diff --git a/.github/actions/run-alpine-tests/action.yml b/.github/actions/run-alpine-tests/action.yml
index 67a7cf9767..a9842c11be 100644
--- a/.github/actions/run-alpine-tests/action.yml
+++ b/.github/actions/run-alpine-tests/action.yml
@@ -43,7 +43,7 @@ runs:
         printf '%s\n' "$ALPINE_TEST_COMMAND" >> "$script_path"
         chmod +x "$script_path"
 
-        docker run --rm \
+        docker run --rm --init \
           --platform linux/amd64 \
           --volume "$GITHUB_WORKSPACE:/workspace" \
           --volume "$script_path:/tmp/copilot-sdk-alpine-test.sh:ro" \
diff --git a/.github/workflows/block-remove-before-merge.yml b/.github/workflows/block-remove-before-merge.yml
index 443eea9f7c..0cd4a9824e 100644
--- a/.github/workflows/block-remove-before-merge.yml
+++ b/.github/workflows/block-remove-before-merge.yml
@@ -17,7 +17,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v7
-        timeout-minutes: 4
         with:
           fetch-depth: 2
       - name: Check for remove-before-merge paths in PR
diff --git a/.github/workflows/java-publish-snapshot.yml b/.github/workflows/java-publish-snapshot.yml
index ce5b8c5f4e..219dd43bf2 100644
--- a/.github/workflows/java-publish-snapshot.yml
+++ b/.github/workflows/java-publish-snapshot.yml
@@ -171,6 +171,80 @@ jobs:
           if-no-files-found: error
           retention-days: 1
 
+  build-linuxmusl-arm64-classifier:
+    name: Build Linux musl 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-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        with:
+          node-version: 22
+
+      - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
+        with:
+          java-version: "25"
+          distribution: "microsoft"
+          cache: "maven"
+
+      - name: Build and validate linuxmusl-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
+          VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
+          docker run --rm \
+            --volume "$GITHUB_WORKSPACE:/workspace" \
+            --volume "$HOME/.m2:/root/.m2" \
+            --workdir /workspace/java \
+            --env HOST_GID="$(id -g)" \
+            --env HOST_UID="$(id -u)" \
+            "eclipse-temurin:25-jdk-alpine" \
+            sh -c "apk add --no-cache git java-cacerts maven nodejs npm &&
+              export JAVA_TOOL_OPTIONS=-Djavax.net.ssl.trustStore=/etc/ssl/certs/java/cacerts &&
+              git config --global --add safe.directory /workspace &&
+              node copilot-native/scripts/validate-native-host.mjs linuxmusl-arm64 &&
+              mvn -B -pl copilot-native package -DskipTests -Dcopilot.native.libc=musl &&
+              chown -R \$HOST_UID:\$HOST_GID copilot-native/target"
+          JAR="copilot-native/target/copilot-sdk-java-runtime-$VERSION-linuxmusl-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 linuxmusl-arm64 "$JAR" "$(basename "$JAR")" ..
+          node copilot-native/scripts/validate-native-artifact.mjs placeholder "$PRIMARY_JAR"
+          MANIFEST="copilot-native/target/linuxmusl-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-linuxmusl-arm64-snapshot-${{ github.run_id }}-${{ github.run_attempt }}
+          path: |
+            java/copilot-native/target/copilot-sdk-java-runtime-${{ steps.build.outputs.version }}-linuxmusl-arm64.jar
+            java/copilot-native/target/linuxmusl-arm64-${{ steps.build.outputs.version }}.sha256
+          if-no-files-found: error
+          retention-days: 1
+
   build-windows-x64-classifier:
     name: Build Windows x64 snapshot classifier
     needs: resolve-source
@@ -296,7 +370,7 @@ jobs:
   build-darwin-classifier:
     name: Build Darwin snapshot classifier
     needs: resolve-source
-    runs-on: macos-26
+    runs-on: macos-26-agent-runtime
     permissions:
       contents: read
     outputs:
@@ -426,6 +500,7 @@ jobs:
         resolve-source,
         build-linux-arm64-classifier,
         build-linuxmusl-x64-classifier,
+        build-linuxmusl-arm64-classifier,
         build-windows-x64-classifier,
         build-windows-arm64-classifier,
         build-darwin-classifier,
@@ -468,6 +543,11 @@ jobs:
           name: java-native-linuxmusl-x64-snapshot-${{ github.run_id }}-${{ github.run_attempt }}
           path: ${{ runner.temp }}/java-native-linuxmusl-x64
 
+      - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+        with:
+          name: java-native-linuxmusl-arm64-snapshot-${{ github.run_id }}-${{ github.run_attempt }}
+          path: ${{ runner.temp }}/java-native-linuxmusl-arm64
+
       - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: java-native-win32-x64-snapshot-${{ github.run_id }}-${{ github.run_attempt }}
@@ -569,6 +649,31 @@ jobs:
           echo "linuxmusl_x64_jar=$JAR" >> "$GITHUB_OUTPUT"
           echo "linuxmusl_x64_sha=$(cut -d ' ' -f 1 "$MANIFEST")" >> "$GITHUB_OUTPUT"
 
+      - name: Verify version, source, and Linux musl ARM64 classifier
+        id: linuxmusl-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="${{ steps.linux-arm64-artifact.outputs.version }}"
+          if [ "$VERSION" != "${{ needs.build-linuxmusl-arm64-classifier.outputs.version }}" ]; then
+            echo "::error::Linux musl ARM64 classifier version does not match deploy version."
+            exit 1
+          fi
+          ARTIFACT_DIRECTORY="${{ runner.temp }}/java-native-linuxmusl-arm64"
+          JAR="$ARTIFACT_DIRECTORY/copilot-sdk-java-runtime-$VERSION-linuxmusl-arm64.jar"
+          MANIFEST="$ARTIFACT_DIRECTORY/linuxmusl-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 linuxmusl-arm64 "$JAR" "$(basename "$JAR")" "$GITHUB_WORKSPACE"
+          echo "linuxmusl_arm64_jar=$JAR" >> "$GITHUB_OUTPUT"
+          echo "linuxmusl_arm64_sha=$(cut -d ' ' -f 1 "$MANIFEST")" >> "$GITHUB_OUTPUT"
+
       - name: Verify version, source, and Darwin classifier
         id: darwin-artifact
         run: |
@@ -650,6 +755,7 @@ jobs:
           mvn -B deploy -DskipTests -DskipITs -Dcopilot.native.libc=glibc \
             "-Dcopilot.native.external.linux.arm64.classifier.path=${{ steps.linux-arm64-artifact.outputs.linux_arm64_jar }}" \
             "-Dcopilot.native.external.linuxmusl.x64.classifier.path=${{ steps.linuxmusl-x64-artifact.outputs.linuxmusl_x64_jar }}" \
+            "-Dcopilot.native.external.linuxmusl.arm64.classifier.path=${{ steps.linuxmusl-arm64-artifact.outputs.linuxmusl_arm64_jar }}" \
             "-Dcopilot.native.external.win32.classifier.path=${{ steps.windows-artifact.outputs.windows_jar }}" \
             "-Dcopilot.native.external.win32.arm64.classifier.path=${{ steps.windows-arm64-artifact.outputs.windows_arm64_jar }}" \
             "-Dcopilot.native.external.darwin.classifier.path=${{ steps.darwin-artifact.outputs.darwin_jar }}" \
@@ -689,6 +795,7 @@ jobs:
             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 "| \`linuxmusl-x64\` | \`Alpine x64\` | \`$(basename "${{ steps.linuxmusl-x64-artifact.outputs.linuxmusl_x64_jar }}")\` | \`${{ steps.linuxmusl-x64-artifact.outputs.linuxmusl_x64_sha }}\` | Published |"
+            echo "| \`linuxmusl-arm64\` | \`Alpine ARM64\` | \`$(basename "${{ steps.linuxmusl-arm64-artifact.outputs.linuxmusl_arm64_jar }}")\` | \`${{ steps.linuxmusl-arm64-artifact.outputs.linuxmusl_arm64_sha }}\` | Published |"
             echo "| \`win32-x64\` | \`windows-latest\` | \`$(basename "${{ steps.windows-artifact.outputs.windows_jar }}")\` | \`${{ steps.windows-artifact.outputs.windows_sha }}\` | Published |"
             echo "| \`win32-arm64\` | \`windows-11-arm\` | \`$(basename "${{ steps.windows-arm64-artifact.outputs.windows_arm64_jar }}")\` | \`${{ steps.windows-arm64-artifact.outputs.windows_arm64_sha }}\` | Published |"
             echo "| \`darwin-x64\` | \`macos-15-intel\` | \`$(basename "${{ steps.darwin-x64-artifact.outputs.darwin_x64_jar }}")\` | \`${{ steps.darwin-x64-artifact.outputs.darwin_x64_sha }}\` | Published |"
diff --git a/.github/workflows/java-smoke-test.yml b/.github/workflows/java-smoke-test.yml
deleted file mode 100644
index 95f662beb1..0000000000
--- a/.github/workflows/java-smoke-test.yml
+++ /dev/null
@@ -1,125 +0,0 @@
-name: "Java smoke test"
-
-on:
-  workflow_dispatch:
-  workflow_call:
-    secrets:
-      COPILOT_GITHUB_TOKEN:
-        required: true
-
-permissions:
-  contents: read
-
-jobs:
-  smoke-test-jdk17:
-    name: Build SDK and run smoke test (JDK 17)
-    runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/main'
-    defaults:
-      run:
-        shell: bash
-        working-directory: ./java
-    steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-
-      - name: Set up JDK 17
-        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
-        with:
-          java-version: "17"
-          distribution: "microsoft"
-          cache: "maven"
-
-      - uses: ./.github/actions/setup-copilot
-        id: setup-copilot
-
-      - name: Build SDK and install to local repo
-        run: mvn -DskipTests -DskipITs -Pskip-test-harness clean install
-
-      - name: Create and run smoke test via Copilot CLI
-        env:
-          COPILOT_GITHUB_TOKEN: ${{ secrets.COPILOT_GITHUB_TOKEN }}
-          COPILOT_CLI_JS: ${{ steps.setup-copilot.outputs.javascript-cli-path }}
-        run: |
-          cat > /tmp/smoke-test-prompt.txt << 'PROMPT_EOF'
-          You are running inside the copilot-sdk monorepo, in the java/ subdirectory.
-          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 `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`.
-
-          **Critical override — do NOT run the jar:** Stop after the `mvn --no-snapshot-updates clean package` build succeeds. Do NOT execute Step 4 (java -jar) or Step 5 (verify exit code) from the prompt. The workflow will run the jar in a separate deterministic step to guarantee the exit code propagates correctly.
-
-          Follow steps 1-3 only: create the `smoke-test/` directory, create `pom.xml` and the Java source file exactly as specified, and build with `mvn --no-snapshot-updates clean package` (no SNAPSHOT updates and without `-U`).
-
-          If any step fails, exit with a non-zero exit code. Do not silently fix errors.
-          PROMPT_EOF
-
-          node "$COPILOT_CLI_JS" --yolo --prompt "$(cat /tmp/smoke-test-prompt.txt)"
-
-      - name: Run smoke test jar
-        env:
-          COPILOT_GITHUB_TOKEN: ${{ secrets.COPILOT_GITHUB_TOKEN }}
-        run: |
-          cd smoke-test
-          java -jar ./target/copilot-sdk-smoketest-1.0-SNAPSHOT.jar
-          echo "Smoke test passed (exit code 0)"
-
-  smoke-test-java25:
-    name: Build SDK and run smoke test (JDK 25)
-    runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/main'
-    defaults:
-      run:
-        shell: bash
-        working-directory: ./java
-    steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-
-      - name: Set up JDK 25
-        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
-        with:
-          java-version: "25"
-          distribution: "microsoft"
-          cache: "maven"
-
-      - uses: ./.github/actions/setup-copilot
-        id: setup-copilot
-
-      - name: Build SDK and install to local repo
-        run: mvn -DskipTests -DskipITs -Pskip-test-harness clean install
-
-      - name: Create and run smoke test via Copilot CLI
-        env:
-          COPILOT_GITHUB_TOKEN: ${{ secrets.COPILOT_GITHUB_TOKEN }}
-          COPILOT_CLI_JS: ${{ steps.setup-copilot.outputs.javascript-cli-path }}
-        run: |
-          cat > /tmp/smoke-test-prompt.txt << 'PROMPT_EOF'
-          You are running inside the copilot-sdk monorepo, in the java/ subdirectory.
-          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 `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`.
-
-          **Critical override — do NOT run the jar:** Stop after the `mvn --no-snapshot-updates clean package` build succeeds. Do NOT execute Step 4 (java -jar) or Step 5 (verify exit code) from the prompt. The workflow will run the jar in a separate deterministic step to guarantee the exit code propagates correctly.
-
-          **Critical override — enable Virtual Threads for JDK 25:** After creating the Java source file from the README "Quick Start" section but BEFORE building, you must modify the source file to enable virtual thread support. The Quick Start code contains inline comments that start with `// JDK 25+:` — these are instructions. Find every such comment and follow what it says (comment out lines it says to comment out, uncomment lines it says to uncomment). Add any imports required by the newly uncommented code (e.g. `java.util.concurrent.Executors`).
-          Also set `maven.compiler.source` and `maven.compiler.target` to `25` in the `pom.xml`.
-
-          Follow steps 1-3 only: create the `smoke-test/` directory, create `pom.xml` and the Java source file exactly as specified, apply the JDK 25 virtual thread modifications described above, and build with `mvn --no-snapshot-updates clean package` (no SNAPSHOT updates and without `-U`).
-
-          If any step fails, exit with a non-zero exit code. Do not silently fix errors.
-          PROMPT_EOF
-
-          node "$COPILOT_CLI_JS" --yolo --prompt "$(cat /tmp/smoke-test-prompt.txt)"
-
-      - name: Run smoke test jar
-        env:
-          COPILOT_GITHUB_TOKEN: ${{ secrets.COPILOT_GITHUB_TOKEN }}
-        run: |
-          cd smoke-test
-          java -jar ./target/copilot-sdk-smoketest-1.0-SNAPSHOT.jar
-          echo "Smoke test passed (exit code 0)"
diff --git a/.github/workflows/sdk-dotnet.yml b/.github/workflows/sdk-dotnet.yml
index 4e9671c9a9..5ebbe5c0c4 100644
--- a/.github/workflows/sdk-dotnet.yml
+++ b/.github/workflows/sdk-dotnet.yml
@@ -1,13 +1,12 @@
 # Invoked by sdk.yml to run the .NET SDK build/test matrix, documentation,
 # full subprocess CAPI coverage, and focused in-process smoke
-# coverage on Linux and x64 musl.
+# coverage across standard platforms and x64 musl.
 name: "SDK .NET"
 
 env:
   HUSKY: 0
   POWERSHELL_UPDATECHECK: Off
   SDK_HOME: ${{ inputs.sdk-home }}
-  SETUP_NODE_TIMEOUT_MINUTES: 10
 
 on:
   workflow_call:
@@ -27,7 +26,6 @@ jobs:
   dotnet-linux-x64:
     name: ".NET (ubuntu-latest, CAPI)"
     if: inputs.platform == 'all' || inputs.platform == 'linux-x64'
-    timeout-minutes: 30
     runs-on: ubuntu-latest
     defaults:
       run:
@@ -38,7 +36,6 @@ jobs:
       DOTNET_TEST_RESULTS_DIRECTORY: TestResults/subprocess
     steps:
       - uses: actions/checkout@v7
-        timeout-minutes: 4
         with:
           persist-credentials: false
       - uses: ./.github/actions/download-sdk-runtime
@@ -83,6 +80,13 @@ jobs:
           DOTNET_TEST_RESULTS_DIRECTORY: TestResults/inprocess
           DOTNET_TEST_FILTER: "FullyQualifiedName~GitHub.Copilot.Test.E2E.ClientE2ETests.Should_Start_And_Connect_Over_InProcess_Ffi|FullyQualifiedName~GitHub.Copilot.Test.E2E.SessionE2ETests.Should_Receive_Session_Events|FullyQualifiedName~GitHub.Copilot.Test.E2E.ClientOptionsE2ETests.Should_Use_Configured_GitHub_Host_For_Authentication"
         run: ../scripts/ci/run-dotnet-tests.sh
+      - name: Validate documentation examples
+        if: github.event_name != 'merge_group'
+        working-directory: ${{ inputs.sdk-home }}/scripts/docs-validation
+        run: |
+          npm ci
+          npm run extract
+          npm run validate:cs
       - if: failure()
         uses: actions/upload-artifact@v7
         with:
@@ -92,19 +96,18 @@ jobs:
           retention-days: 7
 
   dotnet-darwin-arm64:
-    name: ".NET (macos-latest, default, CAPI)"
+    name: ".NET (macos-26-xlarge-agent-runtime, default, CAPI)"
     if: inputs.platform == 'all' || inputs.platform == 'darwin-arm64'
-    runs-on: macos-latest
-    timeout-minutes: 30
+    runs-on: macos-26-xlarge-agent-runtime
     defaults:
       run:
         shell: bash
         working-directory: ${{ inputs.sdk-home }}/dotnet
     env:
       COPILOT_SDK_E2E_BACKEND: capi
+      DOTNET_TEST_RESULTS_DIRECTORY: TestResults/subprocess
     steps:
       - uses: actions/checkout@v7
-        timeout-minutes: 4
         with:
           persist-credentials: false
       - uses: ./.github/actions/download-sdk-runtime
@@ -123,22 +126,41 @@ jobs:
       - run: dotnet build --no-restore -p:CopilotCliBinaryPath="$COPILOT_RUNTIME_BINARY_PATH" -p:CopilotSkipCliDownload=true
       - run: npm ci --ignore-scripts
         working-directory: ${{ inputs.sdk-home }}/test/harness
-      - env:
+      - name: Test out-of-process
+        id: subprocess
+        env:
+          COPILOT_HMAC_KEY: ${{ secrets.COPILOT_DEVELOPER_CLI_INTEGRATION_HMAC_KEY }}
+        run: ../scripts/ci/run-dotnet-tests.sh
+      - name: Test in-process smoke
+        if: ${{ !cancelled() && (steps.subprocess.outcome == 'success' || steps.subprocess.outcome == 'failure') }}
+        env:
           COPILOT_HMAC_KEY: ${{ secrets.COPILOT_DEVELOPER_CLI_INTEGRATION_HMAC_KEY }}
+          COPILOT_SDK_DEFAULT_CONNECTION: inprocess
+          DOTNET_TEST_RESULTS_DIRECTORY: TestResults/inprocess
+          DOTNET_TEST_FILTER: "FullyQualifiedName~GitHub.Copilot.Test.E2E.ClientE2ETests.Should_Start_And_Connect_Over_InProcess_Ffi|FullyQualifiedName~GitHub.Copilot.Test.E2E.SessionE2ETests.Should_Receive_Session_Events|FullyQualifiedName~GitHub.Copilot.Test.E2E.ClientOptionsE2ETests.Should_Use_Configured_GitHub_Host_For_Authentication"
         run: ../scripts/ci/run-dotnet-tests.sh
       - if: failure()
         uses: actions/upload-artifact@v7
         with:
-          name: dotnet-test-diagnostics-macos-latest-default-capi-${{ github.run_attempt }}
+          name: dotnet-test-diagnostics-macos-26-xlarge-default-capi-${{ github.run_attempt }}
           path: ${{ inputs.sdk-home }}/dotnet/TestResults/
           if-no-files-found: warn
           retention-days: 7
 
   dotnet-win32-x64:
-    name: ".NET (windows-latest, default, CAPI)"
+    name: ".NET (windows-latest, ${{ matrix.framework }}, ${{ matrix.suite.name }}, CAPI)"
     if: inputs.platform == 'all' || inputs.platform == 'win32-x64'
     runs-on: windows-latest
-    timeout-minutes: 30
+    strategy:
+      fail-fast: false
+      matrix:
+        framework: [net8.0, net472]
+        # Complementary filters include every test, including newly added classes.
+        suite:
+          - name: e2e-s
+            filter: FullyQualifiedName~GitHub.Copilot.Test.E2E.S
+          - name: remaining
+            filter: FullyQualifiedName!~GitHub.Copilot.Test.E2E.S
     defaults:
       run:
         shell: bash
@@ -146,9 +168,11 @@ jobs:
     env:
       COPILOT_SDK_E2E_BACKEND: capi
       DOTNET_TEST_RUNTIME: win-x64
+      DOTNET_TEST_FRAMEWORK: ${{ matrix.framework }}
+      DOTNET_TEST_FILTER: ${{ matrix.suite.filter }}
+      DOTNET_TEST_RESULTS_DIRECTORY: TestResults/subprocess
     steps:
       - uses: actions/checkout@v7
-        timeout-minutes: 4
         with:
           persist-credentials: false
       - uses: ./.github/actions/download-sdk-runtime
@@ -164,17 +188,27 @@ jobs:
         with:
           node-version: 22
       - run: dotnet restore test/GitHub.Copilot.SDK.Test.csproj --runtime "$DOTNET_TEST_RUNTIME" -p:CopilotCliBinaryPath="$COPILOT_RUNTIME_BINARY_PATH" -p:CopilotSkipCliDownload=true
-      - run: dotnet build test/GitHub.Copilot.SDK.Test.csproj --no-restore --runtime "$DOTNET_TEST_RUNTIME" -p:CopilotCliBinaryPath="$COPILOT_RUNTIME_BINARY_PATH" -p:CopilotSkipCliDownload=true
+      - run: dotnet build test/GitHub.Copilot.SDK.Test.csproj --no-restore --framework "$DOTNET_TEST_FRAMEWORK" --runtime "$DOTNET_TEST_RUNTIME" -p:CopilotCliBinaryPath="$COPILOT_RUNTIME_BINARY_PATH" -p:CopilotSkipCliDownload=true
       - run: npm ci --ignore-scripts
         working-directory: ${{ inputs.sdk-home }}/test/harness
       - run: pwsh.exe -Command "Write-Host 'PowerShell ready'"
-      - env:
+      - name: Test out-of-process
+        id: subprocess
+        env:
+          COPILOT_HMAC_KEY: ${{ secrets.COPILOT_DEVELOPER_CLI_INTEGRATION_HMAC_KEY }}
+        run: ../scripts/ci/run-dotnet-tests.sh
+      - name: Test in-process smoke
+        if: ${{ !cancelled() && (steps.subprocess.outcome == 'success' || steps.subprocess.outcome == 'failure') }}
+        env:
           COPILOT_HMAC_KEY: ${{ secrets.COPILOT_DEVELOPER_CLI_INTEGRATION_HMAC_KEY }}
+          COPILOT_SDK_DEFAULT_CONNECTION: inprocess
+          DOTNET_TEST_RESULTS_DIRECTORY: TestResults/inprocess
+          DOTNET_TEST_FILTER: "FullyQualifiedName~GitHub.Copilot.Test.E2E.ClientE2ETests.Should_Start_And_Connect_Over_InProcess_Ffi|FullyQualifiedName~GitHub.Copilot.Test.E2E.SessionE2ETests.Should_Receive_Session_Events|FullyQualifiedName~GitHub.Copilot.Test.E2E.ClientOptionsE2ETests.Should_Use_Configured_GitHub_Host_For_Authentication"
         run: ../scripts/ci/run-dotnet-tests.sh
       - if: failure()
         uses: actions/upload-artifact@v7
         with:
-          name: dotnet-test-diagnostics-windows-latest-default-capi-${{ github.run_attempt }}
+          name: dotnet-test-diagnostics-windows-latest-${{ matrix.framework }}-${{ matrix.suite.name }}-capi-${{ github.run_attempt }}
           path: ${{ inputs.sdk-home }}/dotnet/TestResults/
           if-no-files-found: warn
           retention-days: 7
@@ -183,12 +217,10 @@ jobs:
     name: ".NET (Alpine x64, CAPI)"
     if: inputs.platform == 'all' || inputs.platform == 'linuxmusl-x64'
     runs-on: ubuntu-latest
-    timeout-minutes: 20
     env:
       COPILOT_SDK_E2E_BACKEND: capi
     steps:
       - uses: actions/checkout@v7
-        timeout-minutes: 4
         with:
           persist-credentials: false
       - uses: ./.github/actions/download-sdk-runtime
@@ -257,25 +289,3 @@ jobs:
           path: ${{ inputs.sdk-home }}/dotnet/TestResults/
           if-no-files-found: warn
           retention-days: 7
-
-  docs-dotnet:
-    name: "Docs (.NET)"
-    if: inputs.platform == 'all' || inputs.platform == 'docs'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v7
-        timeout-minutes: 4
-        with:
-          persist-credentials: false
-      - uses: actions/setup-node@v6
-        with:
-          node-version: 22
-      - uses: actions/setup-dotnet@v6
-        with:
-          dotnet-version: "10.0.x"
-      - run: npm ci
-        working-directory: ${{ inputs.sdk-home }}/scripts/docs-validation
-      - run: dotnet restore -p:CopilotSkipCliDownload=true
-        working-directory: ${{ inputs.sdk-home }}/dotnet
-      - run: npm run extract && npm run validate:cs
-        working-directory: ${{ inputs.sdk-home }}/scripts/docs-validation
diff --git a/.github/workflows/sdk-go.yml b/.github/workflows/sdk-go.yml
index 24ef16a35b..d07042076e 100644
--- a/.github/workflows/sdk-go.yml
+++ b/.github/workflows/sdk-go.yml
@@ -7,7 +7,6 @@ env:
   HUSKY: 0
   POWERSHELL_UPDATECHECK: Off
   SDK_HOME: ${{ inputs.sdk-home }}
-  SETUP_NODE_TIMEOUT_MINUTES: 10
 
 on:
   workflow_call:
@@ -30,7 +29,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ${{ fromJSON(inputs.platform == 'linux-x64' && '["ubuntu-latest"]' || inputs.platform == 'darwin-arm64' && '["macos-latest"]' || inputs.platform == 'win32-x64' && '["windows-latest"]' || '["ubuntu-latest","macos-latest","windows-latest"]') }}
+        os: ${{ fromJSON(inputs.platform == 'linux-x64' && '["ubuntu-latest"]' || inputs.platform == 'darwin-arm64' && '["macos-26-agent-runtime"]' || inputs.platform == 'win32-x64' && '["windows-latest"]' || '["ubuntu-latest","macos-26-agent-runtime","windows-latest"]') }}
     runs-on: ${{ matrix.os }}
     defaults:
       run:
@@ -38,7 +37,6 @@ jobs:
         working-directory: ${{ inputs.sdk-home }}/go
     steps:
       - uses: actions/checkout@v7
-        timeout-minutes: 4
         with:
           persist-credentials: false
       - uses: ./.github/actions/download-sdk-runtime
@@ -68,7 +66,9 @@ jobs:
       - if: runner.os == 'Linux'
         run: go test ./...
         working-directory: ${{ inputs.sdk-home }}/go/samples
-      - run: npm ci --ignore-scripts
+      - run: |
+          npm ci --ignore-scripts
+          npm rebuild esbuild
         working-directory: ${{ inputs.sdk-home }}/test/harness
       - if: runner.os == 'Windows'
         run: pwsh.exe -Command "Write-Host 'PowerShell ready'"
@@ -86,15 +86,24 @@ jobs:
         run: |
           go test -v -race -timeout=20m ./internal/e2e -run '^TestInProcessFfiE2E$'
           go test -v -race -timeout=20m ./internal/e2e -run '^TestClientE2E$/^should_use_configured_github_host_for_authentication$'
+      - if: github.event_name != 'merge_group' && runner.os == 'Linux'
+        uses: actions/setup-node@v6
+        with:
+          node-version: 22
+      - name: Validate documentation examples
+        if: github.event_name != 'merge_group' && runner.os == 'Linux'
+        working-directory: ${{ inputs.sdk-home }}/scripts/docs-validation
+        run: |
+          npm ci
+          npm run extract
+          npm run validate:go
 
   go-musl-x64:
     name: "Go (Alpine x64)"
     if: inputs.platform == 'all' || inputs.platform == 'linuxmusl-x64'
     runs-on: ubuntu-latest
-    timeout-minutes: 20
     steps:
       - uses: actions/checkout@v7
-        timeout-minutes: 4
         with:
           persist-credentials: false
       - uses: ./.github/actions/download-sdk-runtime
@@ -114,6 +123,7 @@ jobs:
             apk add --no-cache build-base nodejs npm
             npm --prefix "$COPILOT_SDK_ROOT/nodejs" ci --ignore-scripts
             npm --prefix "$COPILOT_SDK_ROOT/test/harness" ci --ignore-scripts
+            npm --prefix "$COPILOT_SDK_ROOT/test/harness" rebuild esbuild
 
             export GITHUB_ENV=/tmp/copilot-sdk-runtime.env
             export COPILOT_RUNTIME_TARGET=linuxmusl-x64
@@ -138,24 +148,3 @@ jobs:
             go test -v -race -timeout=20m ./internal/e2e -run '^TestInProcessFfiE2E$' || status=$?
             go test -v -race -timeout=20m ./internal/e2e -run '^TestClientE2E$/^should_use_configured_github_host_for_authentication$' || status=$?
             exit "$status"
-
-  docs-go:
-    name: "Docs (Go)"
-    if: inputs.platform == 'all' || inputs.platform == 'docs'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v7
-        timeout-minutes: 4
-        with:
-          persist-credentials: false
-      - uses: actions/setup-node@v6
-        with:
-          node-version: 22
-      - uses: actions/setup-go@v6
-        with:
-          go-version: "1.24"
-          cache-dependency-path: ${{ inputs.sdk-home }}/go/go.sum
-      - run: npm ci
-        working-directory: ${{ inputs.sdk-home }}/scripts/docs-validation
-      - run: npm run extract && npm run validate:go
-        working-directory: ${{ inputs.sdk-home }}/scripts/docs-validation
diff --git a/.github/workflows/sdk-java.yml b/.github/workflows/sdk-java.yml
index 408298d88c..28f9650925 100644
--- a/.github/workflows/sdk-java.yml
+++ b/.github/workflows/sdk-java.yml
@@ -1,12 +1,11 @@
-# Invoked by sdk.yml to run full subprocess Java SDK coverage on supported JDKs,
-# focused in-process smoke coverage across native classifiers, and documentation.
+# Invoked by sdk.yml to run full subprocess Java SDK coverage followed by focused
+# in-process smoke on standard platforms and x64 musl, plus JDK 17 and docs checks.
 name: "SDK Java"
 
 env:
   HUSKY: 0
   POWERSHELL_UPDATECHECK: Off
   SDK_HOME: ${{ inputs.sdk-home }}
-  SETUP_NODE_TIMEOUT_MINUTES: 10
 
 on:
   workflow_call:
@@ -24,25 +23,30 @@ permissions:
 
 jobs:
   java:
-    name: "Java (JDK ${{ matrix.test-jdk }})"
-    if: inputs.platform == 'all' || inputs.platform == 'linux-x64'
+    name: "Java (${{ matrix.os }}, JDK ${{ matrix.test-jdk }})"
+    if: contains(fromJSON('["all","linux-x64","darwin-arm64","win32-x64"]'), inputs.platform)
     strategy:
       fail-fast: false
       matrix:
+        os: ${{ fromJSON(inputs.platform == 'linux-x64' && '["ubuntu-latest"]' || inputs.platform == 'darwin-arm64' && '["macos-26-agent-runtime"]' || inputs.platform == 'win32-x64' && '["windows-latest"]' || '["ubuntu-latest","macos-26-agent-runtime","windows-latest"]') }}
         test-jdk: ["25", "17"]
-    runs-on: ubuntu-latest
+        exclude:
+          - os: macos-26-agent-runtime
+            test-jdk: "17"
+          - os: windows-latest
+            test-jdk: "17"
+    runs-on: ${{ matrix.os }}
     defaults:
       run:
         shell: bash
         working-directory: ${{ inputs.sdk-home }}/java
     steps:
       - uses: actions/checkout@v7
-        timeout-minutes: 4
         with:
           persist-credentials: false
       - uses: ./.github/actions/download-sdk-runtime
         with:
-          artifact-name: executable-sdk-Linux-X64-gnu
+          artifact-name: ${{ runner.os == 'Linux' && format('executable-sdk-{0}-{1}-gnu', runner.os, runner.arch) || format('executable-sdk-{0}-{1}', runner.os, runner.arch) }}
           path: ${{ github.workspace }}
       - run: node "$SDK_HOME/scripts/ci/runtime-artifact.mjs" restore && node "$SDK_HOME/scripts/ci/runtime-artifact.mjs" prepare
         working-directory: .
@@ -56,13 +60,15 @@ jobs:
           node-version: 22
       # TEMPORARY MERGE QUEUE REDUCTION: pull requests and main pushes retain
       # static checks; merge groups rerun only SDK compatibility coverage.
-      - if: github.event_name != 'merge_group' && matrix.test-jdk == '25'
+      - if: github.event_name != 'merge_group' && runner.os == 'Linux' && matrix.test-jdk == '25'
         run: ./scripts/test-update-documentation-versions.sh
       - run: ./mvnw test-compile jar:jar
-      - if: github.event_name != 'merge_group' && matrix.test-jdk == '25'
+      - if: github.event_name != 'merge_group' && runner.os == 'Linux' && matrix.test-jdk == '25'
         run: ./mvnw javadoc:javadoc
-      - if: github.event_name != 'merge_group' && matrix.test-jdk == '25'
+      - if: github.event_name != 'merge_group' && runner.os == 'Linux' && matrix.test-jdk == '25'
         run: ./mvnw spotless:check
+      - if: runner.os == 'Windows'
+        run: pwsh.exe -Command "Write-Host 'PowerShell ready'"
       - if: matrix.test-jdk == '25'
         id: subprocess
         env:
@@ -94,10 +100,19 @@ jobs:
             -Dsurefire.failIfNoSpecifiedTests=false \
             -Dit.test=InProcessTransportIT,AuthHostE2ETest \
             -Dcopilot.inprocess.cli.path="$COPILOT_CLI_PATH"
+      - if: github.event_name != 'merge_group' && runner.os == 'Linux' && matrix.test-jdk == '25'
+        run: ./mvnw install -Dmaven.test.skip=true -Dskip.test.harness=true -Dcopilot.native.skip.download=true
+      - name: Validate documentation examples
+        if: github.event_name != 'merge_group' && runner.os == 'Linux' && matrix.test-jdk == '25'
+        working-directory: ${{ inputs.sdk-home }}/scripts/docs-validation
+        run: |
+          npm ci
+          npm run extract
+          npm run validate:java
       - if: failure()
         uses: actions/upload-artifact@v7
         with:
-          name: java-test-results-jdk-${{ matrix.test-jdk }}
+          name: java-test-results-${{ matrix.os }}-jdk-${{ matrix.test-jdk }}
           path: |
             ${{ inputs.sdk-home }}/java/sdk/target/surefire-reports/
             ${{ inputs.sdk-home }}/java/sdk/target/surefire-reports-isolated/
@@ -105,132 +120,129 @@ jobs:
             ${{ inputs.sdk-home }}/java/sdk/target/subprocess-reports/
           retention-days: 7
 
-  java-inprocess:
-    name: "Java (inprocess, ${{ matrix.classifier }})"
-    if: contains(fromJSON('["all","darwin-arm64","win32-x64"]'), inputs.platform)
-    strategy:
-      fail-fast: false
-      matrix:
-        include: ${{ fromJSON(inputs.platform == 'darwin-arm64' && '[{"os":"macos-26","classifier":"darwin-arm64"}]' || inputs.platform == 'win32-x64' && '[{"os":"windows-latest","classifier":"win32-x64"}]' || '[{"os":"windows-latest","classifier":"win32-x64"},{"os":"macos-26","classifier":"darwin-arm64"}]') }}
-    runs-on: ${{ matrix.os }}
-    defaults:
-      run:
-        shell: bash
-        working-directory: ${{ inputs.sdk-home }}/java
+  java-musl-x64:
+    name: "Java (JDK 25, linuxmusl-x64)"
+    if: inputs.platform == 'all' || inputs.platform == 'linuxmusl-x64'
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v7
-        timeout-minutes: 4
         with:
           persist-credentials: false
       - uses: ./.github/actions/download-sdk-runtime
         with:
-          artifact-name: ${{ runner.os == 'Linux' && format('executable-sdk-{0}-{1}-gnu', runner.os, runner.arch) || format('executable-sdk-{0}-{1}', runner.os, runner.arch) }}
+          artifact-name: executable-sdk-Linux-X64-musl
           path: ${{ github.workspace }}
-      - run: node "$SDK_HOME/scripts/ci/runtime-artifact.mjs" restore && node "$SDK_HOME/scripts/ci/runtime-artifact.mjs" prepare
+      - run: node "$SDK_HOME/scripts/ci/runtime-artifact.mjs" restore
         working-directory: .
-      - uses: actions/setup-java@v5
-        with:
-          java-version: "25"
-          distribution: microsoft
-          cache: maven
-      - uses: actions/setup-node@v6
+      - uses: ./.github/actions/run-alpine-tests
+        env:
+          COPILOT_HMAC_KEY: ${{ secrets.COPILOT_DEVELOPER_CLI_INTEGRATION_HMAC_KEY }}
         with:
-          node-version: 22
-      - env:
-          CI: "true"
-        run: >-
-          ./mvnw clean verify -Pinprocess
-          -Dtest=NoTestsForInProcessSmoke
-          -Dsurefire.failIfNoSpecifiedTests=false
-          -Dit.test=InProcessTransportIT,AuthHostE2ETest
-          -Dcopilot.inprocess.cli.path="$COPILOT_CLI_PATH"
+          image: eclipse-temurin:25-jdk-alpine
+          sdk-root: /workspace/${{ inputs.sdk-home }}
+          workdir: /workspace/${{ inputs.sdk-home }}/java
+          command: |
+            apk add --no-cache java-cacerts maven nodejs npm
+            export JAVA_TOOL_OPTIONS=-Djavax.net.ssl.trustStore=/etc/ssl/certs/java/cacerts
+            export GITHUB_ENV=/tmp/copilot-sdk-runtime.env
+            export COPILOT_RUNTIME_TARGET=linuxmusl-x64
+            export COPILOT_RUNTIME_OUTPUT_DIRECTORY=/workspace/.sdk-runtime/linuxmusl-x64
+            node "$COPILOT_SDK_ROOT/scripts/ci/runtime-artifact.mjs" prepare
+            set -a
+            . "$GITHUB_ENV"
+            set +a
+            node copilot-native/scripts/validate-native-host.mjs linuxmusl-x64
+            ./mvnw test-compile jar:jar -Dcopilot.native.libc=musl
+            status=0
+            ./mvnw -pl sdk verify -Dskip.test.harness=true -Dcopilot.cli.path="$COPILOT_CLI_PATH" || status=$?
+            mkdir -p sdk/target/subprocess-reports
+            for reports in surefire-reports surefire-reports-isolated failsafe-reports; do
+              if [ -d "sdk/target/$reports" ]; then
+                mv "sdk/target/$reports" sdk/target/subprocess-reports/
+              fi
+            done
+            ./mvnw verify -Pinprocess \
+              -Dskip.test.harness=true \
+              -Dtest=NoTestsForInProcessSmoke \
+              -Dsurefire.failIfNoSpecifiedTests=false \
+              -Dit.test=InProcessTransportIT,AuthHostE2ETest \
+              -Dcopilot.native.libc=musl \
+              -Dcopilot.inprocess.cli.path="$COPILOT_CLI_PATH" || status=$?
+            exit "$status"
       - if: failure()
         uses: actions/upload-artifact@v7
         with:
-          name: java-test-results-inprocess-${{ matrix.classifier }}
+          name: java-test-results-linuxmusl-x64
           path: |
             ${{ inputs.sdk-home }}/java/sdk/target/surefire-reports/
             ${{ inputs.sdk-home }}/java/sdk/target/surefire-reports-isolated/
             ${{ inputs.sdk-home }}/java/sdk/target/failsafe-reports/
+            ${{ inputs.sdk-home }}/java/sdk/target/subprocess-reports/
           retention-days: 7
-
-  java-inprocess-musl-x64:
-    name: "Java (inprocess, linuxmusl-x64)"
-    if: inputs.platform == 'all' || inputs.platform == 'linuxmusl-x64'
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
+  java-musl-arm64:
+    name: "Java (JDK 25, linuxmusl-arm64)"
+    if: inputs.platform == 'all' || inputs.platform == 'linuxmusl-arm64'
+    runs-on: ubuntu-24.04-arm
     steps:
       - uses: actions/checkout@v7
-        timeout-minutes: 4
         with:
           persist-credentials: false
       - uses: ./.github/actions/download-sdk-runtime
         with:
-          artifact-name: executable-sdk-Linux-X64-musl
+          artifact-name: executable-sdk-Linux-ARM64-musl
           path: ${{ github.workspace }}
       - run: node "$SDK_HOME/scripts/ci/runtime-artifact.mjs" restore
         working-directory: .
-      - name: Run Java SDK tests (InProcess, musl)
+      - name: Run Java SDK tests (linuxmusl-arm64)
         env:
           COPILOT_HMAC_KEY: ${{ secrets.COPILOT_DEVELOPER_CLI_INTEGRATION_HMAC_KEY }}
         run: |
-          docker run --rm \
+          docker run --rm --init \
             --volume "$GITHUB_WORKSPACE:/workspace" \
             --workdir "/workspace/$SDK_HOME/java" \
             --env CI=true \
             --env COPILOT_HMAC_KEY \
             --env GITHUB_ACTIONS=true \
             --env GITHUB_WORKSPACE=/workspace \
-            --env SDK_HOME="/workspace/$SDK_HOME" \
+            --env COPILOT_SDK_ROOT="/workspace/$SDK_HOME" \
             eclipse-temurin:25-jdk-alpine \
             sh -c 'set -eux
-              apk add --no-cache git java-cacerts maven nodejs npm
-              export JAVA_TOOL_OPTIONS=-Djavax.net.ssl.trustStore=/etc/ssl/certs/java/cacerts
+              apk add --no-cache bash git java-cacerts maven nodejs npm
+              bash --noprofile --norc -c "exit 0"
               git config --global --add safe.directory /workspace
+              export JAVA_TOOL_OPTIONS=-Djavax.net.ssl.trustStore=/etc/ssl/certs/java/cacerts
               export GITHUB_ENV=/tmp/copilot-sdk-runtime.env
-              export COPILOT_RUNTIME_TARGET=linuxmusl-x64
-              export COPILOT_RUNTIME_OUTPUT_DIRECTORY=/workspace/.sdk-runtime/linuxmusl-x64
-              node "$SDK_HOME/scripts/ci/runtime-artifact.mjs" prepare
+              export COPILOT_RUNTIME_TARGET=linuxmusl-arm64
+              export COPILOT_RUNTIME_OUTPUT_DIRECTORY=/workspace/.sdk-runtime/linuxmusl-arm64
+              node "$COPILOT_SDK_ROOT/scripts/ci/runtime-artifact.mjs" prepare
               set -a
               . "$GITHUB_ENV"
               set +a
-              node copilot-native/scripts/validate-native-host.mjs linuxmusl-x64
-              ./mvnw clean verify -Pinprocess \
+              node copilot-native/scripts/validate-native-host.mjs linuxmusl-arm64
+              ./mvnw test-compile jar:jar -Dcopilot.native.libc=musl
+              status=0
+              ./mvnw -pl sdk verify -Dskip.test.harness=true -Dcopilot.cli.path="$COPILOT_CLI_PATH" || status=$?
+              mkdir -p sdk/target/subprocess-reports
+              for reports in surefire-reports surefire-reports-isolated failsafe-reports; do
+                if [ -d "sdk/target/$reports" ]; then
+                  mv "sdk/target/$reports" sdk/target/subprocess-reports/
+                fi
+              done
+              ./mvnw verify -Pinprocess \
+                -Dskip.test.harness=true \
                 -Dtest=NoTestsForInProcessSmoke \
                 -Dsurefire.failIfNoSpecifiedTests=false \
                 -Dit.test=InProcessTransportIT,AuthHostE2ETest \
                 -Dcopilot.native.libc=musl \
-                -Dcopilot.inprocess.cli.path="$COPILOT_CLI_PATH"'
+                -Dcopilot.inprocess.cli.path="$COPILOT_CLI_PATH" || status=$?
+              exit "$status"'
       - if: failure()
         uses: actions/upload-artifact@v7
         with:
-          name: java-test-results-inprocess-linuxmusl-x64
+          name: java-test-results-linuxmusl-arm64
           path: |
             ${{ inputs.sdk-home }}/java/sdk/target/surefire-reports/
             ${{ inputs.sdk-home }}/java/sdk/target/surefire-reports-isolated/
             ${{ inputs.sdk-home }}/java/sdk/target/failsafe-reports/
+            ${{ inputs.sdk-home }}/java/sdk/target/subprocess-reports/
           retention-days: 7
-
-  docs-java:
-    name: "Docs (Java)"
-    if: inputs.platform == 'all' || inputs.platform == 'docs'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v7
-        timeout-minutes: 4
-        with:
-          persist-credentials: false
-      - uses: actions/setup-node@v6
-        with:
-          node-version: 22
-      - uses: actions/setup-java@v5
-        with:
-          distribution: microsoft
-          java-version: "25"
-          cache: maven
-      - run: ./mvnw install -Dmaven.test.skip=true -Dskip.test.harness=true -Dcopilot.native.skip.download=true
-        working-directory: ${{ inputs.sdk-home }}/java
-      - run: npm ci
-        working-directory: ${{ inputs.sdk-home }}/scripts/docs-validation
-      - run: npm run extract && npm run validate:java
-        working-directory: ${{ inputs.sdk-home }}/scripts/docs-validation
diff --git a/.github/workflows/sdk-nodejs.yml b/.github/workflows/sdk-nodejs.yml
index 315331609b..d573049446 100644
--- a/.github/workflows/sdk-nodejs.yml
+++ b/.github/workflows/sdk-nodejs.yml
@@ -7,7 +7,6 @@ env:
   HUSKY: 0
   POWERSHELL_UPDATECHECK: Off
   SDK_HOME: ${{ inputs.sdk-home }}
-  SETUP_NODE_TIMEOUT_MINUTES: 10
 
 on:
   workflow_call:
@@ -19,6 +18,11 @@ on:
       sdk-home:
         required: true
         type: string
+    outputs:
+      capi-result:
+        description: "Standard-platform CAPI job result, independent of BYOK jobs"
+        # Direct result outputs can be empty: https://github.com/actions/runner/issues/2495
+        value: ${{ fromJSON(toJSON(jobs.nodejs)).result }}
 
 permissions:
   contents: read
@@ -30,7 +34,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ${{ fromJSON(inputs.platform == 'linux-x64' && '["ubuntu-latest"]' || inputs.platform == 'darwin-arm64' && '["macos-latest"]' || inputs.platform == 'win32-x64' && '["windows-latest"]' || '["ubuntu-latest","macos-latest","windows-latest"]') }}
+        os: ${{ fromJSON(inputs.platform == 'linux-x64' && '["ubuntu-latest"]' || inputs.platform == 'darwin-arm64' && '["macos-26-agent-runtime"]' || inputs.platform == 'win32-x64' && '["windows-latest"]' || '["ubuntu-latest","macos-26-agent-runtime","windows-latest"]') }}
     runs-on: ${{ matrix.os }}
     defaults:
       run:
@@ -38,7 +42,6 @@ jobs:
         working-directory: ${{ inputs.sdk-home }}/nodejs
     steps:
       - uses: actions/checkout@v7
-        timeout-minutes: 4
         with:
           persist-credentials: false
       - uses: ./.github/actions/download-sdk-runtime
@@ -89,17 +92,17 @@ jobs:
         env:
           COPILOT_HMAC_KEY: ${{ secrets.COPILOT_DEVELOPER_CLI_INTEGRATION_HMAC_KEY }}
         run: |
-          if [ "$GITHUB_EVENT_NAME" = "merge_group" ]; then
+          if [ "$GITHUB_EVENT_NAME" = "merge_group" ] || [ "$GITHUB_EVENT_NAME" = "pull_request" ] || [ "$GITHUB_EVENT_NAME" = "push" ]; then
             npm test -- --reporter=default --reporter=json --outputFile="$RUNNER_TEMP/sdk-nodejs-results.json"
           else
             npm test
           fi
-      - name: Upload merge-queue Node.js test results
-        if: always() && github.event_name == 'merge_group' && runner.os == 'Linux'
+      - name: Upload Flake Finder Node.js test results
+        if: always() && (github.event_name == 'merge_group' || github.event_name == 'pull_request' || github.event_name == 'push')
         continue-on-error: true
         uses: actions/upload-artifact@v7
         with:
-          name: suspected-flakes-sdk-nodejs-${{ github.run_attempt }}-linux
+          name: suspected-flakes-sdk-nodejs-${{ github.run_attempt }}-${{ runner.os == 'macOS' && 'macos' || runner.os == 'Windows' && 'windows' || 'linux' }}
           path: ${{ runner.temp }}/sdk-nodejs-results.json
           if-no-files-found: warn
           retention-days: 7
@@ -109,6 +112,13 @@ jobs:
           COPILOT_HMAC_KEY: ${{ secrets.COPILOT_DEVELOPER_CLI_INTEGRATION_HMAC_KEY }}
           COPILOT_SDK_DEFAULT_CONNECTION: inprocess
         run: npm test -- test/e2e/inprocess_ffi.e2e.test.ts test/e2e/auth_host.e2e.test.ts
+      - name: Validate documentation examples
+        if: github.event_name != 'merge_group' && runner.os == 'Linux'
+        working-directory: ${{ inputs.sdk-home }}/scripts/docs-validation
+        run: |
+          npm ci
+          npm run extract
+          npm run validate:ts
 
   # Keep each BYOK backend on its own runner; shared runtime E2E coverage belongs
   # in TypeScript rather than repeating these sweeps across SDK languages.
@@ -116,7 +126,6 @@ jobs:
     name: "Node.js (ubuntu-latest, ${{ matrix.backend }})"
     if: github.event_name != 'merge_group' && (inputs.platform == 'all' || inputs.platform == 'linux-x64')
     runs-on: ubuntu-latest
-    timeout-minutes: 30
     strategy:
       fail-fast: false
       matrix:
@@ -129,7 +138,6 @@ jobs:
       COPILOT_SDK_E2E_BACKEND: ${{ matrix.backend }}
     steps:
       - uses: actions/checkout@v7
-        timeout-minutes: 4
         with:
           persist-credentials: false
       - uses: ./.github/actions/download-sdk-runtime
@@ -158,7 +166,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v7
-        timeout-minutes: 4
         with:
           persist-credentials: false
       - uses: ./.github/actions/download-sdk-runtime
@@ -197,24 +204,3 @@ jobs:
             npm test || status=$?
             COPILOT_SDK_DEFAULT_CONNECTION=inprocess npm test -- test/e2e/inprocess_ffi.e2e.test.ts test/e2e/auth_host.e2e.test.ts || status=$?
             exit "$status"
-
-  docs-typescript:
-    name: "Docs (TypeScript)"
-    if: inputs.platform == 'all' || inputs.platform == 'docs'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v7
-        timeout-minutes: 4
-        with:
-          persist-credentials: false
-      - uses: actions/setup-node@v6
-        with:
-          node-version: 22
-          cache: npm
-          cache-dependency-path: ${{ inputs.sdk-home }}/nodejs/package-lock.json
-      - run: npm ci --ignore-scripts
-        working-directory: ${{ inputs.sdk-home }}/nodejs
-      - run: npm ci
-        working-directory: ${{ inputs.sdk-home }}/scripts/docs-validation
-      - run: npm run extract && npm run validate:ts
-        working-directory: ${{ inputs.sdk-home }}/scripts/docs-validation
diff --git a/.github/workflows/sdk-platform.yml b/.github/workflows/sdk-platform.yml
index b21a9106fc..f1ed4e6ed4 100644
--- a/.github/workflows/sdk-platform.yml
+++ b/.github/workflows/sdk-platform.yml
@@ -16,6 +16,9 @@ on:
         description: "Node.js SDK result, independent of other languages"
         # Direct result outputs can be empty: https://github.com/actions/runner/issues/2495
         value: ${{ fromJSON(toJSON(jobs.nodejs)).result }}
+      nodejs-capi-result:
+        description: "Standard-platform Node.js CAPI result, independent of BYOK and other languages"
+        value: ${{ jobs.nodejs.outputs.capi-result }}
 
 permissions:
   contents: read
diff --git a/.github/workflows/sdk-python.yml b/.github/workflows/sdk-python.yml
index 71bedf2eaa..b2db80794b 100644
--- a/.github/workflows/sdk-python.yml
+++ b/.github/workflows/sdk-python.yml
@@ -7,7 +7,6 @@ env:
   HUSKY: 0
   POWERSHELL_UPDATECHECK: Off
   SDK_HOME: ${{ inputs.sdk-home }}
-  SETUP_NODE_TIMEOUT_MINUTES: 10
 
 on:
   workflow_call:
@@ -30,9 +29,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ${{ fromJSON(inputs.platform == 'linux-x64' && '["ubuntu-latest"]' || inputs.platform == 'darwin-arm64' && '["macos-latest"]' || inputs.platform == 'win32-x64' && '["windows-latest"]' || '["ubuntu-latest","macos-latest","windows-latest"]') }}
+        os: ${{ fromJSON(inputs.platform == 'linux-x64' && '["ubuntu-latest"]' || inputs.platform == 'darwin-arm64' && '["macos-26-agent-runtime"]' || inputs.platform == 'win32-x64' && '["windows-latest"]' || '["ubuntu-latest","macos-26-agent-runtime","windows-latest"]') }}
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 20
     defaults:
       run:
         shell: bash
@@ -41,7 +39,6 @@ jobs:
       PYTHONUTF8: 1
     steps:
       - uses: actions/checkout@v7
-        timeout-minutes: 4
         with:
           persist-credentials: false
       - uses: ./.github/actions/download-sdk-runtime
@@ -83,6 +80,14 @@ jobs:
           COPILOT_HMAC_KEY: ${{ secrets.COPILOT_DEVELOPER_CLI_INTEGRATION_HMAC_KEY }}
           COPILOT_SDK_DEFAULT_CONNECTION: inprocess
         run: uv run --locked pytest -v -s e2e/test_inprocess_ffi_e2e.py e2e/test_auth_host_e2e.py
+      - name: Validate documentation examples
+        if: github.event_name != 'merge_group' && runner.os == 'Linux'
+        working-directory: ${{ inputs.sdk-home }}/scripts/docs-validation
+        run: |
+          npm ci
+          npm run extract
+          uv run --locked --python 3.12 --project "$GITHUB_WORKSPACE/$SDK_HOME/python" python3 -m mypy --version
+          uv run --locked --python 3.12 --project "$GITHUB_WORKSPACE/$SDK_HOME/python" npm run validate:py
       - name: Upload Python test diagnostics
         if: failure()
         uses: actions/upload-artifact@v7
@@ -97,10 +102,8 @@ jobs:
     name: "Python (Alpine x64)"
     if: inputs.platform == 'all' || inputs.platform == 'linuxmusl-x64'
     runs-on: ubuntu-latest
-    timeout-minutes: 20
     steps:
       - uses: actions/checkout@v7
-        timeout-minutes: 4
         with:
           persist-credentials: false
       - uses: ./.github/actions/download-sdk-runtime
@@ -149,29 +152,3 @@ jobs:
           include-hidden-files: true
           if-no-files-found: warn
           retention-days: 7
-
-  docs-python:
-    name: "Docs (Python)"
-    if: inputs.platform == 'all' || inputs.platform == 'docs'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v7
-        timeout-minutes: 4
-        with:
-          persist-credentials: false
-      - uses: actions/setup-node@v6
-        with:
-          node-version: 22
-      - uses: actions/setup-python@v6
-        with:
-          python-version: "3.12"
-      - uses: astral-sh/setup-uv@v7
-      - run: uv sync --locked
-        working-directory: ${{ inputs.sdk-home }}/python
-      - run: npm ci
-        working-directory: ${{ inputs.sdk-home }}/scripts/docs-validation
-      - run: npm run extract
-        working-directory: ${{ inputs.sdk-home }}/scripts/docs-validation
-      - run: uv run --locked --project "$GITHUB_WORKSPACE/$SDK_HOME/python" python3 -m mypy --version
-      - run: uv run --locked --project "$GITHUB_WORKSPACE/$SDK_HOME/python" npm run validate:py
-        working-directory: ${{ inputs.sdk-home }}/scripts/docs-validation
diff --git a/.github/workflows/sdk-runtime-artifact.yml b/.github/workflows/sdk-runtime-artifact.yml
index 0481e945ae..51c226b429 100644
--- a/.github/workflows/sdk-runtime-artifact.yml
+++ b/.github/workflows/sdk-runtime-artifact.yml
@@ -11,7 +11,6 @@ env:
   GIT_HTTP_LOW_SPEED_LIMIT: 1000
   GIT_HTTP_LOW_SPEED_TIME: 60
   HUSKY: 0
-  SETUP_NODE_TIMEOUT_MINUTES: 10
 
 on:
   workflow_call:
@@ -47,10 +46,6 @@ on:
         required: false
         default: ""
         type: string
-      timeout-minutes:
-        required: false
-        default: 90
-        type: number
 
 permissions:
   contents: read
@@ -63,7 +58,6 @@ jobs:
   cache-relay:
     if: inputs.runtime-source == 'checkout'
     runs-on: ubuntu-slim
-    timeout-minutes: 15
     permissions:
       actions: read
       contents: read
@@ -71,7 +65,7 @@ jobs:
       cache-hit: ${{ steps.cache.outputs.cache-hit }}
     steps:
       - uses: actions/checkout@v7
-        timeout-minutes: 4
+        timeout-minutes: 60
         with:
           persist-credentials: false
 
@@ -144,7 +138,6 @@ jobs:
       (inputs.runtime-source == 'published' ||
        (needs.cache-relay.result == 'success' && needs.cache-relay.outputs.cache-hit != 'true'))
     runs-on: ${{ inputs.runtime-source == 'checkout' && inputs.os || 'ubuntu-latest' }}
-    timeout-minutes: ${{ inputs.timeout-minutes }}
     permissions:
       actions: read
       contents: read
@@ -152,7 +145,7 @@ jobs:
       packages: read
     steps:
       - uses: actions/checkout@v7
-        timeout-minutes: 4
+        timeout-minutes: 60
         with:
           persist-credentials: false
 
@@ -197,7 +190,7 @@ jobs:
 
       - if: inputs.runtime-source == 'checkout' && steps.cache.outputs.cache-hit != 'true'
         uses: ./.github/actions/setup-node
-        timeout-minutes: ${{ fromJSON(env.SETUP_NODE_TIMEOUT_MINUTES) }}
+        timeout-minutes: 60
 
       - name: Capture verified addon source identity
         if: inputs.runtime-source == 'checkout' && steps.cache.outputs.cache-hit != 'true'
diff --git a/.github/workflows/sdk-rust.yml b/.github/workflows/sdk-rust.yml
index 5ab3134139..902ae8ed11 100644
--- a/.github/workflows/sdk-rust.yml
+++ b/.github/workflows/sdk-rust.yml
@@ -7,7 +7,6 @@ env:
   HUSKY: 0
   POWERSHELL_UPDATECHECK: Off
   SDK_HOME: ${{ inputs.sdk-home }}
-  SETUP_NODE_TIMEOUT_MINUTES: 10
 
 on:
   workflow_call:
@@ -27,11 +26,10 @@ jobs:
   rust:
     name: "Rust (${{ matrix.os }})"
     if: contains(fromJSON('["all","linux-x64","darwin-arm64","win32-x64"]'), inputs.platform)
-    timeout-minutes: 60
     strategy:
       fail-fast: false
       matrix:
-        os: ${{ fromJSON(inputs.platform == 'linux-x64' && '["ubuntu-latest"]' || inputs.platform == 'darwin-arm64' && '["macos-latest"]' || inputs.platform == 'win32-x64' && '["windows-latest"]' || '["ubuntu-latest","macos-latest","windows-latest"]') }}
+        os: ${{ fromJSON(inputs.platform == 'linux-x64' && '["ubuntu-latest"]' || inputs.platform == 'darwin-arm64' && '["macos-26-xlarge-agent-runtime"]' || inputs.platform == 'win32-x64' && '["windows-latest"]' || '["ubuntu-latest","macos-26-xlarge-agent-runtime","windows-latest"]') }}
     runs-on: ${{ matrix.os }}
     defaults:
       run:
@@ -40,9 +38,11 @@ jobs:
     env:
       CARGO_TERM_COLOR: always
       RUST_BACKTRACE: 1
+      # Preserve source-line backtraces without full variable/type debug information.
+      CARGO_PROFILE_DEV_DEBUG: line-tables-only
+      CARGO_PROFILE_TEST_DEBUG: line-tables-only
     steps:
       - uses: actions/checkout@v7
-        timeout-minutes: 4
         with:
           persist-credentials: false
       - uses: ./.github/actions/download-sdk-runtime
@@ -106,7 +106,7 @@ jobs:
 
       - name: Test in-process smoke
         id: inprocess
-        if: ${{ !cancelled() && runner.os != 'Windows' && (steps.subprocess.outcome == 'success' || steps.subprocess.outcome == 'failure') }}
+        if: ${{ !cancelled() && (steps.subprocess.outcome == 'success' || steps.subprocess.outcome == 'failure') }}
         env:
           COPILOT_HMAC_KEY: ${{ secrets.COPILOT_DEVELOPER_CLI_INTEGRATION_HMAC_KEY }}
           COPILOT_SDK_DEFAULT_CONNECTION: inprocess
@@ -128,10 +128,8 @@ jobs:
     name: "Rust (Alpine x64)"
     if: inputs.platform == 'all' || inputs.platform == 'linuxmusl-x64'
     runs-on: ubuntu-latest
-    timeout-minutes: 60
     steps:
       - uses: actions/checkout@v7
-        timeout-minutes: 4
         with:
           persist-credentials: false
       - uses: ./.github/actions/download-sdk-runtime
diff --git a/.github/workflows/sdk.yml b/.github/workflows/sdk.yml
index b6314e62f6..852163ec93 100644
--- a/.github/workflows/sdk.yml
+++ b/.github/workflows/sdk.yml
@@ -9,7 +9,6 @@ env:
   COPILOT_BAZEL_ANG_PR_SAMPLED_MODE: ${{ vars.COPILOT_BAZEL_ANG_PR_SAMPLED_MODE }}
   HUSKY: 0
   POWERSHELL_UPDATECHECK: Off
-  SETUP_NODE_TIMEOUT_MINUTES: 10
 
 on:
   pull_request:
@@ -27,17 +26,163 @@ permissions:
   contents: read
 
 jobs:
+  detect-sdk-changes:
+    name: "Detect SDK-impacting changes"
+    runs-on: ubuntu-slim
+    outputs:
+      has_sdk_changes: ${{ steps.full-coverage.outputs.has_sdk_changes || steps.classify.outputs.has_sdk_changes || steps.recover.outputs.has_sdk_changes }}
+    steps:
+      - name: Require full coverage outside pull requests
+        id: full-coverage
+        if: github.event_name != 'pull_request'
+        run: echo "has_sdk_changes=true" >> "$GITHUB_OUTPUT"
+
+      - uses: actions/checkout@v7
+        id: checkout
+        if: github.event_name == 'pull_request'
+        continue-on-error: true
+        with:
+          # Include the synthetic merge commit's base parent without fetching
+          # repository history.
+          fetch-depth: 2
+          persist-credentials: false
+
+      - name: Detect repository layout
+        id: repository-layout
+        if: steps.checkout.outcome == 'success'
+        continue-on-error: true
+        run: |
+          trusted_revision="$(git rev-parse "$GITHUB_SHA^1")"
+          echo "base-sha=$trusted_revision" >> "$GITHUB_OUTPUT"
+          if git cat-file -e "${trusted_revision}:src/sdk/package.json" 2>/dev/null &&
+             git cat-file -e "${trusted_revision}:script/sea-build.ts" 2>/dev/null; then
+            echo "layout=runtime" >> "$GITHUB_OUTPUT"
+          elif git cat-file -e "${trusted_revision}:package.json" 2>/dev/null &&
+               git cat-file -e "${trusted_revision}:nodejs/package.json" 2>/dev/null; then
+            echo "layout=standalone" >> "$GITHUB_OUTPUT"
+          else
+            echo "::warning::Unable to identify the SDK repository layout; requiring full coverage."
+            exit 1
+          fi
+
+      - name: Find SDK-impacting paths
+        id: filter
+        if: steps.repository-layout.outcome == 'success'
+        continue-on-error: true
+        uses: tj-actions/changed-files@9426d40962ed5378910ee2e21d5f8c6fcbf2dd96 # v47.0.6
+        with:
+          base_sha: ${{ steps.repository-layout.outputs.base-sha }}
+          sha: ${{ github.sha }}
+          skip_initial_fetch: true
+          fail_on_initial_diff_error: true
+          quotepath: false
+          files_yaml: |
+            runtime:
+              - .github/actions/**
+              - .github/workflows/sdk*.yml
+              - .github/workflows/sdk*.yaml
+              - .github/workflows/shared-cli-build.yml
+              - .github/workflows/publish.yml
+              - .editorconfig
+              - .gitattributes
+              - .nvmrc
+              - package.json
+              - package-lock.json
+              - pnpm-lock.yaml
+              - sdk-protocol-version.json
+              - assets/**
+              - BUILD.bazel
+              - src/**
+              - generated/**
+              - schema/**
+              - files/**
+              - third_party/**
+              - patches/**
+              - tools/bazel/**
+              - .cargo/**
+              - bazel/**
+              - script/**
+              - .bazelignore
+              - .bazelrc
+              - .bazelversion
+              - Cargo.lock
+              - Cargo.toml
+              - MODULE.bazel
+              - MODULE.bazel.lock
+              - pnpm-workspace.yaml
+              - rust-toolchain.toml
+              - esbuild.ts
+              - tsconfig*.json
+            standalone:
+              - .github/actions/**
+              - .github/workflows/sdk*.yml
+              - .github/workflows/sdk*.yaml
+              - .github/workflows/shared-cli-build.yml
+              - .github/workflows/publish.yml
+              - .editorconfig
+              - .gitattributes
+              - .nvmrc
+              - package.json
+              - package-lock.json
+              - pnpm-lock.yaml
+              - sdk-protocol-version.json
+              - assets/**
+              - BUILD.bazel
+              - nodejs/**
+              - python/**
+              - go/**
+              - dotnet/**
+              - java/**
+              - rust/**
+              - scripts/**
+              - samples/**
+              - test/**
+              - docs/**
+              - README.md
+              - vitest.config.ts
+
+      - name: Select layout-specific result
+        id: classify
+        if: steps.filter.outcome == 'success'
+        env:
+          LAYOUT: ${{ steps.repository-layout.outputs.layout }}
+          RUNTIME_CHANGED: ${{ steps.filter.outputs.runtime_any_modified }}
+          STANDALONE_CHANGED: ${{ steps.filter.outputs.standalone_any_modified }}
+        run: |
+          if [[ "$LAYOUT" == "runtime" ]]; then
+            has_sdk_changes="$RUNTIME_CHANGED"
+          elif [[ "$LAYOUT" == "standalone" ]]; then
+            has_sdk_changes="$STANDALONE_CHANGED"
+          else
+            exit 1
+          fi
+          echo "has_sdk_changes=$has_sdk_changes" >> "$GITHUB_OUTPUT"
+
+      - name: Require full coverage after detection errors
+        id: recover
+        if: github.event_name == 'pull_request' && (steps.checkout.outcome != 'success' || steps.repository-layout.outcome != 'success' || steps.filter.outcome != 'success' || steps.classify.outcome != 'success')
+        run: |
+          echo "::warning::SDK change detection failed; requiring full coverage."
+          echo "has_sdk_changes=true" >> "$GITHUB_OUTPUT"
+
   detect-layout:
     name: "Detect SDK layout"
+    needs: detect-sdk-changes
+    if: ${{ !cancelled() && (needs.detect-sdk-changes.result != 'success' || needs.detect-sdk-changes.outputs.has_sdk_changes == 'true') }}
     runs-on: ubuntu-latest
     outputs:
       runtime-source: ${{ steps.detect.outputs.runtime-source }}
       sdk-home: ${{ steps.detect.outputs.sdk-home }}
     steps:
       - uses: actions/checkout@v7
-        timeout-minutes: 4
         with:
           persist-credentials: false
+          sparse-checkout: |
+            /src/sdk/package.json
+            /script/sea-build.ts
+            /package.json
+            /nodejs/package.json
+          sparse-checkout-cone-mode: false
       - id: detect
         run: |
           if [[ -f src/sdk/package.json && -f script/sea-build.ts ]]; then
@@ -60,7 +205,6 @@ jobs:
     needs: detect-layout
     if: github.event_name != 'merge_group' && needs.detect-layout.outputs.runtime-source == 'checkout'
     runs-on: ubuntu-latest-xl
-    timeout-minutes: 60
     concurrency:
       group: windows-x64-addons-release-windows-e2e-no-icf-${{ github.sha }}
       queue: max
@@ -70,7 +214,6 @@ jobs:
       packages: read
     steps:
       - uses: actions/checkout@v7
-        timeout-minutes: 4
         with:
           persist-credentials: false
 
@@ -100,7 +243,7 @@ jobs:
 
       - uses: ./.github/actions/setup-node
         if: steps.cache.outputs.cache-hit != 'true'
-        timeout-minutes: ${{ fromJSON(env.SETUP_NODE_TIMEOUT_MINUTES) }}
+        timeout-minutes: 60
       - uses: ./.github/actions/setup-bazel
         if: steps.cache.outputs.cache-hit != 'true'
         with:
@@ -210,7 +353,6 @@ jobs:
       artifact: Linux-X64-gnu
       bazel-config: e2e-no-lto
       shared-cli-build-compatible: true
-      timeout-minutes: 60
     secrets: inherit
 
   build-runtime-linuxmusl-x64:
@@ -230,7 +372,25 @@ jobs:
       target: linuxmusl-x64
       artifact: Linux-X64-musl
       bazel-config: e2e-no-lto
-      timeout-minutes: 60
+    secrets: inherit
+
+  build-runtime-linuxmusl-arm64:
+    name: "Build runtime (linuxmusl-arm64)"
+    needs: detect-layout
+    if: github.event_name != 'merge_group'
+    permissions:
+      actions: read
+      contents: read
+      id-token: write
+      packages: read
+    uses: ./.github/workflows/sdk-runtime-artifact.yml
+    with:
+      runtime-source: ${{ needs.detect-layout.outputs.runtime-source }}
+      sdk-home: ${{ needs.detect-layout.outputs.sdk-home }}
+      os: ubuntu-latest-xl
+      target: linuxmusl-arm64
+      artifact: Linux-ARM64-musl
+      bazel-config: e2e-no-lto
     secrets: inherit
 
   build-runtime-darwin-arm64:
@@ -246,13 +406,12 @@ jobs:
     with:
       runtime-source: ${{ needs.detect-layout.outputs.runtime-source }}
       sdk-home: ${{ needs.detect-layout.outputs.sdk-home }}
-      os: macos-latest-xlarge
+      os: macos-26-xlarge-agent-runtime
       target: darwin-arm64
       artifact: macOS-ARM64
       bazel-config: e2e-no-lto
       use-bazel-addons-on-darwin: true
       shared-cli-build-compatible: true
-      timeout-minutes: 60
     secrets: inherit
 
   build-runtime-win32-x64:
@@ -274,7 +433,6 @@ jobs:
       bazel-config: windows-e2e-no-icf
       shared-cli-build-compatible: true
       prebuilt-addons-artifact: ${{ needs.detect-layout.outputs.runtime-source == 'checkout' && 'sdk-bazel-cross-addons-win32-x64-release' || '' }}
-      timeout-minutes: 60
     secrets: inherit
 
   sdk-linux-x64:
@@ -296,6 +454,16 @@ jobs:
       sdk-home: ${{ needs.detect-layout.outputs.sdk-home }}
     secrets: inherit
 
+  sdk-linuxmusl-arm64:
+    name: "Linux musl ARM64 (Java)"
+    needs: [detect-layout, build-runtime-linuxmusl-arm64]
+    if: github.event_name != 'merge_group'
+    uses: ./.github/workflows/sdk-java.yml
+    with:
+      platform: linuxmusl-arm64
+      sdk-home: ${{ needs.detect-layout.outputs.sdk-home }}
+    secrets: inherit
+
   sdk-darwin-arm64:
     name: "macOS ARM64"
     needs: [detect-layout, build-runtime-darwin-arm64]
@@ -317,40 +485,35 @@ jobs:
       sdk-home: ${{ needs.detect-layout.outputs.sdk-home }}
     secrets: inherit
 
-  sdk-docs:
-    name: "Documentation"
-    needs: detect-layout
-    if: github.event_name != 'merge_group'
-    uses: ./.github/workflows/sdk-platform.yml
-    with:
-      platform: docs
-      sdk-home: ${{ needs.detect-layout.outputs.sdk-home }}
-    secrets: inherit
-
+  # Only Linux CAPI gates this rollup; the full SDK aggregate still reports all coverage.
   sdk-typescript:
     name: sdk-typescript
     if: always()
-    needs: [sdk-linux-x64, sdk-linuxmusl-x64, sdk-darwin-arm64, sdk-win32-x64]
+    needs: [detect-sdk-changes, sdk-linux-x64]
     runs-on: ubuntu-slim
     steps:
-      - name: Check Node.js SDK results
+      - name: Check Linux CAPI Node.js SDK result
         env:
+          DETECT_RESULT: ${{ needs.detect-sdk-changes.result }}
           EVENT_NAME: ${{ github.event_name }}
+          HAS_SDK_CHANGES: ${{ needs.detect-sdk-changes.outputs.has_sdk_changes }}
           RESULTS: ${{ toJSON(needs) }}
         run: |
-          for job in sdk-linux-x64 sdk-linuxmusl-x64 sdk-darwin-arm64 sdk-win32-x64; do
-            expected=success
-            result=$(jq -r --arg job "$job" '.[$job].outputs["nodejs-result"]' <<< "$RESULTS")
-            # TEMPORARY MERGE QUEUE REDUCTION: only Linux x64 runs in merge groups.
-            if [[ "$EVENT_NAME" == "merge_group" && "$job" != "sdk-linux-x64" ]]; then
-              expected=skipped
-              result=$(jq -r --arg job "$job" '.[$job].result' <<< "$RESULTS")
-            fi
-            if [[ "$result" != "$expected" ]]; then
-              echo "::error::Node.js SDK job $job: expected $expected, got $result"
+          linux_result=$(jq -r '.["sdk-linux-x64"].result' <<< "$RESULTS")
+          if [[ "$EVENT_NAME" == "pull_request" && "$DETECT_RESULT" == "success" && "$HAS_SDK_CHANGES" == "false" ]]; then
+            if [[ "$linux_result" != "skipped" ]]; then
+              echo "::error::Non-SDK pull request did not skip sdk-linux-x64: $linux_result"
               exit 1
             fi
-          done
+            echo "No SDK-impacting changes; Linux CAPI Node.js SDK job skipped"
+            exit 0
+          fi
+
+          result=$(jq -r '.["sdk-linux-x64"].outputs["nodejs-capi-result"]' <<< "$RESULTS")
+          if [[ "$result" != "success" ]]; then
+            echo "::error::Linux CAPI Node.js SDK job: expected success, got $result"
+            exit 1
+          fi
 
   check-freshness:
     name: "Check schema and SDK freshness"
@@ -361,13 +524,34 @@ jobs:
       id-token: write
     steps:
       - uses: actions/checkout@v7
-        timeout-minutes: 10
         with:
           persist-credentials: false
-          fetch-depth: 0
+          fetch-depth: ${{ github.event_name == 'pull_request' && 2 || 1 }}
+      - name: Fetch generation comparison baseline
+        if: needs.detect-layout.outputs.runtime-source == 'checkout' && (github.event_name == 'merge_group' || github.event_name == 'push')
+        env:
+          BASELINE_SHA: ${{ github.event.merge_group.base_sha || github.event.before }}
+          CHECKOUT_TOKEN: ${{ github.token }}
+        run: |
+          set -euo pipefail
+          if [[ "$GITHUB_EVENT_NAME" == "push" && "$BASELINE_SHA" =~ ^0+$ ]]; then
+            echo "New branch push has no generation baseline; checking all projections."
+            exit 0
+          fi
+          if [[ ! "$BASELINE_SHA" =~ ^[0-9a-fA-F]{40}$ ]]; then
+            echo "::error::Missing or invalid SDK generation baseline SHA."
+            exit 1
+          fi
+          if git cat-file -e "$BASELINE_SHA^{commit}" 2>/dev/null; then
+            exit 0
+          fi
+          auth_header="$(printf 'x-access-token:%s' "$CHECKOUT_TOKEN" | base64 | tr -d '\n')"
+          GIT_CONFIG_COUNT=1 \
+          GIT_CONFIG_KEY_0=http.https://github.com/.extraheader \
+          GIT_CONFIG_VALUE_0="AUTHORIZATION: basic $auth_header" \
+            git fetch --no-tags --depth=1 origin "$BASELINE_SHA"
       - if: needs.detect-layout.outputs.runtime-source == 'checkout'
         uses: ./.github/actions/setup-node
-        timeout-minutes: ${{ fromJSON(env.SETUP_NODE_TIMEOUT_MINUTES) }}
         with:
           install-deps: "false"
       - if: needs.detect-layout.outputs.runtime-source == 'checkout'
@@ -433,26 +617,45 @@ jobs:
     name: "SDK"
     if: always()
     needs:
+      - detect-sdk-changes
       - build-runtime-windows-x64-addons
       - build-runtime-linux-x64
       - build-runtime-linuxmusl-x64
+      - build-runtime-linuxmusl-arm64
       - build-runtime-darwin-arm64
       - build-runtime-win32-x64
       - detect-layout
       - sdk-linux-x64
       - sdk-linuxmusl-x64
+      - sdk-linuxmusl-arm64
       - sdk-darwin-arm64
       - sdk-win32-x64
-      - sdk-docs
       - check-freshness
     runs-on: ubuntu-slim
     steps:
       - name: Check SDK results
         env:
+          DETECT_RESULT: ${{ needs.detect-sdk-changes.result }}
           EVENT_NAME: ${{ github.event_name }}
+          HAS_SDK_CHANGES: ${{ needs.detect-sdk-changes.outputs.has_sdk_changes }}
           RESULTS: ${{ toJSON(needs) }}
           RUNTIME_SOURCE: ${{ needs.detect-layout.outputs.runtime-source }}
         run: |
+          if [[ "$EVENT_NAME" == "pull_request" && "$DETECT_RESULT" == "success" && "$HAS_SDK_CHANGES" == "false" ]]; then
+            unexpected=$(jq -r '
+              to_entries[]
+              | select(.key != "detect-sdk-changes" and .value.result != "skipped")
+              | "\(.key): \(.value.result)"
+            ' <<< "$RESULTS")
+            if [[ -n "$unexpected" ]]; then
+              echo "::error::Non-SDK pull request did not skip all SDK jobs:"
+              echo "$unexpected"
+              exit 1
+            fi
+            echo "No SDK-impacting changes; SDK build and test matrix skipped"
+            exit 0
+          fi
+
           # TEMPORARY MERGE QUEUE REDUCTION: keep this branch aligned with the
           # gated jobs above until the full merge-group matrix is restored.
           if [[ "$EVENT_NAME" == "merge_group" ]]; then
@@ -465,12 +668,13 @@ jobs:
             skipped_jobs=(
               build-runtime-windows-x64-addons
               build-runtime-linuxmusl-x64
+              build-runtime-linuxmusl-arm64
               build-runtime-darwin-arm64
               build-runtime-win32-x64
               sdk-linuxmusl-x64
+              sdk-linuxmusl-arm64
               sdk-darwin-arm64
               sdk-win32-x64
-              sdk-docs
             )
             for job in "${required_jobs[@]}"; do
               if [[ "$(jq -r --arg job "$job" '.[$job].result' <<< "$RESULTS")" != "success" ]]; then
@@ -501,6 +705,7 @@ jobs:
           failures=$(jq -r --arg runtime_source "$RUNTIME_SOURCE" '
             to_entries[]
             | select(.value.result != "success")
+            | select(.key != "detect-sdk-changes")
             | select(
                 $runtime_source != "published"
                 or .key != "build-runtime-windows-x64-addons"
diff --git a/BUILD.bazel b/BUILD.bazel
index e25b8ef8e3..b9465c7090 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -1,9 +1,15 @@
+exports_files(
+    ["test/harness/sdk-diagnostics.mjs"],
+    visibility = ["//src/runtime-bin:__pkg__"],
+)
+
 SHARED_CODEGEN_INPUTS = [
     "nodejs/scripts/releaseArtifacts.ts",
     "nodejs/src/cliVersion.ts",
     "scripts/codegen/legacy-parameters.ts",
     "scripts/codegen/package-lock.json",
     "scripts/codegen/package.json",
+    "scripts/codegen/extensible-enums.ts",
     "scripts/codegen/utils.ts",
     "scripts/runtime-layout.mjs",
     "scripts/runtime-release.mjs",
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 9e64a0bb04..6513793b66 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -316,7 +316,12 @@ additional feature/acquisition choices documented in [rust/AGENTS.md](rust/AGENT
 
 ### Documentation checks
 
-API snippet validation is separate from SDK tests. From the SDK root:
+[SDK CI](.github/workflows/sdk.yml) validates Node.js, Python, Go, .NET, and Java
+API snippets after successful tests in their standard Linux jobs (JDK 25 for Java).
+These checks run on pull requests, pushes to `main`, and manual workflow runs,
+but not merge groups. A documentation failure fails the corresponding language job.
+
+To validate snippets without running SDK tests, run these commands from the SDK root:
 
 ```bash
 npm --prefix scripts/docs-validation ci
@@ -327,8 +332,15 @@ uv run --locked --project python npm run docs:python
 ```
 
 This extracts and validates snippets for Node.js, Python, Go, .NET, or Java.
-Java's current docs validator calls `mvn` directly,
-so this task also needs Maven 3.9+ on PATH. There is no `docs:rust` facade;
+`docs:java` installs the SDK once through its Maven wrapper, with tests, replay
+harness setup, and native downloads disabled, then compiles the snippets using
+the same wrapper. CI supplies that installation in its existing post-test step;
+the validator does not reinstall it. A separate Maven installation is not required.
+Java validation also compiles the exact [README Quick Start](java/README.md#quick-start).
+The regular Maven integration suite checks a standalone consumer JAR with a manifest
+classpath and runtime dependencies, without a live model, credentials, or native runtime.
+These checks replace the former agent-driven Java smoke workflow.
+There is no `docs:rust` facade;
 follow [the Rust SDK workflow](.github/workflows/sdk-rust.yml) for rustdoc.
 
 ### Recording and replaying SDK tests
@@ -344,12 +356,18 @@ For TypeScript SDK E2Es, use the existing
 `nodejs/test/e2e/harness/sdkTestContext.ts` fixture. In the runtime repository,
 also follow the `e2e-test-author` skill's SDK section.
 
-SDK CI runs full subprocess coverage followed by a short in-process smoke
-step on the same runner wherever both modes share a platform. Smoke still
-runs if the subprocess tests fail, and either failure fails the job. Java's
-macOS, Windows, and musl smoke jobs remain separate because they have no
-matching subprocess job. Merge groups retain the reduced Linux TypeScript
-CAPI subprocess coverage.
+All SDKs run full subprocess coverage and in-process smoke on Linux/glibc
+x64, macOS ARM64, Windows x64, and Linux/musl x64. Windows .NET uses complementary
+jobs per framework. Smoke also runs after subprocess failures; either failure
+fails the job. Java uses JDK 25 on these platforms,
+plus a Linux/glibc JDK 17 compatibility job using precompiled classes.
+Merge groups retain the reduced Linux TypeScript CAPI subprocess coverage.
+
+The `sdk-typescript` required rollup checks only the Linux CAPI job, including
+its build, packaging, and applicable static checks. Other platforms, BYOK
+backends, and languages keep their existing scheduling and failure reporting;
+they do not gate this rollup. The full `SDK` aggregate still requires all
+scheduled coverage to succeed.
 
 The three BYOK backend sweeps run in separate Linux TypeScript jobs, alongside
 the normal CAPI job; they do not repeat unit tests, packaging, or static
@@ -390,6 +408,12 @@ failed-startup cleanup. Keep those lifecycle expectations aligned when changing
 an SDK transport; test watchdogs must allow all cleanup phases their separate
 budgets, rather than treating the graceful-exit timeout as a total shutdown cap.
 
+Java also exercises the opt-in `shutdown-error` mode. It rejects
+`runtime.shutdown`, writes `<cleanup-marker>.eof` when stdin closes, and holds
+cleanup-marker creation and process exit until the test creates
+`<cleanup-marker>.release`. This handshake verifies that a failed shutdown RPC
+still allows EOF-driven finalization before forced cleanup.
+
 The shared harness records real inference responses under `test/snapshots`.
 Record new captures with `GITHUB_TOKEN` set and `GITHUB_ACTIONS` unset;
 never author model responses by hand. Rerun with `GITHUB_ACTIONS=true` and real
diff --git a/docs/developer-docs/secrets.md b/docs/developer-docs/secrets.md
index 1218f96254..b09ddd213c 100644
--- a/docs/developer-docs/secrets.md
+++ b/docs/developer-docs/secrets.md
@@ -17,7 +17,7 @@ These secrets are used by the authoritative SDK build/test workflow.
 These secrets power the GitHub Agentic Workflows (gh-aw) used for issue triage, code generation, and release automation.
 
 * **`COPILOT_GITHUB_TOKEN`**: GitHub OAuth token consumed by the Copilot CLI for AI authentication. Required by all agentic workflows when invoking `copilot` for AI inference.
-  * Workflows: `issue-triage.lock.yml`, `issue-classification.lock.yml`, `handle-bug.lock.yml`, `handle-enhancement.lock.yml`, `handle-question.lock.yml`, `handle-documentation.lock.yml`, `java-codegen-check.yml`, `java-codegen-fix.lock.yml`, `java-smoke-test.yml`, `java-adapt-handwritten-code-to-accept-upgrade-changes.lock.yml`, `release-changelog.lock.yml`, `cross-repo-issue-analysis.lock.yml`
+  * Workflows: `issue-triage.lock.yml`, `issue-classification.lock.yml`, `handle-bug.lock.yml`, `handle-enhancement.lock.yml`, `handle-question.lock.yml`, `handle-documentation.lock.yml`, `java-codegen-check.yml`, `java-codegen-fix.lock.yml`, `java-adapt-handwritten-code-to-accept-upgrade-changes.lock.yml`, `release-changelog.lock.yml`, `cross-repo-issue-analysis.lock.yml`
 
 * **`GH_AW_GITHUB_TOKEN`**: Optional GitHub token override for repository operations (reading code, creating pull requests, and making GitHub API calls). If unset, workflows use the automatic `GITHUB_TOKEN`.
   * Workflows: `issue-triage.lock.yml`, `issue-classification.lock.yml`, `handle-bug.lock.yml`, `handle-enhancement.lock.yml`, `handle-question.lock.yml`, `handle-documentation.lock.yml`, `java-codegen-fix.lock.yml`, `java-adapt-handwritten-code-to-accept-upgrade-changes.lock.yml`, `release-changelog.lock.yml`, `cross-repo-issue-analysis.lock.yml`
diff --git a/docs/features/custom-agents.md b/docs/features/custom-agents.md
index 9e2f597688..965582a01b 100644
--- a/docs/features/custom-agents.md
+++ b/docs/features/custom-agents.md
@@ -25,6 +25,8 @@ flowchart TD
 
 ## Defining custom agents
 
+To discover Markdown definitions from versioned packages or vendored folders, use `agentDirectories` or [repository customization locations](./customization-locations.md).
+
 Pass `customAgents` when creating a session. Each agent needs at minimum a `name` and `prompt`.
 
 <details open>
diff --git a/docs/features/customization-locations.md b/docs/features/customization-locations.md
new file mode 100644
index 0000000000..703c5d5066
--- /dev/null
+++ b/docs/features/customization-locations.md
@@ -0,0 +1,55 @@
+<!-- Copyright (c) Microsoft Corporation. All rights reserved. -->
+
+# Customization discovery locations
+
+GitHub Copilot can discover versioned skills, agents, instructions, and file hooks directly from package installations, submodules, and vendored directories. You don't need to copy them into conventional directories.
+
+## Repository settings
+
+Declare checkout-relative directories in `.github/copilot/settings.json`:
+
+```json
+{
+  "skillDirectories": ["node_modules/@example/team/skills"],
+  "agentDirectories": ["vendor/team/agents"],
+  "instructionDirectories": ["vendor/team/instructions"],
+  "hookDirectories": ["vendor/team/hooks"]
+}
+```
+
+Each list adds discovery locations for its own customization type. Conventional locations continue to work. A key in `.github/copilot/settings.local.json` replaces only that repository list; an empty list removes its repository contribution. Omitted keys inherit the checked-in list. Repository lists don't replace SDK inputs or existing user skill directories.
+
+Repository paths must be nonempty, literal directories within the declaring checkout. Absolute paths, home or environment-variable expansion, globs, and escapes outside the checkout are rejected. Links and junctions are allowed only when their resolved roots and discovered descendants remain inside the checkout. A missing directory is reported and can be discovered after installation and an explicit customization reload. Copilot doesn't install packages or watch these directories.
+
+File content from repository-defined discovery locations is read through a validated, opened file handle. Retargeting a link outside the checkout between discovery and invocation doesn't authorize reading its new target.
+
+Repository locations require trust covering the declaring checkout root and remain subject to each customization type's existing discovery switches, disabled entries, and managed policy. Persisted trust for only a subdirectory doesn't authorize its parent checkout's settings. Listing a location doesn't enable a disabled customization type or grant filesystem access.
+
+In the CLI, remembered folder trust refreshes repository customizations in the current session, even if model catalog initialization failed. `/skills reload` also rechecks persisted trust and repository discovery settings.
+
+## SDK inputs
+
+Session creation, resume, and option updates accept the same four lists. TypeScript and Java use `skillDirectories`, `agentDirectories`, `instructionDirectories`, and `hookDirectories`. Python and Rust use snake case; Go and .NET use Pascal case.
+
+SDK directories can be outside the checkout. Leading and trailing whitespace is trimmed, and blank entries are ignored. Relative SDK paths resolve once against the request's effective working directory when supplied. Changing the working directory doesn't move retained SDK roots. Supplying a new relative list uses the new effective working directory. An empty list clears only the explicit SDK contribution; omission or `null` leaves it unchanged during an update.
+
+If adopting a `hookDirectories` replacement fails or is canceled before the new hook service takes ownership, the previous directory option and live hook service remain in place. Overlapping failed updates restore the retained value rather than another failed update's directories. A failed update doesn't roll back a newer accepted update.
+
+Explicit agent and file-hook directories don't require ambient configuration discovery. `enableFileHooks` controls repository-origin hooks, including conventional `.github/hooks`, but not explicit SDK hook directories or callback `hooks`. Managed restrictions and hook disables still apply.
+
+Directory inputs are discovery configuration, not general filesystem grants. They don't widen `additionalDirectories`. Existing file-hook sandbox rules remain in effect.
+
+Loading active local skills adds read-only grants for their contributing SDK skill directories under the runtime's skill-resource policy. Empty, ignored, and disabled skill sources don't add those grants. Repository-defined skill directories don't add them.
+
+## File formats and precedence
+
+| Type | Discovered content |
+| --- | --- |
+| Skills | A direct `SKILL.md` bundle or recursively discovered topmost bundles |
+| Agents | Existing Markdown agent definitions |
+| Repository instructions | Recursive `*.instructions.md` files, with existing frontmatter and `applyTo` matching |
+| Hooks | Existing hook JSON configurations |
+
+Repository instruction directories don't import package `AGENTS.md` hierarchies or `.claude/rules`. Existing SDK instruction-directory formats remain supported. Each subsystem preserves its existing source precedence. Overlapping hook file references are deduplicated; distinct authored actions aren't collapsed because their commands happen to match.
+
+File-backed command hooks receive `COPILOT_HOOK_DIR`, the directory containing their configuration file. Use it to locate adjacent scripts and resources. Hook working-directory semantics don't change: they remain anchored to the consuming workspace. `COPILOT_HOOK_DIR` is an execution environment variable, not JSON template expansion; `COPILOT_PLUGIN_ROOT` retains its separate plugin-root behavior. Inline hooks and SDK callbacks don't gain a fabricated configuration directory.
diff --git a/docs/features/hooks.md b/docs/features/hooks.md
index a3cfc0f503..b0cd89d6e9 100644
--- a/docs/features/hooks.md
+++ b/docs/features/hooks.md
@@ -35,6 +35,55 @@ All hooks are **optional**—register only the ones you need. Returning `null` (
 
 ## Registering hooks
 
+Callback `hooks` remain separate from file-backed `hookDirectories`. For packaged hook configurations and adjacent resources, see [customization discovery locations](./customization-locations.md).
+
+### Agent-scoped declarative hooks
+
+Custom agents can declare a `hooks` event map in `.agent.md` frontmatter or in
+the SDK's custom-agent configuration. These are declarative command or HTTP
+actions, not SDK callback functions. They run only while that agent is selected,
+in addition to applicable session, user, repository, plugin, and managed-policy
+hooks. Changing or clearing the selected agent changes the scoped hooks for the
+next invocation without changing other sessions or concurrent subagents.
+
+```yaml
+---
+name: formatter
+description: Formats changed files
+hooks:
+  PostToolUse:
+    - type: command
+      command: ./scripts/format-changed-files.sh
+      windows: ./scripts/format-changed-files.ps1
+---
+Format the files you change.
+```
+
+Both runtime event names such as `postToolUse` and supported VS Code aliases
+such as `PostToolUse` are accepted. `command` supplies the fallback shell command;
+`windows`, `linux`, and `osx` override it on the corresponding platform. Hook
+commands are relative to the executing session's repository root, unless they
+set an explicit working directory. Hook payloads and decisions follow the
+runtime's existing hook contracts.
+
+When a local agent runs as a subagent, its scoped `Stop` (`agentStop`) actions
+run at `SubagentStop` instead of ordinary turn stop. An explicit `SubagentStop`
+action on that agent still observes its own children. Stop callbacks receive
+`stop_hook_active: true` after a prior block. After eight consecutive scoped
+Stop continuations, the runtime ignores further scoped blocks and accepts the
+child's final response unless a parent lifecycle hook still blocks completion.
+
+Repository and inherited-agent hooks require workspace admission. Agent
+discovery or selection does not itself grant trust. Existing hook-disable
+settings, enterprise restrictions, sandbox permissions, and timeouts also apply
+to scoped actions. SDK-provided agents cannot claim managed-plugin privileges.
+Remote or organization-hosted agent definitions do not execute scoped hooks,
+and scoped Stop dispatch is supported for local runtime subagents, not external
+AHP participants.
+
+Unsupported event names are reported before event selection. Action preparation
+errors affect only their declared event; shared and managed-policy hooks still run.
+
 Pass a `hooks` object when you create (or resume) a session. Every example below follows this pattern.
 
 <details open>
diff --git a/docs/features/mcp.md b/docs/features/mcp.md
index cf3003ce8c..1c93c82710 100644
--- a/docs/features/mcp.md
+++ b/docs/features/mcp.md
@@ -26,6 +26,44 @@ The SDK supports two types of MCP servers:
 
 ## Configuration
 
+### Inspect configuration and lifecycle
+
+`session.rpc.mcp.listConfigured()` is a parameterless, passive inventory read.
+It does not start or restart servers, authenticate, apply sandbox policy, or
+wait for server startup. Configuration discovery and policy filtering determine
+which servers appear and their `enabled` values.
+
+This experimental RPC requires an aligned SDK/runtime release. Its earlier
+prerelease response allowed `live` to be omitted; SDKs using the required
+lifecycle contract do not support that older response shape. When supplying
+an external runtime, update it alongside the SDK. The overall protocol version
+is unchanged and does not identify this experimental contract revision.
+
+Every entry includes `live.status`. A configured server with no materialized
+runtime server reports the existing `not_configured` status, even when
+`enabled` is `true`. A runtime server that was explicitly stopped reports
+`stopped`. Materialized servers report their actual lifecycle, including
+`pending`, `connected`, `needs-auth`, and `failed`; failures include `live.error`
+when available.
+
+Configuration and lifecycle describe different facts. If a server's URL,
+authentication, or configuration source changes while an old connection remains
+alive, inventory still reports that connection's actual lifecycle. A
+`connected` status does not mean the latest configuration has been applied.
+The runtime owns this observation; clients must not substitute cached state
+based only on the server name.
+
+Inventory retries concurrent graph replacement a bounded number of times and
+returns an error if it cannot obtain a consistent snapshot. It never omits
+`live` to hide a graph race.
+
+A name-only `startServer` or `restartServer` resolves and initializes only the
+requested server after a cold session resume without first calling `list`.
+This includes user and plugin configurations and the built-in GitHub server
+configured through `githubMcpToolConfig`. It does not start other configured
+servers or override disabled state, authentication requirements, sandbox policy,
+or configuration-source precedence.
+
 ### Node.js / TypeScript
 
 ```typescript
diff --git a/docs/features/plugin-directories.md b/docs/features/plugin-directories.md
index 456ef88e7f..393fc4c048 100644
--- a/docs/features/plugin-directories.md
+++ b/docs/features/plugin-directories.md
@@ -422,6 +422,63 @@ for (const plugin of plugins.plugins) {
 
 Plugins loaded via `--plugin-dir` appear in this list with their cache path set to the directory you provided. Marketplace installs are tagged with their registry source.
 
+## Retrying plugins required by managed settings
+
+When managed settings require plugins through `enabledPlugins`, the runtime installs or updates them before chat messages. If that fails, the session emits a `session.warning` with `warningType: "managed_plugins"` and waits an hour, or until the managed settings change, before trying again. The experimental `session.rpc.plugins.retryManaged()` tries again right away, for example from a Retry action next to that warning.
+
+Call it with no arguments to retry every plugin the managed settings require, or pass `plugin@marketplace` specs in `plugins` to retry only those. The result has one entry per plugin with a `status`: `installed`, `updated`, `already_present`, `failed`, `deferred`, or `not_required`. `failed` and `deferred` entries include an `error`. The session also emits the usual `session.info` progress and `session.warning` failure events.
+
+<details open>
+<summary><strong>Node.js / TypeScript</strong></summary>
+
+<!-- docs-validate: hidden -->
+```typescript
+import { CopilotClient } from "@github/copilot-sdk";
+
+async function main() {
+  const client = new CopilotClient();
+  await client.start();
+  const session = await client.createSession({
+    onPermissionRequest: async () => ({ kind: "approve-once" }),
+  });
+
+  // Retry every plugin the managed settings require, for example from a Retry action.
+  const result = await session.rpc.plugins.retryManaged();
+  for (const entry of result.plugins) {
+    console.log(`${entry.spec}: ${entry.status}${entry.error ? ` (${entry.error})` : ""}`);
+  }
+
+  // Or retry only the required plugins that are still missing.
+  const { plugins } = await session.rpc.plugins.list();
+  const missing = plugins
+    .filter((plugin) => plugin.managedDesiredEnabled === true && plugin.installed === false)
+    .map((plugin) => `${plugin.name}@${plugin.marketplace}`);
+  await session.rpc.plugins.retryManaged({ plugins: missing });
+}
+
+main();
+```
+<!-- /docs-validate: hidden -->
+
+```typescript
+// Retry every plugin the managed settings require, for example from a Retry action.
+const result = await session.rpc.plugins.retryManaged();
+for (const entry of result.plugins) {
+  console.log(`${entry.spec}: ${entry.status}${entry.error ? ` (${entry.error})` : ""}`);
+}
+
+// Or retry only the required plugins that are still missing.
+const { plugins } = await session.rpc.plugins.list();
+const missing = plugins
+  .filter((plugin) => plugin.managedDesiredEnabled === true && plugin.installed === false)
+  .map((plugin) => `${plugin.name}@${plugin.marketplace}`);
+await session.rpc.plugins.retryManaged({ plugins: missing });
+```
+
+</details>
+
+Runtimes that do not prepare managed plugins for the session reject the call.
+
 ## Troubleshooting
 
 * **"no plugin.json or SKILL.md found in &lt;dir&gt;"** — the directory exists but doesn't qualify as a plugin. Add a `plugin.json` manifest at the root (or under `.github/`), or include a top-level `SKILL.md`.
diff --git a/docs/features/session-persistence.md b/docs/features/session-persistence.md
index 302844b347..d3826e4f2b 100644
--- a/docs/features/session-persistence.md
+++ b/docs/features/session-persistence.md
@@ -131,6 +131,34 @@ await session.SendAndWaitAsync(new MessageOptions { Prompt = "Analyze my codebas
 
 Later—minutes, hours, or even days—you can resume the session from where you left off.
 
+### Remembered permissions with a session filesystem
+
+When you configure a custom `sessionFs` provider, runtime-owned durable permission choices use provider storage rather than the runtime host's configuration. The files live under the provider's `sessionStatePath` and retain their existing formats:
+
+* `permissions.json`: A top-level `locations` map retaining the existing `tool_approvals` and `allowed_directories` fields
+* `settings.json`: Top-level `allowedUrls` for `approve-permanently` URL approvals and `sandbox` for saved sandbox preferences
+* `config.json`: Top-level `trustedFolders` for remembered folder trust and `sandboxOnboardingShown` for the first-enable sandbox message
+
+Location keys are normalized provider directory paths, such as `/workspace`, without an added prefix. The runtime resolves them lexically using provider path conventions, without inspecting the host filesystem or discovering host Git repositories. An approval saved for `/workspace` is not automatically selected when the working directory is `/workspace/sub`.
+
+Provider-backed folder trust also uses lexical paths: a trusted folder covers itself and its descendants, not linked Git worktrees at other paths. Trust those worktree paths explicitly.
+
+There is no additional session-ID partition inside these files. Sessions that access the same backing files share remembered choices. Use separate provider namespaces when sessions or tenants must not share grants. With a namespace per session, permanent choices survive that session's resumes but do not automatically carry over to new sessions. To restore a session's persisted choices on resume, reconnect it to the same namespace.
+
+Consent updates are serialized per provider endpoint and file within one runtime process. Separate endpoints do not block each other. If different provider endpoints or runtime processes share backing files, the application must coordinate concurrent updates; the runtime cannot infer that those files are shared.
+
+These operations never import, update, or fall back to the host's `permissions-config.json`, `settings.json`, or `config.json`, including when provider reads or writes fail. Existing-format files supplied through the provider are read directly.
+
+As with host configuration, URL approvals are read only from `settings.json`. A legacy `allowedUrls` field in `config.json` is ignored; `config.json` remains the global-state file for remembered folder trust and the sandbox onboarding marker.
+
+Storage routing does not change permission lifetimes, URL denial precedence, or session policy behavior. Approve-once and approve-for-session do not become permanent grants.
+
+Saved sandbox preferences are restored on create and resume. Later explicit SDK `options.update` calls can change the live sandbox configuration without rewriting the saved preference.
+
+Without `sessionFs`, SDK applications in both `empty` and `copilot-cli` modes retain existing host-backed persistence. This includes the existing behavior where permanent URL consent saves host settings and grants access in the live session, but a fresh SDK session does not automatically load the host URL allowlist.
+
+See [Multi-tenancy and server deployments](../setup/multi-tenancy.md#sessionfs) for provider isolation responsibilities.
+
 ### Transcript recovery
 
 The resume option `allowTranscriptRecovery` controls recovery when the runtime loads a
@@ -283,7 +311,17 @@ When resuming a session, you can optionally reconfigure many settings. This is u
 
 With `model: "auto"`, the optional `capi.autoTier` setting selects an Auto routing preference: `efficiency`, `balance`, `intelligence`, or `fast`. In Python, use `capi={"auto_tier": "balance"}`. This setting applies to V2 Auto routing; V1 Auto requests are unchanged.
 
-`fast` is an integrator-only latency preset, not a first-party GitHub Copilot product preference. The SDK does not decide Fast eligibility, inspect client identity, choose it as a default, or fall back to another tier when a runtime does not support it—an older runtime returns its native error unchanged.
+When the runtime's default-off `DYNAMIC_AUTO_TIERS` feature is enabled, the session's `model.list` RPC also returns optional `auto` metadata from the provider's `/meta` endpoint. Use the enabled descriptors with `type: "auto"` to discover additional supported tier identifiers, their display names, descriptions, and ordering. The existing selection methods and JSON fields accept these identifiers. A discovery failure does not fall back to `/models`, and a successful response without `auto` metadata provides no selectable Auto tiers.
+
+Treat tier identifiers as extensible values, not a closed enumeration. Existing named values remain available; for additional identifiers, use strings in Node.js and Python, `AutoTier("premium-v2")` in Go, `new AutoTier("premium-v2")` in .NET, `AutoTier::Custom` in Rust, or `AutoTier.fromValue` in Java. The provider's `defaultTier` describes its default routing without creating a committed SDK preference.
+
+If a persisted tier is removed or disabled, resume preserves the explicit preference rather than replacing it with the provider's default. Select an available replacement before activating Auto routing.
+
+The CLI also preserves settings-derived preferences during startup, even when a tier is unavailable or dynamic discovery is disabled. You can then select a replacement in the model picker. Explicit SDK create and resume preferences are still validated before the operation succeeds, and Auto activation always validates availability against the resolved discovery mode.
+
+When a create or resume request includes `expAssignments`, the runtime installs those assignments before validating an explicit Auto preference. Validation, discovery, and activation use the same resolved feature decision.
+
+`fast` is an integrator-only latency preset, not a first-party GitHub Copilot product preference. Fast is not validated against the `/meta` tier catalog when configuring a session. The SDK does not decide Fast eligibility, inspect client identity, choose it as a default, or fall back to another tier when a runtime does not support it—an older runtime returns its native error unchanged.
 
 The runtime persists the selected tier, so applications do not need to resend it on every resume:
 
@@ -309,6 +347,8 @@ if (result.status === "pending") {
 
 The runtime does not apply the preference immediately. It records the request and commits it only when a later user turn using the `auto` model successfully obtains a usable model from the provider. A `pending` status therefore confirms that the request was accepted, not that it took effect. Only the most recent request survives: a new request replaces any earlier one that no turn has claimed yet.
 
+If an older request is still validating when a newer preference request or reset arrives, the older call fails with a superseded-request error instead of replacing the newer intent.
+
 Watch for the outcome through these events:
 
 * `session.model_change` when the preference commits.
diff --git a/docs/features/skills.md b/docs/features/skills.md
index 30c5112dbd..df8d319928 100644
--- a/docs/features/skills.md
+++ b/docs/features/skills.md
@@ -336,6 +336,333 @@ The frontmatter fields:
 
 The markdown body contains the instructions that are injected into the session context when the skill is loaded.
 
+## Skill providers (experimental)
+
+> [!NOTE]
+> Skill providers are experimental. The API can change in future SDK releases.
+
+A skill provider serves skills from your application's own storage, such as a database in a multi-tenant service, instead of `SKILL.md` files on disk. Provider skills join the session's skill catalog alongside file-based skills. The model loads them on demand through the `skill` tool, and users can invoke them like any other skill.
+
+A provider implements two operations:
+
+* **List skills**: returns catalog metadata for every skill: a `name`, a `description`, and optionally `userInvocable`, `disableModelInvocation`, and `argumentHint`. The runtime calls it when it loads the session's skills.
+* **Read skill**: returns the markdown for one skill, or a not-found result if the skill no longer exists. The runtime calls it only when the skill is loaded.
+
+Pass the provider when you create or resume a session:
+
+<details open>
+<summary><strong>Node.js / TypeScript</strong></summary>
+
+```typescript
+import { approveAll, CopilotClient, type SkillProvider } from "@github/copilot-sdk";
+
+const releaseSkills = new Map([
+    [
+        "release-notes",
+        {
+            description: "Writes release notes in the team's format.",
+            markdown: "Group changes by feature area and link each pull request.",
+        },
+    ],
+]);
+
+const skillProvider: SkillProvider = {
+    listSkills: () =>
+        [...releaseSkills].map(([name, skill]) => ({ name, description: skill.description })),
+    readSkill: (name) => releaseSkills.get(name)?.markdown ?? null,
+};
+
+const client = new CopilotClient();
+const session = await client.createSession({
+    onPermissionRequest: approveAll,
+    skillProvider,
+});
+```
+
+</details>
+<details>
+<summary><strong>Python</strong></summary>
+
+```python
+from copilot import CopilotClient, SkillProviderDescriptor
+from copilot.session import PermissionHandler
+
+RELEASE_SKILLS = {
+    "release-notes": (
+        "Writes release notes in the team's format.",
+        "Group changes by feature area and link each pull request.",
+    ),
+}
+
+
+class ReleaseSkills:
+    async def list_skills(self) -> list[SkillProviderDescriptor]:
+        return [
+            SkillProviderDescriptor(name=name, description=description)
+            for name, (description, _) in RELEASE_SKILLS.items()
+        ]
+
+    async def read_skill(self, name: str) -> str | None:
+        skill = RELEASE_SKILLS.get(name)
+        return skill[1] if skill else None
+
+
+async def main():
+    client = CopilotClient()
+    await client.start()
+    session = await client.create_session(
+        on_permission_request=PermissionHandler.approve_all,
+        skill_provider=ReleaseSkills(),
+    )
+```
+
+</details>
+<details>
+<summary><strong>Go</strong></summary>
+
+```go
+package main
+
+import (
+	"context"
+	"fmt"
+	"log"
+
+	copilot "github.com/github/copilot-sdk/go"
+	"github.com/github/copilot-sdk/go/rpc"
+)
+
+type releaseSkill struct {
+	description string
+	markdown    string
+}
+
+type releaseSkills map[string]releaseSkill
+
+func (s releaseSkills) ListSkills(ctx context.Context) ([]rpc.SkillProviderDescriptor, error) {
+	descriptors := make([]rpc.SkillProviderDescriptor, 0, len(s))
+	for name, skill := range s {
+		descriptors = append(descriptors, rpc.SkillProviderDescriptor{Name: name, Description: skill.description})
+	}
+	return descriptors, nil
+}
+
+func (s releaseSkills) ReadSkill(ctx context.Context, name string) (string, error) {
+	skill, ok := s[name]
+	if !ok {
+		return "", fmt.Errorf("%w: %s", copilot.ErrSkillNotFound, name)
+	}
+	return skill.markdown, nil
+}
+
+func main() {
+	ctx := context.Background()
+	client := copilot.NewClient(nil)
+	session, err := client.CreateSession(ctx, &copilot.SessionConfig{
+		OnPermissionRequest: copilot.PermissionHandler.ApproveAll,
+		SkillProvider: releaseSkills{
+			"release-notes": {
+				description: "Writes release notes in the team's format.",
+				markdown:    "Group changes by feature area and link each pull request.",
+			},
+		},
+	})
+	if err != nil {
+		log.Fatal(err)
+	}
+	_ = session
+}
+```
+
+</details>
+<details>
+<summary><strong>.NET</strong></summary>
+
+```csharp
+#pragma warning disable GHCP001 // Skill providers are experimental.
+using GitHub.Copilot;
+using GitHub.Copilot.Rpc;
+
+public sealed class ReleaseSkills : ISkillProvider
+{
+    private readonly Dictionary<string, (string Description, string Markdown)> _skills = new()
+    {
+        ["release-notes"] = (
+            "Writes release notes in the team's format.",
+            "Group changes by feature area and link each pull request."),
+    };
+
+    public Task<IReadOnlyList<SkillProviderDescriptor>> ListSkillsAsync(CancellationToken cancellationToken) =>
+        Task.FromResult<IReadOnlyList<SkillProviderDescriptor>>(
+            _skills.Select(skill => new SkillProviderDescriptor
+            {
+                Name = skill.Key,
+                Description = skill.Value.Description,
+            }).ToList());
+
+    public Task<string?> ReadSkillAsync(string name, CancellationToken cancellationToken) =>
+        Task.FromResult(_skills.TryGetValue(name, out var skill) ? skill.Markdown : null);
+}
+
+public static class SkillProviderExample
+{
+    public static async Task RunAsync(CopilotClient client)
+    {
+        await using var session = await client.CreateSessionAsync(new SessionConfig
+        {
+            OnPermissionRequest = PermissionHandler.ApproveAll,
+            SkillProvider = new ReleaseSkills(),
+        });
+    }
+}
+```
+
+The .NET skill provider types raise the `GHCP001` experimental diagnostic. Suppress it with `#pragma warning disable GHCP001` or a project-level `<NoWarn>GHCP001</NoWarn>`.
+
+</details>
+<details>
+<summary><strong>Java</strong></summary>
+
+```java
+import com.github.copilot.AllowCopilotExperimental;
+import com.github.copilot.CopilotClient;
+import com.github.copilot.CopilotSession;
+import com.github.copilot.SkillProvider;
+import com.github.copilot.SkillProviderDescriptor;
+import com.github.copilot.rpc.PermissionHandler;
+import com.github.copilot.rpc.SessionConfig;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+
+@AllowCopilotExperimental
+class ReleaseSkills implements SkillProvider {
+    private final Map<String, String> markdown = Map.of(
+            "release-notes", "Group changes by feature area and link each pull request.");
+
+    @Override
+    public CompletableFuture<List<SkillProviderDescriptor>> listSkills() {
+        return CompletableFuture.completedFuture(List.of(new SkillProviderDescriptor(
+                "release-notes", "Writes release notes in the team's format.", null, null, null)));
+    }
+
+    @Override
+    public CompletableFuture<String> readSkill(String name) {
+        return CompletableFuture.completedFuture(markdown.get(name));
+    }
+}
+
+@AllowCopilotExperimental
+class SkillProviderExample {
+    static CopilotSession createSession(CopilotClient client) throws Exception {
+        return client.createSession(new SessionConfig()
+                .setOnPermissionRequest(PermissionHandler.APPROVE_ALL)
+                .setSkillProvider(new ReleaseSkills()))
+                .get();
+    }
+}
+```
+
+The Java skill provider API is `@CopilotExperimental`, so the consuming class or method must opt in with `@AllowCopilotExperimental` (or compile with `-Acopilot.experimental.allowed=true`). See [Using experimental APIs](../../java/README.md#using-experimental-apis).
+
+</details>
+<details>
+<summary><strong>Rust</strong></summary>
+
+<!-- docs-validate: skip -->
+```rust
+use std::sync::Arc;
+
+use async_trait::async_trait;
+use github_copilot_sdk::{Error, SessionConfig, SkillProvider, SkillProviderDescriptor};
+
+struct ReleaseSkills;
+
+#[async_trait]
+impl SkillProvider for ReleaseSkills {
+    async fn list_skills(&self) -> Result<Vec<SkillProviderDescriptor>, Error> {
+        Ok(vec![SkillProviderDescriptor {
+            name: "release-notes".into(),
+            description: "Writes release notes in the team's format.".into(),
+            ..Default::default()
+        }])
+    }
+
+    async fn read_skill(&self, name: &str) -> Result<Option<String>, Error> {
+        Ok((name == "release-notes")
+            .then(|| "Group changes by feature area and link each pull request.".to_string()))
+    }
+}
+
+let session = client
+    .create_session(
+        SessionConfig::default()
+            .approve_all_permissions()
+            .with_skill_provider(Arc::new(ReleaseSkills)),
+    )
+    .await?;
+```
+
+</details>
+
+### Provider skill content
+
+Read skill returns the skill's `SKILL.md` text. YAML frontmatter is optional:
+
+* Without frontmatter, the whole text is the skill body, and all metadata comes from the listed skill.
+* With frontmatter, an omitted field inherits the listed value. A field that you include must match the listed value, or the skill fails to load.
+* `allowed-tools` is read only from frontmatter.
+* If the first line of the text is `---`, the runtime parses it as frontmatter, so don't start a body-only skill with a Markdown thematic break.
+
+Provider skills are text-only. They have no base directory, so they can't reference bundled scripts, templates, or other files. `skills.list` reports them with the source `sdk` and an empty `path`.
+
+### Serving existing SKILL.md files
+
+To serve `SKILL.md` files that you already have, such as files stored in a database, parse each file's YAML frontmatter once to build its catalog entry, then return the file unchanged from read skill:
+
+* Map `name` and `description` to the listed skill's `name` and `description`. Both are required in the catalog; the runtime doesn't fall back to a folder name or the skill body.
+* Map `user-invocable`, `disable-model-invocation`, and `argument-hint` to the matching optional fields when the frontmatter sets them.
+* Return the original text, frontmatter included, from read skill. Because the listed values came from the same frontmatter, they match, and the runtime still reads `allowed-tools` from it.
+
+### Trusting provider content
+
+Treat provider skills like skill directories: their content is trusted input. The model follows a skill's instructions, and the frontmatter controls how the skill is invoked. `allowed-tools` doesn't grant permissions in SDK sessions. The runtime reports it in the `allowedTools` field of the `skill.invoked` event, and your permission handler still decides every tool request.
+
+Don't serve text that end users or other tenants can edit unless you would let them author a skill file. If you build skills from user input, generate the frontmatter yourself instead of passing user-supplied frontmatter through.
+
+### Provider limits and errors
+
+The runtime validates the provider's catalog and content:
+
+* Names must match `^[A-Za-z0-9][A-Za-z0-9._-]{0,63}$` and be unique, ignoring case.
+* A catalog can contain at most 1,024 skills and 1 MiB of metadata. Each description and argument hint can be at most 1,024 characters.
+* Each skill's markdown can be at most 1 MiB of UTF-8.
+* Each call must complete within 30 seconds. When the runtime stops waiting for a call, because it timed out, the session ended, or a resume replaced the provider, it cancels the request and ignores any later result. Each SDK passes that cancellation to your provider in its usual way:
+
+  | SDK | Cancellation signal |
+  |---|---|
+  | Node.js | The `signal` (`AbortSignal`) in the options passed to `listSkills` and `readSkill` is aborted. |
+  | Python | The provider's `asyncio` task is cancelled with `asyncio.CancelledError`. Synchronous providers run to completion. |
+  | Go | The call's `context.Context` is cancelled. |
+  | .NET | The call's `CancellationToken` is cancelled. |
+  | Java | The returned `CompletableFuture` is cancelled with `cancel(true)`, which doesn't interrupt running work. |
+  | Rust | The provider future is dropped. |
+
+  These signals cover calls that the runtime cancels. When the connection closes or the client is force-stopped, the .NET, Java, and Rust SDKs also cancel calls that are still running. The Node.js, Python, and Go SDKs don't: a running call continues until it returns, and the SDK discards its result.
+
+If listing fails or returns an invalid catalog, the runtime reports the problem in the `errors` list returned by `skills.reload`. A failed reload keeps the provider skills from the last successful list. If reading a skill fails, the `skill` tool reports a generic load failure to the model. The SDK never forwards the text of errors your provider throws or returns, so that text can't leak into the conversation.
+
+### Provider lifecycle
+
+A provider is bound to one session:
+
+* A provider enables skills unless you set `enableSkills` to `false`, which keeps the provider bound but never called. In `mode: "empty"`, skills stay disabled until you set `enableSkills` to `true`.
+* The provider is never persisted. Pass it again when you resume a session. Resuming without a provider removes it from the session. Extensions that join the session don't change it.
+* A provider skill with the same name as a file-based skill replaces the file-based skill, and `skills.reload` reports a warning.
+* Sub-agents use their parent session's provider.
+* The runtime can call the provider concurrently, for example from the `skill` tool, user invocations, and custom agents that preload skills, so both operations must be safe for concurrent use.
+* Cloud sessions don't support skill providers. The SDK rejects the configuration before it creates the session.
+
 ## Configuration options
 
 ### SessionConfig skill fields
@@ -344,12 +671,18 @@ The markdown body contains the instructions that are injected into the session c
 |----------|-------|------|-------------|
 | Node.js | `skillDirectories` | `string[]` | Directories to load skills from |
 | Node.js | `disabledSkills` | `string[]` | Skills to disable |
+| Node.js | `skillProvider` | `SkillProvider` | Experimental provider for SDK-supplied skills |
 | Python | `skill_directories` | `list[str]` | Directories to load skills from |
 | Python | `disabled_skills` | `list[str]` | Skills to disable |
+| Python | `skill_provider` | `SkillProvider` | Experimental provider for SDK-supplied skills |
 | Go | `SkillDirectories` | `[]string` | Directories to load skills from |
 | Go | `DisabledSkills` | `[]string` | Skills to disable |
+| Go | `SkillProvider` | `SkillProvider` | Experimental provider for SDK-supplied skills |
 | .NET | `SkillDirectories` | `List<string>` | Directories to load skills from |
 | .NET | `DisabledSkills` | `List<string>` | Skills to disable |
+| .NET | `SkillProvider` | `ISkillProvider` | Experimental provider for SDK-supplied skills |
+| Java | `setSkillProvider` | `SkillProvider` | Experimental provider for SDK-supplied skills |
+| Rust | `with_skill_provider` | `Arc<dyn SkillProvider>` | Experimental provider for SDK-supplied skills |
 
 ### Built-in skills and `mode: "empty"`
 
diff --git a/docs/features/streaming-events.md b/docs/features/streaming-events.md
index 514a8b2b0e..b20339042a 100644
--- a/docs/features/streaming-events.md
+++ b/docs/features/streaming-events.md
@@ -734,7 +734,7 @@ The `permissionRequest` is a discriminated union on `kind`:
 | `kind` | Key Fields | Description |
 |--------|------------|-------------|
 | `"shell"` | `fullCommandText`, `intention`, `commands[]`, `possiblePaths[]` | Execute a shell command |
-| `"write"` | `fileName`, `diff`, `intention`, `newFileContents?` | Write/modify a file |
+| `"write"` | `fileName`, `diff`, `intention`, `newFileContents?`, `fileEdits?` | Write/modify a file |
 | `"read"` | `path`, `intention` | Read a file or directory |
 | `"mcp"` | `serverName`, `toolName`, `toolTitle`, `args?`, `readOnly` | Call an MCP tool |
 | `"url"` | `url`, `intention` | Fetch a URL |
@@ -743,6 +743,10 @@ The `permissionRequest` is a discriminated union on `kind`:
 
 All `kind` variants also include an optional `toolCallId` linking back to the tool call that triggered the request.
 
+Write requests can also include `fileEdits` in both `permissionRequest` and `promptRequest`. Each entry contains an optional `before` and `after` snapshot, each with an absolute `path` in the session filesystem namespace and complete UTF-8 `content`. A missing `before` means creation; a missing `after` means deletion. An empty `content` string represents an empty file, not an unavailable preview. A move can have different paths on its two sides. When a move overwrites an existing destination, separate entries describe the source deletion and destination replacement.
+
+These snapshots describe the planned operation, not a later read of the live filesystem. The runtime omits `fileEdits` when it cannot provide a complete text preview, including requests made before reading a sandbox-protected file, non-UTF-8 contents, or an unreadable or non-regular move destination, such as a named pipe. Do not infer a deletion from an empty legacy `newFileContents` value. The existing fields and approval choices remain available to consumers that do not use previews.
+
 ### `permission.completed`
 
 A permission request was resolved.
@@ -856,7 +860,7 @@ A skill was activated for the current conversation.
 | `name` | `string` | ✅ | Skill name |
 | `path` | `string` | ✅ | File path to the SKILL.md definition |
 | `content` | `string` | ✅ | Full skill content injected into the conversation |
-| `allowedTools` | `string[]` | | Tools auto-approved while this skill is active |
+| `allowedTools` | `string[]` | | Tools listed in the skill's `allowed-tools` frontmatter. The SDK doesn't approve them automatically; your permission handler still decides. The Copilot CLI auto-approves them while the skill is active. |
 | `pluginName` | `string` | | Plugin the skill originated from |
 | `pluginVersion` | `string` | | Plugin version |
 
diff --git a/docs/features/usage-and-billing.md b/docs/features/usage-and-billing.md
index ec662b6850..c412cb35c2 100644
--- a/docs/features/usage-and-billing.md
+++ b/docs/features/usage-and-billing.md
@@ -22,9 +22,21 @@ The table below maps each signal to the API that exposes it.
 | Accumulated AI credit and token totals | `session.usage.getMetrics` | Session | RPC |
 | Per-model AI credit pricing | `models.list` | Server | RPC |
 | Account quota and premium interactions | `account.getQuota` | Server | RPC |
+| Session-owned provider quota observations | `session.quota.get` and `session.quota.refresh` | Session | RPC |
+| Provider admission-state updates | `session.quota_observation` | Session | Event |
+
+`session.quota.get` reads local runtime state; `session.quota.refresh` refreshes the provider catalogs and quota sources. Both return `providerQuotas`, keyed by provider identity, quota ID, and observation kind. The runtime keeps one observation store. The legacy `snapshots` field is a derived compatibility view of authoritative budgets, not a second source of quota state.
+
+Provider cardinality is an emergent property of actual usage and observations supplied to the seam. This API neither knows nor enforces how many providers a user may use: it records and projects zero, one, or many entries identically. Producers supply stable provider/account-scoped references; usage adds model identity, and quota adds quota identity and observation kind. `get()` returns the full known collection, so callers can select an exact key, a subset, or all entries without provider-specific methods. Acquisition uses the sources supplied by the upstream account/model layer; it does not manufacture a union or impose a selected-provider filter on reads.
+
+Check `observationKind`, `quantityKind`, and `acquisitionStatus` before interpreting a reading. An `authoritative_budget` can supply progress and reset metadata. An `advisory_balance` reports independent signed 64-bit quantities without promising a percentage, reset window, or post-call balance. An `admission_state` reports permission/capacity at request admission and carries no quantities; it does not replace an account balance. Preserve missing values and explicit nulls rather than converting them to zero. A failed or unavailable acquisition is not quota exhaustion.
+
+For Microsoft 365 Copilot, access and capacity are service verdicts, while quantities are advisory. For example, `allowed`/`available` with both quantities explicitly zero means **0 / 0 AIC reported**, not 100% consumed or inconsistent state. A missing entitlement is different from a zero entitlement. The `-1` entitlement sentinel means unlimited entitlement without changing the reported capacity state. Inference headers can reflect cached admission state; neither those headers nor an on-demand quota refresh establish the charge for the preceding call.
+
+Usage totals belong to a session, not the active account. In the CLI, switching away from a non-empty Microsoft 365 Copilot session requires starting a new session. The previous session retains its usage and history for resume; the new session starts its own totals.
 
 > [!NOTE]
-> `session.usage.getMetrics`, `session.metadata.contextInfo`, and `session.metadata.recomputeContextTokens` are marked experimental in the generated RPC surface. In .NET they raise the `GHCP001` experimental diagnostic, which you suppress with `#pragma warning disable GHCP001` or a project-level `<NoWarn>GHCP001</NoWarn>`. Pin both the SDK and the Copilot CLI runtime if your application depends on them.
+> `session.quota`, `session.usage.getMetrics`, `session.metadata.contextInfo`, and `session.metadata.recomputeContextTokens` are marked experimental in the generated RPC surface. In .NET they raise the `GHCP001` experimental diagnostic, which you suppress with `#pragma warning disable GHCP001` or a project-level `<NoWarn>GHCP001</NoWarn>`. Pin both the SDK and the Copilot CLI runtime if your application depends on them.
 
 The field tables below list only the fields used in the examples on this page. The complete, always-current field reference is the generated SDK types plus [Streaming events](./streaming-events.md), which is regenerated from the CLI schema on every dependency bump. Treat those as the source of truth and this page as a task-oriented guide.
 
diff --git a/docs/runtime-supervised-host.md b/docs/runtime-supervised-host.md
index 427fe39daf..c0999bddbb 100644
--- a/docs/runtime-supervised-host.md
+++ b/docs/runtime-supervised-host.md
@@ -106,14 +106,23 @@ Startup fails if a requested transport cannot become ready, rather than silently
 downgrading to local-only hosting. Select transports at startup; dispose and
 recreate the host to change them.
 
+`githubEnvironment.requireConnectionBinding` defaults to `true`: sealed
+authentication must bind the current handshake challenge, a fresh nonce and
+timestamp. Explicit `false` selects compatibility with clients sending unbound
+encrypted tokens. Relay encryption and resource authorization stay mandatory,
+but an unbound sealed token is replayable. This is the same transitional policy
+supported by `copilotd`, not a switch to plaintext authentication.
+
 GitHub-only hosting does not open a local listener. Its host handle has an
 environment ID but no local URL or connection token. `environmentId` is absent
 for local-only hosting. Disposal ends transport and registration activity without
 deleting the saved MC environment record or application-owned sessions.
 
 Registering an environment does not publish every application session. Use
-`publishSession` for existing resident sessions; factory callbacks and durable
-catalog behavior are unchanged. Environment management is independent of a
+`publishSession` for an existing resident session, and `listSessions` to read
+the host's complete advertised catalog of live and dormant sessions. Listing
+does not start a host, publish a session, or paginate results. Factory callbacks
+and durable catalog behavior are unchanged. Environment management is independent of a
 running host and available only through generated `rpc.environments.list`,
 `rpc.environments.get`, and `rpc.environments.delete` operations, using each
 language's naming conventions.
@@ -378,7 +387,8 @@ configuration before calling these methods, just as in the creation examples.
 Python and .NET handles support asynchronous context management; Java handles
 support try-with-resources. Go callers explicitly invoke `Dispose(ctx)`.
 
-Only durable catalog entries marked as application-owned invoke the resume
+Durable catalog entries marked as application-owned, including published
+application sessions, invoke the resume
 factory. If its resume callback is missing, restoration fails rather than silently
 falling back to host-owned creation. Published resident sessions attach directly and do not invoke either
 factory. This callback does not provide arbitrary adoption or reconfiguration
@@ -398,11 +408,33 @@ and `sessionUri`. Publication does not call the factory, copy history, replace
 the native session, or transfer ownership. Its metadata and workspace come
 from the resident session, not from an application-supplied configuration.
 
-Published sessions are discoverable only for this listener's lifetime. They
-are not imported into its durable catalog. Stopping the listener detaches its
-participation without deleting the original session or transcript. A missing
-or replaced resident session cannot be silently restored from disk by the
-listener.
+Publication records the session in the durable, compute-scoped host catalog.
+Stopping the listener detaches its participation without deleting the catalog
+entry, original session, or transcript. A later host using the same compute
+identity can discover it as a dormant session. Restoring an application-owned
+session requires the owning application's `resumeSession` callback to configure
+its tools, hooks, and handlers; the host does not silently substitute host-owned
+session construction. A currently attached resident session still attaches
+directly without invoking a factory. The SDK does not expose an unpublish operation.
+
+### Listing host sessions
+
+Call the owner-bound host handle to read every live or dormant session currently
+advertised by its host. The runtime returns the complete catalog in one response;
+the method does not start a host or publish sessions. The host ID is supplied
+by the handle, so the call stays on the original owning connection.
+Each method returns a `HostListSessionsResult` with a `sessions` collection,
+not the collection directly. In Node.js, use
+`const { sessions } = await host.listSessions()`.
+
+| SDK | Method |
+| --- | --- |
+| Node.js | `host.listSessions()` |
+| Python | `await host.list_sessions()` |
+| Go | `host.ListSessions(ctx)` |
+| .NET | `host.ListSessionsAsync(cancellationToken)` |
+| Java | `host.listSessions()` |
+| Rust | `host.list_sessions().await` |
 
 ### CLI hosting commands
 
@@ -417,14 +449,11 @@ Sharing also shows the session URI. Use an AHP 0.9 client with the connection
 token and ordinary GitHub resource authentication; the connection token alone
 does not bypass resource authorization.
 
-`/ahp status` shows connection information. `/ahp stop` stops the **entire
-listener and all its shares**. `/remote unshare` removes the foreground session.
-The pinned host has no per-session unregister operation, so unsharing drains
-and restarts the listener at the same endpoint with the same connection token
-before republishing other shares. Other clients must reconnect; local sessions
-and their identities remain unchanged. Exiting the owning CLI stops the
-listener as well. There is one listener per CLI/effective catalog, not one
-listener per shared session.
+`/ahp status` shows connection information. `/ahp stop` stops the entire
+listener and its active participation, not its durable catalog. Other clients
+must reconnect after hosting restarts; local sessions and their identities
+remain unchanged. Exiting the owning CLI stops the listener as well. Hosting
+lifetime is separate from durable publication.
 
 `--ahp-host [--listen host:port] [--workspace directory]` serves this same backend
 in the CLI process, using normal SDK session construction, managed policy,
@@ -440,19 +469,36 @@ Outbound relay, host-picker and explicitly configured external-daemon controls r
 
 ## Durable catalog and single host owner
 
-The runtime passes its actual resolved data directory to the host library; the single AHP
-catalog lives at `<effective Copilot home>/ahp/sessions`. It follows the same
+The runtime passes its actual resolved data directory and compute identity to
+the host library. Durable catalogs are scoped to both the effective Copilot
+home and compute identity. The effective home follows the same
 default `~/.copilot`, `COPILOT_HOME`, and SDK `baseDirectory` resolution as that
-runtime. The catalog contains sessions previously created through AHP, not all
-SDK/CLI sessions. Listener disposal, owner disconnect, and restart retain it.
+runtime. Each catalog contains sessions previously created through AHP and
+explicitly published resident sessions, not all SDK/CLI sessions.
+Listener disposal, owner disconnect, and restart retain it.
 A replacement listener can list and resume these sessions after authenticating.
 
+Supply top-level `AhpHostOptions.computeId` to keep the same catalog when switching
+between local and Mission Control hosting. If omitted for a local-only start,
+the runtime persists a stable identity in its settings; the SDK never generates
+one. Mission Control's `githubEnvironment.computeId` remains required. When both
+compute IDs are supplied, they must agree or startup fails.
+
+| SDK | Top-level compute identity |
+| --- | --- |
+| Node.js | `computeId` |
+| Python | `compute_id` |
+| Go | `ComputeID` |
+| .NET | `ComputeId` |
+| Java | `setComputeId(...)` |
+| Rust | `with_compute_id(...)` |
+
 Only one AHP server may own a catalog at a time. A second start for the
-same location fails, including from another runtime. Ordinary runtimes, SDK
+same home and compute identity fails, including from another runtime. Ordinary runtimes, SDK
 clients, and sessions do not acquire this lock and remain usable. The lock is
 kernel-managed, non-blocking, held until shutdown writes finish, and released
-even after forced process termination. Different effective homes have separate
-catalogs. This does not change standalone `copilotd` defaults or concurrency
+even after forced process termination. Different effective homes or compute
+identities have separate catalogs. This does not change standalone `copilotd` defaults or concurrency
 behavior, and does not add standalone/in-process shared-writer support.
 
 ## Current GHES shell limitation
diff --git a/docs/setup/multi-tenancy.md b/docs/setup/multi-tenancy.md
index ebbafe4fb0..7fe893a070 100644
--- a/docs/setup/multi-tenancy.md
+++ b/docs/setup/multi-tenancy.md
@@ -334,6 +334,24 @@ const client = new CopilotClient({
 
 For languages that expose a provider callback, configure `sessionFs` at the client level and provide a per-session filesystem handler when creating or resuming a session. See [Session Persistence](../features/session-persistence.md) for persistence concepts and storage trade-offs.
 
+Runtime-owned durable permission choices also use the session filesystem. Under the provider's `sessionStatePath`, `permissions.json` retains its top-level `locations` map with `tool_approvals` and `allowed_directories`; `settings.json` stores top-level `allowedUrls` and `sandbox`; and `config.json` stores top-level `trustedFolders`.
+
+URL approvals are read only from `settings.json`; legacy user-setting fields such as `allowedUrls` in `config.json` are ignored, matching host behavior.
+
+Location keys are normalized provider directory paths, with no added prefix. Resolution follows the provider's path conventions without inspecting the host filesystem or discovering host Git repositories. `/workspace` and `/workspace/sub` select different location entries.
+
+The runtime does not add session-ID partitions to these files or change their sharing granularity. Sessions accessing the same files in the same provider namespace share remembered grants. Your application must use distinct namespaces for tenants or sessions that require isolation, authorize access to each namespace, and reconnect resumed sessions to their original namespace.
+
+With a separate namespace per session, permanent grants survive that session's resumes rather than becoming tenant-wide grants for new sessions. Sharing grants across sessions requires sharing the consent files while keeping other session state separate. The runtime serializes consent updates only within the same provider endpoint and process; applications that share backing files across endpoints or processes must coordinate concurrent updates.
+
+The runtime blocks direct provider-backed file writes to the lexical approval-metadata paths as defense in depth, not as a tamper-proof storage boundary. Providers must not expose writable aliases (such as symlinks or Windows 8.3 short names) to approval metadata through agent file tools. Shell tools do not run through SessionFS, and their commands are not checked against its virtual metadata paths. If your application separately exposes the provider's backing storage to shell execution or other arbitrary code, your host must protect that storage.
+
+Session filesystem approval operations never import or fall back to remembered permissions from the host's `permissions-config.json`, URL or sandbox settings from `settings.json`, or folder trust from `config.json`. They do not update those host files, even when the provider has no approvals or reports an error. A provider error is not permission to use host consent. URL deny rules remain authoritative, and folder trust uses provider paths without host Git discovery.
+
+Approve-once, approve-for-session, rejections, and session policy changes retain their existing lifetimes and event-replay behavior. Storage routing does not turn them into new permanent grants. Protect session transcripts, including durable permission events, with the same tenant isolation as approval metadata.
+
+This boundary applies only to sessions using a session filesystem provider. All SDK applications without `sessionFs`, in both `empty` and `copilot-cli` modes, and ordinary CLI sessions retain existing host-backed persistence for remembered locations, permanent URL approvals, folder trust, and sandbox settings.
+
 Verified public SDK surfaces:
 
 | Language | Client-level config | Per-session provider |
diff --git a/dotnet/README.md b/dotnet/README.md
index 6bde71b71c..84f5b650f1 100644
--- a/dotnet/README.md
+++ b/dotnet/README.md
@@ -44,6 +44,12 @@ For GitHub Mission Control, set
 instead, or configure both transports. GitHub environment name and compute ID are
 required; there is no implicit local listener. The host's `Url`, `Token`, and `Pid`
 are nullable; `EnvironmentId` contains the GitHub environment ID when configured.
+Call `host.ListSessionsAsync()` to read the complete advertised catalog of live
+and dormant sessions.
+Set top-level `ComputeId` to reuse the durable catalog across local and Mission
+Control hosting; it must agree with `GitHubEnvironment.ComputeId` when both are
+supplied. The runtime persists an omitted local-only identity. Publication
+survives host shutdown; dormant application sessions require your resume callback.
 Environment list/get/delete operations are available only through the generated RPC API.
 See [runtime-supervised AHP hosting](../docs/runtime-supervised-host.md) for creation
 and resume callbacks, resident-session publication, ownership, and shared-snapshot E2Es.
@@ -178,6 +184,9 @@ Start the CLI server and establish connection.
 ##### `StopAsync(): Task`
 
 Stop the server and close all sessions. Throws if errors are encountered during cleanup.
+Closing a session stops subscribed event delivery, drops queued events, and releases
+subscriptions without waiting for handlers already admitted for dispatch. Pending `SendAndWaitAsync`
+operations fail with `IOException` if the session closes before their final response arrives.
 For an owned stdio runtime, graceful shutdown closes stdin and waits up to 10 seconds
 for host cleanup, including telemetry export. This cleanup is best-effort: if the wait
 times out, the process is terminated and that timeout alone is not reported as a cleanup
@@ -186,6 +195,20 @@ error. A successful return does not guarantee that all telemetry was exported.
 ##### `ForceStopAsync(): Task`
 
 Force stop the CLI server without graceful cleanup. Use when `StopAsync()` takes too long.
+Stops session event dispatch and releases queued events and subscriptions. A handler already
+admitted for dispatch may finish; shutdown does not wait for it. Pending `SendAndWaitAsync` operations fail
+with `IOException` if the session closes before their final response arrives.
+The SDK releases its references to later handlers' captured objects even if an admitted handler remains blocked.
+Local retirement also releases tool, command, hook, auth/input, provider, canvas,
+and transform registrations, without changing caller-owned configuration or joining
+callbacks already admitted. Registration and callback lookup share a retirement fence;
+late accepted tool replacements cannot restore handlers. Ordinary disposal retains
+hook callbacks through the detach response and performs local retirement in `finally`.
+Both stop methods close session admission before taking the session snapshot. Concurrent
+create/resume setup on that connection is rejected and retired locally; restarting the
+client opens admission only for the new connection.
+Cleanup of a rejected cloud creation stays on its original connection and cannot
+restart the client during shutdown.
 
 ##### `CreateSessionAsync(SessionConfig? config = null): Task<CopilotSession>`
 
@@ -207,6 +230,7 @@ Create a new conversation session.
 - `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`.
+- `SkillProvider` - Experimental session-scoped skill provider. See [Skill providers (experimental)](#skill-providers-experimental).
 - `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 legacy question-and-answer requests from the agent. Enables the legacy `ask_user` tool. See [User Input Requests](#user-input-requests) section.
 - `AskUserVariant` - Selects the model-facing `ask_user` tool shape. Defaults to `AskUserVariant.Legacy`; use `AskUserVariant.Elicitation` with `OnElicitationRequest`.
@@ -225,6 +249,7 @@ Resume an existing session. Returns the session with `WorkspacePath` populated i
 
 - `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`.
+- `SkillProvider` - Re-supplies the session-scoped skill provider when resuming.
 - `AskUserVariant` - Re-supplies the model-facing `ask_user` tool shape on cold resume.
 - `AllowTranscriptRecovery` - Repairs a damaged transcript when true. The default
   is true in all modes; set false to reject recovery. `session.TranscriptRecovery` contains
@@ -254,6 +279,62 @@ await using var session = await client.CreateSessionAsync(new SessionConfig
 
 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.
 
+##### Skill providers (experimental)
+
+Set `SessionConfig.SkillProvider` or `ResumeSessionConfig.SkillProvider` to
+serve session-scoped skills from your application. The provider is not persisted:
+pass it again on every resume, because resuming without one unbinds it. Skill
+providers are only supported for local sessions; `CreateSessionAsync` throws if
+`Cloud` and `SkillProvider` are both set. The skill provider types are
+experimental and raise the `GHCP001` diagnostic; suppress it with
+`#pragma warning disable GHCP001` or `<NoWarn>GHCP001</NoWarn>`.
+
+```csharp
+#pragma warning disable GHCP001 // Skill providers are experimental.
+
+public sealed class MySkillProvider : ISkillProvider
+{
+    public Task<IReadOnlyList<SkillProviderDescriptor>> ListSkillsAsync(CancellationToken cancellationToken) =>
+        Task.FromResult<IReadOnlyList<SkillProviderDescriptor>>(
+        [
+            new()
+            {
+                Name = "project-facts",
+                Description = "Important facts about this host application",
+                ArgumentHint = "<topic>"
+            }
+        ]);
+
+    public Task<string?> ReadSkillAsync(string name, CancellationToken cancellationToken) =>
+        Task.FromResult(name == "project-facts"
+            ? """
+              # Project facts
+
+              Use the application's project index before answering.
+              """
+            : null);
+}
+
+await using var client = new CopilotClient(new CopilotClientOptions
+{
+    Mode = CopilotClientMode.Empty
+});
+
+await using var session = await client.CreateSessionAsync(new SessionConfig
+{
+    AvailableTools = [], // Empty mode requires an explicit tool allow-list.
+    SkillProvider = new MySkillProvider(),
+    EnableSkills = true // Required in empty mode; otherwise skills default off.
+});
+```
+
+The runtime may call `ListSkillsAsync` and `ReadSkillAsync` concurrently. Honor
+the supplied cancellation token; it is canceled when the runtime abandons the
+request (for example, on timeout, session disposal, or a resume that replaces the
+provider) or the connection closes. Return `null` from `ReadSkillAsync` when a
+skill name is not found. Optional `SkillProviderDescriptor` properties are
+omitted from JSON when unset.
+
 ##### `PingAsync(string? message = null): Task<PingResponse>`
 
 Ping the server to check connectivity.
@@ -542,6 +623,24 @@ await session2.DisposeAsync();
 
 ---
 
+## Provider-qualified model selection
+
+Use the experimental request-object overload to select the `modelId` and `providerId` from a model catalog entry:
+
+```csharp
+using GitHub.Copilot.Rpc;
+
+#pragma warning disable GHCP001 // Provider-qualified model selection is experimental.
+await session.Rpc.Model.SwitchToAsync(new ModelSwitchToRequest
+{
+    ModelId = modelId,
+    ProviderId = providerId,
+});
+#pragma warning restore GHCP001
+```
+
+The SDK supplies the session ID. Existing positional calls, including `session.Rpc.Model.SwitchToAsync("auto", AutoTier.Balance)`, retain their original parameter order and defaults.
+
 ## Auto routing tiers
 
 The canonical values are `AutoTier.Efficiency`, `AutoTier.Balance`, `AutoTier.Intelligence`, and `AutoTier.Fast`, which send `efficiency`, `balance`, `intelligence`, and `fast` on the wire. Fast is an integrator-only latency preset, not a fourth first-party GitHub Copilot preference. The SDK forwards the requested value without deciding eligibility or inspecting client identity. An externally supplied older runtime returns its native runtime or JSON-RPC error; the SDK does not downgrade or silently ignore the request.
diff --git a/dotnet/src/Client.cs b/dotnet/src/Client.cs
index 999440992f..77df3cba7f 100644
--- a/dotnet/src/Client.cs
+++ b/dotnet/src/Client.cs
@@ -71,6 +71,8 @@ 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 object _sessionAdmissionLock = new();
+    private bool _sessionAdmissionClosed;
     private readonly ConcurrentDictionary<string, Func<GitHubTokenProviderArgs, Task<GitHubTokenProviderResult>>> _gitHubTokenProviders = new();
 
     private readonly CopilotClientOptions _options;
@@ -365,7 +367,14 @@ private static bool IsFullyQualifiedPath(string path)
     /// </example>
     public Task StartAsync(CancellationToken cancellationToken = default)
     {
-        return _connectionTask ??= StartCoreAsync(cancellationToken);
+        lock (_sessionAdmissionLock)
+        {
+            if (_connectionTask is null)
+            {
+                _sessionAdmissionClosed = false;
+            }
+            return _connectionTask ??= StartCoreAsync(cancellationToken);
+        }
 
         async Task<Connection> StartCoreAsync(CancellationToken ct)
         {
@@ -394,29 +403,7 @@ async Task<Connection> StartCoreAsync(CancellationToken ct)
                         ffiEnvironment["COPILOT_DISABLE_KEYTAR"] = "1";
                     }
 
-                    var ffiArgs = new List<string>();
-                    if (_options.LogLevel is { } logLevel && !string.IsNullOrEmpty(logLevel.Value))
-                    {
-                        ffiArgs.AddRange(["--log-level", logLevel.Value]);
-                    }
-                    if (!string.IsNullOrEmpty(_options.GitHubToken))
-                    {
-                        ffiArgs.AddRange(["--auth-token-env", "COPILOT_SDK_AUTH_TOKEN"]);
-                    }
-                    var useLoggedInUser = _options.UseLoggedInUser ?? string.IsNullOrEmpty(_options.GitHubToken);
-                    if (!useLoggedInUser)
-                    {
-                        ffiArgs.Add("--no-auto-login");
-                    }
-                    if (_options.SessionIdleTimeoutSeconds is > 0)
-                    {
-                        ffiArgs.AddRange(["--session-idle-timeout", _options.SessionIdleTimeoutSeconds.Value.ToString(CultureInfo.InvariantCulture)]);
-                    }
-                    if (_options.EnableRemoteSessions)
-                    {
-                        ffiArgs.Add("--remote");
-                    }
-
+                    var ffiArgs = BuildInProcessRuntimeArguments(_options);
                     var explicitCliPath = System.Environment.GetEnvironmentVariable("COPILOT_CLI_PATH");
                     if (string.IsNullOrEmpty(explicitCliPath))
                     {
@@ -556,11 +543,12 @@ await InvokeRpcAsync<JsonElement>(
     /// </example>
     public async Task StopAsync()
     {
+        var sessions = CloseSessionAdmission(clearSessions: false);
         DisconnectAhpHosts();
         List<Exception> errors = [];
-        CancelPendingExternalTools();
+        CancelPendingExternalTools(sessions);
 
-        foreach (var session in _sessions.Values.ToArray())
+        foreach (var session in sessions)
         {
             try
             {
@@ -572,7 +560,6 @@ public async Task StopAsync()
             }
         }
 
-        _sessions.Clear();
         ClearGitHubTokenProviders();
 
         await CleanupConnectionAsync(errors, gracefulRuntimeShutdown: true);
@@ -588,6 +575,7 @@ public async Task StopAsync()
     /// Use this when <see cref="StopAsync"/> fails or takes too long. This method:
     /// <list type="bullet">
     ///     <item>Clears all sessions immediately without destroying them</item>
+    ///     <item>Stops session event delivery without waiting for running handlers</item>
     ///     <item>Force closes the connection</item>
     ///     <item>Kills the CLI process (if spawned by this client)</item>
     /// </list>
@@ -604,9 +592,13 @@ public async Task StopAsync()
     /// </example>
     public async Task ForceStopAsync()
     {
+        var sessions = CloseSessionAdmission(clearSessions: true);
         DisconnectAhpHosts();
-        CancelPendingExternalTools();
-        _sessions.Clear();
+        CancelPendingExternalTools(sessions);
+        foreach (var session in sessions)
+        {
+            session.Retire();
+        }
         ClearGitHubTokenProviders();
 
         var errors = new List<Exception>();
@@ -614,6 +606,20 @@ public async Task ForceStopAsync()
         ThrowErrors(errors);
     }
 
+    private CopilotSession[] CloseSessionAdmission(bool clearSessions)
+    {
+        lock (_sessionAdmissionLock)
+        {
+            _sessionAdmissionClosed = true;
+            var sessions = _sessions.Values.ToArray();
+            if (clearSessions)
+            {
+                _sessions.Clear();
+            }
+            return sessions;
+        }
+    }
+
     private static void ThrowErrors(List<Exception>? errors)
     {
         if (errors is not null)
@@ -632,14 +638,17 @@ private static void ThrowErrors(List<Exception>? errors)
 
     private async Task CleanupConnectionAsync(List<Exception>? errors, bool gracefulRuntimeShutdown)
     {
-        var connectionTask = _connectionTask;
+        Task<Connection>? connectionTask;
+        lock (_sessionAdmissionLock)
+        {
+            connectionTask = _connectionTask;
+            _connectionTask = null;
+        }
         if (connectionTask is null)
         {
             return;
         }
 
-        _connectionTask = null;
-
         Connection ctx;
         try
         {
@@ -892,6 +901,7 @@ private CopilotSession InitializeSession(
         session.RegisterElicitationHandler(config.OnElicitationRequest);
         session.RegisterExitPlanModeHandler(config.OnExitPlanModeRequest);
         session.RegisterAutoModeSwitchHandler(config.OnAutoModeSwitchRequest);
+        session.RegisterSkillProvider(config.SkillProvider);
         if (config.OnUserInputRequest != null)
         {
             session.RegisterUserInputHandler(config.OnUserInputRequest);
@@ -911,7 +921,7 @@ private CopilotSession InitializeSession(
         ConfigureSessionFsHandlers(session, config.CreateSessionFsProvider);
         session.SetCanvasHandler(config.CanvasHandler);
         session.RegisterBearerTokenProviders(BuildBearerTokenCallbacks(config));
-        RegisterSession(session);
+        RegisterSession(session, rpc);
         session.StartProcessingEvents();
         LoggingHelpers.LogTiming(_logger, LogLevel.Debug, null,
             callerName + " local setup complete. Elapsed={Elapsed}, SessionId={SessionId}, Tools={ToolsCount}, Commands={CommandsCount}, Hooks={HasHooks}",
@@ -1190,6 +1200,10 @@ public async Task<CopilotSession> CreateSessionAsync(SessionConfig config, Cance
     {
         ArgumentNullException.ThrowIfNull(config);
         ValidateGitHubTokenConfig(config);
+        if (config.Cloud is not null && config.SkillProvider is not null)
+        {
+            throw new ArgumentException("Skill providers are not supported for cloud sessions.");
+        }
 
         var connection = await EnsureConnectedAsync(cancellationToken);
         var totalTimestamp = Stopwatch.GetTimestamp();
@@ -1248,6 +1262,7 @@ public async Task<CopilotSession> CreateSessionAsync(SessionConfig config, Cance
             var request = new CreateSessionRequest(
                 config.Model,
                 localSessionId,
+                config.Name,
                 config.ClientName,
                 config.ReasoningEffort,
                 config.ReasoningSummary,
@@ -1307,10 +1322,13 @@ public async Task<CopilotSession> CreateSessionAsync(SessionConfig config, Cance
                 Cloud: config.Cloud,
                 RefreshCustomInstructions: config.RefreshCustomInstructions,
                 InstructionDirectories: config.InstructionDirectories,
+                AgentDirectories: config.AgentDirectories,
+                HookDirectories: config.HookDirectories,
                 PluginDirectories: config.PluginDirectories,
                 DisabledMcpServers: config.DisabledMcpServers,
                 LargeOutput: config.LargeOutput,
                 ToolSearch: config.ToolSearch,
+                ImageGeneration: config.ImageGeneration,
                 Memory: config.Memory,
                 Canvases: config.Canvases,
                 RequestCanvasRenderer: config.RequestCanvasRenderer,
@@ -1324,10 +1342,12 @@ public async Task<CopilotSession> CreateSessionAsync(SessionConfig config, Cance
                 FeatureFlags: config.FeatureFlags,
                 ExpAssignments: config.ExpAssignments,
                 EnableManagedSettings: config.EnableManagedSettings,
+                EnforceManagedModelDefaults: config.EnforceManagedModelDefaults,
                 GitHubMcpToolConfig: config.GitHubMcpToolConfig,
                 ManagedSettings: config.ManagedSettings,
                 EnableGitHubTelemetryForwarding: _options.OnGitHubTelemetry != null ? true : null,
-                AdditionalDirectories: config.AdditionalDirectories);
+                AdditionalDirectories: config.AdditionalDirectories,
+                HasSkillProvider: config.SkillProvider is not null ? true : null);
 
             var rpcTimestamp = Stopwatch.GetTimestamp();
 
@@ -1401,7 +1421,13 @@ public async Task<CopilotSession> CreateSessionAsync(SessionConfig config, Cance
                 try
                 {
                     using var cleanupTimeout = new CancellationTokenSource(TimeSpan.FromSeconds(10));
-                    await DeleteSessionAsync(serverAssignedSessionId, cleanupTimeout.Token).ConfigureAwait(false);
+                    var deletion = await InvokeRpcAsync<DeleteSessionResponse>(
+                        connection.Rpc, "session.delete", [new DeleteSessionRequest(serverAssignedSessionId)],
+                        cleanupTimeout.Token).ConfigureAwait(false);
+                    if (!deletion.Success)
+                    {
+                        throw new InvalidOperationException($"Failed to delete session {serverAssignedSessionId}: {deletion.Error}");
+                    }
                 }
                 catch (Exception cleanupError) when (cleanupError is OperationCanceledException
                     or IOException
@@ -1571,10 +1597,13 @@ public async Task<CopilotSession> ResumeSessionAsync(string sessionId, ResumeSes
                 RemoteSession: config.RemoteSession,
                 ContinuePendingWork: config.ContinuePendingWork,
                 InstructionDirectories: config.InstructionDirectories,
+                AgentDirectories: config.AgentDirectories,
+                HookDirectories: config.HookDirectories,
                 PluginDirectories: config.PluginDirectories,
                 DisabledMcpServers: config.DisabledMcpServers,
                 LargeOutput: config.LargeOutput,
                 ToolSearch: config.ToolSearch,
+                ImageGeneration: config.ImageGeneration,
                 Memory: config.Memory,
                 Canvases: config.Canvases,
                 RequestCanvasRenderer: config.RequestCanvasRenderer,
@@ -1589,11 +1618,13 @@ public async Task<CopilotSession> ResumeSessionAsync(string sessionId, ResumeSes
                 FeatureFlags: config.FeatureFlags,
                 ExpAssignments: config.ExpAssignments,
                 EnableManagedSettings: config.EnableManagedSettings,
+                EnforceManagedModelDefaults: config.EnforceManagedModelDefaults,
                 GitHubMcpToolConfig: config.GitHubMcpToolConfig,
                 ManagedSettings: config.ManagedSettings,
                 EnableGitHubTelemetryForwarding: _options.OnGitHubTelemetry != null ? true : null,
                 AdditionalDirectories: config.AdditionalDirectories,
-                AllowTranscriptRecovery: config.AllowTranscriptRecovery);
+                AllowTranscriptRecovery: config.AllowTranscriptRecovery,
+                HasSkillProvider: config.SkillProvider is not null ? true : null);
 
             var rpcTimestamp = Stopwatch.GetTimestamp();
             var response = await InvokeRpcAsync<ResumeSessionResponse>(
@@ -1807,6 +1838,7 @@ public async Task DeleteSessionAsync(string sessionId, CancellationToken cancell
 
         if (_sessions.TryRemove(sessionId, out var session))
         {
+            session.ClearSkillProvider();
             session.ReleaseGitHubTokenProviderRegistration();
         }
     }
@@ -2225,7 +2257,7 @@ private void ConfigureSessionFsHandlers(CopilotSession session, Func<CopilotSess
                 "SessionFsConfig declares capabilities.binary but the provider does not implement ISessionFsBinaryProvider.");
         }
 
-        session.ClientSessionApis.SessionFs = provider;
+        session.SetSessionFsHandler(provider);
     }
 
     private async Task VerifyProtocolVersionAsync(Connection connection, CancellationToken cancellationToken)
@@ -2532,6 +2564,40 @@ private static void ApplyTelemetryEnvironment(IDictionary<string, string?> envir
         return GetBundledNativePath(OperatingSystem.IsWindows() ? "copilot.exe" : "copilot", out searchedPath);
     }
 
+    private static List<string> BuildInProcessRuntimeArguments(CopilotClientOptions options)
+    {
+        var args = new List<string>();
+        if (options.LogLevel is { } logLevel && !string.IsNullOrEmpty(logLevel.Value))
+        {
+            args.AddRange(["--log-level", logLevel.Value]);
+        }
+        if (!string.IsNullOrEmpty(options.GitHubToken))
+        {
+            args.AddRange(["--auth-token-env", "COPILOT_SDK_AUTH_TOKEN"]);
+        }
+        var useLoggedInUser = options.UseLoggedInUser ?? string.IsNullOrEmpty(options.GitHubToken);
+        if (!useLoggedInUser)
+        {
+            args.Add("--no-auto-login");
+        }
+        if (options.SessionIdleTimeoutSeconds is > 0)
+        {
+            args.AddRange(["--session-idle-timeout", options.SessionIdleTimeoutSeconds.Value.ToString(CultureInfo.InvariantCulture)]);
+        }
+        if (options.EnableRemoteSessions)
+        {
+            args.Add("--remote");
+        }
+
+        var cliLoginSyncIntegrationId =
+            System.Environment.GetEnvironmentVariable("GITHUB_COPILOT_INTEGRATION_ID")?.Trim();
+        if (!string.IsNullOrEmpty(cliLoginSyncIntegrationId))
+        {
+            args.Add($"--cli-login-sync-integration-id={cliLoginSyncIntegrationId}");
+        }
+        return args;
+    }
+
     private static string? GetBundledNativePath(string binaryName, out string searchedPath)
     {
         // Always use portable RID (e.g., linux-x64) to match the build-time placement,
@@ -2753,6 +2819,8 @@ private async Task<Connection> ConnectToServerAsync(Process? cliProcess, string?
             rpc.SetLocalRpcMethod("autoModeSwitch.request", handler.OnAutoModeSwitchRequest);
             rpc.SetLocalRpcMethod("hooks.invoke", handler.OnHooksInvoke);
             rpc.SetLocalRpcMethod("systemMessage.transform", handler.OnSystemMessageTransform);
+            rpc.SetLocalRpcMethod("skillProvider.list", handler.OnSkillProviderList, singleObjectParam: true);
+            rpc.SetLocalRpcMethod("skillProvider.read", handler.OnSkillProviderRead, singleObjectParam: true);
             ClientSessionApiRegistration.RegisterClientSessionApiHandlers(rpc, sessionId =>
             {
                 var session = GetSession(sessionId) ?? throw new ArgumentException($"Unknown session {sessionId}");
@@ -2856,14 +2924,15 @@ private async Task CancelExternalToolsWhenConnectionClosesAsync(JsonRpc rpc)
         CancelPendingExternalTools();
     }
 
-    private void CancelPendingExternalTools()
+    private void CancelPendingExternalTools(IEnumerable<CopilotSession>? sessions = null)
     {
         if (_clientGlobalApis?.LlmInference is LlmInferenceAdapter llmInferenceAdapter)
         {
             llmInferenceAdapter.CancelPending();
         }
-        foreach (var session in _sessions.Values)
+        foreach (var session in sessions ?? _sessions.Values)
         {
+            session.ClearSkillProvider();
             session.CancelPendingExternalTools();
         }
     }
@@ -2911,12 +2980,29 @@ private static JsonSerializerOptions CreateSerializerOptions()
         return session;
     }
 
-    private void RegisterSession(CopilotSession session)
+    private void RegisterSession(CopilotSession session, JsonRpc rpc)
     {
-        if (!_sessions.TryAdd(session.SessionId, session))
+        Exception error;
+        lock (_sessionAdmissionLock)
         {
-            throw new InvalidOperationException($"Session '{session.SessionId}' is already tracked by this client.");
+            // A restarted connection must not admit setup that began on the stopped transport.
+            if (!_sessionAdmissionClosed
+                && _connectionTask?.Status == System.Threading.Tasks.TaskStatus.RanToCompletion
+                && ReferenceEquals(_connectionTask.Result.Rpc, rpc))
+            {
+                if (_sessions.TryAdd(session.SessionId, session))
+                {
+                    return;
+                }
+                error = new InvalidOperationException($"Session '{session.SessionId}' is already tracked by this client.");
+            }
+            else
+            {
+                error = new IOException("Cannot register a session on a stopped connection.");
+            }
         }
+        session.Retire();
+        throw error;
     }
 
     /// <summary>
@@ -3039,6 +3125,32 @@ public async ValueTask<SystemMessageTransformRpcResponse> OnSystemMessageTransfo
             return await session.HandleSystemMessageTransformAsync(sections);
         }
 
+        public async ValueTask<SkillProviderListResult> OnSkillProviderList(SkillProviderListRequest request, CancellationToken cancellationToken)
+        {
+            ArgumentNullException.ThrowIfNull(request);
+            if (string.IsNullOrEmpty(request.SessionId))
+            {
+                throw new ArgumentException("Skill provider list request is missing a session id.");
+            }
+
+            var session = client.GetSession(request.SessionId)
+                ?? throw new InvalidOperationException($"No skill provider for session: {request.SessionId}");
+            return await session.HandleSkillProviderListAsync(cancellationToken);
+        }
+
+        public async ValueTask<SkillProviderReadResult> OnSkillProviderRead(SkillProviderReadRequest request, CancellationToken cancellationToken)
+        {
+            ArgumentNullException.ThrowIfNull(request);
+            if (string.IsNullOrEmpty(request.SessionId) || string.IsNullOrEmpty(request.Name))
+            {
+                throw new ArgumentException("Skill provider read request is missing a session id or skill name.");
+            }
+
+            var session = client.GetSession(request.SessionId)
+                ?? throw new InvalidOperationException($"No skill provider for session: {request.SessionId}");
+            return await session.HandleSkillProviderReadAsync(request.Name, cancellationToken);
+        }
+
     }
 
     private class Connection(
@@ -3117,6 +3229,7 @@ public static string Escape(string arg)
     internal record CreateSessionRequest(
         string? Model,
         string? SessionId,
+        string? Name,
         string? ClientName,
         string? ReasoningEffort,
         ReasoningSummary? ReasoningSummary,
@@ -3176,10 +3289,13 @@ internal record CreateSessionRequest(
         CloudSessionOptions? Cloud = null,
         bool? RefreshCustomInstructions = null,
         IList<string>? InstructionDirectories = null,
+        IList<string>? AgentDirectories = null,
+        IList<string>? HookDirectories = null,
         IList<string>? PluginDirectories = null,
         [property: JsonPropertyName("disabledMcpServers")] IList<string>? DisabledMcpServers = null,
         LargeToolOutputConfig? LargeOutput = null,
         ToolSearchConfig? ToolSearch = null,
+        ImageGenerationConfig? ImageGeneration = null,
         MemoryConfiguration? Memory = null,
 #pragma warning disable GHCP001
         IList<CanvasDeclaration>? Canvases = null,
@@ -3194,10 +3310,12 @@ internal record CreateSessionRequest(
         [property: JsonPropertyName("featureFlags")] IDictionary<string, bool>? FeatureFlags = null,
         [property: JsonPropertyName("expAssignments")] CopilotExpAssignmentResponse? ExpAssignments = null,
         [property: JsonPropertyName("enableManagedSettings")] bool? EnableManagedSettings = null,
+        [property: JsonPropertyName("enforceManagedModelDefaults")] bool? EnforceManagedModelDefaults = null,
         [property: JsonPropertyName("managedSettings")] ManagedSettings? ManagedSettings = null,
         bool? EnableGitHubTelemetryForwarding = null,
         [property: JsonPropertyName("githubMcpToolConfig")] GitHubMcpToolConfig? GitHubMcpToolConfig = null,
-        IList<string>? AdditionalDirectories = null);
+        IList<string>? AdditionalDirectories = null,
+        bool? HasSkillProvider = null);
 #pragma warning restore GHCP001
 
     internal record ToolDefinition(
@@ -3296,10 +3414,13 @@ internal record ResumeSessionRequest(
         RemoteSessionMode? RemoteSession = null,
         bool? ContinuePendingWork = null,
         IList<string>? InstructionDirectories = null,
+        IList<string>? AgentDirectories = null,
+        IList<string>? HookDirectories = null,
         IList<string>? PluginDirectories = null,
         [property: JsonPropertyName("disabledMcpServers")] IList<string>? DisabledMcpServers = null,
         LargeToolOutputConfig? LargeOutput = null,
         ToolSearchConfig? ToolSearch = null,
+        ImageGenerationConfig? ImageGeneration = null,
         MemoryConfiguration? Memory = null,
 #pragma warning disable GHCP001
         IList<CanvasDeclaration>? Canvases = null,
@@ -3315,11 +3436,13 @@ internal record ResumeSessionRequest(
         [property: JsonPropertyName("featureFlags")] IDictionary<string, bool>? FeatureFlags = null,
         [property: JsonPropertyName("expAssignments")] CopilotExpAssignmentResponse? ExpAssignments = null,
         [property: JsonPropertyName("enableManagedSettings")] bool? EnableManagedSettings = null,
+        [property: JsonPropertyName("enforceManagedModelDefaults")] bool? EnforceManagedModelDefaults = null,
         [property: JsonPropertyName("managedSettings")] ManagedSettings? ManagedSettings = null,
         bool? EnableGitHubTelemetryForwarding = null,
         [property: JsonPropertyName("githubMcpToolConfig")] GitHubMcpToolConfig? GitHubMcpToolConfig = null,
         IList<string>? AdditionalDirectories = null,
-        bool? AllowTranscriptRecovery = null);
+        bool? AllowTranscriptRecovery = null,
+        bool? HasSkillProvider = null);
 #pragma warning restore GHCP001
 
     internal record ResumeSessionResponse(
@@ -3407,6 +3530,21 @@ internal record UserInputRequestResponse(
         string Answer,
         bool WasFreeform);
 
+    internal record SkillProviderListRequest(
+        string SessionId);
+
+#pragma warning disable GHCP001
+    internal record SkillProviderListResult(
+        IReadOnlyList<SkillProviderDescriptor> Skills);
+#pragma warning restore GHCP001
+
+    internal record SkillProviderReadRequest(
+        string SessionId,
+        string Name);
+
+    internal record SkillProviderReadResult(
+        [property: JsonIgnore(Condition = JsonIgnoreCondition.Never)] string? Markdown);
+
     internal record AutoModeSwitchRequestResponse(
         AutoModeSwitchResponse Response);
 
@@ -3435,6 +3573,12 @@ internal record HooksInvokeResponse(
     [JsonSerializable(typeof(ExitPlanModeResult))]
     [JsonSerializable(typeof(GetLastSessionIdResponse))]
     [JsonSerializable(typeof(HooksInvokeResponse))]
+    [JsonSerializable(typeof(SkillProviderListRequest))]
+#pragma warning disable GHCP001
+    [JsonSerializable(typeof(SkillProviderListResult))]
+#pragma warning restore GHCP001
+    [JsonSerializable(typeof(SkillProviderReadRequest))]
+    [JsonSerializable(typeof(SkillProviderReadResult))]
     [JsonSerializable(typeof(ListSessionsRequest))]
     [JsonSerializable(typeof(ListSessionsResponse))]
     [JsonSerializable(typeof(GetSessionMetadataRequest))]
diff --git a/dotnet/src/Generated/Rpc.cs b/dotnet/src/Generated/Rpc.cs
index 080abf0116..abd757747b 100644
--- a/dotnet/src/Generated/Rpc.cs
+++ b/dotnet/src/Generated/Rpc.cs
@@ -107,2168 +107,2383 @@ internal sealed class ConnectRequest
     public string? Token { get; set; }
 }
 
-/// <summary>Hosting capabilities and session capacity advertised by an environment.</summary>
+/// <summary>The user's sandbox settings raised to the managed floor.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class EnvironmentCapabilities
+internal sealed class SandboxResolveFlooredConfigResult
 {
-    /// <summary>Advertised Agent Host Protocol version.</summary>
-    [JsonPropertyName("ahpVersion")]
-    public string? AhpVersion { get; set; }
-
-    /// <summary>Current session count, when advertised.</summary>
-    [JsonPropertyName("currentSessions")]
-    public long? CurrentSessions { get; set; }
-
-    /// <summary>Feature identifiers advertised by the environment.</summary>
-    [JsonPropertyName("features")]
-    public IList<string> Features { get => field ??= []; set; }
-
-    /// <summary>Maximum session capacity, when advertised.</summary>
-    [JsonPropertyName("maxSessions")]
-    public long? MaxSessions { get; set; }
+    /// <summary>The floored sandbox config, normalized through the declared sandbox shape so only declared fields in a fixed order are present.</summary>
+    [JsonPropertyName("sandboxJson")]
+    public JsonElement SandboxJson { get; set; }
 }
 
-/// <summary>Safe discovery information. Host-side relay bootstrap credentials are never included.</summary>
+/// <summary>The user's sandbox settings and the managed sandbox floor to raise them to.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class GitHubEnvironment
+internal sealed class SandboxResolveFlooredConfigParams
 {
-    /// <summary>Hosting capabilities advertised by the environment.</summary>
-    [JsonPropertyName("capabilities")]
-    public EnvironmentCapabilities? Capabilities { get; set; }
-
-    /// <summary>Identifier assigned by Mission Control.</summary>
-    [JsonPropertyName("id")]
-    public string Id { get; set; } = string.Empty;
-
-    /// <summary>Compute kind reported by Mission Control.</summary>
-    [JsonPropertyName("kind")]
-    public EnvironmentKind Kind { get; set; }
-
-    /// <summary>Discovery labels attached to the environment.</summary>
-    [JsonPropertyName("labels")]
-    public IDictionary<string, string>? Labels { get; set; }
-
-    /// <summary>Timestamp of the last heartbeat received by Mission Control.</summary>
-    [JsonPropertyName("lastHeartbeatAt")]
-    public string? LastHeartbeatAt { get; set; }
-
-    /// <summary>Human-readable environment name.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
-
-    /// <summary>Organization identifier, when the environment belongs to an organization.</summary>
-    [JsonPropertyName("orgId")]
-    public string? OrgId { get; set; }
-
-    /// <summary>Identifier of the environment owner.</summary>
-    [JsonPropertyName("ownerId")]
-    public string? OwnerId { get; set; }
-
-    /// <summary>Owner category reported by Mission Control.</summary>
-    [JsonPropertyName("ownerType")]
-    public string? OwnerType { get; set; }
+    /// <summary>The effective managed `sandbox` slice acting as a floor. Omitted when no administrator policy applies, in which case the user's own settings stand unchanged.</summary>
+    [JsonPropertyName("managedSandbox")]
+    public JsonElement? ManagedSandbox { get; set; }
 
-    /// <summary>Open-ended operational status vocabulary.</summary>
-    [JsonPropertyName("status")]
-    public string Status { get; set; } = string.Empty;
+    /// <summary>The user's own `sandbox` settings slice. Omitted when the user has configured none, which still yields the managed floor rather than a disabled sandbox.</summary>
+    [JsonPropertyName("userSandbox")]
+    public JsonElement? UserSandbox { get; set; }
 }
 
-/// <summary>Environments visible to the authenticated caller and matching the supplied filters.</summary>
+/// <summary>The prepared file-picker policy, or none when the sandbox is disabled.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class EnvironmentsListResult
+internal sealed class SandboxPreparePickerPolicyResult
 {
-    /// <summary>Safe discovery records without relay bootstrap credentials.</summary>
-    [JsonPropertyName("environments")]
-    public IList<GitHubEnvironment> Environments { get => field ??= []; set; }
+    /// <summary>The prepared policy to pass back to `sandbox.filterPickerCandidates`. Absent when the sandbox is disabled or absent, in which case filtering keeps every candidate.</summary>
+    [JsonPropertyName("sandboxJson")]
+    public JsonElement? SandboxJson { get; set; }
 }
 
-/// <summary>Optional discovery filters supported by GitHub Mission Control.</summary>
+/// <summary>The working directory and sandbox settings to build a file-picker policy from.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class EnvironmentsListRequest
+internal sealed class SandboxPreparePickerPolicyParams
 {
-    /// <summary>Restrict discovery to this compute kind.</summary>
-    [JsonPropertyName("kind")]
-    public EnvironmentKind? Kind { get; set; }
+    /// <summary>The session's working directory. Git discovery and grant canonicalization are resolved against it.</summary>
+    [JsonPropertyName("cwd")]
+    public string Cwd { get; set; } = string.Empty;
 
-    /// <summary>Operational status, such as online, offline, degraded, waking, or draining.</summary>
-    [JsonPropertyName("status")]
-    public string? Status { get; set; }
+    /// <summary>The session's resolved `sandbox` slice. Omitted, or disabled, yields no policy and every candidate is kept.</summary>
+    [JsonPropertyName("sandbox")]
+    public JsonElement? Sandbox { get; set; }
 }
 
-/// <summary>Safe discovery information for the requested environment.</summary>
+/// <summary>Per-candidate allow decisions, positionally aligned with the request.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class EnvironmentsGetResult
+internal sealed class SandboxFilterPickerCandidatesResult
 {
-    /// <summary>The requested environment without relay bootstrap credentials.</summary>
-    [JsonPropertyName("environment")]
-    public GitHubEnvironment Environment { get => field ??= new(); set; }
+    /// <summary>One decision per candidate, in the same order. Always the same length as the request's `candidates`.</summary>
+    [JsonPropertyName("allowed")]
+    public IList<bool> Allowed { get => field ??= []; set; }
 }
 
-/// <summary>Identify a Mission Control environment to retrieve.</summary>
+/// <summary>One file-picker suggestion offered up for the sandbox filesystem check.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class EnvironmentsGetRequest
+internal sealed class SandboxPickerCandidate
 {
-    /// <summary>Identifier assigned by Mission Control.</summary>
-    [JsonPropertyName("environmentId")]
-    public string EnvironmentId { get; set; } = string.Empty;
+    /// <summary>Whether the suggestion is a directory. A directory the policy does not itself allow may still be needed as a waypoint to an allowed subtree.</summary>
+    [JsonPropertyName("isDirectory")]
+    public bool IsDirectory { get; set; }
+
+    /// <summary>Absolute path the suggestion would attach.</summary>
+    [JsonPropertyName("path")]
+    public string Path { get; set; } = string.Empty;
 }
 
-/// <summary>Acknowledgement that the requested environment was deleted.</summary>
+/// <summary>A batch of file-picker candidates to check against a prepared policy.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class EnvironmentsDeleteResult
+internal sealed class SandboxFilterPickerCandidatesParams
 {
+    /// <summary>The candidates to check, in the order the answers are returned.</summary>
+    [JsonPropertyName("candidates")]
+    public IList<SandboxPickerCandidate> Candidates { get => field ??= []; set; }
+
+    /// <summary>The session's working directory, matching the one the policy was prepared from.</summary>
+    [JsonPropertyName("cwd")]
+    public string Cwd { get; set; } = string.Empty;
+
+    /// <summary>The policy returned by `sandbox.preparePickerPolicy`. Omitted keeps every candidate.</summary>
+    [JsonPropertyName("sandbox")]
+    public JsonElement? Sandbox { get; set; }
 }
 
-/// <summary>Identify a user-managed Mission Control environment to delete.</summary>
+/// <summary>The sandbox a named feature actually launches under.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class EnvironmentsDeleteRequest
+internal sealed class SandboxEffectiveForOptionalResult
 {
-    /// <summary>User-managed environment to delete. GitHub-managed environments cannot be deleted.</summary>
-    [JsonPropertyName("environmentId")]
-    public string EnvironmentId { get; set; } = string.Empty;
+    /// <summary>The effective sandbox config for the requested feature, or a disabled sandbox when the feature is routed out of it.</summary>
+    [JsonPropertyName("sandboxJson")]
+    public JsonElement SandboxJson { get; set; }
 }
 
-/// <summary>The existing runtime identity and its resource on the listener.</summary>
+/// <summary>A sandbox config and the per-feature routing flag to resolve it for.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class HostPublishSessionResult
+internal sealed class SandboxEffectiveForOptionalParams
 {
-    /// <summary>Canonical runtime ID of the published session.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>The routing flag naming the feature being launched, such as `sandboxMcpServers` or `sandboxLspServers`.</summary>
+    [JsonPropertyName("routingFlag")]
+    public string RoutingFlag { get; set; } = string.Empty;
 
-    /// <summary>AHP resource URI for the session on this listener.</summary>
-    [JsonPropertyName("sessionUri")]
-    public string SessionUri { get; set; } = string.Empty;
+    /// <summary>The session's resolved `sandbox` slice. Omitted when the host has none, which yields a disabled sandbox rather than an error.</summary>
+    [JsonPropertyName("sandbox")]
+    public JsonElement? Sandbox { get; set; }
 }
 
-/// <summary>Publishes a resident session attached to the listener's owning connection.</summary>
+/// <summary>The startup warning, absent when the machine can run a sandbox.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class HostPublishSessionRequest
+internal sealed class SandboxUnsupportedStartupNoticeResult
 {
-    /// <summary>Listener UUID returned by host.start.</summary>
-    [JsonPropertyName("hostId")]
-    public string HostId { get; set; } = string.Empty;
-
-    /// <summary>Canonical runtime session ID attached to the listener's owning connection.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>The user-facing warning, carrying the platform remedy and the recovery the policy in force actually allows. Absent when this machine supports a sandbox, so a host can call unconditionally and print only what it gets.</summary>
+    [JsonPropertyName("notice")]
+    public string? Notice { get; set; }
 }
 
-/// <summary>The resident session the application has materialized on its own connection.</summary>
+/// <summary>The managed sandbox policy in force, which selects which remedy the notice offers.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class HostCreateSessionResult
+internal sealed class SandboxUnsupportedStartupNoticeParams
 {
-    /// <summary>Runtime session UUID materialized on the application's SDK connection.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>True when the sandbox stayed on only because the managed policy could not be determined. Distinguishes a policy that positively enforces the sandbox from one that merely failed to resolve, which is the difference between telling the user to contact an administrator and telling them to wait. Defaults to false.</summary>
+    [JsonPropertyName("enabledByUndeterminedPolicy")]
+    public bool? EnabledByUndeterminedPolicy { get; set; }
+
+    /// <summary>The managed `sandbox` slice, when a policy supplies one. The notice treats the sandbox as enforced only when this both enables it and sets `failIfUnavailable`, because a managed sandbox that tolerates being unavailable still leaves the user able to turn it off.</summary>
+    [JsonPropertyName("managedSandbox")]
+    public JsonElement? ManagedSandbox { get; set; }
 }
 
-/// <summary>One application-owned session handoff, requested by the supervised hosting participant.</summary>
+/// <summary>One slash command, as typed, to test against the enforcement-block allowlist.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class HostCreateSessionRequest
+internal sealed class SandboxEnforcementCommandAllowedParams
 {
-    /// <summary>Host-selected SDK creation or resume settings, without executable callbacks or tools.</summary>
-    [JsonPropertyName("config")]
-    public IDictionary<string, JsonElement> Config { get => field ??= new Dictionary<string, JsonElement>(); set; }
-
-    /// <summary>Unique identity for this participation, independent of the session lifetime.</summary>
-    [JsonPropertyName("handoffId")]
-    public string HandoffId { get; set; } = string.Empty;
+    /// <summary>The command's arguments, in order. Pass an empty array for a bare command: several entries in the allowlist admit the bare form and refuse every argument.</summary>
+    [JsonPropertyName("args")]
+    public IList<string> Args { get => field ??= []; set; }
 
-    /// <summary>Resume an app-owned durable session instead of creating a new session.</summary>
-    [JsonPropertyName("resume")]
-    public bool? Resume { get; set; }
+    /// <summary>The command name as the user typed it, with or without its leading slash.</summary>
+    [JsonPropertyName("commandName")]
+    public string CommandName { get; set; } = string.Empty;
 }
 
-/// <summary>Empty acknowledgement for a completed host lifecycle operation.</summary>
+/// <summary>The documentation URL a host cites when it declines or downgrades a sandbox setting.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class HostReleaseSessionResult
+internal sealed class SandboxDocsUrlResult
 {
+    /// <summary>Documentation URL describing the sandbox and the settings that control it.</summary>
+    [JsonPropertyName("url")]
+    public string Url { get; set; } = string.Empty;
 }
 
-/// <summary>Ends one participation, not the application's session lifetime.</summary>
+/// <summary>Whether this host can run one sandbox policy feature. A session whose effective policy uses an unsupported feature fails each sandboxed command with `reason`, except `filesystem_enumeration`, whose absence degrades sandboxed PowerShell instead of failing it.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class HostReleaseSessionRequest
+public sealed class SandboxHostCapability
 {
-    /// <summary>Identity of the participation to release without destroying the session.</summary>
-    [JsonPropertyName("handoffId")]
-    public string HandoffId { get; set; } = string.Empty;
+    /// <summary>The policy feature, as an extensible string: ignore names you do not recognize. Known values: `network` (sandboxed commands can reach the network; on Linux this needs the tooling for Bubblewrap's private network namespace, such as slirp4netns), `network_filtering` (host rules and the sandbox proxy; on Linux this needs the same tooling as `network`; on Windows it needs Process Security Environment 1.1 host-loopback support or MXC's PSEC 1.0-only proxy-loopback compatibility capability, and a policy that uses it must also set `network.allowLocalNetwork`; compatibility applies only to an explicit identity-less runtime proxy, not general host-loopback access, and other policy restrictions still apply), `denied_paths` (native enforcement of `filesystem.deniedPaths`), `shell` (shell commands inside the sandbox), and `filesystem_enumeration` (enumerate-only filesystem grants; on Windows this needs Process Security Environment 1.1 filesystem enumeration support, and without it sandboxed PowerShell still runs but cannot resolve its current location; other platforms always report it).</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
+
+    /// <summary>Human-readable reason and remedy when the feature is unsupported, such as a package to install or an OS update. Present only when `supported` is false.</summary>
+    [JsonPropertyName("reason")]
+    public string? Reason { get; set; }
+
+    /// <summary>Whether this host can run the feature.</summary>
+    [JsonPropertyName("supported")]
+    public bool Supported { get; set; }
 }
 
-/// <summary>Listener readiness, returned only after binding and the supervised participant's SDK handshake.</summary>
+/// <summary>Whether the host running this runtime can run the command sandbox. The runtime checks `supported` once per process. A capability answer can change while the process runs, for example after the user installs a missing package.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class HostStartResult
+public sealed class SandboxHostSupport
 {
-    /// <summary>GitHub Mission Control environment ID, present when its relay transport is ready.</summary>
-    [JsonPropertyName("environmentId")]
-    public string? EnvironmentId { get; set; }
-
-    /// <summary>Caller-generated listener UUID.</summary>
-    [JsonPropertyName("hostId")]
-    public string HostId { get; set; } = string.Empty;
-
-    /// <summary>Separate host process ID, when provided by a legacy runtime. Absent for in-process listeners.</summary>
-    [JsonPropertyName("pid")]
-    public long? Pid { get; set; }
+    /// <summary>Sandbox policy features whose availability varies between hosts that can run the backend. Empty when `supported` is false, because no feature can run without a backend. Later runtimes can add entries; ignore an entry whose `name` you do not recognize.</summary>
+    [JsonPropertyName("capabilities")]
+    public IList<SandboxHostCapability> Capabilities { get => field ??= []; set; }
 
-    /// <summary>Secret connection token, absent when authentication is disabled.</summary>
-    [JsonPropertyName("token")]
-    public string? Token { get; set; }
+    /// <summary>Human-readable reason the sandbox cannot run on this host. Present only when `supported` is false.</summary>
+    [JsonPropertyName("reason")]
+    public string? Reason { get; set; }
 
-    /// <summary>Actual bound WebSocket URL, including the allocated port.</summary>
-    [JsonPropertyName("url")]
-    public string? Url { get; set; }
+    /// <summary>Whether a process-containment backend is usable on this host: Seatbelt on macOS, Bubblewrap on Linux, or ProcessContainer on Windows.</summary>
+    [JsonPropertyName("supported")]
+    public bool Supported { get; set; }
 }
 
-/// <summary>GitHub Mission Control registration options. The compute ID is application-owned and stable.</summary>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class HostGitHubEnvironmentOptions
+public sealed class SandboxConfigAuth
 {
-    /// <summary>Stable application installation identity, reused across host restarts.</summary>
-    [JsonPropertyName("computeId")]
-    public string ComputeId { get; set; } = string.Empty;
+    /// <summary>Whether to authenticate sandboxed gh through the local masking proxy. The child receives a fake GH_TOKEN; its real value is substituted only at github.com, api.github.com and uploads.github.com (github.com because gh repo clone authenticates git through gh auth git-credential). The repository's GitHub account takes precedence over the Copilot login. Default: false (opt-in).</summary>
+    [JsonPropertyName("gh")]
+    public bool? Gh { get; set; }
 
-    /// <summary>Human-readable environment display name.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Whether to authenticate sandboxed HTTPS git through the local masking proxy. The child receives a fake `http.&lt;url&gt;.extraheader`; the real Authorization header is substituted only at its original HTTPS host, port, and repository path scope. github.com uses the Copilot token; other forges use credentials resolved from the user's own helper on the host. Default: false (opt-in).</summary>
+    [JsonPropertyName("git")]
+    public bool? Git { get; set; }
 }
 
-/// <summary>Local WebSocket transport options.</summary>
+/// <summary>Destinations authorized to receive one masked environment credential.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class HostLocalServerOptions
+public sealed class SandboxMaskedEnvVar
 {
-    /// <summary>Listener hostname. Defaults to 127.0.0.1; explicit non-loopback binds are allowed.</summary>
-    [JsonPropertyName("hostname")]
-    public string? Hostname { get; set; }
-
-    /// <summary>Listener port. Omitted or zero requests an OS-allocated port.</summary>
-    [JsonPropertyName("port")]
-    public int? Port { get; set; }
-
-    /// <summary>Require token authentication (default true). Cannot be false with a token.</summary>
-    [JsonPropertyName("requireConnectionToken")]
-    public bool? RequireConnectionToken { get; set; }
-
-    /// <summary>Nonempty connection token. Generated randomly when required and omitted.</summary>
-    [JsonPropertyName("token")]
-    public string? Token { get; set; }
+    /// <summary>Nonempty list of HTTPS injection hostnames or *.example.com patterns. Bare * is not accepted. These grants never override the sandbox network policy. Values in plaintext HTTP requests, URLs, bodies, encoded credentials, and signed requests are not substituted.</summary>
+    [JsonPropertyName("injectHosts")]
+    public IList<string> InjectHosts { get => field ??= []; set; }
 }
 
-/// <summary>Starts a supervised AHP host with at least one explicitly selected transport.</summary>
+/// <summary>Whole-value environment credential masking for sandboxed children.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class HostStartRequest
+public sealed class SandboxCredentialsConfig
 {
-    /// <summary>Registers a GitHub Mission Control environment and enables its relay transport.</summary>
-    [JsonPropertyName("githubEnvironment")]
-    public HostGitHubEnvironmentOptions? GitHubEnvironment { get; set; }
-
-    /// <summary>Caller-generated UUID identifying this connection-owned listener.</summary>
-    [JsonPropertyName("hostId")]
-    public string HostId { get; set; } = string.Empty;
-
-    /// <summary>Enables a local WebSocket listener.</summary>
-    [JsonPropertyName("localServer")]
-    public HostLocalServerOptions? LocalServer { get; set; }
-
-    /// <summary>Ask the owning application to resume its durable AHP sessions.</summary>
-    [JsonPropertyName("resumeFactory")]
-    public bool? ResumeFactory { get; set; }
-
-    /// <summary>Ask the owning SDK application to materialize AHP sessions.</summary>
-    [JsonPropertyName("sessionFactory")]
-    public bool? SessionFactory { get; set; }
+    /// <summary>Environment variable names and their HTTPS injection destinations. Absent variables stay absent. No real values or sentinels are stored in this map.</summary>
+    [JsonPropertyName("envVars")]
+    public IDictionary<string, SandboxMaskedEnvVar> EnvVars { get => field ??= new Dictionary<string, SandboxMaskedEnvVar>(); set; }
 }
 
-/// <summary>Empty acknowledgement for a completed host lifecycle operation.</summary>
+/// <summary>macOS seatbelt experimental options.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class HostDisposeResult
+public sealed class SandboxConfigUserPolicyExperimentalSeatbelt
 {
+    /// <summary>Whether the macOS seatbelt profile may access the keychain.</summary>
+    [JsonPropertyName("keychainAccess")]
+    public bool? KeychainAccess { get; set; }
 }
 
-/// <summary>Stops a connection-owned listener and joins its teardown.</summary>
+/// <summary>Platform-specific experimental policy fields.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class HostDisposeRequest
+public sealed class SandboxConfigUserPolicyExperimental
 {
-    /// <summary>Listener UUID. Unknown or successfully stopped IDs are harmless.</summary>
-    [JsonPropertyName("hostId")]
-    public string HostId { get; set; } = string.Empty;
+    /// <summary>macOS seatbelt experimental options.</summary>
+    [JsonPropertyName("seatbelt")]
+    public SandboxConfigUserPolicyExperimentalSeatbelt? Seatbelt { get; set; }
 }
 
-/// <summary>Private credentials delivered only to a runtime-owned Mission Control hosting participant.</summary>
+/// <summary>Filesystem rules to merge into the base policy.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class HostGetEnvironmentCredentialsResult
+public sealed class SandboxConfigUserPolicyFilesystem
 {
-    /// <summary>GitHub API base URL for the authenticated service.</summary>
-    [JsonPropertyName("githubApiUrl")]
-    public string GitHubApiUrl { get; set; } = string.Empty;
+    /// <summary>Whether to clear the policy when the session exits.</summary>
+    [JsonPropertyName("clearPolicyOnExit")]
+    public bool? ClearPolicyOnExit { get; set; }
 
-    /// <summary>Hostname of the authenticated GitHub service.</summary>
-    [JsonPropertyName("githubHost")]
-    public string GitHubHost { get; set; } = string.Empty;
+    /// <summary>Paths explicitly denied.</summary>
+    [JsonPropertyName("deniedPaths")]
+    public IList<string>? DeniedPaths { get; set; }
 
-    /// <summary>Mission Control API origin for environment registration and management.</summary>
-    [JsonPropertyName("missionControlUrl")]
-    public string MissionControlUrl { get; set; } = string.Empty;
+    /// <summary>Paths granted read-only access.</summary>
+    [JsonPropertyName("readonlyPaths")]
+    public IList<string>? ReadonlyPaths { get; set; }
 
-    /// <summary>Current bearer token for the authenticated GitHub identity.</summary>
-    [JsonPropertyName("token")]
-    public string Token { get; set; } = string.Empty;
+    /// <summary>Paths granted read/write access.</summary>
+    [JsonPropertyName("readwritePaths")]
+    public IList<string>? ReadwritePaths { get; set; }
 }
 
-/// <summary>Normalized local WebSocket listener settings.</summary>
+/// <summary>HTTP proxy configuration for sandboxed traffic.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class HostLocalServerConfiguration
+public sealed class SandboxConfigUserPolicyNetworkProxy
 {
-    /// <summary>Hostname or IP address to bind.</summary>
-    [JsonPropertyName("hostname")]
-    public string Hostname { get; set; } = string.Empty;
-
-    /// <summary>Port to bind, with zero requesting OS allocation.</summary>
-    [JsonPropertyName("port")]
-    public int Port { get; set; }
+    /// <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>Whether the listener requires token authentication.</summary>
-    [JsonPropertyName("requireConnectionToken")]
-    public bool RequireConnectionToken { 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; an explicit port must be between 1 and 65535. 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 proxy 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>Secret connection token, absent when authentication is disabled.</summary>
-    [JsonPropertyName("token")]
-    public string? Token { 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>Normalized listener settings delivered only to the supervised hosting participant.</summary>
+/// <summary>Network rules to merge into the base policy.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class HostGetConfigurationResult
+public sealed class SandboxConfigUserPolicyNetwork
 {
-    /// <summary>Requested GitHub Mission Control registration.</summary>
-    [JsonPropertyName("githubEnvironment")]
-    public HostGitHubEnvironmentOptions? GitHubEnvironment { get; set; }
+    /// <summary>Hosts allowed through the built-in sandbox proxy. A non-empty list denies unmatched hosts; an absent or empty list allows all hosts not blocked. Supports exact hostnames, IP addresses, and *.example.com for strict subdomains. Host rules do not override the outbound or local-network toggles.</summary>
+    [JsonPropertyName("allowedHosts")]
+    public IList<string>? AllowedHosts { get; set; }
 
-    /// <summary>Normalized local listener settings, absent for relay-only hosts.</summary>
-    [JsonPropertyName("localServer")]
-    public HostLocalServerConfiguration? LocalServer { get; set; }
+    /// <summary>Whether traffic to local/loopback addresses is allowed.</summary>
+    [JsonPropertyName("allowLocalNetwork")]
+    public bool? AllowLocalNetwork { get; set; }
 
-    /// <summary>Whether app-owned durable sessions are resumed by the owning application.</summary>
-    [JsonPropertyName("resumeFactory")]
-    public bool ResumeFactory { get; set; }
+    /// <summary>Whether outbound network traffic is allowed at all.</summary>
+    [JsonPropertyName("allowOutbound")]
+    public bool? AllowOutbound { get; set; }
 
-    /// <summary>Whether session materialization is delegated to the owning application.</summary>
-    [JsonPropertyName("sessionFactory")]
-    public bool SessionFactory { get; set; }
+    /// <summary>Hosts denied by the built-in sandbox proxy. Deny rules take precedence over allowedHosts. A domain also denies all its subdomains. IP addresses match exactly; *.example.com matches strict subdomains, and * denies every host.</summary>
+    [JsonPropertyName("blockedHosts")]
+    public IList<string>? BlockedHosts { get; set; }
+
+    /// <summary>HTTP(S) proxy for sandboxed traffic. This is the built-in local proxy's upstream: every sandboxed command reaches it through a loopback listener, so credentials stay in the runtime and never reach the child. On Windows the sandbox also needs local network access, because it reaches that listener over host loopback. Configure credentials in the separate username/password fields. The transient local listener URL is never persisted.</summary>
+    [JsonPropertyName("proxy")]
+    public SandboxConfigUserPolicyNetworkProxy? Proxy { get; set; }
 }
 
-/// <summary>Empty acknowledgement for a completed host lifecycle operation.</summary>
+/// <summary>macOS seatbelt-specific options.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class HostReadyResult
+public sealed class SandboxConfigUserPolicySeatbelt
 {
+    /// <summary>Whether the macOS seatbelt profile may access the keychain.</summary>
+    [JsonPropertyName("keychainAccess")]
+    public bool? KeychainAccess { get; set; }
 }
 
-/// <summary>Readiness reported by the supervised hosting participant on its own SDK connection.</summary>
+/// <summary>User-managed sandbox policy fragment merged into the auto-discovered base policy.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class HostReadyRequest
+public sealed class SandboxConfigUserPolicy
 {
-    /// <summary>Actual bound WebSocket URL.</summary>
-    [JsonPropertyName("address")]
-    public string? Address { get; set; }
+    /// <summary>Deprecated legacy location for `seatbelt`; read only when the top-level `seatbelt` is absent.</summary>
+    [JsonPropertyName("experimental")]
+    public SandboxConfigUserPolicyExperimental? Experimental { get; set; }
 
-    /// <summary>Registered environment ID, reported only once the relay transport is connected.</summary>
-    [JsonPropertyName("environmentId")]
-    public string? EnvironmentId { get; set; }
+    /// <summary>Filesystem rules to merge into the base policy.</summary>
+    [JsonPropertyName("filesystem")]
+    public SandboxConfigUserPolicyFilesystem? Filesystem { get; set; }
 
-    /// <summary>Configured secret token, absent when authentication is disabled.</summary>
-    [JsonPropertyName("token")]
-    public string? Token { 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>One server-discovered hook action from user, repository, plugin, or managed-policy configuration.</summary>
+/// <summary>Resolved sandbox configuration.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class DiscoveredHook
+public sealed class SandboxConfig
 {
-    /// <summary>Durable content hash used by hook enablement. Identical actions may intentionally share this key. Omitted when changing the user's disabled-hooks setting cannot change the action's current server-discovered state, including managed-policy hooks, session-start prompt actions, actions suppressed by disable-all settings, and projectless plugin actions that require project-directory expansion.</summary>
-    [JsonPropertyName("disableKey")]
-    public string? DisableKey { get; set; }
+    /// <summary>Whether to auto-add the current working directory to readwritePaths. Default: true.</summary>
+    [JsonPropertyName("addCurrentWorkingDirectory")]
+    public bool? AddCurrentWorkingDirectory { get; set; }
 
-    /// <summary>Whether this action is enabled under the server-side discovery settings. Concrete sessions may differ because they can add session-specific directories, plugins, or trust. False when its disable key is present in the user's disabled-hooks setting or disable-all settings suppress the action.</summary>
+    /// <summary>Whether the agent may request that an individual command run outside the sandbox, which the host then approves or denies through the usual permission flow. A host capability flag rather than part of the policy: it is stripped from the effective spawn policy and only has an effect while `enabled` is true. Fail-closed, unlike the opt-out flags on this object: omitting it offers no bypass. Default: false (opt-in).</summary>
+    [JsonPropertyName("allowBypass")]
+    public bool? AllowBypass { get; set; }
+
+    /// <summary>Whether to auto-grant read access to tool directories discovered on PATH and in toolchain environment variables (GOROOT, JAVA_HOME, VIRTUAL_ENV, and similar), and to common developer-tool caches, config, and toolchains. Writable grants cover scratch caches, the Unix GitHub CLI cache, and Cargo's registry, git store, and lock/tracker files. A relocated CARGO_HOME gets the same narrow split: registry and git are read-write; bin is read-only; the home root, config.toml, and credentials.toml stay ungranted. Set to false to disable every grant listed above; user-installed toolchains and caches then need explicit userPolicy.filesystem readonlyPaths and readwritePaths entries. The working directory (see addCurrentWorkingDirectory), temporary storage, session log paths, and system locations follow their own rules and stay granted. 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>Opt-in whole-value environment masking for sandboxed shell, MCP, and LSP children. Configured names get random sentinels; the local proxy substitutes them only in HTTPS request headers at their injection hosts. Approved bypasses skip masking and the sandbox proxy, so bypassed shells may receive the real environment values. Disabled or explicitly opted-out routes are not protected. No credential values are stored in this configuration.</summary>
+    [JsonPropertyName("credentials")]
+    public SandboxCredentialsConfig? Credentials { get; set; }
+
+    /// <summary>Whether sandboxing is enabled for the session.</summary>
     [JsonPropertyName("enabled")]
     public bool Enabled { get; set; }
 
-    /// <summary>Hook event that invokes this action.</summary>
-    [JsonPropertyName("hookType")]
-    public HookType HookType { get; set; }
+    /// <summary>The `sandboxLspServers` counterpart of `managedMcpRoutingLocked`.</summary>
+    [JsonInclude]
+    [JsonPropertyName("managedLspRoutingLocked")]
+    internal bool? ManagedLspRoutingLocked { get; set; }
 
-    /// <summary>Deterministic identifier for this server-discovered action row. It remains stable while the project, origin, source, event, action content, and duplicate ordinal are unchanged. This is row identity, not the key persisted in disabledHooks.</summary>
-    [JsonPropertyName("id")]
-    public string Id { get; set; } = string.Empty;
+    /// <summary>Set by the runtime when a managed policy forced `sandboxMcpServers` on and took the local opt-out away. Provenance rather than policy: it lets a sandbox startup failure point at the administrator instead of a setting the next managed merge would override, and it is ignored when comparing two configs for change. Only the managed merge may set it; a caller-supplied value is stripped.</summary>
+    [JsonInclude]
+    [JsonPropertyName("managedMcpRoutingLocked")]
+    internal bool? ManagedMcpRoutingLocked { get; set; }
 
-    /// <summary>Configuration tier that contributed this hook action.</summary>
-    [JsonPropertyName("origin")]
-    public HookOrigin Origin { get; set; }
+    /// <summary>Whether language servers the session launches are confined by the sandbox. Only an explicit `false` opts out. Ignored while `enabled` is false. Default: true (enabled by default; set to false to opt out).</summary>
+    [JsonPropertyName("sandboxLspServers")]
+    public bool? SandboxLspServers { get; set; }
 
-    /// <summary>Input project path for which this server-side action was resolved. Set on every row returned for project-scoped discovery, including repeated user and policy actions.</summary>
-    [JsonPropertyName("projectPath")]
-    public string? ProjectPath { get; set; }
+    /// <summary>Whether MCP servers the session launches are confined by the sandbox. Only an explicit `false` opts out; doing so also lets remote-MCP egress leave the sandbox, so the flag and `enabled` are always read together. Ignored while `enabled` is false. Default: true (enabled by default; set to false to opt out).</summary>
+    [JsonPropertyName("sandboxMcpServers")]
+    public bool? SandboxMcpServers { get; set; }
 
-    /// <summary>Human-readable source label, such as a hook file path, settings source, or plugin name.</summary>
-    [JsonPropertyName("source")]
-    public string? Source { get; set; }
+    /// <summary>User-managed sandbox policy fragment merged into the auto-discovered base policy.</summary>
+    [JsonPropertyName("userPolicy")]
+    public SandboxConfigUserPolicy? UserPolicy { get; set; }
 }
 
-/// <summary>Server-discovered hook actions and partial-load diagnostics from user, repository, plugin, and managed-policy sources. Concrete sessions may include additional session-specific hook sources.</summary>
+/// <summary>Identifies the credential hosts that the persistent certificate authority of the sandbox credential proxy must cover. The runtime always adds the hosts from the saved user settings.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class HooksDiscoverResult
+internal sealed class SandboxProxyCaRequest
 {
-    /// <summary>Errors for hook sources or actions that could not be loaded, making the result partially incomplete. Other valid actions are still returned. Project-resolution and repository-settings errors are prefixed with their project path.</summary>
-    [JsonPropertyName("errors")]
-    public IList<string> Errors { get => field ??= []; set; }
+    /// <summary>The sandbox configuration that the host gives its sessions. The runtime reads the credential hosts from `auth` and `credentials`; it ignores `enabled` and the other fields.</summary>
+    [JsonPropertyName("sandboxConfig")]
+    public SandboxConfig? SandboxConfig { get; set; }
+}
 
-    /// <summary>All discovered hook actions. Byte-identical actions remain separate rows even when they share a disable key.</summary>
-    [JsonPropertyName("hooks")]
-    public IList<DiscoveredHook> Hooks { get => field ??= []; set; }
+/// <summary>Status of the persistent certificate authority of the sandbox credential proxy.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class SandboxProxyCaStatus
+{
+    /// <summary>Whether this process can add the certificate authority to OS trust without credentials from a different user. False where OS trust is unsupported, and on Windows when the process cannot elevate itself to write the machine trust store. When false, do not offer to set up the certificate authority.</summary>
+    [JsonPropertyName("canInstall")]
+    public bool CanInstall { get; set; }
 
-    /// <summary>Non-fatal source-loading warnings. Discovery remains complete for the affected source, although the source had a recoverable issue. Repository-settings warnings are prefixed with their project path when attribution is available.</summary>
-    [JsonPropertyName("warnings")]
-    public IList<string> Warnings { get => field ??= []; set; }
+    /// <summary>Human-readable reason for the state. On `installed` or `notInstalled`, present only when the certificate authority must be rotated, and then says why.</summary>
+    [JsonPropertyName("detail")]
+    public string? Detail { get; set; }
+
+    /// <summary>The state of the certificate authority.</summary>
+    [JsonPropertyName("state")]
+    public SandboxProxyCaState State { get; set; }
 }
 
-/// <summary>Optional project paths and host-exclusion behavior for server-scoped hook discovery.</summary>
+/// <summary>Result of creating the persistent certificate authority of the sandbox credential proxy.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class HooksDiscoverRequest
+public sealed class SandboxProxyCaCreateResult
 {
-    /// <summary>When true, omit host-owned user and plugin hook rows and their diagnostics. Managed-policy hooks and trusted repository hooks remain visible, and host disabledHooks still contribute to each remaining row's effective enabled state. This filters sources rather than simulating a host with no settings.</summary>
-    [JsonPropertyName("excludeHostHooks")]
-    public bool? ExcludeHostHooks { get; set; }
-
-    /// <summary>Optional project directory paths whose trusted repository and project-expanded plugin hooks should be discovered. When omitted or empty, user, managed-policy, and globally enabled installed or explicit plugin hooks are returned without project expansion.</summary>
-    [JsonPropertyName("projectPaths")]
-    public IList<string>? ProjectPaths { get; set; }
+    /// <summary>Absolute path of the public certificate of the certificate authority, in PEM format.</summary>
+    [JsonPropertyName("certificatePath")]
+    public string CertificatePath { get; set; } = string.Empty;
 }
 
-/// <summary>Active server-driven promotion for a model, including its discount and optional expiry.</summary>
+/// <summary>Where this runtime keeps the sandbox proxy password.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ModelBillingPromo
+internal sealed class SandboxProxySecretLocation
 {
-    /// <summary>Percentage discount (0-100) applied while the promotion is active. May be fractional.</summary>
-    [JsonPropertyName("discountPercent")]
-    public double? DiscountPercent { get; set; }
+    /// <summary>Absolute path of the credential store holding the sandbox proxy password. The proxy password belongs to no MCP server, so it is kept in its own directory rather than in the MCP secret store.</summary>
+    [JsonPropertyName("configDir")]
+    public string ConfigDir { get; set; } = string.Empty;
 
-    /// <summary>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.</summary>
-    [JsonPropertyName("endsAt")]
-    public string? EndsAt { get; set; }
+    /// <summary>Identifier of the proxy password entry within that store. Derived from the configuration directory, so two Copilot homes on one machine never share an entry. Use it to recognize a `${secret:…}` reference in stored settings as this runtime's own proxy password.</summary>
+    [JsonPropertyName("secretId")]
+    public string SecretId { get; set; } = string.Empty;
+}
 
-    /// <summary>Stable identifier for the promotion campaign.</summary>
-    [JsonPropertyName("id")]
-    public string? Id { get; set; }
+/// <summary>The stored sandbox proxy password, if one is present.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class SandboxProxySecretGetResult
+{
+    /// <summary>The stored password. Absent when no entry exists in either the keychain or the on-disk fallback store.</summary>
+    [JsonPropertyName("value")]
+    public string? Value { get; set; }
+}
 
-    /// <summary>Human-readable promotion message. Does not include the expiry timestamp; consumers may format endsAt and append it when present.</summary>
-    [JsonPropertyName("message")]
-    public string? Message { get; set; }
-
-    /// <summary>Whether the service asked hosts to give this promotion a prominent surface, such as a dedicated banner, in addition to listing it with the model. `true` requests that surface and `false` asks for the model list only. Absent means the service expressed no preference — for example a response that predates the field — so hosts should apply their own default rather than read it as `false`.</summary>
-    [JsonPropertyName("showBanner")]
-    public bool? ShowBanner { get; set; }
+/// <summary>Where the sandbox proxy password was stored.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class SandboxProxySecretSaveResult
+{
+    /// <summary>Whether the OS keychain accepted the value. False means it was written to the on-disk fallback store instead, which is still readable by `sandbox.proxySecret.get`.</summary>
+    [JsonPropertyName("storedInKeychain")]
+    public bool StoredInKeychain { get; set; }
 }
 
-/// <summary>Long context tier pricing (available for models with extended context windows).</summary>
+/// <summary>The sandbox proxy password to store.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ModelBillingTokenPricesLongContext
+internal sealed class SandboxProxySecretSaveRequest
 {
-    /// <summary>Use cacheReadPrice instead. AI Credits cost per billing batch of cached tokens.</summary>
-    [EditorBrowsable(EditorBrowsableState.Never)]
-#if NET5_0_OR_GREATER
-    [Obsolete("This member is deprecated and will be removed in a future version.", DiagnosticId = "GHCP001")]
-#else
-    [Obsolete("This member is deprecated and will be removed in a future version.")]
-#endif
-    [JsonPropertyName("cachePrice")]
-    public double? CachePrice { get; set; }
-
-    /// <summary>AI Credits cost per billing batch of cached (read) tokens.</summary>
-    [JsonPropertyName("cacheReadPrice")]
-    public double? CacheReadPrice { get; set; }
+    /// <summary>The password to store for the sandbox proxy.</summary>
+    [JsonPropertyName("value")]
+    public string Value { get; set; } = string.Empty;
+}
 
-    /// <summary>AI Credits cost per billing batch of 1-hour cache-write (cache creation) tokens.</summary>
-    [JsonPropertyName("cacheWrite1hPrice")]
-    public double? CacheWrite1hPrice { get; set; }
+/// <summary>The stored sandbox settings to resolve against the defaults.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class SandboxApplyDefaultsRequest
+{
+    /// <summary>The sandbox settings as stored in the settings file. An empty object resolves to the defaults alone.</summary>
+    [JsonPropertyName("stored")]
+    public JsonElement Stored { get; set; }
+}
 
-    /// <summary>AI Credits cost per billing batch of cache-write (cache creation) tokens.</summary>
-    [JsonPropertyName("cacheWritePrice")]
-    public double? CacheWritePrice { get; set; }
+/// <summary>The outcome of a locked snapshot write.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class PersistenceWriteRawJsonLockedResult
+{
+    /// <summary>Why the write failed. Absent when `success` is true. A lock the runtime could not acquire in time reports here rather than raising.</summary>
+    [JsonPropertyName("error")]
+    public string? Error { get; set; }
 
-    /// <summary>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.</summary>
-    [EditorBrowsable(EditorBrowsableState.Never)]
-#if NET5_0_OR_GREATER
-    [Obsolete("This member is deprecated and will be removed in a future version.", DiagnosticId = "GHCP001")]
-#else
-    [Obsolete("This member is deprecated and will be removed in a future version.")]
-#endif
-    [JsonPropertyName("contextMax")]
-    public long? ContextMax { get; set; }
+    /// <summary>Whether the file now holds the requested contents.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
+}
 
-    /// <summary>AI Credits cost per billing batch of input tokens.</summary>
-    [JsonPropertyName("inputPrice")]
-    public double? InputPrice { get; set; }
+/// <summary>A complete JSON snapshot to write under the runtime's per-path file lock.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class PersistenceWriteRawJsonLockedRequest
+{
+    /// <summary>The serialized JSON document to write. It replaces the file's contents entirely; nothing is merged.</summary>
+    [JsonPropertyName("dataJson")]
+    public string DataJson { get; set; } = string.Empty;
 
-    /// <summary>Prompt token budget for the long context tier. The total context window is this value plus the model's max_output_tokens.</summary>
-    [JsonPropertyName("maxPromptTokens")]
-    public long? MaxPromptTokens { get; set; }
+    /// <summary>Comment lines to emit above the document, for a format that tolerates them. Omit for strict JSON.</summary>
+    [JsonPropertyName("fileHeader")]
+    public string? FileHeader { get; set; }
 
-    /// <summary>AI Credits cost per billing batch of output tokens.</summary>
-    [JsonPropertyName("outputPrice")]
-    public double? OutputPrice { get; set; }
+    /// <summary>Absolute path of the file to replace. Parent directories are created when missing.</summary>
+    [JsonPropertyName("path")]
+    public string Path { get; set; } = string.Empty;
 }
 
-/// <summary>Token-level pricing information for this model.</summary>
+/// <summary>Outcome of rewriting the `disabledHooks` setting.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ModelBillingTokenPrices
+internal sealed class UserSettingsSetHookDisabledResult
 {
-    /// <summary>Number of tokens per standard billing batch.</summary>
-    [JsonPropertyName("batchSize")]
-    public long? BatchSize { get; set; }
-
-    /// <summary>Use cacheReadPrice instead. AI Credits cost per billing batch of cached tokens.</summary>
-    [EditorBrowsable(EditorBrowsableState.Never)]
-#if NET5_0_OR_GREATER
-    [Obsolete("This member is deprecated and will be removed in a future version.", DiagnosticId = "GHCP001")]
-#else
-    [Obsolete("This member is deprecated and will be removed in a future version.")]
-#endif
-    [JsonPropertyName("cachePrice")]
-    public double? CachePrice { get; set; }
-
-    /// <summary>AI Credits cost per billing batch of cached (read) tokens.</summary>
-    [JsonPropertyName("cacheReadPrice")]
-    public double? CacheReadPrice { get; set; }
+    /// <summary>Why the write failed. Absent when the status is `ok`.</summary>
+    [JsonPropertyName("errorMessage")]
+    public string? ErrorMessage { 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>`ok` when the setting was written, `invalid` when settings.json could not be parsed and was left alone, `error` when the write itself failed.</summary>
+    [JsonPropertyName("status")]
+    public string Status { get; set; } = string.Empty;
+}
 
-    /// <summary>AI Credits cost per billing batch of cache-write (cache creation) tokens.</summary>
-    [JsonPropertyName("cacheWritePrice")]
-    public double? CacheWritePrice { get; set; }
+/// <summary>One hook to disable or re-enable.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class UserSettingsSetHookDisabledRequest
+{
+    /// <summary>True adds the key to `disabledHooks`, false removes it.</summary>
+    [JsonPropertyName("disabled")]
+    public bool Disabled { get; set; }
 
-    /// <summary>Use maxPromptTokens instead. Prompt token budget for the default tier. The total context window is this value plus the model's max_output_tokens.</summary>
-    [EditorBrowsable(EditorBrowsableState.Never)]
-#if NET5_0_OR_GREATER
-    [Obsolete("This member is deprecated and will be removed in a future version.", DiagnosticId = "GHCP001")]
-#else
-    [Obsolete("This member is deprecated and will be removed in a future version.")]
-#endif
-    [JsonPropertyName("contextMax")]
-    public long? ContextMax { get; set; }
+    /// <summary>Durable content-hash key of the hook, as `hooks.loadResources` reports it.</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("disableKey")]
+    public string DisableKey { get; set; } = string.Empty;
 
-    /// <summary>AI Credits cost per billing batch of input tokens.</summary>
-    [JsonPropertyName("inputPrice")]
-    public double? InputPrice { get; set; }
+    /// <summary>Path of the settings.json to rewrite.</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("settingsPath")]
+    public string SettingsPath { get; set; } = string.Empty;
+}
 
-    /// <summary>Long context tier pricing (available for models with extended context windows).</summary>
-    [JsonPropertyName("longContext")]
-    public ModelBillingTokenPricesLongContext? LongContext { get; set; }
+/// <summary>Selects the configuration directory whose user settings to read.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class UserSettingsLoadForConfigDirRequest
+{
+    /// <summary>Copilot configuration directory to read the settings document from, taking precedence over the server's own `COPILOT_HOME` and default home. Omit it, or pass an empty string, to read the directory the server resolved for itself.</summary>
+    [JsonPropertyName("configDir")]
+    public string? ConfigDir { get; set; }
+}
 
-    /// <summary>Prompt token budget for the default tier. The total context window is this value plus the model's max_output_tokens.</summary>
-    [JsonPropertyName("maxPromptTokens")]
-    public long? MaxPromptTokens { get; set; }
+/// <summary>A repository's settings as stored, together with any diagnostic raised while reading them.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class UserSettingsLoadRepoResult
+{
+    /// <summary>The repository's settings document, keyed by setting name, with each value carried verbatim. Null when the repository declares no settings.</summary>
+    [JsonPropertyName("settings")]
+    public IDictionary<string, JsonElement>? Settings { get; set; }
 
-    /// <summary>AI Credits cost per billing batch of output tokens.</summary>
-    [JsonPropertyName("outputPrice")]
-    public double? OutputPrice { get; set; }
+    /// <summary>Why part of the document was ignored, as a single human-readable string joining every diagnostic with `; `. Null when the document loaded cleanly. The settings that did load are still reported, so a consumer should surface this and continue rather than treat it as a failure.</summary>
+    [JsonPropertyName("warning")]
+    public string? Warning { get; set; }
 }
 
-/// <summary>Billing information.</summary>
+/// <summary>Selects the repository whose checked-in settings to read.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ModelBilling
+internal sealed class UserSettingsLoadRepoRequest
 {
-    /// <summary>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.</summary>
-    [JsonPropertyName("discountPercent")]
-    public int? DiscountPercent { get; set; }
-
-    /// <summary>Billing cost multiplier relative to the base rate.</summary>
-    [JsonPropertyName("multiplier")]
-    public double? Multiplier { get; set; }
+    /// <summary>Absolute path of the repository root whose settings to read. When this is the user's home directory, the Claude-compatible configuration is skipped, so a home-directory session does not inherit a personal config as if it were repository policy.</summary>
+    [JsonPropertyName("repoRoot")]
+    public string RepoRoot { get; set; } = string.Empty;
+}
 
-    /// <summary>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.</summary>
-    [JsonPropertyName("promo")]
-    public ModelBillingPromo? Promo { get; set; }
+/// <summary>The settings a consumer should act on inside a repository, together with any diagnostic raised while reading the repository layer.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class UserSettingsLoadAndMergeRepoResult
+{
+    /// <summary>The merged settings document, keyed by setting name. Equals the supplied user layer when the repository declares no settings.</summary>
+    [JsonPropertyName("settings")]
+    public IDictionary<string, JsonElement> Settings { get => field ??= new Dictionary<string, JsonElement>(); set; }
 
-    /// <summary>Token-level pricing information for this model.</summary>
-    [JsonPropertyName("tokenPrices")]
-    public ModelBillingTokenPrices? TokenPrices { get; set; }
+    /// <summary>Why part of the repository document was ignored, as a single human-readable string joining every diagnostic with `; `. Null when it loaded cleanly. The settings that did load are still merged, so a consumer should surface this and continue rather than treat it as a failure.</summary>
+    [JsonPropertyName("warning")]
+    public string? Warning { get; set; }
 }
 
-/// <summary>Vision-specific limits.</summary>
+/// <summary>A repository to read settings from, and the user layer they are merged over.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ModelCapabilitiesLimitsVision
+internal sealed class UserSettingsLoadAndMergeRepoRequest
 {
-    /// <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>Absolute path of the repository root whose settings to read. When this is the user's home directory, the Claude-compatible configuration is skipped, so a home-directory session does not inherit a personal config as if it were repository policy.</summary>
+    [JsonPropertyName("repoRoot")]
+    public string RepoRoot { get; set; } = string.Empty;
 
-    /// <summary>MIME types the model accepts.</summary>
-    [JsonPropertyName("supported_media_types")]
-    public IList<string> SupportedMediaTypes { get => field ??= []; set; }
+    /// <summary>The user's own settings, keyed by setting name. The repository layer is merged over this; a repository may only add to the collection settings it is allowed to influence, so a user setting it does not name survives unchanged.</summary>
+    [JsonPropertyName("userSettings")]
+    public IDictionary<string, JsonElement> UserSettings { get => field ??= new Dictionary<string, JsonElement>(); set; }
 }
 
-/// <summary>Token limits for prompts, outputs, and context window.</summary>
+/// <summary>The on-disk location of the user's settings document.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ModelCapabilitiesLimits
+internal sealed class UserSettingsPathResult
 {
-    /// <summary>Maximum total context window size in tokens.</summary>
-    [JsonPropertyName("max_context_window_tokens")]
-    public long? MaxContextWindowTokens { get; set; }
+    /// <summary>Absolute path to the settings file this runtime reads and writes. Normally `settings.json` under the Copilot configuration directory; an extensionless legacy `settings` file is reported instead when it exists and `settings.json` does not.</summary>
+    [JsonPropertyName("path")]
+    public string Path { get; set; } = string.Empty;
+}
 
-    /// <summary>Maximum number of output/completion tokens.</summary>
-    [JsonPropertyName("max_output_tokens")]
-    public long? MaxOutputTokens { get; set; }
+/// <summary>The user's stored settings, together with any diagnostic raised while reading them.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class UserSettingsLoadWithWarningResult
+{
+    /// <summary>The stored user settings document, keyed by setting name, with each value carried verbatim. Empty when the file could not be read at all.</summary>
+    [JsonPropertyName("settings")]
+    public IDictionary<string, JsonElement> Settings { get => field ??= new Dictionary<string, JsonElement>(); set; }
 
-    /// <summary>Maximum number of prompt/input tokens.</summary>
-    [JsonPropertyName("max_prompt_tokens")]
-    public long? MaxPromptTokens { get; set; }
+    /// <summary>Why part of the document was ignored, phrased for display to the user. Null when the document loaded cleanly. The settings that did load are still reported, so a consumer may surface this and continue rather than treat it as a failure.</summary>
+    [JsonPropertyName("warning")]
+    public string? Warning { get; set; }
+}
 
-    /// <summary>Vision-specific limits.</summary>
-    [JsonPropertyName("vision")]
-    public ModelCapabilitiesLimitsVision? Vision { get; set; }
+/// <summary>The user layer folded over the managed layer.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class UserSettingsMergeManagedAndUserResult
+{
+    /// <summary>The merged settings. An empty object when neither layer was supplied, so an unmanaged host with no user settings governs nothing.</summary>
+    [JsonPropertyName("settingsJson")]
+    public JsonElement SettingsJson { get; set; }
 }
 
-/// <summary>Feature flags indicating what the model supports.</summary>
+/// <summary>The managed (enterprise policy) layer and the user layer to fold together. The field names carry the layer identity: nothing about a settings object identifies which layer produced it, so a generic base/override pair would let a caller transpose them and silently resolve the governance keys in the user's favour.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ModelCapabilitiesSupports
+internal sealed class UserSettingsMergeManagedAndUserParams
 {
-    /// <summary>Resolved Anthropic adaptive-thinking capability — unsupported / optional / required / adaptive_only. 'required' models reject thinking.type='enabled' with HTTP 400 but still accept 'disabled' (e.g. opus-4.7/4.8/5, sonnet-5); 'adaptive_only' models accept nothing but 'adaptive' (e.g. fable, mythos).</summary>
-    [JsonPropertyName("adaptive_thinking")]
-    public AdaptiveThinkingSupport? AdaptiveThinking { get; set; }
+    /// <summary>The managed layer. Its governance keys win, and the per-entry `enabledPlugins` and `extraKnownMarketplaces` control maps are stamped back from it after the union. Omitted when the host is unmanaged.</summary>
+    [JsonPropertyName("managed")]
+    public JsonElement? Managed { get; set; }
 
-    /// <summary>Whether this model supports reasoning effort configuration.</summary>
-    [JsonPropertyName("reasoningEffort")]
-    public bool? ReasoningEffort { get; set; }
+    /// <summary>The user's own settings layer. Wins on every key the managed layer does not govern. Omitted when the user has no settings yet.</summary>
+    [JsonPropertyName("user")]
+    public JsonElement? User { get; set; }
+}
 
-    /// <summary>Whether the model supports provider-native thinking. Independent of configurable reasoning effort; omission means unknown.</summary>
-    [JsonPropertyName("thinking")]
-    public bool? Thinking { get; set; }
+/// <summary>The repository layer folded into the user layer.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class UserSettingsMergeRepoValueResult
+{
+    /// <summary>The merged settings, with the per-entry managed control maps re-stamped from the runtime's ambient managed policy.</summary>
+    [JsonPropertyName("settingsJson")]
+    public JsonElement SettingsJson { get; set; }
+}
 
-    /// <summary>Whether this model supports canonical tool calling.</summary>
-    [JsonPropertyName("toolCalls")]
-    public bool? ToolCalls { get; set; }
+/// <summary>The user layer and the repository layer to fold together.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class UserSettingsMergeRepoValueParams
+{
+    /// <summary>The repository's checked-in settings layer.</summary>
+    [JsonPropertyName("repoSettings")]
+    public JsonElement RepoSettings { get; set; }
 
-    /// <summary>Whether this model supports vision/image input.</summary>
-    [JsonPropertyName("vision")]
-    public bool? Vision { get; set; }
+    /// <summary>The user's settings, already resolved against any managed layer.</summary>
+    [JsonPropertyName("userSettings")]
+    public JsonElement UserSettings { get; set; }
 }
 
-/// <summary>Model capabilities and limits.</summary>
+/// <summary>The outcome of the one-time staff update-channel migration.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ModelCapabilities
+internal sealed class UserSettingsMigrateStaffUpdateChannelOnceResult
 {
-    /// <summary>Token limits for prompts, outputs, and context window.</summary>
-    [JsonPropertyName("limits")]
-    public ModelCapabilitiesLimits? Limits { get; set; }
+    /// <summary>When the migration was recorded as done, as an ISO-8601 timestamp. Absent only for `ineligible`, which records nothing.</summary>
+    [JsonPropertyName("completedAt")]
+    public string? CompletedAt { get; set; }
 
-    /// <summary>Feature flags indicating what the model supports.</summary>
-    [JsonPropertyName("supports")]
-    public ModelCapabilitiesSupports? Supports { get; set; }
+    /// <summary>What the migration did. Only `migrated` means the persisted settings changed.</summary>
+    [JsonPropertyName("status")]
+    public StaffUpdateChannelMigrationStatus Status { get; set; }
 }
 
-/// <summary>A service-published message about a model, carrying a stable machine-readable code alongside human-readable text.</summary>
+/// <summary>The filesystem and environment facts a user-settings file is resolved from. Passed explicitly rather than read from the runtime's own process, so a host whose configuration directory differs from its process environment resolves the file it means.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ModelMessage
+internal sealed class UserSettingsHostContext
 {
-    /// <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>The Copilot configuration directory, when the host set one. Takes precedence over `COPILOT_HOME` and the home directory.</summary>
+    [JsonPropertyName("configDir")]
+    public string? ConfigDir { get; set; }
 
-    /// <summary>Human-readable message text intended for display to the user.</summary>
-    [JsonPropertyName("message")]
-    public string Message { get; set; } = string.Empty;
+    /// <summary>The host's environment variables. `COPILOT_HOME` is read from here, as are the variables a settings hook may expand.</summary>
+    [JsonPropertyName("environment")]
+    public IDictionary<string, JsonElement> Environment { get => field ??= new Dictionary<string, JsonElement>(); set; }
+
+    /// <summary>The user's home directory, used when neither a configuration directory nor `COPILOT_HOME` is set.</summary>
+    [JsonPropertyName("homeDirectory")]
+    public string HomeDirectory { get; set; } = string.Empty;
 }
 
-/// <summary>Policy state (if applicable).</summary>
+/// <summary>The outcome of the one-time staff model-selection reset.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ModelPolicy
+internal sealed class UserSettingsResetStaffModelSelectionOnceResult
 {
-    /// <summary>Current policy state for this model.</summary>
-    [JsonPropertyName("state")]
-    public ModelPolicyState State { get; set; }
+    /// <summary>The cutoff this reset is gated on, as an ISO-8601 timestamp. A recorded timestamp at or after it means the reset is already done.</summary>
+    [JsonPropertyName("cutoff")]
+    public string Cutoff { get; set; } = string.Empty;
 
-    /// <summary>Usage terms or conditions for this model.</summary>
-    [JsonPropertyName("terms")]
-    public string? Terms { get; set; }
+    /// <summary>Whether the persisted model selection was cleared. Only `true` means the settings document changed and the host should adopt the returned settings.</summary>
+    [JsonPropertyName("didReset")]
+    public bool DidReset { get; set; }
+
+    /// <summary>The timestamp the host should now record, as an ISO-8601 timestamp. Carries the caller's own value back unchanged when nothing was reset.</summary>
+    [JsonPropertyName("resetAt")]
+    public string? ResetAt { get; set; }
+
+    /// <summary>The settings document as it stands after the reset, keyed by setting name. Present only when `didReset` is true.</summary>
+    [JsonPropertyName("settings")]
+    public IDictionary<string, JsonElement>? Settings { get; set; }
 }
 
-/// <summary>A neutral reference to the model provider that produced a model: an opaque id, a human-readable label, and the provider kind. Carried on each enumerated Model so consumers can group by provider without reaching into a provider-shaped internal type.</summary>
+/// <summary>Selects the configuration directory to run the one-time staff model-selection reset against, and supplies the caller's record of whether it has already run.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ModelProviderRef
+internal sealed class UserSettingsResetStaffModelSelectionOnceRequest
 {
-    /// <summary>Opaque, stable id of the provider that produced this model. Matches the enumerated `ModelProviderDescriptor.id`.</summary>
-    [JsonPropertyName("id")]
-    public string Id { get; set; } = string.Empty;
+    /// <summary>The configuration directory, home directory and environment to resolve the settings and global-state documents from. A host that scopes a session to its own Copilot home must pass that directory here, or the reset is evaluated against the server's own home instead.</summary>
+    [JsonPropertyName("context")]
+    public UserSettingsHostContext Context { get => field ??= new(); set; }
 
-    /// <summary>The provider kind.</summary>
-    [JsonPropertyName("kind")]
-    public ModelProviderKind Kind { get; set; }
+    /// <summary>Whether the signed-in account is a staff account. The reset applies only to staff, so anything other than `true` returns `didReset: false` without touching the settings document.</summary>
+    [JsonPropertyName("staff")]
+    public bool? Staff { get; set; }
 
-    /// <summary>Human-readable provider label, owned by the runtime so every consumer renders identical text.</summary>
-    [JsonPropertyName("label")]
-    public string Label { get; set; } = string.Empty;
+    /// <summary>When the caller last recorded this reset, as an ISO-8601 timestamp. A timestamp at or after the cutoff means the reset already ran and is returned unchanged.</summary>
+    [JsonPropertyName("staffModelResetAt")]
+    public string? StaffModelResetAt { get; set; }
 }
 
-/// <summary>Service-published warning text that hosts should display when presenting a model.</summary>
+/// <summary>The unrecognized top-level keys found in the user settings document, already phrased for display.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ModelWarningText
+internal sealed class UserSettingsUnknownKeysWarningResult
 {
-    /// <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>The warning to show the user, naming the unrecognized keys and the file they were found in. Absent when every top-level key is recognized, and also when the document is missing or could not be read, because an unknown-key list taken from a document the runtime could not load would name keys that may not be there.</summary>
+    [JsonPropertyName("warning")]
+    public string? Warning { get; set; }
 }
 
-/// <summary>Copilot model metadata, including identifier, display name, capabilities, policy, billing, reasoning efforts, and picker categories.</summary>
+/// <summary>Selects the configuration directory whose user settings document should be inspected for unrecognized top-level keys.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class Model
+internal sealed class UserSettingsUnknownKeysWarningRequest
 {
-    /// <summary>Billing information.</summary>
-    [JsonPropertyName("billing")]
-    public ModelBilling? Billing { get; set; }
+    /// <summary>The configuration directory, home directory and environment to resolve the settings document from. A host that scopes a session to its own Copilot home must pass that directory here, or the server's own home is inspected instead.</summary>
+    [JsonPropertyName("context")]
+    public UserSettingsHostContext Context { get => field ??= new(); set; }
+}
 
-    /// <summary>Model capabilities and limits.</summary>
-    [JsonPropertyName("capabilities")]
-    public ModelCapabilities Capabilities { get => field ??= new(); set; }
+/// <summary>The overrides and host context to resolve effective runtime settings from.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class UserSettingsBuildRuntimeRequest
+{
+    /// <summary>The environment to read settings-bearing variables from. Passed explicitly rather than read from the server process so a host can resolve settings for an environment it is about to create rather than the one it runs in.</summary>
+    [JsonPropertyName("environment")]
+    public IDictionary<string, string> Environment { get => field ??= new Dictionary<string, string>(); set; }
 
-    /// <summary>Default reasoning effort level (only present if model supports reasoning effort).</summary>
-    [JsonPropertyName("defaultReasoningEffort")]
-    public string? DefaultReasoningEffort { get; set; }
+    /// <summary>Settings that take precedence over every document and environment layer, such as the values a host derived from its own command line. Keyed by setting name, with each value carried verbatim, so a host may pass keys this runtime does not recognize. Absent when the host contributes no overrides of its own.</summary>
+    [JsonPropertyName("overrides")]
+    public IDictionary<string, JsonElement>? Overrides { get; set; }
 
-    /// <summary>Model identifier (e.g., "claude-sonnet-4.5").</summary>
-    [JsonPropertyName("id")]
-    public string Id { get; set; } = string.Empty;
+    /// <summary>The platform to apply platform-specific defaults for, in the same spelling the host's own runtime reports.</summary>
+    [JsonPropertyName("platform")]
+    public string Platform { 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>The directory the settings are being resolved for. This selects the repository-scoped document, so a host resolving settings for a directory other than its own process working directory must pass that directory here.</summary>
+    [JsonPropertyName("workingDirectory")]
+    public string WorkingDirectory { get; set; } = string.Empty;
+}
 
-    /// <summary>Provider-supplied model metadata. Keys and JSON-compatible values are preserved unchanged. This is factual metadata published by the model provider; it carries no picker or UX semantics.</summary>
-    [JsonPropertyName("metadata")]
-    public IDictionary<string, JsonElement>? Metadata { get; set; }
+/// <summary>The outcome of the one-time staff log-level migration.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class UserSettingsMigrateStaffLogLevelOnceResult
+{
+    /// <summary>When the migration was recorded as done, as an ISO-8601 timestamp. Absent only for `ineligible`, which records nothing.</summary>
+    [JsonPropertyName("completedAt")]
+    public string? CompletedAt { get; set; }
 
-    /// <summary>Model capability category for grouping in the model picker.</summary>
-    [JsonPropertyName("modelPickerCategory")]
-    public ModelPickerCategory? ModelPickerCategory { get; set; }
+    /// <summary>The settings document as it stands after the migration, keyed by setting name. Present only for `refreshed`, and only when the document could be re-read cleanly.</summary>
+    [JsonPropertyName("settings")]
+    public IDictionary<string, JsonElement>? Settings { get; set; }
 
-    /// <summary>Relative cost tier for token-based billing users.</summary>
-    [JsonPropertyName("modelPickerPriceCategory")]
-    public ModelPickerPriceCategory? ModelPickerPriceCategory { get; set; }
+    /// <summary>What the migration did. Only `refreshed` can have changed the persisted settings.</summary>
+    [JsonPropertyName("status")]
+    public StaffLogLevelMigrationStatus Status { get; set; }
+}
 
-    /// <summary>Display name.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+/// <summary>Selects the configuration directory to run the one-time staff log-level migration against, and supplies the caller's record of whether it has already run.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class UserSettingsMigrateStaffLogLevelOnceRequest
+{
+    /// <summary>When the caller last recorded this migration, as an ISO-8601 timestamp. Supplying it lets the runtime answer `current` without re-running the evaluation.</summary>
+    [JsonPropertyName("cachedCompletedAt")]
+    public string? CachedCompletedAt { get; set; }
 
-    /// <summary>Policy state (if applicable).</summary>
-    [JsonPropertyName("policy")]
-    public ModelPolicy? Policy { get; set; }
+    /// <summary>The configuration directory, home directory and environment to resolve the settings and global-state documents from. A host that scopes a session to its own Copilot home must pass that directory here, or the migration is evaluated against the server's own home instead.</summary>
+    [JsonPropertyName("context")]
+    public UserSettingsHostContext Context { get => field ??= new(); set; }
+}
 
-    /// <summary>The model provider that produced this model, as a neutral reference (opaque id, human-readable label, and provider kind). Present on models returned by `session.model.list`, which resolves provider attribution from the session's account roster; absent on the flat `server.models.list`, which does not resolve a session roster. The model picker groups by this reference.</summary>
-    [JsonPropertyName("provider")]
-    public ModelProviderRef? Provider { get; set; }
+/// <summary>The outcome of the one-time obsolete-settings cleanup.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class UserSettingsMigrateObsoleteOnDiskResult
+{
+    /// <summary>What the cleanup did. Only `changed` rewrote the document. The cleaned settings are not returned here: the document is written before this replies, so `user.settings.load` reads it authoritatively.</summary>
+    [JsonPropertyName("status")]
+    public UserSettingsMigrateObsoleteOnDiskStatus Status { 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>Selects the configuration directory whose settings document to clean.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class UserSettingsMigrateObsoleteOnDiskRequest
+{
+    /// <summary>The configuration directory holding the settings document to clean. A host that scopes a session to its own Copilot home passes that directory here; omit it to clean the document under the home the server resolved for itself. The home directory and environment are deliberately not caller-supplied: they decide only the settings path root and the two hook-parsing flags, and those describe the process doing the reading rather than the caller.</summary>
+    [JsonPropertyName("configDir")]
+    public string? ConfigDir { get; set; }
+}
 
-    /// <summary>Supported reasoning effort levels (only present if model supports reasoning effort).</summary>
-    [JsonPropertyName("supportedReasoningEfforts")]
-    public IList<string>? SupportedReasoningEfforts { get; set; }
+/// <summary>A single user setting's effective value alongside its default, so consumers can render settings left at their default.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class UserSettingMetadata
+{
+    /// <summary>The centrally-known default for this setting (null when no default is registered).</summary>
+    [JsonPropertyName("default")]
+    public JsonElement Default { 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>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>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>The effective value: the user's value if set, otherwise the default.</summary>
+    [JsonPropertyName("value")]
+    public JsonElement Value { get; set; }
 }
 
-/// <summary>List of Copilot models available to the resolved user, including capabilities and billing metadata.</summary>
+/// <summary>Per-key metadata for every known user setting in settings.json, including settings left at their default. Excludes repository- and enterprise-managed overrides.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ModelList
+public sealed class UserSettingsGetResult
 {
-    /// <summary>List of available models with full metadata.</summary>
-    [JsonPropertyName("models")]
-    public IList<Model> Models { get => field ??= []; set; }
+    /// <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>RPC data type for ModelsList operations.</summary>
+/// <summary>On-disk locations of the settings files this runtime reads. A path is reported whether or not the file exists.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class ModelsListRequest
+internal sealed class UserSettingsGetPathsResult
 {
-    /// <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>The repository's local, untracked settings file, or null when no repository root was supplied.</summary>
+    [JsonPropertyName("repoLocalSettings")]
+    public string? RepoLocalSettings { 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>The repository's checked-in settings file, or null when no repository root was supplied.</summary>
+    [JsonPropertyName("repoSettings")]
+    public string? RepoSettings { get; set; }
+
+    /// <summary>The user settings file: `settings.json` under the resolved Copilot home. This is the file `user.settings.get`, `user.settings.load`, and `user.settings.set` read and write.</summary>
+    [JsonPropertyName("userSettings")]
+    public string UserSettings { get; set; } = string.Empty;
 }
 
-/// <summary>A well-known model in the runtime's built-in catalog.</summary>
+/// <summary>Selects which settings file paths to resolve.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class BuiltInModelCatalogEntry
+internal sealed class UserSettingsGetPathsRequest
 {
-    /// <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;
+    /// <summary>Absolute path of a repository root. Supply it to also resolve that repository's two settings file paths; omit it to resolve only the user path.</summary>
+    [JsonPropertyName("repoRoot")]
+    public string? RepoRoot { get; set; }
 }
 
-/// <summary>The running runtime's complete catalog of well-known built-in model IDs, including supported models and additional IDs with built-in metadata.</summary>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class BuiltInModelCatalog
+internal sealed class UserSettingsSetRequest
 {
-    /// <summary>Built-in model entries.</summary>
-    [JsonPropertyName("models")]
-    public IList<BuiltInModelCatalogEntry> Models { get => field ??= []; set; }
+    /// <summary>Partial user settings to write, as a free-form object keyed by setting name.</summary>
+    [JsonPropertyName("settings")]
+    public JsonElement Settings { get; set; }
 }
 
-/// <summary>Whether this host can run one sandbox policy feature. A session whose effective policy uses an unsupported feature fails each sandboxed command with `reason`, except `filesystem_enumeration`, whose absence degrades sandboxed PowerShell instead of failing it.</summary>
+/// <summary>Top-level user-setting keys grouped by who may govern them.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SandboxHostCapability
+internal sealed class UserSettingsGovernanceKeysResult
 {
-    /// <summary>The policy feature, as an extensible string: ignore names you do not recognize. Known values: `network` (sandboxed commands can reach the network; on Linux this needs the tooling for Bubblewrap's private network namespace, such as slirp4netns), `network_filtering` (host rules and the sandbox proxy; on Linux this needs the same tooling as `network`; on Windows it needs Process Security Environment 1.1 host-loopback support, and a policy that uses it must also set `network.allowLocalNetwork`), `denied_paths` (native enforcement of `filesystem.deniedPaths`), `shell` (shell commands inside the sandbox), and `filesystem_enumeration` (enumerate-only filesystem grants; on Windows this needs Process Security Environment 1.1 filesystem enumeration support, and without it sandboxed PowerShell still runs but cannot resolve its current location; other platforms always report it).</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Top-level keys a repository may override through a Claude-compatible repository config.</summary>
+    [JsonPropertyName("claudeRepo")]
+    public IList<string> ClaudeRepo { get => field ??= []; set; }
 
-    /// <summary>Human-readable reason and remedy when the feature is unsupported, such as a package to install or an OS update. Present only when `supported` is false.</summary>
-    [JsonPropertyName("reason")]
-    public string? Reason { get; set; }
+    /// <summary>Top-level keys an enterprise policy may fix through managed settings.</summary>
+    [JsonPropertyName("managed")]
+    public IList<string> Managed { get => field ??= []; set; }
 
-    /// <summary>Whether this host can run the feature.</summary>
-    [JsonPropertyName("supported")]
-    public bool Supported { get; set; }
+    /// <summary>Top-level keys a repository may override through `.github/copilot/settings.json` or `.github/copilot/settings.local.json`.</summary>
+    [JsonPropertyName("repo")]
+    public IList<string> Repo { get => field ??= []; set; }
 }
 
-/// <summary>Whether the host running this runtime can run the command sandbox. The runtime checks `supported` once per process. A capability answer can change while the process runs, for example after the user installs a missing package.</summary>
+/// <summary>Outcome of an atomic user or repository settings edit.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SandboxHostSupport
+internal sealed class SettingsEditResult
 {
-    /// <summary>Sandbox policy features whose availability varies between hosts that can run the backend. Empty when `supported` is false, because no feature can run without a backend. Later runtimes can add entries; ignore an entry whose `name` you do not recognize.</summary>
-    [JsonPropertyName("capabilities")]
-    public IList<SandboxHostCapability> Capabilities { get => field ??= []; set; }
-
-    /// <summary>Human-readable reason the sandbox cannot run on this host. Present only when `supported` is false.</summary>
-    [JsonPropertyName("reason")]
-    public string? Reason { get; set; }
-
-    /// <summary>Whether a process-containment backend is usable on this host: Seatbelt on macOS, Bubblewrap on Linux, or ProcessContainer on Windows.</summary>
-    [JsonPropertyName("supported")]
-    public bool Supported { get; set; }
+    /// <summary>Changed, unchanged or invalid existing file. Rejected input, validation failures and I/O errors remain RPC errors.</summary>
+    [JsonPropertyName("status")]
+    public SettingsEditStatus Status { get; set; }
 }
 
-/// <summary>Status of the persistent certificate authority of the sandbox credential proxy.</summary>
+/// <summary>One atomic edit of a canonical setting in settings.json.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SandboxProxyCaStatus
+internal sealed class UserSettingsEditRequest
 {
-    /// <summary>Whether this process can add the certificate authority to OS trust without credentials from a different user. False where OS trust is unsupported, and on Windows when the process cannot elevate itself to write the machine trust store. When false, do not offer to set up the certificate authority.</summary>
-    [JsonPropertyName("canInstall")]
-    public bool CanInstall { get; set; }
+    /// <summary>Nonempty canonical path segments of the setting to edit, starting with its top-level key.</summary>
+    [JsonPropertyName("canonicalPath")]
+    public IList<string> CanonicalPath { get => field ??= []; set; }
 
-    /// <summary>Human-readable reason for the state. On `installed` or `notInstalled`, present only when the certificate authority must be rotated, and then says why.</summary>
-    [JsonPropertyName("detail")]
-    public string? Detail { get; set; }
+    /// <summary>Configuration directory to edit. Omitted or empty resolves the server's own home, as in `user.settings.loadForConfigDir`.</summary>
+    [JsonPropertyName("configDir")]
+    public string? ConfigDir { get; set; }
 
-    /// <summary>The state of the certificate authority.</summary>
-    [JsonPropertyName("state")]
-    public SandboxProxyCaState State { get; set; }
+    /// <summary>Set a scalar, add or remove a string list item, or remove the setting. The handler rejects a missing or incompatible value.</summary>
+    [JsonPropertyName("operation")]
+    public SettingsEditOperation Operation { get; set; }
+
+    /// <summary>Required boolean, string or number for set, required string for add-item and remove-item, and forbidden for remove. The runtime rejects all other JSON values.</summary>
+    [JsonPropertyName("value")]
+    public JsonElement? Value { 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>
+/// <summary>Settings object with canonical key names.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SandboxConfigAuth
+internal sealed class UserSettingsNormalizeResult
 {
-    /// <summary>Whether to authenticate sandboxed gh through the local masking proxy. The child receives a fake GH_TOKEN; its real value is substituted only at github.com, api.github.com and uploads.github.com (github.com because gh repo clone authenticates git through gh auth git-credential). The repository's GitHub account takes precedence over the Copilot login. Default: false (opt-in).</summary>
-    [JsonPropertyName("gh")]
-    public bool? Gh { get; set; }
-
-    /// <summary>Whether to authenticate sandboxed HTTPS git through the local masking proxy. The child receives a fake `http.&lt;url&gt;.extraheader`; the real Authorization header is substituted only at its original HTTPS host, port, and repository path scope. github.com uses the Copilot token; other forges use credentials resolved from the user's own helper on the host. Default: false (opt-in).</summary>
-    [JsonPropertyName("git")]
-    public bool? Git { get; set; }
+    /// <summary>The same settings with every legacy or snake_case key renamed to its canonical spelling.</summary>
+    [JsonPropertyName("settings")]
+    public JsonElement Settings { get; set; }
 }
 
-/// <summary>Destinations authorized to receive one masked environment credential.</summary>
+/// <summary>Settings object whose key names should be canonicalized.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SandboxMaskedEnvVar
+internal sealed class UserSettingsNormalizeRequest
 {
-    /// <summary>Nonempty list of HTTPS injection hostnames or *.example.com patterns. Bare * is not accepted. These grants never override the sandbox network policy. Values in plaintext HTTP requests, URLs, bodies, encoded credentials, and signed requests are not substituted.</summary>
-    [JsonPropertyName("injectHosts")]
-    public IList<string> InjectHosts { get => field ??= []; set; }
+    /// <summary>Free-form settings object, possibly using legacy or snake_case key names.</summary>
+    [JsonPropertyName("settings")]
+    public JsonElement Settings { get; set; }
 }
 
-/// <summary>Whole-value environment credential masking for sandboxed children.</summary>
+/// <summary>The settings layer a problem was found in.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SandboxCredentialsConfig
+public sealed class UserSettingsProblemLocation
 {
-    /// <summary>Environment variable names and their HTTPS injection destinations. Absent variables stay absent. No real values or sentinels are stored in this map.</summary>
-    [JsonPropertyName("envVars")]
-    public IDictionary<string, SandboxMaskedEnvVar> EnvVars { get => field ??= new Dictionary<string, SandboxMaskedEnvVar>(); set; }
+    /// <summary>Absolute path of the file backing this layer.</summary>
+    [JsonPropertyName("filePath")]
+    public string FilePath { get; set; } = string.Empty;
+
+    /// <summary>Which layer this is: `user`, `repo`, or `local`.</summary>
+    [JsonPropertyName("kind")]
+    public string Kind { get; set; } = string.Empty;
+
+    /// <summary>The caller-supplied display label for the layer.</summary>
+    [JsonPropertyName("label")]
+    public string Label { get; set; } = string.Empty;
 }
 
-/// <summary>macOS seatbelt experimental options.</summary>
+/// <summary>One setting that will not take effect, and why.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SandboxConfigUserPolicyExperimentalSeatbelt
+public sealed class UserSettingsProblem
 {
-    /// <summary>Whether the macOS seatbelt profile may access the keychain.</summary>
-    [JsonPropertyName("keychainAccess")]
-    public bool? KeychainAccess { get; set; }
+    /// <summary>Coarse grouping for the problem, for a caller that presents problems in sections.</summary>
+    [JsonPropertyName("category")]
+    public string Category { get; set; } = string.Empty;
+
+    /// <summary>Why the setting will not take effect. Never contains the setting's value, which may be a token or another secret.</summary>
+    [JsonPropertyName("explanation")]
+    public string Explanation { get; set; } = string.Empty;
+
+    /// <summary>Stable identifier for this problem within the reported set, so a caller can track a selection across refreshes.</summary>
+    [JsonPropertyName("id")]
+    public string Id { get; set; } = string.Empty;
+
+    /// <summary>What is wrong in machine-readable form, for a caller that wants to branch rather than display.</summary>
+    [JsonPropertyName("kind")]
+    public string Kind { get; set; } = string.Empty;
+
+    /// <summary>The offending key as written in the file, when the problem is attributable to a single key. Absent when the whole file is at fault.</summary>
+    [JsonPropertyName("rawKey")]
+    public string? RawKey { get; set; }
+
+    /// <summary>The settings layer the problem was found in.</summary>
+    [JsonPropertyName("source")]
+    public UserSettingsProblemLocation Source { get => field ??= new(); set; }
 }
 
-/// <summary>Platform-specific experimental policy fields.</summary>
+/// <summary>The settings that will not take effect across the given layers.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SandboxConfigUserPolicyExperimental
+internal sealed class UserSettingsProblemsResult
 {
-    /// <summary>macOS seatbelt experimental options.</summary>
-    [JsonPropertyName("seatbelt")]
-    public SandboxConfigUserPolicyExperimentalSeatbelt? Seatbelt { get; set; }
+    /// <summary>Each setting that will not take effect, and why. Empty when every layer is healthy.</summary>
+    [JsonPropertyName("problems")]
+    public IList<UserSettingsProblem>? Problems { get; set; }
 }
 
-/// <summary>Filesystem rules to merge into the base policy.</summary>
+/// <summary>One already-loaded settings layer to diagnose.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SandboxConfigUserPolicyFilesystem
+public sealed class UserSettingsProblemSource
 {
-    /// <summary>Whether to clear the policy when the session exits.</summary>
-    [JsonPropertyName("clearPolicyOnExit")]
-    public bool? ClearPolicyOnExit { get; set; }
+    /// <summary>The layer's settings exactly as loaded, unnormalized. Empty when the file is missing or failed to parse.</summary>
+    [JsonPropertyName("config")]
+    public IDictionary<string, JsonElement>? Config { get; set; }
 
-    /// <summary>Paths explicitly denied.</summary>
-    [JsonPropertyName("deniedPaths")]
-    public IList<string>? DeniedPaths { get; set; }
+    /// <summary>Absolute path of the file backing this layer.</summary>
+    [JsonPropertyName("filePath")]
+    public string FilePath { get; set; } = string.Empty;
 
-    /// <summary>Paths granted read-only access.</summary>
-    [JsonPropertyName("readonlyPaths")]
-    public IList<string>? ReadonlyPaths { get; set; }
+    /// <summary>True when the file itself failed to parse, so its keys could not be read at all.</summary>
+    [JsonPropertyName("invalid")]
+    public bool? Invalid { get; set; }
 
-    /// <summary>Paths granted read/write access.</summary>
-    [JsonPropertyName("readwritePaths")]
-    public IList<string>? ReadwritePaths { get; set; }
+    /// <summary>Which layer this is: `user`, `repo`, or `local`.</summary>
+    [JsonPropertyName("kind")]
+    public string Kind { get; set; } = string.Empty;
+
+    /// <summary>Caller-chosen display label for the layer, echoed back on each problem so a caller can group by layer without re-deriving its own naming.</summary>
+    [JsonPropertyName("label")]
+    public string Label { get; set; } = string.Empty;
 }
 
-/// <summary>HTTP proxy configuration for sandboxed traffic.</summary>
+/// <summary>The settings layers to diagnose.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SandboxConfigUserPolicyNetworkProxy
+internal sealed class UserSettingsProblemsRequest
 {
-    /// <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; an explicit port must be between 1 and 65535. 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 proxy 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>Layers to diagnose, in the precedence order the caller applies them.</summary>
+    [JsonPropertyName("sources")]
+    public IList<UserSettingsProblemSource>? Sources { 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>One problem found while validating a setting value.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class UserSettingsValidationIssue
+{
+    /// <summary>Human-readable description of the problem.</summary>
+    [JsonPropertyName("message")]
+    public string Message { get; set; } = string.Empty;
+
+    /// <summary>Where in the settings tree the problem sits, as object keys and array indices. The first element is the top-level key; a whole-value problem is reported as that single key.</summary>
+    [JsonPropertyName("path")]
+    public IList<JsonElement> Path { get => field ??= []; set; }
 }
 
-/// <summary>Network rules to merge into the base policy.</summary>
+/// <summary>Outcome of validating and writing one top-level setting subtree.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SandboxConfigUserPolicyNetwork
+internal sealed class UserSettingsApplyTopKeyResult
 {
-    /// <summary>Hosts allowed through the built-in sandbox proxy. A non-empty list denies unmatched hosts; an absent or empty list allows all hosts not blocked. Supports exact hostnames, IP addresses, and *.example.com for strict subdomains. Host rules do not override the outbound or local-network toggles.</summary>
-    [JsonPropertyName("allowedHosts")]
-    public IList<string>? AllowedHosts { get; set; }
+    /// <summary>Why the write failed, present only when `status` is `write-error`.</summary>
+    [JsonPropertyName("error")]
+    public string? Error { get; set; }
 
-    /// <summary>Whether traffic to local/loopback addresses is allowed.</summary>
-    [JsonPropertyName("allowLocalNetwork")]
-    public bool? AllowLocalNetwork { get; set; }
+    /// <summary>Problems found, present only when `status` is `validation-error`.</summary>
+    [JsonPropertyName("issues")]
+    public IList<UserSettingsValidationIssue>? Issues { get; set; }
 
-    /// <summary>Whether outbound network traffic is allowed at all.</summary>
-    [JsonPropertyName("allowOutbound")]
-    public bool? AllowOutbound { get; set; }
+    /// <summary>`ok` when the value was written, `validation-error` when it was rejected before any write, `write-error` when validation passed but the write failed.</summary>
+    [JsonPropertyName("status")]
+    public string Status { get; set; } = string.Empty;
+}
 
-    /// <summary>Hosts denied by the built-in sandbox proxy. Deny rules take precedence over allowedHosts. A domain also denies all its subdomains. IP addresses match exactly; *.example.com matches strict subdomains, and * denies every host.</summary>
-    [JsonPropertyName("blockedHosts")]
-    public IList<string>? BlockedHosts { get; set; }
+/// <summary>A single top-level setting subtree to validate and write.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class UserSettingsApplyTopKeyRequest
+{
+    /// <summary>Canonical path of the setting the caller is editing. Currently informational only.</summary>
+    [JsonPropertyName("canonicalPath")]
+    public IList<string> CanonicalPath { get => field ??= []; set; }
 
-    /// <summary>HTTP(S) proxy for sandboxed traffic. This is the built-in local proxy's upstream: every sandboxed command reaches it through a loopback listener, so credentials stay in the runtime and never reach the child. On Windows the sandbox also needs local network access, because it reaches that listener over host loopback. Configure credentials in the separate username/password fields. The transient local listener URL is never persisted.</summary>
-    [JsonPropertyName("proxy")]
-    public SandboxConfigUserPolicyNetworkProxy? Proxy { get; set; }
+    /// <summary>Records that the user chose an update channel explicitly, so the one-time staff channel migration stops reapplying. Honored only for the `autoUpdatesChannel` key.</summary>
+    [JsonPropertyName("completeStaffUpdateChannelMigration")]
+    public bool? CompleteStaffUpdateChannelMigration { get; set; }
+
+    /// <summary>True to remove the top-level key instead of writing it.</summary>
+    [JsonPropertyName("delete")]
+    public bool? Delete { get; set; }
+
+    /// <summary>Top-level setting name to write.</summary>
+    [JsonPropertyName("topKey")]
+    public string TopKey { get; set; } = string.Empty;
+
+    /// <summary>Value to write for the whole top-level key. Omitted when `delete` is true. Explicit null is preserved and validated as null.</summary>
+    [JsonPropertyName("value")]
+    public JsonElement? Value { get; set; }
 }
 
-/// <summary>macOS seatbelt-specific options.</summary>
+/// <summary>The whole content to store in the user settings file.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SandboxConfigUserPolicySeatbelt
+internal sealed class UserSettingsWriteAllRequest
 {
-    /// <summary>Whether the macOS seatbelt profile may access the keychain.</summary>
-    [JsonPropertyName("keychainAccess")]
-    public bool? KeychainAccess { get; set; }
+    /// <summary>The settings object to store. It replaces the file's entire content, so a key absent here is removed.</summary>
+    [JsonPropertyName("settings")]
+    public JsonElement Settings { get; set; }
 }
 
-/// <summary>User-managed sandbox policy fragment merged into the auto-discovered base policy.</summary>
+/// <summary>The stored value of the user setting after the merge.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SandboxConfigUserPolicy
+internal sealed class UserSettingsUpdateResult
 {
-    /// <summary>Deprecated legacy location for `seatbelt`; read only when the top-level `seatbelt` is absent.</summary>
-    [JsonPropertyName("experimental")]
-    public SandboxConfigUserPolicyExperimental? Experimental { get; set; }
+    /// <summary>The key's stored value after the write: the merged object when both the stored value and the supplied value are objects, otherwise the supplied value.</summary>
+    [JsonPropertyName("value")]
+    public JsonElement Value { get; set; }
+}
 
-    /// <summary>Filesystem rules to merge into the base policy.</summary>
-    [JsonPropertyName("filesystem")]
-    public SandboxConfigUserPolicyFilesystem? Filesystem { get; set; }
+/// <summary>Names the user setting to merge into, and the partial object to merge.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class UserSettingsUpdateRequest
+{
+    /// <summary>Copilot configuration directory to write the settings document in, taking precedence over the server's own `COPILOT_HOME` and default home. Omit it, or pass an empty string, to use the directory the server resolved for itself.</summary>
+    [JsonPropertyName("configDir")]
+    public string? ConfigDir { get; set; }
 
-    /// <summary>Network rules to merge into the base policy.</summary>
-    [JsonPropertyName("network")]
-    public SandboxConfigUserPolicyNetwork? Network { get; set; }
+    /// <summary>Top-level user-setting key to merge into, such as `extensions`.</summary>
+    [JsonPropertyName("key")]
+    public string Key { get; set; } = string.Empty;
 
-    /// <summary>macOS seatbelt options to merge into the base policy.</summary>
-    [JsonPropertyName("seatbelt")]
-    public SandboxConfigUserPolicySeatbelt? Seatbelt { get; set; }
+    /// <summary>Single-component name for the settings document at `&lt;configDir&gt;/settings/&lt;subDir&gt;.json`; path separators, `.` and `..` are rejected. Omit it, or pass an empty string, to use the main settings document.</summary>
+    [JsonPropertyName("subDir")]
+    public string? SubDir { get; set; }
+
+    /// <summary>Value to store for `key`. When both the stored value and this value are objects, their fields are shallow-merged and fields this object does not name are preserved. Otherwise this value replaces the stored value.</summary>
+    [JsonPropertyName("value")]
+    public JsonElement Value { get; set; }
 }
 
-/// <summary>Resolved sandbox configuration.</summary>
+/// <summary>Contents of settings.json as stored, for a caller about to rewrite it.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SandboxConfig
+internal sealed class UserSettingsLoadForEditResult
 {
-    /// <summary>Whether to auto-add the current working directory to readwritePaths. Default: true.</summary>
-    [JsonPropertyName("addCurrentWorkingDirectory")]
-    public bool? AddCurrentWorkingDirectory { get; set; }
+    /// <summary>Parsed contents, present only when `status` is `ok`.</summary>
+    [JsonPropertyName("settings")]
+    public JsonElement? Settings { get; set; }
 
-    /// <summary>Whether the agent may request that an individual command run outside the sandbox, which the host then approves or denies through the usual permission flow. A host capability flag rather than part of the policy: it is stripped from the effective spawn policy and only has an effect while `enabled` is true. Fail-closed, unlike the opt-out flags on this object: omitting it offers no bypass. Default: false (opt-in).</summary>
-    [JsonPropertyName("allowBypass")]
-    public bool? AllowBypass { get; set; }
+    /// <summary>`ok` when the file parsed, `missing` when there is no file yet, `invalid` when the file exists but will not parse.</summary>
+    [JsonPropertyName("status")]
+    public string Status { get; set; } = string.Empty;
+}
 
-    /// <summary>Whether to auto-grant read access to tool directories discovered on PATH and in toolchain environment variables (GOROOT, JAVA_HOME, VIRTUAL_ENV, and similar), and to common developer-tool caches, config, and toolchains. Writable grants cover scratch caches, the Unix GitHub CLI cache, and Cargo's registry, git store, and lock/tracker files. A relocated CARGO_HOME gets the same narrow split: registry and git are read-write; bin is read-only; the home root, config.toml, and credentials.toml stay ungranted. Set to false to disable every grant listed above; user-installed toolchains and caches then need explicit userPolicy.filesystem readonlyPaths and readwritePaths entries. The working directory (see addCurrentWorkingDirectory), temporary storage, session log paths, and system locations follow their own rules and stay granted. Default: true (enabled by default; set to false to opt out).</summary>
-    [JsonPropertyName("allowDevToolAccess")]
-    public bool? AllowDevToolAccess { get; set; }
+/// <summary>Outcome of validating one top-level setting subtree.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class UserSettingsValidateResult
+{
+    /// <summary>Problems found, empty when `ok` is true.</summary>
+    [JsonPropertyName("issues")]
+    public IList<UserSettingsValidationIssue>? Issues { get; set; }
 
-    /// <summary>Credential-injection capability flags.</summary>
-    [JsonPropertyName("auth")]
-    public SandboxConfigAuth? Auth { get; set; }
+    /// <summary>True when the subtree is valid.</summary>
+    [JsonPropertyName("ok")]
+    public bool Ok { get; set; }
+}
 
-    /// <summary>Opt-in whole-value environment masking for sandboxed shell, MCP, and LSP children. Configured names get random sentinels; the local proxy substitutes them only in HTTPS request headers at their injection hosts. Approved bypasses skip masking and the sandbox proxy, so bypassed shells may receive the real environment values. Disabled or explicitly opted-out routes are not protected. No credential values are stored in this configuration.</summary>
-    [JsonPropertyName("credentials")]
-    public SandboxCredentialsConfig? Credentials { get; set; }
+/// <summary>A single top-level setting subtree to validate.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class UserSettingsValidateRequest
+{
+    /// <summary>True to validate a removal of this key. The current settings file is not read.</summary>
+    [JsonPropertyName("delete")]
+    public bool? Delete { get; set; }
 
-    /// <summary>Whether sandboxing is enabled for the session.</summary>
-    [JsonPropertyName("enabled")]
-    public bool Enabled { get; set; }
+    /// <summary>Top-level setting name to validate.</summary>
+    [JsonPropertyName("topKey")]
+    public string TopKey { get; set; } = string.Empty;
 
-    /// <summary>The `sandboxLspServers` counterpart of `managedMcpRoutingLocked`.</summary>
-    [JsonInclude]
-    [JsonPropertyName("managedLspRoutingLocked")]
-    internal bool? ManagedLspRoutingLocked { get; set; }
+    /// <summary>Value to validate. Omitted when `delete` is true.</summary>
+    [JsonPropertyName("value")]
+    public JsonElement? Value { get; set; }
+}
 
-    /// <summary>Set by the runtime when a managed policy forced `sandboxMcpServers` on and took the local opt-out away. Provenance rather than policy: it lets a sandbox startup failure point at the administrator instead of a setting the next managed merge would override, and it is ignored when comparing two configs for change. Only the managed merge may set it; a caller-supplied value is stripped.</summary>
-    [JsonInclude]
-    [JsonPropertyName("managedMcpRoutingLocked")]
-    internal bool? ManagedMcpRoutingLocked { get; set; }
+/// <summary>One atomic edit of an allowed top-level repository setting.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class RepoSettingsEditRequest
+{
+    /// <summary>One canonical top-level repository setting that the allowlist permits.</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>Whether language servers the session launches are confined by the sandbox. Only an explicit `false` opts out. Ignored while `enabled` is false. Default: true (enabled by default; set to false to opt out).</summary>
-    [JsonPropertyName("sandboxLspServers")]
-    public bool? SandboxLspServers { get; set; }
+    /// <summary>Set a scalar, add or remove a string list item, or remove the setting. The handler rejects a missing or incompatible value.</summary>
+    [JsonPropertyName("operation")]
+    public SettingsEditOperation Operation { get; set; }
 
-    /// <summary>Whether MCP servers the session launches are confined by the sandbox. Only an explicit `false` opts out; doing so also lets remote-MCP egress leave the sandbox, so the flag and `enabled` are always read together. Ignored while `enabled` is false. Default: true (enabled by default; set to false to opt out).</summary>
-    [JsonPropertyName("sandboxMcpServers")]
-    public bool? SandboxMcpServers { get; set; }
+    /// <summary>Absolute path of the repository root.</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("repoRoot")]
+    public string RepoRoot { get; set; } = string.Empty;
 
-    /// <summary>User-managed sandbox policy fragment merged into the auto-discovered base policy.</summary>
-    [JsonPropertyName("userPolicy")]
-    public SandboxConfigUserPolicy? UserPolicy { get; set; }
+    /// <summary>Shared or local repository settings file.</summary>
+    [JsonPropertyName("scope")]
+    public RepoSettingsEditScope Scope { get; set; }
+
+    /// <summary>Required boolean, string or number for set, required string for add-item and remove-item, and forbidden for remove. The runtime rejects all other JSON values.</summary>
+    [JsonPropertyName("value")]
+    public JsonElement? Value { get; set; }
 }
 
-/// <summary>Identifies the credential hosts that the persistent certificate authority of the sandbox credential proxy must cover. The runtime always adds the hosts from the saved user settings.</summary>
+/// <summary>Parsed repository settings without normalization or layering.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SandboxProxyCaRequest
+internal sealed class RepoSettingsReadRawResult
 {
-    /// <summary>The sandbox configuration that the host gives its sessions. The runtime reads the credential hosts from `auth` and `credentials`; it ignores `enabled` and the other fields.</summary>
-    [JsonPropertyName("sandboxConfig")]
-    public SandboxConfig? SandboxConfig { get; set; }
+    /// <summary>Stored JSON values after the existing JSONC parser and prototype-safety checks. Empty when the file is missing, blank, or invalid.</summary>
+    [JsonPropertyName("config")]
+    public JsonElement Config { get; set; }
+
+    /// <summary>True when the file exists but did not parse, so `config` is empty for that reason rather than because nothing is set.</summary>
+    [JsonPropertyName("invalid")]
+    public bool Invalid { get; set; }
 }
 
-/// <summary>Result of creating the persistent certificate authority of the sandbox credential proxy.</summary>
+/// <summary>Which repository settings file to read.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SandboxProxyCaCreateResult
+internal sealed class RepoSettingsReadRawRequest
 {
-    /// <summary>Absolute path of the public certificate of the certificate authority, in PEM format.</summary>
-    [JsonPropertyName("certificatePath")]
-    public string CertificatePath { get; set; } = string.Empty;
+    /// <summary>Absolute path of the repository root.</summary>
+    [JsonPropertyName("repoRoot")]
+    public string RepoRoot { get; set; } = string.Empty;
+
+    /// <summary>Use repo for shared settings or local for settings.local.json. Other scopes are rejected.</summary>
+    [JsonPropertyName("scope")]
+    public string Scope { get; set; } = string.Empty;
 }
 
-/// <summary>Built-in tool metadata with identifier, optional namespaced name, description, input-parameter schema, and usage instructions.</summary>
+/// <summary>One key to write or remove in a repository settings file.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class Tool
+internal sealed class RepoSettingsWriteKeyRequest
 {
-    /// <summary>Description of what the tool does.</summary>
-    [JsonPropertyName("description")]
-    public string Description { get; set; } = string.Empty;
-
-    /// <summary>Optional instructions for how to use this tool effectively.</summary>
-    [JsonPropertyName("instructions")]
-    public string? Instructions { get; set; }
+    /// <summary>True to remove the key instead of writing it.</summary>
+    [JsonPropertyName("delete")]
+    public bool? Delete { get; set; }
 
-    /// <summary>Tool identifier (e.g., "bash", "grep", "str_replace_editor").</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Canonical top-level key permitted by the repository settings allowlist.</summary>
+    [JsonPropertyName("key")]
+    public string Key { get; set; } = string.Empty;
 
-    /// <summary>Optional namespaced name for declarative filtering (e.g., "playwright/navigate" for MCP tools).</summary>
-    [JsonPropertyName("namespacedName")]
-    public string? NamespacedName { get; set; }
+    /// <summary>Absolute path of the repository root.</summary>
+    [JsonPropertyName("repoRoot")]
+    public string RepoRoot { get; set; } = string.Empty;
 
-    /// <summary>JSON Schema for the tool's input parameters.</summary>
-    [JsonPropertyName("parameters")]
-    public IDictionary<string, JsonElement>? Parameters { get; set; }
+    /// <summary>Use repo for shared settings or local for settings.local.json. Other scopes are rejected.</summary>
+    [JsonPropertyName("scope")]
+    public string Scope { get; set; } = string.Empty;
 
-    /// <summary>Telemetry-safety policy for the tool name and input names, not input values. Treat omitted metadata as unsafe.</summary>
-    [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-    [JsonPropertyName("safeForTelemetry")]
-    public JsonElement? SafeForTelemetry { get; set; }
+    /// <summary>Value to validate and write. Required unless delete is true; a null value is validated, not treated as deletion.</summary>
+    [JsonPropertyName("value")]
+    public JsonElement? Value { get; set; }
 }
 
-/// <summary>Built-in tools available for the requested model, with their parameters and instructions.</summary>
+/// <summary>The complete set of repository-overridable settings to store.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ToolList
+internal sealed class RepoSettingsWriteAllRequest
 {
-    /// <summary>List of available built-in tools with metadata.</summary>
-    [JsonPropertyName("tools")]
-    public IList<Tool> Tools { get => field ??= []; set; }
-}
+    /// <summary>Absolute path of the repository root.</summary>
+    [JsonPropertyName("repoRoot")]
+    public string RepoRoot { get; set; } = string.Empty;
 
-/// <summary>Optional model identifier whose tool overrides should be applied to the listing.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class ToolsListRequest
-{
-    /// <summary>Optional model ID — when provided, the returned tool list reflects model-specific overrides.</summary>
-    [JsonPropertyName("model")]
-    public string? Model { get; set; }
+    /// <summary>Use repo for shared settings or local for settings.local.json. Other scopes are rejected.</summary>
+    [JsonPropertyName("scope")]
+    public string Scope { get; set; } = string.Empty;
+
+    /// <summary>Object of allowed settings to store. Missing allowlisted keys are removed. Other input keys are ignored, while unknown stored keys are preserved.</summary>
+    [JsonPropertyName("settings")]
+    public JsonElement Settings { get; set; }
 }
 
-/// <summary>Quota usage snapshot for a Copilot quota type, including entitlement, used requests, overage, reset date, and remaining percentage.</summary>
+/// <summary>Caller population and startup inputs to resolve named online-experiment gates for. Carries no account: the runtime resolves the assignment for the authentication it already holds.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class AccountQuotaSnapshot
+internal sealed class FeatureFlagsResolveStartupGatesRequest
 {
-    /// <summary>Number of requests included in the entitlement, or -1 for unlimited entitlements.</summary>
-    [JsonPropertyName("entitlementRequests")]
-    public long EntitlementRequests { get; set; }
+    /// <summary>User settings document whose `featureFlags` block is layered on top of the resolved set.</summary>
+    [JsonPropertyName("config")]
+    public JsonElement? Config { get; set; }
 
-    /// <summary>Whether the user has an unlimited usage entitlement.</summary>
-    [JsonPropertyName("isUnlimitedEntitlement")]
-    public bool IsUnlimitedEntitlement { get; set; }
+    /// <summary>Environment to read flag overrides from. Defaults to this runtime process's own environment.</summary>
+    [JsonPropertyName("environment")]
+    public IDictionary<string, string>? Environment { get; set; }
 
-    /// <summary>Number of additional usage requests made this period.</summary>
-    [JsonPropertyName("overage")]
-    public double Overage { get; set; }
+    /// <summary>When this installation first launched, in milliseconds since the Unix epoch. Experiments that segment on installation age read it. Omit when the first launch was never recorded.</summary>
+    [JsonPropertyName("firstLaunchAtMillis")]
+    public double? FirstLaunchAtMillis { get; set; }
 
-    /// <summary>Whether additional usage is allowed when quota is exhausted.</summary>
-    [JsonPropertyName("overageAllowedWithExhaustedQuota")]
-    public bool OverageAllowedWithExhaustedQuota { get; set; }
+    /// <summary>The feature flags to resolve. A name this runtime does not declare is reported as an error rather than as a disabled flag.</summary>
+    [JsonPropertyName("flags")]
+    public IList<string> Flags { get => field ??= []; set; }
 
-    /// <summary>Percentage of entitlement remaining.</summary>
-    [JsonPropertyName("remainingPercentage")]
-    public double RemainingPercentage { get; set; }
+    /// <summary>Whether the caller is in an experimental population.</summary>
+    [JsonPropertyName("isExperimental")]
+    public bool IsExperimental { get; set; }
 
-    /// <summary>Date when the quota resets (ISO 8601 string).</summary>
-    [JsonPropertyName("resetDate")]
-    public DateTimeOffset? ResetDate { get; set; }
+    /// <summary>Whether the caller is GitHub or Microsoft staff.</summary>
+    [JsonPropertyName("isStaff")]
+    public bool IsStaff { get; set; }
 
-    /// <summary>Whether usage is still permitted after quota exhaustion.</summary>
-    [JsonPropertyName("usageAllowedWithExhaustedQuota")]
-    public bool UsageAllowedWithExhaustedQuota { get; set; }
+    /// <summary>GitHub-staff membership. Omit when it was never recorded: a legacy staff account then counts as both staff populations and keeps every staff feature.</summary>
+    [JsonPropertyName("isStaffGithub")]
+    public bool? IsStaffGitHub { get; set; }
 
-    /// <summary>Number of requests used so far this period.</summary>
-    [JsonPropertyName("usedRequests")]
-    public long UsedRequests { get; set; }
-}
+    /// <summary>Microsoft-staff membership. Omitted the same way as `isStaffGitHub`.</summary>
+    [JsonPropertyName("isStaffMicrosoft")]
+    public bool? IsStaffMicrosoft { get; set; }
 
-/// <summary>Quota usage snapshots for the resolved user, keyed by quota type.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class AccountGetQuotaResult
-{
-    /// <summary>Quota snapshots keyed by type (e.g., chat, completions, premium_interactions).</summary>
-    [JsonPropertyName("quotaSnapshots")]
-    public IDictionary<string, AccountQuotaSnapshot> QuotaSnapshots { get => field ??= new Dictionary<string, AccountQuotaSnapshot>(); set; }
+    /// <summary>Whether the caller belongs to a team plan.</summary>
+    [JsonPropertyName("isTeam")]
+    public bool IsTeam { get; set; }
+
+    /// <summary>Whether the runtime may refresh the cached assignment over the network without an active session. The refresh never blocks this call: the answer comes from the cache either way, so a refresh only affects a later launch.</summary>
+    [JsonPropertyName("refreshWithoutSession")]
+    public bool RefreshWithoutSession { get; set; }
+
+    /// <summary>Whether streamer mode is on, which withholds the populations an experiment would otherwise segment on.</summary>
+    [JsonPropertyName("streamerMode")]
+    public bool StreamerMode { get; set; }
 }
 
-/// <summary>RPC data type for AccountGetQuota operations.</summary>
+/// <summary>The declared shape of one feature flag, independent of any caller population.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class AccountGetQuotaRequest
+internal sealed class FeatureFlagMetadata
 {
-    /// <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>The population the flag is declared for before any environment or user-settings override is applied.</summary>
+    [JsonPropertyName("availability")]
+    public FeatureFlagAvailability Availability { 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>Whether the flag participates in the CAPI sanity suite.</summary>
+    [JsonPropertyName("capiSanity")]
+    public bool CapiSanity { get; set; }
+
+    /// <summary>Text shown to a user choosing whether to turn the flag on in experimental mode. Absent when the flag is not user-facing.</summary>
+    [JsonPropertyName("experimentalDescription")]
+    public string? ExperimentalDescription { get; set; }
+
+    /// <summary>The online-experiment (ExP) flag this maps to, when the flag is assigned by an experiment rather than declared statically.</summary>
+    [JsonPropertyName("expFlag")]
+    public string? ExpFlag { get; set; }
+
+    /// <summary>Environment variable that overrides this flag's experiment assignment locally in the experiment service, not in `featureFlags.resolve`. Present exactly when `expFlag` is, and derived from it, so a caller reads a local override without reproducing the naming rule.</summary>
+    [JsonPropertyName("expFlagEnvVar")]
+    public string? ExpFlagEnvVar { get; set; }
+
+    /// <summary>The flag's name, matching the key it is listed under.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
 }
 
-/// <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>
+/// <summary>Every feature flag this runtime declares, with the shape each one was declared with.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-[JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "type",
-    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[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")]
-[JsonDerivedType(typeof(AuthInfoApiKey), "api-key")]
-public partial class AuthInfo
+internal sealed class FeatureFlagsMetadataResult
 {
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("type")]
-    public virtual string Type { get; set; } = string.Empty;
+    /// <summary>Declared feature flags keyed by flag name.</summary>
+    [JsonPropertyName("flags")]
+    public IDictionary<string, FeatureFlagMetadata> Flags { get => field ??= new Dictionary<string, FeatureFlagMetadata>(); set; }
 }
 
-
-/// <summary>Endpoint URLs from the raw Copilot `/copilot_internal/v2/token` user-response passthrough.</summary>
+/// <summary>Caller population and overrides for static feature-flag resolution, independent of experiment assignments and active runtime state.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class CopilotUserResponseEndpoints
+internal sealed class FeatureFlagsResolveRequest
 {
-    /// <summary>Copilot API endpoint URL.</summary>
-    [JsonPropertyName("api")]
-    public string? Api { get; set; }
+    /// <summary>Resolve against this already-computed flag set rather than each flag's declared availability. Keyed by flag name.</summary>
+    [JsonPropertyName("baseFlags")]
+    public IDictionary<string, bool>? BaseFlags { get; set; }
 
-    /// <summary>Experimental-service endpoint URL.</summary>
-    [JsonPropertyName("exp")]
-    public string? Exp { get; set; }
+    /// <summary>User settings to apply, including `enabledFeatureFlags`, legacy `feature_flags.enabled`, and supported convenience settings.</summary>
+    [JsonPropertyName("config")]
+    public JsonElement? Config { get; set; }
 
-    /// <summary>Origin-tracker endpoint URL.</summary>
-    [JsonPropertyName("origin-tracker")]
-    public string? OriginTracker { get; set; }
+    /// <summary>Environment for direct feature-flag overrides and `COPILOT_CLI_ENABLED_FEATURE_FLAGS`. Does not apply `COPILOT_EXP_*` experiment assignments. Defaults to this runtime process's own environment.</summary>
+    [JsonPropertyName("environment")]
+    public IDictionary<string, string>? Environment { get; set; }
 
-    /// <summary>Copilot proxy endpoint URL.</summary>
-    [JsonPropertyName("proxy")]
-    public string? Proxy { get; set; }
+    /// <summary>Flags forced to a value after every other layer, keyed by flag name.</summary>
+    [JsonPropertyName("flagOverrides")]
+    public IDictionary<string, bool>? FlagOverrides { get; set; }
 
-    /// <summary>Copilot telemetry endpoint URL.</summary>
-    [JsonPropertyName("telemetry")]
-    public string? Telemetry { get; set; }
+    /// <summary>Whether the caller is in an experimental population.</summary>
+    [JsonPropertyName("isExperimental")]
+    public bool IsExperimental { get; set; }
+
+    /// <summary>Whether the caller is GitHub or Microsoft staff.</summary>
+    [JsonPropertyName("isStaff")]
+    public bool IsStaff { get; set; }
+
+    /// <summary>GitHub-staff membership. Omit when it was never recorded: a legacy staff account then counts as both staff populations and keeps every staff feature.</summary>
+    [JsonPropertyName("isStaffGithub")]
+    public bool? IsStaffGitHub { get; set; }
+
+    /// <summary>Microsoft-staff membership. Omitted the same way as `isStaffGitHub`.</summary>
+    [JsonPropertyName("isStaffMicrosoft")]
+    public bool? IsStaffMicrosoft { get; set; }
+
+    /// <summary>Whether the caller belongs to the team population used by feature availability.</summary>
+    [JsonPropertyName("isTeam")]
+    public bool IsTeam { get; set; }
 }
 
-/// <summary>RPC data type for CopilotUserResponseEnterpriseListItem operations.</summary>
-public sealed class CopilotUserResponseEnterpriseListItem
+/// <summary>The policy questions a host asks before granting elevated permissions.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class PermissionsEvaluateManagedPolicyResult
 {
-    /// <summary>JavaScript-safe numeric database ID of the enterprise.</summary>
-    [JsonPropertyName("id")]
-    public long? Id { get; set; }
+    /// <summary>True when managed policy forbids bypass-permissions mode, so allow-all style flags must not take effect.</summary>
+    [JsonPropertyName("bypassPermissionsDisabled")]
+    public bool BypassPermissionsDisabled { get; set; }
+
+    /// <summary>True when the managed layer supplies permission rules that the session must enforce.</summary>
+    [JsonPropertyName("permissionRulesActive")]
+    public bool PermissionRulesActive { get; set; }
+
+    /// <summary>True when a managed policy exists but this build could not determine its meaning. Hosts fail closed on it rather than assuming permission was granted.</summary>
+    [JsonPropertyName("policyUndetermined")]
+    public bool PolicyUndetermined { get; set; }
 }
 
-/// <summary>RPC data type for CopilotUserResponseOrganizationListItem operations.</summary>
-public sealed class CopilotUserResponseOrganizationListItem
+/// <summary>The verbatim managed `permissions` slice to interpret.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class PermissionsEvaluateManagedPolicyParams
 {
-    /// <summary>Numeric database ID of the organization.</summary>
-    [JsonPropertyName("id")]
-    public double? Id { get; set; }
+    /// <summary>The `permissions` object from a managed settings layer, for example `{"disableBypassPermissionsMode":"disable"}`. Omitted or null means no managed policy applies.</summary>
+    [JsonPropertyName("permissions")]
+    public JsonElement? Permissions { get; set; }
+}
 
-    /// <summary>GitHub login of the organization.</summary>
-    [JsonPropertyName("login")]
-    public string? Login { get; set; }
+/// <summary>Which stored location permissions were dropped because their directory is gone.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class LocationPermissionsCleanupResult
+{
+    /// <summary>Location keys whose grants were removed. Empty when every stored location still exists.</summary>
+    [JsonPropertyName("removedLocationKeys")]
+    public IList<string> RemovedLocationKeys { get => field ??= []; set; }
+}
 
-    /// <summary>Display name of the organization.</summary>
-    [JsonPropertyName("name")]
-    public string? Name { get; set; }
+/// <summary>Folder trust check result.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class FolderTrustCheckResult
+{
+    /// <summary>Whether the folder is trusted.</summary>
+    [JsonPropertyName("trusted")]
+    public bool Trusted { get; set; }
 }
 
-/// <summary>Chat quota snapshot from the raw Copilot user-response passthrough, with entitlement, overage, remaining quota, reset, and billing fields.</summary>
+/// <summary>A folder to check against a persisted trusted-folders list, and the configuration directory holding that list.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class CopilotUserResponseQuotaSnapshotsChat
+internal sealed class FolderTrustIsTrustedParams
 {
-    /// <summary>Number of requests/units included in the entitlement for this period; `-1` denotes an unlimited entitlement.</summary>
-    [JsonPropertyName("entitlement")]
-    public double? Entitlement { get; set; }
+    /// <summary>Configuration directory to read the trusted-folders list from. Omit it to read the default location; supply it when the host has redirected its configuration, or the check answers from a list the host is not using.</summary>
+    [JsonPropertyName("configDir")]
+    public string? ConfigDir { get; set; }
 
-    /// <summary>Whether the user currently has quota available; when `false` and not unlimited, further requests are blocked until the quota resets.</summary>
-    [JsonPropertyName("has_quota")]
-    public bool? HasQuota { get; set; }
+    /// <summary>Folder to check. A folder counts as trusted when it is itself listed, when an ancestor is listed, or when its git root is listed.</summary>
+    [JsonPropertyName("path")]
+    public string Path { get; set; } = string.Empty;
+}
 
-    /// <summary>Count of additional pay-per-request usage consumed this period beyond the entitlement.</summary>
-    [JsonPropertyName("overage_count")]
-    public double? OverageCount { get; set; }
+/// <summary>The device-managed settings layer, with the sandbox floor and the load outcome a host needs to compose it into an effective policy.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class ManagedSettingsReadDeviceResult
+{
+    /// <summary>Whether discovery or validation failed. A host must treat this as "policy unknown" rather than "no policy": absent settings with this set false mean the device genuinely has none.</summary>
+    [JsonPropertyName("loadFailed")]
+    public bool LoadFailed { get; set; }
 
-    /// <summary>Whether usage may continue at pay-per-request rates once the entitlement is exhausted.</summary>
-    [JsonPropertyName("overage_permitted")]
-    public bool? OveragePermitted { get; set; }
+    /// <summary>Sandbox floor read from the discovered document before validation, so a document that is otherwise rejected can still raise the floor it declared.</summary>
+    [JsonPropertyName("sandboxFloor")]
+    public JsonElement? SandboxFloor { get; set; }
 
-    /// <summary>Percentage of the entitlement remaining at the snapshot timestamp.</summary>
-    [JsonPropertyName("percent_remaining")]
-    public double? PercentRemaining { get; set; }
+    /// <summary>Validated, canonical device-managed settings. Omitted when no device policy was discovered, when the discovered document failed validation, or when it validated to an empty object — an empty document carries no policy, and reporting it as present would outrank layers that do.</summary>
+    [JsonPropertyName("settings")]
+    public JsonElement? Settings { get; set; }
+}
 
-    /// <summary>Identifier of the quota bucket this snapshot describes.</summary>
-    [JsonPropertyName("quota_id")]
-    public string? QuotaId { get; set; }
+/// <summary>The managed layers to retain as this process's startup policy, with the outcome of fetching each one.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class ManagedSettingsRetainPolicyParams
+{
+    /// <summary>Whether the device load failed. Report it honestly, for the same reason as `serverFetchFailed`.</summary>
+    [JsonPropertyName("deviceLoadFailed")]
+    public bool DeviceLoadFailed { get; set; }
 
-    /// <summary>Amount of quota remaining at the snapshot timestamp.</summary>
-    [JsonPropertyName("quota_remaining")]
-    public double? QuotaRemaining { get; set; }
+    /// <summary>The device/MDM policy layer.</summary>
+    [JsonPropertyName("deviceResponse")]
+    public JsonElement? DeviceResponse { get; set; }
 
-    /// <summary>Unix epoch time, in seconds, when this quota next resets.</summary>
-    [JsonPropertyName("quota_reset_at")]
-    public double? QuotaResetAt { get; set; }
+    /// <summary>Sandbox floor declared by the device layer, carried separately so a document that failed validation can still raise the floor.</summary>
+    [JsonPropertyName("deviceSandboxFloor")]
+    public JsonElement? DeviceSandboxFloor { get; set; }
 
-    /// <summary>Remaining entitlement/quota amount at the snapshot timestamp.</summary>
-    [JsonPropertyName("remaining")]
-    public double? Remaining { get; set; }
+    /// <summary>Whether the device sandbox intent is unreadable independently of its other settings.</summary>
+    [JsonPropertyName("deviceSandboxUndetermined")]
+    public bool DeviceSandboxUndetermined { get; set; }
 
-    /// <summary>UTC timestamp when this snapshot was captured.</summary>
-    [JsonPropertyName("timestamp_utc")]
-    public string? TimestampUtc { get; set; }
+    /// <summary>Whether a device policy source demonstrably exists. This, not a read error, is the evidence a device is managed, so a fail-closed policy gates on it.</summary>
+    [JsonPropertyName("deviceSourceFound")]
+    public bool DeviceSourceFound { get; set; }
 
-    /// <summary>Whether this category uses usage-based (token/AI-credit) billing rather than a fixed premium-request count.</summary>
-    [JsonPropertyName("token_based_billing")]
-    public bool? TokenBasedBilling { get; set; }
+    /// <summary>Whether any managed policy source exists, independently of fetch failures.</summary>
+    [JsonPropertyName("managedPolicyPresent")]
+    public bool ManagedPolicyPresent { get; set; }
 
-    /// <summary>Whether the entitlement for this category is unlimited.</summary>
-    [JsonPropertyName("unlimited")]
-    public bool? Unlimited { get; set; }
-}
+    /// <summary>Whether permission policy is undetermined. Sandbox-only uncertainty does not imply this flag.</summary>
+    [JsonPropertyName("permissionPolicyUndetermined")]
+    public bool PermissionPolicyUndetermined { get; set; }
 
-/// <summary>Completions quota snapshot from the raw Copilot user-response passthrough, with entitlement, overage, remaining quota, reset, and billing fields.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class CopilotUserResponseQuotaSnapshotsCompletions
-{
-    /// <summary>Number of requests/units included in the entitlement for this period; `-1` denotes an unlimited entitlement.</summary>
-    [JsonPropertyName("entitlement")]
-    public double? Entitlement { get; set; }
+    /// <summary>The policy helper's response: the third managed layer that a process owning its startup policy resolves. It is retained with the other two so that every ambient read in this process, including the mutation guards and the governed marketplace allowlist that the `plugins.*` handlers derive, sees the whole policy the process fetched. A session-owning process omits it, because it resolves a helper per session against that session's working directory.</summary>
+    [JsonPropertyName("policyHelperResponse")]
+    public JsonElement? PolicyHelperResponse { get; set; }
 
-    /// <summary>Whether the user currently has quota available; when `false` and not unlimited, further requests are blocked until the quota resets.</summary>
-    [JsonPropertyName("has_quota")]
-    public bool? HasQuota { get; set; }
+    /// <summary>Preserve the retained server layer during a device-only resolution.</summary>
+    [JsonPropertyName("preserveServerState")]
+    public bool PreserveServerState { get; set; }
 
-    /// <summary>Count of additional pay-per-request usage consumed this period beyond the entitlement.</summary>
-    [JsonPropertyName("overage_count")]
-    public double? OverageCount { get; set; }
+    /// <summary>Whether uncertainty alone enabled the shared sandbox floor.</summary>
+    [JsonPropertyName("sandboxEnabledByUndeterminedPolicy")]
+    public bool SandboxEnabledByUndeterminedPolicy { get; set; }
 
-    /// <summary>Whether usage may continue at pay-per-request rates once the entitlement is exhausted.</summary>
-    [JsonPropertyName("overage_permitted")]
-    public bool? OveragePermitted { get; set; }
+    /// <summary>Whether the shared sandbox policy is undetermined. Diagnostic errors alone do not imply this flag.</summary>
+    [JsonPropertyName("sandboxFloorUndetermined")]
+    public bool SandboxFloorUndetermined { get; set; }
 
-    /// <summary>Percentage of the entitlement remaining at the snapshot timestamp.</summary>
-    [JsonPropertyName("percent_remaining")]
-    public double? PercentRemaining { get; set; }
+    /// <summary>Whether the server fetch failed. Report it honestly: true keeps the already-retained server layer rather than replacing it with an absent one.</summary>
+    [JsonPropertyName("serverFetchFailed")]
+    public bool ServerFetchFailed { get; set; }
 
-    /// <summary>Identifier of the quota bucket this snapshot describes.</summary>
-    [JsonPropertyName("quota_id")]
-    public string? QuotaId { get; set; }
+    /// <summary>Whether a required fresh server-policy confirmation failed.</summary>
+    [JsonPropertyName("serverForcedRefreshFailure")]
+    public bool ServerForcedRefreshFailure { get; set; }
 
-    /// <summary>Amount of quota remaining at the snapshot timestamp.</summary>
-    [JsonPropertyName("quota_remaining")]
-    public double? QuotaRemaining { get; set; }
+    /// <summary>The resolved server policy. A known source can lack a response after a forced-refresh failure.</summary>
+    [JsonPropertyName("serverResponse")]
+    public JsonElement? ServerResponse { get; set; }
 
-    /// <summary>Unix epoch time, in seconds, when this quota next resets.</summary>
-    [JsonPropertyName("quota_reset_at")]
-    public double? QuotaResetAt { get; set; }
+    /// <summary>Whether the server policy source exists, even when its response is unavailable.</summary>
+    [JsonPropertyName("serverSourceFound")]
+    public bool ServerSourceFound { get; set; }
 
-    /// <summary>Remaining entitlement/quota amount at the snapshot timestamp.</summary>
-    [JsonPropertyName("remaining")]
-    public double? Remaining { get; set; }
+    /// <summary>Shared server/device sandbox floor, excluding session-local helper policy.</summary>
+    [JsonPropertyName("sharedSandboxFloor")]
+    public JsonElement? SharedSandboxFloor { get; set; }
+}
 
-    /// <summary>UTC timestamp when this snapshot was captured.</summary>
-    [JsonPropertyName("timestamp_utc")]
-    public string? TimestampUtc { get; set; }
+/// <summary>The user settings with the managed layer's controlled entries stamped on.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class ManagedSettingsApplyControlsResult
+{
+    /// <summary>The resulting settings document.</summary>
+    [JsonPropertyName("settingsJson")]
+    public JsonElement SettingsJson { get; set; }
+}
 
-    /// <summary>Whether this category uses usage-based (token/AI-credit) billing rather than a fixed premium-request count.</summary>
-    [JsonPropertyName("token_based_billing")]
-    public bool? TokenBasedBilling { get; set; }
+/// <summary>A user settings document and the effective managed policy whose controlled entries should be stamped onto it.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class ManagedSettingsApplyControlsParams
+{
+    /// <summary>The effective managed policy, as composed by `managedSettings.resolveEffectiveValue`. Omit it on an unmanaged host: the settings then come back unchanged.</summary>
+    [JsonPropertyName("managed")]
+    public JsonElement? Managed { get; set; }
 
-    /// <summary>Whether the entitlement for this category is unlimited.</summary>
-    [JsonPropertyName("unlimited")]
-    public bool? Unlimited { get; set; }
+    /// <summary>The user settings document to stamp. Entries the managed layer does not name are returned exactly as supplied.</summary>
+    [JsonPropertyName("settings")]
+    public JsonElement Settings { get; set; }
 }
 
-/// <summary>Premium-interactions quota snapshot from the raw Copilot user-response passthrough, with entitlement, overage, remaining quota, reset, and billing fields.</summary>
+/// <summary>The accepted managed settings, reduced to the keys a client is allowed to set.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class CopilotUserResponseQuotaSnapshotsPremiumInteractions
+internal sealed class ManagedSettingsParseClientValueResult
 {
-    /// <summary>Number of requests/units included in the entitlement for this period; `-1` denotes an unlimited entitlement.</summary>
-    [JsonPropertyName("entitlement")]
-    public double? Entitlement { get; set; }
-
-    /// <summary>Whether the user currently has quota available; when `false` and not unlimited, further requests are blocked until the quota resets.</summary>
-    [JsonPropertyName("has_quota")]
-    public bool? HasQuota { get; set; }
+    /// <summary>The normalized settings. Omitted when the client supplied none. An accepted document that sets nothing comes back as an empty object, which is distinct from omission.</summary>
+    [JsonPropertyName("settingsJson")]
+    public JsonElement? SettingsJson { get; set; }
+}
 
-    /// <summary>Count of additional pay-per-request usage consumed this period beyond the entitlement.</summary>
-    [JsonPropertyName("overage_count")]
-    public double? OverageCount { get; set; }
+/// <summary>The client-supplied managed settings to validate and normalize. Omitting them is valid and yields no policy.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class ManagedSettingsParseClientValueParams
+{
+    /// <summary>The managed settings a client is supplying for a session it is about to open. Omit them when the client is imposing no policy of its own.</summary>
+    [JsonPropertyName("settings")]
+    public JsonElement? Settings { get; set; }
+}
 
-    /// <summary>Whether usage may continue at pay-per-request rates once the entitlement is exhausted.</summary>
-    [JsonPropertyName("overage_permitted")]
-    public bool? OveragePermitted { get; set; }
+/// <summary>The effective managed policy composed from the supplied layers.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class ManagedSettingsResolveEffectiveValueResult
+{
+    /// <summary>The composed effective managed settings. Omitted when no layer sets anything, so an unmanaged host locks nothing. Carries `sandboxAdvisoryFloorDeclined: true` when an advisory server force-on was dropped because this host cannot run the sandbox.</summary>
+    [JsonPropertyName("settingsJson")]
+    public JsonElement? SettingsJson { get; set; }
+}
 
-    /// <summary>Percentage of the entitlement remaining at the snapshot timestamp.</summary>
-    [JsonPropertyName("percent_remaining")]
-    public double? PercentRemaining { get; set; }
+/// <summary>The managed-settings layers to compose into an effective policy. Every layer is optional; omitting all of them yields no effective policy.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class ManagedSettingsResolveEffectiveValueParams
+{
+    /// <summary>The device sandbox floor, folded into the device layer under `sandbox` before composition.</summary>
+    [JsonPropertyName("deviceSandboxFloor")]
+    public JsonElement? DeviceSandboxFloor { get; set; }
 
-    /// <summary>Identifier of the quota bucket this snapshot describes.</summary>
-    [JsonPropertyName("quota_id")]
-    public string? QuotaId { get; set; }
+    /// <summary>The device layer: native MDM and managed-file settings describing the machine rather than the account.</summary>
+    [JsonPropertyName("mdm")]
+    public JsonElement? Mdm { get; set; }
 
-    /// <summary>Amount of quota remaining at the snapshot timestamp.</summary>
-    [JsonPropertyName("quota_remaining")]
-    public double? QuotaRemaining { get; set; }
+    /// <summary>The policy-helper layer, an enforced channel sourced from a platform policy helper process.</summary>
+    [JsonPropertyName("policyHelper")]
+    public JsonElement? PolicyHelper { get; set; }
 
-    /// <summary>Unix epoch time, in seconds, when this quota next resets.</summary>
-    [JsonPropertyName("quota_reset_at")]
-    public double? QuotaResetAt { get; set; }
+    /// <summary>The account's server-delivered org policy, as returned by a managed-settings fetch. Omitted before sign-in or when the fetch has not landed.</summary>
+    [JsonPropertyName("server")]
+    public JsonElement? Server { get; set; }
+}
 
-    /// <summary>Remaining entitlement/quota amount at the snapshot timestamp.</summary>
-    [JsonPropertyName("remaining")]
-    public double? Remaining { get; set; }
+/// <summary>The bypass-permissions state a host should hold after the resolution, and what it must do to get there.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class ManagedSettingsResolveBypassDisableTransitionResult
+{
+    /// <summary>The account the returned `managed` source is pinned to. Store it alongside `source`; the next call needs it to decide whether an account switch lifts the disable.</summary>
+    [JsonPropertyName("managedIdentity")]
+    public string? ManagedIdentity { get; set; }
 
-    /// <summary>UTC timestamp when this snapshot was captured.</summary>
-    [JsonPropertyName("timestamp_utc")]
-    public string? TimestampUtc { get; set; }
+    /// <summary>The value to store in the host's own bypass-disabled flag. Omitted means leave it exactly as it is, which is not the same as being told to store `false`.</summary>
+    [JsonPropertyName("setDisabledState")]
+    public bool? SetDisabledState { get; set; }
 
-    /// <summary>Whether this category uses usage-based (token/AI-credit) billing rather than a fixed premium-request count.</summary>
-    [JsonPropertyName("token_based_billing")]
-    public bool? TokenBasedBilling { get; set; }
+    /// <summary>Which layer disables bypass mode after this resolution. Omitted when none does, which is what a lifted disable looks like.</summary>
+    [JsonPropertyName("source")]
+    public ManagedSettingsBypassDisableSource? Source { get; set; }
 
-    /// <summary>Whether the entitlement for this category is unlimited.</summary>
-    [JsonPropertyName("unlimited")]
-    public bool? Unlimited { get; set; }
+    /// <summary>Whether a bypass-permissions session already running must be turned off. True only when this resolution newly disables bypass mode, so a host that is already compliant is not interrupted.</summary>
+    [JsonPropertyName("suppressRuntimeAllowAll")]
+    public bool SuppressRuntimeAllowAll { get; set; }
 }
 
-/// <summary>Quota snapshot map from the raw Copilot user-response passthrough, with chat, completions, premium-interactions, and other entries.</summary>
+/// <summary>The bypass-permissions state a host holds today, the account now signed in, and what the managed-policy resolution said.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class CopilotUserResponseQuotaSnapshots
+internal sealed class ManagedSettingsResolveBypassDisableTransitionParams
 {
-    /// <summary>Chat quota snapshot from the raw Copilot user-response passthrough, with entitlement, overage, remaining quota, reset, and billing fields.</summary>
-    [JsonPropertyName("chat")]
-    public CopilotUserResponseQuotaSnapshotsChat? Chat { get; set; }
+    /// <summary>The account signed in now. A `managed` disable pinned to a different account is lifted.</summary>
+    [JsonPropertyName("activeIdentity")]
+    public string ActiveIdentity { get; set; } = string.Empty;
 
-    /// <summary>Completions quota snapshot from the raw Copilot user-response passthrough, with entitlement, overage, remaining quota, reset, and billing fields.</summary>
-    [JsonPropertyName("completions")]
-    public CopilotUserResponseQuotaSnapshotsCompletions? Completions { get; set; }
+    /// <summary>The account a `managed` disable is pinned to. Omit it when the current source is not `managed`; it is ignored for the other sources.</summary>
+    [JsonPropertyName("currentManagedIdentity")]
+    public string? CurrentManagedIdentity { get; set; }
 
-    /// <summary>Premium-interactions quota snapshot from the raw Copilot user-response passthrough, with entitlement, overage, remaining quota, reset, and billing fields.</summary>
-    [JsonPropertyName("premium_interactions")]
-    public CopilotUserResponseQuotaSnapshotsPremiumInteractions? PremiumInteractions { get; set; }
+    /// <summary>Which layer currently disables bypass mode. Omit it when nothing does.</summary>
+    [JsonPropertyName("currentSource")]
+    public ManagedSettingsBypassDisableSource? CurrentSource { get; set; }
+
+    /// <summary>What the resolution said about bypass mode. Send `unknown` rather than omitting the field when there is no verdict.</summary>
+    [JsonPropertyName("policy")]
+    public ManagedSettingsBypassPolicyResolution Policy { 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>
+/// <summary>One diagnostic emitted while ingesting managed settings. Returned rather than logged by the runtime so the host decides where ingestion diagnostics go, which matters because an ingestion runs before a session exists to carry a log sink.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class CopilotUserResponse
+internal sealed class ManagedSettingsLogMessage
 {
-    /// <summary>Copilot access SKU identifier (e.g. `free_limited_copilot`, `copilot_for_business_seat_quota`) used to gate model and feature access.</summary>
-    [JsonPropertyName("access_type_sku")]
-    public string? AccessTypeSku { get; set; }
+    /// <summary>Severity of this diagnostic.</summary>
+    [JsonPropertyName("level")]
+    public ManagedSettingsLogLevel Level { get; set; }
 
-    /// <summary>Opaque analytics tracking identifier for the user, forwarded from the Copilot API.</summary>
-    [JsonPropertyName("analytics_tracking_id")]
-    public string? AnalyticsTrackingId { get; set; }
+    /// <summary>Human-readable diagnostic text.</summary>
+    [JsonPropertyName("message")]
+    public string Message { get; set; } = string.Empty;
+}
 
-    /// <summary>Date the Copilot seat was assigned to the user, if applicable.</summary>
-    [JsonPropertyName("assigned_date")]
-    public string? AssignedDate { get; set; }
+/// <summary>The managed policy layers an ingestion resolved, together with the per-layer outcome flags a host needs to decide how much to trust the result. The flags are reported rather than folded into the settings because a host must be able to distinguish an unmanaged device from a managed device whose policy could not be confirmed, and apply its fail-closed gates in the second case.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class ManagedSettingsIngestResult
+{
+    /// <summary>The device layer could not be read, so it is unconfirmed rather than known-absent.</summary>
+    [JsonPropertyName("deviceLoadFailed")]
+    public bool DeviceLoadFailed { get; set; }
 
-    /// <summary>Whether the user is eligible to sign up for the free/limited Copilot tier.</summary>
-    [JsonPropertyName("can_signup_for_limited")]
-    public bool? CanSignupForLimited { get; set; }
+    /// <summary>The device layer discovered from the machine, when one exists.</summary>
+    [JsonPropertyName("deviceResponse")]
+    public JsonElement? DeviceResponse { get; set; }
 
-    /// <summary>Whether the user is able to upgrade their Copilot plan.</summary>
-    [JsonPropertyName("can_upgrade_plan")]
-    public bool? CanUpgradePlan { get; set; }
+    /// <summary>The sandbox floor contributed by the device layer.</summary>
+    [JsonPropertyName("deviceSandboxFloor")]
+    public JsonElement? DeviceSandboxFloor { get; set; }
 
-    /// <summary>Whether Copilot chat is enabled for the user.</summary>
-    [JsonPropertyName("chat_enabled")]
-    public bool? ChatEnabled { get; set; }
+    /// <summary>Whether the device layer's sandbox intent could not be determined, so a consumer must not read its absence as permission to run unsandboxed.</summary>
+    [JsonPropertyName("deviceSandboxUndetermined")]
+    public bool DeviceSandboxUndetermined { get; set; }
 
-    /// <summary>Whether CLI remote control is enabled for the user.</summary>
-    [JsonPropertyName("cli_remote_control_enabled")]
-    public bool? CliRemoteControlEnabled { get; set; }
+    /// <summary>A device-managed policy is known to exist.</summary>
+    [JsonPropertyName("deviceSourceFound")]
+    public bool DeviceSourceFound { get; set; }
 
-    /// <summary>Whether cloud session storage is enabled for the user.</summary>
-    [JsonPropertyName("cloud_session_storage_enabled")]
-    public bool? CloudSessionStorageEnabled { get; set; }
+    /// <summary>Diagnostics emitted while resolving the layers, in the order they occurred.</summary>
+    [JsonPropertyName("logMessages")]
+    public IList<ManagedSettingsLogMessage> LogMessages { get => field ??= []; set; }
 
-    /// <summary>Whether the Codex agent is enabled for the user.</summary>
-    [JsonPropertyName("codex_agent_enabled")]
-    public bool? CodexAgentEnabled { get; set; }
+    /// <summary>The effective managed permissions layer, when the resolved policy carries one.</summary>
+    [JsonPropertyName("permissions")]
+    public JsonElement? Permissions { get; set; }
 
-    /// <summary>Copilot plan name for the user (e.g. `individual`, `business`, `enterprise`).</summary>
-    [JsonPropertyName("copilot_plan")]
-    public string? CopilotPlan { get; set; }
+    /// <summary>Which channel registered the policy helper that produced the helper layer.</summary>
+    [JsonPropertyName("policyHelperAuthority")]
+    public ManagedSettingsPolicyHelperAuthority? PolicyHelperAuthority { get; set; }
 
-    /// <summary>Whether `.copilotignore` content-exclusion support is enabled for the user.</summary>
-    [JsonPropertyName("copilotignore_enabled")]
-    public bool? CopilotignoreEnabled { get; set; }
+    /// <summary>A policy helper is configured for this host.</summary>
+    [JsonPropertyName("policyHelperConfigured")]
+    public bool PolicyHelperConfigured { get; set; }
 
-    /// <summary>Endpoint URLs from the raw Copilot `/copilot_internal/v2/token` user-response passthrough.</summary>
-    [JsonPropertyName("endpoints")]
-    public CopilotUserResponseEndpoints? Endpoints { get; set; }
+    /// <summary>The policy helper's failure must be treated as fail-closed rather than ignored.</summary>
+    [JsonPropertyName("policyHelperFailClosed")]
+    public bool PolicyHelperFailClosed { get; set; }
 
-    /// <summary>Enterprises that provide the user's Copilot license; malformed entries are normalized to null or ID-less shapes.</summary>
-    [JsonPropertyName("enterprise_list")]
-    public IList<CopilotUserResponseEnterpriseListItem?>? EnterpriseList { get; set; }
+    /// <summary>The policy helper was configured but could not be run or its output could not be read.</summary>
+    [JsonPropertyName("policyHelperLoadFailed")]
+    public bool PolicyHelperLoadFailed { get; set; }
 
-    /// <summary>Whether MCP (Model Context Protocol) support is enabled for the user.</summary>
-    [JsonPropertyName("is_mcp_enabled")]
-    public bool? IsMcpEnabled { get; set; }
+    /// <summary>The layer produced by the platform policy helper, when one ran.</summary>
+    [JsonPropertyName("policyHelperResponse")]
+    public JsonElement? PolicyHelperResponse { get; set; }
 
-    /// <summary>Whether the user is a GitHub/Microsoft staff member.</summary>
-    [JsonPropertyName("is_staff")]
-    public bool? IsStaff { get; set; }
+    /// <summary>A live fetch failed but a recent cached entry was served in its place, so `serverFetchFailed` stays false. Lets a consumer distinguish a clean fetch from a cache-backed fallback.</summary>
+    [JsonPropertyName("serverCacheFallback")]
+    public bool ServerCacheFallback { get; set; }
 
-    /// <summary>Per-category quota allotments for free/limited-tier users, keyed by quota category.</summary>
-    [JsonPropertyName("limited_user_quotas")]
-    public IDictionary<string, double>? LimitedUserQuotas { get; set; }
+    /// <summary>Minimum client version requested by a successful response. Advisory only; the delivered policy remains active.</summary>
+    [JsonPropertyName("serverClientUpdateRequested")]
+    public string? ServerClientUpdateRequested { get; set; }
 
-    /// <summary>Date the free/limited-tier user's quotas next reset, as a raw string from the Copilot API.</summary>
-    [JsonPropertyName("limited_user_reset_date")]
-    public string? LimitedUserResetDate { get; set; }
+    /// <summary>The server refused to deliver a policy because this client is too old to enforce it, carrying the user-facing sentence describing the refusal. No retry will help; the remedy is a client update. Gates that exist only because of managed policy should deny on this rather than falling back to their unmanaged default.</summary>
+    [JsonPropertyName("serverClientUpdateRequired")]
+    public string? ServerClientUpdateRequired { get; set; }
 
-    /// <summary>GitHub login of the authenticated user.</summary>
-    [JsonPropertyName("login")]
-    public string? Login { get; set; }
+    /// <summary>The error that made the server fetch fail, when one did.</summary>
+    [JsonPropertyName("serverFetchError")]
+    public string? ServerFetchError { get; set; }
 
-    /// <summary>Per-category monthly quota allotments, keyed by quota category.</summary>
-    [JsonPropertyName("monthly_quotas")]
-    public IDictionary<string, double>? MonthlyQuotas { get; set; }
+    /// <summary>The server fetch failed and no cached entry stood in for it, so the server layer is unconfirmed and fail-closed gates apply.</summary>
+    [JsonPropertyName("serverFetchFailed")]
+    public bool ServerFetchFailed { get; set; }
 
-    /// <summary>Organizations the user belongs to, each with an optional ID, login, and display name.</summary>
-    [JsonPropertyName("organization_list")]
-    public IList<CopilotUserResponseOrganizationListItem?>? OrganizationList { get; set; }
+    /// <summary>The server fetch failed while a policy demanded a fresh confirmation, which is the strict posture an enterprise opted into rather than an ordinary transient failure.</summary>
+    [JsonPropertyName("serverForcedRefreshFailure")]
+    public bool ServerForcedRefreshFailure { get; set; }
 
-    /// <summary>Logins of the organizations the user belongs to.</summary>
-    [JsonPropertyName("organization_login_list")]
-    public IList<string>? OrganizationLoginList { get; set; }
+    /// <summary>The synthesized fail-closed permissions layer applied in place of a policy a refused client may not enforce.</summary>
+    [JsonPropertyName("serverPermissionsFloor")]
+    public JsonElement? ServerPermissionsFloor { get; set; }
 
-    /// <summary>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.</summary>
-    [JsonPropertyName("quota_reset_date")]
-    public string? QuotaResetDate { get; set; }
+    /// <summary>How the server layer was resolved.</summary>
+    [JsonPropertyName("serverResolution")]
+    public ManagedSettingsServerPolicyResolution ServerResolution { get; set; }
 
-    /// <summary>UTC-normalized form of `quota_reset_date` (the date the user's usage quota next resets).</summary>
-    [JsonPropertyName("quota_reset_date_utc")]
-    public string? QuotaResetDateUtc { get; set; }
+    /// <summary>The account's server-delivered policy, when one was resolved.</summary>
+    [JsonPropertyName("serverResponse")]
+    public JsonElement? ServerResponse { get; set; }
 
-    /// <summary>Quota snapshot map from the raw Copilot user-response passthrough, with chat, completions, premium-interactions, and other entries.</summary>
-    [JsonPropertyName("quota_snapshots")]
-    public CopilotUserResponseQuotaSnapshots? QuotaSnapshots { get; set; }
+    /// <summary>The server fetch failed in a way a later retry could succeed at, as opposed to a refusal that no retry will change.</summary>
+    [JsonPropertyName("serverRetryableFailure")]
+    public bool ServerRetryableFailure { get; set; }
 
-    /// <summary>Whether the user's telemetry is subject to restricted-data handling.</summary>
-    [JsonPropertyName("restricted_telemetry")]
-    public bool? RestrictedTelemetry { get; set; }
+    /// <summary>The sandbox object from a cached server policy that a forced refresh declined to serve in full. Folded back into the effective sandbox layer so an outage during a forced refresh still synthesizes the fail-closed sandbox floor from the administrator's known intent.</summary>
+    [JsonPropertyName("serverSandboxFloor")]
+    public JsonElement? ServerSandboxFloor { get; set; }
 
-    /// <summary>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.</summary>
-    [JsonPropertyName("te")]
-    public bool? Te { get; set; }
+    /// <summary>A server-managed policy is known to exist even though `serverResponse` is intentionally unset. Consumers should OR this with the presence of `serverResponse` when deciding whether the device is managed, so a fresh start during an outage still applies the fail-closed gates instead of treating the device as unmanaged.</summary>
+    [JsonPropertyName("serverSourceFound")]
+    public bool ServerSourceFound { get; set; }
 
-    /// <summary>Whether the account is on usage-based (token/AI-credit) billing rather than a fixed premium-request quota.</summary>
-    [JsonPropertyName("token_based_billing")]
-    public bool? TokenBasedBilling { get; set; }
+    /// <summary>No usable token was available, so no server fetch was attempted.</summary>
+    [JsonPropertyName("serverTokenUnavailable")]
+    public bool ServerTokenUnavailable { get; set; }
+
+    /// <summary>The effective managed settings composed from every resolved layer. Omitted when no layer set anything, so an unmanaged host locks nothing.</summary>
+    [JsonPropertyName("settings")]
+    public JsonElement? Settings { get; set; }
 }
 
-/// <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>
+/// <summary>Inputs describing the host and account an ingestion should resolve managed policy for.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class AuthInfoHmac : AuthInfo
+internal sealed class ManagedSettingsIngestParams
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "hmac";
+    /// <summary>The authenticated identity to resolve policy for. Omitted before sign-in, in which case no server layer is fetched.</summary>
+    [JsonPropertyName("authInfo")]
+    public JsonElement? AuthInfo { 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>Whether to ignore a cached server policy when reading, forcing the resolution to come from a live fetch.</summary>
+    [JsonPropertyName("bypassCacheRead")]
+    public bool? BypassCacheRead { get; set; }
 
-    /// <summary>HMAC secret used to sign requests.</summary>
-    [JsonPropertyName("hmac")]
-    public required string Hmac { get; set; }
+    /// <summary>Name of the embedding client, reported to the managed-settings service as `client_id` so it can refuse to deliver a policy this client is too old to enforce. Omit it and the runtime reports a generic identity; the runtime version sent alongside is the gate that actually matters.</summary>
+    [JsonPropertyName("clientName")]
+    public string? ClientName { get; set; }
 
-    /// <summary>Authentication host. HMAC auth always targets the public GitHub host.</summary>
-    [JsonPropertyName("host")]
-    public required string Host { get; set; }
-}
+    /// <summary>A device layer supplied by the host instead of discovered from the machine. Pair it with `hasDeviceResponse` so an explicit absence is distinguishable from an omitted override.</summary>
+    [JsonPropertyName("deviceResponse")]
+    public JsonElement? DeviceResponse { get; set; }
 
-/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class AuthInfoEnv : AuthInfo
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "env";
+    /// <summary>The host's environment variables, read for cache location and policy overrides. Supplied by the host rather than read from the runtime process so a command that selected its own configuration home is honored.</summary>
+    [JsonPropertyName("environment")]
+    public JsonElement Environment { 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>Whether `deviceResponse` is an override at all. True with a null `deviceResponse` asserts the device layer is empty; false discovers it from the machine.</summary>
+    [JsonPropertyName("hasDeviceResponse")]
+    public bool? HasDeviceResponse { get; set; }
 
-    /// <summary>Name of the environment variable the token was sourced from.</summary>
-    [JsonPropertyName("envVar")]
-    public required string EnvVar { get; set; }
+    /// <summary>The host's home directory, used to resolve cache and managed-file locations.</summary>
+    [JsonPropertyName("homeDirectory")]
+    public string HomeDirectory { get; set; } = string.Empty;
 
-    /// <summary>Authentication host (e.g. https://github.com or a GHES host).</summary>
-    [JsonPropertyName("host")]
-    public required string Host { get; set; }
+    /// <summary>The host's platform, in Node's `process.platform` spelling, used to locate platform-specific cache and policy paths.</summary>
+    [JsonPropertyName("platform")]
+    public string Platform { get; set; } = string.Empty;
 
-    /// <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>Whether a configured platform policy helper may be run to produce an enforced helper layer.</summary>
+    [JsonPropertyName("policyHelperEnabled")]
+    public bool? PolicyHelperEnabled { get; set; }
 
-    /// <summary>The token value itself. Treat as a secret.</summary>
-    [JsonPropertyName("token")]
-    public required string Token { get; set; }
-}
+    /// <summary>The policy-helper invocation reason. Defaults to sessionStart.</summary>
+    [JsonPropertyName("policyHelperReason")]
+    public ManagedSettingsPolicyHelperReason? PolicyHelperReason { get; set; }
 
-/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class AuthInfoToken : AuthInfo
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "token";
+    /// <summary>Directory the policy helper runs in when this ingestion is not owned by a registered session. A host resolving policy before its session exists must pass this, or a directory-sensitive helper judges the wrong repository.</summary>
+    [JsonPropertyName("policyHelperWorkingDirectory")]
+    public string? PolicyHelperWorkingDirectory { 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>Whether to run ingestion. Omit or set false to return an empty result without discovering or fetching policy.</summary>
+    [JsonPropertyName("selfFetch")]
+    public bool? SelfFetch { get; set; }
 
-    /// <summary>Authentication host.</summary>
-    [JsonPropertyName("host")]
-    public required string Host { get; set; }
+    /// <summary>How this ingestion may use the on-disk server-policy cache. Defaults to the runtime's own policy when omitted.</summary>
+    [JsonPropertyName("serverPolicyCacheMode")]
+    public ManagedSettingsServerPolicyCacheMode? ServerPolicyCacheMode { 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 session whose credential store and working directory the policy helper should use. Omit it when no session exists yet and the process-wide store applies.</summary>
+    [JsonPropertyName("sessionId")]
+    public string? SessionId { get; set; }
 
-    /// <summary>The token value itself. Treat as a secret.</summary>
-    [JsonPropertyName("token")]
-    public required string Token { get; set; }
+    /// <summary>User agent to send with the policy fetch.</summary>
+    [JsonPropertyName("userAgent")]
+    public string UserAgent { get; set; } = string.Empty;
 }
 
-/// <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>
+/// <summary>The verdict of the `forceLoginOrgs` enterprise sign-in pin for one credential. A managed device may pin Copilot to an approved set of GitHub organizations so a developer cannot sign in with a personal — or another enterprise's — account and escape every control that keys off the signed-in identity. A host must refuse to proceed when `allowed` is false; the remaining fields explain the refusal rather than qualifying it.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class AuthInfoTokenProvider : AuthInfo
+internal sealed class ForceLoginOrgsDecision
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "token-provider";
+    /// <summary>Whether the client may proceed. True whenever no pin is in force, so an unmanaged host is never blocked.</summary>
+    [JsonPropertyName("allowed")]
+    public bool Allowed { get; set; }
 
-    /// <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>A stable kebab-case reason code when refused: `org-not-approved`, `unverifiable-credential`, `policy-undetermined`, `policy-invalid`, `not-signed-in`, or `membership-unknown`. Omitted when allowed. Treat an unrecognized code as a refusal rather than mapping it to an allow: a code this host has not been taught about still denied the credential.</summary>
+    [JsonPropertyName("denial")]
+    public string? Denial { get; set; }
 
-    /// <summary>Authentication host.</summary>
-    [JsonPropertyName("host")]
-    public required string Host { get; set; }
+    /// <summary>Whether a pin applies at all. Distinguishes "allowed because unmanaged" from "allowed because the account is approved", which a diagnostics surface needs and which also decides whether a bring-your-own-key provider may serve inference.</summary>
+    [JsonPropertyName("enforced")]
+    public bool Enforced { get; set; }
 
-    /// <summary>Opaque SDK callback registration identifier.</summary>
-    [JsonPropertyName("registrationId")]
-    public required string RegistrationId { get; set; }
-}
+    /// <summary>The approved organization the account matched, when allowed under a pin.</summary>
+    [JsonPropertyName("matchedOrg")]
+    public string? MatchedOrg { 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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class AuthInfoCopilotApiToken : AuthInfo
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "copilot-api-token";
+    /// <summary>A developer-facing explanation of the refusal. Omitted when allowed.</summary>
+    [JsonPropertyName("message")]
+    public string? Message { 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>Error-level detail from managed-policy discovery — which file failed to load, which field failed validation. Carried on the decision rather than left to the log because a refusal can exit the process before a log sink exists, which would discard the only actionable diagnostic a misconfigured managed device produces.</summary>
+    [JsonPropertyName("policyDiagnostics")]
+    public IList<string> PolicyDiagnostics { get => field ??= []; set; }
 
-    /// <summary>Authentication host (always the public GitHub host).</summary>
-    [JsonPropertyName("host")]
-    public required string Host { get; set; }
+    /// <summary>The approved organization logins, as configured. Enterprise configuration rather than user data, so it is safe to name in a message or a log line.</summary>
+    [JsonPropertyName("requiredOrgs")]
+    public IList<string> RequiredOrgs { get => field ??= []; set; }
 }
 
-/// <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="AuthInfo"/>.</remarks>
+/// <summary>The startup policy a resolution composed, the per-layer outcome flags a host needs to decide how much to trust it, and the enterprise sign-in verdict for the credential it ran against. The flags are reported rather than folded into the settings because a host must distinguish an unmanaged device from a managed device whose policy could not be confirmed, and apply its fail-closed gates in the second case.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class AuthInfoUser : AuthInfo
+internal sealed class ManagedSettingsResolveStartupPolicyResult
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "user";
+    /// <summary>Advisory minimum client version from a successful server response.</summary>
+    [JsonPropertyName("clientUpdateRequested")]
+    public string? ClientUpdateRequested { 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>The server refused to deliver a policy because this client is too old to enforce it, carrying the user-facing sentence describing the refusal. No retry will help; the remedy is a client update.</summary>
+    [JsonPropertyName("clientUpdateRequired")]
+    public string? ClientUpdateRequired { get; set; }
 
-    /// <summary>Authentication host.</summary>
-    [JsonPropertyName("host")]
-    public required string Host { get; set; }
+    /// <summary>The device layer could not be read, so it is unconfirmed rather than known-absent.</summary>
+    [JsonPropertyName("deviceLoadFailed")]
+    public bool DeviceLoadFailed { get; set; }
 
-    /// <summary>OAuth user login.</summary>
-    [JsonPropertyName("login")]
-    public required string Login { get; set; }
-}
+    /// <summary>The device layer discovered from the machine, when one exists.</summary>
+    [JsonPropertyName("deviceResponse")]
+    public JsonElement? DeviceResponse { get; set; }
 
-/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class AuthInfoGhCli : AuthInfo
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "gh-cli";
+    /// <summary>The sandbox floor contributed by the device layer.</summary>
+    [JsonPropertyName("deviceSandboxFloor")]
+    public JsonElement? DeviceSandboxFloor { 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>The enterprise sign-in verdict for the credential this resolution ran against, evaluated over the effective policy so a server-delivered pin is honored alongside a device one. Computed on every resolution, including one that was not retained, so a host that declines to apply policy still cannot proceed past a pin.</summary>
+    [JsonPropertyName("forceLoginOrgs")]
+    public ForceLoginOrgsDecision ForceLoginOrgs { get => field ??= new(); set; }
 
-    /// <summary>Authentication host.</summary>
-    [JsonPropertyName("host")]
-    public required string Host { get; set; }
+    /// <summary>A managed policy is known to apply to this host, from a discovered source or a resolved document.</summary>
+    [JsonPropertyName("managedPolicyPresent")]
+    public bool ManagedPolicyPresent { get; set; }
 
-    /// <summary>User login as reported by `gh auth status`.</summary>
-    [JsonPropertyName("login")]
-    public required string Login { get; set; }
+    /// <summary>The permissions layer specifically could not be confirmed, so permission gates apply their fail-closed posture.</summary>
+    [JsonPropertyName("permissionPolicyUndetermined")]
+    public bool PermissionPolicyUndetermined { get; set; }
 
-    /// <summary>The token returned by `gh auth token`. Treat as a secret.</summary>
-    [JsonPropertyName("token")]
-    public required string Token { get; set; }
-}
+    /// <summary>The policy helper was configured but could not be run, or its output could not be read.</summary>
+    [JsonPropertyName("policyHelperLoadFailed")]
+    public bool PolicyHelperLoadFailed { get; set; }
 
-/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class AuthInfoApiKey : AuthInfo
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "api-key";
+    /// <summary>The layer produced by the platform policy helper, when one ran.</summary>
+    [JsonPropertyName("policyHelperResponse")]
+    public JsonElement? PolicyHelperResponse { get; set; }
 
-    /// <summary>The API key. Treat as a secret.</summary>
-    [JsonPropertyName("apiKey")]
-    public required string ApiKey { get; set; }
+    /// <summary>Some layer of the policy could not be confirmed, so its absence must not be read as permission. Folds in a failed server fetch as well as an unreadable device layer.</summary>
+    [JsonPropertyName("policyUndetermined")]
+    public bool PolicyUndetermined { 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>The sandbox was enabled because policy could not be confirmed rather than because an administrator asked for it. Lets a host explain a sandbox the user did not configure.</summary>
+    [JsonPropertyName("sandboxEnabledByUndeterminedPolicy")]
+    public bool SandboxEnabledByUndeterminedPolicy { get; set; }
 
-    /// <summary>Authentication host.</summary>
-    [JsonPropertyName("host")]
-    public required string Host { get; set; }
-}
+    /// <summary>The effective sandbox floor composed across every layer, which a host must apply rather than its own default.</summary>
+    [JsonPropertyName("sandboxFloor")]
+    public JsonElement? SandboxFloor { get; set; }
 
-/// <summary>Current authentication state.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class AccountGetCurrentAuthResult
-{
-    /// <summary>Authentication errors from the last auth attempt, if any.</summary>
-    [JsonPropertyName("authErrors")]
-    public IList<string>? AuthErrors { get; set; }
+    /// <summary>The server fetch failed and no cached entry stood in for it, so the server layer is unconfirmed and fail-closed gates apply.</summary>
+    [JsonPropertyName("serverFetchFailed")]
+    public bool ServerFetchFailed { get; set; }
 
-    /// <summary>Current authentication information, if authenticated.</summary>
-    [JsonPropertyName("authInfo")]
-    public AuthInfo? AuthInfo { get; set; }
+    /// <summary>How the current runtime resolved the server layer.</summary>
+    [JsonPropertyName("serverResolution")]
+    public ManagedSettingsServerPolicyResolution ServerResolution { get; set; }
+
+    /// <summary>The account's server-delivered policy, when one was resolved.</summary>
+    [JsonPropertyName("serverResponse")]
+    public JsonElement? ServerResponse { get; set; }
+
+    /// <summary>Telemetry describing which layers answered and how, for the host to report alongside its own startup events.</summary>
+    [JsonPropertyName("telemetry")]
+    public JsonElement Telemetry { get; set; }
+
+    /// <summary>Warnings raised while resolving, in the order they occurred.</summary>
+    [JsonPropertyName("warnings")]
+    public IList<string> Warnings { get => field ??= []; set; }
 }
 
-/// <summary>Authenticated account entry returned by `account.getAllUsers`.</summary>
+/// <summary>Inputs describing the host and account a startup policy resolution should run for. Mirrors `managedSettings.ingest`, and adds the decision of whether the resolved policy is retained for this runtime process.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class AccountAllUsers
+internal sealed class ManagedSettingsResolveStartupPolicyParams
 {
-    /// <summary>Authentication information for this user.</summary>
+    /// <summary>The authenticated identity to resolve policy for. Omitted before sign-in, in which case no server layer is fetched and the sign-in pin is evaluated against no credential.</summary>
     [JsonPropertyName("authInfo")]
-    public AuthInfo AuthInfo { get => field ??= new(); set; }
+    public JsonElement? AuthInfo { get; set; }
 
-    /// <summary>Opaque identifier accepted by account and model selection APIs.</summary>
-    [JsonPropertyName("selectionId")]
-    public string? SelectionId { get; set; }
+    /// <summary>Whether to ignore a cached server policy when reading, forcing the resolution to come from a live fetch.</summary>
+    [JsonPropertyName("bypassCacheRead")]
+    public bool? BypassCacheRead { get; set; }
 
-    /// <summary>Associated token, if available.</summary>
-    [JsonPropertyName("token")]
-    public string? Token { get; set; }
+    /// <summary>Name of the embedding client, reported to the managed-settings service as `client_id` so it can refuse to deliver a policy this client is too old to enforce.</summary>
+    [JsonPropertyName("clientName")]
+    public string? ClientName { get; set; }
+
+    /// <summary>A device layer supplied by the host instead of discovered from the machine. Pair it with `hasDeviceResponse` so an explicit absence is distinguishable from an omitted override.</summary>
+    [JsonPropertyName("deviceResponse")]
+    public JsonElement? DeviceResponse { get; set; }
+
+    /// <summary>The host's environment variables, read for cache location, policy overrides, and the variables that would make a membership snapshot forgeable.</summary>
+    [JsonPropertyName("environment")]
+    public JsonElement Environment { get; set; }
+
+    /// <summary>Whether `deviceResponse` is an override at all. True with a null `deviceResponse` asserts the device layer is empty; false discovers it from the machine.</summary>
+    [JsonPropertyName("hasDeviceResponse")]
+    public bool? HasDeviceResponse { get; set; }
+
+    /// <summary>The host's home directory, used to resolve cache and managed-file locations.</summary>
+    [JsonPropertyName("homeDirectory")]
+    public string HomeDirectory { get; set; } = string.Empty;
+
+    /// <summary>The host's platform, in Node's `process.platform` spelling, used to locate platform-specific cache and policy paths.</summary>
+    [JsonPropertyName("platform")]
+    public string Platform { get; set; } = string.Empty;
+
+    /// <summary>Whether a configured platform policy helper may be run to produce an enforced helper layer.</summary>
+    [JsonPropertyName("policyHelperEnabled")]
+    public bool? PolicyHelperEnabled { get; set; }
+
+    /// <summary>The policy-helper invocation reason. Defaults to sessionStart.</summary>
+    [JsonPropertyName("policyHelperReason")]
+    public ManagedSettingsPolicyHelperReason? PolicyHelperReason { get; set; }
+
+    /// <summary>Directory the policy helper runs in when this resolution is not owned by a registered session. A host resolving policy before its session exists must pass this, or a directory-sensitive helper judges the wrong repository.</summary>
+    [JsonPropertyName("policyHelperWorkingDirectory")]
+    public string? PolicyHelperWorkingDirectory { get; set; }
+
+    /// <summary>Whether to retain the resolved policy as this runtime process's startup policy, so later work in the process enforces it. Set false to resolve without side effects, which is what a protocol host wants before session creation: its sessions apply the complete policy through the normal lifecycle, and retaining here would let a readiness credential affect unrelated sessions. The returned verdict is identical either way — this decides only whether the process keeps it.</summary>
+    [JsonPropertyName("retainAndApply")]
+    public bool RetainAndApply { get; set; }
+
+    /// <summary>Whether to run ingestion. Omit or set false to return an empty result without discovering or fetching policy.</summary>
+    [JsonPropertyName("selfFetch")]
+    public bool? SelfFetch { get; set; }
+
+    /// <summary>How this resolution may use the on-disk server-policy cache. Defaults to the runtime's own policy when omitted. Rejected when combined with `bypassCacheRead`, because the two express the same decision and accepting both would leave the caller unsure which one the runtime honored.</summary>
+    [JsonPropertyName("serverPolicyCacheMode")]
+    public ManagedSettingsServerPolicyCacheMode? ServerPolicyCacheMode { get; set; }
+
+    /// <summary>The session whose credential store, working directory and client kind the resolution should use. Omit it when no session exists yet and the process-wide store applies. A resolution whose session names a credential other than `authInfo` is returned but not retained, so a stale sign-in cannot apply policy for an account that has already been switched away from.</summary>
+    [JsonPropertyName("sessionId")]
+    public string? SessionId { get; set; }
+
+    /// <summary>User agent to send with the policy fetch.</summary>
+    [JsonPropertyName("userAgent")]
+    public string UserAgent { get; set; } = string.Empty;
 }
 
-/// <summary>Result of a successful login; throws on failure.</summary>
+/// <summary>The managed remote-control policy in force for an account, if any. An absent policy means the account is unmanaged for this capability, which a host reads as allowed — so absence here is a positive statement that no policy applies, never a stand-in for a resolution that failed. A resolution that cannot be completed is rejected instead.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class AccountLoginResult
+internal sealed class ManagedSettingsLoadRemoteControlResult
 {
-    /// <summary>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.</summary>
-    [JsonPropertyName("storedInVault")]
-    public bool StoredInVault { get; set; }
+    /// <summary>The account's `remoteControl` policy document. Absent when no managed policy governs remote control for this account. Reported as an explicit disabled policy, rather than as absence, when the service refused to deliver a policy this client is too old to enforce.</summary>
+    [JsonPropertyName("remoteControl")]
+    public JsonElement? RemoteControl { get; set; }
 }
 
-/// <summary>Credentials to validate and store. Omit login to resolve the authenticated user from the token.</summary>
+/// <summary>Inputs describing the host and account whose managed remote-control policy should be resolved. Mirrors `managedSettings.ingest`, and deliberately carries no retention decision: reading this gate never becomes this runtime process's startup policy.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class AccountLoginRequest
+internal sealed class ManagedSettingsLoadRemoteControlParams
 {
-    /// <summary>GitHub host URL.</summary>
-    [JsonPropertyName("host")]
-    public string Host { get; set; } = string.Empty;
+    /// <summary>The authenticated identity to resolve policy for. Omitted before sign-in, in which case no server layer is fetched.</summary>
+    [JsonPropertyName("authInfo")]
+    public JsonElement? AuthInfo { get; set; }
 
-    /// <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; }
+    /// <summary>Name of the embedding client, reported to the managed-settings service as `client_id` so it can refuse to deliver a policy this client is too old to enforce. That refusal is exactly what turns into an explicit `disabled` below, so a host that omits this field forfeits the protection.</summary>
+    [JsonPropertyName("clientName")]
+    public string? ClientName { get; set; }
 
-    /// <summary>GitHub authentication token.</summary>
-    [JsonPropertyName("token")]
-    public string Token { get; set; } = string.Empty;
-}
+    /// <summary>A device layer supplied by the host instead of discovered from the machine. Pair it with `hasDeviceResponse` so an explicit absence is distinguishable from an omitted override.</summary>
+    [JsonPropertyName("deviceResponse")]
+    public JsonElement? DeviceResponse { get; set; }
 
-/// <summary>Logout result indicating if more users remain.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class AccountLogoutResult
-{
-    /// <summary>Whether other authenticated users remain after logout.</summary>
-    [JsonPropertyName("hasMoreUsers")]
-    public bool HasMoreUsers { get; set; }
+    /// <summary>The host's environment variables, read for cache location and policy overrides.</summary>
+    [JsonPropertyName("environment")]
+    public JsonElement Environment { get; set; }
+
+    /// <summary>Whether `deviceResponse` is an override at all. True with a null `deviceResponse` asserts the device layer is empty; false discovers it from the machine.</summary>
+    [JsonPropertyName("hasDeviceResponse")]
+    public bool? HasDeviceResponse { get; set; }
+
+    /// <summary>The host's home directory, used to resolve cache and managed-file locations.</summary>
+    [JsonPropertyName("homeDirectory")]
+    public string HomeDirectory { get; set; } = string.Empty;
+
+    /// <summary>The host's platform, in Node's `process.platform` spelling, used to locate platform-specific cache and policy paths.</summary>
+    [JsonPropertyName("platform")]
+    public string Platform { get; set; } = string.Empty;
+
+    /// <summary>Whether a configured platform policy helper may be run to produce an enforced helper layer.</summary>
+    [JsonPropertyName("policyHelperEnabled")]
+    public bool? PolicyHelperEnabled { get; set; }
+
+    /// <summary>The policy-helper invocation reason. Defaults to sessionStart.</summary>
+    [JsonPropertyName("policyHelperReason")]
+    public ManagedSettingsPolicyHelperReason? PolicyHelperReason { get; set; }
+
+    /// <summary>Whether to run ingestion. Omit or set false to return an empty result without discovering or fetching policy.</summary>
+    [JsonPropertyName("selfFetch")]
+    public bool? SelfFetch { get; set; }
+
+    /// <summary>User agent to send with the policy fetch.</summary>
+    [JsonPropertyName("userAgent")]
+    public string UserAgent { get; set; } = string.Empty;
 }
 
-/// <summary>User to log out.</summary>
+/// <summary>The credential and environment to evaluate the device-channel sign-in pin against.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class AccountLogoutRequest
+internal sealed class ManagedSettingsResolveDeviceForceLoginOrgsGateParams
 {
-    /// <summary>Authentication information for the user to log out.</summary>
+    /// <summary>The authenticated identity to judge. Omitted when signed out, which is the case the device channel exists to serve: it can refuse a first sign-in before any credential exists.</summary>
     [JsonPropertyName("authInfo")]
-    public AuthInfo? AuthInfo { get; set; }
+    public JsonElement? AuthInfo { get; set; }
 
-    /// <summary>Opaque account identifier returned by `account.getAllUsers`.</summary>
-    [JsonPropertyName("selectionId")]
-    public string? SelectionId { get; set; }
+    /// <summary>The host's environment variables. Read for the variables that would make an identity's membership snapshot forgeable, so a credential whose provenance cannot be trusted is refused rather than accepted.</summary>
+    [JsonPropertyName("environment")]
+    public JsonElement Environment { get; set; }
 }
 
-/// <summary>Confirmation that the secret values were registered.</summary>
+/// <summary>Validated device-managed settings discovered before a session exists.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SecretsAddFilterValuesResult
+public sealed class ManagedSettingsReadResult
 {
-    /// <summary>Whether the values were successfully registered.</summary>
-    [JsonPropertyName("ok")]
-    public bool Ok { get; set; }
+    /// <summary>Discovery or validation error text when managed settings could not be read safely.</summary>
+    [JsonPropertyName("errorMessage")]
+    public string? ErrorMessage { 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>Secret values to add to the redaction filter.</summary>
+/// <summary>One validation finding for a managed-settings document.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SecretsAddFilterValuesRequest
+public sealed class ManagedSettingsDiagnostic
 {
-    /// <summary>Raw secret values to register for redaction.</summary>
-    [JsonPropertyName("values")]
-    public IList<string> Values { get => field ??= []; set; }
+    /// <summary>Human-readable description of the finding.</summary>
+    [JsonPropertyName("message")]
+    public string Message { get; set; } = string.Empty;
+
+    /// <summary>Dot-separated path of the offending setting, such as `autoTier.overridable`. Empty for the document as a whole.</summary>
+    [JsonPropertyName("path")]
+    public string Path { get; set; } = string.Empty;
+
+    /// <summary>Whether the finding rejects the document.</summary>
+    [JsonPropertyName("severity")]
+    public ManagedSettingsDiagnosticSeverity Severity { get; set; }
 }
 
-/// <summary>Concrete configuration file containing an MCP server declaration.</summary>
+/// <summary>One managed-settings channel and the document it delivered.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpSourceFile
+public sealed class ManagedSettingsLayer
 {
-    /// <summary>RFC 6901 JSON Pointer to the server declaration, when known.</summary>
-    [JsonPropertyName("jsonPointer")]
-    public string? JsonPointer { get; set; }
+    /// <summary>Validated managed-settings document this channel delivered. Absent when the channel delivered none.</summary>
+    [JsonPropertyName("settings")]
+    public JsonElement? Settings { get; set; }
 
-    /// <summary>Canonical file URI for the configuration document.</summary>
-    [Url]
-    [StringSyntax(StringSyntaxAttribute.Uri)]
-    [JsonPropertyName("uri")]
-    public string Uri { get; set; } = string.Empty;
+    /// <summary>Channel identifier: `device` (MDM, plist, registry, or managed file), `server` (account or organization policy), or `policyHelper` (session-local helper output, supported by compose). Treat unknown output values as additional channels; more may be added.</summary>
+    [JsonPropertyName("source")]
+    public string Source { get; set; } = string.Empty;
 }
 
-/// <summary>Plugin identity associated with an MCP server declaration.</summary>
+/// <summary>Lock state and provenance of one managed setting.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpSourcePlugin
+public sealed class ManagedSettingMeta
 {
-    /// <summary>Canonical plugin identity.</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 users and repositories may choose a different value. `false` means policy locks the value.</summary>
+    [JsonPropertyName("overridable")]
+    public bool Overridable { get; set; }
 
-    /// <summary>Human-readable plugin name, when available.</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; }
+    /// <summary>Original managed value when the runtime adjusted it to a supported effective value. Omitted when no adjustment was needed.</summary>
+    [JsonPropertyName("requested")]
+    public string? Requested { get; set; }
 
-    /// <summary>Plugin version, when available.</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("version")]
-    public string? Version { get; set; }
+    /// <summary>Channel that supplied this scalar value, matching a `layers[].source`: `device`, `server`, or `policyHelper`. These scalar defaults select one winning channel, not a mixed source. Treat unknown values as additional channels; more may be added.</summary>
+    [JsonPropertyName("source")]
+    public string Source { get; set; } = string.Empty;
 }
 
-/// <summary>Canonical identity and location of the effective MCP server declaration. The declaration is uniquely addressed by this source id together with the discovered server name.</summary>
+/// <summary>Per-key lock state and provenance for `ManagedSettingsValues`, with the same field names. Producers emit each typed key in values and meta together; both outer objects are omitted when no typed key is set.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpSourceRef
+public sealed class ManagedSettingsMeta
 {
-    /// <summary>Open semantic editability identifier. Known values are editable and read-only.</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("editability")]
-    public string Editability { get; set; } = string.Empty;
-
-    /// <summary>Configuration file location, when the declaration is file-backed.</summary>
-    [JsonPropertyName("file")]
-    public McpSourceFile? File { get; set; }
+    /// <summary>Lock state and provenance of `values.autoTier`.</summary>
+    [JsonPropertyName("autoTier")]
+    public ManagedSettingMeta? AutoTier { get; set; }
 
-    /// <summary>Opaque stable identity for the configuration source. Clients must not parse this 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>Lock state and provenance of `values.contextTier`.</summary>
+    [JsonPropertyName("contextTier")]
+    public ManagedSettingMeta? ContextTier { get; set; }
 
-    /// <summary>Open source-kind identifier. Known values include user, workspace, invocation, plugin, builtin, and device-registry.</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("kind")]
-    public string Kind { get; set; } = string.Empty;
+    /// <summary>Lock state and provenance of `values.effortLevel`.</summary>
+    [JsonPropertyName("effortLevel")]
+    public ManagedSettingMeta? EffortLevel { get; set; }
 
-    /// <summary>Plugin identity, when the declaration is plugin-provided.</summary>
-    [JsonPropertyName("plugin")]
-    public McpSourcePlugin? Plugin { get; set; }
+    /// <summary>Lock state and provenance of `values.model`.</summary>
+    [JsonPropertyName("model")]
+    public ManagedSettingMeta? Model { get; set; }
 }
 
-/// <summary>MCP server discovered by `mcp.discover`, with config source, optional plugin source, transport type, and enabled state.</summary>
+/// <summary>Effective enterprise managed settings and contributing channels. Session events report applied policy; sessionless resolve reports an account/device snapshot, and compose reports a non-applying preview of candidate documents. Device values take precedence over server values, then the policy helper, per ordinary key, while permissions compose restrictively. Session-local SDK-client policy is included only in session results. Marked experimental while the managed-settings surface stabilizes.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class DiscoveredMcpServer
+public sealed class ManagedSettingsResolvedData
 {
-    /// <summary>Canonical identity and location of the effective server declaration.</summary>
-    [JsonPropertyName("effectiveSource")]
-    public McpSourceRef? EffectiveSource { get; set; }
+    /// <summary>Whether an explicit enterprise policy restriction disables bypass-permissions ("yolo") mode for this session. Deny-wins across layers; an unresolved policy does not force this on by itself.</summary>
+    [JsonPropertyName("bypassPermissionsDisabled")]
+    public bool BypassPermissionsDisabled { get; set; }
 
-    /// <summary>Whether the server is enabled (not in the disabled list).</summary>
-    [JsonPropertyName("enabled")]
-    public bool Enabled { get; set; }
+    /// <summary>Whether a session-local permissions layer injected by the SDK host was present.</summary>
+    [JsonPropertyName("clientManaged")]
+    public bool? ClientManaged { 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>Whether an actual device MDM/plist/registry/file managed-settings layer was present.</summary>
+    [JsonPropertyName("deviceManaged")]
+    public bool DeviceManaged { get; set; }
 
-    /// <summary>Configuration source: user, workspace, plugin, or builtin.</summary>
-    [JsonPropertyName("source")]
-    public McpServerSource Source { get; set; }
+    /// <summary>Whether managed policy could not be determined (e.g. a failed server fetch) and unresolved-policy safeguards remain active. This does not by itself disable bypass-permissions; `bypassPermissionsDisabled` reports only an explicit policy restriction.</summary>
+    [JsonPropertyName("failClosed")]
+    public bool FailClosed { get; set; }
 
-    /// <summary>Plugin name that provided this server, when source is plugin.</summary>
-    [JsonPropertyName("sourcePlugin")]
-    public string? SourcePlugin { get; set; }
+    /// <summary>The setting keys under enterprise management in the effective managed settings (e.g. `model`, `enabledPlugins`, `permissions`). Empty when no managed settings are in force.</summary>
+    [JsonPropertyName("managedKeys")]
+    public IList<string> ManagedKeys { get => field ??= []; set; }
 
-    /// <summary>Plugin version that provided this server, when source is plugin.</summary>
-    [JsonPropertyName("sourcePluginVersion")]
-    public string? SourcePluginVersion { get; set; }
+    /// <summary>Whether at least two managed sources supplied permission allowlists, so enforcement intersects them and the flattened settings payload omits `permissions.allow`.</summary>
+    [JsonPropertyName("permissionsAllowIntersected")]
+    public bool? PermissionsAllowIntersected { get; set; }
 
-    /// <summary>Server transport type: stdio, http, sse (deprecated), or memory.</summary>
-    [JsonPropertyName("type")]
-    public DiscoveredMcpServerType? Type { get; set; }
-}
+    /// <summary>Reusable retained managed permission policy for managedSettings.permissions.evaluate, including source composition and session-local injection. Provided by live session snapshots; absent in older events. Refresh the context when managed policy changes.</summary>
+    [JsonPropertyName("permissionsContext")]
+    public ManagedPermissionsContext? PermissionsContext { get; set; }
 
-/// <summary>MCP servers discovered from user, workspace, plugin, and built-in sources.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpDiscoverResult
-{
-    /// <summary>MCP servers discovered from all sources.</summary>
-    [JsonPropertyName("servers")]
-    public IList<DiscoveredMcpServer> Servers { get => field ??= []; set; }
-}
+    /// <summary>Whether the policy-helper managed-settings layer was present. The policy helper is the weakest channel: it fills keys no enterprise source set and can never replace one.</summary>
+    [JsonPropertyName("policyHelperManaged")]
+    public bool? PolicyHelperManaged { get; set; }
 
-/// <summary>Optional working directory used as context for MCP server discovery.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class McpDiscoverRequest
-{
-    /// <summary>Whether to include canonical effectiveSource metadata for each discovered server. Callers must opt in so protocol-3 clients retain the legacy closed response shape.</summary>
-    [JsonPropertyName("includeEffectiveSource")]
-    public bool? IncludeEffectiveSource { 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>
+    [JsonPropertyName("sandboxEnabledByUndeterminedPolicy")]
+    public bool? SandboxEnabledByUndeterminedPolicy { get; set; }
 
-    /// <summary>Working directory used as context for discovery (e.g., plugin resolution).</summary>
-    [JsonPropertyName("workingDirectory")]
-    public string? WorkingDirectory { get; set; }
+    /// <summary>Whether the server (account/org) managed-settings layer was present.</summary>
+    [JsonPropertyName("serverManaged")]
+    public bool ServerManaged { get; set; }
+
+    /// <summary>The effective (resolved) managed settings values, so clients can render exactly what is enforced. Absent when no managed policy is in force.</summary>
+    [JsonPropertyName("settings")]
+    public JsonElement? Settings { get; set; }
+
+    /// <summary>Channel summary: `server`, `device`, `client`, or `policyHelper` when exactly one channel contributed; `mixed` when multiple channels contributed; otherwise `none`. Consult the per-channel booleans for exact provenance.</summary>
+    [JsonPropertyName("source")]
+    public ManagedSettingsResolvedSource Source { get; set; }
 }
 
-/// <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>
+/// <summary>Typed effective values of managed settings. Each field mirrors the managed-settings schema key of the same name; more keys are added as they are typed.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-[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
+public sealed class ManagedSettingsValues
 {
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("kind")]
-    public virtual string Kind { get; set; } = string.Empty;
-}
+    /// <summary>Managed Auto routing preference, used when the selected model is `auto`.</summary>
+    [JsonPropertyName("autoTier")]
+    public AutoTier? AutoTier { get; set; }
 
+    /// <summary>Managed context-tier default for the managed concrete model.</summary>
+    [JsonPropertyName("contextTier")]
+    public ContextTier? ContextTier { get; set; }
 
-/// <summary>The protocol version and capability set the runtime actually honoured for a successful catalog operation.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class CatalogNegotiatedContract
-{
-    /// <summary>Wire features the runtime understood for this operation. Includes the five original catalog capabilities and only explicitly requested supported additions, in supported order without duplicates. Capabilities that introduce new success-union variants or operations are therefore included only when explicitly required, preserving older protocol-v3 clients. 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>Managed reasoning-effort default for the managed concrete model. The runtime clamps it to an entitled effort when model availability is known.</summary>
+    [JsonPropertyName("effortLevel")]
+    public string? EffortLevel { get; set; }
 
-    /// <summary>Protocol version of the runtime that served the request.</summary>
-    [JsonPropertyName("runtimeProtocolVersion")]
-    public long RuntimeProtocolVersion { get; set; }
+    /// <summary>Managed default model identifier. When model availability was resolved, aliases and family names are projected to a concrete available model ID; otherwise the configured value is returned.</summary>
+    [JsonPropertyName("model")]
+    public string? Model { get; set; }
 }
 
-/// <summary>The configuration-change alternative for the transportChoices entry at the same index. Only the selected alternative is applied; entries are not cumulative. The payload stays behind the runtime boundary.</summary>
+/// <summary>Effective enterprise managed settings for an account, resolved without a session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpPlanConfigurationChange
+public sealed class ManagedSettingsResolveResult
 {
-    /// <summary>Names of the configuration fields the change would set, without their values.</summary>
-    [JsonPropertyName("changedFields")]
-    public IList<string> ChangedFields { get => field ??= []; set; }
+    /// <summary>Printable opaque identity of the account the settings were resolved for, suitable for comparison and storage, not an account selectionId. Absent when no account was available, in which case only device policy is reported.</summary>
+    [JsonPropertyName("account")]
+    public string? Account { get; set; }
 
-    /// <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("configKey")]
-    public string ConfigKey { get; set; } = string.Empty;
+    /// <summary>Warnings about unavailable policy sources or a failed refresh served from cache. A cached response is not proof of a successful live fetch; `resolved.failClosed` separately describes enforcement.</summary>
+    [JsonPropertyName("diagnostics")]
+    public IList<ManagedSettingsDiagnostic> Diagnostics { get => field ??= []; set; }
 
-    /// <summary>Whether the change would create a new entry or modify an existing one.</summary>
-    [JsonPropertyName("operation")]
-    public McpPlanConfigurationOperation Operation { get; set; }
+    /// <summary>Each managed-settings channel consulted, strongest first, with the validated document it delivered before merging. `resolved.settings` is the merged result. More channels may be added over time.</summary>
+    [JsonPropertyName("layers")]
+    public IList<ManagedSettingsLayer> Layers { get => field ??= []; set; }
 
-    /// <summary>Scope the change would be written to.</summary>
-    [JsonPropertyName("scope")]
-    public McpPlanScope Scope { get; set; }
+    /// <summary>Per-key lock state and provenance for the entries in `values`, using the same key names.</summary>
+    [JsonPropertyName("meta")]
+    public ManagedSettingsMeta? Meta { 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>Reusable source-composed permission policy for managedSettings.permissions.evaluate. Unlike resolved.settings.permissions, this retains every source's allowlist and default-prompt semantics. Refresh through resolve when account/device policy changes. Absent on runtimes that do not support permission evaluation.</summary>
+    [JsonPropertyName("permissionsContext")]
+    public ManagedPermissionsContext? PermissionsContext { get; set; }
+
+    /// <summary>Effective managed settings from the device and account (server) channels, in the same shape as `session.managedSettings.get`, excluding session-local injection.</summary>
+    [JsonPropertyName("resolved")]
+    public ManagedSettingsResolvedData Resolved { get => field ??= new(); set; }
+
+    /// <summary>Typed effective values of managed settings, keyed like the managed-settings schema and already resolved across channels, with the `{ "overridable": ... }` wrapper removed. Present when policy sets at least one typed key. Keys not typed here are available in `resolved.settings`.</summary>
+    [JsonPropertyName("values")]
+    public ManagedSettingsValues? Values { get; set; }
 }
 
-/// <summary>Normalised identity of the MCP server a plan targets, independent of how the card spelled it.</summary>
+/// <summary>RPC data type for ManagedSettingsResolve operations.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpPlanResourceIdentity
+internal sealed class ManagedSettingsResolveRequest
 {
-    /// <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("canonicalName")]
-    public string CanonicalName { get; set; } = string.Empty;
+    /// <summary>Embedding client identity for server policy requests, as in session creation. Omit for the CLI identity.</summary>
+    [JsonPropertyName("clientName")]
+    public string? ClientName { get; set; }
 
-    /// <summary>Registry identifier of the server, when it came from a registry.</summary>
-    [JsonPropertyName("registryId")]
-    public string? RegistryId { get; set; }
+    /// <summary>GitHub token to resolve instead of the current account. The call fails when the token cannot be resolved.</summary>
+    [JsonPropertyName("gitHubToken")]
+    public string? GitHubToken { 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>Opaque account identifier returned by `account.getAllUsers`. When omitted, the current account is used, or device policy only when no account is signed in.</summary>
+    [JsonPropertyName("selectionId")]
+    public string? SelectionId { get; set; }
 
-    /// <summary>Version advertised by the card, when it declares one.</summary>
-    [JsonPropertyName("version")]
-    public string? Version { get; set; }
+    /// <summary>Working directory used to run an organization policy helper. When omitted, sessionless resolution does not run the helper.</summary>
+    [JsonPropertyName("workingDirectory")]
+    public string? WorkingDirectory { get; set; }
 }
 
-/// <summary>Outcome of evaluating the planned server against registry and enterprise policy. Evaluation is read-only.</summary>
+/// <summary>The authoring JSON schema for managed settings recognized by this runtime.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpPlanPolicyResult
+public sealed class ManagedSettingsSchemaResult
 {
-    /// <summary>What policy decided for this server.</summary>
-    [JsonPropertyName("decision")]
-    public McpPlanPolicyDecision Decision { get; set; }
+    /// <summary>Version of the runtime that owns this schema.</summary>
+    [JsonPropertyName("runtimeVersion")]
+    public string RuntimeVersion { 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("reason")]
-    public string? Reason { get; set; }
+    /// <summary>JSON schema (draft 2020-12) with descriptive shared `x-composition` annotations, not a complete runtime composition contract. Model, effortLevel, and contextTier remain coupled; use `managedSettings.compose` for the runtime's effective result.</summary>
+    [JsonPropertyName("schema")]
+    public JsonElement Schema { get; set; }
+}
 
-    /// <summary>Which authority produced the decision.</summary>
-    [JsonPropertyName("source")]
-    public McpPlanPolicySource Source { get; set; }
+/// <summary>Result of validating a managed-settings document.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class ManagedSettingsValidateResult
+{
+    /// <summary>Errors that reject the document and warnings about content the runtime ignores.</summary>
+    [JsonPropertyName("diagnostics")]
+    public IList<ManagedSettingsDiagnostic> Diagnostics { get => field ??= []; set; }
+
+    /// <summary>Canonical form of the document the runtime would apply, with unrecognized keys removed. Absent when the document is invalid.</summary>
+    [JsonPropertyName("settings")]
+    public JsonElement? Settings { get; set; }
+
+    /// <summary>Whether the runtime would accept the document within the preview resource limits. Always equals whether `settings` is present. An invalid document is rejected as a whole.</summary>
+    [JsonPropertyName("valid")]
+    public bool Valid { get; set; }
 }
 
-/// <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>
+/// <summary>A candidate managed-settings document to validate without applying it.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class CardDigest
+internal sealed class ManagedSettingsValidateRequest
 {
-    /// <summary>Digest algorithm and canonical representation.</summary>
-    [JsonPropertyName("algorithm")]
-    public CardDigestAlgorithm Algorithm { get; set; }
+    /// <summary>The document to validate: a JSON object, or a string containing the document's JSON text. Preview documents are limited to 1 MiB and 64 levels of nesting, a stricter resource limit than delivered-policy parsing; violations are returned as diagnostics.</summary>
+    [JsonPropertyName("content")]
+    public JsonElement Content { 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>Channel the document is meant for (`device`, `server`, or `policyHelper`). Some keys are only honored in some channels; for example, a `policyHelper` registration is ignored in policy-helper output. When omitted, no channel-specific checks run.</summary>
+    [JsonPropertyName("layer")]
+    public string? Layer { get; set; }
 }
 
-/// <summary>Provenance of the exact validated JSON MCP card content bound privately to a completed plan and its opaque handle.</summary>
+/// <summary>The effective managed settings the runtime would enforce for the given documents, in the same shape `managedSettings.resolve` returns.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpPlanProvenance
+public sealed class ManagedSettingsComposeResult
 {
-    /// <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>Warnings about ignored content, with paths prefixed by the channel name.</summary>
+    [JsonPropertyName("diagnostics")]
+    public IList<ManagedSettingsDiagnostic> Diagnostics { get => field ??= []; set; }
 
-    /// <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>Only the supplied channels, strongest first, with canonical documents. Empty canonical documents are represented as absent settings, as in live resolution.</summary>
+    [JsonPropertyName("layers")]
+    public IList<ManagedSettingsLayer> Layers { get => field ??= []; set; }
 
-    /// <summary>JSON MCP media type the validated card was interpreted as.</summary>
-    [JsonPropertyName("mediaType")]
-    public McpServerCardMediaType MediaType { get; set; }
+    /// <summary>Per-key lock state and provenance for `values`.</summary>
+    [JsonPropertyName("meta")]
+    public ManagedSettingsMeta? Meta { 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>Effective managed settings, in the same shape as `session.managedSettings.get`.</summary>
+    [JsonPropertyName("resolved")]
+    public ManagedSettingsResolvedData Resolved { get => field ??= new(); set; }
+
+    /// <summary>Typed effective values, as in `managedSettings.resolve`.</summary>
+    [JsonPropertyName("values")]
+    public ManagedSettingsValues? Values { get; set; }
 }
 
-/// <summary>Where a plan would be written.</summary>
+/// <summary>One candidate channel; absent settings represents a channel that delivered no document.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpPlanTarget
+public sealed class ManagedSettingsComposeLayer
 {
-    /// <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>Candidate managed-settings document. Omit when the channel delivered none, as in resolve output.</summary>
+    [JsonPropertyName("settings")]
+    public JsonElement? Settings { get; set; }
 
-    /// <summary>Configuration scope the plan targets.</summary>
-    [JsonPropertyName("scope")]
-    public McpPlanScope Scope { get; set; }
+    /// <summary>The channel whose candidate document is being supplied.</summary>
+    [JsonPropertyName("source")]
+    public ManagedSettingsChannel Source { get; set; }
 }
 
-/// <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>
+/// <summary>Candidate managed-settings documents to merge without applying them.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-[JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "installMethod",
-    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(McpPlanTransportChoicePackage), "package")]
-[JsonDerivedType(typeof(McpPlanTransportChoiceRemote), "remote")]
-public partial class McpPlanTransportChoice
+internal sealed class ManagedSettingsComposeRequest
 {
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("installMethod")]
-    public virtual string InstallMethod { get; set; } = string.Empty;
+    /// <summary>One entry per channel. `source` must be `device`, `server`, or `policyHelper`, each at most once (checked at runtime); order does not matter, because channel precedence is fixed. To preview documents from resolve output, map recognized source strings to ManagedSettingsChannel and copy their settings; generated resolve and compose layer types are distinct. Omitted settings means this channel delivered no document. Supplied documents must be valid within the preview limits; warnings are returned in diagnostics. Compose does not reproduce source-failure state or retained enforcement floors from resolve.</summary>
+    [JsonPropertyName("layers")]
+    public IList<ManagedSettingsComposeLayer> Layers { get => field ??= []; set; }
 }
 
-
-/// <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>
+/// <summary>Polymorphic base type discriminated by <c>kind</c>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonPolymorphic(
     TypeDiscriminatorPropertyName = "kind",
     UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(McpPlanRequiredValueScalar), "scalar")]
-[JsonDerivedType(typeof(McpPlanRequiredValueEnum), "enum")]
-public partial class McpPlanRequiredValue
+[JsonDerivedType(typeof(ManagedPermissionOperationUrl), "url")]
+public partial class ManagedPermissionOperation
 {
     /// <summary>The type discriminator.</summary>
     [JsonPropertyName("kind")]
@@ -2276,2394 +2491,2178 @@ public partial class McpPlanRequiredValue
 }
 
 
-/// <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>
+/// <summary>The <c>url</c> variant of <see cref="ManagedPermissionOperation"/>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class McpPlanRequiredValueScalar : McpPlanRequiredValue
+public partial class ManagedPermissionOperationUrl : ManagedPermissionOperation
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Kind => "scalar";
+    public override string Kind => "url";
 
-    /// <summary>Where the value is applied when the server is launched.</summary>
-    [JsonPropertyName("category")]
-    public required McpPlanValueCategory Category { get; set; }
+    /// <summary>Absolute HTTP(S) URL with a host. Invalid URLs reject the entire evaluation batch.</summary>
+    [JsonPropertyName("url")]
+    public required string Url { 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>RPC data type for ManagedPermissionEvaluation operations.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class ManagedPermissionEvaluation
+{
+    /// <summary>Original input operation associated with this verdict.</summary>
+    [JsonPropertyName("operation")]
+    public ManagedPermissionOperation Operation { get => field ??= new(); 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>Managed-policy decision only; never bypasses user permissions or other security controls.</summary>
+    [JsonPropertyName("verdict")]
+    public ManagedPermissionVerdict Verdict { get; set; }
+}
 
-    /// <summary>Whether the value may be supplied more than once.</summary>
-    [JsonPropertyName("isRepeated")]
-    public required bool IsRepeated { get; set; }
+/// <summary>Ordered managed permission verdicts and the supplied policy's fail-closed posture.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class ManagedSettingsPermissionsEvaluateResult
+{
+    /// <summary>Managed permission policy could not be determined; every operation is denied.</summary>
+    [JsonPropertyName("failClosed")]
+    public bool FailClosed { 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>One verdict per input operation, in the same order, including duplicates.</summary>
+    [JsonPropertyName("results")]
+    public IList<ManagedPermissionEvaluation> Results { get => field ??= []; set; }
+}
 
-    /// <summary>Whether the value must be present for the plan to be applicable.</summary>
-    [JsonPropertyName("required")]
-    public required bool Required { get; set; }
+/// <summary>Managed policy context and ordered operations for pure, sessionless evaluation.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class ManagedSettingsPermissionsEvaluateRequest
+{
+    /// <summary>Trusted, reusable managed permission policy snapshot; no policy is discovered during evaluation.</summary>
+    [JsonPropertyName("context")]
+    public ManagedPermissionsContext Context { get; set; } = null!;
 
-    /// <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>Operations to evaluate, preserving input order and duplicates. An empty batch is valid.</summary>
+    [JsonPropertyName("operations")]
+    public IList<ManagedPermissionOperation> Operations { get => field ??= []; set; }
+}
 
-    /// <summary>Scalar type the value must conform to.</summary>
-    [JsonPropertyName("valueType")]
-    public required McpPlanScalarValueType ValueType { get; set; }
+/// <summary>Hosting capabilities and session capacity advertised by an environment.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class EnvironmentCapabilities
+{
+    /// <summary>Advertised Agent Host Protocol version.</summary>
+    [JsonPropertyName("ahpVersion")]
+    public string? AhpVersion { get; set; }
+
+    /// <summary>Current session count, when advertised.</summary>
+    [JsonPropertyName("currentSessions")]
+    public long? CurrentSessions { get; set; }
+
+    /// <summary>Feature identifiers advertised by the environment.</summary>
+    [JsonPropertyName("features")]
+    public IList<string> Features { get => field ??= []; set; }
+
+    /// <summary>Maximum session capacity, when advertised.</summary>
+    [JsonPropertyName("maxSessions")]
+    public long? MaxSessions { get; set; }
 }
 
-/// <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>
+/// <summary>Safe discovery information. Host-side relay bootstrap credentials are never included.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class McpPlanRequiredValueEnum : McpPlanRequiredValue
+public sealed class GitHubEnvironment
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "enum";
+    /// <summary>Hosting capabilities advertised by the environment.</summary>
+    [JsonPropertyName("capabilities")]
+    public EnvironmentCapabilities? Capabilities { get; set; }
 
-    /// <summary>Where the value is applied when the server is launched.</summary>
-    [JsonPropertyName("category")]
-    public required McpPlanValueCategory Category { get; set; }
+    /// <summary>Identifier assigned by Mission Control.</summary>
+    [JsonPropertyName("id")]
+    public string Id { 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>Compute kind reported by Mission Control.</summary>
+    [JsonPropertyName("kind")]
+    public EnvironmentKind Kind { 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>Discovery labels attached to the environment.</summary>
+    [JsonPropertyName("labels")]
+    public IDictionary<string, string>? Labels { get; set; }
 
-    /// <summary>Non-empty permitted value set. Inert untrusted data.</summary>
-    [JsonPropertyName("enumValues")]
-    public required IList<string> EnumValues { get; set; }
+    /// <summary>Timestamp of the last heartbeat received by Mission Control.</summary>
+    [JsonPropertyName("lastHeartbeatAt")]
+    public string? LastHeartbeatAt { get; set; }
 
-    /// <summary>Whether the value may be supplied more than once.</summary>
-    [JsonPropertyName("isRepeated")]
-    public required bool IsRepeated { get; set; }
+    /// <summary>Human-readable environment name.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
 
-    /// <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>Organization identifier, when the environment belongs to an organization.</summary>
+    [JsonPropertyName("orgId")]
+    public string? OrgId { 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>Identifier of the environment owner.</summary>
+    [JsonPropertyName("ownerId")]
+    public string? OwnerId { 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>Owner category reported by Mission Control.</summary>
+    [JsonPropertyName("ownerType")]
+    public string? OwnerType { get; set; }
 
-    /// <summary>Discriminator: the value must be one of `enumValues`.</summary>
-    [JsonPropertyName("valueType")]
-    public required McpPlanEnumValueType ValueType { get; set; }
+    /// <summary>Open-ended operational status vocabulary.</summary>
+    [JsonPropertyName("status")]
+    public string Status { get; set; } = string.Empty;
 }
 
-/// <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>
+/// <summary>Environments visible to the authenticated caller and matching the supplied filters.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpPlanSecretPlaceholder
+public sealed class EnvironmentsListResult
 {
-    /// <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>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>Safe discovery records without relay bootstrap credentials.</summary>
+    [JsonPropertyName("environments")]
+    public IList<GitHubEnvironment> Environments { get => field ??= []; set; }
 }
 
-/// <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>
+/// <summary>Optional discovery filters supported by GitHub Mission Control.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class McpPlanTransportChoicePackage : McpPlanTransportChoice
+internal sealed class EnvironmentsListRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string InstallMethod => "package";
-
-    /// <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>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>Restrict discovery to this compute kind.</summary>
+    [JsonPropertyName("kind")]
+    public EnvironmentKind? Kind { get; set; }
 
-    /// <summary>Typed values this choice requires, excluding secrets.</summary>
-    [JsonPropertyName("requiredValues")]
-    public required IList<McpPlanRequiredValue> RequiredValues { get; set; }
+    /// <summary>Operational status, such as online, offline, degraded, waking, or draining.</summary>
+    [JsonPropertyName("status")]
+    public string? Status { get; set; }
+}
 
-    /// <summary>Secrets this choice requires, referenced by placeholder only.</summary>
-    [JsonPropertyName("secretPlaceholders")]
-    public required IList<McpPlanSecretPlaceholder> SecretPlaceholders { get; set; }
+/// <summary>Safe discovery information for the requested environment.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class EnvironmentsGetResult
+{
+    /// <summary>The requested environment without relay bootstrap credentials.</summary>
+    [JsonPropertyName("environment")]
+    public GitHubEnvironment Environment { get => field ??= new(); set; }
+}
 
-    /// <summary>Local process transport this package choice would use.</summary>
-    [JsonPropertyName("transport")]
-    public required McpPlanPackageTransport Transport { get; set; }
+/// <summary>Identify a Mission Control environment to retrieve.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class EnvironmentsGetRequest
+{
+    /// <summary>Identifier assigned by Mission Control.</summary>
+    [JsonPropertyName("environmentId")]
+    public string EnvironmentId { get; set; } = string.Empty;
 }
 
-/// <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>
+/// <summary>Acknowledgement that the requested environment was deleted.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class McpPlanTransportChoiceRemote : McpPlanTransportChoice
+public sealed class EnvironmentsDeleteResult
 {
-    /// <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>Identify a user-managed Mission Control environment to delete.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class EnvironmentsDeleteRequest
+{
+    /// <summary>User-managed environment to delete. GitHub-managed environments cannot be deleted.</summary>
+    [JsonPropertyName("environmentId")]
+    public string EnvironmentId { get; set; } = string.Empty;
 }
 
-/// <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>
+/// <summary>The existing runtime identity and its resource on the listener.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpInstallPlan
+public sealed class HostPublishSessionResult
 {
-    /// <summary>Alternative configuration changes, with exactly one entry for each transportChoices entry in the same order. Only the entry for the subsequently selected transport applies; these are not cumulative writes. Payloads remain behind the runtime boundary.</summary>
-    [JsonPropertyName("configurationChanges")]
-    public IList<McpPlanConfigurationChange> ConfigurationChanges { get => field ??= []; set; }
-
-    /// <summary>Normalised identity of the server the plan would install.</summary>
-    [JsonPropertyName("identity")]
-    public McpPlanResourceIdentity Identity { get => field ??= new(); set; }
-
-    /// <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>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>Outcome of evaluating the server against registry and enterprise policy.</summary>
-    [JsonPropertyName("policy")]
-    public McpPlanPolicyResult Policy { get => field ??= new(); 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>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>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>True only when every eligible transport choice needs additional values or secrets. False means at least one choice needs no additional configuration, not that every choice is ready. A later apply operation must validate the selected choice's own inputs, secrets and policy after explicit confirmation.</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>Canonical runtime ID of the published session.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 
-    /// <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>AHP resource URI for the session on this listener.</summary>
+    [JsonPropertyName("sessionUri")]
+    public string SessionUri { get; set; } = string.Empty;
 }
 
-/// <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>
+/// <summary>Publishes a resident session attached to the listener's owning connection.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class McpPlanInstallResultPlanned : McpPlanInstallResult
+internal sealed class HostPublishSessionRequest
 {
-    /// <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>Listener UUID returned by host.start.</summary>
+    [JsonPropertyName("hostId")]
+    public string HostId { get; set; } = string.Empty;
 
-    /// <summary>The normalised plan.</summary>
-    [JsonPropertyName("plan")]
-    public required McpInstallPlan Plan { get; set; }
+    /// <summary>Canonical runtime session ID attached to the listener's owning connection.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <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>
+/// <summary>Metadata advertised by the AHP host, not a guarantee that history can be resumed.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class McpPlanInstallResultNegotiationRefused : McpPlanInstallResult
+public sealed class HostSessionSummary
 {
-    /// <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>Optional activity description advertised by the host.</summary>
+    [JsonPropertyName("activity")]
+    public string? Activity { get; set; }
 
-    /// <summary>Lowest caller protocol version this runtime will serve.</summary>
-    [JsonPropertyName("minimumSupportedProtocolVersion")]
-    public required long MinimumSupportedProtocolVersion { get; set; }
+    /// <summary>Session creation time as an ISO 8601 timestamp.</summary>
+    [JsonPropertyName("createdAt")]
+    public string CreatedAt { get; set; } = string.Empty;
 
-    /// <summary>Whether the version or the capability set was the problem.</summary>
-    [JsonPropertyName("reason")]
-    public required CatalogNegotiationRefusedReason Reason { get; set; }
+    /// <summary>Last modification time as an ISO 8601 timestamp.</summary>
+    [JsonPropertyName("modifiedAt")]
+    public string ModifiedAt { get; set; } = string.Empty;
 
-    /// <summary>Protocol version of the runtime that refused the request.</summary>
-    [JsonPropertyName("runtimeProtocolVersion")]
-    public required long RuntimeProtocolVersion { get; set; }
+    /// <summary>Stable AHP resource URI identifying the session on this host.</summary>
+    [JsonPropertyName("resource")]
+    public string Resource { get; set; } = string.Empty;
 
-    /// <summary>Capabilities this runtime can safely advertise to this caller. The complete five-capability protocol-3 legacy set is always present; every capability added after that baseline appears only when the caller required it, so an older closed-enum decoder can still consume a refusal. This list does not imply that every deployment has enabled every operation.</summary>
-    [JsonPropertyName("supportedCapabilities")]
-    public required IList<string> SupportedCapabilities { get; set; }
+    /// <summary>Unsigned 32-bit AHP session status bitset (0..=4294967295); unknown bits must be preserved.</summary>
+    [JsonPropertyName("status")]
+    public long Status { 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>Authoritative title advertised by the host.</summary>
+    [JsonPropertyName("title")]
+    public string Title { get; set; } = string.Empty;
 }
 
-/// <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>
+/// <summary>The complete live and dormant advertised catalog, without subscribing to sessions.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class McpPlanInstallResultHandleRejected : McpPlanInstallResult
+public sealed class HostListSessionsResult
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "handle-rejected";
-
-    /// <summary>Which kind of handle was presented.</summary>
-    [JsonPropertyName("handleType")]
-    public required CatalogHandleType HandleType { get; set; }
-
-    /// <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>Complete advertised session summaries, in the host's catalog order.</summary>
+    [JsonPropertyName("sessions")]
+    public IList<HostSessionSummary> Sessions { get => field ??= []; set; }
 }
 
-/// <summary>The request was rejected because a bounded field fell outside its permitted range or a required field was unusable. Pagination may also be rejected by the authority after a continuation request; repeat the search without page.</summary>
-/// <remarks>The <c>invalid-request</c> variant of <see cref="McpPlanInstallResult"/>.</remarks>
+/// <summary>Reads a running host's catalog or the runtime's saved default catalog.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class McpPlanInstallResultInvalidRequest : McpPlanInstallResult
+internal sealed class HostListSessionsRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "invalid-request";
-
-    /// <summary>Which request field was rejected.</summary>
-    [JsonPropertyName("field")]
-    public required CatalogInvalidRequestField Field { get; set; }
+    /// <summary>
+    /// Listener UUID returned by host.start; the caller must own it. Omit to read
+    /// the saved default compute-identity catalog without starting a listener.
+    /// </summary>
+    [JsonPropertyName("hostId")]
+    public string? HostId { 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>The resident session the application has materialized on its own connection.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class HostCreateSessionResult
+{
+    /// <summary>Runtime session UUID materialized on the application's SDK connection.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <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>
+/// <summary>One application-owned session handoff, requested by the supervised hosting participant.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class McpPlanInstallResultAuthenticationRequired : McpPlanInstallResult
+internal sealed class HostCreateSessionRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "authentication-required";
+    /// <summary>Host-selected SDK creation or resume settings, without executable callbacks or tools.</summary>
+    [JsonPropertyName("config")]
+    public IDictionary<string, JsonElement> Config { get => field ??= new Dictionary<string, JsonElement>(); set; }
 
-    /// <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>Unique identity for this participation, independent of the session lifetime.</summary>
+    [JsonPropertyName("handoffId")]
+    public string HandoffId { get; set; } = string.Empty;
 
-    /// <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>
+    /// For an explicit publication, borrow an existing owning-connection resident
+    /// instead of invoking the resume factory. Cold sessions still use the factory.
+    /// </summary>
+    [JsonPropertyName("preferResident")]
+    public bool? PreferResident { get; set; }
+
+    /// <summary>Resume an app-owned durable session instead of creating a new session.</summary>
+    [JsonPropertyName("resume")]
+    public bool? Resume { get; set; }
 }
 
-/// <summary>Registry or enterprise policy refused the operation.</summary>
-/// <remarks>The <c>policy-rejected</c> variant of <see cref="McpPlanInstallResult"/>.</remarks>
+/// <summary>Empty acknowledgement for a completed host lifecycle operation.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class McpPlanInstallResultPolicyRejected : McpPlanInstallResult
+internal sealed class HostReleaseSessionResult
 {
-    /// <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>Ends one participation, not the application's session lifetime.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class HostReleaseSessionRequest
+{
+    /// <summary>Identity of the participation to release without destroying the session.</summary>
+    [JsonPropertyName("handoffId")]
+    public string HandoffId { get; set; } = string.Empty;
 }
 
-/// <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>
+/// <summary>Listener readiness, returned only after binding and the supervised participant's SDK handshake.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class McpPlanInstallResultNetworkFailure : McpPlanInstallResult
+public sealed class HostStartResult
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "network-failure";
+    /// <summary>GitHub Mission Control environment ID, present when its relay transport is ready.</summary>
+    [JsonPropertyName("environmentId")]
+    public string? EnvironmentId { 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>Caller-generated listener UUID.</summary>
+    [JsonPropertyName("hostId")]
+    public string HostId { 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>Separate host process ID, when provided by a legacy runtime. Absent for in-process listeners.</summary>
+    [JsonPropertyName("pid")]
+    public long? Pid { get; set; }
 
-    /// <summary>Bounded cooldown in seconds before another catalog request should be attempted, when the authority supplied a numeric Retry-After value or the runtime applied its documented fallback.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("retryAfterSeconds")]
-    public int? RetryAfterSeconds { get; set; }
+    /// <summary>Secret connection token, absent when authentication is disabled.</summary>
+    [JsonPropertyName("token")]
+    public string? Token { 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>Actual bound WebSocket URL, including the allocated port.</summary>
+    [JsonPropertyName("url")]
+    public string? Url { get; set; }
 }
 
-/// <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>
+/// <summary>GitHub Mission Control registration options. The compute ID is application-owned and stable.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class McpPlanInstallResultUnsafeRetrieval : McpPlanInstallResult
+public sealed class HostGitHubEnvironmentOptions
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "unsafe-retrieval";
+    /// <summary>Stable application installation identity, reused across host restarts.</summary>
+    [JsonPropertyName("computeId")]
+    public string ComputeId { 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>Human-readable environment display name.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
 
-    /// <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>Require sealed, connection-bound authentication (default true), independent of listener address. False permits unsealed direct credentials and unbound sealed relay credentials; use only when the caller fully controls and trusts the direct transport. Relay token encryption remains mandatory.</summary>
+    [JsonPropertyName("requireConnectionBinding")]
+    public bool? RequireConnectionBinding { get; set; }
 }
 
-/// <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>
+/// <summary>Local WebSocket transport options.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class McpPlanInstallResultMalformedCard : McpPlanInstallResult
+public sealed class HostLocalServerOptions
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "malformed-card";
+    /// <summary>Listener hostname. Defaults to 127.0.0.1; explicit non-loopback binds are allowed.</summary>
+    [JsonPropertyName("hostname")]
+    public string? Hostname { get; set; }
 
-    /// <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>Listener port. Omitted or zero requests an OS-allocated port.</summary>
+    [JsonPropertyName("port")]
+    public int? Port { 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>Require token authentication (default true). Cannot be false with a token.</summary>
+    [JsonPropertyName("requireConnectionToken")]
+    public bool? RequireConnectionToken { get; set; }
 
-    /// <summary>How the card failed validation.</summary>
-    [JsonPropertyName("reason")]
-    public required CatalogMalformedCardReason Reason { get; set; }
+    /// <summary>Nonempty connection token. Generated randomly when required and omitted.</summary>
+    [JsonPropertyName("token")]
+    public string? Token { get; set; }
 }
 
-/// <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>
+/// <summary>Starts a supervised AHP host with at least one explicitly selected transport.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class McpPlanInstallResultContractViolation : McpPlanInstallResult
+public sealed class HostStartRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "contract-violation";
+    /// <summary>Stable application identity selecting its durable host catalog. Defaults to the persisted runtime compute GUID; must agree with githubEnvironment.computeId when both are supplied.</summary>
+    [JsonPropertyName("computeId")]
+    public string? ComputeId { get; set; }
 
-    /// <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>Registers a GitHub Mission Control environment and enables its relay transport.</summary>
+    [JsonPropertyName("githubEnvironment")]
+    public HostGitHubEnvironmentOptions? GitHubEnvironment { get; set; }
 
-    /// <summary>Which rule the response broke.</summary>
-    [JsonPropertyName("reason")]
-    public required CatalogContractViolationReason Reason { get; set; }
+    /// <summary>Caller-generated UUID identifying this connection-owned listener.</summary>
+    [JsonPropertyName("hostId")]
+    public required string HostId { get; set; }
+
+    /// <summary>Enables a local WebSocket listener.</summary>
+    [JsonPropertyName("localServer")]
+    public HostLocalServerOptions? LocalServer { get; set; }
+
+    /// <summary>Ask the owning application to resume its durable AHP sessions.</summary>
+    [JsonPropertyName("resumeFactory")]
+    public bool? ResumeFactory { get; set; }
+
+    /// <summary>Ask the owning SDK application to materialize AHP sessions.</summary>
+    [JsonPropertyName("sessionFactory")]
+    public bool? SessionFactory { get; set; }
 }
 
-/// <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>
+/// <summary>Empty acknowledgement for a completed host lifecycle operation.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class McpPlanInstallResultUnavailableTransport : McpPlanInstallResult
+public sealed class HostDisposeResult
 {
-    /// <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>Stops a connection-owned listener and joins its teardown.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class HostDisposeRequest
+{
+    /// <summary>Listener UUID. Unknown or successfully stopped IDs are harmless.</summary>
+    [JsonPropertyName("hostId")]
+    public string HostId { get; set; } = string.Empty;
 }
 
-/// <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>
+/// <summary>Private credentials delivered only to a runtime-owned Mission Control hosting participant.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class McpPlanInstallResultNotInstallable : McpPlanInstallResult
+internal sealed class HostGetEnvironmentCredentialsResult
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "not-installable";
+    /// <summary>GitHub API base URL for the authenticated service.</summary>
+    [JsonPropertyName("githubApiUrl")]
+    public string GitHubApiUrl { 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>Hostname of the authenticated GitHub service.</summary>
+    [JsonPropertyName("githubHost")]
+    public string GitHubHost { get; set; } = string.Empty;
 
-    /// <summary>Why the candidate cannot be installed.</summary>
-    [JsonPropertyName("reason")]
-    public required CatalogNotInstallableReason Reason { get; set; }
+    /// <summary>Mission Control API origin for environment registration and management.</summary>
+    [JsonPropertyName("missionControlUrl")]
+    public string MissionControlUrl { get; set; } = string.Empty;
+
+    /// <summary>Current bearer token for the authenticated GitHub identity.</summary>
+    [JsonPropertyName("token")]
+    public string Token { get; set; } = string.Empty;
 }
 
-/// <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>
+/// <summary>Normalized local WebSocket listener settings.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class McpPlanInstallResultUnavailable : McpPlanInstallResult
+public sealed class HostLocalServerConfiguration
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "unavailable";
+    /// <summary>Hostname or IP address to bind.</summary>
+    [JsonPropertyName("hostname")]
+    public string Hostname { 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>Port to bind, with zero requesting OS allocation.</summary>
+    [JsonPropertyName("port")]
+    public int Port { get; set; }
 
-    /// <summary>Why the operation is unavailable.</summary>
-    [JsonPropertyName("reason")]
-    public required CatalogUnavailableReason Reason { get; set; }
+    /// <summary>Whether the listener requires token authentication.</summary>
+    [JsonPropertyName("requireConnectionToken")]
+    public bool RequireConnectionToken { get; set; }
+
+    /// <summary>Secret connection token, absent when authentication is disabled.</summary>
+    [JsonPropertyName("token")]
+    public string? Token { get; set; }
 }
 
-/// <summary>The protocol version and capability set a caller requires, supplied on every catalog request so negotiation cannot be skipped by omission.</summary>
+/// <summary>Normalized listener settings delivered only to the supervised hosting participant.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class CatalogClientContract
+internal sealed class HostGetConfigurationResult
 {
-    /// <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>Requested GitHub Mission Control registration.</summary>
+    [JsonPropertyName("githubEnvironment")]
+    public HostGitHubEnvironmentOptions? GitHubEnvironment { 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>Normalized local listener settings, absent for relay-only hosts.</summary>
+    [JsonPropertyName("localServer")]
+    public HostLocalServerConfiguration? LocalServer { get; set; }
+
+    /// <summary>Whether app-owned durable sessions are resumed by the owning application.</summary>
+    [JsonPropertyName("resumeFactory")]
+    public bool ResumeFactory { get; set; }
+
+    /// <summary>Whether session materialization is delegated to the owning application.</summary>
+    [JsonPropertyName("sessionFactory")]
+    public bool SessionFactory { get; set; }
 }
 
-/// <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>
+/// <summary>Empty acknowledgement for a completed host lifecycle operation.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-[JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "kind",
-    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(McpPlanInstallSourceCandidate), "candidate")]
-[JsonDerivedType(typeof(McpPlanInstallSourceCard), "card")]
-public partial class McpPlanInstallSource
+internal sealed class HostReadyResult
 {
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("kind")]
-    public virtual string Kind { get; set; } = string.Empty;
 }
 
-
-/// <summary>Plan from a candidate returned by a previous catalog search.</summary>
-/// <remarks>The <c>candidate</c> variant of <see cref="McpPlanInstallSource"/>.</remarks>
+/// <summary>Readiness reported by the supervised hosting participant on its own SDK connection.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class McpPlanInstallSourceCandidate : McpPlanInstallSource
+internal sealed class HostReadyRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "candidate";
+    /// <summary>Actual bound WebSocket URL.</summary>
+    [JsonPropertyName("address")]
+    public string? Address { 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>Registered environment ID, reported only once the relay transport is connected.</summary>
+    [JsonPropertyName("environmentId")]
+    public string? EnvironmentId { get; set; }
 
-    /// <summary>The runtime- or authority-minted `searchId` returned with the search that produced this candidate. Planning verifies the private correlation and atomically consumes a matching candidate before downstream work, including attempts that subsequently fail or report unavailable. A mismatched search does not consume the candidate. 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>Configured secret token, absent when authentication is disabled.</summary>
+    [JsonPropertyName("token")]
+    public string? Token { get; set; }
 }
 
-/// <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>
+/// <summary>One server-discovered hook action from user, repository, plugin, or managed-policy configuration.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-[JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "kind",
-    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(McpServerCardReferenceUrl), "url")]
-[JsonDerivedType(typeof(McpServerCardReferenceEmbedded), "embedded")]
-public partial class McpServerCardReference
+public sealed class DiscoveredHook
 {
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("kind")]
-    public virtual string Kind { get; set; } = string.Empty;
-}
-
+    /// <summary>Durable content hash used by hook enablement. Identical actions may intentionally share this key. Omitted when changing the user's disabled-hooks setting cannot change the action's current server-discovered state, including managed-policy hooks, session-start prompt actions, actions suppressed by disable-all settings, and projectless plugin actions that require project-directory expansion.</summary>
+    [JsonPropertyName("disableKey")]
+    public string? DisableKey { get; set; }
 
-/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class McpServerCardReferenceUrl : McpServerCardReference
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "url";
+    /// <summary>Whether this action is enabled under the server-side discovery settings. Concrete sessions may differ because they can add session-specific directories, plugins, or trust. False when its disable key is present in the user's disabled-hooks setting or disable-all settings suppress the action.</summary>
+    [JsonPropertyName("enabled")]
+    public bool Enabled { get; set; }
 
-    /// <summary>Media type the card is expected to conform to.</summary>
-    [JsonPropertyName("mediaType")]
-    public required McpServerCardMediaType MediaType { get; set; }
+    /// <summary>Hook event that invokes this action.</summary>
+    [JsonPropertyName("hookType")]
+    public HookType HookType { 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>Deterministic identifier for this server-discovered action row. It remains stable while the project, origin, source, event, action content, and duplicate ordinal are unchanged. This is row identity, not the key persisted in disabledHooks.</summary>
+    [JsonPropertyName("id")]
+    public string Id { get; set; } = string.Empty;
 
-/// <summary>An MCP server card supplied inline as an inert document.</summary>
-/// <remarks>The <c>embedded</c> variant of <see cref="McpServerCardReference"/>.</remarks>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class McpServerCardReferenceEmbedded : McpServerCardReference
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "embedded";
+    /// <summary>Configuration tier that contributed this hook action.</summary>
+    [JsonPropertyName("origin")]
+    public HookOrigin Origin { 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>Input project path for which this server-side action was resolved. Set on every row returned for project-scoped discovery, including repeated user and policy actions.</summary>
+    [JsonPropertyName("projectPath")]
+    public string? ProjectPath { get; set; }
 
-    /// <summary>Media type the card is expected to conform to.</summary>
-    [JsonPropertyName("mediaType")]
-    public required McpServerCardMediaType MediaType { get; set; }
+    /// <summary>Human-readable source label, such as a hook file path, settings source, or plugin name.</summary>
+    [JsonPropertyName("source")]
+    public string? Source { get; set; }
 }
 
-/// <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>
+/// <summary>Server-discovered hook actions and partial-load diagnostics from user, repository, plugin, and managed-policy sources. Concrete sessions may include additional session-specific hook sources.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class McpPlanInstallSourceCard : McpPlanInstallSource
+public sealed class HooksDiscoverResult
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "card";
+    /// <summary>Errors for hook sources or actions that could not be loaded, making the result partially incomplete. Other valid actions are still returned. Project-resolution and repository-settings errors are prefixed with their project path.</summary>
+    [JsonPropertyName("errors")]
+    public IList<string> Errors { get => field ??= []; set; }
 
-    /// <summary>The card to plan from: exactly one of a URL or embedded data.</summary>
-    [JsonPropertyName("card")]
-    public required McpServerCardReference Card { get; set; }
+    /// <summary>All discovered hook actions. Byte-identical actions remain separate rows even when they share a disable key.</summary>
+    [JsonPropertyName("hooks")]
+    public IList<DiscoveredHook> Hooks { get => field ??= []; set; }
+
+    /// <summary>Non-fatal source-loading warnings. Discovery remains complete for the affected source, although the source had a recoverable issue. Repository-settings warnings are prefixed with their project path when attribution is available.</summary>
+    [JsonPropertyName("warnings")]
+    public IList<string> Warnings { get => field ??= []; set; }
 }
 
-/// <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>
+/// <summary>Optional project paths and host-exclusion behavior for server-scoped hook discovery.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpPlanInstallRequest
+public sealed class HooksDiscoverRequest
 {
-    /// <summary>Protocol version and capabilities the caller requires.</summary>
-    [JsonPropertyName("contract")]
-    public required CatalogClientContract Contract { get; set; }
-
-    /// <summary>The same existing attached session that owns the original catalogue candidate.</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("policySessionId")]
-    public string? PolicySessionId { get; set; }
+    /// <summary>When true, omit host-owned user and plugin hook rows and their diagnostics. Managed-policy hooks and trusted repository hooks remain visible, and host disabledHooks still contribute to each remaining row's effective enabled state. This filters sources rather than simulating a host with no settings.</summary>
+    [JsonPropertyName("excludeHostHooks")]
+    public bool? ExcludeHostHooks { get; set; }
 
-    /// <summary>Configuration scope the plan targets. Defaults to user scope when omitted.</summary>
-    [JsonPropertyName("scope")]
-    public McpPlanScope? Scope { get; set; }
+    /// <summary>Explicit discovery-only file-hook roots, separate from callback hooks and filesystem grants. Available without ambient discovery or repository file-hook enablement, subject to managed/hook disables. Relative paths resolve against the request's effective working directory when supplied. Null and omission are equivalent; an empty array contributes no explicit roots.</summary>
+    [JsonPropertyName("hookDirectories")]
+    public IList<string>? HookDirectories { get; set; }
 
-    /// <summary>What to plan: either a candidate handle from a previous search, or a card supplied directly.</summary>
-    [JsonPropertyName("source")]
-    public required McpPlanInstallSource Source { get; set; }
+    /// <summary>Optional project directory paths whose trusted repository and project-expanded plugin hooks should be discovered. When omitted or empty, user, managed-policy, and globally enabled installed or explicit plugin hooks are returned without project expansion.</summary>
+    [JsonPropertyName("projectPaths")]
+    public IList<string>? ProjectPaths { get; set; }
 }
 
-/// <summary>Management result with contract receipt, or a typed request/negotiation refusal.</summary>
-/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
+/// <summary>Active server-driven promotion for a model, including its discount and optional expiry.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-[JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "kind",
-    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(McpInstallationManagementResultOutcome), "outcome")]
-[JsonDerivedType(typeof(McpInstallationManagementResultNegotiationRefused), "negotiation-refused")]
-[JsonDerivedType(typeof(McpInstallationManagementResultInvalidRequest), "invalid-request")]
-public partial class McpInstallationManagementResult
+public sealed class ModelBillingPromo
 {
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("kind")]
-    public virtual string Kind { get; set; } = string.Empty;
-}
+    /// <summary>Percentage discount (0-100) applied while the promotion is active. May be fractional.</summary>
+    [JsonPropertyName("discountPercent")]
+    public double? DiscountPercent { get; set; }
 
+    /// <summary>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.</summary>
+    [JsonPropertyName("endsAt")]
+    public string? EndsAt { get; set; }
 
-/// <summary>Read-only or recovery management result, never permission to activate or replay.</summary>
-/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-[JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "kind",
-    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(McpInstallationManagementOutcomeRecoveryRequired), "recovery-required")]
-[JsonDerivedType(typeof(McpInstallationManagementOutcomeInstallPrepared), "install-prepared")]
-[JsonDerivedType(typeof(McpInstallationManagementOutcomeListed), "listed")]
-[JsonDerivedType(typeof(McpInstallationManagementOutcomeRecovered), "recovered")]
-[JsonDerivedType(typeof(McpInstallationManagementOutcomeUninstallPlanned), "uninstall-planned")]
-[JsonDerivedType(typeof(McpInstallationManagementOutcomeOperation), "operation")]
-[JsonDerivedType(typeof(McpInstallationManagementOutcomeRefused), "refused")]
-public partial class McpInstallationManagementOutcome
-{
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("kind")]
-    public virtual string Kind { get; set; } = string.Empty;
-}
+    /// <summary>Stable identifier for the promotion campaign.</summary>
+    [JsonPropertyName("id")]
+    public string? Id { get; set; }
 
+    /// <summary>Human-readable promotion message. Does not include the expiry timestamp; consumers may format endsAt and append it when present.</summary>
+    [JsonPropertyName("message")]
+    public string? Message { get; set; }
 
-/// <summary>Already-confirmed durable work must be reconciled before new mutations or inventory.</summary>
-/// <remarks>The <c>recovery-required</c> variant of <see cref="McpInstallationManagementOutcome"/>.</remarks>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class McpInstallationManagementOutcomeRecoveryRequired : McpInstallationManagementOutcome
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "recovery-required";
+    /// <summary>Whether the service asked hosts to give this promotion a prominent surface, such as a dedicated banner, in addition to listing it with the model. `true` requests that surface and `false` asks for the model list only. Absent means the service expressed no preference — for example a response that predates the field — so hosts should apply their own default rather than read it as `false`.</summary>
+    [JsonPropertyName("showBanner")]
+    public bool? ShowBanner { get; set; }
 }
 
-/// <summary>Inert, runtime-owned admission. The operation ID is known before confirmation or effects.</summary>
+/// <summary>Long context tier pricing (available for models with extended context windows).</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpPreparedInstall
+public sealed class ModelBillingTokenPricesLongContext
 {
-    /// <summary>Original plan expiry in Unix epoch milliseconds; preparation does not extend it.</summary>
-    [JsonPropertyName("expiresAtEpochMs")]
-    public long ExpiresAtEpochMs { get; set; }
+    /// <summary>Use cacheReadPrice instead. AI Credits cost per billing batch of cached tokens.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+#if NET5_0_OR_GREATER
+    [Obsolete("This member is deprecated and will be removed in a future version.", DiagnosticId = "GHCP001")]
+#else
+    [Obsolete("This member is deprecated and will be removed in a future version.")]
+#endif
+    [JsonPropertyName("cachePrice")]
+    public double? CachePrice { get; set; }
 
-    /// <summary>Original connection-owned operation, known before the first confirmation callback.</summary>
-    [JsonPropertyName("operationId")]
-    public string OperationId { get; set; } = string.Empty;
-}
+    /// <summary>AI Credits cost per billing batch of cached (read) tokens.</summary>
+    [JsonPropertyName("cacheReadPrice")]
+    public double? CacheReadPrice { get; set; }
 
-/// <summary>The <c>install-prepared</c> variant of <see cref="McpInstallationManagementOutcome"/>.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class McpInstallationManagementOutcomeInstallPrepared : McpInstallationManagementOutcome
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "install-prepared";
+    /// <summary>AI Credits cost per billing batch of 1-hour cache-write (cache creation) tokens.</summary>
+    [JsonPropertyName("cacheWrite1hPrice")]
+    public double? CacheWrite1hPrice { get; set; }
 
-    /// <summary>Known original operation identity, returned before callback or effects.</summary>
-    [JsonPropertyName("operation")]
-    public required McpPreparedInstall Operation { get; set; }
-}
+    /// <summary>AI Credits cost per billing batch of cache-write (cache creation) tokens.</summary>
+    [JsonPropertyName("cacheWritePrice")]
+    public double? CacheWritePrice { get; set; }
 
-/// <summary>A versioned, bounded trust observation carried unchanged with a catalog candidate and its private handle context. Current observations require a recognised T1/T2 tier; every non-current state structurally forbids a tier. Eligibility remains `unknown` while Agent Finder supplies no exposure decision, and states absent from its current wire are never inferred from age, relevance, popularity, or a tier transition.</summary>
-/// <remarks>Polymorphic base type discriminated by <c>status</c>.</remarks>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-[JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "status",
-    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(CatalogTrustSnapshotCurrent), "current")]
-[JsonDerivedType(typeof(CatalogTrustSnapshotAbsent), "absent")]
-[JsonDerivedType(typeof(CatalogTrustSnapshotStale), "stale")]
-[JsonDerivedType(typeof(CatalogTrustSnapshotDowngraded), "downgraded")]
-[JsonDerivedType(typeof(CatalogTrustSnapshotRevoked), "revoked")]
-[JsonDerivedType(typeof(CatalogTrustSnapshotUnsupported), "unsupported")]
-[JsonDerivedType(typeof(CatalogTrustSnapshotMalformed), "malformed")]
-public partial class CatalogTrustSnapshot
-{
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("status")]
-    public virtual string Status { get; set; } = string.Empty;
-}
+    /// <summary>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.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+#if NET5_0_OR_GREATER
+    [Obsolete("This member is deprecated and will be removed in a future version.", DiagnosticId = "GHCP001")]
+#else
+    [Obsolete("This member is deprecated and will be removed in a future version.")]
+#endif
+    [JsonPropertyName("contextMax")]
+    public long? ContextMax { get; set; }
 
+    /// <summary>AI Credits cost per billing batch of input tokens.</summary>
+    [JsonPropertyName("inputPrice")]
+    public double? InputPrice { get; set; }
 
-/// <summary>Where and when the runtime observed the trust metadata. Observation time is not the authority's evaluation time and must not be used to infer staleness.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class CatalogTrustProvenance
-{
-    /// <summary>ISO 8601 timestamp with a timezone offset at which the runtime observed the search result carrying this trust field.</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(20)]
-    [MaxLength(64)]
-    [JsonPropertyName("observedAt")]
-    public DateTimeOffset ObservedAt { get; set; }
+    /// <summary>Prompt token budget for the long context tier. The total context window is this value plus the model's max_output_tokens.</summary>
+    [JsonPropertyName("maxPromptTokens")]
+    public long? MaxPromptTokens { get; set; }
 
-    /// <summary>Bounded authority that supplied the trust field.</summary>
-    [JsonPropertyName("source")]
-    public CatalogTrustSource Source { get; set; }
+    /// <summary>AI Credits cost per billing batch of output tokens.</summary>
+    [JsonPropertyName("outputPrice")]
+    public double? OutputPrice { get; set; }
 }
 
-/// <summary>A recognised current Agent Finder T1 or T2 trust tier.</summary>
-/// <remarks>The <c>current</c> variant of <see cref="CatalogTrustSnapshot"/>.</remarks>
+/// <summary>Token-level pricing information for this model.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class CatalogTrustSnapshotCurrent : CatalogTrustSnapshot
+public sealed class ModelBillingTokenPrices
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Status => "current";
+    /// <summary>Number of tokens per standard billing batch.</summary>
+    [JsonPropertyName("batchSize")]
+    public long? BatchSize { get; set; }
 
-    /// <summary>Service-computed exposure eligibility. `unknown` is required while Agent Finder returns no explicit eligibility field.</summary>
-    [JsonPropertyName("eligibility")]
-    public required CatalogTrustEligibility Eligibility { get; set; }
+    /// <summary>Use cacheReadPrice instead. AI Credits cost per billing batch of cached tokens.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+#if NET5_0_OR_GREATER
+    [Obsolete("This member is deprecated and will be removed in a future version.", DiagnosticId = "GHCP001")]
+#else
+    [Obsolete("This member is deprecated and will be removed in a future version.")]
+#endif
+    [JsonPropertyName("cachePrice")]
+    public double? CachePrice { get; set; }
 
-    /// <summary>Bounded source and observation time for this snapshot. This is distinct from evidence used by the authority to calculate trust.</summary>
-    [JsonPropertyName("provenance")]
-    public required CatalogTrustProvenance Provenance { get; set; }
+    /// <summary>AI Credits cost per billing batch of cached (read) tokens.</summary>
+    [JsonPropertyName("cacheReadPrice")]
+    public double? CacheReadPrice { get; set; }
 
-    /// <summary>Schema version of this runtime-owned snapshot envelope.</summary>
-    [JsonPropertyName("schemaVersion")]
-    public required CatalogTrustSnapshotSchemaVersion SchemaVersion { 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>Service-computed T1 or T2 trust tier.</summary>
-    [JsonPropertyName("tier")]
-    public required CatalogTrustTier Tier { get; set; }
-}
+    /// <summary>AI Credits cost per billing batch of cache-write (cache creation) tokens.</summary>
+    [JsonPropertyName("cacheWritePrice")]
+    public double? CacheWritePrice { get; set; }
 
-/// <summary>Discriminator: the authority omitted trust metadata.</summary>
-/// <remarks>The <c>absent</c> variant of <see cref="CatalogTrustSnapshot"/>.</remarks>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class CatalogTrustSnapshotAbsent : CatalogTrustSnapshot
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Status => "absent";
+    /// <summary>Use maxPromptTokens instead. Prompt token budget for the default tier. The total context window is this value plus the model's max_output_tokens.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+#if NET5_0_OR_GREATER
+    [Obsolete("This member is deprecated and will be removed in a future version.", DiagnosticId = "GHCP001")]
+#else
+    [Obsolete("This member is deprecated and will be removed in a future version.")]
+#endif
+    [JsonPropertyName("contextMax")]
+    public long? ContextMax { get; set; }
 
-    /// <summary>Service-computed exposure eligibility. `unknown` is required while Agent Finder returns no explicit eligibility field.</summary>
-    [JsonPropertyName("eligibility")]
-    public required CatalogTrustEligibility Eligibility { get; set; }
+    /// <summary>AI Credits cost per billing batch of input tokens.</summary>
+    [JsonPropertyName("inputPrice")]
+    public double? InputPrice { get; set; }
 
-    /// <summary>Bounded source and observation time for this snapshot. This is distinct from evidence used by the authority to calculate trust.</summary>
-    [JsonPropertyName("provenance")]
-    public required CatalogTrustProvenance Provenance { get; set; }
+    /// <summary>Long context tier pricing (available for models with extended context windows).</summary>
+    [JsonPropertyName("longContext")]
+    public ModelBillingTokenPricesLongContext? LongContext { get; set; }
 
-    /// <summary>Schema version of this runtime-owned snapshot envelope.</summary>
-    [JsonPropertyName("schemaVersion")]
-    public required CatalogTrustSnapshotSchemaVersion SchemaVersion { get; set; }
+    /// <summary>Prompt token budget for the default tier. The total context window is this value plus the model's max_output_tokens.</summary>
+    [JsonPropertyName("maxPromptTokens")]
+    public long? MaxPromptTokens { get; set; }
+
+    /// <summary>AI Credits cost per billing batch of output tokens.</summary>
+    [JsonPropertyName("outputPrice")]
+    public double? OutputPrice { get; set; }
 }
 
-/// <summary>Discriminator: the authority explicitly marked the assessment stale.</summary>
-/// <remarks>The <c>stale</c> variant of <see cref="CatalogTrustSnapshot"/>.</remarks>
+/// <summary>Billing information.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class CatalogTrustSnapshotStale : CatalogTrustSnapshot
+public sealed class ModelBilling
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Status => "stale";
+    /// <summary>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.</summary>
+    [JsonPropertyName("discountPercent")]
+    public int? DiscountPercent { get; set; }
 
-    /// <summary>Service-computed exposure eligibility. `unknown` is required while Agent Finder returns no explicit eligibility field.</summary>
-    [JsonPropertyName("eligibility")]
-    public required CatalogTrustEligibility Eligibility { get; set; }
+    /// <summary>Billing cost multiplier relative to the base rate.</summary>
+    [JsonPropertyName("multiplier")]
+    public double? Multiplier { get; set; }
 
-    /// <summary>Bounded source and observation time for this snapshot. This is distinct from evidence used by the authority to calculate trust.</summary>
-    [JsonPropertyName("provenance")]
-    public required CatalogTrustProvenance Provenance { get; set; }
+    /// <summary>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.</summary>
+    [JsonPropertyName("promo")]
+    public ModelBillingPromo? Promo { get; set; }
 
-    /// <summary>Schema version of this runtime-owned snapshot envelope.</summary>
-    [JsonPropertyName("schemaVersion")]
-    public required CatalogTrustSnapshotSchemaVersion SchemaVersion { get; set; }
+    /// <summary>Token-level pricing information for this model.</summary>
+    [JsonPropertyName("tokenPrices")]
+    public ModelBillingTokenPrices? TokenPrices { get; set; }
 }
 
-/// <summary>Discriminator: the authority explicitly reported a downgraded assessment.</summary>
-/// <remarks>The <c>downgraded</c> variant of <see cref="CatalogTrustSnapshot"/>.</remarks>
+/// <summary>Vision-specific limits.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class CatalogTrustSnapshotDowngraded : CatalogTrustSnapshot
+public sealed class ModelCapabilitiesLimitsVision
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Status => "downgraded";
-
-    /// <summary>Service-computed exposure eligibility. `unknown` is required while Agent Finder returns no explicit eligibility field.</summary>
-    [JsonPropertyName("eligibility")]
-    public required CatalogTrustEligibility Eligibility { get; set; }
+    /// <summary>Maximum image size in bytes.</summary>
+    [JsonPropertyName("max_prompt_image_size")]
+    public long MaxPromptImageSize { get; set; }
 
-    /// <summary>Bounded source and observation time for this snapshot. This is distinct from evidence used by the authority to calculate trust.</summary>
-    [JsonPropertyName("provenance")]
-    public required CatalogTrustProvenance Provenance { get; set; }
+    /// <summary>Maximum number of images per prompt.</summary>
+    [JsonPropertyName("max_prompt_images")]
+    public long MaxPromptImages { get; set; }
 
-    /// <summary>Schema version of this runtime-owned snapshot envelope.</summary>
-    [JsonPropertyName("schemaVersion")]
-    public required CatalogTrustSnapshotSchemaVersion SchemaVersion { get; set; }
+    /// <summary>MIME types the model accepts.</summary>
+    [JsonPropertyName("supported_media_types")]
+    public IList<string> SupportedMediaTypes { get => field ??= []; set; }
 }
 
-/// <summary>Discriminator: the authority explicitly revoked the assessment.</summary>
-/// <remarks>The <c>revoked</c> variant of <see cref="CatalogTrustSnapshot"/>.</remarks>
+/// <summary>Token limits for prompts, outputs, and context window.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class CatalogTrustSnapshotRevoked : CatalogTrustSnapshot
+public sealed class ModelCapabilitiesLimits
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Status => "revoked";
+    /// <summary>Maximum total context window size in tokens.</summary>
+    [JsonPropertyName("max_context_window_tokens")]
+    public long? MaxContextWindowTokens { get; set; }
 
-    /// <summary>Service-computed exposure eligibility. `unknown` is required while Agent Finder returns no explicit eligibility field.</summary>
-    [JsonPropertyName("eligibility")]
-    public required CatalogTrustEligibility Eligibility { get; set; }
+    /// <summary>Maximum number of output/completion tokens.</summary>
+    [JsonPropertyName("max_output_tokens")]
+    public long? MaxOutputTokens { get; set; }
 
-    /// <summary>Bounded source and observation time for this snapshot. This is distinct from evidence used by the authority to calculate trust.</summary>
-    [JsonPropertyName("provenance")]
-    public required CatalogTrustProvenance Provenance { get; set; }
+    /// <summary>Maximum number of prompt/input tokens.</summary>
+    [JsonPropertyName("max_prompt_tokens")]
+    public long? MaxPromptTokens { get; set; }
 
-    /// <summary>Schema version of this runtime-owned snapshot envelope.</summary>
-    [JsonPropertyName("schemaVersion")]
-    public required CatalogTrustSnapshotSchemaVersion SchemaVersion { get; set; }
+    /// <summary>Vision-specific limits.</summary>
+    [JsonPropertyName("vision")]
+    public ModelCapabilitiesLimitsVision? Vision { get; set; }
 }
 
-/// <summary>Discriminator: the authority supplied a bounded trust value this runtime does not understand.</summary>
-/// <remarks>The <c>unsupported</c> variant of <see cref="CatalogTrustSnapshot"/>.</remarks>
+/// <summary>Feature flags indicating what the model supports.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class CatalogTrustSnapshotUnsupported : CatalogTrustSnapshot
+public sealed class ModelCapabilitiesSupports
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Status => "unsupported";
+    /// <summary>Resolved Anthropic adaptive-thinking capability — unsupported / optional / required / adaptive_only. 'required' models reject thinking.type='enabled' with HTTP 400 but still accept 'disabled' (e.g. opus-4.7/4.8/5, sonnet-5); 'adaptive_only' models accept nothing but 'adaptive' (e.g. fable, mythos).</summary>
+    [JsonPropertyName("adaptive_thinking")]
+    public AdaptiveThinkingSupport? AdaptiveThinking { get; set; }
 
-    /// <summary>Service-computed exposure eligibility. `unknown` is required while Agent Finder returns no explicit eligibility field.</summary>
-    [JsonPropertyName("eligibility")]
-    public required CatalogTrustEligibility Eligibility { get; set; }
+    /// <summary>Whether this model supports reasoning effort configuration.</summary>
+    [JsonPropertyName("reasoningEffort")]
+    public bool? ReasoningEffort { get; set; }
 
-    /// <summary>Bounded source and observation time for this snapshot. This is distinct from evidence used by the authority to calculate trust.</summary>
-    [JsonPropertyName("provenance")]
-    public required CatalogTrustProvenance Provenance { get; set; }
+    /// <summary>Whether the model supports provider-native thinking. Independent of configurable reasoning effort; omission means unknown.</summary>
+    [JsonPropertyName("thinking")]
+    public bool? Thinking { get; set; }
 
-    /// <summary>Schema version of this runtime-owned snapshot envelope.</summary>
-    [JsonPropertyName("schemaVersion")]
-    public required CatalogTrustSnapshotSchemaVersion SchemaVersion { get; set; }
+    /// <summary>Whether this model supports canonical tool calling.</summary>
+    [JsonPropertyName("toolCalls")]
+    public bool? ToolCalls { get; set; }
+
+    /// <summary>Whether this model supports vision/image input.</summary>
+    [JsonPropertyName("vision")]
+    public bool? Vision { get; set; }
 }
 
-/// <summary>Discriminator: the trust field was empty, unbounded, or had the wrong JSON type.</summary>
-/// <remarks>The <c>malformed</c> variant of <see cref="CatalogTrustSnapshot"/>.</remarks>
+/// <summary>Model capabilities and limits.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class CatalogTrustSnapshotMalformed : CatalogTrustSnapshot
+public sealed class ModelCapabilities
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Status => "malformed";
+    /// <summary>Token limits for prompts, outputs, and context window.</summary>
+    [JsonPropertyName("limits")]
+    public ModelCapabilitiesLimits? Limits { get; set; }
 
-    /// <summary>Service-computed exposure eligibility. `unknown` is required while Agent Finder returns no explicit eligibility field.</summary>
-    [JsonPropertyName("eligibility")]
-    public required CatalogTrustEligibility Eligibility { get; set; }
+    /// <summary>Feature flags indicating what the model supports.</summary>
+    [JsonPropertyName("supports")]
+    public ModelCapabilitiesSupports? Supports { get; set; }
+}
 
-    /// <summary>Bounded source and observation time for this snapshot. This is distinct from evidence used by the authority to calculate trust.</summary>
-    [JsonPropertyName("provenance")]
-    public required CatalogTrustProvenance Provenance { get; set; }
+/// <summary>A service-published message about a model, carrying a stable machine-readable code alongside human-readable text.</summary>
+[Experimental(global::GitHub.Copilot.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>Schema version of this runtime-owned snapshot envelope.</summary>
-    [JsonPropertyName("schemaVersion")]
-    public required CatalogTrustSnapshotSchemaVersion SchemaVersion { get; set; }
+    /// <summary>Human-readable message text intended for display to the user.</summary>
+    [JsonPropertyName("message")]
+    public string Message { get; set; } = string.Empty;
 }
 
-/// <summary>Catalogue identity retained from a bound candidate or plan at installation time.</summary>
+/// <summary>Policy state (if applicable).</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class InstallationCatalogueIdentity
+public sealed class ModelPolicy
 {
-    /// <summary>Catalogue description retained at install planning time.</summary>
-    [JsonPropertyName("description")]
-    public string? Description { get; set; }
+    /// <summary>Current policy state for this model.</summary>
+    [JsonPropertyName("state")]
+    public ModelPolicyState State { get; set; }
 
-    /// <summary>Human display name retained from the catalogue candidate.</summary>
-    [JsonPropertyName("displayName")]
-    public string DisplayName { get; set; } = string.Empty;
+    /// <summary>Usage terms or conditions for this model.</summary>
+    [JsonPropertyName("terms")]
+    public string? Terms { get; set; }
+}
 
-    /// <summary>Catalogue item URL when supplied by the authority.</summary>
-    [JsonPropertyName("itemUrl")]
-    public string? ItemUrl { get; set; }
+/// <summary>Service-published warning text that hosts should display when presenting a model.</summary>
+[Experimental(global::GitHub.Copilot.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>Catalogue publisher retained at install planning time.</summary>
-    [JsonPropertyName("publisher")]
-    public string? Publisher { get; set; }
+/// <summary>Copilot model metadata, including identifier, display name, capabilities, policy, billing, reasoning efforts, and picker categories.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class Model
+{
+    /// <summary>Billing information.</summary>
+    [JsonPropertyName("billing")]
+    public ModelBilling? Billing { get; set; }
 
-    /// <summary>Authority resource identifier when supplied by the catalogue.</summary>
-    [JsonPropertyName("resourceId")]
-    public string? ResourceId { get; set; }
+    /// <summary>Model capabilities and limits.</summary>
+    [JsonPropertyName("capabilities")]
+    public ModelCapabilities Capabilities { get => field ??= new(); set; }
 
-    /// <summary>Catalogue authority/source string that supplied the candidate.</summary>
-    [JsonPropertyName("source")]
-    public string Source { get; set; } = string.Empty;
+    /// <summary>Default reasoning effort level (only present if model supports reasoning effort).</summary>
+    [JsonPropertyName("defaultReasoningEffort")]
+    public string? DefaultReasoningEffort { get; set; }
 
-    /// <summary>Catalogue trust observation retained at install planning time.</summary>
-    [JsonPropertyName("trustAtInstall")]
-    public CatalogTrustSnapshot? TrustAtInstall { get; set; }
+    /// <summary>Model identifier (e.g., "claude-sonnet-4.5").</summary>
+    [JsonPropertyName("id")]
+    public string Id { get; set; } = string.Empty;
 
-    /// <summary>Catalogue version retained at install planning time.</summary>
-    [JsonPropertyName("version")]
-    public string? Version { get; set; }
-}
+    /// <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>Durable configuration ownership is distinct from session-specific usability.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpInstallationSummary
-{
-    /// <summary>Catalogue identity retained from the installed plan when available.</summary>
-    [JsonPropertyName("catalogue")]
-    public InstallationCatalogueIdentity? Catalogue { get; set; }
+    /// <summary>Provider-supplied model metadata. Keys and JSON-compatible values are preserved unchanged. This is factual metadata published by the model provider; it carries no picker or UX semantics.</summary>
+    [JsonPropertyName("metadata")]
+    public IDictionary<string, JsonElement>? Metadata { get; set; }
 
-    /// <summary>Exact alternative retained in the installing receipt.</summary>
-    [JsonPropertyName("choiceId")]
-    public string ChoiceId { get; set; } = string.Empty;
+    /// <summary>Model capability category for grouping in the model picker.</summary>
+    [JsonPropertyName("modelPickerCategory")]
+    public ModelPickerCategory? ModelPickerCategory { get; set; }
 
-    /// <summary>Identity retained from the validated original plan.</summary>
-    [JsonPropertyName("identity")]
-    public McpPlanResourceIdentity Identity { get => field ??= new(); set; }
+    /// <summary>Relative cost tier for token-based billing users.</summary>
+    [JsonPropertyName("modelPickerPriceCategory")]
+    public ModelPickerPriceCategory? ModelPickerPriceCategory { get; set; }
 
-    /// <summary>Exact durable installation receipt identity.</summary>
-    [JsonPropertyName("installationId")]
-    public string InstallationId { get; set; } = string.Empty;
+    /// <summary>Display name.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
 
-    /// <summary>ISO 8601 wall-clock installation time when available.</summary>
-    [JsonPropertyName("installedAt")]
-    public string? InstalledAt { get; set; }
+    /// <summary>Policy state (if applicable).</summary>
+    [JsonPropertyName("policy")]
+    public ModelPolicy? Policy { get; set; }
 
-    /// <summary>Original installing operation, not a fresh management operation.</summary>
-    [JsonPropertyName("operationId")]
-    public string OperationId { get; set; } = string.Empty;
+    /// <summary>The model provider that produced this model, as a neutral reference (opaque id, human-readable label, and provider kind). Present on models returned by `session.model.list`, which resolves provider attribution from the session's account roster; absent on the flat `server.models.list`, which does not resolve a session roster. The model picker groups by this reference.</summary>
+    [JsonPropertyName("provider")]
+    public ModelProviderRef? Provider { get; set; }
 
-    /// <summary>Ownership or setup state, never inferred proof of tool usability.</summary>
-    [JsonPropertyName("state")]
-    public McpInstallationState State { 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>Model vendor as the Copilot API reports it, for example "Anthropic" or "Azure OpenAI". Open vocabulary, passed through unchanged. It can name the vendor that serves the model instead of the one that built it, or a label that is not a vendor, such as "Experimental". Absent when the Copilot API reports no vendor.</summary>
+    [JsonPropertyName("vendor")]
+    public string? Vendor { 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>The <c>listed</c> variant of <see cref="McpInstallationManagementOutcome"/>.</summary>
+/// <summary>List of Copilot models available to the resolved user, including capabilities and billing metadata.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class McpInstallationManagementOutcomeListed : McpInstallationManagementOutcome
+public sealed class ModelList
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "listed";
-
-    /// <summary>Owned receipts visible to the selected account and host.</summary>
-    [JsonPropertyName("installations")]
-    public required IList<McpInstallationSummary> Installations { get; set; }
+    /// <summary>List of available models with full metadata.</summary>
+    [JsonPropertyName("models")]
+    public IList<Model> Models { get => field ??= []; set; }
 }
 
-/// <summary>The <c>recovered</c> variant of <see cref="McpInstallationManagementOutcome"/>.</summary>
+/// <summary>RPC data type for ModelsList operations.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class McpInstallationManagementOutcomeRecovered : McpInstallationManagementOutcome
+internal sealed class ModelsListRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "recovered";
+    /// <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>Freshly inspected receipts after successful durable reconciliation.</summary>
-    [JsonPropertyName("installations")]
-    public required IList<McpInstallationSummary> Installations { 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>Exact inert removal plan. No configuration or credentials have changed.</summary>
+/// <summary>A well-known model in the runtime's built-in catalog.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpUninstallPlan
+public sealed class BuiltInModelCatalogEntry
 {
-    /// <summary>Original wall-clock expiry in milliseconds. Applying never renews it.</summary>
-    [JsonPropertyName("expiresAtEpochMs")]
-    public long ExpiresAtEpochMs { get; set; }
+    /// <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;
+}
 
-    /// <summary>Original owned receipt being removed.</summary>
-    [JsonPropertyName("installation")]
-    public McpInstallationSummary Installation { get => field ??= new(); set; }
+/// <summary>The running runtime's complete catalog of well-known built-in model IDs, including supported models and additional IDs with built-in metadata.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class BuiltInModelCatalog
+{
+    /// <summary>Built-in model entries.</summary>
+    [JsonPropertyName("models")]
+    public IList<BuiltInModelCatalogEntry> Models { get => field ??= []; set; }
+}
 
-    /// <summary>The original operation, inspectable and cancellable on this same connection.</summary>
-    [JsonPropertyName("operationId")]
-    public string OperationId { get; set; } = string.Empty;
+/// <summary>Built-in tool metadata with identifier, optional namespaced name, description, input-parameter schema, and usage instructions.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class Tool
+{
+    /// <summary>Description of what the tool does.</summary>
+    [JsonPropertyName("description")]
+    public string Description { get; set; } = string.Empty;
 
-    /// <summary>Exact configured input slots owned by this installation, never shared OAuth tokens.</summary>
-    [JsonPropertyName("ownedSecretCount")]
-    public long OwnedSecretCount { get; set; }
+    /// <summary>Optional instructions for how to use this tool effectively.</summary>
+    [JsonPropertyName("instructions")]
+    public string? Instructions { get; set; }
 
-    /// <summary>One-use original connection and authority-bound plan handle.</summary>
-    [JsonPropertyName("planHandle")]
-    public string PlanHandle { get; set; } = string.Empty;
+    /// <summary>Tool identifier (e.g., "bash", "grep", "str_replace_editor").</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
 
-    /// <summary>Shared authentication is deliberately retained; revocation is a separate action.</summary>
-    [JsonPropertyName("preservesSharedAuthentication")]
-    public bool PreservesSharedAuthentication { get; set; }
+    /// <summary>Optional namespaced name for declarative filtering (e.g., "playwright/navigate" for MCP tools).</summary>
+    [JsonPropertyName("namespacedName")]
+    public string? NamespacedName { get; set; }
 
-    /// <summary>Whether removal restores a protected earlier configuration.</summary>
-    [JsonPropertyName("restoresPreviousConfiguration")]
-    public bool RestoresPreviousConfiguration { get; set; }
+    /// <summary>JSON Schema for the tool's input parameters.</summary>
+    [JsonPropertyName("parameters")]
+    public IDictionary<string, JsonElement>? Parameters { get; set; }
+
+    /// <summary>Telemetry-safety policy for the tool name and input names, not input values. Treat omitted metadata as unsafe.</summary>
+    [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+    [JsonPropertyName("safeForTelemetry")]
+    public JsonElement? SafeForTelemetry { get; set; }
 }
 
-/// <summary>The <c>uninstall-planned</c> variant of <see cref="McpInstallationManagementOutcome"/>.</summary>
+/// <summary>Built-in tools available for the requested model, with their parameters and instructions.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class McpInstallationManagementOutcomeUninstallPlanned : McpInstallationManagementOutcome
+public sealed class ToolList
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "uninstall-planned";
-
-    /// <summary>Original owned removal plan and operation.</summary>
-    [JsonPropertyName("plan")]
-    public required McpUninstallPlan Plan { get; set; }
+    /// <summary>List of available built-in tools with metadata.</summary>
+    [JsonPropertyName("tools")]
+    public IList<Tool> Tools { get => field ??= []; set; }
 }
 
-/// <summary>Status snapshot from the original connection, independent of new-work account availability.</summary>
-/// <remarks>Polymorphic base type discriminated by <c>phase</c>.</remarks>
+/// <summary>Optional model identifier whose tool overrides should be applied to the listing.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-[JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "phase",
-    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(McpInstallationOperationStatusPreparing), "preparing")]
-[JsonDerivedType(typeof(McpInstallationOperationStatusPrepared), "prepared")]
-[JsonDerivedType(typeof(McpInstallationOperationStatusAwaitingConfirmation), "awaiting-confirmation")]
-[JsonDerivedType(typeof(McpInstallationOperationStatusRevalidating), "revalidating")]
-[JsonDerivedType(typeof(McpInstallationOperationStatusApplying), "applying")]
-[JsonDerivedType(typeof(McpInstallationOperationStatusCompleted), "completed")]
-public partial class McpInstallationOperationStatus
+internal sealed class ToolsListRequest
 {
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("phase")]
-    public virtual string Phase { get; set; } = string.Empty;
+    /// <summary>Optional model ID — when provided, the returned tool list reflects model-specific overrides.</summary>
+    [JsonPropertyName("model")]
+    public string? Model { get; set; }
 }
 
-
-/// <summary>The <c>preparing</c> variant of <see cref="McpInstallationOperationStatus"/>.</summary>
+/// <summary>Quota usage snapshot for a Copilot quota type, including entitlement, used requests, overage, reset date, and remaining percentage.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class McpInstallationOperationStatusPreparing : McpInstallationOperationStatus
+public sealed class AccountQuotaSnapshot
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Phase => "preparing";
-
-    /// <summary>Whether cancellation has been requested, not proof that a write was undone.</summary>
-    [JsonPropertyName("cancellationRequested")]
-    public required bool CancellationRequested { get; set; }
+    /// <summary>Number of requests included in the entitlement, or -1 for unlimited entitlements.</summary>
+    [JsonPropertyName("entitlementRequests")]
+    public long EntitlementRequests { get; set; }
 
-    /// <summary>Original runtime-issued operation identity.</summary>
-    [JsonPropertyName("operationId")]
-    public required string OperationId { get; set; }
-}
+    /// <summary>Whether the user has an unlimited usage entitlement.</summary>
+    [JsonPropertyName("isUnlimitedEntitlement")]
+    public bool IsUnlimitedEntitlement { get; set; }
 
-/// <summary>The <c>prepared</c> variant of <see cref="McpInstallationOperationStatus"/>.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class McpInstallationOperationStatusPrepared : McpInstallationOperationStatus
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Phase => "prepared";
+    /// <summary>Number of additional usage requests made this period.</summary>
+    [JsonPropertyName("overage")]
+    public double Overage { get; set; }
 
-    /// <summary>Whether the inert prepared operation was asked to cancel.</summary>
-    [JsonPropertyName("cancellationRequested")]
-    public required bool CancellationRequested { get; set; }
+    /// <summary>Whether additional usage is allowed when quota is exhausted.</summary>
+    [JsonPropertyName("overageAllowedWithExhaustedQuota")]
+    public bool OverageAllowedWithExhaustedQuota { get; set; }
 
-    /// <summary>Original runtime-issued operation identity.</summary>
-    [JsonPropertyName("operationId")]
-    public required string OperationId { get; set; }
-}
+    /// <summary>Percentage of entitlement remaining.</summary>
+    [JsonPropertyName("remainingPercentage")]
+    public double RemainingPercentage { get; set; }
 
-/// <summary>The <c>awaiting-confirmation</c> variant of <see cref="McpInstallationOperationStatus"/>.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class McpInstallationOperationStatusAwaitingConfirmation : McpInstallationOperationStatus
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Phase => "awaiting-confirmation";
+    /// <summary>Date when the quota resets (ISO 8601 string).</summary>
+    [JsonPropertyName("resetDate")]
+    public DateTimeOffset? ResetDate { get; set; }
 
-    /// <summary>Whether the pending human callback was asked to cancel.</summary>
-    [JsonPropertyName("cancellationRequested")]
-    public required bool CancellationRequested { get; set; }
+    /// <summary>Whether usage is still permitted after quota exhaustion.</summary>
+    [JsonPropertyName("usageAllowedWithExhaustedQuota")]
+    public bool UsageAllowedWithExhaustedQuota { get; set; }
 
-    /// <summary>Original runtime-issued operation identity.</summary>
-    [JsonPropertyName("operationId")]
-    public required string OperationId { get; set; }
+    /// <summary>Number of requests used so far this period.</summary>
+    [JsonPropertyName("usedRequests")]
+    public long UsedRequests { get; set; }
 }
 
-/// <summary>The <c>revalidating</c> variant of <see cref="McpInstallationOperationStatus"/>.</summary>
+/// <summary>Quota usage snapshots for the resolved user, keyed by quota type.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class McpInstallationOperationStatusRevalidating : McpInstallationOperationStatus
+public sealed class AccountGetQuotaResult
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Phase => "revalidating";
-
-    /// <summary>Whether source or authority revalidation was asked to cancel.</summary>
-    [JsonPropertyName("cancellationRequested")]
-    public required bool CancellationRequested { get; set; }
-
-    /// <summary>Original runtime-issued operation identity.</summary>
-    [JsonPropertyName("operationId")]
-    public required string OperationId { get; set; }
+    /// <summary>Quota snapshots keyed by type (e.g., chat, completions, premium_interactions).</summary>
+    [JsonPropertyName("quotaSnapshots")]
+    public IDictionary<string, AccountQuotaSnapshot> QuotaSnapshots { get => field ??= new Dictionary<string, AccountQuotaSnapshot>(); set; }
 }
 
-/// <summary>The <c>applying</c> variant of <see cref="McpInstallationOperationStatus"/>.</summary>
+/// <summary>RPC data type for AccountGetQuota operations.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class McpInstallationOperationStatusApplying : McpInstallationOperationStatus
+internal sealed class AccountGetQuotaRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Phase => "applying";
-
-    /// <summary>Whether applying was asked to cancel; already-started effects retain their lease.</summary>
-    [JsonPropertyName("cancellationRequested")]
-    public required bool CancellationRequested { get; set; }
+    /// <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>Original runtime-issued operation identity.</summary>
-    [JsonPropertyName("operationId")]
-    public required string OperationId { 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>Terminal mutation result. Uncertainty is not approval, rollback or permission to replay.</summary>
-/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "kind",
+    TypeDiscriminatorPropertyName = "type",
     UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(McpInstallationOutcomeInstalled), "installed")]
-[JsonDerivedType(typeof(McpInstallationOutcomeUninstalled), "uninstalled")]
-[JsonDerivedType(typeof(McpInstallationOutcomeRolledBack), "rolled-back")]
-[JsonDerivedType(typeof(McpInstallationOutcomeRecoveryRequired), "recovery-required")]
-[JsonDerivedType(typeof(McpInstallationOutcomeDeclined), "declined")]
-[JsonDerivedType(typeof(McpInstallationOutcomeCancelled), "cancelled")]
-[JsonDerivedType(typeof(McpInstallationOutcomeRefused), "refused")]
-public partial class McpInstallationOutcome
+[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(AuthInfoAccount), "account")]
+[JsonDerivedType(typeof(AuthInfoGhCli), "gh-cli")]
+[JsonDerivedType(typeof(AuthInfoApiKey), "api-key")]
+public partial class AuthInfo
 {
     /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("kind")]
-    public virtual string Kind { get; set; } = string.Empty;
+    [JsonPropertyName("type")]
+    public virtual string Type { get; set; } = string.Empty;
 }
 
 
-/// <summary>The <c>installed</c> variant of <see cref="McpInstallationOutcome"/>.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class McpInstallationOutcomeInstalled : McpInstallationOutcome
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "installed";
-
-    /// <summary>Durable installation succeeded but final transaction cleanup remains.</summary>
-    [JsonPropertyName("cleanupPending")]
-    public required bool CleanupPending { get; set; }
-
-    /// <summary>Receipt identity produced by the confirmed transaction.</summary>
-    [JsonPropertyName("installation")]
-    public required McpInstallationSummary Installation { get; set; }
-}
-
-/// <summary>The <c>uninstalled</c> variant of <see cref="McpInstallationOutcome"/>.</summary>
+/// <summary>Endpoint URLs from the raw Copilot `/copilot_internal/v2/token` user-response passthrough.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class McpInstallationOutcomeUninstalled : McpInstallationOutcome
+public sealed class CopilotUserResponseEndpoints
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "uninstalled";
-
-    /// <summary>Durable removal succeeded but final cleanup remains.</summary>
-    [JsonPropertyName("cleanupPending")]
-    public required bool CleanupPending { get; set; }
+    /// <summary>Copilot API endpoint URL.</summary>
+    [JsonPropertyName("api")]
+    public string? Api { get; set; }
 
-    /// <summary>Exact removed receipt identity.</summary>
-    [JsonPropertyName("installationId")]
-    public required string InstallationId { get; set; }
+    /// <summary>Experimental-service endpoint URL.</summary>
+    [JsonPropertyName("exp")]
+    public string? Exp { get; set; }
 
-    /// <summary>Original removal operation.</summary>
-    [JsonPropertyName("operationId")]
-    public required string OperationId { get; set; }
+    /// <summary>Origin-tracker endpoint URL.</summary>
+    [JsonPropertyName("origin-tracker")]
+    public string? OriginTracker { get; set; }
 
-    /// <summary>Any grants in the incumbent shared OAuth store remain unowned and retained.</summary>
-    [JsonPropertyName("preservedSharedAuthentication")]
-    public required bool PreservedSharedAuthentication { get; set; }
+    /// <summary>Copilot proxy endpoint URL.</summary>
+    [JsonPropertyName("proxy")]
+    public string? Proxy { get; set; }
 
-    /// <summary>Exact owned input slots removed, excluding shared OAuth credentials.</summary>
-    [JsonPropertyName("removedOwnedSecrets")]
-    public required long RemovedOwnedSecrets { get; set; }
+    /// <summary>Copilot telemetry endpoint URL.</summary>
+    [JsonPropertyName("telemetry")]
+    public string? Telemetry { get; set; }
+}
 
-    /// <summary>Whether protected pre-install configuration was restored.</summary>
-    [JsonPropertyName("restoredPreviousConfiguration")]
-    public required bool RestoredPreviousConfiguration { get; set; }
+/// <summary>RPC data type for CopilotUserResponseEnterpriseListItem operations.</summary>
+public sealed class CopilotUserResponseEnterpriseListItem
+{
+    /// <summary>JavaScript-safe numeric database ID of the enterprise.</summary>
+    [JsonPropertyName("id")]
+    public long? Id { get; set; }
 }
 
-/// <summary>The durable transaction was aborted or fully compensated.</summary>
-/// <remarks>The <c>rolled-back</c> variant of <see cref="McpInstallationOutcome"/>.</remarks>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class McpInstallationOutcomeRolledBack : McpInstallationOutcome
+/// <summary>RPC data type for CopilotUserResponseOrganizationListItem operations.</summary>
+public sealed class CopilotUserResponseOrganizationListItem
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "rolled-back";
+    /// <summary>Numeric database ID of the organization.</summary>
+    [JsonPropertyName("id")]
+    public double? Id { get; set; }
 
-    /// <summary>Original connection-owned operation.</summary>
-    [JsonPropertyName("operationId")]
-    public required string OperationId { get; set; }
+    /// <summary>GitHub login of the organization.</summary>
+    [JsonPropertyName("login")]
+    public string? Login { get; set; }
 
-    /// <summary>Cause of the fully aborted or compensated operation.</summary>
-    [JsonPropertyName("reason")]
-    public required McpInstallationFailureReason Reason { get; set; }
+    /// <summary>Display name of the organization.</summary>
+    [JsonPropertyName("name")]
+    public string? Name { get; set; }
 }
 
-/// <summary>A write may have completed. Recover and inspect durable state before retrying.</summary>
-/// <remarks>The <c>recovery-required</c> variant of <see cref="McpInstallationOutcome"/>.</remarks>
+/// <summary>Chat quota snapshot from the raw Copilot user-response passthrough, with entitlement, overage, remaining quota, reset, and billing fields.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class McpInstallationOutcomeRecoveryRequired : McpInstallationOutcome
+public sealed class CopilotUserResponseQuotaSnapshotsChat
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "recovery-required";
+    /// <summary>Number of requests/units included in the entitlement for this period; `-1` denotes an unlimited entitlement.</summary>
+    [JsonPropertyName("entitlement")]
+    public double? Entitlement { get; set; }
 
-    /// <summary>Operation whose durable result must be recovered and inspected.</summary>
-    [JsonPropertyName("operationId")]
-    public required string OperationId { get; set; }
-}
+    /// <summary>Whether the user currently has quota available; when `false` and not unlimited, further requests are blocked until the quota resets.</summary>
+    [JsonPropertyName("has_quota")]
+    public bool? HasQuota { get; set; }
 
-/// <summary>The <c>declined</c> variant of <see cref="McpInstallationOutcome"/>.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class McpInstallationOutcomeDeclined : McpInstallationOutcome
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "declined";
+    /// <summary>Count of additional pay-per-request usage consumed this period beyond the entitlement.</summary>
+    [JsonPropertyName("overage_count")]
+    public double? OverageCount { get; set; }
 
-    /// <summary>Original operation explicitly declined by the user.</summary>
-    [JsonPropertyName("operationId")]
-    public required string OperationId { get; set; }
-}
+    /// <summary>Whether usage may continue at pay-per-request rates once the entitlement is exhausted.</summary>
+    [JsonPropertyName("overage_permitted")]
+    public bool? OveragePermitted { get; set; }
 
-/// <summary>The <c>cancelled</c> variant of <see cref="McpInstallationOutcome"/>.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class McpInstallationOutcomeCancelled : McpInstallationOutcome
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "cancelled";
+    /// <summary>Percentage of the entitlement remaining at the snapshot timestamp.</summary>
+    [JsonPropertyName("percent_remaining")]
+    public double? PercentRemaining { get; set; }
 
-    /// <summary>Original operation cancelled before a terminal application result.</summary>
-    [JsonPropertyName("operationId")]
-    public required string OperationId { get; set; }
-}
+    /// <summary>Identifier of the quota bucket this snapshot describes.</summary>
+    [JsonPropertyName("quota_id")]
+    public string? QuotaId { get; set; }
 
-/// <summary>The <c>refused</c> variant of <see cref="McpInstallationOutcome"/>.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class McpInstallationOutcomeRefused : McpInstallationOutcome
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "refused";
+    /// <summary>Amount of quota remaining at the snapshot timestamp.</summary>
+    [JsonPropertyName("quota_remaining")]
+    public double? QuotaRemaining { get; set; }
 
-    /// <summary>Present once an operation has been allocated; never a plan handle.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("operationId")]
-    public string? OperationId { get; set; }
+    /// <summary>Unix epoch time, in seconds, when this quota next resets.</summary>
+    [JsonPropertyName("quota_reset_at")]
+    public double? QuotaResetAt { get; set; }
 
-    /// <summary>Specific bounded refusal, never a success-shaped fallback.</summary>
-    [JsonPropertyName("reason")]
-    public required McpInstallationFailureReason Reason { get; set; }
+    /// <summary>Remaining entitlement/quota amount at the snapshot timestamp.</summary>
+    [JsonPropertyName("remaining")]
+    public double? Remaining { get; set; }
+
+    /// <summary>UTC timestamp when this snapshot was captured.</summary>
+    [JsonPropertyName("timestamp_utc")]
+    public string? TimestampUtc { get; set; }
+
+    /// <summary>Whether this category uses usage-based (token/AI-credit) billing rather than a fixed premium-request count.</summary>
+    [JsonPropertyName("token_based_billing")]
+    public bool? TokenBasedBilling { get; set; }
+
+    /// <summary>Whether the entitlement for this category is unlimited.</summary>
+    [JsonPropertyName("unlimited")]
+    public bool? Unlimited { get; set; }
 }
 
-/// <summary>The <c>completed</c> variant of <see cref="McpInstallationOperationStatus"/>.</summary>
+/// <summary>Completions quota snapshot from the raw Copilot user-response passthrough, with entitlement, overage, remaining quota, reset, and billing fields.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class McpInstallationOperationStatusCompleted : McpInstallationOperationStatus
+public sealed class CopilotUserResponseQuotaSnapshotsCompletions
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Phase => "completed";
+    /// <summary>Number of requests/units included in the entitlement for this period; `-1` denotes an unlimited entitlement.</summary>
+    [JsonPropertyName("entitlement")]
+    public double? Entitlement { get; set; }
 
-    /// <summary>Whether cancellation was requested before the terminal result.</summary>
-    [JsonPropertyName("cancellationRequested")]
-    public required bool CancellationRequested { get; set; }
+    /// <summary>Whether the user currently has quota available; when `false` and not unlimited, further requests are blocked until the quota resets.</summary>
+    [JsonPropertyName("has_quota")]
+    public bool? HasQuota { get; set; }
 
-    /// <summary>Original runtime-issued operation identity.</summary>
-    [JsonPropertyName("operationId")]
-    public required string OperationId { get; set; }
+    /// <summary>Count of additional pay-per-request usage consumed this period beyond the entitlement.</summary>
+    [JsonPropertyName("overage_count")]
+    public double? OverageCount { get; set; }
 
-    /// <summary>Immutable terminal receipt.</summary>
-    [JsonPropertyName("outcome")]
-    public required McpInstallationOutcome Outcome { get; set; }
-}
+    /// <summary>Whether usage may continue at pay-per-request rates once the entitlement is exhausted.</summary>
+    [JsonPropertyName("overage_permitted")]
+    public bool? OveragePermitted { get; set; }
 
-/// <summary>The <c>operation</c> variant of <see cref="McpInstallationManagementOutcome"/>.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class McpInstallationManagementOutcomeOperation : McpInstallationManagementOutcome
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "operation";
+    /// <summary>Percentage of the entitlement remaining at the snapshot timestamp.</summary>
+    [JsonPropertyName("percent_remaining")]
+    public double? PercentRemaining { get; set; }
 
-    /// <summary>Original-connection operation snapshot.</summary>
-    [JsonPropertyName("operation")]
-    public required McpInstallationOperationStatus Operation { get; set; }
-}
+    /// <summary>Identifier of the quota bucket this snapshot describes.</summary>
+    [JsonPropertyName("quota_id")]
+    public string? QuotaId { get; set; }
 
-/// <summary>The <c>refused</c> variant of <see cref="McpInstallationManagementOutcome"/>.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class McpInstallationManagementOutcomeRefused : McpInstallationManagementOutcome
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "refused";
+    /// <summary>Amount of quota remaining at the snapshot timestamp.</summary>
+    [JsonPropertyName("quota_remaining")]
+    public double? QuotaRemaining { get; set; }
 
-    /// <summary>Specific bounded refusal.</summary>
-    [JsonPropertyName("reason")]
-    public required McpInstallationFailureReason Reason { get; set; }
-}
+    /// <summary>Unix epoch time, in seconds, when this quota next resets.</summary>
+    [JsonPropertyName("quota_reset_at")]
+    public double? QuotaResetAt { get; set; }
 
-/// <summary>The <c>outcome</c> variant of <see cref="McpInstallationManagementResult"/>.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class McpInstallationManagementResultOutcome : McpInstallationManagementResult
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "outcome";
+    /// <summary>Remaining entitlement/quota amount at the snapshot timestamp.</summary>
+    [JsonPropertyName("remaining")]
+    public double? Remaining { get; set; }
 
-    /// <summary>Capabilities actually honoured for this request.</summary>
-    [JsonPropertyName("negotiated")]
-    public required CatalogNegotiatedContract Negotiated { get; set; }
+    /// <summary>UTC timestamp when this snapshot was captured.</summary>
+    [JsonPropertyName("timestamp_utc")]
+    public string? TimestampUtc { get; set; }
 
-    /// <summary>Observed management outcome.</summary>
-    [JsonPropertyName("outcome")]
-    public required McpInstallationManagementOutcome Outcome { get; set; }
+    /// <summary>Whether this category uses usage-based (token/AI-credit) billing rather than a fixed premium-request count.</summary>
+    [JsonPropertyName("token_based_billing")]
+    public bool? TokenBasedBilling { get; set; }
+
+    /// <summary>Whether the entitlement for this category is unlimited.</summary>
+    [JsonPropertyName("unlimited")]
+    public bool? Unlimited { get; set; }
 }
 
-/// <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="McpInstallationManagementResult"/>.</remarks>
+/// <summary>Premium-interactions quota snapshot from the raw Copilot user-response passthrough, with entitlement, overage, remaining quota, reset, and billing fields.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class McpInstallationManagementResultNegotiationRefused : McpInstallationManagementResult
+public sealed class CopilotUserResponseQuotaSnapshotsPremiumInteractions
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "negotiation-refused";
+    /// <summary>Number of requests/units included in the entitlement for this period; `-1` denotes an unlimited entitlement.</summary>
+    [JsonPropertyName("entitlement")]
+    public double? Entitlement { 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>Whether the user currently has quota available; when `false` and not unlimited, further requests are blocked until the quota resets.</summary>
+    [JsonPropertyName("has_quota")]
+    public bool? HasQuota { get; set; }
 
-    /// <summary>Lowest caller protocol version this runtime will serve.</summary>
-    [JsonPropertyName("minimumSupportedProtocolVersion")]
-    public required long MinimumSupportedProtocolVersion { get; set; }
+    /// <summary>Count of additional pay-per-request usage consumed this period beyond the entitlement.</summary>
+    [JsonPropertyName("overage_count")]
+    public double? OverageCount { get; set; }
 
-    /// <summary>Whether the version or the capability set was the problem.</summary>
-    [JsonPropertyName("reason")]
-    public required CatalogNegotiationRefusedReason Reason { get; set; }
+    /// <summary>Whether usage may continue at pay-per-request rates once the entitlement is exhausted.</summary>
+    [JsonPropertyName("overage_permitted")]
+    public bool? OveragePermitted { get; set; }
 
-    /// <summary>Protocol version of the runtime that refused the request.</summary>
-    [JsonPropertyName("runtimeProtocolVersion")]
-    public required long RuntimeProtocolVersion { get; set; }
+    /// <summary>Percentage of the entitlement remaining at the snapshot timestamp.</summary>
+    [JsonPropertyName("percent_remaining")]
+    public double? PercentRemaining { get; set; }
 
-    /// <summary>Capabilities this runtime can safely advertise to this caller. The complete five-capability protocol-3 legacy set is always present; every capability added after that baseline appears only when the caller required it, so an older closed-enum decoder can still consume a refusal. This list does not imply that every deployment has enabled every operation.</summary>
-    [JsonPropertyName("supportedCapabilities")]
-    public required IList<string> SupportedCapabilities { get; set; }
+    /// <summary>Identifier of the quota bucket this snapshot describes.</summary>
+    [JsonPropertyName("quota_id")]
+    public string? QuotaId { 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>Amount of quota remaining at the snapshot timestamp.</summary>
+    [JsonPropertyName("quota_remaining")]
+    public double? QuotaRemaining { get; set; }
 
-/// <summary>The request was rejected because a bounded field fell outside its permitted range or a required field was unusable. Pagination may also be rejected by the authority after a continuation request; repeat the search without page.</summary>
-/// <remarks>The <c>invalid-request</c> variant of <see cref="McpInstallationManagementResult"/>.</remarks>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class McpInstallationManagementResultInvalidRequest : McpInstallationManagementResult
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "invalid-request";
+    /// <summary>Unix epoch time, in seconds, when this quota next resets.</summary>
+    [JsonPropertyName("quota_reset_at")]
+    public double? QuotaResetAt { get; set; }
 
-    /// <summary>Which request field was rejected.</summary>
-    [JsonPropertyName("field")]
-    public required CatalogInvalidRequestField Field { get; set; }
+    /// <summary>Remaining entitlement/quota amount at the snapshot timestamp.</summary>
+    [JsonPropertyName("remaining")]
+    public double? Remaining { 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>UTC timestamp when this snapshot was captured.</summary>
+    [JsonPropertyName("timestamp_utc")]
+    public string? TimestampUtc { get; set; }
+
+    /// <summary>Whether this category uses usage-based (token/AI-credit) billing rather than a fixed premium-request count.</summary>
+    [JsonPropertyName("token_based_billing")]
+    public bool? TokenBasedBilling { get; set; }
+
+    /// <summary>Whether the entitlement for this category is unlimited.</summary>
+    [JsonPropertyName("unlimited")]
+    public bool? Unlimited { get; set; }
 }
 
-/// <summary>One Registry string-valued configuration entry for the selected transport.</summary>
+/// <summary>Quota snapshot map from the raw Copilot user-response passthrough, with chat, completions, premium-interactions, and other entries.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpInstallationInput
+public sealed class CopilotUserResponseQuotaSnapshots
 {
-    /// <summary>Exact category declared by the selected choice.</summary>
-    [JsonPropertyName("category")]
-    public McpPlanValueCategory Category { get; set; }
+    /// <summary>Chat quota snapshot from the raw Copilot user-response passthrough, with entitlement, overage, remaining quota, reset, and billing fields.</summary>
+    [JsonPropertyName("chat")]
+    public CopilotUserResponseQuotaSnapshotsChat? Chat { get; set; }
 
-    /// <summary>Exact key declared by the selected choice.</summary>
-    [JsonPropertyName("key")]
-    public string Key { get; set; } = string.Empty;
+    /// <summary>Completions quota snapshot from the raw Copilot user-response passthrough, with entitlement, overage, remaining quota, reset, and billing fields.</summary>
+    [JsonPropertyName("completions")]
+    public CopilotUserResponseQuotaSnapshotsCompletions? Completions { get; set; }
 
-    /// <summary>Explicit non-secret value. Secret placeholders use a separate input channel.</summary>
-    [JsonPropertyName("value")]
-    public string Value { get; set; } = string.Empty;
+    /// <summary>Premium-interactions quota snapshot from the raw Copilot user-response passthrough, with entitlement, overage, remaining quota, reset, and billing fields.</summary>
+    [JsonPropertyName("premium_interactions")]
+    public CopilotUserResponseQuotaSnapshotsPremiumInteractions? PremiumInteractions { get; set; }
 }
 
-/// <summary>A request-local value for one exact reviewed placeholder. Never logged or persisted in a plan.</summary>
+/// <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>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpInstallationSecret
+public sealed class CopilotUserResponse
 {
-    /// <summary>Exact placeholder from the selected choice, not a caller-chosen backend identifier.</summary>
-    [JsonPropertyName("placeholder")]
-    public string Placeholder { get; set; } = string.Empty;
+    /// <summary>Copilot access SKU identifier (e.g. `free_limited_copilot`, `copilot_for_business_seat_quota`) used to gate model and feature access.</summary>
+    [JsonPropertyName("access_type_sku")]
+    public string? AccessTypeSku { get; set; }
 
-    /// <summary>Fresh explicit secret value. It is omitted from confirmation reviews and telemetry.</summary>
-    [JsonPropertyName("value")]
-    public string Value { get; set; } = string.Empty;
-}
+    /// <summary>Opaque analytics tracking identifier for the user, forwarded from the Copilot API.</summary>
+    [JsonPropertyName("analytics_tracking_id")]
+    public string? AnalyticsTrackingId { get; set; }
 
-/// <summary>Side-effect-free preparation of one original bound remote MCP choice.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class McpPrepareInstallRequest
-{
-    /// <summary>Exact selected alternative from that plan.</summary>
-    [JsonPropertyName("choiceId")]
-    public string ChoiceId { get; set; } = string.Empty;
+    /// <summary>Date the Copilot seat was assigned to the user, if applicable.</summary>
+    [JsonPropertyName("assigned_date")]
+    public string? AssignedDate { get; set; }
 
-    /// <summary>Required bound catalogue and confirmed remote installation capabilities.</summary>
-    [JsonPropertyName("contract")]
-    public CatalogClientContract Contract { get => field ??= new(); set; }
+    /// <summary>Whether the user is eligible to sign up for the free/limited Copilot tier.</summary>
+    [JsonPropertyName("can_signup_for_limited")]
+    public bool? CanSignupForLimited { get; set; }
 
-    /// <summary>
-    /// Declared non-secret values. Non-empty only when the caller requires
-    /// `mcp-configured-remote-installation`; omitted values use the card default.
-    /// </summary>
-    [JsonPropertyName("inputs")]
-    public IList<McpInstallationInput> Inputs { get => field ??= []; set; }
+    /// <summary>Whether the user is able to upgrade their Copilot plan.</summary>
+    [JsonPropertyName("can_upgrade_plan")]
+    public bool? CanUpgradePlan { get; set; }
 
-    /// <summary>Original single-use bound plan, never a client-authored configuration.</summary>
-    [JsonPropertyName("planHandle")]
-    public string PlanHandle { get; set; } = string.Empty;
+    /// <summary>Whether Copilot chat is enabled for the user.</summary>
+    [JsonPropertyName("chat_enabled")]
+    public bool? ChatEnabled { get; set; }
 
-    /// <summary>An existing local session attached to this connection, not permission to attach one.</summary>
-    [JsonPropertyName("policySessionId")]
-    public string PolicySessionId { get; set; } = string.Empty;
+    /// <summary>Whether CLI remote control is enabled for the user.</summary>
+    [JsonPropertyName("cli_remote_control_enabled")]
+    public bool? CliRemoteControlEnabled { get; set; }
 
-    /// <summary>
-    /// One entry per declared secret placeholder of the selected choice. Non-empty
-    /// only when the caller requires `mcp-configured-remote-installation`.
-    /// </summary>
-    [JsonPropertyName("secrets")]
-    public IList<McpInstallationSecret> Secrets { get => field ??= []; set; }
+    /// <summary>Whether cloud session storage is enabled for the user.</summary>
+    [JsonPropertyName("cloud_session_storage_enabled")]
+    public bool? CloudSessionStorageEnabled { get; set; }
 
-    /// <summary>The trusted host presents this choice alongside the exact secret placeholders.</summary>
-    [JsonPropertyName("secretStorage")]
-    public McpInstallationSecretStorage SecretStorage { get; set; }
+    /// <summary>Whether the Codex agent is enabled for the user.</summary>
+    [JsonPropertyName("codex_agent_enabled")]
+    public bool? CodexAgentEnabled { get; set; }
 
-    /// <summary>The exact original source, used transiently only after confirmation.</summary>
-    [JsonPropertyName("source")]
-    public McpServerCardReference Source { get => field ??= new(); set; }
-}
+    /// <summary>Copilot plan name for the user (e.g. `individual`, `business`, `enterprise`).</summary>
+    [JsonPropertyName("copilot_plan")]
+    public string? CopilotPlan { get; set; }
 
-/// <summary>An installation result together with the exact honoured contract, or a negotiation refusal.</summary>
-/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-[JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "kind",
-    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(McpInstallationResultOutcome), "outcome")]
-[JsonDerivedType(typeof(McpInstallationResultNegotiationRefused), "negotiation-refused")]
-[JsonDerivedType(typeof(McpInstallationResultInvalidRequest), "invalid-request")]
-public partial class McpInstallationResult
-{
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("kind")]
-    public virtual string Kind { get; set; } = string.Empty;
-}
+    /// <summary>Whether `.copilotignore` content-exclusion support is enabled for the user.</summary>
+    [JsonPropertyName("copilotignore_enabled")]
+    public bool? CopilotignoreEnabled { get; set; }
 
+    /// <summary>Endpoint URLs from the raw Copilot `/copilot_internal/v2/token` user-response passthrough.</summary>
+    [JsonPropertyName("endpoints")]
+    public CopilotUserResponseEndpoints? Endpoints { get; set; }
 
-/// <summary>The <c>outcome</c> variant of <see cref="McpInstallationResult"/>.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class McpInstallationResultOutcome : McpInstallationResult
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "outcome";
+    /// <summary>Enterprises that provide the user's Copilot license; malformed entries are normalized to null or ID-less shapes.</summary>
+    [JsonPropertyName("enterprise_list")]
+    public IList<CopilotUserResponseEnterpriseListItem?>? EnterpriseList { get; set; }
 
-    /// <summary>Capabilities actually honoured for this request.</summary>
-    [JsonPropertyName("negotiated")]
-    public required CatalogNegotiatedContract Negotiated { get; set; }
+    /// <summary>Whether MCP (Model Context Protocol) support is enabled for the user.</summary>
+    [JsonPropertyName("is_mcp_enabled")]
+    public bool? IsMcpEnabled { get; set; }
 
-    /// <summary>Terminal result of the original operation.</summary>
-    [JsonPropertyName("outcome")]
-    public required McpInstallationOutcome Outcome { get; set; }
-}
+    /// <summary>Whether the user is a GitHub/Microsoft staff member.</summary>
+    [JsonPropertyName("is_staff")]
+    public bool? IsStaff { get; set; }
 
-/// <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="McpInstallationResult"/>.</remarks>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class McpInstallationResultNegotiationRefused : McpInstallationResult
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "negotiation-refused";
+    /// <summary>Per-category quota allotments for free/limited-tier users, keyed by quota category.</summary>
+    [JsonPropertyName("limited_user_quotas")]
+    public IDictionary<string, double>? LimitedUserQuotas { 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>Date the free/limited-tier user's quotas next reset, as a raw string from the Copilot API.</summary>
+    [JsonPropertyName("limited_user_reset_date")]
+    public string? LimitedUserResetDate { get; set; }
 
-    /// <summary>Lowest caller protocol version this runtime will serve.</summary>
-    [JsonPropertyName("minimumSupportedProtocolVersion")]
-    public required long MinimumSupportedProtocolVersion { get; set; }
+    /// <summary>GitHub login of the authenticated user.</summary>
+    [JsonPropertyName("login")]
+    public string? Login { get; set; }
 
-    /// <summary>Whether the version or the capability set was the problem.</summary>
-    [JsonPropertyName("reason")]
-    public required CatalogNegotiationRefusedReason Reason { get; set; }
+    /// <summary>Per-category monthly quota allotments, keyed by quota category.</summary>
+    [JsonPropertyName("monthly_quotas")]
+    public IDictionary<string, double>? MonthlyQuotas { get; set; }
 
-    /// <summary>Protocol version of the runtime that refused the request.</summary>
-    [JsonPropertyName("runtimeProtocolVersion")]
-    public required long RuntimeProtocolVersion { get; set; }
+    /// <summary>Organizations the user belongs to, each with an optional ID, login, and display name.</summary>
+    [JsonPropertyName("organization_list")]
+    public IList<CopilotUserResponseOrganizationListItem?>? OrganizationList { get; set; }
 
-    /// <summary>Capabilities this runtime can safely advertise to this caller. The complete five-capability protocol-3 legacy set is always present; every capability added after that baseline appears only when the caller required it, so an older closed-enum decoder can still consume a refusal. This list does not imply that every deployment has enabled every operation.</summary>
-    [JsonPropertyName("supportedCapabilities")]
-    public required IList<string> SupportedCapabilities { get; set; }
+    /// <summary>Logins of the organizations the user belongs to.</summary>
+    [JsonPropertyName("organization_login_list")]
+    public IList<string>? OrganizationLoginList { 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>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.</summary>
+    [JsonPropertyName("quota_reset_date")]
+    public string? QuotaResetDate { get; set; }
+
+    /// <summary>UTC-normalized form of `quota_reset_date` (the date the user's usage quota next resets).</summary>
+    [JsonPropertyName("quota_reset_date_utc")]
+    public string? QuotaResetDateUtc { get; set; }
+
+    /// <summary>Quota snapshot map from the raw Copilot user-response passthrough, with chat, completions, premium-interactions, and other entries.</summary>
+    [JsonPropertyName("quota_snapshots")]
+    public CopilotUserResponseQuotaSnapshots? QuotaSnapshots { get; set; }
+
+    /// <summary>Whether the user's telemetry is subject to restricted-data handling.</summary>
+    [JsonPropertyName("restricted_telemetry")]
+    public bool? RestrictedTelemetry { get; set; }
+
+    /// <summary>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.</summary>
+    [JsonPropertyName("te")]
+    public bool? Te { get; set; }
+
+    /// <summary>Whether the account is on usage-based (token/AI-credit) billing rather than a fixed premium-request quota.</summary>
+    [JsonPropertyName("token_based_billing")]
+    public bool? TokenBasedBilling { get; set; }
 }
 
-/// <summary>The request was rejected because a bounded field fell outside its permitted range or a required field was unusable. Pagination may also be rejected by the authority after a continuation request; repeat the search without page.</summary>
-/// <remarks>The <c>invalid-request</c> variant of <see cref="McpInstallationResult"/>.</remarks>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class McpInstallationResultInvalidRequest : McpInstallationResult
+public partial class AuthInfoHmac : AuthInfo
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Kind => "invalid-request";
+    public override string Type => "hmac";
 
-    /// <summary>Which request field was rejected.</summary>
-    [JsonPropertyName("field")]
-    public required CatalogInvalidRequestField Field { 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>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>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>Applies exactly one previously prepared operation on its original connection.</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(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class McpApplyInstallRequest
+public partial class AuthInfoEnv : AuthInfo
 {
-    /// <summary>Capabilities required by the original prepared operation.</summary>
-    [JsonPropertyName("contract")]
-    public CatalogClientContract Contract { get => field ??= new(); set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "env";
 
-    /// <summary>Runtime-issued ID already returned by prepareInstall, never reused or rebound.</summary>
-    [JsonPropertyName("operationId")]
-    public string OperationId { 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>Same existing attached or privately borrowed session as preparation.</summary>
-    [JsonPropertyName("policySessionId")]
-    public string PolicySessionId { get; set; } = string.Empty;
-}
+    /// <summary>Name of the environment variable the token was sourced from.</summary>
+    [JsonPropertyName("envVar")]
+    public required string EnvVar { get; set; }
 
-/// <summary>Read-only preparation of one owned removal under fresh selected-session authority.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class McpPlanUninstallRequest
-{
-    /// <summary>Required authenticated bound installation capabilities.</summary>
-    [JsonPropertyName("contract")]
-    public CatalogClientContract Contract { get => field ??= new(); set; }
+    /// <summary>Authentication host (e.g. https://github.com or a GHES host).</summary>
+    [JsonPropertyName("host")]
+    public required string Host { get; set; }
 
-    /// <summary>Exact receipt to inspect, not a server-name guess.</summary>
-    [JsonPropertyName("installationId")]
-    public string InstallationId { get; set; } = string.Empty;
+    /// <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>Existing selected session on the original connection.</summary>
-    [JsonPropertyName("policySessionId")]
-    public string PolicySessionId { get; set; } = string.Empty;
+    /// <summary>The token value itself. Treat as a secret.</summary>
+    [JsonPropertyName("token")]
+    public required string Token { get; set; }
 }
 
-/// <summary>One-use application of the exact retained removal plan.</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(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class McpApplyUninstallRequest
+public partial class AuthInfoToken : AuthInfo
 {
-    /// <summary>Required authenticated bound installation capabilities.</summary>
-    [JsonPropertyName("contract")]
-    public CatalogClientContract Contract { get => field ??= new(); set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "token";
 
-    /// <summary>Opaque original removal plan, consumed once.</summary>
-    [JsonPropertyName("planHandle")]
-    public string PlanHandle { 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>Same existing selected session as removal preparation.</summary>
-    [JsonPropertyName("policySessionId")]
-    public string PolicySessionId { get; set; } = string.Empty;
-}
+    /// <summary>Authentication host.</summary>
+    [JsonPropertyName("host")]
+    public required string Host { get; set; }
 
-/// <summary>User-configured MCP servers, keyed by server name.</summary>
+    /// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpConfigList
+public partial class AuthInfoTokenProvider : AuthInfo
 {
-    /// <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; }
+    /// <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>MCP server name and configuration to add to user configuration.</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="AuthInfo"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class McpConfigAddRequest
+public partial class AuthInfoCopilotApiToken : AuthInfo
 {
-    /// <summary>MCP server configuration (stdio process or remote HTTP/SSE).</summary>
-    [JsonPropertyName("config")]
-    public JsonElement Config { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "copilot-api-token";
 
-    /// <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>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>MCP server name and replacement configuration to write to user configuration.</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="AuthInfo"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class McpConfigUpdateRequest
+public partial class AuthInfoUser : AuthInfo
 {
-    /// <summary>MCP server configuration (stdio process or remote HTTP/SSE).</summary>
-    [JsonPropertyName("config")]
-    public JsonElement Config { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "user";
 
-    /// <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>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>MCP server name to remove from user configuration.</summary>
+/// <summary>An interactive account whose model provider owns its credentials. It carries no GitHub credential.</summary>
+/// <remarks>The <c>account</c> variant of <see cref="AuthInfo"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class McpConfigRemoveRequest
+public partial class AuthInfoAccount : AuthInfo
 {
-    /// <summary>OAuth Client ID Metadata Document URL whose persisted credentials should also be removed.</summary>
-    [JsonPropertyName("authClientIdMetadataUrl")]
-    public string? AuthClientIdMetadataUrl { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "account";
 
-    /// <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>Host coordinate owned by the account's model provider.</summary>
+    [JsonPropertyName("host")]
+    public required string Host { get; set; }
+
+    /// <summary>Login identifying the provider-owned account.</summary>
+    [JsonPropertyName("login")]
+    public required string Login { get; set; }
 }
 
-/// <summary>MCP server names to enable for new sessions.</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(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class McpConfigEnableRequest
+public partial class AuthInfoGhCli : AuthInfo
 {
-    /// <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; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "gh-cli";
+
+    /// <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>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>MCP server names to disable for new sessions.</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(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class McpConfigDisableRequest
+public partial class AuthInfoApiKey : AuthInfo
 {
-    /// <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; }
+    /// <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>New-work inventory or recovery request under an explicitly selected existing session.</summary>
+/// <summary>Current authentication state.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class McpInstallationsRequest
+public sealed class AccountGetCurrentAuthResult
 {
-    /// <summary>Required authenticated bound installation contract.</summary>
-    [JsonPropertyName("contract")]
-    public CatalogClientContract Contract { get => field ??= new(); set; }
+    /// <summary>Authentication errors from the last auth attempt, if any.</summary>
+    [JsonPropertyName("authErrors")]
+    public IList<string>? AuthErrors { get; set; }
 
-    /// <summary>Existing selected local session on this connection.</summary>
-    [JsonPropertyName("policySessionId")]
-    public string PolicySessionId { get; set; } = string.Empty;
+    /// <summary>Current authentication information, if authenticated.</summary>
+    [JsonPropertyName("authInfo")]
+    public AuthInfo? AuthInfo { get; set; }
 }
 
-/// <summary>Existing-operation control. A new session selector is deliberately not accepted.</summary>
+/// <summary>Authenticated account entry returned by `account.getAllUsers`.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class McpInstallationOperationRequest
+public sealed class AccountAllUsers
 {
-    /// <summary>Original installation wire capability; new-work authentication is not reacquired.</summary>
-    [JsonPropertyName("contract")]
-    public CatalogClientContract Contract { get => field ??= new(); set; }
+    /// <summary>Authentication information for this user.</summary>
+    [JsonPropertyName("authInfo")]
+    public AuthInfo AuthInfo { get => field ??= new(); set; }
 
-    /// <summary>Exact runtime-issued operation ID on the original connection.</summary>
-    [JsonPropertyName("operationId")]
-    public string OperationId { get; set; } = string.Empty;
+    /// <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; }
 }
 
-/// <summary>Installed plugin that contributes a discovered extension.</summary>
+/// <summary>Result of a successful login; throws on failure.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class DiscoveredExtensionPlugin
+public sealed class AccountLoginResult
 {
-    /// <summary>Installed plugin name.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>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.</summary>
+    [JsonPropertyName("storedInVault")]
+    public bool StoredInVault { get; set; }
 }
 
-/// <summary>Discovered extension metadata and persistent enablement state.</summary>
+/// <summary>Credentials to validate and store. Omit login to resolve the authenticated user from the token.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class DiscoveredExtension
+internal sealed class AccountLoginRequest
 {
-    /// <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>GitHub host URL.</summary>
+    [JsonPropertyName("host")]
+    public string Host { 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>User login/username. When omitted, the runtime validates the token and resolves the login from GitHub.</summary>
+    [JsonPropertyName("login")]
+    public string? Login { get; set; }
 
-    /// <summary>Containing plugin metadata for plugin-contributed extensions.</summary>
-    [JsonPropertyName("plugin")]
-    public DiscoveredExtensionPlugin? Plugin { get; set; }
+    /// <summary>GitHub authentication token.</summary>
+    [JsonPropertyName("token")]
+    public string Token { get; set; } = string.Empty;
+}
 
-    /// <summary>Discovery source.</summary>
-    [JsonPropertyName("source")]
-    public DiscoveredExtensionSource Source { get; set; }
+/// <summary>Logout result indicating if more users remain.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class AccountLogoutResult
+{
+    /// <summary>Whether other authenticated users remain after logout.</summary>
+    [JsonPropertyName("hasMoreUsers")]
+    public bool HasMoreUsers { get; set; }
 }
 
-/// <summary>Extensions discovered from persisted Copilot home state and their effective loading mode. Launch-scoped additional plugins are not included.</summary>
+/// <summary>User to log out.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class DiscoveredExtensions
+internal sealed class AccountLogoutRequest
 {
-    /// <summary>Discovered user and enabled installed-plugin extensions from persisted Copilot home state.</summary>
-    [JsonPropertyName("extensions")]
-    public IList<DiscoveredExtension> Extensions { get => field ??= []; set; }
+    /// <summary>Authentication information for the user to log out.</summary>
+    [JsonPropertyName("authInfo")]
+    public AuthInfo? AuthInfo { get; set; }
 
-    /// <summary>Effective extension loading mode. Defaults to load_and_augment when unset.</summary>
-    [JsonPropertyName("mode")]
-    public DiscoveredExtensionMode Mode { get; set; }
+    /// <summary>Opaque account identifier returned by `account.getAllUsers`.</summary>
+    [JsonPropertyName("selectionId")]
+    public string? SelectionId { get; set; }
 }
 
-/// <summary>Source-qualified extension identifiers to persistently enable for future sessions.</summary>
+/// <summary>The wording the runtime uses for an authentication identity.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class DiscoveredExtensionsEnableRequest
+internal sealed class AccountDescribeAuthInfoResult
 {
-    /// <summary>Source-qualified user or plugin extension IDs to enable.</summary>
-    [JsonPropertyName("ids")]
-    public IList<string> Ids { get => field ??= []; set; }
+    /// <summary>One-line description of the identity, suitable after a verb such as "Switched to".</summary>
+    [JsonPropertyName("description")]
+    public string Description { get; set; } = string.Empty;
+
+    /// <summary>Sign-in banner announcing the authenticated user.</summary>
+    [JsonPropertyName("message")]
+    public string Message { get; set; } = string.Empty;
 }
 
-/// <summary>Source-qualified extension identifiers to persistently disable for future sessions.</summary>
+/// <summary>Credential-free authentication identity safe to expose to hosts and user interfaces.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class DiscoveredExtensionsDisableRequest
+public sealed class AuthIdentity
 {
-    /// <summary>Source-qualified user or plugin extension IDs to disable.</summary>
-    [JsonPropertyName("ids")]
-    public IList<string> Ids { get => field ??= []; set; }
+    /// <summary>Snapshot of the authenticated user's Copilot subscription info, if known.</summary>
+    [JsonPropertyName("copilotUser")]
+    public CopilotUserResponse? CopilotUser { get; set; }
+
+    /// <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>Skill installation management result with the honoured contract, or a typed refusal.</summary>
-/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
+/// <summary>The authentication identity whose shared wording should be rendered.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-[JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "kind",
-    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(SkillInstallationManagementResultOutcome), "outcome")]
-[JsonDerivedType(typeof(SkillInstallationManagementResultNegotiationRefused), "negotiation-refused")]
-[JsonDerivedType(typeof(SkillInstallationManagementResultInvalidRequest), "invalid-request")]
-public partial class SkillInstallationManagementResult
+internal sealed class AccountDescribeAuthInfoRequest
 {
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("kind")]
-    public virtual string Kind { get; set; } = string.Empty;
+    /// <summary>Identity to describe.</summary>
+    [JsonPropertyName("identity")]
+    public AuthIdentity Identity { get => field ??= new(); set; }
 }
 
-
-/// <summary>Management outcome for verified Skill inventory, planning and removal.</summary>
-/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
+/// <summary>Whether the identity can create gists, and why not when it cannot.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-[JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "kind",
-    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(SkillInstallationManagementOutcomeRecoveryRequired), "recovery-required")]
-[JsonDerivedType(typeof(SkillInstallationManagementOutcomeInstallPlanned), "install-planned")]
-[JsonDerivedType(typeof(SkillInstallationManagementOutcomeListed), "listed")]
-[JsonDerivedType(typeof(SkillInstallationManagementOutcomeRecovered), "recovered")]
-[JsonDerivedType(typeof(SkillInstallationManagementOutcomeRolledBack), "rolled-back")]
-[JsonDerivedType(typeof(SkillInstallationManagementOutcomeUninstallPlanned), "uninstall-planned")]
-[JsonDerivedType(typeof(SkillInstallationManagementOutcomeOperation), "operation")]
-[JsonDerivedType(typeof(SkillInstallationManagementOutcomeEnabledChanged), "enabled-changed")]
-[JsonDerivedType(typeof(SkillInstallationManagementOutcomeRefused), "refused")]
-public partial class SkillInstallationManagementOutcome
+internal sealed class AccountGetGistSupportResult
 {
-    /// <summary>The type discriminator.</summary>
+    /// <summary>Machine-readable reason category when unsupported.</summary>
     [JsonPropertyName("kind")]
-    public virtual string Kind { get; set; } = string.Empty;
-}
+    public string? Kind { get; set; }
 
+    /// <summary>Human-readable explanation to show where the gist action would have been.</summary>
+    [JsonPropertyName("reason")]
+    public string? Reason { get; set; }
 
-/// <summary>Already-confirmed durable work must be reconciled before new mutations or inventory.</summary>
-/// <remarks>The <c>recovery-required</c> variant of <see cref="SkillInstallationManagementOutcome"/>.</remarks>
+    /// <summary>True when the identity can create gists.</summary>
+    [JsonPropertyName("supported")]
+    public bool Supported { get; set; }
+}
+
+/// <summary>The authentication identity whose gist support should be reported.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class SkillInstallationManagementOutcomeRecoveryRequired : SkillInstallationManagementOutcome
+internal sealed class AccountGetGistSupportRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "recovery-required";
+    /// <summary>Identity to evaluate.</summary>
+    [JsonPropertyName("identity")]
+    public AuthIdentity Identity { get => field ??= new(); set; }
 }
 
-/// <summary>Safe verified Skill review fields. No raw credential, candidate handle or plan handle.</summary>
-/// <remarks>Polymorphic base type discriminated by <c>action</c>.</remarks>
+/// <summary>An absolute URL on the identity's GitHub host.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-[JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "action",
-    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(SkillInstallationReviewInstall), "install")]
-[JsonDerivedType(typeof(SkillInstallationReviewUninstall), "uninstall")]
-public partial class SkillInstallationReview
+internal sealed class AccountGetWebUrlResult
 {
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("action")]
-    public virtual string Action { get; set; } = string.Empty;
+    /// <summary>Absolute URL for the requested path.</summary>
+    [JsonPropertyName("url")]
+    public string Url { get; set; } = string.Empty;
 }
 
-
-/// <summary>One reviewed Skill file.</summary>
+/// <summary>A path to resolve against the GitHub host an identity is signed in to.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SkillInstallationFileReview
+internal sealed class AccountGetWebUrlRequest
 {
-    /// <summary>SHA-256 digest of the exact file bytes.</summary>
-    [JsonPropertyName("digest")]
-    public string Digest { get; set; } = string.Empty;
-
-    /// <summary>Whether the file is installed with executable permissions.</summary>
-    [JsonPropertyName("executable")]
-    public bool Executable { get; set; }
-
-    /// <summary>Declared media type for the file.</summary>
-    [JsonPropertyName("mediaType")]
-    public string MediaType { get; set; } = string.Empty;
+    /// <summary>Identity whose host the path resolves against. Omit to resolve against the public github.com host.</summary>
+    [JsonPropertyName("identity")]
+    public AuthIdentity? Identity { get; set; }
 
-    /// <summary>Relative file path within the Skill root.</summary>
+    /// <summary>Host-relative path, without a leading slash, for example `settings/copilot/features`.</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("path")]
     public string Path { get; set; } = string.Empty;
-
-    /// <summary>Exact reviewed file size in bytes.</summary>
-    [JsonPropertyName("sizeBytes")]
-    public long SizeBytes { get; set; }
 }
 
-/// <summary>Source identity retained from Agent Finder and the pinned GitHub descriptor.</summary>
+/// <summary>The environment variable supplying a classic personal access token, when one is set.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SkillInstallationSource
+internal sealed class AccountGetTokenEnvVarResult
 {
-    /// <summary>Digest of the descriptor's bundle manifest.</summary>
-    [JsonPropertyName("bundleDigest")]
-    public string BundleDigest { get; set; } = string.Empty;
+    /// <summary>Variable name, for example `GH_TOKEN`. Absent when no classic token is present in the environment.</summary>
+    [JsonPropertyName("name")]
+    public string? Name { get; set; }
+}
 
-    /// <summary>Agent Finder materialisation revision identifier.</summary>
-    [JsonPropertyName("catalogRevisionId")]
-    public string CatalogRevisionId { get; set; } = string.Empty;
+/// <summary>Confirmation that the secret values were registered.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class SecretsAddFilterValuesResult
+{
+    /// <summary>Whether the values were successfully registered.</summary>
+    [JsonPropertyName("ok")]
+    public bool Ok { get; set; }
+}
 
-    /// <summary>Digest of the canonical materialisation descriptor.</summary>
-    [JsonPropertyName("descriptorDigest")]
-    public string DescriptorDigest { get; set; } = string.Empty;
+/// <summary>Secret values to add to the redaction filter.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class SecretsAddFilterValuesRequest
+{
+    /// <summary>Raw secret values to register for redaction.</summary>
+    [JsonPropertyName("values")]
+    public IList<string> Values { get => field ??= []; set; }
+}
 
-    /// <summary>Repository full name, for example owner/name.</summary>
-    [JsonPropertyName("repository")]
-    public string Repository { get; set; } = string.Empty;
+/// <summary>Concrete configuration file containing an MCP server declaration.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class McpSourceFile
+{
+    /// <summary>RFC 6901 JSON Pointer to the server declaration, when known.</summary>
+    [JsonPropertyName("jsonPointer")]
+    public string? JsonPointer { get; set; }
 
-    /// <summary>GitHub repository database identifier.</summary>
-    [JsonPropertyName("repositoryId")]
-    public string RepositoryId { get; set; } = string.Empty;
+    /// <summary>Canonical file URI for the configuration document.</summary>
+    [Url]
+    [StringSyntax(StringSyntaxAttribute.Uri)]
+    [JsonPropertyName("uri")]
+    public string Uri { get; set; } = string.Empty;
+}
 
-    /// <summary>Agent Finder resource identifier.</summary>
-    [JsonPropertyName("resourceId")]
-    public string ResourceId { get; set; } = string.Empty;
+/// <summary>Plugin identity associated with an MCP server declaration.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class McpSourcePlugin
+{
+    /// <summary>Canonical plugin identity.</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>Pinned Git commit revision.</summary>
-    [JsonPropertyName("revision")]
-    public string Revision { get; set; } = string.Empty;
+    /// <summary>Human-readable plugin name, when available.</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; }
 
-    /// <summary>Root path within the pinned repository.</summary>
-    [JsonPropertyName("root")]
-    public string Root { get; set; } = string.Empty;
+    /// <summary>Plugin version, when available.</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("version")]
+    public string? Version { get; set; }
 }
 
-/// <summary>A user-facing personal Skill installation location without absolute host paths.</summary>
+/// <summary>Canonical identity and location of the effective MCP server declaration. The declaration is uniquely addressed by this source id together with the discovered server name.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SkillInstallationLocation
+public sealed class McpSourceRef
 {
-    /// <summary>Diagnostics-only absolute host path. Hosts must not display it by default.</summary>
-    [JsonPropertyName("diagnosticsAbsolutePath")]
-    public string? DiagnosticsAbsolutePath { get; set; }
+    /// <summary>Open semantic editability identifier. Known values are editable and read-only.</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("editability")]
+    public string Editability { get; set; } = string.Empty;
 
-    /// <summary>Safe display label, for example ~/.copilot/skills/run-checks.</summary>
-    [JsonPropertyName("displayLabel")]
-    public string DisplayLabel { get; set; } = string.Empty;
+    /// <summary>Configuration file location, when the declaration is file-backed.</summary>
+    [JsonPropertyName("file")]
+    public McpSourceFile? File { get; set; }
 
-    /// <summary>Path relative to the Copilot home.</summary>
-    [JsonPropertyName("relativePath")]
-    public string RelativePath { get; set; } = string.Empty;
+    /// <summary>Opaque stable identity for the configuration source. Clients must not parse this 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>Installation scope. Agent Finder Skills are installed in the user's personal Copilot home.</summary>
-    [JsonPropertyName("scope")]
-    public SkillInstallationScope Scope { get; set; }
+    /// <summary>Open source-kind identifier. Known values include user, workspace, invocation, plugin, builtin, and device-registry.</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("kind")]
+    public string Kind { get; set; } = string.Empty;
+
+    /// <summary>Plugin identity, when the declaration is plugin-provided.</summary>
+    [JsonPropertyName("plugin")]
+    public McpSourcePlugin? Plugin { get; set; }
 }
 
-/// <summary>Review for installing a verified Skill.</summary>
-/// <remarks>The <c>install</c> variant of <see cref="SkillInstallationReview"/>.</remarks>
+/// <summary>MCP server discovered by `mcp.discover`, with config source, optional plugin source, transport type, and enabled state.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class SkillInstallationReviewInstall : SkillInstallationReview
+public sealed class DiscoveredMcpServer
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Action => "install";
+    /// <summary>Canonical identity and location of the effective server declaration.</summary>
+    [JsonPropertyName("effectiveSource")]
+    public McpSourceRef? EffectiveSource { get; set; }
 
-    /// <summary>Catalogue identity retained from the bound candidate before consent.</summary>
-    [JsonPropertyName("catalogue")]
-    public required InstallationCatalogueIdentity Catalogue { get; set; }
-
-    /// <summary>Skill description from SKILL.md when present.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("description")]
-    public string? Description { get; set; }
-
-    /// <summary>
-    /// Complete verified SKILL.md content. Planning refuses with review-too-large
-    /// when this exceeds 262144 UTF-8 bytes; it is never truncated.
-    /// </summary>
-    [JsonPropertyName("entrypointContent")]
-    public required string EntrypointContent { get; set; }
-
-    /// <summary>Relative path of the verified Skill entrypoint.</summary>
-    [JsonPropertyName("entrypointPath")]
-    public required string EntrypointPath { get; set; }
-
-    /// <summary>Reviewed files and digests.</summary>
-    [JsonPropertyName("files")]
-    public required IList<SkillInstallationFileReview> Files { get; set; }
-
-    /// <summary>Installing never grants immediate use; the Skill is written disabled.</summary>
-    [JsonPropertyName("installsDisabled")]
-    public required bool InstallsDisabled { get; set; }
+    /// <summary>Whether the server is enabled (not in the disabled list).</summary>
+    [JsonPropertyName("enabled")]
+    public bool Enabled { get; set; }
 
-    /// <summary>Skill invocation name from SKILL.md.</summary>
+    /// <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 required string Name { get; set; }
+    public string Name { get; set; } = string.Empty;
 
-    /// <summary>Exact verified source identity.</summary>
+    /// <summary>Configuration source: user, workspace, plugin, or builtin.</summary>
     [JsonPropertyName("source")]
-    public required SkillInstallationSource Source { get; set; }
+    public McpServerSource Source { get; set; }
 
-    /// <summary>Exact user-scope target location without an absolute host path.</summary>
-    [JsonPropertyName("target")]
-    public required SkillInstallationLocation Target { get; set; }
+    /// <summary>Plugin name that provided this server, when source is plugin.</summary>
+    [JsonPropertyName("sourcePlugin")]
+    public string? SourcePlugin { get; set; }
 
-    /// <summary>Total reviewed payload size in bytes.</summary>
-    [JsonPropertyName("totalBytes")]
-    public required long TotalBytes { get; set; }
+    /// <summary>Plugin version that provided this server, when source is plugin.</summary>
+    [JsonPropertyName("sourcePluginVersion")]
+    public string? SourcePluginVersion { get; set; }
+
+    /// <summary>Server transport type: stdio, http, sse (deprecated), or memory.</summary>
+    [JsonPropertyName("type")]
+    public DiscoveredMcpServerType? Type { get; set; }
 }
 
-/// <summary>Durable verified Skill ownership summary.</summary>
+/// <summary>MCP servers discovered from user, workspace, plugin, and built-in sources.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SkillInstallationSummary
+public sealed class McpDiscoverResult
 {
-    /// <summary>Catalogue identity retained at install time.</summary>
-    [JsonPropertyName("catalogue")]
-    public InstallationCatalogueIdentity Catalogue { get => field ??= new(); set; }
-
-    /// <summary>Persisted enablement requested for this installation.</summary>
-    [JsonPropertyName("configuredEnabled")]
-    public bool ConfiguredEnabled { get; set; }
-
-    /// <summary>Exact durable installation receipt identity.</summary>
-    [JsonPropertyName("installationId")]
-    public string InstallationId { get; set; } = string.Empty;
-
-    /// <summary>ISO 8601 wall-clock installation time.</summary>
-    [JsonPropertyName("installedAt")]
-    public string InstalledAt { get; set; } = string.Empty;
-
-    /// <summary>Skill invocation name.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
-
-    /// <summary>Operation that installed this Skill.</summary>
-    [JsonPropertyName("operationId")]
-    public string OperationId { get; set; } = string.Empty;
-
-    /// <summary>Ownership state observed from files and receipts.</summary>
-    [JsonPropertyName("ownershipState")]
-    public SkillInstallationOwnershipState OwnershipState { get; set; }
-
-    /// <summary>Bound-session load observation.</summary>
-    [JsonPropertyName("sessionState")]
-    public SkillInstallationSessionState SessionState { get; set; }
-
-    /// <summary>Exact retained verified source identity.</summary>
-    [JsonPropertyName("source")]
-    public SkillInstallationSource Source { get => field ??= new(); set; }
-
-    /// <summary>User-facing installation location without an absolute host path.</summary>
-    [JsonPropertyName("target")]
-    public SkillInstallationLocation Target { get => field ??= new(); set; }
+    /// <summary>MCP servers discovered from all sources.</summary>
+    [JsonPropertyName("servers")]
+    public IList<DiscoveredMcpServer> Servers { get => field ??= []; set; }
 }
 
-/// <summary>Review for uninstalling an owned verified Skill.</summary>
-/// <remarks>The <c>uninstall</c> variant of <see cref="SkillInstallationReview"/>.</remarks>
+/// <summary>Optional working directory used as context for MCP server discovery.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class SkillInstallationReviewUninstall : SkillInstallationReview
+internal sealed class McpDiscoverRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Action => "uninstall";
-
-    /// <summary>Catalogue identity retained at install time.</summary>
-    [JsonPropertyName("catalogue")]
-    public required InstallationCatalogueIdentity Catalogue { get; set; }
-
-    /// <summary>Files recorded by the installation receipt.</summary>
-    [JsonPropertyName("files")]
-    public required IList<SkillInstallationFileReview> Files { get; set; }
-
-    /// <summary>Whether current files differ from the receipt. Apply refuses drift.</summary>
-    [JsonPropertyName("filesModified")]
-    public required bool FilesModified { get; set; }
-
-    /// <summary>Owned installation being removed.</summary>
-    [JsonPropertyName("installation")]
-    public required SkillInstallationSummary Installation { get; set; }
+    /// <summary>Whether to include canonical effectiveSource metadata for each discovered server. Callers must opt in so protocol-3 clients retain the legacy closed response shape.</summary>
+    [JsonPropertyName("includeEffectiveSource")]
+    public bool? IncludeEffectiveSource { get; set; }
 
-    /// <summary>Total receipt-owned payload size in bytes.</summary>
-    [JsonPropertyName("totalBytes")]
-    public required long TotalBytes { get; set; }
+    /// <summary>Working directory used as context for discovery (e.g., plugin resolution).</summary>
+    [JsonPropertyName("workingDirectory")]
+    public string? WorkingDirectory { get; set; }
 }
 
-/// <summary>A computed Skill install plan. Nothing has been applied.</summary>
+/// <summary>Names of the MCP servers the runtime supplies itself.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SkillInstallPlan
+internal sealed class McpListBuiltinServerNamesResult
 {
-    /// <summary>Original wall-clock expiry as an ISO 8601 timestamp.</summary>
-    [JsonPropertyName("expiresAt")]
-    public string ExpiresAt { get; set; } = string.Empty;
-
-    /// <summary>Original operation identifier returned before confirmation.</summary>
-    [JsonPropertyName("operationId")]
-    public string OperationId { get; set; } = string.Empty;
-
-    /// <summary>One-use plan handle, bound to the original candidate authority.</summary>
-    [JsonPropertyName("planHandle")]
-    public string PlanHandle { get; set; } = string.Empty;
-
-    /// <summary>Safe review to present before applying the plan.</summary>
-    [JsonPropertyName("review")]
-    public SkillInstallationReview Review { get => field ??= new(); set; }
+    /// <summary>Every built-in server name. A host disabling the built-ins wholesale suppresses exactly this set.</summary>
+    [JsonPropertyName("names")]
+    public IList<string> Names { get => field ??= []; set; }
 }
 
-/// <summary>A verified Skill installation plan was prepared.</summary>
-/// <remarks>The <c>install-planned</c> variant of <see cref="SkillInstallationManagementOutcome"/>.</remarks>
+/// <summary>Whether the gh-replaceable GitHub MCP tools may be clipped for the session described by the request.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class SkillInstallationManagementOutcomeInstallPlanned : SkillInstallationManagementOutcome
+internal sealed class McpShouldExcludeGitHubToolsResult
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "install-planned";
-
-    /// <summary>Prepared install plan.</summary>
-    [JsonPropertyName("plan")]
-    public required SkillInstallPlan Plan { get; set; }
+    /// <summary>True only when both halves hold: the session's filters still reach the platform shell tool, and the host actually has the `gh` those tools would be replaced by. Feed it straight back as the `excludeGhReplaceableTools` build option.</summary>
+    [JsonPropertyName("excludeGhReplaceableTools")]
+    public bool ExcludeGhReplaceableTools { get; set; }
 }
 
-/// <summary>Owned Skill installations were listed.</summary>
-/// <remarks>The <c>listed</c> variant of <see cref="SkillInstallationManagementOutcome"/>.</remarks>
+/// <summary>The session tool filters that decide whether the session still has a shell to run `gh` with.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class SkillInstallationManagementOutcomeListed : SkillInstallationManagementOutcome
+internal sealed class McpShouldExcludeGitHubToolsRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "listed";
+    /// <summary>The session's tool allowlist, when it set one. Omitted means the session constrains nothing this way.</summary>
+    [JsonPropertyName("availableTools")]
+    public IList<string>? AvailableTools { get; set; }
 
-    /// <summary>Owned Skill installation summaries.</summary>
-    [JsonPropertyName("installations")]
-    public required IList<SkillInstallationSummary> Installations { get; set; }
+    /// <summary>The session's tool denylist, when it set one. Omitted means the session constrains nothing this way.</summary>
+    [JsonPropertyName("excludedTools")]
+    public IList<string>? ExcludedTools { get; set; }
+
+    /// <summary>How the allowlist and denylist combine when both are set. Omitted means the default every session gets, so a caller that never chose a precedence is answered as its sessions behave.</summary>
+    [JsonPropertyName("toolFilterPrecedence")]
+    public OptionsUpdateToolFilterPrecedence? ToolFilterPrecedence { get; set; }
 }
 
-/// <summary>Recovery completed and inventory was inspected.</summary>
-/// <remarks>The <c>recovered</c> variant of <see cref="SkillInstallationManagementOutcome"/>.</remarks>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class SkillInstallationManagementOutcomeRecovered : SkillInstallationManagementOutcome
+[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
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "recovered";
-
-    /// <summary>Owned Skill installation summaries after recovery.</summary>
-    [JsonPropertyName("installations")]
-    public required IList<SkillInstallationSummary> Installations { get; set; }
+    /// <summary>The type discriminator.</summary>
+    [JsonPropertyName("kind")]
+    public virtual string Kind { get; set; } = string.Empty;
 }
 
-/// <summary>Interrupted work was safely compensated and the pending marker was cleared.</summary>
-/// <remarks>The <c>rolled-back</c> variant of <see cref="SkillInstallationManagementOutcome"/>.</remarks>
+
+/// <summary>The protocol version and capability set the runtime actually honoured for a successful catalog operation.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class SkillInstallationManagementOutcomeRolledBack : SkillInstallationManagementOutcome
+public sealed class CatalogNegotiatedContract
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "rolled-back";
-
-    /// <summary>Original operation identity.</summary>
-    [JsonPropertyName("operation_id")]
-    public required string OperationId { get; set; }
+    /// <summary>Wire features the runtime understood for this operation. Includes the five original catalog capabilities and only explicitly requested supported additions, in supported order without duplicates. Capabilities that introduce new success-union variants or operations are therefore included only when explicitly required, preserving older protocol-v3 clients. 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>Cause of the compensation.</summary>
-    [JsonPropertyName("reason")]
-    public required SkillInstallationFailureReason Reason { get; set; }
+    /// <summary>Protocol version of the runtime that served the request.</summary>
+    [JsonPropertyName("runtimeProtocolVersion")]
+    public long RuntimeProtocolVersion { get; set; }
 }
 
-/// <summary>A computed Skill uninstall plan. Nothing has been removed.</summary>
+/// <summary>The configuration-change alternative for the transportChoices entry at the same index. Only the selected alternative is applied; entries are not cumulative. The payload stays behind the runtime boundary.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SkillUninstallPlan
+public sealed class McpPlanConfigurationChange
 {
-    /// <summary>Original wall-clock expiry as an ISO 8601 timestamp.</summary>
-    [JsonPropertyName("expiresAt")]
-    public string ExpiresAt { get; set; } = string.Empty;
+    /// <summary>Names of the configuration fields the change would set, without their values.</summary>
+    [JsonPropertyName("changedFields")]
+    public IList<string> ChangedFields { get => field ??= []; set; }
 
-    /// <summary>Owned Skill installation being removed.</summary>
-    [JsonPropertyName("installation")]
-    public SkillInstallationSummary Installation { get => field ??= new(); set; }
+    /// <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("configKey")]
+    public string ConfigKey { get; set; } = string.Empty;
 
-    /// <summary>Original removal operation identifier returned before confirmation.</summary>
-    [JsonPropertyName("operationId")]
-    public string OperationId { 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>One-use uninstall plan handle.</summary>
-    [JsonPropertyName("planHandle")]
-    public string PlanHandle { get; set; } = string.Empty;
+    /// <summary>Scope the change would be written to.</summary>
+    [JsonPropertyName("scope")]
+    public McpPlanScope Scope { get; set; }
 
-    /// <summary>Safe review to present before applying removal.</summary>
-    [JsonPropertyName("review")]
-    public SkillInstallationReview Review { get => field ??= new(); 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>An owned Skill uninstall plan was prepared.</summary>
-/// <remarks>The <c>uninstall-planned</c> variant of <see cref="SkillInstallationManagementOutcome"/>.</remarks>
+/// <summary>Normalised identity of the MCP server a plan targets, independent of how the card spelled it.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class SkillInstallationManagementOutcomeUninstallPlanned : SkillInstallationManagementOutcome
+public sealed class McpPlanResourceIdentity
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "uninstall-planned";
+    /// <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("canonicalName")]
+    public string CanonicalName { get; set; } = string.Empty;
 
-    /// <summary>Prepared uninstall plan.</summary>
-    [JsonPropertyName("plan")]
-    public required SkillUninstallPlan Plan { get; set; }
-}
+    /// <summary>Registry identifier of the server, when it came from a registry.</summary>
+    [JsonPropertyName("registryId")]
+    public string? RegistryId { get; set; }
 
-/// <summary>Status snapshot from the original connection, independent of new-work account availability.</summary>
-/// <remarks>Polymorphic base type discriminated by <c>phase</c>.</remarks>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-[JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "phase",
-    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(SkillInstallationOperationStatusPreparing), "preparing")]
-[JsonDerivedType(typeof(SkillInstallationOperationStatusPrepared), "prepared")]
-[JsonDerivedType(typeof(SkillInstallationOperationStatusAwaitingConfirmation), "awaiting-confirmation")]
-[JsonDerivedType(typeof(SkillInstallationOperationStatusRevalidating), "revalidating")]
-[JsonDerivedType(typeof(SkillInstallationOperationStatusApplying), "applying")]
-[JsonDerivedType(typeof(SkillInstallationOperationStatusCompleted), "completed")]
-public partial class SkillInstallationOperationStatus
-{
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("phase")]
-    public virtual string Phase { get; set; } = string.Empty;
-}
+    /// <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>Original operation progress discriminator.</summary>
-/// <remarks>The <c>preparing</c> variant of <see cref="SkillInstallationOperationStatus"/>.</remarks>
+/// <summary>Outcome of evaluating the planned server against registry and enterprise policy. Evaluation is read-only.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class SkillInstallationOperationStatusPreparing : SkillInstallationOperationStatus
+public sealed class McpPlanPolicyResult
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Phase => "preparing";
+    /// <summary>What policy decided for this server.</summary>
+    [JsonPropertyName("decision")]
+    public McpPlanPolicyDecision Decision { get; set; }
 
-    /// <summary>Whether cancellation has been requested.</summary>
-    [JsonPropertyName("cancellationRequested")]
-    public required bool CancellationRequested { 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>Original runtime-issued operation identity.</summary>
-    [JsonPropertyName("operationId")]
-    public required string OperationId { get; set; }
+    /// <summary>Which authority produced the decision.</summary>
+    [JsonPropertyName("source")]
+    public McpPlanPolicySource Source { get; set; }
 }
 
-/// <summary>Original operation progress discriminator.</summary>
-/// <remarks>The <c>prepared</c> variant of <see cref="SkillInstallationOperationStatus"/>.</remarks>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class SkillInstallationOperationStatusPrepared : SkillInstallationOperationStatus
+public sealed class CardDigest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Phase => "prepared";
-
-    /// <summary>Whether cancellation has been requested.</summary>
-    [JsonPropertyName("cancellationRequested")]
-    public required bool CancellationRequested { get; set; }
+    /// <summary>Digest algorithm and canonical representation.</summary>
+    [JsonPropertyName("algorithm")]
+    public CardDigestAlgorithm Algorithm { get; set; }
 
-    /// <summary>Original runtime-issued operation identity.</summary>
-    [JsonPropertyName("operationId")]
-    public required string OperationId { 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>Original operation progress discriminator.</summary>
-/// <remarks>The <c>awaiting-confirmation</c> variant of <see cref="SkillInstallationOperationStatus"/>.</remarks>
+/// <summary>Provenance of the exact validated JSON MCP card content bound privately to a completed plan and its opaque handle.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class SkillInstallationOperationStatusAwaitingConfirmation : SkillInstallationOperationStatus
+public sealed class McpPlanProvenance
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Phase => "awaiting-confirmation";
+    /// <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>Whether cancellation has been requested.</summary>
-    [JsonPropertyName("cancellationRequested")]
-    public required bool CancellationRequested { get; set; }
+    /// <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>Original runtime-issued operation identity.</summary>
-    [JsonPropertyName("operationId")]
-    public required string OperationId { get; set; }
+    /// <summary>JSON MCP media type the validated card was interpreted as.</summary>
+    [JsonPropertyName("mediaType")]
+    public McpServerCardMediaType MediaType { 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>Original operation progress discriminator.</summary>
-/// <remarks>The <c>revalidating</c> variant of <see cref="SkillInstallationOperationStatus"/>.</remarks>
+/// <summary>Where a plan would be written.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class SkillInstallationOperationStatusRevalidating : SkillInstallationOperationStatus
+public sealed class McpPlanTarget
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Phase => "revalidating";
-
-    /// <summary>Whether cancellation has been requested.</summary>
-    [JsonPropertyName("cancellationRequested")]
-    public required bool CancellationRequested { get; 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>Original runtime-issued operation identity.</summary>
-    [JsonPropertyName("operationId")]
-    public required string OperationId { get; set; }
+    /// <summary>Configuration scope the plan targets.</summary>
+    [JsonPropertyName("scope")]
+    public McpPlanScope Scope { get; set; }
 }
 
-/// <summary>Original operation progress discriminator.</summary>
-/// <remarks>The <c>applying</c> variant of <see cref="SkillInstallationOperationStatus"/>.</remarks>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class SkillInstallationOperationStatusApplying : SkillInstallationOperationStatus
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "installMethod",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(McpPlanTransportChoicePackage), "package")]
+[JsonDerivedType(typeof(McpPlanTransportChoiceRemote), "remote")]
+public partial class McpPlanTransportChoice
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Phase => "applying";
-
-    /// <summary>Whether cancellation has been requested; already-started effects require recovery.</summary>
-    [JsonPropertyName("cancellationRequested")]
-    public required bool CancellationRequested { get; set; }
-
-    /// <summary>Original runtime-issued operation identity.</summary>
-    [JsonPropertyName("operationId")]
-    public required string OperationId { get; set; }
+    /// <summary>The type discriminator.</summary>
+    [JsonPropertyName("installMethod")]
+    public virtual string InstallMethod { get; set; } = string.Empty;
 }
 
-/// <summary>Terminal verified Skill mutation result.</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(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonPolymorphic(
     TypeDiscriminatorPropertyName = "kind",
     UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(SkillInstallationOutcomeInstalled), "installed")]
-[JsonDerivedType(typeof(SkillInstallationOutcomeUninstalled), "uninstalled")]
-[JsonDerivedType(typeof(SkillInstallationOutcomeRolledBack), "rolled-back")]
-[JsonDerivedType(typeof(SkillInstallationOutcomeRecoveryRequired), "recovery-required")]
-[JsonDerivedType(typeof(SkillInstallationOutcomeDeclined), "declined")]
-[JsonDerivedType(typeof(SkillInstallationOutcomeCancelled), "cancelled")]
-[JsonDerivedType(typeof(SkillInstallationOutcomeRefused), "refused")]
-public partial class SkillInstallationOutcome
+[JsonDerivedType(typeof(McpPlanRequiredValueScalar), "scalar")]
+[JsonDerivedType(typeof(McpPlanRequiredValueEnum), "enum")]
+public partial class McpPlanRequiredValue
 {
     /// <summary>The type discriminator.</summary>
     [JsonPropertyName("kind")]
@@ -4671,206 +4670,285 @@ public partial class SkillInstallationOutcome
 }
 
 
-/// <summary>The verified Skill was installed disabled.</summary>
-/// <remarks>The <c>installed</c> variant of <see cref="SkillInstallationOutcome"/>.</remarks>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class SkillInstallationOutcomeInstalled : SkillInstallationOutcome
+public partial class McpPlanRequiredValueScalar : McpPlanRequiredValue
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Kind => "installed";
-
-    /// <summary>Durable installed Skill summary.</summary>
-    [JsonPropertyName("installation")]
-    public required SkillInstallationSummary Installation { get; set; }
-}
+    public override string Kind => "scalar";
 
-/// <summary>The owned Skill was removed.</summary>
-/// <remarks>The <c>uninstalled</c> variant of <see cref="SkillInstallationOutcome"/>.</remarks>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class SkillInstallationOutcomeUninstalled : SkillInstallationOutcome
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "uninstalled";
+    /// <summary>Where the value is applied when the server is launched.</summary>
+    [JsonPropertyName("category")]
+    public required McpPlanValueCategory Category { get; set; }
 
-    /// <summary>Removed installation identity.</summary>
-    [JsonPropertyName("installationId")]
-    public required string InstallationId { 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>Original removal operation identity.</summary>
-    [JsonPropertyName("operationId")]
-    public required string OperationId { 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>The durable transaction was aborted or fully compensated.</summary>
-/// <remarks>The <c>rolled-back</c> variant of <see cref="SkillInstallationOutcome"/>.</remarks>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class SkillInstallationOutcomeRolledBack : SkillInstallationOutcome
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "rolled-back";
+    /// <summary>Whether the value may be supplied more than once.</summary>
+    [JsonPropertyName("isRepeated")]
+    public required bool IsRepeated { get; set; }
 
-    /// <summary>Original operation identity.</summary>
-    [JsonPropertyName("operationId")]
-    public required string OperationId { 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>Cause of the fully aborted or compensated operation.</summary>
-    [JsonPropertyName("reason")]
-    public required SkillInstallationFailureReason Reason { 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>A write may have completed. Recover and inspect durable state before retrying.</summary>
-/// <remarks>The <c>recovery-required</c> variant of <see cref="SkillInstallationOutcome"/>.</remarks>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class SkillInstallationOutcomeRecoveryRequired : SkillInstallationOutcome
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "recovery-required";
+    /// <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>Operation whose durable result must be recovered and inspected.</summary>
-    [JsonPropertyName("operationId")]
-    public required string OperationId { get; set; }
+    /// <summary>Scalar type the value must conform to.</summary>
+    [JsonPropertyName("valueType")]
+    public required McpPlanScalarValueType ValueType { get; set; }
 }
 
-/// <summary>The user declined the confirmation request.</summary>
-/// <remarks>The <c>declined</c> variant of <see cref="SkillInstallationOutcome"/>.</remarks>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class SkillInstallationOutcomeDeclined : SkillInstallationOutcome
+public partial class McpPlanRequiredValueEnum : McpPlanRequiredValue
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Kind => "declined";
+    public override string Kind => "enum";
 
-    /// <summary>Original operation identity.</summary>
-    [JsonPropertyName("operationId")]
-    public required string OperationId { get; set; }
-}
+    /// <summary>Where the value is applied when the server is launched.</summary>
+    [JsonPropertyName("category")]
+    public required McpPlanValueCategory Category { get; set; }
 
-/// <summary>The operation was cancelled before a terminal mutation.</summary>
-/// <remarks>The <c>cancelled</c> variant of <see cref="SkillInstallationOutcome"/>.</remarks>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class SkillInstallationOutcomeCancelled : SkillInstallationOutcome
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "cancelled";
+    /// <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>Original operation identity.</summary>
-    [JsonPropertyName("operationId")]
-    public required string OperationId { 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>The operation was refused without applying changes.</summary>
-/// <remarks>The <c>refused</c> variant of <see cref="SkillInstallationOutcome"/>.</remarks>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class SkillInstallationOutcomeRefused : SkillInstallationOutcome
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "refused";
+    /// <summary>Non-empty permitted value set. Inert untrusted data.</summary>
+    [JsonPropertyName("enumValues")]
+    public required IList<string> EnumValues { get; set; }
 
-    /// <summary>Present once an operation has been allocated.</summary>
+    /// <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("operationId")]
-    public string? OperationId { get; set; }
+    [JsonPropertyName("title")]
+    public string? Title { get; set; }
 
-    /// <summary>Bounded refusal reason.</summary>
-    [JsonPropertyName("reason")]
-    public required SkillInstallationFailureReason Reason { get; set; }
+    /// <summary>Discriminator: the value must be one of `enumValues`.</summary>
+    [JsonPropertyName("valueType")]
+    public required McpPlanEnumValueType ValueType { get; set; }
 }
 
-/// <summary>Original operation progress discriminator.</summary>
-/// <remarks>The <c>completed</c> variant of <see cref="SkillInstallationOperationStatus"/>.</remarks>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class SkillInstallationOperationStatusCompleted : SkillInstallationOperationStatus
+public sealed class McpPlanSecretPlaceholder
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Phase => "completed";
-
-    /// <summary>Whether cancellation was requested before the terminal result.</summary>
-    [JsonPropertyName("cancellationRequested")]
-    public required bool CancellationRequested { 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>Original runtime-issued operation identity.</summary>
-    [JsonPropertyName("operationId")]
-    public required string OperationId { get; set; }
+    /// <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>Immutable terminal receipt.</summary>
-    [JsonPropertyName("outcome")]
-    public required SkillInstallationOutcome Outcome { 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)]
+    [JsonPropertyName("title")]
+    public string? Title { get; set; }
 }
 
-/// <summary>Original-connection operation snapshot.</summary>
-/// <remarks>The <c>operation</c> variant of <see cref="SkillInstallationManagementOutcome"/>.</remarks>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class SkillInstallationManagementOutcomeOperation : SkillInstallationManagementOutcome
+public partial class McpPlanTransportChoicePackage : McpPlanTransportChoice
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Kind => "operation";
+    public override string InstallMethod => "package";
 
-    /// <summary>Operation status.</summary>
-    [JsonPropertyName("operation")]
-    public required SkillInstallationOperationStatus Operation { 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>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>Enablement changed and the selected session was reconciled.</summary>
-/// <remarks>The <c>enabled-changed</c> variant of <see cref="SkillInstallationManagementOutcome"/>.</remarks>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class SkillInstallationManagementOutcomeEnabledChanged : SkillInstallationManagementOutcome
+public partial class McpPlanTransportChoiceRemote : McpPlanTransportChoice
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Kind => "enabled-changed";
+    public override string InstallMethod => "remote";
 
-    /// <summary>Safe reload or reconciliation diagnostics.</summary>
-    [JsonPropertyName("diagnostics")]
-    public required IList<string> Diagnostics { 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>Updated installation summary.</summary>
-    [JsonPropertyName("installation")]
-    public required SkillInstallationSummary Installation { 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>The management request was refused.</summary>
-/// <remarks>The <c>refused</c> variant of <see cref="SkillInstallationManagementOutcome"/>.</remarks>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class SkillInstallationManagementOutcomeRefused : SkillInstallationManagementOutcome
+public sealed class McpInstallPlan
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "refused";
+    /// <summary>Alternative configuration changes, with exactly one entry for each transportChoices entry in the same order. Only the entry for the subsequently selected transport applies; these are not cumulative writes. Payloads remain behind the runtime boundary.</summary>
+    [JsonPropertyName("configurationChanges")]
+    public IList<McpPlanConfigurationChange> ConfigurationChanges { get => field ??= []; set; }
 
-    /// <summary>Bounded refusal reason.</summary>
-    [JsonPropertyName("reason")]
-    public required SkillInstallationFailureReason Reason { get; set; }
+    /// <summary>Normalised identity of the server the plan would install.</summary>
+    [JsonPropertyName("identity")]
+    public McpPlanResourceIdentity Identity { get => field ??= new(); set; }
+
+    /// <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>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>Outcome of evaluating the server against registry and enterprise policy.</summary>
+    [JsonPropertyName("policy")]
+    public McpPlanPolicyResult Policy { get => field ??= new(); 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>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>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>True only when every eligible transport choice needs additional values or secrets. False means at least one choice needs no additional configuration, not that every choice is ready. A later apply operation must validate the selected choice's own inputs, secrets and policy after explicit confirmation.</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>The <c>outcome</c> variant of <see cref="SkillInstallationManagementResult"/>.</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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class SkillInstallationManagementResultOutcome : SkillInstallationManagementResult
+public partial class McpPlanInstallResultPlanned : McpPlanInstallResult
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Kind => "outcome";
+    public override string Kind => "planned";
 
-    /// <summary>Capabilities honoured for this request.</summary>
+    /// <summary>Protocol version and capabilities the runtime honoured.</summary>
     [JsonPropertyName("negotiated")]
     public required CatalogNegotiatedContract Negotiated { get; set; }
 
-    /// <summary>Observed management outcome.</summary>
-    [JsonPropertyName("outcome")]
-    public required SkillInstallationManagementOutcome Outcome { get; set; }
+    /// <summary>The normalised plan.</summary>
+    [JsonPropertyName("plan")]
+    public required McpInstallPlan Plan { get; set; }
 }
 
 /// <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="SkillInstallationManagementResult"/>.</remarks>
+/// <remarks>The <c>negotiation-refused</c> variant of <see cref="McpPlanInstallResult"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class SkillInstallationManagementResultNegotiationRefused : SkillInstallationManagementResult
+public partial class McpPlanInstallResultNegotiationRefused : McpPlanInstallResult
 {
     /// <inheritdoc />
     [JsonIgnore]
@@ -4903,10 +4981,34 @@ public partial class SkillInstallationManagementResultNegotiationRefused : Skill
     public required IList<string> UnsupportedCapabilities { get; set; }
 }
 
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class McpPlanInstallResultHandleRejected : McpPlanInstallResult
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "handle-rejected";
+
+    /// <summary>Which kind of handle was presented.</summary>
+    [JsonPropertyName("handleType")]
+    public required CatalogHandleType HandleType { get; set; }
+
+    /// <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>The request was rejected because a bounded field fell outside its permitted range or a required field was unusable. Pagination may also be rejected by the authority after a continuation request; repeat the search without page.</summary>
-/// <remarks>The <c>invalid-request</c> variant of <see cref="SkillInstallationManagementResult"/>.</remarks>
+/// <remarks>The <c>invalid-request</c> variant of <see cref="McpPlanInstallResult"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class SkillInstallationManagementResultInvalidRequest : SkillInstallationManagementResult
+public partial class McpPlanInstallResultInvalidRequest : McpPlanInstallResult
 {
     /// <inheritdoc />
     [JsonIgnore]
@@ -4923,65 +5025,54 @@ public partial class SkillInstallationManagementResultInvalidRequest : SkillInst
     public required string Message { get; set; }
 }
 
-/// <summary>Side-effect-free planning of one verified Agent Finder Skill candidate.</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(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SkillPlanInstallRequest
+public partial class McpPlanInstallResultAuthenticationRequired : McpPlanInstallResult
 {
-    /// <summary>Fresh single-use AI skill candidate handle returned by a bound catalogue search.</summary>
-    [JsonPropertyName("candidateHandle")]
-    public string CandidateHandle { get; set; } = string.Empty;
-
-    /// <summary>Required authenticated bound catalogue and Skill installation capabilities.</summary>
-    [JsonPropertyName("contract")]
-    public CatalogClientContract Contract { get => field ??= new(); set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "authentication-required";
 
-    /// <summary>Existing local session attached to this connection.</summary>
-    [JsonPropertyName("policySessionId")]
-    public string PolicySessionId { get; set; } = string.Empty;
-}
+    /// <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>Skill installation result with the honoured contract, or a typed request/negotiation refusal.</summary>
-/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-[JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "kind",
-    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(SkillInstallationResultOutcome), "outcome")]
-[JsonDerivedType(typeof(SkillInstallationResultNegotiationRefused), "negotiation-refused")]
-[JsonDerivedType(typeof(SkillInstallationResultInvalidRequest), "invalid-request")]
-public partial class SkillInstallationResult
-{
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("kind")]
-    public virtual string Kind { get; set; } = string.Empty;
+    /// <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>The <c>outcome</c> variant of <see cref="SkillInstallationResult"/>.</summary>
+/// <summary>Registry or enterprise policy refused the operation.</summary>
+/// <remarks>The <c>policy-rejected</c> variant of <see cref="McpPlanInstallResult"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class SkillInstallationResultOutcome : SkillInstallationResult
+public partial class McpPlanInstallResultPolicyRejected : McpPlanInstallResult
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Kind => "outcome";
+    public override string Kind => "policy-rejected";
 
-    /// <summary>Capabilities honoured for this request.</summary>
-    [JsonPropertyName("negotiated")]
-    public required CatalogNegotiatedContract Negotiated { 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>Terminal operation outcome.</summary>
-    [JsonPropertyName("outcome")]
-    public required SkillInstallationOutcome Outcome { get; set; }
+    /// <summary>Which authority produced the decision.</summary>
+    [JsonPropertyName("source")]
+    public required McpPlanPolicySource Source { get; set; }
 }
 
-/// <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="SkillInstallationResult"/>.</remarks>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class SkillInstallationResultNegotiationRefused : SkillInstallationResult
+public partial class McpPlanInstallResultNetworkFailure : McpPlanInstallResult
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Kind => "negotiation-refused";
+    public override string Kind => "network-failure";
 
     /// <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")]
@@ -4989,307 +5080,305 @@ public partial class SkillInstallationResultNegotiationRefused : SkillInstallati
     [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>
+    /// <summary>Categorised failure, low cardinality so it can be aggregated without carrying a URL.</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; }
+    public required CatalogNetworkFailureReason Reason { get; set; }
 
-    /// <summary>Capabilities this runtime can safely advertise to this caller. The complete five-capability protocol-3 legacy set is always present; every capability added after that baseline appears only when the caller required it, so an older closed-enum decoder can still consume a refusal. This list does not imply that every deployment has enabled every operation.</summary>
-    [JsonPropertyName("supportedCapabilities")]
-    public required IList<string> SupportedCapabilities { get; set; }
+    /// <summary>Bounded cooldown in seconds before another catalog request should be attempted, when the authority supplied a numeric Retry-After value or the runtime applied its documented fallback.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("retryAfterSeconds")]
+    public int? RetryAfterSeconds { 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>HTTP status code, when the failure was a rejected response.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("statusCode")]
+    public int? StatusCode { get; set; }
 }
 
-/// <summary>The request was rejected because a bounded field fell outside its permitted range or a required field was unusable. Pagination may also be rejected by the authority after a continuation request; repeat the search without page.</summary>
-/// <remarks>The <c>invalid-request</c> variant of <see cref="SkillInstallationResult"/>.</remarks>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class SkillInstallationResultInvalidRequest : SkillInstallationResult
+public partial class McpPlanInstallResultUnsafeRetrieval : McpPlanInstallResult
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Kind => "invalid-request";
-
-    /// <summary>Which request field was rejected.</summary>
-    [JsonPropertyName("field")]
-    public required CatalogInvalidRequestField Field { get; set; }
+    public override string Kind => "unsafe-retrieval";
 
-    /// <summary>Human-readable explanation, safe to surface. Never echoes the offending value, nor a query, URL, handle, or secret.</summary>
+    /// <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>Applies exactly one retained verified Skill installation plan.</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(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SkillApplyInstallRequest
+public partial class McpPlanInstallResultMalformedCard : McpPlanInstallResult
 {
-    /// <summary>Required authenticated bound catalogue and Skill installation capabilities.</summary>
-    [JsonPropertyName("contract")]
-    public CatalogClientContract Contract { get => field ??= new(); set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "malformed-card";
 
-    /// <summary>Opaque original plan, consumed once.</summary>
-    [JsonPropertyName("planHandle")]
-    public string PlanHandle { 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>Same existing selected session as planning.</summary>
-    [JsonPropertyName("policySessionId")]
-    public string PolicySessionId { get; set; } = string.Empty;
+    /// <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>Read-only preparation of one owned Skill removal under fresh selected-session authority.</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(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SkillPlanUninstallRequest
+public partial class McpPlanInstallResultContractViolation : McpPlanInstallResult
 {
-    /// <summary>Required authenticated bound installation contract.</summary>
-    [JsonPropertyName("contract")]
-    public CatalogClientContract Contract { get => field ??= new(); set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "contract-violation";
 
-    /// <summary>Exact receipt to inspect.</summary>
-    [JsonPropertyName("installationId")]
-    public string InstallationId { get; set; } = string.Empty;
+    /// <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>Existing selected local session on this connection.</summary>
-    [JsonPropertyName("policySessionId")]
-    public string PolicySessionId { get; set; } = string.Empty;
+    /// <summary>Which rule the response broke.</summary>
+    [JsonPropertyName("reason")]
+    public required CatalogContractViolationReason Reason { get; set; }
 }
 
-/// <summary>One-use application of the exact retained Skill removal plan.</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(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SkillApplyUninstallRequest
+public partial class McpPlanInstallResultUnavailableTransport : McpPlanInstallResult
 {
-    /// <summary>Required authenticated bound installation contract.</summary>
-    [JsonPropertyName("contract")]
-    public CatalogClientContract Contract { get => field ??= new(); set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "unavailable-transport";
 
-    /// <summary>Opaque original removal plan, consumed once.</summary>
-    [JsonPropertyName("planHandle")]
-    public string PlanHandle { 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>Same existing selected session as removal preparation.</summary>
-    [JsonPropertyName("policySessionId")]
-    public string PolicySessionId { get; set; } = string.Empty;
+    /// <summary>Why no transport could be offered.</summary>
+    [JsonPropertyName("reason")]
+    public required CatalogUnavailableTransportReason Reason { get; set; }
 }
 
-/// <summary>Server-side skill metadata, including name, description, source, enabled/invocable state, path, project path, and argument hint.</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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ServerSkill
+public partial class McpPlanInstallResultNotInstallable : McpPlanInstallResult
 {
-    /// <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 (based on global config).</summary>
-    [JsonPropertyName("enabled")]
-    public bool Enabled { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "not-installable";
 
-    /// <summary>Unique identifier for the skill.</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>Absolute path to the skill file.</summary>
-    [JsonPropertyName("path")]
-    public string? Path { get; set; }
+    /// <summary>Why the candidate cannot be installed.</summary>
+    [JsonPropertyName("reason")]
+    public required CatalogNotInstallableReason Reason { get; set; }
+}
 
-    /// <summary>The project path this skill belongs to (only for project/inherited skills).</summary>
-    [JsonPropertyName("projectPath")]
-    public string? ProjectPath { get; set; }
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class McpPlanInstallResultUnavailable : McpPlanInstallResult
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "unavailable";
 
-    /// <summary>Source location type (e.g., project, personal-copilot, plugin, builtin).</summary>
-    [JsonPropertyName("source")]
-    public SkillSource Source { 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>Whether the skill can be invoked by the user as a slash command.</summary>
-    [JsonPropertyName("userInvocable")]
-    public bool UserInvocable { get; set; }
+    /// <summary>Why the operation is unavailable.</summary>
+    [JsonPropertyName("reason")]
+    public required CatalogUnavailableReason Reason { get; set; }
 }
 
-/// <summary>Skills discovered across global and project sources.</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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ServerSkillList
+public sealed class CatalogClientContract
 {
-    /// <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>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>All discovered skills across all sources.</summary>
-    [JsonPropertyName("skills")]
-    public IList<ServerSkill> Skills { get => field ??= []; 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>Optional project paths and additional skill directories to include in discovery.</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(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SkillsDiscoverRequest
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "kind",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(McpPlanInstallSourceCandidate), "candidate")]
+[JsonDerivedType(typeof(McpPlanInstallSourceCard), "card")]
+public partial class McpPlanInstallSource
 {
-    /// <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 skill scan paths to exclude from discovery.</summary>
-    [JsonPropertyName("ignoredSkillsLocations")]
-    public IList<string>? IgnoredSkillsLocations { 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>The type discriminator.</summary>
+    [JsonPropertyName("kind")]
+    public virtual string Kind { get; set; } = string.Empty;
 }
 
-/// <summary>Canonical directory where skills can be discovered or created, with scope, preference, and optional project path.</summary>
+
+/// <summary>Plan from a candidate returned by a previous catalog search.</summary>
+/// <remarks>The <c>candidate</c> variant of <see cref="McpPlanInstallSource"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SkillDiscoveryPath
+public partial class McpPlanInstallSourceCandidate : McpPlanInstallSource
 {
-    /// <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 => "candidate";
 
-    /// <summary>The input project path this directory was derived from (only for project scope).</summary>
-    [JsonPropertyName("projectPath")]
-    public string? ProjectPath { 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>Which tier this directory belongs to.</summary>
-    [JsonPropertyName("scope")]
-    public SkillDiscoveryScope Scope { get; set; }
+    /// <summary>The runtime- or authority-minted `searchId` returned with the search that produced this candidate. Planning verifies the private correlation and atomically consumes a matching candidate before downstream work, including attempts that subsequently fail or report unavailable. A mismatched search does not consume the candidate. 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>Canonical locations where skills can be created so the runtime will recognize them.</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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SkillDiscoveryPathList
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "kind",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(McpServerCardReferenceUrl), "url")]
+[JsonDerivedType(typeof(McpServerCardReferenceEmbedded), "embedded")]
+public partial class McpServerCardReference
 {
-    /// <summary>Canonical skill create/discovery directories, in priority order.</summary>
-    [JsonPropertyName("paths")]
-    public IList<SkillDiscoveryPath> Paths { get => field ??= []; set; }
+    /// <summary>The type discriminator.</summary>
+    [JsonPropertyName("kind")]
+    public virtual string Kind { get; set; } = string.Empty;
 }
 
-/// <summary>Optional project paths to enumerate.</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(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SkillsGetDiscoveryPathsRequest
+public partial class McpServerCardReferenceUrl : McpServerCardReference
 {
-    /// <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; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "url";
 
-    /// <summary>Optional skill scan paths to exclude from discovery.</summary>
-    [JsonPropertyName("ignoredSkillsLocations")]
-    public IList<string>? IgnoredSkillsLocations { 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 project directory paths. When omitted or empty, only personal and custom directories are returned.</summary>
-    [JsonPropertyName("projectPaths")]
-    public IList<string>? ProjectPaths { 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>Inventory request under an explicitly selected existing session.</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(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SkillInstallationsRequest
+public partial class McpServerCardReferenceEmbedded : McpServerCardReference
 {
-    /// <summary>Required authenticated bound installation contract.</summary>
-    [JsonPropertyName("contract")]
-    public CatalogClientContract Contract { get => field ??= new(); set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "embedded";
 
-    /// <summary>Existing selected local session on this connection.</summary>
-    [JsonPropertyName("policySessionId")]
-    public string PolicySessionId { get; set; } = string.Empty;
+    /// <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>Media type the card is expected to conform to.</summary>
+    [JsonPropertyName("mediaType")]
+    public required McpServerCardMediaType MediaType { get; set; }
 }
 
-/// <summary>Existing-operation control. A new session selector is deliberately not accepted.</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(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SkillInstallationOperationRequest
+public partial class McpPlanInstallSourceCard : McpPlanInstallSource
 {
-    /// <summary>Required authenticated bound Skill installation capability.</summary>
-    [JsonPropertyName("contract")]
-    public CatalogClientContract Contract { get => field ??= new(); set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "card";
 
-    /// <summary>Exact runtime-issued operation ID on the original connection.</summary>
-    [JsonPropertyName("operationId")]
-    public string OperationId { get; set; } = string.Empty;
+    /// <summary>The card to plan from: exactly one of a URL or embedded data.</summary>
+    [JsonPropertyName("card")]
+    public required McpServerCardReference Card { get; set; }
 }
 
-/// <summary>Persisted enablement update for one owned Skill installation.</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(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SkillSetEnabledRequest
+public sealed class McpPlanInstallRequest
 {
-    /// <summary>Required authenticated bound Skill installation capability.</summary>
+    /// <summary>Protocol version and capabilities the caller requires.</summary>
     [JsonPropertyName("contract")]
-    public CatalogClientContract Contract { get => field ??= new(); set; }
-
-    /// <summary>Persisted enablement value.</summary>
-    [JsonPropertyName("enabled")]
-    public bool Enabled { get; set; }
-
-    /// <summary>Exact receipt identity to update.</summary>
-    [JsonPropertyName("installationId")]
-    public string InstallationId { get; set; } = string.Empty;
+    public required CatalogClientContract Contract { get; set; }
 
-    /// <summary>Existing selected local session to reconcile after persistence.</summary>
+    /// <summary>The same existing attached session that owns the original catalogue candidate.</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("policySessionId")]
-    public string PolicySessionId { get; set; } = string.Empty;
-}
-
-/// <summary>Skill names to mark as disabled in global configuration, replacing any previous list.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SkillsConfigSetDisabledSkillsRequest
-{
-    /// <summary>List of skill names to disable.</summary>
-    [JsonPropertyName("disabledSkills")]
-    public IList<string> DisabledSkills { get => field ??= []; set; }
-}
+    public string? PolicySessionId { get; set; }
 
-/// <summary>Adds or removes a single skill from the global disabled list, leaving every other entry untouched.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SkillsConfigSetSkillDisabledRequest
-{
-    /// <summary>True to disable the skill, false to enable it.</summary>
-    [JsonPropertyName("disabled")]
-    public bool Disabled { get; set; }
+    /// <summary>Configuration scope the plan targets. Defaults to user scope when omitted.</summary>
+    [JsonPropertyName("scope")]
+    public McpPlanScope? Scope { 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>What to plan: either a candidate handle from a previous search, or a card supplied directly.</summary>
+    [JsonPropertyName("source")]
+    public required McpPlanInstallSource Source { get; set; }
 }
 
-/// <summary>Outcome of a catalog.search call: either bounded inert candidates, or one typed refusal. Never a partial success.</summary>
+/// <summary>Management result with contract receipt, or a typed request/negotiation refusal.</summary>
 /// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
 [Experimental(global::GitHub.Copilot.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
+[JsonDerivedType(typeof(McpInstallationManagementResultOutcome), "outcome")]
+[JsonDerivedType(typeof(McpInstallationManagementResultNegotiationRefused), "negotiation-refused")]
+[JsonDerivedType(typeof(McpInstallationManagementResultInvalidRequest), "invalid-request")]
+public partial class McpInstallationManagementResult
 {
     /// <summary>The type discriminator.</summary>
     [JsonPropertyName("kind")]
@@ -5297,16 +5386,20 @@ public partial class CatalogSearchResult
 }
 
 
-/// <summary>One inert catalog result, represented as an MCP server, discovery-only AI skill, or opt-in Agent Plugin variant so kind, media type, provenance, and available operations cannot contradict each other.</summary>
+/// <summary>Read-only or recovery management result, never permission to activate or replay.</summary>
 /// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonPolymorphic(
     TypeDiscriminatorPropertyName = "kind",
     UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(CatalogCandidateMcpServer), "mcp-server")]
-[JsonDerivedType(typeof(CatalogCandidateAiSkill), "ai-skill")]
-[JsonDerivedType(typeof(CatalogCandidatePlugin), "plugin")]
-public partial class CatalogCandidate
+[JsonDerivedType(typeof(McpInstallationManagementOutcomeRecoveryRequired), "recovery-required")]
+[JsonDerivedType(typeof(McpInstallationManagementOutcomeInstallPrepared), "install-prepared")]
+[JsonDerivedType(typeof(McpInstallationManagementOutcomeListed), "listed")]
+[JsonDerivedType(typeof(McpInstallationManagementOutcomeRecovered), "recovered")]
+[JsonDerivedType(typeof(McpInstallationManagementOutcomeUninstallPlanned), "uninstall-planned")]
+[JsonDerivedType(typeof(McpInstallationManagementOutcomeOperation), "operation")]
+[JsonDerivedType(typeof(McpInstallationManagementOutcomeRefused), "refused")]
+public partial class McpInstallationManagementOutcome
 {
     /// <summary>The type discriminator.</summary>
     [JsonPropertyName("kind")]
@@ -5314,856 +5407,699 @@ public partial class CatalogCandidate
 }
 
 
-/// <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>
+/// <summary>Already-confirmed durable work must be reconciled before new mutations or inventory.</summary>
+/// <remarks>The <c>recovery-required</c> variant of <see cref="McpInstallationManagementOutcome"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class CatalogMcpServerCandidateProvenance
+public partial class McpInstallationManagementOutcomeRecoveryRequired : McpInstallationManagementOutcome
 {
-    /// <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>JSON MCP media type advertised for the referenced card.</summary>
-    [JsonPropertyName("mediaType")]
-    public McpServerCardMediaType MediaType { 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;
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "recovery-required";
 }
 
-/// <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>
+/// <summary>Inert, runtime-owned admission. The operation ID is known before confirmation or effects.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-[JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "kind",
-    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(CatalogCandidateSourceUrl), "url")]
-[JsonDerivedType(typeof(CatalogCandidateSourceEmbedded), "embedded")]
-public partial class CatalogCandidateSource
+public sealed class McpPreparedInstall
 {
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("kind")]
-    public virtual string Kind { get; set; } = string.Empty;
-}
+    /// <summary>Original plan expiry in Unix epoch milliseconds; preparation does not extend it.</summary>
+    [JsonPropertyName("expiresAtEpochMs")]
+    public long ExpiresAtEpochMs { get; set; }
 
+    /// <summary>Original connection-owned operation, known before the first confirmation callback.</summary>
+    [JsonPropertyName("operationId")]
+    public string OperationId { get; set; } = string.Empty;
+}
 
-/// <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>
+/// <summary>The <c>install-prepared</c> variant of <see cref="McpInstallationManagementOutcome"/>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class CatalogCandidateSourceUrl : CatalogCandidateSource
+public partial class McpInstallationManagementOutcomeInstallPrepared : McpInstallationManagementOutcome
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Kind => "url";
+    public override string Kind => "install-prepared";
 
-    /// <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>Known original operation identity, returned before callback or effects.</summary>
+    [JsonPropertyName("operation")]
+    public required McpPreparedInstall Operation { get; set; }
 }
 
-/// <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>
+/// <summary>A versioned, bounded trust observation carried unchanged with a catalog candidate and its private handle context. Current observations require a recognised T1/T2 tier; every non-current state structurally forbids a tier. Eligibility remains `unknown` while Agent Finder supplies no exposure decision, and states absent from its current wire are never inferred from age, relevance, popularity, or a tier transition.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>status</c>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class CatalogCandidateSourceEmbedded : CatalogCandidateSource
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "status",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(CatalogTrustSnapshotCurrent), "current")]
+[JsonDerivedType(typeof(CatalogTrustSnapshotAbsent), "absent")]
+[JsonDerivedType(typeof(CatalogTrustSnapshotStale), "stale")]
+[JsonDerivedType(typeof(CatalogTrustSnapshotDowngraded), "downgraded")]
+[JsonDerivedType(typeof(CatalogTrustSnapshotRevoked), "revoked")]
+[JsonDerivedType(typeof(CatalogTrustSnapshotUnsupported), "unsupported")]
+[JsonDerivedType(typeof(CatalogTrustSnapshotMalformed), "malformed")]
+public partial class CatalogTrustSnapshot
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "embedded";
+    /// <summary>The type discriminator.</summary>
+    [JsonPropertyName("status")]
+    public virtual string Status { get; set; } = string.Empty;
 }
 
-/// <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>
+
+/// <summary>Where and when the runtime observed the trust metadata. Observation time is not the authority's evaluation time and must not be used to infer staleness.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class CatalogCandidateMcpServer : CatalogCandidate
+public sealed class CatalogTrustProvenance
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "mcp-server";
-
-    /// <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>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>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>
+    /// <summary>ISO 8601 timestamp with a timezone offset at which the runtime observed the search result carrying this trust field.</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; }
+    [MinLength(20)]
+    [MaxLength(64)]
+    [JsonPropertyName("observedAt")]
+    public DateTimeOffset ObservedAt { 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>Bounded authority that supplied the trust field.</summary>
+    [JsonPropertyName("source")]
+    public CatalogTrustSource Source { 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>A recognised current Agent Finder T1 or T2 trust tier.</summary>
+/// <remarks>The <c>current</c> variant of <see cref="CatalogTrustSnapshot"/>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class CatalogTrustSnapshotCurrent : CatalogTrustSnapshot
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Status => "current";
 
-    /// <summary>JSON MCP media type of the underlying card.</summary>
-    [JsonPropertyName("mediaType")]
-    public required McpServerCardMediaType MediaType { get; set; }
+    /// <summary>Service-computed exposure eligibility. `unknown` is required while Agent Finder returns no explicit eligibility field.</summary>
+    [JsonPropertyName("eligibility")]
+    public required CatalogTrustEligibility Eligibility { get; set; }
 
-    /// <summary>Where the catalog reference was observed, without the card itself or any content digest.</summary>
+    /// <summary>Bounded source and observation time for this snapshot. This is distinct from evidence used by the authority to calculate trust.</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; }
+    public required CatalogTrustProvenance Provenance { 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>Schema version of this runtime-owned snapshot envelope.</summary>
+    [JsonPropertyName("schemaVersion")]
+    public required CatalogTrustSnapshotSchemaVersion SchemaVersion { get; set; }
 
-    /// <summary>Versioned trust metadata observed from the catalog authority. Optional for protocol-3 compatibility with runtimes that predate trust snapshots. A trust-capable runtime emits an explicit snapshot even when the authority omitted or malformed its trust field.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("trust")]
-    public CatalogTrustSnapshot? Trust { get; set; }
+    /// <summary>Service-computed T1 or T2 trust tier.</summary>
+    [JsonPropertyName("tier")]
+    public required CatalogTrustTier Tier { get; set; }
 }
 
-/// <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>
+/// <summary>Discriminator: the authority omitted trust metadata.</summary>
+/// <remarks>The <c>absent</c> variant of <see cref="CatalogTrustSnapshot"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class CatalogAiSkillCandidateProvenance
+public partial class CatalogTrustSnapshotAbsent : CatalogTrustSnapshot
 {
-    /// <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;
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Status => "absent";
 
-    /// <summary>Media type advertised for the referenced AI skill card.</summary>
-    [JsonPropertyName("mediaType")]
-    public CatalogAiSkillMediaType MediaType { get; set; }
+    /// <summary>Service-computed exposure eligibility. `unknown` is required while Agent Finder returns no explicit eligibility field.</summary>
+    [JsonPropertyName("eligibility")]
+    public required CatalogTrustEligibility Eligibility { 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>Bounded source and observation time for this snapshot. This is distinct from evidence used by the authority to calculate trust.</summary>
+    [JsonPropertyName("provenance")]
+    public required CatalogTrustProvenance Provenance { get; set; }
+
+    /// <summary>Schema version of this runtime-owned snapshot envelope.</summary>
+    [JsonPropertyName("schemaVersion")]
+    public required CatalogTrustSnapshotSchemaVersion SchemaVersion { get; set; }
 }
 
-/// <summary>An inert AI skill catalog result. Verified Skill candidates may be installable only when the runtime reports installability and the selected session is permitted to plan installation.</summary>
-/// <remarks>The <c>ai-skill</c> variant of <see cref="CatalogCandidate"/>.</remarks>
+/// <summary>Discriminator: the authority explicitly marked the assessment stale.</summary>
+/// <remarks>The <c>stale</c> variant of <see cref="CatalogTrustSnapshot"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class CatalogCandidateAiSkill : CatalogCandidate
+public partial class CatalogTrustSnapshotStale : CatalogTrustSnapshot
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Kind => "ai-skill";
+    public override string Status => "stale";
 
-    /// <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>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>Service-computed exposure eligibility. `unknown` is required while Agent Finder returns no explicit eligibility field.</summary>
+    [JsonPropertyName("eligibility")]
+    public required CatalogTrustEligibility Eligibility { 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>Bounded source and observation time for this snapshot. This is distinct from evidence used by the authority to calculate trust.</summary>
+    [JsonPropertyName("provenance")]
+    public required CatalogTrustProvenance Provenance { 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>Schema version of this runtime-owned snapshot envelope.</summary>
+    [JsonPropertyName("schemaVersion")]
+    public required CatalogTrustSnapshotSchemaVersion SchemaVersion { get; set; }
+}
 
-    /// <summary>Whether this AI skill candidate can be planned for verified installation in the selected session.</summary>
-    [JsonPropertyName("installability")]
-    public required CatalogAiSkillInstallability Installability { get; set; }
+/// <summary>Discriminator: the authority explicitly reported a downgraded assessment.</summary>
+/// <remarks>The <c>downgraded</c> variant of <see cref="CatalogTrustSnapshot"/>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class CatalogTrustSnapshotDowngraded : CatalogTrustSnapshot
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Status => "downgraded";
 
-    /// <summary>Media type of the underlying AI skill card.</summary>
-    [JsonPropertyName("mediaType")]
-    public required CatalogAiSkillMediaType MediaType { get; set; }
+    /// <summary>Service-computed exposure eligibility. `unknown` is required while Agent Finder returns no explicit eligibility field.</summary>
+    [JsonPropertyName("eligibility")]
+    public required CatalogTrustEligibility Eligibility { get; set; }
 
-    /// <summary>Where the catalog reference was observed, without the card itself or any content digest.</summary>
+    /// <summary>Bounded source and observation time for this snapshot. This is distinct from evidence used by the authority to calculate trust.</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; }
+    public required CatalogTrustProvenance Provenance { get; set; }
 
-    /// <summary>Versioned trust metadata observed from the catalog authority. Optional for protocol-3 compatibility with runtimes that predate trust snapshots. A trust-capable runtime emits an explicit snapshot even when the authority omitted or malformed its trust field.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("trust")]
-    public CatalogTrustSnapshot? Trust { get; set; }
+    /// <summary>Schema version of this runtime-owned snapshot envelope.</summary>
+    [JsonPropertyName("schemaVersion")]
+    public required CatalogTrustSnapshotSchemaVersion SchemaVersion { get; set; }
 }
 
-/// <summary>Where and when an Agent Plugin catalog reference was observed. Discovery provenance deliberately carries no descriptor URL, raw data, candidate handle, or content digest.</summary>
+/// <summary>Discriminator: the authority explicitly revoked the assessment.</summary>
+/// <remarks>The <c>revoked</c> variant of <see cref="CatalogTrustSnapshot"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class CatalogAgentPluginCandidateProvenance
+public partial class CatalogTrustSnapshotRevoked : CatalogTrustSnapshot
 {
-    /// <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;
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Status => "revoked";
 
-    /// <summary>Canonical Agent Plugin media type.</summary>
-    [JsonPropertyName("mediaType")]
-    public CatalogAgentPluginMediaType MediaType { get; set; }
+    /// <summary>Service-computed exposure eligibility. `unknown` is required while Agent Finder returns no explicit eligibility field.</summary>
+    [JsonPropertyName("eligibility")]
+    public required CatalogTrustEligibility Eligibility { 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>Bounded source and observation time for this snapshot. This is distinct from evidence used by the authority to calculate trust.</summary>
+    [JsonPropertyName("provenance")]
+    public required CatalogTrustProvenance Provenance { get; set; }
+
+    /// <summary>Schema version of this runtime-owned snapshot envelope.</summary>
+    [JsonPropertyName("schemaVersion")]
+    public required CatalogTrustSnapshotSchemaVersion SchemaVersion { get; set; }
 }
 
-/// <summary>Syntactically validated GitHub repository provenance declared by catalog metadata. This is a source claim rather than proof that the descriptor URL resolves to the repository.</summary>
+/// <summary>Discriminator: the authority supplied a bounded trust value this runtime does not understand.</summary>
+/// <remarks>The <c>unsupported</c> variant of <see cref="CatalogTrustSnapshot"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class CatalogPluginRepositorySource
+public partial class CatalogTrustSnapshotUnsupported : CatalogTrustSnapshot
 {
-    /// <summary>Case-preserving safe relative POSIX path derived from metadata.repoPath.</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("path")]
-    public string Path { get; set; } = string.Empty;
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Status => "unsupported";
 
-    /// <summary>Canonical lowercase owner/repository name derived from metadata.sourceSet.</summary>
-    [RegularExpression("^[a-z0-9_.-]+/[a-z0-9_.-]+$")]
-    [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(3)]
-    [MaxLength(256)]
-    [JsonPropertyName("repository")]
-    public string Repository { get; set; } = string.Empty;
+    /// <summary>Service-computed exposure eligibility. `unknown` is required while Agent Finder returns no explicit eligibility field.</summary>
+    [JsonPropertyName("eligibility")]
+    public required CatalogTrustEligibility Eligibility { get; set; }
+
+    /// <summary>Bounded source and observation time for this snapshot. This is distinct from evidence used by the authority to calculate trust.</summary>
+    [JsonPropertyName("provenance")]
+    public required CatalogTrustProvenance Provenance { get; set; }
+
+    /// <summary>Schema version of this runtime-owned snapshot envelope.</summary>
+    [JsonPropertyName("schemaVersion")]
+    public required CatalogTrustSnapshotSchemaVersion SchemaVersion { get; set; }
 }
 
-/// <summary>An inert Agent Plugin catalog result. Its canonical catalog identity, declared version, repository source claim, and explicit compatibility tags are safe to correlate, while its descriptor, URL, raw data, and installed-plugin state remain runtime-private. This contract-only variant does not mint or expose a candidate handle.</summary>
-/// <remarks>The <c>plugin</c> variant of <see cref="CatalogCandidate"/>.</remarks>
+/// <summary>Discriminator: the trust field was empty, unbounded, or had the wrong JSON type.</summary>
+/// <remarks>The <c>malformed</c> variant of <see cref="CatalogTrustSnapshot"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class CatalogCandidatePlugin : CatalogCandidate
+public partial class CatalogTrustSnapshotMalformed : CatalogTrustSnapshot
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Kind => "plugin";
+    public override string Status => "malformed";
 
-    /// <summary>Explicit validated compatibility tags, in canonical order. An empty list means the source declared no recognised compatibility; clients must not infer compatibility from other fields. `canvas-only` requires both `canvas` and `github-copilot`.</summary>
-    [JsonPropertyName("compatibilityTags")]
-    public required IList<CatalogAgentPluginCompatibilityTag> CompatibilityTags { get; set; }
+    /// <summary>Service-computed exposure eligibility. `unknown` is required while Agent Finder returns no explicit eligibility field.</summary>
+    [JsonPropertyName("eligibility")]
+    public required CatalogTrustEligibility Eligibility { 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)]
+    /// <summary>Bounded source and observation time for this snapshot. This is distinct from evidence used by the authority to calculate trust.</summary>
+    [JsonPropertyName("provenance")]
+    public required CatalogTrustProvenance Provenance { get; set; }
+
+    /// <summary>Schema version of this runtime-owned snapshot envelope.</summary>
+    [JsonPropertyName("schemaVersion")]
+    public required CatalogTrustSnapshotSchemaVersion SchemaVersion { get; set; }
+}
+
+/// <summary>Catalogue identity retained from a bound candidate or plan at installation time.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class InstallationCatalogueIdentity
+{
+    /// <summary>Catalogue description retained at install planning time.</summary>
     [JsonPropertyName("description")]
     public string? Description { 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)]
+    /// <summary>Human display name retained from the catalogue candidate.</summary>
     [JsonPropertyName("displayName")]
-    public required string DisplayName { get; set; }
-
-    /// <summary>Validated, normalised catalogue resource URN. This identity comes only from the catalog identifier and is never inferred from display text or installed-plugin state.</summary>
-    [JsonPropertyName("identity")]
-    public required string Identity { get; set; }
-
-    /// <summary>Canonical Agent Plugin media type.</summary>
-    [JsonPropertyName("mediaType")]
-    public required CatalogAgentPluginMediaType MediaType { get; set; }
+    public string DisplayName { get; set; } = string.Empty;
 
-    /// <summary>Where the Agent Plugin catalog reference was observed, without its descriptor, URL, raw data, or content digest.</summary>
-    [JsonPropertyName("provenance")]
-    public required CatalogAgentPluginCandidateProvenance Provenance { get; set; }
+    /// <summary>Catalogue item URL when supplied by the authority.</summary>
+    [JsonPropertyName("itemUrl")]
+    public string? ItemUrl { 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)]
+    /// <summary>Catalogue publisher retained at install planning time.</summary>
     [JsonPropertyName("publisher")]
     public string? Publisher { get; set; }
 
-    /// <summary>Bounded repository provenance declared through the catalog's sourceSet and repoPath metadata. It contains no descriptor URL.</summary>
+    /// <summary>Authority resource identifier when supplied by the catalogue.</summary>
+    [JsonPropertyName("resourceId")]
+    public string? ResourceId { get; set; }
+
+    /// <summary>Catalogue authority/source string that supplied the candidate.</summary>
     [JsonPropertyName("source")]
-    public required CatalogPluginRepositorySource Source { get; set; }
+    public string Source { get; set; } = string.Empty;
 
-    /// <summary>Versioned trust metadata observed from the catalog authority. Optional for protocol-3 compatibility and emitted only when the caller also requires the trust-snapshot capability.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("trust")]
-    public CatalogTrustSnapshot? Trust { get; set; }
+    /// <summary>Catalogue trust observation retained at install planning time.</summary>
+    [JsonPropertyName("trustAtInstall")]
+    public CatalogTrustSnapshot? TrustAtInstall { get; set; }
 
-    /// <summary>Optional version declared by the catalog source. Omitted rather than guessed when the source supplies no version.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    /// <summary>Catalogue version retained at install planning time.</summary>
     [JsonPropertyName("version")]
     public string? Version { get; set; }
 }
 
-/// <summary>Authority-reported navigation metadata, returned only to callers requiring catalog-search-pagination and only when a supported token is present. Tokenless first-page and continuation responses omit this object; no counts are inferred from candidates. The opaque token may be retained for previous or numbered navigation even when hasNextPage is false.</summary>
+/// <summary>Durable configuration ownership is distinct from session-specific usability.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class CatalogSearchPagination
+public sealed class McpInstallationSummary
 {
-    /// <summary>One-based page returned by the authority.</summary>
-    [JsonPropertyName("currentPage")]
-    public int CurrentPage { get; set; }
-
-    /// <summary>Whether the authority token advertises a valid next target within the navigation window. Not inferred from token presence, truncated, or currentPage being less than pageCount.</summary>
-    [JsonPropertyName("hasNextPage")]
-    public bool HasNextPage { get; set; }
+    /// <summary>Catalogue identity retained from the installed plan when available.</summary>
+    [JsonPropertyName("catalogue")]
+    public InstallationCatalogueIdentity? Catalogue { get; set; }
 
-    /// <summary>Navigation window ceiling ceil(1000 / pageSize), not the number of existing pages. Legal targets must not exceed this ceiling or the token's signed pageCount.</summary>
-    [JsonPropertyName("maxPage")]
-    public int MaxPage { get; set; }
+    /// <summary>Exact alternative retained in the installing receipt.</summary>
+    [JsonPropertyName("choiceId")]
+    public string ChoiceId { get; set; } = string.Empty;
 
-    /// <summary>Backend-reported page count, which may exceed maxPage. Present pagination metadata always describes a multi-page result; zero- and single-page responses omit pagination. Navigation targets must also be within the signed pageCount carried by the supplied token.</summary>
-    [JsonPropertyName("pageCount")]
-    public long PageCount { get; set; }
+    /// <summary>Identity retained from the validated original plan.</summary>
+    [JsonPropertyName("identity")]
+    public McpPlanResourceIdentity Identity { get => field ??= new(); set; }
 
-    /// <summary>Page size bound to the search, equal to the effective request limit.</summary>
-    [JsonPropertyName("pageSize")]
-    public int PageSize { get; set; }
+    /// <summary>Exact durable installation receipt identity.</summary>
+    [JsonPropertyName("installationId")]
+    public string InstallationId { get; set; } = string.Empty;
 
-    /// <summary>Opaque pagination token. Session-bound search returns an expiring runtime-owned reference retaining the exact private authority token, original search and authority. Legacy unbound search returns the authority token unchanged, without a runtime-created expiry. Only the runtime unwraps tokens or changes targetPage; SDK consumers must not decode, modify or log them.</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(4096)]
-    [JsonPropertyName("token")]
-    public string Token { get; set; } = string.Empty;
+    /// <summary>ISO 8601 wall-clock installation time when available.</summary>
+    [JsonPropertyName("installedAt")]
+    public string? InstalledAt { get; set; }
 
-    /// <summary>Backend-reported count for this response, not the number of returned candidates. Its relationship to the full query result set is unknown.</summary>
-    [JsonPropertyName("totalCount")]
-    public long TotalCount { get; set; }
+    /// <summary>Original installing operation, not a fresh management operation.</summary>
+    [JsonPropertyName("operationId")]
+    public string OperationId { get; set; } = string.Empty;
 
-    /// <summary>The relationship of totalCount to the complete query result set is unknown; neither exactness nor a lower-bound guarantee is implied.</summary>
-    [JsonPropertyName("totalCountRelation")]
-    public CatalogSearchTotalCountRelation TotalCountRelation { get; set; }
+    /// <summary>Ownership or setup state, never inferred proof of tool usability.</summary>
+    [JsonPropertyName("state")]
+    public McpInstallationState State { get; set; }
 }
 
-/// <summary>A completed catalog search containing inert candidate summaries. MCP server and AI skill variants carry a single-use handle; the Agent Plugin variant is handleless.</summary>
-/// <remarks>The <c>succeeded</c> variant of <see cref="CatalogSearchResult"/>.</remarks>
+/// <summary>The <c>listed</c> variant of <see cref="McpInstallationManagementOutcome"/>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class CatalogSearchResultSucceeded : CatalogSearchResult
+public partial class McpInstallationManagementOutcomeListed : McpInstallationManagementOutcome
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Kind => "succeeded";
-
-    /// <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>Protocol version and capabilities the runtime honoured.</summary>
-    [JsonPropertyName("negotiated")]
-    public required CatalogNegotiatedContract Negotiated { get; set; }
-
-    /// <summary>Navigation metadata for callers explicitly requiring catalog-search-pagination. Omitted when the authority returns no token, including tokenless first-page and continuation responses. Counts are never substituted from candidates.length.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("pagination")]
-    public CatalogSearchPagination? Pagination { 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; }
+    public override string Kind => "listed";
 
-    /// <summary>Legacy indication that the authority returned a page token. Preserved for compatibility; this is not a has-next-page indicator. Use pagination.hasNextPage when pagination metadata is present.</summary>
-    [JsonPropertyName("truncated")]
-    public required bool Truncated { get; set; }
+    /// <summary>Owned receipts visible to the selected account and host.</summary>
+    [JsonPropertyName("installations")]
+    public required IList<McpInstallationSummary> Installations { get; set; }
 }
 
-/// <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>
+/// <summary>The <c>recovered</c> variant of <see cref="McpInstallationManagementOutcome"/>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class CatalogSearchResultNegotiationRefused : CatalogSearchResult
+public partial class McpInstallationManagementOutcomeRecovered : McpInstallationManagementOutcome
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Kind => "negotiation-refused";
+    public override string Kind => "recovered";
 
-    /// <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>Freshly inspected receipts after successful durable reconciliation.</summary>
+    [JsonPropertyName("installations")]
+    public required IList<McpInstallationSummary> Installations { get; set; }
+}
 
-    /// <summary>Lowest caller protocol version this runtime will serve.</summary>
-    [JsonPropertyName("minimumSupportedProtocolVersion")]
-    public required long MinimumSupportedProtocolVersion { get; set; }
+/// <summary>Exact inert removal plan. No configuration or credentials have changed.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class McpUninstallPlan
+{
+    /// <summary>Original wall-clock expiry in milliseconds. Applying never renews it.</summary>
+    [JsonPropertyName("expiresAtEpochMs")]
+    public long ExpiresAtEpochMs { get; set; }
 
-    /// <summary>Whether the version or the capability set was the problem.</summary>
-    [JsonPropertyName("reason")]
-    public required CatalogNegotiationRefusedReason Reason { get; set; }
+    /// <summary>Original owned receipt being removed.</summary>
+    [JsonPropertyName("installation")]
+    public McpInstallationSummary Installation { get => field ??= new(); set; }
 
-    /// <summary>Protocol version of the runtime that refused the request.</summary>
-    [JsonPropertyName("runtimeProtocolVersion")]
-    public required long RuntimeProtocolVersion { get; set; }
+    /// <summary>The original operation, inspectable and cancellable on this same connection.</summary>
+    [JsonPropertyName("operationId")]
+    public string OperationId { get; set; } = string.Empty;
 
-    /// <summary>Capabilities this runtime can safely advertise to this caller. The complete five-capability protocol-3 legacy set is always present; every capability added after that baseline appears only when the caller required it, so an older closed-enum decoder can still consume a refusal. This list does not imply that every deployment has enabled every operation.</summary>
-    [JsonPropertyName("supportedCapabilities")]
-    public required IList<string> SupportedCapabilities { get; set; }
+    /// <summary>Exact configured input slots owned by this installation, never shared OAuth tokens.</summary>
+    [JsonPropertyName("ownedSecretCount")]
+    public long OwnedSecretCount { 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>One-use original connection and authority-bound plan handle.</summary>
+    [JsonPropertyName("planHandle")]
+    public string PlanHandle { get; set; } = string.Empty;
+
+    /// <summary>Shared authentication is deliberately retained; revocation is a separate action.</summary>
+    [JsonPropertyName("preservesSharedAuthentication")]
+    public bool PreservesSharedAuthentication { get; set; }
+
+    /// <summary>Whether removal restores a protected earlier configuration.</summary>
+    [JsonPropertyName("restoresPreviousConfiguration")]
+    public bool RestoresPreviousConfiguration { get; set; }
 }
 
-/// <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>
+/// <summary>The <c>uninstall-planned</c> variant of <see cref="McpInstallationManagementOutcome"/>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class CatalogSearchResultUnsupportedKind : CatalogSearchResult
+public partial class McpInstallationManagementOutcomeUninstallPlanned : McpInstallationManagementOutcome
 {
     /// <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; }
+    public override string Kind => "uninstall-planned";
 
-    /// <summary>Every candidate kind this runtime can serve.</summary>
-    [JsonPropertyName("supportedKinds")]
-    public required IList<CatalogCandidateKind> SupportedKinds { get; set; }
+    /// <summary>Original owned removal plan and operation.</summary>
+    [JsonPropertyName("plan")]
+    public required McpUninstallPlan Plan { get; set; }
 }
 
-/// <summary>The request was rejected because a bounded field fell outside its permitted range or a required field was unusable. Pagination may also be rejected by the authority after a continuation request; repeat the search without page.</summary>
-/// <remarks>The <c>invalid-request</c> variant of <see cref="CatalogSearchResult"/>.</remarks>
+/// <summary>Status snapshot from the original connection, independent of new-work account availability.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>phase</c>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class CatalogSearchResultInvalidRequest : CatalogSearchResult
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "phase",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(McpInstallationOperationStatusPreparing), "preparing")]
+[JsonDerivedType(typeof(McpInstallationOperationStatusPrepared), "prepared")]
+[JsonDerivedType(typeof(McpInstallationOperationStatusAwaitingConfirmation), "awaiting-confirmation")]
+[JsonDerivedType(typeof(McpInstallationOperationStatusRevalidating), "revalidating")]
+[JsonDerivedType(typeof(McpInstallationOperationStatusApplying), "applying")]
+[JsonDerivedType(typeof(McpInstallationOperationStatusCompleted), "completed")]
+public partial class McpInstallationOperationStatus
 {
-    /// <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>The type discriminator.</summary>
+    [JsonPropertyName("phase")]
+    public virtual string Phase { get; set; } = string.Empty;
 }
 
-/// <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>
+
+/// <summary>The <c>preparing</c> variant of <see cref="McpInstallationOperationStatus"/>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class CatalogSearchResultAuthenticationRequired : CatalogSearchResult
+public partial class McpInstallationOperationStatusPreparing : McpInstallationOperationStatus
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Kind => "authentication-required";
+    public override string Phase => "preparing";
 
-    /// <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>Whether cancellation has been requested, not proof that a write was undone.</summary>
+    [JsonPropertyName("cancellationRequested")]
+    public required bool CancellationRequested { 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>Original runtime-issued operation identity.</summary>
+    [JsonPropertyName("operationId")]
+    public required string OperationId { get; set; }
 }
 
-/// <summary>Registry or enterprise policy refused the operation.</summary>
-/// <remarks>The <c>policy-rejected</c> variant of <see cref="CatalogSearchResult"/>.</remarks>
+/// <summary>The <c>prepared</c> variant of <see cref="McpInstallationOperationStatus"/>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class CatalogSearchResultPolicyRejected : CatalogSearchResult
+public partial class McpInstallationOperationStatusPrepared : McpInstallationOperationStatus
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Kind => "policy-rejected";
+    public override string Phase => "prepared";
 
-    /// <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 inert prepared operation was asked to cancel.</summary>
+    [JsonPropertyName("cancellationRequested")]
+    public required bool CancellationRequested { get; set; }
 
-    /// <summary>Which authority produced the decision.</summary>
-    [JsonPropertyName("source")]
-    public required McpPlanPolicySource Source { get; set; }
+    /// <summary>Original runtime-issued operation identity.</summary>
+    [JsonPropertyName("operationId")]
+    public required string OperationId { get; set; }
 }
 
-/// <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>
+/// <summary>The <c>awaiting-confirmation</c> variant of <see cref="McpInstallationOperationStatus"/>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class CatalogSearchResultNetworkFailure : CatalogSearchResult
+public partial class McpInstallationOperationStatusAwaitingConfirmation : McpInstallationOperationStatus
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Kind => "network-failure";
-
-    /// <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; }
+    public override string Phase => "awaiting-confirmation";
 
-    /// <summary>Bounded cooldown in seconds before another catalog request should be attempted, when the authority supplied a numeric Retry-After value or the runtime applied its documented fallback.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("retryAfterSeconds")]
-    public int? RetryAfterSeconds { get; set; }
+    /// <summary>Whether the pending human callback was asked to cancel.</summary>
+    [JsonPropertyName("cancellationRequested")]
+    public required bool CancellationRequested { 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>Original runtime-issued operation identity.</summary>
+    [JsonPropertyName("operationId")]
+    public required string OperationId { get; set; }
 }
 
-/// <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>
+/// <summary>The <c>revalidating</c> variant of <see cref="McpInstallationOperationStatus"/>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class CatalogSearchResultUnsafeRetrieval : CatalogSearchResult
+public partial class McpInstallationOperationStatusRevalidating : McpInstallationOperationStatus
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Kind => "unsafe-retrieval";
+    public override string Phase => "revalidating";
 
-    /// <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>Whether source or authority revalidation was asked to cancel.</summary>
+    [JsonPropertyName("cancellationRequested")]
+    public required bool CancellationRequested { 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>Original runtime-issued operation identity.</summary>
+    [JsonPropertyName("operationId")]
+    public required string OperationId { get; set; }
 }
 
-/// <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>
+/// <summary>The <c>applying</c> variant of <see cref="McpInstallationOperationStatus"/>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class CatalogSearchResultMalformedCard : CatalogSearchResult
+public partial class McpInstallationOperationStatusApplying : McpInstallationOperationStatus
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Kind => "malformed-card";
-
-    /// <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; }
+    public override string Phase => "applying";
 
-    /// <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>Whether applying was asked to cancel; already-started effects retain their lease.</summary>
+    [JsonPropertyName("cancellationRequested")]
+    public required bool CancellationRequested { get; set; }
 
-    /// <summary>How the card failed validation.</summary>
-    [JsonPropertyName("reason")]
-    public required CatalogMalformedCardReason Reason { get; set; }
+    /// <summary>Original runtime-issued operation identity.</summary>
+    [JsonPropertyName("operationId")]
+    public required string OperationId { get; set; }
 }
 
-/// <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>
+/// <summary>Terminal mutation result. Uncertainty is not approval, rollback or permission to replay.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class CatalogSearchResultContractViolation : CatalogSearchResult
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "kind",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(McpInstallationOutcomeInstalled), "installed")]
+[JsonDerivedType(typeof(McpInstallationOutcomeUninstalled), "uninstalled")]
+[JsonDerivedType(typeof(McpInstallationOutcomeRolledBack), "rolled-back")]
+[JsonDerivedType(typeof(McpInstallationOutcomeRecoveryRequired), "recovery-required")]
+[JsonDerivedType(typeof(McpInstallationOutcomeDeclined), "declined")]
+[JsonDerivedType(typeof(McpInstallationOutcomeCancelled), "cancelled")]
+[JsonDerivedType(typeof(McpInstallationOutcomeRefused), "refused")]
+public partial class McpInstallationOutcome
 {
-    /// <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>The type discriminator.</summary>
+    [JsonPropertyName("kind")]
+    public virtual string Kind { get; set; } = string.Empty;
 }
 
-/// <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>
+
+/// <summary>The <c>installed</c> variant of <see cref="McpInstallationOutcome"/>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class CatalogSearchResultUnavailable : CatalogSearchResult
+public partial class McpInstallationOutcomeInstalled : McpInstallationOutcome
 {
     /// <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; }
-}
+    public override string Kind => "installed";
 
-/// <summary>An explicit numbered-page request. SDK consumers treat the token as opaque. For bound search, the runtime unwraps an expiring owner-bound reference to the private authority token; only the runtime changes the authority token's targetPage. Legacy unbound navigation keeps its authority-issued token semantics. No snapshot stability is promised.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class CatalogSearchPage
-{
-    /// <summary>Requested one-based page. Must not exceed either the token's signed pageCount or the navigation window ceil(1000 / pageSize). Repeat the search without page to discover newly available pages beyond that signed pageCount.</summary>
-    [JsonPropertyName("number")]
-    public int Number { get; set; }
+    /// <summary>Durable installation succeeded but final transaction cleanup remains.</summary>
+    [JsonPropertyName("cleanupPending")]
+    public required bool CleanupPending { get; set; }
 
-    /// <summary>Opaque pagination token from an earlier response, owner-bound when session-bound search was requested. Never decode, modify or log it in an SDK consumer. Expired or foreign bound references require a fresh bound search, not a legacy retry.</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(4096)]
-    [JsonPropertyName("token")]
-    public string Token { get; set; } = string.Empty;
+    /// <summary>Receipt identity produced by the confirmed transaction.</summary>
+    [JsonPropertyName("installation")]
+    public required McpInstallationSummary Installation { get; set; }
 }
 
-/// <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>
+/// <summary>The <c>uninstalled</c> variant of <see cref="McpInstallationOutcome"/>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class CatalogSearchRequest
+public partial class McpInstallationOutcomeUninstalled : McpInstallationOutcome
 {
-    /// <summary>Protocol version and capabilities the caller requires.</summary>
-    [JsonPropertyName("contract")]
-    public required CatalogClientContract Contract { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "uninstalled";
 
-    /// <summary>Restrict results to these candidate kinds. Agent Plugins are opt-in and require the `agent-plugin-discovery` capability so protocol-v3 clients generated before that variant cannot receive an unknown result; when omitted, the backwards-compatible MCP server and AI skill kinds are searched.</summary>
-    [JsonPropertyName("kinds")]
-    public IList<CatalogCandidateKind>? Kinds { get; set; }
+    /// <summary>Durable removal succeeded but final cleanup remains.</summary>
+    [JsonPropertyName("cleanupPending")]
+    public required bool CleanupPending { get; set; }
 
-    /// <summary>Maximum number of candidates to return. Defaults to 10 when omitted.</summary>
-    [JsonPropertyName("limit")]
-    public int? Limit { get; set; }
+    /// <summary>Exact removed receipt identity.</summary>
+    [JsonPropertyName("installationId")]
+    public required string InstallationId { get; set; }
 
-    /// <summary>Numbered navigation using metadata from an earlier response. Requires catalog-search-pagination and the same query, kinds and effective limit. Omit for a fresh first-page search.</summary>
-    [JsonPropertyName("page")]
-    public CatalogSearchPage? Page { get; set; }
+    /// <summary>Original removal operation.</summary>
+    [JsonPropertyName("operationId")]
+    public required string OperationId { get; set; }
 
-    /// <summary>
-    /// Select an existing attached local session. Requires authenticated, session-bound search.
-    /// The runtime never creates, resumes or reconfigures a session to honour this selector.
-    /// </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("policySessionId")]
-    public string? PolicySessionId { get; set; }
+    /// <summary>Any grants in the incumbent shared OAuth store remain unowned and retained.</summary>
+    [JsonPropertyName("preservedSharedAuthentication")]
+    public required bool PreservedSharedAuthentication { get; set; }
 
-    /// <summary>Free-text search query. Persisted as tool input for session continuity, but omitted from 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 required string Query { get; set; }
-}
+    /// <summary>Exact owned input slots removed, excluding shared OAuth credentials.</summary>
+    [JsonPropertyName("removedOwnedSecrets")]
+    public required long RemovedOwnedSecrets { get; set; }
 
-/// <summary>Typed outcome of catalog.select. Only the selected host result carries a fresh candidate handle; the model-facing projection removes both that handle and searchId.</summary>
-/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-[JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "kind",
-    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(CatalogSelectionResultSelected), "selected")]
-[JsonDerivedType(typeof(CatalogSelectionResultDeclined), "declined")]
-[JsonDerivedType(typeof(CatalogSelectionResultCancelled), "cancelled")]
-[JsonDerivedType(typeof(CatalogSelectionResultTimedOut), "timed-out")]
-[JsonDerivedType(typeof(CatalogSelectionResultInvalid), "invalid")]
-[JsonDerivedType(typeof(CatalogSelectionResultStale), "stale")]
-[JsonDerivedType(typeof(CatalogSelectionResultReplayed), "replayed")]
-[JsonDerivedType(typeof(CatalogSelectionResultForeign), "foreign")]
-[JsonDerivedType(typeof(CatalogSelectionResultWrongKind), "wrong-kind")]
-[JsonDerivedType(typeof(CatalogSelectionResultNegotiationRefused), "negotiation-refused")]
-[JsonDerivedType(typeof(CatalogSelectionResultInvalidRequest), "invalid-request")]
-[JsonDerivedType(typeof(CatalogSelectionResultUnavailable), "unavailable")]
-public partial class CatalogSelectionResult
-{
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("kind")]
-    public virtual string Kind { get; set; } = string.Empty;
+    /// <summary>Whether protected pre-install configuration was restored.</summary>
+    [JsonPropertyName("restoredPreviousConfiguration")]
+    public required bool RestoredPreviousConfiguration { get; set; }
 }
 
-
-/// <summary>The chosen candidate was transferred into a fresh bounded single-use handle for a later explicit planning request.</summary>
-/// <remarks>The <c>selected</c> variant of <see cref="CatalogSelectionResult"/>.</remarks>
+/// <summary>The durable transaction was aborted or fully compensated.</summary>
+/// <remarks>The <c>rolled-back</c> variant of <see cref="McpInstallationOutcome"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class CatalogSelectionResultSelected : CatalogSelectionResult
+public partial class McpInstallationOutcomeRolledBack : McpInstallationOutcome
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Kind => "selected";
+    public override string Kind => "rolled-back";
 
-    /// <summary>Fresh single-use candidate handle accepted by mcp.planInstall. Returned only to the native host and never included in model-tool output.</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>Original connection-owned operation.</summary>
+    [JsonPropertyName("operationId")]
+    public required string OperationId { get; set; }
 
-    /// <summary>The exact search identifier privately bound to the selected candidate.</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>Cause of the fully aborted or compensated operation.</summary>
+    [JsonPropertyName("reason")]
+    public required McpInstallationFailureReason Reason { get; set; }
 }
 
-/// <summary>The caller explicitly declined every candidate and the retained search state was released.</summary>
-/// <remarks>The <c>declined</c> variant of <see cref="CatalogSelectionResult"/>.</remarks>
+/// <summary>A write may have completed. Recover and inspect durable state before retrying.</summary>
+/// <remarks>The <c>recovery-required</c> variant of <see cref="McpInstallationOutcome"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class CatalogSelectionResultDeclined : CatalogSelectionResult
+public partial class McpInstallationOutcomeRecoveryRequired : McpInstallationOutcome
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Kind => "declined";
+    public override string Kind => "recovery-required";
 
-    /// <summary>The search identifier privately bound to the released selection group.</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>Operation whose durable result must be recovered and inspected.</summary>
+    [JsonPropertyName("operationId")]
+    public required string OperationId { get; set; }
 }
 
-/// <summary>The caller cancelled the selection interaction and the retained search state was released.</summary>
-/// <remarks>The <c>cancelled</c> variant of <see cref="CatalogSelectionResult"/>.</remarks>
+/// <summary>The <c>declined</c> variant of <see cref="McpInstallationOutcome"/>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class CatalogSelectionResultCancelled : CatalogSelectionResult
+public partial class McpInstallationOutcomeDeclined : McpInstallationOutcome
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Kind => "cancelled";
+    public override string Kind => "declined";
 
-    /// <summary>The search identifier privately bound to the released selection group.</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>Original operation explicitly declined by the user.</summary>
+    [JsonPropertyName("operationId")]
+    public required string OperationId { get; set; }
 }
 
-/// <summary>The host declared that its live selection interaction timed out, and the retained search state was released.</summary>
-/// <remarks>The <c>timed-out</c> variant of <see cref="CatalogSelectionResult"/>.</remarks>
+/// <summary>The <c>cancelled</c> variant of <see cref="McpInstallationOutcome"/>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class CatalogSelectionResultTimedOut : CatalogSelectionResult
+public partial class McpInstallationOutcomeCancelled : McpInstallationOutcome
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Kind => "timed-out";
+    public override string Kind => "cancelled";
 
-    /// <summary>The search identifier privately bound to the released selection group.</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>Original operation cancelled before a terminal application result.</summary>
+    [JsonPropertyName("operationId")]
+    public required string OperationId { get; set; }
 }
 
-/// <summary>The selection reference was malformed or unknown.</summary>
-/// <remarks>The <c>invalid</c> variant of <see cref="CatalogSelectionResult"/>.</remarks>
+/// <summary>The <c>refused</c> variant of <see cref="McpInstallationOutcome"/>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class CatalogSelectionResultInvalid : CatalogSelectionResult
+public partial class McpInstallationOutcomeRefused : McpInstallationOutcome
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Kind => "invalid";
+    public override string Kind => "refused";
 
-    /// <summary>Human-readable explanation safe to surface. Never contains the presented reference or private candidate state.</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>Present once an operation has been allocated; never a plan handle.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("operationId")]
+    public string? OperationId { get; set; }
+
+    /// <summary>Specific bounded refusal, never a success-shaped fallback.</summary>
+    [JsonPropertyName("reason")]
+    public required McpInstallationFailureReason Reason { get; set; }
 }
 
-/// <summary>The runtime-enforced selection reference lifetime elapsed before the request arrived.</summary>
-/// <remarks>The <c>stale</c> variant of <see cref="CatalogSelectionResult"/>.</remarks>
+/// <summary>The <c>completed</c> variant of <see cref="McpInstallationOperationStatus"/>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class CatalogSelectionResultStale : CatalogSelectionResult
+public partial class McpInstallationOperationStatusCompleted : McpInstallationOperationStatus
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Kind => "stale";
+    public override string Phase => "completed";
 
-    /// <summary>Human-readable explanation safe to surface. Never contains the presented reference or private candidate state.</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 cancellation was requested before the terminal result.</summary>
+    [JsonPropertyName("cancellationRequested")]
+    public required bool CancellationRequested { get; set; }
+
+    /// <summary>Original runtime-issued operation identity.</summary>
+    [JsonPropertyName("operationId")]
+    public required string OperationId { get; set; }
+
+    /// <summary>Immutable terminal receipt.</summary>
+    [JsonPropertyName("outcome")]
+    public required McpInstallationOutcome Outcome { get; set; }
 }
 
-/// <summary>The selection group was already terminated or its pending host hand-off was already claimed.</summary>
-/// <remarks>The <c>replayed</c> variant of <see cref="CatalogSelectionResult"/>.</remarks>
+/// <summary>The <c>operation</c> variant of <see cref="McpInstallationManagementOutcome"/>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class CatalogSelectionResultReplayed : CatalogSelectionResult
+public partial class McpInstallationManagementOutcomeOperation : McpInstallationManagementOutcome
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Kind => "replayed";
+    public override string Kind => "operation";
 
-    /// <summary>Human-readable explanation safe to surface. Never contains the presented reference or private candidate state.</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>Original-connection operation snapshot.</summary>
+    [JsonPropertyName("operation")]
+    public required McpInstallationOperationStatus Operation { get; set; }
 }
 
-/// <summary>The selection reference belongs to another runtime instance or session.</summary>
-/// <remarks>The <c>foreign</c> variant of <see cref="CatalogSelectionResult"/>.</remarks>
+/// <summary>The <c>refused</c> variant of <see cref="McpInstallationManagementOutcome"/>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class CatalogSelectionResultForeign : CatalogSelectionResult
+public partial class McpInstallationManagementOutcomeRefused : McpInstallationManagementOutcome
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Kind => "foreign";
+    public override string Kind => "refused";
 
-    /// <summary>Human-readable explanation safe to surface. Never contains the presented reference or private candidate state.</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>Specific bounded refusal.</summary>
+    [JsonPropertyName("reason")]
+    public required McpInstallationFailureReason Reason { get; set; }
 }
 
-/// <summary>The presented opaque handle was issued for another catalog operation.</summary>
-/// <remarks>The <c>wrong-kind</c> variant of <see cref="CatalogSelectionResult"/>.</remarks>
+/// <summary>The <c>outcome</c> variant of <see cref="McpInstallationManagementResult"/>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class CatalogSelectionResultWrongKind : CatalogSelectionResult
+public partial class McpInstallationManagementResultOutcome : McpInstallationManagementResult
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Kind => "wrong-kind";
+    public override string Kind => "outcome";
 
-    /// <summary>Human-readable explanation safe to surface. Never contains the presented reference or private candidate state.</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>Capabilities actually honoured for this request.</summary>
+    [JsonPropertyName("negotiated")]
+    public required CatalogNegotiatedContract Negotiated { get; set; }
+
+    /// <summary>Observed management outcome.</summary>
+    [JsonPropertyName("outcome")]
+    public required McpInstallationManagementOutcome Outcome { get; set; }
 }
 
 /// <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="CatalogSelectionResult"/>.</remarks>
+/// <remarks>The <c>negotiation-refused</c> variant of <see cref="McpInstallationManagementResult"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class CatalogSelectionResultNegotiationRefused : CatalogSelectionResult
+public partial class McpInstallationManagementResultNegotiationRefused : McpInstallationManagementResult
 {
     /// <inheritdoc />
     [JsonIgnore]
@@ -6197,9 +6133,9 @@ public partial class CatalogSelectionResultNegotiationRefused : CatalogSelection
 }
 
 /// <summary>The request was rejected because a bounded field fell outside its permitted range or a required field was unusable. Pagination may also be rejected by the authority after a continuation request; repeat the search without page.</summary>
-/// <remarks>The <c>invalid-request</c> variant of <see cref="CatalogSelectionResult"/>.</remarks>
+/// <remarks>The <c>invalid-request</c> variant of <see cref="McpInstallationManagementResult"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class CatalogSelectionResultInvalidRequest : CatalogSelectionResult
+public partial class McpInstallationManagementResultInvalidRequest : McpInstallationManagementResult
 {
     /// <inheritdoc />
     [JsonIgnore]
@@ -6216,542 +6152,458 @@ public partial class CatalogSelectionResultInvalidRequest : CatalogSelectionResu
     public required string Message { get; set; }
 }
 
-/// <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="CatalogSelectionResult"/>.</remarks>
+/// <summary>One Registry string-valued configuration entry for the selected transport.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class CatalogSelectionResultUnavailable : CatalogSelectionResult
+public sealed class McpInstallationInput
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "unavailable";
+    /// <summary>Exact category declared by the selected choice.</summary>
+    [JsonPropertyName("category")]
+    public McpPlanValueCategory Category { 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>Exact key declared by the selected choice.</summary>
+    [JsonPropertyName("key")]
+    public string Key { get; set; } = string.Empty;
 
-    /// <summary>Why the operation is unavailable.</summary>
-    [JsonPropertyName("reason")]
-    public required CatalogUnavailableReason Reason { get; set; }
+    /// <summary>Explicit non-secret value. Secret placeholders use a separate input channel.</summary>
+    [JsonPropertyName("value")]
+    public string Value { get; set; } = string.Empty;
 }
 
-/// <summary>Terminates one retained catalog selection group through an opaque reference previously returned by the model-safe search projection.</summary>
+/// <summary>A request-local value for one exact reviewed placeholder. Never logged or persisted in a plan.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class CatalogSelectionRequest
+public sealed class McpInstallationSecret
 {
-    /// <summary>Protocol version and capabilities the caller requires.</summary>
-    [JsonPropertyName("contract")]
-    public CatalogClientContract Contract { get => field ??= new(); set; }
-
-    /// <summary>The terminal outcome declared by the caller. Timed-out means the host's live interaction deadline elapsed; a reference whose runtime TTL elapsed is rejected separately as stale.</summary>
-    [JsonPropertyName("outcome")]
-    public CatalogSelectionDecision Outcome { get; set; }
-
-    /// <summary>Opaque runtime-instance scoped reference to one visible candidate. For a non-selected outcome, any candidate reference from the same search closes that search's retained group.</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("selectionRef")]
-    public string SelectionRef { get; set; } = string.Empty;
+    /// <summary>Exact placeholder from the selected choice, not a caller-chosen backend identifier.</summary>
+    [JsonPropertyName("placeholder")]
+    public string Placeholder { get; set; } = string.Empty;
 
-    /// <summary>Locally owned root session whose retained search state is being resolved.</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("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Fresh explicit secret value. It is omitted from confirmation reviews and telemetry.</summary>
+    [JsonPropertyName("value")]
+    public string Value { get; set; } = string.Empty;
 }
 
-/// <summary>Information about an installed plugin tracked in global state.</summary>
+/// <summary>Side-effect-free preparation of one original bound remote MCP choice.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class InstalledPluginInfo
+internal sealed class McpPrepareInstallRequest
 {
-    /// <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; }
+    /// <summary>Exact selected alternative from that plan.</summary>
+    [JsonPropertyName("choiceId")]
+    public string ChoiceId { get; set; } = string.Empty;
 
-    /// <summary>Whether the managed desired plugin currently has an installed or live record. Set to false for a managed desired entry retained in the listing after installation or reconciliation failed.</summary>
-    [JsonPropertyName("installed")]
-    public bool? Installed { get; set; }
+    /// <summary>Required bound catalogue and confirmed remote installation capabilities.</summary>
+    [JsonPropertyName("contract")]
+    public CatalogClientContract Contract { get => field ??= new(); 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>
+    /// Declared non-secret values. Non-empty only when the caller requires
+    /// `mcp-configured-remote-installation`; omitted values use the card default.
+    /// </summary>
+    [JsonPropertyName("inputs")]
+    public IList<McpInstallationInput> Inputs { get => field ??= []; set; }
 
-    /// <summary>Whether enterprise managed settings control this plugin's enabled state.</summary>
-    [JsonPropertyName("managed")]
-    public bool? Managed { get; set; }
+    /// <summary>Original single-use bound plan, never a client-authored configuration.</summary>
+    [JsonPropertyName("planHandle")]
+    public string PlanHandle { get; set; } = string.Empty;
 
-    /// <summary>The enabled state required by enterprise managed settings, when this plugin spec is managed.</summary>
-    [JsonPropertyName("managedDesiredEnabled")]
-    public bool? ManagedDesiredEnabled { get; set; }
+    /// <summary>An existing local session attached to this connection, not permission to attach one.</summary>
+    [JsonPropertyName("policySessionId")]
+    public string PolicySessionId { 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>
+    /// One entry per declared secret placeholder of the selected choice. Non-empty
+    /// only when the caller requires `mcp-configured-remote-installation`.
+    /// </summary>
+    [JsonPropertyName("secrets")]
+    public IList<McpInstallationSecret> Secrets { get => field ??= []; set; }
 
-    /// <summary>Plugin name.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>The trusted host presents this choice alongside the exact secret placeholders.</summary>
+    [JsonPropertyName("secretStorage")]
+    public McpInstallationSecretStorage SecretStorage { get; set; }
 
-    /// <summary>Runtime-reported plugin provenance. Currently set to "builtin" only for plugins registered through the trusted host built-in boundary; absent for installed, marketplace, direct, and live plugins.</summary>
+    /// <summary>The exact original source, used transiently only after confirmation.</summary>
     [JsonPropertyName("source")]
-    public string? Source { get; set; }
-
-    /// <summary>Installed version (when reported by the plugin manifest).</summary>
-    [JsonPropertyName("version")]
-    public string? Version { get; set; }
+    public McpServerCardReference Source { get => field ??= new(); set; }
 }
 
-/// <summary>Plugins installed in user/global state.</summary>
+/// <summary>An installation result together with the exact honoured contract, or a negotiation refusal.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class PluginListResult
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "kind",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(McpInstallationResultOutcome), "outcome")]
+[JsonDerivedType(typeof(McpInstallationResultNegotiationRefused), "negotiation-refused")]
+[JsonDerivedType(typeof(McpInstallationResultInvalidRequest), "invalid-request")]
+public partial class McpInstallationResult
 {
-    /// <summary>Installed plugins.</summary>
-    [JsonPropertyName("plugins")]
-    public IList<InstalledPluginInfo> Plugins { get => field ??= []; set; }
+    /// <summary>The type discriminator.</summary>
+    [JsonPropertyName("kind")]
+    public virtual string Kind { get; set; } = string.Empty;
 }
 
-/// <summary>Result of installing a plugin.</summary>
+
+/// <summary>The <c>outcome</c> variant of <see cref="McpInstallationResult"/>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class PluginInstallResult
+public partial class McpInstallationResultOutcome : McpInstallationResult
 {
-    /// <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>The newly installed plugin's metadata.</summary>
-    [JsonPropertyName("plugin")]
-    public InstalledPluginInfo Plugin { get => field ??= new(); set; }
-
-    /// <summary>Optional post-install message provided by the plugin (e.g. setup instructions).</summary>
-    [JsonPropertyName("postInstallMessage")]
-    public string? PostInstallMessage { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "outcome";
 
-    /// <summary>Number of skills discovered and installed from the plugin.</summary>
-    [JsonPropertyName("skillsInstalled")]
-    public long SkillsInstalled { get; set; }
+    /// <summary>Capabilities actually honoured for this request.</summary>
+    [JsonPropertyName("negotiated")]
+    public required CatalogNegotiatedContract Negotiated { get; set; }
 
-    /// <summary>Where the completed plugin tree was staged before atomic promotion.</summary>
-    [JsonPropertyName("stagingMode")]
-    public PluginInstallStagingMode? StagingMode { get; set; }
+    /// <summary>Terminal result of the original operation.</summary>
+    [JsonPropertyName("outcome")]
+    public required McpInstallationOutcome Outcome { get; set; }
 }
 
-/// <summary>Plugin source and optional working directory for relative-path resolution.</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="McpInstallationResult"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class PluginsInstallRequest
+public partial class McpInstallationResultNegotiationRefused : McpInstallationResult
 {
-    /// <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 => "negotiation-refused";
 
-/// <summary>Name (or spec) of the plugin to uninstall.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class PluginsUninstallRequest
-{
-    /// <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>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>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>Lowest caller protocol version this runtime will serve.</summary>
+    [JsonPropertyName("minimumSupportedProtocolVersion")]
+    public required long MinimumSupportedProtocolVersion { get; set; }
 
-/// <summary>Result of updating a single plugin.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class PluginUpdateResult
-{
-    /// <summary>Version after the update, when reported by the plugin manifest.</summary>
-    [JsonPropertyName("newVersion")]
-    public string? NewVersion { get; set; }
+    /// <summary>Whether the version or the capability set was the problem.</summary>
+    [JsonPropertyName("reason")]
+    public required CatalogNegotiationRefusedReason Reason { get; set; }
 
-    /// <summary>Version that was previously installed, when available.</summary>
-    [JsonPropertyName("previousVersion")]
-    public string? PreviousVersion { get; set; }
+    /// <summary>Protocol version of the runtime that refused the request.</summary>
+    [JsonPropertyName("runtimeProtocolVersion")]
+    public required long RuntimeProtocolVersion { get; set; }
 
-    /// <summary>Number of skills discovered and installed after the update.</summary>
-    [JsonPropertyName("skillsInstalled")]
-    public long SkillsInstalled { get; set; }
-}
+    /// <summary>Capabilities this runtime can safely advertise to this caller. The complete five-capability protocol-3 legacy set is always present; every capability added after that baseline appears only when the caller required it, so an older closed-enum decoder can still consume a refusal. This list does not imply that every deployment has enabled every operation.</summary>
+    [JsonPropertyName("supportedCapabilities")]
+    public required IList<string> SupportedCapabilities { get; set; }
 
-/// <summary>Name (or spec) of the plugin to update.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class PluginsUpdateRequest
-{
-    /// <summary>Plugin name or "plugin@marketplace" spec to update.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <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>Per-plugin result from updating all plugins, with versions, skills installed, success flag, and optional error.</summary>
+/// <summary>The request was rejected because a bounded field fell outside its permitted range or a required field was unusable. Pagination may also be rejected by the authority after a continuation request; repeat the search without page.</summary>
+/// <remarks>The <c>invalid-request</c> variant of <see cref="McpInstallationResult"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class PluginUpdateAllEntry
+public partial class McpInstallationResultInvalidRequest : McpInstallationResult
 {
-    /// <summary>Error message (failure only).</summary>
-    [JsonPropertyName("error")]
-    public string? Error { get; set; }
-
-    /// <summary>Marketplace the plugin came from. Empty string ("") for direct installs.</summary>
-    [JsonPropertyName("marketplace")]
-    public string Marketplace { get; set; } = string.Empty;
-
-    /// <summary>Plugin name that was updated.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
-
-    /// <summary>Version after the update, when available.</summary>
-    [JsonPropertyName("newVersion")]
-    public string? NewVersion { get; set; }
-
-    /// <summary>Previously installed version, when available.</summary>
-    [JsonPropertyName("previousVersion")]
-    public string? PreviousVersion { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "invalid-request";
 
-    /// <summary>Number of skills installed after the update (success only).</summary>
-    [JsonPropertyName("skillsInstalled")]
-    public long? SkillsInstalled { get; set; }
+    /// <summary>Which request field was rejected.</summary>
+    [JsonPropertyName("field")]
+    public required CatalogInvalidRequestField Field { get; set; }
 
-    /// <summary>Whether the update succeeded for this plugin.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { 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 updating all installed plugins.</summary>
+/// <summary>Applies exactly one previously prepared operation on its original connection.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class PluginUpdateAllResult
+internal sealed class McpApplyInstallRequest
 {
-    /// <summary>Per-plugin update results in deterministic order.</summary>
-    [JsonPropertyName("results")]
-    public IList<PluginUpdateAllEntry> Results { get => field ??= []; set; }
+    /// <summary>Capabilities required by the original prepared operation.</summary>
+    [JsonPropertyName("contract")]
+    public CatalogClientContract Contract { get => field ??= new(); set; }
+
+    /// <summary>Runtime-issued ID already returned by prepareInstall, never reused or rebound.</summary>
+    [JsonPropertyName("operationId")]
+    public string OperationId { get; set; } = string.Empty;
+
+    /// <summary>Same existing attached or privately borrowed session as preparation.</summary>
+    [JsonPropertyName("policySessionId")]
+    public string PolicySessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Plugin names (or specs) to enable, plus the optional working directory the repository-controlled guard is evaluated against.</summary>
+/// <summary>Read-only preparation of one owned removal under fresh selected-session authority.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class PluginsEnableRequest
+internal sealed class McpPlanUninstallRequest
 {
-    /// <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>Required authenticated bound installation capabilities.</summary>
+    [JsonPropertyName("contract")]
+    public CatalogClientContract Contract { get => field ??= new(); set; }
 
-    /// <summary>Working directory whose repository `enabledPlugins` overlay decides whether this mutation is repository-controlled. Hosts that serve sessions across several repositories (the SDK server) should pass the session's directory; otherwise the guard is evaluated against the server process's own working directory, which may belong to a different repository. Defaults to the server's current working directory.</summary>
-    [JsonPropertyName("workingDirectory")]
-    public string? WorkingDirectory { get; set; }
+    /// <summary>Exact receipt to inspect, not a server-name guess.</summary>
+    [JsonPropertyName("installationId")]
+    public string InstallationId { get; set; } = string.Empty;
+
+    /// <summary>Existing selected session on the original connection.</summary>
+    [JsonPropertyName("policySessionId")]
+    public string PolicySessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Plugin names (or specs) to disable, plus the optional working directory the repository-controlled guard is evaluated against.</summary>
+/// <summary>One-use application of the exact retained removal plan.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class PluginsDisableRequest
+internal sealed class McpApplyUninstallRequest
 {
-    /// <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>Required authenticated bound installation capabilities.</summary>
+    [JsonPropertyName("contract")]
+    public CatalogClientContract Contract { get => field ??= new(); set; }
 
-    /// <summary>Working directory whose repository `enabledPlugins` overlay decides whether this mutation is repository-controlled. Hosts that serve sessions across several repositories (the SDK server) should pass the session's directory; otherwise the guard is evaluated against the server process's own working directory, which may belong to a different repository. Defaults to the server's current working directory.</summary>
-    [JsonPropertyName("workingDirectory")]
-    public string? WorkingDirectory { get; set; }
+    /// <summary>Opaque original removal plan, consumed once.</summary>
+    [JsonPropertyName("planHandle")]
+    public string PlanHandle { get; set; } = string.Empty;
+
+    /// <summary>Same existing selected session as removal preparation.</summary>
+    [JsonPropertyName("policySessionId")]
+    public string PolicySessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Trusted built-in plugin directories to use for this runtime process.</summary>
+/// <summary>User-configured MCP servers, keyed by server name.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class PluginsBuiltinSetRequest
+public sealed class McpConfigList
 {
-    /// <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>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>Registered marketplace summary.</summary>
+/// <summary>MCP server name and configuration to add to user configuration.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class MarketplaceInfo
+internal sealed class McpConfigAddRequest
 {
-    /// <summary>Whether the managed marketplace currently resolved into the runtime marketplace registry. Set to false when the desired managed entry is retained for governance visibility after loading or reconciliation failed.</summary>
-    [JsonPropertyName("available")]
-    public bool? Available { get; set; }
-
-    /// <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>Whether enterprise managed settings provide and control this marketplace entry.</summary>
-    [JsonPropertyName("managed")]
-    public bool? Managed { get; set; }
+    /// <summary>MCP server configuration (stdio process or remote HTTP/SSE).</summary>
+    [JsonPropertyName("config")]
+    public JsonElement Config { get; set; }
 
-    /// <summary>Marketplace name (matches the @marketplace suffix in plugin specs).</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>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>All registered marketplaces, including built-in defaults.</summary>
+/// <summary>MCP server name and replacement configuration to write to user configuration.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class MarketplaceListResult
+internal sealed class McpConfigUpdateRequest
 {
-    /// <summary>Registered marketplaces.</summary>
-    [JsonPropertyName("marketplaces")]
-    public IList<MarketplaceInfo> Marketplaces { 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>Result of registering a new marketplace.</summary>
+/// <summary>MCP server name to remove from user configuration.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class MarketplaceAddResult
+internal sealed class McpConfigRemoveRequest
 {
-    /// <summary>Final name of the marketplace as resolved from its manifest.</summary>
+    /// <summary>OAuth Client ID Metadata Document URL whose persisted credentials should also be removed.</summary>
+    [JsonPropertyName("authClientIdMetadataUrl")]
+    public string? AuthClientIdMetadataUrl { 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>Marketplace source and optional working directory for relative-path resolution.</summary>
+/// <summary>MCP server names to enable for new sessions.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class PluginsMarketplacesAddRequest
+internal sealed class McpConfigEnableRequest
 {
-    /// <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>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>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>Outcome of the remove attempt, including dependent-plugin info when applicable.</summary>
+/// <summary>MCP server names to disable for new sessions.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class MarketplaceRemoveResult
+internal sealed class McpConfigDisableRequest
 {
-    /// <summary>Names of installed plugins that prevented removal. Populated only when `removed=false`.</summary>
-    [JsonPropertyName("dependentPlugins")]
-    public IList<string>? DependentPlugins { 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>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>Name of the marketplace to remove and an optional force flag.</summary>
+/// <summary>Request id naming a cancellable registry search.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class PluginsMarketplacesRemoveRequest
+internal sealed class McpRegistryRequestIdResult
 {
-    /// <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>Request ID for `mcp.registry.search` and `mcp.registry.cancel`. It serves one search. Allocation can reclaim unused IDs at the 1,024-ID reservation limit.</summary>
+    [JsonPropertyName("requestId")]
+    public long RequestId { get; set; }
+}
 
-    /// <summary>Marketplace name to remove.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+/// <summary>Servers selected from the registry response.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class McpRegistrySearchResult
+{
+    /// <summary>The server objects, carried opaquely. The runtime follows pages, keeps the newest entry per server name, cuts the list to `limit`, and sorts an empty-query result by GitHub stars. Each server object remains unchanged because the registry owns that shape.</summary>
+    [JsonPropertyName("servers")]
+    public JsonElement Servers { get; set; }
 }
 
-/// <summary>Plugin entry advertised by a marketplace.</summary>
+/// <summary>Registry search terms, the credential to search under, and the request id that makes the search cancellable.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class MarketplacePluginInfo
+internal sealed class McpRegistrySearchRequest
 {
-    /// <summary>Short description from the marketplace catalog, when present.</summary>
-    [JsonPropertyName("description")]
-    public string? Description { get; set; }
+    /// <summary>The credential the search runs under, carried opaquely. Hosts usually send credential-free `AuthIdentity`; a `token` identity can be resolved only when it embeds a token, while `env` and `gh-cli` identities can use a token embedded in the request first.</summary>
+    [JsonPropertyName("authInfo")]
+    public JsonElement AuthInfo { get; set; }
 
-    /// <summary>Plugin name as listed in the marketplace catalog.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Maximum number of servers to return.</summary>
+    [JsonPropertyName("limit")]
+    public long Limit { get; set; }
+
+    /// <summary>Free-text query. Omitted or empty asks the registry for its top servers rather than searching. A value that is not a string is refused.</summary>
+    [JsonPropertyName("query")]
+    public string? Query { get; set; }
+
+    /// <summary>Repository used for the policy lookup, as `owner/name`. The policy selects the registry URL and whether the user token goes to the registry. The registry receives this repository only when the policy entry lists it as required context. A value that is not a string is refused.</summary>
+    [JsonPropertyName("repository")]
+    public string? Repository { get; set; }
+
+    /// <summary>Request ID from `mcp.registry.allocateRequestId`. The search refuses unknown, reclaimed, or canceled IDs and IDs that another search or request already uses.</summary>
+    [JsonPropertyName("requestId")]
+    public long RequestId { get; set; }
 }
 
-/// <summary>Plugins advertised by the marketplace.</summary>
+/// <summary>Whether the cancel reached a live search.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class MarketplaceBrowseResult
+internal sealed class McpRegistryCancelResult
 {
-    /// <summary>Plugins advertised by the marketplace.</summary>
-    [JsonPropertyName("plugins")]
-    public IList<MarketplacePluginInfo> Plugins { get => field ??= []; set; }
+    /// <summary>True when the cancel stopped a running search. False for unknown or reclaimed IDs, completed or canceled searches, and unused reservations. The cancel releases an unused reservation.</summary>
+    [JsonPropertyName("canceled")]
+    public bool Canceled { get; set; }
 }
 
-/// <summary>Name of the marketplace whose plugin catalog to fetch.</summary>
+/// <summary>Registry search to abandon.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class PluginsMarketplacesBrowseRequest
+internal sealed class McpRegistryCancelRequest
 {
-    /// <summary>Marketplace name to browse.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Request ID from `mcp.registry.allocateRequestId` that the search uses.</summary>
+    [JsonPropertyName("requestId")]
+    public long RequestId { get; set; }
 }
 
-/// <summary>Per-marketplace refresh result, including marketplace name, success flag, and optional failure error.</summary>
+/// <summary>New-work inventory or recovery request under an explicitly selected existing session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class MarketplaceRefreshEntry
+internal sealed class McpInstallationsRequest
 {
-    /// <summary>Error message (failure only).</summary>
-    [JsonPropertyName("error")]
-    public string? Error { get; set; }
-
-    /// <summary>Marketplace name that was refreshed.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Required authenticated bound installation contract.</summary>
+    [JsonPropertyName("contract")]
+    public CatalogClientContract Contract { get => field ??= new(); set; }
 
-    /// <summary>Whether the refresh succeeded.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { get; set; }
+    /// <summary>Existing selected local session on this connection.</summary>
+    [JsonPropertyName("policySessionId")]
+    public string PolicySessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Result of refreshing one or more marketplace catalogs.</summary>
+/// <summary>Existing-operation control. A new session selector is deliberately not accepted.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class MarketplaceRefreshResult
+internal sealed class McpInstallationOperationRequest
 {
-    /// <summary>Per-marketplace refresh results in deterministic order.</summary>
-    [JsonPropertyName("results")]
-    public IList<MarketplaceRefreshEntry> Results { get => field ??= []; set; }
+    /// <summary>Original installation wire capability; new-work authentication is not reacquired.</summary>
+    [JsonPropertyName("contract")]
+    public CatalogClientContract Contract { get => field ??= new(); set; }
+
+    /// <summary>Exact runtime-issued operation ID on the original connection.</summary>
+    [JsonPropertyName("operationId")]
+    public string OperationId { get; set; } = string.Empty;
 }
 
-/// <summary>RPC data type for PluginsMarketplacesRefresh operations.</summary>
+/// <summary>Installed plugin that contributes a discovered extension.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class PluginsMarketplacesRefreshRequest
+public sealed class DiscoveredExtensionPlugin
 {
-    /// <summary>Marketplace name to refresh. When omitted, every registered marketplace is refreshed.</summary>
+    /// <summary>Installed plugin name.</summary>
     [JsonPropertyName("name")]
-    public string? Name { get; set; }
+    public string Name { get; set; } = string.Empty;
 }
 
-/// <summary>Agent metadata, including identifiers, display details, source, tools, model, models, reasoning effort, MCP servers, skills, and file path.</summary>
+/// <summary>Discovered extension metadata and persistent enablement state.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class AgentInfo
+public sealed class DiscoveredExtension
 {
-    /// <summary>Description of the agent's purpose.</summary>
-    [JsonPropertyName("description")]
-    public string Description { get; set; } = string.Empty;
-
-    /// <summary>Whether model-driven invocation is disabled for this agent.</summary>
-    [JsonPropertyName("disableModelInvocation")]
-    public bool? DisableModelInvocation { get; set; }
-
-    /// <summary>Human-readable display name.</summary>
-    [JsonPropertyName("displayName")]
-    public string DisplayName { get; set; } = string.Empty;
+    /// <summary>Whether this extension's persistent per-ID preference is enabled.</summary>
+    [JsonPropertyName("enabled")]
+    public bool Enabled { get; set; }
 
-    /// <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>
+    /// <summary>Source-qualified ID accepted by both server and session extension enablement methods.</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(global::GitHub.Copilot.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>Whether authored models are preferences or required constraints.</summary>
-    [JsonPropertyName("modelPolicy")]
-    public AgentModelPolicy? ModelPolicy { get; set; }
-
-    /// <summary>Authored preferred model ids for this agent, in priority order. Runtime model selection chooses the first available model; omitted means no authored preference.</summary>
-    [JsonPropertyName("models")]
-    public IList<string>? Models { get; set; }
-
-    /// <summary>Name of the agent. Use `id` as the stable selection identifier.</summary>
+    /// <summary>Human-readable extension name.</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>
+    /// <summary>Absolute path to the extension entry module, suitable for revealing it in a file manager.</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>Authored reasoning effort for this agent. Applied on selection to models that support it; omitted means no authored preference.</summary>
-    [JsonPropertyName("reasoningEffort")]
-    public string? ReasoningEffort { get; set; }
+    public string Path { get; set; } = string.Empty;
 
-    /// <summary>Skill names preloaded into this agent's context. Omitted means none.</summary>
-    [JsonPropertyName("skills")]
-    public IList<string>? Skills { get; set; }
+    /// <summary>Containing plugin metadata for plugin-contributed extensions.</summary>
+    [JsonPropertyName("plugin")]
+    public DiscoveredExtensionPlugin? Plugin { get; set; }
 
-    /// <summary>Where the agent definition was loaded from.</summary>
+    /// <summary>Discovery source.</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>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ServerAgentList
-{
-    /// <summary>All discovered agents across all sources.</summary>
-    [JsonPropertyName("agents")]
-    public IList<AgentInfo> Agents { get => field ??= []; set; }
+    public DiscoveredExtensionSource Source { get; set; }
 }
 
-/// <summary>Optional project paths to include in agent discovery.</summary>
+/// <summary>Extensions discovered from persisted Copilot home state and their effective loading mode. Launch-scoped additional plugins are not included.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class AgentsDiscoverRequest
+public sealed class DiscoveredExtensions
 {
-    /// <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>Discovered user and enabled installed-plugin extensions from persisted Copilot home state.</summary>
+    [JsonPropertyName("extensions")]
+    public IList<DiscoveredExtension> Extensions { get => field ??= []; 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>Effective extension loading mode. Defaults to load_and_augment when unset.</summary>
+    [JsonPropertyName("mode")]
+    public DiscoveredExtensionMode Mode { get; set; }
 }
 
-/// <summary>Canonical directory where custom agents can be discovered or created, with scope, preference, and optional project path.</summary>
+/// <summary>Source-qualified extension identifiers to persistently enable for future sessions.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class AgentDiscoveryPath
+internal sealed class DiscoveredExtensionsEnableRequest
 {
-    /// <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>Source-qualified user or plugin extension IDs to enable.</summary>
+    [JsonPropertyName("ids")]
+    public IList<string> Ids { get => field ??= []; set; }
 }
 
-/// <summary>Canonical locations where custom agents can be created so the runtime will recognize them.</summary>
+/// <summary>Source-qualified extension identifiers to persistently disable for future sessions.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class AgentDiscoveryPathList
+internal sealed class DiscoveredExtensionsDisableRequest
 {
-    /// <summary>Canonical agent create/discovery directories, in priority order.</summary>
-    [JsonPropertyName("paths")]
-    public IList<AgentDiscoveryPath> Paths { get => field ??= []; set; }
+    /// <summary>Source-qualified user or plugin extension IDs to disable.</summary>
+    [JsonPropertyName("ids")]
+    public IList<string> Ids { get => field ??= []; set; }
 }
 
-/// <summary>Optional project paths to include when enumerating agent discovery directories.</summary>
+/// <summary>The prompt the init command runs.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class AgentsGetDiscoveryPathsRequest
+internal sealed class InstructionsInitPromptResult
 {
-    /// <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>Prompt text authoring repository instructions.</summary>
+    [JsonPropertyName("prompt")]
+    public string Prompt { get; set; } = string.Empty;
 }
 
 /// <summary>Loaded instruction source for a session, including path, content, category, location, applicability, and optional description.</summary>
@@ -6810,17 +6662,50 @@ public sealed class ServerInstructionSourceList
 
 /// <summary>Optional project paths to include in instruction discovery.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class InstructionsDiscoverRequest
+public sealed class InstructionsDiscoverRequest
 {
     /// <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>Explicit discovery-only instruction roots using existing SDK instruction formats, not filesystem grants. Available without ambient discovery, subject to instruction/managed disables. Relative paths resolve against the request's effective working directory when supplied. Null and omission are equivalent; an empty array contributes no explicit roots.</summary>
+    [JsonPropertyName("instructionDirectories")]
+    public IList<string>? InstructionDirectories { 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>Explicit discovery arguments for one location, supplied by the caller rather than derived from a session.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class InstructionsDiscoverRepoSourcesRequest
+{
+    /// <summary>Extra directories to scan alongside instruction directories configured in the runtime environment.</summary>
+    [JsonPropertyName("additionalDirs")]
+    public IList<string>? AdditionalDirs { get; set; }
+
+    /// <summary>Copilot configuration directory for user-level sources. An omitted or empty value uses the server's configuration home.</summary>
+    [JsonPropertyName("configDir")]
+    public string? ConfigDir { get; set; }
+
+    /// <summary>Working directory whose instruction sources should also be included. Omission adds no separate working-directory scope.</summary>
+    [JsonPropertyName("cwdPath")]
+    public string? CwdPath { get; set; }
+
+    /// <summary>When true, also discover instruction files nested below the location.</summary>
+    [JsonPropertyName("enableChildInstructions")]
+    public bool? EnableChildInstructions { get; set; }
+
+    /// <summary>When true, include the sources a command-line host reads. Hosts that are not the CLI omit it.</summary>
+    [JsonPropertyName("isCli")]
+    public bool? IsCli { get; set; }
+
+    /// <summary>Repository location to discover. An empty string selects no repository scope; cwdPath can still supply working-directory sources.</summary>
+    [JsonPropertyName("location")]
+    public string Location { 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>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 public sealed class InstructionDiscoveryPath
@@ -6857,1807 +6742,1881 @@ public sealed class InstructionDiscoveryPathList
 
 /// <summary>Optional project paths to include when enumerating instruction discovery targets.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class InstructionsGetDiscoveryPathsRequest
+public sealed class InstructionsGetDiscoveryPathsRequest
 {
     /// <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>Explicit discovery-only instruction roots to enumerate, including configured missing directories. Relative paths resolve against the request's effective working directory when supplied. These are not filesystem grants or preferred creation targets. Null and omission are equivalent.</summary>
+    [JsonPropertyName("instructionDirectories")]
+    public IList<string>? InstructionDirectories { 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>A literal choice the command input accepts, with a human-facing description.</summary>
+/// <summary>Skill installation management result with the honoured contract, or a typed refusal.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SlashCommandInputChoice
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "kind",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(SkillInstallationManagementResultOutcome), "outcome")]
+[JsonDerivedType(typeof(SkillInstallationManagementResultNegotiationRefused), "negotiation-refused")]
+[JsonDerivedType(typeof(SkillInstallationManagementResultInvalidRequest), "invalid-request")]
+public partial class SkillInstallationManagementResult
 {
-    /// <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;
+    /// <summary>The type discriminator.</summary>
+    [JsonPropertyName("kind")]
+    public virtual string Kind { get; set; } = string.Empty;
 }
 
-/// <summary>Optional unstructured input hint.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SlashCommandInput
-{
-    /// <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>Optional completion hint for the input (e.g. 'directory' for filesystem path completion).</summary>
-    [JsonPropertyName("completion")]
-    public SlashCommandInputCompletion? Completion { get; set; }
 
-    /// <summary>Hint to display when command input has not been provided.</summary>
-    [JsonPropertyName("hint")]
-    public string Hint { get; set; } = string.Empty;
-
-    /// <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>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>Slash-command metadata with name, aliases, description, kind, input hint, execution allowance, and schedulability.</summary>
+/// <summary>Management outcome for verified Skill inventory, planning and removal.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SlashCommandInfo
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "kind",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(SkillInstallationManagementOutcomeRecoveryRequired), "recovery-required")]
+[JsonDerivedType(typeof(SkillInstallationManagementOutcomeInstallPlanned), "install-planned")]
+[JsonDerivedType(typeof(SkillInstallationManagementOutcomeListed), "listed")]
+[JsonDerivedType(typeof(SkillInstallationManagementOutcomeRecovered), "recovered")]
+[JsonDerivedType(typeof(SkillInstallationManagementOutcomeRolledBack), "rolled-back")]
+[JsonDerivedType(typeof(SkillInstallationManagementOutcomeUninstallPlanned), "uninstall-planned")]
+[JsonDerivedType(typeof(SkillInstallationManagementOutcomeOperation), "operation")]
+[JsonDerivedType(typeof(SkillInstallationManagementOutcomeEnabledChanged), "enabled-changed")]
+[JsonDerivedType(typeof(SkillInstallationManagementOutcomeRefused), "refused")]
+public partial class SkillInstallationManagementOutcome
 {
-    /// <summary>Canonical aliases without leading slashes.</summary>
-    [JsonPropertyName("aliases")]
-    public IList<string>? Aliases { get; set; }
-
-    /// <summary>Whether the command may run while an agent turn is active.</summary>
-    [JsonPropertyName("allowDuringAgentExecution")]
-    public bool AllowDuringAgentExecution { get; set; }
-
-    /// <summary>Human-readable command description.</summary>
-    [JsonPropertyName("description")]
-    public string Description { get; set; } = string.Empty;
-
-    /// <summary>Whether the command is experimental.</summary>
-    [JsonPropertyName("experimental")]
-    public bool? Experimental { get; set; }
-
-    /// <summary>Optional unstructured input hint.</summary>
-    [JsonPropertyName("input")]
-    public SlashCommandInput? Input { get; set; }
-
-    /// <summary>Coarse command category for grouping and behavior: runtime built-in, skill-backed command, or SDK/client-owned command.</summary>
+    /// <summary>The type discriminator.</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>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>Slash commands available in the session, after applying any include/exclude filters.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class CommandList
-{
-    /// <summary>Commands available in this session.</summary>
-    [JsonPropertyName("commands")]
-    public IList<SlashCommandInfo> Commands { get => field ??= []; set; }
+    public virtual string Kind { get; set; } = string.Empty;
 }
 
-/// <summary>A single user setting's effective value alongside its default, so consumers can render settings left at their default.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class UserSettingMetadata
-{
-    /// <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>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>Already-confirmed durable work must be reconciled before new mutations or inventory.</summary>
+/// <remarks>The <c>recovery-required</c> variant of <see cref="SkillInstallationManagementOutcome"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class UserSettingsGetResult
+public partial class SkillInstallationManagementOutcomeRecoveryRequired : SkillInstallationManagementOutcome
 {
-    /// <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 => "recovery-required";
 }
 
-/// <summary>Outcome of writing user settings.</summary>
+/// <summary>Safe verified Skill review fields. No raw credential, candidate handle or plan handle.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>action</c>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class UserSettingsSetResult
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "action",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(SkillInstallationReviewInstall), "install")]
+[JsonDerivedType(typeof(SkillInstallationReviewUninstall), "uninstall")]
+public partial class SkillInstallationReview
 {
-    /// <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>The type discriminator.</summary>
+    [JsonPropertyName("action")]
+    public virtual string Action { get; set; } = string.Empty;
 }
 
-/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class UserSettingsSetRequest
-{
-    /// <summary>Partial user settings to write, as a free-form object keyed by setting name.</summary>
-    [JsonPropertyName("settings")]
-    public JsonElement Settings { get; set; }
-}
 
-/// <summary>Validated device-managed settings discovered before a session exists.</summary>
+/// <summary>One reviewed Skill file.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ManagedSettingsReadResult
+public sealed class SkillInstallationFileReview
 {
-    /// <summary>Discovery or validation error text when managed settings could not be read safely.</summary>
-    [JsonPropertyName("errorMessage")]
-    public string? ErrorMessage { get; set; }
+    /// <summary>SHA-256 digest of the exact file bytes.</summary>
+    [JsonPropertyName("digest")]
+    public string Digest { get; set; } = string.Empty;
 
-    /// <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>Whether the file is installed with executable permissions.</summary>
+    [JsonPropertyName("executable")]
+    public bool Executable { get; set; }
 
-/// <summary>One validation finding for a managed-settings document.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ManagedSettingsDiagnostic
-{
-    /// <summary>Human-readable description of the finding.</summary>
-    [JsonPropertyName("message")]
-    public string Message { get; set; } = string.Empty;
+    /// <summary>Declared media type for the file.</summary>
+    [JsonPropertyName("mediaType")]
+    public string MediaType { get; set; } = string.Empty;
 
-    /// <summary>Dot-separated path of the offending setting, such as `autoTier.overridable`. Empty for the document as a whole.</summary>
+    /// <summary>Relative file path within the Skill root.</summary>
     [JsonPropertyName("path")]
     public string Path { get; set; } = string.Empty;
 
-    /// <summary>Whether the finding rejects the document.</summary>
-    [JsonPropertyName("severity")]
-    public ManagedSettingsDiagnosticSeverity Severity { get; set; }
+    /// <summary>Exact reviewed file size in bytes.</summary>
+    [JsonPropertyName("sizeBytes")]
+    public long SizeBytes { get; set; }
 }
 
-/// <summary>One managed-settings channel and the document it delivered.</summary>
+/// <summary>Source identity retained from Agent Finder and the pinned GitHub descriptor.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ManagedSettingsLayer
+public sealed class SkillInstallationSource
 {
-    /// <summary>Validated managed-settings document this channel delivered. Absent when the channel delivered none.</summary>
-    [JsonPropertyName("settings")]
-    public JsonElement? Settings { get; set; }
+    /// <summary>Digest of the descriptor's bundle manifest.</summary>
+    [JsonPropertyName("bundleDigest")]
+    public string BundleDigest { get; set; } = string.Empty;
 
-    /// <summary>Channel identifier: `device` (MDM, plist, registry, or managed file), `server` (account or organization policy), or `policyHelper` (session-local helper output, supported by compose). Treat unknown output values as additional channels; more may be added.</summary>
-    [JsonPropertyName("source")]
-    public string Source { get; set; } = string.Empty;
-}
+    /// <summary>Agent Finder materialisation revision identifier.</summary>
+    [JsonPropertyName("catalogRevisionId")]
+    public string CatalogRevisionId { get; set; } = string.Empty;
 
-/// <summary>Lock state and provenance of one managed setting.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ManagedSettingMeta
-{
-    /// <summary>Whether users and repositories may choose a different value. `false` means policy locks the value.</summary>
-    [JsonPropertyName("overridable")]
-    public bool Overridable { get; set; }
+    /// <summary>Digest of the canonical materialisation descriptor.</summary>
+    [JsonPropertyName("descriptorDigest")]
+    public string DescriptorDigest { get; set; } = string.Empty;
 
-    /// <summary>Channel that supplied this scalar value, matching a `layers[].source`: `device`, `server`, or `policyHelper`. These scalar defaults select one winning channel, not a mixed source. Treat unknown values as additional channels; more may be added.</summary>
-    [JsonPropertyName("source")]
-    public string Source { get; set; } = string.Empty;
+    /// <summary>Repository full name, for example owner/name.</summary>
+    [JsonPropertyName("repository")]
+    public string Repository { get; set; } = string.Empty;
+
+    /// <summary>GitHub repository database identifier.</summary>
+    [JsonPropertyName("repositoryId")]
+    public string RepositoryId { get; set; } = string.Empty;
+
+    /// <summary>Agent Finder resource identifier.</summary>
+    [JsonPropertyName("resourceId")]
+    public string ResourceId { get; set; } = string.Empty;
+
+    /// <summary>Pinned Git commit revision.</summary>
+    [JsonPropertyName("revision")]
+    public string Revision { get; set; } = string.Empty;
+
+    /// <summary>Root path within the pinned repository.</summary>
+    [JsonPropertyName("root")]
+    public string Root { get; set; } = string.Empty;
 }
 
-/// <summary>Per-key lock state and provenance for `ManagedSettingsValues`, with the same field names. Producers emit each typed key in values and meta together; both outer objects are omitted when no typed key is set.</summary>
+/// <summary>A user-facing personal Skill installation location without absolute host paths.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ManagedSettingsMeta
+public sealed class SkillInstallationLocation
 {
-    /// <summary>Lock state and provenance of `values.autoTier`.</summary>
-    [JsonPropertyName("autoTier")]
-    public ManagedSettingMeta? AutoTier { get; set; }
+    /// <summary>Diagnostics-only absolute host path. Hosts must not display it by default.</summary>
+    [JsonPropertyName("diagnosticsAbsolutePath")]
+    public string? DiagnosticsAbsolutePath { get; set; }
 
-    /// <summary>Lock state and provenance of `values.model`.</summary>
-    [JsonPropertyName("model")]
-    public ManagedSettingMeta? Model { get; set; }
+    /// <summary>Safe display label, for example ~/.copilot/skills/run-checks.</summary>
+    [JsonPropertyName("displayLabel")]
+    public string DisplayLabel { get; set; } = string.Empty;
+
+    /// <summary>Path relative to the Copilot home.</summary>
+    [JsonPropertyName("relativePath")]
+    public string RelativePath { get; set; } = string.Empty;
+
+    /// <summary>Installation scope. Agent Finder Skills are installed in the user's personal Copilot home.</summary>
+    [JsonPropertyName("scope")]
+    public SkillInstallationScope Scope { get; set; }
 }
 
-/// <summary>Effective enterprise managed settings and contributing channels. Session events report applied policy; sessionless resolve reports an account/device snapshot, and compose reports a non-applying preview of candidate documents. Device values take precedence over server values, then the policy helper, per ordinary key, while permissions compose restrictively. Session-local SDK-client policy is included only in session results. Marked experimental while the managed-settings surface stabilizes.</summary>
+/// <summary>Review for installing a verified Skill.</summary>
+/// <remarks>The <c>install</c> variant of <see cref="SkillInstallationReview"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ManagedSettingsResolvedData
+public partial class SkillInstallationReviewInstall : SkillInstallationReview
 {
-    /// <summary>Whether enterprise policy disables bypass-permissions ("yolo") mode for this session. Deny-wins across layers, and forced on when `failClosed` is true.</summary>
-    [JsonPropertyName("bypassPermissionsDisabled")]
-    public bool BypassPermissionsDisabled { get; set; }
-
-    /// <summary>Whether a session-local permissions layer injected by the SDK host was present.</summary>
-    [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 bool DeviceManaged { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Action => "install";
 
-    /// <summary>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.</summary>
-    [JsonPropertyName("failClosed")]
-    public bool FailClosed { get; set; }
+    /// <summary>Catalogue identity retained from the bound candidate before consent.</summary>
+    [JsonPropertyName("catalogue")]
+    public required InstallationCatalogueIdentity Catalogue { get; set; }
 
-    /// <summary>The setting keys under enterprise management in the effective managed settings (e.g. `model`, `enabledPlugins`, `permissions`). Empty when no managed settings are in force.</summary>
-    [JsonPropertyName("managedKeys")]
-    public IList<string> ManagedKeys { get => field ??= []; set; }
+    /// <summary>Skill description from SKILL.md when present.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("description")]
+    public string? Description { get; set; }
 
-    /// <summary>Whether at least two managed sources supplied permission allowlists, so enforcement intersects them and the flattened settings payload omits `permissions.allow`.</summary>
-    [JsonPropertyName("permissionsAllowIntersected")]
-    public bool? PermissionsAllowIntersected { get; set; }
+    /// <summary>
+    /// Complete verified SKILL.md content. Planning refuses with review-too-large
+    /// when this exceeds 262144 UTF-8 bytes; it is never truncated.
+    /// </summary>
+    [JsonPropertyName("entrypointContent")]
+    public required string EntrypointContent { get; set; }
 
-    /// <summary>Whether the policy-helper managed-settings layer was present. The policy helper is the weakest channel: it fills keys no enterprise source set and can never replace one.</summary>
-    [JsonPropertyName("policyHelperManaged")]
-    public bool? PolicyHelperManaged { get; set; }
+    /// <summary>Relative path of the verified Skill entrypoint.</summary>
+    [JsonPropertyName("entrypointPath")]
+    public required string EntrypointPath { 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>
-    [JsonPropertyName("sandboxEnabledByUndeterminedPolicy")]
-    public bool? SandboxEnabledByUndeterminedPolicy { get; set; }
+    /// <summary>Reviewed files and digests.</summary>
+    [JsonPropertyName("files")]
+    public required IList<SkillInstallationFileReview> Files { get; set; }
 
-    /// <summary>Whether the server (account/org) managed-settings layer was present.</summary>
-    [JsonPropertyName("serverManaged")]
-    public bool ServerManaged { get; set; }
+    /// <summary>Installing never grants immediate use; the Skill is written disabled.</summary>
+    [JsonPropertyName("installsDisabled")]
+    public required bool InstallsDisabled { get; set; }
 
-    /// <summary>The effective (resolved) managed settings values, so clients can render exactly what is enforced. Absent when no managed policy is in force.</summary>
-    [JsonPropertyName("settings")]
-    public JsonElement? Settings { get; set; }
+    /// <summary>Skill invocation name from SKILL.md.</summary>
+    [JsonPropertyName("name")]
+    public required string Name { get; set; }
 
-    /// <summary>Channel summary: `server`, `device`, `client`, or `policyHelper` when exactly one channel contributed; `mixed` when multiple channels contributed; otherwise `none`. Consult the per-channel booleans for exact provenance.</summary>
+    /// <summary>Exact verified source identity.</summary>
     [JsonPropertyName("source")]
-    public ManagedSettingsResolvedSource Source { get; set; }
-}
+    public required SkillInstallationSource Source { get; set; }
 
-/// <summary>Typed effective values of managed settings. Each field mirrors the managed-settings schema key of the same name; more keys are added as they are typed.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ManagedSettingsValues
-{
-    /// <summary>Managed Auto routing preference, used when the selected model is `auto`.</summary>
-    [JsonPropertyName("autoTier")]
-    public AutoTier? AutoTier { get; set; }
+    /// <summary>Exact user-scope target location without an absolute host path.</summary>
+    [JsonPropertyName("target")]
+    public required SkillInstallationLocation Target { get; set; }
 
-    /// <summary>Managed default model identifier, as configured. New sessions start with it; it can name a model the account cannot use, so hosts match it against the listed models.</summary>
-    [JsonPropertyName("model")]
-    public string? Model { get; set; }
+    /// <summary>Total reviewed payload size in bytes.</summary>
+    [JsonPropertyName("totalBytes")]
+    public required long TotalBytes { get; set; }
 }
 
-/// <summary>Effective enterprise managed settings for an account, resolved without a session.</summary>
+/// <summary>Durable verified Skill ownership summary.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ManagedSettingsResolveResult
+public sealed class SkillInstallationSummary
 {
-    /// <summary>Printable opaque identity of the account the settings were resolved for, suitable for comparison and storage, not an account selectionId. Absent when no account was available, in which case only device policy is reported.</summary>
-    [JsonPropertyName("account")]
-    public string? Account { get; set; }
-
-    /// <summary>Warnings about unavailable policy sources or a failed refresh served from cache. A cached response is not proof of a successful live fetch; `resolved.failClosed` separately describes enforcement.</summary>
-    [JsonPropertyName("diagnostics")]
-    public IList<ManagedSettingsDiagnostic> Diagnostics { get => field ??= []; set; }
+    /// <summary>Catalogue identity retained at install time.</summary>
+    [JsonPropertyName("catalogue")]
+    public InstallationCatalogueIdentity Catalogue { get => field ??= new(); set; }
 
-    /// <summary>Each managed-settings channel consulted, strongest first, with the validated document it delivered before merging. `resolved.settings` is the merged result. More channels may be added over time.</summary>
-    [JsonPropertyName("layers")]
-    public IList<ManagedSettingsLayer> Layers { get => field ??= []; set; }
+    /// <summary>Persisted enablement requested for this installation.</summary>
+    [JsonPropertyName("configuredEnabled")]
+    public bool ConfiguredEnabled { get; set; }
 
-    /// <summary>Per-key lock state and provenance for the entries in `values`, using the same key names.</summary>
-    [JsonPropertyName("meta")]
-    public ManagedSettingsMeta? Meta { get; set; }
+    /// <summary>Exact durable installation receipt identity.</summary>
+    [JsonPropertyName("installationId")]
+    public string InstallationId { get; set; } = string.Empty;
 
-    /// <summary>Effective managed settings from the device and account (server) channels, in the same shape as `session.managedSettings.get`, excluding session-local injection.</summary>
-    [JsonPropertyName("resolved")]
-    public ManagedSettingsResolvedData Resolved { get => field ??= new(); set; }
+    /// <summary>ISO 8601 wall-clock installation time.</summary>
+    [JsonPropertyName("installedAt")]
+    public string InstalledAt { get; set; } = string.Empty;
 
-    /// <summary>Typed effective values of managed settings, keyed like the managed-settings schema and already resolved across channels, with the `{ "overridable": ... }` wrapper removed. Present when policy sets at least one typed key. Keys not typed here are available in `resolved.settings`.</summary>
-    [JsonPropertyName("values")]
-    public ManagedSettingsValues? Values { get; set; }
-}
+    /// <summary>Skill invocation name.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
 
-/// <summary>RPC data type for ManagedSettingsResolve operations.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class ManagedSettingsResolveRequest
-{
-    /// <summary>Embedding client identity for server policy requests, as in session creation. Omit for the CLI identity.</summary>
-    [JsonPropertyName("clientName")]
-    public string? ClientName { get; set; }
+    /// <summary>Operation that installed this Skill.</summary>
+    [JsonPropertyName("operationId")]
+    public string OperationId { get; set; } = string.Empty;
 
-    /// <summary>GitHub token to resolve instead of the current account. The call fails when the token cannot be resolved.</summary>
-    [JsonPropertyName("gitHubToken")]
-    public string? GitHubToken { get; set; }
+    /// <summary>Ownership state observed from files and receipts.</summary>
+    [JsonPropertyName("ownershipState")]
+    public SkillInstallationOwnershipState OwnershipState { get; set; }
 
-    /// <summary>Opaque account identifier returned by `account.getAllUsers`. When omitted, the current account is used, or device policy only when no account is signed in.</summary>
-    [JsonPropertyName("selectionId")]
-    public string? SelectionId { get; set; }
-}
+    /// <summary>Bound-session load observation.</summary>
+    [JsonPropertyName("sessionState")]
+    public SkillInstallationSessionState SessionState { get; set; }
 
-/// <summary>The authoring JSON schema for managed settings recognized by this runtime.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ManagedSettingsSchemaResult
-{
-    /// <summary>Version of the runtime that owns this schema.</summary>
-    [JsonPropertyName("runtimeVersion")]
-    public string RuntimeVersion { get; set; } = string.Empty;
+    /// <summary>Exact retained verified source identity.</summary>
+    [JsonPropertyName("source")]
+    public SkillInstallationSource Source { get => field ??= new(); set; }
 
-    /// <summary>JSON schema (draft 2020-12) with descriptive shared `x-composition` annotations, not a complete runtime composition contract. Model, effortLevel, and contextTier remain coupled; use `managedSettings.compose` for the runtime's effective result.</summary>
-    [JsonPropertyName("schema")]
-    public JsonElement Schema { get; set; }
+    /// <summary>User-facing installation location without an absolute host path.</summary>
+    [JsonPropertyName("target")]
+    public SkillInstallationLocation Target { get => field ??= new(); set; }
 }
 
-/// <summary>Result of validating a managed-settings document.</summary>
+/// <summary>Review for uninstalling an owned verified Skill.</summary>
+/// <remarks>The <c>uninstall</c> variant of <see cref="SkillInstallationReview"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ManagedSettingsValidateResult
+public partial class SkillInstallationReviewUninstall : SkillInstallationReview
 {
-    /// <summary>Errors that reject the document and warnings about content the runtime ignores.</summary>
-    [JsonPropertyName("diagnostics")]
-    public IList<ManagedSettingsDiagnostic> Diagnostics { get => field ??= []; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Action => "uninstall";
 
-    /// <summary>Canonical form of the document the runtime would apply, with unrecognized keys removed. Absent when the document is invalid.</summary>
-    [JsonPropertyName("settings")]
-    public JsonElement? Settings { get; set; }
+    /// <summary>Catalogue identity retained at install time.</summary>
+    [JsonPropertyName("catalogue")]
+    public required InstallationCatalogueIdentity Catalogue { get; set; }
 
-    /// <summary>Whether the runtime would accept the document within the preview resource limits. Always equals whether `settings` is present. An invalid document is rejected as a whole.</summary>
-    [JsonPropertyName("valid")]
-    public bool Valid { get; set; }
-}
+    /// <summary>Files recorded by the installation receipt.</summary>
+    [JsonPropertyName("files")]
+    public required IList<SkillInstallationFileReview> Files { get; set; }
 
-/// <summary>A candidate managed-settings document to validate without applying it.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class ManagedSettingsValidateRequest
-{
-    /// <summary>The document to validate: a JSON object, or a string containing the document's JSON text. Preview documents are limited to 1 MiB and 64 levels of nesting, a stricter resource limit than delivered-policy parsing; violations are returned as diagnostics.</summary>
-    [JsonPropertyName("content")]
-    public JsonElement Content { get; set; }
+    /// <summary>Whether current files differ from the receipt. Apply refuses drift.</summary>
+    [JsonPropertyName("filesModified")]
+    public required bool FilesModified { get; set; }
 
-    /// <summary>Channel the document is meant for (`device`, `server`, or `policyHelper`). Some keys are only honored in some channels; for example, a `policyHelper` registration is ignored in policy-helper output. When omitted, no channel-specific checks run.</summary>
-    [JsonPropertyName("layer")]
-    public string? Layer { get; set; }
+    /// <summary>Owned installation being removed.</summary>
+    [JsonPropertyName("installation")]
+    public required SkillInstallationSummary Installation { get; set; }
+
+    /// <summary>Total receipt-owned payload size in bytes.</summary>
+    [JsonPropertyName("totalBytes")]
+    public required long TotalBytes { get; set; }
 }
 
-/// <summary>The effective managed settings the runtime would enforce for the given documents, in the same shape `managedSettings.resolve` returns.</summary>
+/// <summary>A computed Skill install plan. Nothing has been applied.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ManagedSettingsComposeResult
+public sealed class SkillInstallPlan
 {
-    /// <summary>Warnings about ignored content, with paths prefixed by the channel name.</summary>
-    [JsonPropertyName("diagnostics")]
-    public IList<ManagedSettingsDiagnostic> Diagnostics { get => field ??= []; set; }
-
-    /// <summary>Only the supplied channels, strongest first, with canonical documents. Empty canonical documents are represented as absent settings, as in live resolution.</summary>
-    [JsonPropertyName("layers")]
-    public IList<ManagedSettingsLayer> Layers { get => field ??= []; set; }
+    /// <summary>Original wall-clock expiry as an ISO 8601 timestamp.</summary>
+    [JsonPropertyName("expiresAt")]
+    public string ExpiresAt { get; set; } = string.Empty;
 
-    /// <summary>Per-key lock state and provenance for `values`.</summary>
-    [JsonPropertyName("meta")]
-    public ManagedSettingsMeta? Meta { get; set; }
+    /// <summary>Original operation identifier returned before confirmation.</summary>
+    [JsonPropertyName("operationId")]
+    public string OperationId { get; set; } = string.Empty;
 
-    /// <summary>Effective managed settings, in the same shape as `session.managedSettings.get`.</summary>
-    [JsonPropertyName("resolved")]
-    public ManagedSettingsResolvedData Resolved { get => field ??= new(); set; }
+    /// <summary>One-use plan handle, bound to the original candidate authority.</summary>
+    [JsonPropertyName("planHandle")]
+    public string PlanHandle { get; set; } = string.Empty;
 
-    /// <summary>Typed effective values, as in `managedSettings.resolve`.</summary>
-    [JsonPropertyName("values")]
-    public ManagedSettingsValues? Values { get; set; }
+    /// <summary>Safe review to present before applying the plan.</summary>
+    [JsonPropertyName("review")]
+    public SkillInstallationReview Review { get => field ??= new(); set; }
 }
 
-/// <summary>One candidate channel; absent settings represents a channel that delivered no document.</summary>
+/// <summary>A verified Skill installation plan was prepared.</summary>
+/// <remarks>The <c>install-planned</c> variant of <see cref="SkillInstallationManagementOutcome"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ManagedSettingsComposeLayer
+public partial class SkillInstallationManagementOutcomeInstallPlanned : SkillInstallationManagementOutcome
 {
-    /// <summary>Candidate managed-settings document. Omit when the channel delivered none, as in resolve output.</summary>
-    [JsonPropertyName("settings")]
-    public JsonElement? Settings { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "install-planned";
 
-    /// <summary>The channel whose candidate document is being supplied.</summary>
-    [JsonPropertyName("source")]
-    public ManagedSettingsChannel Source { get; set; }
+    /// <summary>Prepared install plan.</summary>
+    [JsonPropertyName("plan")]
+    public required SkillInstallPlan Plan { get; set; }
 }
 
-/// <summary>Candidate managed-settings documents to merge without applying them.</summary>
+/// <summary>Owned Skill installations were listed.</summary>
+/// <remarks>The <c>listed</c> variant of <see cref="SkillInstallationManagementOutcome"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class ManagedSettingsComposeRequest
+public partial class SkillInstallationManagementOutcomeListed : SkillInstallationManagementOutcome
 {
-    /// <summary>One entry per channel. `source` must be `device`, `server`, or `policyHelper`, each at most once (checked at runtime); order does not matter, because channel precedence is fixed. To preview documents from resolve output, map recognized source strings to ManagedSettingsChannel and copy their settings; generated resolve and compose layer types are distinct. Omitted settings means this channel delivered no document. Supplied documents must be valid within the preview limits; warnings are returned in diagnostics. Compose does not reproduce source-failure state or retained enforcement floors from resolve.</summary>
-    [JsonPropertyName("layers")]
-    public IList<ManagedSettingsComposeLayer> Layers { get => field ??= []; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "listed";
+
+    /// <summary>Owned Skill installation summaries.</summary>
+    [JsonPropertyName("installations")]
+    public required IList<SkillInstallationSummary> Installations { get; set; }
 }
 
-/// <summary>Indicates whether the calling client was registered as the session filesystem provider.</summary>
+/// <summary>Recovery completed and inventory was inspected.</summary>
+/// <remarks>The <c>recovered</c> variant of <see cref="SkillInstallationManagementOutcome"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionFsSetProviderResult
+public partial class SkillInstallationManagementOutcomeRecovered : SkillInstallationManagementOutcome
 {
-    /// <summary>Whether the provider was set successfully.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "recovered";
+
+    /// <summary>Owned Skill installation summaries after recovery.</summary>
+    [JsonPropertyName("installations")]
+    public required IList<SkillInstallationSummary> Installations { get; set; }
 }
 
-/// <summary>Optional capabilities declared by the provider.</summary>
+/// <summary>Interrupted work was safely compensated and the pending marker was cleared.</summary>
+/// <remarks>The <c>rolled-back</c> variant of <see cref="SkillInstallationManagementOutcome"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionFsSetProviderCapabilities
+public partial class SkillInstallationManagementOutcomeRolledBack : SkillInstallationManagementOutcome
 {
-    /// <summary>Whether the provider supports binary reads and writes through sessionFs.readFileBytes and sessionFs.writeFileBytes.</summary>
-    [JsonPropertyName("binary")]
-    public bool? Binary { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "rolled-back";
 
-    /// <summary>Whether the provider supports SQLite query/exists operations.</summary>
-    [JsonPropertyName("sqlite")]
-    public bool? Sqlite { get; set; }
+    /// <summary>Original operation identity.</summary>
+    [JsonPropertyName("operation_id")]
+    public required string OperationId { get; set; }
+
+    /// <summary>Cause of the compensation.</summary>
+    [JsonPropertyName("reason")]
+    public required SkillInstallationFailureReason Reason { 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. A registered provider is authoritative for path interpretation and filesystem facts used by workspace permission validation. Paths are interpreted lexically; home-relative paths (`~` and `~/...`) and Windows drive-relative paths such as `C:foo` are unsupported. Until provider-side canonicalization is supported, providers must not expose symlinks inside allowed roots that escape those roots.</summary>
+/// <summary>A computed Skill uninstall plan. Nothing has been removed.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionFsSetProviderRequest
+public sealed class SkillUninstallPlan
 {
-    /// <summary>Optional capabilities declared by the provider.</summary>
-    [JsonPropertyName("capabilities")]
-    public SessionFsSetProviderCapabilities? Capabilities { get; set; }
+    /// <summary>Original wall-clock expiry as an ISO 8601 timestamp.</summary>
+    [JsonPropertyName("expiresAt")]
+    public string ExpiresAt { get; set; } = string.Empty;
 
-    /// <summary>Path conventions used by this filesystem.</summary>
-    [JsonPropertyName("conventions")]
-    public SessionFsSetProviderConventions Conventions { get; set; }
+    /// <summary>Owned Skill installation being removed.</summary>
+    [JsonPropertyName("installation")]
+    public SkillInstallationSummary Installation { get => field ??= new(); set; }
 
-    /// <summary>Absolute initial working directory for sessions. Registering the provider establishes this path as the root of its virtual namespace; the runtime does not require the provider to materialize or stat it before creating a session.</summary>
-    [JsonPropertyName("initialCwd")]
-    public string InitialCwd { get; set; } = string.Empty;
+    /// <summary>Original removal operation identifier returned before confirmation.</summary>
+    [JsonPropertyName("operationId")]
+    public string OperationId { get; set; } = string.Empty;
 
-    /// <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>One-use uninstall plan handle.</summary>
+    [JsonPropertyName("planHandle")]
+    public string PlanHandle { get; set; } = string.Empty;
+
+    /// <summary>Safe review to present before applying removal.</summary>
+    [JsonPropertyName("review")]
+    public SkillInstallationReview Review { get => field ??= new(); set; }
 }
 
-/// <summary>Indicates whether the calling client was registered as the LLM inference provider.</summary>
+/// <summary>An owned Skill uninstall plan was prepared.</summary>
+/// <remarks>The <c>uninstall-planned</c> variant of <see cref="SkillInstallationManagementOutcome"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class LlmInferenceSetProviderResult
+public partial class SkillInstallationManagementOutcomeUninstallPlanned : SkillInstallationManagementOutcome
 {
-    /// <summary>Whether the provider was set successfully.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "uninstall-planned";
+
+    /// <summary>Prepared uninstall plan.</summary>
+    [JsonPropertyName("plan")]
+    public required SkillUninstallPlan Plan { get; set; }
 }
 
-/// <summary>Whether the start frame was accepted.</summary>
+/// <summary>Status snapshot from the original connection, independent of new-work account availability.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>phase</c>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class LlmInferenceHttpResponseStartResult
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "phase",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(SkillInstallationOperationStatusPreparing), "preparing")]
+[JsonDerivedType(typeof(SkillInstallationOperationStatusPrepared), "prepared")]
+[JsonDerivedType(typeof(SkillInstallationOperationStatusAwaitingConfirmation), "awaiting-confirmation")]
+[JsonDerivedType(typeof(SkillInstallationOperationStatusRevalidating), "revalidating")]
+[JsonDerivedType(typeof(SkillInstallationOperationStatusApplying), "applying")]
+[JsonDerivedType(typeof(SkillInstallationOperationStatusCompleted), "completed")]
+public partial class SkillInstallationOperationStatus
 {
-    /// <summary>True when the response start was matched to a pending request; false when unknown.</summary>
-    [JsonPropertyName("accepted")]
-    public bool Accepted { get; set; }
+    /// <summary>The type discriminator.</summary>
+    [JsonPropertyName("phase")]
+    public virtual string Phase { get; set; } = string.Empty;
 }
 
-/// <summary>Response head.</summary>
+
+/// <summary>Original operation progress discriminator.</summary>
+/// <remarks>The <c>preparing</c> variant of <see cref="SkillInstallationOperationStatus"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class LlmInferenceHttpResponseStartRequest
+public partial class SkillInstallationOperationStatusPreparing : SkillInstallationOperationStatus
 {
-    /// <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>Matches the requestId from the originating httpRequestStart frame.</summary>
-    [JsonPropertyName("requestId")]
-    public string RequestId { get; set; } = string.Empty;
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Phase => "preparing";
 
-    /// <summary>HTTP status code.</summary>
-    [JsonPropertyName("status")]
-    public long Status { get; set; }
+    /// <summary>Whether cancellation has been requested.</summary>
+    [JsonPropertyName("cancellationRequested")]
+    public required bool CancellationRequested { get; set; }
 
-    /// <summary>Optional HTTP status reason phrase.</summary>
-    [JsonPropertyName("statusText")]
-    public string? StatusText { get; set; }
+    /// <summary>Original runtime-issued operation identity.</summary>
+    [JsonPropertyName("operationId")]
+    public required string OperationId { get; set; }
 }
 
-/// <summary>Whether the chunk was accepted.</summary>
+/// <summary>Original operation progress discriminator.</summary>
+/// <remarks>The <c>prepared</c> variant of <see cref="SkillInstallationOperationStatus"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class LlmInferenceHttpResponseChunkResult
+public partial class SkillInstallationOperationStatusPrepared : SkillInstallationOperationStatus
 {
-    /// <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 Phase => "prepared";
 
-/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class LlmInferenceHttpResponseChunkError
-{
-    /// <summary>Optional machine-readable error code.</summary>
-    [JsonPropertyName("code")]
-    public string? Code { get; set; }
+    /// <summary>Whether cancellation has been requested.</summary>
+    [JsonPropertyName("cancellationRequested")]
+    public required bool CancellationRequested { get; set; }
 
-    /// <summary>Human-readable failure description.</summary>
-    [JsonPropertyName("message")]
-    public string Message { get; set; } = string.Empty;
+    /// <summary>Original runtime-issued operation identity.</summary>
+    [JsonPropertyName("operationId")]
+    public required string OperationId { get; set; }
 }
 
-/// <summary>A response body chunk or terminal error.</summary>
+/// <summary>Original operation progress discriminator.</summary>
+/// <remarks>The <c>awaiting-confirmation</c> variant of <see cref="SkillInstallationOperationStatus"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class LlmInferenceHttpResponseChunkRequest
+public partial class SkillInstallationOperationStatusAwaitingConfirmation : SkillInstallationOperationStatus
 {
-    /// <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>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; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Phase => "awaiting-confirmation";
 
-    /// <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 cancellation has been requested.</summary>
+    [JsonPropertyName("cancellationRequested")]
+    public required bool CancellationRequested { get; set; }
 
-    /// <summary>Matches the requestId from the originating httpRequestStart frame.</summary>
-    [JsonPropertyName("requestId")]
-    public string RequestId { get; set; } = string.Empty;
+    /// <summary>Original runtime-issued operation identity.</summary>
+    [JsonPropertyName("operationId")]
+    public required string OperationId { get; set; }
 }
 
-/// <summary>Pre-resolved working-directory context for session startup.</summary>
+/// <summary>Original operation progress discriminator.</summary>
+/// <remarks>The <c>revalidating</c> variant of <see cref="SkillInstallationOperationStatus"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionContext
+public partial class SkillInstallationOperationStatusRevalidating : SkillInstallationOperationStatus
 {
-    /// <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; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Phase => "revalidating";
 
-    /// <summary>Repository host type.</summary>
-    [JsonPropertyName("hostType")]
-    public SessionContextHostType? HostType { get; set; }
+    /// <summary>Whether cancellation has been requested.</summary>
+    [JsonPropertyName("cancellationRequested")]
+    public required bool CancellationRequested { get; set; }
 
-    /// <summary>Repository slug in `owner/name` form, when known.</summary>
-    [JsonPropertyName("repository")]
-    public string? Repository { get; set; }
+    /// <summary>Original runtime-issued operation identity.</summary>
+    [JsonPropertyName("operationId")]
+    public required string OperationId { get; set; }
 }
 
-/// <summary>GitHub repository the remote session belongs to.</summary>
+/// <summary>Original operation progress discriminator.</summary>
+/// <remarks>The <c>applying</c> variant of <see cref="SkillInstallationOperationStatus"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class RemoteSessionMetadataRepository
+public partial class SkillInstallationOperationStatusApplying : SkillInstallationOperationStatus
 {
-    /// <summary>Branch associated with the remote session.</summary>
-    [JsonPropertyName("branch")]
-    public string Branch { get; set; } = string.Empty;
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Phase => "applying";
 
-    /// <summary>Repository name.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Whether cancellation has been requested; already-started effects require recovery.</summary>
+    [JsonPropertyName("cancellationRequested")]
+    public required bool CancellationRequested { get; set; }
 
-    /// <summary>Repository owner.</summary>
-    [JsonPropertyName("owner")]
-    public string Owner { get; set; } = string.Empty;
+    /// <summary>Original runtime-issued operation identity.</summary>
+    [JsonPropertyName("operationId")]
+    public required string OperationId { get; set; }
 }
 
-/// <summary>Remote session metadata for the session to hand off (typically obtained from `sessions.list` with `source: "remote"`).</summary>
+/// <summary>Terminal verified Skill mutation result.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class RemoteSessionMetadataValue
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "kind",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(SkillInstallationOutcomeInstalled), "installed")]
+[JsonDerivedType(typeof(SkillInstallationOutcomeUninstalled), "uninstalled")]
+[JsonDerivedType(typeof(SkillInstallationOutcomeRolledBack), "rolled-back")]
+[JsonDerivedType(typeof(SkillInstallationOutcomeRecoveryRequired), "recovery-required")]
+[JsonDerivedType(typeof(SkillInstallationOutcomeDeclined), "declined")]
+[JsonDerivedType(typeof(SkillInstallationOutcomeCancelled), "cancelled")]
+[JsonDerivedType(typeof(SkillInstallationOutcomeRefused), "refused")]
+public partial class SkillInstallationOutcome
 {
-    /// <summary>Most recent working directory context.</summary>
-    [JsonPropertyName("context")]
-    public SessionContext? Context { get; set; }
+    /// <summary>The type discriminator.</summary>
+    [JsonPropertyName("kind")]
+    public virtual string Kind { 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>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>The verified Skill was installed disabled.</summary>
+/// <remarks>The <c>installed</c> variant of <see cref="SkillInstallationOutcome"/>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class SkillInstallationOutcomeInstalled : SkillInstallationOutcome
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "installed";
 
-    /// <summary>Always true for remote sessions.</summary>
-    [JsonPropertyName("isRemote")]
-    public bool IsRemote { get; set; }
+    /// <summary>Durable installed Skill summary.</summary>
+    [JsonPropertyName("installation")]
+    public required SkillInstallationSummary Installation { get; set; }
+}
 
-    /// <summary>Last-modified time as an ISO 8601 timestamp.</summary>
-    [JsonPropertyName("modifiedTime")]
-    public string ModifiedTime { get; set; } = string.Empty;
+/// <summary>The owned Skill was removed.</summary>
+/// <remarks>The <c>uninstalled</c> variant of <see cref="SkillInstallationOutcome"/>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class SkillInstallationOutcomeUninstalled : SkillInstallationOutcome
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "uninstalled";
 
-    /// <summary>Optional human-friendly name set via /rename.</summary>
-    [JsonPropertyName("name")]
-    public string? Name { get; set; }
+    /// <summary>Removed installation identity.</summary>
+    [JsonPropertyName("installationId")]
+    public required string InstallationId { get; set; }
 
-    /// <summary>Pull request number associated with the session.</summary>
-    [JsonPropertyName("pullRequestNumber")]
-    public long? PullRequestNumber { get; set; }
+    /// <summary>Original removal operation identity.</summary>
+    [JsonPropertyName("operationId")]
+    public required string OperationId { get; set; }
+}
 
-    /// <summary>Backing remote session IDs (most recent first).</summary>
-    [JsonPropertyName("remoteSessionIds")]
-    public IList<string> RemoteSessionIds { get => field ??= []; set; }
+/// <summary>The durable transaction was aborted or fully compensated.</summary>
+/// <remarks>The <c>rolled-back</c> variant of <see cref="SkillInstallationOutcome"/>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class SkillInstallationOutcomeRolledBack : SkillInstallationOutcome
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "rolled-back";
 
-    /// <summary>GitHub repository the remote session belongs to.</summary>
-    [JsonPropertyName("repository")]
-    public RemoteSessionMetadataRepository Repository { get => field ??= new(); set; }
+    /// <summary>Original operation identity.</summary>
+    [JsonPropertyName("operationId")]
+    public required string OperationId { get; set; }
 
-    /// <summary>Original remote resource identifier (task ID or PR node ID).</summary>
-    [JsonPropertyName("resourceId")]
-    public string? ResourceId { get; set; }
+    /// <summary>Cause of the fully aborted or compensated operation.</summary>
+    [JsonPropertyName("reason")]
+    public required SkillInstallationFailureReason Reason { get; set; }
+}
 
-    /// <summary>Stable session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+/// <summary>A write may have completed. Recover and inspect durable state before retrying.</summary>
+/// <remarks>The <c>recovery-required</c> variant of <see cref="SkillInstallationOutcome"/>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class SkillInstallationOutcomeRecoveryRequired : SkillInstallationOutcome
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "recovery-required";
 
-    /// <summary>Deadline (ISO 8601) at which a CLI remote session becomes stale without further heartbeats.</summary>
-    [JsonPropertyName("staleAt")]
-    public string? StaleAt { get; set; }
+    /// <summary>Operation whose durable result must be recovered and inspected.</summary>
+    [JsonPropertyName("operationId")]
+    public required string OperationId { get; set; }
+}
 
-    /// <summary>Session creation time as an ISO 8601 timestamp.</summary>
-    [JsonPropertyName("startTime")]
-    public string StartTime { get; set; } = string.Empty;
+/// <summary>The user declined the confirmation request.</summary>
+/// <remarks>The <c>declined</c> variant of <see cref="SkillInstallationOutcome"/>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class SkillInstallationOutcomeDeclined : SkillInstallationOutcome
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "declined";
 
-    /// <summary>Server-side task state returned by GitHub.</summary>
-    [JsonPropertyName("state")]
-    public string? State { get; set; }
+    /// <summary>Original operation identity.</summary>
+    [JsonPropertyName("operationId")]
+    public required string OperationId { get; set; }
+}
 
-    /// <summary>Short summary of the session, when one has been derived.</summary>
-    [JsonPropertyName("summary")]
-    public string? Summary { get; set; }
+/// <summary>The operation was cancelled before a terminal mutation.</summary>
+/// <remarks>The <c>cancelled</c> variant of <see cref="SkillInstallationOutcome"/>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class SkillInstallationOutcomeCancelled : SkillInstallationOutcome
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "cancelled";
 
-    /// <summary>Whether the remote task originated from CCA or CLI `--remote`.</summary>
-    [JsonPropertyName("taskType")]
-    public RemoteSessionMetadataTaskType? TaskType { get; set; }
+    /// <summary>Original operation identity.</summary>
+    [JsonPropertyName("operationId")]
+    public required string OperationId { get; set; }
 }
 
-/// <summary>`sessions.open` handoff progress update with step, status, and optional message.</summary>
+/// <summary>The operation was refused without applying changes.</summary>
+/// <remarks>The <c>refused</c> variant of <see cref="SkillInstallationOutcome"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionsOpenProgress
+public partial class SkillInstallationOutcomeRefused : SkillInstallationOutcome
 {
-    /// <summary>Optional step message.</summary>
-    [JsonPropertyName("message")]
-    public string? Message { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "refused";
 
-    /// <summary>Step status.</summary>
-    [JsonPropertyName("status")]
-    public SessionsOpenProgressStatus Status { get; set; }
+    /// <summary>Present once an operation has been allocated.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("operationId")]
+    public string? OperationId { get; set; }
 
-    /// <summary>Handoff step.</summary>
-    [JsonPropertyName("step")]
-    public SessionsOpenProgressStep Step { get; set; }
+    /// <summary>Bounded refusal reason.</summary>
+    [JsonPropertyName("reason")]
+    public required SkillInstallationFailureReason Reason { get; set; }
 }
 
-/// <summary>Result of opening a session.</summary>
+/// <summary>Original operation progress discriminator.</summary>
+/// <remarks>The <c>completed</c> variant of <see cref="SkillInstallationOperationStatus"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionOpenResult
+public partial class SkillInstallationOperationStatusCompleted : SkillInstallationOperationStatus
 {
-    /// <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; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Phase => "completed";
 
-    /// <summary>Opened session ID. Omitted when status is `not_found`.</summary>
-    [JsonPropertyName("sessionId")]
-    public string? SessionId { get; set; }
+    /// <summary>Whether cancellation was requested before the terminal result.</summary>
+    [JsonPropertyName("cancellationRequested")]
+    public required bool CancellationRequested { 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>Original runtime-issued operation identity.</summary>
+    [JsonPropertyName("operationId")]
+    public required string OperationId { get; set; }
 
-    /// <summary>Outcome of the open request.</summary>
-    [JsonPropertyName("status")]
-    public SessionsOpenStatus Status { get; set; }
+    /// <summary>Immutable terminal receipt.</summary>
+    [JsonPropertyName("outcome")]
+    public required SkillInstallationOutcome Outcome { get; set; }
 }
 
-/// <summary>Identifier and optional friendly name assigned to the newly forked session.</summary>
+/// <summary>Original-connection operation snapshot.</summary>
+/// <remarks>The <c>operation</c> variant of <see cref="SkillInstallationManagementOutcome"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionsForkResult
+public partial class SkillInstallationManagementOutcomeOperation : SkillInstallationManagementOutcome
 {
-    /// <summary>Friendly name assigned to the forked session, if any.</summary>
-    [JsonPropertyName("name")]
-    public string? Name { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "operation";
 
-    /// <summary>The new forked session's ID.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Operation status.</summary>
+    [JsonPropertyName("operation")]
+    public required SkillInstallationOperationStatus Operation { get; set; }
 }
 
-/// <summary>Source session identifier to fork from, optional event-ID boundary, and optional friendly name for the new session.</summary>
+/// <summary>Enablement changed and the selected session was reconciled.</summary>
+/// <remarks>The <c>enabled-changed</c> variant of <see cref="SkillInstallationManagementOutcome"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionsForkRequest
+public partial class SkillInstallationManagementOutcomeEnabledChanged : SkillInstallationManagementOutcome
 {
-    /// <summary>Optional friendly name to assign to the forked session.</summary>
-    [JsonPropertyName("name")]
-    public string? Name { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "enabled-changed";
 
-    /// <summary>Source session ID to fork from.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Safe reload or reconciliation diagnostics.</summary>
+    [JsonPropertyName("diagnostics")]
+    public required IList<string> Diagnostics { 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>Updated installation summary.</summary>
+    [JsonPropertyName("installation")]
+    public required SkillInstallationSummary Installation { get; set; }
 }
 
-/// <summary>Repository associated with the connected remote session.</summary>
+/// <summary>The management request was refused.</summary>
+/// <remarks>The <c>refused</c> variant of <see cref="SkillInstallationManagementOutcome"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ConnectedRemoteSessionMetadataRepository
+public partial class SkillInstallationManagementOutcomeRefused : SkillInstallationManagementOutcome
 {
-    /// <summary>Branch associated with the remote session.</summary>
-    [JsonPropertyName("branch")]
-    public string Branch { get; set; } = string.Empty;
-
-    /// <summary>Repository name.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "refused";
 
-    /// <summary>Repository owner or organization login.</summary>
-    [JsonPropertyName("owner")]
-    public string Owner { get; set; } = string.Empty;
+    /// <summary>Bounded refusal reason.</summary>
+    [JsonPropertyName("reason")]
+    public required SkillInstallationFailureReason Reason { get; set; }
 }
 
-/// <summary>Metadata for a connected remote session.</summary>
+/// <summary>The <c>outcome</c> variant of <see cref="SkillInstallationManagementResult"/>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ConnectedRemoteSessionMetadata
+public partial class SkillInstallationManagementResultOutcome : SkillInstallationManagementResult
 {
-    /// <summary>Neutral SDK discriminator for the connected remote session kind.</summary>
-    [JsonPropertyName("kind")]
-    public ConnectedRemoteSessionMetadataKind Kind { get; set; }
-
-    /// <summary>Last session update time as an ISO 8601 string.</summary>
-    [JsonPropertyName("modifiedTime")]
-    public DateTimeOffset ModifiedTime { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "outcome";
 
-    /// <summary>Optional friendly session name.</summary>
-    [JsonPropertyName("name")]
-    public string? Name { get; set; }
+    /// <summary>Capabilities honoured for this request.</summary>
+    [JsonPropertyName("negotiated")]
+    public required CatalogNegotiatedContract Negotiated { get; set; }
 
-    /// <summary>Pull request number associated with the session.</summary>
-    [JsonPropertyName("pullRequestNumber")]
-    public long? PullRequestNumber { get; set; }
+    /// <summary>Observed management outcome.</summary>
+    [JsonPropertyName("outcome")]
+    public required SkillInstallationManagementOutcome Outcome { get; set; }
+}
 
-    /// <summary>Repository associated with the connected remote session.</summary>
-    [JsonPropertyName("repository")]
-    public ConnectedRemoteSessionMetadataRepository Repository { get => field ??= new(); set; }
+/// <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="SkillInstallationManagementResult"/>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class SkillInstallationManagementResultNegotiationRefused : SkillInstallationManagementResult
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "negotiation-refused";
 
-    /// <summary>Original remote resource identifier.</summary>
-    [JsonPropertyName("resourceId")]
-    public string? ResourceId { 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>SDK session ID for the connected remote session.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Lowest caller protocol version this runtime will serve.</summary>
+    [JsonPropertyName("minimumSupportedProtocolVersion")]
+    public required long MinimumSupportedProtocolVersion { get; set; }
 
-    /// <summary>Remote session staleness deadline as an ISO 8601 string.</summary>
-    [JsonPropertyName("staleAt")]
-    public DateTimeOffset? StaleAt { get; set; }
+    /// <summary>Whether the version or the capability set was the problem.</summary>
+    [JsonPropertyName("reason")]
+    public required CatalogNegotiationRefusedReason Reason { get; set; }
 
-    /// <summary>Session start time as an ISO 8601 string.</summary>
-    [JsonPropertyName("startTime")]
-    public DateTimeOffset StartTime { get; set; }
+    /// <summary>Protocol version of the runtime that refused the request.</summary>
+    [JsonPropertyName("runtimeProtocolVersion")]
+    public required long RuntimeProtocolVersion { get; set; }
 
-    /// <summary>Remote session state returned by the backing service.</summary>
-    [JsonPropertyName("state")]
-    public string? State { get; set; }
+    /// <summary>Capabilities this runtime can safely advertise to this caller. The complete five-capability protocol-3 legacy set is always present; every capability added after that baseline appears only when the caller required it, so an older closed-enum decoder can still consume a refusal. This list does not imply that every deployment has enabled every operation.</summary>
+    [JsonPropertyName("supportedCapabilities")]
+    public required IList<string> SupportedCapabilities { get; set; }
 
-    /// <summary>Optional session summary.</summary>
-    [JsonPropertyName("summary")]
-    public string? Summary { 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>Remote session connection result.</summary>
+/// <summary>The request was rejected because a bounded field fell outside its permitted range or a required field was unusable. Pagination may also be rejected by the authority after a continuation request; repeat the search without page.</summary>
+/// <remarks>The <c>invalid-request</c> variant of <see cref="SkillInstallationManagementResult"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class RemoteSessionConnectionResult
+public partial class SkillInstallationManagementResultInvalidRequest : SkillInstallationManagementResult
 {
-    /// <summary>Metadata for a connected remote session.</summary>
-    [JsonPropertyName("metadata")]
-    public ConnectedRemoteSessionMetadata Metadata { get => field ??= new(); set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "invalid-request";
 
-    /// <summary>SDK session ID for the connected remote session.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Which request field was rejected.</summary>
+    [JsonPropertyName("field")]
+    public required CatalogInvalidRequestField Field { get; set; }
 
-/// <summary>Remote session connection parameters.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class ConnectRemoteSessionParams
-{
-    /// <summary>Session ID to connect to.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <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>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>Side-effect-free planning of one verified Agent Finder Skill candidate.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class SessionListEntry
+internal sealed class SkillPlanInstallRequest
 {
-    /// <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>Fresh single-use AI skill candidate handle returned by a bound catalogue search.</summary>
+    [JsonPropertyName("candidateHandle")]
+    public string CandidateHandle { get; set; } = string.Empty;
 
-    /// <summary>Pre-resolved working-directory context for session startup.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("context")]
-    public SessionContext? Context { get; set; }
+    /// <summary>Required authenticated bound catalogue and Skill installation capabilities.</summary>
+    [JsonPropertyName("contract")]
+    public CatalogClientContract Contract { get => field ??= new(); 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>Existing local session attached to this connection.</summary>
+    [JsonPropertyName("policySessionId")]
+    public string PolicySessionId { 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>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("hostStatus")]
-    public RemoteSessionHostStatus? HostStatus { get; set; }
+/// <summary>Skill installation result with the honoured contract, or a typed request/negotiation refusal.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "kind",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(SkillInstallationResultOutcome), "outcome")]
+[JsonDerivedType(typeof(SkillInstallationResultNegotiationRefused), "negotiation-refused")]
+[JsonDerivedType(typeof(SkillInstallationResultInvalidRequest), "invalid-request")]
+public partial class SkillInstallationResult
+{
+    /// <summary>The type discriminator.</summary>
+    [JsonPropertyName("kind")]
+    public virtual string Kind { 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>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>The <c>outcome</c> variant of <see cref="SkillInstallationResult"/>.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class SkillInstallationResultOutcome : SkillInstallationResult
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "outcome";
 
-    /// <summary>Last-modified time of the session's persisted state, as ISO 8601.</summary>
-    [JsonPropertyName("modifiedTime")]
-    public required string ModifiedTime { get; set; }
+    /// <summary>Capabilities honoured for this request.</summary>
+    [JsonPropertyName("negotiated")]
+    public required CatalogNegotiatedContract Negotiated { get; set; }
 
-    /// <summary>Optional human-friendly name set via /rename.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("name")]
-    public string? Name { get; set; }
+    /// <summary>Terminal operation outcome.</summary>
+    [JsonPropertyName("outcome")]
+    public required SkillInstallationOutcome Outcome { get; set; }
+}
 
-    /// <summary>Pull request number associated with the session.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("pullRequestNumber")]
-    public long? PullRequestNumber { get; set; }
+/// <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="SkillInstallationResult"/>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class SkillInstallationResultNegotiationRefused : SkillInstallationResult
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "negotiation-refused";
 
-    /// <summary>Backing remote session IDs (most recent first).</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("remoteSessionIds")]
-    public IList<string>? RemoteSessionIds { 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>GitHub repository the remote session belongs to.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("repository")]
-    public RemoteSessionMetadataRepository? Repository { get; set; }
+    /// <summary>Lowest caller protocol version this runtime will serve.</summary>
+    [JsonPropertyName("minimumSupportedProtocolVersion")]
+    public required long MinimumSupportedProtocolVersion { 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>Whether the version or the capability set was the problem.</summary>
+    [JsonPropertyName("reason")]
+    public required CatalogNegotiationRefusedReason Reason { get; set; }
 
-    /// <summary>Stable session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public required string SessionId { get; set; }
+    /// <summary>Protocol version of the runtime that refused the request.</summary>
+    [JsonPropertyName("runtimeProtocolVersion")]
+    public required long RuntimeProtocolVersion { 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>Capabilities this runtime can safely advertise to this caller. The complete five-capability protocol-3 legacy set is always present; every capability added after that baseline appears only when the caller required it, so an older closed-enum decoder can still consume a refusal. This list does not imply that every deployment has enabled every operation.</summary>
+    [JsonPropertyName("supportedCapabilities")]
+    public required IList<string> SupportedCapabilities { get; set; }
 
-    /// <summary>Session creation time as an ISO 8601 timestamp.</summary>
-    [JsonPropertyName("startTime")]
-    public required string StartTime { 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>Server-side task state returned by GitHub.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("state")]
-    public string? State { get; set; }
+/// <summary>The request was rejected because a bounded field fell outside its permitted range or a required field was unusable. Pagination may also be rejected by the authority after a continuation request; repeat the search without page.</summary>
+/// <remarks>The <c>invalid-request</c> variant of <see cref="SkillInstallationResult"/>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class SkillInstallationResultInvalidRequest : SkillInstallationResult
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "invalid-request";
 
-    /// <summary>Short summary of the session, when one has been derived.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("summary")]
-    public string? Summary { get; set; }
+    /// <summary>Which request field was rejected.</summary>
+    [JsonPropertyName("field")]
+    public required CatalogInvalidRequestField Field { 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>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>Sessions matching the filter, ordered most-recently-modified first.</summary>
+/// <summary>Applies exactly one retained verified Skill installation plan.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionList
+internal sealed class SkillApplyInstallRequest
 {
-    /// <summary>Sessions ordered most-recently-modified first. Discriminated by `isRemote`.</summary>
-    [JsonPropertyName("sessions")]
-    public IList<SessionListEntry> Sessions { get => field ??= []; set; }
+    /// <summary>Required authenticated bound catalogue and Skill installation capabilities.</summary>
+    [JsonPropertyName("contract")]
+    public CatalogClientContract Contract { get => field ??= new(); set; }
+
+    /// <summary>Opaque original plan, consumed once.</summary>
+    [JsonPropertyName("planHandle")]
+    public string PlanHandle { get; set; } = string.Empty;
+
+    /// <summary>Same existing selected session as planning.</summary>
+    [JsonPropertyName("policySessionId")]
+    public string PolicySessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Optional filter applied to the returned sessions.</summary>
+/// <summary>Read-only preparation of one owned Skill removal under fresh selected-session authority.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionListFilter
+internal sealed class SkillPlanUninstallRequest
 {
-    /// <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>Required authenticated bound installation contract.</summary>
+    [JsonPropertyName("contract")]
+    public CatalogClientContract Contract { get => field ??= new(); set; }
 
-    /// <summary>Match sessions whose context.gitRoot equals this value.</summary>
-    [JsonPropertyName("gitRoot")]
-    public string? GitRoot { get; set; }
+    /// <summary>Exact receipt to inspect.</summary>
+    [JsonPropertyName("installationId")]
+    public string InstallationId { get; set; } = string.Empty;
 
-    /// <summary>Match sessions whose context.repository equals this value.</summary>
-    [JsonPropertyName("repository")]
-    public string? Repository { get; set; }
+    /// <summary>Existing selected local session on this connection.</summary>
+    [JsonPropertyName("policySessionId")]
+    public string PolicySessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Optional source filter, metadata-load limit, and context filter applied to the returned sessions.</summary>
+/// <summary>One-use application of the exact retained Skill removal plan.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionsListRequest
+internal sealed class SkillApplyUninstallRequest
 {
-    /// <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>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>Required authenticated bound installation contract.</summary>
+    [JsonPropertyName("contract")]
+    public CatalogClientContract Contract { get => field ??= new(); set; }
 
-    /// <summary>Which session sources to include. Defaults to `local` for backward compatibility.</summary>
-    [JsonPropertyName("source")]
-    public SessionSource? Source { get; set; }
+    /// <summary>Opaque original removal plan, consumed once.</summary>
+    [JsonPropertyName("planHandle")]
+    public string PlanHandle { 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>Same existing selected session as removal preparation.</summary>
+    [JsonPropertyName("policySessionId")]
+    public string PolicySessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Persisted local session metadata, including identifiers, timestamps, summary/name, client, context, detached state, and task ID.</summary>
+/// <summary>Server-side skill metadata, including name, description, source, enabled/invocable state, path, project path, and argument hint.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class LocalSessionMetadataValue
+public sealed class ServerSkill
 {
-    /// <summary>Runtime client name that created/last resumed this session.</summary>
-    [JsonPropertyName("clientName")]
-    public string? ClientName { 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>Optional freeform hint describing the skill's expected arguments, from the `argument-hint` frontmatter field.</summary>
+    [JsonPropertyName("argumentHint")]
+    public string? ArgumentHint { get; set; }
 
-    /// <summary>Always false for local sessions.</summary>
-    [JsonPropertyName("isRemote")]
-    public bool IsRemote { get; set; }
+    /// <summary>Canonical slash command name used to invoke the skill, without the leading '/'.</summary>
+    [JsonPropertyName("commandName")]
+    public string? CommandName { 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>Description of what the skill does.</summary>
+    [JsonPropertyName("description")]
+    public string Description { get; set; } = string.Empty;
 
-    /// <summary>Last-modified time of the session's persisted state, as ISO 8601.</summary>
-    [JsonPropertyName("modifiedTime")]
-    public string ModifiedTime { get; set; } = string.Empty;
+    /// <summary>Whether the skill is currently enabled (based on global config).</summary>
+    [JsonPropertyName("enabled")]
+    public bool Enabled { get; set; }
 
-    /// <summary>Optional human-friendly name set via /rename.</summary>
+    /// <summary>Unique identifier for the skill.</summary>
     [JsonPropertyName("name")]
-    public string? Name { get; set; }
+    public string Name { get; set; } = string.Empty;
 
-    /// <summary>Stable session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Absolute path to the skill file.</summary>
+    [JsonPropertyName("path")]
+    public string? Path { get; set; }
 
-    /// <summary>Session creation time as an ISO 8601 timestamp.</summary>
-    [JsonPropertyName("startTime")]
-    public string StartTime { get; set; } = string.Empty;
+    /// <summary>The project path this skill belongs to (only for project/inherited skills).</summary>
+    [JsonPropertyName("projectPath")]
+    public string? ProjectPath { get; set; }
 
-    /// <summary>Short summary of the session, when one has been derived.</summary>
-    [JsonPropertyName("summary")]
-    public string? Summary { get; set; }
-}
+    /// <summary>Source location type (e.g., project, personal-copilot, plugin, builtin).</summary>
+    [JsonPropertyName("source")]
+    public SkillSource Source { get; set; }
 
-/// <summary>Persisted local session metadata when the session exists.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionsGetMetadataResult
-{
-    /// <summary>Local session metadata, omitted when the session does not exist.</summary>
-    [JsonPropertyName("session")]
-    public LocalSessionMetadataValue? Session { 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>Session ID whose persisted metadata should be read.</summary>
+/// <summary>Skills discovered across global and project sources.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionsGetMetadataRequest
+public sealed class ServerSkillList
 {
-    /// <summary>Session ID to inspect.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <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>Client metadata outcome for one requested local session.</summary>
-/// <remarks>Polymorphic base type discriminated by <c>status</c>.</remarks>
+/// <summary>Optional project paths and additional skill directories to include in discovery.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-[JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "status",
-    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(SessionsClientMetadataEntryOk), "ok")]
-[JsonDerivedType(typeof(SessionsClientMetadataEntryNotFound), "notFound")]
-[JsonDerivedType(typeof(SessionsClientMetadataEntryCorrupt), "corrupt")]
-[JsonDerivedType(typeof(SessionsClientMetadataEntryUnsupportedVersion), "unsupportedVersion")]
-[JsonDerivedType(typeof(SessionsClientMetadataEntryUnavailable), "unavailable")]
-public partial class SessionsClientMetadataEntry
+internal sealed class SkillsDiscoverRequest
 {
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("status")]
-    public virtual string Status { 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 skill scan paths to exclude from discovery.</summary>
+    [JsonPropertyName("ignoredSkillsLocations")]
+    public IList<string>? IgnoredSkillsLocations { 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>The <c>ok</c> variant of <see cref="SessionsClientMetadataEntry"/>.</summary>
+    /// <summary>Explicit discovery-only skill roots, not filesystem grants. Available without ambient discovery, subject to skill/managed disables. Relative paths resolve against the request's effective working directory when supplied. Null and omission are equivalent; an empty array contributes no explicit roots.</summary>
+    [JsonPropertyName("skillDirectories")]
+    public IList<string>? SkillDirectories { get; set; }
+}
+
+/// <summary>Canonical directory where skills can be discovered or created, with scope, preference, and optional project path.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class SessionsClientMetadataEntryOk : SessionsClientMetadataEntry
+public sealed class SkillDiscoveryPath
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Status => "ok";
+    /// <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>Validated client metadata, possibly empty or projected to requested keys.</summary>
-    [JsonPropertyName("metadata")]
-    public required IDictionary<string, string> Metadata { get; set; }
+    /// <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>Requested session ID.</summary>
-    [JsonPropertyName("sessionId")]
-    public required string SessionId { 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>The <c>notFound</c> variant of <see cref="SessionsClientMetadataEntry"/>.</summary>
+/// <summary>Canonical locations where skills can be created so the runtime will recognize them.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class SessionsClientMetadataEntryNotFound : SessionsClientMetadataEntry
+public sealed class SkillDiscoveryPathList
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Status => "notFound";
-
-    /// <summary>Requested session ID.</summary>
-    [JsonPropertyName("sessionId")]
-    public required string SessionId { get; set; }
+    /// <summary>Canonical skill create/discovery directories, in priority order.</summary>
+    [JsonPropertyName("paths")]
+    public IList<SkillDiscoveryPath> Paths { get => field ??= []; set; }
 }
 
-/// <summary>The <c>corrupt</c> variant of <see cref="SessionsClientMetadataEntry"/>.</summary>
+/// <summary>Optional project paths to enumerate.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class SessionsClientMetadataEntryCorrupt : SessionsClientMetadataEntry
+public sealed class SkillsGetDiscoveryPathsRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Status => "corrupt";
+    /// <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>Requested session ID.</summary>
-    [JsonPropertyName("sessionId")]
-    public required string SessionId { get; set; }
+    /// <summary>Optional skill scan paths to exclude from discovery.</summary>
+    [JsonPropertyName("ignoredSkillsLocations")]
+    public IList<string>? IgnoredSkillsLocations { 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>Explicit discovery-only skill roots to enumerate, including configured missing directories. Relative paths resolve against the request's effective working directory when supplied. These are not filesystem grants or preferred creation targets. Null and omission are equivalent.</summary>
+    [JsonPropertyName("skillDirectories")]
+    public IList<string>? SkillDirectories { get; set; }
 }
 
-/// <summary>The <c>unsupportedVersion</c> variant of <see cref="SessionsClientMetadataEntry"/>.</summary>
+/// <summary>Inventory request under an explicitly selected existing session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class SessionsClientMetadataEntryUnsupportedVersion : SessionsClientMetadataEntry
+internal sealed class SkillInstallationsRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Status => "unsupportedVersion";
+    /// <summary>Required authenticated bound installation contract.</summary>
+    [JsonPropertyName("contract")]
+    public CatalogClientContract Contract { get => field ??= new(); set; }
 
-    /// <summary>Requested session ID.</summary>
-    [JsonPropertyName("sessionId")]
-    public required string SessionId { get; set; }
+    /// <summary>Existing selected local session on this connection.</summary>
+    [JsonPropertyName("policySessionId")]
+    public string PolicySessionId { get; set; } = string.Empty;
 }
 
-/// <summary>The <c>unavailable</c> variant of <see cref="SessionsClientMetadataEntry"/>.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class SessionsClientMetadataEntryUnavailable : SessionsClientMetadataEntry
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Status => "unavailable";
-
-    /// <summary>Filesystem or provider error code. Clients should not assume every provider uses operating-system error codes.</summary>
-    [JsonPropertyName("code")]
-    public required string Code { get; set; }
-
-    /// <summary>Human-readable diagnostic message. Not stable for programmatic matching.</summary>
-    [JsonPropertyName("message")]
-    public required string Message { get; set; }
-
-    /// <summary>Requested session ID.</summary>
-    [JsonPropertyName("sessionId")]
-    public required string SessionId { get; set; }
-}
-
-/// <summary>Bounded batch request for client-owned metadata from persisted local sessions.</summary>
+/// <summary>Existing-operation control. A new session selector is deliberately not accepted.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionsGetClientMetadataRequest
+internal sealed class SkillInstallationOperationRequest
 {
-    /// <summary>Case-sensitive keys to project from each valid bag. Each key must be non-empty, at most 256 UTF-8 bytes, and outside the reserved `copilot/` and `github/` namespaces. Omit to return every entry.</summary>
-    [JsonPropertyName("keys")]
-    public IList<string>? Keys { get; set; }
+    /// <summary>Required authenticated bound Skill installation capability.</summary>
+    [JsonPropertyName("contract")]
+    public CatalogClientContract Contract { get => field ??= new(); set; }
 
-    /// <summary>Session IDs to inspect. Results preserve this order.</summary>
-    [JsonPropertyName("sessionIds")]
-    public IList<string> SessionIds { get => field ??= []; set; }
+    /// <summary>Exact runtime-issued operation ID on the original connection.</summary>
+    [JsonPropertyName("operationId")]
+    public string OperationId { get; set; } = string.Empty;
 }
 
-/// <summary>Batch of session events returned by a read, with cursor and continuation metadata.</summary>
+/// <summary>Persisted enablement update for one owned Skill installation.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class EventsReadResult
+internal sealed class SkillSetEnabledRequest
 {
-    /// <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>Required authenticated bound Skill installation capability.</summary>
+    [JsonPropertyName("contract")]
+    public CatalogClientContract Contract { get => field ??= new(); set; }
 
-    /// <summary>Cursor status: 'ok' means the cursor was applied successfully. For session.eventLog.read, 'expired' means the cursor referred to an event that no longer exists in active history and the read fell back to a boundary of the remaining history: the beginning for a forward read or the newest window for a backward read. That fallback may overlap already rendered events, so active-session consumers should reset, rebase, or deduplicate before continuing. sessions.readPersistedEvents has stricter snapshot semantics: 'expired' returns an empty terminal page and never switches to a replacement journal generation. Other persisted-read I/O failures are RPC errors with diagnostics, not cursor expiry.</summary>
-    [JsonPropertyName("cursorStatus")]
-    public EventsCursorStatus CursorStatus { get; set; }
+    /// <summary>Persisted enablement value.</summary>
+    [JsonPropertyName("enabled")]
+    public bool Enabled { 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>Exact receipt identity to update.</summary>
+    [JsonPropertyName("installationId")]
+    public string InstallationId { get; set; } = string.Empty;
 
-    /// <summary>True when more events are available in the read's direction. For a backward read, true means older persisted events remain before the returned window. A persisted-event page may contain fewer than `max` events because of its byte budget while still reporting hasMore true; continue according to this flag rather than the event count.</summary>
-    [JsonPropertyName("hasMore")]
-    public bool HasMore { get; set; }
+    /// <summary>Existing selected local session to reconcile after persistence.</summary>
+    [JsonPropertyName("policySessionId")]
+    public string PolicySessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Pagination options for reading an inactive or active local session's persisted event journal.</summary>
+/// <summary>Skill names to mark as disabled in global configuration, replacing any previous list.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionsReadPersistedEventsRequest
+internal sealed class SkillsConfigSetDisabledSkillsRequest
 {
-    /// <summary>Opaque, process-local, single-use cursor returned by the previous persisted-event read. Omit on the first call and issue continuations sequentially; reusing the same cursor returns an expired terminal page.</summary>
-    [JsonPropertyName("cursor")]
-    public string? Cursor { get; set; }
-
-    /// <summary>Direction to page through persisted history. Forward starts at the beginning; backward starts with the newest events. Events in each page remain chronological. This selects the initial read only; a continuation always uses the direction bound into its cursor.</summary>
-    [JsonPropertyName("direction")]
-    public EventsReadDirection? Direction { get; set; }
-
-    /// <summary>Maximum number of events to return in this batch (1–1000, default 200). Pages may contain fewer events to keep the serialized event array within a soft 1 MiB budget including resolved binary assets; one oversized event is returned alone to guarantee progress.</summary>
-    [JsonPropertyName("max")]
-    public long? Max { get; set; }
-
-    /// <summary>Session ID whose persisted event journal should be read.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>List of skill names to disable.</summary>
+    [JsonPropertyName("disabledSkills")]
+    public IList<string> DisabledSkills { get => field ??= []; set; }
 }
 
-/// <summary>Recent local session IDs that contain user-visible history.</summary>
+/// <summary>Adds or removes a single skill from the global disabled list, leaving every other entry untouched.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionsListNonEmptySessionIdsResult
+internal sealed class SkillsConfigSetSkillDisabledRequest
 {
-    /// <summary>Session IDs ordered newest-first.</summary>
-    [JsonPropertyName("sessionIds")]
-    public IList<string> SessionIds { get => field ??= []; set; }
-}
+    /// <summary>True to disable the skill, false to enable it.</summary>
+    [JsonPropertyName("disabled")]
+    public bool Disabled { get; set; }
 
-/// <summary>Limit for non-empty local session IDs.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionsListNonEmptySessionIdsRequest
-{
-    /// <summary>Maximum number of session IDs to return.</summary>
-    [JsonPropertyName("limit")]
-    public long? Limit { 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>ID of the local session bound to the given GitHub task, or omitted when none.</summary>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionsFindByTaskIDResult
+[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>Omitted when no local session is bound to that GitHub task.</summary>
-    [JsonPropertyName("sessionId")]
-    public string? SessionId { get; set; }
+    /// <summary>The type discriminator.</summary>
+    [JsonPropertyName("kind")]
+    public virtual string Kind { get; set; } = string.Empty;
 }
 
-/// <summary>GitHub task ID to look up.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionsFindByTaskIDRequest
-{
-    /// <summary>GitHub task ID to look up.</summary>
-    [JsonPropertyName("taskId")]
-    public string TaskId { get; set; } = string.Empty;
-}
 
-/// <summary>Session ID matching the prefix, omitted when no unique match exists.</summary>
+/// <summary>One inert catalog result, represented as an MCP server, discovery-only AI skill, or opt-in Agent Plugin variant so kind, media type, provenance, and available operations cannot contradict each other.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionsFindByPrefixResult
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "kind",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(CatalogCandidateMcpServer), "mcp-server")]
+[JsonDerivedType(typeof(CatalogCandidateAiSkill), "ai-skill")]
+[JsonDerivedType(typeof(CatalogCandidatePlugin), "plugin")]
+public partial class CatalogCandidate
 {
-    /// <summary>Omitted when no unique session matches the prefix (no match or ambiguous).</summary>
-    [JsonPropertyName("sessionId")]
-    public string? SessionId { get; set; }
+    /// <summary>The type discriminator.</summary>
+    [JsonPropertyName("kind")]
+    public virtual string Kind { get; set; } = string.Empty;
 }
 
-/// <summary>UUID prefix to resolve to a unique session ID.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionsFindByPrefixRequest
-{
-    /// <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>Most-relevant session ID for the supplied context, or omitted when no sessions exist.</summary>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionsGetLastForContextResult
+public sealed class CatalogMcpServerCandidateProvenance
 {
-    /// <summary>Most-relevant session ID for the supplied context, or omitted when no sessions exist.</summary>
-    [JsonPropertyName("sessionId")]
-    public string? SessionId { 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>Optional working-directory context used to score session relevance.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionsGetLastForContextRequest
-{
-    /// <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>JSON MCP media type advertised for the referenced card.</summary>
+    [JsonPropertyName("mediaType")]
+    public McpServerCardMediaType MediaType { get; set; }
 
-/// <summary>Absolute path to the session's events.jsonl file on disk.</summary>
-[Experimental(global::GitHub.Copilot.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>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>Session ID whose event-log file path to compute.</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(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionsGetEventFilePathRequest
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "kind",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(CatalogCandidateSourceUrl), "url")]
+[JsonDerivedType(typeof(CatalogCandidateSourceEmbedded), "embedded")]
+public partial class CatalogCandidateSource
 {
-    /// <summary>Session ID whose event-log file path to compute.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>The type discriminator.</summary>
+    [JsonPropertyName("kind")]
+    public virtual string Kind { get; set; } = string.Empty;
 }
 
-/// <summary>Map of sessionId -&gt; on-disk size in bytes for each session's workspace directory.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionSizes
-{
-    /// <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>Session IDs from the input set that are currently in use by another process.</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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionsCheckInUseResult
+public partial class CatalogCandidateSourceUrl : CatalogCandidateSource
 {
-    /// <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; }
-}
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "url";
 
-/// <summary>Session IDs to test for live in-use locks.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionsCheckInUseRequest
-{
-    /// <summary>Session IDs to test for live in-use locks.</summary>
-    [JsonPropertyName("sessionIds")]
-    public IList<string> SessionIds { get => field ??= []; 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>The session's persisted remote-steerable flag, or omitted when no value has been persisted.</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(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionsGetPersistedRemoteSteerableResult
+public partial class CatalogCandidateSourceEmbedded : CatalogCandidateSource
 {
-    /// <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; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "embedded";
 }
 
-/// <summary>Session ID to look up the persisted remote-steerable flag for.</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(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionsGetPersistedRemoteSteerableRequest
+public partial class CatalogCandidateMcpServer : CatalogCandidate
 {
-    /// <summary>Session ID to look up the persisted remote-steerable flag for.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "mcp-server";
 
-/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionsCloseResult
-{
-}
+    /// <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>Session ID to close.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionsCloseRequest
-{
-    /// <summary>Session ID to close.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { 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>Map of sessionId -&gt; bytes freed by removing the session's workspace directory.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionBulkDeleteResult
-{
-    /// <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>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>Session IDs to close, deactivate, and delete from disk.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionsBulkDeleteRequest
-{
-    /// <summary>Session IDs to close, deactivate, and delete from disk.</summary>
-    [JsonPropertyName("sessionIds")]
-    public IList<string> SessionIds { get => field ??= []; 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>Versioned trust metadata observed from the catalog authority. Optional for protocol-3 compatibility with runtimes that predate trust snapshots. A trust-capable runtime emits an explicit snapshot even when the authority omitted or malformed its trust field.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("trust")]
+    public CatalogTrustSnapshot? Trust { get; set; }
 }
 
-/// <summary>Session ID to delete from disk.</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(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionsDeleteRequest
+public sealed class CatalogAiSkillCandidateProvenance
 {
-    /// <summary>Session ID to delete.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <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>Internal resolved session directory path to delete.</summary>
-    [JsonPropertyName("sessionPath")]
-    public string? SessionPath { get; set; }
+    /// <summary>Media type advertised for the referenced AI skill card.</summary>
+    [JsonPropertyName("mediaType")]
+    public CatalogAiSkillMediaType MediaType { 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>Outcome of the prune operation: deleted IDs, dry-run candidates, skipped IDs, total bytes freed, and the dry-run flag.</summary>
+/// <summary>An inert AI skill catalog result. Verified Skill candidates may be installable only when the runtime reports installability and the selected session is permitted to plan installation.</summary>
+/// <remarks>The <c>ai-skill</c> variant of <see cref="CatalogCandidate"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionPruneResult
+public partial class CatalogCandidateAiSkill : CatalogCandidate
 {
-    /// <summary>Session IDs that would be deleted in dry-run mode (always empty otherwise).</summary>
-    [JsonPropertyName("candidates")]
-    public IList<string> Candidates { get => field ??= []; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "ai-skill";
 
-    /// <summary>Session IDs that were deleted (always empty in dry-run mode).</summary>
-    [JsonPropertyName("deleted")]
-    public IList<string> Deleted { get => field ??= []; 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>True when no deletions were actually performed.</summary>
-    [JsonPropertyName("dryRun")]
-    public bool DryRun { 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>Total bytes freed (actual when not dry-run, projected when dry-run).</summary>
-    [JsonPropertyName("freedBytes")]
-    public long FreedBytes { 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>Session IDs that were skipped (e.g., named sessions).</summary>
-    [JsonPropertyName("skipped")]
-    public IList<string> Skipped { get => field ??= []; 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>Age threshold and optional flags controlling which old sessions are pruned (or simulated when dryRun is true).</summary>
-[Experimental(global::GitHub.Copilot.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>Whether this AI skill candidate can be planned for verified installation in the selected session.</summary>
+    [JsonPropertyName("installability")]
+    public required CatalogAiSkillInstallability Installability { get; set; }
 
-    /// <summary>Session IDs that should never be considered for pruning.</summary>
-    [JsonPropertyName("excludeSessionIds")]
-    public IList<string>? ExcludeSessionIds { get; set; }
+    /// <summary>Media type of the underlying AI skill card.</summary>
+    [JsonPropertyName("mediaType")]
+    public required CatalogAiSkillMediaType MediaType { get; set; }
 
-    /// <summary>When true, named sessions (set via /rename) are also eligible for pruning.</summary>
-    [JsonPropertyName("includeNamed")]
-    public bool? IncludeNamed { get; 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>Delete sessions whose modifiedTime is at least this many days old.</summary>
-    [JsonPropertyName("olderThanDays")]
-    public long OlderThanDays { 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>Flush a session's pending events to disk. No-op when no writer exists for the session (e.g., already closed).</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionsSaveResult
-{
-}
+    /// <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>Session ID whose pending events should be flushed to disk.</summary>
-[Experimental(global::GitHub.Copilot.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>Versioned trust metadata observed from the catalog authority. Optional for protocol-3 compatibility with runtimes that predate trust snapshots. A trust-capable runtime emits an explicit snapshot even when the authority omitted or malformed its trust field.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("trust")]
+    public CatalogTrustSnapshot? Trust { 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>Where and when an Agent Plugin catalog reference was observed. Discovery provenance deliberately carries no descriptor URL, raw data, candidate handle, or content digest.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionsReleaseLockResult
+public sealed class CatalogAgentPluginCandidateProvenance
 {
-}
+    /// <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>Session ID whose in-use lock should be released.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionsReleaseLockRequest
-{
-    /// <summary>Session ID whose in-use lock should be released.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Canonical Agent Plugin media type.</summary>
+    [JsonPropertyName("mediaType")]
+    public CatalogAgentPluginMediaType MediaType { 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>The enriched metadata records, with summary and context fields backfilled where available. Sessions confirmed empty and unnamed are omitted.</summary>
+/// <summary>Syntactically validated GitHub repository provenance declared by catalog metadata. This is a source claim rather than proof that the descriptor URL resolves to the repository.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionEnrichMetadataResult
+public sealed class CatalogPluginRepositorySource
 {
-    /// <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>Case-preserving safe relative POSIX path derived from metadata.repoPath.</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("path")]
+    public string Path { get; set; } = string.Empty;
+
+    /// <summary>Canonical lowercase owner/repository name derived from metadata.sourceSet.</summary>
+    [RegularExpression("^[a-z0-9_.-]+/[a-z0-9_.-]+$")]
+    [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(3)]
+    [MaxLength(256)]
+    [JsonPropertyName("repository")]
+    public string Repository { get; set; } = string.Empty;
 }
 
-/// <summary>Session metadata records to enrich with summary and context information.</summary>
+/// <summary>An inert Agent Plugin catalog result. Its canonical catalog identity, declared version, repository source claim, and explicit compatibility tags are safe to correlate, while its descriptor, URL, raw data, and installed-plugin state remain runtime-private. This contract-only variant does not mint or expose a candidate handle.</summary>
+/// <remarks>The <c>plugin</c> variant of <see cref="CatalogCandidate"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionsEnrichMetadataRequest
+public partial class CatalogCandidatePlugin : CatalogCandidate
 {
-    /// <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; }
-}
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "plugin";
 
-/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionsReloadPluginHooksResult
-{
-}
+    /// <summary>Explicit validated compatibility tags, in canonical order. An empty list means the source declared no recognised compatibility; clients must not infer compatibility from other fields. `canvas-only` requires both `canvas` and `github-copilot`.</summary>
+    [JsonPropertyName("compatibilityTags")]
+    public required IList<CatalogAgentPluginCompatibilityTag> CompatibilityTags { get; set; }
 
-/// <summary>Active session ID and an optional flag for deferring repo-level hooks until folder trust.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionsReloadPluginHooksRequest
-{
-    /// <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>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>Active session ID to reload hooks for.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { 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>Queued repo-level startup prompts and the total hook command count after loading.</summary>
-[Experimental(global::GitHub.Copilot.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>Validated, normalised catalogue resource URN. This identity comes only from the catalog identifier and is never inferred from display text or installed-plugin state.</summary>
+    [JsonPropertyName("identity")]
+    public required string Identity { 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>Canonical Agent Plugin media type.</summary>
+    [JsonPropertyName("mediaType")]
+    public required CatalogAgentPluginMediaType MediaType { get; set; }
 
-/// <summary>Active session ID whose deferred repo-level hooks should be loaded.</summary>
-[Experimental(global::GitHub.Copilot.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>Where the Agent Plugin catalog reference was observed, without its descriptor, URL, raw data, or content digest.</summary>
+    [JsonPropertyName("provenance")]
+    public required CatalogAgentPluginCandidateProvenance Provenance { 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>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionsSetAdditionalPluginsResult
-{
+    /// <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>Bounded repository provenance declared through the catalog's sourceSet and repoPath metadata. It contains no descriptor URL.</summary>
+    [JsonPropertyName("source")]
+    public required CatalogPluginRepositorySource Source { get; set; }
+
+    /// <summary>Versioned trust metadata observed from the catalog authority. Optional for protocol-3 compatibility and emitted only when the caller also requires the trust-snapshot capability.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("trust")]
+    public CatalogTrustSnapshot? Trust { get; set; }
+
+    /// <summary>Optional version declared by the catalog source. Omitted rather than guessed when the source supplies no version.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("version")]
+    public string? Version { get; set; }
 }
 
-/// <summary>Installed plugin record from global state, with marketplace, version, install time, enabled state, cache path, and source.</summary>
+/// <summary>Authority-reported navigation metadata, returned only to callers requiring catalog-search-pagination and only when a supported token is present. Tokenless first-page and continuation responses omit this object; no counts are inferred from candidates. The opaque token may be retained for previous or numbered navigation even when hasNextPage is false.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class InstalledPlugin
+public sealed class CatalogSearchPagination
 {
-    /// <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>One-based page returned by the authority.</summary>
+    [JsonPropertyName("currentPage")]
+    public int CurrentPage { get; set; }
 
-    /// <summary>Installation timestamp.</summary>
-    [JsonPropertyName("installed_at")]
-    public string InstalledAt { get; set; } = string.Empty;
+    /// <summary>Whether the authority token advertises a valid next target within the navigation window. Not inferred from token presence, truncated, or currentPage being less than pageCount.</summary>
+    [JsonPropertyName("hasNextPage")]
+    public bool HasNextPage { get; set; }
 
-    /// <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>Navigation window ceiling ceil(1000 / pageSize), not the number of existing pages. Legal targets must not exceed this ceiling or the token's signed pageCount.</summary>
+    [JsonPropertyName("maxPage")]
+    public int MaxPage { 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>Backend-reported page count, which may exceed maxPage. Present pagination metadata always describes a multi-page result; zero- and single-page responses omit pagination. Navigation targets must also be within the signed pageCount carried by the supplied token.</summary>
+    [JsonPropertyName("pageCount")]
+    public long PageCount { get; set; }
 
-    /// <summary>Plugin name.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Page size bound to the search, equal to the effective request limit.</summary>
+    [JsonPropertyName("pageSize")]
+    public int PageSize { get; set; }
 
-    /// <summary>Source for direct repo installs (when marketplace is empty).</summary>
-    [JsonPropertyName("source")]
-    public JsonElement? Source { get; set; }
+    /// <summary>Opaque pagination token. Session-bound search returns an expiring runtime-owned reference retaining the exact private authority token, original search and authority. Legacy unbound search returns the authority token unchanged, without a runtime-created expiry. Only the runtime unwraps tokens or changes targetPage; SDK consumers must not decode, modify or log them.</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(4096)]
+    [JsonPropertyName("token")]
+    public string Token { get; set; } = string.Empty;
 
-    /// <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>Backend-reported count for this response, not the number of returned candidates. Its relationship to the full query result set is unknown.</summary>
+    [JsonPropertyName("totalCount")]
+    public long TotalCount { get; set; }
 
-    /// <summary>Version installed (if available).</summary>
-    [JsonPropertyName("version")]
-    public string? Version { get; set; }
+    /// <summary>The relationship of totalCount to the complete query result set is unknown; neither exactness nor a lower-bound guarantee is implied.</summary>
+    [JsonPropertyName("totalCountRelation")]
+    public CatalogSearchTotalCountRelation TotalCountRelation { get; set; }
 }
 
-/// <summary>Manager-wide additional plugins to register; replaces any previously-configured set.</summary>
+/// <summary>A completed catalog search containing inert candidate summaries. MCP server and AI skill variants carry a single-use handle; the Agent Plugin variant is handleless.</summary>
+/// <remarks>The <c>succeeded</c> variant of <see cref="CatalogSearchResult"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionsSetAdditionalPluginsRequest
+public partial class CatalogSearchResultSucceeded : CatalogSearchResult
 {
-    /// <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; }
-}
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "succeeded";
 
-/// <summary>Dynamic-context board entry count, when available.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionsGetBoardEntryCountResult
-{
-    /// <summary>Board entry count, when available.</summary>
-    [JsonPropertyName("count")]
-    public long? Count { 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>Protocol version and capabilities the runtime honoured.</summary>
+    [JsonPropertyName("negotiated")]
+    public required CatalogNegotiatedContract Negotiated { get; set; }
+
+    /// <summary>Navigation metadata for callers explicitly requiring catalog-search-pagination. Omitted when the authority returns no token, including tokenless first-page and continuation responses. Counts are never substituted from candidates.length.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("pagination")]
+    public CatalogSearchPagination? Pagination { 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>Legacy indication that the authority returned a page token. Preserved for compatibility; this is not a has-next-page indicator. Use pagination.hasNextPage when pagination metadata is present.</summary>
+    [JsonPropertyName("truncated")]
+    public required bool Truncated { get; set; }
 }
 
-/// <summary>Session ID whose board entry count should be returned.</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(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionsGetBoardEntryCountRequest
+public partial class CatalogSearchResultNegotiationRefused : CatalogSearchResult
 {
-    /// <summary>Session ID whose board entry count should be returned.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <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>Capabilities this runtime can safely advertise to this caller. The complete five-capability protocol-3 legacy set is always present; every capability added after that baseline appears only when the caller required it, so an older closed-enum decoder can still consume a refusal. This list does not imply that every deployment has enabled every operation.</summary>
+    [JsonPropertyName("supportedCapabilities")]
+    public required IList<string> 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>State of the runtime-managed remote-control singleton.</summary>
-/// <remarks>Polymorphic base type discriminated by <c>state</c>.</remarks>
+/// <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(global::GitHub.Copilot.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 partial class CatalogSearchResultUnsupportedKind : CatalogSearchResult
 {
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("state")]
-    public virtual string State { get; set; } = string.Empty;
-}
+    /// <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>Remote control is not connected.</summary>
-/// <remarks>The <c>off</c> variant of <see cref="RemoteControlStatus"/>.</remarks>
+    /// <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>The request was rejected because a bounded field fell outside its permitted range or a required field was unusable. Pagination may also be rejected by the authority after a continuation request; repeat the search without page.</summary>
+/// <remarks>The <c>invalid-request</c> variant of <see cref="CatalogSearchResult"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class RemoteControlStatusOff : RemoteControlStatus
+public partial class CatalogSearchResultInvalidRequest : CatalogSearchResult
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string State => "off";
+    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>Remote control is in the middle of initial setup.</summary>
-/// <remarks>The <c>connecting</c> variant of <see cref="RemoteControlStatus"/>.</remarks>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class RemoteControlStatusConnecting : RemoteControlStatus
+public partial class CatalogSearchResultAuthenticationRequired : CatalogSearchResult
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string State => "connecting";
+    public override string Kind => "authentication-required";
 
-    /// <summary>Session id the connection is attaching to.</summary>
-    [JsonPropertyName("attachedSessionId")]
-    public required string AttachedSessionId { get; set; }
+    /// <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>Remote control is connected to a local session.</summary>
-/// <remarks>The <c>active</c> variant of <see cref="RemoteControlStatus"/>.</remarks>
+/// <summary>Registry or enterprise policy refused the operation.</summary>
+/// <remarks>The <c>policy-rejected</c> variant of <see cref="CatalogSearchResult"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class RemoteControlStatusActive : RemoteControlStatus
+public partial class CatalogSearchResultPolicyRejected : CatalogSearchResult
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string State => "active";
-
-    /// <summary>Session id remote control is pointed at.</summary>
-    [JsonPropertyName("attachedSessionId")]
-    public required string AttachedSessionId { 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; }
+    public override string Kind => "policy-rejected";
 
-    /// <summary>MC frontend URL for this session, when known.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("frontendUrl")]
-    public string? FrontendUrl { 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>Whether the MC session may steer this session.</summary>
-    [JsonPropertyName("isSteerable")]
-    public required bool IsSteerable { get; set; }
+    /// <summary>Which authority produced the decision.</summary>
+    [JsonPropertyName("source")]
+    public required McpPlanPolicySource Source { get; set; }
 }
 
-/// <summary>The last setup attempt failed. The singleton is otherwise off.</summary>
-/// <remarks>The <c>error</c> variant of <see cref="RemoteControlStatus"/>.</remarks>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class RemoteControlStatusError : RemoteControlStatus
+public partial class CatalogSearchResultNetworkFailure : CatalogSearchResult
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string State => "error";
+    public override string Kind => "network-failure";
 
-    /// <summary>Session id the failing setup attempt targeted, when known.</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 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>Bounded cooldown in seconds before another catalog request should be attempted, when the authority supplied a numeric Retry-After value or the runtime applied its documented fallback.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("attachedSessionId")]
-    public string? AttachedSessionId { get; set; }
+    [JsonPropertyName("retryAfterSeconds")]
+    public int? RetryAfterSeconds { get; set; }
 
-    /// <summary>Human-readable error message from the last setup attempt.</summary>
-    [JsonPropertyName("error")]
-    public required string Error { 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>Wrapper for the singleton's current status.</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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class RemoteControlStatusResult
+public partial class CatalogSearchResultUnsafeRetrieval : CatalogSearchResult
 {
-    /// <summary>State of the runtime-managed remote-control singleton.</summary>
-    [JsonPropertyName("status")]
-    public RemoteControlStatus Status { get => field ??= new(); set; }
-}
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "unsafe-retrieval";
 
-/// <summary>Reattach to an existing MC session without creating a new one.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class RemoteControlConfigExistingMcSession
-{
-    /// <summary>Existing MC session ID to reattach to.</summary>
-    [JsonPropertyName("mcSessionId")]
-    public string McSessionId { 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>Existing MC task ID for the reattached session.</summary>
-    [JsonPropertyName("mcTaskId")]
-    public string McTaskId { get; set; } = string.Empty;
+    /// <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>Configuration for the runtime-managed remote-control singleton.</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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class RemoteControlConfig
+public partial class CatalogSearchResultMalformedCard : CatalogSearchResult
 {
-    /// <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; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "malformed-card";
 
-    /// <summary>When true, suppresses timeline messages on successful setup.</summary>
-    [JsonPropertyName("silent")]
-    public bool Silent { get; set; }
+    /// <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>Whether the MC session may steer the local session (write mode).</summary>
-    [JsonPropertyName("steerable")]
-    public bool Steerable { 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>Existing Mission Control task ID to attach the exported session to.</summary>
-    [JsonPropertyName("taskId")]
-    public string? TaskId { get; set; }
+    /// <summary>How the card failed validation.</summary>
+    [JsonPropertyName("reason")]
+    public required CatalogMalformedCardReason Reason { get; set; }
 }
 
-/// <summary>Parameters for attaching the remote-control singleton to a session.</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(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionsStartRemoteControlRequest
+public partial class CatalogSearchResultContractViolation : CatalogSearchResult
 {
-    /// <summary>Configuration for the runtime-managed remote-control singleton.</summary>
-    [JsonPropertyName("config")]
-    public RemoteControlConfig Config { get => field ??= new(); set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "contract-violation";
 
-    /// <summary>Local session id to attach remote control to.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <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>Outcome of a transferRemoteControl call.</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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class RemoteControlTransferResult
+public partial class CatalogSearchResultUnavailable : CatalogSearchResult
 {
-    /// <summary>State of the runtime-managed remote-control singleton.</summary>
-    [JsonPropertyName("status")]
-    public RemoteControlStatus Status { get => field ??= new(); set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "unavailable";
 
-    /// <summary>Whether the rebinding actually happened.</summary>
-    [JsonPropertyName("transferred")]
-    public bool Transferred { 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>Why the operation is unavailable.</summary>
+    [JsonPropertyName("reason")]
+    public required CatalogUnavailableReason Reason { get; set; }
 }
 
-/// <summary>Parameters for atomically rebinding the remote-control singleton.</summary>
+/// <summary>An explicit numbered-page request. SDK consumers treat the token as opaque. For bound search, the runtime unwraps an expiring owner-bound reference to the private authority token; only the runtime changes the authority token's targetPage. Legacy unbound navigation keeps its authority-issued token semantics. No snapshot stability is promised.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionsTransferRemoteControlRequest
+public sealed class CatalogSearchPage
 {
-    /// <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>Requested one-based page. Must not exceed either the token's signed pageCount or the navigation window ceil(1000 / pageSize). Repeat the search without page to discover newly available pages beyond that signed pageCount.</summary>
+    [JsonPropertyName("number")]
+    public int Number { get; set; }
 
-    /// <summary>Local session id to point remote control at.</summary>
-    [JsonPropertyName("toSessionId")]
-    public string ToSessionId { get; set; } = string.Empty;
+    /// <summary>Opaque pagination token from an earlier response, owner-bound when session-bound search was requested. Never decode, modify or log it in an SDK consumer. Expired or foreign bound references require a fresh bound search, not a legacy retry.</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(4096)]
+    [JsonPropertyName("token")]
+    public string Token { get; set; } = string.Empty;
 }
 
-/// <summary>Patch for the singleton's steering state.</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(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionsSetRemoteControlSteeringRequest
+public sealed class CatalogSearchRequest
 {
-    /// <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>Protocol version and capabilities the caller requires.</summary>
+    [JsonPropertyName("contract")]
+    public required CatalogClientContract Contract { get; set; }
 
-/// <summary>Outcome of a stopRemoteControl call.</summary>
-[Experimental(global::GitHub.Copilot.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>Restrict results to these candidate kinds. Agent Plugins are opt-in and require the `agent-plugin-discovery` capability so protocol-v3 clients generated before that variant cannot receive an unknown result; when omitted, the backwards-compatible MCP server and AI skill kinds are searched.</summary>
+    [JsonPropertyName("kinds")]
+    public IList<CatalogCandidateKind>? Kinds { get; set; }
 
-    /// <summary>Whether the singleton was actually torn down by this call.</summary>
-    [JsonPropertyName("stopped")]
-    public bool Stopped { get; set; }
-}
+    /// <summary>Maximum number of candidates to return. Defaults to 10 when omitted.</summary>
+    [JsonPropertyName("limit")]
+    public int? Limit { get; set; }
 
-/// <summary>RPC data type for SessionsStopRemoteControl operations.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionsStopRemoteControlRequest
-{
-    /// <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>Numbered navigation using metadata from an earlier response. Requires catalog-search-pagination and the same query, kinds and effective limit. Omit for a fresh first-page search.</summary>
+    [JsonPropertyName("page")]
+    public CatalogSearchPage? Page { 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>
+    /// Select an existing attached local session. Requires authenticated, session-bound search.
+    /// The runtime never creates, resumes or reconfigures a session to honour this selector.
+    /// </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("policySessionId")]
+    public string? PolicySessionId { get; set; }
 
-/// <summary>Params to attach or detach an in-process ExtensionController delegate.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class ConfigureSessionExtensionsParams
-{
-    /// <summary>Session to attach the extension controller delegate to.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Free-text search query. Persisted as tool input for session continuity, but omitted from 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 required string Query { get; set; }
 }
 
-/// <summary>Outcome of an agentRegistry.spawn call.</summary>
+/// <summary>Typed outcome of catalog.select. Only the selected host result carries a fresh candidate handle; the model-facing projection removes both that handle and searchId.</summary>
 /// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
 [Experimental(global::GitHub.Copilot.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
+[JsonDerivedType(typeof(CatalogSelectionResultSelected), "selected")]
+[JsonDerivedType(typeof(CatalogSelectionResultDeclined), "declined")]
+[JsonDerivedType(typeof(CatalogSelectionResultCancelled), "cancelled")]
+[JsonDerivedType(typeof(CatalogSelectionResultTimedOut), "timed-out")]
+[JsonDerivedType(typeof(CatalogSelectionResultInvalid), "invalid")]
+[JsonDerivedType(typeof(CatalogSelectionResultStale), "stale")]
+[JsonDerivedType(typeof(CatalogSelectionResultReplayed), "replayed")]
+[JsonDerivedType(typeof(CatalogSelectionResultForeign), "foreign")]
+[JsonDerivedType(typeof(CatalogSelectionResultWrongKind), "wrong-kind")]
+[JsonDerivedType(typeof(CatalogSelectionResultNegotiationRefused), "negotiation-refused")]
+[JsonDerivedType(typeof(CatalogSelectionResultInvalidRequest), "invalid-request")]
+[JsonDerivedType(typeof(CatalogSelectionResultUnavailable), "unavailable")]
+public partial class CatalogSelectionResult
 {
     /// <summary>The type discriminator.</summary>
     [JsonPropertyName("kind")]
@@ -8665,6244 +8624,5618 @@ public partial class AgentRegistrySpawnResult
 }
 
 
-/// <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>
+/// <summary>The chosen candidate was transferred into a fresh bounded single-use handle for a later explicit planning request.</summary>
+/// <remarks>The <c>selected</c> variant of <see cref="CatalogSelectionResult"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class AgentRegistryLiveTargetEntry
+public partial class CatalogSelectionResultSelected : CatalogSelectionResult
 {
-    /// <summary>Kind of attention required when status === "attention". Meaningful only when status === "attention".</summary>
-    [JsonPropertyName("attentionKind")]
-    public AgentRegistryLiveTargetEntryAttentionKind? AttentionKind { get; set; }
-
-    /// <summary>Git branch of the session (when known).</summary>
-    [JsonPropertyName("branch")]
-    public string? Branch { get; set; }
-
-    /// <summary>Copilot CLI version that wrote the entry.</summary>
-    [JsonPropertyName("copilotVersion")]
-    public string CopilotVersion { get; set; } = string.Empty;
-
-    /// <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>TCP port the entry's JSON-RPC server is listening on.</summary>
-    [JsonPropertyName("port")]
-    public long Port { get; set; }
-
-    /// <summary>Registry entry schema version (1 = ui-server, 2 = managed-server).</summary>
-    [JsonPropertyName("schemaVersion")]
-    public long SchemaVersion { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "selected";
 
-    /// <summary>Session ID of the foreground session for this entry.</summary>
-    [JsonPropertyName("sessionId")]
-    public string? SessionId { get; set; }
+    /// <summary>Fresh single-use candidate handle accepted by mcp.planInstall. Returned only to the native host and never included in model-tool output.</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>Friendly session name (when set).</summary>
-    [JsonPropertyName("sessionName")]
-    public string? SessionName { get; set; }
+    /// <summary>The exact search identifier privately bound to the selected candidate.</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>ISO 8601 timestamp captured at registration.</summary>
-    [JsonPropertyName("startedAt")]
-    public string StartedAt { get; set; } = string.Empty;
+/// <summary>The caller explicitly declined every candidate and the retained search state was released.</summary>
+/// <remarks>The <c>declined</c> variant of <see cref="CatalogSelectionResult"/>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class CatalogSelectionResultDeclined : CatalogSelectionResult
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "declined";
 
-    /// <summary>Coarse lifecycle status of the foreground session.</summary>
-    [JsonPropertyName("status")]
-    public AgentRegistryLiveTargetEntryStatus? Status { get; set; }
+    /// <summary>The search identifier privately bound to the released selection group.</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>Monotonic per-publisher revision counter incremented on every status update. Lets watchers detect transient flips.</summary>
-    [JsonPropertyName("statusRevision")]
-    public long? StatusRevision { get; set; }
+/// <summary>The caller cancelled the selection interaction and the retained search state was released.</summary>
+/// <remarks>The <c>cancelled</c> variant of <see cref="CatalogSelectionResult"/>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class CatalogSelectionResultCancelled : CatalogSelectionResult
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "cancelled";
 
-    /// <summary>Connection token (null when the target is unauthenticated).</summary>
-    [JsonInclude]
-    [JsonPropertyName("token")]
-    internal string? Token { get; set; }
+    /// <summary>The search identifier privately bound to the released selection group.</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>Canonical process-log discovery outcome; populated from spawnLiveTarget.</summary>
+/// <summary>The host declared that its live selection interaction timed out, and the retained search state was released.</summary>
+/// <remarks>The <c>timed-out</c> variant of <see cref="CatalogSelectionResult"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class AgentRegistryLogCapture
+public partial class CatalogSelectionResultTimedOut : CatalogSelectionResult
 {
-    /// <summary>Whether a canonical process log was discovered for this managed spawn.</summary>
-    [JsonPropertyName("enabled")]
-    public bool Enabled { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "timed-out";
 
-    /// <summary>Why no canonical process log could be opened for this managed spawn (set only when enabled is false).</summary>
-    [JsonPropertyName("openError")]
-    public string? OpenError { get; set; }
+    /// <summary>The search identifier privately bound to the released selection group.</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>Categorized reason no canonical process log could be opened (set only when enabled is false).</summary>
-    [JsonPropertyName("openErrorReason")]
-    public AgentRegistryLogCaptureOpenErrorReason? OpenErrorReason { get; set; }
+/// <summary>The selection reference was malformed or unknown.</summary>
+/// <remarks>The <c>invalid</c> variant of <see cref="CatalogSelectionResult"/>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class CatalogSelectionResultInvalid : CatalogSelectionResult
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "invalid";
 
-    /// <summary>Absolute path to the managed spawn's process-&lt;timestamp&gt;-&lt;pid&gt;.log file (only set when enabled).</summary>
-    [JsonPropertyName("path")]
-    public string? Path { get; set; }
+    /// <summary>Human-readable explanation safe to surface. Never contains the presented reference or private candidate state.</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>Managed-server child was spawned and registered successfully.</summary>
-/// <remarks>The <c>spawned</c> variant of <see cref="AgentRegistrySpawnResult"/>.</remarks>
+/// <summary>The runtime-enforced selection reference lifetime elapsed before the request arrived.</summary>
+/// <remarks>The <c>stale</c> variant of <see cref="CatalogSelectionResult"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class AgentRegistrySpawnResultSpawned : AgentRegistrySpawnResult
+public partial class CatalogSelectionResultStale : CatalogSelectionResult
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Kind => "spawned";
-
-    /// <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; }
+    public override string Kind => "stale";
 
-    /// <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>Human-readable explanation safe to surface. Never contains the presented reference or private candidate state.</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 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>The selection group was already terminated or its pending host hand-off was already claimed.</summary>
+/// <remarks>The <c>replayed</c> variant of <see cref="CatalogSelectionResult"/>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class CatalogSelectionResultReplayed : CatalogSelectionResult
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "replayed";
 
-    /// <summary>Per-spawn log-capture outcome; populated from spawnLiveTarget.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("logCapture")]
-    public AgentRegistryLogCapture? LogCapture { get; set; }
+    /// <summary>Human-readable explanation safe to surface. Never contains the presented reference or private candidate state.</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>`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>The selection reference belongs to another runtime instance or session.</summary>
+/// <remarks>The <c>foreign</c> variant of <see cref="CatalogSelectionResult"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class AgentRegistrySpawnResultSpawnError : AgentRegistrySpawnResult
+public partial class CatalogSelectionResultForeign : CatalogSelectionResult
 {
     /// <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; }
+    public override string Kind => "foreign";
 
-    /// <summary>Human-readable error message.</summary>
+    /// <summary>Human-readable explanation safe to surface. Never contains the presented reference or private candidate state.</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>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>The presented opaque handle was issued for another catalog operation.</summary>
+/// <remarks>The <c>wrong-kind</c> variant of <see cref="CatalogSelectionResult"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class AgentRegistrySpawnResultRegistryTimeout : AgentRegistrySpawnResult
+public partial class CatalogSelectionResultWrongKind : CatalogSelectionResult
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Kind => "registry-timeout";
-
-    /// <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; }
+    public override string Kind => "wrong-kind";
 
-    /// <summary>Per-spawn log-capture outcome; populated from spawnLiveTarget.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("logCapture")]
-    public AgentRegistryLogCapture? LogCapture { get; set; }
+    /// <summary>Human-readable explanation safe to surface. Never contains the presented reference or private candidate state.</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>Synchronous pre-validation rejected the spawn request.</summary>
-/// <remarks>The <c>validation-error</c> variant of <see cref="AgentRegistrySpawnResult"/>.</remarks>
+/// <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="CatalogSelectionResult"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class AgentRegistrySpawnResultValidationError : AgentRegistrySpawnResult
+public partial class CatalogSelectionResultNegotiationRefused : CatalogSelectionResult
 {
     /// <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; }
+    public override string Kind => "negotiation-refused";
 
-    /// <summary>Human-readable explanation; safe to surface in the UI banner. Never logged to unrestricted telemetry.</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 required string Message { 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>
+    /// <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 AgentRegistrySpawnValidationErrorReason Reason { get; set; }
+    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>Capabilities this runtime can safely advertise to this caller. The complete five-capability protocol-3 legacy set is always present; every capability added after that baseline appears only when the caller required it, so an older closed-enum decoder can still consume a refusal. This list does not imply that every deployment has enabled every operation.</summary>
+    [JsonPropertyName("supportedCapabilities")]
+    public required IList<string> 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>Inputs to spawn a managed-server child via the controller's spawn delegate.</summary>
+/// <summary>The request was rejected because a bounded field fell outside its permitted range or a required field was unusable. Pagination may also be rejected by the authority after a continuation request; repeat the search without page.</summary>
+/// <remarks>The <c>invalid-request</c> variant of <see cref="CatalogSelectionResult"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class AgentRegistrySpawnRequest
+public partial class CatalogSelectionResultInvalidRequest : CatalogSelectionResult
 {
-    /// <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; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "invalid-request";
 
-    /// <summary>Working directory for the spawned child (must be an existing directory).</summary>
-    [JsonPropertyName("cwd")]
-    public string Cwd { get; set; } = string.Empty;
+    /// <summary>Which request field was rejected.</summary>
+    [JsonPropertyName("field")]
+    public required CatalogInvalidRequestField Field { 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>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>Model identifier to apply to the new session.</summary>
-    [JsonPropertyName("model")]
-    public string? Model { get; set; }
+/// <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="CatalogSelectionResult"/>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class CatalogSelectionResultUnavailable : CatalogSelectionResult
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "unavailable";
 
-    /// <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>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>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>Why the operation is unavailable.</summary>
+    [JsonPropertyName("reason")]
+    public required CatalogUnavailableReason Reason { get; set; }
 }
 
-/// <summary>Identifies the target session.</summary>
+/// <summary>Terminates one retained catalog selection group through an opaque reference previously returned by the model-safe search projection.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionSuspendRequest
+internal sealed class CatalogSelectionRequest
 {
-    /// <summary>Target session identifier.</summary>
+    /// <summary>Protocol version and capabilities the caller requires.</summary>
+    [JsonPropertyName("contract")]
+    public CatalogClientContract Contract { get => field ??= new(); set; }
+
+    /// <summary>The terminal outcome declared by the caller. Timed-out means the host's live interaction deadline elapsed; a reference whose runtime TTL elapsed is rejected separately as stale.</summary>
+    [JsonPropertyName("outcome")]
+    public CatalogSelectionDecision Outcome { get; set; }
+
+    /// <summary>Opaque runtime-instance scoped reference to one visible candidate. For a non-selected outcome, any candidate reference from the same search closes that search's retained group.</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("selectionRef")]
+    public string SelectionRef { get; set; } = string.Empty;
+
+    /// <summary>Locally owned root session whose retained search state is being resolved.</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("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Result of sending a user message.</summary>
+/// <summary>Information about an installed plugin tracked in global state.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SendResult
+public sealed class InstalledPluginInfo
 {
-    /// <summary>Unique identifier assigned to the message.</summary>
-    [JsonPropertyName("messageId")]
-    public string MessageId { get; set; } = string.Empty;
-}
+    /// <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>Provider-native structured output format. JSON Schema is forwarded without rewriting or validating the schema or the generated output.</summary>
-/// <remarks>Polymorphic base type discriminated by <c>type</c>.</remarks>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-[JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "type",
-    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(ResponseFormatJsonSchema), "json_schema")]
-public partial class ResponseFormat
-{
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("type")]
-    public virtual string Type { get; set; } = string.Empty;
-}
+    /// <summary>Whether the plugin is currently enabled for new sessions.</summary>
+    [JsonPropertyName("enabled")]
+    public bool Enabled { get; set; }
+
+    /// <summary>Whether the managed desired plugin currently has an installed or live record. Set to false for a managed desired entry retained in the listing after installation or reconciliation failed.</summary>
+    [JsonPropertyName("installed")]
+    public bool? Installed { 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>A JSON Schema output contract. OpenAI receives the name, description, schema and strict setting; Anthropic receives the schema in output_config.format and always uses its native strict enforcement.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class JsonSchemaResponseFormat
-{
-    /// <summary>Optional description passed to OpenAI providers.</summary>
-    [JsonPropertyName("description")]
-    public string? Description { get; set; }
+    /// <summary>Whether enterprise managed settings control this plugin's enabled state.</summary>
+    [JsonPropertyName("managed")]
+    public bool? Managed { get; set; }
 
-    /// <summary>Name of the output schema, subject to the provider's naming restrictions.</summary>
+    /// <summary>The enabled state required by enterprise managed settings, when this plugin spec is managed.</summary>
+    [JsonPropertyName("managedDesiredEnabled")]
+    public bool? ManagedDesiredEnabled { get; set; }
+
+    /// <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>Plugin name.</summary>
     [JsonPropertyName("name")]
     public string Name { get; set; } = string.Empty;
 
-    /// <summary>JSON Schema passed unchanged to the inference provider. Schemas larger than 32 MiB when JSON-encoded are rejected before admission, using the runtime's existing request-size ceiling. This is not a guarantee that the entire model request fits. Supported keywords and schema restrictions are determined by the provider.</summary>
-    [JsonPropertyName("schema")]
-    public JsonElement Schema { get; set; }
+    /// <summary>Runtime-reported plugin provenance. Currently set to "builtin" only for plugins registered through the trusted host built-in boundary; absent for installed, marketplace, direct, and live plugins.</summary>
+    [JsonPropertyName("source")]
+    public string? Source { get; set; }
 
-    /// <summary>Optional strict enforcement setting for OpenAI providers. Omitted uses the provider default. Anthropic always enforces its supported schema subset.</summary>
-    [JsonPropertyName("strict")]
-    public bool? Strict { get; set; }
+    /// <summary>Installed version (when reported by the plugin manifest).</summary>
+    [JsonPropertyName("version")]
+    public string? Version { get; set; }
 }
 
-/// <summary>The <c>json_schema</c> variant of <see cref="ResponseFormat"/>.</summary>
+/// <summary>Plugins installed in user/global state.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class ResponseFormatJsonSchema : ResponseFormat
+public sealed class PluginListResult
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "json_schema";
-
-    /// <summary>JSON Schema and provider options for the turn's output.</summary>
-    [JsonPropertyName("jsonSchema")]
-    public required JsonSchemaResponseFormat JsonSchema { get; set; }
+    /// <summary>Installed plugins.</summary>
+    [JsonPropertyName("plugins")]
+    public IList<InstalledPluginInfo> Plugins { get => field ??= []; set; }
 }
 
-/// <summary>Parameters for sending a user message to the session.</summary>
+/// <summary>Result of installing a plugin.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SendRequest
+public sealed class PluginInstallResult
 {
-    /// <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>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>Optional attachments (files, directories, selections, blobs, GitHub references) to include with the 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>
-    [JsonPropertyName("billable")]
-    public 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>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>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>Provider-native output format for this turn, including all tool-call iterations. Not inherited by later turns or subagents. Ordinary steering inherits the active format; specifying responseFormat with mode: immediate is an error, even while idle. Returned assistant content remains text; the runtime does not parse or validate it. Unsupported models or schemas produce provider errors.</summary>
-    [JsonPropertyName("responseFormat")]
-    public ResponseFormat? ResponseFormat { get; set; }
-
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-
-    /// <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>The newly installed plugin's metadata.</summary>
+    [JsonPropertyName("plugin")]
+    public InstalledPluginInfo Plugin { get => field ??= new(); set; }
 
-    /// <summary>W3C Trace Context traceparent header for distributed tracing of this agent turn.</summary>
-    [JsonPropertyName("traceparent")]
-    public string? Traceparent { get; set; }
+    /// <summary>Optional post-install message provided by the plugin (e.g. setup instructions).</summary>
+    [JsonPropertyName("postInstallMessage")]
+    public string? PostInstallMessage { get; set; }
 
-    /// <summary>W3C Trace Context tracestate header for distributed tracing.</summary>
-    [JsonPropertyName("tracestate")]
-    public string? Tracestate { get; set; }
+    /// <summary>Number of skills discovered and installed from the plugin.</summary>
+    [JsonPropertyName("skillsInstalled")]
+    public long SkillsInstalled { 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>Where the completed plugin tree was staged before atomic promotion.</summary>
+    [JsonPropertyName("stagingMode")]
+    public PluginInstallStagingMode? StagingMode { get; set; }
 }
 
-/// <summary>Result of sending zero or more user messages.</summary>
+/// <summary>Plugin source and optional working directory for relative-path resolution.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SendMessagesResult
+internal sealed class PluginsInstallRequest
 {
-    /// <summary>Unique identifiers assigned to the messages, one per provided message in order. For a batch that starts a run, assistant messages use the final ID as originatingMessageId throughout that run, including tool iterations and stop-hook corrections. Immediate steering does not replace the active run's origin. Empty when no messages were provided; that run has no originatingMessageId.</summary>
-    [JsonPropertyName("messageIds")]
-    public IList<string> MessageIds { get => field ??= []; 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>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>A single user message to append to the session as part of a `session.sendMessages` turn.</summary>
+/// <summary>Name (or spec) of the plugin to uninstall.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SendMessageItem
+internal sealed class PluginsUninstallRequest
 {
-    /// <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>The user message text.</summary>
-    [JsonPropertyName("prompt")]
-    public string Prompt { 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>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>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>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>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>Result of updating a single plugin.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SendMessagesRequest
+public sealed class PluginUpdateResult
 {
-    /// <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, before running one agent loop. When the batch starts a run, its final message is the primary initiating message; earlier messages provide context, not separate runs or replies. May be empty, in which case a single turn runs over the existing history with no new user message or originatingMessageId.</summary>
-    [JsonPropertyName("messages")]
-    public IList<SendMessageItem> Messages { get => field ??= []; 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>If true, adds the messages to the front of the queue instead of the end.</summary>
-    [JsonPropertyName("prepend")]
-    public bool? Prepend { 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>Provider-native output format for the whole turn, including an empty message batch and all tool-call iterations. Not inherited by later turns or subagents. Ordinary steering inherits the active format; specifying responseFormat with mode: immediate is an error, even while idle. Returned assistant content remains text; the runtime does not parse or validate it. Unsupported models or schemas produce provider errors.</summary>
-    [JsonPropertyName("responseFormat")]
-    public ResponseFormat? ResponseFormat { 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>Version after the update, when reported by the plugin manifest.</summary>
+    [JsonPropertyName("newVersion")]
+    public string? NewVersion { get; set; }
 
-    /// <summary>W3C Trace Context tracestate header for distributed tracing.</summary>
-    [JsonPropertyName("tracestate")]
-    public string? Tracestate { get; set; }
+    /// <summary>Version that was previously installed, when available.</summary>
+    [JsonPropertyName("previousVersion")]
+    public string? PreviousVersion { 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>Number of skills discovered and installed after the update.</summary>
+    [JsonPropertyName("skillsInstalled")]
+    public long SkillsInstalled { get; set; }
 }
 
-/// <summary>Internal request for sending a system notification.</summary>
+/// <summary>Name (or spec) of the plugin to update.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SendSystemNotificationRequest
+internal sealed class PluginsUpdateRequest
 {
-    /// <summary>Optional structured notification kind.</summary>
-    [JsonPropertyName("kind")]
-    public JsonElement? Kind { get; set; }
-
-    /// <summary>Notification text to deliver to the model.</summary>
-    [JsonPropertyName("message")]
-    public string Message { 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>Plugin name or "plugin@marketplace" spec to update.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
 }
 
-/// <summary>Result of aborting the current turn.</summary>
+/// <summary>Per-plugin result from updating all plugins, with versions, skills installed, success flag, and optional error.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class AbortResult
+public sealed class PluginUpdateAllEntry
 {
-    /// <summary>Error message if the abort failed.</summary>
+    /// <summary>Error message (failure only).</summary>
     [JsonPropertyName("error")]
     public string? Error { get; set; }
 
-    /// <summary>Whether the abort completed successfully.</summary>
+    /// <summary>Marketplace the plugin came from. Empty string ("") for direct installs.</summary>
+    [JsonPropertyName("marketplace")]
+    public string Marketplace { get; set; } = string.Empty;
+
+    /// <summary>Plugin name that was updated.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
+
+    /// <summary>Version after the update, when available.</summary>
+    [JsonPropertyName("newVersion")]
+    public string? NewVersion { get; set; }
+
+    /// <summary>Previously installed version, when available.</summary>
+    [JsonPropertyName("previousVersion")]
+    public string? PreviousVersion { get; set; }
+
+    /// <summary>Number of skills installed after the update (success only).</summary>
+    [JsonPropertyName("skillsInstalled")]
+    public long? SkillsInstalled { get; set; }
+
+    /// <summary>Whether the update succeeded for this plugin.</summary>
     [JsonPropertyName("success")]
     public bool Success { get; set; }
 }
 
-/// <summary>Parameters for aborting the current turn.</summary>
+/// <summary>Result of updating all installed plugins.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class AbortRequest
+public sealed class PluginUpdateAllResult
 {
-    /// <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>Per-plugin update results in deterministic order.</summary>
+    [JsonPropertyName("results")]
+    public IList<PluginUpdateAllEntry> Results { get => field ??= []; set; }
 }
 
-/// <summary>Result of interrupting the main agent turn.</summary>
+/// <summary>Plugin names (or specs) to enable, plus the optional working directory the repository-controlled guard is evaluated against.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class InterruptMainTurnResult
+internal sealed class PluginsEnableRequest
 {
-    /// <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>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>Working directory whose repository `enabledPlugins` overlay decides whether this mutation is repository-controlled. Hosts that serve sessions across several repositories (the SDK server) should pass the session's directory; otherwise the guard is evaluated against the server process's own working directory, which may belong to a different repository. Defaults to the server's current working directory.</summary>
+    [JsonPropertyName("workingDirectory")]
+    public string? WorkingDirectory { get; set; }
 }
 
-/// <summary>Parameters for interrupting the main agent turn.</summary>
+/// <summary>Plugin names (or specs) to disable, plus the optional working directory the repository-controlled guard is evaluated against.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class InterruptMainTurnRequest
+internal sealed class PluginsDisableRequest
 {
-    /// <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>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>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Working directory whose repository `enabledPlugins` overlay decides whether this mutation is repository-controlled. Hosts that serve sessions across several repositories (the SDK server) should pass the session's directory; otherwise the guard is evaluated against the server process's own working directory, which may belong to a different repository. Defaults to the server's current working directory.</summary>
+    [JsonPropertyName("workingDirectory")]
+    public string? WorkingDirectory { get; set; }
 }
 
-/// <summary>Identifies the target session.</summary>
+/// <summary>Trusted built-in plugin directories to use for this runtime process.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionCancelAllBackgroundAgentsRequest
+internal sealed class PluginsBuiltinSetRequest
 {
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <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>Parameters for shutting down the session.</summary>
+/// <summary>Registered marketplace summary.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class ShutdownRequest
+public sealed class MarketplaceInfo
 {
-    /// <summary>Dispatch deferred sessionEnd hooks in the background with their full per-hook timeoutSec instead of awaiting them under the short shared shutdown budget. Set this when the host process keeps running after the session closes (for example the CLI's /clear), so a slow hook neither blocks the close nor is aborted. Hooks still detached when the process later exits are terminated with it. Defaults to false.</summary>
-    [JsonPropertyName("detachSessionEndHooks")]
-    public bool? DetachSessionEndHooks { get; set; }
+    /// <summary>Whether the managed marketplace currently resolved into the runtime marketplace registry. Set to false when the desired managed entry is retained for governance visibility after loading or reconciliation failed.</summary>
+    [JsonPropertyName("available")]
+    public bool? Available { 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>True when this is a default marketplace shipped with the runtime. Defaults are not removable.</summary>
+    [JsonPropertyName("isDefault")]
+    public bool? IsDefault { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Whether enterprise managed settings provide and control this marketplace entry.</summary>
+    [JsonPropertyName("managed")]
+    public bool? Managed { get; set; }
 
-    /// <summary>Why the session is being shut down. Defaults to "routine" when omitted.</summary>
-    [JsonPropertyName("type")]
-    public ShutdownType? Type { get; set; }
+    /// <summary>Marketplace name (matches the @marketplace suffix in plugin specs).</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
+
+    /// <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>Identifier of the session event that was emitted for the log message.</summary>
+/// <summary>All registered marketplaces, including built-in defaults.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class LogResult
+public sealed class MarketplaceListResult
 {
-    /// <summary>The unique identifier of the emitted session event.</summary>
-    [JsonPropertyName("eventId")]
-    public Guid EventId { get; set; }
+    /// <summary>Registered marketplaces.</summary>
+    [JsonPropertyName("marketplaces")]
+    public IList<MarketplaceInfo> Marketplaces { get => field ??= []; set; }
 }
 
-/// <summary>Message text, optional severity level, persistence flag, optional follow-up URL, and optional tip.</summary>
+/// <summary>Result of registering a new marketplace.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class LogRequest
+public sealed class MarketplaceAddResult
 {
-    /// <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>
-    [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; }
+    /// <summary>Final name of the marketplace as resolved from its manifest.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
 }
 
-/// <summary>Adapter-declared policy that tells clients whether discovery may run automatically.</summary>
+/// <summary>Marketplace source and optional working directory for relative-path resolution.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ModelProviderAutomaticDiscoveryPolicy
+internal sealed class PluginsMarketplacesAddRequest
 {
-    /// <summary>Whether automatic discovery is allowed, limited to configured providers, or explicit-only.</summary>
-    [JsonPropertyName("mode")]
-    public ModelProviderAutomaticDiscoveryMode Mode { get; set; }
+    /// <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>Maximum network scope used by this adapter during discovery.</summary>
-    [JsonPropertyName("networkScope")]
-    public ModelProviderDiscoveryNetworkScope NetworkScope { 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>True when discovery requires non-null caller input. Omission or null is rejected before adapter execution. When false, omitted or null input selects adapter defaults without schema validation.</summary>
-    [JsonPropertyName("requiresInput")]
-    public bool RequiresInput { get; set; }
+/// <summary>Outcome of the remove attempt, including dependent-plugin info when applicable.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class MarketplaceRemoveResult
+{
+    /// <summary>Names of installed plugins that prevented removal. Populated only when `removed=false`.</summary>
+    [JsonPropertyName("dependentPlugins")]
+    public IList<string>? DependentPlugins { get; set; }
 
-    /// <summary>True when the adapter must be enabled by a trusted owner, such as a trusted extension, before automatic discovery may run.</summary>
-    [JsonPropertyName("requiresTrust")]
-    public bool RequiresTrust { 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>An operation supported by a model-provider adapter.</summary>
+/// <summary>Name of the marketplace to remove and an optional force flag.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ModelProviderAdapterOperationDescriptor
+internal sealed class PluginsMarketplacesRemoveRequest
 {
-    /// <summary>Optional self-contained JSON Schema Draft 7 for non-null discovery input. Only supported on discover. No external references are resolved. Omitted or null input selects defaults when requiresInput is false. Without a schema, the adapter validates supplied input.</summary>
-    [JsonPropertyName("inputSchema")]
-    public JsonElement? InputSchema { get; set; }
+    /// <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>Supported operation name: `discover`, `getStatus`, or `models.list`. Unknown names and duplicate declarations are rejected.</summary>
+    /// <summary>Marketplace name to remove.</summary>
     [JsonPropertyName("name")]
     public string Name { get; set; } = string.Empty;
 }
 
-/// <summary>Contributor attribution, independent of routing identity and authorization.</summary>
+/// <summary>Plugin entry advertised by a marketplace.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ModelProviderAttribution
+public sealed class MarketplacePluginInfo
 {
-    /// <summary>Human-readable contributor name, not the adapter display name.</summary>
-    [JsonPropertyName("ownerDisplayName")]
-    public string? OwnerDisplayName { get; set; }
-
-    /// <summary>Stable contributor identifier. Required and nonblank for extension and custom sources; optional for built-in and configured sources. Does not grant authority.</summary>
-    [JsonPropertyName("ownerId")]
-    public string? OwnerId { get; set; }
+    /// <summary>Short description from the marketplace catalog, when present.</summary>
+    [JsonPropertyName("description")]
+    public string? Description { get; set; }
 
-    /// <summary>Kind of component that supplied the adapter. Attribution does not confer authority.</summary>
-    [JsonPropertyName("source")]
-    public ModelProviderProvenanceSource Source { get; set; }
+    /// <summary>Plugin name as listed in the marketplace catalog.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
 }
 
-/// <summary>A normalized model-provider adapter in the session's effective catalog.</summary>
+/// <summary>Plugins advertised by the marketplace.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ModelProviderAdapterDescriptor
+public sealed class MarketplaceBrowseResult
 {
-    /// <summary>Stable opaque identity for routing to this adapter. Unique in the effective catalog, independent of live registration generations.</summary>
-    [JsonPropertyName("adapterId")]
-    public string AdapterId { get; set; } = string.Empty;
-
-    /// <summary>Adapter-declared policy for passive and automatic discovery.</summary>
-    [JsonPropertyName("automaticDiscovery")]
-    public ModelProviderAutomaticDiscoveryPolicy AutomaticDiscovery { get => field ??= new(); set; }
+    /// <summary>Plugins advertised by the marketplace.</summary>
+    [JsonPropertyName("plugins")]
+    public IList<MarketplacePluginInfo> Plugins { get => field ??= []; set; }
+}
 
-    /// <summary>Human-readable provider name.</summary>
-    [JsonPropertyName("displayName")]
-    public string DisplayName { get; set; } = string.Empty;
+/// <summary>Name of the marketplace whose plugin catalog to fetch.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class PluginsMarketplacesBrowseRequest
+{
+    /// <summary>Marketplace name to browse.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
+}
 
-    /// <summary>Operations supported by this provider adapter.</summary>
-    [JsonPropertyName("operations")]
-    public IList<ModelProviderAdapterOperationDescriptor> Operations { get => field ??= []; set; }
+/// <summary>Per-marketplace refresh result, including marketplace name, success flag, and optional failure error.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class MarketplaceRefreshEntry
+{
+    /// <summary>Error message (failure only).</summary>
+    [JsonPropertyName("error")]
+    public string? Error { get; set; }
 
-    /// <summary>Attribution for the adapter itself.</summary>
-    [JsonPropertyName("provenance")]
-    public ModelProviderAttribution Provenance { get => field ??= new(); set; }
+    /// <summary>Marketplace name that was refreshed.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
 
-    /// <summary>Descriptive provider family, such as `ollama`. Different adapters may have the same family; use adapterId for routing.</summary>
-    [JsonPropertyName("providerKind")]
-    public string ProviderKind { get; set; } = string.Empty;
+    /// <summary>Whether the refresh succeeded.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
 }
 
-/// <summary>Normalized model-provider adapter definitions available to the session, not discovered instances.</summary>
+/// <summary>Result of refreshing one or more marketplace catalogs.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ModelProviderAdapterCatalog
+public sealed class MarketplaceRefreshResult
 {
-    /// <summary>Available provider adapters ordered by adapterId.</summary>
-    [JsonPropertyName("providers")]
-    public IList<ModelProviderAdapterDescriptor> Providers { get => field ??= []; set; }
+    /// <summary>Per-marketplace refresh results in deterministic order.</summary>
+    [JsonPropertyName("results")]
+    public IList<MarketplaceRefreshEntry> Results { get => field ??= []; set; }
 }
 
-/// <summary>Identifies the target session.</summary>
+/// <summary>RPC data type for PluginsMarketplacesRefresh operations.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionProvidersGetCatalogRequest
+internal sealed class PluginsMarketplacesRefreshRequest
 {
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Marketplace name to refresh. When omitted, every registered marketplace is refreshed.</summary>
+    [JsonPropertyName("name")]
+    public string? Name { get; set; }
 }
 
-/// <summary>Attribution for the adapter that produced a provider row.</summary>
+/// <summary>Agent metadata, including identifiers, display details, source, tools, model, models, reasoning effort, MCP servers, skills, and file path.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ModelProviderProvenance
+public sealed class AgentInfo
 {
-    /// <summary>Stable opaque adapter identity from the effective catalog. Treat this as a whole identifier, not a parseable owner or kind.</summary>
-    [JsonPropertyName("adapterId")]
-    public string AdapterId { get; set; } = string.Empty;
+    /// <summary>Description of the agent's purpose.</summary>
+    [JsonPropertyName("description")]
+    public string Description { get; set; } = string.Empty;
 
-    /// <summary>Human-readable contributor name, not the adapter display name.</summary>
-    [JsonPropertyName("ownerDisplayName")]
-    public string? OwnerDisplayName { get; set; }
+    /// <summary>Whether model-driven invocation is disabled for this agent.</summary>
+    [JsonPropertyName("disableModelInvocation")]
+    public bool? DisableModelInvocation { get; set; }
 
-    /// <summary>Stable contributor identifier when the adapter has an owner outside the runtime. Independent of the contribution mechanism and not a routing key.</summary>
-    [JsonPropertyName("ownerId")]
-    public string? OwnerId { get; set; }
+    /// <summary>Human-readable display name.</summary>
+    [JsonPropertyName("displayName")]
+    public string DisplayName { get; set; } = string.Empty;
 
-    /// <summary>Descriptive provider family that produced this row; not a routing key.</summary>
-    [JsonPropertyName("providerKind")]
-    public string ProviderKind { get; set; } = string.Empty;
+    /// <summary>Declarative hook actions keyed by event name, executed only while this agent is active.</summary>
+    [JsonPropertyName("hooks")]
+    public IDictionary<string, IList<JsonElement>>? Hooks { get; set; }
 
-    /// <summary>Kind of component that supplied the adapter.</summary>
-    [JsonPropertyName("source")]
-    public ModelProviderProvenanceSource Source { get; set; }
-}
+    /// <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>Serializable reference to a discovered provider instance.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ModelProviderInstanceReference
-{
-    /// <summary>Stable opaque identity of the adapter that owns this reference. Must be present in the target session's effective catalog.</summary>
-    [JsonPropertyName("adapterId")]
-    public string AdapterId { get; set; } = string.Empty;
-
-    /// <summary>Stable instance identifier derived by the provider adapter, such as `ollama:{normalizedEndpoint}`.</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(global::GitHub.Copilot.Diagnostics.Experimental)]
+    [JsonPropertyName("mcpServers")]
+    public IDictionary<string, JsonElement>? McpServers { get; set; }
 
-    /// <summary>Absolute provider management URI. The adapter validates normalization, supported schemes, and permission to access it against its bound configuration; a reference does not grant authority.</summary>
-    [Url]
-    [StringSyntax(StringSyntaxAttribute.Uri)]
-    [JsonPropertyName("managementEndpoint")]
-    public string ManagementEndpoint { get; set; } = string.Empty;
+    /// <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>Descriptive provider family. Must match the selected adapter; not a routing key.</summary>
-    [JsonPropertyName("providerKind")]
-    public string ProviderKind { get; set; } = string.Empty;
-}
+    /// <summary>Whether authored models are preferences or required constraints.</summary>
+    [JsonPropertyName("modelPolicy")]
+    public AgentModelPolicy? ModelPolicy { get; set; }
 
-/// <summary>A normalized model-provider instance discovered by the runtime.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ModelProviderInstance
-{
-    /// <summary>Human-readable instance name.</summary>
-    [JsonPropertyName("displayName")]
-    public string DisplayName { get; set; } = string.Empty;
+    /// <summary>Authored preferred model ids for this agent, in priority order. Runtime model selection chooses the first available model; omitted means no authored preference.</summary>
+    [JsonPropertyName("models")]
+    public IList<string>? Models { get; set; }
 
-    /// <summary>Inference API endpoint when the provider exposes one separately from its management endpoint.</summary>
-    [Url]
-    [StringSyntax(StringSyntaxAttribute.Uri)]
-    [JsonPropertyName("inferenceEndpoint")]
-    public string? InferenceEndpoint { 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>Transport to use for inference against this instance.</summary>
-    [JsonPropertyName("inferenceTransport")]
-    public ProviderEndpointTransport? InferenceTransport { get; set; }
+    /// <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>Provider family to use for inference against this instance.</summary>
-    [JsonPropertyName("inferenceType")]
-    public ProviderEndpointType? InferenceType { 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>Wire API to use for inference against this instance, when required by the provider family.</summary>
-    [JsonPropertyName("inferenceWireApi")]
-    public ProviderEndpointWireApi? InferenceWireApi { get; set; }
+    /// <summary>Authored reasoning effort for this agent. Applied on selection to models that support it; omitted means no authored preference.</summary>
+    [JsonPropertyName("reasoningEffort")]
+    public string? ReasoningEffort { get; set; }
 
-    /// <summary>Attribution for the adapter that produced this instance.</summary>
-    [JsonPropertyName("provenance")]
-    public ModelProviderProvenance Provenance { get => field ??= new(); set; }
+    /// <summary>Skill names preloaded into this agent's context. Omitted means none.</summary>
+    [JsonPropertyName("skills")]
+    public IList<string>? Skills { get; set; }
 
-    /// <summary>Self-contained reference for subsequent provider operations.</summary>
-    [JsonPropertyName("reference")]
-    public ModelProviderInstanceReference Reference { get => field ??= new(); set; }
-}
+    /// <summary>Where the agent definition was loaded from.</summary>
+    [JsonPropertyName("source")]
+    public AgentInfoSource? Source { get; set; }
 
-/// <summary>Typed provider-operation outcome. Use the code for control flow and the optional message for display.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ModelProviderOperationOutcome
-{
-    /// <summary>Machine-readable operation outcome.</summary>
-    [JsonPropertyName("code")]
-    public ModelProviderOperationOutcomeCode Code { 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>Human-readable detail for non-success outcomes.</summary>
-    [JsonPropertyName("message")]
-    public string? Message { 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>Provider instances found by a discovery operation.</summary>
+/// <summary>Agents discovered across user, project, plugin, and remote sources.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ModelProviderDiscoverResult
+public sealed class ServerAgentList
 {
-    /// <summary>Discovered provider instances. Empty when passive default discovery finds no reachable provider.</summary>
-    [JsonPropertyName("instances")]
-    public IList<ModelProviderInstance> Instances { get => field ??= []; set; }
-
-    /// <summary>Typed operation outcome. Passive discovery can return `absent` with an empty instance list.</summary>
-    [JsonPropertyName("outcome")]
-    public ModelProviderOperationOutcome Outcome { get => field ??= new(); set; }
+    /// <summary>All discovered agents across all sources.</summary>
+    [JsonPropertyName("agents")]
+    public IList<AgentInfo> Agents { get => field ??= []; set; }
 }
 
-/// <summary>Provider discovery parameters.</summary>
+/// <summary>Optional project paths to include in agent discovery.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class ModelProviderDiscoverRequest
+public sealed class AgentsDiscoverRequest
 {
-    /// <summary>Opaque adapter identity returned by `session.providers.getCatalog`.</summary>
-    [JsonPropertyName("adapterId")]
-    public string AdapterId { get; set; } = string.Empty;
+    /// <summary>Explicit discovery-only agent roots, separate from customAgents and filesystem grants. Available without ambient discovery, subject to managed/source disables. Relative paths resolve against the request's effective working directory when supplied. Null and omission are equivalent; an empty array contributes no explicit roots.</summary>
+    [JsonPropertyName("agentDirectories")]
+    public IList<string>? AgentDirectories { get; set; }
 
-    /// <summary>Provider-specific JSON input. Omission or null selects adapter defaults unless requiresInput is true. Non-null input is validated against the advertised Draft 7 schema when present; otherwise validation belongs to the adapter.</summary>
-    [JsonPropertyName("input")]
-    public JsonElement? Input { get; set; }
+    /// <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>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <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>Current health information for a provider instance.</summary>
+/// <summary>Canonical directory where custom agents can be discovered or created, with scope, preference, and optional project path.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ModelProviderStatus
+public sealed class AgentDiscoveryPath
 {
-    /// <summary>Normalized provider instance.</summary>
-    [JsonPropertyName("instance")]
-    public ModelProviderInstance Instance { get => field ??= new(); 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>Typed operation outcome.</summary>
-    [JsonPropertyName("outcome")]
-    public ModelProviderOperationOutcome Outcome { get => field ??= new(); set; }
+    /// <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>Open provider status value, such as `healthy`, `unreachable`, or `notInstalled`.</summary>
-    [JsonPropertyName("status")]
-    public string Status { get; set; } = string.Empty;
+    /// <summary>The input project path this directory was derived from (only for project scope).</summary>
+    [JsonPropertyName("projectPath")]
+    public string? ProjectPath { get; set; }
 
-    /// <summary>Provider-reported version.</summary>
-    [JsonPropertyName("version")]
-    public string? Version { get; set; }
+    /// <summary>Which tier this directory belongs to.</summary>
+    [JsonPropertyName("scope")]
+    public AgentDiscoveryPathScope Scope { get; set; }
 }
 
-/// <summary>Provider status request parameters.</summary>
+/// <summary>Canonical locations where custom agents can be created so the runtime will recognize them.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class ModelProviderGetStatusRequest
+public sealed class AgentDiscoveryPathList
 {
-    /// <summary>Provider instance reference returned by discovery.</summary>
-    [JsonPropertyName("instance")]
-    public ModelProviderInstanceReference Instance { get => field ??= new(); set; }
-
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Canonical agent create/discovery directories, in priority order.</summary>
+    [JsonPropertyName("paths")]
+    public IList<AgentDiscoveryPath> Paths { get => field ??= []; set; }
 }
 
-/// <summary>Provider-reported model artifact metadata.</summary>
+/// <summary>Optional project paths to include when enumerating agent discovery directories.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ModelArtifactDetails
+public sealed class AgentsGetDiscoveryPathsRequest
 {
-    /// <summary>Provider-reported model architecture.</summary>
-    [JsonPropertyName("architecture")]
-    public string? Architecture { get; set; }
-
-    /// <summary>Provider-reported model families.</summary>
-    [JsonPropertyName("families")]
-    public IList<string>? Families { get; set; }
+    /// <summary>Explicit discovery-only agent roots to enumerate, including configured missing directories. Relative paths resolve against the request's effective working directory when supplied. These are not filesystem grants or preferred creation targets. Null and omission are equivalent.</summary>
+    [JsonPropertyName("agentDirectories")]
+    public IList<string>? AgentDirectories { get; set; }
 
-    /// <summary>Primary model family.</summary>
-    [JsonPropertyName("family")]
-    public string? Family { get; set; }
+    /// <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>Artifact format, such as `gguf`.</summary>
-    [JsonPropertyName("format")]
-    public string? Format { 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>Provider-reported parameter count label.</summary>
-    [JsonPropertyName("parameterSize")]
-    public string? ParameterSize { get; set; }
+/// <summary>The agents this runtime ships, named so a consumer can tell them apart from authored ones.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class AgentsGetBuiltinsResult
+{
+    /// <summary>The subset of `names` a user is allowed to turn off. A shipped agent outside this list is always active and a client should not offer a toggle for it.</summary>
+    [JsonPropertyName("disableableNames")]
+    public IList<string> DisableableNames { get => field ??= []; set; }
 
-    /// <summary>Provider-reported quantization label.</summary>
-    [JsonPropertyName("quantization")]
-    public string? Quantization { get; set; }
+    /// <summary>Every agent name this runtime ships.</summary>
+    [JsonPropertyName("names")]
+    public IList<string> Names { get => field ??= []; set; }
 
-    /// <summary>Provider-reported tokenizer.</summary>
-    [JsonPropertyName("tokenizer")]
-    public string? Tokenizer { get; set; }
+    /// <summary>The subset of `names` defined by a shipped YAML definition. The remainder are special-cased in code and have no definition to load.</summary>
+    [JsonPropertyName("yamlBasedNames")]
+    public IList<string> YamlBasedNames { get => field ??= []; set; }
 }
 
-/// <summary>A non-fatal provider observation warning.</summary>
+/// <summary>A shipped agent, named and described.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ModelProviderWarning
+internal sealed class BuiltinAgentSummary
 {
-    /// <summary>Machine-readable warning code.</summary>
-    [JsonPropertyName("code")]
-    public string Code { get; set; } = string.Empty;
+    /// <summary>One-line description of what the agent does.</summary>
+    [JsonPropertyName("description")]
+    public string Description { get; set; } = string.Empty;
 
-    /// <summary>Human-readable warning message.</summary>
-    [JsonPropertyName("message")]
-    public string Message { get; set; } = string.Empty;
+    /// <summary>The agent name, as it appears in `getBuiltins`.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
 }
 
-/// <summary>A model offered for agent conversations. Missing capability metadata does not disqualify a candidate. Models known to be incompatible, such as embedding-only models, are excluded by the adapter.</summary>
+/// <summary>The shipped agents available under the requested flags.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class DiscoveredModel
+internal sealed class AgentsGetAvailableBuiltinsResult
 {
-    /// <summary>Provider-reported model capabilities. Omitted capability fields are unknown; explicit false values are preserved.</summary>
-    [JsonPropertyName("capabilities")]
-    public ModelCapabilities Capabilities { get => field ??= new(); set; }
-
-    /// <summary>Provider-reported model artifact details.</summary>
-    [JsonPropertyName("details")]
-    public ModelArtifactDetails Details { get => field ??= new(); set; }
-
-    /// <summary>Provider-reported artifact digest.</summary>
-    [JsonPropertyName("digest")]
-    public string? Digest { get; set; }
-
-    /// <summary>Provider-native model identifier.</summary>
-    [JsonPropertyName("id")]
-    public string Id { get; set; } = string.Empty;
-
-    /// <summary>Provider-reported last-modified timestamp.</summary>
-    [JsonPropertyName("modifiedAt")]
-    public DateTimeOffset? ModifiedAt { get; set; }
-
-    /// <summary>Provider-reported display name.</summary>
-    [JsonPropertyName("name")]
-    public string? Name { get; set; }
+    /// <summary>Available shipped agents, in the runtime's own order.</summary>
+    [JsonPropertyName("agents")]
+    public IList<BuiltinAgentSummary> Agents { get => field ??= []; set; }
+}
 
-    /// <summary>Attribution for the adapter that produced this model row.</summary>
-    [JsonPropertyName("provenance")]
-    public ModelProviderProvenance Provenance { get => field ??= new(); set; }
+/// <summary>The feature flags to evaluate shipped agents against.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class AgentsGetAvailableBuiltinsRequest
+{
+    /// <summary>The surface asking, which gates agents that only apply to one client. Omit or pass null to apply no client filter.</summary>
+    [JsonPropertyName("context")]
+    public string? Context { get; set; }
 
-    /// <summary>Provider-reported artifact size in bytes.</summary>
-    [JsonPropertyName("sizeBytes")]
-    public long? SizeBytes { get; set; }
+    /// <summary>Feature flag values keyed by name, evaluated with the runtime's truthiness rules. Omit or pass null for no flags.</summary>
+    [JsonPropertyName("featureFlags")]
+    public IDictionary<string, JsonElement>? FeatureFlags { get; set; }
 
-    /// <summary>Non-fatal warnings encountered while enriching this model.</summary>
-    [JsonPropertyName("warnings")]
-    public IList<ModelProviderWarning> Warnings { get => field ??= []; set; }
+    /// <summary>Flag overrides keyed by name. A null entry uses the corresponding base flag; false explicitly disables it. Omit or pass null for no overrides.</summary>
+    [JsonPropertyName("overrides")]
+    public IDictionary<string, JsonElement>? Overrides { get; set; }
 }
 
-/// <summary>Models offered for agent conversations by one provider instance. Adapters exclude known-incompatible models, but retain candidates with unknown capabilities. Listing does not guarantee compatibility.</summary>
+/// <summary>One shipped agent's definition.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class DiscoveredModelList
+internal sealed class AgentsGetBuiltinDefinitionResult
 {
-    /// <summary>Provider-native models in provider order.</summary>
-    [JsonPropertyName("models")]
-    public IList<DiscoveredModel> Models { get => field ??= []; set; }
-
-    /// <summary>Typed operation outcome.</summary>
-    [JsonPropertyName("outcome")]
-    public ModelProviderOperationOutcome Outcome { get => field ??= new(); set; }
+    /// <summary>The agent's definition, serialized as JSON. It carries the authored keys plus the runtime's projected `__nativeCustomAgent` view of the same agent. It is a string rather than an object because the runtime parses it with the agent schema's tolerant shape, which accepts keys this contract does not name.</summary>
+    [JsonPropertyName("definitionJson")]
+    public string DefinitionJson { get; set; } = string.Empty;
 }
 
-/// <summary>Provider model inventory request parameters.</summary>
+/// <summary>The shipped agent whose definition to load.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class ModelProviderModelsListRequest
+internal sealed class AgentsGetBuiltinDefinitionRequest
 {
-    /// <summary>Provider instance reference returned by discovery.</summary>
-    [JsonPropertyName("instance")]
-    public ModelProviderInstanceReference Instance { get => field ??= new(); set; }
-
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>The agent name, which must be one of `getBuiltins`'s `yamlBasedNames`. A name outside that list is special-cased in code and has no definition, and is reported as an error rather than as an empty definition.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
 }
 
-/// <summary>Vision-specific limits.</summary>
+/// <summary>One shipped agent, projected for a listing.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ModelCapabilitiesOverrideLimitsVision
+internal sealed class AgentsGetBuiltinListingDefinitionResult
 {
-    /// <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>MIME types the model accepts.</summary>
-    [JsonPropertyName("supported_media_types")]
-    public IList<string>? SupportedMediaTypes { get; set; }
+    /// <summary>The agent projected as a custom agent, serialized as JSON. It is a string rather than an object for the same reason as `getBuiltinDefinition`: the runtime parses the underlying definition with the agent schema's tolerant shape, which accepts keys this contract does not name.</summary>
+    [JsonPropertyName("definitionJson")]
+    public string DefinitionJson { get; set; } = string.Empty;
 }
 
-/// <summary>Token limits for prompts, outputs, and context window.</summary>
+/// <summary>The shipped agent whose listing entry to load.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ModelCapabilitiesOverrideLimits
+internal sealed class AgentsGetBuiltinListingDefinitionRequest
 {
-    /// <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>The agent name, taken from `getAvailableBuiltins`. Unlike `getBuiltinDefinition`, the agent that `getBuiltins` reports as special-cased rather than YAML-based is answered here too, from its in-code definition.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
 }
 
-/// <summary>Feature flags indicating what the model supports.</summary>
+/// <summary>The model to switch to, and the warning to show when the agent's preference could not be met.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ModelCapabilitiesOverrideSupports
+internal sealed class AgentsCustomAgentInitialModelDecisionResult
 {
-    /// <summary>Resolved Anthropic adaptive-thinking capability — unsupported / optional / required / adaptive_only. 'required' models reject thinking.type='enabled' with HTTP 400 but still accept 'disabled' (e.g. opus-4.7/4.8/5, sonnet-5); 'adaptive_only' models accept nothing but 'adaptive' (e.g. fable, mythos).</summary>
-    [JsonPropertyName("adaptive_thinking")]
-    public AdaptiveThinkingSupport? AdaptiveThinking { get; set; }
-
-    /// <summary>Whether this model supports reasoning effort configuration.</summary>
+    /// <summary>The reasoning effort attached to the selected model preference. Absent when that preference does not specify an effort.</summary>
     [JsonPropertyName("reasoningEffort")]
-    public bool? ReasoningEffort { get; set; }
+    public string? ReasoningEffort { get; set; }
 
-    /// <summary>Whether this model supports canonical tool calling.</summary>
-    [JsonPropertyName("toolCalls")]
-    public bool? ToolCalls { get; set; }
+    /// <summary>The first available model that matches the agent's preferences. Absent when none of the requested models is available.</summary>
+    [JsonPropertyName("targetModel")]
+    public string? TargetModel { get; set; }
 
-    /// <summary>Whether this model supports vision/image input.</summary>
-    [JsonPropertyName("vision")]
-    public bool? Vision { get; set; }
+    /// <summary>What to tell the user about an unmet preference. Absent when the preference was met. A warning with no `targetModel` means the agent's models are all unavailable.</summary>
+    [JsonPropertyName("warning")]
+    public string? Warning { get; set; }
 }
 
-/// <summary>Optional capability overrides (vision, tool_calls, reasoning, etc.).</summary>
+/// <summary>The models a custom agent asks for, and the models actually available.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ModelCapabilitiesOverride
+internal sealed class AgentsCustomAgentInitialModelDecisionParams
 {
-    /// <summary>Token limits for prompts, outputs, and context window.</summary>
-    [JsonPropertyName("limits")]
-    public ModelCapabilitiesOverrideLimits? Limits { get; set; }
+    /// <summary>The agent's declared `model:` entry, serialized. A single name or an ordered list of acceptable names.</summary>
+    [JsonPropertyName("agentModelsJson")]
+    public string AgentModelsJson { get; set; } = string.Empty;
 
-    /// <summary>Feature flags indicating what the model supports.</summary>
-    [JsonPropertyName("supports")]
-    public ModelCapabilitiesOverrideSupports? Supports { get; set; }
+    /// <summary>The models available to this session, serialized in the shape the model list carries.</summary>
+    [JsonPropertyName("availableModelsJson")]
+    public string AvailableModelsJson { get; set; } = string.Empty;
 }
 
-/// <summary>RPC data type for ProtocolSystemMessageAppendConfig operations.</summary>
+/// <summary>Installed plugin record from global state, with marketplace, version, install time, enabled state, cache path, and source.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ProtocolSystemMessageAppendConfig
+public sealed class InstalledPlugin
 {
-    /// <summary>Text appended to the standard system prompt.</summary>
-    [JsonPropertyName("content")]
-    public string? Content { get; set; }
+    /// <summary>Path where the plugin is cached locally.</summary>
+    [JsonPropertyName("cache_path")]
+    public string? CachePath { get; set; }
 
-    /// <summary>Append-mode discriminator. Omission also selects append mode.</summary>
-    [JsonPropertyName("mode")]
-    public ProtocolAppendMode? Mode { get; set; }
-}
+    /// <summary>Whether the plugin is currently enabled.</summary>
+    [JsonPropertyName("enabled")]
+    public bool Enabled { get; set; }
 
-/// <summary>RPC data type for SystemMessageBlock operations.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SystemMessageBlock
-{
-    /// <summary>Whether providers with explicit prompt caching should place a cache breakpoint after this block.</summary>
-    [JsonPropertyName("cacheBreakpoint")]
-    public bool? CacheBreakpoint { get; set; }
+    /// <summary>Installation timestamp.</summary>
+    [JsonPropertyName("installed_at")]
+    public string InstalledAt { get; set; } = string.Empty;
 
-    /// <summary>Text content for this system-message block.</summary>
-    [JsonPropertyName("content")]
-    public string Content { 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>Whether the block is static and may be cached independently of dynamic prompt content.</summary>
-    [JsonPropertyName("isStatic")]
-    public bool? IsStatic { 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 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>RPC data type for ProtocolSystemMessageReplaceConfig operations.</summary>
+/// <summary>An account the host has signed in to, identified by the server it lives on and the login it uses there. The same person can appear more than once when they use both github.com and an Enterprise server.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ProtocolSystemMessageReplaceConfig
+internal sealed class LoggedInUser
 {
-    /// <summary>Complete replacement system-message text.</summary>
-    [JsonPropertyName("content")]
-    public string Content { get; set; } = string.Empty;
+    /// <summary>Source account this account was derived from, when one was recorded.</summary>
+    [JsonPropertyName("derivedFrom")]
+    public string? DerivedFrom { get; set; }
 
-    /// <summary>Optional structured blocks corresponding to the replacement content.</summary>
-    [JsonPropertyName("contentBlocks")]
-    public IList<SystemMessageBlock>? ContentBlocks { get; set; }
+    /// <summary>Host the account belongs to, such as `github.com` or an Enterprise server.</summary>
+    [JsonPropertyName("host")]
+    public string Host { get; set; } = string.Empty;
 
-    /// <summary>Replace-mode discriminator.</summary>
-    [JsonPropertyName("mode")]
-    public ProtocolReplaceMode Mode { get; set; }
+    /// <summary>Account kind, when the host recorded one. Consumers must tolerate new strings.</summary>
+    [JsonPropertyName("kind")]
+    public string? Kind { get; set; }
+
+    /// <summary>Account login on that host.</summary>
+    [JsonPropertyName("login")]
+    public string Login { get; set; } = string.Empty;
 }
 
-/// <summary>RPC data type for ProtocolStaticSectionOverride operations.</summary>
+/// <summary>The host's machine-wide state. Every field is optional because a fresh install has recorded nothing yet, so a reader must treat an absent field as `not yet`, never as a negative answer. Stored credentials are deliberately absent from this shape.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ProtocolStaticSectionOverride
+internal sealed class GlobalStateLoadResult
 {
-    /// <summary>Declarative operation applied to the section.</summary>
-    [JsonPropertyName("action")]
-    public ProtocolStaticSectionAction Action { get; set; }
+    /// <summary>Whether the app tip has been shown.</summary>
+    [JsonPropertyName("appTipShown")]
+    public bool? AppTipShown { get; set; }
 
-    /// <summary>Optional content used by replace, append, and prepend operations.</summary>
-    [JsonPropertyName("content")]
-    public string? Content { get; set; }
+    /// <summary>Terminals the user has already been asked to set up, so the host does not ask twice.</summary>
+    [JsonPropertyName("askedSetupTerminals")]
+    public IList<string>? AskedSetupTerminals { get; set; }
+
+    /// <summary>When the Auto-feedback hint was last shown, as an ISO 8601 timestamp. It enforces the once-per-day cap for non-staff users across restarts.</summary>
+    [JsonPropertyName("autoFeedbackLastPromptedAt")]
+    public string? AutoFeedbackLastPromptedAt { get; set; }
+
+    /// <summary>When the host first ran on this machine.</summary>
+    [JsonPropertyName("firstLaunchAt")]
+    public string? FirstLaunchAt { get; set; }
+
+    /// <summary>Plugins installed on this machine.</summary>
+    [JsonPropertyName("installedPlugins")]
+    public IList<InstalledPlugin>? InstalledPlugins { get; set; }
+
+    /// <summary>Account used for the most recent sign-in.</summary>
+    [JsonPropertyName("lastLoggedInUser")]
+    public LoggedInUser? LastLoggedInUser { get; set; }
+
+    /// <summary>Every account the host has signed in to on this machine.</summary>
+    [JsonPropertyName("loggedInUsers")]
+    public IList<LoggedInUser>? LoggedInUsers { get; set; }
+
+    /// <summary>Whether the one-off cleanup of stored reasoning summaries has run.</summary>
+    [JsonPropertyName("reasoningSummariesCleanupDone")]
+    public bool? ReasoningSummariesCleanupDone { get; set; }
+
+    /// <summary>Models the user selected recently, most recent first.</summary>
+    [JsonPropertyName("recentModelIds")]
+    public IList<string>? RecentModelIds { get; set; }
+
+    /// <summary>Whether the user declined to trust the sandbox credential proxy CA.</summary>
+    [JsonPropertyName("sandboxCredentialProxyCaDeclined")]
+    public bool? SandboxCredentialProxyCaDeclined { get; set; }
+
+    /// <summary>Whether the sandbox onboarding has been shown.</summary>
+    [JsonPropertyName("sandboxOnboardingShown")]
+    public bool? SandboxOnboardingShown { get; set; }
+
+    /// <summary>Whether the user is a GitHub or Microsoft staff member, which unlocks internal-only behavior.</summary>
+    [JsonPropertyName("staff")]
+    public bool? Staff { get; set; }
+
+    /// <summary>Whether the user was recognized as GitHub staff.</summary>
+    [JsonPropertyName("staffGithub")]
+    public bool? StaffGitHub { get; set; }
+
+    /// <summary>When the staff-only log level migration last ran.</summary>
+    [JsonPropertyName("staffLogLevelMigrationAt")]
+    public string? StaffLogLevelMigrationAt { get; set; }
+
+    /// <summary>Whether the user was recognized as Microsoft staff.</summary>
+    [JsonPropertyName("staffMicrosoft")]
+    public bool? StaffMicrosoft { get; set; }
+
+    /// <summary>When the staff-only model reset last ran.</summary>
+    [JsonPropertyName("staffModelResetAt")]
+    public string? StaffModelResetAt { get; set; }
+
+    /// <summary>When the staff-only update channel migration last ran.</summary>
+    [JsonPropertyName("staffUpdateChannelMigrationAt")]
+    public string? StaffUpdateChannelMigrationAt { get; set; }
+
+    /// <summary>Folders where the user declined the init prompt, so it stays hidden there.</summary>
+    [JsonPropertyName("suppressInitFolders")]
+    public IList<string>? SuppressInitFolders { get; set; }
+
+    /// <summary>Folders the user has marked as trusted.</summary>
+    [JsonPropertyName("trustedFolders")]
+    public IList<string>? TrustedFolders { get; set; }
 }
 
-/// <summary>Polymorphic base type discriminated by <c>action</c>.</summary>
+/// <summary>Selects the configuration directory whose machine-wide state to read.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-[JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "action",
-    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(ProtocolMarkerSectionOverrideTransform), "transform")]
-[JsonDerivedType(typeof(ProtocolMarkerSectionOverridePreserve), "preserve")]
-public partial class ProtocolMarkerSectionOverride
+internal sealed class GlobalStateLoadForConfigDirRequest
 {
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("action")]
-    public virtual string Action { get; set; } = string.Empty;
+    /// <summary>Copilot configuration directory to read the state document from, taking precedence over the server's own `COPILOT_HOME` and default home. Omit it, or pass an empty string, to read the directory the server resolved for itself.</summary>
+    [JsonPropertyName("configDir")]
+    public string? ConfigDir { get; set; }
 }
 
-
-/// <summary>The <c>transform</c> variant of <see cref="ProtocolMarkerSectionOverride"/>.</summary>
+/// <summary>A single top-level key to record in the host's machine-wide state. The write replaces only that key and leaves the rest of the document untouched, so two writers recording different one-off flags do not overwrite each other. The stored credential keys cannot be written through this method.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class ProtocolMarkerSectionOverrideTransform : ProtocolMarkerSectionOverride
+internal sealed class GlobalStateWriteKeyRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Action => "transform";
+    /// <summary>Copilot configuration directory to write the state document in, taking precedence over the server's own `COPILOT_HOME` and default home. Omit it, or pass an empty string, to write the directory the server resolved for itself. Mirrors `globalState.loadForConfigDir`, so a caller can read and write the same directory.</summary>
+    [JsonPropertyName("configDir")]
+    public string? ConfigDir { get; set; }
+
+    /// <summary>Top-level key to write, named as it appears in the result of `globalState.load`. It must be one of the writable keys that `globalState.writeKey` lists.</summary>
+    [JsonPropertyName("key")]
+    public string Key { get; set; } = string.Empty;
+
+    /// <summary>Value to store for the key. Omit it, or pass null, to remove the key instead.</summary>
+    [JsonPropertyName("value")]
+    public JsonElement? Value { get; set; }
 }
 
-/// <summary>The <c>preserve</c> variant of <see cref="ProtocolMarkerSectionOverride"/>.</summary>
+/// <summary>A literal choice the command input accepts, with a human-facing description.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class ProtocolMarkerSectionOverridePreserve : ProtocolMarkerSectionOverride
+public sealed class SlashCommandInputChoice
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Action => "preserve";
+    /// <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;
 }
 
-/// <summary>JSON union data type for <c>ProtocolSectionOverride</c>.</summary>
+/// <summary>Optional unstructured input hint.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-[JsonConverter(typeof(Converter))]
-public sealed partial class ProtocolSectionOverride
+public sealed class SlashCommandInput
 {
-    /// <summary>Gets the value when this instance contains <see cref="ProtocolStaticSectionOverride"/>.</summary>
-    public ProtocolStaticSectionOverride? ProtocolStaticSectionOverride { get; }
+    /// <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>Gets the value when this instance contains <see cref="ProtocolMarkerSectionOverride"/>.</summary>
-    public ProtocolMarkerSectionOverride? ProtocolMarkerSectionOverride { get; }
+    /// <summary>Optional completion hint for the input (e.g. 'directory' for filesystem path completion).</summary>
+    [JsonPropertyName("completion")]
+    public SlashCommandInputCompletion? Completion { get; set; }
 
-    /// <summary>Initializes a new instance of the <see cref="ProtocolSectionOverride"/> class from <see cref="ProtocolStaticSectionOverride"/>.</summary>
-    public ProtocolSectionOverride(ProtocolStaticSectionOverride value)
-    {
-        ArgumentNullException.ThrowIfNull(value);
-        ProtocolStaticSectionOverride = value;
-    }
+    /// <summary>Hint to display when command input has not been provided.</summary>
+    [JsonPropertyName("hint")]
+    public string Hint { get; set; } = string.Empty;
 
-    /// <summary>Converts <see cref="ProtocolStaticSectionOverride"/> to <see cref="ProtocolSectionOverride"/>.</summary>
-    public static implicit operator ProtocolSectionOverride(ProtocolStaticSectionOverride value) => new(value);
+    /// <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>Initializes a new instance of the <see cref="ProtocolSectionOverride"/> class from <see cref="ProtocolMarkerSectionOverride"/>.</summary>
-    public ProtocolSectionOverride(ProtocolMarkerSectionOverride value)
-    {
-        ArgumentNullException.ThrowIfNull(value);
-        ProtocolMarkerSectionOverride = value;
-    }
+    /// <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>Converts <see cref="ProtocolMarkerSectionOverride"/> to <see cref="ProtocolSectionOverride"/>.</summary>
-    public static implicit operator ProtocolSectionOverride(ProtocolMarkerSectionOverride value) => new(value);
+/// <summary>Slash-command metadata with name, aliases, description, kind, input hint, execution allowance, and schedulability.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class SlashCommandInfo
+{
+    /// <summary>Canonical aliases without leading slashes.</summary>
+    [JsonPropertyName("aliases")]
+    public IList<string>? Aliases { get; set; }
 
-    /// <summary>Provides a <see cref="JsonConverter{ProtocolSectionOverride}"/> for serializing <see cref="ProtocolSectionOverride"/> instances.</summary>
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<ProtocolSectionOverride>
-    {
-        /// <inheritdoc />
-        public override ProtocolSectionOverride Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-        {
-            if (reader.TokenType == JsonTokenType.Null)
-            {
-                throw new JsonException("Expected JSON object for ProtocolSectionOverride.");
-            }
+    /// <summary>Whether the command may run while an agent turn is active.</summary>
+    [JsonPropertyName("allowDuringAgentExecution")]
+    public bool AllowDuringAgentExecution { get; set; }
 
-            using var document = JsonDocument.ParseValue(ref reader);
-            var element = document.RootElement;
-            if (element.ValueKind == JsonValueKind.Object && (element.TryGetProperty("action", out _) && element.GetProperty("action").ValueKind == JsonValueKind.String && (element.GetProperty("action").GetString() == "replace" || element.GetProperty("action").GetString() == "remove" || element.GetProperty("action").GetString() == "append" || element.GetProperty("action").GetString() == "prepend")))
-            {
-                var protocolStaticSectionOverride = JsonSerializer.Deserialize(element, RpcJsonContext.Default.ProtocolStaticSectionOverride);
-                return protocolStaticSectionOverride is null ? throw new JsonException("Expected ProtocolStaticSectionOverride value.") : new ProtocolSectionOverride(protocolStaticSectionOverride);
-            }
-            if ((element.ValueKind == JsonValueKind.Object && (element.TryGetProperty("action", out _) && element.GetProperty("action").ValueKind == JsonValueKind.String && (element.GetProperty("action").GetString() == "transform")) || element.ValueKind == JsonValueKind.Object && (element.TryGetProperty("action", out _) && element.GetProperty("action").ValueKind == JsonValueKind.String && (element.GetProperty("action").GetString() == "preserve"))))
-            {
-                var protocolMarkerSectionOverride = JsonSerializer.Deserialize(element, RpcJsonContext.Default.ProtocolMarkerSectionOverride);
-                return protocolMarkerSectionOverride is null ? throw new JsonException("Expected ProtocolMarkerSectionOverride value.") : new ProtocolSectionOverride(protocolMarkerSectionOverride);
-            }
+    /// <summary>Human-readable command description.</summary>
+    [JsonPropertyName("description")]
+    public string Description { get; set; } = string.Empty;
 
-            throw new JsonException("JSON value did not match any ProtocolSectionOverride variant.");
-        }
+    /// <summary>Whether the command is experimental.</summary>
+    [JsonPropertyName("experimental")]
+    public bool? Experimental { get; set; }
 
-        /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, ProtocolSectionOverride value, JsonSerializerOptions options)
-        {
-            if (value.ProtocolStaticSectionOverride is { } protocolStaticSectionOverride)
-            {
-                JsonSerializer.Serialize(writer, protocolStaticSectionOverride, RpcJsonContext.Default.ProtocolStaticSectionOverride);
-                return;
-            }
-            if (value.ProtocolMarkerSectionOverride is { } protocolMarkerSectionOverride)
-            {
-                JsonSerializer.Serialize(writer, protocolMarkerSectionOverride, RpcJsonContext.Default.ProtocolMarkerSectionOverride);
-                return;
-            }
+    /// <summary>Optional unstructured input hint.</summary>
+    [JsonPropertyName("input")]
+    public SlashCommandInput? Input { get; set; }
 
-            throw new JsonException("No ProtocolSectionOverride variant value is 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>Canonical command name without a leading slash.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
+
+    /// <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>RPC data type for ProtocolSystemMessageCustomizeConfig operations.</summary>
+/// <summary>Slash commands available in the session, after applying any include/exclude filters.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ProtocolSystemMessageCustomizeConfig
+public sealed class CommandList
 {
-    /// <summary>Text appended after the customized sections.</summary>
-    [JsonPropertyName("content")]
-    public string? Content { get; set; }
-
-    /// <summary>Customize-mode discriminator.</summary>
-    [JsonPropertyName("mode")]
-    public ProtocolCustomizeMode Mode { get; set; }
-
-    /// <summary>Named standard-prompt section overrides.</summary>
-    [JsonPropertyName("sections")]
-    public IDictionary<string, ProtocolSectionOverride>? Sections { get; set; }
+    /// <summary>Commands available in this session.</summary>
+    [JsonPropertyName("commands")]
+    public IList<SlashCommandInfo> Commands { get => field ??= []; set; }
 }
 
-/// <summary>JSON union data type for <c>ProtocolSystemMessageConfig</c>.</summary>
+/// <summary>Owner, name, and host of a GitHub repository, as resolved from a git remote URL.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-[JsonConverter(typeof(Converter))]
-public sealed partial class ProtocolSystemMessageConfig
+public sealed class GitHubRepositoryIdentity
 {
-    /// <summary>Gets the value when this instance contains <see cref="ProtocolSystemMessageAppendConfig"/>.</summary>
-    public ProtocolSystemMessageAppendConfig? ProtocolSystemMessageAppendConfig { get; }
-
-    /// <summary>Gets the value when this instance contains <see cref="ProtocolSystemMessageReplaceConfig"/>.</summary>
-    public ProtocolSystemMessageReplaceConfig? ProtocolSystemMessageReplaceConfig { get; }
-
-    /// <summary>Gets the value when this instance contains <see cref="ProtocolSystemMessageCustomizeConfig"/>.</summary>
-    public ProtocolSystemMessageCustomizeConfig? ProtocolSystemMessageCustomizeConfig { get; }
-
-    /// <summary>Initializes a new instance of the <see cref="ProtocolSystemMessageConfig"/> class from <see cref="ProtocolSystemMessageAppendConfig"/>.</summary>
-    public ProtocolSystemMessageConfig(ProtocolSystemMessageAppendConfig value)
-    {
-        ArgumentNullException.ThrowIfNull(value);
-        ProtocolSystemMessageAppendConfig = value;
-    }
-
-    /// <summary>Converts <see cref="ProtocolSystemMessageAppendConfig"/> to <see cref="ProtocolSystemMessageConfig"/>.</summary>
-    public static implicit operator ProtocolSystemMessageConfig(ProtocolSystemMessageAppendConfig value) => new(value);
-
-    /// <summary>Initializes a new instance of the <see cref="ProtocolSystemMessageConfig"/> class from <see cref="ProtocolSystemMessageReplaceConfig"/>.</summary>
-    public ProtocolSystemMessageConfig(ProtocolSystemMessageReplaceConfig value)
-    {
-        ArgumentNullException.ThrowIfNull(value);
-        ProtocolSystemMessageReplaceConfig = value;
-    }
-
-    /// <summary>Converts <see cref="ProtocolSystemMessageReplaceConfig"/> to <see cref="ProtocolSystemMessageConfig"/>.</summary>
-    public static implicit operator ProtocolSystemMessageConfig(ProtocolSystemMessageReplaceConfig value) => new(value);
-
-    /// <summary>Initializes a new instance of the <see cref="ProtocolSystemMessageConfig"/> class from <see cref="ProtocolSystemMessageCustomizeConfig"/>.</summary>
-    public ProtocolSystemMessageConfig(ProtocolSystemMessageCustomizeConfig value)
-    {
-        ArgumentNullException.ThrowIfNull(value);
-        ProtocolSystemMessageCustomizeConfig = value;
-    }
-
-    /// <summary>Converts <see cref="ProtocolSystemMessageCustomizeConfig"/> to <see cref="ProtocolSystemMessageConfig"/>.</summary>
-    public static implicit operator ProtocolSystemMessageConfig(ProtocolSystemMessageCustomizeConfig value) => new(value);
-
-    /// <summary>Provides a <see cref="JsonConverter{ProtocolSystemMessageConfig}"/> for serializing <see cref="ProtocolSystemMessageConfig"/> instances.</summary>
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<ProtocolSystemMessageConfig>
-    {
-        /// <inheritdoc />
-        public override ProtocolSystemMessageConfig Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-        {
-            if (reader.TokenType == JsonTokenType.Null)
-            {
-                throw new JsonException("Expected JSON object for ProtocolSystemMessageConfig.");
-            }
-
-            using var document = JsonDocument.ParseValue(ref reader);
-            var element = document.RootElement;
-            if (element.ValueKind == JsonValueKind.Object && (!element.TryGetProperty("mode", out _) || (element.TryGetProperty("mode", out _) && element.GetProperty("mode").ValueKind == JsonValueKind.String && (element.GetProperty("mode").GetString() == "append"))))
-            {
-                var protocolSystemMessageAppendConfig = JsonSerializer.Deserialize(element, RpcJsonContext.Default.ProtocolSystemMessageAppendConfig);
-                return protocolSystemMessageAppendConfig is null ? throw new JsonException("Expected ProtocolSystemMessageAppendConfig value.") : new ProtocolSystemMessageConfig(protocolSystemMessageAppendConfig);
-            }
-            if (element.ValueKind == JsonValueKind.Object && (element.TryGetProperty("mode", out _) && element.GetProperty("mode").ValueKind == JsonValueKind.String && (element.GetProperty("mode").GetString() == "replace")))
-            {
-                var protocolSystemMessageReplaceConfig = JsonSerializer.Deserialize(element, RpcJsonContext.Default.ProtocolSystemMessageReplaceConfig);
-                return protocolSystemMessageReplaceConfig is null ? throw new JsonException("Expected ProtocolSystemMessageReplaceConfig value.") : new ProtocolSystemMessageConfig(protocolSystemMessageReplaceConfig);
-            }
-            if (element.ValueKind == JsonValueKind.Object && (element.TryGetProperty("mode", out _) && element.GetProperty("mode").ValueKind == JsonValueKind.String && (element.GetProperty("mode").GetString() == "customize")))
-            {
-                var protocolSystemMessageCustomizeConfig = JsonSerializer.Deserialize(element, RpcJsonContext.Default.ProtocolSystemMessageCustomizeConfig);
-                return protocolSystemMessageCustomizeConfig is null ? throw new JsonException("Expected ProtocolSystemMessageCustomizeConfig value.") : new ProtocolSystemMessageConfig(protocolSystemMessageCustomizeConfig);
-            }
-
-            throw new JsonException("JSON value did not match any ProtocolSystemMessageConfig variant.");
-        }
+    /// <summary>Host the remote points at, for example `github.com` or a GitHub Enterprise hostname.</summary>
+    [JsonPropertyName("host")]
+    public string Host { get; set; } = string.Empty;
 
-        /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, ProtocolSystemMessageConfig value, JsonSerializerOptions options)
-        {
-            if (value.ProtocolSystemMessageAppendConfig is { } protocolSystemMessageAppendConfig)
-            {
-                JsonSerializer.Serialize(writer, protocolSystemMessageAppendConfig, RpcJsonContext.Default.ProtocolSystemMessageAppendConfig);
-                return;
-            }
-            if (value.ProtocolSystemMessageReplaceConfig is { } protocolSystemMessageReplaceConfig)
-            {
-                JsonSerializer.Serialize(writer, protocolSystemMessageReplaceConfig, RpcJsonContext.Default.ProtocolSystemMessageReplaceConfig);
-                return;
-            }
-            if (value.ProtocolSystemMessageCustomizeConfig is { } protocolSystemMessageCustomizeConfig)
-            {
-                JsonSerializer.Serialize(writer, protocolSystemMessageCustomizeConfig, RpcJsonContext.Default.ProtocolSystemMessageCustomizeConfig);
-                return;
-            }
+    /// <summary>Repository name, without the owner prefix or the `.git` suffix.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
 
-            throw new JsonException("No ProtocolSystemMessageConfig variant value is set.");
-        }
-    }
+    /// <summary>Repository owner login (user or organization).</summary>
+    [JsonPropertyName("owner")]
+    public string Owner { get; set; } = string.Empty;
 }
 
-/// <summary>A BYOK model definition referencing a named provider.</summary>
+/// <summary>The GitHub repository that owns the requested path, when the selected remote (`origin`, else the first) is on a GitHub host.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ProviderModelConfig
+internal sealed class GitHubRepositoryAtPathResult
 {
-    /// <summary>Optional capability overrides (vision, tool_calls, reasoning, etc.).</summary>
-    [JsonPropertyName("capabilities")]
-    public ModelCapabilitiesOverride? Capabilities { get; set; }
+    /// <summary>Resolved repository identity, or null when the selected remote resolves to no GitHub host.</summary>
+    [JsonPropertyName("repository")]
+    public GitHubRepositoryIdentity? Repository { 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>Working-tree path whose owning GitHub repository should be resolved.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class GitHubRepositoryAtPathRequest
+{
+    /// <summary>Absolute path to a directory inside the git working tree to resolve.</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("path")]
+    public string Path { get; set; } = string.Empty;
+}
 
-    /// <summary>Maximum context window tokens for the model.</summary>
-    [JsonPropertyName("maxContextWindowTokens")]
-    public double? MaxContextWindowTokens { get; set; }
+/// <summary>A freshly registered request id. Registering it before the listing starts is what lets a cancel that races the request still find the owner listing slot. The id serves one listing only. Long-abandoned unused ids can be released by later allocations.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class GitHubOwnersRequestIdResult
+{
+    /// <summary>Request id to pass to `gitHubOwners.list` and, to abandon it, `gitHubOwners.cancel`.</summary>
+    [JsonPropertyName("requestId")]
+    public long RequestId { get; set; }
+}
 
-    /// <summary>Maximum output tokens for the model.</summary>
-    [JsonPropertyName("maxOutputTokens")]
-    public double? MaxOutputTokens { get; set; }
+/// <summary>A GitHub login the authenticated user may act as: their own account, or an organization they belong to.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class GitHubOwnerOption
+{
+    /// <summary>The owner's GitHub login.</summary>
+    [JsonPropertyName("login")]
+    public string Login { get; set; } = string.Empty;
 
-    /// <summary>Maximum prompt/input tokens for the model.</summary>
-    [JsonPropertyName("maxPromptTokens")]
-    public double? MaxPromptTokens { get; set; }
+    /// <summary>Which kind of owner this is. The authenticated user's own account is always reported as `user`.</summary>
+    [JsonPropertyName("type")]
+    public string Type { get; set; } = string.Empty;
+}
 
-    /// <summary>Provider-published model metadata, preserved verbatim as the public Model.metadata object.</summary>
-    [JsonPropertyName("metadata")]
-    public IDictionary<string, JsonElement>? Metadata { get; set; }
+/// <summary>Outcome of an owner listing. Exactly one of `owners` and `message` is present, except that `throwError` reports a failure the caller is expected to raise rather than render.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class GitHubOwnersListResult
+{
+    /// <summary>Why no owners could be listed, phrased for a user. Present when the listing failed in a way the caller should render rather than raise.</summary>
+    [JsonPropertyName("message")]
+    public string? Message { 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>The owners, on success: the authenticated user first, then the organizations they belong to.</summary>
+    [JsonPropertyName("owners")]
+    public IList<GitHubOwnerOption>? Owners { 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>A malformed request or an unreadable credential, which the caller raises instead of rendering. Kept a field rather than a dispatch error so it stays distinct from `message`, which the caller renders.</summary>
+    [JsonPropertyName("throwError")]
+    public string? ThrowError { get; set; }
 
-    /// <summary>Name of the configured provider that serves this model.</summary>
-    [JsonPropertyName("provider")]
-    public string Provider { get; set; } = string.Empty;
+    /// <summary>A line the caller should log. Present only alongside `message`, and only for failures worth recording.</summary>
+    [JsonPropertyName("warning")]
+    public string? Warning { get; set; }
+}
 
-    /// <summary>System-message configuration used when the runtime builds the standard prompt for this provider-qualified model, including general-purpose subagents. It uses the same object hierarchy as session-level systemMessage configuration, except transform actions are rejected because the current callback protocol is not model-scoped. When present, it overrides the session-wide configuration on those prompt paths. Selected custom-agent and specialized-subagent prompts remain authoritative.</summary>
-    [JsonPropertyName("systemMessage")]
-    public ProtocolSystemMessageConfig? SystemMessage { get; set; }
+/// <summary>Credential to list owners under, and the request id that makes the listing cancellable.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class GitHubOwnersListRequest
+{
+    /// <summary>The credential the listing runs under, carried opaquely because its shape is the host's own and the runtime only resolves a token and a GitHub host from it. No credential travels: this selects one the runtime already holds.</summary>
+    [JsonPropertyName("authInfo")]
+    public JsonElement AuthInfo { get; set; }
 
-    /// <summary>The model name sent to the provider API for inference. Defaults to `id`.</summary>
-    [JsonPropertyName("wireModel")]
-    public string? WireModel { get; set; }
+    /// <summary>Request id from `gitHubOwners.nextRequestId`. An id that was never registered, canceled before use, released after being abandoned, or already used is refused rather than silently running uncancellable.</summary>
+    [JsonPropertyName("requestId")]
+    public long RequestId { get; set; }
 }
 
-/// <summary>Azure-specific provider options.</summary>
+/// <summary>Whether the id named a running owner listing.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ProviderConfigAzure
+internal sealed class GitHubOwnersCancelResult
 {
-    /// <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>True when a listing with the id was running and the cancel stopped it. False when the id was never registered, was registered but unused, was released after being abandoned, or its listing had ended. An unused id is released and cannot start a later listing.</summary>
+    [JsonPropertyName("canceled")]
+    public bool Canceled { get; set; }
 }
 
-/// <summary>External SDK input for a named custom model provider. Ingested by the native protocol boundary before host dispatch.</summary>
+/// <summary>The owner listing to abandon.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class NamedProviderConfig
+internal sealed class GitHubOwnersCancelRequest
 {
-    /// <summary>Static API key used to authenticate provider requests.</summary>
-    [JsonPropertyName("apiKey")]
-    public string? ApiKey { get; set; }
+    /// <summary>Request id the listing was started with.</summary>
+    [JsonPropertyName("requestId")]
+    public long RequestId { get; set; }
+}
 
-    /// <summary>Azure authentication configuration for the provider.</summary>
-    [JsonPropertyName("azure")]
-    public ProviderConfigAzure? Azure { get; set; }
+/// <summary>The remote the checked-out branch tracks.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class GitCurrentBranchRemoteResult
+{
+    /// <summary>Name of the tracked remote. Reports `origin` whenever the working tree has no tracking configuration to read, including on a detached HEAD, so this is never null and never empty.</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("remote")]
+    public string Remote { get; set; } = string.Empty;
+}
 
-    /// <summary>Base URL for provider API requests.</summary>
-    [JsonPropertyName("baseUrl")]
-    public string BaseUrl { get; set; } = string.Empty;
+/// <summary>Working-tree path a git query applies to.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class GitCwdRequest
+{
+    /// <summary>Absolute path to a directory inside the git working tree to query.</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("cwd")]
+    public string Cwd { get; set; } = string.Empty;
+}
 
-    /// <summary>Static bearer token used to authenticate provider requests.</summary>
-    [JsonPropertyName("bearerToken")]
-    public string? BearerToken { get; set; }
+/// <summary>Updated working directory and git context. Emitted as the new payload of `session.context_changed`.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class SessionWorkingDirectoryContext
+{
+    /// <summary>Merge-base commit SHA (fork point from the remote default branch).</summary>
+    [JsonPropertyName("baseCommit")]
+    public string? BaseCommit { get; set; }
 
-    /// <summary>Whether the host supplies bearer tokens dynamically.</summary>
-    [JsonPropertyName("hasBearerTokenProvider")]
-    public bool? HasBearerTokenProvider { get; set; }
+    /// <summary>Current git branch name.</summary>
+    [JsonPropertyName("branch")]
+    public string? Branch { get; set; }
 
-    /// <summary>Additional HTTP headers included with provider requests.</summary>
-    [JsonPropertyName("headers")]
-    public IDictionary<string, string>? Headers { get; set; }
+    /// <summary>Current working directory path.</summary>
+    [JsonPropertyName("cwd")]
+    public string Cwd { get; set; } = string.Empty;
 
-    /// <summary>The product serving the provider's models, reported in telemetry as `model_provider`. Only affects telemetry.</summary>
-    [JsonPropertyName("modelProvider")]
-    public ProviderConfigModelProvider? ModelProvider { get; set; }
+    /// <summary>Root directory of the git repository, resolved via git rev-parse.</summary>
+    [JsonPropertyName("gitRoot")]
+    public string? GitRoot { get; set; }
 
-    /// <summary>Unique provider name used to qualify model selection IDs.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Head commit of the current git branch.</summary>
+    [JsonPropertyName("headCommit")]
+    public string? HeadCommit { get; set; }
 
-    /// <summary>Transport used to communicate with the provider.</summary>
-    [JsonPropertyName("transport")]
-    public ProviderConfigTransport? Transport { get; set; }
+    /// <summary>Hosting platform type of the repository.</summary>
+    [JsonPropertyName("hostType")]
+    public SessionWorkingDirectoryContextHostType? HostType { get; set; }
 
-    /// <summary>Provider protocol family.</summary>
-    [JsonPropertyName("type")]
-    public ProviderConfigType? Type { 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>Wire API used to communicate with the provider.</summary>
-    [JsonPropertyName("wireApi")]
-    public ProviderConfigWireApi? WireApi { 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>Provider configuration prepared from a discovered model. Preparing a plan changes nothing: it neither registers the model with the session nor writes durable configuration. To apply it, pass `provider` and `model` to `session.provider.add`, omitting whichever the dispositions report as already configured.</summary>
+/// <summary>A GitHub repository one of a working tree's remotes points at.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ModelProviderConfigurationPlan
+internal sealed class GitRemoteRepository
 {
-    /// <summary>Model definition prepared from the discovered model. Capability fields the provider did not report stay omitted rather than being asserted false.</summary>
-    [JsonPropertyName("model")]
-    public ProviderModelConfig Model { get => field ??= new(); set; }
-
-    /// <summary>Whether `model` still needs to be registered. When `alreadyConfigured`, `selectionId` is already registered and the caller can select it without adding anything.</summary>
-    [JsonPropertyName("modelDisposition")]
-    public ModelProviderConfigurationDisposition ModelDisposition { get; set; }
-
-    /// <summary>Provider connection prepared from the instance's inference metadata. Carries no credential; supply one if the endpoint requires it.</summary>
-    [JsonPropertyName("provider")]
-    public NamedProviderConfig Provider { get => field ??= new(); set; }
+    /// <summary>GitHub host serving the repository, which is not `github.com` for a GitHub Enterprise remote.</summary>
+    [JsonPropertyName("host")]
+    public string Host { get; set; } = string.Empty;
 
-    /// <summary>Whether `provider` still needs to be registered. When `alreadyConfigured`, a provider with the same endpoint is already registered and `provider` restates it under its existing name; adding it again is rejected as a duplicate.</summary>
-    [JsonPropertyName("providerDisposition")]
-    public ModelProviderConfigurationDisposition ProviderDisposition { get; set; }
+    /// <summary>Repository name, without the owner.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
 
-    /// <summary>Provider-qualified selection id (`provider/id`) to pass to `switchTo` once the plan is applied.</summary>
-    [JsonPropertyName("selectionId")]
-    public string SelectionId { get; set; } = string.Empty;
+    /// <summary>Account or organization owning the repository.</summary>
+    [JsonPropertyName("owner")]
+    public string Owner { get; set; } = string.Empty;
 
-    /// <summary>Non-fatal warnings carried over from the discovered model, such as capabilities the provider did not report.</summary>
-    [JsonPropertyName("warnings")]
-    public IList<ModelProviderWarning> Warnings { get => field ??= []; set; }
+    /// <summary>Name of the first remote that produced this distinct repository entry, such as `origin` or `upstream`.</summary>
+    [JsonPropertyName("remoteName")]
+    public string RemoteName { get; set; } = string.Empty;
 }
 
-/// <summary>A discovered instance and one of its models to translate into provider configuration. Pass back the instance and model as returned by `session.providers.discover` and `session.providers.models.list`.</summary>
+/// <summary>The GitHub repositories a working tree's remotes point at.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class ModelProviderPrepareConfigurationRequest
+internal sealed class GitReposFromRemotesResult
 {
-    /// <summary>The discovered instance that serves the model.</summary>
-    [JsonPropertyName("instance")]
-    public ModelProviderInstance Instance { get => field ??= new(); set; }
-
-    /// <summary>The discovered model to configure.</summary>
-    [JsonPropertyName("model")]
-    public DiscoveredModel Model { get => field ??= new(); set; }
-
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>One entry per distinct GitHub repository, in the order git reports the first remote for each repository. Empty when no remote points at a GitHub host, which a caller should read as `not connected to GitHub`. Failing to read the remotes is an error, not an empty list.</summary>
+    [JsonPropertyName("repositories")]
+    public IList<GitRemoteRepository> Repositories { get => field ??= []; set; }
 }
 
-/// <summary>Managed sandbox enforcement state for a session.</summary>
+/// <summary>Git working tree whose GitHub remotes should be listed.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SandboxEnforcementStatus
+internal sealed class GitReposFromRemotesRequest
 {
-    /// <summary>Whether an enforcement failure has permanently blocked the session.</summary>
-    [JsonPropertyName("blocked")]
-    public bool Blocked { get; set; }
-
-    /// <summary>The first sandbox enforcement failure that blocked the session.</summary>
-    [JsonPropertyName("reason")]
-    public string? Reason { get; set; }
-
-    /// <summary>Whether the effective managed policy requires an available sandbox backend.</summary>
-    [JsonPropertyName("required")]
-    public bool Required { get; set; }
+    /// <summary>Absolute path to the root of the git working tree.</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("gitRoot")]
+    public string GitRoot { get; set; } = string.Empty;
 }
 
-/// <summary>Identifies the target session.</summary>
+/// <summary>Indicates whether the calling client was registered as the session filesystem provider.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionSandboxGetEnforcementStatusRequest
+public sealed class SessionFsSetProviderResult
 {
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Whether the provider was set successfully.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
 }
 
-/// <summary>Result of attempting to disable sandboxing for the current session.</summary>
+/// <summary>Optional capabilities declared by the provider.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SandboxDisableForSessionResult
+public sealed class SessionFsSetProviderCapabilities
 {
-    /// <summary>The authoritative sandbox enabled state after the operation.</summary>
-    [JsonPropertyName("enabled")]
-    public bool Enabled { get; set; }
+    /// <summary>Whether the provider supports binary reads and writes through sessionFs.readFileBytes and sessionFs.writeFileBytes.</summary>
+    [JsonPropertyName("binary")]
+    public bool? Binary { get; set; }
 
-    /// <summary>Whether this call resolved the pending request and applied the session opt-out.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { get; set; }
+    /// <summary>Whether the provider supports SQLite query/exists operations.</summary>
+    [JsonPropertyName("sqlite")]
+    public bool? Sqlite { get; set; }
 }
 
-/// <summary>Optional informational context describing how and where the permission decision was made. This does not affect permission behavior.</summary>
+/// <summary>Initial working directory, session-state path layout, and path conventions used to register the calling SDK client as the session filesystem provider. A registered provider is authoritative for path interpretation and filesystem facts used by workspace permission validation. Paths are interpreted lexically; home-relative paths (`~` and `~/...`) and Windows drive-relative paths such as `C:foo` are unsupported. Until provider-side canonicalization is supported, providers must not expose symlinks inside allowed roots that escape those roots.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class PermissionDecisionContext
+internal sealed class SessionFsSetProviderRequest
 {
-    /// <summary>Disposition of the permission request as observed by the responding client.</summary>
-    [JsonPropertyName("outcome")]
-    public PermissionDecisionOutcome Outcome { get; set; }
+    /// <summary>Optional capabilities declared by the provider.</summary>
+    [JsonPropertyName("capabilities")]
+    public SessionFsSetProviderCapabilities? Capabilities { 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>Path conventions used by this filesystem.</summary>
+    [JsonPropertyName("conventions")]
+    public SessionFsSetProviderConventions Conventions { get; set; }
 
-    /// <summary>Controlled reason or actor responsible for the response.</summary>
-    [JsonPropertyName("source")]
-    public PermissionDecisionSource Source { get; set; }
+    /// <summary>Absolute initial working directory for sessions. Registering the provider establishes this path as the root of its virtual namespace; the runtime does not require the provider to materialize or stat it before creating a session.</summary>
+    [JsonPropertyName("initialCwd")]
+    public string InitialCwd { get; set; } = string.Empty;
 
-    /// <summary>Client surface that submitted the response.</summary>
-    [JsonPropertyName("surface")]
-    public PermissionDecisionSurface Surface { 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>Request to disable sandboxing for the current session while resolving an active sandbox-bypass permission prompt.</summary>
+/// <summary>Indicates whether the calling client was registered as the LLM inference provider.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SandboxDisableForSessionRequest
+public sealed class LlmInferenceSetProviderResult
 {
-    /// <summary>Optional attribution for the permission decision.</summary>
-    [JsonPropertyName("decisionContext")]
-    public PermissionDecisionContext? DecisionContext { get; set; }
-
-    /// <summary>Identifier of the exact pending sandbox-bypass permission request that authorized the session opt-out.</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>Whether the provider was set successfully.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
 }
 
-/// <summary>Result of accepting a sandbox path grant.</summary>
+/// <summary>Whether the start frame was accepted.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SandboxGrantPathForRequestResult
+public sealed class LlmInferenceHttpResponseStartResult
 {
-    /// <summary>Whether this call resolved the pending request and added the path to the session's sandbox policy.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { get; set; }
+    /// <summary>True when the response start was matched to a pending request; false when unknown.</summary>
+    [JsonPropertyName("accepted")]
+    public bool Accepted { get; set; }
 }
 
-/// <summary>Request to accept the sandbox path grant offered on an active sandbox escalation permission prompt.</summary>
+/// <summary>Response head.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SandboxGrantPathForRequestRequest
+internal sealed class LlmInferenceHttpResponseStartRequest
 {
-    /// <summary>Optional attribution for the permission decision.</summary>
-    [JsonPropertyName("decisionContext")]
-    public PermissionDecisionContext? DecisionContext { 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>Identifier of the exact pending sandbox escalation permission request whose sandboxPathGrant to accept.</summary>
+    /// <summary>Matches the requestId from the originating httpRequestStart frame.</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>HTTP status code.</summary>
+    [JsonPropertyName("status")]
+    public long Status { get; set; }
+
+    /// <summary>Optional HTTP status reason phrase.</summary>
+    [JsonPropertyName("statusText")]
+    public string? StatusText { get; set; }
 }
 
-/// <summary>Authentication status and account metadata for the session.</summary>
+/// <summary>Whether the chunk was accepted.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionAuthStatus
+public sealed class LlmInferenceHttpResponseChunkResult
 {
-    /// <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>Human-readable authentication status description.</summary>
-    [JsonPropertyName("statusMessage")]
-    public string? StatusMessage { get; set; }
-}
-
-/// <summary>Identifies the target session.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionGitHubAuthGetStatusRequest
-{
-    /// <summary>Target session identifier.</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>Indicates whether the credential update succeeded.</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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionSetCredentialsResult
+public sealed class LlmInferenceHttpResponseChunkError
 {
-    /// <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>Optional machine-readable error code.</summary>
+    [JsonPropertyName("code")]
+    public string? Code { get; set; }
 
-    /// <summary>Whether the operation succeeded.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { get; set; }
+    /// <summary>Human-readable failure description.</summary>
+    [JsonPropertyName("message")]
+    public string Message { get; set; } = string.Empty;
 }
 
-/// <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>
+/// <summary>A response body chunk or terminal error.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-[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
+internal sealed class LlmInferenceHttpResponseChunkRequest
 {
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("type")]
-    public virtual string Type { get; set; } = string.Empty;
-}
-
+    /// <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>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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class SettableAuthInfoHmac : SettableAuthInfo
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "hmac";
+    /// <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>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>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>HMAC secret used to sign requests.</summary>
-    [JsonPropertyName("hmac")]
-    public required string Hmac { 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>Authentication host. HMAC auth always targets the public GitHub host.</summary>
-    [JsonPropertyName("host")]
-    public required string Host { get; set; }
+    /// <summary>Matches the requestId from the originating httpRequestStart frame.</summary>
+    [JsonPropertyName("requestId")]
+    public string RequestId { get; set; } = string.Empty;
 }
 
-/// <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>
+/// <summary>Pre-resolved working-directory context for session startup.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class SettableAuthInfoEnv : SettableAuthInfo
+public sealed class SessionContext
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "env";
-
-    /// <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>Active git branch.</summary>
+    [JsonPropertyName("branch")]
+    public string? Branch { get; set; }
 
-    /// <summary>Name of the environment variable the token was sourced from.</summary>
-    [JsonPropertyName("envVar")]
-    public required string EnvVar { get; set; }
+    /// <summary>Most recent working directory for this session.</summary>
+    [JsonPropertyName("cwd")]
+    public string Cwd { get; set; } = string.Empty;
 
-    /// <summary>Authentication host (e.g. https://github.com or a GHES host).</summary>
-    [JsonPropertyName("host")]
-    public required string Host { get; set; }
+    /// <summary>Git repository root, if the cwd was inside a git repo.</summary>
+    [JsonPropertyName("gitRoot")]
+    public string? GitRoot { 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>Repository host type.</summary>
+    [JsonPropertyName("hostType")]
+    public SessionContextHostType? HostType { get; set; }
 
-    /// <summary>The token value itself. Treat as a secret.</summary>
-    [JsonPropertyName("token")]
-    public required string Token { get; set; }
+    /// <summary>Repository slug in `owner/name` form, when known.</summary>
+    [JsonPropertyName("repository")]
+    public string? Repository { get; set; }
 }
 
-/// <summary>Token authentication accepted by session.gitHubAuth.setCredentials.</summary>
-/// <remarks>The <c>token</c> variant of <see cref="SettableAuthInfo"/>.</remarks>
+/// <summary>GitHub repository the remote session belongs to.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class SettableAuthInfoToken : SettableAuthInfo
+public sealed class RemoteSessionMetadataRepository
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "token";
-
-    /// <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>Branch associated with the remote session.</summary>
+    [JsonPropertyName("branch")]
+    public string Branch { get; set; } = string.Empty;
 
-    /// <summary>Authentication host.</summary>
-    [JsonPropertyName("host")]
-    public required string Host { get; set; }
+    /// <summary>Repository name.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
 
-    /// <summary>The token value itself. Treat as a secret.</summary>
-    [JsonPropertyName("token")]
-    public required string Token { get; set; }
+    /// <summary>Repository owner.</summary>
+    [JsonPropertyName("owner")]
+    public string Owner { get; set; } = string.Empty;
 }
 
-/// <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>
+/// <summary>Remote session metadata for the session to hand off (typically obtained from `sessions.list` with `source: "remote"`).</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class SettableAuthInfoCopilotApiToken : SettableAuthInfo
+public sealed class RemoteSessionMetadataValue
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "copilot-api-token";
+    /// <summary>Most recent working directory context.</summary>
+    [JsonPropertyName("context")]
+    public SessionContext? Context { 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>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>Authentication host (always the public GitHub host).</summary>
-    [JsonPropertyName("host")]
-    public required string Host { 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>
+    [JsonPropertyName("hostStatus")]
+    public RemoteSessionHostStatus? HostStatus { get; set; }
 
-/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class SettableAuthInfoUser : SettableAuthInfo
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "user";
+    /// <summary>Always true for remote sessions.</summary>
+    [JsonPropertyName("isRemote")]
+    public bool IsRemote { 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>Last-modified time as an ISO 8601 timestamp.</summary>
+    [JsonPropertyName("modifiedTime")]
+    public string ModifiedTime { get; set; } = string.Empty;
 
-    /// <summary>Authentication host.</summary>
-    [JsonPropertyName("host")]
-    public required string Host { get; set; }
+    /// <summary>Optional human-friendly name set via /rename.</summary>
+    [JsonPropertyName("name")]
+    public string? Name { get; set; }
 
-    /// <summary>OAuth user login.</summary>
-    [JsonPropertyName("login")]
-    public required string Login { get; set; }
-}
+    /// <summary>Pull request number associated with the session.</summary>
+    [JsonPropertyName("pullRequestNumber")]
+    public long? PullRequestNumber { get; set; }
 
-/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class SettableAuthInfoGhCli : SettableAuthInfo
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "gh-cli";
+    /// <summary>Backing remote session IDs (most recent first).</summary>
+    [JsonPropertyName("remoteSessionIds")]
+    public IList<string> RemoteSessionIds { get => field ??= []; 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>GitHub repository the remote session belongs to.</summary>
+    [JsonPropertyName("repository")]
+    public RemoteSessionMetadataRepository Repository { get => field ??= new(); set; }
 
-    /// <summary>Authentication host.</summary>
-    [JsonPropertyName("host")]
-    public required string Host { get; set; }
+    /// <summary>Original remote resource identifier (task ID or PR node ID).</summary>
+    [JsonPropertyName("resourceId")]
+    public string? ResourceId { get; set; }
 
-    /// <summary>User login as reported by `gh auth status`.</summary>
-    [JsonPropertyName("login")]
-    public required string Login { get; set; }
+    /// <summary>Stable session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 
-    /// <summary>The token returned by `gh auth token`. Treat as a secret.</summary>
-    [JsonPropertyName("token")]
-    public required string Token { 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>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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class SettableAuthInfoApiKey : SettableAuthInfo
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "api-key";
+    /// <summary>Session creation time as an ISO 8601 timestamp.</summary>
+    [JsonPropertyName("startTime")]
+    public string StartTime { get; set; } = string.Empty;
 
-    /// <summary>The API key. Treat as a secret.</summary>
-    [JsonPropertyName("apiKey")]
-    public required string ApiKey { get; set; }
+    /// <summary>Server-side task state returned by GitHub.</summary>
+    [JsonPropertyName("state")]
+    public string? State { 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>Short summary of the session, when one has been derived.</summary>
+    [JsonPropertyName("summary")]
+    public string? Summary { get; set; }
 
-    /// <summary>Authentication host.</summary>
-    [JsonPropertyName("host")]
-    public required string Host { get; set; }
+    /// <summary>Whether the remote task originated from CCA or CLI `--remote`.</summary>
+    [JsonPropertyName("taskType")]
+    public RemoteSessionMetadataTaskType? TaskType { get; set; }
 }
 
-/// <summary>New auth credentials to install on the session. Omit to leave credentials unchanged.</summary>
+/// <summary>`sessions.open` handoff progress update with step, status, and optional message.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionSetCredentialsParams
+public sealed class SessionsOpenProgress
 {
-    /// <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>Optional step message.</summary>
+    [JsonPropertyName("message")]
+    public string? Message { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Step status.</summary>
+    [JsonPropertyName("status")]
+    public SessionsOpenProgressStatus Status { get; set; }
+
+    /// <summary>Handoff step.</summary>
+    [JsonPropertyName("step")]
+    public SessionsOpenProgressStep Step { get; set; }
 }
 
-/// <summary>Credential-free authentication identity safe to expose to hosts and user interfaces.</summary>
+/// <summary>Result of opening a session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class AuthIdentity
+public sealed class SessionOpenResult
 {
-    /// <summary>Snapshot of the authenticated user's Copilot subscription info, if known.</summary>
-    [JsonPropertyName("copilotUser")]
-    public CopilotUserResponse? CopilotUser { get; set; }
+    /// <summary>Remote session metadata, present when status is `connected`.</summary>
+    [JsonPropertyName("metadata")]
+    public RemoteSessionMetadataValue? Metadata { get; set; }
 
-    /// <summary>Name of the environment variable that supplied the credential, when applicable.</summary>
-    [JsonPropertyName("envVar")]
-    public string? EnvVar { get; set; }
+    /// <summary>Handoff progress steps, present when status is `handed_off`.</summary>
+    [JsonPropertyName("progress")]
+    public IList<SessionsOpenProgress>? Progress { get; set; }
 
-    /// <summary>Authentication host.</summary>
-    [JsonPropertyName("host")]
-    public string Host { get; set; } = string.Empty;
+    /// <summary>Remote session ID, present when status is `connected`.</summary>
+    [JsonPropertyName("remoteSessionId")]
+    public string? RemoteSessionId { get; set; }
 
-    /// <summary>Authenticated login, when available.</summary>
-    [JsonPropertyName("login")]
-    public string? Login { get; set; }
+    /// <summary>Opened session ID. Omitted when status is `not_found`.</summary>
+    [JsonPropertyName("sessionId")]
+    public string? SessionId { 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>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>Authentication type.</summary>
-    [JsonPropertyName("type")]
-    public AuthInfoType Type { get; set; }
+    /// <summary>Outcome of the open request.</summary>
+    [JsonPropertyName("status")]
+    public SessionsOpenStatus Status { get; set; }
 }
 
-/// <summary>Identifies the target session.</summary>
+/// <summary>Identifier and optional friendly name assigned to the newly forked session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionGitHubAuthGetCurrentAuthInfoRequest
+public sealed class SessionsForkResult
 {
-    /// <summary>Target session identifier.</summary>
+    /// <summary>Friendly name assigned to the forked session, if any.</summary>
+    [JsonPropertyName("name")]
+    public string? Name { get; set; }
+
+    /// <summary>The new forked session's ID.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Identifies the target session.</summary>
+/// <summary>Source session identifier to fork from, optional event-ID boundary, and optional friendly name for the new session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionGitHubAuthGetAllAuthAvailableRequest
+internal sealed class SessionsForkRequest
 {
-    /// <summary>Target session identifier.</summary>
+    /// <summary>Optional friendly name to assign to the forked session.</summary>
+    [JsonPropertyName("name")]
+    public string? Name { get; set; }
+
+    /// <summary>Source session ID to fork from.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
+
+    /// <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>Identifies the target session.</summary>
+/// <summary>Repository associated with the connected remote session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionGitHubAuthRefreshCopilotUserRequest
+public sealed class ConnectedRemoteSessionMetadataRepository
 {
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Branch associated with the remote session.</summary>
+    [JsonPropertyName("branch")]
+    public string Branch { get; set; } = string.Empty;
+
+    /// <summary>Repository name.</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>Internal GitHub login parameters.</summary>
+/// <summary>Metadata for a connected remote session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionAuthLoginRequest
+public sealed class ConnectedRemoteSessionMetadata
 {
-    /// <summary>GitHub host URL.</summary>
-    [JsonPropertyName("host")]
-    public string Host { get; set; } = string.Empty;
+    /// <summary>Neutral SDK discriminator for the connected remote session kind.</summary>
+    [JsonPropertyName("kind")]
+    public ConnectedRemoteSessionMetadataKind Kind { get; set; }
 
-    /// <summary>GitHub login.</summary>
-    [JsonPropertyName("login")]
-    public string Login { get; set; } = string.Empty;
+    /// <summary>Last session update time as an ISO 8601 string.</summary>
+    [JsonPropertyName("modifiedTime")]
+    public DateTimeOffset ModifiedTime { get; set; }
 
-    /// <summary>Whether to persist the token after login.</summary>
-    [JsonPropertyName("persist")]
-    public bool? Persist { get; set; }
+    /// <summary>Optional friendly session name.</summary>
+    [JsonPropertyName("name")]
+    public string? Name { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Pull request number associated with the session.</summary>
+    [JsonPropertyName("pullRequestNumber")]
+    public long? PullRequestNumber { get; set; }
 
-    /// <summary>GitHub authentication token.</summary>
-    [JsonPropertyName("token")]
-    public string Token { get; set; } = string.Empty;
-}
+    /// <summary>Repository associated with the connected remote session.</summary>
+    [JsonPropertyName("repository")]
+    public ConnectedRemoteSessionMetadataRepository Repository { get => field ??= new(); set; }
 
-/// <summary>Parameters for switching the session's active authentication.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionAuthSwitchRequest
-{
-    /// <summary>Authentication information to activate.</summary>
-    [JsonPropertyName("authInfo")]
-    public AuthInfo AuthInfo { get => field ??= new(); set; }
+    /// <summary>Original remote resource identifier.</summary>
+    [JsonPropertyName("resourceId")]
+    public string? ResourceId { get; set; }
 
-    /// <summary>Target session identifier.</summary>
+    /// <summary>SDK session ID for the connected remote session.</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>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>Identifies the target session.</summary>
+/// <summary>Remote session connection result.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionGitHubAuthLogoutRequest
+public sealed class RemoteSessionConnectionResult
 {
-    /// <summary>Target session identifier.</summary>
+    /// <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 identifying a GitHub authentication to log out.</summary>
+/// <summary>Remote session connection parameters.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionAuthLogoutUserRequest
+internal sealed class ConnectRemoteSessionParams
 {
-    /// <summary>Authentication information to log out.</summary>
-    [JsonPropertyName("authInfo")]
-    public AuthInfo AuthInfo { get => field ??= new(); set; }
-
-    /// <summary>Target session identifier.</summary>
+    /// <summary>Session ID to connect to.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Validation error from an authentication attempt.</summary>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class AuthValidationError
+public partial class SessionListEntry
 {
-    /// <summary>Optional message returned by GitHub.</summary>
-    [JsonPropertyName("githubMessage")]
-    public string? GitHubMessage { get; set; }
+    /// <summary>The boolean discriminator.</summary>
+    [JsonPropertyName("isRemote")]
+    public bool IsRemote { get; set; }
 
-    /// <summary>Authentication validation error message.</summary>
-    [JsonPropertyName("message")]
-    public string Message { get; set; } = string.Empty;
-}
+    /// <summary>Runtime client name that created/last resumed this session.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("clientName")]
+    public string? ClientName { get; set; }
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionGitHubAuthLastAuthErrorsRequest
-{
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Pre-resolved working-directory context for session startup.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("context")]
+    public SessionContext? Context { get; set; }
 
-/// <summary>The enumerated collection, keyed by the same selector as the query.</summary>
-/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-[JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "kind",
-    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(AuthEnumerateValueAccounts), "accounts")]
-[JsonDerivedType(typeof(AuthEnumerateValueProviders), "providers")]
-public partial class AuthEnumerateValue
-{
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("kind")]
-    public virtual string Kind { 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>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("hostActivity")]
+    public string? HostActivity { 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>One signed-in account in the roster forest.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class AccountStatus
-{
-    /// <summary>Whether this is the active account.</summary>
-    [JsonPropertyName("active")]
-    public bool Active { 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>Opaque id of the account this one was derived from (e.g. an EMU account's base Entra identity); absent for a root account. Matches the base identity account's selectionId, forming the derivation edge.</summary>
-    [JsonPropertyName("derivedFrom")]
-    public string? DerivedFrom { 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>Authentication host URL.</summary>
-    [Url]
-    [StringSyntax(StringSyntaxAttribute.Uri)]
-    [JsonPropertyName("host")]
-    public string Host { get; set; } = string.Empty;
+    /// <summary>Last-modified time of the session's persisted state, as ISO 8601.</summary>
+    [JsonPropertyName("modifiedTime")]
+    public required string ModifiedTime { get; set; }
 
-    /// <summary>The provider kind of this account.</summary>
-    [JsonPropertyName("kind")]
-    public AccountKind Kind { get; set; }
+    /// <summary>Optional human-friendly name set via /rename.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("name")]
+    public string? Name { get; set; }
 
-    /// <summary>Authenticated login/username.</summary>
-    [JsonPropertyName("login")]
-    public string Login { get; set; } = string.Empty;
+    /// <summary>Pull request number associated with the session.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("pullRequestNumber")]
+    public long? PullRequestNumber { get; set; }
 
-    /// <summary>Opaque selection id used to switch to, or log out, this account.</summary>
-    [JsonPropertyName("selectionId")]
-    public string SelectionId { get; set; } = string.Empty;
+    /// <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; }
+
+    /// <summary>Whether the remote task originated from CCA or CLI `--remote`.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("taskType")]
+    public RemoteSessionMetadataTaskType? TaskType { get; set; }
 }
 
-/// <summary>The <c>accounts</c> variant of <see cref="AuthEnumerateValue"/>.</summary>
+/// <summary>Sessions matching the filter, ordered most-recently-modified first.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class AuthEnumerateValueAccounts : AuthEnumerateValue
+public sealed class SessionList
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "accounts";
-
-    /// <summary>The signed-in account forest; empty when not logged in.</summary>
-    [JsonPropertyName("items")]
-    public required IList<AccountStatus> Items { get; set; }
+    /// <summary>Sessions ordered most-recently-modified first. Discriminated by `isRemote`.</summary>
+    [JsonPropertyName("sessions")]
+    public IList<SessionListEntry> Sessions { get => field ??= []; set; }
 }
 
-/// <summary>A provider offered for interactive login.</summary>
+/// <summary>Optional filter applied to the returned sessions.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ProviderDescriptor
+public sealed class SessionListFilter
 {
-    /// <summary>Whether this provider is currently available to sign in with.</summary>
-    [JsonPropertyName("available")]
-    public bool Available { get; set; }
+    /// <summary>Match sessions whose context.branch equals this value.</summary>
+    [JsonPropertyName("branch")]
+    public string? Branch { get; set; }
 
-    /// <summary>The neutral provider kind.</summary>
-    [JsonPropertyName("kind")]
-    public LoginProviderKind Kind { get; set; }
+    /// <summary>Match sessions whose context.cwd equals this value.</summary>
+    [JsonPropertyName("cwd")]
+    public string? Cwd { get; set; }
 
-    /// <summary>Human-readable menu label, owned by the runtime so every consumer renders identical text.</summary>
-    [JsonPropertyName("label")]
-    public string Label { get; set; } = string.Empty;
+    /// <summary>Match sessions whose context.gitRoot equals this value.</summary>
+    [JsonPropertyName("gitRoot")]
+    public string? GitRoot { get; set; }
+
+    /// <summary>Match sessions whose context.repository equals this value.</summary>
+    [JsonPropertyName("repository")]
+    public string? Repository { get; set; }
 }
 
-/// <summary>The <c>providers</c> variant of <see cref="AuthEnumerateValue"/>.</summary>
+/// <summary>Optional source filter, metadata-load limit, and context filter applied to the returned sessions.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class AuthEnumerateValueProviders : AuthEnumerateValue
+internal sealed class SessionsListRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "providers";
+    /// <summary>Optional filter applied to the returned sessions.</summary>
+    [JsonPropertyName("filter")]
+    public SessionListFilter? Filter { get; set; }
 
-    /// <summary>The providers offered for interactive login.</summary>
-    [JsonPropertyName("items")]
-    public required IList<ProviderDescriptor> Items { 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>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>Which session sources to include. Defaults to `local` for backward compatibility.</summary>
+    [JsonPropertyName("source")]
+    public SessionSource? Source { 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>Selects which accounts collection to enumerate. A no-arg selector is the empty-payload variant.</summary>
-/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
+/// <summary>Persisted local session metadata, including identifiers, timestamps, summary/name, client, context, detached state, and task ID.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-[JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "kind",
-    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(AuthEnumerateQueryAccounts), "accounts")]
-[JsonDerivedType(typeof(AuthEnumerateQueryProviders), "providers")]
-public partial class AuthEnumerateQuery
+public sealed class LocalSessionMetadataValue
 {
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("kind")]
-    public virtual string Kind { get; set; } = string.Empty;
-}
+    /// <summary>Runtime client name that created/last resumed this session.</summary>
+    [JsonPropertyName("clientName")]
+    public string? ClientName { 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>The <c>accounts</c> variant of <see cref="AuthEnumerateQuery"/>.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class AuthEnumerateQueryAccounts : AuthEnumerateQuery
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "accounts";
+    /// <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>
+    [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>The <c>providers</c> variant of <see cref="AuthEnumerateQuery"/>.</summary>
+/// <summary>Persisted local session metadata when the session exists.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class AuthEnumerateQueryProviders : AuthEnumerateQuery
+internal sealed class SessionsGetMetadataResult
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "providers";
-
-    /// <summary>Whether an interactive Entra broker is available on the host; gates Entra availability in the returned list.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("brokerAvailable")]
-    public bool? BrokerAvailable { get; set; }
+    /// <summary>Local session metadata, omitted when the session does not exist.</summary>
+    [JsonPropertyName("session")]
+    public LocalSessionMetadataValue? Session { get; set; }
 }
 
-/// <summary>Enumerate request carrying the typed collection query.</summary>
+/// <summary>Session ID whose persisted metadata should be read.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class AccountsEnumerateRequest
+internal sealed class SessionsGetMetadataRequest
 {
-    /// <summary>Which typed accounts collection to enumerate.</summary>
-    [JsonPropertyName("query")]
-    public AuthEnumerateQuery Query { get => field ??= new(); set; }
-
-    /// <summary>Target session identifier.</summary>
+    /// <summary>Session ID to inspect.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>The read result, keyed by the same selector as the query.</summary>
-/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
+/// <summary>Client metadata outcome for one requested local session.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>status</c>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "kind",
+    TypeDiscriminatorPropertyName = "status",
     UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(AuthReadValueActiveAccount), "activeAccount")]
-[JsonDerivedType(typeof(AuthReadValueStatus), "status")]
-[JsonDerivedType(typeof(AuthReadValueLastErrors), "lastErrors")]
-public partial class AuthReadValue
+[JsonDerivedType(typeof(SessionsClientMetadataEntryOk), "ok")]
+[JsonDerivedType(typeof(SessionsClientMetadataEntryNotFound), "notFound")]
+[JsonDerivedType(typeof(SessionsClientMetadataEntryCorrupt), "corrupt")]
+[JsonDerivedType(typeof(SessionsClientMetadataEntryUnsupportedVersion), "unsupportedVersion")]
+[JsonDerivedType(typeof(SessionsClientMetadataEntryUnavailable), "unavailable")]
+public partial class SessionsClientMetadataEntry
 {
     /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("kind")]
-    public virtual string Kind { get; set; } = string.Empty;
+    [JsonPropertyName("status")]
+    public virtual string Status { get; set; } = string.Empty;
 }
 
 
-/// <summary>The <c>activeAccount</c> variant of <see cref="AuthReadValue"/>.</summary>
+/// <summary>The <c>ok</c> variant of <see cref="SessionsClientMetadataEntry"/>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class AuthReadValueActiveAccount : AuthReadValue
+public partial class SessionsClientMetadataEntryOk : SessionsClientMetadataEntry
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Kind => "activeAccount";
-
-    /// <summary>The active account, or absent when not logged in.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("account")]
-    public AccountStatus? Account { get; set; }
-}
-
-/// <summary>Neutral authentication status summary.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class AuthStatusDto
-{
-    /// <summary>Number of signed-in accounts in the roster.</summary>
-    [JsonPropertyName("accountCount")]
-    public long AccountCount { get; set; }
-
-    /// <summary>Active account host, if authenticated.</summary>
-    [Url]
-    [StringSyntax(StringSyntaxAttribute.Uri)]
-    [JsonPropertyName("activeHost")]
-    public string? ActiveHost { get; set; }
-
-    /// <summary>Active account login, if authenticated.</summary>
-    [JsonPropertyName("activeLogin")]
-    public string? ActiveLogin { get; set; }
+    public override string Status => "ok";
 
-    /// <summary>Copilot plan tier of the active account, if known.</summary>
-    [JsonPropertyName("copilotPlan")]
-    public string? CopilotPlan { get; set; }
+    /// <summary>Validated client metadata, possibly empty or projected to requested keys.</summary>
+    [JsonPropertyName("metadata")]
+    public required IDictionary<string, string> Metadata { get; set; }
 
-    /// <summary>Whether the session has resolved authentication.</summary>
-    [JsonPropertyName("isAuthenticated")]
-    public bool IsAuthenticated { get; set; }
+    /// <summary>Requested session ID.</summary>
+    [JsonPropertyName("sessionId")]
+    public required string SessionId { get; set; }
 }
 
-/// <summary>The <c>status</c> variant of <see cref="AuthReadValue"/>.</summary>
+/// <summary>The <c>notFound</c> variant of <see cref="SessionsClientMetadataEntry"/>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class AuthReadValueStatus : AuthReadValue
+public partial class SessionsClientMetadataEntryNotFound : SessionsClientMetadataEntry
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Kind => "status";
+    public override string Status => "notFound";
 
-    /// <summary>The neutral authentication status summary.</summary>
-    [JsonPropertyName("status")]
-    public required AuthStatusDto Status { get; set; }
+    /// <summary>Requested session ID.</summary>
+    [JsonPropertyName("sessionId")]
+    public required string SessionId { get; set; }
 }
 
-/// <summary>The <c>lastErrors</c> variant of <see cref="AuthReadValue"/>.</summary>
+/// <summary>The <c>corrupt</c> variant of <see cref="SessionsClientMetadataEntry"/>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class AuthReadValueLastErrors : AuthReadValue
+public partial class SessionsClientMetadataEntryCorrupt : SessionsClientMetadataEntry
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Kind => "lastErrors";
+    public override string Status => "corrupt";
 
-    /// <summary>Validation errors from the most recent authentication attempt.</summary>
-    [JsonPropertyName("errors")]
-    public required IList<AuthValidationError> Errors { get; set; }
+    /// <summary>Requested session ID.</summary>
+    [JsonPropertyName("sessionId")]
+    public required string SessionId { get; set; }
 }
 
-/// <summary>Selects which typed accounts datum to read.</summary>
-/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
+/// <summary>The <c>unsupportedVersion</c> variant of <see cref="SessionsClientMetadataEntry"/>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-[JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "kind",
-    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(AuthReadQueryActiveAccount), "activeAccount")]
-[JsonDerivedType(typeof(AuthReadQueryStatus), "status")]
-[JsonDerivedType(typeof(AuthReadQueryLastErrors), "lastErrors")]
-public partial class AuthReadQuery
+public partial class SessionsClientMetadataEntryUnsupportedVersion : SessionsClientMetadataEntry
 {
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("kind")]
-    public virtual string Kind { get; set; } = string.Empty;
-}
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Status => "unsupportedVersion";
 
+    /// <summary>Requested session ID.</summary>
+    [JsonPropertyName("sessionId")]
+    public required string SessionId { get; set; }
+}
 
-/// <summary>The <c>activeAccount</c> variant of <see cref="AuthReadQuery"/>.</summary>
+/// <summary>The <c>unavailable</c> variant of <see cref="SessionsClientMetadataEntry"/>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class AuthReadQueryActiveAccount : AuthReadQuery
+public partial class SessionsClientMetadataEntryUnavailable : SessionsClientMetadataEntry
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Kind => "activeAccount";
+    public override string Status => "unavailable";
+
+    /// <summary>Filesystem or provider error code. Clients should not assume every provider uses operating-system error codes.</summary>
+    [JsonPropertyName("code")]
+    public required string Code { get; set; }
+
+    /// <summary>Human-readable diagnostic message. Not stable for programmatic matching.</summary>
+    [JsonPropertyName("message")]
+    public required string Message { get; set; }
+
+    /// <summary>Requested session ID.</summary>
+    [JsonPropertyName("sessionId")]
+    public required string SessionId { get; set; }
 }
 
-/// <summary>The <c>status</c> variant of <see cref="AuthReadQuery"/>.</summary>
+/// <summary>Bounded batch request for client-owned metadata from persisted local sessions.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class AuthReadQueryStatus : AuthReadQuery
+internal sealed class SessionsGetClientMetadataRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "status";
+    /// <summary>Case-sensitive keys to project from each valid bag. Each key must be non-empty, at most 256 UTF-8 bytes, and outside the reserved `copilot/` and `github/` namespaces. Omit to return every entry.</summary>
+    [JsonPropertyName("keys")]
+    public IList<string>? Keys { get; set; }
+
+    /// <summary>Session IDs to inspect. Results preserve this order.</summary>
+    [JsonPropertyName("sessionIds")]
+    public IList<string> SessionIds { get => field ??= []; set; }
 }
 
-/// <summary>The <c>lastErrors</c> variant of <see cref="AuthReadQuery"/>.</summary>
+/// <summary>Batch of session events returned by a read, with cursor and continuation metadata.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class AuthReadQueryLastErrors : AuthReadQuery
+public sealed class EventsReadResult
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "lastErrors";
+    /// <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>Cursor status: 'ok' means the cursor was applied successfully. For session.eventLog.read, 'expired' means the cursor referred to an event that no longer exists in active history and the read fell back to a boundary of the remaining history: the beginning for a forward read or the newest window for a backward read. That fallback may overlap already rendered events, so active-session consumers should reset, rebase, or deduplicate before continuing. sessions.readPersistedEvents has stricter snapshot semantics: 'expired' returns an empty terminal page and never switches to a replacement journal generation. Other persisted-read I/O failures are RPC errors with diagnostics, not cursor expiry.</summary>
+    [JsonPropertyName("cursorStatus")]
+    public EventsCursorStatus CursorStatus { 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>True when more events are available in the read's direction. For a backward read, true means older persisted events remain before the returned window. A persisted-event page may contain fewer than `max` events because of its byte budget while still reporting hasMore true; continue according to this flag rather than the event count.</summary>
+    [JsonPropertyName("hasMore")]
+    public bool HasMore { get; set; }
 }
 
-/// <summary>Read request carrying the typed datum query.</summary>
+/// <summary>Pagination options for reading an inactive or active local session's persisted event journal.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class AccountsGetRequest
+internal sealed class SessionsReadPersistedEventsRequest
 {
-    /// <summary>Which typed accounts datum to read.</summary>
-    [JsonPropertyName("query")]
-    public AuthReadQuery Query { get => field ??= new(); set; }
+    /// <summary>Opaque, process-local, single-use cursor returned by the previous persisted-event read. Omit on the first call and issue continuations sequentially; reusing the same cursor returns an expired terminal page.</summary>
+    [JsonPropertyName("cursor")]
+    public string? Cursor { get; set; }
 
-    /// <summary>Target session identifier.</summary>
+    /// <summary>Direction to page through persisted history. Forward starts at the beginning; backward starts with the newest events. Events in each page remain chronological. This selects the initial read only; a continuation always uses the direction bound into its cursor.</summary>
+    [JsonPropertyName("direction")]
+    public EventsReadDirection? Direction { get; set; }
+
+    /// <summary>Maximum number of events to return in this batch (1–1000, default 200). Pages may contain fewer events to keep the serialized event array within a soft 1 MiB budget including resolved binary assets; one oversized event is returned alone to guarantee progress.</summary>
+    [JsonPropertyName("max")]
+    public long? Max { get; set; }
+
+    /// <summary>Session ID whose persisted event journal should be read.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Result of a non-interactive accounts mutation.</summary>
+/// <summary>Recent local session IDs that contain user-visible history.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class AuthWriteResult
+internal sealed class SessionsListNonEmptySessionIdsResult
 {
-    /// <summary>For a logout, whether other signed-in accounts remain.</summary>
-    [JsonPropertyName("moreUsers")]
-    public bool? MoreUsers { get; set; }
-
-    /// <summary>Whether the mutation was applied.</summary>
-    [JsonPropertyName("ok")]
-    public bool Ok { get; set; }
+    /// <summary>Session IDs ordered newest-first.</summary>
+    [JsonPropertyName("sessionIds")]
+    public IList<string> SessionIds { get => field ??= []; set; }
 }
 
-/// <summary>One non-interactive accounts mutation command (the selector is fused with its typed args).</summary>
-/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
+/// <summary>Limit for non-empty local session IDs.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-[JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "kind",
-    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(AuthWriteSwitchActive), "switchActive")]
-[JsonDerivedType(typeof(AuthWriteLogout), "logout")]
-[JsonDerivedType(typeof(AuthWriteSetCredentials), "setCredentials")]
-public partial class AuthWrite
+internal sealed class SessionsListNonEmptySessionIdsRequest
 {
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("kind")]
-    public virtual string Kind { get; set; } = string.Empty;
+    /// <summary>Maximum number of session IDs to return.</summary>
+    [JsonPropertyName("limit")]
+    public long? Limit { get; set; }
 }
 
-
-/// <summary>The <c>switchActive</c> variant of <see cref="AuthWrite"/>.</summary>
+/// <summary>ID of the local session bound to the given GitHub task, or omitted when none.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class AuthWriteSwitchActive : AuthWrite
+public sealed class SessionsFindByTaskIDResult
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "switchActive";
-
-    /// <summary>Opaque selection id of the account to make active.</summary>
-    [JsonPropertyName("selectionId")]
-    public required string SelectionId { get; set; }
+    /// <summary>Omitted when no local session is bound to that GitHub task.</summary>
+    [JsonPropertyName("sessionId")]
+    public string? SessionId { get; set; }
 }
 
-/// <summary>The <c>logout</c> variant of <see cref="AuthWrite"/>.</summary>
+/// <summary>GitHub task ID to look up.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class AuthWriteLogout : AuthWrite
+internal sealed class SessionsFindByTaskIDRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "logout";
-
-    /// <summary>Opaque selection id of the account to log out; absent logs out the active account.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("selectionId")]
-    public string? SelectionId { get; set; }
+    /// <summary>GitHub task ID to look up.</summary>
+    [JsonPropertyName("taskId")]
+    public string TaskId { get; set; } = string.Empty;
 }
 
-/// <summary>The <c>setCredentials</c> variant of <see cref="AuthWrite"/>.</summary>
+/// <summary>Session ID matching the prefix, omitted when no unique match exists.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class AuthWriteSetCredentials : AuthWrite
+public sealed class SessionsFindByPrefixResult
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "setCredentials";
+    /// <summary>Omitted when no unique session matches the prefix (no match or ambiguous).</summary>
+    [JsonPropertyName("sessionId")]
+    public string? SessionId { get; set; }
+}
 
-    /// <summary>Authentication host URL.</summary>
-    [Url]
-    [StringSyntax(StringSyntaxAttribute.Uri)]
-    [JsonPropertyName("host")]
-    public required string Host { get; set; }
-
-    /// <summary>Login/username for the credential.</summary>
-    [JsonPropertyName("login")]
-    public required string Login { get; set; }
-
-    /// <summary>GitHub authentication token to install.</summary>
-    [JsonPropertyName("token")]
-    public required string Token { get; set; }
+/// <summary>UUID prefix to resolve to a unique session ID.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class SessionsFindByPrefixRequest
+{
+    /// <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>Mutation request carrying the typed write command.</summary>
+/// <summary>Most-relevant session ID for the supplied context, or omitted when no sessions exist.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class AccountsSetRequest
+public sealed class SessionsGetLastForContextResult
 {
-    /// <summary>The non-interactive mutation command to apply.</summary>
-    [JsonPropertyName("command")]
-    public AuthWrite Command { get => field ??= new(); set; }
-
-    /// <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;
+    public string? SessionId { get; set; }
 }
 
-/// <summary>One step in an interactive login flow. The consumer acts on the step and calls advance to proceed. Browser-open is encoded as two distinct steps by design: `open-url` is CONSUMER-driven (the provider surfaces the authorize URL and the consumer opens it — github.com/GHEC web), while `needs-interaction` is PROVIDER-driven (the provider opens the browser or broker UI itself and does not surface a URL — Entra).</summary>
-/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
+/// <summary>Optional working-directory context used to score session relevance.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-[JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "kind",
-    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(AuthLoginStepOpenUrl), "open-url")]
-[JsonDerivedType(typeof(AuthLoginStepInputRequired), "input-required")]
-[JsonDerivedType(typeof(AuthLoginStepAwaiting), "awaiting")]
-[JsonDerivedType(typeof(AuthLoginStepNeedsInteraction), "needs-interaction")]
-[JsonDerivedType(typeof(AuthLoginStepCompleted), "completed")]
-[JsonDerivedType(typeof(AuthLoginStepError), "error")]
-public partial class AuthLoginStep
+internal sealed class SessionsGetLastForContextRequest
 {
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("kind")]
-    public virtual string Kind { get; set; } = string.Empty;
+    /// <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>The <c>open-url</c> variant of <see cref="AuthLoginStep"/>.</summary>
+/// <summary>Absolute path to the session's events.jsonl file on disk.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class AuthLoginStepOpenUrl : AuthLoginStep
+internal sealed class SessionsGetEventFilePathResult
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "open-url";
-
-    /// <summary>Authorize URL the consumer should open in a browser (consumer-driven browser-open).</summary>
-    [JsonPropertyName("url")]
-    public required string Url { get; set; }
+    /// <summary>Absolute path to the session's events.jsonl file.</summary>
+    [JsonPropertyName("filePath")]
+    public string FilePath { get; set; } = string.Empty;
 }
 
-/// <summary>The <c>input-required</c> variant of <see cref="AuthLoginStep"/>.</summary>
+/// <summary>Session ID whose event-log file path to compute.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class AuthLoginStepInputRequired : AuthLoginStep
+internal sealed class SessionsGetEventFilePathRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "input-required";
-
-    /// <summary>Prompt for the value the provider needs; the consumer supplies it as advance input (e.g. a GitHub Enterprise Cloud host, *.ghe.com).</summary>
-    [JsonPropertyName("prompt")]
-    public required string Prompt { get; set; }
+    /// <summary>Session ID whose event-log file path to compute.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>The <c>awaiting</c> variant of <see cref="AuthLoginStep"/>.</summary>
+/// <summary>Map of sessionId -&gt; on-disk size in bytes for each session's workspace directory.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class AuthLoginStepAwaiting : AuthLoginStep
+public sealed class SessionSizes
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "awaiting";
+    /// <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>The <c>needs-interaction</c> variant of <see cref="AuthLoginStep"/>.</summary>
+/// <summary>Session IDs from the input set that are currently in use by another process.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class AuthLoginStepNeedsInteraction : AuthLoginStep
+public sealed class SessionsCheckInUseResult
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "needs-interaction";
+    /// <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>Terminal result of an interactive login flow.</summary>
+/// <summary>Session IDs to test for live in-use locks.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class AuthLoginResultDto
+internal sealed class SessionsCheckInUseRequest
 {
-    /// <summary>Host that was signed in, when completed.</summary>
-    [Url]
-    [StringSyntax(StringSyntaxAttribute.Uri)]
-    [JsonPropertyName("host")]
-    public string? Host { get; set; }
-
-    /// <summary>Login that was signed in, when completed.</summary>
-    [JsonPropertyName("login")]
-    public string? Login { get; set; }
-
-    /// <summary>Terminal disposition of the login.</summary>
-    [JsonPropertyName("status")]
-    public AuthLoginResultStatus Status { get; set; }
+    /// <summary>Session IDs to test for live in-use locks.</summary>
+    [JsonPropertyName("sessionIds")]
+    public IList<string> SessionIds { get => field ??= []; set; }
 }
 
-/// <summary>The <c>completed</c> variant of <see cref="AuthLoginStep"/>.</summary>
+/// <summary>The session's persisted remote-steerable flag, or omitted when no value has been persisted.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class AuthLoginStepCompleted : AuthLoginStep
+internal sealed class SessionsGetPersistedRemoteSteerableResult
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "completed";
-
-    /// <summary>The terminal login result.</summary>
-    [JsonPropertyName("result")]
-    public required AuthLoginResultDto Result { get; set; }
+    /// <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>The <c>error</c> variant of <see cref="AuthLoginStep"/>.</summary>
+/// <summary>Session ID to look up the persisted remote-steerable flag for.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class AuthLoginStepError : AuthLoginStep
+internal sealed class SessionsGetPersistedRemoteSteerableRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "error";
-
-    /// <summary>Human-readable failure message.</summary>
-    [JsonPropertyName("message")]
-    public required string Message { 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 started login flow: its opaque id and first step.</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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class AuthLoginBegun
+public sealed class SessionsCloseResult
 {
-    /// <summary>Opaque flow id used to advance or cancel this login.</summary>
-    [JsonPropertyName("flowId")]
-    public string FlowId { get; set; } = string.Empty;
-
-    /// <summary>The first step of the flow.</summary>
-    [JsonPropertyName("step")]
-    public AuthLoginStep Step { get => field ??= new(); set; }
 }
 
-/// <summary>Begin an interactive login flow for a provider kind. Dispatch is kind-only.</summary>
+/// <summary>Session ID to close.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class AuthLoginBeginRequest
+internal sealed class SessionsCloseRequest
 {
-    /// <summary>The provider kind to sign in with.</summary>
-    [JsonPropertyName("kind")]
-    public LoginProviderKind Kind { get; set; }
-
-    /// <summary>Target session identifier.</summary>
+    /// <summary>Session ID to close.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Advance an in-flight login flow, optionally fulfilling an input-required step.</summary>
+/// <summary>Map of sessionId -&gt; bytes freed by removing the session's workspace directory.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class AuthLoginAdvanceRequest
+public sealed class SessionBulkDeleteResult
 {
-    /// <summary>Opaque flow id from begin.</summary>
-    [JsonPropertyName("flowId")]
-    public string FlowId { get; set; } = string.Empty;
-
-    /// <summary>Neutral input fulfilling a preceding input-required step (e.g. a GHEC host); ignored otherwise.</summary>
-    [JsonPropertyName("input")]
-    public string? Input { get; set; }
-
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <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>Cancel an in-flight login flow.</summary>
+/// <summary>Session IDs to close, deactivate, and delete from disk.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class AuthLoginCancelRequest
+internal sealed class SessionsBulkDeleteRequest
 {
-    /// <summary>Opaque flow id from begin.</summary>
-    [JsonPropertyName("flowId")]
-    public string FlowId { get; set; } = string.Empty;
-
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Session IDs to close, deactivate, and delete from disk.</summary>
+    [JsonPropertyName("sessionIds")]
+    public IList<string> SessionIds { get => field ??= []; set; }
 }
 
-/// <summary>A file included in the session debug bundle.</summary>
+/// <summary>Session ID to delete from disk.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class DebugCollectLogsCollectedEntry
+internal sealed class SessionsDeleteRequest
 {
-    /// <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>Session ID to delete.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 
-    /// <summary>Source category for this entry.</summary>
-    [JsonPropertyName("source")]
-    public DebugCollectLogsSource Source { get; set; }
+    /// <summary>Internal resolved session directory path to delete.</summary>
+    [JsonPropertyName("sessionPath")]
+    public string? SessionPath { get; set; }
 }
 
-/// <summary>An optional debug bundle entry that could not be included.</summary>
+/// <summary>Outcome of the prune operation: deleted IDs, dry-run candidates, skipped IDs, total bytes freed, and the dry-run flag.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class DebugCollectLogsSkippedEntry
+public sealed class SessionPruneResult
 {
-    /// <summary>Relative path requested for this bundle entry.</summary>
-    [JsonPropertyName("bundlePath")]
-    public string BundlePath { get; set; } = string.Empty;
+    /// <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>Server-local source path that could not be read.</summary>
-    [JsonPropertyName("path")]
-    public string? Path { 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>Reason the entry was skipped.</summary>
-    [JsonPropertyName("reason")]
-    public string Reason { get; set; } = string.Empty;
+    /// <summary>True when no deletions were actually performed.</summary>
+    [JsonPropertyName("dryRun")]
+    public bool DryRun { get; set; }
+
+    /// <summary>Total bytes freed (actual when not dry-run, projected when dry-run).</summary>
+    [JsonPropertyName("freedBytes")]
+    public long FreedBytes { get; set; }
+
+    /// <summary>Session IDs that were skipped (e.g., named sessions).</summary>
+    [JsonPropertyName("skipped")]
+    public IList<string> Skipped { get => field ??= []; set; }
 }
 
-/// <summary>Result of collecting a session debug bundle.</summary>
+/// <summary>Age threshold and optional flags controlling which old sessions are pruned (or simulated when dryRun is true).</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class DebugCollectLogsResult
+internal sealed class SessionsPruneOldRequest
 {
-    /// <summary>Files included in the bundle.</summary>
-    [JsonPropertyName("entries")]
-    public IList<DebugCollectLogsCollectedEntry> Entries { get => field ??= []; set; }
+    /// <summary>When true, only report what would be deleted without performing any deletion.</summary>
+    [JsonPropertyName("dryRun")]
+    public bool? DryRun { get; set; }
 
-    /// <summary>Destination kind that was written.</summary>
-    [JsonPropertyName("kind")]
-    public DebugCollectLogsResultKind Kind { get; set; }
+    /// <summary>Session IDs that should never be considered for pruning.</summary>
+    [JsonPropertyName("excludeSessionIds")]
+    public IList<string>? ExcludeSessionIds { 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>When true, named sessions (set via /rename) are also eligible for pruning.</summary>
+    [JsonPropertyName("includeNamed")]
+    public bool? IncludeNamed { get; set; }
 
-    /// <summary>Optional files or directories that could not be included.</summary>
-    [JsonPropertyName("skippedEntries")]
-    public IList<DebugCollectLogsSkippedEntry>? SkippedEntries { get; set; }
+    /// <summary>Delete sessions whose modifiedTime is at least this many days old.</summary>
+    [JsonPropertyName("olderThanDays")]
+    public long OlderThanDays { get; set; }
 }
 
-/// <summary>A caller-provided server-local file or directory to include in the debug bundle.</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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class DebugCollectLogsEntry
+public sealed class SessionsSaveResult
 {
-    /// <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. With none, no redaction is applied; the caller must ensure any necessary redaction is performed before this call.</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 session debug bundle.</summary>
-/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
+/// <summary>Session ID whose pending events should be flushed to disk.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-[JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "kind",
-    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(DebugCollectLogsDestinationArchive), "archive")]
-[JsonDerivedType(typeof(DebugCollectLogsDestinationDirectory), "directory")]
-public partial class DebugCollectLogsDestination
+internal sealed class SessionsSaveRequest
 {
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("kind")]
-    public virtual string Kind { get; set; } = string.Empty;
+    /// <summary>Session ID whose pending events should be flushed to disk.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-
-/// <summary>The <c>archive</c> variant of <see cref="DebugCollectLogsDestination"/>.</summary>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class DebugCollectLogsDestinationArchive : DebugCollectLogsDestination
+public sealed class SessionsReleaseLockResult
 {
-    /// <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>Session ID whose in-use lock should be released.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class SessionsReleaseLockRequest
+{
+    /// <summary>Session ID whose in-use lock should be released.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <summary>Absolute or server-relative path for the .tgz archive to create.</summary>
-    [JsonPropertyName("outputPath")]
-    public required string OutputPath { get; set; }
+/// <summary>The enriched metadata records, with summary and context fields backfilled where available. Sessions confirmed empty and unnamed are omitted.</summary>
+[Experimental(global::GitHub.Copilot.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>The <c>directory</c> variant of <see cref="DebugCollectLogsDestination"/>.</summary>
+/// <summary>Session metadata records to enrich with summary and context information.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class DebugCollectLogsDestinationDirectory : DebugCollectLogsDestination
+internal sealed class SessionsEnrichMetadataRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "directory";
+    /// <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>Directory where files should be staged. The directory is created if needed.</summary>
-    [JsonPropertyName("outputDirectory")]
-    public required string OutputDirectory { get; set; }
+/// <summary>The workspace record that was written.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class SessionsCreateWorkspaceResult
+{
+    /// <summary>The created workspace record, as JSON.</summary>
+    [JsonPropertyName("workspaceJson")]
+    public string WorkspaceJson { get; set; } = string.Empty;
 }
 
-/// <summary>Built-in session diagnostics to include in the bundle. Omitted fields default to true.</summary>
+/// <summary>A working-directory context together with the client that produced it.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class DebugCollectLogsInclude
+public sealed class SessionWorkingDirectoryContextWithClient
 {
-    /// <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>Merge-base commit SHA.</summary>
+    [JsonPropertyName("baseCommit")]
+    public string? BaseCommit { get; set; }
 
-    /// <summary>Include the session event log (`events.jsonl`). Defaults to true.</summary>
-    [JsonPropertyName("events")]
-    public bool? Events { get; set; }
+    /// <summary>Current git branch name.</summary>
+    [JsonPropertyName("branch")]
+    public string? Branch { 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>Name of the client that created the session.</summary>
+    [JsonPropertyName("clientName")]
+    public string? ClientName { get; set; }
 
-    /// <summary>Maximum number of previous process logs to include. Defaults to 5.</summary>
-    [JsonPropertyName("previousProcessLogLimit")]
-    public long? PreviousProcessLogLimit { get; set; }
+    /// <summary>Current working directory path.</summary>
+    [JsonPropertyName("cwd")]
+    public string Cwd { get; set; } = string.Empty;
 
-    /// <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>Root directory of the git repository.</summary>
+    [JsonPropertyName("gitRoot")]
+    public string? GitRoot { get; set; }
 
-    /// <summary>Include process logs for the session. Defaults to true.</summary>
-    [JsonPropertyName("processLogs")]
-    public bool? ProcessLogs { get; set; }
+    /// <summary>Head commit of the current git branch.</summary>
+    [JsonPropertyName("headCommit")]
+    public string? HeadCommit { 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>Hosting platform type of the repository.</summary>
+    [JsonPropertyName("hostType")]
+    public string? HostType { get; set; }
+
+    /// <summary>Repository identifier derived from the git remote URL.</summary>
+    [JsonPropertyName("repository")]
+    public string? Repository { get; set; }
+
+    /// <summary>Raw host string from the git remote URL.</summary>
+    [JsonPropertyName("repositoryHost")]
+    public string? RepositoryHost { get; set; }
 }
 
-/// <summary>Options for collecting a session debug bundle with configurable redaction.</summary>
+/// <summary>Identity, state location and starting context for a workspace record.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class DebugCollectLogsRequest
+internal sealed class SessionsCreateWorkspaceRequest
 {
-    /// <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>Starting working-directory context. The record keeps `cwd`, `gitRoot`, `repository`, `hostType`, `branch`, and `clientName`. Other fields, including `repositoryHost`, `headCommit`, and `baseCommit`, are ignored. `hostType` must be `github` or `ado`.</summary>
+    [JsonPropertyName("context")]
+    public SessionWorkingDirectoryContextWithClient? Context { get; set; }
 
-    /// <summary>Where the bundle should be written. Use `archive` to produce a .tgz, or `directory` to stage files for caller-managed upload/post-processing.</summary>
-    [JsonPropertyName("destination")]
-    public DebugCollectLogsDestination Destination { get => field ??= new(); set; }
+    /// <summary>`windows` (any letter case) selects Windows path rules. Any other value selects POSIX path rules.</summary>
+    [JsonPropertyName("convention")]
+    public string Convention { get; set; } = string.Empty;
 
-    /// <summary>Which built-in session diagnostics to include. Omitted fields default to true.</summary>
-    [JsonPropertyName("include")]
-    public DebugCollectLogsInclude? Include { get; set; }
+    /// <summary>User-supplied display name for the workspace.</summary>
+    [JsonPropertyName("name")]
+    public string? Name { get; set; }
 
-    /// <summary>Target session identifier.</summary>
+    /// <summary>Session ID the workspace record belongs to.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
+
+    /// <summary>Directory the session's state is written under when no session filesystem provider is configured. Ignored when a provider is configured; the provider's session state path is used instead.</summary>
+    [JsonPropertyName("sessionStatePath")]
+    public string SessionStatePath { get; set; } = string.Empty;
 }
 
-/// <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>The workspace record on disk, omitted when the session has none.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class CanvasAction
+internal sealed class SessionsLoadWorkspaceResult
 {
-    /// <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>The workspace record, as JSON. Omitted when the record does not exist.</summary>
+    [JsonPropertyName("workspaceJson")]
+    public string? WorkspaceJson { get; set; }
 }
 
-/// <summary>Canvas available in the current session.</summary>
+/// <summary>Where the session's state lives, as a root directory and the session ID under it.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class DiscoveredCanvas
+internal sealed class SessionsLoadWorkspaceRequest
 {
-    /// <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>Session ID naming the state directory under the sessions home. Rejected when it is absolute or contains a parent component, so it cannot escape the sessions home.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 
-    /// <summary>Human-readable canvas name.</summary>
-    [JsonPropertyName("displayName")]
-    public string DisplayName { get; set; } = string.Empty;
+    /// <summary>Root directory every session's state directory sits under.</summary>
+    [JsonPropertyName("sessionsHome")]
+    public string SessionsHome { get; set; } = string.Empty;
+}
 
-    /// <summary>Owning provider identifier.</summary>
-    [JsonPropertyName("extensionId")]
-    public string ExtensionId { get; set; } = string.Empty;
+/// <summary>The merge completed. The record carries the supplied workspace-schema fields, but a stored `fork_count` stays.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class SessionsUpdateWorkspaceFieldsResult
+{
+}
 
-    /// <summary>Owning extension display name, when available.</summary>
-    [JsonPropertyName("extensionName")]
-    public string? ExtensionName { get; set; }
+/// <summary>Where the session's state lives, plus workspace-schema fields to merge into its workspace record. Stored keys outside the schema are not preserved, and a stored `fork_count` is never replaced.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class SessionsUpdateWorkspaceFieldsRequest
+{
+    /// <summary>Workspace-schema fields to merge into the record, as a JSON object. Fields the object omits keep their stored values, except stored keys outside the schema are not preserved and a stored `fork_count` is never replaced.</summary>
+    [JsonPropertyName("fieldsJson")]
+    public string FieldsJson { get; set; } = string.Empty;
 
-    /// <summary>Host-local PNG path for the canvas icon, when supplied.</summary>
-    [JsonPropertyName("icon")]
-    public string? Icon { get; set; }
+    /// <summary>Session ID naming the state directory under the sessions home. Rejected when it is absolute or contains a parent component, so it cannot escape the sessions home.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 
-    /// <summary>JSON Schema for canvas open input.</summary>
-    [JsonPropertyName("inputSchema")]
-    public JsonElement? InputSchema { get; set; }
+    /// <summary>Root directory every session's state directory sits under.</summary>
+    [JsonPropertyName("sessionsHome")]
+    public string SessionsHome { get; set; } = string.Empty;
 }
 
-/// <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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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>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>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>Live open-canvas snapshot.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class CanvasListOpenResult
-{
-    /// <summary>Currently open canvas instances.</summary>
-    [JsonPropertyName("openCanvases")]
-    public IList<OpenCanvasInstance> OpenCanvases { get => field ??= []; set; }
-}
-
-/// <summary>Identifies the target session.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionCanvasListOpenRequest
-{
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
-
-/// <summary>Canvas open parameters.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class CanvasOpenRequest
-{
-    /// <summary>Provider-local canvas identifier.</summary>
-    [JsonPropertyName("canvasId")]
-    public string CanvasId { 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>Canvas open input.</summary>
-    [JsonPropertyName("input")]
-    public JsonElement? Input { 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>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>Canvas close parameters.</summary>
+/// <summary>Active session ID whose deferred repo-level hooks should be loaded.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class CanvasCloseRequest
+internal sealed class SessionsLoadDeferredRepoHooksRequest
 {
-    /// <summary>Open canvas instance identifier.</summary>
-    [JsonPropertyName("instanceId")]
-    public string InstanceId { get; set; } = string.Empty;
-
-    /// <summary>Target session identifier.</summary>
+    /// <summary>Active session ID whose deferred repo-level hooks should be loaded.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Canvas action invocation result.</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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class CanvasActionInvokeResult
+public sealed class SessionsSetAdditionalPluginsResult
 {
-    /// <summary>Provider-supplied action result.</summary>
-    [JsonPropertyName("result")]
-    public JsonElement? Result { get; set; }
 }
 
-/// <summary>Canvas action invocation parameters.</summary>
+/// <summary>Manager-wide additional plugins to register; replaces any previously-configured set.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class CanvasActionInvokeRequest
+internal sealed class SessionsSetAdditionalPluginsRequest
 {
-    /// <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>
-    [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>Internal canvas provider registration parameters.</summary>
+/// <summary>Dynamic-context board entry count, when available.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class CanvasProviderRegisterRequest
+internal sealed class SessionsGetBoardEntryCountResult
 {
-    /// <summary>Canvas contributions supplied by the provider.</summary>
-    [JsonPropertyName("canvases")]
-    public IList<JsonElement> Canvases { get => field ??= []; 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>Board entry count, when available.</summary>
+    [JsonPropertyName("count")]
+    public long? Count { get; set; }
 }
 
-/// <summary>Internal canvas provider unregistration parameters.</summary>
+/// <summary>Session ID whose board entry count should be returned.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class CanvasProviderUnregisterRequest
+internal sealed class SessionsGetBoardEntryCountRequest
 {
-    /// <summary>Connection identifier to unregister.</summary>
-    [JsonPropertyName("connectionId")]
-    public string ConnectionId { 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 workflow 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(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "type",
+    TypeDiscriminatorPropertyName = "state",
     UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(WorkflowRunFailureWorkflowLimitReached), "workflow_limit_reached")]
-[JsonDerivedType(typeof(WorkflowRunFailureWorkflowResumeDeclined), "workflow_resume_declined")]
-[JsonDerivedType(typeof(WorkflowRunFailureWorkflowDurableFailure), "workflow_durable_failure")]
-[JsonDerivedType(typeof(WorkflowRunFailureWorkflowAccountingIncomplete), "workflow_accounting_incomplete")]
-[JsonDerivedType(typeof(WorkflowRunFailureWorkflowProviderDisconnected), "workflow_provider_disconnected")]
-public partial class WorkflowRunFailure
+[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>workflow_limit_reached</c> variant of <see cref="WorkflowRunFailure"/>.</summary>
+/// <summary>Remote control is not connected.</summary>
+/// <remarks>The <c>off</c> variant of <see cref="RemoteControlStatus"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class WorkflowRunFailureWorkflowLimitReached : WorkflowRunFailure
+public partial class RemoteControlStatusOff : RemoteControlStatus
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Type => "workflow_limit_reached";
-
-    /// <summary>Resource ceiling that stopped the run.</summary>
-    [JsonPropertyName("kind")]
-    public required WorkflowRunFailureKind Kind { get; set; }
-
-    /// <summary>Workflow run identifier.</summary>
-    [JsonPropertyName("runId")]
-    public required string RunId { get; set; }
-
-    /// <summary>Suggested larger ceiling when the runtime can derive one safely.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("suggestedValue")]
-    public double? SuggestedValue { 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>workflow_resume_declined</c> variant of <see cref="WorkflowRunFailure"/>.</summary>
+/// <summary>Remote control is in the middle of initial setup.</summary>
+/// <remarks>The <c>connecting</c> variant of <see cref="RemoteControlStatus"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class WorkflowRunFailureWorkflowResumeDeclined : WorkflowRunFailure
+public partial class RemoteControlStatusConnecting : RemoteControlStatus
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Type => "workflow_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>Workflow 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>workflow_durable_failure</c> variant of <see cref="WorkflowRunFailure"/>.</summary>
+/// <summary>Remote control is connected to a local session.</summary>
+/// <remarks>The <c>active</c> variant of <see cref="RemoteControlStatus"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class WorkflowRunFailureWorkflowDurableFailure : WorkflowRunFailure
+public partial class RemoteControlStatusActive : RemoteControlStatus
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Type => "workflow_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 WorkflowDurableOperation Operation { get; set; }
+    public override string State => "active";
 
-    /// <summary>Workflow run identifier.</summary>
-    [JsonPropertyName("runId")]
-    public required string RunId { get; set; }
-}
+    /// <summary>Session id remote control is pointed at.</summary>
+    [JsonPropertyName("attachedSessionId")]
+    public required string AttachedSessionId { get; set; }
 
-/// <summary>The run stopped because its usage accounting could not be completed.</summary>
-/// <remarks>The <c>workflow_accounting_incomplete</c> variant of <see cref="WorkflowRunFailure"/>.</remarks>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class WorkflowRunFailureWorkflowAccountingIncomplete : WorkflowRunFailure
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "workflow_accounting_incomplete";
+    /// <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>Confirmed usage in nano-AIU, representing the floor of what the run spent.</summary>
-    [JsonPropertyName("drainedNanoAiu")]
-    public required long DrainedNanoAiu { get; set; }
+    /// <summary>MC frontend URL for this session, when known.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("frontendUrl")]
+    public string? FrontendUrl { get; set; }
 
-    /// <summary>Workflow run identifier.</summary>
-    [JsonPropertyName("runId")]
-    public required string RunId { get; set; }
+    /// <summary>Whether the MC session may steer this session.</summary>
+    [JsonPropertyName("isSteerable")]
+    public required bool IsSteerable { get; set; }
 }
 
-/// <summary>The extension that owns the workflow disconnected while the run was executing, so the host halted it. The run's journaled subagent results are preserved so a resume can reuse them.</summary>
-/// <remarks>The <c>workflow_provider_disconnected</c> variant of <see cref="WorkflowRunFailure"/>.</remarks>
+/// <summary>The last setup attempt failed. The singleton is otherwise off.</summary>
+/// <remarks>The <c>error</c> variant of <see cref="RemoteControlStatus"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class WorkflowRunFailureWorkflowProviderDisconnected : WorkflowRunFailure
+public partial class RemoteControlStatusError : RemoteControlStatus
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Type => "workflow_provider_disconnected";
+    public override string State => "error";
 
-    /// <summary>Workflow run identifier.</summary>
-    [JsonPropertyName("runId")]
-    public required string RunId { 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>Durable metadata describing who initiated a workflow pause.</summary>
-/// <remarks>Polymorphic base type discriminated by <c>type</c>.</remarks>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-[JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "type",
-    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(WorkflowPauseInfoUser), "user")]
-[JsonDerivedType(typeof(WorkflowPauseInfoCheckpoint), "checkpoint")]
-public partial class WorkflowPauseInfo
-{
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("type")]
-    public virtual string Type { get; set; } = string.Empty;
+    /// <summary>Human-readable error message from the last setup attempt.</summary>
+    [JsonPropertyName("error")]
+    public required string Error { get; set; }
 }
 
-
-/// <summary>The <c>user</c> variant of <see cref="WorkflowPauseInfo"/>.</summary>
+/// <summary>Wrapper for the singleton's current status.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class WorkflowPauseInfoUser : WorkflowPauseInfo
+public sealed class RemoteControlStatusResult
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "user";
+    /// <summary>State of the runtime-managed remote-control singleton.</summary>
+    [JsonPropertyName("status")]
+    public RemoteControlStatus Status { get => field ??= new(); set; }
 }
 
-/// <summary>The <c>checkpoint</c> variant of <see cref="WorkflowPauseInfo"/>.</summary>
+/// <summary>Reattach to an existing MC session without creating a new one.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class WorkflowPauseInfoCheckpoint : WorkflowPauseInfo
+public sealed class RemoteControlConfigExistingMcSession
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "checkpoint";
+    /// <summary>Existing MC session ID to reattach to.</summary>
+    [JsonPropertyName("mcSessionId")]
+    public string McSessionId { get; set; } = string.Empty;
 
-    /// <summary>Stable author-defined checkpoint key that initiated the pause.</summary>
-    [JsonPropertyName("key")]
-    public required string Key { get; set; }
+    /// <summary>Existing MC task ID for the reattached session.</summary>
+    [JsonPropertyName("mcTaskId")]
+    public string McTaskId { get; set; } = string.Empty;
 }
 
-/// <summary>Complete current or terminal workflow run envelope.</summary>
+/// <summary>Configuration for the runtime-managed remote-control singleton.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class WorkflowRunResult
+public sealed class RemoteControlConfig
 {
-    /// <summary>One-based execution attempt represented by this envelope. Absent before the first attempt starts or when returned by an older runtime.</summary>
-    [JsonPropertyName("attempt")]
-    public long? Attempt { get; set; }
-
-    /// <summary>Error message for an errored run.</summary>
-    [JsonPropertyName("error")]
-    public string? Error { get; set; }
-
-    /// <summary>Machine-readable failure details for a halted or errored run.</summary>
-    [JsonPropertyName("failure")]
-    public WorkflowRunFailure? Failure { get; set; }
-
-    /// <summary>Structured pause initiator metadata for a paused attempt.</summary>
-    [JsonPropertyName("pauseInfo")]
-    public WorkflowPauseInfo? PauseInfo { get; set; }
+    /// <summary>Reattach to an existing MC session without creating a new one.</summary>
+    [JsonPropertyName("existingMcSession")]
+    public RemoteControlConfigExistingMcSession? ExistingMcSession { get; set; }
 
-    /// <summary>Reason for a halted or cancelled run.</summary>
-    [JsonPropertyName("reason")]
-    public string? Reason { 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>Completed workflow result.</summary>
-    [JsonPropertyName("result")]
-    public JsonElement? Result { get; set; }
+    /// <summary>Whether remote export should be enabled.</summary>
+    [JsonPropertyName("remote")]
+    public bool Remote { get; set; }
 
-    /// <summary>Workflow run identifier.</summary>
-    [JsonPropertyName("runId")]
-    public string RunId { get; set; } = string.Empty;
+    /// <summary>When true, suppresses timeline messages on successful setup.</summary>
+    [JsonPropertyName("silent")]
+    public bool Silent { get; set; }
 
-    /// <summary>Partial journal and progress snapshot for a halted, cancelled, or errored run.</summary>
-    [JsonPropertyName("snapshot")]
-    public JsonElement? Snapshot { get; set; }
+    /// <summary>Whether the MC session may steer the local session (write mode).</summary>
+    [JsonPropertyName("steerable")]
+    public bool Steerable { get; set; }
 
-    /// <summary>Current or terminal workflow run status.</summary>
-    [JsonPropertyName("status")]
-    public WorkflowRunStatus Status { get; set; }
+    /// <summary>Existing Mission Control task ID to attach the exported session to.</summary>
+    [JsonPropertyName("taskId")]
+    public string? TaskId { get; set; }
 }
 
-/// <summary>Wire-only per-invocation workflow resource ceiling overrides.</summary>
+/// <summary>Parameters for attaching the remote-control singleton to a session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class WorkflowRunLimits
+internal sealed class SessionsStartRemoteControlRequest
 {
-    /// <summary>Maximum AI credits consumed by workflow 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 workflow subagents that may run concurrently.</summary>
-    [JsonPropertyName("maxConcurrentSubagents")]
-    public long? MaxConcurrentSubagents { get; set; }
-
-    /// <summary>Maximum total number of workflow subagents that may be admitted.</summary>
-    [JsonPropertyName("maxTotalSubagents")]
-    public long? MaxTotalSubagents { get; set; }
+    /// <summary>Configuration for the runtime-managed remote-control singleton.</summary>
+    [JsonPropertyName("config")]
+    public RemoteControlConfig Config { get => field ??= new(); 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>Local session id to attach remote control to.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Options controlling workflow invocation.</summary>
+/// <summary>Outcome of a transferRemoteControl call.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class WorkflowRunOptions
+public sealed class RemoteControlTransferResult
 {
-    /// <summary>Per-invocation resource ceiling overrides.</summary>
-    [JsonPropertyName("limits")]
-    public WorkflowRunLimits? Limits { get; set; }
-
-    /// <summary>Whether to emit workflow phase names to the session transcript.</summary>
-    [JsonPropertyName("logPhaseNames")]
-    public bool? LogPhaseNames { get; set; }
-
-    /// <summary>Whether to notify the originating session when the workflow completes.</summary>
-    [JsonPropertyName("notifyOnComplete")]
-    public bool? NotifyOnComplete { get; set; }
+    /// <summary>State of the runtime-managed remote-control singleton.</summary>
+    [JsonPropertyName("status")]
+    public RemoteControlStatus Status { get => field ??= new(); set; }
 
-    /// <summary>Run identifier whose journal and progress should seed this resumed run.</summary>
-    [JsonPropertyName("resumeFromRunId")]
-    public string? ResumeFromRunId { get; set; }
+    /// <summary>Whether the rebinding actually happened.</summary>
+    [JsonPropertyName("transferred")]
+    public bool Transferred { get; set; }
 }
 
-/// <summary>Parameters for invoking a registered workflow.</summary>
+/// <summary>Parameters for atomically rebinding the remote-control singleton.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class WorkflowRunRequest
+internal sealed class SessionsTransferRemoteControlRequest
 {
-    /// <summary>Workflow input value.</summary>
-    [JsonPropertyName("args")]
-    public JsonElement Args { get; set; }
-
-    /// <summary>Registered workflow name.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
-
-    /// <summary>Workflow invocation options.</summary>
-    [JsonPropertyName("options")]
-    public WorkflowRunOptions? Options { 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>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Local session id to point remote control at.</summary>
+    [JsonPropertyName("toSessionId")]
+    public string ToSessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Resolved persisted workflow identity and resumed run envelope.</summary>
+/// <summary>Patch for the singleton's steering state.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class WorkflowResumeResult
+internal sealed class SessionsSetRemoteControlSteeringRequest
 {
-    /// <summary>Terminal resumed run envelope.</summary>
-    [JsonPropertyName("run")]
-    public WorkflowRunResult Run { get => field ??= new(); set; }
-
-    /// <summary>Persisted workflow name resolved for the resumed run.</summary>
-    [JsonPropertyName("workflowName")]
-    public string WorkflowName { get; set; } = string.Empty;
+    /// <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>Parameters for resuming a workflow run from its persisted identity.</summary>
+/// <summary>Outcome of a stopRemoteControl call.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class WorkflowResumeRequest
+public sealed class RemoteControlStopResult
 {
-    /// <summary>Optional per-invocation resource ceiling overrides.</summary>
-    [JsonPropertyName("limits")]
-    public WorkflowRunLimits? Limits { get; set; }
-
-    /// <summary>Whether to emit workflow phase names to the session transcript.</summary>
-    [JsonPropertyName("logPhaseNames")]
-    public bool? LogPhaseNames { get; set; }
-
-    /// <summary>Whether to notify the originating session when the workflow completes.</summary>
-    [JsonPropertyName("notifyOnComplete")]
-    public bool? NotifyOnComplete { get; set; }
-
-    /// <summary>Workflow 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 singleton was actually torn down by this call.</summary>
+    [JsonPropertyName("stopped")]
+    public bool Stopped { get; set; }
 }
 
-/// <summary>Options for an internal tool-originated workflow invocation.</summary>
+/// <summary>RPC data type for SessionsStopRemoteControl operations.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class WorkflowToolRunOptions
+internal sealed class SessionsStopRemoteControlRequest
 {
-    /// <summary>Per-invocation resource ceiling overrides.</summary>
-    [JsonPropertyName("limits")]
-    public WorkflowRunLimits? Limits { 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>Run identifier whose journal and progress should seed this resumed run.</summary>
-    [JsonPropertyName("resumeFromRunId")]
-    public string? ResumeFromRunId { 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>Internal parameters for invoking a registered workflow from a tool.</summary>
+/// <summary>Params to attach or detach an in-process ExtensionController delegate.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class WorkflowToolRunRequest
+internal sealed class ConfigureSessionExtensionsParams
 {
-    /// <summary>Workflow input value.</summary>
-    [JsonPropertyName("args")]
-    public JsonElement Args { get; set; }
-
-    /// <summary>Registered workflow name.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
-
-    /// <summary>Tool-originated workflow invocation options.</summary>
-    [JsonPropertyName("options")]
-    public WorkflowToolRunOptions? Options { get; set; }
-
-    /// <summary>Target session identifier.</summary>
+    /// <summary>Session to attach the extension controller delegate to.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <summary>Opaque identifier of the originating tool call.</summary>
-    [JsonPropertyName("toolCallId")]
-    public string? ToolCallId { get; set; }
+/// <summary>Outcome of an agentRegistry.spawn call.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
+[Experimental(global::GitHub.Copilot.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>Internal parameters for resuming a workflow run from a tool.</summary>
+
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class WorkflowToolResumeRequest
+public sealed class AgentRegistryLiveTargetEntry
 {
-    /// <summary>Optional per-invocation resource ceiling overrides.</summary>
-    [JsonPropertyName("limits")]
-    public WorkflowRunLimits? Limits { get; set; }
+    /// <summary>Kind of attention required when status === "attention". Meaningful only when status === "attention".</summary>
+    [JsonPropertyName("attentionKind")]
+    public AgentRegistryLiveTargetEntryAttentionKind? AttentionKind { get; set; }
 
-    /// <summary>Workflow run identifier.</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>Target session identifier.</summary>
+    /// <summary>Copilot CLI version that wrote the entry.</summary>
+    [JsonPropertyName("copilotVersion")]
+    public string CopilotVersion { get; set; } = string.Empty;
+
+    /// <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>TCP port the entry's JSON-RPC server is listening on.</summary>
+    [JsonPropertyName("port")]
+    public long Port { get; set; }
+
+    /// <summary>Registry entry schema version (1 = ui-server, 2 = managed-server).</summary>
+    [JsonPropertyName("schemaVersion")]
+    public long SchemaVersion { get; set; }
+
+    /// <summary>Session ID of the foreground session for this entry.</summary>
     [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    public string? SessionId { get; set; }
 
-    /// <summary>Opaque identifier of the originating tool call.</summary>
-    [JsonPropertyName("toolCallId")]
-    public string? ToolCallId { get; set; }
+    /// <summary>Friendly session name (when set).</summary>
+    [JsonPropertyName("sessionName")]
+    public string? SessionName { get; set; }
+
+    /// <summary>ISO 8601 timestamp captured at registration.</summary>
+    [JsonPropertyName("startedAt")]
+    public string StartedAt { get; set; } = string.Empty;
+
+    /// <summary>Coarse lifecycle status of the foreground session.</summary>
+    [JsonPropertyName("status")]
+    public AgentRegistryLiveTargetEntryStatus? Status { 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>Connection token (null when the target is unauthenticated).</summary>
+    [JsonInclude]
+    [JsonPropertyName("token")]
+    internal string? Token { get; set; }
 }
 
-/// <summary>Parameters for retrieving a workflow run.</summary>
+/// <summary>Canonical process-log discovery outcome; populated from spawnLiveTarget.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class WorkflowGetRunRequest
+public sealed class AgentRegistryLogCapture
 {
-    /// <summary>Workflow run identifier.</summary>
-    [JsonPropertyName("runId")]
-    public string RunId { get; set; } = string.Empty;
+    /// <summary>Whether a canonical process log was discovered for this managed spawn.</summary>
+    [JsonPropertyName("enabled")]
+    public bool Enabled { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Why no canonical process log could be opened for this managed spawn (set only when enabled is false).</summary>
+    [JsonPropertyName("openError")]
+    public string? OpenError { get; set; }
+
+    /// <summary>Categorized reason no canonical process log could be opened (set only when enabled is false).</summary>
+    [JsonPropertyName("openErrorReason")]
+    public AgentRegistryLogCaptureOpenErrorReason? OpenErrorReason { get; set; }
+
+    /// <summary>Absolute path to the managed spawn's process-&lt;timestamp&gt;-&lt;pid&gt;.log file (only set when enabled).</summary>
+    [JsonPropertyName("path")]
+    public string? Path { get; set; }
 }
 
-/// <summary>Declared or approved workflow resource ceilings.</summary>
+/// <summary>Managed-server child was spawned and registered successfully.</summary>
+/// <remarks>The <c>spawned</c> variant of <see cref="AgentRegistrySpawnResult"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class WorkflowDeclaredLimits
+public partial class AgentRegistrySpawnResultSpawned : AgentRegistrySpawnResult
 {
-    /// <summary>Maximum AI credits consumed by subagents and descendants.</summary>
-    [JsonPropertyName("maxAiCredits")]
-    public double? MaxAiCredits { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "spawned";
 
-    /// <summary>Maximum concurrently active subagents.</summary>
-    [JsonPropertyName("maxConcurrentSubagents")]
-    public long? MaxConcurrentSubagents { 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>Maximum total subagents spawned by the run.</summary>
-    [JsonPropertyName("maxTotalSubagents")]
-    public long? MaxTotalSubagents { 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>Maximum accumulated active execution time in seconds.</summary>
-    [JsonPropertyName("timeoutSeconds")]
-    public double? TimeoutSeconds { 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>Per-spawn log-capture outcome; populated from spawnLiveTarget.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("logCapture")]
+    public AgentRegistryLogCapture? LogCapture { get; set; }
 }
 
-/// <summary>Durable workflow resource consumption.</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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class WorkflowRunConsumed
+public partial class AgentRegistrySpawnResultSpawnError : AgentRegistrySpawnResult
 {
-    /// <summary>Accumulated active execution time in milliseconds.</summary>
-    [JsonPropertyName("activeMs")]
-    public long ActiveMs { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "spawn-error";
 
-    /// <summary>AI usage consumed by the run in nano-AIU.</summary>
-    [JsonPropertyName("nanoAiu")]
-    public long NanoAiu { get; set; }
+    /// <summary>Underlying errno code (e.g. ENOENT, EACCES) when available.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("code")]
+    public string? Code { get; set; }
 
-    /// <summary>Total subagents spawned by the run.</summary>
-    [JsonPropertyName("subagents")]
-    public long Subagents { get; set; }
+    /// <summary>Human-readable error message.</summary>
+    [JsonPropertyName("message")]
+    public required string Message { get; set; }
 }
 
-/// <summary>Current workflow phase identity.</summary>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class WorkflowCurrentPhase
+public partial class AgentRegistrySpawnResultRegistryTimeout : AgentRegistrySpawnResult
 {
-    /// <summary>Current phase identifier.</summary>
-    [JsonPropertyName("id")]
-    public string Id { get; set; } = string.Empty;
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "registry-timeout";
 
-    /// <summary>Zero-based declared phase ordinal, or null for an undeclared phase.</summary>
-    [JsonPropertyName("ordinal")]
-    public long? Ordinal { 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>Per-spawn log-capture outcome; populated from spawnLiveTarget.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("logCapture")]
+    public AgentRegistryLogCapture? LogCapture { get; set; }
 }
 
-/// <summary>Prompt-safe terminal workflow outcome.</summary>
+/// <summary>Synchronous pre-validation rejected the spawn request.</summary>
+/// <remarks>The <c>validation-error</c> variant of <see cref="AgentRegistrySpawnResult"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class WorkflowRunTerminal
+public partial class AgentRegistrySpawnResultValidationError : AgentRegistrySpawnResult
 {
-    /// <summary>Human-readable terminal error.</summary>
-    [JsonPropertyName("error")]
-    public string? Error { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "validation-error";
 
-    /// <summary>Machine-readable terminal failure.</summary>
-    [JsonPropertyName("failure")]
-    public WorkflowRunFailure? Failure { 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>Pause initiator metadata, or null when the run did not pause.</summary>
-    [JsonPropertyName("pauseInfo")]
-    public WorkflowPauseInfo? PauseInfo { 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>Human-readable terminal reason.</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>
     [JsonPropertyName("reason")]
-    public string? Reason { get; set; }
-
-    /// <summary>Prompt-safe preview of the completed result.</summary>
-    [JsonPropertyName("resultPreview")]
-    public string? ResultPreview { get; set; }
+    public required AgentRegistrySpawnValidationErrorReason Reason { get; set; }
 }
 
-/// <summary>Durable workflow run summary with read-time live overlays.</summary>
+/// <summary>Inputs to spawn a managed-server child via the controller's spawn delegate.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class WorkflowRunSummary
+internal sealed class AgentRegistrySpawnRequest
 {
-    /// <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 WorkflowDeclaredLimits? Approved { get; set; }
-
-    /// <summary>Whether the durable run state currently passes runtime resume eligibility checks.</summary>
-    [JsonPropertyName("canResume")]
-    public bool CanResume { get; set; }
-
-    /// <summary>Epoch milliseconds when the run completed, or null while nonterminal.</summary>
-    [JsonPropertyName("completedAt")]
-    public long? CompletedAt { 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>Durable resource consumption.</summary>
-    [JsonPropertyName("consumed")]
-    public WorkflowRunConsumed Consumed { get => field ??= new(); set; }
+    /// <summary>Working directory for the spawned child (must be an existing directory).</summary>
+    [JsonPropertyName("cwd")]
+    public string Cwd { get; set; } = string.Empty;
 
-    /// <summary>Epoch milliseconds when the run was created.</summary>
-    [JsonPropertyName("createdAt")]
-    public long CreatedAt { 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>Current phase identity, or null before any phase is entered.</summary>
-    [JsonPropertyName("currentPhase")]
-    public WorkflowCurrentPhase? CurrentPhase { get; set; }
+    /// <summary>Model identifier to apply to the new session.</summary>
+    [JsonPropertyName("model")]
+    public string? Model { get; set; }
 
-    /// <summary>Resource ceilings declared by the workflow.</summary>
-    [JsonPropertyName("declaredLimits")]
-    public WorkflowDeclaredLimits DeclaredLimits { get => field ??= new(); set; }
+    /// <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>Number of phases declared by the workflow.</summary>
-    [JsonPropertyName("declaredPhaseCount")]
-    public long DeclaredPhaseCount { 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>Human-readable workflow description.</summary>
-    [JsonPropertyName("description")]
-    public string Description { get; set; } = string.Empty;
+/// <summary>Feature availability.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class ConnectorDiscoveryCapabilities
+{
+    /// <summary>API version.</summary>
+    [JsonPropertyName("apiVersion")]
+    public long ApiVersion { get; set; }
 
-    /// <summary>Number of direct workflow agents currently live.</summary>
-    [JsonPropertyName("liveAgentCount")]
-    public long LiveAgentCount { get; set; }
+    /// <summary>Availability.</summary>
+    [JsonPropertyName("availability")]
+    public ConnectorDiscoveryAvailability Availability { get; set; }
 
-    /// <summary>Epoch milliseconds when this live-overlay snapshot was observed.</summary>
-    [JsonPropertyName("observedAt")]
-    public long ObservedAt { get; set; }
+    /// <summary>Whether results are cached.</summary>
+    [JsonPropertyName("conditionalCache")]
+    public bool ConditionalCache { get; set; }
 
-    /// <summary>Monotonic durable run revision.</summary>
-    [JsonPropertyName("revision")]
-    public long Revision { get; set; }
+    /// <summary>Whether accounts are selected by opaque ID.</summary>
+    [JsonPropertyName("opaqueAccountSelection")]
+    public bool OpaqueAccountSelection { get; set; }
+}
 
-    /// <summary>Workflow run identifier.</summary>
-    [JsonPropertyName("runId")]
-    public string RunId { get; set; } = string.Empty;
+/// <summary>Account metadata.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class ConnectorDiscoveryAuthInfo
+{
+    /// <summary>Host.</summary>
+    [JsonPropertyName("host")]
+    public string Host { get; set; } = string.Empty;
 
-    /// <summary>Epoch milliseconds when execution first started, or null before start.</summary>
-    [JsonPropertyName("startedAt")]
-    public long? StartedAt { get; set; }
+    /// <summary>Login.</summary>
+    [JsonPropertyName("login")]
+    public string Login { get; set; } = string.Empty;
 
-    /// <summary>Current workflow run status.</summary>
-    [JsonPropertyName("status")]
-    public WorkflowRunStatus Status { get; set; }
+    /// <summary>Authentication type.</summary>
+    [JsonPropertyName("type")]
+    public AuthInfoType Type { get; set; }
+}
 
-    /// <summary>Terminal run outcome, or null while nonterminal.</summary>
-    [JsonPropertyName("terminal")]
-    public WorkflowRunTerminal? Terminal { get; set; }
+/// <summary>Eligible account.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class ConnectorDiscoveryAccount
+{
+    /// <summary>Opaque account ID.</summary>
+    [JsonPropertyName("accountId")]
+    public string AccountId { get; set; } = string.Empty;
 
-    /// <summary>Total direct workflow agents spawned across all attempts.</summary>
-    [JsonPropertyName("totalSpawnedAgentCount")]
-    public long TotalSpawnedAgentCount { get; set; }
+    /// <summary>Account metadata.</summary>
+    [JsonPropertyName("authInfo")]
+    public ConnectorDiscoveryAuthInfo AuthInfo { get => field ??= new(); set; }
+}
 
-    /// <summary>Epoch milliseconds when the durable run was last updated.</summary>
-    [JsonPropertyName("updatedAt")]
-    public long UpdatedAt { get; set; }
+/// <summary>Eligible accounts.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class ConnectorDiscoveryAccountList
+{
+    /// <summary>Eligible accounts.</summary>
+    [JsonPropertyName("accounts")]
+    public IList<ConnectorDiscoveryAccount> Accounts { get => field ??= []; set; }
 
-    /// <summary>Registered workflow name.</summary>
-    [JsonPropertyName("workflowName")]
-    public string WorkflowName { get; set; } = string.Empty;
+    /// <summary>Availability.</summary>
+    [JsonPropertyName("availability")]
+    public ConnectorDiscoveryAvailability Availability { get; set; }
 }
 
-/// <summary>A page of workflow runs in durable creation order.</summary>
+/// <summary>Entry.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class WorkflowListRunsResult
+public sealed class ConnectorDiscoveryCatalogEntry
 {
-    /// <summary>Whether terminal runs newer than this page exist.</summary>
-    [JsonPropertyName("hasMoreNewer")]
-    public bool? HasMoreNewer { get; set; }
+    /// <summary>Description.</summary>
+    [JsonPropertyName("description")]
+    public string? Description { 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>Display name.</summary>
+    [JsonPropertyName("displayName")]
+    public string DisplayName { get; set; } = string.Empty;
 
-    /// <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>Logo.</summary>
+    [JsonPropertyName("logo")]
+    public string? Logo { get; set; }
 
-    /// <summary>Number of terminal runs older than this page.</summary>
-    [JsonPropertyName("omittedOlder")]
-    public long? OmittedOlder { get; set; }
+    /// <summary>Name.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
 
-    /// <summary>Workflow run summaries in durable creation order.</summary>
-    [JsonPropertyName("runs")]
-    public IList<WorkflowRunSummary> Runs { get => field ??= []; set; }
+    /// <summary>Release tag.</summary>
+    [JsonPropertyName("releaseTag")]
+    public string? ReleaseTag { get; set; }
+
+    /// <summary>Status.</summary>
+    [JsonPropertyName("status")]
+    public ConnectorCatalogStatus Status { get; set; }
+
+    /// <summary>Tier.</summary>
+    [JsonPropertyName("tier")]
+    public string? Tier { get; set; }
 }
 
-/// <summary>Parameters for paging workflow runs.</summary>
+/// <summary>Entries for the selected account.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class WorkflowListRunsRequest
+public sealed class ConnectorDiscoveryCatalogResult
 {
-    /// <summary>Exclusive forward cursor.</summary>
-    [JsonPropertyName("afterSeq")]
-    public long? AfterSeq { get; set; }
+    /// <summary>Opaque account ID.</summary>
+    [JsonPropertyName("accountId")]
+    public string AccountId { get; set; } = string.Empty;
 
-    /// <summary>Exclusive backward cursor.</summary>
-    [JsonPropertyName("beforeSeq")]
-    public long? BeforeSeq { get; set; }
+    /// <summary>Entries.</summary>
+    [JsonPropertyName("connectors")]
+    public IList<ConnectorDiscoveryCatalogEntry> Connectors { get => field ??= []; set; }
 
-    /// <summary>Maximum terminal runs to return. Defaults to 200 and is capped at 500.</summary>
-    [JsonPropertyName("limit")]
-    public int? Limit { get; set; }
+    /// <summary>Refresh time in Unix epoch milliseconds.</summary>
+    [JsonPropertyName("refreshedAtMs")]
+    public long RefreshedAtMs { get; set; }
+
+    /// <summary>Revision.</summary>
+    [JsonPropertyName("revision")]
+    public long Revision { get; set; }
+}
+
+/// <summary>Selected account.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class ConnectorDiscoveryAccountRequest
+{
+    /// <summary>Opaque account ID.</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(2048)]
+    [JsonPropertyName("accountId")]
+    public string AccountId { get; set; } = string.Empty;
+}
 
+/// <summary>Identifies the target session.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class SessionSuspendRequest
+{
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Prompt-safe durable identity and live status for a direct workflow agent.</summary>
+/// <summary>Result of sending a user message.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class WorkflowAgentSummary
+public sealed class SendResult
 {
-    /// <summary>Accumulated active agent time in milliseconds.</summary>
-    [JsonPropertyName("activeMs")]
-    public long ActiveMs { get; set; }
+    /// <summary>Unique identifier assigned to the message.</summary>
+    [JsonPropertyName("messageId")]
+    public string MessageId { get; set; } = string.Empty;
+}
 
-    /// <summary>Prompt-safe live activity text.</summary>
-    [JsonPropertyName("activity")]
-    public string? Activity { get; set; }
+/// <summary>Provider-native structured output format. JSON Schema is forwarded without rewriting or validating the schema or the generated output.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>type</c>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "type",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(ResponseFormatJsonSchema), "json_schema")]
+public partial class ResponseFormat
+{
+    /// <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>A JSON Schema output contract. OpenAI receives the name, description, schema and strict setting; Anthropic receives the schema in output_config.format and always uses its native strict enforcement.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class JsonSchemaResponseFormat
+{
+    /// <summary>Optional description passed to OpenAI providers.</summary>
+    [JsonPropertyName("description")]
+    public string? Description { get; set; }
 
-    /// <summary>Epoch milliseconds when the agent completed.</summary>
-    [JsonPropertyName("completedAt")]
-    public long? CompletedAt { get; set; }
+    /// <summary>Name of the output schema, subject to the provider's naming restrictions.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
 
-    /// <summary>Friendly, non-unique name intended for display.</summary>
-    [JsonPropertyName("displayName")]
-    public string? DisplayName { get; set; }
+    /// <summary>JSON Schema passed unchanged to the inference provider. Schemas larger than 32 MiB when JSON-encoded are rejected before admission, using the runtime's existing request-size ceiling. This is not a guarantee that the entire model request fits. Supported keywords and schema restrictions are determined by the provider.</summary>
+    [JsonPropertyName("schema")]
+    public JsonElement Schema { get; set; }
 
-    /// <summary>Friendly, non-unique name intended for display.</summary>
-    [JsonPropertyName("label")]
-    public string Label { get; set; } = string.Empty;
+    /// <summary>Optional strict enforcement setting for OpenAI providers. Omitted uses the provider default. Anthropic always enforces its supported schema subset.</summary>
+    [JsonPropertyName("strict")]
+    public bool? Strict { get; set; }
+}
 
-    /// <summary>Phase identifier active when the agent was launched, or null.</summary>
-    [JsonPropertyName("phaseId")]
-    public string? PhaseId { get; set; }
+/// <summary>The <c>json_schema</c> variant of <see cref="ResponseFormat"/>.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class ResponseFormatJsonSchema : ResponseFormat
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "json_schema";
 
-    /// <summary>Model requested when the agent was launched.</summary>
-    [JsonPropertyName("requestedModel")]
-    public string? RequestedModel { get; set; }
+    /// <summary>JSON Schema and provider options for the turn's output.</summary>
+    [JsonPropertyName("jsonSchema")]
+    public required JsonSchemaResponseFormat JsonSchema { get; set; }
+}
 
-    /// <summary>Concrete model resolved for the agent.</summary>
-    [JsonPropertyName("resolvedModel")]
-    public string? ResolvedModel { get; set; }
+/// <summary>Parameters for sending a user message to the session.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class SendRequest
+{
+    /// <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>Owning workflow run identifier.</summary>
-    [JsonPropertyName("runId")]
-    public string RunId { 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>Epoch milliseconds when the agent started.</summary>
-    [JsonPropertyName("startedAt")]
-    public long? StartedAt { 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>Durable lifecycle and timing for one workflow phase.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class WorkflowPhaseObservation
-{
-    /// <summary>Completed active time accumulated by this phase in milliseconds.</summary>
-    [JsonPropertyName("accumulatedActiveMs")]
-    public long AccumulatedActiveMs { 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>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>If provided, this is shown in the timeline instead of `prompt`.</summary>
+    [JsonPropertyName("displayPrompt")]
+    public string? DisplayPrompt { get; set; }
 
-    /// <summary>Current live active time for this phase in milliseconds.</summary>
-    [JsonPropertyName("currentActiveMs")]
-    public long CurrentActiveMs { 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>Optional human-readable phase detail.</summary>
-    [JsonPropertyName("detail")]
-    public string? Detail { 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>Number of times execution entered this phase.</summary>
-    [JsonPropertyName("entryCount")]
-    public long EntryCount { get; set; }
+    /// <summary>The user message text.</summary>
+    [JsonPropertyName("prompt")]
+    public string Prompt { get; set; } = string.Empty;
 
-    /// <summary>Phase identifier.</summary>
-    [JsonPropertyName("id")]
-    public string Id { 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>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>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>Direct agents in this phase that are currently live.</summary>
-    [JsonPropertyName("liveAgentCount")]
-    public long LiveAgentCount { get; set; }
+    /// <summary>Provider-native output format for this turn, including all tool-call iterations. Not inherited by later turns or subagents. Ordinary steering inherits the active format; specifying responseFormat with mode: immediate is an error, even while idle. Returned assistant content remains text; the runtime does not parse or validate it. Unsupported models or schemas produce provider errors.</summary>
+    [JsonPropertyName("responseFormat")]
+    public ResponseFormat? ResponseFormat { get; set; }
 
-    /// <summary>Zero-based declared phase ordinal, or null for an undeclared phase.</summary>
-    [JsonPropertyName("ordinal")]
-    public long? Ordinal { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 
-    /// <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>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>Derived lifecycle state of the phase.</summary>
-    [JsonPropertyName("status")]
-    public WorkflowPhaseStatus Status { get; set; }
+    /// <summary>W3C Trace Context traceparent header for distributed tracing of this agent turn.</summary>
+    [JsonPropertyName("traceparent")]
+    public string? Traceparent { get; set; }
 
-    /// <summary>Human-readable phase title.</summary>
-    [JsonPropertyName("title")]
-    public string Title { get; set; } = string.Empty;
+    /// <summary>W3C Trace Context tracestate header for distributed tracing.</summary>
+    [JsonPropertyName("tracestate")]
+    public string? Tracestate { get; set; }
 
-    /// <summary>Total direct agents associated with this phase.</summary>
-    [JsonPropertyName("totalAgentCount")]
-    public long TotalAgentCount { 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>One durable workflow progress record.</summary>
+/// <summary>Result of sending zero or more user messages.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class WorkflowProgressLine
+public sealed class SendMessagesResult
 {
-    /// <summary>Resume attempt that emitted this record.</summary>
-    [JsonPropertyName("attempt")]
-    public long Attempt { get; set; }
-
-    /// <summary>Progress record kind.</summary>
-    [JsonPropertyName("kind")]
-    public WorkflowLogLineKind 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>Epoch milliseconds when the record was persisted.</summary>
-    [JsonPropertyName("recordedAt")]
-    public long RecordedAt { get; set; }
-
-    /// <summary>Global monotonic sequence number within the run.</summary>
-    [JsonPropertyName("seq")]
-    public long Seq { get; set; }
-
-    /// <summary>Prompt-safe progress text.</summary>
-    [JsonPropertyName("text")]
-    public string Text { get; set; } = string.Empty;
+    /// <summary>Unique identifiers assigned to the messages, one per provided message in order. For a batch that starts a run, assistant messages use the final ID as originatingMessageId throughout that run, including tool iterations and stop-hook corrections. Immediate steering does not replace the active run's origin. Empty when no messages were provided; that run has no originatingMessageId.</summary>
+    [JsonPropertyName("messageIds")]
+    public IList<string> MessageIds { get => field ??= []; set; }
 }
 
-/// <summary>A bidirectional page of workflow progress.</summary>
+/// <summary>A single user message to append to the session as part of a `session.sendMessages` turn.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class WorkflowProgressPage
+public sealed class SendMessageItem
 {
-    /// <summary>Whether progress records newer than this page exist.</summary>
-    [JsonPropertyName("hasMoreNewer")]
-    public bool HasMoreNewer { get; set; }
+    /// <summary>Optional attachments (files, directories, selections, blobs, GitHub references) to include with this message.</summary>
+    [JsonPropertyName("attachments")]
+    public IList<Attachment>? Attachments { get; set; }
 
-    /// <summary>Whether progress records older than this page exist.</summary>
-    [JsonPropertyName("hasMoreOlder")]
-    public bool HasMoreOlder { 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>Newest sequence number in this page, or null when empty.</summary>
-    [JsonPropertyName("newestSeq")]
-    public long? NewestSeq { get; set; }
+    /// <summary>If provided, this is shown in the timeline instead of `prompt`.</summary>
+    [JsonPropertyName("displayPrompt")]
+    public string? DisplayPrompt { get; set; }
 
-    /// <summary>Oldest sequence number in this page, or null when empty.</summary>
-    [JsonPropertyName("oldestSeq")]
-    public long? OldestSeq { get; set; }
+    /// <summary>The user message text.</summary>
+    [JsonPropertyName("prompt")]
+    public string Prompt { get; set; } = string.Empty;
 
-    /// <summary>Progress records in sequence order.</summary>
-    [JsonPropertyName("records")]
-    public IList<WorkflowProgressLine> Records { get => field ??= []; 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>Run revision reflected by this page.</summary>
-    [JsonPropertyName("revision")]
-    public long Revision { 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>Full workflow run observability detail.</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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class WorkflowRunDetail
+internal sealed class SendMessagesRequest
 {
-    /// <summary>Epoch milliseconds when the current active segment started, or null while inactive.</summary>
-    [JsonPropertyName("activeSegmentStartedAt")]
-    public long? ActiveSegmentStartedAt { get; set; }
-
-    /// <summary>Durable identities and live statuses for direct workflow agents.</summary>
-    [JsonPropertyName("agents")]
-    public IList<WorkflowAgentSummary> Agents { get => field ??= []; set; }
-
-    /// <summary>Approved effective resource ceilings, or null until approved.</summary>
-    [JsonPropertyName("approved")]
-    public WorkflowDeclaredLimits? Approved { get; set; }
-
-    /// <summary>Whether the durable run state currently passes runtime resume eligibility checks.</summary>
-    [JsonPropertyName("canResume")]
-    public bool CanResume { 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 WorkflowRunConsumed 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 WorkflowCurrentPhase? CurrentPhase { get; set; }
-
-    /// <summary>Resource ceilings declared by the workflow.</summary>
-    [JsonPropertyName("declaredLimits")]
-    public WorkflowDeclaredLimits DeclaredLimits { get => field ??= new(); set; }
-
-    /// <summary>Number of phases declared by the workflow.</summary>
-    [JsonPropertyName("declaredPhaseCount")]
-    public long DeclaredPhaseCount { get; set; }
-
-    /// <summary>Human-readable workflow description.</summary>
-    [JsonPropertyName("description")]
-    public string Description { get; set; } = string.Empty;
-
-    /// <summary>Number of direct workflow agents currently live.</summary>
-    [JsonPropertyName("liveAgentCount")]
-    public long LiveAgentCount { get; set; }
-
-    /// <summary>Epoch milliseconds when this live-overlay snapshot was observed.</summary>
-    [JsonPropertyName("observedAt")]
-    public long ObservedAt { get; set; }
-
-    /// <summary>Lifecycle and timing observations for each workflow phase.</summary>
-    [JsonPropertyName("phases")]
-    public IList<WorkflowPhaseObservation> Phases { get => field ??= []; 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>Bidirectional page of durable workflow progress.</summary>
-    [JsonPropertyName("progress")]
-    public WorkflowProgressPage Progress { get => field ??= new(); set; }
+    /// <summary>The user messages to append to the conversation, in order, before running one agent loop. When the batch starts a run, its final message is the primary initiating message; earlier messages provide context, not separate runs or replies. May be empty, in which case a single turn runs over the existing history with no new user message or originatingMessageId.</summary>
+    [JsonPropertyName("messages")]
+    public IList<SendMessageItem> Messages { get => field ??= []; set; }
 
-    /// <summary>Monotonic durable run revision.</summary>
-    [JsonPropertyName("revision")]
-    public long Revision { 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>Workflow run identifier.</summary>
-    [JsonPropertyName("runId")]
-    public string RunId { 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>Epoch milliseconds when execution first started, or null before start.</summary>
-    [JsonPropertyName("startedAt")]
-    public long? StartedAt { 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>Current workflow run status.</summary>
-    [JsonPropertyName("status")]
-    public WorkflowRunStatus Status { get; set; }
+    /// <summary>Provider-native output format for the whole turn, including an empty message batch and all tool-call iterations. Not inherited by later turns or subagents. Ordinary steering inherits the active format; specifying responseFormat with mode: immediate is an error, even while idle. Returned assistant content remains text; the runtime does not parse or validate it. Unsupported models or schemas produce provider errors.</summary>
+    [JsonPropertyName("responseFormat")]
+    public ResponseFormat? ResponseFormat { get; set; }
 
-    /// <summary>Terminal run outcome, or null while nonterminal.</summary>
-    [JsonPropertyName("terminal")]
-    public WorkflowRunTerminal? Terminal { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 
-    /// <summary>Total direct workflow agents spawned across all attempts.</summary>
-    [JsonPropertyName("totalSpawnedAgentCount")]
-    public long TotalSpawnedAgentCount { get; set; }
+    /// <summary>W3C Trace Context traceparent header for distributed tracing of this agent turn.</summary>
+    [JsonPropertyName("traceparent")]
+    public string? Traceparent { get; set; }
 
-    /// <summary>Epoch milliseconds when the durable run was last updated.</summary>
-    [JsonPropertyName("updatedAt")]
-    public long UpdatedAt { get; set; }
+    /// <summary>W3C Trace Context tracestate header for distributed tracing.</summary>
+    [JsonPropertyName("tracestate")]
+    public string? Tracestate { get; set; }
 
-    /// <summary>Registered workflow name.</summary>
-    [JsonPropertyName("workflowName")]
-    public string WorkflowName { get; set; } = string.Empty;
+    /// <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 paging workflow progress.</summary>
+/// <summary>Internal request for sending a system notification.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class WorkflowGetRunProgressRequest
+internal sealed class SendSystemNotificationRequest
 {
-    /// <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 structured notification kind.</summary>
+    [JsonPropertyName("kind")]
+    public JsonElement? Kind { get; set; }
 
-    /// <summary>Optional phase identifier used to scope records and cursors.</summary>
-    [JsonPropertyName("phaseId")]
-    public string? PhaseId { get; set; }
+    /// <summary>Notification text to deliver to the model.</summary>
+    [JsonPropertyName("message")]
+    public string Message { get; set; } = string.Empty;
 
-    /// <summary>Workflow 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>Parameters for cancelling a workflow run.</summary>
+/// <summary>Result of aborting the current turn.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class WorkflowCancelRequest
+public sealed class AbortResult
 {
-    /// <summary>Workflow run identifier.</summary>
-    [JsonPropertyName("runId")]
-    public string RunId { get; set; } = string.Empty;
+    /// <summary>Error message if the abort failed.</summary>
+    [JsonPropertyName("error")]
+    public string? Error { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Whether the abort completed successfully.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
 }
 
-/// <summary>Parameters for pausing a running workflow.</summary>
+/// <summary>Parameters for aborting the current turn.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class WorkflowPauseRequest
+internal sealed class AbortRequest
 {
-    /// <summary>Workflow run identifier.</summary>
-    [JsonPropertyName("runId")]
-    public string RunId { get; set; } = string.Empty;
+    /// <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>RPC data type for SessionWorkflowPauseAtCheckpoint operations.</summary>
+/// <summary>Result of interrupting the main agent turn.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionWorkflowPauseAtCheckpointResult
+public sealed class InterruptMainTurnResult
 {
-    /// <summary>Whether this execution attempt must pause or may continue.</summary>
-    [JsonPropertyName("action")]
-    public WorkflowPauseCheckpointAction Action { 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>Parameters for an owned durable pause checkpoint.</summary>
+/// <summary>Parameters for interrupting the main agent turn.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class WorkflowPauseCheckpointRequest
+internal sealed class InterruptMainTurnRequest
 {
-    /// <summary>Opaque token identifying the execution attempt that reached the checkpoint.</summary>
-    [JsonPropertyName("executionToken")]
-    public string ExecutionToken { get; set; } = string.Empty;
-
-    /// <summary>Stable author-defined checkpoint key.</summary>
-    [JsonPropertyName("key")]
-    public string Key { get; set; } = string.Empty;
-
-    /// <summary>Workflow run identifier.</summary>
-    [JsonPropertyName("runId")]
-    public string RunId { get; set; } = string.Empty;
+    /// <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>Acknowledgement that a workflow request was accepted.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class WorkflowAckResult
-{
-}
-
-/// <summary>One ordered workflow progress line.</summary>
+/// <summary>Identifies the target session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class WorkflowLogLine
+internal sealed class SessionCancelAllBackgroundAgentsRequest
 {
-    /// <summary>Progress line kind.</summary>
-    [JsonPropertyName("kind")]
-    public WorkflowLogLineKind Kind { get; set; }
-
-    /// <summary>Monotonic sequence number within the workflow run.</summary>
-    [JsonPropertyName("seq")]
-    public long Seq { get; set; }
-
-    /// <summary>Progress text.</summary>
-    [JsonPropertyName("text")]
-    public string Text { get; set; } = string.Empty;
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Parameters for recording workflow progress.</summary>
+/// <summary>Parameters for shutting down the session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class WorkflowLogRequest
+internal sealed class ShutdownRequest
 {
-    /// <summary>Opaque token identifying the current workflow execution attempt.</summary>
-    [JsonPropertyName("executionToken")]
-    public string ExecutionToken { get; set; } = string.Empty;
-
-    /// <summary>Ordered progress lines to append.</summary>
-    [JsonPropertyName("lines")]
-    public IList<WorkflowLogLine> Lines { get => field ??= []; set; }
+    /// <summary>Dispatch deferred sessionEnd hooks in the background with their full per-hook timeoutSec instead of awaiting them under the short shared shutdown budget. Set this when the host process keeps running after the session closes (for example the CLI's /clear), so a slow hook neither blocks the close nor is aborted. Hooks still detached when the process later exits are terminated with it. Defaults to false.</summary>
+    [JsonPropertyName("detachSessionEndHooks")]
+    public bool? DetachSessionEndHooks { get; set; }
 
-    /// <summary>Workflow run identifier.</summary>
-    [JsonPropertyName("runId")]
-    public string RunId { get; set; } = string.Empty;
+    /// <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>Target session identifier.</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; }
 }
 
-/// <summary>Result of one workflow-scoped subagent call.</summary>
+/// <summary>Identifier of the session event that was emitted for the log message.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class WorkflowAgentResult
+public sealed class LogResult
 {
-    /// <summary>Agent result, omitted when the agent produced no result.</summary>
-    [JsonPropertyName("result")]
-    public JsonElement? Result { get; set; }
+    /// <summary>The unique identifier of the emitted session event.</summary>
+    [JsonPropertyName("eventId")]
+    public Guid EventId { get; set; }
 }
 
-/// <summary>Options for one workflow-scoped subagent call.</summary>
+/// <summary>Message text, optional severity level, persistence flag, optional follow-up URL, and optional tip.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class WorkflowAgentOptions
+internal sealed class LogRequest
 {
-    /// <summary>Optional built-in or custom agent name whose definition configures the subagent.</summary>
-    [JsonPropertyName("agent")]
-    public string? Agent { get; set; }
+    /// <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>Optional context tier override for the subagent.</summary>
-    [JsonPropertyName("contextTier")]
-    public ContextTier? ContextTier { 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>Optional label distinguishing otherwise identical memoized agent calls.</summary>
-    [JsonPropertyName("label")]
-    public string? Label { get; set; }
+    /// <summary>Human-readable message.</summary>
+    [JsonPropertyName("message")]
+    public string Message { get; set; } = string.Empty;
 
-    /// <summary>Optional model identifier for the subagent.</summary>
-    [JsonPropertyName("model")]
-    public string? Model { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 
-    /// <summary>Optional reasoning effort override for the subagent.</summary>
-    [JsonPropertyName("reasoningEffort")]
-    public string? ReasoningEffort { get; set; }
+    /// <summary>Optional actionable tip displayed alongside the message. Only honored on `level: "info"`.</summary>
+    [JsonPropertyName("tip")]
+    public string? Tip { get; set; }
 
-    /// <summary>Optional JSON Schema for structured agent output.</summary>
-    [JsonPropertyName("schema")]
-    public JsonElement? Schema { 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; }
 }
 
-/// <summary>Parameters for one workflow-scoped subagent call.</summary>
+/// <summary>Adapter-declared policy that tells clients whether discovery may run automatically.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class WorkflowAgentRequest
+public sealed class ModelProviderAutomaticDiscoveryPolicy
 {
-    /// <summary>Opaque token identifying the current workflow execution attempt.</summary>
-    [JsonPropertyName("executionToken")]
-    public string ExecutionToken { get; set; } = string.Empty;
-
-    /// <summary>Subagent execution options.</summary>
-    [JsonPropertyName("opts")]
-    public WorkflowAgentOptions Opts { get => field ??= new(); set; }
+    /// <summary>Whether automatic discovery is allowed, limited to configured providers, or explicit-only.</summary>
+    [JsonPropertyName("mode")]
+    public ModelProviderAutomaticDiscoveryMode Mode { get; set; }
 
-    /// <summary>Prompt to send to the subagent.</summary>
-    [JsonPropertyName("prompt")]
-    public string Prompt { get; set; } = string.Empty;
+    /// <summary>Maximum network scope used by this adapter during discovery.</summary>
+    [JsonPropertyName("networkScope")]
+    public ModelProviderDiscoveryNetworkScope NetworkScope { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>True when discovery requires non-null caller input. Omission or null is rejected before adapter execution. When false, omitted or null input selects adapter defaults without schema validation.</summary>
+    [JsonPropertyName("requiresInput")]
+    public bool RequiresInput { get; set; }
 
-    /// <summary>Workflow run identifier that owns the subagent.</summary>
-    [JsonPropertyName("workflowRunId")]
-    public string WorkflowRunId { get; set; } = string.Empty;
+    /// <summary>True when the adapter must be enabled by a trusted owner, such as a trusted extension, before automatic discovery may run.</summary>
+    [JsonPropertyName("requiresTrust")]
+    public bool RequiresTrust { get; set; }
 }
 
-/// <summary>Result of reading a workflow journal entry.</summary>
+/// <summary>An operation supported by a model-provider adapter.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class WorkflowJournalGetResult
+public sealed class ModelProviderAdapterOperationDescriptor
 {
-    /// <summary>Whether the journal contained the requested key.</summary>
-    [JsonPropertyName("hit")]
-    public bool Hit { get; set; }
+    /// <summary>Optional self-contained JSON Schema Draft 7 for non-null discovery input. Only supported on discover. No external references are resolved. Omitted or null input selects defaults when requiresInput is false. Without a schema, the adapter validates supplied input.</summary>
+    [JsonPropertyName("inputSchema")]
+    public JsonElement? InputSchema { 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>Supported operation name: `discover`, `getStatus`, or `models.list`. Unknown names and duplicate declarations are rejected.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
 }
 
-/// <summary>Parameters for reading a workflow journal entry.</summary>
+/// <summary>Contributor attribution, independent of routing identity and authorization.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class WorkflowJournalGetRequest
+public sealed class ModelProviderAttribution
 {
-    /// <summary>Opaque token identifying the current workflow 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>Human-readable contributor name, not the adapter display name.</summary>
+    [JsonPropertyName("ownerDisplayName")]
+    public string? OwnerDisplayName { get; set; }
 
-    /// <summary>Workflow run identifier.</summary>
-    [JsonPropertyName("runId")]
-    public string RunId { get; set; } = string.Empty;
+    /// <summary>Stable contributor identifier. Required and nonblank for extension and custom sources; optional for built-in and configured sources. Does not grant authority.</summary>
+    [JsonPropertyName("ownerId")]
+    public string? OwnerId { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Kind of component that supplied the adapter. Attribution does not confer authority.</summary>
+    [JsonPropertyName("source")]
+    public ModelProviderProvenanceSource Source { get; set; }
 }
 
-/// <summary>Parameters for storing a workflow journal entry.</summary>
+/// <summary>A normalized model-provider adapter in the session's effective catalog.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class WorkflowJournalPutRequest
+public sealed class ModelProviderAdapterDescriptor
 {
-    /// <summary>Opaque token identifying the current workflow execution attempt.</summary>
-    [JsonPropertyName("executionToken")]
-    public string ExecutionToken { get; set; } = string.Empty;
+    /// <summary>Stable opaque identity for routing to this adapter. Unique in the effective catalog, independent of live registration generations.</summary>
+    [JsonPropertyName("adapterId")]
+    public string AdapterId { get; set; } = string.Empty;
 
-    /// <summary>Namespaced journal key.</summary>
-    [JsonPropertyName("key")]
-    public string Key { get; set; } = string.Empty;
+    /// <summary>Adapter-declared policy for passive and automatic discovery.</summary>
+    [JsonPropertyName("automaticDiscovery")]
+    public ModelProviderAutomaticDiscoveryPolicy AutomaticDiscovery { get => field ??= new(); set; }
 
-    /// <summary>JSON result to memoize.</summary>
-    [JsonPropertyName("resultJson")]
-    public JsonElement ResultJson { get; set; }
+    /// <summary>Human-readable provider name.</summary>
+    [JsonPropertyName("displayName")]
+    public string DisplayName { get; set; } = string.Empty;
 
-    /// <summary>Workflow run identifier.</summary>
-    [JsonPropertyName("runId")]
-    public string RunId { get; set; } = string.Empty;
+    /// <summary>Operations supported by this provider adapter.</summary>
+    [JsonPropertyName("operations")]
+    public IList<ModelProviderAdapterOperationDescriptor> Operations { get => field ??= []; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Attribution for the adapter itself.</summary>
+    [JsonPropertyName("provenance")]
+    public ModelProviderAttribution Provenance { get => field ??= new(); set; }
+
+    /// <summary>Descriptive provider family, such as `ollama`. Different adapters may have the same family; use adapterId for routing.</summary>
+    [JsonPropertyName("providerKind")]
+    public string ProviderKind { get; set; } = string.Empty;
 }
 
-/// <summary>The session's authoritative model snapshot. Auto preference fields are configuration for the virtual `auto` model and do not change the selected model identifier. The context tier reflects `Session.getContextTier()`, restored from the session journal on resume.</summary>
+/// <summary>Normalized model-provider adapter definitions available to the session, not discovered instances.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class CurrentModel
+public sealed class ModelProviderAdapterCatalog
 {
-    /// <summary>Auto preference currently claimed by an in-progress activation. Null means the activation is returning to provider-default routing.</summary>
-    [JsonPropertyName("activatingAutoTier")]
-    public AutoTier? ActivatingAutoTier { get; set; }
-
-    /// <summary>Auto preference currently committed for the session. This can remain available while another model is selected so a later switch to `auto` can reuse it.</summary>
-    [JsonPropertyName("autoTier")]
-    public AutoTier? AutoTier { get; 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>Latest unclaimed Auto preference waiting for a future user turn. Null means the pending request is returning to provider-default routing.</summary>
-    [JsonPropertyName("pendingAutoTier")]
-    public AutoTier? PendingAutoTier { get; set; }
-
-    /// <summary>Captured base model to restore when leaving plan mode. Omitted outside plan mode or when no plan override has captured a base model. Persistent agent model requirements apply to this model rather than the temporary plan model.</summary>
-    [JsonPropertyName("planBaseModelId")]
-    public string? PlanBaseModelId { 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>Available provider adapters ordered by adapterId.</summary>
+    [JsonPropertyName("providers")]
+    public IList<ModelProviderAdapterDescriptor> Providers { get => field ??= []; set; }
 }
 
 /// <summary>Identifies the target session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionModelGetCurrentRequest
+internal sealed class SessionProvidersGetCatalogRequest
 {
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>RPC data type for ModelSwitchConfirmation operations.</summary>
+/// <summary>Attribution for the adapter that produced a provider row.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ModelSwitchConfirmation
+public sealed class ModelProviderProvenance
 {
-    /// <summary>Current conversation token count before switching models.</summary>
-    [JsonPropertyName("currentTokens")]
-    public double CurrentTokens { get; set; }
+    /// <summary>Stable opaque adapter identity from the effective catalog. Treat this as a whole identifier, not a parseable owner or kind.</summary>
+    [JsonPropertyName("adapterId")]
+    public string AdapterId { get; set; } = string.Empty;
 
-    /// <summary>Target model token limit used by the compaction preflight.</summary>
-    [JsonPropertyName("targetLimit")]
-    public double TargetLimit { get; set; }
+    /// <summary>Human-readable contributor name, not the adapter display name.</summary>
+    [JsonPropertyName("ownerDisplayName")]
+    public string? OwnerDisplayName { get; set; }
 
-    /// <summary>Display name of the model that requires compaction confirmation.</summary>
-    [JsonPropertyName("targetModelDisplayName")]
-    public string TargetModelDisplayName { get; set; } = string.Empty;
+    /// <summary>Stable contributor identifier when the adapter has an owner outside the runtime. Independent of the contribution mechanism and not a routing key.</summary>
+    [JsonPropertyName("ownerId")]
+    public string? OwnerId { get; set; }
+
+    /// <summary>Descriptive provider family that produced this row; not a routing key.</summary>
+    [JsonPropertyName("providerKind")]
+    public string ProviderKind { get; set; } = string.Empty;
+
+    /// <summary>Kind of component that supplied the adapter.</summary>
+    [JsonPropertyName("source")]
+    public ModelProviderProvenanceSource Source { get; set; }
 }
 
-/// <summary>The model identifier active on the session after the switch.</summary>
+/// <summary>Serializable reference to a discovered provider instance.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ModelSwitchToResult
+public sealed class ModelProviderInstanceReference
 {
-    /// <summary>Compaction confirmation projection when status is confirmation_required.</summary>
-    [JsonPropertyName("confirmation")]
-    public ModelSwitchConfirmation? Confirmation { get; set; }
+    /// <summary>Stable opaque identity of the adapter that owns this reference. Must be present in the target session's effective catalog.</summary>
+    [JsonPropertyName("adapterId")]
+    public string AdapterId { 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>Stable instance identifier derived by the provider adapter, such as `ollama:{normalizedEndpoint}`.</summary>
+    [JsonPropertyName("id")]
+    public string Id { get; set; } = string.Empty;
 
-    /// <summary>Deprecation warnings associated with the selected model or options.</summary>
-    [JsonPropertyName("deprecationWarnings")]
-    public IList<string>? DeprecationWarnings { get; set; }
+    /// <summary>Absolute provider management URI. The adapter validates normalization, supported schemes, and permission to access it against its bound configuration; a reference does not grant authority.</summary>
+    [Url]
+    [StringSyntax(StringSyntaxAttribute.Uri)]
+    [JsonPropertyName("managementEndpoint")]
+    public string ManagementEndpoint { get; set; } = string.Empty;
 
-    /// <summary>User-facing outcome message for the model switch.</summary>
-    [JsonPropertyName("message")]
-    public string? Message { get; set; }
+    /// <summary>Descriptive provider family. Must match the selected adapter; not a routing key.</summary>
+    [JsonPropertyName("providerKind")]
+    public string ProviderKind { get; set; } = string.Empty;
+}
 
-    /// <summary>Currently active model identifier after the switch.</summary>
-    [JsonPropertyName("modelId")]
-    public string? ModelId { get; set; }
+/// <summary>A normalized model-provider instance discovered by the runtime.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class ModelProviderInstance
+{
+    /// <summary>Human-readable instance name.</summary>
+    [JsonPropertyName("displayName")]
+    public string DisplayName { get; set; } = string.Empty;
 
-    /// <summary>Authoritative model and Auto preference state after an immediate switch. For deferred switches this remains the current state until the queued change drains.</summary>
-    [JsonPropertyName("modelState")]
-    public CurrentModel? ModelState { get; set; }
+    /// <summary>Inference API endpoint when the provider exposes one separately from its management endpoint.</summary>
+    [Url]
+    [StringSyntax(StringSyntaxAttribute.Uri)]
+    [JsonPropertyName("inferenceEndpoint")]
+    public string? InferenceEndpoint { get; set; }
 
-    /// <summary>Persistence failure encountered after applying the model switch.</summary>
-    [JsonPropertyName("persistenceError")]
-    public string? PersistenceError { get; set; }
+    /// <summary>Transport to use for inference against this instance.</summary>
+    [JsonPropertyName("inferenceTransport")]
+    public ProviderEndpointTransport? InferenceTransport { get; set; }
 
-    /// <summary>Stable queue item identifier when this request was enqueued. Remains present if the item drains before the response is returned.</summary>
-    [JsonPropertyName("queueId")]
-    public string? QueueId { get; set; }
+    /// <summary>Provider family to use for inference against this instance.</summary>
+    [JsonPropertyName("inferenceType")]
+    public ProviderEndpointType? InferenceType { get; set; }
 
-    /// <summary>Lifecycle result for the requested switch.</summary>
-    [JsonPropertyName("status")]
-    public string? Status { get; set; }
+    /// <summary>Wire API to use for inference against this instance, when required by the provider family.</summary>
+    [JsonPropertyName("inferenceWireApi")]
+    public ProviderEndpointWireApi? InferenceWireApi { get; set; }
 
-    /// <summary>User-facing warning produced while applying the model switch.</summary>
-    [JsonPropertyName("warning")]
-    public string? Warning { get; set; }
-}
+    /// <summary>Attribution for the adapter that produced this instance.</summary>
+    [JsonPropertyName("provenance")]
+    public ModelProviderProvenance Provenance { get => field ??= new(); set; }
 
-/// <summary>Environment variables consulted while resolving model-picker settings.</summary>
-public sealed class ModelPickerSettingsContextEnvironment
-{
+    /// <summary>Self-contained reference for subsequent provider operations.</summary>
+    [JsonPropertyName("reference")]
+    public ModelProviderInstanceReference Reference { get => field ??= new(); set; }
 }
 
-/// <summary>Filesystem and environment context used to resolve model-picker settings.</summary>
+/// <summary>Typed provider-operation outcome. Use the code for control flow and the optional message for display.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ModelPickerSettingsContext
+public sealed class ModelProviderOperationOutcome
 {
-    /// <summary>Optional Copilot configuration directory containing persisted settings.</summary>
-    [JsonPropertyName("configDir")]
-    public string? ConfigDir { get; set; }
-
-    /// <summary>Environment variables consulted while resolving model-picker settings.</summary>
-    [JsonPropertyName("environment")]
-    public ModelPickerSettingsContextEnvironment Environment { get => field ??= new(); set; }
+    /// <summary>Machine-readable operation outcome.</summary>
+    [JsonPropertyName("code")]
+    public ModelProviderOperationOutcomeCode Code { get; set; }
 
-    /// <summary>User home directory used when resolving persisted settings.</summary>
-    [JsonPropertyName("homeDirectory")]
-    public string HomeDirectory { get; set; } = string.Empty;
+    /// <summary>Human-readable detail for non-success outcomes.</summary>
+    [JsonPropertyName("message")]
+    public string? Message { get; set; }
 }
 
-/// <summary>RPC data type for ModelPickerPersistence operations.</summary>
+/// <summary>Provider instances found by a discovery operation.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ModelPickerPersistenceRequest
+public sealed class ModelProviderDiscoverResult
 {
-    /// <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>Discovered provider instances. Empty when passive default discovery finds no reachable provider.</summary>
+    [JsonPropertyName("instances")]
+    public IList<ModelProviderInstance> Instances { get => field ??= []; set; }
 
-    /// <summary>Filesystem and environment context used to resolve settings persistence.</summary>
-    [JsonPropertyName("settingsContext")]
-    public ModelPickerSettingsContext SettingsContext { get => field ??= new(); set; }
+    /// <summary>Typed operation outcome. Passive discovery can return `absent` with an empty instance list.</summary>
+    [JsonPropertyName("outcome")]
+    public ModelProviderOperationOutcome Outcome { get => field ??= new(); set; }
 }
 
-/// <summary>Target model identifier and optional reasoning effort, summary, capability overrides, and context tier.</summary>
+/// <summary>Provider discovery parameters.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class ModelSwitchToRequest
+internal sealed class ModelProviderDiscoverRequest
 {
-    /// <summary>Optional Auto routing preference to stage atomically with selecting `auto`. Pass null to return to provider-default Auto routing. This field is rejected when `modelId` is not `auto`.</summary>
-    [JsonPropertyName("autoTier")]
-    public AutoTier? AutoTier { 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>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>Settings scope used when persisting the selected model.</summary>
-    [JsonPropertyName("modelChangeScope")]
-    public string? ModelChangeScope { 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>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. Pass null to clear any session effort override and fall back to the model's default. When omitted, the session's current effort is kept.</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>Opaque adapter identity returned by `session.providers.getCatalog`.</summary>
+    [JsonPropertyName("adapterId")]
+    public string AdapterId { get; set; } = string.Empty;
 
-    /// <summary>When true, evaluate context-window compaction policy before applying the switch.</summary>
-    [JsonPropertyName("runCompactionPreflight")]
-    public bool? RunCompactionPreflight { get; set; }
+    /// <summary>Provider-specific JSON input. Omission or null selects adapter defaults unless requiresInput is true. Non-null input is validated against the advertised Draft 7 schema when present; otherwise validation belongs to the adapter.</summary>
+    [JsonPropertyName("input")]
+    public JsonElement? Input { get; set; }
 
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
-
-    /// <summary>Origin to record on the effective `session.model_change` event for trusted in-process calls. Transport SDK calls are always recorded as `sdk`, regardless of this value.</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>Immediate acknowledgement and Auto preference snapshot after a switch request. This result never implies that a pending preference committed.</summary>
+/// <summary>Current health information for a provider instance.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ModelSwitchAutoTierResult
+public sealed class ModelProviderStatus
 {
-    /// <summary>Auto preference currently claimed by an in-progress activation. Null means the activation is returning to provider-default routing.</summary>
-    [JsonPropertyName("activatingAutoTier")]
-    public AutoTier? ActivatingAutoTier { get; set; }
-
-    /// <summary>Auto preference currently committed for the session.</summary>
-    [JsonPropertyName("effectiveAutoTier")]
-    public AutoTier? EffectiveAutoTier { get; set; }
+    /// <summary>Normalized provider instance.</summary>
+    [JsonPropertyName("instance")]
+    public ModelProviderInstance Instance { get => field ??= new(); set; }
 
-    /// <summary>Latest unclaimed Auto preference waiting for a future user turn.</summary>
-    [JsonPropertyName("pendingAutoTier")]
-    public AutoTier? PendingAutoTier { get; set; }
+    /// <summary>Typed operation outcome.</summary>
+    [JsonPropertyName("outcome")]
+    public ModelProviderOperationOutcome Outcome { get => field ??= new(); set; }
 
-    /// <summary>Immediate request status. `pending` means accepted but not committed.</summary>
+    /// <summary>Open provider status value, such as `healthy`, `unreachable`, or `notInstalled`.</summary>
     [JsonPropertyName("status")]
-    public ModelSwitchAutoTierStatus Status { get; set; }
+    public string Status { get; set; } = string.Empty;
 
-    /// <summary>Earlier unclaimed preference replaced by this request. This can be present with either status, including when selecting the effective preference cancels pending work.</summary>
-    [JsonPropertyName("supersededAutoTier")]
-    public AutoTier? SupersededAutoTier { get; set; }
+    /// <summary>Provider-reported version.</summary>
+    [JsonPropertyName("version")]
+    public string? Version { get; set; }
 }
 
-/// <summary>An Auto preference request for the session. This updates Auto configuration only; it does not change the selected model to `auto`.</summary>
+/// <summary>Provider status request parameters.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class ModelSwitchAutoTierRequest
+internal sealed class ModelProviderGetStatusRequest
 {
-    /// <summary>Auto preference to activate when a future user turn using the `auto` model safely mints a replacement model and token pair. Pass null to return to provider-default Auto routing.</summary>
-    [JsonPropertyName("autoTier")]
-    [JsonIgnore(Condition = JsonIgnoreCondition.Never)]
-    public AutoTier? AutoTier { get; set; }
+    /// <summary>Provider instance reference returned by discovery.</summary>
+    [JsonPropertyName("instance")]
+    public ModelProviderInstanceReference Instance { get => field ??= new(); set; }
 
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
-
-    /// <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>Managed, repository, and CLI model overrides to overlay onto the session at startup.</summary>
+/// <summary>Provider-reported model artifact metadata.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class ModelApplyStartupOverlayRequest
+public sealed class ModelArtifactDetails
 {
-    /// <summary>Effective default Auto routing preference from user and managed settings. Applies only to fresh sessions and never replaces a per-session selection.</summary>
-    [JsonPropertyName("autoTier")]
-    public AutoTier? AutoTier { get; set; }
+    /// <summary>Provider-reported model architecture.</summary>
+    [JsonPropertyName("architecture")]
+    public string? Architecture { get; set; }
 
-    /// <summary>Model explicitly selected by the CLI, when provided.</summary>
-    [JsonPropertyName("cliModel")]
-    public string? CliModel { get; set; }
+    /// <summary>Provider-reported model families.</summary>
+    [JsonPropertyName("families")]
+    public IList<string>? Families { get; set; }
 
-    /// <summary>Whether the overlay is being applied while resuming a deferred session.</summary>
-    [JsonPropertyName("deferredResume")]
-    public bool? DeferredResume { get; set; }
+    /// <summary>Primary model family.</summary>
+    [JsonPropertyName("family")]
+    public string? Family { get; set; }
 
-    /// <summary>Model required by device-managed policy, when configured.</summary>
-    [JsonPropertyName("deviceManagedModel")]
-    public string? DeviceManagedModel { get; set; }
+    /// <summary>Artifact format, such as `gguf`.</summary>
+    [JsonPropertyName("format")]
+    public string? Format { get; set; }
 
-    /// <summary>Context tier paired with the effective organization-managed model. Applies only when that concrete managed model is selected; it is ignored for Auto and for CLI, resume, or user overrides.</summary>
-    [JsonPropertyName("managedContextTier")]
-    public string? ManagedContextTier { get; set; }
+    /// <summary>Provider-reported parameter count label.</summary>
+    [JsonPropertyName("parameterSize")]
+    public string? ParameterSize { get; set; }
 
-    /// <summary>Reasoning effort paired with the effective organization-managed model. Applies only when that concrete managed model is selected; it is ignored for Auto and for CLI, resume, or user overrides.</summary>
-    [JsonPropertyName("managedReasoningEffort")]
-    public string? ManagedReasoningEffort { get; set; }
+    /// <summary>Provider-reported quantization label.</summary>
+    [JsonPropertyName("quantization")]
+    public string? Quantization { get; set; }
 
-    /// <summary>Startup default model from the enterprise policy helper, when configured. Weakest of the managed sources: it applies only when neither device nor server policy names a model, and an explicit user selection still wins.</summary>
-    [JsonPropertyName("policyHelperModel")]
-    public string? PolicyHelperModel { get; set; }
+    /// <summary>Provider-reported tokenizer.</summary>
+    [JsonPropertyName("tokenizer")]
+    public string? Tokenizer { get; set; }
+}
 
-    /// <summary>Auto routing preference selected by repository settings, when configured. Applied only when the overlay selects the Auto model; beside a concrete model it stays dormant.</summary>
-    [JsonPropertyName("repoAutoTier")]
-    public string? RepoAutoTier { get; set; }
+/// <summary>A non-fatal provider observation warning.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class ModelProviderWarning
+{
+    /// <summary>Machine-readable warning code.</summary>
+    [JsonPropertyName("code")]
+    public string Code { get; set; } = string.Empty;
 
-    /// <summary>Context tier selected by repository settings, when configured.</summary>
-    [JsonPropertyName("repoContextTier")]
-    public string? RepoContextTier { get; set; }
+    /// <summary>Human-readable warning message.</summary>
+    [JsonPropertyName("message")]
+    public string Message { get; set; } = string.Empty;
+}
 
-    /// <summary>Model selected by repository settings, when configured.</summary>
-    [JsonPropertyName("repoModel")]
-    public string? RepoModel { get; set; }
+/// <summary>A model offered for agent conversations. Missing capability metadata does not disqualify a candidate. Models known to be incompatible, such as embedding-only models, are excluded by the adapter.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class DiscoveredModel
+{
+    /// <summary>Provider-reported model capabilities. Omitted capability fields are unknown; explicit false values are preserved.</summary>
+    [JsonPropertyName("capabilities")]
+    public ModelCapabilities Capabilities { get => field ??= new(); set; }
 
-    /// <summary>Reasoning effort selected by repository settings, when configured.</summary>
-    [JsonPropertyName("repoReasoningEffort")]
-    public string? RepoReasoningEffort { get; set; }
+    /// <summary>Provider-reported model artifact details.</summary>
+    [JsonPropertyName("details")]
+    public ModelArtifactDetails Details { get => field ??= new(); set; }
 
-    /// <summary>Model required by server-managed policy, when configured.</summary>
-    [JsonPropertyName("serverManagedModel")]
-    public string? ServerManagedModel { get; set; }
+    /// <summary>Provider-reported artifact digest.</summary>
+    [JsonPropertyName("digest")]
+    public string? Digest { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Provider-native model identifier.</summary>
+    [JsonPropertyName("id")]
+    public string Id { get; set; } = string.Empty;
 
-/// <summary>The applied host allowlist and effective session model policy after intersection.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ModelSetAllowedModelsResult
-{
-    /// <summary>Normalized host allowlist. Omitted when the host restriction was cleared, or when a relay client does not return the host policy.</summary>
-    [JsonPropertyName("allowedModels")]
-    public IList<string>? AllowedModels { get; set; }
+    /// <summary>Provider-reported last-modified timestamp.</summary>
+    [JsonPropertyName("modifiedAt")]
+    public DateTimeOffset? ModifiedAt { get; set; }
 
-    /// <summary>Effective exact IDs or repository policy patterns after applying the host restriction. Omitted by relay clients that do not return the host policy.</summary>
-    [JsonPropertyName("effectiveAllowedModels")]
-    public IList<string>? EffectiveAllowedModels { get; set; }
+    /// <summary>Provider-reported display name.</summary>
+    [JsonPropertyName("name")]
+    public string? Name { get; set; }
 
-    /// <summary>Effective deterministic fallback model, when the policy defines one.</summary>
-    [JsonPropertyName("fallbackModel")]
-    public string? FallbackModel { get; set; }
+    /// <summary>Attribution for the adapter that produced this model row.</summary>
+    [JsonPropertyName("provenance")]
+    public ModelProviderProvenance Provenance { get => field ??= new(); set; }
 
-    /// <summary>Selected session model after reconciling a now-disallowed concrete selection.</summary>
-    [JsonPropertyName("modelId")]
-    public string? ModelId { get; set; }
+    /// <summary>Provider-reported artifact size in bytes.</summary>
+    [JsonPropertyName("sizeBytes")]
+    public long? SizeBytes { get; set; }
+
+    /// <summary>Non-fatal warnings encountered while enriching this model.</summary>
+    [JsonPropertyName("warnings")]
+    public IList<ModelProviderWarning> Warnings { get => field ??= []; set; }
 }
 
-/// <summary>Host-supplied exact model selection IDs to allow for this running session. CAPI IDs are intersected with repository `.github/allowed_models.txt` policy; provider-qualified IDs remain exempt from repository-only policy but are restricted by this host list. Omit or pass null to clear the host restriction; an explicit empty or disjoint list is rejected. Validation and pre-selection fallback failures preserve the previous restriction. Failures after a fallback selection commits retain the new restriction and selected model; callers should inspect current session state after such an error.</summary>
+/// <summary>Models offered for agent conversations by one provider instance. Adapters exclude known-incompatible models, but retain candidates with unknown capabilities. Listing does not guarantee compatibility.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class ModelSetAllowedModelsRequest
+public sealed class DiscoveredModelList
 {
-    /// <summary>Exact model IDs to permit, or null to clear the host restriction.</summary>
-    [JsonPropertyName("allowedModels")]
-    public IList<string>? AllowedModels { get; set; }
+    /// <summary>Provider-native models in provider order.</summary>
+    [JsonPropertyName("models")]
+    public IList<DiscoveredModel> Models { get => field ??= []; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Typed operation outcome.</summary>
+    [JsonPropertyName("outcome")]
+    public ModelProviderOperationOutcome Outcome { get => field ??= new(); 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>
+/// <summary>Provider model inventory request parameters.</summary>
 [Experimental(global::GitHub.Copilot.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(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class ModelSetReasoningEffortRequest
+internal sealed class ModelProviderModelsListRequest
 {
-    /// <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>Provider instance reference returned by discovery.</summary>
+    [JsonPropertyName("instance")]
+    public ModelProviderInstanceReference Instance { get => field ??= new(); set; }
 
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Cost-category metadata for a CAPI model.</summary>
+/// <summary>Vision-specific limits.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionModelPriceCategory
+public sealed class ModelCapabilitiesOverrideLimitsVision
 {
-    /// <summary>CAPI model identifier.</summary>
-    [JsonPropertyName("id")]
-    public string Id { get; set; } = string.Empty;
+    /// <summary>Maximum image size in bytes.</summary>
+    [JsonPropertyName("max_prompt_image_size")]
+    public long? MaxPromptImageSize { get; set; }
 
-    /// <summary>Cost category assigned to the model.</summary>
-    [JsonPropertyName("priceCategory")]
-    public ModelPickerPriceCategory PriceCategory { 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>One model provider available to the session — the model analog of the account `ProviderDescriptor`. Opaque id/label/kind plus a stable ordering; central code never branches on kind.</summary>
+/// <summary>Token limits for prompts, outputs, and context window.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ModelProviderDescriptor
+public sealed class ModelCapabilitiesOverrideLimits
 {
-    /// <summary>Opaque, stable provider id, stamped onto every model this provider returns.</summary>
-    [JsonPropertyName("id")]
-    public string Id { get; set; } = string.Empty;
+    /// <summary>Maximum total context window size in tokens.</summary>
+    [JsonPropertyName("max_context_window_tokens")]
+    public long? MaxContextWindowTokens { get; set; }
 
-    /// <summary>The neutral provider kind.</summary>
-    [JsonPropertyName("kind")]
-    public ModelProviderKind Kind { get; set; }
+    /// <summary>Maximum number of output/completion tokens.</summary>
+    [JsonPropertyName("max_output_tokens")]
+    public long? MaxOutputTokens { get; set; }
 
-    /// <summary>Human-readable menu label, owned by the runtime so every consumer renders identical text.</summary>
-    [JsonPropertyName("label")]
-    public string Label { get; set; } = string.Empty;
+    /// <summary>Maximum number of prompt/input tokens.</summary>
+    [JsonPropertyName("max_prompt_tokens")]
+    public long? MaxPromptTokens { get; set; }
 
-    /// <summary>Stable ordering key for presenting providers in a deterministic sequence.</summary>
-    [JsonPropertyName("ordering")]
-    public long Ordering { get; set; }
+    /// <summary>Vision-specific limits.</summary>
+    [JsonPropertyName("vision")]
+    public ModelCapabilitiesOverrideLimitsVision? Vision { get; set; }
 }
 
-/// <summary>The list of models available to this session.</summary>
+/// <summary>Feature flags indicating what the model supports.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionModelList
+public sealed class ModelCapabilitiesOverrideSupports
 {
-    /// <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>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>Resolved Anthropic adaptive-thinking capability — unsupported / optional / required / adaptive_only. 'required' models reject thinking.type='enabled' with HTTP 400 but still accept 'disabled' (e.g. opus-4.7/4.8/5, sonnet-5); 'adaptive_only' models accept nothing but 'adaptive' (e.g. fable, mythos).</summary>
+    [JsonPropertyName("adaptive_thinking")]
+    public AdaptiveThinkingSupport? AdaptiveThinking { get; set; }
 
-    /// <summary>The model providers available to this session, in ordering order, resolved from the account roster; empty when no provider is entitled (logged out / seatless). Each model in `list` carries its own provider reference; this roster gives the deterministic provider sequence and lets a consumer group by provider without deriving ordering from the model list. Central code never branches on a provider kind.</summary>
-    [JsonPropertyName("providers")]
-    public IList<ModelProviderDescriptor>? Providers { get; set; }
+    /// <summary>Whether this model supports reasoning effort configuration.</summary>
+    [JsonPropertyName("reasoningEffort")]
+    public bool? ReasoningEffort { 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>Whether this model supports canonical tool calling.</summary>
+    [JsonPropertyName("toolCalls")]
+    public bool? ToolCalls { get; set; }
 
-/// <summary>RPC data type for SessionModelList operations.</summary>
-[Experimental(global::GitHub.Copilot.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 this model supports vision/image input.</summary>
+    [JsonPropertyName("vision")]
+    public bool? Vision { get; set; }
 }
 
-/// <summary>RPC data type for SessionModelListRequestWithSession operations.</summary>
+/// <summary>Optional capability overrides (vision, tool_calls, reasoning, etc.).</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionModelListRequestWithSession
+public sealed class ModelCapabilitiesOverride
 {
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Token limits for prompts, outputs, and context window.</summary>
+    [JsonPropertyName("limits")]
+    public ModelCapabilitiesOverrideLimits? Limits { 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>Feature flags indicating what the model supports.</summary>
+    [JsonPropertyName("supports")]
+    public ModelCapabilitiesOverrideSupports? Supports { get; set; }
 }
 
-/// <summary>Identifies the target session.</summary>
+/// <summary>RPC data type for ProtocolSystemMessageAppendConfig operations.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionModeGetRequest
+public sealed class ProtocolSystemMessageAppendConfig
 {
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Text appended to the standard system prompt.</summary>
+    [JsonPropertyName("content")]
+    public string? Content { get; set; }
+
+    /// <summary>Append-mode discriminator. Omission also selects append mode.</summary>
+    [JsonPropertyName("mode")]
+    public ProtocolAppendMode? Mode { get; set; }
 }
 
-/// <summary>Outcome of a session mode change, including any model switch it triggered and follow-up the host must perform.</summary>
+/// <summary>RPC data type for SystemMessageBlock operations.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ModeSetResult
+public sealed class SystemMessageBlock
 {
-    /// <summary>Whether the host should arm an interactive continuation after the mode change.</summary>
-    [JsonPropertyName("armInteractiveContinuation")]
-    public bool? ArmInteractiveContinuation { get; set; }
-
-    /// <summary>Compaction confirmation required before the mode change can complete.</summary>
-    [JsonPropertyName("confirmation")]
-    public ModelSwitchConfirmation? Confirmation { get; set; }
-
-    /// <summary>Whether the host must defer implementing the requested mode change.</summary>
-    [JsonPropertyName("deferImplementation")]
-    public bool? DeferImplementation { get; set; }
-
-    /// <summary>Deprecation warnings associated with the model selected by the mode change.</summary>
-    [JsonPropertyName("deprecationWarnings")]
-    public IList<string>? DeprecationWarnings { 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 the requested mode was applied to the session. False only when an 'expectedMode' precondition did not hold, in which case any model change reported alongside it was still applied.</summary>
-    [JsonPropertyName("modeApplied")]
-    public bool? ModeApplied { get; set; }
-
-    /// <summary>Whether applying the mode changed the active model.</summary>
-    [JsonPropertyName("modelChanged")]
-    public bool ModelChanged { get; set; }
+    /// <summary>Whether providers with explicit prompt caching should place a cache breakpoint after this block.</summary>
+    [JsonPropertyName("cacheBreakpoint")]
+    public bool? CacheBreakpoint { get; set; }
 
-    /// <summary>Lifecycle status of the requested mode change.</summary>
-    [JsonPropertyName("status")]
-    public string Status { get; set; } = string.Empty;
+    /// <summary>Text content for this system-message block.</summary>
+    [JsonPropertyName("content")]
+    public string Content { get; set; } = string.Empty;
 
-    /// <summary>User-facing warning produced while applying the mode change.</summary>
-    [JsonPropertyName("warning")]
-    public string? Warning { get; set; }
+    /// <summary>Whether the block is static and may be cached independently of dynamic prompt content.</summary>
+    [JsonPropertyName("isStatic")]
+    public bool? IsStatic { get; set; }
 }
 
-/// <summary>Agent interaction mode to apply to the session.</summary>
+/// <summary>RPC data type for ProtocolSystemMessageReplaceConfig operations.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class ModeSetRequest
+public sealed class ProtocolSystemMessageReplaceConfig
 {
-    /// <summary>Explicit response to a model-switch compaction preflight.</summary>
-    [JsonPropertyName("compactionDecision")]
-    public string? CompactionDecision { get; set; }
-
-    /// <summary>Mode the session must currently be in for the change to apply. When set and the session is in a different mode the request is a no-op and reports status 'unchanged'.</summary>
-    [JsonPropertyName("expectedMode")]
-    public SessionMode? ExpectedMode { get; set; }
+    /// <summary>Complete replacement system-message text.</summary>
+    [JsonPropertyName("content")]
+    public string Content { get; set; } = string.Empty;
 
-    /// <summary>Session whose plan-mode base state should be inherited.</summary>
-    [JsonPropertyName("inheritPlanBaseFromSessionId")]
-    public string? InheritPlanBaseFromSessionId { get; set; }
+    /// <summary>Optional structured blocks corresponding to the replacement content.</summary>
+    [JsonPropertyName("contentBlocks")]
+    public IList<SystemMessageBlock>? ContentBlocks { get; set; }
 
-    /// <summary>The session mode the agent is operating in.</summary>
+    /// <summary>Replace-mode discriminator.</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;
+    public ProtocolReplaceMode Mode { get; set; }
 }
 
-/// <summary>The session's friendly name, or null when not yet set.</summary>
+/// <summary>RPC data type for ProtocolStaticSectionOverride operations.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class NameGetResult
+public sealed class ProtocolStaticSectionOverride
 {
-    /// <summary>The session name (user-set or auto-generated), or null if not yet set.</summary>
-    [JsonPropertyName("name")]
-    public string? Name { get; set; }
-}
+    /// <summary>Declarative operation applied to the section.</summary>
+    [JsonPropertyName("action")]
+    public ProtocolStaticSectionAction Action { get; set; }
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionNameGetRequest
-{
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Optional content used by replace, append, and prepend operations.</summary>
+    [JsonPropertyName("content")]
+    public string? Content { get; set; }
 }
 
-/// <summary>New friendly name to apply to the session.</summary>
+/// <summary>Polymorphic base type discriminated by <c>action</c>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class NameSetRequest
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "action",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(ProtocolMarkerSectionOverrideTransform), "transform")]
+[JsonDerivedType(typeof(ProtocolMarkerSectionOverridePreserve), "preserve")]
+public partial class ProtocolMarkerSectionOverride
 {
-    /// <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>The type discriminator.</summary>
+    [JsonPropertyName("action")]
+    public virtual string Action { get; set; } = string.Empty;
 }
 
-/// <summary>Indicates whether the auto-generated summary was applied as the session's name.</summary>
-[Experimental(global::GitHub.Copilot.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>Auto-generated session summary to apply as the session's name when no user-set name exists.</summary>
+/// <summary>The <c>transform</c> variant of <see cref="ProtocolMarkerSectionOverride"/>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class NameSetAutoRequest
+public partial class ProtocolMarkerSectionOverrideTransform : ProtocolMarkerSectionOverride
 {
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-
-    /// <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;
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Action => "transform";
 }
 
-/// <summary>Existence, contents, and resolved path of the session plan file.</summary>
+/// <summary>The <c>preserve</c> variant of <see cref="ProtocolMarkerSectionOverride"/>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class PlanReadResult
+public partial class ProtocolMarkerSectionOverridePreserve : ProtocolMarkerSectionOverride
 {
-    /// <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; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Action => "preserve";
 }
 
-/// <summary>Identifies the target session.</summary>
+/// <summary>JSON union data type for <c>ProtocolSectionOverride</c>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionPlanReadRequest
+[JsonConverter(typeof(Converter))]
+public sealed partial class ProtocolSectionOverride
 {
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Gets the value when this instance contains <see cref="ProtocolStaticSectionOverride"/>.</summary>
+    public ProtocolStaticSectionOverride? ProtocolStaticSectionOverride { get; }
 
-/// <summary>Replacement contents to write to the session plan file.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class PlanUpdateRequest
-{
-    /// <summary>The new content for the plan file.</summary>
-    [JsonPropertyName("content")]
-    public string Content { get; set; } = string.Empty;
+    /// <summary>Gets the value when this instance contains <see cref="ProtocolMarkerSectionOverride"/>.</summary>
+    public ProtocolMarkerSectionOverride? ProtocolMarkerSectionOverride { get; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Initializes a new instance of the <see cref="ProtocolSectionOverride"/> class from <see cref="ProtocolStaticSectionOverride"/>.</summary>
+    public ProtocolSectionOverride(ProtocolStaticSectionOverride value)
+    {
+        ArgumentNullException.ThrowIfNull(value);
+        ProtocolStaticSectionOverride = value;
+    }
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionPlanDeleteRequest
-{
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Converts <see cref="ProtocolStaticSectionOverride"/> to <see cref="ProtocolSectionOverride"/>.</summary>
+    public static implicit operator ProtocolSectionOverride(ProtocolStaticSectionOverride value) => new(value);
 
-/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class PlanSqlTodosRow
-{
-    /// <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>Initializes a new instance of the <see cref="ProtocolSectionOverride"/> class from <see cref="ProtocolMarkerSectionOverride"/>.</summary>
+    public ProtocolSectionOverride(ProtocolMarkerSectionOverride value)
+    {
+        ArgumentNullException.ThrowIfNull(value);
+        ProtocolMarkerSectionOverride = value;
+    }
 
-    /// <summary>Todo description.</summary>
-    [JsonPropertyName("description")]
-    public string? Description { get; set; }
+    /// <summary>Converts <see cref="ProtocolMarkerSectionOverride"/> to <see cref="ProtocolSectionOverride"/>.</summary>
+    public static implicit operator ProtocolSectionOverride(ProtocolMarkerSectionOverride value) => new(value);
 
-    /// <summary>Todo identifier.</summary>
-    [JsonPropertyName("id")]
-    public string? Id { get; set; }
+    /// <summary>Provides a <see cref="JsonConverter{ProtocolSectionOverride}"/> for serializing <see cref="ProtocolSectionOverride"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<ProtocolSectionOverride>
+    {
+        /// <inheritdoc />
+        public override ProtocolSectionOverride Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            if (reader.TokenType == JsonTokenType.Null)
+            {
+                throw new JsonException("Expected JSON object for ProtocolSectionOverride.");
+            }
 
-    /// <summary>Todo status.</summary>
-    [JsonPropertyName("status")]
-    public string? Status { get; set; }
+            using var document = JsonDocument.ParseValue(ref reader);
+            var element = document.RootElement;
+            if (element.ValueKind == JsonValueKind.Object && (element.TryGetProperty("action", out _) && element.GetProperty("action").ValueKind == JsonValueKind.String && (element.GetProperty("action").GetString() == "replace" || element.GetProperty("action").GetString() == "remove" || element.GetProperty("action").GetString() == "append" || element.GetProperty("action").GetString() == "prepend")))
+            {
+                var protocolStaticSectionOverride = JsonSerializer.Deserialize(element, RpcJsonContext.Default.ProtocolStaticSectionOverride);
+                return protocolStaticSectionOverride is null ? throw new JsonException("Expected ProtocolStaticSectionOverride value.") : new ProtocolSectionOverride(protocolStaticSectionOverride);
+            }
+            if ((element.ValueKind == JsonValueKind.Object && (element.TryGetProperty("action", out _) && element.GetProperty("action").ValueKind == JsonValueKind.String && (element.GetProperty("action").GetString() == "transform")) || element.ValueKind == JsonValueKind.Object && (element.TryGetProperty("action", out _) && element.GetProperty("action").ValueKind == JsonValueKind.String && (element.GetProperty("action").GetString() == "preserve"))))
+            {
+                var protocolMarkerSectionOverride = JsonSerializer.Deserialize(element, RpcJsonContext.Default.ProtocolMarkerSectionOverride);
+                return protocolMarkerSectionOverride is null ? throw new JsonException("Expected ProtocolMarkerSectionOverride value.") : new ProtocolSectionOverride(protocolMarkerSectionOverride);
+            }
 
-    /// <summary>Todo title.</summary>
-    [JsonPropertyName("title")]
-    public string? Title { get; set; }
-}
+            throw new JsonException("JSON value did not match any ProtocolSectionOverride variant.");
+        }
 
-/// <summary>Todo rows read from the session SQL database. Empty when no session database is available.</summary>
-[Experimental(global::GitHub.Copilot.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; }
-}
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, ProtocolSectionOverride value, JsonSerializerOptions options)
+        {
+            if (value.ProtocolStaticSectionOverride is { } protocolStaticSectionOverride)
+            {
+                JsonSerializer.Serialize(writer, protocolStaticSectionOverride, RpcJsonContext.Default.ProtocolStaticSectionOverride);
+                return;
+            }
+            if (value.ProtocolMarkerSectionOverride is { } protocolMarkerSectionOverride)
+            {
+                JsonSerializer.Serialize(writer, protocolMarkerSectionOverride, RpcJsonContext.Default.ProtocolMarkerSectionOverride);
+                return;
+            }
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionPlanReadSqlTodosRequest
-{
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+            throw new JsonException("No ProtocolSectionOverride variant value is set.");
+        }
+    }
 }
 
-/// <summary>A single dependency edge read from the session SQL `todo_deps` table, indicating that one todo must complete before another.</summary>
+/// <summary>RPC data type for ProtocolSystemMessageCustomizeConfig operations.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class PlanSqlTodoDependency
+public sealed class ProtocolSystemMessageCustomizeConfig
 {
-    /// <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>Text appended after the customized sections.</summary>
+    [JsonPropertyName("content")]
+    public string? Content { get; set; }
 
-/// <summary>Todo rows + dependency edges read from the session SQL database.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class PlanReadSqlTodosWithDependenciesResult
-{
-    /// <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>Customize-mode discriminator.</summary>
+    [JsonPropertyName("mode")]
+    public ProtocolCustomizeMode Mode { get; set; }
 
-    /// <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>Named standard-prompt section overrides.</summary>
+    [JsonPropertyName("sections")]
+    public IDictionary<string, ProtocolSectionOverride>? Sections { get; set; }
 }
 
-/// <summary>Identifies the target session.</summary>
+/// <summary>JSON union data type for <c>ProtocolSystemMessageConfig</c>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionPlanReadSqlTodosWithDependenciesRequest
-{
-    /// <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
+[JsonConverter(typeof(Converter))]
+public sealed partial class ProtocolSystemMessageConfig
 {
-    /// <summary>Current Git branch.</summary>
-    [JsonPropertyName("branch")]
-    public string? Branch { get; set; }
+    /// <summary>Gets the value when this instance contains <see cref="ProtocolSystemMessageAppendConfig"/>.</summary>
+    public ProtocolSystemMessageAppendConfig? ProtocolSystemMessageAppendConfig { get; }
 
-    /// <summary>Whether the per-session Chronicle upgrade prompt was dismissed for the workspace.</summary>
-    [JsonPropertyName("chronicle_sync_dismissed")]
-    public bool? ChronicleSyncDismissed { get; set; }
+    /// <summary>Gets the value when this instance contains <see cref="ProtocolSystemMessageReplaceConfig"/>.</summary>
+    public ProtocolSystemMessageReplaceConfig? ProtocolSystemMessageReplaceConfig { get; }
 
-    /// <summary>Name of the client that created the workspace.</summary>
-    [JsonPropertyName("client_name")]
-    public string? ClientName { get; set; }
+    /// <summary>Gets the value when this instance contains <see cref="ProtocolSystemMessageCustomizeConfig"/>.</summary>
+    public ProtocolSystemMessageCustomizeConfig? ProtocolSystemMessageCustomizeConfig { get; }
 
-    /// <summary>Timestamp when the workspace was created.</summary>
-    [JsonPropertyName("created_at")]
-    public DateTimeOffset? CreatedAt { get; set; }
+    /// <summary>Initializes a new instance of the <see cref="ProtocolSystemMessageConfig"/> class from <see cref="ProtocolSystemMessageAppendConfig"/>.</summary>
+    public ProtocolSystemMessageConfig(ProtocolSystemMessageAppendConfig value)
+    {
+        ArgumentNullException.ThrowIfNull(value);
+        ProtocolSystemMessageAppendConfig = value;
+    }
 
-    /// <summary>Current working directory associated with the workspace.</summary>
-    [JsonPropertyName("cwd")]
-    public string? Cwd { get; set; }
+    /// <summary>Converts <see cref="ProtocolSystemMessageAppendConfig"/> to <see cref="ProtocolSystemMessageConfig"/>.</summary>
+    public static implicit operator ProtocolSystemMessageConfig(ProtocolSystemMessageAppendConfig value) => new(value);
 
-    /// <summary>Git repository root associated with the workspace.</summary>
-    [JsonPropertyName("git_root")]
-    public string? GitRoot { get; set; }
+    /// <summary>Initializes a new instance of the <see cref="ProtocolSystemMessageConfig"/> class from <see cref="ProtocolSystemMessageReplaceConfig"/>.</summary>
+    public ProtocolSystemMessageConfig(ProtocolSystemMessageReplaceConfig value)
+    {
+        ArgumentNullException.ThrowIfNull(value);
+        ProtocolSystemMessageReplaceConfig = value;
+    }
 
-    /// <summary>Allowed values for the `WorkspacesWorkspaceDetailsHostType` enumeration.</summary>
-    [JsonPropertyName("host_type")]
-    public WorkspacesWorkspaceDetailsHostType? HostType { get; set; }
+    /// <summary>Converts <see cref="ProtocolSystemMessageReplaceConfig"/> to <see cref="ProtocolSystemMessageConfig"/>.</summary>
+    public static implicit operator ProtocolSystemMessageConfig(ProtocolSystemMessageReplaceConfig value) => new(value);
 
-    /// <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)]
+    /// <summary>Initializes a new instance of the <see cref="ProtocolSystemMessageConfig"/> class from <see cref="ProtocolSystemMessageCustomizeConfig"/>.</summary>
+    public ProtocolSystemMessageConfig(ProtocolSystemMessageCustomizeConfig value)
+    {
+        ArgumentNullException.ThrowIfNull(value);
+        ProtocolSystemMessageCustomizeConfig = value;
+    }
+
+    /// <summary>Converts <see cref="ProtocolSystemMessageCustomizeConfig"/> to <see cref="ProtocolSystemMessageConfig"/>.</summary>
+    public static implicit operator ProtocolSystemMessageConfig(ProtocolSystemMessageCustomizeConfig value) => new(value);
+
+    /// <summary>Provides a <see cref="JsonConverter{ProtocolSystemMessageConfig}"/> for serializing <see cref="ProtocolSystemMessageConfig"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<ProtocolSystemMessageConfig>
+    {
+        /// <inheritdoc />
+        public override ProtocolSystemMessageConfig Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            if (reader.TokenType == JsonTokenType.Null)
+            {
+                throw new JsonException("Expected JSON object for ProtocolSystemMessageConfig.");
+            }
+
+            using var document = JsonDocument.ParseValue(ref reader);
+            var element = document.RootElement;
+            if (element.ValueKind == JsonValueKind.Object && (!element.TryGetProperty("mode", out _) || (element.TryGetProperty("mode", out _) && element.GetProperty("mode").ValueKind == JsonValueKind.String && (element.GetProperty("mode").GetString() == "append"))))
+            {
+                var protocolSystemMessageAppendConfig = JsonSerializer.Deserialize(element, RpcJsonContext.Default.ProtocolSystemMessageAppendConfig);
+                return protocolSystemMessageAppendConfig is null ? throw new JsonException("Expected ProtocolSystemMessageAppendConfig value.") : new ProtocolSystemMessageConfig(protocolSystemMessageAppendConfig);
+            }
+            if (element.ValueKind == JsonValueKind.Object && (element.TryGetProperty("mode", out _) && element.GetProperty("mode").ValueKind == JsonValueKind.String && (element.GetProperty("mode").GetString() == "replace")))
+            {
+                var protocolSystemMessageReplaceConfig = JsonSerializer.Deserialize(element, RpcJsonContext.Default.ProtocolSystemMessageReplaceConfig);
+                return protocolSystemMessageReplaceConfig is null ? throw new JsonException("Expected ProtocolSystemMessageReplaceConfig value.") : new ProtocolSystemMessageConfig(protocolSystemMessageReplaceConfig);
+            }
+            if (element.ValueKind == JsonValueKind.Object && (element.TryGetProperty("mode", out _) && element.GetProperty("mode").ValueKind == JsonValueKind.String && (element.GetProperty("mode").GetString() == "customize")))
+            {
+                var protocolSystemMessageCustomizeConfig = JsonSerializer.Deserialize(element, RpcJsonContext.Default.ProtocolSystemMessageCustomizeConfig);
+                return protocolSystemMessageCustomizeConfig is null ? throw new JsonException("Expected ProtocolSystemMessageCustomizeConfig value.") : new ProtocolSystemMessageConfig(protocolSystemMessageCustomizeConfig);
+            }
+
+            throw new JsonException("JSON value did not match any ProtocolSystemMessageConfig variant.");
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, ProtocolSystemMessageConfig value, JsonSerializerOptions options)
+        {
+            if (value.ProtocolSystemMessageAppendConfig is { } protocolSystemMessageAppendConfig)
+            {
+                JsonSerializer.Serialize(writer, protocolSystemMessageAppendConfig, RpcJsonContext.Default.ProtocolSystemMessageAppendConfig);
+                return;
+            }
+            if (value.ProtocolSystemMessageReplaceConfig is { } protocolSystemMessageReplaceConfig)
+            {
+                JsonSerializer.Serialize(writer, protocolSystemMessageReplaceConfig, RpcJsonContext.Default.ProtocolSystemMessageReplaceConfig);
+                return;
+            }
+            if (value.ProtocolSystemMessageCustomizeConfig is { } protocolSystemMessageCustomizeConfig)
+            {
+                JsonSerializer.Serialize(writer, protocolSystemMessageCustomizeConfig, RpcJsonContext.Default.ProtocolSystemMessageCustomizeConfig);
+                return;
+            }
+
+            throw new JsonException("No ProtocolSystemMessageConfig variant value is set.");
+        }
+    }
+}
+
+/// <summary>A BYOK model definition referencing a named provider.</summary>
+[Experimental(global::GitHub.Copilot.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>Most recent Mission Control event identifier observed for the workspace.</summary>
-    [JsonPropertyName("mc_last_event_id")]
-    public string? McLastEventId { get; set; }
+    /// <summary>Maximum context window tokens for the model.</summary>
+    [JsonPropertyName("maxContextWindowTokens")]
+    public double? MaxContextWindowTokens { get; set; }
 
-    /// <summary>Mission Control session identifier associated with the workspace.</summary>
-    [JsonPropertyName("mc_session_id")]
-    public string? McSessionId { get; set; }
+    /// <summary>Maximum output tokens for the model.</summary>
+    [JsonPropertyName("maxOutputTokens")]
+    public double? MaxOutputTokens { get; set; }
 
-    /// <summary>Mission Control task identifier associated with the workspace.</summary>
-    [JsonPropertyName("mc_task_id")]
-    public string? McTaskId { get; set; }
+    /// <summary>Maximum prompt/input tokens for the model.</summary>
+    [JsonPropertyName("maxPromptTokens")]
+    public double? MaxPromptTokens { get; set; }
 
-    /// <summary>Workspace display name.</summary>
-    [JsonPropertyName("name")]
-    public string? Name { get; set; }
+    /// <summary>Provider-published model metadata, preserved verbatim as the public Model.metadata object.</summary>
+    [JsonPropertyName("metadata")]
+    public IDictionary<string, JsonElement>? Metadata { get; set; }
 
-    /// <summary>Whether the workspace session can be steered remotely.</summary>
-    [JsonPropertyName("remote_steerable")]
-    public bool? RemoteSteerable { 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>Repository identifier associated with the workspace.</summary>
-    [JsonPropertyName("repository")]
-    public string? Repository { 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>Number of persisted summaries in the workspace.</summary>
-    [JsonPropertyName("summary_count")]
-    public long? SummaryCount { get; set; }
+    /// <summary>Name of the configured provider that serves this model.</summary>
+    [JsonPropertyName("provider")]
+    public string Provider { get; set; } = string.Empty;
 
-    /// <summary>Timestamp when the workspace was last updated.</summary>
-    [JsonPropertyName("updated_at")]
-    public DateTimeOffset? UpdatedAt { get; set; }
+    /// <summary>System-message configuration used when the runtime builds the standard prompt for this provider-qualified model, including general-purpose subagents. It uses the same object hierarchy as session-level systemMessage configuration, except transform actions are rejected because the current callback protocol is not model-scoped. When present, it overrides the session-wide configuration on those prompt paths. Selected custom-agent and specialized-subagent prompts remain authoritative.</summary>
+    [JsonPropertyName("systemMessage")]
+    public ProtocolSystemMessageConfig? SystemMessage { get; set; }
 
-    /// <summary>Whether the workspace name was explicitly chosen by the user.</summary>
-    [JsonPropertyName("user_named")]
-    public bool? UserNamed { get; set; }
+    /// <summary>The model name sent to the provider API for inference. Defaults to `id`.</summary>
+    [JsonPropertyName("wireModel")]
+    public string? WireModel { get; set; }
 }
 
-/// <summary>Current workspace metadata for the session, including its absolute filesystem path when available.</summary>
+/// <summary>Azure-specific provider options.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class WorkspacesGetWorkspaceResult
+public sealed class ProviderConfigAzure
 {
-    /// <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>Current workspace metadata, or null if not available.</summary>
-    [JsonPropertyName("workspace")]
-    public WorkspacesGetWorkspaceResultWorkspace? Workspace { get; set; }
+    /// <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>Identifies the target session.</summary>
+/// <summary>External SDK input for a named custom model provider. Ingested by the native protocol boundary before host dispatch.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionWorkspacesGetWorkspaceRequest
+public sealed class NamedProviderConfig
 {
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <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>The product serving the provider's models, reported in telemetry as `model_provider`. Only affects telemetry.</summary>
+    [JsonPropertyName("modelProvider")]
+    public ProviderConfigModelProvider? ModelProvider { 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>Workspace metadata fields to update.</summary>
+/// <summary>Provider configuration prepared from a discovered model. Preparing a plan changes nothing: it neither registers the model with the session nor writes durable configuration. To apply it, pass `provider` and `model` to `session.provider.add`, omitting whichever the dispositions report as already configured.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class WorkspacesUpdateMetadataRequest
+public sealed class ModelProviderConfigurationPlan
 {
-    /// <summary>Opaque workspace context supplied by the session host.</summary>
-    [JsonPropertyName("context")]
-    public JsonElement? Context { get; set; }
+    /// <summary>Model definition prepared from the discovered model. Capability fields the provider did not report stay omitted rather than being asserted false.</summary>
+    [JsonPropertyName("model")]
+    public ProviderModelConfig Model { get => field ??= new(); set; }
 
-    /// <summary>Optional workspace display name override.</summary>
-    [JsonPropertyName("name")]
-    public string? Name { get; set; }
+    /// <summary>Whether `model` still needs to be registered. When `alreadyConfigured`, `selectionId` is already registered and the caller can select it without adding anything.</summary>
+    [JsonPropertyName("modelDisposition")]
+    public ModelProviderConfigurationDisposition ModelDisposition { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Provider connection prepared from the instance's inference metadata. Carries no credential; supply one if the endpoint requires it.</summary>
+    [JsonPropertyName("provider")]
+    public NamedProviderConfig Provider { get => field ??= new(); set; }
+
+    /// <summary>Whether `provider` still needs to be registered. When `alreadyConfigured`, a provider with the same endpoint is already registered and `provider` restates it under its existing name; adding it again is rejected as a duplicate.</summary>
+    [JsonPropertyName("providerDisposition")]
+    public ModelProviderConfigurationDisposition ProviderDisposition { get; set; }
+
+    /// <summary>Provider-qualified selection id (`provider/id`) to pass to `switchTo` once the plan is applied.</summary>
+    [JsonPropertyName("selectionId")]
+    public string SelectionId { get; set; } = string.Empty;
+
+    /// <summary>Non-fatal warnings carried over from the discovered model, such as capabilities the provider did not report.</summary>
+    [JsonPropertyName("warnings")]
+    public IList<ModelProviderWarning> Warnings { get => field ??= []; set; }
 }
 
-/// <summary>Optional session context used when creating a local workspace.</summary>
+/// <summary>A discovered instance and one of its models to translate into provider configuration. Pass back the instance and model as returned by `session.providers.discover` and `session.providers.models.list`.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class WorkspacesEnsureRequest
+internal sealed class ModelProviderPrepareConfigurationRequest
 {
-    /// <summary>Opaque workspace context supplied by the session host.</summary>
-    [JsonPropertyName("context")]
-    public JsonElement? Context { get; set; }
+    /// <summary>The discovered instance that serves the model.</summary>
+    [JsonPropertyName("instance")]
+    public ModelProviderInstance Instance { get => field ??= new(); set; }
+
+    /// <summary>The discovered model to configure.</summary>
+    [JsonPropertyName("model")]
+    public DiscoveredModel Model { get => field ??= new(); set; }
 
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Relative paths of files stored in the session workspace files directory.</summary>
+/// <summary>Managed sandbox enforcement state for a session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class WorkspacesListFilesResult
+public sealed class SandboxEnforcementStatus
 {
-    /// <summary>Slash-separated relative file paths in the workspace files directory.</summary>
-    [JsonPropertyName("files")]
-    public IList<string> Files { get => field ??= []; set; }
+    /// <summary>Whether an enforcement failure has permanently blocked the session.</summary>
+    [JsonPropertyName("blocked")]
+    public bool Blocked { get; set; }
+
+    /// <summary>The first sandbox enforcement failure that blocked the session.</summary>
+    [JsonPropertyName("reason")]
+    public string? Reason { get; set; }
+
+    /// <summary>Whether the effective managed policy requires an available sandbox backend.</summary>
+    [JsonPropertyName("required")]
+    public bool Required { get; set; }
 }
 
 /// <summary>Identifies the target session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionWorkspacesListFilesRequest
+internal sealed class SessionSandboxGetEnforcementStatusRequest
 {
     /// <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 possible secret-bearing environment variable and optional locally suggested HTTPS injection hosts. This is a draft for user review, not an active grant.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class WorkspacesReadFileResult
+public sealed class SandboxCredentialSuggestion
 {
-    /// <summary>File content as a UTF-8 string.</summary>
-    [JsonPropertyName("content")]
-    public string Content { get; set; } = string.Empty;
+    /// <summary>Environment variable name. The secret value is never returned.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
+
+    /// <summary>HTTPS hostnames suggested by a local known-provider mapping. An empty list requires the user to supply injection hosts before adding a masking entry. These suggestions do not allow network access.</summary>
+    [JsonPropertyName("suggestedInjectHosts")]
+    public IList<string> SuggestedInjectHosts { get => field ??= []; set; }
 }
 
-/// <summary>Relative path of the workspace file to read.</summary>
+/// <summary>Possible unconfigured secrets in the sandbox shell environment, sorted by variable name, with no secret values.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class WorkspacesReadFileRequest
+public sealed class SandboxCredentialSuggestionsResult
 {
-    /// <summary>Slash-separated relative path within the workspace files directory.</summary>
-    [JsonPropertyName("path")]
-    public string Path { get; set; } = string.Empty;
+    /// <summary>Candidates for user review. Empty when sandboxing is disabled or no unconfigured candidates are present.</summary>
+    [JsonPropertyName("suggestions")]
+    public IList<SandboxCredentialSuggestion> Suggestions { get => field ??= []; set; }
+}
 
+/// <summary>Identifies the target session.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class SessionSandboxGetCredentialSuggestionsRequest
+{
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Relative path and UTF-8 content for the workspace file to create or overwrite.</summary>
+/// <summary>Result of attempting to disable sandboxing for the current session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class WorkspacesCreateFileRequest
+public sealed class SandboxDisableForSessionResult
 {
-    /// <summary>File content to write as a UTF-8 string.</summary>
-    [JsonPropertyName("content")]
-    public string Content { get; set; } = string.Empty;
-
-    /// <summary>Slash-separated relative path within the workspace files directory.</summary>
-    [JsonPropertyName("path")]
-    public string Path { get; set; } = string.Empty;
+    /// <summary>The authoritative sandbox enabled state after the operation.</summary>
+    [JsonPropertyName("enabled")]
+    public bool Enabled { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Whether this call resolved the pending request and applied the session opt-out.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
 }
 
-/// <summary>Filesystem metadata for a path in the session workspace files directory.</summary>
+/// <summary>Optional informational context describing how and where the permission decision was made. This does not affect permission behavior.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class WorkspacesStatFileResult
+public sealed class PermissionDecisionContext
 {
-    /// <summary>Creation time in Unix epoch milliseconds.</summary>
-    [JsonPropertyName("birthtimeMs")]
-    public double BirthtimeMs { get; set; }
-
-    /// <summary>Whether the path identifies a directory.</summary>
-    [JsonPropertyName("isDirectory")]
-    public bool IsDirectory { get; set; }
+    /// <summary>Disposition of the permission request as observed by the responding client.</summary>
+    [JsonPropertyName("outcome")]
+    public PermissionDecisionOutcome Outcome { get; set; }
 
-    /// <summary>Whether the path identifies a regular file.</summary>
-    [JsonPropertyName("isFile")]
-    public bool IsFile { 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>Last modification time in Unix epoch milliseconds.</summary>
-    [JsonPropertyName("mtimeMs")]
-    public double MtimeMs { get; set; }
+    /// <summary>Controlled reason or actor responsible for the response.</summary>
+    [JsonPropertyName("source")]
+    public PermissionDecisionSource Source { get; set; }
 
-    /// <summary>Size in bytes.</summary>
-    [JsonPropertyName("size")]
-    public double Size { get; set; }
+    /// <summary>Client surface that submitted the response.</summary>
+    [JsonPropertyName("surface")]
+    public PermissionDecisionSurface Surface { get; set; }
 }
 
-/// <summary>Relative path of the workspace file or directory to inspect.</summary>
+/// <summary>Request to disable sandboxing for the current session while resolving an active sandbox-bypass permission prompt.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class WorkspacesStatFileRequest
+internal sealed class SandboxDisableForSessionRequest
 {
-    /// <summary>Slash-separated relative path within the workspace files directory.</summary>
-    [JsonPropertyName("path")]
-    public string Path { get; set; } = string.Empty;
+    /// <summary>Optional attribution for the permission decision.</summary>
+    [JsonPropertyName("decisionContext")]
+    public PermissionDecisionContext? DecisionContext { get; set; }
+
+    /// <summary>Identifier of the exact pending sandbox-bypass permission request that authorized the session opt-out.</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>Directory to create within the session workspace files directory.</summary>
+/// <summary>Result of accepting a sandbox path grant.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class WorkspacesCreateDirectoryRequest
+public sealed class SandboxGrantPathForRequestResult
 {
-    /// <summary>Slash-separated relative path within the workspace files directory.</summary>
-    [JsonPropertyName("path")]
-    public string Path { get; set; } = string.Empty;
-
-    /// <summary>Whether to create missing parent directories. Defaults to false.</summary>
-    [JsonPropertyName("recursive")]
-    public bool? Recursive { get; set; }
-
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Whether this call resolved the pending request and added the path to the session's sandbox policy.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
 }
 
-/// <summary>File or directory to remove from the session workspace files directory.</summary>
+/// <summary>Request to accept the sandbox path grant offered on an active sandbox escalation permission prompt.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class WorkspacesRemovePathRequest
+internal sealed class SandboxGrantPathForRequestRequest
 {
-    /// <summary>Whether a missing path should be treated as success. Defaults to false.</summary>
-    [JsonPropertyName("force")]
-    public bool? Force { get; set; }
-
-    /// <summary>Slash-separated relative path within the workspace files directory.</summary>
-    [JsonPropertyName("path")]
-    public string Path { get; set; } = string.Empty;
+    /// <summary>Optional attribution for the permission decision.</summary>
+    [JsonPropertyName("decisionContext")]
+    public PermissionDecisionContext? DecisionContext { get; set; }
 
-    /// <summary>Whether to remove directory contents recursively. Defaults to false.</summary>
-    [JsonPropertyName("recursive")]
-    public bool? Recursive { get; set; }
+    /// <summary>Identifier of the exact pending sandbox escalation permission request whose sandboxPathGrant to accept.</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>Source and destination paths for a rename within the session workspace files directory.</summary>
+/// <summary>Authentication status and account metadata for the session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class WorkspacesRenamePathRequest
+public sealed class SessionAuthStatus
 {
-    /// <summary>Slash-separated destination path relative to the workspace files directory.</summary>
-    [JsonPropertyName("destination")]
-    public string Destination { get; set; } = string.Empty;
-
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Authentication type.</summary>
+    [JsonPropertyName("authType")]
+    public AuthInfoType? AuthType { get; set; }
 
-    /// <summary>Slash-separated source path relative to the workspace files directory.</summary>
-    [JsonPropertyName("source")]
-    public string Source { get; set; } = string.Empty;
-}
+    /// <summary>Copilot plan tier (e.g., individual_pro, business).</summary>
+    [JsonPropertyName("copilotPlan")]
+    public string? CopilotPlan { get; set; }
 
-/// <summary>Workspace checkpoint metadata with assigned number, human-readable title, and checkpoint filename.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class WorkspacesCheckpoints
-{
-    /// <summary>Filename of the checkpoint within the workspace checkpoints directory.</summary>
-    [JsonPropertyName("filename")]
-    public string Filename { get; set; } = string.Empty;
+    /// <summary>Authentication host URL.</summary>
+    [Url]
+    [StringSyntax(StringSyntaxAttribute.Uri)]
+    [JsonPropertyName("host")]
+    public string? Host { get; set; }
 
-    /// <summary>Checkpoint number assigned by the workspace manager.</summary>
-    [JsonPropertyName("number")]
-    public long Number { get; set; }
+    /// <summary>Whether the session has resolved authentication.</summary>
+    [JsonPropertyName("isAuthenticated")]
+    public bool IsAuthenticated { get; set; }
 
-    /// <summary>Human-readable checkpoint title.</summary>
-    [JsonPropertyName("title")]
-    public string Title { get; set; } = string.Empty;
-}
+    /// <summary>Authenticated login/username, if available.</summary>
+    [JsonPropertyName("login")]
+    public string? Login { get; set; }
 
-/// <summary>Workspace checkpoints in chronological order; empty when the workspace is not enabled.</summary>
-[Experimental(global::GitHub.Copilot.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>Human-readable authentication status description.</summary>
+    [JsonPropertyName("statusMessage")]
+    public string? StatusMessage { get; set; }
 }
 
 /// <summary>Identifies the target session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionWorkspacesListCheckpointsRequest
+internal sealed class SessionGitHubAuthGetStatusRequest
 {
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Checkpoint content as a UTF-8 string, or null when the checkpoint or workspace is missing.</summary>
-[Experimental(global::GitHub.Copilot.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>Checkpoint number to read.</summary>
+/// <summary>Indicates whether the credential update succeeded.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class WorkspacesReadCheckpointRequest
+public sealed class SessionSetCredentialsResult
 {
-    /// <summary>Checkpoint number to read.</summary>
-    [JsonPropertyName("number")]
-    public long Number { 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>Metadata for the persisted summary.</summary>
-public sealed class WorkspacesAddSummaryResultSummary
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
+[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(SettableAuthInfoAccount), "account")]
+[JsonDerivedType(typeof(SettableAuthInfoGhCli), "gh-cli")]
+[JsonDerivedType(typeof(SettableAuthInfoApiKey), "api-key")]
+public partial class SettableAuthInfo
 {
+    /// <summary>The type discriminator.</summary>
+    [JsonPropertyName("type")]
+    public virtual string Type { get; set; } = string.Empty;
 }
 
-/// <summary>Refreshed metadata for the containing workspace.</summary>
-public sealed class WorkspacesAddSummaryResultWorkspace
-{
-}
 
-/// <summary>Persisted summary metadata and refreshed workspace metadata.</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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class WorkspacesAddSummaryResult
+public partial class SettableAuthInfoHmac : SettableAuthInfo
 {
-    /// <summary>Metadata for the persisted summary.</summary>
-    [JsonPropertyName("summary")]
-    public WorkspacesAddSummaryResultSummary? Summary { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "hmac";
 
-    /// <summary>Refreshed metadata for the containing workspace.</summary>
-    [JsonPropertyName("workspace")]
-    public WorkspacesAddSummaryResultWorkspace? Workspace { 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>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>Compaction summary checkpoint to persist.</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(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class WorkspacesAddSummaryRequest
+public partial class SettableAuthInfoEnv : SettableAuthInfo
 {
-    /// <summary>Markdown summary content to persist.</summary>
-    [JsonPropertyName("content")]
-    public string Content { get; set; } = string.Empty;
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "env";
 
-    /// <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>Summary title shown in checkpoint listings.</summary>
-    [JsonPropertyName("title")]
-    public string Title { get; set; } = string.Empty;
-}
+    /// <summary>Name of the environment variable the token was sourced from.</summary>
+    [JsonPropertyName("envVar")]
+    public required string EnvVar { get; set; }
 
-/// <summary>Rollback point for local workspace summaries.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class WorkspacesTruncateSummariesRequest
-{
-    /// <summary>Number of newest summaries to keep.</summary>
-    [JsonPropertyName("keepCount")]
-    public long KeepCount { get; set; }
+    /// <summary>Authentication host (e.g. https://github.com or a GHES host).</summary>
+    [JsonPropertyName("host")]
+    public required string Host { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <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>Autopilot objective file content, or null when missing.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class WorkspacesReadAutopilotObjectiveResult
-{
-    /// <summary>Autopilot objective file content, or null when missing.</summary>
-    [JsonPropertyName("content")]
-    public string? Content { get; set; }
+    /// <summary>The token value itself. Treat as a secret.</summary>
+    [JsonPropertyName("token")]
+    public required string Token { get; set; }
 }
 
-/// <summary>Identifies the target session.</summary>
+/// <summary>Token authentication accepted by session.gitHubAuth.setCredentials.</summary>
+/// <remarks>The <c>token</c> variant of <see cref="SettableAuthInfo"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionWorkspacesReadAutopilotObjectiveRequest
+public partial class SettableAuthInfoToken : SettableAuthInfo
 {
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "token";
 
-/// <summary>Result of writing the autopilot objective file.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class WorkspacesWriteAutopilotObjectiveResult
-{
-    /// <summary>Filesystem operation performed.</summary>
-    [JsonPropertyName("operation")]
-    public string Operation { 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>Autopilot objective file content to persist.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class WorkspacesWriteAutopilotObjectiveRequest
-{
-    /// <summary>Autopilot objective file content.</summary>
-    [JsonPropertyName("content")]
-    public string Content { get; set; } = string.Empty;
+    /// <summary>Authentication host.</summary>
+    [JsonPropertyName("host")]
+    public required string Host { get; set; }
 
-    /// <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>Result of deleting the autopilot objective 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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class WorkspacesDeleteAutopilotObjectiveResult
+public partial class SettableAuthInfoCopilotApiToken : SettableAuthInfo
 {
-    /// <summary>True when a file was deleted.</summary>
-    [JsonPropertyName("deleted")]
-    public bool Deleted { get; set; }
-}
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "copilot-api-token";
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionWorkspacesDeleteAutopilotObjectiveRequest
-{
-    /// <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>Whether the autopilot objective file exists.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class WorkspacesAutopilotObjectiveExistsResult
-{
-    /// <summary>True when the objective file exists.</summary>
-    [JsonPropertyName("exists")]
-    public bool Exists { 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(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionWorkspacesAutopilotObjectiveExistsRequest
+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>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>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 filesystem path to the saved paste file.</summary>
-    [JsonPropertyName("filePath")]
-    public string FilePath { get; set; } = string.Empty;
+    /// <summary>Authentication host.</summary>
+    [JsonPropertyName("host")]
+    public required string Host { get; set; }
 
-    /// <summary>Size of the saved file in bytes.</summary>
-    [JsonPropertyName("sizeBytes")]
-    public long SizeBytes { get; set; }
+    /// <summary>OAuth user login.</summary>
+    [JsonPropertyName("login")]
+    public required string Login { get; set; }
 }
 
-/// <summary>Descriptor for the saved paste file, or null when the workspace is unavailable.</summary>
+/// <summary>An interactive account whose model provider owns its credentials. It carries no GitHub credential.</summary>
+/// <remarks>The <c>account</c> variant of <see cref="SettableAuthInfo"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class WorkspacesSaveLargePasteResult
+public partial class SettableAuthInfoAccount : SettableAuthInfo
 {
-    /// <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; }
-}
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "account";
 
-/// <summary>Pasted content to save as a UTF-8 file in the session workspace.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class WorkspacesSaveLargePasteRequest
-{
-    /// <summary>Pasted content to save as a UTF-8 file.</summary>
-    [JsonPropertyName("content")]
-    public string Content { get; set; } = string.Empty;
+    /// <summary>Host coordinate owned by the account's model provider.</summary>
+    [JsonPropertyName("host")]
+    public required string Host { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Login identifying the provider-owned account.</summary>
+    [JsonPropertyName("login")]
+    public required string Login { get; set; }
 }
 
-/// <summary>A single changed file and its unified diff.</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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class WorkspaceDiffFileChange
+public partial class SettableAuthInfoGhCli : SettableAuthInfo
 {
-    /// <summary>Type of change represented by this file diff.</summary>
-    [JsonPropertyName("changeType")]
-    public WorkspaceDiffFileChangeType ChangeType { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "gh-cli";
 
-    /// <summary>Unified diff content for the file. Empty when the diff was truncated.</summary>
-    [JsonPropertyName("diff")]
-    public string Diff { 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>Whether the diff content was omitted because it exceeded the per-file size limit.</summary>
-    [JsonPropertyName("isTruncated")]
-    public bool? IsTruncated { get; set; }
+    /// <summary>Authentication host.</summary>
+    [JsonPropertyName("host")]
+    public required string Host { get; set; }
 
-    /// <summary>Original file path for renamed files.</summary>
-    [JsonPropertyName("oldPath")]
-    public string? OldPath { get; set; }
+    /// <summary>User login as reported by `gh auth status`.</summary>
+    [JsonPropertyName("login")]
+    public required string Login { 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>The token returned by `gh auth token`. Treat as a secret.</summary>
+    [JsonPropertyName("token")]
+    public required string Token { get; set; }
 }
 
-/// <summary>Workspace diff result for the requested mode.</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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class WorkspaceDiffResult
+public partial class SettableAuthInfoApiKey : SettableAuthInfo
 {
-    /// <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; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "api-key";
 
-    /// <summary>Effective mode used for the returned changes.</summary>
-    [JsonPropertyName("mode")]
-    public WorkspaceDiffMode Mode { get; set; }
+    /// <summary>The API key. Treat as a secret.</summary>
+    [JsonPropertyName("apiKey")]
+    public required string ApiKey { get; set; }
 
-    /// <summary>Diff mode requested by the client.</summary>
-    [JsonPropertyName("requestedMode")]
-    public WorkspaceDiffMode RequestedMode { 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>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>Authentication host.</summary>
+    [JsonPropertyName("host")]
+    public required string Host { get; set; }
 }
 
-/// <summary>Parameters for computing a workspace diff.</summary>
+/// <summary>New auth credentials to install on the session. Omit to leave credentials unchanged.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class WorkspacesDiffRequest
+internal sealed class SessionSetCredentialsParams
 {
-    /// <summary>When true, ignore whitespace-only changes (git `--ignore-all-space`). Defaults to false.</summary>
-    [JsonPropertyName("ignoreWhitespace")]
-    public bool? IgnoreWhitespace { get; set; }
-
-    /// <summary>Diff mode requested by the client.</summary>
-    [JsonPropertyName("mode")]
-    public WorkspaceDiffMode Mode { get; set; }
+    /// <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>Current per-window credit limit and consumption for an autopilot objective.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class AutopilotObjectiveCreditLimit
-{
-    /// <summary>Configured AI-credit cap, when one is set.</summary>
-    [JsonPropertyName("credits")]
-    public double? Credits { get; set; }
-
-    /// <summary>Window consumption in fractional AI credits, for display.</summary>
-    [JsonPropertyName("creditsUsed")]
-    public double CreditsUsed { get; set; }
-
-    /// <summary>Exact window consumption in non-negative integer nano-AIU, encoded as a decimal string.</summary>
-    [RegularExpression("^[0-9]+$")]
-    [JsonPropertyName("creditsUsedNanoAiu")]
-    public string CreditsUsedNanoAiu { get; set; } = string.Empty;
-}
-
-/// <summary>Public, persistence-independent projection of an autopilot objective.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class AutopilotObjectiveState
-{
-    /// <summary>Optional summary recorded when the objective completed.</summary>
-    [JsonPropertyName("completionSummary")]
-    public string? CompletionSummary { get; set; }
-
-    /// <summary>Exact lifetime AI-credit consumption in non-negative integer nano-AIU, encoded as a decimal string.</summary>
-    [RegularExpression("^[0-9]+$")]
-    [JsonPropertyName("creditCountNanoAiu")]
-    public string CreditCountNanoAiu { get; set; } = string.Empty;
-
-    /// <summary>Current per-window consumption and optional cap, when a credit-tracking window is present.</summary>
-    [JsonPropertyName("creditLimit")]
-    public AutopilotObjectiveCreditLimit? CreditLimit { get; set; }
-
-    /// <summary>Session-local objective identifier.</summary>
-    [JsonPropertyName("id")]
-    public long Id { get; set; }
-
-    /// <summary>User-provided objective text.</summary>
-    [JsonPropertyName("objective")]
-    public string Objective { get; set; } = string.Empty;
-
-    /// <summary>Optional reason the objective is paused.</summary>
-    [JsonPropertyName("pauseReason")]
-    public string? PauseReason { get; set; }
-
-    /// <summary>Current normalized lifecycle status.</summary>
-    [JsonPropertyName("status")]
-    public AutopilotObjectiveStatus Status { get; set; }
-
-    /// <summary>Number of objective turns started.</summary>
-    [JsonPropertyName("turnCount")]
-    public long TurnCount { get; set; }
-}
-
-/// <summary>Canonical runtime state for the session's current autopilot objective.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class AutopilotObjectiveGetStateResult
-{
-    /// <summary>Current objective state, or `null` when the session has no objective.</summary>
-    [JsonPropertyName("state")]
-    public AutopilotObjectiveState? State { get; set; }
-}
-
 /// <summary>Identifies the target session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionAutopilotObjectiveGetStateRequest
+internal sealed class SessionGitHubAuthGetCurrentAuthInfoRequest
 {
     /// <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>Identifies the target session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class CompletionsGetTriggerCharactersResult
+internal sealed class SessionGitHubAuthGetAllAuthAvailableRequest
 {
-    /// <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>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
 /// <summary>Identifies the target session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionCompletionsGetTriggerCharactersRequest
+internal sealed class SessionGitHubAuthRefreshCopilotUserRequest
 {
     /// <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>Internal GitHub login parameters.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionCompletionItem
+internal sealed class SessionAuthLoginRequest
 {
-    /// <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>GitHub host URL.</summary>
+    [JsonPropertyName("host")]
+    public string Host { get; set; } = string.Empty;
 
-/// <summary>Host-driven completion items for the current composer input. Empty when the host returns no items or does not support completions.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class CompletionsRequestResult
-{
-    /// <summary>Completion items in host-ranked order.</summary>
-    [JsonPropertyName("items")]
-    public IList<SessionCompletionItem> Items { get => field ??= []; set; }
-}
+    /// <summary>GitHub login.</summary>
+    [JsonPropertyName("login")]
+    public string Login { get; set; } = string.Empty;
 
-/// <summary>Request host-driven completions for the current composer input.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class CompletionsRequestRequest
-{
-    /// <summary>Cursor offset within `text`, in UTF-16 code units.</summary>
-    [JsonPropertyName("offset")]
-    public long Offset { get; set; }
+    /// <summary>Whether to persist the token after login.</summary>
+    [JsonPropertyName("persist")]
+    public bool? Persist { 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>GitHub authentication token.</summary>
+    [JsonPropertyName("token")]
+    public string Token { get; set; } = string.Empty;
 }
 
-/// <summary>Instruction sources loaded for the session, in merge order.</summary>
+/// <summary>Parameters for switching the session's active authentication.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class InstructionsGetSourcesResult
+internal sealed class SessionAuthSwitchRequest
 {
-    /// <summary>Instruction sources for the session.</summary>
-    [JsonPropertyName("sources")]
-    public IList<InstructionSource> Sources { get => field ??= []; set; }
-}
+    /// <summary>Authentication information to activate.</summary>
+    [JsonPropertyName("authInfo")]
+    public AuthInfo AuthInfo { get => field ??= new(); set; }
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionInstructionsGetSourcesRequest
-{
     /// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionInstructionsReloadRequest
+internal sealed class SessionGitHubAuthLogoutRequest
 {
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Result of one customization reload component.</summary>
+/// <summary>Parameters identifying a GitHub authentication to log out.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class CustomizationReloadOutcome
+internal sealed class SessionAuthLogoutUserRequest
 {
-    /// <summary>Reason for a skipped component or description of a failure, when available.</summary>
-    [JsonPropertyName("detail")]
-    public string? Detail { get; set; }
-
-    /// <summary>Whether the component reloaded, was skipped, or failed.</summary>
-    [JsonPropertyName("status")]
-    public CustomizationReloadStatus Status { get; set; }
+    /// <summary>Authentication information to log out.</summary>
+    [JsonPropertyName("authInfo")]
+    public AuthInfo AuthInfo { get => field ??= new(); set; }
 
-    /// <summary>Component whose reload was attempted or skipped.</summary>
-    [JsonPropertyName("subsystem")]
-    public CustomizationReloadSubsystem Subsystem { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Results of reloading discovered session customizations. Inspect outcomes for reloaded, skipped, or failed subsystems; a rejection may follow partial mutation. Changes to the model-facing prompt and tools apply on the next turn.</summary>
+/// <summary>Validation error from an authentication attempt.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class CustomizationsReloadResult
+public sealed class AuthValidationError
 {
-    /// <summary>Errors from any component that could not be refreshed.</summary>
-    [JsonPropertyName("errors")]
-    public IList<string> Errors { get => field ??= []; set; }
-
-    /// <summary>Outcome of each component in reload order; a skipped component was not configured or loaded.</summary>
-    [JsonPropertyName("outcomes")]
-    public IList<CustomizationReloadOutcome> Outcomes { get => field ??= []; set; }
+    /// <summary>Optional message returned by GitHub.</summary>
+    [JsonPropertyName("githubMessage")]
+    public string? GitHubMessage { get; set; }
 
-    /// <summary>Warnings from skill discovery.</summary>
-    [JsonPropertyName("warnings")]
-    public IList<string> Warnings { 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(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionCustomizationsReloadRequest
+internal sealed class SessionGitHubAuthLastAuthErrorsRequest
 {
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Indicates whether fleet mode was successfully activated.</summary>
+/// <summary>The enumerated collection, keyed by the same selector as the query.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class FleetStartResult
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "kind",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(AuthEnumerateValueAccounts), "accounts")]
+[JsonDerivedType(typeof(AuthEnumerateValueProviders), "providers")]
+public partial class AuthEnumerateValue
 {
-    /// <summary>Whether fleet mode was successfully activated.</summary>
-    [JsonPropertyName("started")]
-    public bool Started { get; set; }
+    /// <summary>The type discriminator.</summary>
+    [JsonPropertyName("kind")]
+    public virtual string Kind { get; set; } = string.Empty;
 }
 
-/// <summary>Parameters for starting fleet orchestration: an optional user prompt combined with the fleet instructions, plus the send options forwarded to the resulting turn.</summary>
+
+/// <summary>One signed-in account in the roster forest.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class FleetStartRequest
+public sealed class AccountStatus
 {
-    /// <summary>Optional attachments (files, directories, selections, blobs, GitHub references) to include with the fleet request.</summary>
-    [JsonPropertyName("attachments")]
-    public IList<Attachment>? Attachments { get; set; }
+    /// <summary>Whether this is the active account.</summary>
+    [JsonPropertyName("active")]
+    public bool Active { get; set; }
 
-    /// <summary>If false, this request will not trigger a Premium Request Unit charge. User requests default to billable.</summary>
-    [JsonInclude]
-    [JsonPropertyName("billable")]
-    internal bool? Billable { get; set; }
+    /// <summary>Human-readable credential source used to authenticate this account, such as `gh` or `GITHUB_TOKEN`.</summary>
+    [JsonPropertyName("authSource")]
+    public string? AuthSource { get; set; }
 
-    /// <summary>Optional user prompt to combine with fleet instructions.</summary>
-    [JsonPropertyName("prompt")]
-    public string? Prompt { get; set; }
+    /// <summary>Opaque id of the account this one was derived from (e.g. an EMU account's base Entra identity); absent for a root account. Matches the base identity account's selectionId, forming the derivation edge.</summary>
+    [JsonPropertyName("derivedFrom")]
+    public string? DerivedFrom { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Authentication host URL.</summary>
+    [Url]
+    [StringSyntax(StringSyntaxAttribute.Uri)]
+    [JsonPropertyName("host")]
+    public string Host { get; set; } = string.Empty;
 
-    /// <summary>If true, await completion of the agentic loop for this fleet request before returning. Defaults to false.</summary>
-    [JsonPropertyName("wait")]
-    public bool? Wait { get; set; }
+    /// <summary>The provider kind of this account.</summary>
+    [JsonPropertyName("kind")]
+    public AccountKind Kind { get; set; }
+
+    /// <summary>Authenticated login/username.</summary>
+    [JsonPropertyName("login")]
+    public string Login { get; set; } = string.Empty;
+
+    /// <summary>Opaque selection id used to switch to, or log out, this account.</summary>
+    [JsonPropertyName("selectionId")]
+    public string SelectionId { get; set; } = string.Empty;
 }
 
-/// <summary>Agents available to the session.</summary>
+/// <summary>The <c>accounts</c> variant of <see cref="AuthEnumerateValue"/>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class AgentList
+public partial class AuthEnumerateValueAccounts : AuthEnumerateValue
 {
-    /// <summary>Available agents.</summary>
-    [JsonPropertyName("agents")]
-    public IList<AgentInfo> Agents { get => field ??= []; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "accounts";
+
+    /// <summary>The signed-in account forest; empty when not logged in.</summary>
+    [JsonPropertyName("items")]
+    public required IList<AccountStatus> Items { get; set; }
 }
 
-/// <summary>RPC data type for SessionAgentList operations.</summary>
+/// <summary>A provider offered for interactive login.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionAgentListRequest
+public sealed class ProviderDescriptor
 {
-    /// <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>Whether this provider is currently available to sign in with.</summary>
+    [JsonPropertyName("available")]
+    public bool Available { 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>The neutral provider kind.</summary>
+    [JsonPropertyName("kind")]
+    public LoginProviderKind Kind { get; set; }
+
+    /// <summary>Human-readable menu label, owned by the runtime so every consumer renders identical text.</summary>
+    [JsonPropertyName("label")]
+    public string Label { get; set; } = string.Empty;
 }
 
-/// <summary>RPC data type for SessionAgentListRequestWithSession operations.</summary>
+/// <summary>The <c>providers</c> variant of <see cref="AuthEnumerateValue"/>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionAgentListRequestWithSession
+public partial class AuthEnumerateValueProviders : AuthEnumerateValue
 {
-    /// <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>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; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "providers";
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>The providers offered for interactive login.</summary>
+    [JsonPropertyName("items")]
+    public required IList<ProviderDescriptor> Items { get; set; }
 }
 
-/// <summary>An in-memory authored prompt override for an available agent.</summary>
+/// <summary>Selects which accounts collection to enumerate. A no-arg selector is the empty-payload variant.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class AgentSetPromptRequest
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "kind",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(AuthEnumerateQueryAccounts), "accounts")]
+[JsonDerivedType(typeof(AuthEnumerateQueryProviders), "providers")]
+public partial class AuthEnumerateQuery
 {
-    /// <summary>Stable effective agent id. Plugin namespace separators are normalized.</summary>
-    [JsonPropertyName("id")]
-    public string Id { get; set; } = string.Empty;
+    /// <summary>The type discriminator.</summary>
+    [JsonPropertyName("kind")]
+    public virtual string Kind { get; set; } = string.Empty;
+}
 
-    /// <summary>Replacement authored prompt. Empty text is valid.</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>The <c>accounts</c> variant of <see cref="AuthEnumerateQuery"/>.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class AuthEnumerateQueryAccounts : AuthEnumerateQuery
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "accounts";
 }
 
-/// <summary>The currently selected custom agent, or null when using the default agent.</summary>
+/// <summary>The <c>providers</c> variant of <see cref="AuthEnumerateQuery"/>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class AgentGetCurrentResult
+public partial class AuthEnumerateQueryProviders : AuthEnumerateQuery
 {
-    /// <summary>Currently selected custom agent, or null if using the default agent.</summary>
-    [JsonPropertyName("agent")]
-    public AgentInfo? Agent { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "providers";
+
+    /// <summary>Whether an interactive Entra broker is available on the host; gates Entra availability in the returned list.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("brokerAvailable")]
+    public bool? BrokerAvailable { get; set; }
 }
 
-/// <summary>Identifies the target session.</summary>
+/// <summary>Enumerate request carrying the typed collection query.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionAgentGetCurrentRequest
+internal sealed class AccountsEnumerateRequest
 {
+    /// <summary>Which typed accounts collection to enumerate.</summary>
+    [JsonPropertyName("query")]
+    public AuthEnumerateQuery Query { get => field ??= new(); set; }
+
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>The newly selected custom agent.</summary>
+/// <summary>The read result, keyed by the same selector as the query.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class AgentSelectResult
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "kind",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(AuthReadValueActiveAccount), "activeAccount")]
+[JsonDerivedType(typeof(AuthReadValueStatus), "status")]
+[JsonDerivedType(typeof(AuthReadValueLastErrors), "lastErrors")]
+public partial class AuthReadValue
 {
-    /// <summary>The newly selected custom agent.</summary>
-    [JsonPropertyName("agent")]
-    public AgentInfo Agent { get => field ??= new(); set; }
+    /// <summary>The type discriminator.</summary>
+    [JsonPropertyName("kind")]
+    public virtual string Kind { get; set; } = string.Empty;
 }
 
-/// <summary>Name of the custom agent to select for subsequent turns.</summary>
+
+/// <summary>The <c>activeAccount</c> variant of <see cref="AuthReadValue"/>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class AgentSelectRequest
+public partial class AuthReadValueActiveAccount : AuthReadValue
 {
-    /// <summary>Name of the custom agent to select.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "activeAccount";
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>The active account, or absent when not logged in.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("account")]
+    public AccountStatus? Account { get; set; }
+
+    /// <summary>Credential-free identity metadata for the active account, including resolved Copilot user information when available.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("authInfo")]
+    public AuthIdentity? AuthInfo { get; set; }
 }
 
-/// <summary>Identifies the target session.</summary>
+/// <summary>Neutral authentication status summary.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionAgentDeselectRequest
+public sealed class AuthStatusDto
 {
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Number of signed-in accounts in the roster.</summary>
+    [JsonPropertyName("accountCount")]
+    public long AccountCount { get; set; }
+
+    /// <summary>Active account host, if authenticated.</summary>
+    [Url]
+    [StringSyntax(StringSyntaxAttribute.Uri)]
+    [JsonPropertyName("activeHost")]
+    public string? ActiveHost { get; set; }
+
+    /// <summary>Active account login, if authenticated.</summary>
+    [JsonPropertyName("activeLogin")]
+    public string? ActiveLogin { get; set; }
+
+    /// <summary>Copilot plan tier of the active account, if known.</summary>
+    [JsonPropertyName("copilotPlan")]
+    public string? CopilotPlan { get; set; }
+
+    /// <summary>Whether the session has resolved authentication.</summary>
+    [JsonPropertyName("isAuthenticated")]
+    public bool IsAuthenticated { get; set; }
 }
 
-/// <summary>Custom agents available to the session after reloading definitions from disk.</summary>
+/// <summary>The <c>status</c> variant of <see cref="AuthReadValue"/>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class AgentReloadResult
+public partial class AuthReadValueStatus : AuthReadValue
 {
-    /// <summary>Reloaded custom agents.</summary>
-    [JsonPropertyName("agents")]
-    public IList<AgentInfo> Agents { get => field ??= []; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "status";
+
+    /// <summary>The neutral authentication status summary.</summary>
+    [JsonPropertyName("status")]
+    public required AuthStatusDto Status { get; set; }
 }
 
-/// <summary>Identifies the target session.</summary>
+/// <summary>The <c>lastErrors</c> variant of <see cref="AuthReadValue"/>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionAgentReloadRequest
+public partial class AuthReadValueLastErrors : AuthReadValue
 {
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "lastErrors";
+
+    /// <summary>Validation errors from the most recent authentication attempt.</summary>
+    [JsonPropertyName("errors")]
+    public required IList<AuthValidationError> Errors { get; set; }
 }
 
-/// <summary>Identifier assigned to the newly started background agent task.</summary>
+/// <summary>Selects which typed accounts datum to read.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class TasksStartAgentResult
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "kind",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(AuthReadQueryActiveAccount), "activeAccount")]
+[JsonDerivedType(typeof(AuthReadQueryStatus), "status")]
+[JsonDerivedType(typeof(AuthReadQueryLastErrors), "lastErrors")]
+public partial class AuthReadQuery
 {
-    /// <summary>Generated agent ID for the background task.</summary>
-    [JsonPropertyName("agentId")]
-    public string AgentId { get; set; } = string.Empty;
+    /// <summary>The type discriminator.</summary>
+    [JsonPropertyName("kind")]
+    public virtual string Kind { get; set; } = string.Empty;
 }
 
-/// <summary>Agent type, prompt, name, and optional description and model override for the new task.</summary>
+
+/// <summary>The <c>activeAccount</c> variant of <see cref="AuthReadQuery"/>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class TasksStartAgentRequest
+public partial class AuthReadQueryActiveAccount : AuthReadQuery
 {
-    /// <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; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "activeAccount";
+}
 
-    /// <summary>Optional model override.</summary>
-    [JsonPropertyName("model")]
-    public string? Model { get; set; }
+/// <summary>The <c>status</c> variant of <see cref="AuthReadQuery"/>.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class AuthReadQueryStatus : AuthReadQuery
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "status";
+}
 
-    /// <summary>Friendly, non-unique name used when displaying the agent.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+/// <summary>The <c>lastErrors</c> variant of <see cref="AuthReadQuery"/>.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class AuthReadQueryLastErrors : AuthReadQuery
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "lastErrors";
+}
 
-    /// <summary>Task prompt for the agent.</summary>
-    [JsonPropertyName("prompt")]
-    public string Prompt { get; set; } = string.Empty;
+/// <summary>Read request carrying the typed datum query.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class AccountsGetRequest
+{
+    /// <summary>Which typed accounts datum to read.</summary>
+    [JsonPropertyName("query")]
+    public AuthReadQuery Query { get => field ??= new(); set; }
 
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Tracked task union returned by task APIs, containing an agent, client, or shell task.</summary>
-/// <remarks>Polymorphic base type discriminated by <c>type</c>.</remarks>
+/// <summary>Result of a non-interactive accounts mutation.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class AuthWriteResult
+{
+    /// <summary>For a logout, whether other signed-in accounts remain.</summary>
+    [JsonPropertyName("moreUsers")]
+    public bool? MoreUsers { get; set; }
+
+    /// <summary>Whether the mutation was applied.</summary>
+    [JsonPropertyName("ok")]
+    public bool Ok { get; set; }
+}
+
+/// <summary>One non-interactive accounts mutation command (the selector is fused with its typed args).</summary>
+/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "type",
+    TypeDiscriminatorPropertyName = "kind",
     UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(TaskInfoAgent), "agent")]
-[JsonDerivedType(typeof(TaskInfoClient), "client")]
-[JsonDerivedType(typeof(TaskInfoShell), "shell")]
-public partial class TaskInfo
+[JsonDerivedType(typeof(AuthWriteSwitchActive), "switchActive")]
+[JsonDerivedType(typeof(AuthWriteLogout), "logout")]
+[JsonDerivedType(typeof(AuthWriteSetCredentials), "setCredentials")]
+public partial class AuthWrite
 {
     /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("type")]
-    public virtual string Type { get; set; } = string.Empty;
+    [JsonPropertyName("kind")]
+    public virtual string Kind { 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>
+/// <summary>The <c>switchActive</c> variant of <see cref="AuthWrite"/>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class TaskInfoAgent : TaskInfo
+public partial class AuthWriteSwitchActive : AuthWrite
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Type => "agent";
+    public override string Kind => "switchActive";
 
-    /// <summary>ISO 8601 timestamp when the current active period began.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("activeStartedAt")]
-    public DateTimeOffset? ActiveStartedAt { get; set; }
+    /// <summary>Opaque selection id of the account to make active.</summary>
+    [JsonPropertyName("selectionId")]
+    public required string SelectionId { get; set; }
+}
 
-    /// <summary>Accumulated active execution time in milliseconds.</summary>
-    [JsonConverter(typeof(MillisecondsTimeSpanConverter))]
+/// <summary>The <c>logout</c> variant of <see cref="AuthWrite"/>.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class AuthWriteLogout : AuthWrite
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "logout";
+
+    /// <summary>Opaque selection id of the account to log out; absent logs out the active account.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("activeTimeMs")]
-    public TimeSpan? ActiveTime { get; set; }
+    [JsonPropertyName("selectionId")]
+    public string? SelectionId { get; set; }
+}
 
-    /// <summary>Type of agent running this task.</summary>
-    [JsonPropertyName("agentType")]
-    public required string AgentType { get; set; }
+/// <summary>The <c>setCredentials</c> variant of <see cref="AuthWrite"/>.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class AuthWriteSetCredentials : AuthWrite
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "setCredentials";
 
-    /// <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>Authentication host URL.</summary>
+    [Url]
+    [StringSyntax(StringSyntaxAttribute.Uri)]
+    [JsonPropertyName("host")]
+    public required string Host { get; set; }
 
-    /// <summary>ISO 8601 timestamp when the task finished.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("completedAt")]
-    public DateTimeOffset? CompletedAt { get; set; }
+    /// <summary>Login/username for the credential.</summary>
+    [JsonPropertyName("login")]
+    public required string Login { get; set; }
 
-    /// <summary>Short description of the task.</summary>
-    [JsonPropertyName("description")]
-    public required string Description { get; set; }
+    /// <summary>GitHub authentication token to install.</summary>
+    [JsonPropertyName("token")]
+    public required string Token { get; set; }
+}
 
-    /// <summary>Friendly, non-unique name intended for display.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("displayName")]
-    public string? DisplayName { get; set; }
+/// <summary>Mutation request carrying the typed write command.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class AccountsSetRequest
+{
+    /// <summary>The non-interactive mutation command to apply.</summary>
+    [JsonPropertyName("command")]
+    public AuthWrite Command { get => field ??= new(); set; }
 
-    /// <summary>Error message when the task failed.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("error")]
-    public string? Error { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <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>One step in an interactive login flow. The consumer acts on the step and calls advance to proceed. Browser-open is encoded as two distinct steps by design: `open-url` is CONSUMER-driven (the provider surfaces the authorize URL and the consumer opens it — github.com/GHEC web), while `needs-interaction` is PROVIDER-driven (the provider opens the browser or broker UI itself and does not surface a URL — Entra).</summary>
+/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "kind",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(AuthLoginStepOpenUrl), "open-url")]
+[JsonDerivedType(typeof(AuthLoginStepInputRequired), "input-required")]
+[JsonDerivedType(typeof(AuthLoginStepAwaiting), "awaiting")]
+[JsonDerivedType(typeof(AuthLoginStepNeedsInteraction), "needs-interaction")]
+[JsonDerivedType(typeof(AuthLoginStepCompleted), "completed")]
+[JsonDerivedType(typeof(AuthLoginStepError), "error")]
+public partial class AuthLoginStep
+{
+    /// <summary>The type discriminator.</summary>
+    [JsonPropertyName("kind")]
+    public virtual string Kind { get; set; } = string.Empty;
+}
 
-    /// <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>The <c>open-url</c> variant of <see cref="AuthLoginStep"/>.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class AuthLoginStepOpenUrl : AuthLoginStep
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "open-url";
 
-    /// <summary>Most recent response text from the agent.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("latestResponse")]
-    public string? LatestResponse { get; set; }
+    /// <summary>Authorize URL the consumer should open in a browser (consumer-driven browser-open).</summary>
+    [JsonPropertyName("url")]
+    public required string Url { get; set; }
+}
 
-    /// <summary>Requested model override for the task when specified.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("model")]
-    public string? Model { get; set; }
+/// <summary>The <c>input-required</c> variant of <see cref="AuthLoginStep"/>.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class AuthLoginStepInputRequired : AuthLoginStep
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "input-required";
 
-    /// <summary>Most recent prompt delivered to the agent. Updated whenever the agent receives a follow-up message.</summary>
+    /// <summary>Prompt for the value the provider needs; the consumer supplies it as advance input (e.g. a GitHub Enterprise Cloud host, *.ghe.com).</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>The <c>awaiting</c> variant of <see cref="AuthLoginStep"/>.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class AuthLoginStepAwaiting : AuthLoginStep
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "awaiting";
+}
 
-    /// <summary>Tool call ID associated with this agent task.</summary>
-    [JsonPropertyName("toolCallId")]
-    public required string ToolCallId { get; set; }
+/// <summary>The <c>needs-interaction</c> variant of <see cref="AuthLoginStep"/>.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class AuthLoginStepNeedsInteraction : AuthLoginStep
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "needs-interaction";
 }
 
-/// <summary>Public owner attribution for a client-owned task. Identifiers are opaque and never authorize requests.</summary>
+/// <summary>A credential-free account choice after sign-in.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class TaskClientOwner
+public sealed class AuthLoginAccount
 {
-    /// <summary>ISO 8601 timestamp when the bound join disconnected.</summary>
-    [JsonPropertyName("disconnectedAt")]
-    public DateTimeOffset? DisconnectedAt { get; set; }
+    /// <summary>Host coordinate owned by the selected account's provider.</summary>
+    [JsonPropertyName("host")]
+    public string Host { get; set; } = string.Empty;
 
-    /// <summary>Display-only owner name.</summary>
-    [JsonPropertyName("displayName")]
-    public string? DisplayName { get; set; }
-
-    /// <summary>Opaque identity of the currently or most recently bound session join.</summary>
-    [JsonPropertyName("joinId")]
-    public string JoinId { get; set; } = string.Empty;
-
-    /// <summary>Class of the task owner.</summary>
+    /// <summary>Provider kind that owns this account choice.</summary>
     [JsonPropertyName("kind")]
-    public TaskClientOwnerKind Kind { get; set; }
-
-    /// <summary>Opaque session-scoped participant identity.</summary>
-    [JsonPropertyName("participantId")]
-    public string ParticipantId { get; set; } = string.Empty;
+    public AccountKind Kind { get; set; }
 
-    /// <summary>Whether this task's bound join is currently connected.</summary>
-    [JsonPropertyName("presence")]
-    public TaskClientOwnerPresence Presence { get; set; }
+    /// <summary>Human-readable login for the account choice.</summary>
+    [JsonPropertyName("login")]
+    public string Login { get; set; } = string.Empty;
 
-    /// <summary>Display-only owner source.</summary>
-    [JsonPropertyName("source")]
-    public string? Source { get; set; }
+    /// <summary>Opaque identifier supplied to the next login step to select this account.</summary>
+    [JsonPropertyName("selectionId")]
+    public string SelectionId { get; set; } = string.Empty;
 }
 
-/// <summary>Tracked client-owned task metadata.</summary>
-/// <remarks>The <c>client</c> variant of <see cref="TaskInfo"/>.</remarks>
+/// <summary>Result of an interactive login flow. Pending consent or account selection is not terminal.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class TaskInfoClient : TaskInfo
+public sealed class AuthLoginResultDto
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "client";
-
-    /// <summary>ISO 8601 timestamp when the current active segment started.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("activeStartedAt")]
-    public DateTimeOffset? ActiveStartedAt { get; set; }
-
-    /// <summary>Accumulated active execution time in milliseconds.</summary>
-    [JsonPropertyName("activeTimeMs")]
-    public required long ActiveTimeMs { get; set; }
-
-    /// <summary>Whether the currently bound owner can receive a cancellation request.</summary>
-    [JsonPropertyName("canCancel")]
-    public required bool CanCancel { get; set; }
-
-    /// <summary>Human-readable reason for terminal cancellation.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("cancellationReason")]
-    public string? CancellationReason { get; set; }
-
-    /// <summary>Owner-scoped registration and reclaim key.</summary>
-    [JsonPropertyName("clientTaskId")]
-    public required string ClientTaskId { get; set; }
-
-    /// <summary>ISO 8601 timestamp when the task reached a terminal status.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("completedAt")]
-    public DateTimeOffset? CompletedAt { get; set; }
-
-    /// <summary>Task description.</summary>
-    [JsonPropertyName("description")]
-    public required string Description { get; set; }
-
-    /// <summary>Optional task display name.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("displayName")]
-    public string? DisplayName { get; set; }
-
-    /// <summary>Human-readable terminal failure message.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("error")]
-    public string? Error { get; set; }
-
-    /// <summary>Optional owner-supplied terminal failure code.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("errorCode")]
-    public string? ErrorCode { get; set; }
-
-    /// <summary>Execution mode, which is always background for client-owned tasks.</summary>
-    [JsonPropertyName("executionMode")]
-    public required TaskClientExecutionMode ExecutionMode { get; set; }
-
-    /// <summary>Canonical runtime-generated task identifier.</summary>
-    [JsonPropertyName("id")]
-    public required string Id { get; set; }
-
-    /// <summary>ISO 8601 timestamp when the connected owner entered idle status.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("idleSince")]
-    public DateTimeOffset? IdleSince { get; set; }
-
-    /// <summary>ISO 8601 timestamp of the most recent orphan transition.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("orphanedAt")]
-    public DateTimeOffset? OrphanedAt { get; set; }
+    /// <summary>Available accounts when sign-in is awaiting account selection, ordered with Microsoft 365 first.</summary>
+    [JsonPropertyName("accounts")]
+    public IList<AuthLoginAccount>? Accounts { get; set; }
 
-    /// <summary>Public attribution and presence for the task owner.</summary>
-    [JsonPropertyName("owner")]
-    public required TaskClientOwner Owner { get; set; }
-
-    /// <summary>ISO 8601 timestamp of the most recent successful reclaim.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("reclaimedAt")]
-    public DateTimeOffset? ReclaimedAt { get; set; }
-
-    /// <summary>Opaque successful terminal result supplied by the task owner.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("result")]
-    public JsonElement? Result { get; set; }
-
-    /// <summary>Sequence number of the latest accepted owner update.</summary>
-    [JsonPropertyName("sequence")]
-    public required long Sequence { get; set; }
+    /// <summary>Host that was signed in, when completed.</summary>
+    [Url]
+    [StringSyntax(StringSyntaxAttribute.Uri)]
+    [JsonPropertyName("host")]
+    public string? Host { get; set; }
 
-    /// <summary>ISO 8601 timestamp when the task started.</summary>
-    [JsonPropertyName("startedAt")]
-    public required DateTimeOffset StartedAt { get; set; }
+    /// <summary>Login that was signed in, when completed.</summary>
+    [JsonPropertyName("login")]
+    public string? Login { get; set; }
 
-    /// <summary>Client task lifecycle status.</summary>
+    /// <summary>Current disposition of the login, including pending user decisions.</summary>
     [JsonPropertyName("status")]
-    public required TaskClientStatus Status { get; set; }
-
-    /// <summary>ISO 8601 timestamp of the latest accepted lifecycle change.</summary>
-    [JsonPropertyName("updatedAt")]
-    public required DateTimeOffset UpdatedAt { get; set; }
+    public AuthLoginResultStatus Status { 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>The <c>completed</c> variant of <see cref="AuthLoginStep"/>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class TaskInfoShell : TaskInfo
+public partial class AuthLoginStepCompleted : AuthLoginStep
 {
     /// <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; }
+    public override string Kind => "completed";
 
-    /// <summary>Process ID when available.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("pid")]
-    public long? Pid { get; set; }
+    /// <summary>Login result. When status is needs-plaintext-consent or needs-account-selection, advance with the user's decision to continue.</summary>
+    [JsonPropertyName("result")]
+    public required AuthLoginResultDto Result { get; set; }
+}
 
-    /// <summary>ISO 8601 timestamp when the task was started.</summary>
-    [JsonPropertyName("startedAt")]
-    public required DateTimeOffset StartedAt { get; set; }
+/// <summary>The <c>error</c> variant of <see cref="AuthLoginStep"/>.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class AuthLoginStepError : AuthLoginStep
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "error";
 
-    /// <summary>Current lifecycle status of the task.</summary>
-    [JsonPropertyName("status")]
-    public required TaskStatus Status { get; set; }
+    /// <summary>Human-readable failure message.</summary>
+    [JsonPropertyName("message")]
+    public required string Message { get; set; }
 }
 
-/// <summary>Background tasks currently tracked by the session.</summary>
+/// <summary>A started login flow: its opaque id and first step.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class TaskList
+public sealed class AuthLoginBegun
 {
-    /// <summary>Currently tracked tasks.</summary>
-    [JsonPropertyName("tasks")]
-    public IList<TaskInfo> Tasks { get => field ??= []; set; }
+    /// <summary>Opaque flow id used to advance or cancel this login.</summary>
+    [JsonPropertyName("flowId")]
+    public string FlowId { get; set; } = string.Empty;
+
+    /// <summary>The first step of the flow.</summary>
+    [JsonPropertyName("step")]
+    public AuthLoginStep Step { get => field ??= new(); set; }
 }
 
-/// <summary>Identifies the target session.</summary>
+/// <summary>Begin an interactive login flow for a provider kind. Dispatch is kind-only.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionTasksListRequest
+internal sealed class AuthLoginBeginRequest
 {
+    /// <summary>The provider kind to sign in with.</summary>
+    [JsonPropertyName("kind")]
+    public LoginProviderKind Kind { get; set; }
+
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Tracked client-owned task metadata.</summary>
+/// <summary>Advance an in-flight login flow, optionally fulfilling an input-required step.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class TaskClientInfo
+internal sealed class AuthLoginAdvanceRequest
 {
-    /// <summary>ISO 8601 timestamp when the current active segment started.</summary>
-    [JsonPropertyName("activeStartedAt")]
-    public DateTimeOffset? ActiveStartedAt { get; set; }
-
-    /// <summary>Accumulated active execution time in milliseconds.</summary>
-    [JsonPropertyName("activeTimeMs")]
-    public long ActiveTimeMs { get; set; }
-
-    /// <summary>Whether the currently bound owner can receive a cancellation request.</summary>
-    [JsonPropertyName("canCancel")]
-    public bool CanCancel { get; set; }
-
-    /// <summary>Human-readable reason for terminal cancellation.</summary>
-    [JsonPropertyName("cancellationReason")]
-    public string? CancellationReason { get; set; }
-
-    /// <summary>Owner-scoped registration and reclaim key.</summary>
-    [JsonPropertyName("clientTaskId")]
-    public string ClientTaskId { get; set; } = string.Empty;
-
-    /// <summary>ISO 8601 timestamp when the task reached a terminal status.</summary>
-    [JsonPropertyName("completedAt")]
-    public DateTimeOffset? CompletedAt { get; set; }
-
-    /// <summary>Task description.</summary>
-    [JsonPropertyName("description")]
-    public string Description { get; set; } = string.Empty;
-
-    /// <summary>Optional task display name.</summary>
-    [JsonPropertyName("displayName")]
-    public string? DisplayName { get; set; }
-
-    /// <summary>Human-readable terminal failure message.</summary>
-    [JsonPropertyName("error")]
-    public string? Error { get; set; }
-
-    /// <summary>Optional owner-supplied terminal failure code.</summary>
-    [JsonPropertyName("errorCode")]
-    public string? ErrorCode { get; set; }
-
-    /// <summary>Execution mode, which is always background for client-owned tasks.</summary>
-    [JsonPropertyName("executionMode")]
-    public TaskClientExecutionMode ExecutionMode { get; set; }
-
-    /// <summary>Canonical runtime-generated task identifier.</summary>
-    [JsonPropertyName("id")]
-    public string Id { get; set; } = string.Empty;
-
-    /// <summary>ISO 8601 timestamp when the connected owner entered idle status.</summary>
-    [JsonPropertyName("idleSince")]
-    public DateTimeOffset? IdleSince { get; set; }
-
-    /// <summary>ISO 8601 timestamp of the most recent orphan transition.</summary>
-    [JsonPropertyName("orphanedAt")]
-    public DateTimeOffset? OrphanedAt { get; set; }
-
-    /// <summary>Public attribution and presence for the task owner.</summary>
-    [JsonPropertyName("owner")]
-    public TaskClientOwner Owner { get => field ??= new(); set; }
-
-    /// <summary>ISO 8601 timestamp of the most recent successful reclaim.</summary>
-    [JsonPropertyName("reclaimedAt")]
-    public DateTimeOffset? ReclaimedAt { get; set; }
-
-    /// <summary>Opaque successful terminal result supplied by the task owner.</summary>
-    [JsonPropertyName("result")]
-    public JsonElement? Result { get; set; }
-
-    /// <summary>Sequence number of the latest accepted owner update.</summary>
-    [JsonPropertyName("sequence")]
-    public long Sequence { get; set; }
+    /// <summary>Opaque flow id from begin.</summary>
+    [JsonPropertyName("flowId")]
+    public string FlowId { get; set; } = string.Empty;
 
-    /// <summary>ISO 8601 timestamp when the task started.</summary>
-    [JsonPropertyName("startedAt")]
-    public DateTimeOffset StartedAt { get; set; }
+    /// <summary>Neutral input fulfilling a preceding input-required step (e.g. a GHEC host); ignored otherwise.</summary>
+    [JsonPropertyName("input")]
+    public string? Input { get; set; }
 
-    /// <summary>Client task lifecycle status.</summary>
-    [JsonPropertyName("status")]
-    public TaskClientStatus Status { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <summary>Task kind.</summary>
-    [JsonPropertyName("type")]
-    public TaskClientType Type { get; set; }
+/// <summary>Cancel an in-flight login flow.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class AuthLoginCancelRequest
+{
+    /// <summary>Opaque flow id from begin.</summary>
+    [JsonPropertyName("flowId")]
+    public string FlowId { get; set; } = string.Empty;
 
-    /// <summary>ISO 8601 timestamp of the latest accepted lifecycle change.</summary>
-    [JsonPropertyName("updatedAt")]
-    public DateTimeOffset UpdatedAt { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Result of registering or reclaiming a client-owned task.</summary>
+/// <summary>A file included in the session debug bundle.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class TasksRegisterResult
+public sealed class DebugCollectLogsCollectedEntry
 {
-    /// <summary>True only when this invocation created a new task.</summary>
-    [JsonPropertyName("created")]
-    public bool Created { get; set; }
+    /// <summary>Relative path of the file in the staged bundle/archive.</summary>
+    [JsonPropertyName("bundlePath")]
+    public string BundlePath { get; set; } = string.Empty;
 
-    /// <summary>True only when this invocation reclaimed an orphaned task.</summary>
-    [JsonPropertyName("reclaimed")]
-    public bool Reclaimed { get; set; }
+    /// <summary>Redacted output size in bytes.</summary>
+    [JsonPropertyName("sizeBytes")]
+    public long SizeBytes { get; set; }
 
-    /// <summary>Authoritative registered or reclaimed task.</summary>
-    [JsonPropertyName("task")]
-    public TaskClientInfo Task { get => field ??= new(); set; }
+    /// <summary>Source category for this entry.</summary>
+    [JsonPropertyName("source")]
+    public DebugCollectLogsSource Source { get; set; }
 }
 
-/// <summary>Registers or reclaims a client-owned task.</summary>
+/// <summary>An optional debug bundle entry that could not be included.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class TasksRegisterRequest
+public sealed class DebugCollectLogsSkippedEntry
 {
-    /// <summary>Whether the owner supports runtime cancellation requests.</summary>
-    [JsonPropertyName("cancellable")]
-    public bool Cancellable { get; set; }
+    /// <summary>Relative path requested for this bundle entry.</summary>
+    [JsonPropertyName("bundlePath")]
+    public string BundlePath { get; set; } = string.Empty;
 
-    /// <summary>Owner-scoped idempotency key used for registration and reclaim.</summary>
-    [JsonPropertyName("clientTaskId")]
-    public string ClientTaskId { get; set; } = string.Empty;
+    /// <summary>Server-local source path that could not be read.</summary>
+    [JsonPropertyName("path")]
+    public string? Path { get; set; }
 
-    /// <summary>Human-readable description of the external work.</summary>
-    [JsonPropertyName("description")]
-    public string Description { get; set; } = string.Empty;
+    /// <summary>Reason the entry was skipped.</summary>
+    [JsonPropertyName("reason")]
+    public string Reason { get; set; } = string.Empty;
+}
 
-    /// <summary>Optional short display name for the external work.</summary>
-    [JsonPropertyName("displayName")]
-    public string? DisplayName { get; set; }
+/// <summary>Result of collecting a session debug bundle.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class DebugCollectLogsResult
+{
+    /// <summary>Files included in the bundle.</summary>
+    [JsonPropertyName("entries")]
+    public IList<DebugCollectLogsCollectedEntry> Entries { get => field ??= []; set; }
 
-    /// <summary>Expected current sequence for idempotent registration or orphan reclaim.</summary>
-    [JsonPropertyName("expectedSequence")]
-    public long? ExpectedSequence { get; set; }
+    /// <summary>Destination kind that was written.</summary>
+    [JsonPropertyName("kind")]
+    public DebugCollectLogsResultKind Kind { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <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>Task kind.</summary>
-    [JsonPropertyName("type")]
-    public TaskClientType Type { get; set; }
+    /// <summary>Optional files or directories that could not be included.</summary>
+    [JsonPropertyName("skippedEntries")]
+    public IList<DebugCollectLogsSkippedEntry>? SkippedEntries { get; set; }
 }
 
-/// <summary>Result of publishing a client-owned task update.</summary>
+/// <summary>A caller-provided server-local file or directory to include in the debug bundle.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class TasksUpdateResult
+public sealed class DebugCollectLogsEntry
 {
-    /// <summary>Whether this invocation changed task state.</summary>
-    [JsonPropertyName("applied")]
-    public bool Applied { get; set; }
+    /// <summary>Relative path to use inside the staged bundle/archive.</summary>
+    [JsonPropertyName("bundlePath")]
+    public string BundlePath { get; set; } = string.Empty;
 
-    /// <summary>Whether this invocation repeated the latest accepted update.</summary>
-    [JsonPropertyName("duplicate")]
-    public bool Duplicate { get; set; }
+    /// <summary>Kind of source path to include.</summary>
+    [JsonPropertyName("kind")]
+    public DebugCollectLogsEntryKind Kind { get; set; }
 
-    /// <summary>Authoritative task after processing the update.</summary>
-    [JsonPropertyName("task")]
-    public TaskClientInfo Task { get => field ??= new(); 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. With none, no redaction is applied; the caller must ensure any necessary redaction is performed before this call.</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>Progress or terminal update for a client-owned task.</summary>
+/// <summary>Destination for the session debug bundle.</summary>
 /// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonPolymorphic(
     TypeDiscriminatorPropertyName = "kind",
     UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(TaskClientUpdateProgress), "progress")]
-[JsonDerivedType(typeof(TaskClientUpdateCompleted), "completed")]
-[JsonDerivedType(typeof(TaskClientUpdateFailed), "failed")]
-[JsonDerivedType(typeof(TaskClientUpdateCancelled), "cancelled")]
-public partial class TaskClientUpdate
+[JsonDerivedType(typeof(DebugCollectLogsDestinationArchive), "archive")]
+[JsonDerivedType(typeof(DebugCollectLogsDestinationDirectory), "directory")]
+public partial class DebugCollectLogsDestination
 {
     /// <summary>The type discriminator.</summary>
     [JsonPropertyName("kind")]
@@ -14910,5518 +14243,10850 @@ public partial class TaskClientUpdate
 }
 
 
-/// <summary>Publishes nonterminal progress for a running or idle client task.</summary>
-/// <remarks>The <c>progress</c> variant of <see cref="TaskClientUpdate"/>.</remarks>
+/// <summary>The <c>archive</c> variant of <see cref="DebugCollectLogsDestination"/>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class TaskClientUpdateProgress : TaskClientUpdate
+public partial class DebugCollectLogsDestinationArchive : DebugCollectLogsDestination
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Kind => "progress";
-
-    /// <summary>Optional progress message appended to recent activity when nonempty.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("message")]
-    public string? Message { get; set; }
-
-    /// <summary>Optional completion percentage; null clears the current percentage.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("percentage")]
-    public double? Percentage { get; set; }
+    public override string Kind => "archive";
 
-    /// <summary>Optional progress phase; null clears the current phase.</summary>
+    /// <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("phase")]
-    public string? Phase { get; set; }
+    [JsonPropertyName("noOverwrite")]
+    public bool? NoOverwrite { get; set; }
 
-    /// <summary>Optional active status transition.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("status")]
-    public TaskClientActiveStatus? Status { get; set; }
+    /// <summary>Absolute or server-relative path for the .tgz archive to create.</summary>
+    [JsonPropertyName("outputPath")]
+    public required string OutputPath { get; set; }
 }
 
-/// <summary>Reports successful terminal completion.</summary>
-/// <remarks>The <c>completed</c> variant of <see cref="TaskClientUpdate"/>.</remarks>
+/// <summary>The <c>directory</c> variant of <see cref="DebugCollectLogsDestination"/>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class TaskClientUpdateCompleted : TaskClientUpdate
+public partial class DebugCollectLogsDestinationDirectory : DebugCollectLogsDestination
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Kind => "completed";
-
-    /// <summary>Optional final progress message.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("message")]
-    public string? Message { get; set; }
+    public override string Kind => "directory";
 
-    /// <summary>Optional opaque successful terminal result.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("result")]
-    public JsonElement? Result { get; set; }
+    /// <summary>Directory where files should be staged. The directory is created if needed.</summary>
+    [JsonPropertyName("outputDirectory")]
+    public required string OutputDirectory { get; set; }
 }
 
-/// <summary>Reports terminal failure.</summary>
-/// <remarks>The <c>failed</c> variant of <see cref="TaskClientUpdate"/>.</remarks>
+/// <summary>Built-in session diagnostics to include in the bundle. Omitted fields default to true.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class TaskClientUpdateFailed : TaskClientUpdate
+public sealed class DebugCollectLogsInclude
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "failed";
+    /// <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>Optional owner-supplied terminal failure code.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("code")]
-    public string? Code { get; set; }
+    /// <summary>Include the session event log (`events.jsonl`). Defaults to true.</summary>
+    [JsonPropertyName("events")]
+    public bool? Events { get; set; }
 
-    /// <summary>Human-readable terminal failure message.</summary>
-    [JsonPropertyName("error")]
-    public required string Error { 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>Optional final progress message.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("message")]
-    public string? Message { get; set; }
-}
+    /// <summary>Maximum number of previous process logs to include. Defaults to 5.</summary>
+    [JsonPropertyName("previousProcessLogLimit")]
+    public long? PreviousProcessLogLimit { get; set; }
 
-/// <summary>Reports terminal cancellation after external work stopped.</summary>
-/// <remarks>The <c>cancelled</c> variant of <see cref="TaskClientUpdate"/>.</remarks>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class TaskClientUpdateCancelled : TaskClientUpdate
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "cancelled";
+    /// <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>Optional final progress message.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("message")]
-    public string? Message { get; set; }
+    /// <summary>Include process logs for the session. Defaults to true.</summary>
+    [JsonPropertyName("processLogs")]
+    public bool? ProcessLogs { get; set; }
 
-    /// <summary>Optional human-readable cancellation reason.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("reason")]
-    public string? Reason { 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>Updates a client-owned task.</summary>
+/// <summary>Options for collecting a session debug bundle with configurable redaction.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class TasksUpdateRequest
+internal sealed class DebugCollectLogsRequest
 {
-    /// <summary>Canonical runtime-generated task identifier.</summary>
-    [JsonPropertyName("id")]
-    public string Id { get; set; } = string.Empty;
+    /// <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>Owner update sequence to apply.</summary>
-    [JsonPropertyName("sequence")]
-    public long Sequence { get; set; }
+    /// <summary>Where the bundle should be written. Use `archive` to produce a .tgz, or `directory` to stage 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>Progress or terminal update payload.</summary>
-    [JsonPropertyName("update")]
-    public TaskClientUpdate Update { get => field ??= new(); 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>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class TasksRefreshResult
+public sealed class CanvasAction
 {
+    /// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionTasksRefreshRequest
+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>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>Declared canvases available in this session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class TasksWaitForPendingResult
+public sealed class CanvasList
 {
+    /// <summary>Declared canvases available in this session.</summary>
+    [JsonPropertyName("canvases")]
+    public IList<DiscoveredCanvas> Canvases { get => field ??= []; set; }
 }
 
 /// <summary>Identifies the target session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionTasksWaitForPendingRequest
+internal sealed class SessionCanvasListRequest
 {
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Progress information for the task, discriminated by type. Returns null when no task with this ID is currently tracked.</summary>
-/// <remarks>Polymorphic base type discriminated by <c>type</c>.</remarks>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-[JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "type",
-    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(TaskProgressAgent), "agent")]
-[JsonDerivedType(typeof(TaskProgressClient), "client")]
-[JsonDerivedType(typeof(TaskProgressShell), "shell")]
-public partial class TaskProgress
-{
-    /// <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(global::GitHub.Copilot.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="TaskProgress"/>.</remarks>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class TaskProgressAgent : TaskProgress
-{
-    /// <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>Generic progress for a client-owned task.</summary>
-/// <remarks>The <c>client</c> variant of <see cref="TaskProgress"/>.</remarks>
+/// <summary>Open canvas instance snapshot.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class TaskProgressClient : TaskProgress
+public sealed class OpenCanvasInstance
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "client";
+    /// <summary>Provider-local canvas identifier.</summary>
+    [JsonPropertyName("canvasId")]
+    public string CanvasId { get; set; } = string.Empty;
 
-    /// <summary>Most recent nonempty progress message.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("lastMessage")]
-    public string? LastMessage { get; set; }
+    /// <summary>Owning provider identifier.</summary>
+    [JsonPropertyName("extensionId")]
+    public string ExtensionId { get; set; } = string.Empty;
 
-    /// <summary>Current completion percentage from zero through one hundred.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("percentage")]
-    public double? Percentage { get; set; }
+    /// <summary>Owning extension display name, when available.</summary>
+    [JsonPropertyName("extensionName")]
+    public string? ExtensionName { get; set; }
 
-    /// <summary>Current owner-defined progress phase.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("phase")]
-    public string? Phase { get; set; }
+    /// <summary>Host-local PNG path for the canvas icon, when supplied.</summary>
+    [JsonPropertyName("icon")]
+    public string? Icon { get; set; }
 
-    /// <summary>Recent server-timestamped progress messages.</summary>
-    [JsonPropertyName("recentActivity")]
-    public required IList<TaskProgressLine> RecentActivity { get; set; }
+    /// <summary>Input supplied when the instance was opened.</summary>
+    [JsonPropertyName("input")]
+    public JsonElement? Input { get; set; }
 
-    /// <summary>Sequence number of the latest accepted owner update.</summary>
-    [JsonPropertyName("sequence")]
-    public required long Sequence { get; set; }
+    /// <summary>Stable caller-supplied canvas instance identifier.</summary>
+    [JsonPropertyName("instanceId")]
+    public string InstanceId { get; set; } = string.Empty;
 
-    /// <summary>Current client task lifecycle status.</summary>
+    /// <summary>Provider-supplied status text.</summary>
     [JsonPropertyName("status")]
-    public required TaskClientStatus Status { get; set; }
-
-    /// <summary>ISO 8601 timestamp of the latest accepted lifecycle change.</summary>
-    [JsonPropertyName("updatedAt")]
-    public required DateTimeOffset UpdatedAt { 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="TaskProgress"/>.</remarks>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class TaskProgressShell : TaskProgress
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "shell";
+    public string? Status { get; set; }
 
-    /// <summary>Process ID when available.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("pid")]
-    public long? Pid { get; set; }
+    /// <summary>Rendered title.</summary>
+    [JsonPropertyName("title")]
+    public string? Title { get; set; }
 
-    /// <summary>Recent stdout/stderr lines from the running shell command.</summary>
-    [JsonPropertyName("recentOutput")]
-    public required string RecentOutput { get; set; }
+    /// <summary>URL for web-rendered canvases.</summary>
+    [JsonPropertyName("url")]
+    public string? Url { get; set; }
 }
 
-/// <summary>Progress information for the task, or null when no task with that ID is tracked.</summary>
+/// <summary>Live open-canvas snapshot.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class TasksGetProgressResult
+public sealed class CanvasListOpenResult
 {
-    /// <summary>Progress information for the task, discriminated by type. Returns null when no task with this ID is currently tracked.</summary>
-    [JsonPropertyName("progress")]
-    public TaskProgress? Progress { get; set; }
+    /// <summary>Currently open canvas instances.</summary>
+    [JsonPropertyName("openCanvases")]
+    public IList<OpenCanvasInstance> OpenCanvases { get => field ??= []; set; }
 }
 
-/// <summary>Identifier of the background task to fetch progress for.</summary>
+/// <summary>Identifies the target session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class TasksGetProgressRequest
+internal sealed class SessionCanvasListOpenRequest
 {
-    /// <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>
+/// <summary>Canvas open parameters.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class TasksGetCurrentPromotableResult
+internal sealed class CanvasOpenRequest
 {
-    /// <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>Provider-local canvas identifier.</summary>
+    [JsonPropertyName("canvasId")]
+    public string CanvasId { 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>Canvas open input.</summary>
+    [JsonPropertyName("input")]
+    public JsonElement? Input { get; set; }
+
+    /// <summary>Caller-supplied stable instance identifier.</summary>
+    [JsonPropertyName("instanceId")]
+    public string InstanceId { get; set; } = string.Empty;
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(global::GitHub.Copilot.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(global::GitHub.Copilot.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>
+/// <summary>Canvas close parameters.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class TasksPromoteToBackgroundRequest
+internal sealed class CanvasCloseRequest
 {
-    /// <summary>Task identifier.</summary>
-    [JsonPropertyName("id")]
-    public string Id { 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>The promoted task as it now exists in background mode, omitted if no promotable task was waiting.</summary>
+/// <summary>Canvas action invocation result.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class TasksPromoteCurrentToBackgroundResult
+public sealed class CanvasActionInvokeResult
 {
-    /// <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>Provider-supplied action result.</summary>
+    [JsonPropertyName("result")]
+    public JsonElement? Result { get; set; }
 }
 
-/// <summary>Identifies the target session.</summary>
+/// <summary>Canvas action invocation parameters.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionTasksPromoteCurrentToBackgroundRequest
+internal sealed class CanvasActionInvokeRequest
 {
+    /// <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>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Indicates whether the background task was successfully cancelled.</summary>
+/// <summary>Internal canvas provider registration parameters.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class TasksCancelResult
+internal sealed class CanvasProviderRegisterRequest
 {
-    /// <summary>Whether the task was successfully cancelled.</summary>
-    [JsonPropertyName("cancelled")]
-    public bool Cancelled { get; set; }
-}
+    /// <summary>Canvas contributions supplied by the provider.</summary>
+    [JsonPropertyName("canvases")]
+    public IList<JsonElement> Canvases { get => field ??= []; set; }
 
-/// <summary>Identifier of the background task to cancel.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class TasksCancelRequest
-{
-    /// <summary>Task identifier.</summary>
-    [JsonPropertyName("id")]
-    public string Id { get; set; } = string.Empty;
+    /// <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>Indicates whether the task was removed. False when the task does not exist or is still running/idle.</summary>
-[Experimental(global::GitHub.Copilot.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>
+/// <summary>Internal canvas provider unregistration parameters.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class TasksRemoveRequest
+internal sealed class CanvasProviderUnregisterRequest
 {
-    /// <summary>Task identifier.</summary>
-    [JsonPropertyName("id")]
-    public string Id { get; set; } = string.Empty;
+    /// <summary>Connection identifier to unregister.</summary>
+    [JsonPropertyName("connectionId")]
+    public string ConnectionId { 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>
+/// <summary>Machine-readable workflow run failure.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>type</c>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class TasksSendMessageResult
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "type",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(WorkflowRunFailureWorkflowLimitReached), "workflow_limit_reached")]
+[JsonDerivedType(typeof(WorkflowRunFailureWorkflowResumeDeclined), "workflow_resume_declined")]
+[JsonDerivedType(typeof(WorkflowRunFailureWorkflowDurableFailure), "workflow_durable_failure")]
+[JsonDerivedType(typeof(WorkflowRunFailureWorkflowAccountingIncomplete), "workflow_accounting_incomplete")]
+[JsonDerivedType(typeof(WorkflowRunFailureWorkflowProviderDisconnected), "workflow_provider_disconnected")]
+public partial class WorkflowRunFailure
 {
-    /// <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>The type discriminator.</summary>
+    [JsonPropertyName("type")]
+    public virtual string Type { get; set; } = string.Empty;
 }
 
-/// <summary>Identifier of the target agent task, message content, and optional sender agent ID.</summary>
+
+/// <summary>The <c>workflow_limit_reached</c> variant of <see cref="WorkflowRunFailure"/>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class TasksSendMessageRequest
+public partial class WorkflowRunFailureWorkflowLimitReached : WorkflowRunFailure
 {
-    /// <summary>Agent ID of the sender, if sent on behalf of another agent.</summary>
-    [JsonPropertyName("fromAgentId")]
-    public string? FromAgentId { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "workflow_limit_reached";
 
-    /// <summary>Agent task identifier.</summary>
-    [JsonPropertyName("id")]
-    public string Id { get; set; } = string.Empty;
+    /// <summary>Resource ceiling that stopped the run.</summary>
+    [JsonPropertyName("kind")]
+    public required WorkflowRunFailureKind Kind { get; set; }
 
-    /// <summary>Message content to send to the agent.</summary>
-    [JsonPropertyName("message")]
-    public string Message { get; set; } = string.Empty;
+    /// <summary>Workflow run identifier.</summary>
+    [JsonPropertyName("runId")]
+    public required string RunId { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Suggested larger ceiling when the runtime can derive one safely.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("suggestedValue")]
+    public double? SuggestedValue { get; set; }
+
+    /// <summary>Approved effective ceiling that was reached.</summary>
+    [JsonPropertyName("value")]
+    public required double Value { get; set; }
 }
 
-/// <summary>Skill metadata available to a session, with name, description, source, enabled/invocable state, path, plugin, and argument hint.</summary>
+/// <summary>The <c>workflow_resume_declined</c> variant of <see cref="WorkflowRunFailure"/>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class Skill
+public partial class WorkflowRunFailureWorkflowResumeDeclined : WorkflowRunFailure
 {
-    /// <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;
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "workflow_resume_declined";
 
-    /// <summary>Whether the skill is currently enabled.</summary>
-    [JsonPropertyName("enabled")]
-    public bool Enabled { get; set; }
+    /// <summary>Human-readable reason the resume did not proceed.</summary>
+    [JsonPropertyName("reason")]
+    public required string Reason { get; set; }
 
-    /// <summary>Unique identifier for the skill.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Workflow run identifier whose changed limits were declined.</summary>
+    [JsonPropertyName("runId")]
+    public required string RunId { get; set; }
+}
 
-    /// <summary>Absolute path to the skill file.</summary>
-    [JsonPropertyName("path")]
-    public string? Path { get; set; }
+/// <summary>The <c>workflow_durable_failure</c> variant of <see cref="WorkflowRunFailure"/>.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class WorkflowRunFailureWorkflowDurableFailure : WorkflowRunFailure
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "workflow_durable_failure";
 
-    /// <summary>Name of the plugin that provides the skill, when source is 'plugin'.</summary>
-    [JsonPropertyName("pluginName")]
-    public string? PluginName { get; set; }
+    /// <summary>Stable failure code.</summary>
+    [JsonPropertyName("code")]
+    public required string Code { get; set; }
 
-    /// <summary>Source location type (e.g., project, personal-copilot, plugin, builtin).</summary>
-    [JsonPropertyName("source")]
-    public SkillSource Source { get; set; }
+    /// <summary>Execution-critical durable operation that failed.</summary>
+    [JsonPropertyName("operation")]
+    public required WorkflowDurableOperation Operation { 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>Workflow run identifier.</summary>
+    [JsonPropertyName("runId")]
+    public required string RunId { get; set; }
 }
 
-/// <summary>Skills available to the session, with their enabled state.</summary>
+/// <summary>The run stopped because its usage accounting could not be completed.</summary>
+/// <remarks>The <c>workflow_accounting_incomplete</c> variant of <see cref="WorkflowRunFailure"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SkillList
+public partial class WorkflowRunFailureWorkflowAccountingIncomplete : WorkflowRunFailure
 {
-    /// <summary>Available skills.</summary>
-    [JsonPropertyName("skills")]
-    public IList<Skill> Skills { get => field ??= []; set; }
-}
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "workflow_accounting_incomplete";
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionSkillsListRequest
-{
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Confirmed usage in nano-AIU, representing the floor of what the run spent.</summary>
+    [JsonPropertyName("drainedNanoAiu")]
+    public required long DrainedNanoAiu { get; set; }
+
+    /// <summary>Workflow run identifier.</summary>
+    [JsonPropertyName("runId")]
+    public required string RunId { get; set; }
 }
 
-/// <summary>Skill invocation record with name, path, content, allowed tools, and turn number.</summary>
+/// <summary>The extension that owns the workflow disconnected while the run was executing, so the host halted it. The run's journaled subagent results are preserved so a resume can reuse them.</summary>
+/// <remarks>The <c>workflow_provider_disconnected</c> variant of <see cref="WorkflowRunFailure"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SkillsInvokedSkill
+public partial class WorkflowRunFailureWorkflowProviderDisconnected : WorkflowRunFailure
 {
-    /// <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>Whether model invocation was disabled when this skill was invoked.</summary>
-    [JsonPropertyName("disableModelInvocation")]
-    public bool? DisableModelInvocation { get; set; }
-
-    /// <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;
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "workflow_provider_disconnected";
 
-    /// <summary>Path to the SKILL.md file, or an empty string for an SDK-provided skill without a filesystem identity.</summary>
-    [JsonPropertyName("path")]
-    public string Path { get; set; } = string.Empty;
+    /// <summary>Workflow run identifier.</summary>
+    [JsonPropertyName("runId")]
+    public required string RunId { get; set; }
 }
 
-/// <summary>Skills invoked during this session, ordered by invocation time (most recent last).</summary>
+/// <summary>Durable metadata describing who initiated a workflow pause.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>type</c>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SkillsGetInvokedResult
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "type",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(WorkflowPauseInfoUser), "user")]
+[JsonDerivedType(typeof(WorkflowPauseInfoCheckpoint), "checkpoint")]
+public partial class WorkflowPauseInfo
 {
-    /// <summary>Skills invoked during this session, ordered by invocation time (most recent last).</summary>
-    [JsonPropertyName("skills")]
-    public IList<SkillsInvokedSkill> Skills { get => field ??= []; set; }
+    /// <summary>The type discriminator.</summary>
+    [JsonPropertyName("type")]
+    public virtual string Type { get; set; } = string.Empty;
 }
 
-/// <summary>Identifies the target session.</summary>
+
+/// <summary>The <c>user</c> variant of <see cref="WorkflowPauseInfo"/>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionSkillsGetInvokedRequest
+public partial class WorkflowPauseInfoUser : WorkflowPauseInfo
 {
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "user";
 }
 
-/// <summary>Name of the skill to enable for the session.</summary>
+/// <summary>The <c>checkpoint</c> variant of <see cref="WorkflowPauseInfo"/>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SkillsEnableRequest
+public partial class WorkflowPauseInfoCheckpoint : WorkflowPauseInfo
 {
-    /// <summary>Name of the skill to enable.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "checkpoint";
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Stable author-defined checkpoint key that initiated the pause.</summary>
+    [JsonPropertyName("key")]
+    public required string Key { get; set; }
 }
 
-/// <summary>Name of the skill to disable for the session.</summary>
+/// <summary>Complete current or terminal workflow run envelope.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SkillsDisableRequest
+public sealed class WorkflowRunResult
 {
-    /// <summary>Name of the skill to disable.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>One-based execution attempt represented by this envelope. Absent before the first attempt starts or when returned by an older runtime.</summary>
+    [JsonPropertyName("attempt")]
+    public long? Attempt { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Error message for an errored run.</summary>
+    [JsonPropertyName("error")]
+    public string? Error { get; set; }
 
-/// <summary>Diagnostics from reloading skill definitions, with warnings and errors as separate lists.</summary>
-[Experimental(global::GitHub.Copilot.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>Machine-readable failure details for a halted or errored run.</summary>
+    [JsonPropertyName("failure")]
+    public WorkflowRunFailure? Failure { 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>Structured pause initiator metadata for a paused attempt.</summary>
+    [JsonPropertyName("pauseInfo")]
+    public WorkflowPauseInfo? PauseInfo { get; set; }
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionSkillsReloadRequest
-{
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Reason for a halted or cancelled run.</summary>
+    [JsonPropertyName("reason")]
+    public string? Reason { get; set; }
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionSkillsEnsureLoadedRequest
-{
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Completed workflow result.</summary>
+    [JsonPropertyName("result")]
+    public JsonElement? Result { get; set; }
 
-/// <summary>Recorded MCP server connection failure.</summary>
-[Experimental(global::GitHub.Copilot.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>Workflow run identifier.</summary>
+    [JsonPropertyName("runId")]
+    public string RunId { get; set; } = string.Empty;
 
-    /// <summary>epoch-ms timestamp at which the failure was recorded.</summary>
-    [JsonPropertyName("timestamp")]
-    public long Timestamp { get; set; }
-}
+    /// <summary>Partial journal and progress snapshot for a halted, cancelled, or errored run.</summary>
+    [JsonPropertyName("snapshot")]
+    public JsonElement? Snapshot { get; set; }
 
-/// <summary>Recorded MCP server pending-auth state.</summary>
-[Experimental(global::GitHub.Copilot.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>Current or terminal workflow run status.</summary>
+    [JsonPropertyName("status")]
+    public WorkflowRunStatus Status { get; set; }
 }
 
-/// <summary>Host-level state, omitted when no MCP host is initialized.</summary>
+/// <summary>Wire-only per-invocation workflow resource ceiling overrides.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpHostState
+public sealed class WorkflowRunLimits
 {
-    /// <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>Maximum AI credits consumed by workflow 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>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>Maximum number of workflow subagents that may run concurrently.</summary>
+    [JsonPropertyName("maxConcurrentSubagents")]
+    public long? MaxConcurrentSubagents { get; set; }
 
-    /// <summary>Names of servers with in-flight connection attempts.</summary>
-    [JsonPropertyName("pendingConnections")]
-    public IList<string> PendingConnections { get => field ??= []; set; }
-}
+    /// <summary>Maximum total number of workflow subagents that may be admitted.</summary>
+    [JsonPropertyName("maxTotalSubagents")]
+    public long? MaxTotalSubagents { get; set; }
 
-/// <summary>Owned installation that a listed MCP server's live configuration came from.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpServerOwnership
-{
-    /// <summary>Stable installation identifier from the owned installation receipt.</summary>
-    [JsonPropertyName("installationId")]
-    public string InstallationId { get; set; } = string.Empty;
+    /// <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>MCP server status entry, including config source/plugin source and any connection error.</summary>
+/// <summary>Options controlling workflow invocation.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpServer
+public sealed class WorkflowRunOptions
 {
-    /// <summary>Human-readable display name supplied by a managed server catalog.</summary>
-    [JsonPropertyName("displayName")]
-    public string? DisplayName { get; set; }
-
-    /// <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>Owned installation this entry's live configuration came from. Absent for manual, workspace, plugin, builtin and same-name servers, and on runtimes without owned installations.</summary>
-    [JsonPropertyName("owned")]
-    public McpServerOwnership? Owned { get; set; }
-
-    /// <summary>Server-advertised metadata for a connected server. Omitted when no live connection metadata is available, including while pending or when failed, disabled, stopped, or not configured.</summary>
-    [JsonPropertyName("serverMetadata")]
-    public McpServerMetadata? ServerMetadata { get; set; }
-
-    /// <summary>Configuration source: user, workspace, plugin, builtin, or managed.</summary>
-    [JsonPropertyName("source")]
-    public McpServerSource? Source { get; set; }
+    /// <summary>Per-invocation resource ceiling overrides.</summary>
+    [JsonPropertyName("limits")]
+    public WorkflowRunLimits? Limits { get; set; }
 
-    /// <summary>Plugin name that provided this server, when source is plugin.</summary>
-    [JsonPropertyName("sourcePlugin")]
-    public string? SourcePlugin { get; set; }
+    /// <summary>Whether to emit workflow phase names to the session transcript.</summary>
+    [JsonPropertyName("logPhaseNames")]
+    public bool? LogPhaseNames { get; set; }
 
-    /// <summary>Plugin version that provided this server, when source is plugin.</summary>
-    [JsonPropertyName("sourcePluginVersion")]
-    public string? SourcePluginVersion { get; set; }
+    /// <summary>Whether to notify the originating session when the workflow completes.</summary>
+    [JsonPropertyName("notifyOnComplete")]
+    public bool? NotifyOnComplete { get; set; }
 
-    /// <summary>Connection status: connected, failed, needs-auth, pending, disabled, stopped, or not_configured.</summary>
-    [JsonPropertyName("status")]
-    public McpServerStatus Status { get; set; }
+    /// <summary>Run identifier whose journal and progress should seed this resumed run.</summary>
+    [JsonPropertyName("resumeFromRunId")]
+    public string? ResumeFromRunId { get; set; }
 }
 
-/// <summary>MCP servers configured for the session, with their connection status and host-level state.</summary>
+/// <summary>Parameters for invoking a registered workflow.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpServerList
+internal sealed class WorkflowRunRequest
 {
-    /// <summary>Host-level state, omitted when no MCP host is initialized.</summary>
-    [JsonPropertyName("host")]
-    public McpHostState? Host { get; set; }
+    /// <summary>Workflow input value.</summary>
+    [JsonPropertyName("args")]
+    public JsonElement Args { get; set; }
 
-    /// <summary>Configured MCP servers.</summary>
-    [JsonPropertyName("servers")]
-    public IList<McpServer> Servers { get => field ??= []; set; }
-}
+    /// <summary>Registered workflow name.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
+
+    /// <summary>Workflow invocation options.</summary>
+    [JsonPropertyName("options")]
+    public WorkflowRunOptions? Options { get; set; }
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(global::GitHub.Copilot.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>
+/// <summary>Resolved persisted workflow identity and resumed run envelope.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpToolUi
+public sealed class WorkflowResumeResult
 {
-    /// <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>Terminal resumed run envelope.</summary>
+    [JsonPropertyName("run")]
+    public WorkflowRunResult Run { get => field ??= new(); set; }
 
-    /// <summary>Tool visibility advertised by the server. When absent, MCP Apps defaults apply.</summary>
-    [JsonPropertyName("visibility")]
-    public IList<McpToolUiVisibility>? Visibility { get; set; }
+    /// <summary>Persisted workflow name resolved for the resumed run.</summary>
+    [JsonPropertyName("workflowName")]
+    public string WorkflowName { get; set; } = string.Empty;
 }
 
-/// <summary>MCP tool metadata with tool name, optional description, and normalized MCP Apps discovery metadata.</summary>
+/// <summary>Parameters for resuming a workflow run from its persisted identity.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpTools
+internal sealed class WorkflowResumeRequest
 {
-    /// <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>Optional per-invocation resource ceiling overrides.</summary>
+    [JsonPropertyName("limits")]
+    public WorkflowRunLimits? Limits { get; set; }
 
-    /// <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>Whether to emit workflow phase names to the session transcript.</summary>
+    [JsonPropertyName("logPhaseNames")]
+    public bool? LogPhaseNames { get; set; }
 
-/// <summary>Tools exposed by the connected MCP server. Throws when the server is not connected.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpListToolsResult
-{
-    /// <summary>Tools exposed by the server.</summary>
-    [JsonPropertyName("tools")]
-    public IList<McpTools> Tools { get => field ??= []; set; }
-}
+    /// <summary>Whether to notify the originating session when the workflow completes.</summary>
+    [JsonPropertyName("notifyOnComplete")]
+    public bool? NotifyOnComplete { get; set; }
 
-/// <summary>Server name whose tool list should be returned.</summary>
-[Experimental(global::GitHub.Copilot.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>Workflow 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 MCP server to enable for the session.</summary>
+/// <summary>Options for an internal tool-originated workflow invocation.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpEnableRequest
+internal sealed class WorkflowToolRunOptions
 {
-    /// <summary>Exact receipt identity for explicit owned activation in this session.</summary>
-    [JsonPropertyName("expectedInstallationId")]
-    public string? ExpectedInstallationId { get; set; }
+    /// <summary>Per-invocation resource ceiling overrides.</summary>
+    [JsonPropertyName("limits")]
+    public WorkflowRunLimits? Limits { get; set; }
 
-    /// <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 required string ServerName { get; set; }
+    /// <summary>Run identifier whose journal and progress should seed this resumed run.</summary>
+    [JsonPropertyName("resumeFromRunId")]
+    public string? ResumeFromRunId { get; set; }
 }
 
-/// <summary>Name of the MCP server to enable for the session.</summary>
+/// <summary>Internal parameters for invoking a registered workflow from a tool.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class McpEnableRequestWithSession
+internal sealed class WorkflowToolRunRequest
 {
-    /// <summary>Exact receipt identity for explicit owned activation in this session.</summary>
-    [JsonPropertyName("expectedInstallationId")]
-    public string? ExpectedInstallationId { get; set; }
+    /// <summary>Workflow input value.</summary>
+    [JsonPropertyName("args")]
+    public JsonElement Args { get; set; }
 
-    /// <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>Registered workflow name.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
+
+    /// <summary>Tool-originated workflow invocation options.</summary>
+    [JsonPropertyName("options")]
+    public WorkflowToolRunOptions? Options { get; set; }
 
     /// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpDisableRequest
-{
-    /// <summary>Required for an owned installation; omission preserves only manual-server behaviour.</summary>
-    [JsonPropertyName("expectedInstallationId")]
-    public string? ExpectedInstallationId { get; set; }
 
-    /// <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 required string ServerName { get; set; }
+    /// <summary>Opaque identifier of the originating tool call.</summary>
+    [JsonPropertyName("toolCallId")]
+    public string? ToolCallId { get; set; }
 }
 
-/// <summary>Name of the MCP server to disable for the session.</summary>
+/// <summary>Internal parameters for resuming a workflow run from a tool.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class McpDisableRequestWithSession
+internal sealed class WorkflowToolResumeRequest
 {
-    /// <summary>Required for an owned installation; omission preserves only manual-server behaviour.</summary>
-    [JsonPropertyName("expectedInstallationId")]
-    public string? ExpectedInstallationId { get; set; }
+    /// <summary>Optional per-invocation resource ceiling overrides.</summary>
+    [JsonPropertyName("limits")]
+    public WorkflowRunLimits? Limits { get; set; }
 
-    /// <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>Workflow 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>Opaque identifier of the originating tool call.</summary>
+    [JsonPropertyName("toolCallId")]
+    public string? ToolCallId { get; set; }
 }
 
-/// <summary>Identifies the target session.</summary>
+/// <summary>Parameters for retrieving a workflow run.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionMcpReloadRequest
+internal sealed class WorkflowGetRunRequest
 {
+    /// <summary>Workflow 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>Result of moving in-flight MCP loading to the background.</summary>
+/// <summary>Declared or approved workflow resource ceilings.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class MoveMcpLoadingToBackgroundResult
+public sealed class WorkflowDeclaredLimits
 {
-    /// <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>Maximum AI credits consumed by subagents and descendants.</summary>
+    [JsonPropertyName("maxAiCredits")]
+    public double? MaxAiCredits { get; set; }
+
+    /// <summary>Maximum concurrently active subagents.</summary>
+    [JsonPropertyName("maxConcurrentSubagents")]
+    public long? MaxConcurrentSubagents { get; set; }
+
+    /// <summary>Maximum total subagents spawned by the run.</summary>
+    [JsonPropertyName("maxTotalSubagents")]
+    public long? MaxTotalSubagents { get; set; }
+
+    /// <summary>Maximum accumulated active execution time in seconds.</summary>
+    [JsonPropertyName("timeoutSeconds")]
+    public double? TimeoutSeconds { get; set; }
 }
 
-/// <summary>Identifies the target session.</summary>
+/// <summary>Durable workflow resource consumption.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionMcpMoveLoadingToBackgroundRequest
+public sealed class WorkflowRunConsumed
 {
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Accumulated active execution time in milliseconds.</summary>
+    [JsonPropertyName("activeMs")]
+    public long ActiveMs { get; set; }
+
+    /// <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>MCP server allowed by policy, with server name and optional PII-free explanatory note.</summary>
+/// <summary>Current workflow phase identity.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpAllowedServer
+public sealed class WorkflowCurrentPhase
 {
-    /// <summary>Allowed server name.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Current phase identifier.</summary>
+    [JsonPropertyName("id")]
+    public string Id { get; set; } = string.Empty;
 
-    /// <summary>PII-free note explaining why the server was allowed.</summary>
-    [JsonPropertyName("redactedNote")]
-    public string? RedactedNote { get; set; }
+    /// <summary>Zero-based declared phase ordinal, or null for an undeclared phase.</summary>
+    [JsonPropertyName("ordinal")]
+    public long? Ordinal { get; set; }
 }
 
-/// <summary>MCP server whose connection attempt failed.</summary>
+/// <summary>Prompt-safe terminal workflow outcome.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpFailedServer
+public sealed class WorkflowRunTerminal
 {
-    /// <summary>The captured connection failure detail.</summary>
+    /// <summary>Human-readable terminal error.</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(global::GitHub.Copilot.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")]
-#else
-    [Obsolete("This member is deprecated and will be removed in a future version.")]
-#endif
-    [JsonPropertyName("enterpriseName")]
-    public string? EnterpriseName { get; set; }
+    /// <summary>Machine-readable terminal failure.</summary>
+    [JsonPropertyName("failure")]
+    public WorkflowRunFailure? Failure { get; set; }
 
-    /// <summary>Filtered server name.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Pause initiator metadata, or null when the run did not pause.</summary>
+    [JsonPropertyName("pauseInfo")]
+    public WorkflowPauseInfo? PauseInfo { get; set; }
 
-    /// <summary>Human-readable filter reason.</summary>
+    /// <summary>Human-readable terminal reason.</summary>
     [JsonPropertyName("reason")]
-    public string Reason { get; set; } = string.Empty;
+    public string? Reason { get; set; }
 
-    /// <summary>PII-free filter reason.</summary>
-    [JsonPropertyName("redactedReason")]
-    public string? RedactedReason { get; set; }
+    /// <summary>Prompt-safe preview of the completed result.</summary>
+    [JsonPropertyName("resultPreview")]
+    public string? ResultPreview { get; set; }
 }
 
-/// <summary>MCP server startup filtering result.</summary>
+/// <summary>Durable workflow run summary with read-time live overlays.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class McpStartServersResult
+public sealed class WorkflowRunSummary
 {
-    /// <summary>Non-default servers allowed by policy.</summary>
-    [JsonPropertyName("allowedServers")]
-    public IList<McpAllowedServer>? AllowedServers { get; set; }
+    /// <summary>Epoch milliseconds when the current active segment started, or null while inactive.</summary>
+    [JsonPropertyName("activeSegmentStartedAt")]
+    public long? ActiveSegmentStartedAt { get; set; }
 
-    /// <summary>Servers whose connection attempt failed.</summary>
-    [JsonPropertyName("failedServers")]
-    public IList<McpFailedServer>? FailedServers { get; set; }
+    /// <summary>Approved effective resource ceilings, or null until approved.</summary>
+    [JsonPropertyName("approved")]
+    public WorkflowDeclaredLimits? Approved { get; set; }
 
-    /// <summary>Servers filtered out before startup.</summary>
-    [JsonPropertyName("filteredServers")]
-    public IList<McpFilteredServer> FilteredServers { get => field ??= []; set; }
-}
+    /// <summary>Whether the durable run state currently passes runtime resume eligibility checks.</summary>
+    [JsonPropertyName("canResume")]
+    public bool CanResume { get; set; }
 
-/// <summary>Opaque MCP reload configuration.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class McpReloadWithConfigRequest
-{
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Epoch milliseconds when the run completed, or null while nonterminal.</summary>
+    [JsonPropertyName("completedAt")]
+    public long? CompletedAt { 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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpExecuteSamplingResult
-{
-}
+    /// <summary>Durable resource consumption.</summary>
+    [JsonPropertyName("consumed")]
+    public WorkflowRunConsumed Consumed { get => field ??= new(); set; }
 
-/// <summary>Outcome of an MCP sampling execution: success result, failure error, or cancellation.</summary>
-[Experimental(global::GitHub.Copilot.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>Epoch milliseconds when the run was created.</summary>
+    [JsonPropertyName("createdAt")]
+    public long CreatedAt { get; set; }
 
-    /// <summary>Error description, present when action='failure'.</summary>
-    [JsonPropertyName("error")]
-    public string? Error { get; set; }
+    /// <summary>Current phase identity, or null before any phase is entered.</summary>
+    [JsonPropertyName("currentPhase")]
+    public WorkflowCurrentPhase? CurrentPhase { 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>Resource ceilings declared by the workflow.</summary>
+    [JsonPropertyName("declaredLimits")]
+    public WorkflowDeclaredLimits DeclaredLimits { get => field ??= new(); 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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpExecuteSamplingRequest
-{
-}
+    /// <summary>Number of phases declared by the workflow.</summary>
+    [JsonPropertyName("declaredPhaseCount")]
+    public long DeclaredPhaseCount { get; set; }
 
-/// <summary>Identifiers and raw MCP CreateMessageRequest params used to run a sampling inference.</summary>
-[Experimental(global::GitHub.Copilot.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>Human-readable workflow description.</summary>
+    [JsonPropertyName("description")]
+    public string Description { 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>
-    [JsonPropertyName("request")]
-    public McpExecuteSamplingRequest Request { get => field ??= new(); set; }
+    /// <summary>Number of direct workflow agents currently live.</summary>
+    [JsonPropertyName("liveAgentCount")]
+    public long LiveAgentCount { 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>Epoch milliseconds when this live-overlay snapshot was observed.</summary>
+    [JsonPropertyName("observedAt")]
+    public long ObservedAt { get; set; }
 
-    /// <summary>Name of the MCP server that initiated the sampling request.</summary>
-    [JsonPropertyName("serverName")]
-    public string ServerName { get; set; } = string.Empty;
+    /// <summary>Monotonic durable run revision.</summary>
+    [JsonPropertyName("revision")]
+    public long Revision { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Workflow run identifier.</summary>
+    [JsonPropertyName("runId")]
+    public string RunId { get; set; } = string.Empty;
 
-/// <summary>Indicates whether an in-flight sampling execution with the given requestId was found and cancelled.</summary>
-[Experimental(global::GitHub.Copilot.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>Epoch milliseconds when execution first started, or null before start.</summary>
+    [JsonPropertyName("startedAt")]
+    public long? StartedAt { get; set; }
 
-/// <summary>The requestId previously passed to executeSampling that should be cancelled.</summary>
-[Experimental(global::GitHub.Copilot.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>Current workflow run status.</summary>
+    [JsonPropertyName("status")]
+    public WorkflowRunStatus Status { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Terminal run outcome, or null while nonterminal.</summary>
+    [JsonPropertyName("terminal")]
+    public WorkflowRunTerminal? Terminal { get; set; }
 
-/// <summary>Env-value mode recorded on the session after the update.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpSetEnvValueModeResult
-{
-    /// <summary>Mode recorded on the session after the update.</summary>
-    [JsonPropertyName("mode")]
-    public McpSetEnvValueModeDetails Mode { get; set; }
-}
+    /// <summary>Total direct workflow agents spawned across all attempts.</summary>
+    [JsonPropertyName("totalSpawnedAgentCount")]
+    public long TotalSpawnedAgentCount { get; set; }
 
-/// <summary>Mode controlling how MCP server env values are resolved (`direct` or `indirect`).</summary>
-[Experimental(global::GitHub.Copilot.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>Epoch milliseconds when the durable run was last updated.</summary>
+    [JsonPropertyName("updatedAt")]
+    public long UpdatedAt { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Registered workflow name.</summary>
+    [JsonPropertyName("workflowName")]
+    public string WorkflowName { get; set; } = string.Empty;
 }
 
-/// <summary>Indicates whether the auto-managed `github` MCP server was removed (false when nothing to remove).</summary>
+/// <summary>A page of workflow runs in durable creation order.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpRemoveGitHubResult
+public sealed class WorkflowListRunsResult
 {
-    /// <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>Whether terminal runs newer than this page exist.</summary>
+    [JsonPropertyName("hasMoreNewer")]
+    public bool? HasMoreNewer { get; set; }
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionMcpRemoveGitHubRequest
-{
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <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>Result of configuring GitHub MCP.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class McpConfigureGitHubResult
-{
-    /// <summary>Whether GitHub MCP configuration changed.</summary>
-    [JsonPropertyName("changed")]
-    public bool Changed { 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>Number of terminal runs older than this page.</summary>
+    [JsonPropertyName("omittedOlder")]
+    public long? OmittedOlder { get; set; }
+
+    /// <summary>Workflow run summaries in durable creation order.</summary>
+    [JsonPropertyName("runs")]
+    public IList<WorkflowRunSummary> Runs { get => field ??= []; set; }
 }
 
-/// <summary>Credential-free authentication identity used to configure GitHub MCP.</summary>
+/// <summary>Parameters for paging workflow runs.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class McpConfigureGitHubRequest
+internal sealed class WorkflowListRunsRequest
 {
+    /// <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 terminal runs to return. Defaults to 200 and is capped at 500.</summary>
+    [JsonPropertyName("limit")]
+    public int? Limit { get; set; }
+
     /// <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>
+/// <summary>Prompt-safe durable identity and live status for a direct workflow agent.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpStartServerRequest
+public sealed class WorkflowAgentSummary
 {
-    /// <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>Accumulated active agent time in milliseconds.</summary>
+    [JsonPropertyName("activeMs")]
+    public long ActiveMs { get; set; }
 
-    /// <summary>Exact receipt identity for explicit owned activation in this session.</summary>
-    [JsonPropertyName("expectedInstallationId")]
-    public string? ExpectedInstallationId { get; set; }
+    /// <summary>Prompt-safe live activity text.</summary>
+    [JsonPropertyName("activity")]
+    public string? Activity { get; set; }
 
-    /// <summary>Name of the MCP server to start.</summary>
-    [JsonPropertyName("serverName")]
-    public required string ServerName { get; set; }
-}
+    /// <summary>Stable direct-agent identifier.</summary>
+    [JsonPropertyName("agentId")]
+    public string AgentId { 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(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class McpStartServerRequestWithSession
-{
-    /// <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>Registered agent type.</summary>
+    [JsonPropertyName("agentType")]
+    public string AgentType { get; set; } = string.Empty;
 
-    /// <summary>Exact receipt identity for explicit owned activation in this session.</summary>
-    [JsonPropertyName("expectedInstallationId")]
-    public string? ExpectedInstallationId { get; set; }
+    /// <summary>Epoch milliseconds when the agent completed.</summary>
+    [JsonPropertyName("completedAt")]
+    public long? CompletedAt { get; set; }
 
-    /// <summary>Name of the MCP server to start.</summary>
-    [JsonPropertyName("serverName")]
-    public string ServerName { get; set; } = string.Empty;
+    /// <summary>Friendly, non-unique name intended for display.</summary>
+    [JsonPropertyName("displayName")]
+    public string? DisplayName { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Friendly, non-unique name intended for display.</summary>
+    [JsonPropertyName("label")]
+    public string Label { 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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public 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>Phase identifier active when the agent was launched, or null.</summary>
+    [JsonPropertyName("phaseId")]
+    public string? PhaseId { get; set; }
 
-    /// <summary>Exact receipt identity for an explicit owned restart; configuration overrides are refused.</summary>
-    [JsonPropertyName("expectedInstallationId")]
-    public string? ExpectedInstallationId { get; set; }
+    /// <summary>Model requested when the agent was launched.</summary>
+    [JsonPropertyName("requestedModel")]
+    public string? RequestedModel { get; set; }
 
-    /// <summary>Name of the MCP server to restart.</summary>
-    [JsonPropertyName("serverName")]
-    public required string ServerName { get; set; }
-}
+    /// <summary>Concrete model resolved for the agent.</summary>
+    [JsonPropertyName("resolvedModel")]
+    public string? ResolvedModel { 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>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class McpRestartServerRequestWithSession
-{
-    /// <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>Owning workflow run identifier.</summary>
+    [JsonPropertyName("runId")]
+    public string RunId { get; set; } = string.Empty;
 
-    /// <summary>Exact receipt identity for an explicit owned restart; configuration overrides are refused.</summary>
-    [JsonPropertyName("expectedInstallationId")]
-    public string? ExpectedInstallationId { get; set; }
+    /// <summary>Epoch milliseconds when the agent started.</summary>
+    [JsonPropertyName("startedAt")]
+    public long? StartedAt { get; set; }
 
-    /// <summary>Name of the MCP server to restart.</summary>
-    [JsonPropertyName("serverName")]
-    public string ServerName { get; set; } = string.Empty;
+    /// <summary>Current durable or live agent status.</summary>
+    [JsonPropertyName("status")]
+    public string Status { get; set; } = string.Empty;
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Tool-call identifier that launched the agent.</summary>
+    [JsonPropertyName("toolCallId")]
+    public string ToolCallId { get; set; } = string.Empty;
 }
 
-/// <summary>Server name for an individual MCP server stop.</summary>
+/// <summary>Durable lifecycle and timing for one workflow phase.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpStopServerRequest
+public sealed class WorkflowPhaseObservation
 {
-    /// <summary>Exact owned receipt identity. Stop also forgets this session's durable activation.</summary>
-    [JsonPropertyName("expectedInstallationId")]
-    public string? ExpectedInstallationId { get; set; }
+    /// <summary>Completed active time accumulated by this phase in milliseconds.</summary>
+    [JsonPropertyName("accumulatedActiveMs")]
+    public long AccumulatedActiveMs { get; set; }
 
-    /// <summary>Name of the MCP server to stop.</summary>
-    [JsonPropertyName("serverName")]
-    public required string ServerName { get; set; }
-}
+    /// <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>Server name for an individual MCP server stop.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class McpStopServerRequestWithSession
-{
-    /// <summary>Exact owned receipt identity. Stop also forgets this session's durable activation.</summary>
-    [JsonPropertyName("expectedInstallationId")]
-    public string? ExpectedInstallationId { get; set; }
+    /// <summary>Current live active time for this phase in milliseconds.</summary>
+    [JsonPropertyName("currentActiveMs")]
+    public long CurrentActiveMs { get; set; }
 
-    /// <summary>Name of the MCP server to stop.</summary>
-    [JsonPropertyName("serverName")]
-    public string ServerName { get; set; } = string.Empty;
+    /// <summary>Optional human-readable phase detail.</summary>
+    [JsonPropertyName("detail")]
+    public string? Detail { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Number of times execution entered this phase.</summary>
+    [JsonPropertyName("entryCount")]
+    public long EntryCount { get; set; }
 
-/// <summary>Registration parameters for an external MCP client.</summary>
-[Experimental(global::GitHub.Copilot.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>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>Server name identifying the external client to remove.</summary>
-[Experimental(global::GitHub.Copilot.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>Direct agents in this phase that are currently live.</summary>
+    [JsonPropertyName("liveAgentCount")]
+    public long LiveAgentCount { get; set; }
 
-    /// <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>Whether the named MCP server is running.</summary>
-[Experimental(global::GitHub.Copilot.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>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>Server name to check running status for.</summary>
-[Experimental(global::GitHub.Copilot.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>Derived lifecycle state of the phase.</summary>
+    [JsonPropertyName("status")]
+    public WorkflowPhaseStatus Status { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Human-readable phase title.</summary>
+    [JsonPropertyName("title")]
+    public string Title { get; set; } = string.Empty;
 
-/// <summary>Indicates whether the pending MCP OAuth response was accepted.</summary>
-[Experimental(global::GitHub.Copilot.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>Total direct agents associated with this phase.</summary>
+    [JsonPropertyName("totalAgentCount")]
+    public long TotalAgentCount { get; set; }
 }
 
-/// <summary>Host response to the pending OAuth request.</summary>
-/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
+/// <summary>One durable workflow progress record.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-[JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "kind",
-    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(McpOauthPendingRequestResponseToken), "token")]
-[JsonDerivedType(typeof(McpOauthPendingRequestResponseCancelled), "cancelled")]
-public partial class McpOauthPendingRequestResponse
+public sealed class WorkflowProgressLine
 {
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("kind")]
-    public virtual string Kind { get; set; } = string.Empty;
-}
+    /// <summary>Resume attempt that emitted this record.</summary>
+    [JsonPropertyName("attempt")]
+    public long Attempt { get; set; }
 
+    /// <summary>Progress record kind.</summary>
+    [JsonPropertyName("kind")]
+    public WorkflowLogLineKind Kind { get; set; }
 
-/// <summary>The <c>token</c> variant of <see cref="McpOauthPendingRequestResponse"/>.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class McpOauthPendingRequestResponseToken : McpOauthPendingRequestResponse
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "token";
+    /// <summary>Phase active when the record was emitted, or null before any phase.</summary>
+    [JsonPropertyName("phaseId")]
+    public string? PhaseId { get; set; }
 
-    /// <summary>Access token acquired by the SDK host.</summary>
-    [JsonPropertyName("accessToken")]
-    public required string AccessToken { get; set; }
+    /// <summary>Epoch milliseconds when the record was persisted.</summary>
+    [JsonPropertyName("recordedAt")]
+    public long RecordedAt { get; set; }
 
-    /// <summary>Token lifetime in seconds, if known.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("expiresIn")]
-    public long? ExpiresIn { get; set; }
+    /// <summary>Global monotonic sequence number within the run.</summary>
+    [JsonPropertyName("seq")]
+    public long Seq { get; set; }
 
-    /// <summary>OAuth token type. Defaults to bearer when omitted.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("tokenType")]
-    public string? TokenType { get; set; }
+    /// <summary>Prompt-safe progress text.</summary>
+    [JsonPropertyName("text")]
+    public string Text { get; set; } = string.Empty;
 }
 
-/// <summary>The <c>cancelled</c> variant of <see cref="McpOauthPendingRequestResponse"/>.</summary>
+/// <summary>A bidirectional page of workflow progress.</summary>
 [Experimental(global::GitHub.Copilot.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(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class McpOauthHandlePendingRequest
+public sealed class WorkflowProgressPage
 {
-    /// <summary>OAuth request identifier from the mcp.oauth_required event.</summary>
-    [JsonPropertyName("requestId")]
-    public string RequestId { get; set; } = string.Empty;
+    /// <summary>Whether progress records newer than this page exist.</summary>
+    [JsonPropertyName("hasMoreNewer")]
+    public bool HasMoreNewer { get; set; }
 
-    /// <summary>Host response to the pending OAuth request.</summary>
-    [JsonPropertyName("result")]
-    public McpOauthPendingRequestResponse Result { get => field ??= new(); set; }
+    /// <summary>Whether progress records older than this page exist.</summary>
+    [JsonPropertyName("hasMoreOlder")]
+    public bool HasMoreOlder { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Newest sequence number in this page, or null when empty.</summary>
+    [JsonPropertyName("newestSeq")]
+    public long? NewestSeq { get; set; }
 
-/// <summary>Identifies the MCP server whose persisted OAuth credentials were updated.</summary>
-[Experimental(global::GitHub.Copilot.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>Oldest sequence number in this page, or null when empty.</summary>
+    [JsonPropertyName("oldestSeq")]
+    public long? OldestSeq { 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>Progress records in sequence order.</summary>
+    [JsonPropertyName("records")]
+    public IList<WorkflowProgressLine> 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>An inert runtime-issued login handle. Preparation alone performs no activation or OAuth work.</summary>
+/// <summary>Full workflow run observability detail.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionMcpOauthPrepareLoginResult
+public sealed class WorkflowRunDetail
 {
-    /// <summary>Original expiry, not extended by consumption, retries or cancellation.</summary>
-    [JsonPropertyName("expiresAt")]
-    public DateTimeOffset ExpiresAt { get; set; }
+    /// <summary>Epoch milliseconds when the current active segment started, or null while inactive.</summary>
+    [JsonPropertyName("activeSegmentStartedAt")]
+    public long? ActiveSegmentStartedAt { get; set; }
 
-    /// <summary>Retain with the original requester and use for one login or cancellation.</summary>
-    [JsonPropertyName("loginId")]
-    public string LoginId { get; set; } = string.Empty;
-}
+    /// <summary>Durable identities and live statuses for direct workflow agents.</summary>
+    [JsonPropertyName("agents")]
+    public IList<WorkflowAgentSummary> Agents { get => field ??= []; set; }
 
-/// <summary>Effect-free preparation bound to the existing local session, requester and installation, with frozen options.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionMcpOauthPrepareLoginRequest
-{
-    /// <summary>Text shown on the loopback callback page after successful authorisation.</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(2048)]
-    [JsonPropertyName("callbackSuccessMessage")]
-    public string? CallbackSuccessMessage { get; set; }
+    /// <summary>Approved effective resource ceilings, or null until approved.</summary>
+    [JsonPropertyName("approved")]
+    public WorkflowDeclaredLimits? Approved { get; set; }
 
-    /// <summary>Display name used by the incumbent OAuth client-registration flow.</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(2048)]
-    [JsonPropertyName("clientName")]
-    public string? ClientName { get; set; }
+    /// <summary>Whether the durable run state currently passes runtime resume eligibility checks.</summary>
+    [JsonPropertyName("canResume")]
+    public bool CanResume { get; set; }
 
-    /// <summary>Exact installation identity from owned inventory, never a server-name alias.</summary>
-    [JsonPropertyName("expectedInstallationId")]
-    public string ExpectedInstallationId { get; set; } = string.Empty;
+    /// <summary>Epoch milliseconds when the run completed, or null while nonterminal.</summary>
+    [JsonPropertyName("completedAt")]
+    public long? CompletedAt { get; set; }
 
-    /// <summary>Request a new authorisation rather than accepting a usable cached grant.</summary>
-    [JsonPropertyName("forceReauth")]
-    public bool? ForceReauth { get; set; }
+    /// <summary>Durable resource consumption.</summary>
+    [JsonPropertyName("consumed")]
+    public WorkflowRunConsumed Consumed { get => field ??= new(); set; }
 
-    /// <summary>Name recorded by the authoritative owned installation receipt.</summary>
-    [JsonPropertyName("serverName")]
-    public string ServerName { get; set; } = string.Empty;
+    /// <summary>Epoch milliseconds when the run was created.</summary>
+    [JsonPropertyName("createdAt")]
+    public long CreatedAt { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Current phase identity, or null before any phase is entered.</summary>
+    [JsonPropertyName("currentPhase")]
+    public WorkflowCurrentPhase? CurrentPhase { get; set; }
 
-/// <summary>OAuth authorization URL the caller should open, or empty when cached tokens already authenticated the server.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpOauthLoginResult
-{
-    /// <summary>Opaque authorization identifier returned only for a host-managed redirect URI. The runtime also sends it as the OAuth state value, so the callback endpoint can read state and pass it with the full callback URL to session.mcp.oauth.complete.</summary>
-    [JsonPropertyName("authorizationId")]
-    public string? AuthorizationId { get; set; }
+    /// <summary>Resource ceilings declared by the workflow.</summary>
+    [JsonPropertyName("declaredLimits")]
+    public WorkflowDeclaredLimits DeclaredLimits { get => field ??= new(); set; }
 
-    /// <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. For the default loopback flow, the runtime starts its listener before returning. With redirectUri, the host receives the callback and completes it through session.mcp.oauth.complete. The runtime continues the flow in the background and signals completion via session.mcp_server_status_changed.</summary>
-    [Url]
-    [StringSyntax(StringSyntaxAttribute.Uri)]
-    [JsonPropertyName("authorizationUrl")]
-    public string? AuthorizationUrl { get; set; }
+    /// <summary>Number of phases declared by the workflow.</summary>
+    [JsonPropertyName("declaredPhaseCount")]
+    public long DeclaredPhaseCount { get; set; }
 
-    /// <summary>Runtime-issued owned flow identity; never a server name or installation operation ID.</summary>
-    [JsonPropertyName("loginId")]
-    public string? LoginId { get; set; }
+    /// <summary>Human-readable workflow description.</summary>
+    [JsonPropertyName("description")]
+    public string Description { get; set; } = string.Empty;
 
-    /// <summary>Explicit outcome for owned sign-in. Manual callers retain their legacy response shape.</summary>
-    [JsonPropertyName("status")]
-    public McpOwnedOauthLoginStatus? Status { get; set; }
-}
+    /// <summary>Number of direct workflow agents currently live.</summary>
+    [JsonPropertyName("liveAgentCount")]
+    public long LiveAgentCount { get; set; }
 
-/// <summary>Remote MCP server name and optional overrides controlling reauthentication, OAuth client display name, callback handling, and static OAuth client selection.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public 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>Epoch milliseconds when this live-overlay snapshot was observed.</summary>
+    [JsonPropertyName("observedAt")]
+    public long ObservedAt { 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>Lifecycle and timing observations for each workflow phase.</summary>
+    [JsonPropertyName("phases")]
+    public IList<WorkflowPhaseObservation> Phases { get => field ??= []; 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>Bidirectional page of durable workflow progress.</summary>
+    [JsonPropertyName("progress")]
+    public WorkflowProgressPage Progress { get => field ??= new(); 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>Monotonic durable run revision.</summary>
+    [JsonPropertyName("revision")]
+    public long Revision { get; set; }
 
-    /// <summary>Exact owned receipt identity. Owned login never uses an implicit helper session.</summary>
-    [JsonPropertyName("expectedInstallationId")]
-    public string? ExpectedInstallationId { get; set; }
+    /// <summary>Workflow run identifier.</summary>
+    [JsonPropertyName("runId")]
+    public string RunId { get; set; } = string.Empty;
 
-    /// <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>Epoch milliseconds when execution first started, or null before start.</summary>
+    [JsonPropertyName("startedAt")]
+    public long? StartedAt { 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>Current workflow run status.</summary>
+    [JsonPropertyName("status")]
+    public WorkflowRunStatus Status { get; set; }
 
-    /// <summary>
-    /// Required for owned login. Consumes the exact prepareLogin handle once.
-    /// Set forceReauth and display options during preparation, not consumption.
-    /// </summary>
-    [JsonPropertyName("loginId")]
-    public string? LoginId { get; set; }
+    /// <summary>Terminal run outcome, or null while nonterminal.</summary>
+    [JsonPropertyName("terminal")]
+    public WorkflowRunTerminal? Terminal { 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>Total direct workflow agents spawned across all attempts.</summary>
+    [JsonPropertyName("totalSpawnedAgentCount")]
+    public long TotalSpawnedAgentCount { get; set; }
 
-    /// <summary>Optional externally visible HTTPS redirect URI for a host-managed callback endpoint. When supplied, the runtime still owns discovery, PKCE, token exchange, persistence, and reconnect, but does not bind a loopback listener or terminate HTTPS. The URI must not contain query parameters or a fragment and must be registered for the selected CIMD, DCR, or static OAuth client.</summary>
-    [Url]
-    [StringSyntax(StringSyntaxAttribute.Uri)]
-    [JsonPropertyName("redirectUri")]
-    public string? RedirectUri { get; set; }
+    /// <summary>Epoch milliseconds when the durable run was last updated.</summary>
+    [JsonPropertyName("updatedAt")]
+    public long UpdatedAt { 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 required string ServerName { get; set; }
+    /// <summary>Registered workflow name.</summary>
+    [JsonPropertyName("workflowName")]
+    public string WorkflowName { get; set; } = string.Empty;
 }
 
-/// <summary>Remote MCP server name and optional overrides controlling reauthentication, OAuth client display name, callback handling, and static OAuth client selection.</summary>
+/// <summary>Parameters for paging workflow progress.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class McpOauthLoginRequestWithSession
+internal sealed class WorkflowGetRunProgressRequest
 {
-    /// <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>Exact owned receipt identity. Owned login never uses an implicit helper session.</summary>
-    [JsonPropertyName("expectedInstallationId")]
-    public string? ExpectedInstallationId { 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>Exclusive forward cursor.</summary>
+    [JsonPropertyName("afterSeq")]
+    public long? AfterSeq { get; set; }
 
-    /// <summary>
-    /// Required for owned login. Consumes the exact prepareLogin handle once.
-    /// Set forceReauth and display options during preparation, not consumption.
-    /// </summary>
-    [JsonPropertyName("loginId")]
-    public string? LoginId { get; set; }
+    /// <summary>Exclusive backward cursor.</summary>
+    [JsonPropertyName("beforeSeq")]
+    public long? BeforeSeq { 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>Maximum records to return. Defaults to 200 and is capped at 500.</summary>
+    [JsonPropertyName("limit")]
+    public int? Limit { get; set; }
 
-    /// <summary>Optional externally visible HTTPS redirect URI for a host-managed callback endpoint. When supplied, the runtime still owns discovery, PKCE, token exchange, persistence, and reconnect, but does not bind a loopback listener or terminate HTTPS. The URI must not contain query parameters or a fragment and must be registered for the selected CIMD, DCR, or static OAuth client.</summary>
-    [Url]
-    [StringSyntax(StringSyntaxAttribute.Uri)]
-    [JsonPropertyName("redirectUri")]
-    public string? RedirectUri { get; set; }
+    /// <summary>Optional phase identifier used to scope records and cursors.</summary>
+    [JsonPropertyName("phaseId")]
+    public string? PhaseId { 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>Workflow 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>Host-delivered callback for a runtime-managed MCP OAuth login.</summary>
+/// <summary>Parameters for cancelling a workflow run.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class McpOauthCompleteRequest
+internal sealed class WorkflowCancelRequest
 {
-    /// <summary>Opaque identifier returned by session.mcp.oauth.login for the pending external callback.</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("authorizationId")]
-    public string AuthorizationId { get; set; } = string.Empty;
-
-    /// <summary>Full externally visible HTTPS callback URL received by the host, including the authorization response query parameters. Applications behind a reverse proxy must reconstruct the public URL rather than passing an internal proxy URL.</summary>
-    [Url]
-    [StringSyntax(StringSyntaxAttribute.Uri)]
-    [JsonPropertyName("callbackUrl")]
-    public string CallbackUrl { get; set; } = string.Empty;
+    /// <summary>Workflow 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>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(global::GitHub.Copilot.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>
+/// <summary>Parameters for pausing a running workflow.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class McpOauthProbeResultNoAuthRequired : McpOauthProbeResult
+internal sealed class WorkflowPauseRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Status => "no-auth-required";
+    /// <summary>Workflow run identifier.</summary>
+    [JsonPropertyName("runId")]
+    public string RunId { get; set; } = string.Empty;
 
-    /// <summary>HTTP response returned by the server.</summary>
-    [JsonPropertyName("httpResponse")]
-    public required McpOauthHttpResponse HttpResponse { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>The <c>authenticated</c> variant of <see cref="McpOauthProbeResult"/>.</summary>
+/// <summary>RPC data type for SessionWorkflowPauseAtCheckpoint operations.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class McpOauthProbeResultAuthenticated : McpOauthProbeResult
+internal sealed class SessionWorkflowPauseAtCheckpointResult
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Status => "authenticated";
-
-    /// <summary>HTTP response returned by the server.</summary>
-    [JsonPropertyName("httpResponse")]
-    public required McpOauthHttpResponse HttpResponse { get; set; }
+    /// <summary>Whether this execution attempt must pause or may continue.</summary>
+    [JsonPropertyName("action")]
+    public WorkflowPauseCheckpointAction Action { get; set; }
 }
 
-/// <summary>The <c>needs-auth</c> variant of <see cref="McpOauthProbeResult"/>.</summary>
+/// <summary>Parameters for an owned durable pause checkpoint.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class McpOauthProbeResultNeedsAuth : McpOauthProbeResult
+internal sealed class WorkflowPauseCheckpointRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Status => "needs-auth";
+    /// <summary>Opaque token identifying the execution attempt that reached the checkpoint.</summary>
+    [JsonPropertyName("executionToken")]
+    public string ExecutionToken { get; set; } = string.Empty;
 
-    /// <summary>HTTP 401 or 403 response returned by the server.</summary>
-    [JsonPropertyName("httpResponse")]
-    public required McpOauthHttpResponse HttpResponse { get; set; }
+    /// <summary>Stable author-defined checkpoint key.</summary>
+    [JsonPropertyName("key")]
+    public string Key { get; set; } = string.Empty;
 
-    /// <summary>Why authentication is needed.</summary>
-    [JsonPropertyName("reason")]
-    public required McpOauthProbeNeedsAuthReason Reason { get; set; }
+    /// <summary>Workflow run identifier.</summary>
+    [JsonPropertyName("runId")]
+    public string RunId { get; set; } = string.Empty;
 
-    /// <summary>Parsed WWW-Authenticate challenge parameters, when present and parseable.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("wwwAuthenticateParams")]
-    public McpOauthWWWAuthenticateParams? WwwAuthenticateParams { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>The <c>failed</c> variant of <see cref="McpOauthProbeResult"/>.</summary>
+/// <summary>Acknowledgement that a workflow request was accepted.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class McpOauthProbeResultFailed : McpOauthProbeResult
+public sealed class WorkflowAckResult
 {
-    /// <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>
+/// <summary>One ordered workflow progress line.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpOauthProbeRequest
+public sealed class WorkflowLogLine
 {
-    /// <summary>Exact owned receipt identity; probing never activates a dormant installation.</summary>
-    [JsonPropertyName("expectedInstallationId")]
-    public string? ExpectedInstallationId { get; set; }
+    /// <summary>Progress line kind.</summary>
+    [JsonPropertyName("kind")]
+    public WorkflowLogLineKind Kind { get; set; }
 
-    /// <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 required string ServerName { get; set; }
+    /// <summary>Monotonic sequence number within the workflow run.</summary>
+    [JsonPropertyName("seq")]
+    public long Seq { get; set; }
+
+    /// <summary>Progress text.</summary>
+    [JsonPropertyName("text")]
+    public string Text { get; set; } = string.Empty;
 }
 
-/// <summary>Remote MCP server name for a passive OAuth status probe.</summary>
+/// <summary>Parameters for recording workflow progress.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class McpOauthProbeRequestWithSession
+internal sealed class WorkflowLogRequest
 {
-    /// <summary>Exact owned receipt identity; probing never activates a dormant installation.</summary>
-    [JsonPropertyName("expectedInstallationId")]
-    public string? ExpectedInstallationId { get; set; }
+    /// <summary>Opaque token identifying the current workflow execution attempt.</summary>
+    [JsonPropertyName("executionToken")]
+    public string ExecutionToken { get; set; } = string.Empty;
 
-    /// <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>Ordered progress lines to append.</summary>
+    [JsonPropertyName("lines")]
+    public IList<WorkflowLogLine> Lines { get => field ??= []; set; }
+
+    /// <summary>Workflow 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>Honest terminal cancellation result; persistence or recovery failures remain RPC errors.</summary>
+/// <summary>Result of one workflow-scoped subagent call.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionMcpOauthCancelLoginResult
+public sealed class WorkflowAgentResult
 {
-    /// <summary>True after cancellation settles, false when the original login already connected successfully.</summary>
-    [JsonPropertyName("cancelled")]
-    public bool Cancelled { get; set; }
+    /// <summary>Agent result, omitted when the agent produced no result.</summary>
+    [JsonPropertyName("result")]
+    public JsonElement? Result { get; set; }
 }
 
-/// <summary>Targets only the original prepared/applying owned login on this exact session requester.</summary>
+/// <summary>Options for one workflow-scoped subagent call.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionMcpOauthCancelLoginRequest
+public sealed class WorkflowAgentOptions
 {
-    /// <summary>The same authoritative installation identity supplied during preparation.</summary>
-    [JsonPropertyName("expectedInstallationId")]
-    public string ExpectedInstallationId { get; set; } = string.Empty;
+    /// <summary>Optional built-in or custom agent name whose definition configures the subagent.</summary>
+    [JsonPropertyName("agent")]
+    public string? Agent { get; set; }
 
-    /// <summary>Runtime-issued login handle known before the effectful login request begins.</summary>
-    [JsonPropertyName("loginId")]
-    public string LoginId { get; set; } = string.Empty;
+    /// <summary>Optional context tier override for the subagent.</summary>
+    [JsonPropertyName("contextTier")]
+    public ContextTier? ContextTier { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Optional label distinguishing otherwise identical memoized agent calls.</summary>
+    [JsonPropertyName("label")]
+    public string? Label { get; set; }
 
-/// <summary>Indicates whether the pending MCP OAuth response was accepted.</summary>
-[Experimental(global::GitHub.Copilot.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>Optional model identifier for the subagent.</summary>
+    [JsonPropertyName("model")]
+    public string? Model { get; set; }
 
-/// <summary>Pending MCP OAuth request id to respond to.</summary>
-[Experimental(global::GitHub.Copilot.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>Optional reasoning effort override for the subagent.</summary>
+    [JsonPropertyName("reasoningEffort")]
+    public string? ReasoningEffort { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Optional JSON Schema for structured agent output.</summary>
+    [JsonPropertyName("schema")]
+    public JsonElement? Schema { get; set; }
 }
 
-/// <summary>Indicates whether the pending MCP headers refresh response was accepted.</summary>
+/// <summary>Parameters for one workflow-scoped subagent call.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpHeadersHandlePendingHeadersRefreshRequestResult
+internal sealed class WorkflowAgentRequest
 {
-    /// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-[JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "kind",
-    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(McpHeadersHandlePendingHeadersRefreshRequestHeaders), "headers")]
-[JsonDerivedType(typeof(McpHeadersHandlePendingHeadersRefreshRequestNone), "none")]
-[JsonDerivedType(typeof(McpHeadersHandlePendingHeadersRefreshRequestError), "error")]
-public partial class McpHeadersHandlePendingHeadersRefreshRequest
-{
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("kind")]
-    public virtual string Kind { get; set; } = string.Empty;
-}
-
+    /// <summary>Opaque token identifying the current workflow execution attempt.</summary>
+    [JsonPropertyName("executionToken")]
+    public string ExecutionToken { get; set; } = string.Empty;
 
-/// <summary>The <c>headers</c> variant of <see cref="McpHeadersHandlePendingHeadersRefreshRequest"/>.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class McpHeadersHandlePendingHeadersRefreshRequestHeaders : McpHeadersHandlePendingHeadersRefreshRequest
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "headers";
+    /// <summary>Subagent execution options.</summary>
+    [JsonPropertyName("opts")]
+    public WorkflowAgentOptions Opts { get => field ??= new(); 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>Prompt to send to the subagent.</summary>
+    [JsonPropertyName("prompt")]
+    public string Prompt { get; set; } = string.Empty;
 
-    /// <summary>Optional lifetime in milliseconds for these returned headers. The runtime clamps its configured cache lifetime to this value.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("ttlMs")]
-    public long? TtlMs { get; set; }
-}
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 
-/// <summary>The <c>none</c> variant of <see cref="McpHeadersHandlePendingHeadersRefreshRequest"/>.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class McpHeadersHandlePendingHeadersRefreshRequestNone : McpHeadersHandlePendingHeadersRefreshRequest
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "none";
+    /// <summary>Workflow run identifier that owns the subagent.</summary>
+    [JsonPropertyName("workflowRunId")]
+    public string WorkflowRunId { get; set; } = string.Empty;
 }
 
-/// <summary>The <c>error</c> variant of <see cref="McpHeadersHandlePendingHeadersRefreshRequest"/>.</summary>
+/// <summary>Result of reading a workflow journal entry.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class McpHeadersHandlePendingHeadersRefreshRequestError : McpHeadersHandlePendingHeadersRefreshRequest
+public sealed class WorkflowJournalGetResult
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "error";
+    /// <summary>Whether the journal contained the requested key.</summary>
+    [JsonPropertyName("hit")]
+    public bool Hit { get; set; }
 
-    /// <summary>Host credential broker failure, denial, or revocation reason.</summary>
-    [JsonPropertyName("message")]
-    public required string Message { 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>MCP headers refresh request id and the host response.</summary>
+/// <summary>Parameters for reading a workflow journal entry.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class McpHeadersHandlePendingHeadersRefreshRequestRequest
+internal sealed class WorkflowJournalGetRequest
 {
-    /// <summary>Headers refresh request identifier from mcp.headers_refresh_required.</summary>
-    [JsonPropertyName("requestId")]
-    public string RequestId { get; set; } = string.Empty;
+    /// <summary>Opaque token identifying the current workflow execution attempt.</summary>
+    [JsonPropertyName("executionToken")]
+    public string ExecutionToken { 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>Namespaced journal key.</summary>
+    [JsonPropertyName("key")]
+    public string Key { get; set; } = string.Empty;
+
+    /// <summary>Workflow 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>MCP Apps resource content with URI, optional MIME type, text or base64 blob, and resource metadata.</summary>
+/// <summary>Parameters for storing a workflow journal entry.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpAppsResourceContent
+internal sealed class WorkflowJournalPutRequest
 {
-    /// <summary>Resource-level metadata (CSP, permissions, etc.).</summary>
-    [JsonPropertyName("_meta")]
-    public IDictionary<string, JsonElement>? Meta { get; set; }
+    /// <summary>Opaque token identifying the current workflow execution attempt.</summary>
+    [JsonPropertyName("executionToken")]
+    public string ExecutionToken { get; set; } = string.Empty;
 
-    /// <summary>Base64-encoded binary content.</summary>
-    [JsonPropertyName("blob")]
-    public string? Blob { get; set; }
+    /// <summary>Namespaced journal key.</summary>
+    [JsonPropertyName("key")]
+    public string Key { get; set; } = string.Empty;
 
-    /// <summary>MIME type of the content.</summary>
-    [JsonPropertyName("mimeType")]
-    public string? MimeType { get; set; }
+    /// <summary>JSON result to memoize.</summary>
+    [JsonPropertyName("resultJson")]
+    public JsonElement ResultJson { get; set; }
 
-    /// <summary>Text content (e.g. HTML).</summary>
-    [JsonPropertyName("text")]
-    public string? Text { get; set; }
+    /// <summary>Workflow run identifier.</summary>
+    [JsonPropertyName("runId")]
+    public string RunId { get; set; } = string.Empty;
 
-    /// <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>The session's authoritative model snapshot. Auto preference fields are configuration for the virtual `auto` model and do not change the selected model identifier. The context tier reflects `Session.getContextTier()`, restored from the session journal on resume.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpAppsReadResourceResult
+public sealed class CurrentModel
 {
-    /// <summary>Resource contents returned by the server.</summary>
-    [JsonPropertyName("contents")]
-    public IList<McpAppsResourceContent> Contents { get => field ??= []; set; }
-}
+    /// <summary>Auto preference currently claimed by an in-progress activation. Null means the activation is returning to provider-default routing.</summary>
+    [JsonPropertyName("activatingAutoTier")]
+    public AutoTier? ActivatingAutoTier { get; set; }
 
-/// <summary>MCP server and resource URI to fetch.</summary>
-[Experimental(global::GitHub.Copilot.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>Auto preference currently committed for the session. This can remain available while another model is selected so a later switch to `auto` can reuse it.</summary>
+    [JsonPropertyName("autoTier")]
+    public AutoTier? AutoTier { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Context tier for models that support multiple context-window sizes.</summary>
+    [JsonPropertyName("contextTier")]
+    public ContextTier? ContextTier { get; set; }
 
-    /// <summary>Resource URI (typically ui://...).</summary>
-    [JsonPropertyName("uri")]
-    public string Uri { get; set; } = string.Empty;
-}
+    /// <summary>Currently active model identifier.</summary>
+    [JsonPropertyName("modelId")]
+    public string? ModelId { get; set; }
 
-/// <summary>App-callable tools from the named MCP server.</summary>
-[Experimental(global::GitHub.Copilot.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>Latest unclaimed Auto preference waiting for a future user turn. Null means the pending request is returning to provider-default routing.</summary>
+    [JsonPropertyName("pendingAutoTier")]
+    public AutoTier? PendingAutoTier { get; set; }
 
-/// <summary>MCP server to list app-callable tools for.</summary>
-[Experimental(global::GitHub.Copilot.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>Captured base model to restore when leaving plan mode. Omitted outside plan mode or when no plan override has captured a base model. Persistent agent model requirements apply to this model rather than the temporary plan model.</summary>
+    [JsonPropertyName("planBaseModelId")]
+    public string? PlanBaseModelId { get; set; }
 
-    /// <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>Provider of planBaseModelId, when that saved selection is provider-qualified.</summary>
+    [JsonPropertyName("planBaseProviderId")]
+    public string? PlanBaseProviderId { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Provider selected for this model. Together with modelId, identifies a catalog entry even when providers serve the same model. Omitted for unattributed legacy selections.</summary>
+    [JsonPropertyName("providerId")]
+    public string? ProviderId { 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>MCP server, tool name, and arguments to invoke from an MCP App view.</summary>
+/// <summary>Identifies the target session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class McpAppsCallToolRequest
+internal sealed class SessionModelGetCurrentRequest
 {
-    /// <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>
+/// <summary>RPC data type for ModelSwitchConfirmation operations.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpAppsSetHostContextDetails
+public sealed class ModelSwitchConfirmation
 {
-    /// <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>Current conversation token count before switching models.</summary>
+    [JsonPropertyName("currentTokens")]
+    public double CurrentTokens { get; set; }
 
-    /// <summary>IANA timezone, e.g. 'America/New_York'.</summary>
-    [JsonPropertyName("timeZone")]
-    public string? TimeZone { get; set; }
+    /// <summary>Target model token limit used by the compaction preflight.</summary>
+    [JsonPropertyName("targetLimit")]
+    public double TargetLimit { get; set; }
 
-    /// <summary>Host application identifier.</summary>
-    [JsonPropertyName("userAgent")]
-    public string? UserAgent { get; set; }
+    /// <summary>Display name of the model that requires compaction confirmation.</summary>
+    [JsonPropertyName("targetModelDisplayName")]
+    public string TargetModelDisplayName { get; set; } = string.Empty;
 }
 
-/// <summary>Host context to advertise to MCP App guests.</summary>
+/// <summary>The model identifier active on the session after the switch.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class McpAppsSetHostContextRequest
+public sealed class ModelSwitchToResult
 {
-    /// <summary>Host context advertised to MCP App guests.</summary>
-    [JsonPropertyName("context")]
-    public McpAppsSetHostContextDetails Context { get => field ??= new(); set; }
+    /// <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>Current host context.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpAppsHostContextDetails
-{
-    /// <summary>Display modes the host supports.</summary>
-    [JsonPropertyName("availableDisplayModes")]
-    public IList<McpAppsHostContextDetailsAvailableDisplayMode>? AvailableDisplayModes { get; set; }
+    /// <summary>Deprecation warnings associated with the selected model or options.</summary>
+    [JsonPropertyName("deprecationWarnings")]
+    public IList<string>? DeprecationWarnings { get; set; }
 
-    /// <summary>Current display mode (SEP-1865).</summary>
-    [JsonPropertyName("displayMode")]
-    public McpAppsHostContextDetailsDisplayMode? DisplayMode { get; set; }
+    /// <summary>User-facing outcome message for the model switch.</summary>
+    [JsonPropertyName("message")]
+    public string? Message { get; set; }
 
-    /// <summary>BCP-47 locale, e.g. 'en-US'.</summary>
-    [JsonPropertyName("locale")]
-    public string? Locale { get; set; }
+    /// <summary>Currently active model identifier after the switch.</summary>
+    [JsonPropertyName("modelId")]
+    public string? ModelId { get; set; }
 
-    /// <summary>Platform type for responsive design.</summary>
-    [JsonPropertyName("platform")]
-    public McpAppsHostContextDetailsPlatform? Platform { get; set; }
+    /// <summary>Authoritative model and Auto preference state after an immediate switch. For deferred switches this remains the current state until the queued change drains.</summary>
+    [JsonPropertyName("modelState")]
+    public CurrentModel? ModelState { get; set; }
 
-    /// <summary>UI theme preference per SEP-1865.</summary>
-    [JsonPropertyName("theme")]
-    public McpAppsHostContextDetailsTheme? Theme { get; set; }
+    /// <summary>Persistence failure encountered after applying the model switch.</summary>
+    [JsonPropertyName("persistenceError")]
+    public string? PersistenceError { get; set; }
 
-    /// <summary>IANA timezone, e.g. 'America/New_York'.</summary>
-    [JsonPropertyName("timeZone")]
-    public string? TimeZone { get; set; }
+    /// <summary>Stable queue item identifier when this request was enqueued. Remains present if the item drains before the response is returned.</summary>
+    [JsonPropertyName("queueId")]
+    public string? QueueId { get; set; }
 
-    /// <summary>Host application identifier.</summary>
-    [JsonPropertyName("userAgent")]
-    public string? UserAgent { get; set; }
-}
+    /// <summary>Lifecycle result for the requested switch.</summary>
+    [JsonPropertyName("status")]
+    public string? Status { get; set; }
 
-/// <summary>Current host context advertised to MCP App guests.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpAppsHostContext
-{
-    /// <summary>Current host context.</summary>
-    [JsonPropertyName("context")]
-    public McpAppsHostContextDetails Context { get => field ??= new(); set; }
+    /// <summary>User-facing warning produced while applying the model switch.</summary>
+    [JsonPropertyName("warning")]
+    public string? Warning { get; set; }
 }
 
-/// <summary>Identifies the target session.</summary>
+/// <summary>Filesystem and environment context used to resolve model-picker settings.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionMcpAppsGetHostContextRequest
+public sealed class ModelPickerSettingsContext
 {
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Optional Copilot configuration directory containing persisted settings.</summary>
+    [JsonPropertyName("configDir")]
+    public string? ConfigDir { get; set; }
+
+    /// <summary>Environment variables consulted while resolving model-picker settings.</summary>
+    [JsonPropertyName("environment")]
+    public IDictionary<string, JsonElement> Environment { get => field ??= new Dictionary<string, JsonElement>(); set; }
+
+    /// <summary>User home directory used when resolving persisted settings.</summary>
+    [JsonPropertyName("homeDirectory")]
+    public string HomeDirectory { get; set; } = string.Empty;
 }
 
-/// <summary>Capability negotiation snapshot.</summary>
+/// <summary>RPC data type for ModelPickerPersistence operations.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpAppsDiagnoseCapability
+public sealed class ModelPickerPersistenceRequest
 {
-    /// <summary>Whether the runtime advertises `extensions.io.modelcontextprotocol/ui` to MCP servers.</summary>
-    [JsonPropertyName("advertised")]
-    public bool Advertised { get; set; }
+    /// <summary>Whether context tier was explicitly selected and should be persisted.</summary>
+    [JsonPropertyName("contextTierExplicit")]
+    public bool? ContextTierExplicit { 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 reasoning effort was explicitly selected and should be persisted.</summary>
+    [JsonPropertyName("reasoningEffortExplicit")]
+    public bool? ReasoningEffortExplicit { get; set; }
 
-    /// <summary>Whether the session has the `mcp-apps` capability.</summary>
-    [JsonPropertyName("sessionHasMcpApps")]
-    public bool SessionHasMcpApps { get; set; }
+    /// <summary>Filesystem and environment context used to resolve settings persistence.</summary>
+    [JsonPropertyName("settingsContext")]
+    public ModelPickerSettingsContext SettingsContext { get => field ??= new(); set; }
 }
 
-/// <summary>What the server returned for this session.</summary>
+/// <summary>Target model identifier and optional reasoning effort, summary, capability overrides, and context tier.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpAppsDiagnoseServer
+public sealed class ModelSwitchToRequest
 {
-    /// <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>Optional Auto routing preference to stage atomically with selecting `auto`. Pass null to return to provider-default Auto routing. This field is rejected when `modelId` is not `auto`.</summary>
+    [JsonPropertyName("autoTier")]
+    public AutoTier? AutoTier { get; set; }
 
-    /// <summary>Total tools returned by the server's tools/list.</summary>
-    [JsonPropertyName("toolCount")]
-    public double ToolCount { 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>Tools whose `_meta.ui` is populated (resourceUri and/or visibility set).</summary>
-    [JsonPropertyName("toolsWithUiMeta")]
-    public double ToolsWithUiMeta { get; 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>Diagnostic snapshot of MCP Apps wiring for the named server.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpAppsDiagnoseResult
-{
-    /// <summary>Capability negotiation snapshot.</summary>
-    [JsonPropertyName("capability")]
-    public McpAppsDiagnoseCapability Capability { get => field ??= new(); 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>What the server returned for this session.</summary>
-    [JsonPropertyName("server")]
-    public McpAppsDiagnoseServer Server { get => field ??= new(); set; }
-}
+    /// <summary>Override individual model capabilities resolved by the runtime.</summary>
+    [JsonPropertyName("modelCapabilities")]
+    public ModelCapabilitiesOverride? ModelCapabilities { get; set; }
 
-/// <summary>MCP server to diagnose MCP Apps wiring for.</summary>
-[Experimental(global::GitHub.Copilot.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>Settings scope used when persisting the selected model.</summary>
+    [JsonPropertyName("modelChangeScope")]
+    public string? ModelChangeScope { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Model id to switch to, as returned by `list`. Include providerId to select an exact catalog entry when providers share the id. Without providerId, a bare id retains incumbent selection behavior; a registry-qualified id (`provider/id`, e.g. `acme/claude-sonnet`) targets a BYOK model.</summary>
+    [JsonPropertyName("modelId")]
+    public required string ModelId { get; set; }
 
-/// <summary>MCP resource content with URI, optional MIME type, text or base64 blob, and resource metadata.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpResourceContent
-{
-    /// <summary>Resource-level metadata (CSP, permissions, etc.).</summary>
-    [JsonPropertyName("_meta")]
-    public IDictionary<string, JsonElement>? Meta { get; set; }
+    /// <summary>Optional settings context and explicit-override flags used to persist a picker selection.</summary>
+    [JsonPropertyName("pickerPersistence")]
+    public ModelPickerPersistenceRequest? PickerPersistence { get; set; }
 
-    /// <summary>Base64-encoded binary content.</summary>
-    [JsonPropertyName("blob")]
-    public string? Blob { get; set; }
+    /// <summary>Provider id from the selected list entry's provider reference. Selects this exact provider/model pair; an unavailable pair fails rather than using another provider. Omit for deterministic legacy bare-model selection.</summary>
+    [JsonPropertyName("providerId")]
+    public string? ProviderId { get; set; }
 
-    /// <summary>MIME type of the content.</summary>
-    [JsonPropertyName("mimeType")]
-    public string? MimeType { 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. Pass null to clear any session effort override and fall back to the model's default. When omitted, the session's current effort is kept.</summary>
+    [JsonPropertyName("reasoningEffort")]
+    public string? ReasoningEffort { get; set; }
 
-    /// <summary>Text content (e.g. HTML).</summary>
-    [JsonPropertyName("text")]
-    public string? Text { get; set; }
+    /// <summary>Reasoning summary mode to request for supported model clients.</summary>
+    [JsonPropertyName("reasoningSummary")]
+    public ReasoningSummary? ReasoningSummary { get; set; }
 
-    /// <summary>The resource URI.</summary>
-    [JsonPropertyName("uri")]
-    public string Uri { get; set; } = string.Empty;
-}
+    /// <summary>Optional repository settings scope to persist after the switch commits.</summary>
+    [JsonPropertyName("repoScope")]
+    public string? RepoScope { get; set; }
 
-/// <summary>Resource contents returned by the MCP server.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpResourcesReadResult
-{
-    /// <summary>Resource contents returned by the server.</summary>
-    [JsonPropertyName("contents")]
-    public IList<McpResourceContent> Contents { get => field ??= []; set; }
-}
+    /// <summary>Require the target to be currently available and enabled before applying the switch.</summary>
+    [JsonPropertyName("requireAvailable")]
+    public bool? RequireAvailable { get; set; }
 
-/// <summary>MCP server and resource URI to fetch.</summary>
-[Experimental(global::GitHub.Copilot.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>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>Origin to record on the effective `session.model_change` event for trusted in-process calls. Transport SDK calls are always recorded as `sdk`, regardless of this value.</summary>
+    [JsonPropertyName("source")]
+    public ModelChangeSource? Source { get; set; }
 
-    /// <summary>Resource URI.</summary>
-    [JsonPropertyName("uri")]
-    public string Uri { get; set; } = string.Empty;
+    /// <summary>Output verbosity level to request for supported models.</summary>
+    [JsonPropertyName("verbosity")]
+    public Verbosity? Verbosity { get; set; }
 }
 
-/// <summary>Standard MCP resource annotations plus preserved non-standard annotation fields.</summary>
+/// <summary>Target model identifier and optional reasoning effort, summary, capability overrides, and context tier.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpResourceAnnotations
+internal sealed class ModelSwitchToRequestWithSession
 {
-    /// <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>Optional Auto routing preference to stage atomically with selecting `auto`. Pass null to return to provider-default Auto routing. This field is rejected when `modelId` is not `auto`.</summary>
+    [JsonPropertyName("autoTier")]
+    public AutoTier? AutoTier { get; set; }
 
-    /// <summary>Priority hint for model/client use.</summary>
-    [JsonPropertyName("priority")]
-    public double? Priority { 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>A resource icon descriptor plus preserved non-standard icon fields.</summary>
-[Experimental(global::GitHub.Copilot.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>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>Icon MIME type, when known.</summary>
-    [JsonPropertyName("mimeType")]
-    public string? MimeType { 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>Icon sizes hint.</summary>
-    [JsonPropertyName("sizes")]
-    public string? Sizes { get; set; }
+    /// <summary>Override individual model capabilities resolved by the runtime.</summary>
+    [JsonPropertyName("modelCapabilities")]
+    public ModelCapabilitiesOverride? ModelCapabilities { get; set; }
 
-    /// <summary>Icon URI.</summary>
-    [JsonPropertyName("src")]
-    public string Src { get; set; } = string.Empty;
+    /// <summary>Settings scope used when persisting the selected model.</summary>
+    [JsonPropertyName("modelChangeScope")]
+    public string? ModelChangeScope { get; set; }
 
-    /// <summary>Theme hint for this icon.</summary>
-    [JsonPropertyName("theme")]
-    public string? Theme { get; set; }
-}
+    /// <summary>Model id to switch to, as returned by `list`. Include providerId to select an exact catalog entry when providers share the id. Without providerId, a bare id retains incumbent selection behavior; a registry-qualified id (`provider/id`, e.g. `acme/claude-sonnet`) targets a BYOK model.</summary>
+    [JsonPropertyName("modelId")]
+    public string ModelId { get; set; } = string.Empty;
 
-/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpResource
-{
-    /// <summary>Resource-level metadata.</summary>
-    [JsonPropertyName("_meta")]
-    public IDictionary<string, JsonElement>? Meta { get; set; }
+    /// <summary>Optional settings context and explicit-override flags used to persist a picker selection.</summary>
+    [JsonPropertyName("pickerPersistence")]
+    public ModelPickerPersistenceRequest? PickerPersistence { 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>Provider id from the selected list entry's provider reference. Selects this exact provider/model pair; an unavailable pair fails rather than using another provider. Omit for deterministic legacy bare-model selection.</summary>
+    [JsonPropertyName("providerId")]
+    public string? ProviderId { get; set; }
 
-    /// <summary>Model/client annotations associated with this resource.</summary>
-    [JsonPropertyName("annotations")]
-    public McpResourceAnnotations? Annotations { 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. Pass null to clear any session effort override and fall back to the model's default. When omitted, the session's current effort is kept.</summary>
+    [JsonPropertyName("reasoningEffort")]
+    public string? ReasoningEffort { get; set; }
 
-    /// <summary>Optional description of what this resource represents.</summary>
-    [JsonPropertyName("description")]
-    public string? Description { get; set; }
+    /// <summary>Reasoning summary mode to request for supported model clients.</summary>
+    [JsonPropertyName("reasoningSummary")]
+    public ReasoningSummary? ReasoningSummary { get; set; }
 
-    /// <summary>Icons associated with this resource.</summary>
-    [JsonPropertyName("icons")]
-    public IList<McpResourceIcon>? Icons { get; set; }
+    /// <summary>Optional repository settings scope to persist after the switch commits.</summary>
+    [JsonPropertyName("repoScope")]
+    public string? RepoScope { get; set; }
 
-    /// <summary>MIME type of the resource, if known.</summary>
-    [JsonPropertyName("mimeType")]
-    public string? MimeType { 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>The programmatic name of the resource.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>When true, evaluate context-window compaction policy before applying the switch.</summary>
+    [JsonPropertyName("runCompactionPreflight")]
+    public bool? RunCompactionPreflight { get; set; }
 
-    /// <summary>Resource size in bytes, when known.</summary>
-    [JsonPropertyName("size")]
-    public long? Size { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 
-    /// <summary>Optional human-readable display title.</summary>
-    [JsonPropertyName("title")]
-    public string? Title { get; set; }
+    /// <summary>Origin to record on the effective `session.model_change` event for trusted in-process calls. Transport SDK calls are always recorded as `sdk`, regardless of this value.</summary>
+    [JsonPropertyName("source")]
+    public ModelChangeSource? Source { get; set; }
 
-    /// <summary>The resource URI (e.g. ui://... or file:///...).</summary>
-    [JsonPropertyName("uri")]
-    public string Uri { get; set; } = string.Empty;
+    /// <summary>Output verbosity level to request for supported models.</summary>
+    [JsonPropertyName("verbosity")]
+    public Verbosity? Verbosity { get; set; }
 }
 
-/// <summary>One page of resources advertised by the named MCP server.</summary>
+/// <summary>Immediate acknowledgement and Auto preference snapshot after a switch request. This result never implies that a pending preference committed.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpResourcesListResult
+public sealed class ModelSwitchAutoTierResult
 {
-    /// <summary>Opaque cursor for the next page, if the server has more resources.</summary>
-    [JsonPropertyName("nextCursor")]
-    public string? NextCursor { get; set; }
+    /// <summary>Auto preference currently claimed by an in-progress activation. Null means the activation is returning to provider-default routing.</summary>
+    [JsonPropertyName("activatingAutoTier")]
+    public AutoTier? ActivatingAutoTier { get; set; }
 
-    /// <summary>Resources advertised by the server (proxied MCP `resources/list`).</summary>
-    [JsonPropertyName("resources")]
-    public IList<McpResource> Resources { get => field ??= []; set; }
+    /// <summary>Auto preference currently committed for the session.</summary>
+    [JsonPropertyName("effectiveAutoTier")]
+    public AutoTier? EffectiveAutoTier { get; set; }
+
+    /// <summary>Latest unclaimed Auto preference waiting for a future user turn.</summary>
+    [JsonPropertyName("pendingAutoTier")]
+    public AutoTier? PendingAutoTier { get; set; }
+
+    /// <summary>Immediate request status. `pending` means accepted but not committed.</summary>
+    [JsonPropertyName("status")]
+    public ModelSwitchAutoTierStatus Status { get; set; }
+
+    /// <summary>Earlier unclaimed preference replaced by this request. This can be present with either status, including when selecting the effective preference cancels pending work.</summary>
+    [JsonPropertyName("supersededAutoTier")]
+    public AutoTier? SupersededAutoTier { get; set; }
 }
 
-/// <summary>MCP server whose resources to enumerate.</summary>
+/// <summary>An Auto preference request for the session. This updates Auto configuration only; it does not change the selected model to `auto`.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class McpResourcesListRequest
+internal sealed class ModelSwitchAutoTierRequest
 {
-    /// <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>Auto preference to activate when a future user turn using the `auto` model safely mints a replacement model and token pair. Pass null to return to provider-default Auto routing.</summary>
+    [JsonPropertyName("autoTier")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.Never)]
+    public AutoTier? AutoTier { get; set; }
 
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
+
+    /// <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>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>Managed, repository, and CLI model overrides to overlay onto the session at startup.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpResourceTemplate
+internal sealed class ModelApplyStartupOverlayRequest
 {
-    /// <summary>Resource-template-level metadata.</summary>
-    [JsonPropertyName("_meta")]
-    public IDictionary<string, JsonElement>? Meta { get; set; }
+    /// <summary>Effective default Auto routing preference from user and managed settings. Applies only to fresh sessions and never replaces a per-session selection.</summary>
+    [JsonPropertyName("autoTier")]
+    public AutoTier? AutoTier { 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 explicitly selected by the CLI, when provided.</summary>
+    [JsonPropertyName("cliModel")]
+    public string? CliModel { get; set; }
 
-    /// <summary>Model/client annotations associated with this template.</summary>
-    [JsonPropertyName("annotations")]
-    public McpResourceAnnotations? Annotations { get; set; }
+    /// <summary>Whether the overlay is being applied while resuming a deferred session.</summary>
+    [JsonPropertyName("deferredResume")]
+    public bool? DeferredResume { get; set; }
 
-    /// <summary>Optional description of what this template is for.</summary>
-    [JsonPropertyName("description")]
-    public string? Description { get; set; }
+    /// <summary>Model required by device-managed policy, when configured.</summary>
+    [JsonPropertyName("deviceManagedModel")]
+    public string? DeviceManagedModel { get; set; }
 
-    /// <summary>Icons associated with resources matching this template.</summary>
-    [JsonPropertyName("icons")]
-    public IList<McpResourceIcon>? Icons { get; set; }
+    /// <summary>Context tier paired with the effective organization-managed model. Applies only when that concrete managed model is selected; it is ignored for Auto and for CLI, resume, or user overrides.</summary>
+    [JsonPropertyName("managedContextTier")]
+    public string? ManagedContextTier { get; set; }
 
-    /// <summary>MIME type for resources matching this template, if uniform.</summary>
-    [JsonPropertyName("mimeType")]
-    public string? MimeType { get; set; }
+    /// <summary>Reasoning effort paired with the effective organization-managed model. Applies only when that concrete managed model is selected; it is ignored for Auto and for CLI, resume, or user overrides.</summary>
+    [JsonPropertyName("managedReasoningEffort")]
+    public string? ManagedReasoningEffort { get; set; }
 
-    /// <summary>The programmatic name of the resource template.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Startup default model from the enterprise policy helper, when configured. Weakest of the managed sources: it applies only when neither device nor server policy names a model, and an explicit user selection still wins.</summary>
+    [JsonPropertyName("policyHelperModel")]
+    public string? PolicyHelperModel { get; set; }
 
-    /// <summary>Optional human-readable display title.</summary>
-    [JsonPropertyName("title")]
-    public string? Title { get; set; }
+    /// <summary>Auto routing preference selected by repository settings, when configured. Applied only when the overlay selects the Auto model; beside a concrete model it stays dormant.</summary>
+    [JsonPropertyName("repoAutoTier")]
+    public string? RepoAutoTier { get; set; }
 
-    /// <summary>An RFC 6570 URI template for constructing resource URIs.</summary>
-    [JsonPropertyName("uriTemplate")]
-    public string UriTemplate { get; set; } = string.Empty;
-}
+    /// <summary>Context tier selected by repository settings, when configured.</summary>
+    [JsonPropertyName("repoContextTier")]
+    public string? RepoContextTier { get; set; }
 
-/// <summary>One page of resource templates advertised by the named MCP server.</summary>
-[Experimental(global::GitHub.Copilot.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>Model selected by repository settings, when configured.</summary>
+    [JsonPropertyName("repoModel")]
+    public string? RepoModel { 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>Provider owning the repository-selected model. Omitted repository provider identity retains legacy bare-model behavior.</summary>
+    [JsonPropertyName("repoModelProviderId")]
+    public string? RepoModelProviderId { get; set; }
 
-/// <summary>MCP server whose resource templates to enumerate.</summary>
-[Experimental(global::GitHub.Copilot.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>Reasoning effort selected by repository settings, when configured.</summary>
+    [JsonPropertyName("repoReasoningEffort")]
+    public string? RepoReasoningEffort { 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>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>An argument accepted by an MCP prompt.</summary>
+/// <summary>RPC data type for SessionModelClearStartupSeed operations.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpPromptArgument
+internal sealed class SessionModelClearStartupSeedResult
 {
-    /// <summary>Argument-level metadata.</summary>
-    [JsonPropertyName("_meta")]
-    public IDictionary<string, JsonElement>? Meta { get; set; }
-
-    /// <summary>Server-provided non-standard argument fields.</summary>
-    [JsonPropertyName("additionalProperties")]
-    public IDictionary<string, JsonElement>? AdditionalProperties { get; set; }
-
-    /// <summary>Description of the argument.</summary>
-    [JsonPropertyName("description")]
-    public string? Description { get; set; }
-
-    /// <summary>Name of the argument.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
-
-    /// <summary>Whether the argument is required; omission is distinct from false.</summary>
-    [JsonPropertyName("required")]
-    public bool? Required { get; set; }
+    /// <summary>Gets or sets the <c>cleared</c> value.</summary>
+    [JsonPropertyName("cleared")]
+    public bool Cleared { get; set; }
 }
 
-/// <summary>An MCP prompt icon with standard size hints and preserved non-standard fields.</summary>
+/// <summary>RPC data type for SessionModelClearStartupSeed operations.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpPromptIcon
+internal sealed class SessionModelClearStartupSeedRequest
 {
-    /// <summary>Server-provided non-standard icon fields.</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, such as `48x48` or `any`.</summary>
-    [JsonPropertyName("sizes")]
-    public IList<string>? Sizes { get; set; }
+    /// <summary>Gets or sets the <c>expectedModel</c> value.</summary>
+    [JsonPropertyName("expectedModel")]
+    public string ExpectedModel { get; set; } = string.Empty;
 
-    /// <summary>Icon URI.</summary>
-    [JsonPropertyName("src")]
-    public string Src { get; set; } = string.Empty;
+    /// <summary>Provider captured with the startup seed; omission matches only an unqualified seed.</summary>
+    [JsonPropertyName("expectedProviderId")]
+    public string? ExpectedProviderId { get; set; }
 
-    /// <summary>Theme hint for this icon.</summary>
-    [JsonPropertyName("theme")]
-    public string? Theme { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>An MCP prompt descriptor. Server-provided non-standard fields are exposed under `additionalProperties`.</summary>
+/// <summary>The applied host allowlist and effective session model policy after intersection.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpPrompt
+public sealed class ModelSetAllowedModelsResult
 {
-    /// <summary>Prompt-level metadata.</summary>
-    [JsonPropertyName("_meta")]
-    public IDictionary<string, JsonElement>? Meta { get; set; }
-
-    /// <summary>Server-provided non-standard descriptor fields.</summary>
-    [JsonPropertyName("additionalProperties")]
-    public IDictionary<string, JsonElement>? AdditionalProperties { get; set; }
-
-    /// <summary>Arguments accepted by the prompt.</summary>
-    [JsonPropertyName("arguments")]
-    public IList<McpPromptArgument>? Arguments { get; set; }
-
-    /// <summary>Description of what this prompt provides.</summary>
-    [JsonPropertyName("description")]
-    public string? Description { get; set; }
+    /// <summary>Normalized host allowlist. Omitted when the host restriction was cleared, or when a relay client does not return the host policy.</summary>
+    [JsonPropertyName("allowedModels")]
+    public IList<string>? AllowedModels { get; set; }
 
-    /// <summary>Icons associated with this prompt.</summary>
-    [JsonPropertyName("icons")]
-    public IList<McpPromptIcon>? Icons { get; set; }
+    /// <summary>Effective exact IDs or repository policy patterns after applying the host restriction. Omitted by relay clients that do not return the host policy.</summary>
+    [JsonPropertyName("effectiveAllowedModels")]
+    public IList<string>? EffectiveAllowedModels { get; set; }
 
-    /// <summary>The programmatic name of the prompt.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Effective deterministic fallback model, when the policy defines one.</summary>
+    [JsonPropertyName("fallbackModel")]
+    public string? FallbackModel { get; set; }
 
-    /// <summary>Human-readable display title.</summary>
-    [JsonPropertyName("title")]
-    public string? Title { get; set; }
+    /// <summary>Selected session model after reconciling a now-disallowed concrete selection.</summary>
+    [JsonPropertyName("modelId")]
+    public string? ModelId { get; set; }
 }
 
-/// <summary>One page of prompts advertised by the named MCP server.</summary>
+/// <summary>Host-supplied exact model selection IDs to allow for this running session. CAPI IDs are intersected with repository `.github/allowed_models.txt` policy; provider-qualified IDs remain exempt from repository-only policy but are restricted by this host list. Omit or pass null to clear the host restriction; an explicit empty or disjoint list is rejected. Validation and pre-selection fallback failures preserve the previous restriction. Failures after a fallback selection commits retain the new restriction and selected model; callers should inspect current session state after such an error.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpPromptsListResult
+internal sealed class ModelSetAllowedModelsRequest
 {
-    /// <summary>MCP result metadata.</summary>
-    [JsonPropertyName("_meta")]
-    public IDictionary<string, JsonElement>? Meta { get; set; }
-
-    /// <summary>Server-provided non-standard result fields.</summary>
-    [JsonPropertyName("additionalProperties")]
-    public IDictionary<string, JsonElement>? AdditionalProperties { get; set; }
-
-    /// <summary>Opaque cursor for the next page, if the server has more prompts.</summary>
-    [JsonPropertyName("nextCursor")]
-    public string? NextCursor { get; set; }
+    /// <summary>Exact model IDs to permit, or null to clear the host restriction.</summary>
+    [JsonPropertyName("allowedModels")]
+    public IList<string>? AllowedModels { get; set; }
 
-    /// <summary>Prompts advertised by the server.</summary>
-    [JsonPropertyName("prompts")]
-    public IList<McpPrompt> Prompts { get => field ??= []; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>MCP server whose prompts to enumerate.</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(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class McpPromptsListRequest
+public sealed class ModelSetReasoningEffortResult
 {
-    /// <summary>Opaque MCP pagination cursor from a prior `nextCursor` value.</summary>
-    [JsonPropertyName("cursor")]
-    public string? Cursor { get; set; }
+    /// <summary>Reasoning effort level recorded on the session after the update.</summary>
+    [JsonPropertyName("reasoningEffort")]
+    public string ReasoningEffort { get; set; } = string.Empty;
+}
 
-    /// <summary>Name of the MCP server whose prompts 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>Reasoning effort level to apply to the currently selected model.</summary>
+[Experimental(global::GitHub.Copilot.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>An MCP prompt message with opaque JSON content preserved without flattening or content-type filtering.</summary>
+/// <summary>Reasoning-summaries presentation policy for the session's current model.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpPromptMessage
+public sealed class ModelGetReasoningSummariesResult
 {
-    /// <summary>Message-level metadata.</summary>
-    [JsonPropertyName("_meta")]
-    public IDictionary<string, JsonElement>? Meta { get; set; }
+    /// <summary>Whether the supplied `persistedShowReasoning` setting only restates the model default. This reports a redundancy, not a standing instruction to delete the setting: it stays true for as long as the setting and the model default agree, including for a user who later chose that value deliberately. It exists for a one-time migration of a legacy setting written before the model default made it redundant, so a host that acts on it owns the cleanup and must gate it behind its own persisted `done` marker, delete only a setting whose value still matches the one it read, and never repeat the deletion on a later launch. Under an off-by-default reasoning-summaries experiment an explicit `showReasoning: true` opt-in also reads as redundant on a summary-producing model, so an ungated host would keep deleting that opt-in and hide summaries again on every launch.</summary>
+    [JsonPropertyName("clearRedundantSetting")]
+    public bool ClearRedundantSetting { get; set; }
 
-    /// <summary>Server-provided non-standard message fields.</summary>
-    [JsonPropertyName("additionalProperties")]
-    public IDictionary<string, JsonElement>? AdditionalProperties { get; set; }
+    /// <summary>Whether the session's reasoning-summaries experiment assignment has settled. False means this read does not wait for a pending assignment and reports the experiment-derived fields conservatively: `showHiddenHint` is false and `visibility` falls back to `persistedShowReasoning`, or is omitted when none was supplied. A host that wants the assigned answer re-reads until this is true.</summary>
+    [JsonPropertyName("experimentSettled")]
+    public bool ExperimentSettled { get; set; }
 
-    /// <summary>The original MCP content block, including nested metadata and unfamiliar content types.</summary>
-    [JsonPropertyName("content")]
-    public JsonElement Content { get; set; }
+    /// <summary>Whether the selected model shows reasoning summaries by default.</summary>
+    [JsonPropertyName("modelDefaultShowsSummaries")]
+    public bool ModelDefaultShowsSummaries { get; set; }
 
-    /// <summary>The role of the message sender.</summary>
-    [JsonPropertyName("role")]
-    public McpPromptRole Role { get; set; }
-}
+    /// <summary>False until the session has a model catalog and a selected model. This read never resolves the catalog itself, and the runtime emits no readiness notification, so repeating this call alone leaves `ready` false indefinitely on a session that has neither listed models nor run a turn. `session.model.list` is the prerequisite and the signal: it resolves and caches the catalog for the session, so a successful return means the next read is ready. The exception is a session that resolves models without a Copilot catalog, that is a BYOK registry or an alternate provider: `session.model.list` returns an empty list without caching a catalog, so `ready` stays false and this policy is unavailable there. While false, every model-policy field is false and `visibility` is omitted; `experimentSettled` is independent of readiness and still reports the assignment state.</summary>
+    [JsonPropertyName("ready")]
+    public bool Ready { get; set; }
 
-/// <summary>Prompt messages returned by the MCP server without sending them to the model.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpPromptsGetResult
-{
-    /// <summary>MCP result metadata.</summary>
-    [JsonPropertyName("_meta")]
-    public IDictionary<string, JsonElement>? Meta { get; set; }
+    /// <summary>Whether turns on this session produce reasoning summaries, honouring an explicit session reasoning-summary override.</summary>
+    [JsonPropertyName("sessionShowsSummaries")]
+    public bool SessionShowsSummaries { get; set; }
 
-    /// <summary>Server-provided non-standard result fields.</summary>
-    [JsonPropertyName("additionalProperties")]
-    public IDictionary<string, JsonElement>? AdditionalProperties { get; set; }
+    /// <summary>Whether to show the hint that reasoning summaries are hidden. Always false while `experimentSettled` is false.</summary>
+    [JsonPropertyName("showHiddenHint")]
+    public bool ShowHiddenHint { get; set; }
 
-    /// <summary>Description of the prompt.</summary>
-    [JsonPropertyName("description")]
-    public string? Description { get; set; }
+    /// <summary>Whether the selected model emits reasoning headers.</summary>
+    [JsonPropertyName("showReasoningHeaders")]
+    public bool ShowReasoningHeaders { get; set; }
 
-    /// <summary>Ordered prompt messages.</summary>
-    [JsonPropertyName("messages")]
-    public IList<McpPromptMessage> Messages { get => field ??= []; set; }
+    /// <summary>Default reasoning visibility, and only meaningful once `ready` is true: false when the session produces no summaries, else the persisted setting, else the experiment's default. While `ready` is true it is omitted only when all three are unavailable, that is when the session produces summaries, no `persistedShowReasoning` was supplied, and `experimentSettled` is false. While `ready` is false there is no model policy to report and this field is always omitted, so an absent value alone does not imply a pending experiment.</summary>
+    [JsonPropertyName("visibility")]
+    public bool? Visibility { get; set; }
 }
 
-/// <summary>MCP server, prompt name, and optional string-valued arguments.</summary>
+/// <summary>Host presentation state the reasoning-summaries policy depends on.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class McpPromptsGetRequest
+internal sealed class ModelGetReasoningSummariesRequest
 {
-    /// <summary>String-valued arguments to pass to the prompt.</summary>
-    [JsonPropertyName("arguments")]
-    public IDictionary<string, string>? Arguments { get; set; }
-
-    /// <summary>The programmatic name of the prompt.</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("promptName")]
-    public string PromptName { get; set; } = string.Empty;
-
-    /// <summary>Name of the MCP server hosting the prompt.</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>The host's persisted `showReasoning` user setting, omitted when unset.</summary>
+    [JsonPropertyName("persistedShowReasoning")]
+    public bool? PersistedShowReasoning { get; set; }
 
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
+
+    /// <summary>Whether the host is currently showing reasoning summaries. Defaults to false.</summary>
+    [JsonPropertyName("summariesVisible")]
+    public bool? SummariesVisible { get; set; }
 }
 
-/// <summary>MCP diagnostic source configuration.</summary>
+/// <summary>Availability of a server-advertised routing preference.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpDiagnosticSourceConfiguration
+public sealed class AutoTierStatus
 {
-    /// <summary>Threshold to apply to MCP diagnostic producers in this session.</summary>
-    [JsonPropertyName("level")]
-    public DiagnosticLogLevel Level { get; set; }
+    /// <summary>Whether the provider permits selecting this preference.</summary>
+    [JsonPropertyName("enabled")]
+    public bool Enabled { get; set; }
+
+    /// <summary>Human-readable explanation of availability.</summary>
+    [JsonPropertyName("message")]
+    public string? Message { get; set; }
+
+    /// <summary>Extensible machine-readable unavailability reason.</summary>
+    [JsonPropertyName("reason")]
+    public string? Reason { get; set; }
 }
 
-/// <summary>Typed diagnostic source configuration. At least one source is required by diagnostics configuration methods.</summary>
+/// <summary>A server-advertised routing preference. Identifiers and execution types are extensible.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class DiagnosticSourcesConfiguration
+public sealed class AutoTierDescriptor
 {
-    /// <summary>MCP diagnostic capture threshold. Omit to leave the current threshold unchanged.</summary>
-    [JsonPropertyName("mcp")]
-    public McpDiagnosticSourceConfiguration? Mcp { get; set; }
+    /// <summary>Description displayed beside the preference.</summary>
+    [JsonPropertyName("description")]
+    public string Description { get; set; } = string.Empty;
+
+    /// <summary>Human-readable label, not a routing identifier.</summary>
+    [JsonPropertyName("displayName")]
+    public string DisplayName { get; set; } = string.Empty;
+
+    /// <summary>Opaque routing identifier transmitted unchanged to the provider.</summary>
+    [JsonPropertyName("id")]
+    public string Id { get; set; } = string.Empty;
+
+    /// <summary>Current account-specific availability.</summary>
+    [JsonPropertyName("status")]
+    public AutoTierStatus Status { get => field ??= new(); set; }
+
+    /// <summary>Execution kind; this client supports `auto` preferences on the Auto model.</summary>
+    [JsonPropertyName("type")]
+    public string Type { get; set; } = string.Empty;
 }
 
-/// <summary>Per-source session diagnostics configuration.</summary>
+/// <summary>Account-bound discovery metadata for the virtual `auto` model.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class DiagnosticsConfiguration
+public sealed class AutoTierMetadata
 {
-    /// <summary>Diagnostic thresholds keyed by supported source.</summary>
-    [JsonPropertyName("sources")]
-    public DiagnosticSourcesConfiguration Sources { get => field ??= new(); set; }
+    /// <summary>Provider-default preference, used only when no explicit preference exists.</summary>
+    [JsonPropertyName("defaultTier")]
+    public string DefaultTier { get; set; } = string.Empty;
+
+    /// <summary>Provider that supplied this metadata, when the catalog is provider-attributed.</summary>
+    [JsonPropertyName("providerId")]
+    public string? ProviderId { get; set; }
+
+    /// <summary>Routing preferences in the server's presentation order.</summary>
+    [JsonPropertyName("tiers")]
+    public IList<AutoTierDescriptor> Tiers { get => field ??= []; set; }
 }
 
-/// <summary>Patch session diagnostic thresholds for explicitly supplied sources.</summary>
+/// <summary>Cost-category metadata for a CAPI model.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class DiagnosticsConfigureRequest
+public sealed class SessionModelPriceCategory
 {
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>CAPI model identifier.</summary>
+    [JsonPropertyName("id")]
+    public string Id { get; set; } = string.Empty;
 
-    /// <summary>Sources to configure. At least one supported source must be supplied.</summary>
-    [JsonPropertyName("sources")]
-    public DiagnosticSourcesConfiguration Sources { get => field ??= new(); set; }
+    /// <summary>Cost category assigned to the model.</summary>
+    [JsonPropertyName("priceCategory")]
+    public ModelPickerPriceCategory PriceCategory { get; set; }
 }
 
-/// <summary>One retained session-scoped diagnostic record. Potentially content-bearing diagnostic data is opt-in and must not be exported automatically as telemetry.</summary>
-/// <remarks>Polymorphic base type discriminated by <c>source</c>.</remarks>
+/// <summary>One model provider available to the session — the model analog of the account `ProviderDescriptor`. Opaque id/label/kind plus a stable ordering; central code never branches on kind.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-[JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "source",
-    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(DiagnosticEntryMcp), "mcp")]
-public partial class DiagnosticEntry
+public sealed class ModelProviderDescriptor
 {
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("source")]
-    public virtual string Source { get; set; } = string.Empty;
-}
+    /// <summary>Opaque, stable provider id, stamped onto every model this provider returns.</summary>
+    [JsonPropertyName("id")]
+    public string Id { get; set; } = string.Empty;
 
+    /// <summary>The neutral provider kind.</summary>
+    [JsonPropertyName("kind")]
+    public ModelProviderKind Kind { get; set; }
 
-/// <summary>MCP-specific detail for a source-discriminated diagnostic entry.</summary>
+    /// <summary>Human-readable menu label, owned by the runtime so every consumer renders identical text.</summary>
+    [JsonPropertyName("label")]
+    public string Label { get; set; } = string.Empty;
+
+    /// <summary>Stable ordering key for presenting providers in a deterministic sequence.</summary>
+    [JsonPropertyName("ordering")]
+    public long Ordering { get; set; }
+}
+
+/// <summary>The list of models available to this session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpDiagnosticDetails
+public sealed class SessionModelList
 {
-    /// <summary>Fresh identifier for the MCP connection attempt, including failed starts.</summary>
-    [JsonPropertyName("connectionId")]
-    public string ConnectionId { get; set; } = string.Empty;
+    /// <summary>Ordered Auto routing preferences discovered for this session's account.</summary>
+    [JsonPropertyName("auto")]
+    public AutoTierMetadata? Auto { get; set; }
 
-    /// <summary>Serialized diagnostic detail. Protocol and HTTP records use JSON when detail is present.</summary>
-    [JsonPropertyName("data")]
-    public string? Data { 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>Protocol-frame direction when kind is protocol.</summary>
-    [JsonPropertyName("direction")]
-    public McpDiagnosticDirection? Direction { 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>Diagnostic record category.</summary>
-    [JsonPropertyName("kind")]
-    public McpDiagnosticKind Kind { get; set; }
+    /// <summary>The model providers available to this session, in ordering order, resolved from the account roster; empty when no provider is entitled (logged out / seatless). Each model in `list` carries its own provider reference; this roster gives the deterministic provider sequence and lets a consumer group by provider without deriving ordering from the model list. Central code never branches on a provider kind.</summary>
+    [JsonPropertyName("providers")]
+    public IList<ModelProviderDescriptor>? Providers { get; set; }
 
-    /// <summary>Configured MCP server name.</summary>
-    [JsonPropertyName("serverName")]
-    public string ServerName { get; set; } = string.Empty;
+    /// <summary>Per-quota snapshots returned alongside the model list, keyed by quota type.</summary>
+    [JsonPropertyName("quotaSnapshots")]
+    public IDictionary<string, JsonElement>? QuotaSnapshots { get; set; }
 }
 
-/// <summary>The <c>mcp</c> variant of <see cref="DiagnosticEntry"/>.</summary>
+/// <summary>RPC data type for SessionModelList operations.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class DiagnosticEntryMcp : DiagnosticEntry
+public sealed class SessionModelListRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Source => "mcp";
+    /// <summary>If true, bypasses the per-session model list cache and re-fetches from CAPI.</summary>
+    [JsonPropertyName("skipCache")]
+    public bool? SkipCache { get; set; }
+}
 
-    /// <summary>Agent identifier for a subagent host. Omitted for the root agent.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("agentId")]
-    public string? AgentId { get; set; }
+/// <summary>RPC data type for SessionModelListRequestWithSession operations.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class SessionModelListRequestWithSession
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 
-    /// <summary>Typed MCP diagnostic detail.</summary>
-    [JsonPropertyName("details")]
-    public required McpDiagnosticDetails Details { 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>Severity of this emitted diagnostic record.</summary>
-    [JsonPropertyName("level")]
-    public required DiagnosticSeverity Level { get; set; }
+/// <summary>Identifies the target session.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class SessionModeGetRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <summary>Human-readable diagnostic summary.</summary>
-    [JsonPropertyName("message")]
-    public required string Message { get; set; }
+/// <summary>Outcome of a session mode change, including any model switch it triggered and follow-up the host must perform.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class ModeSetResult
+{
+    /// <summary>Whether the host should arm an interactive continuation after the mode change.</summary>
+    [JsonPropertyName("armInteractiveContinuation")]
+    public bool? ArmInteractiveContinuation { get; set; }
 
-    /// <summary>Original byte count when a known-size message or data value was truncated.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("originalBytes")]
-    public long? OriginalBytes { get; set; }
+    /// <summary>Compaction confirmation required before the mode change can complete.</summary>
+    [JsonPropertyName("confirmation")]
+    public ModelSwitchConfirmation? Confirmation { get; set; }
 
-    /// <summary>UTC RFC 3339 timestamp captured at the diagnostic source.</summary>
-    [JsonPropertyName("timestamp")]
-    public required string Timestamp { get; set; }
+    /// <summary>Whether the host must defer implementing the requested mode change.</summary>
+    [JsonPropertyName("deferImplementation")]
+    public bool? DeferImplementation { get; set; }
 
-    /// <summary>Whether message or data was truncated to the record-size bound.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("truncated")]
-    public bool? Truncated { get; set; }
-}
+    /// <summary>Deprecation warnings associated with the model selected by the mode change.</summary>
+    [JsonPropertyName("deprecationWarnings")]
+    public IList<string>? DeprecationWarnings { get; set; }
 
-/// <summary>One cursor-addressed page of retained session diagnostics.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class DiagnosticsReadResult
-{
-    /// <summary>Opaque cursor for the next independent read.</summary>
-    [JsonPropertyName("cursor")]
-    public string Cursor { get; set; } = string.Empty;
+    /// <summary>User-facing outcome message for the model switch triggered by the mode change.</summary>
+    [JsonPropertyName("message")]
+    public string? Message { get; set; }
 
-    /// <summary>Whether the requested cursor remained within the retained buffer window.</summary>
-    [JsonPropertyName("cursorStatus")]
-    public DiagnosticCursorStatus CursorStatus { get; set; }
+    /// <summary>Whether the requested mode was applied to the session. False only when an 'expectedMode' precondition did not hold, in which case any model change reported alongside it was still applied.</summary>
+    [JsonPropertyName("modeApplied")]
+    public bool? ModeApplied { get; set; }
 
-    /// <summary>Number of records lost before this page when known. Omitted when a buffer generation change makes the count unknowable.</summary>
-    [JsonPropertyName("droppedCount")]
-    public long? DroppedCount { get; set; }
+    /// <summary>Whether applying the mode changed the active model.</summary>
+    [JsonPropertyName("modelChanged")]
+    public bool ModelChanged { get; set; }
 
-    /// <summary>Retained records beginning at the requested cursor.</summary>
-    [JsonPropertyName("entries")]
-    public IList<DiagnosticEntry> Entries { get => field ??= []; set; }
+    /// <summary>Lifecycle status of the requested mode change.</summary>
+    [JsonPropertyName("status")]
+    public string Status { get; set; } = string.Empty;
 
-    /// <summary>Whether additional retained records follow this page.</summary>
-    [JsonPropertyName("hasMore")]
-    public bool HasMore { get; set; }
+    /// <summary>User-facing warning produced while applying the mode change.</summary>
+    [JsonPropertyName("warning")]
+    public string? Warning { get; set; }
 }
 
-/// <summary>Cursor-based request for session diagnostics. The default limit is 100 (maximum 500); the default waitMs is zero (maximum 30000).</summary>
+/// <summary>Agent interaction mode to apply to the session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class DiagnosticsReadRequest
+internal sealed class ModeSetRequest
 {
-    /// <summary>Opaque cursor returned by an earlier read. Omit to start at the oldest retained record.</summary>
-    [JsonPropertyName("cursor")]
-    public string? Cursor { get; set; }
-
-    /// <summary>Maximum number of records to return, from 1 through 500. Omit for 100.</summary>
-    [JsonPropertyName("max")]
-    public long? Max { get; set; }
+    /// <summary>Explicit response to a model-switch compaction preflight.</summary>
+    [JsonPropertyName("compactionDecision")]
+    public string? CompactionDecision { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Mode the session must currently be in for the change to apply. When set and the session is in a different mode the request is a no-op and reports status 'unchanged'.</summary>
+    [JsonPropertyName("expectedMode")]
+    public SessionMode? ExpectedMode { get; set; }
 
-    /// <summary>Nonempty selection of sources to read. Each source may be listed once.</summary>
-    [JsonPropertyName("sources")]
-    public IList<DiagnosticSource> Sources { get => field ??= []; set; }
+    /// <summary>Session whose plan-mode base state should be inherited.</summary>
+    [JsonPropertyName("inheritPlanBaseFromSessionId")]
+    public string? InheritPlanBaseFromSessionId { get; set; }
 
-    /// <summary>Maximum time in milliseconds to wait for a new record, from 0 through 30000.</summary>
-    [JsonPropertyName("waitMs")]
-    public int? WaitMs { get; set; }
-}
+    /// <summary>The session mode the agent is operating in.</summary>
+    [JsonPropertyName("mode")]
+    public SessionMode Mode { get; set; }
 
-/// <summary>Feature detection and hard polling limits for the EXPERIMENTAL session connector API.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ConnectorCapabilities
-{
-    /// <summary>Connector API contract version.</summary>
-    [JsonPropertyName("apiVersion")]
-    public long ApiVersion { get; set; }
+    /// <summary>Whether the selected plan model should be persisted.</summary>
+    [JsonPropertyName("persistPlanSelection")]
+    public bool? PersistPlanSelection { get; set; }
 
-    /// <summary>Current session availability. Disabled availability is reported without making a Connector request.</summary>
-    [JsonPropertyName("availability")]
-    public ConnectorAvailability Availability { get; set; }
+    /// <summary>Settings context used when persisting the selected plan model.</summary>
+    [JsonPropertyName("pickerSettingsContext")]
+    public ModelPickerSettingsContext? PickerSettingsContext { get; set; }
 
-    /// <summary>Whether connect and reconnect can return an opaque continuation for bounded consent polling.</summary>
-    [JsonPropertyName("consentContinuation")]
-    public bool ConsentContinuation { get; set; }
+    /// <summary>Context tier to use with the dedicated plan model.</summary>
+    [JsonPropertyName("planContextTier")]
+    public string? PlanContextTier { get; set; }
 
-    /// <summary>Maximum accepted wall-clock deadline in milliseconds for one continuation call.</summary>
-    [JsonPropertyName("maxDeadlineMs")]
-    public long MaxDeadlineMs { get; set; }
+    /// <summary>Action to perform when leaving plan mode.</summary>
+    [JsonPropertyName("planExitAction")]
+    public string? PlanExitAction { get; set; }
 
-    /// <summary>Maximum accepted polling attempts for one continuation call.</summary>
-    [JsonPropertyName("maxPollAttempts")]
-    public long MaxPollAttempts { get; set; }
+    /// <summary>Dedicated model to use in plan mode, when configured.</summary>
+    [JsonPropertyName("planModel")]
+    public string? PlanModel { get; set; }
 
-    /// <summary>Maximum accepted delay in milliseconds between polling attempts.</summary>
-    [JsonPropertyName("maxPollIntervalMs")]
-    public long MaxPollIntervalMs { get; set; }
+    /// <summary>Whether a dedicated plan model is configured.</summary>
+    [JsonPropertyName("planModelConfigured")]
+    public bool? PlanModelConfigured { get; set; }
 
-    /// <summary>Whether callers select a host-owned GitHub account through an opaque selection ID rather than supplying a provider token.</summary>
-    [JsonPropertyName("opaqueAccountSelection")]
-    public bool OpaqueAccountSelection { get; set; }
+    /// <summary>Provider owning planModel. Omit for legacy bare-model selection.</summary>
+    [JsonPropertyName("planModelProviderId")]
+    public string? PlanModelProviderId { get; set; }
 
-    /// <summary>Whether getAccount is supported. Absence means false.</summary>
-    [JsonPropertyName("sessionAccountSelection")]
-    public bool? SessionAccountSelection { get; set; }
+    /// <summary>Reasoning effort to use with the dedicated plan model.</summary>
+    [JsonPropertyName("planReasoningEffort")]
+    public string? PlanReasoningEffort { get; set; }
 
-    /// <summary>Whether reconcile accepts forceConnectorName. Absence means false.</summary>
-    [JsonPropertyName("targetedReconcile")]
-    public bool? TargetedReconcile { get; set; }
-}
+    /// <summary>Whether leaving plan mode should restore the session's previous model.</summary>
+    [JsonPropertyName("restorePlanModel")]
+    public bool? RestorePlanModel { get; set; }
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionConnectorsGetCapabilitiesRequest
-{
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Credential-free identity metadata.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class AuthIdentityMetadata
-{
-    /// <summary>Identity host.</summary>
-    [JsonPropertyName("host")]
-    public string Host { get; set; } = string.Empty;
-
-    /// <summary>User login.</summary>
-    [JsonPropertyName("login")]
-    public string Login { get; set; } = string.Empty;
-
-    /// <summary>Authentication type.</summary>
-    [JsonPropertyName("type")]
-    public AuthInfoType Type { get; set; }
-}
-
-/// <summary>Session account selection.</summary>
+/// <summary>The session's friendly name, or null when not yet set.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ConnectorSessionAccount
+public sealed class NameGetResult
 {
-    /// <summary>Opaque session-scoped account selection ID.</summary>
-    [JsonPropertyName("accountId")]
-    public string AccountId { get; set; } = string.Empty;
-
-    /// <summary>Credential-free identity metadata.</summary>
-    [JsonPropertyName("authInfo")]
-    public AuthIdentityMetadata AuthInfo { get => field ??= new(); 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>Identifies the target session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionConnectorsGetAccountRequest
+internal sealed class SessionNameGetRequest
 {
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Account-targeted authorization update required by the Connector service. The account ID is an opaque host routing identifier; no credential is included.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ConnectorAuthorizationRequirement
-{
-    /// <summary>Exact opaque account selection that made the Connector request.</summary>
-    [JsonPropertyName("accountId")]
-    public string AccountId { get; set; } = string.Empty;
-
-    /// <summary>Stable OAuth scope the selected account must grant.</summary>
-    [JsonPropertyName("scope")]
-    public ConnectorAuthorizationScope Scope { get; set; }
-}
-
-/// <summary>Credential-free Connector catalog entry.</summary>
+/// <summary>New friendly name to apply to the session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ConnectorCatalogEntry
+internal sealed class NameSetRequest
 {
-    /// <summary>Untrusted service description, when present.</summary>
-    [JsonPropertyName("description")]
-    public string? Description { get; set; }
-
-    /// <summary>Untrusted display label from the service.</summary>
-    [JsonPropertyName("displayName")]
-    public string DisplayName { get; set; } = string.Empty;
-
-    /// <summary>Optional catalog logo.</summary>
-    [JsonPropertyName("logo")]
-    public string? Logo { get; set; }
-
-    /// <summary>Canonical Connector name used by lifecycle methods.</summary>
+    /// <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>Optional catalog release tag.</summary>
-    [JsonPropertyName("releaseTag")]
-    public string? ReleaseTag { get; set; }
-
-    /// <summary>Opaque stable runtime IDs currently projected into the session for this Connector.</summary>
-    [JsonPropertyName("runtimeServerIds")]
-    public IList<string> RuntimeServerIds { get => field ??= []; set; }
-
-    /// <summary>Current authoritative service connection state.</summary>
-    [JsonPropertyName("status")]
-    public ConnectorCatalogStatus Status { get; set; }
-
-    /// <summary>Optional catalog tier.</summary>
-    [JsonPropertyName("tier")]
-    public string? Tier { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Validated Connector catalog snapshot cached by the session.</summary>
+/// <summary>Indicates whether the auto-generated summary was applied as the session's name.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ConnectorCatalogResult
+public sealed class NameSetAutoResult
 {
-    /// <summary>Validated catalog entries in service order.</summary>
-    [JsonPropertyName("connectors")]
-    public IList<ConnectorCatalogEntry> Connectors { get => field ??= []; set; }
-
-    /// <summary>Unix epoch milliseconds when this snapshot was accepted.</summary>
-    [JsonPropertyName("refreshedAtMs")]
-    public long RefreshedAtMs { get; set; }
-
-    /// <summary>Monotonically increasing session-local catalog revision.</summary>
-    [JsonPropertyName("revision")]
-    public long Revision { get; set; }
+    /// <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>Live status of one session-owned MCP projection.</summary>
+/// <summary>Auto-generated session summary to apply as the session's name when no user-set name exists.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ConnectorRuntimeStatus
+internal sealed class NameSetAutoRequest
 {
-    /// <summary>Canonical Connector name that owns this server.</summary>
-    [JsonPropertyName("connectorName")]
-    public string ConnectorName { get; set; } = string.Empty;
-
-    /// <summary>Opaque runtime server ID.</summary>
-    [JsonPropertyName("runtimeServerId")]
-    public string RuntimeServerId { get; set; } = string.Empty;
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 
-    /// <summary>Current live MCP host status.</summary>
-    [JsonPropertyName("status")]
-    public ConnectorMcpStatus Status { 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>Authoritative session connector state. Account IDs are opaque routing identifiers and credentials are never included.</summary>
+/// <summary>Existence, contents, and resolved path of the session plan file.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ConnectorStatus
+public sealed class PlanReadResult
 {
-    /// <summary>Opaque account selection pinned to this session, when one has been selected.</summary>
-    [JsonPropertyName("accountId")]
-    public string? AccountId { get; set; }
-
-    /// <summary>Connector API contract version.</summary>
-    [JsonPropertyName("apiVersion")]
-    public long ApiVersion { get; set; }
-
-    /// <summary>Exact selected account and stable scope requiring an authorization update, when proven by the Connector service.</summary>
-    [JsonPropertyName("authorizationRequirement")]
-    public ConnectorAuthorizationRequirement? AuthorizationRequirement { get; set; }
-
-    /// <summary>Current feature and session availability.</summary>
-    [JsonPropertyName("availability")]
-    public ConnectorAvailability Availability { get; set; }
-
-    /// <summary>Latest validated catalog snapshot, when available.</summary>
-    [JsonPropertyName("catalog")]
-    public ConnectorCatalogResult? Catalog { get; set; }
+    /// <summary>The content of the plan file, or null if it does not exist.</summary>
+    [JsonPropertyName("content")]
+    public string? Content { get; set; }
 
-    /// <summary>Number of active opaque connection continuations.</summary>
-    [JsonPropertyName("pendingConnections")]
-    public long PendingConnections { get; set; }
+    /// <summary>Whether the plan file exists in the workspace.</summary>
+    [JsonPropertyName("exists")]
+    public bool Exists { get; set; }
 
-    /// <summary>Live MCP status for every Connector-owned runtime server.</summary>
-    [JsonPropertyName("runtimeServers")]
-    public IList<ConnectorRuntimeStatus> RuntimeServers { get => field ??= []; 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>Identifies the target session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionConnectorsGetStatusRequest
+internal sealed class SessionPlanReadRequest
 {
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Pins a Connector operation to one host-owned GitHub account through its opaque selection ID. Provider tokens are never accepted.</summary>
+/// <summary>Replacement contents to write to the session plan file.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class ConnectorAccountRequest
+internal sealed class PlanUpdateRequest
 {
-    /// <summary>Opaque account selection ID previously returned by an account discovery API.</summary>
-    [JsonPropertyName("accountId")]
-    public string AccountId { get; set; } = string.Empty;
+    /// <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>Typed result of initiating or continuing a Connector connection.</summary>
-/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
+/// <summary>Identifies the target session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-[JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "kind",
-    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(ConnectorConnectResultConnected), "connected")]
-[JsonDerivedType(typeof(ConnectorConnectResultConsentRequired), "consent_required")]
-[JsonDerivedType(typeof(ConnectorConnectResultPending), "pending")]
-public partial class ConnectorConnectResult
+internal sealed class SessionPlanDeleteRequest
 {
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("kind")]
-    public virtual string Kind { get; set; } = string.Empty;
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-
-/// <summary>The service is connected and the session MCP graph was reconciled.</summary>
-/// <remarks>The <c>connected</c> variant of <see cref="ConnectorConnectResult"/>.</remarks>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class ConnectorConnectResultConnected : ConnectorConnectResult
+public sealed class PlanSqlTodosRow
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "connected";
+    /// <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>Fresh authoritative Connector state after MCP reconciliation.</summary>
-    [JsonPropertyName("status")]
-    public required ConnectorStatus Status { get; set; }
-}
+    /// <summary>Todo description.</summary>
+    [JsonPropertyName("description")]
+    public string? Description { get; set; }
 
-/// <summary>Host-owned consent is required before bounded continuation can complete.</summary>
-/// <remarks>The <c>consent_required</c> variant of <see cref="ConnectorConnectResult"/>.</remarks>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class ConnectorConnectResultConsentRequired : ConnectorConnectResult
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "consent_required";
+    /// <summary>Todo identifier.</summary>
+    [JsonPropertyName("id")]
+    public string? Id { get; set; }
 
-    /// <summary>Validated HTTPS consent URL. The runtime does not open it.</summary>
-    [JsonPropertyName("consentUrl")]
-    public required string ConsentUrl { get; set; }
+    /// <summary>Todo status.</summary>
+    [JsonPropertyName("status")]
+    public string? Status { get; set; }
 
-    /// <summary>Opaque ID accepted by continueConnection.</summary>
-    [JsonPropertyName("continuationId")]
-    public required string ContinuationId { get; set; }
+    /// <summary>Todo title.</summary>
+    [JsonPropertyName("title")]
+    public string? Title { get; set; }
 }
 
-/// <summary>The service is still completing the connection without a consent URL.</summary>
-/// <remarks>The <c>pending</c> variant of <see cref="ConnectorConnectResult"/>.</remarks>
+/// <summary>Todo rows read from the session SQL database. Empty when no session database is available.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class ConnectorConnectResultPending : ConnectorConnectResult
+public sealed class PlanReadSqlTodosResult
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "pending";
-
-    /// <summary>Opaque ID accepted by continueConnection.</summary>
-    [JsonPropertyName("continuationId")]
-    public required string ContinuationId { get; set; }
+    /// <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>Selects one Connector and the pinned host-owned account used for its service and MCP authorization.</summary>
+/// <summary>Identifies the target session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class ConnectorConnectRequest
+internal sealed class SessionPlanReadSqlTodosRequest
 {
-    /// <summary>Opaque account selection ID. It must match the account already pinned to the session, if any.</summary>
-    [JsonPropertyName("accountId")]
-    public string AccountId { get; set; } = string.Empty;
-
-    /// <summary>Canonical Connector name from the current catalog.</summary>
-    [JsonPropertyName("connectorName")]
-    public string ConnectorName { get; set; } = string.Empty;
-
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Explicitly bounded continuation of a pending Connector connection.</summary>
+/// <summary>A single dependency edge read from the session SQL `todo_deps` table, indicating that one todo must complete before another.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class ConnectorContinueRequest
+public sealed class PlanSqlTodoDependency
 {
-    /// <summary>Opaque continuation ID returned by connect, reconnect, or an earlier continuation.</summary>
-    [JsonPropertyName("continuationId")]
-    public string ContinuationId { get; set; } = string.Empty;
-
-    /// <summary>Maximum wall-clock duration in milliseconds for this call. Must be between one and the capability limit.</summary>
-    [JsonPropertyName("deadlineMs")]
-    public int DeadlineMs { get; set; }
+    /// <summary>ID of the todo it depends on.</summary>
+    [JsonPropertyName("dependsOn")]
+    public string DependsOn { get; set; } = string.Empty;
 
-    /// <summary>Maximum catalog requests made by this call. Must be between one and the capability limit.</summary>
-    [JsonPropertyName("maxAttempts")]
-    public int MaxAttempts { get; set; }
-
-    /// <summary>Delay in milliseconds between attempts. Must not exceed the capability limit.</summary>
-    [JsonPropertyName("pollIntervalMs")]
-    public int PollIntervalMs { get; set; }
-
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
-
-/// <summary>Authoritative result after disconnect and MCP reconciliation.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ConnectorDisconnectResult
-{
-    /// <summary>Whether the service accepted the idempotent disconnect.</summary>
-    [JsonPropertyName("disconnected")]
-    public bool Disconnected { get; set; }
-
-    /// <summary>Fresh authoritative session state after removing Connector-owned MCP servers.</summary>
-    [JsonPropertyName("status")]
-    public ConnectorStatus Status { get => field ??= new(); set; }
-}
-
-/// <summary>Requests authoritative Connector-to-MCP reconciliation for the pinned account.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ConnectorReconcileRequest
-{
-    /// <summary>Opaque account selection ID. It must match the account already pinned to the session, if any.</summary>
-    [JsonPropertyName("accountId")]
-    public required string AccountId { get; set; }
-
-    /// <summary>Optional Connector name to reinitialize. Requires the targetedReconcile capability.</summary>
-    [JsonPropertyName("forceConnectorName")]
-    public string? ForceConnectorName { get; set; }
-
-    /// <summary>When true, refresh the catalog before reconciling. A disabled Connector API performs no service request.</summary>
-    [JsonPropertyName("refreshCatalog")]
-    public bool? RefreshCatalog { get; set; }
+    /// <summary>ID of the todo that has the dependency.</summary>
+    [JsonPropertyName("todoId")]
+    public string TodoId { get; set; } = string.Empty;
 }
 
-/// <summary>Requests authoritative Connector-to-MCP reconciliation for the pinned account.</summary>
+/// <summary>Todo rows + dependency edges read from the session SQL database.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class ConnectorReconcileRequestWithSession
+public sealed class PlanReadSqlTodosWithDependenciesResult
 {
-    /// <summary>Opaque account selection ID. It must match the account already pinned to the session, if any.</summary>
-    [JsonPropertyName("accountId")]
-    public string AccountId { get; set; } = string.Empty;
-
-    /// <summary>Optional Connector name to reinitialize. Requires the targetedReconcile capability.</summary>
-    [JsonPropertyName("forceConnectorName")]
-    public string? ForceConnectorName { get; set; }
-
-    /// <summary>When true, refresh the catalog before reconciling. A disabled Connector API performs no service request.</summary>
-    [JsonPropertyName("refreshCatalog")]
-    public bool? RefreshCatalog { get; set; }
+    /// <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>Identifies the target session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionConnectorsWithdrawProjectionRequest
+internal sealed class SessionPlanReadSqlTodosWithDependenciesRequest
 {
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionManagedSettingsGetRequest
+/// <summary>RPC data type for WorkspacesGetWorkspaceResultWorkspace operations.</summary>
+public sealed class WorkspacesGetWorkspaceResultWorkspace
 {
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Current Git branch.</summary>
+    [JsonPropertyName("branch")]
+    public string? Branch { get; set; }
 
-/// <summary>Session plugin metadata, with name, marketplace, optional version, and enabled state.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class Plugin
-{
-    /// <summary>Opaque stable identity for a direct plugin source.</summary>
-    [JsonPropertyName("directSourceId")]
-    public string? DirectSourceId { 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>Whether the plugin is currently enabled.</summary>
-    [JsonPropertyName("enabled")]
-    public bool Enabled { get; set; }
+    /// <summary>Name of the client that created the workspace.</summary>
+    [JsonPropertyName("client_name")]
+    public string? ClientName { get; set; }
 
-    /// <summary>Whether this managed desired plugin has an installed or live record.</summary>
-    [JsonPropertyName("installed")]
-    public bool? Installed { get; set; }
+    /// <summary>Timestamp when the workspace was created.</summary>
+    [JsonPropertyName("created_at")]
+    public DateTimeOffset? CreatedAt { get; set; }
 
-    /// <summary>Absolute marketplace directory for a live plugin.</summary>
-    [JsonPropertyName("installedFrom")]
-    public string? InstalledFrom { get; set; }
+    /// <summary>Current working directory associated with the workspace.</summary>
+    [JsonPropertyName("cwd")]
+    public string? Cwd { get; set; }
 
-    /// <summary>Whether enterprise managed settings control this plugin.</summary>
-    [JsonPropertyName("managed")]
-    public bool? Managed { get; set; }
+    /// <summary>Git repository root associated with the workspace.</summary>
+    [JsonPropertyName("git_root")]
+    public string? GitRoot { get; set; }
 
-    /// <summary>Enabled state required by enterprise managed settings.</summary>
-    [JsonPropertyName("managedDesiredEnabled")]
-    public bool? ManagedDesiredEnabled { get; set; }
+    /// <summary>Allowed values for the `WorkspacesWorkspaceDetailsHostType` enumeration.</summary>
+    [JsonPropertyName("host_type")]
+    public WorkspacesWorkspaceDetailsHostType? HostType { get; set; }
 
-    /// <summary>Marketplace the plugin came from.</summary>
-    [JsonPropertyName("marketplace")]
-    public string Marketplace { get; set; } = string.Empty;
+    /// <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>Plugin name.</summary>
+    /// <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; } = string.Empty;
+    public string? Name { get; set; }
 
-    /// <summary>Runtime plugin provenance, such as "builtin".</summary>
-    [JsonPropertyName("source")]
-    public string? Source { get; set; }
+    /// <summary>Whether the workspace session can be steered remotely.</summary>
+    [JsonPropertyName("remote_steerable")]
+    public bool? RemoteSteerable { get; set; }
 
-    /// <summary>Installed version.</summary>
-    [JsonPropertyName("version")]
-    public string? Version { 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>Plugins installed for the session, with their enabled state and version metadata.</summary>
+/// <summary>Current workspace metadata for the session, including its absolute filesystem path when available.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class PluginList
+public sealed class WorkspacesGetWorkspaceResult
 {
-    /// <summary>Installed plugins.</summary>
-    [JsonPropertyName("plugins")]
-    public IList<Plugin> Plugins { get => field ??= []; set; }
+    /// <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>Current workspace metadata, or null if not available.</summary>
+    [JsonPropertyName("workspace")]
+    public WorkspacesGetWorkspaceResultWorkspace? Workspace { get; set; }
 }
 
 /// <summary>Identifies the target session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionPluginsListRequest
+internal sealed class SessionWorkspacesGetWorkspaceRequest
 {
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Plugin source resolved relative to the session's authoritative working directory.</summary>
+/// <summary>Workspace metadata fields to update.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionPluginsInstallRequest
+internal sealed class WorkspacesUpdateMetadataRequest
 {
+    /// <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>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
-
-    /// <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>Name (or spec) of the plugin to uninstall.</summary>
+/// <summary>Optional session context used when creating a local workspace.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class PluginsUninstallRequestWithSession
+internal sealed class WorkspacesEnsureRequest
 {
-    /// <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>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>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>Name (or spec) of the plugin to update.</summary>
+/// <summary>Relative paths of files stored in the session workspace files directory.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class PluginsUpdateRequestWithSession
+public sealed class WorkspacesListFilesResult
 {
-    /// <summary>Plugin name or "plugin@marketplace" spec to update.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Slash-separated relative file paths in the workspace files directory.</summary>
+    [JsonPropertyName("files")]
+    public IList<string> Files { get => field ??= []; set; }
+}
 
+/// <summary>Identifies the target session.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class SessionWorkspacesListFilesRequest
+{
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Plugin names (or specs) to enable in the session's authoritative working directory.</summary>
+/// <summary>Contents of the requested workspace file as a UTF-8 string.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionPluginsEnableRequest
+public sealed class WorkspacesReadFileResult
 {
-    /// <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>File content as a UTF-8 string.</summary>
+    [JsonPropertyName("content")]
+    public string Content { get; set; } = string.Empty;
+}
+
+/// <summary>Relative path of the workspace file to read.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class WorkspacesReadFileRequest
+{
+    /// <summary>Slash-separated 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>Plugin names (or specs) to disable in the session's authoritative working directory.</summary>
+/// <summary>Relative path and UTF-8 content for the workspace file to create or overwrite.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionPluginsDisableRequest
+internal sealed class WorkspacesCreateFileRequest
 {
-    /// <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>File content to write as a UTF-8 string.</summary>
+    [JsonPropertyName("content")]
+    public string Content { get; set; } = string.Empty;
+
+    /// <summary>Slash-separated 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>RPC data type for SessionPluginsReload operations.</summary>
+/// <summary>Filesystem metadata for a path in the session workspace files directory.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionPluginsReloadRequest
+public sealed class WorkspacesStatFileResult
 {
-    /// <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>Creation time in Unix epoch milliseconds.</summary>
+    [JsonPropertyName("birthtimeMs")]
+    public double BirthtimeMs { get; set; }
 
-    /// <summary>Re-run custom-agent discovery after refreshing plugins. Defaults to true.</summary>
-    [JsonPropertyName("reloadCustomAgents")]
-    public bool? ReloadCustomAgents { get; set; }
+    /// <summary>Whether the path identifies a directory.</summary>
+    [JsonPropertyName("isDirectory")]
+    public bool IsDirectory { 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>Whether the path identifies a regular file.</summary>
+    [JsonPropertyName("isFile")]
+    public bool IsFile { 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>Last modification time in Unix epoch milliseconds.</summary>
+    [JsonPropertyName("mtimeMs")]
+    public double MtimeMs { get; set; }
 
-    /// <summary>Reload MCP server connections after refreshing plugins. Defaults to true.</summary>
-    [JsonPropertyName("reloadMcp")]
-    public bool? ReloadMcp { get; set; }
+    /// <summary>Size in bytes.</summary>
+    [JsonPropertyName("size")]
+    public double Size { get; set; }
 }
 
-/// <summary>RPC data type for SessionPluginsReloadRequestWithSession operations.</summary>
+/// <summary>Relative path of the workspace file or directory to inspect.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionPluginsReloadRequestWithSession
+internal sealed class WorkspacesStatFileRequest
 {
-    /// <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>Slash-separated relative path within the workspace files directory.</summary>
+    [JsonPropertyName("path")]
+    public string Path { 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>Directory to create within the session workspace files directory.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class WorkspacesCreateDirectoryRequest
+{
+    /// <summary>Slash-separated relative path within the workspace files directory.</summary>
+    [JsonPropertyName("path")]
+    public string Path { get; set; } = string.Empty;
 
-    /// <summary>Reload MCP server connections after refreshing plugins. Defaults to true.</summary>
-    [JsonPropertyName("reloadMcp")]
-    public bool? ReloadMcp { get; set; }
+    /// <summary>Whether to create missing parent directories. Defaults to false.</summary>
+    [JsonPropertyName("recursive")]
+    public bool? Recursive { get; set; }
 
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Identifies the target session.</summary>
+/// <summary>File or directory to remove from the session workspace files directory.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionPluginsMarketplacesListRequest
+internal sealed class WorkspacesRemovePathRequest
 {
+    /// <summary>Whether a missing path should be treated as success. Defaults to false.</summary>
+    [JsonPropertyName("force")]
+    public bool? Force { get; set; }
+
+    /// <summary>Slash-separated relative path within the workspace files directory.</summary>
+    [JsonPropertyName("path")]
+    public string Path { get; set; } = string.Empty;
+
+    /// <summary>Whether to remove directory contents recursively. Defaults to false.</summary>
+    [JsonPropertyName("recursive")]
+    public bool? Recursive { get; set; }
+
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Marketplace source and optional working directory for relative-path resolution.</summary>
+/// <summary>Source and destination paths for a rename within the session workspace files directory.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class PluginsMarketplacesAddRequestWithSession
+internal sealed class WorkspacesRenamePathRequest
 {
+    /// <summary>Slash-separated destination path relative to the workspace files directory.</summary>
+    [JsonPropertyName("destination")]
+    public string Destination { get; set; } = string.Empty;
+
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 
-    /// <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>
+    /// <summary>Slash-separated source path relative to the workspace files directory.</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; }
 }
 
-/// <summary>Name of the marketplace to remove and an optional force flag.</summary>
+/// <summary>Workspace checkpoint metadata with assigned number, human-readable title, and checkpoint filename.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class PluginsMarketplacesRemoveRequestWithSession
+public sealed class WorkspacesCheckpoints
 {
-    /// <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>Filename of the checkpoint within the workspace checkpoints directory.</summary>
+    [JsonPropertyName("filename")]
+    public string Filename { get; set; } = string.Empty;
 
-    /// <summary>Marketplace name to remove.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Checkpoint number assigned by the workspace manager.</summary>
+    [JsonPropertyName("number")]
+    public long Number { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Human-readable checkpoint title.</summary>
+    [JsonPropertyName("title")]
+    public string Title { get; set; } = string.Empty;
 }
 
-/// <summary>Name of the marketplace whose plugin catalog to fetch.</summary>
+/// <summary>Workspace checkpoints in chronological order; empty when the workspace is not enabled.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class PluginsMarketplacesBrowseRequestWithSession
+public sealed class WorkspacesListCheckpointsResult
 {
-    /// <summary>Marketplace name to browse.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Workspace checkpoints in chronological order. Empty when workspace is not enabled.</summary>
+    [JsonPropertyName("checkpoints")]
+    public IList<WorkspacesCheckpoints> Checkpoints { get => field ??= []; set; }
+}
 
+/// <summary>Identifies the target session.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class SessionWorkspacesListCheckpointsRequest
+{
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>RPC data type for SessionPluginsMarketplacesRefresh operations.</summary>
+/// <summary>Checkpoint content as a UTF-8 string, or null when the checkpoint or workspace is missing.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionPluginsMarketplacesRefreshRequest
+public sealed class WorkspacesReadCheckpointResult
 {
-    /// <summary>Marketplace name to refresh. When omitted, every registered marketplace is refreshed.</summary>
-    [JsonPropertyName("name")]
-    public string? Name { get; set; }
+    /// <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>RPC data type for SessionPluginsMarketplacesRefreshRequestWithSession operations.</summary>
+/// <summary>Checkpoint number to read.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionPluginsMarketplacesRefreshRequestWithSession
+internal sealed class WorkspacesReadCheckpointRequest
 {
-    /// <summary>Marketplace name to refresh. When omitted, every registered marketplace is refreshed.</summary>
-    [JsonPropertyName("name")]
-    public string? Name { get; 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>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>Persisted summary metadata and refreshed workspace metadata.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ProviderSessionToken
+public sealed class WorkspacesAddSummaryResult
 {
-    /// <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>Metadata for the persisted summary.</summary>
+    [JsonPropertyName("summary")]
+    public IDictionary<string, JsonElement>? Summary { get; set; }
 
-    /// <summary>The short-lived token value.</summary>
-    [JsonPropertyName("token")]
-    public string Token { get; set; } = string.Empty;
+    /// <summary>Refreshed metadata for the containing workspace.</summary>
+    [JsonPropertyName("workspace")]
+    public IDictionary<string, JsonElement>? Workspace { get; set; }
 }
 
-/// <summary>A snapshot of the provider endpoint the session is currently configured to talk to.</summary>
+/// <summary>Compaction summary checkpoint to persist.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ProviderEndpoint
+internal sealed class WorkspacesAddSummaryRequest
 {
-    /// <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>Markdown summary content to persist.</summary>
+    [JsonPropertyName("content")]
+    public string Content { 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>
-    [JsonPropertyName("sessionToken")]
-    public ProviderSessionToken? SessionToken { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 
-    /// <summary>Transport to be used for provider requests.</summary>
-    [JsonPropertyName("transport")]
-    public ProviderEndpointTransport? Transport { get; set; }
+    /// <summary>Summary title shown in checkpoint listings.</summary>
+    [JsonPropertyName("title")]
+    public string Title { get; set; } = string.Empty;
+}
 
-    /// <summary>Provider family. Matches the `type` field of a BYOK provider config.</summary>
-    [JsonPropertyName("type")]
-    public ProviderEndpointType Type { get; set; }
+/// <summary>Rollback point for local workspace summaries.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class WorkspacesTruncateSummariesRequest
+{
+    /// <summary>Number of newest summaries to keep.</summary>
+    [JsonPropertyName("keepCount")]
+    public long KeepCount { 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>Autopilot objective file content, or null when missing.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionProviderGetEndpointRequest
+public sealed class WorkspacesReadAutopilotObjectiveResult
 {
-    /// <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>Autopilot objective file content, or null when missing.</summary>
+    [JsonPropertyName("content")]
+    public string? Content { get; set; }
 }
 
-/// <summary>RPC data type for SessionProviderGetEndpointRequestWithSession operations.</summary>
+/// <summary>Identifies the target session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionProviderGetEndpointRequestWithSession
+internal sealed class SessionWorkspacesReadAutopilotObjectiveRequest
 {
-    /// <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>
+/// <summary>Result of writing the autopilot objective file.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ProviderAddResult
+public sealed class WorkspacesWriteAutopilotObjectiveResult
 {
-    /// <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>Filesystem operation performed.</summary>
+    [JsonPropertyName("operation")]
+    public string Operation { get; set; } = string.Empty;
 }
 
-/// <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>Autopilot objective file content to persist.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class ProviderAddRequest
+internal sealed class WorkspacesWriteAutopilotObjectiveRequest
 {
-    /// <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>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>The selectable model entries and selection ids synthesized for the synchronized BYOK models.</summary>
+/// <summary>Result of deleting the autopilot objective file.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ProviderSyncResult
+public sealed class WorkspacesDeleteAutopilotObjectiveResult
 {
-    /// <summary>True when synchronization withdrew the selected host-managed model, leaving the session with no explicit selection, so ordinary model resolution picks the session default. Synchronization never promotes a surviving host model in its place: publishing a model offers it, and the choice of which model to use stays with the user.</summary>
-    [JsonPropertyName("modelDeselected")]
-    public bool? ModelDeselected { get; set; }
-
-    /// <summary>Synthesized selectable model entries for the synchronized BYOK models.</summary>
-    [JsonPropertyName("models")]
-    public IList<JsonElement> Models { get => field ??= []; set; }
-
-    /// <summary>Provider-qualified model selection ids present after synchronization.</summary>
-    [JsonPropertyName("selectionIds")]
-    public IList<string> SelectionIds { get => field ??= []; set; }
+    /// <summary>True when a file was deleted.</summary>
+    [JsonPropertyName("deleted")]
+    public bool Deleted { get; set; }
 }
 
-/// <summary>Authoritative BYOK provider and model registry snapshot to apply atomically to the session.</summary>
+/// <summary>Identifies the target session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class ProviderSyncRequest
+internal sealed class SessionWorkspacesDeleteAutopilotObjectiveRequest
 {
-    /// <summary>BYOK model definition snapshot. Models absent from this list are removed.</summary>
-    [JsonPropertyName("models")]
-    public IList<ProviderModelConfig>? Models { get; set; }
-
-    /// <summary>Named BYOK provider connection snapshot. Providers absent from this list are removed.</summary>
-    [JsonPropertyName("providers")]
-    public IList<NamedProviderConfig>? Providers { get; set; }
-
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>What the withdrawal actually removed from the registry.</summary>
+/// <summary>Whether the autopilot objective file exists.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ProviderWithdrawResult
+public sealed class WorkspacesAutopilotObjectiveExistsResult
 {
-    /// <summary>True when withdrawal removed the selected host-managed model, leaving the session with no explicit selection, so ordinary model resolution picks the session default. Withdrawal never promotes a surviving model in its place: the choice of which model to use stays with the user.</summary>
-    [JsonPropertyName("modelDeselected")]
-    public bool? ModelDeselected { get; set; }
-
-    /// <summary>Providers removed because one of the withdrawn models was the last entry referencing them. A provider that merely has no models is not removed.</summary>
-    [JsonPropertyName("providersRemoved")]
-    public IList<string> ProvidersRemoved { get => field ??= []; set; }
-
-    /// <summary>Selection ids that were registered and are now withdrawn. Excludes requested ids that were not present.</summary>
-    [JsonPropertyName("withdrawn")]
-    public IList<string> Withdrawn { get => field ??= []; set; }
+    /// <summary>True when the objective file exists.</summary>
+    [JsonPropertyName("exists")]
+    public bool Exists { get; set; }
 }
 
-/// <summary>Host-managed model selection ids to withdraw from the session's BYOK registry.</summary>
+/// <summary>Identifies the target session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class ProviderWithdrawRequest
+internal sealed class SessionWorkspacesAutopilotObjectiveExistsRequest
 {
-    /// <summary>Provider-qualified selection ids to withdraw. Ids that are not registered are ignored, so withdrawal is idempotent. A provider left with no models referencing it is removed too.</summary>
-    [JsonPropertyName("models")]
-    public IList<string> Models { get => field ??= []; 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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionUpdateOptionsResult
+/// <summary>RPC data type for WorkspacesSaveLargePasteResultSaved operations.</summary>
+public sealed class WorkspacesSaveLargePasteResultSaved
 {
-    /// <summary>Number of hooks loaded from installed plugins, returned when installedPlugins is updated.</summary>
-    [JsonPropertyName("pluginHookCount")]
-    public long? PluginHookCount { get; set; }
+    /// <summary>Filename within the workspace files directory.</summary>
+    [JsonPropertyName("filename")]
+    public string Filename { get; set; } = string.Empty;
 
-    /// <summary>Whether the operation succeeded.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { get; set; }
+    /// <summary>Absolute filesystem path to the saved paste file.</summary>
+    [JsonPropertyName("filePath")]
+    public string FilePath { get; set; } = string.Empty;
+
+    /// <summary>Size of the saved file in bytes.</summary>
+    [JsonPropertyName("sizeBytes")]
+    public long SizeBytes { get; set; }
 }
 
-/// <summary>Source descriptor for a `session.options.update` content-exclusion rule, with source name and type.</summary>
+/// <summary>Descriptor for the saved paste file, or null when the workspace is unavailable.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class OptionsUpdateAdditionalContentExclusionPolicyRuleSource
+public sealed class WorkspacesSaveLargePasteResult
 {
-    /// <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>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>Single content-exclusion rule supplied to `session.options.update`, with paths, match conditions, and source.</summary>
+/// <summary>Pasted content to save as a UTF-8 file in the session workspace.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class OptionsUpdateAdditionalContentExclusionPolicyRule
+internal sealed class WorkspacesSaveLargePasteRequest
 {
-    /// <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>Pasted content to save as a UTF-8 file.</summary>
+    [JsonPropertyName("content")]
+    public string Content { get; set; } = string.Empty;
 
-    /// <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>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Content-exclusion policy supplied to `session.options.update`, with rules, last-updated data, and scope.</summary>
+/// <summary>Complete text used to generate one session diff. These are display contents, with the same text decoding as the patch, not a file-restore contract.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class OptionsUpdateAdditionalContentExclusionPolicy
+public sealed class WorkspaceDiffContents
 {
-    /// <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>Complete current text read when computing the diff. Omitted for a deleted file; an empty string represents an existing empty file.</summary>
+    [JsonPropertyName("after")]
+    public string? After { get; set; }
 
-    /// <summary>Allowed values for the `OptionsUpdateAdditionalContentExclusionPolicyScope` enumeration.</summary>
-    [JsonPropertyName("scope")]
-    public OptionsUpdateAdditionalContentExclusionPolicyScope Scope { get; set; }
+    /// <summary>Complete text before the session first changed the file. Omitted when the file did not exist; an empty string represents an existing empty file.</summary>
+    [JsonPropertyName("before")]
+    public string? Before { get; set; }
 }
 
-/// <summary>Options scoped to the built-in CAPI (Copilot API) provider.</summary>
+/// <summary>A single changed file and its unified diff.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class CapiSessionOptions
+public sealed class WorkspaceDiffFileChange
 {
-    /// <summary>Routing preference for sessions whose model is `auto`. On create or cold resume, this establishes the preference sent as `tier` on CAPI `/auto` requests; when omitted on cold resume, the runtime restores the last committed preference. On resident resume, a different value requests a safe switch after resume succeeds and cannot change an in-flight turn. Successful switches are persisted for later cold resume. When no preference is supplied or restored, CAPI default routing is used. `fast` is an integrator-only latency preset, not a first-party GitHub Copilot product preference.</summary>
-    [JsonPropertyName("autoTier")]
-    public AutoTier? AutoTier { get; set; }
+    /// <summary>Type of change represented by this file diff.</summary>
+    [JsonPropertyName("changeType")]
+    public WorkspaceDiffFileChangeType ChangeType { get; set; }
 
-    /// <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>Full text used for this patch, only when includeContents was requested for session mode. Omitted for binary, oversized or unavailable contents, and for fallback results. Read isFallback and isTruncated before treating an absent value as a missing file.</summary>
+    [JsonPropertyName("contents")]
+    public WorkspaceDiffContents? Contents { 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>Installed plugin record for a session, with marketplace, version, install time, enabled state, cache path, and source.</summary>
+/// <summary>Workspace diff result for the requested mode.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionInstalledPlugin
+public sealed class WorkspaceDiffResult
 {
-    /// <summary>Path where the plugin is cached locally.</summary>
-    [JsonPropertyName("cache_path")]
-    public string? CachePath { get; set; }
+    /// <summary>Default branch used for a branch diff, when branch mode was requested.</summary>
+    [JsonPropertyName("baseBranch")]
+    public string? BaseBranch { get; set; }
 
-    /// <summary>Whether the plugin is currently enabled.</summary>
-    [JsonPropertyName("enabled")]
-    public bool Enabled { get; set; }
+    /// <summary>Changed files and their unified diffs.</summary>
+    [JsonPropertyName("changes")]
+    public IList<WorkspaceDiffFileChange> Changes { get => field ??= []; set; }
 
-    /// <summary>Installation timestamp (ISO-8601).</summary>
-    [JsonPropertyName("installed_at")]
-    public string InstalledAt { get; set; } = string.Empty;
+    /// <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>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>Effective mode used for the returned changes.</summary>
+    [JsonPropertyName("mode")]
+    public WorkspaceDiffMode Mode { 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>Diff mode requested by the client.</summary>
+    [JsonPropertyName("requestedMode")]
+    public WorkspaceDiffMode RequestedMode { get; set; }
 
-    /// <summary>Plugin name.</summary>
-    [JsonPropertyName("name")]
-    public string Name { 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>Source descriptor for direct repo installs (when marketplace is empty).</summary>
-    [JsonPropertyName("source")]
-    public JsonElement? Source { get; set; }
+/// <summary>Parameters for computing a workspace diff.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class WorkspacesDiffRequest
+{
+    /// <summary>When true, ignore whitespace-only changes (git `--ignore-all-space`). Defaults to false.</summary>
+    [JsonPropertyName("ignoreWhitespace")]
+    public bool? IgnoreWhitespace { 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>Include the full before/after text used to compute each session diff. Defaults to false; true is accepted only for session mode. Existing capture/read limits still apply, and binary or unavailable contents are not returned. This can substantially increase response size.</summary>
+    [JsonPropertyName("includeContents")]
+    public bool? IncludeContents { get; set; }
 
-    /// <summary>Installed version, if known.</summary>
-    [JsonPropertyName("version")]
-    public string? Version { get; set; }
+    /// <summary>Diff mode requested by the client.</summary>
+    [JsonPropertyName("mode")]
+    public required WorkspaceDiffMode Mode { get; set; }
 }
 
-/// <summary>Custom model-provider configuration (BYOK).</summary>
+/// <summary>Parameters for computing a workspace diff.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ProviderConfig
+internal sealed class WorkspacesDiffRequestWithSession
 {
-    /// <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>When true, ignore whitespace-only changes (git `--ignore-all-space`). Defaults to false.</summary>
+    [JsonPropertyName("ignoreWhitespace")]
+    public bool? IgnoreWhitespace { get; set; }
 
-    /// <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>Include the full before/after text used to compute each session diff. Defaults to false; true is accepted only for session mode. Existing capture/read limits still apply, and binary or unavailable contents are not returned. This can substantially increase response size.</summary>
+    [JsonPropertyName("includeContents")]
+    public bool? IncludeContents { 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>Diff mode requested by the client.</summary>
+    [JsonPropertyName("mode")]
+    public WorkspaceDiffMode Mode { 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>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <summary>Maximum context window tokens for the model.</summary>
-    [JsonPropertyName("maxContextWindowTokens")]
-    public double? MaxContextWindowTokens { get; set; }
+/// <summary>Current per-window credit limit and consumption for an autopilot objective.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class AutopilotObjectiveCreditLimit
+{
+    /// <summary>Configured AI-credit cap, when one is set.</summary>
+    [JsonPropertyName("credits")]
+    public double? Credits { get; set; }
 
-    /// <summary>Maximum output tokens for the model.</summary>
-    [JsonPropertyName("maxOutputTokens")]
-    public double? MaxOutputTokens { get; set; }
+    /// <summary>Window consumption in fractional AI credits, for display.</summary>
+    [JsonPropertyName("creditsUsed")]
+    public double CreditsUsed { get; set; }
 
-    /// <summary>Maximum prompt/input tokens for the model.</summary>
-    [JsonPropertyName("maxPromptTokens")]
-    public double? MaxPromptTokens { get; set; }
+    /// <summary>Exact window consumption in non-negative integer nano-AIU, encoded as a decimal string.</summary>
+    [RegularExpression("^[0-9]+$")]
+    [JsonPropertyName("creditsUsedNanoAiu")]
+    public string CreditsUsedNanoAiu { get; set; } = string.Empty;
+}
 
-    /// <summary>Overrides for model capabilities when they cannot be inferred from modelId.</summary>
-    [JsonPropertyName("modelCapabilities")]
-    public ModelCapabilitiesOverride? ModelCapabilities { get; set; }
+/// <summary>Public, persistence-independent projection of an autopilot objective.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class AutopilotObjectiveState
+{
+    /// <summary>Optional summary recorded when the objective completed.</summary>
+    [JsonPropertyName("completionSummary")]
+    public string? CompletionSummary { 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>Exact lifetime AI-credit consumption in non-negative integer nano-AIU, encoded as a decimal string.</summary>
+    [RegularExpression("^[0-9]+$")]
+    [JsonPropertyName("creditCountNanoAiu")]
+    public string CreditCountNanoAiu { get; set; } = string.Empty;
 
-    /// <summary>The product serving the model, reported in telemetry as `model_provider`. Set it when `type` alone cannot identify the product, such as Ollama or LM Studio behind an OpenAI-compatible endpoint. Only affects telemetry.</summary>
-    [JsonPropertyName("modelProvider")]
-    public ProviderConfigModelProvider? ModelProvider { get; set; }
+    /// <summary>Current per-window consumption and optional cap, when a credit-tracking window is present.</summary>
+    [JsonPropertyName("creditLimit")]
+    public AutopilotObjectiveCreditLimit? CreditLimit { get; set; }
 
-    /// <summary>Provider name used for model and telemetry attribution.</summary>
-    [JsonPropertyName("providerName")]
-    public string? ProviderName { get; set; }
+    /// <summary>Session-local objective identifier.</summary>
+    [JsonPropertyName("id")]
+    public long Id { get; set; }
 
-    /// <summary>Provider transport. Defaults to "http".</summary>
-    [JsonPropertyName("transport")]
-    public ProviderConfigTransport? Transport { get; set; }
+    /// <summary>User-provided objective text.</summary>
+    [JsonPropertyName("objective")]
+    public string Objective { get; set; } = string.Empty;
 
-    /// <summary>Provider type. Defaults to "openai" for generic OpenAI-compatible APIs.</summary>
-    [JsonPropertyName("type")]
-    public ProviderConfigType? Type { get; set; }
+    /// <summary>Optional reason the objective is paused.</summary>
+    [JsonPropertyName("pauseReason")]
+    public string? PauseReason { get; set; }
 
-    /// <summary>Wire API format (openai/azure only). Defaults to "completions".</summary>
-    [JsonPropertyName("wireApi")]
-    public ProviderConfigWireApi? WireApi { get; set; }
+    /// <summary>Current normalized lifecycle status.</summary>
+    [JsonPropertyName("status")]
+    public AutopilotObjectiveStatus Status { 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>Number of objective turns started.</summary>
+    [JsonPropertyName("turnCount")]
+    public long TurnCount { 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>
+/// <summary>Canonical runtime state for the session's current autopilot objective.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ShellCredentials
+public sealed class AutopilotObjectiveGetStateResult
 {
-    /// <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>Current objective state, or `null` when the session has no objective.</summary>
+    [JsonPropertyName("state")]
+    public AutopilotObjectiveState? State { 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>Identifies the target session.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class SessionAutopilotObjectiveGetStateRequest
+{
+    /// <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>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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ShellInitScript
+public sealed class CompletionsGetTriggerCharactersResult
 {
-    /// <summary>Path to the script to source.</summary>
-    [JsonPropertyName("path")]
-    public string Path { get; set; } = string.Empty;
+    /// <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>Built-in shell that may source this script.</summary>
-    [JsonPropertyName("shell")]
-    public ShellInitScriptShell Shell { get; set; }
+/// <summary>Identifies the target session.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class SessionCompletionsGetTriggerCharactersRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Per-session settings for built-in shell tools.</summary>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ShellOptions
+public sealed class SessionCompletionItem
 {
-    /// <summary>Command-scoped GitHub credential injection for shell commands.</summary>
-    [JsonPropertyName("credentials")]
-    public ShellCredentials? Credentials { get; set; }
+    /// <summary>Text spliced into the composer when the item is accepted.</summary>
+    [JsonPropertyName("insertText")]
+    public string InsertText { get; set; } = string.Empty;
 
-    /// <summary>Controls automatic non-interactive profile loading where supported. Explicit initScripts are unaffected.</summary>
-    [JsonPropertyName("initProfile")]
-    public ShellInitProfile? InitProfile { get; set; }
+    /// <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>
-    /// 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>Primary display label for the picker row. Falls back to `insertText` when absent.</summary>
+    [JsonPropertyName("label")]
+    public string? Label { 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>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>Patch of mutable session options to apply to the running session.</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(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionUpdateOptionsParams
+public sealed class CompletionsRequestResult
 {
-    /// <summary>Additional content-exclusion policies to merge into the session's policy set.</summary>
-    [Experimental(global::GitHub.Copilot.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>Completion items in host-ranked order.</summary>
+    [JsonPropertyName("items")]
+    public IList<SessionCompletionItem> Items { get => field ??= []; set; }
+}
 
-    /// <summary>Whether to disable the `ask_user` tool (encourages autonomous behavior).</summary>
-    [JsonPropertyName("askUserDisabled")]
-    public bool? AskUserDisabled { get; set; }
+/// <summary>Request host-driven completions for the current composer input.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class CompletionsRequestRequest
+{
+    /// <summary>Cursor offset within `text`, in UTF-16 code units.</summary>
+    [JsonPropertyName("offset")]
+    public long Offset { get; set; }
 
-    /// <summary>Allowlist of tool names available to this session.</summary>
-    [JsonPropertyName("availableTools")]
-    public IList<string>? AvailableTools { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 
-    /// <summary>Options scoped to the built-in CAPI (Copilot API) provider.</summary>
-    [JsonPropertyName("capi")]
-    public CapiSessionOptions? Capi { get; set; }
+    /// <summary>The full composed composer input.</summary>
+    [JsonPropertyName("text")]
+    public string Text { get; set; } = string.Empty;
+}
 
-    /// <summary>Identifier of the client driving the session.</summary>
-    [JsonPropertyName("clientName")]
-    public string? ClientName { get; set; }
+/// <summary>Instruction sources loaded for the session, in merge order.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class InstructionsGetSourcesResult
+{
+    /// <summary>Instruction sources for the session.</summary>
+    [JsonPropertyName("sources")]
+    public IList<InstructionSource> Sources { get => field ??= []; set; }
+}
 
-    /// <summary>Whether to include the `Co-authored-by` trailer in commit messages.</summary>
-    [JsonPropertyName("coauthorEnabled")]
-    public bool? CoauthorEnabled { get; set; }
+/// <summary>Identifies the target session.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class SessionInstructionsGetSourcesRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <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>Identifies the target session.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class SessionInstructionsReloadRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <summary>Whether to allow auto-mode continuation across turns.</summary>
-    [JsonPropertyName("continueOnAutoMode")]
-    public bool? ContinueOnAutoMode { get; set; }
+/// <summary>Result of one customization reload component.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class CustomizationReloadOutcome
+{
+    /// <summary>Reason for a skipped component or description of a failure, when available.</summary>
+    [JsonPropertyName("detail")]
+    public string? Detail { get; set; }
 
-    /// <summary>Override URL for the Copilot API endpoint.</summary>
-    [JsonPropertyName("copilotUrl")]
-    public string? CopilotUrl { get; set; }
+    /// <summary>Whether the component reloaded, was skipped, or failed.</summary>
+    [JsonPropertyName("status")]
+    public CustomizationReloadStatus Status { get; set; }
 
-    /// <summary>Whether to default custom agents to local-only execution.</summary>
-    [JsonPropertyName("customAgentsLocalOnly")]
-    public bool? CustomAgentsLocalOnly { get; set; }
+    /// <summary>Component whose reload was attempted or skipped.</summary>
+    [JsonPropertyName("subsystem")]
+    public CustomizationReloadSubsystem Subsystem { get; set; }
+}
 
-    /// <summary>Instruction source IDs to exclude from the system prompt.</summary>
-    [JsonPropertyName("disabledInstructionSources")]
-    public IList<string>? DisabledInstructionSources { get; set; }
+/// <summary>Results of reloading discovered session customizations. Inspect outcomes for reloaded, skipped, or failed subsystems; a rejection may follow partial mutation. Changes to the model-facing prompt and tools apply on the next turn.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class CustomizationsReloadResult
+{
+    /// <summary>Errors from any component that could not be refreshed.</summary>
+    [JsonPropertyName("errors")]
+    public IList<string> Errors { get => field ??= []; set; }
 
-    /// <summary>Skill IDs that should be excluded from this session.</summary>
-    [JsonPropertyName("disabledSkills")]
-    public IList<string>? DisabledSkills { get; set; }
+    /// <summary>Outcome of each component in reload order; a skipped component was not configured or loaded.</summary>
+    [JsonPropertyName("outcomes")]
+    public IList<CustomizationReloadOutcome> Outcomes { get => field ??= []; 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>Warnings from skill discovery.</summary>
+    [JsonPropertyName("warnings")]
+    public IList<string> Warnings { get => field ??= []; 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>Identifies the target session.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class SessionCustomizationsReloadRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <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>Indicates whether fleet mode was successfully activated.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class FleetStartResult
+{
+    /// <summary>Whether fleet mode was successfully activated.</summary>
+    [JsonPropertyName("started")]
+    public bool Started { get; set; }
+}
 
-    /// <summary>Whether to surface reasoning-summary events from the model.</summary>
-    [JsonPropertyName("enableReasoningSummaries")]
-    public bool? EnableReasoningSummaries { get; set; }
+/// <summary>Parameters for starting fleet orchestration: an optional user prompt combined with the fleet instructions, plus the send options forwarded to the resulting turn.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class FleetStartRequest
+{
+    /// <summary>Optional attachments (files, directories, selections, blobs, GitHub references) to include with the fleet request.</summary>
+    [JsonPropertyName("attachments")]
+    public IList<Attachment>? Attachments { get; set; }
 
-    /// <summary>Whether shell-script safety heuristics are enabled.</summary>
-    [JsonPropertyName("enableScriptSafety")]
-    public bool? EnableScriptSafety { get; set; }
+    /// <summary>If false, this request will not trigger a Premium Request Unit charge. User requests default to billable.</summary>
+    [JsonInclude]
+    [JsonPropertyName("billable")]
+    internal bool? Billable { get; set; }
 
-    /// <summary>Whether to enable cross-session store writes and reads.</summary>
-    [JsonPropertyName("enableSessionStore")]
-    public bool? EnableSessionStore { get; set; }
+    /// <summary>Optional user prompt to combine with fleet instructions.</summary>
+    [JsonPropertyName("prompt")]
+    public string? Prompt { get; set; }
 
-    /// <summary>Whether skill loading is enabled. Explicit false disables every source, including a bound SDK provider; changing the value invalidates the loaded skill snapshot. When omitted, creation falls back to enableConfigDiscovery unless an SDK skill provider is registered.</summary>
-    [JsonPropertyName("enableSkills")]
-    public bool? EnableSkills { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 
-    /// <summary>Whether to stream model responses.</summary>
-    [JsonPropertyName("enableStreaming")]
-    public bool? EnableStreaming { get; set; }
+    /// <summary>If true, await completion of the agentic loop for this fleet request before returning. Defaults to false.</summary>
+    [JsonPropertyName("wait")]
+    public bool? Wait { 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>Agents available to the session.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class AgentList
+{
+    /// <summary>Available agents.</summary>
+    [JsonPropertyName("agents")]
+    public IList<AgentInfo> Agents { get => field ??= []; 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>RPC data type for SessionAgentList operations.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class SessionAgentListRequest
+{
+    /// <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>Whether subagent callback events should be forwarded into the session event log sink.</summary>
-    [JsonPropertyName("eventsLogIncludesSubagents")]
-    public bool? EventsLogIncludesSubagents { 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>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>RPC data type for SessionAgentListRequestWithSession operations.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class SessionAgentListRequestWithSession
+{
+    /// <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>Denylist of tool names for this session.</summary>
-    [JsonPropertyName("excludedTools")]
-    public IList<string>? ExcludedTools { 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>Map of feature-flag IDs to their boolean enabled state.</summary>
-    [JsonPropertyName("featureFlags")]
-    public IDictionary<string, bool>? FeatureFlags { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <summary>Skill scan directories and descendants excluded from discovery. Supports `~`-relative paths.</summary>
-    [JsonPropertyName("ignoredSkillsLocations")]
-    public IList<string>? IgnoredSkillsLocations { get; set; }
+/// <summary>An in-memory authored prompt override for an available agent.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class AgentSetPromptRequest
+{
+    /// <summary>Stable effective agent id. Plugin namespace separators are normalized.</summary>
+    [JsonPropertyName("id")]
+    public string Id { get; set; } = string.Empty;
 
-    /// <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>Replacement authored prompt. Empty text is valid.</summary>
+    [JsonPropertyName("prompt")]
+    public string Prompt { get; set; } = string.Empty;
 
-    /// <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>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>The currently selected custom agent, or null when using the default agent.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class AgentGetCurrentResult
+{
+    /// <summary>Currently selected custom agent, or null if using the default agent.</summary>
+    [JsonPropertyName("agent")]
+    public AgentInfo? Agent { get; set; }
+}
 
-    /// <summary>Stable integration identifier used for analytics and rate-limit attribution.</summary>
-    [JsonPropertyName("integrationId")]
-    public string? IntegrationId { get; set; }
+/// <summary>Identifies the target session.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class SessionAgentGetCurrentRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <summary>Whether experimental capabilities are enabled.</summary>
-    [JsonPropertyName("isExperimentalMode")]
-    public bool? IsExperimentalMode { get; set; }
+/// <summary>The newly selected custom agent.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class AgentSelectResult
+{
+    /// <summary>The newly selected custom agent.</summary>
+    [JsonPropertyName("agent")]
+    public AgentInfo Agent { get => field ??= new(); set; }
+}
 
-    /// <summary>Whether interactive shell sessions are logged.</summary>
-    [JsonPropertyName("logInteractiveShells")]
-    public bool? LogInteractiveShells { get; set; }
+/// <summary>Name of the custom agent to select for subsequent turns.</summary>
+[Experimental(global::GitHub.Copilot.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>Identifier sent to LSP-style integrations.</summary>
-    [JsonPropertyName("lspClientName")]
-    public string? LspClientName { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <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>Identifies the target session.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class SessionAgentDeselectRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <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>Custom agents available to the session after reloading definitions from disk.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class AgentReloadResult
+{
+    /// <summary>Reloaded custom agents.</summary>
+    [JsonPropertyName("agents")]
+    public IList<AgentInfo> Agents { get => field ??= []; set; }
+}
 
-    /// <summary>The model ID to use for assistant turns.</summary>
+/// <summary>Identifies the target session.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class SessionAgentReloadRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Identifier assigned to the newly started background agent task.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class TasksStartAgentResult
+{
+    /// <summary>Generated agent ID for the background task.</summary>
+    [JsonPropertyName("agentId")]
+    public string AgentId { get; set; } = string.Empty;
+}
+
+/// <summary>Agent type, prompt, name, and optional description and model override for the new task.</summary>
+[Experimental(global::GitHub.Copilot.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>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>Per-property model capability overrides for the selected model.</summary>
-    [JsonPropertyName("modelCapabilitiesOverrides")]
-    public ModelCapabilitiesOverride? ModelCapabilitiesOverrides { get; set; }
+    /// <summary>Friendly, non-unique name used when displaying the agent.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
 
-    /// <summary>Organization-level custom instructions to inject into the system prompt.</summary>
-    [JsonPropertyName("organizationCustomInstructions")]
-    public string? OrganizationCustomInstructions { get; set; }
+    /// <summary>Task prompt for the agent.</summary>
+    [JsonPropertyName("prompt")]
+    public string Prompt { get; set; } = string.Empty;
 
-    /// <summary>Custom model-provider configuration (BYOK).</summary>
-    [JsonPropertyName("provider")]
-    public ProviderConfig? Provider { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <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>Tracked task union returned by task APIs, containing an agent, client, or shell task.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>type</c>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "type",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(TaskInfoAgent), "agent")]
+[JsonDerivedType(typeof(TaskInfoClient), "client")]
+[JsonDerivedType(typeof(TaskInfoShell), "shell")]
+public partial class TaskInfo
+{
+    /// <summary>The type discriminator.</summary>
+    [JsonPropertyName("type")]
+    public virtual string Type { get; set; } = string.Empty;
+}
 
-    /// <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>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(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class TaskInfoAgent : TaskInfo
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "agent";
 
-    /// <summary>Resolved sandbox configuration.</summary>
-    [JsonPropertyName("sandboxConfig")]
-    public SandboxConfig? SandboxConfig { 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>Origin of the sandbox choice. Settings-derived origins (never_configured, user_enabled, user_disabled, repository_policy) let managed policy floor a host preference; explicit below-floor changes remain policy conflicts unless a session opt-out is authorized. Also used for telemetry provenance.</summary>
-    [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-    [JsonPropertyName("sandboxConfigSource")]
-    public SandboxConfigSource? SandboxConfigSource { 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>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>Type of agent running this task.</summary>
+    [JsonPropertyName("agentType")]
+    public required string AgentType { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <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>Optional session limits. Pass null to clear the session limits.</summary>
-    [JsonPropertyName("sessionLimits")]
-    public SessionLimitsConfig? SessionLimits { get; set; }
+    /// <summary>ISO 8601 timestamp when the task finished.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("completedAt")]
+    public DateTimeOffset? CompletedAt { get; set; }
 
-    /// <summary>Per-session settings for built-in shell tools.</summary>
-    [JsonPropertyName("shell")]
-    public ShellOptions? Shell { get; set; }
+    /// <summary>Short description of the task.</summary>
+    [JsonPropertyName("description")]
+    public required string Description { 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")]
-#else
-    [Obsolete("This member is deprecated and will be removed in a future version.")]
-#endif
-    [JsonPropertyName("shellInitProfile")]
-    public string? ShellInitProfile { 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>Public owner attribution for a client-owned task. Identifiers are opaque and never authorize requests.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class TaskClientOwner
+{
+    /// <summary>ISO 8601 timestamp when the bound join disconnected.</summary>
+    [JsonPropertyName("disconnectedAt")]
+    public DateTimeOffset? DisconnectedAt { get; set; }
+
+    /// <summary>Display-only owner name.</summary>
+    [JsonPropertyName("displayName")]
+    public string? DisplayName { get; set; }
+
+    /// <summary>Opaque identity of the currently or most recently bound session join.</summary>
+    [JsonPropertyName("joinId")]
+    public string JoinId { get; set; } = string.Empty;
+
+    /// <summary>Class of the task owner.</summary>
+    [JsonPropertyName("kind")]
+    public TaskClientOwnerKind Kind { get; set; }
+
+    /// <summary>Opaque session-scoped participant identity.</summary>
+    [JsonPropertyName("participantId")]
+    public string ParticipantId { get; set; } = string.Empty;
+
+    /// <summary>Whether this task's bound join is currently connected.</summary>
+    [JsonPropertyName("presence")]
+    public TaskClientOwnerPresence Presence { get; set; }
+
+    /// <summary>Display-only owner source.</summary>
+    [JsonPropertyName("source")]
+    public string? Source { get; set; }
+}
+
+/// <summary>Tracked client-owned task metadata.</summary>
+/// <remarks>The <c>client</c> variant of <see cref="TaskInfo"/>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class TaskInfoClient : TaskInfo
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "client";
+
+    /// <summary>ISO 8601 timestamp when the current active segment started.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("activeStartedAt")]
+    public DateTimeOffset? ActiveStartedAt { get; set; }
+
+    /// <summary>Accumulated active execution time in milliseconds.</summary>
+    [JsonPropertyName("activeTimeMs")]
+    public required long ActiveTimeMs { get; set; }
+
+    /// <summary>Whether the currently bound owner can receive a cancellation request.</summary>
+    [JsonPropertyName("canCancel")]
+    public required bool CanCancel { get; set; }
+
+    /// <summary>Human-readable reason for terminal cancellation.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("cancellationReason")]
+    public string? CancellationReason { get; set; }
+
+    /// <summary>Owner-scoped registration and reclaim key.</summary>
+    [JsonPropertyName("clientTaskId")]
+    public required string ClientTaskId { get; set; }
+
+    /// <summary>ISO 8601 timestamp when the task reached a terminal status.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("completedAt")]
+    public DateTimeOffset? CompletedAt { get; set; }
+
+    /// <summary>Task description.</summary>
+    [JsonPropertyName("description")]
+    public required string Description { get; set; }
+
+    /// <summary>Optional task display name.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("displayName")]
+    public string? DisplayName { get; set; }
+
+    /// <summary>Human-readable terminal failure message.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("error")]
+    public string? Error { get; set; }
+
+    /// <summary>Optional owner-supplied terminal failure code.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("errorCode")]
+    public string? ErrorCode { get; set; }
+
+    /// <summary>Execution mode, which is always background for client-owned tasks.</summary>
+    [JsonPropertyName("executionMode")]
+    public required TaskClientExecutionMode ExecutionMode { get; set; }
+
+    /// <summary>Canonical runtime-generated task identifier.</summary>
+    [JsonPropertyName("id")]
+    public required string Id { get; set; }
+
+    /// <summary>ISO 8601 timestamp when the connected owner entered idle status.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("idleSince")]
+    public DateTimeOffset? IdleSince { get; set; }
+
+    /// <summary>ISO 8601 timestamp of the most recent orphan transition.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("orphanedAt")]
+    public DateTimeOffset? OrphanedAt { get; set; }
+
+    /// <summary>Public attribution and presence for the task owner.</summary>
+    [JsonPropertyName("owner")]
+    public required TaskClientOwner Owner { get; set; }
+
+    /// <summary>ISO 8601 timestamp of the most recent successful reclaim.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("reclaimedAt")]
+    public DateTimeOffset? ReclaimedAt { get; set; }
+
+    /// <summary>Opaque successful terminal result supplied by the task owner.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("result")]
+    public JsonElement? Result { get; set; }
+
+    /// <summary>Sequence number of the latest accepted owner update.</summary>
+    [JsonPropertyName("sequence")]
+    public required long Sequence { get; set; }
+
+    /// <summary>ISO 8601 timestamp when the task started.</summary>
+    [JsonPropertyName("startedAt")]
+    public required DateTimeOffset StartedAt { get; set; }
+
+    /// <summary>Client task lifecycle status.</summary>
+    [JsonPropertyName("status")]
+    public required TaskClientStatus Status { get; set; }
+
+    /// <summary>ISO 8601 timestamp of the latest accepted lifecycle change.</summary>
+    [JsonPropertyName("updatedAt")]
+    public required DateTimeOffset 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>
+[Experimental(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class SessionTasksListRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Tracked client-owned task metadata.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class TaskClientInfo
+{
+    /// <summary>ISO 8601 timestamp when the current active segment started.</summary>
+    [JsonPropertyName("activeStartedAt")]
+    public DateTimeOffset? ActiveStartedAt { get; set; }
+
+    /// <summary>Accumulated active execution time in milliseconds.</summary>
+    [JsonPropertyName("activeTimeMs")]
+    public long ActiveTimeMs { get; set; }
+
+    /// <summary>Whether the currently bound owner can receive a cancellation request.</summary>
+    [JsonPropertyName("canCancel")]
+    public bool CanCancel { get; set; }
+
+    /// <summary>Human-readable reason for terminal cancellation.</summary>
+    [JsonPropertyName("cancellationReason")]
+    public string? CancellationReason { get; set; }
+
+    /// <summary>Owner-scoped registration and reclaim key.</summary>
+    [JsonPropertyName("clientTaskId")]
+    public string ClientTaskId { get; set; } = string.Empty;
+
+    /// <summary>ISO 8601 timestamp when the task reached a terminal status.</summary>
+    [JsonPropertyName("completedAt")]
+    public DateTimeOffset? CompletedAt { get; set; }
+
+    /// <summary>Task description.</summary>
+    [JsonPropertyName("description")]
+    public string Description { get; set; } = string.Empty;
+
+    /// <summary>Optional task display name.</summary>
+    [JsonPropertyName("displayName")]
+    public string? DisplayName { get; set; }
+
+    /// <summary>Human-readable terminal failure message.</summary>
+    [JsonPropertyName("error")]
+    public string? Error { get; set; }
+
+    /// <summary>Optional owner-supplied terminal failure code.</summary>
+    [JsonPropertyName("errorCode")]
+    public string? ErrorCode { get; set; }
+
+    /// <summary>Execution mode, which is always background for client-owned tasks.</summary>
+    [JsonPropertyName("executionMode")]
+    public TaskClientExecutionMode ExecutionMode { get; set; }
+
+    /// <summary>Canonical runtime-generated task identifier.</summary>
+    [JsonPropertyName("id")]
+    public string Id { get; set; } = string.Empty;
+
+    /// <summary>ISO 8601 timestamp when the connected owner entered idle status.</summary>
+    [JsonPropertyName("idleSince")]
+    public DateTimeOffset? IdleSince { get; set; }
+
+    /// <summary>ISO 8601 timestamp of the most recent orphan transition.</summary>
+    [JsonPropertyName("orphanedAt")]
+    public DateTimeOffset? OrphanedAt { get; set; }
+
+    /// <summary>Public attribution and presence for the task owner.</summary>
+    [JsonPropertyName("owner")]
+    public TaskClientOwner Owner { get => field ??= new(); set; }
+
+    /// <summary>ISO 8601 timestamp of the most recent successful reclaim.</summary>
+    [JsonPropertyName("reclaimedAt")]
+    public DateTimeOffset? ReclaimedAt { get; set; }
+
+    /// <summary>Opaque successful terminal result supplied by the task owner.</summary>
+    [JsonPropertyName("result")]
+    public JsonElement? Result { get; set; }
+
+    /// <summary>Sequence number of the latest accepted owner update.</summary>
+    [JsonPropertyName("sequence")]
+    public long Sequence { get; set; }
+
+    /// <summary>ISO 8601 timestamp when the task started.</summary>
+    [JsonPropertyName("startedAt")]
+    public DateTimeOffset StartedAt { get; set; }
+
+    /// <summary>Client task lifecycle status.</summary>
+    [JsonPropertyName("status")]
+    public TaskClientStatus Status { get; set; }
+
+    /// <summary>Task kind.</summary>
+    [JsonPropertyName("type")]
+    public TaskClientType Type { get; set; }
+
+    /// <summary>ISO 8601 timestamp of the latest accepted lifecycle change.</summary>
+    [JsonPropertyName("updatedAt")]
+    public DateTimeOffset UpdatedAt { get; set; }
+}
+
+/// <summary>Result of registering or reclaiming a client-owned task.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class TasksRegisterResult
+{
+    /// <summary>True only when this invocation created a new task.</summary>
+    [JsonPropertyName("created")]
+    public bool Created { get; set; }
+
+    /// <summary>True only when this invocation reclaimed an orphaned task.</summary>
+    [JsonPropertyName("reclaimed")]
+    public bool Reclaimed { get; set; }
+
+    /// <summary>Authoritative registered or reclaimed task.</summary>
+    [JsonPropertyName("task")]
+    public TaskClientInfo Task { get => field ??= new(); set; }
+}
+
+/// <summary>Registers or reclaims a client-owned task.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class TasksRegisterRequest
+{
+    /// <summary>Whether the owner supports runtime cancellation requests.</summary>
+    [JsonPropertyName("cancellable")]
+    public bool Cancellable { get; set; }
+
+    /// <summary>Owner-scoped idempotency key used for registration and reclaim.</summary>
+    [JsonPropertyName("clientTaskId")]
+    public string ClientTaskId { get; set; } = string.Empty;
+
+    /// <summary>Human-readable description of the external work.</summary>
+    [JsonPropertyName("description")]
+    public string Description { get; set; } = string.Empty;
+
+    /// <summary>Optional short display name for the external work.</summary>
+    [JsonPropertyName("displayName")]
+    public string? DisplayName { get; set; }
+
+    /// <summary>Expected current sequence for idempotent registration or orphan reclaim.</summary>
+    [JsonPropertyName("expectedSequence")]
+    public long? ExpectedSequence { get; set; }
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+
+    /// <summary>Task kind.</summary>
+    [JsonPropertyName("type")]
+    public TaskClientType Type { get; set; }
+}
+
+/// <summary>Result of publishing a client-owned task update.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class TasksUpdateResult
+{
+    /// <summary>Whether this invocation changed task state.</summary>
+    [JsonPropertyName("applied")]
+    public bool Applied { get; set; }
+
+    /// <summary>Whether this invocation repeated the latest accepted update.</summary>
+    [JsonPropertyName("duplicate")]
+    public bool Duplicate { get; set; }
+
+    /// <summary>Authoritative task after processing the update.</summary>
+    [JsonPropertyName("task")]
+    public TaskClientInfo Task { get => field ??= new(); set; }
+}
+
+/// <summary>Progress or terminal update for a client-owned task.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "kind",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(TaskClientUpdateProgress), "progress")]
+[JsonDerivedType(typeof(TaskClientUpdateCompleted), "completed")]
+[JsonDerivedType(typeof(TaskClientUpdateFailed), "failed")]
+[JsonDerivedType(typeof(TaskClientUpdateCancelled), "cancelled")]
+public partial class TaskClientUpdate
+{
+    /// <summary>The type discriminator.</summary>
+    [JsonPropertyName("kind")]
+    public virtual string Kind { get; set; } = string.Empty;
+}
+
+
+/// <summary>Publishes nonterminal progress for a running or idle client task.</summary>
+/// <remarks>The <c>progress</c> variant of <see cref="TaskClientUpdate"/>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class TaskClientUpdateProgress : TaskClientUpdate
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "progress";
+
+    /// <summary>Optional progress message appended to recent activity when nonempty.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("message")]
+    public string? Message { get; set; }
+
+    /// <summary>Optional completion percentage; null clears the current percentage.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("percentage")]
+    public double? Percentage { get; set; }
+
+    /// <summary>Optional progress phase; null clears the current phase.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("phase")]
+    public string? Phase { get; set; }
+
+    /// <summary>Optional active status transition.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("status")]
+    public TaskClientActiveStatus? Status { get; set; }
+}
+
+/// <summary>Reports successful terminal completion.</summary>
+/// <remarks>The <c>completed</c> variant of <see cref="TaskClientUpdate"/>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class TaskClientUpdateCompleted : TaskClientUpdate
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "completed";
+
+    /// <summary>Optional final progress message.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("message")]
+    public string? Message { get; set; }
+
+    /// <summary>Optional opaque successful terminal result.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("result")]
+    public JsonElement? Result { get; set; }
+}
+
+/// <summary>Reports terminal failure.</summary>
+/// <remarks>The <c>failed</c> variant of <see cref="TaskClientUpdate"/>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class TaskClientUpdateFailed : TaskClientUpdate
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "failed";
+
+    /// <summary>Optional owner-supplied terminal failure code.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("code")]
+    public string? Code { get; set; }
+
+    /// <summary>Human-readable terminal failure message.</summary>
+    [JsonPropertyName("error")]
+    public required string Error { get; set; }
+
+    /// <summary>Optional final progress message.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("message")]
+    public string? Message { get; set; }
+}
+
+/// <summary>Reports terminal cancellation after external work stopped.</summary>
+/// <remarks>The <c>cancelled</c> variant of <see cref="TaskClientUpdate"/>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class TaskClientUpdateCancelled : TaskClientUpdate
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "cancelled";
+
+    /// <summary>Optional final progress message.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("message")]
+    public string? Message { get; set; }
+
+    /// <summary>Optional human-readable cancellation reason.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("reason")]
+    public string? Reason { get; set; }
+}
+
+/// <summary>Updates a client-owned task.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class TasksUpdateRequest
+{
+    /// <summary>Canonical runtime-generated task identifier.</summary>
+    [JsonPropertyName("id")]
+    public string Id { get; set; } = string.Empty;
+
+    /// <summary>Owner update sequence to apply.</summary>
+    [JsonPropertyName("sequence")]
+    public long Sequence { get; set; }
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+
+    /// <summary>Progress or terminal update payload.</summary>
+    [JsonPropertyName("update")]
+    public TaskClientUpdate Update { get => field ??= new(); 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(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class TasksRefreshResult
+{
+}
+
+/// <summary>Identifies the target session.</summary>
+[Experimental(global::GitHub.Copilot.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(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class TasksWaitForPendingResult
+{
+}
+
+/// <summary>Identifies the target session.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class SessionTasksWaitForPendingRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Progress information for the task, discriminated by type. Returns null when no task with this ID is currently tracked.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>type</c>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "type",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(TaskProgressAgent), "agent")]
+[JsonDerivedType(typeof(TaskProgressClient), "client")]
+[JsonDerivedType(typeof(TaskProgressShell), "shell")]
+public partial class TaskProgress
+{
+    /// <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(global::GitHub.Copilot.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="TaskProgress"/>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class TaskProgressAgent : TaskProgress
+{
+    /// <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>Generic progress for a client-owned task.</summary>
+/// <remarks>The <c>client</c> variant of <see cref="TaskProgress"/>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class TaskProgressClient : TaskProgress
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "client";
+
+    /// <summary>Most recent nonempty progress message.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("lastMessage")]
+    public string? LastMessage { get; set; }
+
+    /// <summary>Current completion percentage from zero through one hundred.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("percentage")]
+    public double? Percentage { get; set; }
+
+    /// <summary>Current owner-defined progress phase.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("phase")]
+    public string? Phase { get; set; }
+
+    /// <summary>Recent server-timestamped progress messages.</summary>
+    [JsonPropertyName("recentActivity")]
+    public required IList<TaskProgressLine> RecentActivity { get; set; }
+
+    /// <summary>Sequence number of the latest accepted owner update.</summary>
+    [JsonPropertyName("sequence")]
+    public required long Sequence { get; set; }
+
+    /// <summary>Current client task lifecycle status.</summary>
+    [JsonPropertyName("status")]
+    public required TaskClientStatus Status { get; set; }
+
+    /// <summary>ISO 8601 timestamp of the latest accepted lifecycle change.</summary>
+    [JsonPropertyName("updatedAt")]
+    public required DateTimeOffset UpdatedAt { 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="TaskProgress"/>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class TaskProgressShell : TaskProgress
+{
+    /// <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(global::GitHub.Copilot.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 TaskProgress? Progress { get; set; }
+}
+
+/// <summary>Identifier of the background task to fetch progress for.</summary>
+[Experimental(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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>Whether model invocation was disabled when this skill was invoked.</summary>
+    [JsonPropertyName("disableModelInvocation")]
+    public bool? DisableModelInvocation { get; set; }
+
+    /// <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, or an empty string for an SDK-provided skill without a filesystem identity.</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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class SessionSkillsEnsureLoadedRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>The IDE a host is connected to, as reported to the session.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class SessionConnectedIdeInfo
+{
+    /// <summary>Display name of the connected IDE, for example `VS Code`.</summary>
+    [JsonPropertyName("ideName")]
+    public string IdeName { get; set; } = string.Empty;
+
+    /// <summary>Absolute path of the workspace folder the IDE has open.</summary>
+    [JsonPropertyName("workspaceFolder")]
+    public string WorkspaceFolder { get; set; } = string.Empty;
+}
+
+/// <summary>Records which IDE the host is connected to, or clears it.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class SessionMcpSetConnectedIdeInfoParams
+{
+    /// <summary>The connected IDE. Null or omitted clears the recorded IDE, which is how a host reports that it is disconnected.</summary>
+    [JsonPropertyName("ide")]
+    public SessionConnectedIdeInfo? Ide { get; set; }
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Recorded MCP server connection failure.</summary>
+[Experimental(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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>Owned installation that a listed MCP server's live configuration came from.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class McpServerOwnership
+{
+    /// <summary>Stable installation identifier from the owned installation receipt.</summary>
+    [JsonPropertyName("installationId")]
+    public string InstallationId { get; set; } = string.Empty;
+}
+
+/// <summary>MCP server status entry, including config source/plugin source and any connection error.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class McpServer
+{
+    /// <summary>Human-readable display name supplied by a managed server catalog.</summary>
+    [JsonPropertyName("displayName")]
+    public string? DisplayName { get; set; }
+
+    /// <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>Owned installation this entry's live configuration came from. Absent for manual, workspace, plugin, builtin and same-name servers, and on runtimes without owned installations.</summary>
+    [JsonPropertyName("owned")]
+    public McpServerOwnership? Owned { get; set; }
+
+    /// <summary>Server-advertised metadata for a connected server. Omitted when no live connection metadata is available, including while pending or when failed, disabled, stopped, or not configured.</summary>
+    [JsonPropertyName("serverMetadata")]
+    public McpServerMetadata? ServerMetadata { get; set; }
+
+    /// <summary>Configuration source: user, workspace, plugin, builtin, or managed.</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>Configured URL for an HTTP/SSE server, regardless of configuration source. Omitted for local and in-memory servers.</summary>
+    [JsonPropertyName("url")]
+    public string? Url { get; set; }
+}
+
+/// <summary>MCP servers configured for the session, with their connection status and host-level state.</summary>
+[Experimental(global::GitHub.Copilot.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(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class SessionMcpListRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Observational state for a matching already materialized MCP server.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class McpConfiguredServerState
+{
+    /// <summary>Observed connection error, when the materialized server failed.</summary>
+    [JsonPropertyName("error")]
+    public string? Error { get; set; }
+
+    /// <summary>Observed connection status. This is not a configuration or readiness guarantee.</summary>
+    [JsonPropertyName("status")]
+    public McpServerStatus Status { get; set; }
+}
+
+/// <summary>Effective MCP configuration entry. Configuration enablement is distinct from the optional live observation.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class McpConfiguredServer
+{
+    /// <summary>Human-readable display name supplied by configuration.</summary>
+    [JsonPropertyName("displayName")]
+    public string? DisplayName { get; set; }
+
+    /// <summary>Whether this configured server is enabled after session configuration and policy filtering.</summary>
+    [JsonPropertyName("enabled")]
+    public bool Enabled { get; set; }
+
+    /// <summary>Observed state from an already materialized matching server. Omitted when no live graph has this configured server; it never determines configuration enablement.</summary>
+    [JsonPropertyName("live")]
+    public McpConfiguredServerState Live { get => field ??= new(); 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 provenance: user, workspace, plugin, builtin, or managed.</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>Effective MCP configuration with optional live observations from matching already materialized servers.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class McpConfiguredServerList
+{
+    /// <summary>Effective configured MCP servers.</summary>
+    [JsonPropertyName("servers")]
+    public IList<McpConfiguredServer> Servers { get => field ??= []; set; }
+}
+
+/// <summary>Identifies the target session.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class SessionMcpListConfiguredRequest
+{
+    /// <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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class McpEnableRequest
+{
+    /// <summary>Exact receipt identity for explicit owned activation in this session.</summary>
+    [JsonPropertyName("expectedInstallationId")]
+    public string? ExpectedInstallationId { get; set; }
+
+    /// <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 required string ServerName { get; set; }
+}
+
+/// <summary>Name of the MCP server to enable for the session.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class McpEnableRequestWithSession
+{
+    /// <summary>Exact receipt identity for explicit owned activation in this session.</summary>
+    [JsonPropertyName("expectedInstallationId")]
+    public string? ExpectedInstallationId { get; set; }
+
+    /// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class McpDisableRequest
+{
+    /// <summary>Required for an owned installation; omission preserves only manual-server behaviour.</summary>
+    [JsonPropertyName("expectedInstallationId")]
+    public string? ExpectedInstallationId { get; set; }
+
+    /// <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 required string ServerName { get; set; }
+}
+
+/// <summary>Name of the MCP server to disable for the session.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class McpDisableRequestWithSession
+{
+    /// <summary>Required for an owned installation; omission preserves only manual-server behaviour.</summary>
+    [JsonPropertyName("expectedInstallationId")]
+    public string? ExpectedInstallationId { get; set; }
+
+    /// <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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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")]
+#else
+    [Obsolete("This member is deprecated and will be removed in a future version.")]
+#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(global::GitHub.Copilot.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(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class McpReloadWithConfigRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Outcome of an MCP sampling execution: success result, failure error, or cancellation.</summary>
+[Experimental(global::GitHub.Copilot.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 JsonElement? Result { get; set; }
+}
+
+/// <summary>Identifiers and raw MCP CreateMessageRequest params used to run a sampling inference.</summary>
+[Experimental(global::GitHub.Copilot.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 JsonElement Request { 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>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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.Diagnostics.Experimental)]
+public 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>Exact receipt identity for explicit owned activation in this session.</summary>
+    [JsonPropertyName("expectedInstallationId")]
+    public string? ExpectedInstallationId { get; set; }
+
+    /// <summary>Name of the MCP server to start.</summary>
+    [JsonPropertyName("serverName")]
+    public required string ServerName { 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>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class McpStartServerRequestWithSession
+{
+    /// <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>Exact receipt identity for explicit owned activation in this session.</summary>
+    [JsonPropertyName("expectedInstallationId")]
+    public string? ExpectedInstallationId { 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(global::GitHub.Copilot.Diagnostics.Experimental)]
+public 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>Exact receipt identity for an explicit owned restart; configuration overrides are refused.</summary>
+    [JsonPropertyName("expectedInstallationId")]
+    public string? ExpectedInstallationId { get; set; }
+
+    /// <summary>Name of the MCP server to restart.</summary>
+    [JsonPropertyName("serverName")]
+    public required string ServerName { 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>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class McpRestartServerRequestWithSession
+{
+    /// <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>Exact receipt identity for an explicit owned restart; configuration overrides are refused.</summary>
+    [JsonPropertyName("expectedInstallationId")]
+    public string? ExpectedInstallationId { 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(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class McpStopServerRequest
+{
+    /// <summary>Exact owned receipt identity. Stop also forgets this session's durable activation.</summary>
+    [JsonPropertyName("expectedInstallationId")]
+    public string? ExpectedInstallationId { get; set; }
+
+    /// <summary>Name of the MCP server to stop.</summary>
+    [JsonPropertyName("serverName")]
+    public required string ServerName { get; set; }
+}
+
+/// <summary>Server name for an individual MCP server stop.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class McpStopServerRequestWithSession
+{
+    /// <summary>Exact owned receipt identity. Stop also forgets this session's durable activation.</summary>
+    [JsonPropertyName("expectedInstallationId")]
+    public string? ExpectedInstallationId { get; set; }
+
+    /// <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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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>An inert runtime-issued login handle. Preparation alone performs no activation or OAuth work.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class SessionMcpOauthPrepareLoginResult
+{
+    /// <summary>Original expiry, not extended by consumption, retries or cancellation.</summary>
+    [JsonPropertyName("expiresAt")]
+    public DateTimeOffset ExpiresAt { get; set; }
+
+    /// <summary>Retain with the original requester and use for one login or cancellation.</summary>
+    [JsonPropertyName("loginId")]
+    public string LoginId { get; set; } = string.Empty;
+}
+
+/// <summary>Effect-free preparation bound to the existing local session, requester and installation, with frozen options.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class SessionMcpOauthPrepareLoginRequest
+{
+    /// <summary>Text shown on the loopback callback page after successful authorisation.</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(2048)]
+    [JsonPropertyName("callbackSuccessMessage")]
+    public string? CallbackSuccessMessage { get; set; }
+
+    /// <summary>Display name used by the incumbent OAuth client-registration flow.</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(2048)]
+    [JsonPropertyName("clientName")]
+    public string? ClientName { get; set; }
+
+    /// <summary>Exact installation identity from owned inventory, never a server-name alias.</summary>
+    [JsonPropertyName("expectedInstallationId")]
+    public string ExpectedInstallationId { get; set; } = string.Empty;
+
+    /// <summary>Request a new authorisation rather than accepting a usable cached grant.</summary>
+    [JsonPropertyName("forceReauth")]
+    public bool? ForceReauth { get; set; }
+
+    /// <summary>Name recorded by the authoritative owned installation receipt.</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>OAuth authorization URL the caller should open, or empty when cached tokens already authenticated the server.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class McpOauthLoginResult
+{
+    /// <summary>Opaque authorization identifier returned only for a host-managed redirect URI. The runtime also sends it as the OAuth state value, so the callback endpoint can read state and pass it with the full callback URL to session.mcp.oauth.complete.</summary>
+    [JsonPropertyName("authorizationId")]
+    public string? AuthorizationId { get; set; }
+
+    /// <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. For the default loopback flow, the runtime starts its listener before returning. With redirectUri, the host receives the callback and completes it through session.mcp.oauth.complete. The runtime continues the flow in the background and signals completion via session.mcp_server_status_changed.</summary>
+    [Url]
+    [StringSyntax(StringSyntaxAttribute.Uri)]
+    [JsonPropertyName("authorizationUrl")]
+    public string? AuthorizationUrl { get; set; }
+
+    /// <summary>Runtime-issued owned flow identity; never a server name or installation operation ID.</summary>
+    [JsonPropertyName("loginId")]
+    public string? LoginId { get; set; }
+
+    /// <summary>Explicit outcome for owned sign-in. Manual callers retain their legacy response shape.</summary>
+    [JsonPropertyName("status")]
+    public McpOwnedOauthLoginStatus? Status { get; set; }
+}
+
+/// <summary>Remote MCP server name and optional overrides controlling reauthentication, OAuth client display name, callback handling, and static OAuth client selection.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public 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>Exact owned receipt identity. Owned login never uses an implicit helper session.</summary>
+    [JsonPropertyName("expectedInstallationId")]
+    public string? ExpectedInstallationId { 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>
+    /// Required for owned login. Consumes the exact prepareLogin handle once.
+    /// Set forceReauth and display options during preparation, not consumption.
+    /// </summary>
+    [JsonPropertyName("loginId")]
+    public string? LoginId { 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>Optional externally visible HTTPS redirect URI for a host-managed callback endpoint. When supplied, the runtime still owns discovery, PKCE, token exchange, persistence, and reconnect, but does not bind a loopback listener or terminate HTTPS. The URI must not contain query parameters or a fragment and must be registered for the selected CIMD, DCR, or static OAuth client.</summary>
+    [Url]
+    [StringSyntax(StringSyntaxAttribute.Uri)]
+    [JsonPropertyName("redirectUri")]
+    public string? RedirectUri { 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 required string ServerName { get; set; }
+}
+
+/// <summary>Remote MCP server name and optional overrides controlling reauthentication, OAuth client display name, callback handling, and static OAuth client selection.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class McpOauthLoginRequestWithSession
+{
+    /// <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>Exact owned receipt identity. Owned login never uses an implicit helper session.</summary>
+    [JsonPropertyName("expectedInstallationId")]
+    public string? ExpectedInstallationId { 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>
+    /// Required for owned login. Consumes the exact prepareLogin handle once.
+    /// Set forceReauth and display options during preparation, not consumption.
+    /// </summary>
+    [JsonPropertyName("loginId")]
+    public string? LoginId { 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>Optional externally visible HTTPS redirect URI for a host-managed callback endpoint. When supplied, the runtime still owns discovery, PKCE, token exchange, persistence, and reconnect, but does not bind a loopback listener or terminate HTTPS. The URI must not contain query parameters or a fragment and must be registered for the selected CIMD, DCR, or static OAuth client.</summary>
+    [Url]
+    [StringSyntax(StringSyntaxAttribute.Uri)]
+    [JsonPropertyName("redirectUri")]
+    public string? RedirectUri { 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>Host-delivered callback for a runtime-managed MCP OAuth login.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class McpOauthCompleteRequest
+{
+    /// <summary>Opaque identifier returned by session.mcp.oauth.login for the pending external callback.</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("authorizationId")]
+    public string AuthorizationId { get; set; } = string.Empty;
+
+    /// <summary>Full externally visible HTTPS callback URL received by the host, including the authorization response query parameters. Applications behind a reverse proxy must reconstruct the public URL rather than passing an internal proxy URL.</summary>
+    [Url]
+    [StringSyntax(StringSyntaxAttribute.Uri)]
+    [JsonPropertyName("callbackUrl")]
+    public string CallbackUrl { 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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class McpOauthProbeRequest
+{
+    /// <summary>Exact owned receipt identity; probing never activates a dormant installation.</summary>
+    [JsonPropertyName("expectedInstallationId")]
+    public string? ExpectedInstallationId { get; set; }
+
+    /// <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 required string ServerName { get; set; }
+}
+
+/// <summary>Remote MCP server name for a passive OAuth status probe.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class McpOauthProbeRequestWithSession
+{
+    /// <summary>Exact owned receipt identity; probing never activates a dormant installation.</summary>
+    [JsonPropertyName("expectedInstallationId")]
+    public string? ExpectedInstallationId { get; set; }
+
+    /// <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>Honest terminal cancellation result; persistence or recovery failures remain RPC errors.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class SessionMcpOauthCancelLoginResult
+{
+    /// <summary>True after cancellation settles, false when the original login already connected successfully.</summary>
+    [JsonPropertyName("cancelled")]
+    public bool Cancelled { get; set; }
+}
+
+/// <summary>Targets only the original prepared/applying owned login on this exact session requester.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class SessionMcpOauthCancelLoginRequest
+{
+    /// <summary>The same authoritative installation identity supplied during preparation.</summary>
+    [JsonPropertyName("expectedInstallationId")]
+    public string ExpectedInstallationId { get; set; } = string.Empty;
+
+    /// <summary>Runtime-issued login handle known before the effectful login request begins.</summary>
+    [JsonPropertyName("loginId")]
+    public string LoginId { 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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.Diagnostics.Experimental)]
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "kind",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(McpHeadersHandlePendingHeadersRefreshRequestHeaders), "headers")]
+[JsonDerivedType(typeof(McpHeadersHandlePendingHeadersRefreshRequestNone), "none")]
+[JsonDerivedType(typeof(McpHeadersHandlePendingHeadersRefreshRequestError), "error")]
+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(global::GitHub.Copilot.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>Optional lifetime in milliseconds for these returned headers. The runtime clamps its configured cache lifetime to this value.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("ttlMs")]
+    public long? TtlMs { get; set; }
+}
+
+/// <summary>The <c>none</c> variant of <see cref="McpHeadersHandlePendingHeadersRefreshRequest"/>.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class McpHeadersHandlePendingHeadersRefreshRequestNone : McpHeadersHandlePendingHeadersRefreshRequest
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "none";
+}
+
+/// <summary>The <c>error</c> variant of <see cref="McpHeadersHandlePendingHeadersRefreshRequest"/>.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class McpHeadersHandlePendingHeadersRefreshRequestError : McpHeadersHandlePendingHeadersRefreshRequest
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "error";
+
+    /// <summary>Host credential broker failure, denial, or revocation reason.</summary>
+    [JsonPropertyName("message")]
+    public required string Message { get; set; }
+}
+
+/// <summary>MCP headers refresh request id and the host response.</summary>
+[Experimental(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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>An argument accepted by an MCP prompt.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class McpPromptArgument
+{
+    /// <summary>Argument-level metadata.</summary>
+    [JsonPropertyName("_meta")]
+    public IDictionary<string, JsonElement>? Meta { get; set; }
+
+    /// <summary>Server-provided non-standard argument fields.</summary>
+    [JsonPropertyName("additionalProperties")]
+    public IDictionary<string, JsonElement>? AdditionalProperties { get; set; }
+
+    /// <summary>Description of the argument.</summary>
+    [JsonPropertyName("description")]
+    public string? Description { get; set; }
+
+    /// <summary>Name of the argument.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
+
+    /// <summary>Whether the argument is required; omission is distinct from false.</summary>
+    [JsonPropertyName("required")]
+    public bool? Required { get; set; }
+}
+
+/// <summary>An MCP prompt icon with standard size hints and preserved non-standard fields.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class McpPromptIcon
+{
+    /// <summary>Server-provided non-standard icon fields.</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, such as `48x48` or `any`.</summary>
+    [JsonPropertyName("sizes")]
+    public IList<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 prompt descriptor. Server-provided non-standard fields are exposed under `additionalProperties`.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class McpPrompt
+{
+    /// <summary>Prompt-level metadata.</summary>
+    [JsonPropertyName("_meta")]
+    public IDictionary<string, JsonElement>? Meta { get; set; }
+
+    /// <summary>Server-provided non-standard descriptor fields.</summary>
+    [JsonPropertyName("additionalProperties")]
+    public IDictionary<string, JsonElement>? AdditionalProperties { get; set; }
+
+    /// <summary>Arguments accepted by the prompt.</summary>
+    [JsonPropertyName("arguments")]
+    public IList<McpPromptArgument>? Arguments { get; set; }
+
+    /// <summary>Description of what this prompt provides.</summary>
+    [JsonPropertyName("description")]
+    public string? Description { get; set; }
+
+    /// <summary>Icons associated with this prompt.</summary>
+    [JsonPropertyName("icons")]
+    public IList<McpPromptIcon>? Icons { get; set; }
+
+    /// <summary>The programmatic name of the prompt.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
+
+    /// <summary>Human-readable display title.</summary>
+    [JsonPropertyName("title")]
+    public string? Title { get; set; }
+}
+
+/// <summary>One page of prompts advertised by the named MCP server.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class McpPromptsListResult
+{
+    /// <summary>MCP result metadata.</summary>
+    [JsonPropertyName("_meta")]
+    public IDictionary<string, JsonElement>? Meta { get; set; }
+
+    /// <summary>Server-provided non-standard result fields.</summary>
+    [JsonPropertyName("additionalProperties")]
+    public IDictionary<string, JsonElement>? AdditionalProperties { get; set; }
+
+    /// <summary>Opaque cursor for the next page, if the server has more prompts.</summary>
+    [JsonPropertyName("nextCursor")]
+    public string? NextCursor { get; set; }
+
+    /// <summary>Prompts advertised by the server.</summary>
+    [JsonPropertyName("prompts")]
+    public IList<McpPrompt> Prompts { get => field ??= []; set; }
+}
+
+/// <summary>MCP server whose prompts to enumerate.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class McpPromptsListRequest
+{
+    /// <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 prompts 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 prompt message with opaque JSON content preserved without flattening or content-type filtering.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class McpPromptMessage
+{
+    /// <summary>Message-level metadata.</summary>
+    [JsonPropertyName("_meta")]
+    public IDictionary<string, JsonElement>? Meta { get; set; }
+
+    /// <summary>Server-provided non-standard message fields.</summary>
+    [JsonPropertyName("additionalProperties")]
+    public IDictionary<string, JsonElement>? AdditionalProperties { get; set; }
+
+    /// <summary>The original MCP content block, including nested metadata and unfamiliar content types.</summary>
+    [JsonPropertyName("content")]
+    public JsonElement Content { get; set; }
+
+    /// <summary>The role of the message sender.</summary>
+    [JsonPropertyName("role")]
+    public McpPromptRole Role { get; set; }
+}
+
+/// <summary>Prompt messages returned by the MCP server without sending them to the model.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class McpPromptsGetResult
+{
+    /// <summary>MCP result metadata.</summary>
+    [JsonPropertyName("_meta")]
+    public IDictionary<string, JsonElement>? Meta { get; set; }
+
+    /// <summary>Server-provided non-standard result fields.</summary>
+    [JsonPropertyName("additionalProperties")]
+    public IDictionary<string, JsonElement>? AdditionalProperties { get; set; }
+
+    /// <summary>Description of the prompt.</summary>
+    [JsonPropertyName("description")]
+    public string? Description { get; set; }
+
+    /// <summary>Ordered prompt messages.</summary>
+    [JsonPropertyName("messages")]
+    public IList<McpPromptMessage> Messages { get => field ??= []; set; }
+}
+
+/// <summary>MCP server, prompt name, and optional string-valued arguments.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class McpPromptsGetRequest
+{
+    /// <summary>String-valued arguments to pass to the prompt.</summary>
+    [JsonPropertyName("arguments")]
+    public IDictionary<string, string>? Arguments { get; set; }
+
+    /// <summary>The programmatic name of the prompt.</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("promptName")]
+    public string PromptName { get; set; } = string.Empty;
+
+    /// <summary>Name of the MCP server hosting the prompt.</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 diagnostic source configuration.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class McpDiagnosticSourceConfiguration
+{
+    /// <summary>Threshold to apply to MCP diagnostic producers in this session.</summary>
+    [JsonPropertyName("level")]
+    public DiagnosticLogLevel Level { get; set; }
+}
+
+/// <summary>Typed diagnostic source configuration. At least one source is required by diagnostics configuration methods.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class DiagnosticSourcesConfiguration
+{
+    /// <summary>MCP diagnostic capture threshold. Omit to leave the current threshold unchanged.</summary>
+    [JsonPropertyName("mcp")]
+    public McpDiagnosticSourceConfiguration? Mcp { get; set; }
+}
+
+/// <summary>Per-source session diagnostics configuration.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class DiagnosticsConfiguration
+{
+    /// <summary>Diagnostic thresholds keyed by supported source.</summary>
+    [JsonPropertyName("sources")]
+    public DiagnosticSourcesConfiguration Sources { get => field ??= new(); set; }
+}
+
+/// <summary>Patch session diagnostic thresholds for explicitly supplied sources.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class DiagnosticsConfigureRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+
+    /// <summary>Sources to configure. At least one supported source must be supplied.</summary>
+    [JsonPropertyName("sources")]
+    public DiagnosticSourcesConfiguration Sources { get => field ??= new(); set; }
+}
+
+/// <summary>One retained session-scoped diagnostic record. Potentially content-bearing diagnostic data is opt-in and must not be exported automatically as telemetry.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>source</c>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "source",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(DiagnosticEntryMcp), "mcp")]
+public partial class DiagnosticEntry
+{
+    /// <summary>The type discriminator.</summary>
+    [JsonPropertyName("source")]
+    public virtual string Source { get; set; } = string.Empty;
+}
+
+
+/// <summary>MCP-specific detail for a source-discriminated diagnostic entry.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class McpDiagnosticDetails
+{
+    /// <summary>Fresh identifier for the MCP connection attempt, including failed starts.</summary>
+    [JsonPropertyName("connectionId")]
+    public string ConnectionId { get; set; } = string.Empty;
+
+    /// <summary>Serialized diagnostic detail. Protocol and HTTP records use JSON when detail is present.</summary>
+    [JsonPropertyName("data")]
+    public string? Data { get; set; }
+
+    /// <summary>Protocol-frame direction when kind is protocol.</summary>
+    [JsonPropertyName("direction")]
+    public McpDiagnosticDirection? Direction { get; set; }
+
+    /// <summary>Diagnostic record category.</summary>
+    [JsonPropertyName("kind")]
+    public McpDiagnosticKind Kind { get; set; }
+
+    /// <summary>Configured MCP server name.</summary>
+    [JsonPropertyName("serverName")]
+    public string ServerName { get; set; } = string.Empty;
+}
+
+/// <summary>The <c>mcp</c> variant of <see cref="DiagnosticEntry"/>.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class DiagnosticEntryMcp : DiagnosticEntry
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Source => "mcp";
+
+    /// <summary>Agent identifier for a subagent host. Omitted for the root agent.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("agentId")]
+    public string? AgentId { get; set; }
+
+    /// <summary>Typed MCP diagnostic detail.</summary>
+    [JsonPropertyName("details")]
+    public required McpDiagnosticDetails Details { get; set; }
+
+    /// <summary>Severity of this emitted diagnostic record.</summary>
+    [JsonPropertyName("level")]
+    public required DiagnosticSeverity Level { get; set; }
+
+    /// <summary>Human-readable diagnostic summary.</summary>
+    [JsonPropertyName("message")]
+    public required string Message { get; set; }
+
+    /// <summary>Original byte count when a known-size message or data value was truncated.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("originalBytes")]
+    public long? OriginalBytes { get; set; }
+
+    /// <summary>UTC RFC 3339 timestamp captured at the diagnostic source.</summary>
+    [JsonPropertyName("timestamp")]
+    public required string Timestamp { get; set; }
+
+    /// <summary>Whether message or data was truncated to the record-size bound.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("truncated")]
+    public bool? Truncated { get; set; }
+}
+
+/// <summary>One cursor-addressed page of retained session diagnostics.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class DiagnosticsReadResult
+{
+    /// <summary>Opaque cursor for the next independent read.</summary>
+    [JsonPropertyName("cursor")]
+    public string Cursor { get; set; } = string.Empty;
+
+    /// <summary>Whether the requested cursor remained within the retained buffer window.</summary>
+    [JsonPropertyName("cursorStatus")]
+    public DiagnosticCursorStatus CursorStatus { get; set; }
+
+    /// <summary>Number of records lost before this page when known. Omitted when a buffer generation change makes the count unknowable.</summary>
+    [JsonPropertyName("droppedCount")]
+    public long? DroppedCount { get; set; }
+
+    /// <summary>Retained records beginning at the requested cursor.</summary>
+    [JsonPropertyName("entries")]
+    public IList<DiagnosticEntry> Entries { get => field ??= []; set; }
+
+    /// <summary>Whether additional retained records follow this page.</summary>
+    [JsonPropertyName("hasMore")]
+    public bool HasMore { get; set; }
+}
+
+/// <summary>Cursor-based request for session diagnostics. The default limit is 100 (maximum 500); the default waitMs is zero (maximum 30000).</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class DiagnosticsReadRequest
+{
+    /// <summary>Opaque cursor returned by an earlier read. Omit to start at the oldest retained record.</summary>
+    [JsonPropertyName("cursor")]
+    public string? Cursor { get; set; }
+
+    /// <summary>Maximum number of records to return, from 1 through 500. Omit for 100.</summary>
+    [JsonPropertyName("max")]
+    public long? Max { get; set; }
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+
+    /// <summary>Nonempty selection of sources to read. Each source may be listed once.</summary>
+    [JsonPropertyName("sources")]
+    public IList<DiagnosticSource> Sources { get => field ??= []; set; }
+
+    /// <summary>Maximum time in milliseconds to wait for a new record, from 0 through 30000.</summary>
+    [JsonPropertyName("waitMs")]
+    public int? WaitMs { get; set; }
+}
+
+/// <summary>Feature detection and hard polling limits for the EXPERIMENTAL session connector API.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class ConnectorCapabilities
+{
+    /// <summary>Connector API contract version.</summary>
+    [JsonPropertyName("apiVersion")]
+    public long ApiVersion { get; set; }
+
+    /// <summary>Current session availability. Disabled availability is reported without making a Connector request.</summary>
+    [JsonPropertyName("availability")]
+    public ConnectorAvailability Availability { get; set; }
+
+    /// <summary>Whether connect and reconnect can return an opaque continuation for bounded consent polling.</summary>
+    [JsonPropertyName("consentContinuation")]
+    public bool ConsentContinuation { get; set; }
+
+    /// <summary>Maximum accepted wall-clock deadline in milliseconds for one continuation call.</summary>
+    [JsonPropertyName("maxDeadlineMs")]
+    public long MaxDeadlineMs { get; set; }
+
+    /// <summary>Maximum accepted polling attempts for one continuation call.</summary>
+    [JsonPropertyName("maxPollAttempts")]
+    public long MaxPollAttempts { get; set; }
+
+    /// <summary>Maximum accepted delay in milliseconds between polling attempts.</summary>
+    [JsonPropertyName("maxPollIntervalMs")]
+    public long MaxPollIntervalMs { get; set; }
+
+    /// <summary>Whether callers select a host-owned GitHub account through an opaque selection ID rather than supplying a provider token.</summary>
+    [JsonPropertyName("opaqueAccountSelection")]
+    public bool OpaqueAccountSelection { get; set; }
+
+    /// <summary>Whether getAccount is supported. Absence means false.</summary>
+    [JsonPropertyName("sessionAccountSelection")]
+    public bool? SessionAccountSelection { get; set; }
+
+    /// <summary>Whether reconcile accepts forceConnectorName. Absence means false.</summary>
+    [JsonPropertyName("targetedReconcile")]
+    public bool? TargetedReconcile { get; set; }
+}
+
+/// <summary>Identifies the target session.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class SessionConnectorsGetCapabilitiesRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Credential-free identity metadata.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class AuthIdentityMetadata
+{
+    /// <summary>Identity host.</summary>
+    [JsonPropertyName("host")]
+    public string Host { get; set; } = string.Empty;
+
+    /// <summary>User login.</summary>
+    [JsonPropertyName("login")]
+    public string Login { get; set; } = string.Empty;
+
+    /// <summary>Authentication type.</summary>
+    [JsonPropertyName("type")]
+    public AuthInfoType Type { get; set; }
+}
+
+/// <summary>Session account selection.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class ConnectorSessionAccount
+{
+    /// <summary>Opaque session-scoped account selection ID.</summary>
+    [JsonPropertyName("accountId")]
+    public string AccountId { get; set; } = string.Empty;
+
+    /// <summary>Credential-free identity metadata.</summary>
+    [JsonPropertyName("authInfo")]
+    public AuthIdentityMetadata AuthInfo { get => field ??= new(); set; }
+}
+
+/// <summary>Identifies the target session.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class SessionConnectorsGetAccountRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Account-targeted authorization update required by the Connector service. The account ID is an opaque host routing identifier; no credential is included.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class ConnectorAuthorizationRequirement
+{
+    /// <summary>Exact opaque account selection that made the Connector request.</summary>
+    [JsonPropertyName("accountId")]
+    public string AccountId { get; set; } = string.Empty;
+
+    /// <summary>Stable OAuth scope the selected account must grant.</summary>
+    [JsonPropertyName("scope")]
+    public ConnectorAuthorizationScope Scope { get; set; }
+}
+
+/// <summary>Credential-free Connector catalog entry.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class ConnectorCatalogEntry
+{
+    /// <summary>Untrusted service description, when present.</summary>
+    [JsonPropertyName("description")]
+    public string? Description { get; set; }
+
+    /// <summary>Untrusted display label from the service.</summary>
+    [JsonPropertyName("displayName")]
+    public string DisplayName { get; set; } = string.Empty;
+
+    /// <summary>Optional catalog logo.</summary>
+    [JsonPropertyName("logo")]
+    public string? Logo { get; set; }
+
+    /// <summary>Canonical Connector name used by lifecycle methods.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
+
+    /// <summary>Optional catalog release tag.</summary>
+    [JsonPropertyName("releaseTag")]
+    public string? ReleaseTag { get; set; }
+
+    /// <summary>Opaque stable runtime IDs currently projected into the session for this Connector.</summary>
+    [JsonPropertyName("runtimeServerIds")]
+    public IList<string> RuntimeServerIds { get => field ??= []; set; }
+
+    /// <summary>Current authoritative service connection state.</summary>
+    [JsonPropertyName("status")]
+    public ConnectorCatalogStatus Status { get; set; }
+
+    /// <summary>Optional catalog tier.</summary>
+    [JsonPropertyName("tier")]
+    public string? Tier { get; set; }
+}
+
+/// <summary>Validated Connector catalog snapshot cached by the session.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class ConnectorCatalogResult
+{
+    /// <summary>Validated catalog entries in service order.</summary>
+    [JsonPropertyName("connectors")]
+    public IList<ConnectorCatalogEntry> Connectors { get => field ??= []; set; }
+
+    /// <summary>Unix epoch milliseconds when this snapshot was accepted.</summary>
+    [JsonPropertyName("refreshedAtMs")]
+    public long RefreshedAtMs { get; set; }
+
+    /// <summary>Monotonically increasing session-local catalog revision.</summary>
+    [JsonPropertyName("revision")]
+    public long Revision { get; set; }
+}
+
+/// <summary>Live status of one session-owned MCP projection.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class ConnectorRuntimeStatus
+{
+    /// <summary>Canonical Connector name that owns this server.</summary>
+    [JsonPropertyName("connectorName")]
+    public string ConnectorName { get; set; } = string.Empty;
+
+    /// <summary>Opaque runtime server ID.</summary>
+    [JsonPropertyName("runtimeServerId")]
+    public string RuntimeServerId { get; set; } = string.Empty;
+
+    /// <summary>Current live MCP host status.</summary>
+    [JsonPropertyName("status")]
+    public ConnectorMcpStatus Status { get; set; }
+}
+
+/// <summary>Authoritative session connector state. Account IDs are opaque routing identifiers and credentials are never included.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class ConnectorStatus
+{
+    /// <summary>Opaque account selection pinned to this session, when one has been selected.</summary>
+    [JsonPropertyName("accountId")]
+    public string? AccountId { get; set; }
+
+    /// <summary>Connector API contract version.</summary>
+    [JsonPropertyName("apiVersion")]
+    public long ApiVersion { get; set; }
+
+    /// <summary>Exact selected account and stable scope requiring an authorization update, when proven by the Connector service.</summary>
+    [JsonPropertyName("authorizationRequirement")]
+    public ConnectorAuthorizationRequirement? AuthorizationRequirement { get; set; }
+
+    /// <summary>Current feature and session availability.</summary>
+    [JsonPropertyName("availability")]
+    public ConnectorAvailability Availability { get; set; }
+
+    /// <summary>Latest validated catalog snapshot, when available.</summary>
+    [JsonPropertyName("catalog")]
+    public ConnectorCatalogResult? Catalog { get; set; }
+
+    /// <summary>Number of active opaque connection continuations.</summary>
+    [JsonPropertyName("pendingConnections")]
+    public long PendingConnections { get; set; }
+
+    /// <summary>Live MCP status for every Connector-owned runtime server.</summary>
+    [JsonPropertyName("runtimeServers")]
+    public IList<ConnectorRuntimeStatus> RuntimeServers { get => field ??= []; set; }
+}
+
+/// <summary>Identifies the target session.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class SessionConnectorsGetStatusRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Pins a Connector operation to one host-owned GitHub account through its opaque selection ID. Provider tokens are never accepted.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class ConnectorAccountRequest
+{
+    /// <summary>Opaque account selection ID previously returned by an account discovery API.</summary>
+    [JsonPropertyName("accountId")]
+    public string AccountId { get; set; } = string.Empty;
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Typed result of initiating or continuing a Connector connection.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "kind",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(ConnectorConnectResultConnected), "connected")]
+[JsonDerivedType(typeof(ConnectorConnectResultConsentRequired), "consent_required")]
+[JsonDerivedType(typeof(ConnectorConnectResultPending), "pending")]
+public partial class ConnectorConnectResult
+{
+    /// <summary>The type discriminator.</summary>
+    [JsonPropertyName("kind")]
+    public virtual string Kind { get; set; } = string.Empty;
+}
+
+
+/// <summary>The service is connected and the session MCP graph was reconciled.</summary>
+/// <remarks>The <c>connected</c> variant of <see cref="ConnectorConnectResult"/>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class ConnectorConnectResultConnected : ConnectorConnectResult
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "connected";
+
+    /// <summary>Fresh authoritative Connector state after MCP reconciliation.</summary>
+    [JsonPropertyName("status")]
+    public required ConnectorStatus Status { get; set; }
+}
+
+/// <summary>Host-owned consent is required before bounded continuation can complete.</summary>
+/// <remarks>The <c>consent_required</c> variant of <see cref="ConnectorConnectResult"/>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class ConnectorConnectResultConsentRequired : ConnectorConnectResult
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "consent_required";
+
+    /// <summary>Validated HTTPS consent URL. The runtime does not open it.</summary>
+    [JsonPropertyName("consentUrl")]
+    public required string ConsentUrl { get; set; }
+
+    /// <summary>Opaque ID accepted by continueConnection.</summary>
+    [JsonPropertyName("continuationId")]
+    public required string ContinuationId { get; set; }
+}
+
+/// <summary>The service is still completing the connection without a consent URL.</summary>
+/// <remarks>The <c>pending</c> variant of <see cref="ConnectorConnectResult"/>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class ConnectorConnectResultPending : ConnectorConnectResult
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "pending";
+
+    /// <summary>Opaque ID accepted by continueConnection.</summary>
+    [JsonPropertyName("continuationId")]
+    public required string ContinuationId { get; set; }
+}
+
+/// <summary>Selects one Connector and the pinned host-owned account used for its service and MCP authorization.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class ConnectorConnectRequest
+{
+    /// <summary>Opaque account selection ID. It must match the account already pinned to the session, if any.</summary>
+    [JsonPropertyName("accountId")]
+    public string AccountId { get; set; } = string.Empty;
+
+    /// <summary>Canonical Connector name from the current catalog.</summary>
+    [JsonPropertyName("connectorName")]
+    public string ConnectorName { get; set; } = string.Empty;
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Explicitly bounded continuation of a pending Connector connection.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class ConnectorContinueRequest
+{
+    /// <summary>Opaque continuation ID returned by connect, reconnect, or an earlier continuation.</summary>
+    [JsonPropertyName("continuationId")]
+    public string ContinuationId { get; set; } = string.Empty;
+
+    /// <summary>Maximum wall-clock duration in milliseconds for this call. Must be between one and the capability limit.</summary>
+    [JsonPropertyName("deadlineMs")]
+    public int DeadlineMs { get; set; }
+
+    /// <summary>Maximum catalog requests made by this call. Must be between one and the capability limit.</summary>
+    [JsonPropertyName("maxAttempts")]
+    public int MaxAttempts { get; set; }
+
+    /// <summary>Delay in milliseconds between attempts. Must not exceed the capability limit.</summary>
+    [JsonPropertyName("pollIntervalMs")]
+    public int PollIntervalMs { get; set; }
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Authoritative result after disconnect and MCP reconciliation.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class ConnectorDisconnectResult
+{
+    /// <summary>Whether the service accepted the idempotent disconnect.</summary>
+    [JsonPropertyName("disconnected")]
+    public bool Disconnected { get; set; }
+
+    /// <summary>Fresh authoritative session state after removing Connector-owned MCP servers.</summary>
+    [JsonPropertyName("status")]
+    public ConnectorStatus Status { get => field ??= new(); set; }
+}
+
+/// <summary>Requests authoritative Connector-to-MCP reconciliation for the pinned account.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class ConnectorReconcileRequest
+{
+    /// <summary>Opaque account selection ID. It must match the account already pinned to the session, if any.</summary>
+    [JsonPropertyName("accountId")]
+    public required string AccountId { get; set; }
+
+    /// <summary>Optional Connector name to reinitialize. Requires the targetedReconcile capability.</summary>
+    [JsonPropertyName("forceConnectorName")]
+    public string? ForceConnectorName { get; set; }
+
+    /// <summary>When true, refresh the catalog before reconciling. A disabled Connector API performs no service request.</summary>
+    [JsonPropertyName("refreshCatalog")]
+    public bool? RefreshCatalog { get; set; }
+}
+
+/// <summary>Requests authoritative Connector-to-MCP reconciliation for the pinned account.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class ConnectorReconcileRequestWithSession
+{
+    /// <summary>Opaque account selection ID. It must match the account already pinned to the session, if any.</summary>
+    [JsonPropertyName("accountId")]
+    public string AccountId { get; set; } = string.Empty;
+
+    /// <summary>Optional Connector name to reinitialize. Requires the targetedReconcile capability.</summary>
+    [JsonPropertyName("forceConnectorName")]
+    public string? ForceConnectorName { get; set; }
+
+    /// <summary>When true, refresh the catalog before reconciling. A disabled Connector API performs no service request.</summary>
+    [JsonPropertyName("refreshCatalog")]
+    public bool? RefreshCatalog { get; set; }
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Identifies the target session.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class SessionConnectorsWithdrawProjectionRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Identifies the target session.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class SessionManagedSettingsGetRequest
+{
+    /// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class Plugin
+{
+    /// <summary>Opaque stable identity for a direct plugin source.</summary>
+    [JsonPropertyName("directSourceId")]
+    public string? DirectSourceId { get; set; }
+
+    /// <summary>Whether the plugin is currently enabled.</summary>
+    [JsonPropertyName("enabled")]
+    public bool Enabled { get; set; }
+
+    /// <summary>Whether this managed desired plugin has an installed or live record.</summary>
+    [JsonPropertyName("installed")]
+    public bool? Installed { get; set; }
+
+    /// <summary>Absolute marketplace directory for a live plugin.</summary>
+    [JsonPropertyName("installedFrom")]
+    public string? InstalledFrom { get; set; }
+
+    /// <summary>Whether enterprise managed settings control this plugin.</summary>
+    [JsonPropertyName("managed")]
+    public bool? Managed { get; set; }
+
+    /// <summary>Enabled state required by enterprise managed settings.</summary>
+    [JsonPropertyName("managedDesiredEnabled")]
+    public bool? ManagedDesiredEnabled { 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>Runtime plugin provenance, such as "builtin".</summary>
+    [JsonPropertyName("source")]
+    public string? Source { get; set; }
+
+    /// <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(global::GitHub.Copilot.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(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class SessionPluginsListRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Plugin source resolved relative to the session's authoritative working directory.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class SessionPluginsInstallRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+
+    /// <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>Name (or spec) of the plugin to uninstall.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class PluginsUninstallRequestWithSession
+{
+    /// <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>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>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Name (or spec) of the plugin to update.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class PluginsUpdateRequestWithSession
+{
+    /// <summary>Plugin name or "plugin@marketplace" spec to update.</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>Plugin names (or specs) to enable in the session's authoritative working directory.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class SessionPluginsEnableRequest
+{
+    /// <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>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Plugin names (or specs) to disable in the session's authoritative working directory.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class SessionPluginsDisableRequest
+{
+    /// <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>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>RPC data type for SessionPluginsReload operations.</summary>
+[Experimental(global::GitHub.Copilot.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(global::GitHub.Copilot.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>Retry outcome for one plugin required by managed settings.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class ManagedPluginRetryEntry
+{
+    /// <summary>Why the plugin was not prepared. Present when `status` is `failed` or `deferred`.</summary>
+    [JsonPropertyName("error")]
+    public string? Error { get; set; }
+
+    /// <summary>Plugin spec in "plugin@marketplace" form.</summary>
+    [JsonPropertyName("spec")]
+    public string Spec { get; set; } = string.Empty;
+
+    /// <summary>What the retry did for this plugin.</summary>
+    [JsonPropertyName("status")]
+    public ManagedPluginRetryStatus Status { get; set; }
+}
+
+/// <summary>Per-plugin outcomes of retrying the plugins required by the session's managed settings.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class SessionPluginsRetryManagedResult
+{
+    /// <summary>One entry per requested plugin, in request order. When no plugins were requested, one entry per plugin the managed settings require.</summary>
+    [JsonPropertyName("plugins")]
+    public IList<ManagedPluginRetryEntry> Plugins { get => field ??= []; set; }
+}
+
+/// <summary>RPC data type for SessionPluginsRetryManaged operations.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class SessionPluginsRetryManagedRequest
+{
+    /// <summary>"plugin@marketplace" specs to retry. Omit to retry every plugin the session's managed settings require.</summary>
+    [JsonPropertyName("plugins")]
+    public IList<string>? Plugins { get; set; }
+}
+
+/// <summary>RPC data type for SessionPluginsRetryManagedRequestWithSession operations.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class SessionPluginsRetryManagedRequestWithSession
+{
+    /// <summary>"plugin@marketplace" specs to retry. Omit to retry every plugin the session's managed settings require.</summary>
+    [JsonPropertyName("plugins")]
+    public IList<string>? Plugins { get; set; }
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Identifies the target session.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class SessionPluginsMarketplacesListRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Marketplace source and optional working directory for relative-path resolution.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class PluginsMarketplacesAddRequestWithSession
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+
+    /// <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>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>Name of the marketplace to remove and an optional force flag.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class PluginsMarketplacesRemoveRequestWithSession
+{
+    /// <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>Marketplace name to remove.</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 marketplace whose plugin catalog to fetch.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class PluginsMarketplacesBrowseRequestWithSession
+{
+    /// <summary>Marketplace name to browse.</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>RPC data type for SessionPluginsMarketplacesRefresh operations.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class SessionPluginsMarketplacesRefreshRequest
+{
+    /// <summary>Marketplace name to refresh. When omitted, every registered marketplace is refreshed.</summary>
+    [JsonPropertyName("name")]
+    public string? Name { get; set; }
+}
+
+/// <summary>RPC data type for SessionPluginsMarketplacesRefreshRequestWithSession operations.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class SessionPluginsMarketplacesRefreshRequestWithSession
+{
+    /// <summary>Marketplace name to refresh. When omitted, every registered marketplace is refreshed.</summary>
+    [JsonPropertyName("name")]
+    public string? Name { 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(global::GitHub.Copilot.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(global::GitHub.Copilot.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>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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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>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(global::GitHub.Copilot.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>The selectable model entries and selection ids synthesized for the synchronized BYOK models.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class ProviderSyncResult
+{
+    /// <summary>True when synchronization withdrew the selected host-managed model, leaving the session with no explicit selection, so ordinary model resolution picks the session default. Synchronization never promotes a surviving host model in its place: publishing a model offers it, and the choice of which model to use stays with the user.</summary>
+    [JsonPropertyName("modelDeselected")]
+    public bool? ModelDeselected { get; set; }
+
+    /// <summary>Synthesized selectable model entries for the synchronized BYOK models.</summary>
+    [JsonPropertyName("models")]
+    public IList<JsonElement> Models { get => field ??= []; set; }
+
+    /// <summary>Provider-qualified model selection ids present after synchronization.</summary>
+    [JsonPropertyName("selectionIds")]
+    public IList<string> SelectionIds { get => field ??= []; set; }
+}
+
+/// <summary>Authoritative BYOK provider and model registry snapshot to apply atomically to the session.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class ProviderSyncRequest
+{
+    /// <summary>BYOK model definition snapshot. Models absent from this list are removed.</summary>
+    [JsonPropertyName("models")]
+    public IList<ProviderModelConfig>? Models { get; set; }
+
+    /// <summary>Named BYOK provider connection snapshot. Providers absent from this list are removed.</summary>
+    [JsonPropertyName("providers")]
+    public IList<NamedProviderConfig>? Providers { get; set; }
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>What the withdrawal actually removed from the registry.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class ProviderWithdrawResult
+{
+    /// <summary>True when withdrawal removed the selected host-managed model, leaving the session with no explicit selection, so ordinary model resolution picks the session default. Withdrawal never promotes a surviving model in its place: the choice of which model to use stays with the user.</summary>
+    [JsonPropertyName("modelDeselected")]
+    public bool? ModelDeselected { get; set; }
+
+    /// <summary>Providers removed because one of the withdrawn models was the last entry referencing them. A provider that merely has no models is not removed.</summary>
+    [JsonPropertyName("providersRemoved")]
+    public IList<string> ProvidersRemoved { get => field ??= []; set; }
+
+    /// <summary>Selection ids that were registered and are now withdrawn. Excludes requested ids that were not present.</summary>
+    [JsonPropertyName("withdrawn")]
+    public IList<string> Withdrawn { get => field ??= []; set; }
+}
+
+/// <summary>Host-managed model selection ids to withdraw from the session's BYOK registry.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class ProviderWithdrawRequest
+{
+    /// <summary>Provider-qualified selection ids to withdraw. Ids that are not registered are ignored, so withdrawal is idempotent. A provider left with no models referencing it is removed too.</summary>
+    [JsonPropertyName("models")]
+    public IList<string> Models { get => field ??= []; 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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class CapiSessionOptions
+{
+    /// <summary>Routing preference for sessions whose model is `auto`. On create or cold resume, this establishes the preference sent as `tier` on CAPI `/auto` requests; when omitted on cold resume, the runtime restores the last committed preference. On resident resume, a different value requests a safe switch after resume succeeds and cannot change an in-flight turn. Successful switches are persisted for later cold resume. When no preference is supplied or restored, CAPI default routing is used. `fast` is an integrator-only latency preset, not a first-party GitHub Copilot product preference.</summary>
+    [JsonPropertyName("autoTier")]
+    public AutoTier? AutoTier { get; set; }
+
+    /// <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(global::GitHub.Copilot.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(global::GitHub.Copilot.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>The product serving the model, reported in telemetry as `model_provider`. Set it when `type` alone cannot identify the product, such as Ollama or LM Studio behind an OpenAI-compatible endpoint. Only affects telemetry.</summary>
+    [JsonPropertyName("modelProvider")]
+    public ProviderConfigModelProvider? ModelProvider { 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>
+/// 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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class SessionUpdateOptionsParams
+{
+    /// <summary>Additional content-exclusion policies to merge into the session's policy set.</summary>
+    [Experimental(global::GitHub.Copilot.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>Explicit discovery-only agent roots, separate from customAgents and filesystem grants. Available without enableConfigDiscovery, subject to managed/source disables. Relative SDK paths resolve once when supplied against the request's effective workingDirectory; retained roots do not move on cwd changes. Null and omission are equivalent; [] clears only the explicit SDK contribution.</summary>
+    [JsonPropertyName("agentDirectories")]
+    public IList<string>? AgentDirectories { 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 repository-origin file hooks from `.github/hooks/` and trusted repository-configured roots. Does not control explicit hookDirectories or SDK callback hooks.</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 skill loading is enabled. Explicit false disables every source, including explicit SDK roots and a bound SDK provider; changing the value invalidates the loaded skill snapshot. When omitted, creation falls back to enableConfigDiscovery unless explicit SDK skill roots or an SDK skill provider are supplied.</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>Explicit discovery-only file-hook roots, separate from callback hooks and filesystem grants. Available without enableConfigDiscovery or enableFileHooks, which controls repository-origin hooks only; hook/managed disables still apply. Relative SDK paths resolve once when supplied against the request's effective workingDirectory; retained roots do not move on cwd changes. Null and omission are equivalent; [] clears only the explicit SDK contribution.</summary>
+    [JsonPropertyName("hookDirectories")]
+    public IList<string>? HookDirectories { get; set; }
+
+    /// <summary>Skill scan directories and descendants excluded from discovery. Supports `~`-relative paths.</summary>
+    [JsonPropertyName("ignoredSkillsLocations")]
+    public IList<string>? IgnoredSkillsLocations { 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>Explicit discovery-only instruction roots using existing SDK instruction formats, not filesystem grants. Available without enableConfigDiscovery, subject to instruction/managed disables. Relative SDK paths resolve once when supplied against the request's effective workingDirectory; retained roots do not move on cwd changes. Null and omission are equivalent; [] clears only the explicit SDK contribution.</summary>
+    [JsonPropertyName("instructionDirectories")]
+    public IList<string>? InstructionDirectories { 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. Settings-derived origins (never_configured, user_enabled, user_disabled, repository_policy) let managed policy floor a host preference; explicit below-floor changes remain policy conflicts unless a session opt-out is authorized. Also used for telemetry provenance.</summary>
+    [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+    [JsonPropertyName("sandboxConfigSource")]
+    public 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")]
+#else
+    [Obsolete("This member is deprecated and will be removed in a future version.")]
+#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>Explicit discovery-only skill roots, not filesystem grants. Available without enableConfigDiscovery, subject to skill/managed disables. Relative SDK paths resolve once when supplied against the request's effective workingDirectory; retained roots do not move on cwd changes. Null and omission are equivalent; [] clears only the explicit SDK contribution.</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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class SessionExtensionsReloadRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Identifies the target session.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class SessionExtensionsReconcileRequest
+{
+    /// <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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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 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>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(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class TaskCompleteData
+{
+    /// <summary>Structured blocker details when outcome is blocked.</summary>
+    [JsonPropertyName("blocker")]
+    public TaskBlocker? Blocker { get; set; }
+
+    /// <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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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>Path reported in the shell session's filesystem namespace when shell output exceeded the configured large-output threshold.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("outputFilePath")]
+    public string? OutputFilePath { 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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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>PowerShell process flags applied to built-in and user-requested shell commands.</summary>
-    [JsonPropertyName("shellProcessFlags")]
-    public IList<string>? ShellProcessFlags { get; set; }
+    /// <summary>Whether post-tool-use failure hooks have already processed this result.</summary>
+    [JsonPropertyName("postToolUseFailureHooksProcessed")]
+    public bool? PostToolUseFailureHooksProcessed { get; set; }
 
-    /// <summary>Additional directories to search for skills.</summary>
-    [JsonPropertyName("skillDirectories")]
-    public IList<string>? SkillDirectories { get; set; }
+    /// <summary>Execution outcome classification.</summary>
+    [JsonPropertyName("resultType")]
+    public ToolResultType ResultType { get; set; }
 
-    /// <summary>Whether to skip loading custom instruction sources.</summary>
-    [JsonPropertyName("skipCustomInstructions")]
-    public bool? SkipCustomInstructions { get; set; }
+    /// <summary>Detailed log content available for session display.</summary>
+    [JsonPropertyName("sessionLog")]
+    public string? SessionLog { get; set; }
 
-    /// <summary>Whether to skip embedding retrieval pipeline initialization and execution.</summary>
-    [JsonPropertyName("skipEmbeddingRetrieval")]
-    public bool? SkipEmbeddingRetrieval { get; set; }
+    /// <summary>Skill invocation metadata produced by the tool.</summary>
+    [JsonPropertyName("skillInvocation")]
+    public JsonElement? SkillInvocation { 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>Whether large-output post-processing should be skipped.</summary>
+    [JsonPropertyName("skipLargeOutputProcessing")]
+    public bool? SkipLargeOutputProcessing { get; set; }
 
-    /// <summary>Controls how availableTools (allowlist) and excludedTools (denylist) combine when both are set.</summary>
-    [JsonPropertyName("toolFilterPrecedence")]
-    public OptionsUpdateToolFilterPrecedence? ToolFilterPrecedence { get; set; }
+    /// <summary>Structured result content in addition to the model-facing text.</summary>
+    [JsonPropertyName("structuredContent")]
+    public JsonElement? StructuredContent { get; set; }
 
-    /// <summary>Optional path for trajectory output.</summary>
-    [JsonPropertyName("trajectoryFile")]
-    public string? TrajectoryFile { get; set; }
+    /// <summary>Completion-review decision produced by the task-completion tool.</summary>
+    [JsonPropertyName("taskCompletionDecision")]
+    public TaskCompletionDecision? TaskCompletionDecision { get; set; }
 
-    /// <summary>Output verbosity level for supported models.</summary>
-    [JsonPropertyName("verbosity")]
-    public Verbosity? Verbosity { get; set; }
+    /// <summary>Text result returned to the model.</summary>
+    [JsonPropertyName("textResultForLlm")]
+    public string TextResultForLlm { get; set; } = string.Empty;
 
-    /// <summary>Absolute working-directory path for shell tools.</summary>
-    [JsonPropertyName("workingDirectory")]
-    public string? WorkingDirectory { get; set; }
+    /// <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>Parameters for (re)loading the merged LSP configuration set.</summary>
+/// <summary>Task-completion tool arguments and final result used to build a label-safe session event payload.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class LspInitializeRequest
+internal sealed class ToolsTaskCompleteEventDataRequest
 {
-    /// <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>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>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>Arguments supplied to the completed task_complete tool call.</summary>
+    [JsonPropertyName("toolArgs")]
+    public JsonElement ToolArgs { get; set; }
 }
 
-/// <summary>Discovered extension metadata, including source-qualified ID, name, discovery source, status, and optional process ID.</summary>
+/// <summary>Indicates whether the external tool call result was handled successfully.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class Extension
+public sealed class HandlePendingToolCallResult
 {
-    /// <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>Whether the tool call result was handled successfully.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
 }
 
-/// <summary>Extensions discovered for the session, with their current status.</summary>
+/// <summary>Pending external tool call request ID, with the tool result or an error describing why it failed.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ExtensionList
+internal sealed class HandlePendingToolCallRequest
 {
-    /// <summary>Discovered extensions and their current status.</summary>
-    [JsonPropertyName("extensions")]
-    public IList<Extension> Extensions { get => field ??= []; set; }
-}
+    /// <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>Identifies the target session.</summary>
-[Experimental(global::GitHub.Copilot.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>
+/// <summary>External tool call of the session or one of its sub-agents that is still waiting for session.tools.handlePendingToolCall.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class ExtensionsEnableRequest
+public sealed class PendingExternalToolRequest
 {
-    /// <summary>Source-qualified extension ID to enable.</summary>
-    [JsonPropertyName("id")]
-    public string Id { get; set; } = string.Empty;
+    /// <summary>Sub-agent instance identifier (the envelope agentId of its events) of the agent that issued the call; absent for calls issued by the root agent.</summary>
+    [JsonPropertyName("agentId")]
+    public string? AgentId { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Arguments to pass to the external tool.</summary>
+    [JsonPropertyName("arguments")]
+    public JsonElement? Arguments { get; set; }
+
+    /// <summary>Stable identity of the provider that offered the tool, for hosts that route extension-owned tools by provider.</summary>
+    [JsonPropertyName("providerId")]
+    public string? ProviderId { get; set; }
+
+    /// <summary>Request ID to pass to session.tools.handlePendingToolCall.</summary>
+    [JsonPropertyName("requestId")]
+    public string RequestId { get; set; } = string.Empty;
+
+    /// <summary>Tool call ID assigned to this external tool invocation.</summary>
+    [JsonPropertyName("toolCallId")]
+    public string ToolCallId { get; set; } = string.Empty;
+
+    /// <summary>Name of the external tool to invoke.</summary>
+    [JsonPropertyName("toolName")]
+    public string ToolName { get; set; } = string.Empty;
 }
 
-/// <summary>Source-qualified extension identifier to disable for the session.</summary>
+/// <summary>External tool calls still waiting for a result.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class ExtensionsDisableRequest
+public sealed class PendingExternalToolRequestList
 {
-    /// <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>External tool calls of the session and its sub-agents that session.tools.handlePendingToolCall would still accept, in the order they were requested. Includes calls that were pending when the session was last suspended and resumed with pending work continued, so a host that did not observe the original external_tool.requested event can answer them.</summary>
+    [JsonPropertyName("items")]
+    public IList<PendingExternalToolRequest> Items { get => field ??= []; set; }
 }
 
-/// <summary>Identifies the target session.</summary>
+/// <summary>No parameters; returns the external tool calls of the session and its sub-agents that are still waiting for a result.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionExtensionsReloadRequest
+internal sealed class ToolsListPendingRequestsRequest
 {
     /// <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>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(global::GitHub.Copilot.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 ToolsInitializeAndValidateResult
 {
-    /// <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>
+/// <summary>Identifies the target session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class PushAttachmentFileLineRange
+internal sealed class SessionToolsInitializeAndValidateRequest
 {
-    /// <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>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>File attachment.</summary>
-/// <remarks>The <c>file</c> variant of <see cref="PushAttachment"/>.</remarks>
+/// <summary>Lightweight metadata for a currently initialized session tool.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PushAttachmentFile : PushAttachment
+public sealed class CurrentToolMetadata
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "file";
+    /// <summary>Whether the tool is loaded on demand via tool search.</summary>
+    [JsonPropertyName("deferLoading")]
+    public bool? DeferLoading { get; set; }
 
-    /// <summary>User-facing display name for the attachment.</summary>
-    [JsonPropertyName("displayName")]
-    public required string DisplayName { get; set; }
+    /// <summary>Tool description.</summary>
+    [JsonPropertyName("description")]
+    public string Description { get; set; } = string.Empty;
 
-    /// <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>JSON Schema for tool input.</summary>
+    [JsonPropertyName("input_schema")]
+    public IDictionary<string, JsonElement>? InputSchema { get; set; }
 
-    /// <summary>Absolute file path.</summary>
-    [JsonPropertyName("path")]
-    public required string Path { get; set; }
-}
+    /// <summary>MCP server name for MCP-backed tools.</summary>
+    [JsonPropertyName("mcpServerName")]
+    public string? McpServerName { get; set; }
 
-/// <summary>Directory attachment.</summary>
-/// <remarks>The <c>directory</c> variant of <see cref="PushAttachment"/>.</remarks>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PushAttachmentDirectory : PushAttachment
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "directory";
+    /// <summary>Raw MCP tool name for MCP-backed tools.</summary>
+    [JsonPropertyName("mcpToolName")]
+    public string? McpToolName { get; set; }
 
-    /// <summary>User-facing display name for the attachment.</summary>
-    [JsonPropertyName("displayName")]
-    public required string DisplayName { get; set; }
+    /// <summary>Model-facing tool name.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
 
-    /// <summary>Absolute directory path.</summary>
-    [JsonPropertyName("path")]
-    public required string Path { get; set; }
+    /// <summary>Optional MCP/config namespaced tool name.</summary>
+    [JsonPropertyName("namespacedName")]
+    public string? NamespacedName { get; set; }
 }
 
-/// <summary>End position of the selection.</summary>
+/// <summary>Current lightweight tool metadata snapshot for the session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class PushAttachmentSelectionDetailsEnd
+public sealed class ToolsGetCurrentMetadataResult
 {
-    /// <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>Current tool metadata, or null when tools have not been initialized yet.</summary>
+    [JsonPropertyName("tools")]
+    public IList<CurrentToolMetadata>? Tools { get; set; }
 }
 
-/// <summary>Start position of the selection.</summary>
+/// <summary>Identifies the target session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class PushAttachmentSelectionDetailsStart
+internal sealed class SessionToolsGetCurrentMetadataRequest
 {
-    /// <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>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Position range of the selection within the file.</summary>
+/// <summary>Empty result after replacing the calling connection's externally implemented tools.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class PushAttachmentSelectionDetails
+public sealed class ToolsSetResult
 {
-    /// <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>
+/// <summary>Serializable definition of a caller-implemented tool whose execution is handled over the SDK connection.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PushAttachmentSelection : PushAttachment
+public sealed class ProtocolExternalToolDefinition
 {
-    /// <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>Tool-loading deferral policy.</summary>
+    [JsonPropertyName("defer")]
+    public ProtocolExternalToolDefer? Defer { get; set; }
 
-    /// <summary>Absolute path to the file containing the selection.</summary>
-    [JsonPropertyName("filePath")]
-    public required string FilePath { get; set; }
+    /// <summary>Model-visible explanation of what the tool does.</summary>
+    [JsonPropertyName("description")]
+    public string Description { get; set; } = string.Empty;
 
-    /// <summary>Position range of the selection within the file.</summary>
-    [JsonPropertyName("selection")]
-    public required PushAttachmentSelectionDetails Selection { get; set; }
+    /// <summary>Whether the tool executes commands in a terminal.</summary>
+    [JsonPropertyName("isTerminal")]
+    public bool? IsTerminal { get; set; }
 
-    /// <summary>The selected text content.</summary>
-    [JsonPropertyName("text")]
-    public required string Text { get; set; }
-}
+    /// <summary>Optional caller-defined metadata associated with the tool.</summary>
+    [JsonPropertyName("metadata")]
+    public IDictionary<string, JsonElement>? Metadata { get; set; }
 
-/// <summary>GitHub issue, pull request, or discussion reference.</summary>
-/// <remarks>The <c>github_reference</c> variant of <see cref="PushAttachment"/>.</remarks>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PushAttachmentGitHubReference : PushAttachment
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "github_reference";
+    /// <summary>Unique model-visible tool name.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
 
-    /// <summary>Issue, pull request, or discussion number.</summary>
-    [JsonPropertyName("number")]
-    public required long Number { get; set; }
+    /// <summary>Whether this definition replaces a built-in tool with the same name.</summary>
+    [JsonPropertyName("overridesBuiltInTool")]
+    public bool? OverridesBuiltInTool { get; set; }
 
-    /// <summary>Type of GitHub reference.</summary>
-    [JsonPropertyName("referenceType")]
-    public required PushAttachmentGitHubReferenceType ReferenceType { get; set; }
+    /// <summary>JSON Schema describing the tool's input arguments.</summary>
+    [JsonPropertyName("parameters")]
+    public IDictionary<string, JsonElement>? Parameters { get; set; }
 
-    /// <summary>Current state of the referenced item (e.g., open, closed, merged).</summary>
-    [JsonPropertyName("state")]
-    public required string State { get; set; }
+    /// <summary>Whether execution bypasses the normal tool permission prompt.</summary>
+    [JsonPropertyName("skipPermission")]
+    public bool? SkipPermission { get; set; }
 
-    /// <summary>Title of the referenced item.</summary>
+    /// <summary>Optional human-readable display title.</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; }
+    public string? Title { get; set; }
 }
 
-/// <summary>Pointer to a GitHub repository.</summary>
+/// <summary>Complete externally implemented tool list for the calling connection. An empty list removes every tool previously supplied by that connection.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class PushGitHubRepoRef
+internal sealed class ToolsSetRequest
 {
-    /// <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>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 
-    /// <summary>Repository owner login (user or organization).</summary>
-    [JsonPropertyName("owner")]
-    public string Owner { get; set; } = string.Empty;
+    /// <summary>Complete replacement list for the calling connection.</summary>
+    [JsonPropertyName("tools")]
+    public IList<ProtocolExternalToolDefinition> Tools { get => field ??= []; set; }
 }
 
-/// <summary>Pointer to a GitHub commit.</summary>
-/// <remarks>The <c>github_commit</c> variant of <see cref="PushAttachment"/>.</remarks>
+/// <summary>Empty result after applying subagent settings.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PushAttachmentGitHubCommit : PushAttachment
+public sealed class ToolsUpdateSubagentSettingsResult
 {
-    /// <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>
+/// <summary>Subagent model, reasoning effort, context tier, and auto-invocation settings.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PushAttachmentGitHubRelease : PushAttachment
+public sealed class SubagentSettingsEntry
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "github_release";
+    /// <summary>Whether this agent's runtime-defined proactive invocation prompting is enabled, if supported. Currently consumed by the built-in rubber-duck agent.</summary>
+    [JsonPropertyName("autoInvoke")]
+    public bool? AutoInvoke { get; set; }
 
-    /// <summary>Human-readable release name.</summary>
-    [JsonPropertyName("name")]
-    public required string Name { get; set; }
+    /// <summary>Context tier override for matching subagents.</summary>
+    [JsonPropertyName("contextTier")]
+    public SubagentSettingsEntryContextTier? ContextTier { get; set; }
 
-    /// <summary>Repository the release belongs to.</summary>
-    [JsonPropertyName("repo")]
-    public required PushGitHubRepoRef Repo { get; set; }
+    /// <summary>Reasoning effort override for matching subagents.</summary>
+    [JsonPropertyName("effortLevel")]
+    public string? EffortLevel { get; set; }
 
-    /// <summary>Git tag the release is anchored to.</summary>
-    [JsonPropertyName("tagName")]
-    public required string TagName { get; set; }
+    /// <summary>Model override for matching subagents.</summary>
+    [JsonPropertyName("model")]
+    public string? Model { get; set; }
 
-    /// <summary>URL to the release on GitHub.</summary>
-    [JsonPropertyName("url")]
-    public required string Url { get; set; }
+    /// <summary>Whether the configured model strategy is preferred or required.</summary>
+    [JsonPropertyName("modelPolicy")]
+    public AgentModelPolicy? ModelPolicy { get; set; }
 }
 
-/// <summary>Pointer to a GitHub Actions job.</summary>
-/// <remarks>The <c>github_actions_job</c> variant of <see cref="PushAttachment"/>.</remarks>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PushAttachmentGitHubActionsJob : PushAttachment
+/// <summary>Configured per-agent subagent overrides.</summary>
+public sealed class UpdateSubagentSettingsRequestSubagents
 {
-    /// <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>Per-agent settings keyed by subagent agent_type.</summary>
+    [JsonPropertyName("agents")]
+    public IDictionary<string, SubagentSettingsEntry>? Agents { get; set; }
 
-/// <summary>Pointer to a GitHub repository.</summary>
-/// <remarks>The <c>github_repository</c> variant of <see cref="PushAttachment"/>.</remarks>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PushAttachmentGitHubRepository : PushAttachment
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "github_repository";
+    /// <summary>Names of subagents the user has turned off; they cannot be dispatched.</summary>
+    [JsonPropertyName("disabledSubagents")]
+    public IList<string>? DisabledSubagents { get; set; }
 
-    /// <summary>Short description of the repository.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("description")]
-    public string? Description { 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>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>Maximum subagent nesting depth; applies to usage-based billing users only.</summary>
+    [JsonPropertyName("maxDepth")]
+    public int? MaxDepth { get; set; }
+}
 
-    /// <summary>Repository pointer.</summary>
-    [JsonPropertyName("repo")]
-    public required PushGitHubRepoRef Repo { get; set; }
+/// <summary>Subagent settings to apply to the current session.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class UpdateSubagentSettingsRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 
-    /// <summary>URL to the repository on GitHub.</summary>
-    [JsonPropertyName("url")]
-    public required string Url { get; set; }
+    /// <summary>Subagent settings to apply, or null to clear the live session override.</summary>
+    [JsonPropertyName("subagents")]
+    public UpdateSubagentSettingsRequestSubagents? Subagents { get; set; }
 }
 
-/// <summary>One side of a file diff (head or base).</summary>
+/// <summary>RPC data type for SessionCommandsList operations.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class PushAttachmentGitHubFileDiffSide
+public sealed class SessionCommandsListRequest
 {
-    /// <summary>Repository-relative path to the file.</summary>
-    [JsonPropertyName("path")]
-    public string Path { get; set; } = string.Empty;
+    /// <summary>Include runtime built-in commands.</summary>
+    [JsonPropertyName("includeBuiltins")]
+    public bool? IncludeBuiltins { get; set; }
 
-    /// <summary>Git ref (branch, tag, or commit SHA) the file is read at.</summary>
-    [JsonPropertyName("ref")]
-    public string Ref { get; set; } = string.Empty;
+    /// <summary>Include commands registered by protocol clients, including SDK clients and extensions.</summary>
+    [JsonPropertyName("includeClientCommands")]
+    public bool? IncludeClientCommands { get; set; }
 
-    /// <summary>Repository the file lives in.</summary>
-    [JsonPropertyName("repo")]
-    public PushGitHubRepoRef Repo { get => field ??= new(); set; }
+    /// <summary>Include enabled user-invocable skills and commands.</summary>
+    [JsonPropertyName("includeSkills")]
+    public bool? IncludeSkills { 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>RPC data type for SessionCommandsListRequestWithSession operations.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PushAttachmentGitHubFileDiff : PushAttachment
+internal sealed class SessionCommandsListRequestWithSession
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "github_file_diff";
+    /// <summary>Include runtime built-in commands.</summary>
+    [JsonPropertyName("includeBuiltins")]
+    public bool? IncludeBuiltins { get; set; }
 
-    /// <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>Include commands registered by protocol clients, including SDK clients and extensions.</summary>
+    [JsonPropertyName("includeClientCommands")]
+    public bool? IncludeClientCommands { 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>Include enabled user-invocable skills and commands.</summary>
+    [JsonPropertyName("includeSkills")]
+    public bool? IncludeSkills { 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>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>One side of a tree comparison (head or base).</summary>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class PushAttachmentGitHubTreeComparisonSide
+[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>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>The type discriminator.</summary>
+    [JsonPropertyName("kind")]
+    public virtual string Kind { 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>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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PushAttachmentGitHubTreeComparison : PushAttachment
+public partial class SlashCommandInvocationResultText : SlashCommandInvocationResult
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Type => "github_tree_comparison";
+    public override string Kind => "text";
 
-    /// <summary>Base side of the comparison.</summary>
-    [JsonPropertyName("base")]
-    public required PushAttachmentGitHubTreeComparisonSide Base { get; set; }
+    /// <summary>Whether text contains Markdown.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("markdown")]
+    public bool? Markdown { get; set; }
 
-    /// <summary>Head side of the comparison.</summary>
-    [JsonPropertyName("head")]
-    public required PushAttachmentGitHubTreeComparisonSide Head { get; set; }
+    /// <summary>Whether ANSI sequences should be preserved.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("preserveAnsi")]
+    public bool? PreserveAnsi { get; set; }
 
-    /// <summary>URL to the comparison on GitHub.</summary>
-    [JsonPropertyName("url")]
-    public required string Url { 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>Generic GitHub URL reference.</summary>
-/// <remarks>The <c>github_url</c> variant of <see cref="PushAttachment"/>.</remarks>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PushAttachmentGitHubUrl : PushAttachment
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "github_url";
+    /// <summary>Present when the invocation changed the sandbox for this session only. Nothing was persisted, so consumers must mirror the change onto the live session rather than reloading settings, and must not treat it as a settings change.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("sandboxSessionChange")]
+    public SandboxSessionChange? SandboxSessionChange { get; set; }
 
-    /// <summary>URL to the GitHub resource.</summary>
-    [JsonPropertyName("url")]
-    public required string Url { get; set; }
+    /// <summary>Text output for the client to render.</summary>
+    [JsonPropertyName("text")]
+    public required string Text { 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>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PushAttachmentGitHubFile : PushAttachment
+public partial class SlashCommandInvocationResultAgentPrompt : SlashCommandInvocationResult
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Type => "github_file";
+    public override string Kind => "agent-prompt";
 
-    /// <summary>Repository-relative path to the file.</summary>
-    [JsonPropertyName("path")]
-    public required string Path { get; set; }
+    /// <summary>Prompt text to display to the user.</summary>
+    [JsonPropertyName("displayPrompt")]
+    public required string DisplayPrompt { 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>Optional target session mode for the agent prompt.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("mode")]
+    public SessionMode? Mode { get; set; }
 
-    /// <summary>Repository the file lives in.</summary>
-    [JsonPropertyName("repo")]
-    public required PushGitHubRepoRef Repo { 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>URL to the file on GitHub.</summary>
-    [JsonPropertyName("url")]
-    public required string Url { 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>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>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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PushAttachmentGitHubSnippet : PushAttachment
+public partial class SlashCommandInvocationResultCompleted : SlashCommandInvocationResult
 {
     /// <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; }
+    public override string Kind => "completed";
 
-    /// <summary>Git ref the file is read at (branch, tag, or commit SHA).</summary>
-    [JsonPropertyName("ref")]
-    public required string Ref { get; set; }
+    /// <summary>Optional user-facing message describing the completed command.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("message")]
+    public string? Message { get; set; }
 
-    /// <summary>Repository the file lives in.</summary>
-    [JsonPropertyName("repo")]
-    public required PushGitHubRepoRef Repo { get; set; }
+    /// <summary>Optional target session mode applied without submitting an agent prompt.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("mode")]
+    public SessionMode? Mode { get; set; }
 
-    /// <summary>URL to the snippet on GitHub (with line anchor).</summary>
-    [JsonPropertyName("url")]
-    public required string Url { 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>Blob attachment with inline base64-encoded data.</summary>
-/// <remarks>The <c>blob</c> variant of <see cref="PushAttachment"/>.</remarks>
+/// <summary>Selectable slash-command subcommand option with name, description, and optional group label.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PushAttachmentBlob : PushAttachment
+public sealed class SlashCommandSelectSubcommandOption
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "blob";
-
-    /// <summary>Base64-encoded content.</summary>
-    [Base64String]
-    [JsonPropertyName("data")]
-    public required string Data { get; set; }
+    /// <summary>Human-readable description of the subcommand.</summary>
+    [JsonPropertyName("description")]
+    public string Description { get; set; } = string.Empty;
 
-    /// <summary>User-facing display name for the attachment.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("displayName")]
-    public string? DisplayName { get; set; }
+    /// <summary>Optional group label for organizing options.</summary>
+    [JsonPropertyName("group")]
+    public string? Group { get; set; }
 
-    /// <summary>MIME type of the inline data.</summary>
-    [JsonPropertyName("mimeType")]
-    public required string MimeType { get; set; }
+    /// <summary>Subcommand name to invoke.</summary>
+    [JsonPropertyName("name")]
+    public string Name { 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>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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PushAttachmentExtensionContext : PushAttachment
+public partial class SlashCommandInvocationResultSelectSubcommand : SlashCommandInvocationResult
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Type => "extension_context";
+    public override string Kind => "select-subcommand";
 
-    /// <summary>Caller-supplied JSON payload (required, may be null but not undefined).</summary>
-    [JsonPropertyName("payload")]
-    public required JsonElement Payload { get; set; }
+    /// <summary>Parent command name that requires subcommand selection.</summary>
+    [JsonPropertyName("command")]
+    public required string Command { 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)]
+    /// <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>Parameters for session.extensions.sendAttachmentsToMessage.</summary>
+/// <summary>RPC data type for SlashCommandTimelineEntry operations.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SendAttachmentsToMessageParams
+public sealed class SlashCommandTimelineEntry
 {
-    /// <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>What the user must do to recover, when the entry reports a failure the runtime knows an action for. The `text` never names a client affordance, so a client that offers one renders it from this value.</summary>
+    [JsonPropertyName("remediation")]
+    public RemediationAction? Remediation { 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>Text displayed for the timeline entry.</summary>
+    [JsonPropertyName("text")]
+    public string Text { get; set; } = string.Empty;
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { 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>A tool name and arguments to execute through the session's native invocation pipeline.</summary>
+/// <summary>The <c>add-timeline-entry</c> variant of <see cref="SlashCommandInvocationResult"/>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class ToolsExecuteRequest
+public partial class SlashCommandInvocationResultAddTimelineEntry : SlashCommandInvocationResult
 {
-    /// <summary>Arguments supplied to the tool.</summary>
-    [JsonPropertyName("arguments")]
-    public JsonElement Arguments { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "add-timeline-entry";
 
-    /// <summary>Name of the currently offered tool to execute.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Timeline entry the host should append.</summary>
+    [JsonPropertyName("entry")]
+    public required SlashCommandTimelineEntry Entry { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Optional text the host should prefill into the input editor.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("prefillInput")]
+    public string? PrefillInput { get; set; }
 
-    /// <summary>Optional identifier used to correlate this invocation with its tool call.</summary>
-    [JsonPropertyName("toolCallId")]
-    public string? ToolCallId { get; set; }
+    /// <summary>Whether command execution changed persisted runtime settings.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("runtimeSettingsChanged")]
+    public bool? RuntimeSettingsChanged { get; set; }
 }
 
-/// <summary>Custom grammar input format accepted by a built-in tool.</summary>
+/// <summary>RPC data type for SlashCommandModelPickerDialog operations.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class BuiltinToolFormat
+public sealed class SlashCommandModelPickerDialog
 {
-    /// <summary>Grammar definition accepted by the tool.</summary>
-    [JsonPropertyName("definition")]
-    public string Definition { get; set; } = string.Empty;
+    /// <summary>Discriminator for a model-picker dialog.</summary>
+    [JsonPropertyName("kind")]
+    public string Kind { get; set; } = string.Empty;
 
-    /// <summary>Grammar syntax used by the format definition.</summary>
-    [JsonPropertyName("syntax")]
-    public string Syntax { get; set; } = string.Empty;
+    /// <summary>Model that should be enabled before it can be selected.</summary>
+    [JsonPropertyName("modelToEnable")]
+    public string? ModelToEnable { get; set; }
 
-    /// <summary>Custom input-format discriminator.</summary>
-    [JsonPropertyName("type")]
-    public BuiltinToolFormatType Type { 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>JSON Schema object accepted by a built-in tool.</summary>
+/// <summary>The <c>show-dialog</c> variant of <see cref="SlashCommandInvocationResult"/>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class BuiltinToolInputSchema
+public partial class SlashCommandInvocationResultShowDialog : SlashCommandInvocationResult
 {
-    /// <summary>Root type of the tool input schema.</summary>
-    [JsonPropertyName("type")]
-    public BuiltinToolInputSchemaType Type { get; set; }
+    /// <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>Rust-owned metadata and input schema for a built-in tool.</summary>
+/// <summary>The <c>set-model</c> variant of <see cref="SlashCommandInvocationResult"/>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class BuiltinToolDescriptor
+public partial class SlashCommandInvocationResultSetModel : SlashCommandInvocationResult
 {
-    /// <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; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "set-model";
 
-    /// <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>Auto routing profile selected by the command, when the model is Auto.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("autoTier")]
+    public AutoTier? AutoTier { get; set; }
 
-    /// <summary>Optional supplemental usage instructions for the tool.</summary>
-    [JsonPropertyName("instructions")]
-    public string? Instructions { get; set; }
+    /// <summary>Model selected by the command.</summary>
+    [JsonPropertyName("model")]
+    public required string Model { get; set; }
 
-    /// <summary>Whether the tool executes commands in a terminal.</summary>
-    [JsonPropertyName("isTerminal")]
-    public bool IsTerminal { get; set; }
+    /// <summary>Reasoning effort selected for the model.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("reasoningEffort")]
+    public string? ReasoningEffort { get; set; }
 
-    /// <summary>Stable name used to invoke the built-in tool.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Repository settings scope modified by the command.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("repoScope")]
+    public string? RepoScope { get; set; }
 
-    /// <summary>Policy describing which tool metadata may be recorded without obfuscation.</summary>
-    [JsonPropertyName("safeForTelemetry")]
-    public JsonElement SafeForTelemetry { get; set; }
+    /// <summary>User-settings snapshot to restore if the host cancels the model switch.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("revertOnCancel")]
+    public IDictionary<string, JsonElement>? RevertOnCancel { get; set; }
 
-    /// <summary>Optional human-readable title for the tool.</summary>
-    [JsonPropertyName("title")]
-    public string? Title { get; set; }
+    /// <summary>Whether command execution changed persisted runtime settings.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("runtimeSettingsChanged")]
+    public bool? RuntimeSettingsChanged { get; set; }
 
-    /// <summary>Optional tool category discriminator.</summary>
-    [JsonPropertyName("type")]
-    public string? Type { get; set; }
-}
+    /// <summary>Settings scope modified by the command.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("scope")]
+    public string? Scope { get; set; }
 
-/// <summary>Rust-owned built-in tool descriptors for the session.</summary>
-[Experimental(global::GitHub.Copilot.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>User-facing warning produced while selecting the model.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("warning")]
+    public string? Warning { get; set; }
 }
 
-/// <summary>Shell-specific names and description lines used to materialize built-in shell tool descriptors.</summary>
+/// <summary>The <c>set-plan-model</c> variant of <see cref="SlashCommandInvocationResult"/>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ToolsShellDescriptorConfig
+public partial class SlashCommandInvocationResultSetPlanModel : SlashCommandInvocationResult
 {
-    /// <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;
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "set-plan-model";
 
-    /// <summary>Tool name used to start shell commands.</summary>
-    [JsonPropertyName("shellToolName")]
-    public string ShellToolName { get; set; } = string.Empty;
+    /// <summary>User-facing confirmation message for the plan-model selection.</summary>
+    [JsonPropertyName("message")]
+    public required string Message { get; set; }
 
-    /// <summary>Stable shell type identifier.</summary>
-    [JsonPropertyName("shellType")]
-    public string ShellType { get; set; } = string.Empty;
+    /// <summary>Dedicated model selected for plan mode.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("planModel")]
+    public string? PlanModel { get; set; }
 
-    /// <summary>Tool name used to stop shell commands.</summary>
-    [JsonPropertyName("stopShellToolName")]
-    public string StopShellToolName { get; set; } = string.Empty;
+    /// <summary>Whether command execution changed persisted runtime settings.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("runtimeSettingsChanged")]
+    public bool? RuntimeSettingsChanged { get; set; }
 }
 
-/// <summary>Options controlling how Rust-owned built-in tool descriptors are materialized.</summary>
+/// <summary>Slash command name and optional raw input string to invoke.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class ToolsGetBuiltinDescriptorsRequest
+internal sealed class CommandsInvokeRequest
 {
-    /// <summary>Whether background task completion notifications are enabled.</summary>
-    [JsonPropertyName("backgroundTaskNotificationsEnabled")]
-    public bool? BackgroundTaskNotificationsEnabled { get; set; }
+    /// <summary>Raw input after the command name.</summary>
+    [JsonPropertyName("input")]
+    public string? Input { get; set; }
 
-    /// <summary>Whether tool descriptors should include authoring metadata.</summary>
-    [JsonPropertyName("includeAuthor")]
-    public bool? IncludeAuthor { 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>Whether descriptors should favor fewer user-intervention prompts.</summary>
-    [JsonPropertyName("reduceUserIntervention")]
-    public bool? ReduceUserIntervention { get; set; }
+    /// <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>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 finalizing the invocation effect succeeded, and the failure reason when it did not.</summary>
+[Experimental(global::GitHub.Copilot.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 semantic skill lookup is available.</summary>
-    [JsonPropertyName("skillEmbeddingEnabled")]
-    public bool? SkillEmbeddingEnabled { get; set; }
+    /// <summary>Whether the pending invocation effect was finalized successfully.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
 }
 
-/// <summary>Task completion notification with summary from the agent.</summary>
+/// <summary>The pending slash-command invocation effect to finalize, plus whether the host applied or cancelled it.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class TaskCompleteData
+internal sealed class CommandsFinalizeInvocationEffectRequest
 {
-    /// <summary>Structured blocker details when outcome is blocked.</summary>
-    [JsonPropertyName("blocker")]
-    public TaskBlocker? Blocker { get; set; }
-
-    /// <summary>Active autopilot objective ID evaluated by the completion reviewer.</summary>
-    [JsonPropertyName("objectiveId")]
-    public long? ObjectiveId { get; set; }
+    /// <summary>The slash-command result object that produced the pending effect, echoed back unchanged.</summary>
+    [JsonPropertyName("effect")]
+    public IDictionary<string, JsonElement> Effect { get => field ??= new Dictionary<string, JsonElement>(); set; }
 
-    /// <summary>Semantic completion decision. Absent on legacy events and invalid tool calls.</summary>
+    /// <summary>Whether the host applied or cancelled the pending invocation effect.</summary>
     [JsonPropertyName("outcome")]
-    public TaskCompletionOutcome? Outcome { get; set; }
+    public CommandsInvocationEffectOutcome 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>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <summary>Whether the task was accepted as complete. False when validation failed or completion was rejected or blocked by the reviewer.</summary>
+/// <summary>Indicates whether the pending client-handled command was completed successfully.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class CommandsHandlePendingCommandResult
+{
+    /// <summary>Whether the command was handled successfully.</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; }
+    public bool Success { get; set; }
 }
 
-/// <summary>Binary result returned by a tool for the model.</summary>
+/// <summary>Pending command request ID and an optional error if the client handler failed.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ExternalToolTextResultForLlmBinaryResultsForLlm
+internal sealed class CommandsHandlePendingCommandRequest
 {
-    /// <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>Error message if the command handler failed.</summary>
+    [JsonPropertyName("error")]
+    public string? Error { get; set; }
 
-    /// <summary>MIME type of the binary data.</summary>
-    [JsonPropertyName("mimeType")]
-    public string MimeType { get; set; } = string.Empty;
+    /// <summary>Request ID from the command invocation event.</summary>
+    [JsonPropertyName("requestId")]
+    public string RequestId { 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>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <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>
+/// <summary>Error message produced while executing the command, if any.</summary>
 [Experimental(global::GitHub.Copilot.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
+public sealed class ExecuteCommandResult
 {
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("type")]
-    public virtual string Type { get; set; } = string.Empty;
+    /// <summary>Error message produced while executing the command, if any. Omitted when the handler succeeded.</summary>
+    [JsonPropertyName("error")]
+    public string? Error { get; set; }
 }
 
-
-/// <summary>Plain text content block.</summary>
-/// <remarks>The <c>text</c> variant of <see cref="ExternalToolTextResultForLlmContent"/>.</remarks>
+/// <summary>Slash command name and argument string to execute synchronously.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class ExternalToolTextResultForLlmContentText : ExternalToolTextResultForLlmContent
+internal sealed class ExecuteCommandParams
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "text";
+    /// <summary>Argument string to pass to the command (empty string if none).</summary>
+    [JsonPropertyName("args")]
+    public string Args { get; set; } = string.Empty;
 
-    /// <summary>The text content.</summary>
-    [JsonPropertyName("text")]
-    public required string Text { get; set; }
+    /// <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>Terminal/shell output content block with optional exit code and working directory.</summary>
-/// <remarks>The <c>terminal</c> variant of <see cref="ExternalToolTextResultForLlmContent"/>.</remarks>
+/// <summary>Indicates whether the command was accepted into the local execution queue.</summary>
+/// <remarks>Data type discriminated by <c>queued</c>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class ExternalToolTextResultForLlmContentTerminal : ExternalToolTextResultForLlmContent
+public partial class EnqueueCommandResult
 {
-    /// <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>The boolean discriminator.</summary>
+    [JsonPropertyName("queued")]
+    public bool Queued { get; set; }
 
-    /// <summary>Process exit code, if the command has completed.</summary>
+    /// <summary>Stable opaque ID of the queued command.</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; }
+    [JsonPropertyName("queueId")]
+    public string? QueueId { get; set; }
 }
 
-/// <summary>Shell command exit metadata with optional output preview.</summary>
-/// <remarks>The <c>shell_exit</c> variant of <see cref="ExternalToolTextResultForLlmContent"/>.</remarks>
+/// <summary>Slash-prefixed command string to enqueue for FIFO processing.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class ExternalToolTextResultForLlmContentShellExit : ExternalToolTextResultForLlmContent
+internal sealed class EnqueueCommandParams
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "shell_exit";
+    /// <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>Working directory where the shell command was executed.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("cwd")]
-    public string? Cwd { get; set; }
+    /// <summary>Optional user-facing text for the queue row. The command string is shown when omitted.</summary>
+    [JsonPropertyName("displayText")]
+    public string? DisplayText { get; set; }
 
-    /// <summary>Exit code from the completed shell command.</summary>
-    [JsonPropertyName("exitCode")]
-    public required long ExitCode { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <summary>Path reported in the shell session's filesystem namespace when shell output exceeded the configured large-output threshold.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("outputFilePath")]
-    public string? OutputFilePath { get; set; }
+/// <summary>Indicates whether the queued-command response was matched to a pending request.</summary>
+[Experimental(global::GitHub.Copilot.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>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>Result of the queued command execution.</summary>
+/// <remarks>Data type discriminated by <c>handled</c>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class QueuedCommandResult
+{
+    /// <summary>The boolean discriminator.</summary>
+    [JsonPropertyName("handled")]
+    public bool Handled { get; set; }
 
-    /// <summary>Whether outputPreview is known to be incomplete or truncated.</summary>
+    /// <summary>When true, the runtime will not process subsequent queued commands until a new request comes in.</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; }
+    [JsonPropertyName("stopProcessingQueue")]
+    public bool? StopProcessingQueue { get; set; }
 }
 
-/// <summary>Image content block with base64-encoded data.</summary>
-/// <remarks>The <c>image</c> variant of <see cref="ExternalToolTextResultForLlmContent"/>.</remarks>
+/// <summary>Queued-command request ID and the result indicating whether the host executed it (and whether to stop processing further queued commands).</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class ExternalToolTextResultForLlmContentImage : ExternalToolTextResultForLlmContent
+internal sealed class CommandsRespondToQueuedCommandRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "image";
+    /// <summary>Request ID from the `command.queued` event the host is responding to.</summary>
+    [JsonPropertyName("requestId")]
+    public string RequestId { get; set; } = string.Empty;
 
-    /// <summary>Base64-encoded image data.</summary>
-    [Base64String]
-    [JsonPropertyName("data")]
-    public required string Data { get; set; }
+    /// <summary>Result of the queued command execution.</summary>
+    [JsonPropertyName("result")]
+    public QueuedCommandResult Result { get => field ??= new(); set; }
 
-    /// <summary>MIME type of the image (e.g., image/png, image/jpeg).</summary>
-    [JsonPropertyName("mimeType")]
-    public required string MimeType { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Audio content block with base64-encoded data.</summary>
-/// <remarks>The <c>audio</c> variant of <see cref="ExternalToolTextResultForLlmContent"/>.</remarks>
+/// <summary>Telemetry engagement ID for the session, when available.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class ExternalToolTextResultForLlmContentAudio : ExternalToolTextResultForLlmContent
+public sealed class SessionTelemetryEngagement
 {
-    /// <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>Current telemetry engagement ID, when available.</summary>
+    [JsonPropertyName("engagementId")]
+    public string? EngagementId { get; set; }
 }
 
-/// <summary>Icon image for a resource.</summary>
+/// <summary>Identifies the target session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ExternalToolTextResultForLlmContentResourceLinkIcon
+internal sealed class SessionTelemetryGetEngagementIdRequest
 {
-    /// <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>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Resource link content block referencing an external resource.</summary>
-/// <remarks>The <c>resource_link</c> variant of <see cref="ExternalToolTextResultForLlmContent"/>.</remarks>
+/// <summary>Feature override key/value pairs to attach to subsequent telemetry events from this session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class ExternalToolTextResultForLlmContentResourceLink : ExternalToolTextResultForLlmContent
+internal sealed class TelemetrySetFeatureOverridesRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "resource_link";
+    /// <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>Human-readable description of the resource.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("description")]
-    public string? Description { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <summary>Icons associated with this resource.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("icons")]
-    public IList<ExternalToolTextResultForLlmContentResourceLinkIcon>? Icons { get; set; }
+/// <summary>Completed transient query. Ordered chunks and the terminal outcome are also delivered through `ui.ephemeral_query` session events while it runs.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class UIEphemeralQueryResult
+{
+    /// <summary>Answer returned by the model.</summary>
+    [JsonPropertyName("answer")]
+    public string Answer { get; set; } = string.Empty;
+}
 
-    /// <summary>MIME type of the resource content.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("mimeType")]
-    public string? MimeType { get; set; }
+/// <summary>Transient question to answer without adding it to conversation history.</summary>
+[Experimental(global::GitHub.Copilot.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>Resource name identifier.</summary>
-    [JsonPropertyName("name")]
-    public required string Name { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <summary>Size of the resource in bytes.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("size")]
-    public long? Size { get; set; }
+/// <summary>The elicitation response (accept with form values, decline, or cancel).</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class UIElicitationResponse
+{
+    /// <summary>MCP response metadata.</summary>
+    [JsonPropertyName("_meta")]
+    public IDictionary<string, JsonElement>? Meta { get; set; }
 
-    /// <summary>Human-readable display title for the resource.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("title")]
-    public string? Title { get; set; }
+    /// <summary>The user's response: accept (submitted), decline (rejected), or cancel (dismissed).</summary>
+    [JsonPropertyName("action")]
+    public UIElicitationResponseAction Action { get; set; }
 
-    /// <summary>URI identifying the resource.</summary>
-    [JsonPropertyName("uri")]
-    public required string Uri { 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>Embedded resource content block with inline text or binary data.</summary>
-/// <remarks>The <c>resource</c> variant of <see cref="ExternalToolTextResultForLlmContent"/>.</remarks>
+/// <summary>JSON Schema describing the form fields to present to the user.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class ExternalToolTextResultForLlmContentResource : ExternalToolTextResultForLlmContent
+public sealed class UIElicitationSchema
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "resource";
+    /// <summary>Form field definitions, keyed by field name.</summary>
+    [JsonPropertyName("properties")]
+    public IDictionary<string, JsonElement> Properties { get => field ??= new Dictionary<string, JsonElement>(); set; }
 
-    /// <summary>The embedded resource contents, either text or base64-encoded binary.</summary>
-    [JsonPropertyName("resource")]
-    public required JsonElement Resource { get; 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>A message injected by a tool result.</summary>
+/// <summary>Metadata controlling an MCP task's lifetime.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ToolResultNewMessage
+public sealed class McpTaskMetadata
 {
-    /// <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>Task time-to-live.</summary>
+    [JsonPropertyName("ttl")]
+    public long? Ttl { get; set; }
 }
 
-/// <summary>RPC data type for TaskCompletionDecision operations.</summary>
+/// <summary>Prompt message and JSON schema describing the form fields to elicit from the user.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class TaskCompletionDecision
+internal sealed class UIElicitationRequest
 {
-    /// <summary>Objective eligibility token captured when the decision was evaluated.</summary>
-    [JsonPropertyName("completionEligibilityToken")]
-    public long? CompletionEligibilityToken { get; set; }
+    /// <summary>MCP request metadata.</summary>
+    [JsonPropertyName("_meta")]
+    public IDictionary<string, JsonElement>? Meta { get; set; }
 
-    /// <summary>Whether completion was accepted after the reviewer-rejection budget was exhausted.</summary>
-    [JsonPropertyName("completionRejectionBudgetExhausted")]
-    public bool? CompletionRejectionBudgetExhausted { get; set; }
+    /// <summary>Message describing what information is needed from the user.</summary>
+    [JsonPropertyName("message")]
+    public string Message { get; set; } = string.Empty;
 
-    /// <summary>Active autopilot objective evaluated by the completion reviewer.</summary>
-    [JsonPropertyName("objectiveId")]
-    public long? ObjectiveId { get; set; }
+    /// <summary>Elicitation mode. Omitted and form are equivalent for structured elicitation.</summary>
+    [JsonPropertyName("mode")]
+    public McpElicitationFormMode? Mode { get; set; }
 
-    /// <summary>Semantic result of evaluating the task completion request.</summary>
-    [JsonPropertyName("outcome")]
-    public TaskCompletionOutcome Outcome { 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>Rationale for the completion decision, when one is available.</summary>
-    [JsonPropertyName("reason")]
-    public string? Reason { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 
-    /// <summary>Whether the rationale was derived from completion-reviewer output.</summary>
-    [JsonPropertyName("reviewerDerived")]
-    public bool? ReviewerDerived { get; set; }
+    /// <summary>MCP task metadata.</summary>
+    [JsonPropertyName("task")]
+    public McpTaskMetadata? Task { get; set; }
+}
 
-    /// <summary>Information-flow metadata captured from the completion reviewer.</summary>
-    [JsonPropertyName("reviewerResultMeta")]
-    public JsonElement? ReviewerResultMeta { get; set; }
+/// <summary>Indicates whether the elicitation response was accepted; false if it was already resolved by another client.</summary>
+[Experimental(global::GitHub.Copilot.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>Expanded canonical result returned by a session tool.</summary>
+/// <summary>Pending elicitation request ID and the user's response (accept/decline/cancel + form values).</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ToolResultExpanded
+internal sealed class UIHandlePendingElicitationRequest
 {
-    /// <summary>Base64-encoded binary results returned to the model.</summary>
-    [JsonPropertyName("binaryResultsForLlm")]
-    public IList<ExternalToolTextResultForLlmBinaryResultsForLlm>? BinaryResultsForLlm { get; set; }
+    /// <summary>The unique request ID from the elicitation.requested event.</summary>
+    [JsonPropertyName("requestId")]
+    public string RequestId { get; set; } = string.Empty;
 
-    /// <summary>Sources returned by the tool that the model may cite.</summary>
-    [JsonPropertyName("citableSources")]
-    public IList<JsonElement>? CitableSources { get; set; }
+    /// <summary>The elicitation response (accept with form values, decline, or cancel).</summary>
+    [JsonPropertyName("result")]
+    public UIElicitationResponse Result { get => field ??= new(); set; }
 
-    /// <summary>Structured content blocks returned to the model.</summary>
-    [JsonPropertyName("contents")]
-    public IList<ExternalToolTextResultForLlmContent>? Contents { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <summary>Error message for an unsuccessful execution.</summary>
-    [JsonPropertyName("error")]
-    public string? Error { get; set; }
+/// <summary>Indicates whether the pending UI request was resolved by this call.</summary>
+[Experimental(global::GitHub.Copilot.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>Metadata propagated with the tool result, including information-flow labels.</summary>
-    [JsonPropertyName("mcpMeta")]
-    public IDictionary<string, JsonElement>? McpMeta { get; set; }
+/// <summary>User response for a pending user-input request, with answer text and whether it was typed freeform.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class UIUserInputResponse
+{
+    /// <summary>The user's answer text.</summary>
+    [JsonPropertyName("answer")]
+    public string Answer { get; set; } = string.Empty;
 
-    /// <summary>Messages to inject after the tool result.</summary>
-    [JsonPropertyName("newMessages")]
-    public IList<ToolResultNewMessage>? NewMessages { get; set; }
+    /// <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(global::GitHub.Copilot.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>Whether post-tool-use failure hooks have already processed this result.</summary>
-    [JsonPropertyName("postToolUseFailureHooksProcessed")]
-    public bool? PostToolUseFailureHooksProcessed { get; set; }
+    /// <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>Execution outcome classification.</summary>
-    [JsonPropertyName("resultType")]
-    public ToolResultType ResultType { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <summary>Detailed log content available for session display.</summary>
-    [JsonPropertyName("sessionLog")]
-    public string? SessionLog { get; set; }
+/// <summary>Request ID of a pending `sampling.requested` event and an optional sampling result payload (omit to reject).</summary>
+[Experimental(global::GitHub.Copilot.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>Skill invocation metadata produced by the tool.</summary>
-    [JsonPropertyName("skillInvocation")]
-    public JsonElement? SkillInvocation { get; set; }
+    /// <summary>Optional sampling result payload. Omit to reject/cancel the sampling request without providing a result.</summary>
+    [JsonPropertyName("response")]
+    public JsonElement? Response { get; set; }
 
-    /// <summary>Whether large-output post-processing should be skipped.</summary>
-    [JsonPropertyName("skipLargeOutputProcessing")]
-    public bool? SkipLargeOutputProcessing { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <summary>Structured result content in addition to the model-facing text.</summary>
-    [JsonPropertyName("structuredContent")]
-    public JsonElement? StructuredContent { get; set; }
+/// <summary>Request ID of a pending `auto_mode_switch.requested` event and the user's response.</summary>
+[Experimental(global::GitHub.Copilot.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>Completion-review decision produced by the task-completion tool.</summary>
-    [JsonPropertyName("taskCompletionDecision")]
-    public TaskCompletionDecision? TaskCompletionDecision { get; set; }
+    /// <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>Text result returned to the model.</summary>
-    [JsonPropertyName("textResultForLlm")]
-    public string TextResultForLlm { get; set; } = string.Empty;
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <summary>Deferred tool names made available by this result.</summary>
-    [JsonPropertyName("toolReferences")]
-    public IList<string>? ToolReferences { get; set; }
+/// <summary>The user's selected action for an exhausted session limit.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class UISessionLimitsExhaustedResponse
+{
+    /// <summary>Action selected by the user.</summary>
+    [JsonPropertyName("action")]
+    public UISessionLimitsExhaustedResponseAction Action { get; set; }
 
-    /// <summary>Tool-specific telemetry payload.</summary>
-    [JsonPropertyName("toolTelemetry")]
-    public JsonElement? ToolTelemetry { get; set; }
+    /// <summary>AI Credits to add to the current max when action is 'add'.</summary>
+    [JsonPropertyName("additionalAiCredits")]
+    public double? AdditionalAiCredits { get; set; }
 
-    /// <summary>Optional UI resource produced by the tool.</summary>
-    [JsonPropertyName("uiResource")]
-    public JsonElement? UiResource { get; set; }
+    /// <summary>New absolute max AI Credits when action is 'set'.</summary>
+    [JsonPropertyName("maxAiCredits")]
+    public double? MaxAiCredits { get; set; }
 }
 
-/// <summary>Task-completion tool arguments and final result used to build a label-safe session event payload.</summary>
+/// <summary>Request ID of a pending `session_limits_exhausted.requested` event and the user's selected limit action.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class ToolsTaskCompleteEventDataRequest
+internal sealed class UIHandlePendingSessionLimitsExhaustedRequest
 {
-    /// <summary>Final expanded result returned by the task_complete tool.</summary>
-    [JsonPropertyName("finalResult")]
-    public ToolResultExpanded FinalResult { get => field ??= new(); set; }
+    /// <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>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>
+/// <summary>User response for a pending exit-plan-mode request, with approval state, selected action, auto-approve flag, and feedback.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class HandlePendingToolCallResult
+public sealed class UIExitPlanModeResponse
 {
-    /// <summary>Whether the tool call result was handled successfully.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { get; set; }
+    /// <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>Pending external tool call request ID, with the tool result or an error describing why it failed.</summary>
+/// <summary>Request ID of a pending `exit_plan_mode.requested` event and the user's response.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class HandlePendingToolCallRequest
+internal sealed class UIHandlePendingExitPlanModeRequest
 {
-    /// <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>
+    /// <summary>The unique request ID from the exit_plan_mode.requested event.</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>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>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>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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ToolsInitializeAndValidateResult
+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(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionToolsInitializeAndValidateRequest
+internal sealed class SessionUiRegisterDirectAutoModeSwitchHandlerRequest
 {
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Lightweight metadata for a currently initialized session tool.</summary>
+/// <summary>Indicates whether the handle was active and the registration count was decremented.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class CurrentToolMetadata
+public sealed class UIUnregisterDirectAutoModeSwitchHandlerResult
 {
-    /// <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>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>JSON Schema for tool input.</summary>
-    [JsonPropertyName("input_schema")]
-    public IDictionary<string, JsonElement>? InputSchema { get; set; }
+/// <summary>Opaque handle previously returned by `registerDirectAutoModeSwitchHandler` to release.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class UIUnregisterDirectAutoModeSwitchHandlerRequest
+{
+    /// <summary>Handle previously returned by `registerDirectAutoModeSwitchHandler`.</summary>
+    [JsonPropertyName("handle")]
+    public string Handle { get; set; } = string.Empty;
 
-    /// <summary>MCP server name for MCP-backed tools.</summary>
-    [JsonPropertyName("mcpServerName")]
-    public string? McpServerName { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <summary>Raw MCP tool name for MCP-backed tools.</summary>
-    [JsonPropertyName("mcpToolName")]
-    public string? McpToolName { get; set; }
+/// <summary>Indicates whether the operation succeeded.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class PermissionsConfigureResult
+{
+    /// <summary>Whether the operation succeeded.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
+}
 
-    /// <summary>Model-facing tool name.</summary>
+/// <summary>Source descriptor for a `session.permissions.configure` content-exclusion rule, with source name and type.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class PermissionsConfigureAdditionalContentExclusionPolicyRuleSource
+{
+    /// <summary>Name of the policy source.</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>Type of the policy source.</summary>
+    [JsonPropertyName("type")]
+    public string Type { get; set; } = string.Empty;
 }
 
-/// <summary>Current lightweight tool metadata snapshot for the session.</summary>
+/// <summary>Single content-exclusion rule supplied to `session.permissions.configure`, with paths, match conditions, and source.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ToolsGetCurrentMetadataResult
+public sealed class PermissionsConfigureAdditionalContentExclusionPolicyRule
 {
-    /// <summary>Current tool metadata, or null when tools have not been initialized yet.</summary>
-    [JsonPropertyName("tools")]
-    public IList<CurrentToolMetadata>? Tools { get; set; }
+    /// <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>Identifies the target session.</summary>
+/// <summary>Content-exclusion policy supplied to `session.permissions.configure`, with rules, last-updated data, and scope.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionToolsGetCurrentMetadataRequest
+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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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(global::GitHub.Copilot.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>Empty result after replacing the calling connection's externally implemented tools.</summary>
+/// <summary>Indicates whether the permission decision was applied; false when the request was already resolved.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ToolsSetResult
+public sealed class PermissionRequestResult
 {
+    /// <summary>Whether the permission request was handled successfully.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
 }
 
-/// <summary>Serializable definition of a caller-implemented tool whose execution is handled over the SDK connection.</summary>
+/// <summary>The client's response to the pending permission prompt.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ProtocolExternalToolDefinition
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "kind",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(PermissionDecisionApproveOnce), "approve-once")]
+[JsonDerivedType(typeof(PermissionDecisionApproveForSession), "approve-for-session")]
+[JsonDerivedType(typeof(PermissionDecisionApproveReadOnlyForSession), "approve-read-only-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>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>The type discriminator.</summary>
+    [JsonPropertyName("kind")]
+    public virtual string Kind { 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>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(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class PermissionDecisionApproveOnce : PermissionDecision
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "approve-once";
 
-    /// <summary>Unique model-visible tool name.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <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>Whether this definition replaces a built-in tool with the same name.</summary>
-    [JsonPropertyName("overridesBuiltInTool")]
-    public bool? OverridesBuiltInTool { 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(global::GitHub.Copilot.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(PermissionDecisionApproveForSessionApprovalWorkflow), "workflow")]
+[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>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>Session-scoped approval details for specific command identifiers.</summary>
+/// <remarks>The <c>commands</c> variant of <see cref="PermissionDecisionApproveForSessionApproval"/>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class PermissionDecisionApproveForSessionApprovalCommands : PermissionDecisionApproveForSessionApproval
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "commands";
 
-    /// <summary>Optional human-readable display title.</summary>
-    [JsonPropertyName("title")]
-    public string? Title { get; set; }
+    /// <summary>Command identifiers covered by this approval.</summary>
+    [JsonPropertyName("commandIdentifiers")]
+    public required IList<string> CommandIdentifiers { get; set; }
 }
 
-/// <summary>Complete externally implemented tool list for the calling connection. An empty list removes every tool previously supplied by that connection.</summary>
+/// <summary>Session-scoped approval details for read-only filesystem operations.</summary>
+/// <remarks>The <c>read</c> variant of <see cref="PermissionDecisionApproveForSessionApproval"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class ToolsSetRequest
+public partial class PermissionDecisionApproveForSessionApprovalRead : PermissionDecisionApproveForSessionApproval
 {
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "read";
+}
 
-    /// <summary>Complete replacement list for the calling connection.</summary>
-    [JsonPropertyName("tools")]
-    public IList<ProtocolExternalToolDefinition> Tools { get => field ??= []; set; }
+/// <summary>Session-scoped approval details for filesystem write operations.</summary>
+/// <remarks>The <c>write</c> variant of <see cref="PermissionDecisionApproveForSessionApproval"/>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class PermissionDecisionApproveForSessionApprovalWrite : PermissionDecisionApproveForSessionApproval
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "write";
 }
 
-/// <summary>Empty result after applying subagent settings.</summary>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ToolsUpdateSubagentSettingsResult
+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>Subagent model, reasoning effort, context tier, and auto-invocation settings.</summary>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SubagentSettingsEntry
+public partial class PermissionDecisionApproveForSessionApprovalMcpSampling : PermissionDecisionApproveForSessionApproval
 {
-    /// <summary>Whether this agent's runtime-defined proactive invocation prompting is enabled, if supported. Currently consumed by the built-in rubber-duck agent.</summary>
-    [JsonPropertyName("autoInvoke")]
-    public bool? AutoInvoke { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "mcp-sampling";
 
-    /// <summary>Context tier override for matching subagents.</summary>
-    [JsonPropertyName("contextTier")]
-    public SubagentSettingsEntryContextTier? ContextTier { get; set; }
+    /// <summary>MCP server name.</summary>
+    [JsonPropertyName("serverName")]
+    public required string ServerName { get; set; }
+}
 
-    /// <summary>Reasoning effort override for matching subagents.</summary>
-    [JsonPropertyName("effortLevel")]
-    public string? EffortLevel { 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(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class PermissionDecisionApproveForSessionApprovalMemory : PermissionDecisionApproveForSessionApproval
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "memory";
+}
 
-    /// <summary>Model override for matching subagents.</summary>
-    [JsonPropertyName("model")]
-    public string? Model { 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>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class PermissionDecisionApproveForSessionApprovalCustomTool : PermissionDecisionApproveForSessionApproval
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "custom-tool";
 
-    /// <summary>Whether the configured model strategy is preferred or required.</summary>
-    [JsonPropertyName("modelPolicy")]
-    public AgentModelPolicy? ModelPolicy { get; set; }
+    /// <summary>Custom tool name.</summary>
+    [JsonPropertyName("toolName")]
+    public required string ToolName { get; set; }
 }
 
-/// <summary>Configured per-agent subagent overrides.</summary>
-public sealed class UpdateSubagentSettingsRequestSubagents
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class PermissionDecisionApproveForSessionApprovalExtensionManagement : PermissionDecisionApproveForSessionApproval
 {
-    /// <summary>Per-agent settings keyed by subagent agent_type.</summary>
-    [JsonPropertyName("agents")]
-    public IDictionary<string, SubagentSettingsEntry>? Agents { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "extension-management";
 
-    /// <summary>Names of subagents the user has turned off; they cannot be dispatched.</summary>
-    [JsonPropertyName("disabledSubagents")]
-    public IList<string>? DisabledSubagents { 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>Maximum number of subagents that can run concurrently; applies to usage-based billing users only.</summary>
-    [JsonPropertyName("maxConcurrency")]
-    public int? MaxConcurrency { get; set; }
+/// <summary>Session-scoped workflow approval, optionally narrowed by approval key.</summary>
+/// <remarks>The <c>workflow</c> variant of <see cref="PermissionDecisionApproveForSessionApproval"/>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class PermissionDecisionApproveForSessionApprovalWorkflow : PermissionDecisionApproveForSessionApproval
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "workflow";
 
-    /// <summary>Maximum subagent nesting depth; applies to usage-based billing users only.</summary>
-    [JsonPropertyName("maxDepth")]
-    public int? MaxDepth { get; set; }
+    /// <summary>Optional workflow operation name or canonical approval key; when omitted, the approval covers all workflow operations.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("approvalKey")]
+    public string? ApprovalKey { get; set; }
 }
 
-/// <summary>Subagent settings to apply to the current session.</summary>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class UpdateSubagentSettingsRequest
+public partial class PermissionDecisionApproveForSessionApprovalExtensionPermissionAccess : PermissionDecisionApproveForSessionApproval
 {
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "extension-permission-access";
 
-    /// <summary>Subagent settings to apply, or null to clear the live session override.</summary>
-    [JsonPropertyName("subagents")]
-    public UpdateSubagentSettingsRequestSubagents? Subagents { get; set; }
+    /// <summary>Extension name.</summary>
+    [JsonPropertyName("extensionName")]
+    public required string ExtensionName { get; set; }
 }
 
-/// <summary>RPC data type for SessionCommandsList operations.</summary>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionCommandsListRequest
+public partial class PermissionDecisionApproveForSessionApprovalExtensionEnvAccess : PermissionDecisionApproveForSessionApproval
 {
-    /// <summary>Include runtime built-in commands.</summary>
-    [JsonPropertyName("includeBuiltins")]
-    public bool? IncludeBuiltins { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "extension-env-access";
 
-    /// <summary>Include commands registered by protocol clients, including SDK clients and extensions.</summary>
-    [JsonPropertyName("includeClientCommands")]
-    public bool? IncludeClientCommands { get; set; }
+    /// <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>Include enabled user-invocable skills and commands.</summary>
-    [JsonPropertyName("includeSkills")]
-    public bool? IncludeSkills { get; set; }
+    /// <summary>Extension name.</summary>
+    [JsonPropertyName("extensionName")]
+    public required string ExtensionName { get; set; }
 }
 
-/// <summary>RPC data type for SessionCommandsListRequestWithSession operations.</summary>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionCommandsListRequestWithSession
+public partial class PermissionDecisionApproveForSession : PermissionDecision
 {
-    /// <summary>Include runtime built-in commands.</summary>
-    [JsonPropertyName("includeBuiltins")]
-    public bool? IncludeBuiltins { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "approve-for-session";
 
-    /// <summary>Include commands registered by protocol clients, including SDK clients and extensions.</summary>
-    [JsonPropertyName("includeClientCommands")]
-    public bool? IncludeClientCommands { 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>Include enabled user-invocable skills and commands.</summary>
-    [JsonPropertyName("includeSkills")]
-    public bool? IncludeSkills { 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>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+/// <summary>Approve file-tool read access to specific directories for this logical session, including continuation or resume.</summary>
+/// <remarks>The <c>approve-read-only-for-session</c> variant of <see cref="PermissionDecision"/>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class PermissionDecisionApproveReadOnlyForSession : PermissionDecision
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "approve-read-only-for-session";
+
+    /// <summary>Canonical directories covered by the read-only grant.</summary>
+    [JsonPropertyName("directories")]
+    public required IList<string> Directories { get; set; }
 }
 
-/// <summary>Result of invoking the slash command (text output, prompt to send to the agent, completion, or subcommand selection).</summary>
+/// <summary>Approval to persist for this location.</summary>
 /// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
 [Experimental(global::GitHub.Copilot.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
+[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(PermissionDecisionApproveForLocationApprovalWorkflow), "workflow")]
+[JsonDerivedType(typeof(PermissionDecisionApproveForLocationApprovalExtensionPermissionAccess), "extension-permission-access")]
+[JsonDerivedType(typeof(PermissionDecisionApproveForLocationApprovalExtensionEnvAccess), "extension-env-access")]
+public partial class PermissionDecisionApproveForLocationApproval
 {
     /// <summary>The type discriminator.</summary>
     [JsonPropertyName("kind")]
@@ -20429,822 +25094,630 @@ public partial class SlashCommandInvocationResult
 }
 
 
-/// <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>Location-scoped approval details for specific command identifiers.</summary>
+/// <remarks>The <c>commands</c> variant of <see cref="PermissionDecisionApproveForLocationApproval"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class SlashCommandInvocationResultText : SlashCommandInvocationResult
+public partial class PermissionDecisionApproveForLocationApprovalCommands : PermissionDecisionApproveForLocationApproval
 {
     /// <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>Present when the invocation changed the sandbox for this session only. Nothing was persisted, so consumers must mirror the change onto the live session rather than reloading settings, and must not treat it as a settings change.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("sandboxSessionChange")]
-    public SandboxSessionChange? SandboxSessionChange { get; set; }
+    public override string Kind => "commands";
 
-    /// <summary>Text output for the client to render.</summary>
-    [JsonPropertyName("text")]
-    public required string Text { get; set; }
+    /// <summary>Command identifiers covered by this approval.</summary>
+    [JsonPropertyName("commandIdentifiers")]
+    public required IList<string> CommandIdentifiers { 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>
+/// <summary>Location-scoped approval details for read-only filesystem operations.</summary>
+/// <remarks>The <c>read</c> variant of <see cref="PermissionDecisionApproveForLocationApproval"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class SlashCommandInvocationResultAgentPrompt : SlashCommandInvocationResult
+public partial class PermissionDecisionApproveForLocationApprovalRead : PermissionDecisionApproveForLocationApproval
 {
     /// <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; }
+    public override string Kind => "read";
 }
 
-/// <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>Location-scoped approval details for filesystem write operations.</summary>
+/// <remarks>The <c>write</c> variant of <see cref="PermissionDecisionApproveForLocationApproval"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class SlashCommandInvocationResultCompleted : SlashCommandInvocationResult
+public partial class PermissionDecisionApproveForLocationApprovalWrite : PermissionDecisionApproveForLocationApproval
 {
     /// <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>Optional target session mode applied without submitting an agent prompt.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("mode")]
-    public SessionMode? Mode { 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; }
+    public override string Kind => "write";
 }
 
-/// <summary>Selectable slash-command subcommand option with name, description, and optional group label.</summary>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SlashCommandSelectSubcommandOption
+public partial class PermissionDecisionApproveForLocationApprovalMcp : PermissionDecisionApproveForLocationApproval
 {
-    /// <summary>Human-readable description of the subcommand.</summary>
-    [JsonPropertyName("description")]
-    public string Description { get; set; } = string.Empty;
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "mcp";
 
-    /// <summary>Optional group label for organizing options.</summary>
-    [JsonPropertyName("group")]
-    public string? Group { get; set; }
+    /// <summary>MCP server name.</summary>
+    [JsonPropertyName("serverName")]
+    public required string ServerName { get; set; }
 
-    /// <summary>Subcommand name to invoke.</summary>
-    [JsonPropertyName("name")]
-    public string Name { 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>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>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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class SlashCommandInvocationResultSelectSubcommand : SlashCommandInvocationResult
+public partial class PermissionDecisionApproveForLocationApprovalMcpSampling : PermissionDecisionApproveForLocationApproval
 {
     /// <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; }
+    public override string Kind => "mcp-sampling";
 
-    /// <summary>Human-readable title for the selection UI.</summary>
-    [JsonPropertyName("title")]
-    public required string Title { get; set; }
+    /// <summary>MCP server name.</summary>
+    [JsonPropertyName("serverName")]
+    public required string ServerName { get; set; }
 }
 
-/// <summary>RPC data type for SlashCommandTimelineEntry operations.</summary>
+/// <summary>Location-scoped approval details for writes to long-term memory.</summary>
+/// <remarks>The <c>memory</c> variant of <see cref="PermissionDecisionApproveForLocationApproval"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SlashCommandTimelineEntry
+public partial class PermissionDecisionApproveForLocationApprovalMemory : PermissionDecisionApproveForLocationApproval
 {
-    /// <summary>What the user must do to recover, when the entry reports a failure the runtime knows an action for. The `text` never names a client affordance, so a client that offers one renders it from this value.</summary>
-    [JsonPropertyName("remediation")]
-    public RemediationAction? Remediation { get; set; }
-
-    /// <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; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "memory";
 }
 
-/// <summary>The <c>add-timeline-entry</c> variant of <see cref="SlashCommandInvocationResult"/>.</summary>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class SlashCommandInvocationResultAddTimelineEntry : SlashCommandInvocationResult
+public partial class PermissionDecisionApproveForLocationApprovalCustomTool : PermissionDecisionApproveForLocationApproval
 {
     /// <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; }
+    public override string Kind => "custom-tool";
 
-    /// <summary>Whether command execution changed persisted runtime settings.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("runtimeSettingsChanged")]
-    public bool? RuntimeSettingsChanged { get; set; }
+    /// <summary>Custom tool name.</summary>
+    [JsonPropertyName("toolName")]
+    public required string ToolName { get; set; }
 }
 
-/// <summary>RPC data type for SlashCommandModelPickerDialog operations.</summary>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SlashCommandModelPickerDialog
+public partial class PermissionDecisionApproveForLocationApprovalExtensionManagement : PermissionDecisionApproveForLocationApproval
 {
-    /// <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; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "extension-management";
 
-    /// <summary>Model-selection target represented by the picker.</summary>
-    [JsonPropertyName("target")]
-    public string? Target { 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>The <c>show-dialog</c> variant of <see cref="SlashCommandInvocationResult"/>.</summary>
+/// <summary>Location-scoped workflow approval, optionally narrowed by approval key.</summary>
+/// <remarks>The <c>workflow</c> variant of <see cref="PermissionDecisionApproveForLocationApproval"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class SlashCommandInvocationResultShowDialog : SlashCommandInvocationResult
+public partial class PermissionDecisionApproveForLocationApprovalWorkflow : PermissionDecisionApproveForLocationApproval
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Kind => "show-dialog";
-
-    /// <summary>Dialog the host should display.</summary>
-    [JsonPropertyName("dialog")]
-    public required SlashCommandModelPickerDialog Dialog { get; set; }
+    public override string Kind => "workflow";
 
-    /// <summary>Whether command execution changed persisted runtime settings.</summary>
+    /// <summary>Optional workflow operation name or canonical approval key; when omitted, the approval covers all workflow operations.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("runtimeSettingsChanged")]
-    public bool? RuntimeSettingsChanged { get; set; }
+    [JsonPropertyName("approvalKey")]
+    public string? ApprovalKey { get; set; }
 }
 
-/// <summary>User-settings snapshot to restore if the host cancels the model switch.</summary>
-public sealed class SlashCommandInvocationResultSetModelRevertOnCancel
+/// <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(global::GitHub.Copilot.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>The <c>set-model</c> variant of <see cref="SlashCommandInvocationResult"/>.</summary>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class SlashCommandInvocationResultSetModel : SlashCommandInvocationResult
+public partial class PermissionDecisionApproveForLocationApprovalExtensionEnvAccess : PermissionDecisionApproveForLocationApproval
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Kind => "set-model";
-
-    /// <summary>Auto routing profile selected by the command, when the model is Auto.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("autoTier")]
-    public AutoTier? AutoTier { get; set; }
-
-    /// <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; }
+    public override string Kind => "extension-env-access";
 
-    /// <summary>Settings scope modified by the command.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("scope")]
-    public string? Scope { get; set; }
+    /// <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>User-facing warning produced while selecting the model.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("warning")]
-    public string? Warning { get; set; }
+    /// <summary>Extension name.</summary>
+    [JsonPropertyName("extensionName")]
+    public required string ExtensionName { get; set; }
 }
 
-/// <summary>The <c>set-plan-model</c> variant of <see cref="SlashCommandInvocationResult"/>.</summary>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class SlashCommandInvocationResultSetPlanModel : SlashCommandInvocationResult
+public partial class PermissionDecisionApproveForLocation : PermissionDecision
 {
     /// <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; }
+    public override string Kind => "approve-for-location";
 
-    /// <summary>Dedicated model selected for plan mode.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("planModel")]
-    public string? PlanModel { get; set; }
+    /// <summary>Approval to persist for this location.</summary>
+    [JsonPropertyName("approval")]
+    public required PermissionDecisionApproveForLocationApproval Approval { get; set; }
 
-    /// <summary>Whether command execution changed persisted runtime settings.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("runtimeSettingsChanged")]
-    public bool? RuntimeSettingsChanged { get; set; }
+    /// <summary>Location key (git root or cwd) to persist the approval to.</summary>
+    [JsonPropertyName("locationKey")]
+    public required string LocationKey { get; set; }
 }
 
-/// <summary>Slash command name and optional raw input string to invoke.</summary>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class CommandsInvokeRequest
+public partial class PermissionDecisionApprovePermanently : PermissionDecision
 {
-    /// <summary>Raw input after the command name.</summary>
-    [JsonPropertyName("input")]
-    public string? Input { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "approve-permanently";
 
-    /// <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>URL domain to approve permanently.</summary>
+    [JsonPropertyName("domain")]
+    public required string Domain { get; set; }
+}
 
-    /// <summary>Optional client surface that initiated the invocation.</summary>
-    [JsonPropertyName("origin")]
-    public CommandsInvocationOrigin? Origin { 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(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class PermissionDecisionReject : PermissionDecision
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "reject";
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Optional feedback explaining the rejection.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("feedback")]
+    public string? Feedback { get; set; }
 }
 
-/// <summary>Whether finalizing the invocation effect succeeded, and the failure reason when it did not.</summary>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class CommandsFinalizeInvocationEffectResult
+public partial class PermissionDecisionUserNotAvailable : PermissionDecision
 {
-    /// <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; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "user-not-available";
 }
 
-/// <summary>The slash-command result object that produced the pending effect, echoed back unchanged.</summary>
-public sealed class CommandsFinalizeInvocationEffectRequestEffect
+/// <summary>Permission-decision variant indicating the request was approved.</summary>
+/// <remarks>The <c>approved</c> variant of <see cref="PermissionDecision"/>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class PermissionDecisionApproved : PermissionDecision
 {
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "approved";
 }
 
-/// <summary>The pending slash-command invocation effect to finalize, plus whether the host applied or cancelled it.</summary>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class CommandsFinalizeInvocationEffectRequest
+public partial class PermissionDecisionApprovedForSession : PermissionDecision
 {
-    /// <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; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "approved-for-session";
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>The approval to add as a session-scoped rule.</summary>
+    [JsonPropertyName("approval")]
+    public required UserToolSessionApproval Approval { get; set; }
 }
 
-/// <summary>Indicates whether the pending client-handled command was completed successfully.</summary>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class CommandsHandlePendingCommandResult
+public partial class PermissionDecisionApprovedForLocation : PermissionDecision
 {
-    /// <summary>Whether the command was handled successfully.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { get; set; }
+    /// <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>Pending command request ID and an optional error if the client handler failed.</summary>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class CommandsHandlePendingCommandRequest
+public partial class PermissionDecisionCancelled : PermissionDecision
 {
-    /// <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;
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "cancelled";
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Optional explanation of why the request was cancelled.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("reason")]
+    public string? Reason { get; set; }
 }
 
-/// <summary>Error message produced while executing the command, if any.</summary>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ExecuteCommandResult
+public partial class PermissionDecisionDeniedByRules : PermissionDecision
 {
-    /// <summary>Error message produced while executing the command, if any. Omitted when the handler succeeded.</summary>
-    [JsonPropertyName("error")]
-    public string? Error { get; set; }
+    /// <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>Slash command name and argument string to execute synchronously.</summary>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class ExecuteCommandParams
+public partial class PermissionDecisionDeniedNoApprovalRuleAndCouldNotRequestFromUser : PermissionDecision
 {
-    /// <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;
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "denied-no-approval-rule-and-could-not-request-from-user";
 }
 
-/// <summary>Indicates whether the command was accepted into the local execution queue.</summary>
-/// <remarks>Data type discriminated by <c>queued</c>.</remarks>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class EnqueueCommandResult
+public partial class PermissionDecisionDeniedInteractivelyByUser : PermissionDecision
 {
-    /// <summary>The boolean discriminator.</summary>
-    [JsonPropertyName("queued")]
-    public bool Queued { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "denied-interactively-by-user";
 
-    /// <summary>Stable opaque ID of the queued command.</summary>
+    /// <summary>Optional feedback from the user explaining the denial.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("queueId")]
-    public string? QueueId { get; set; }
+    [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>Slash-prefixed command string to enqueue for FIFO processing.</summary>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class EnqueueCommandParams
+public partial class PermissionDecisionDeniedByContentExclusionPolicy : PermissionDecision
 {
-    /// <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;
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "denied-by-content-exclusion-policy";
 
-    /// <summary>Optional user-facing text for the queue row. The command string is shown when omitted.</summary>
-    [JsonPropertyName("displayText")]
-    public string? DisplayText { get; set; }
+    /// <summary>Human-readable explanation of why the path was excluded.</summary>
+    [JsonPropertyName("message")]
+    public required string Message { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>File path that triggered the exclusion.</summary>
+    [JsonPropertyName("path")]
+    public required string Path { get; set; }
 }
 
-/// <summary>Indicates whether the queued-command response was matched to a pending request.</summary>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class CommandsRespondToQueuedCommandResult
+public partial class PermissionDecisionDeniedByPermissionRequestHook : PermissionDecision
 {
-    /// <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; }
-}
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "denied-by-permission-request-hook";
 
-/// <summary>Result of the queued command execution.</summary>
-/// <remarks>Data type discriminated by <c>handled</c>.</remarks>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class QueuedCommandResult
-{
-    /// <summary>The boolean discriminator.</summary>
-    [JsonPropertyName("handled")]
-    public bool Handled { get; set; }
+    /// <summary>Whether to interrupt the current agent turn.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("interrupt")]
+    public bool? Interrupt { get; set; }
 
-    /// <summary>When true, the runtime will not process subsequent queued commands until a new request comes in.</summary>
+    /// <summary>Optional message from the hook explaining the denial.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("stopProcessingQueue")]
-    public bool? StopProcessingQueue { get; set; }
+    [JsonPropertyName("message")]
+    public string? Message { 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>
+/// <summary>Pending permission request ID and the decision to apply (approve/reject and scope).</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class CommandsRespondToQueuedCommandRequest
+internal sealed class PermissionDecisionRequest
 {
-    /// <summary>Request ID from the `command.queued` event the host is responding to.</summary>
+    /// <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>Result of the queued command execution.</summary>
+    /// <summary>The client's response to the pending permission prompt.</summary>
     [JsonPropertyName("result")]
-    public QueuedCommandResult Result { get => field ??= new(); set; }
+    public PermissionDecision 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>Pending permission prompt reconstructed from event history, with request ID and user-facing prompt details.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionTelemetryEngagement
+public sealed class PendingPermissionRequest
 {
-    /// <summary>Current telemetry engagement ID, when available.</summary>
-    [JsonPropertyName("engagementId")]
-    public string? EngagementId { get; set; }
+    /// <summary>Permission-recovery episode that authorized this request to surface for interactive attention.</summary>
+    [JsonPropertyName("recoveryEpisodeId")]
+    public string? RecoveryEpisodeId { get; set; }
+
+    /// <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>Identifies the target session.</summary>
+/// <summary>List of pending permission requests reconstructed from event history.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionTelemetryGetEngagementIdRequest
+public sealed class PendingPermissionRequestList
 {
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <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>Feature override key/value pairs to attach to subsequent telemetry events from this session.</summary>
+/// <summary>No parameters; returns currently-pending permission requests for the session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class TelemetrySetFeatureOverridesRequest
+internal sealed class PermissionsPendingRequestsRequest
 {
-    /// <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>
+/// <summary>Indicates whether the operation succeeded.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class UIEphemeralQueryResult
+public sealed class PermissionsSetApproveAllResult
 {
-    /// <summary>Answer returned by the model.</summary>
-    [JsonPropertyName("answer")]
-    public string Answer { get; set; } = string.Empty;
+    /// <summary>Whether the operation succeeded.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
 }
 
-/// <summary>Transient question to answer without adding it to conversation history.</summary>
+/// <summary>Allow-all toggle for tool permission requests, with an optional telemetry source.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class UIEphemeralQueryRequest
+internal sealed class PermissionsSetApproveAllRequest
 {
-    /// <summary>Question to answer from the current conversation context.</summary>
-    [JsonPropertyName("question")]
-    public string Question { get; set; } = string.Empty;
+    /// <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>The elicitation response (accept with form values, decline, or cancel).</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class UIElicitationResponse
-{
-    /// <summary>MCP response metadata.</summary>
-    [JsonPropertyName("_meta")]
-    public IDictionary<string, JsonElement>? 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>Optional source for allow-all telemetry. Defaults to `rpc` when omitted for SDK callers.</summary>
+    [JsonPropertyName("source")]
+    public PermissionsSetApproveAllSource? Source { get; set; }
 }
 
-/// <summary>JSON Schema describing the form fields to present to the user.</summary>
+/// <summary>Indicates whether the requested permission mode was applied and reports the authoritative post-mutation mode.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class UIElicitationSchema
+public sealed class PermissionsSetModeResult
 {
-    /// <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>Authoritative permission mode after the mutation.</summary>
+    [JsonPropertyName("mode")]
+    public PermissionMode Mode { get; set; }
 
-/// <summary>Metadata controlling an MCP task's lifetime.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpTaskMetadata
-{
-    /// <summary>Task time-to-live.</summary>
-    [JsonPropertyName("ttl")]
-    public long? Ttl { get; set; }
+    /// <summary>Whether the operation succeeded.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
 }
 
-/// <summary>Prompt message and JSON schema describing the form fields to elicit from the user.</summary>
+/// <summary>Permission mode to apply for the session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class UIElicitationRequest
+internal sealed class PermissionsSetModeRequest
 {
-    /// <summary>MCP request metadata.</summary>
-    [JsonPropertyName("_meta")]
-    public IDictionary<string, JsonElement>? Meta { get; set; }
-
-    /// <summary>Message describing what information is needed from the user.</summary>
-    [JsonPropertyName("message")]
-    public string Message { get; set; } = string.Empty;
+    /// <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>Elicitation mode. Omitted and form are equivalent for structured elicitation.</summary>
+    /// <summary>Permission mode to apply.</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; }
+    public PermissionMode Mode { get; 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>Optional source for permission-mode telemetry. `organization_targeting` is reserved for startup selection after the authenticated account matches an organization targeting policy; SDK callers default to `rpc` and cannot claim targeting provenance.</summary>
+    [JsonPropertyName("source")]
+    public PermissionModeSource? Source { get; set; }
 }
 
-/// <summary>Indicates whether the elicitation response was accepted; false if it was already resolved by another client.</summary>
+/// <summary>Current permission mode.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class UIElicitationResult
+public sealed class PermissionsGetModeResult
 {
-    /// <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>Current permission mode.</summary>
+    [JsonPropertyName("mode")]
+    public PermissionMode Mode { get; set; }
 }
 
-/// <summary>Pending elicitation request ID and the user's response (accept/decline/cancel + form values).</summary>
+/// <summary>No parameters.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class UIHandlePendingElicitationRequest
+internal sealed class PermissionsGetModeRequest
 {
-    /// <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>
+/// <summary>Indicates whether the operation succeeded.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class UIHandlePendingResult
+public sealed class PermissionsModifyRulesResult
 {
-    /// <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>
+    /// <summary>Whether the operation succeeded.</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>
+/// <summary>Scope and add/remove instructions for modifying session- or location-scoped permission rules.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class UIUserInputResponse
+internal sealed class PermissionsModifyRulesParams
 {
-    /// <summary>The user's answer text.</summary>
-    [JsonPropertyName("answer")]
-    public string Answer { get; set; } = string.Empty;
+    /// <summary>Rules to add to the scope. Applied before `remove`/`removeAll`.</summary>
+    [JsonPropertyName("add")]
+    public IList<PermissionRule>? Add { get; set; }
 
-    /// <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>Specific rules to remove from the scope. Ignored when `removeAll` is true.</summary>
+    [JsonPropertyName("remove")]
+    public IList<PermissionRule>? Remove { get; set; }
 
-/// <summary>Request ID of a pending `user_input.requested` event and the user's response.</summary>
-[Experimental(global::GitHub.Copilot.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>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>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>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>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(global::GitHub.Copilot.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>
+/// <summary>Indicates whether the operation succeeded.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class UIHandlePendingSamplingRequest
+public sealed class PermissionsSetRequiredResult
 {
-    /// <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>Whether the operation succeeded.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
 }
 
-/// <summary>Request ID of a pending `auto_mode_switch.requested` event and the user's response.</summary>
+/// <summary>Toggles whether permission prompts should be bridged into session events for this client.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class UIHandlePendingAutoModeSwitchRequest
+internal sealed class PermissionsSetRequiredRequest
 {
-    /// <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 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 user's selected action for an exhausted session limit.</summary>
+/// <summary>Indicates whether the operation succeeded.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class UISessionLimitsExhaustedResponse
+public sealed class PermissionsResetSessionApprovalsResult
 {
-    /// <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>Whether the operation succeeded.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
 }
 
-/// <summary>Request ID of a pending `session_limits_exhausted.requested` event and the user's selected limit action.</summary>
+/// <summary>Clears session-scoped tool approvals and optionally clears location-scoped approvals and exact session-approved paths.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class UIHandlePendingSessionLimitsExhaustedRequest
+internal sealed class PermissionsResetSessionApprovalsRequest
 {
-    /// <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>Whether location-scoped approvals and exact session-approved paths are cleared too. Defaults to `true`.</summary>
+    [JsonPropertyName("includeLocation")]
+    public bool? IncludeLocation { get; 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>Indicates whether the operation succeeded.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class UIExitPlanModeResponse
+public sealed class PermissionsNotifyPromptShownResult
 {
-    /// <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>Whether the operation succeeded.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
 }
 
-/// <summary>Request ID of a pending `exit_plan_mode.requested` event and the user's response.</summary>
+/// <summary>Notification payload describing the permission prompt that the client just rendered.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class UIHandlePendingExitPlanModeRequest
+internal sealed class PermissionPromptShownNotification
 {
-    /// <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>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>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>Snapshot of the session's recursive directory grants, exact session-approved paths, and primary working directory.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class UIRegisterDirectAutoModeSwitchHandlerResult
+public sealed class PermissionPathsList
 {
-    /// <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>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>Exact paths approved for this session without recursively allowing their descendants.</summary>
+    [JsonPropertyName("sessionApprovedPaths")]
+    public IList<string>? SessionApprovedPaths { get; set; }
 }
 
-/// <summary>Identifies the target session.</summary>
+/// <summary>No parameters; returns the session's recursive directory grants and exact session-approved paths.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionUiRegisterDirectAutoModeSwitchHandlerRequest
+internal sealed class PermissionsPathsListRequest
 {
     /// <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 the operation succeeded.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class UIUnregisterDirectAutoModeSwitchHandlerResult
+public sealed class PermissionsPathsAddResult
 {
-    /// <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>Whether the operation succeeded.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
 }
 
-/// <summary>Opaque handle previously returned by `registerDirectAutoModeSwitchHandler` to release.</summary>
+/// <summary>Directory path to add to the session's allowed directories.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class UIUnregisterDirectAutoModeSwitchHandlerRequest
+internal sealed class PermissionPathsAddParams
 {
-    /// <summary>Handle previously returned by `registerDirectAutoModeSwitchHandler`.</summary>
-    [JsonPropertyName("handle")]
-    public string Handle { get; set; } = string.Empty;
+    /// <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>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
@@ -21253,216 +25726,165 @@ internal sealed class UIUnregisterDirectAutoModeSwitchHandlerRequest
 
 /// <summary>Indicates whether the operation succeeded.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class PermissionsConfigureResult
+public sealed class PermissionsPathsUpdatePrimaryResult
 {
     /// <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>
+/// <summary>Directory path to set as the session's new primary working directory.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class PermissionsConfigureAdditionalContentExclusionPolicyRuleSource
+internal sealed class PermissionPathsUpdatePrimaryParams
 {
-    /// <summary>Name of the policy source.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <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>Type of the policy source.</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>Indicates whether the supplied path is within the session's allowed directories.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class PermissionsConfigureAdditionalContentExclusionPolicyRule
+public sealed class PermissionPathsAllowedCheckResult
 {
-    /// <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>Whether the path is within the session's allowed directories.</summary>
+    [JsonPropertyName("allowed")]
+    public bool Allowed { get; set; }
 }
 
-/// <summary>Content-exclusion policy supplied to `session.permissions.configure`, with rules, last-updated data, and scope.</summary>
+/// <summary>Path to evaluate against the session's allowed directories.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class PermissionsConfigureAdditionalContentExclusionPolicy
+internal sealed class PermissionPathsAllowedCheckParams
 {
-    /// <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>Path to check against the session's allowed directories.</summary>
+    [JsonPropertyName("path")]
+    public string Path { get; set; } = string.Empty;
 
-    /// <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>Indicates whether the supplied path is within the session's workspace directory.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class PermissionPathsConfig
+public sealed class PermissionPathsWorkspaceCheckResult
 {
-    /// <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>Whether the path is within the session workspace directory.</summary>
+    [JsonPropertyName("allowed")]
+    public bool Allowed { 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>Path to evaluate against the session's workspace (primary) directory.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class PermissionPathsWorkspaceCheckParams
+{
+    /// <summary>Path to check against the session workspace directory.</summary>
+    [JsonPropertyName("path")]
+    public string Path { get; set; } = string.Empty;
 
-    /// <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>Resolved location-permissions key and type.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class PermissionRulesSet
+public sealed class PermissionLocationResolveResult
 {
-    /// <summary>Rules that auto-approve matching requests.</summary>
-    [JsonPropertyName("approved")]
-    public IList<PermissionRule> Approved { get => field ??= []; set; }
+    /// <summary>Location key used in the location-permissions store.</summary>
+    [JsonPropertyName("locationKey")]
+    public string LocationKey { get; set; } = string.Empty;
 
-    /// <summary>Rules that auto-deny matching requests.</summary>
-    [JsonPropertyName("denied")]
-    public IList<PermissionRule> Denied { get => field ??= []; set; }
+    /// <summary>Whether the location is a git repo or directory.</summary>
+    [JsonPropertyName("locationType")]
+    public PermissionLocationType LocationType { 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>
+/// <summary>Working directory to resolve into a location-permissions key.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class PermissionUrlsConfig
+internal sealed class PermissionLocationResolveParams
 {
-    /// <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>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 
-    /// <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>Working directory whose permission location should be resolved.</summary>
+    [JsonPropertyName("workingDirectory")]
+    public string WorkingDirectory { get; set; } = string.Empty;
 }
 
-/// <summary>Patch of permission policy fields to apply (omit a field to leave it unchanged).</summary>
+/// <summary>Summary of persisted location permissions applied to the session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class PermissionsConfigureParams
+public sealed class PermissionLocationApplyResult
 {
-    /// <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>Number of persisted allowed directories added to the live path manager.</summary>
+    [JsonPropertyName("appliedDirectoryCount")]
+    public long AppliedDirectoryCount { 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>Number of location-scoped rules added to the live permission service.</summary>
+    [JsonPropertyName("appliedRuleCount")]
+    public long AppliedRuleCount { 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>Location-scoped rules applied to the live permission service.</summary>
+    [JsonPropertyName("appliedRules")]
+    public IList<PermissionRule> AppliedRules { get => field ??= []; 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>Whether a different location was applied since the previous apply call.</summary>
+    [JsonPropertyName("changed")]
+    public bool Changed { 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>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>Working directory to load persisted location permissions for.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class PermissionLocationApplyParams
+{
     /// <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>Working directory whose persisted location permissions should be applied.</summary>
+    [JsonPropertyName("workingDirectory")]
+    public string WorkingDirectory { get; set; } = string.Empty;
 }
 
-/// <summary>Indicates whether the permission decision was applied; false when the request was already resolved.</summary>
+/// <summary>Indicates whether the operation succeeded.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class PermissionRequestResult
+public sealed class PermissionsLocationsAddToolApprovalResult
 {
-    /// <summary>Whether the permission request was handled successfully.</summary>
+    /// <summary>Whether the operation succeeded.</summary>
     [JsonPropertyName("success")]
     public bool Success { get; set; }
 }
 
-/// <summary>The client's response to the pending permission prompt.</summary>
-/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-[JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "kind",
-    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(PermissionDecisionApproveOnce), "approve-once")]
-[JsonDerivedType(typeof(PermissionDecisionApproveForSession), "approve-for-session")]
-[JsonDerivedType(typeof(PermissionDecisionApproveReadOnlyForSession), "approve-read-only-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(global::GitHub.Copilot.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>
+/// <summary>Tool approval to persist and apply.</summary>
 /// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
 [Experimental(global::GitHub.Copilot.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(PermissionDecisionApproveForSessionApprovalWorkflow), "workflow")]
-[JsonDerivedType(typeof(PermissionDecisionApproveForSessionApprovalExtensionPermissionAccess), "extension-permission-access")]
-[JsonDerivedType(typeof(PermissionDecisionApproveForSessionApprovalExtensionEnvAccess), "extension-env-access")]
-public partial class PermissionDecisionApproveForSessionApproval
+[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(PermissionsLocationsAddToolApprovalDetailsWorkflow), "workflow")]
+[JsonDerivedType(typeof(PermissionsLocationsAddToolApprovalDetailsExtensionPermissionAccess), "extension-permission-access")]
+[JsonDerivedType(typeof(PermissionsLocationsAddToolApprovalDetailsExtensionEnvAccess), "extension-env-access")]
+public partial class PermissionsLocationsAddToolApprovalDetails
 {
     /// <summary>The type discriminator.</summary>
     [JsonPropertyName("kind")]
@@ -21470,10 +25892,10 @@ public partial class PermissionDecisionApproveForSessionApproval
 }
 
 
-/// <summary>Session-scoped approval details for specific command identifiers.</summary>
-/// <remarks>The <c>commands</c> variant of <see cref="PermissionDecisionApproveForSessionApproval"/>.</remarks>
+/// <summary>Location-persisted tool approval details for specific command identifiers.</summary>
+/// <remarks>The <c>commands</c> variant of <see cref="PermissionsLocationsAddToolApprovalDetails"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PermissionDecisionApproveForSessionApprovalCommands : PermissionDecisionApproveForSessionApproval
+public partial class PermissionsLocationsAddToolApprovalDetailsCommands : PermissionsLocationsAddToolApprovalDetails
 {
     /// <inheritdoc />
     [JsonIgnore]
@@ -21484,30 +25906,30 @@ public partial class PermissionDecisionApproveForSessionApprovalCommands : Permi
     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>
+/// <summary>Location-persisted tool approval details for read-only filesystem operations.</summary>
+/// <remarks>The <c>read</c> variant of <see cref="PermissionsLocationsAddToolApprovalDetails"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PermissionDecisionApproveForSessionApprovalRead : PermissionDecisionApproveForSessionApproval
+public partial class PermissionsLocationsAddToolApprovalDetailsRead : PermissionsLocationsAddToolApprovalDetails
 {
     /// <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>
+/// <summary>Location-persisted tool approval details for filesystem write operations.</summary>
+/// <remarks>The <c>write</c> variant of <see cref="PermissionsLocationsAddToolApprovalDetails"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PermissionDecisionApproveForSessionApprovalWrite : PermissionDecisionApproveForSessionApproval
+public partial class PermissionsLocationsAddToolApprovalDetailsWrite : PermissionsLocationsAddToolApprovalDetails
 {
     /// <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>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PermissionDecisionApproveForSessionApprovalMcp : PermissionDecisionApproveForSessionApproval
+public partial class PermissionsLocationsAddToolApprovalDetailsMcp : PermissionsLocationsAddToolApprovalDetails
 {
     /// <inheritdoc />
     [JsonIgnore]
@@ -21522,10 +25944,10 @@ public partial class PermissionDecisionApproveForSessionApprovalMcp : Permission
     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>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PermissionDecisionApproveForSessionApprovalMcpSampling : PermissionDecisionApproveForSessionApproval
+public partial class PermissionsLocationsAddToolApprovalDetailsMcpSampling : PermissionsLocationsAddToolApprovalDetails
 {
     /// <inheritdoc />
     [JsonIgnore]
@@ -21536,20 +25958,20 @@ public partial class PermissionDecisionApproveForSessionApprovalMcpSampling : Pe
     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>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PermissionDecisionApproveForSessionApprovalMemory : PermissionDecisionApproveForSessionApproval
+public partial class PermissionsLocationsAddToolApprovalDetailsMemory : PermissionsLocationsAddToolApprovalDetails
 {
     /// <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>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PermissionDecisionApproveForSessionApprovalCustomTool : PermissionDecisionApproveForSessionApproval
+public partial class PermissionsLocationsAddToolApprovalDetailsCustomTool : PermissionsLocationsAddToolApprovalDetails
 {
     /// <inheritdoc />
     [JsonIgnore]
@@ -21560,10 +25982,10 @@ public partial class PermissionDecisionApproveForSessionApprovalCustomTool : Per
     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>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PermissionDecisionApproveForSessionApprovalExtensionManagement : PermissionDecisionApproveForSessionApproval
+public partial class PermissionsLocationsAddToolApprovalDetailsExtensionManagement : PermissionsLocationsAddToolApprovalDetails
 {
     /// <inheritdoc />
     [JsonIgnore]
@@ -21575,5128 +25997,5379 @@ public partial class PermissionDecisionApproveForSessionApprovalExtensionManagem
     public string? Operation { get; set; }
 }
 
-/// <summary>Session-scoped workflow approval, optionally narrowed by approval key.</summary>
-/// <remarks>The <c>workflow</c> variant of <see cref="PermissionDecisionApproveForSessionApproval"/>.</remarks>
+/// <summary>Location-persisted workflow approval, optionally narrowed by approval key.</summary>
+/// <remarks>The <c>workflow</c> variant of <see cref="PermissionsLocationsAddToolApprovalDetails"/>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PermissionDecisionApproveForSessionApprovalWorkflow : PermissionDecisionApproveForSessionApproval
+public partial class PermissionsLocationsAddToolApprovalDetailsWorkflow : PermissionsLocationsAddToolApprovalDetails
 {
     /// <inheritdoc />
     [JsonIgnore]
     public override string Kind => "workflow";
 
-    /// <summary>Optional workflow operation name or canonical approval key; when omitted, the approval covers all workflow operations.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("approvalKey")]
-    public string? ApprovalKey { get; set; }
+    /// <summary>Optional workflow operation name or canonical approval key; when omitted, the approval covers all workflow operations.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("approvalKey")]
+    public string? ApprovalKey { 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(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class PermissionsLocationsAddToolApprovalDetailsExtensionPermissionAccess : PermissionsLocationsAddToolApprovalDetails
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "extension-permission-access";
+
+    /// <summary>Extension name.</summary>
+    [JsonPropertyName("extensionName")]
+    public required string ExtensionName { get; set; }
+}
+
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
+public partial class PermissionsLocationsAddToolApprovalDetailsExtensionEnvAccess : PermissionsLocationsAddToolApprovalDetails
+{
+    /// <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>Location-scoped tool approval to persist.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class PermissionLocationAddToolApprovalParams
+{
+    /// <summary>Tool approval to persist and apply.</summary>
+    [JsonPropertyName("approval")]
+    public PermissionsLocationsAddToolApprovalDetails Approval { get => field ??= new(); set; }
+
+    /// <summary>Location key (git root or cwd) to persist the approval to.</summary>
+    [JsonPropertyName("locationKey")]
+    public string LocationKey { get; set; } = string.Empty;
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Folder path to check for trust.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class FolderTrustCheckParams
+{
+    /// <summary>Folder path to check.</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 operation succeeded.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class PermissionsFolderTrustAddTrustedResult
+{
+    /// <summary>Whether the operation succeeded.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
+}
+
+/// <summary>Folder path to add to trusted folders.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class FolderTrustAddParams
+{
+    /// <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>Indicates whether the operation succeeded.</summary>
+[Experimental(global::GitHub.Copilot.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(global::GitHub.Copilot.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>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>The repository the remote session targets.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class MetadataSnapshotRemoteMetadataRepository
+{
+    /// <summary>The branch the remote session is operating on.</summary>
+    [JsonPropertyName("branch")]
+    public string Branch { get; set; } = string.Empty;
+
+    /// <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>Remote-session-specific metadata. Populated only when `isRemote` is true. Fields are immutable for the lifetime of the session.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class MetadataSnapshotRemoteMetadata
+{
+    /// <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>Public-facing projection of workspace metadata for SDK / TUI consumers.</summary>
+public sealed class SessionMetadataSnapshotWorkspace
+{
+    /// <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>Current working directory at session start.</summary>
+    [JsonPropertyName("cwd")]
+    public string? Cwd { get; set; }
+
+    /// <summary>Resolved git root for cwd, if any.</summary>
+    [JsonPropertyName("git_root")]
+    public string? GitRoot { get; set; }
+
+    /// <summary>Repository host type, if known.</summary>
+    [JsonPropertyName("host_type")]
+    public WorkspaceSummaryHostType? HostType { 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>Display name for the session, if set.</summary>
+    [JsonPropertyName("name")]
+    public string? Name { get; set; }
+
+    /// <summary>Repository identifier in 'owner/repo' or 'org/project/repo' format, if any.</summary>
+    [JsonPropertyName("repository")]
+    public string? Repository { get; set; }
+
+    /// <summary>ISO 8601 timestamp when the workspace was last updated.</summary>
+    [JsonPropertyName("updated_at")]
+    public DateTimeOffset? UpdatedAt { get; set; }
+
+    /// <summary>Whether the display name was explicitly set by the user.</summary>
+    [JsonPropertyName("user_named")]
+    public bool? UserNamed { 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>
+/// <summary>Point-in-time snapshot of slow-changing session identifier and state fields.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PermissionDecisionApproveForSessionApprovalExtensionPermissionAccess : PermissionDecisionApproveForSessionApproval
+public sealed class SessionMetadataSnapshot
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "extension-permission-access";
+    /// <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>Extension name.</summary>
-    [JsonPropertyName("extensionName")]
-    public required string ExtensionName { get; set; }
-}
+    /// <summary>Runtime client name associated with the session (telemetry identifier).</summary>
+    [JsonPropertyName("clientName")]
+    public string? ClientName { 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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PermissionDecisionApproveForSessionApprovalExtensionEnvAccess : PermissionDecisionApproveForSessionApproval
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "extension-env-access";
+    /// <summary>The current agent mode for this session (e.g., 'interactive', 'plan', 'autopilot').</summary>
+    [JsonPropertyName("currentMode")]
+    public MetadataSnapshotCurrentMode CurrentMode { get; set; }
 
-    /// <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>Live indexed-search state for this session activation. Omitted by runtimes that do not expose indexed-search status; absence does not indicate enablement.</summary>
+    [JsonPropertyName("indexedSearch")]
+    public IndexedSearchState? IndexedSearch { get; set; }
 
-    /// <summary>Extension name.</summary>
-    [JsonPropertyName("extensionName")]
-    public required string ExtensionName { 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>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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PermissionDecisionApproveForSession : PermissionDecision
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "approve-for-session";
+    /// <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>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>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>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>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>Approve file-tool read access to specific directories for this logical session, including continuation or resume.</summary>
-/// <remarks>The <c>approve-read-only-for-session</c> variant of <see cref="PermissionDecision"/>.</remarks>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PermissionDecisionApproveReadOnlyForSession : PermissionDecision
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "approve-read-only-for-session";
+    /// <summary>Currently selected model identifier, if any.</summary>
+    [JsonPropertyName("selectedModel")]
+    public string? SelectedModel { get; set; }
 
-    /// <summary>Canonical directories covered by the read-only grant.</summary>
-    [JsonPropertyName("directories")]
-    public required IList<string> Directories { get; set; }
-}
+    /// <summary>The unique identifier of the session.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 
-/// <summary>Approval to persist for this location.</summary>
-/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
-[Experimental(global::GitHub.Copilot.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(PermissionDecisionApproveForLocationApprovalWorkflow), "workflow")]
-[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>Current session limits, or null when no limits are active.</summary>
+    [JsonPropertyName("sessionLimits")]
+    public SessionLimitsConfig? SessionLimits { get; set; }
 
+    /// <summary>ISO 8601 timestamp of when the session started.</summary>
+    [JsonPropertyName("startTime")]
+    public DateTimeOffset StartTime { get; set; }
 
-/// <summary>Location-scoped approval details for specific command identifiers.</summary>
-/// <remarks>The <c>commands</c> variant of <see cref="PermissionDecisionApproveForLocationApproval"/>.</remarks>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PermissionDecisionApproveForLocationApprovalCommands : PermissionDecisionApproveForLocationApproval
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "commands";
+    /// <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>Command identifiers covered by this approval.</summary>
-    [JsonPropertyName("commandIdentifiers")]
-    public required IList<string> CommandIdentifiers { get; set; }
+    /// <summary>Absolute path to the session's current working directory.</summary>
+    [JsonPropertyName("workingDirectory")]
+    public string WorkingDirectory { get; set; } = string.Empty;
+
+    /// <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>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>Location-scoped approval details for read-only filesystem operations.</summary>
-/// <remarks>The <c>read</c> variant of <see cref="PermissionDecisionApproveForLocationApproval"/>.</remarks>
+/// <summary>Identifies the target session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PermissionDecisionApproveForLocationApprovalRead : PermissionDecisionApproveForLocationApproval
+internal sealed class SessionMetadataSnapshotRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "read";
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Location-scoped approval details for filesystem write operations.</summary>
-/// <remarks>The <c>write</c> variant of <see cref="PermissionDecisionApproveForLocationApproval"/>.</remarks>
+/// <summary>Identifies the target session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PermissionDecisionApproveForLocationApprovalWrite : PermissionDecisionApproveForLocationApproval
+internal sealed class SessionMetadataGetClientMetadataRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "write";
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <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>
+/// <summary>Atomic patch for client-owned session metadata. Operations apply in clear, remove, then set order. The resulting bag must satisfy the ClientMetadata entry and serialized-size limits. Local storage coordinates concurrent runtime processes; custom SessionFs providers must serialize writers that access the same session from multiple processes.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PermissionDecisionApproveForLocationApprovalMcp : PermissionDecisionApproveForLocationApproval
+internal sealed class MetadataUpdateClientMetadataRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "mcp";
+    /// <summary>Remove every existing client metadata entry before applying remove and set. Defaults to false.</summary>
+    [JsonPropertyName("clear")]
+    public bool? Clear { get; set; }
 
-    /// <summary>MCP server name.</summary>
-    [JsonPropertyName("serverName")]
-    public required string ServerName { get; set; }
+    /// <summary>Case-sensitive keys to remove. Missing keys are ignored. Each key must be non-empty, at most 256 UTF-8 bytes, and outside the reserved `copilot/` and `github/` namespaces.</summary>
+    [JsonPropertyName("remove")]
+    public IList<string>? Remove { get; set; }
 
-    /// <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>String entries to add or replace. Set wins when a key also appears in remove. Each key must be non-empty, at most 256 UTF-8 bytes, and outside the reserved `copilot/` and `github/` namespaces. Each value may contain at most 16 KiB of UTF-8 data.</summary>
+    [JsonPropertyName("set")]
+    public IDictionary<string, string>? Set { 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>
+/// <summary>Indicates whether the local session is currently processing a turn or background continuation.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PermissionDecisionApproveForLocationApprovalMcpSampling : PermissionDecisionApproveForLocationApproval
+public sealed class MetadataIsProcessingResult
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "mcp-sampling";
-
-    /// <summary>MCP server name.</summary>
-    [JsonPropertyName("serverName")]
-    public required string ServerName { get; set; }
+    /// <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>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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PermissionDecisionApproveForLocationApprovalMemory : PermissionDecisionApproveForLocationApproval
+internal sealed class SessionMetadataIsProcessingRequest
 {
-    /// <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>Current activity flags for the session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PermissionDecisionApproveForLocationApprovalCustomTool : PermissionDecisionApproveForLocationApproval
+public sealed class SessionActivity
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "custom-tool";
+    /// <summary>Whether an in-flight operation can currently be aborted.</summary>
+    [JsonPropertyName("abortable")]
+    public bool Abortable { get; set; }
 
-    /// <summary>Custom tool name.</summary>
-    [JsonPropertyName("toolName")]
-    public required string ToolName { get; set; }
+    /// <summary>Whether the session currently has active work, including running turns or tasks.</summary>
+    [JsonPropertyName("hasActiveWork")]
+    public bool HasActiveWork { 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>
+/// <summary>Identifies the target session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PermissionDecisionApproveForLocationApprovalExtensionManagement : PermissionDecisionApproveForLocationApproval
+internal sealed class SessionMetadataActivityRequest
 {
-    /// <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>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Location-scoped workflow approval, optionally narrowed by approval key.</summary>
-/// <remarks>The <c>workflow</c> variant of <see cref="PermissionDecisionApproveForLocationApproval"/>.</remarks>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PermissionDecisionApproveForLocationApprovalWorkflow : PermissionDecisionApproveForLocationApproval
+/// <summary>Token-usage breakdown for the session's current context window.</summary>
+public sealed class MetadataContextInfoResultContextInfo
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "workflow";
+    /// <summary>Output reservation overlapping the displayed prompt allowance plus tokens after the effective input budget's buffer-exhaustion blocking threshold (default 95%).</summary>
+    [JsonPropertyName("bufferTokens")]
+    public long BufferTokens { get; set; }
 
-    /// <summary>Optional workflow operation name or canonical approval key; when omitted, the approval covers all workflow operations.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("approvalKey")]
-    public string? ApprovalKey { get; set; }
-}
+    /// <summary>Token count at which background compaction starts (configurable percentage of promptTokenLimit).</summary>
+    [JsonPropertyName("compactionThreshold")]
+    public long CompactionThreshold { 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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PermissionDecisionApproveForLocationApprovalExtensionPermissionAccess : PermissionDecisionApproveForLocationApproval
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "extension-permission-access";
+    /// <summary>Tokens consumed by user/assistant/tool messages.</summary>
+    [JsonPropertyName("conversationTokens")]
+    public long ConversationTokens { get; set; }
 
-    /// <summary>Extension name.</summary>
-    [JsonPropertyName("extensionName")]
-    public required string ExtensionName { get; set; }
-}
+    /// <summary>Provider-owned model display label, or the Auto routing label. Presentation only; modelName remains the tokenization identity.</summary>
+    [JsonPropertyName("displayModelName")]
+    public string? DisplayModelName { 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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PermissionDecisionApproveForLocationApprovalExtensionEnvAccess : PermissionDecisionApproveForLocationApproval
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "extension-env-access";
+    /// <summary>Advertised prompt allowance for the selected context tier, without adding output tokens. The denominator for context-usage displays.</summary>
+    [JsonPropertyName("limit")]
+    public long Limit { get; set; }
 
-    /// <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>Tokens consumed by MCP tool definitions (subset of toolDefinitionsTokens, excludes deferred tools).</summary>
+    [JsonPropertyName("mcpToolsTokens")]
+    public long McpToolsTokens { get; set; }
 
-    /// <summary>Extension name.</summary>
-    [JsonPropertyName("extensionName")]
-    public required string ExtensionName { get; set; }
-}
+    /// <summary>The model used for token counting.</summary>
+    [JsonPropertyName("modelName")]
+    public string ModelName { get; set; } = string.Empty;
 
-/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PermissionDecisionApproveForLocation : PermissionDecision
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "approve-for-location";
+    /// <summary>Effective input budget: the selected tier's prompt allowance bounded by the combined context ceiling minus the requested output allowance. Uses DEFAULT_TOKEN_LIMIT when limits are unspecified.</summary>
+    [JsonPropertyName("promptTokenLimit")]
+    public long PromptTokenLimit { get; set; }
 
-    /// <summary>Approval to persist for this location.</summary>
-    [JsonPropertyName("approval")]
-    public required PermissionDecisionApproveForLocationApproval Approval { get; set; }
+    /// <summary>Provider whose catalog supplies this context window. Omitted when provider identity is unavailable.</summary>
+    [JsonPropertyName("provider")]
+    public ModelProviderRef? Provider { get; set; }
 
-    /// <summary>Location key (git root or cwd) to persist the approval to.</summary>
-    [JsonPropertyName("locationKey")]
-    public required string LocationKey { get; set; }
+    /// <summary>Tokens consumed by the system prompt.</summary>
+    [JsonPropertyName("systemTokens")]
+    public long SystemTokens { get; set; }
+
+    /// <summary>Tokens consumed by tool definitions sent to the model (excludes deferred tools).</summary>
+    [JsonPropertyName("toolDefinitionsTokens")]
+    public long ToolDefinitionsTokens { get; set; }
+
+    /// <summary>Sum of system, conversation and tool-definition tokens.</summary>
+    [JsonPropertyName("totalTokens")]
+    public long TotalTokens { 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>
+/// <summary>Token breakdown for the session's current context window, or null if uninitialized.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PermissionDecisionApprovePermanently : PermissionDecision
+public sealed class MetadataContextInfoResult
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "approve-permanently";
-
-    /// <summary>URL domain to approve permanently.</summary>
-    [JsonPropertyName("domain")]
-    public required string Domain { get; set; }
+    /// <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>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>Model identifier and token limits used to compute the context-info breakdown.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PermissionDecisionReject : PermissionDecision
+internal sealed class MetadataContextInfoRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "reject";
+    /// <summary>Requested output allowance to reserve against the combined context ceiling. Pass 0 to resolve the session's request cap, falling back to the model's advertised output limit.</summary>
+    [JsonPropertyName("outputTokenLimit")]
+    public long OutputTokenLimit { get; set; }
 
-    /// <summary>Optional feedback explaining the rejection.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("feedback")]
-    public string? Feedback { get; set; }
+    /// <summary>Advertised prompt allowance. Pass 0 to resolve the selected model and context tier from the session.</summary>
+    [JsonPropertyName("promptTokenLimit")]
+    public long PromptTokenLimit { get; set; }
+
+    /// <summary>Provider owning selectedModel. Omit to use the current provider for the current model, or deterministic legacy lookup for a different model.</summary>
+    [JsonPropertyName("providerId")]
+    public string? ProviderId { 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>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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PermissionDecisionUserNotAvailable : PermissionDecision
+/// <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
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "user-not-available";
+    /// <summary>Overlapping output reservation plus post-blocking-threshold buffer.</summary>
+    [JsonPropertyName("buffer")]
+    public long Buffer { get; set; }
+
+    /// <summary>Custom-instructions tokens (0 when none are configured).</summary>
+    [JsonPropertyName("customInstructions")]
+    public long CustomInstructions { get; set; }
+
+    /// <summary>Remaining unused window capacity (clamped at 0).</summary>
+    [JsonPropertyName("freeSpace")]
+    public long FreeSpace { get; set; }
+
+    /// <summary>MCP tool-definition tokens.</summary>
+    [JsonPropertyName("mcpTools")]
+    public long McpTools { get; set; }
+
+    /// <summary>Conversation (user/assistant/tool) message tokens.</summary>
+    [JsonPropertyName("messages")]
+    public long Messages { get; set; }
+
+    /// <summary>System prompt tokens, excluding custom instructions.</summary>
+    [JsonPropertyName("systemPrompt")]
+    public long SystemPrompt { get; set; }
+
+    /// <summary>Non-MCP tool-definition tokens.</summary>
+    [JsonPropertyName("systemTools")]
+    public long SystemTools { get; set; }
 }
 
-/// <summary>Permission-decision variant indicating the request was approved.</summary>
-/// <remarks>The <c>approved</c> variant of <see cref="PermissionDecision"/>.</remarks>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PermissionDecisionApproved : PermissionDecision
+/// <summary>Successful compaction history for the session.</summary>
+public sealed class MetadataContextAttributionResultContextAttributionCompactions
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "approved";
+    /// <summary>Number of successful compactions in this session.</summary>
+    [JsonPropertyName("count")]
+    public long Count { get; set; }
 }
 
-/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PermissionDecisionApprovedForSession : PermissionDecision
+/// <summary>RPC data type for MetadataContextAttributionResultContextAttributionEntry operations.</summary>
+public sealed class MetadataContextAttributionResultContextAttributionEntry
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "approved-for-session";
+    /// <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>The approval to add as a session-scoped rule.</summary>
-    [JsonPropertyName("approval")]
-    public required UserToolSessionApproval Approval { 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>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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PermissionDecisionApprovedForLocation : PermissionDecision
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "approved-for-location";
+    /// <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>The approval to persist for this location.</summary>
-    [JsonPropertyName("approval")]
-    public required UserToolSessionApproval Approval { 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>The location key (git root or cwd) to persist the approval to.</summary>
-    [JsonPropertyName("locationKey")]
-    public required string LocationKey { 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>Token count currently in context attributable to this entry.</summary>
+    [JsonPropertyName("tokens")]
+    public long Tokens { 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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PermissionDecisionCancelled : PermissionDecision
+/// <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
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "cancelled";
+    /// <summary>Output reservation overlapping the displayed prompt allowance plus the tokens past the effective input budget's buffer-exhaustion blocking threshold. Mirrors `SessionContextInfo.bufferTokens`.</summary>
+    [JsonPropertyName("bufferTokens")]
+    public long BufferTokens { get; set; }
 
-    /// <summary>Optional explanation of why the request was cancelled.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("reason")]
-    public string? Reason { 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>Successful compaction history for the session.</summary>
+    [JsonPropertyName("compactions")]
+    public MetadataContextAttributionResultContextAttributionCompactions Compactions { get => field ??= new(); set; }
+
+    /// <summary>Token count at which background compaction starts. Mirrors `SessionContextInfo.compactionThreshold`.</summary>
+    [JsonPropertyName("compactionThreshold")]
+    public long CompactionThreshold { get; set; }
+
+    /// <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>Advertised prompt allowance for the selected context tier: the denominator for context-usage displays and capacity for `categories.freeSpace` and `categories.buffer`. Mirrors `SessionContextInfo.limit`.</summary>
+    [JsonPropertyName("limit")]
+    public long Limit { 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>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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PermissionDecisionDeniedByRules : PermissionDecision
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "denied-by-rules";
+    /// <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>Rules that denied the request.</summary>
-    [JsonPropertyName("rules")]
-    public required IList<PermissionRule> Rules { get; set; }
+    /// <summary>Effective input budget after reserving requested output against the combined context ceiling. 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>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>Per-source attribution breakdown for the session's current context window, or null if uninitialized.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PermissionDecisionDeniedNoApprovalRuleAndCouldNotRequestFromUser : PermissionDecision
+public sealed class MetadataContextAttributionResult
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "denied-no-approval-rule-and-could-not-request-from-user";
+    /// <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>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>Identifies the target session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PermissionDecisionDeniedInteractivelyByUser : PermissionDecision
+internal sealed class SessionMetadataGetContextAttributionRequest
 {
-    /// <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>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <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>A single large message currently in context.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PermissionDecisionDeniedByContentExclusionPolicy : PermissionDecision
+public sealed class ContextHeaviestMessage
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "denied-by-content-exclusion-policy";
+    /// <summary>Stable identifier for this message within the snapshot.</summary>
+    [JsonPropertyName("id")]
+    public string Id { get; set; } = string.Empty;
 
-    /// <summary>Human-readable explanation of why the path was excluded.</summary>
-    [JsonPropertyName("message")]
-    public required string Message { get; set; }
+    /// <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>File path that triggered the exclusion.</summary>
-    [JsonPropertyName("path")]
-    public required string Path { get; set; }
+    /// <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>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>The heaviest individual messages in the session's context window, most-expensive first.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PermissionDecisionDeniedByPermissionRequestHook : PermissionDecision
+public sealed class MetadataContextHeaviestMessagesResult
 {
-    /// <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>Heaviest messages, most-expensive first.</summary>
+    [JsonPropertyName("messages")]
+    public IList<ContextHeaviestMessage> Messages { get => field ??= []; set; }
 
-    /// <summary>Optional message from the hook explaining the denial.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("message")]
-    public string? Message { get; 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>Pending permission request ID and the decision to apply (approve/reject and scope).</summary>
+/// <summary>Parameters for the heaviest-messages query.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class PermissionDecisionRequest
+internal sealed class MetadataContextHeaviestMessagesRequest
 {
-    /// <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>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>Pending permission prompt reconstructed from event history, with request ID and user-facing prompt details.</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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class PendingPermissionRequest
+public sealed class MetadataRecordContextChangeResult
 {
-    /// <summary>Permission-recovery episode that authorized this request to surface for interactive attention.</summary>
-    [JsonPropertyName("recoveryEpisodeId")]
-    public string? RecoveryEpisodeId { get; set; }
+}
 
-    /// <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>Updated working-directory/git context to record on the session.</summary>
+[Experimental(global::GitHub.Copilot.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; }
 
-    /// <summary>Unique identifier for the pending permission request.</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>List of pending permission requests reconstructed from event history.</summary>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class PendingPermissionRequestList
+public sealed class MetadataSetWorkingDirectoryResult
 {
-    /// <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>Working directory after the update.</summary>
+    [JsonPropertyName("workingDirectory")]
+    public string WorkingDirectory { get; set; } = string.Empty;
 }
 
-/// <summary>No parameters; returns currently-pending permission requests for the session.</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(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class PermissionsPendingRequestsRequest
+internal sealed class MetadataSetWorkingDirectoryRequest
 {
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
+
+    /// <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>Indicates whether the operation succeeded.</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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class PermissionsSetApproveAllResult
+public sealed class MetadataRecomputeContextTokensResult
 {
-    /// <summary>Whether the operation succeeded.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { get; set; }
+    /// <summary>Tokens contributed by user/assistant/tool messages (excludes system/developer prompts).</summary>
+    [JsonPropertyName("messagesTokenCount")]
+    public long MessagesTokenCount { 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>Allow-all toggle for tool permission requests, with an optional telemetry source.</summary>
+/// <summary>Model identifier to use when re-tokenizing the session's existing messages.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class PermissionsSetApproveAllRequest
+internal sealed class MetadataRecomputeContextTokensRequest
 {
-    /// <summary>Whether to auto-approve all tool permission requests.</summary>
-    [JsonPropertyName("enabled")]
-    public bool Enabled { get; 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>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>
+/// <summary>Availability of built-in job tools surfaced to boundary consumers.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class PermissionsSetModeResult
+public sealed class SessionSettingsBuiltInToolAvailabilitySnapshot
 {
-    /// <summary>Authoritative permission mode after the mutation.</summary>
-    [JsonPropertyName("mode")]
-    public PermissionMode Mode { get; set; }
+    /// <summary>Whether the create-pull-request tool is available.</summary>
+    [JsonPropertyName("createPullRequest")]
+    public bool? CreatePullRequest { get; set; }
 
-    /// <summary>Whether the operation succeeded.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { get; set; }
+    /// <summary>Whether the report-progress tool is available.</summary>
+    [JsonPropertyName("reportProgress")]
+    public bool? ReportProgress { get; set; }
 }
 
-/// <summary>Permission mode to apply for the session.</summary>
+/// <summary>Redacted job settings for a session. The job nonce is excluded.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class PermissionsSetModeRequest
+public sealed class SessionSettingsJobSnapshot
 {
-    /// <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>Availability of job-specific built-in tools.</summary>
+    [JsonPropertyName("builtInToolAvailability")]
+    public SessionSettingsBuiltInToolAvailabilitySnapshot? BuiltInToolAvailability { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>GitHub Actions event type for the job.</summary>
+    [JsonPropertyName("eventType")]
+    public string? EventType { get; set; }
 
-    /// <summary>Optional source for permission-mode telemetry. `organization_targeting` is reserved for startup selection after the authenticated account matches an organization targeting policy; SDK callers default to `rpc` and cannot claim targeting provenance.</summary>
-    [JsonPropertyName("source")]
-    public PermissionModeSource? Source { get; set; }
+    /// <summary>Whether this is the workflow's trigger job.</summary>
+    [JsonPropertyName("isTriggerJob")]
+    public bool? IsTriggerJob { get; set; }
 }
 
-/// <summary>Current permission mode.</summary>
+/// <summary>Redacted model routing settings for a session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class PermissionsGetModeResult
+public sealed class SessionSettingsModelSnapshot
 {
-    /// <summary>Current permission mode.</summary>
-    [JsonPropertyName("mode")]
-    public PermissionMode Mode { get; set; }
+    /// <summary>Agent service callback URL for job and progress updates.</summary>
+    [JsonPropertyName("callbackUrl")]
+    public string? CallbackUrl { get; set; }
+
+    /// <summary>Default reasoning effort for the selected model.</summary>
+    [JsonPropertyName("defaultReasoningEffort")]
+    public string? DefaultReasoningEffort { get; set; }
+
+    /// <summary>Agent job identifier for the session.</summary>
+    [JsonPropertyName("instanceId")]
+    public string? InstanceId { get; set; }
+
+    /// <summary>Selected model identifier.</summary>
+    [JsonPropertyName("model")]
+    public string? Model { get; set; }
 }
 
-/// <summary>No parameters.</summary>
+/// <summary>Online-evaluation settings safe to expose across the SDK boundary.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class PermissionsGetModeRequest
+public sealed class SessionSettingsOnlineEvaluationSnapshot
 {
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Whether online evaluation is disabled.</summary>
+    [JsonPropertyName("disableOnlineEvaluation")]
+    public bool? DisableOnlineEvaluation { get; set; }
+
+    /// <summary>Whether online-evaluation output-file generation is enabled.</summary>
+    [JsonPropertyName("enableOnlineEvaluationOutputFile")]
+    public bool? EnableOnlineEvaluationOutputFile { get; set; }
 }
 
-/// <summary>Indicates whether the operation succeeded.</summary>
+/// <summary>Redacted repository and GitHub host settings for a session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class PermissionsModifyRulesResult
+public sealed class SessionSettingsRepoSnapshot
 {
-    /// <summary>Whether the operation succeeded.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { get; set; }
+    /// <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 double? Id { get; set; }
+
+    /// <summary>Repository name.</summary>
+    [JsonPropertyName("name")]
+    public string? Name { get; set; }
+
+    /// <summary>GitHub repository owner database ID.</summary>
+    [JsonPropertyName("ownerId")]
+    public double? OwnerId { get; set; }
+
+    /// <summary>Repository owner login.</summary>
+    [JsonPropertyName("ownerName")]
+    public string? OwnerName { get; set; }
+
+    /// <summary>Number of commits in the pull request.</summary>
+    [JsonPropertyName("prCommitCount")]
+    public double? PrCommitCount { get; set; }
+
+    /// <summary>Whether the repository is writable.</summary>
+    [JsonPropertyName("readWrite")]
+    public bool? ReadWrite { get; set; }
+
+    /// <summary>GitHub secret-scanning service URL.</summary>
+    [JsonPropertyName("secretScanningUrl")]
+    public string? SecretScanningUrl { get; set; }
+
+    /// <summary>GitHub server base URL.</summary>
+    [JsonPropertyName("serverUrl")]
+    public string? ServerUrl { get; set; }
 }
 
-/// <summary>Scope and add/remove instructions for modifying session- or location-scoped permission rules.</summary>
+/// <summary>Redacted validation and memory-tool settings for a session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class PermissionsModifyRulesParams
+public sealed class SessionSettingsValidationSnapshot
 {
-    /// <summary>Rules to add to the scope. Applied before `remove`/`removeAll`.</summary>
-    [JsonPropertyName("add")]
-    public IList<PermissionRule>? Add { get; set; }
+    /// <summary>Whether advisory validation is enabled.</summary>
+    [JsonPropertyName("advisoryEnabled")]
+    public bool? AdvisoryEnabled { 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>Whether CodeQL validation is enabled.</summary>
+    [JsonPropertyName("codeqlEnabled")]
+    public bool? CodeqlEnabled { 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>Whether code-review validation is enabled.</summary>
+    [JsonPropertyName("codeReviewEnabled")]
+    public bool? CodeReviewEnabled { 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>Model used for code-review validation.</summary>
+    [JsonPropertyName("codeReviewModel")]
+    public string? CodeReviewModel { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <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>Indicates whether the operation succeeded.</summary>
+/// <summary>Redacted, serializable view of session runtime settings for SDK boundary consumers. Secrets and raw feature flags are intentionally excluded.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class PermissionsSetRequiredResult
+internal sealed class SessionSettingsSnapshot
 {
-    /// <summary>Whether the operation succeeded.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { get; set; }
+    /// <summary>Name of the SDK client that created the session.</summary>
+    [JsonPropertyName("clientName")]
+    public string? ClientName { get; set; }
+
+    /// <summary>Redacted job settings.</summary>
+    [JsonPropertyName("job")]
+    public SessionSettingsJobSnapshot Job { get => field ??= new(); set; }
+
+    /// <summary>Redacted model routing settings.</summary>
+    [JsonPropertyName("model")]
+    public SessionSettingsModelSnapshot Model { get => field ??= new(); set; }
+
+    /// <summary>Online-evaluation settings safe for SDK consumers.</summary>
+    [JsonPropertyName("onlineEvaluation")]
+    public SessionSettingsOnlineEvaluationSnapshot OnlineEvaluation { get => field ??= new(); set; }
+
+    /// <summary>Redacted repository and host settings.</summary>
+    [JsonPropertyName("repo")]
+    public SessionSettingsRepoSnapshot Repo { get => field ??= new(); set; }
+
+    /// <summary>Session start time as Unix epoch milliseconds.</summary>
+    [JsonPropertyName("startTimeMs")]
+    public double? StartTimeMs { 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>Toggles whether permission prompts should be bridged into session events for this client.</summary>
+/// <summary>Identifies the target session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class PermissionsSetRequiredRequest
+internal sealed class SessionSettingsSnapshotRequest
 {
-    /// <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>Indicates whether the operation succeeded.</summary>
+/// <summary>Result of evaluating a Rust-owned settings predicate.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class PermissionsResetSessionApprovalsResult
+internal sealed class SessionSettingsEvaluatePredicateResult
 {
-    /// <summary>Whether the operation succeeded.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { get; set; }
+    /// <summary>Whether the named settings predicate evaluated to enabled.</summary>
+    [JsonPropertyName("enabled")]
+    public bool Enabled { get; set; }
 }
 
-/// <summary>Clears session-scoped tool approvals and optionally clears location-scoped approvals and exact session-approved paths.</summary>
+/// <summary>Named Rust-owned settings predicate to evaluate for this session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class PermissionsResetSessionApprovalsRequest
+internal sealed class SessionSettingsEvaluatePredicateRequest
 {
-    /// <summary>Whether location-scoped approvals and exact session-approved paths are cleared too. Defaults to `true`.</summary>
-    [JsonPropertyName("includeLocation")]
-    public bool? IncludeLocation { 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>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
+
+    /// <summary>Tool name for tool-scoped predicates such as trivial-change handling.</summary>
+    [JsonPropertyName("toolName")]
+    public string? ToolName { get; set; }
 }
 
-/// <summary>Indicates whether the operation succeeded.</summary>
+/// <summary>Content-exclusion decision for one requested path.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class PermissionsNotifyPromptShownResult
+public sealed class ContentExclusionPathCheck
 {
-    /// <summary>Whether the operation succeeded.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { get; set; }
+    /// <summary>Whether the session's complete content-exclusion policy excludes the path.</summary>
+    [JsonPropertyName("excluded")]
+    public bool Excluded { get; set; }
+
+    /// <summary>The path supplied by the caller.</summary>
+    [JsonPropertyName("path")]
+    public string Path { get; set; } = string.Empty;
 }
 
-/// <summary>Notification payload describing the permission prompt that the client just rendered.</summary>
+/// <summary>Batch content-exclusion result. Callers must fail closed when policy evaluation is unavailable.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class PermissionPromptShownNotification
+public sealed class ContentExclusionCheckPathsResult
 {
-    /// <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>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>Per-path decisions in request order. Empty when available is false.</summary>
+    [JsonPropertyName("checks")]
+    public IList<ContentExclusionPathCheck> Checks { get => field ??= []; set; }
+}
+
+/// <summary>Local file system absolute paths within the session working directory to check against its content-exclusion policy.</summary>
+[Experimental(global::GitHub.Copilot.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>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Snapshot of the session's recursive directory grants, exact session-approved paths, and primary working directory.</summary>
+/// <summary>Identifier of the spawned shell process, usable with shell.kill while the process is running.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class PermissionPathsList
+public sealed class ShellExecResult
 {
-    /// <summary>All directories currently allowed for tool access on this session.</summary>
-    [JsonPropertyName("directories")]
-    public IList<string> Directories { get => field ??= []; set; }
+    /// <summary>Identifier usable with shell.kill while the process is running.</summary>
+    [JsonPropertyName("processId")]
+    public string ProcessId { get; set; } = string.Empty;
+}
 
-    /// <summary>The primary working directory for this session.</summary>
-    [JsonPropertyName("primary")]
-    public string Primary { get; set; } = string.Empty;
+/// <summary>Shell command to run, with optional working directory and timeout in milliseconds. Spawn failures return an RPC error.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class ShellExecRequest
+{
+    /// <summary>Shell command to execute.</summary>
+    [JsonPropertyName("command")]
+    public string Command { get; set; } = string.Empty;
 
-    /// <summary>Exact paths approved for this session without recursively allowing their descendants.</summary>
-    [JsonPropertyName("sessionApprovedPaths")]
-    public IList<string>? SessionApprovedPaths { get; set; }
-}
+    /// <summary>Working directory (defaults to session working directory).</summary>
+    [JsonPropertyName("cwd")]
+    public string? Cwd { get; set; }
 
-/// <summary>No parameters; returns the session's recursive directory grants and exact session-approved paths.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class PermissionsPathsListRequest
-{
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
+
+    /// <summary>Timeout in milliseconds (default: 30000).</summary>
+    [JsonConverter(typeof(MillisecondsTimeSpanConverter))]
+    [JsonPropertyName("timeout")]
+    public TimeSpan? Timeout { get; set; }
 }
 
-/// <summary>Indicates whether the operation succeeded.</summary>
+/// <summary>Indicates whether the signal was delivered; false if the process was unknown or already exited.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class PermissionsPathsAddResult
+public sealed class ShellKillResult
 {
-    /// <summary>Whether the operation succeeded.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { get; set; }
+    /// <summary>Whether the signal was sent successfully.</summary>
+    [JsonPropertyName("killed")]
+    public bool Killed { get; set; }
 }
 
-/// <summary>Directory path to add to the session's allowed directories.</summary>
+/// <summary>Identifier of a process previously returned by "shell.exec" and the signal to send.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class PermissionPathsAddParams
+internal sealed class ShellKillRequest
 {
-    /// <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>Process identifier returned by shell.exec.</summary>
+    [JsonPropertyName("processId")]
+    public string ProcessId { get; set; } = string.Empty;
 
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
+
+    /// <summary>Signal to send (default: SIGTERM).</summary>
+    [JsonPropertyName("signal")]
+    public ShellKillSignal? Signal { get; set; }
 }
 
-/// <summary>Indicates whether the operation succeeded.</summary>
+/// <summary>Result of a user-requested shell command.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class PermissionsPathsUpdatePrimaryResult
+public sealed class UserRequestedShellCommandResult
 {
-    /// <summary>Whether the operation succeeded.</summary>
+    /// <summary>Error output when the execution failed.</summary>
+    [JsonPropertyName("error")]
+    public string? Error { get; set; }
+
+    /// <summary>Process exit code, when available.</summary>
+    [JsonPropertyName("exitCode")]
+    public long? ExitCode { get; set; }
+
+    /// <summary>Captured command output.</summary>
+    [JsonPropertyName("output")]
+    public string Output { get; set; } = string.Empty;
+
+    /// <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>Directory path to set as the session's new primary working directory.</summary>
+/// <summary>User-requested shell command and cancellation handle.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class PermissionPathsUpdatePrimaryParams
+internal sealed class ShellExecuteUserRequestedRequest
 {
-    /// <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>Shell command to execute.</summary>
+    [JsonPropertyName("command")]
+    public string Command { get; set; } = string.Empty;
+
+    /// <summary>Caller-provided cancellation handle for this execution.</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 supplied path is within the session's allowed directories.</summary>
+/// <summary>Cancellation result for a user-requested shell command.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class PermissionPathsAllowedCheckResult
+public sealed class CancelUserRequestedShellCommandResult
 {
-    /// <summary>Whether the path is within the session's allowed directories.</summary>
-    [JsonPropertyName("allowed")]
-    public bool Allowed { get; set; }
+    /// <summary>Whether an in-flight execution was found and signalled to cancel.</summary>
+    [JsonPropertyName("cancelled")]
+    public bool Cancelled { get; set; }
 }
 
-/// <summary>Path to evaluate against the session's allowed directories.</summary>
+/// <summary>User-requested shell execution cancellation handle.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class PermissionPathsAllowedCheckParams
+internal sealed class ShellCancelUserRequestedRequest
 {
-    /// <summary>Path to check against the session's allowed directories.</summary>
-    [JsonPropertyName("path")]
-    public string Path { get; set; } = string.Empty;
+    /// <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 supplied path is within the session's workspace directory.</summary>
+/// <summary>Post-compaction context window usage breakdown.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class PermissionPathsWorkspaceCheckResult
+public sealed class HistoryCompactContextWindow
 {
-    /// <summary>Whether the path is within the session workspace directory.</summary>
-    [JsonPropertyName("allowed")]
-    public bool Allowed { 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>Path to evaluate against the session's workspace (primary) directory.</summary>
+/// <summary>Compaction outcome with the number of tokens and messages removed, summary text, and the resulting context window breakdown.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class PermissionPathsWorkspaceCheckParams
+public sealed class HistoryCompactResult
 {
-    /// <summary>Path to check against the session workspace directory.</summary>
-    [JsonPropertyName("path")]
-    public string Path { get; set; } = string.Empty;
+    /// <summary>Post-compaction context window usage breakdown.</summary>
+    [JsonPropertyName("contextWindow")]
+    public HistoryCompactContextWindow? ContextWindow { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Number of messages removed during compaction.</summary>
+    [JsonPropertyName("messagesRemoved")]
+    public long MessagesRemoved { get; set; }
+
+    /// <summary>Whether compaction completed successfully.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
+
+    /// <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>Resolved location-permissions key and type.</summary>
+/// <summary>RPC data type for SessionHistoryCompact operations.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class PermissionLocationResolveResult
+public sealed class SessionHistoryCompactRequest
 {
-    /// <summary>Location key used in the location-permissions store.</summary>
-    [JsonPropertyName("locationKey")]
-    public string LocationKey { get; set; } = string.Empty;
+    /// <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>Whether the location is a git repo or directory.</summary>
-    [JsonPropertyName("locationType")]
-    public PermissionLocationType LocationType { 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>Working directory to resolve into a location-permissions key.</summary>
+/// <summary>RPC data type for SessionHistoryCompactRequestWithSession operations.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class PermissionLocationResolveParams
+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>Working directory whose permission location should be resolved.</summary>
-    [JsonPropertyName("workingDirectory")]
-    public string WorkingDirectory { 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>Summary of persisted location permissions applied to the session.</summary>
+/// <summary>Number of events that were removed by the truncation.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class PermissionLocationApplyResult
+public sealed class HistoryTruncateResult
 {
-    /// <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>Failure detail when checkpointCleanupFailed is true.</summary>
+    [JsonPropertyName("checkpointCleanupError")]
+    public string? CheckpointCleanupError { get; set; }
 
-    /// <summary>Location key used in the location-permissions store.</summary>
-    [JsonPropertyName("locationKey")]
-    public string LocationKey { 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>Whether the location is a git repo or directory.</summary>
-    [JsonPropertyName("locationType")]
-    public PermissionLocationType LocationType { get; set; }
+    /// <summary>Number of events that were removed.</summary>
+    [JsonPropertyName("eventsRemoved")]
+    public long EventsRemoved { get; set; }
 }
 
-/// <summary>Working directory to load persisted location permissions for.</summary>
+/// <summary>Identifier of the event to truncate to; this event and all later events are removed.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class PermissionLocationApplyParams
+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;
+
     /// <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>A root user turn that the session can rewind to.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class PermissionsLocationsAddToolApprovalResult
+public sealed class HistoryRewindPoint
 {
-    /// <summary>Whether the operation succeeded.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { 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>Tool approval to persist and apply.</summary>
-/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
-[Experimental(global::GitHub.Copilot.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(PermissionsLocationsAddToolApprovalDetailsWorkflow), "workflow")]
-[JsonDerivedType(typeof(PermissionsLocationsAddToolApprovalDetailsExtensionPermissionAccess), "extension-permission-access")]
-[JsonDerivedType(typeof(PermissionsLocationsAddToolApprovalDetailsExtensionEnvAccess), "extension-env-access")]
-public partial class PermissionsLocationsAddToolApprovalDetails
-{
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("kind")]
-    public virtual string Kind { get; set; } = string.Empty;
-}
+    /// <summary>ID of the user.message event that begins the discarded suffix.</summary>
+    [JsonPropertyName("eventId")]
+    public string EventId { get; set; } = string.Empty;
 
+    /// <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>Location-persisted tool approval details for specific command identifiers.</summary>
-/// <remarks>The <c>commands</c> variant of <see cref="PermissionsLocationsAddToolApprovalDetails"/>.</remarks>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PermissionsLocationsAddToolApprovalDetailsCommands : PermissionsLocationsAddToolApprovalDetails
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "commands";
+    /// <summary>Whether this turn was an automatically injected autopilot continuation.</summary>
+    [JsonPropertyName("isAutopilotContinuation")]
+    public bool IsAutopilotContinuation { get; set; }
 
-    /// <summary>Command identifiers covered by this approval.</summary>
-    [JsonPropertyName("commandIdentifiers")]
-    public required IList<string> CommandIdentifiers { get; set; }
+    /// <summary>Lines added by this turn's captured file changes.</summary>
+    [JsonPropertyName("linesAdded")]
+    public long LinesAdded { get; set; }
+
+    /// <summary>Lines removed by this turn's captured file changes.</summary>
+    [JsonPropertyName("linesRemoved")]
+    public long LinesRemoved { get; set; }
+
+    /// <summary>ISO timestamp of the user turn.</summary>
+    [JsonPropertyName("timestamp")]
+    public string Timestamp { get; set; } = string.Empty;
+
+    /// <summary>Whether this turn itself captured any file changes.</summary>
+    [JsonPropertyName("turnChangedFiles")]
+    public bool TurnChangedFiles { get; set; }
+
+    /// <summary>User-visible message text for the turn.</summary>
+    [JsonPropertyName("userMessage")]
+    public string UserMessage { 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>Rewind points and file-change-tracking availability for the session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PermissionsLocationsAddToolApprovalDetailsRead : PermissionsLocationsAddToolApprovalDetails
+public sealed class HistoryListRewindPointsResult
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "read";
+    /// <summary>Whether this session captured file changes from its first turn.</summary>
+    [JsonPropertyName("fileChangeTrackingEnabled")]
+    public bool FileChangeTrackingEnabled { 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>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>Location-persisted tool approval details for filesystem write operations.</summary>
-/// <remarks>The <c>write</c> variant of <see cref="PermissionsLocationsAddToolApprovalDetails"/>.</remarks>
+/// <summary>Identifies the target session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PermissionsLocationsAddToolApprovalDetailsWrite : PermissionsLocationsAddToolApprovalDetails
+internal sealed class SessionHistoryListRewindPointsRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "write";
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <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>A file that a conversation-and-files rewind would restore.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PermissionsLocationsAddToolApprovalDetailsMcp : PermissionsLocationsAddToolApprovalDetails
+public sealed class HistoryRewindFilePreview
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "mcp";
+    /// <summary>Aggregate change made across the discarded turns.</summary>
+    [JsonPropertyName("changeType")]
+    public HistoryRewindChangeType ChangeType { get; set; }
 
-    /// <summary>MCP server name.</summary>
-    [JsonPropertyName("serverName")]
-    public required string ServerName { get; set; }
+    /// <summary>Lines added across the discarded turns.</summary>
+    [JsonPropertyName("linesAdded")]
+    public long LinesAdded { get; set; }
 
-    /// <summary>MCP tool name, or null to cover every tool on the server.</summary>
-    [JsonPropertyName("toolName")]
-    public string? ToolName { get; set; }
+    /// <summary>Lines removed across the discarded turns.</summary>
+    [JsonPropertyName("linesRemoved")]
+    public long LinesRemoved { get; set; }
+
+    /// <summary>Absolute path of the captured file.</summary>
+    [JsonPropertyName("path")]
+    public string Path { 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>Files and aggregate changes for a prospective rewind.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PermissionsLocationsAddToolApprovalDetailsMcpSampling : PermissionsLocationsAddToolApprovalDetails
+public sealed class HistoryPreviewRewindResult
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "mcp-sampling";
+    /// <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>MCP server name.</summary>
-    [JsonPropertyName("serverName")]
-    public required string ServerName { get; set; }
-}
+    /// <summary>Number of unique files in the preview.</summary>
+    [JsonPropertyName("fileCount")]
+    public long FileCount { 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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PermissionsLocationsAddToolApprovalDetailsMemory : PermissionsLocationsAddToolApprovalDetails
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "memory";
+    /// <summary>Files ordered by path.</summary>
+    [JsonPropertyName("files")]
+    public IList<HistoryRewindFilePreview> Files { get => field ??= []; 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>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>Event boundary to preview for conversation-and-files rewind.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PermissionsLocationsAddToolApprovalDetailsCustomTool : PermissionsLocationsAddToolApprovalDetails
+internal sealed class HistoryPreviewRewindRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "custom-tool";
+    /// <summary>ID of the user.message event that begins the discarded suffix.</summary>
+    [JsonPropertyName("eventId")]
+    public string EventId { 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>A captured file that rewind intentionally left unchanged.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PermissionsLocationsAddToolApprovalDetailsExtensionManagement : PermissionsLocationsAddToolApprovalDetails
+public sealed class HistorySkippedFileRestore
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "extension-management";
+    /// <summary>Absolute path of the skipped file.</summary>
+    [JsonPropertyName("path")]
+    public string Path { 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>Reason the file was not restored.</summary>
+    [JsonPropertyName("reason")]
+    public HistoryFileRestoreSkipReason Reason { get; set; }
 }
 
-/// <summary>Location-persisted workflow approval, optionally narrowed by approval key.</summary>
-/// <remarks>The <c>workflow</c> variant of <see cref="PermissionsLocationsAddToolApprovalDetails"/>.</remarks>
+/// <summary>Structured outcome of a rewind request.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PermissionsLocationsAddToolApprovalDetailsWorkflow : PermissionsLocationsAddToolApprovalDetails
+public sealed class HistoryRewindResult
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "workflow";
+    /// <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>Optional workflow operation name or canonical approval key; when omitted, the approval covers all workflow operations.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("approvalKey")]
-    public string? ApprovalKey { 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>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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PermissionsLocationsAddToolApprovalDetailsExtensionPermissionAccess : PermissionsLocationsAddToolApprovalDetails
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "extension-permission-access";
+    /// <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>Extension name.</summary>
-    [JsonPropertyName("extensionName")]
-    public required string ExtensionName { 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>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>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>
+/// <summary>Boundary and mode for rewinding session history.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class PermissionsLocationsAddToolApprovalDetailsExtensionEnvAccess : PermissionsLocationsAddToolApprovalDetails
+internal sealed class HistoryRewindRequest
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "extension-env-access";
+    /// <summary>ID of the user.message event that begins the discarded suffix.</summary>
+    [JsonPropertyName("eventId")]
+    public string EventId { 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>Whether to rewind only conversation history or also restore captured files.</summary>
+    [JsonPropertyName("mode")]
+    public HistoryRewindMode Mode { get; set; }
 
-    /// <summary>Extension name.</summary>
-    [JsonPropertyName("extensionName")]
-    public required string ExtensionName { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Location-scoped tool approval to persist.</summary>
+/// <summary>Indicates whether an in-progress background compaction was cancelled.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class PermissionLocationAddToolApprovalParams
+public sealed class HistoryCancelBackgroundCompactionResult
 {
-    /// <summary>Tool approval to persist and apply.</summary>
-    [JsonPropertyName("approval")]
-    public PermissionsLocationsAddToolApprovalDetails Approval { get => field ??= new(); set; }
-
-    /// <summary>Location key (git root or cwd) to persist the approval to.</summary>
-    [JsonPropertyName("locationKey")]
-    public string LocationKey { get; set; } = string.Empty;
+    /// <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>Identifies the target session.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class SessionHistoryCancelBackgroundCompactionRequest
+{
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Folder trust check result.</summary>
+/// <summary>Indicates whether an in-progress manual compaction was aborted.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class FolderTrustCheckResult
+public sealed class HistoryAbortManualCompactionResult
 {
-    /// <summary>Whether the folder is trusted.</summary>
-    [JsonPropertyName("trusted")]
-    public bool Trusted { 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>Folder path to check for trust.</summary>
+/// <summary>Identifies the target session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class FolderTrustCheckParams
+internal sealed class SessionHistoryAbortManualCompactionRequest
 {
-    /// <summary>Folder path to check.</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 operation succeeded.</summary>
+/// <summary>Markdown summary of the conversation context (empty when not available).</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class PermissionsFolderTrustAddTrustedResult
+public sealed class HistorySummarizeForHandoffResult
 {
-    /// <summary>Whether the operation succeeded.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { get; set; }
+    /// <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>Folder path to add to trusted folders.</summary>
+/// <summary>Identifies the target session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class FolderTrustAddParams
+internal sealed class SessionHistorySummarizeForHandoffRequest
 {
-    /// <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>Indicates whether the operation succeeded.</summary>
+/// <summary>What a successful clear removed. A clear that could not be applied rejects instead of reporting a count.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class PermissionsUrlsSetUnrestrictedModeResult
+public sealed class HistoryClearContextResult
 {
-    /// <summary>Whether the operation succeeded.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { 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>Whether the URL-permission policy should run in unrestricted mode.</summary>
+/// <summary>Parameters for clearing the conversation and seeding the window that replaces it.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class PermissionUrlsSetUnrestrictedModeParams
+internal sealed class HistoryClearContextRequest
 {
-    /// <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>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>The repository the remote session targets.</summary>
+/// <summary>User-facing pending queue entry, with kind and display text for a queued message, slash command, or model change.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class MetadataSnapshotRemoteMetadataRepository
+public sealed class QueuePendingItems
 {
-    /// <summary>The branch the remote session is operating on.</summary>
-    [JsonPropertyName("branch")]
-    public string Branch { get; set; } = string.Empty;
+    /// <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>The GitHub repository name (without owner).</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = 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>The GitHub owner (user or organization) of the target repository.</summary>
-    [JsonPropertyName("owner")]
-    public string Owner { 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>Stable identity of the queued user message. Present for message rows and absent for slash commands and model changes.</summary>
+    [JsonPropertyName("messageId")]
+    public string? MessageId { get; set; }
+
+    /// <summary>Optional source tag associated with this pending queue entry. This is an open string, not authenticated authorship. In particular, `user` does not prove that a person typed the message. If the source is absent or unrecognized, consumers must not infer human or agent authorship and should handle the entry neutrally. Consumers should tolerate future source values.</summary>
+    [JsonPropertyName("source")]
+    public string? Source { get; set; }
 }
 
-/// <summary>Remote-session-specific metadata. Populated only when `isRemote` is true. Fields are immutable for the lifetime of the session.</summary>
+/// <summary>Snapshot of the session's pending queued items and immediate-steering messages.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class MetadataSnapshotRemoteMetadata
+public sealed class QueuePendingItemsResult
 {
-    /// <summary>The pull request number the remote session is associated with, if any.</summary>
-    [JsonPropertyName("pullRequestNumber")]
-    public long? PullRequestNumber { 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>The repository the remote session targets.</summary>
-    [JsonPropertyName("repository")]
-    public MetadataSnapshotRemoteMetadataRepository Repository { get => field ??= new(); 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>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>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>Whether the remote task originated from Copilot Coding Agent (cca) or a CLI `--remote` invocation.</summary>
-    [JsonPropertyName("taskType")]
-    public MetadataSnapshotRemoteMetadataTaskType? TaskType { get; set; }
+    /// <summary>ID of the running turn's user message while the model has not answered it, so `withdrawMessage` can still take it back once nothing sent after it is pending. A message leaves `items` when its turn starts, before its `user.message` is recorded; this tells that message apart from one that was removed. Absent when no turn prompt can be taken back.</summary>
+    [JsonPropertyName("withdrawableTurnMessageId")]
+    public string? WithdrawableTurnMessageId { get; set; }
 }
 
-/// <summary>Public-facing projection of workspace metadata for SDK / TUI consumers.</summary>
-public sealed class SessionMetadataSnapshotWorkspace
+/// <summary>Identifies the target session.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class SessionQueuePendingItemsRequest
 {
-    /// <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>Current working directory at session start.</summary>
-    [JsonPropertyName("cwd")]
-    public string? Cwd { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <summary>Resolved git root for cwd, if any.</summary>
-    [JsonPropertyName("git_root")]
-    public string? GitRoot { get; set; }
+/// <summary>Internal snapshot of native queue state for local session orchestration.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class QueueSnapshotResult
+{
+    /// <summary>Queue item identifier of a model switch that has been dequeued but not yet applied.</summary>
+    [JsonPropertyName("inFlightModelChangeId")]
+    public string? InFlightModelChangeId { get; set; }
 
-    /// <summary>Repository host type, if known.</summary>
-    [JsonPropertyName("host_type")]
-    public WorkspaceSummaryHostType? HostType { get; set; }
+    /// <summary>Insertion orders for queued items, aligned with `items`.</summary>
+    [JsonPropertyName("itemOrders")]
+    public IList<long>? ItemOrders { 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>User-facing pending items in FIFO order.</summary>
+    [JsonPropertyName("items")]
+    public IList<QueuePendingItems> Items { get => field ??= []; set; }
 
-    /// <summary>Display name for the session, if set.</summary>
-    [JsonPropertyName("name")]
-    public string? Name { get; set; }
+    /// <summary>Insertion orders for immediate steering messages, aligned with `steeringMessages`.</summary>
+    [JsonPropertyName("steeringMessageOrders")]
+    public IList<long>? SteeringMessageOrders { get; set; }
 
-    /// <summary>Repository identifier in 'owner/repo' or 'org/project/repo' format, if any.</summary>
-    [JsonPropertyName("repository")]
-    public string? Repository { get; set; }
+    /// <summary>Immediate steering messages waiting for an active turn.</summary>
+    [JsonPropertyName("steeringMessages")]
+    public IList<string> SteeringMessages { get => field ??= []; set; }
+}
 
-    /// <summary>ISO 8601 timestamp when the workspace was last updated.</summary>
-    [JsonPropertyName("updated_at")]
-    public DateTimeOffset? UpdatedAt { get; set; }
+/// <summary>Identifies the target session.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class SessionQueueSnapshotRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <summary>Whether the display name was explicitly set by the user.</summary>
-    [JsonPropertyName("user_named")]
-    public bool? UserNamed { get; set; }
+/// <summary>Result of moving a queued item.</summary>
+[Experimental(global::GitHub.Copilot.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; }
 }
 
-/// <summary>Point-in-time snapshot of slow-changing session identifier and state fields.</summary>
+/// <summary>Parameters for moving a queued item by stable id.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionMetadataSnapshot
+internal sealed class QueueMoveItemRequest
 {
-    /// <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>Stable opaque queued-item id.</summary>
+    [JsonPropertyName("id")]
+    public string Id { get; set; } = string.Empty;
 
-    /// <summary>Runtime client name associated with the session (telemetry identifier).</summary>
-    [JsonPropertyName("clientName")]
-    public string? ClientName { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 
-    /// <summary>The current agent mode for this session (e.g., 'interactive', 'plan', 'autopilot').</summary>
-    [JsonPropertyName("currentMode")]
-    public MetadataSnapshotCurrentMode CurrentMode { get; set; }
+    /// <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>Live indexed-search state for this session activation. Omitted by runtimes that do not expose indexed-search status; absence does not indicate enablement.</summary>
-    [JsonPropertyName("indexedSearch")]
-    public IndexedSearchState? IndexedSearch { get; set; }
+/// <summary>Result of inserting a queued message.</summary>
+[Experimental(global::GitHub.Copilot.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>User-provided name supplied at session construction (via `--name`), if any. Immutable after construction.</summary>
-    [JsonPropertyName("initialName")]
-    public string? InitialName { get; set; }
+/// <summary>Serializable message fields accepted by queue.insertAt.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class QueueInsertMessage
+{
+    /// <summary>Optional explicit agent mode. When omitted, the session's current mode is assigned.</summary>
+    [JsonPropertyName("agentMode")]
+    public SendAgentMode? AgentMode { 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>Optional attachments for the message.</summary>
+    [JsonPropertyName("attachments")]
+    public IList<Attachment>? Attachments { 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 the message is billable.</summary>
+    [JsonPropertyName("billable")]
+    public bool? Billable { 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>Accepted for internal SendOptions compatibility but ignored; delivery is derived from current session activity.</summary>
+    [JsonPropertyName("delivery")]
+    public string? Delivery { get; set; }
 
-    /// <summary>Currently selected model identifier, if any.</summary>
-    [JsonPropertyName("selectedModel")]
-    public string? SelectedModel { get; set; }
+    /// <summary>Optional user-facing display text.</summary>
+    [JsonPropertyName("displayPrompt")]
+    public string? DisplayPrompt { get; set; }
 
-    /// <summary>The unique identifier of the session.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Accepted for SendOptions compatibility but ignored; inserted items always use queued delivery semantics.</summary>
+    [JsonPropertyName("mode")]
+    public SendMode? Mode { get; set; }
 
-    /// <summary>Current session limits, or null when no limits are active.</summary>
-    [JsonPropertyName("sessionLimits")]
-    public SessionLimitsConfig? SessionLimits { get; set; }
+    /// <summary>Accepted for SendOptions compatibility but ignored; the requested public position controls placement.</summary>
+    [JsonPropertyName("prepend")]
+    public bool? Prepend { get; set; }
 
-    /// <summary>ISO 8601 timestamp of when the session started.</summary>
-    [JsonPropertyName("startTime")]
-    public DateTimeOffset StartTime { get; set; }
+    /// <summary>The user message text.</summary>
+    [JsonPropertyName("prompt")]
+    public string Prompt { 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>Per-turn request headers.</summary>
+    [JsonPropertyName("requestHeaders")]
+    public IDictionary<string, string>? RequestHeaders { get; set; }
 
-    /// <summary>Absolute path to the session's current working directory.</summary>
-    [JsonPropertyName("workingDirectory")]
-    public string WorkingDirectory { get; set; } = string.Empty;
+    /// <summary>Required tool name for the turn, when any.</summary>
+    [JsonPropertyName("requiredTool")]
+    public string? RequiredTool { 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>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>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>Accepted for SendOptions compatibility but ignored; insertion scheduling is controlled by the queue drain state.</summary>
+    [JsonPropertyName("wait")]
+    public bool? Wait { get; set; }
 }
 
-/// <summary>Identifies the target session.</summary>
+/// <summary>Parameters for inserting a queued message at a public visible position.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionMetadataSnapshotRequest
+internal sealed class QueueInsertAtRequest
 {
+    /// <summary>Queued message contents and delivery metadata.</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>Identifies the target session.</summary>
+/// <summary>Result of removing a queued item.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionMetadataGetClientMetadataRequest
+public sealed class QueueRemoveAtResult
 {
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>True when the addressed item was removed.</summary>
+    [JsonPropertyName("removed")]
+    public bool Removed { get; set; }
 }
 
-/// <summary>Atomic patch for client-owned session metadata. Operations apply in clear, remove, then set order. The resulting bag must satisfy the ClientMetadata entry and serialized-size limits. Local storage coordinates concurrent runtime processes; custom SessionFs providers must serialize writers that access the same session from multiple processes.</summary>
+/// <summary>Parameters for removing a queued item by stable id.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class MetadataUpdateClientMetadataRequest
+internal sealed class QueueRemoveAtRequest
 {
-    /// <summary>Remove every existing client metadata entry before applying remove and set. Defaults to false.</summary>
-    [JsonPropertyName("clear")]
-    public bool? Clear { get; set; }
-
-    /// <summary>Case-sensitive keys to remove. Missing keys are ignored. Each key must be non-empty, at most 256 UTF-8 bytes, and outside the reserved `copilot/` and `github/` namespaces.</summary>
-    [JsonPropertyName("remove")]
-    public IList<string>? Remove { get; 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>String entries to add or replace. Set wins when a key also appears in remove. Each key must be non-empty, at most 256 UTF-8 bytes, and outside the reserved `copilot/` and `github/` namespaces. Each value may contain at most 16 KiB of UTF-8 data.</summary>
-    [JsonPropertyName("set")]
-    public IDictionary<string, string>? Set { get; set; }
 }
 
-/// <summary>Indicates whether the local session is currently processing a turn or background continuation.</summary>
+/// <summary>Result of editing a queued message.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class MetadataIsProcessingResult
+public sealed class QueueUpdateTextResult
 {
-    /// <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>True when the stored text changed.</summary>
+    [JsonPropertyName("updated")]
+    public bool Updated { get; set; }
 }
 
-/// <summary>Identifies the target session.</summary>
+/// <summary>Parameters for editing a single queued message.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionMetadataIsProcessingRequest
+internal sealed class QueueUpdateTextRequest
 {
+    /// <summary>Optional replacement prompt displayed to the user.</summary>
+    [JsonPropertyName("displayPrompt")]
+    public string? DisplayPrompt { get; set; }
+
+    /// <summary>Stable opaque ID of the queued item to edit.</summary>
+    [JsonPropertyName("id")]
+    public string Id { get; set; } = string.Empty;
+
+    /// <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>Current activity flags for the session.</summary>
+/// <summary>Result of withdrawing a user message.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionActivity
+public sealed class QueueWithdrawMessageResult
 {
-    /// <summary>Whether an in-flight operation can currently be aborted.</summary>
-    [JsonPropertyName("abortable")]
-    public bool Abortable { get; set; }
+    /// <summary>True when the running turn was interrupted to withdraw the message. With removed false, the turn was interrupted but its events could not be removed, for example because the model answered first, so the message stays in the interrupted turn.</summary>
+    [JsonPropertyName("interrupted")]
+    public bool Interrupted { get; set; }
 
-    /// <summary>Whether the session currently has active work, including running turns or tasks.</summary>
-    [JsonPropertyName("hasActiveWork")]
-    public bool HasActiveWork { get; set; }
+    /// <summary>True when the message left the queue or, for a running turn, history.</summary>
+    [JsonPropertyName("removed")]
+    public bool Removed { get; set; }
 }
 
-/// <summary>Identifies the target session.</summary>
+/// <summary>Conditional withdrawal of a single user message, from its queue or from the running turn it started.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionMetadataActivityRequest
+internal sealed class QueueWithdrawMessageRequest
 {
+    /// <summary>The prompt originally sent. A message edited since submission is not withdrawn, so an obsolete draft cannot replace the edit.</summary>
+    [JsonPropertyName("expectedPrompt")]
+    public string ExpectedPrompt { get; set; } = string.Empty;
+
+    /// <summary>Message identity returned by send, not the queue item id. Batch messages are not eligible.</summary>
+    [JsonPropertyName("messageId")]
+    public string MessageId { get; set; } = string.Empty;
+
     /// <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>Append to one pending steering message without changing its identity or delivery position.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class QueueAppendSteeringRequest
 {
-    /// <summary>Output reserve plus tokens after the buffer-exhaustion blocking threshold (default 95%).</summary>
-    [JsonPropertyName("bufferTokens")]
-    public long BufferTokens { get; set; }
+    /// <summary>Mode captured at submission. Only steering messages in the same mode may be combined.</summary>
+    [JsonPropertyName("agentMode")]
+    public SendAgentMode AgentMode { get; set; }
 
-    /// <summary>Token count at which background compaction starts (configurable percentage of promptTokenLimit).</summary>
-    [JsonPropertyName("compactionThreshold")]
-    public long CompactionThreshold { get; set; }
+    /// <summary>Attachments to add after the message's existing attachments. An empty list preserves the existing attachments.</summary>
+    [JsonPropertyName("attachments")]
+    public IList<Attachment> Attachments { get => field ??= []; set; }
 
-    /// <summary>Tokens consumed by user/assistant/tool messages.</summary>
-    [JsonPropertyName("conversationTokens")]
-    public long ConversationTokens { get; set; }
+    /// <summary>Display text to append to the existing preview after a blank line.</summary>
+    [JsonPropertyName("displayPrompt")]
+    public string DisplayPrompt { get; set; } = string.Empty;
 
-    /// <summary>Prompt token limit plus the model's full output token limit.</summary>
-    [JsonPropertyName("limit")]
-    public long Limit { get; set; }
+    /// <summary>Expected current prompt, including any previous appends. The runtime applies plan-mode normalization before comparing and refuses a changed message.</summary>
+    [JsonPropertyName("expectedPrompt")]
+    public string ExpectedPrompt { get; set; } = string.Empty;
 
-    /// <summary>Tokens consumed by MCP tool definitions (subset of toolDefinitionsTokens, excludes deferred tools).</summary>
-    [JsonPropertyName("mcpToolsTokens")]
-    public long McpToolsTokens { get; set; }
+    /// <summary>Message identity returned by send, not the queue item id. Only unclaimed user steering messages are eligible.</summary>
+    [JsonPropertyName("messageId")]
+    public string MessageId { get; set; } = string.Empty;
 
-    /// <summary>The model used for token counting.</summary>
-    [JsonPropertyName("modelName")]
-    public string ModelName { get; set; } = string.Empty;
+    /// <summary>Text to append after a blank line.</summary>
+    [JsonPropertyName("prompt")]
+    public string Prompt { get; set; } = string.Empty;
 
-    /// <summary>Maximum prompt tokens allowed by the model (or DEFAULT_TOKEN_LIMIT if unspecified).</summary>
-    [JsonPropertyName("promptTokenLimit")]
-    public long PromptTokenLimit { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <summary>Tokens consumed by the system prompt.</summary>
-    [JsonPropertyName("systemTokens")]
-    public long SystemTokens { get; set; }
+/// <summary>Result of duplicating a queued item.</summary>
+[Experimental(global::GitHub.Copilot.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;
+}
 
-    /// <summary>Tokens consumed by tool definitions sent to the model (excludes deferred tools).</summary>
-    [JsonPropertyName("toolDefinitionsTokens")]
-    public long ToolDefinitionsTokens { get; set; }
+/// <summary>Parameters for duplicating a queued item.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class QueueDuplicateAtRequest
+{
+    /// <summary>Stable opaque ID of the queued item to duplicate.</summary>
+    [JsonPropertyName("id")]
+    public string Id { get; set; } = string.Empty;
 
-    /// <summary>Sum of system, conversation and tool-definition tokens.</summary>
-    [JsonPropertyName("totalTokens")]
-    public long TotalTokens { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class QueueSetDrainPausedRequest
+{
+    /// <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>Result of trying to steer a queued message into a live turn.</summary>
+[Experimental(global::GitHub.Copilot.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>
+[Experimental(global::GitHub.Copilot.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>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Token breakdown for the session's current context window, or null if uninitialized.</summary>
+/// <summary>Whether the native queue has pending work.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class MetadataContextInfoResult
+internal sealed class QueueHasPendingResult
 {
-    /// <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>True when queued or immediate native work is pending.</summary>
+    [JsonPropertyName("hasPending")]
+    public bool HasPending { get; set; }
 }
 
-/// <summary>Model identifier and token limits used to compute the context-info breakdown.</summary>
+/// <summary>Identifies the target session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class MetadataContextInfoRequest
+internal sealed class SessionQueueHasPendingRequest
 {
-    /// <summary>Maximum output tokens allowed by the target model. Pass 0 if unknown.</summary>
-    [JsonPropertyName("outputTokenLimit")]
-    public long OutputTokenLimit { 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>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>Whether a deferred-idle drain should run.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class QueueBeginDeferredIdleDrainResult
 {
-    /// <summary>Output reserve plus post-blocking-threshold buffer.</summary>
-    [JsonPropertyName("buffer")]
-    public long Buffer { get; set; }
-
-    /// <summary>Custom-instructions tokens (0 when none are configured).</summary>
-    [JsonPropertyName("customInstructions")]
-    public long CustomInstructions { get; set; }
-
-    /// <summary>Remaining unused window capacity (clamped at 0).</summary>
-    [JsonPropertyName("freeSpace")]
-    public long FreeSpace { get; set; }
-
-    /// <summary>MCP tool-definition tokens.</summary>
-    [JsonPropertyName("mcpTools")]
-    public long McpTools { get; set; }
-
-    /// <summary>Conversation (user/assistant/tool) message tokens.</summary>
-    [JsonPropertyName("messages")]
-    public long Messages { get; set; }
-
-    /// <summary>System prompt tokens, excluding custom instructions.</summary>
-    [JsonPropertyName("systemPrompt")]
-    public long SystemPrompt { get; set; }
-
-    /// <summary>Non-MCP tool-definition tokens.</summary>
-    [JsonPropertyName("systemTools")]
-    public long SystemTools { get; set; }
+    /// <summary>True when the host should run finishDeferredIdleDrain asynchronously.</summary>
+    [JsonPropertyName("shouldDrain")]
+    public bool ShouldDrain { get; set; }
 }
 
-/// <summary>Successful compaction history for the session.</summary>
-public sealed class MetadataContextAttributionResultContextAttributionCompactions
+/// <summary>Inputs for starting a deferred-idle drain.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class QueueBeginDeferredIdleDrainRequest
 {
-    /// <summary>Number of successful compactions in this session.</summary>
-    [JsonPropertyName("count")]
-    public long Count { get; set; }
+    /// <summary>Whether the host still has active background work.</summary>
+    [JsonPropertyName("activeBackgroundWork")]
+    public bool ActiveBackgroundWork { get; set; }
+
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>RPC data type for MetadataContextAttributionResultContextAttributionEntry operations.</summary>
-public sealed class MetadataContextAttributionResultContextAttributionEntry
+/// <summary>Action selected by the native deferred-idle drain.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class QueueFinishDeferredIdleDrainResult
 {
-    /// <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>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>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>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>Whether the deferred idle was caused by an aborted foreground turn.</summary>
+    [JsonPropertyName("aborted")]
+    public bool Aborted { get; set; }
 
-    /// <summary>Token count currently in context attributable to this entry.</summary>
-    [JsonPropertyName("tokens")]
-    public long Tokens { get; set; }
+    /// <summary>One of none, processQueue, or emitSessionIdle.</summary>
+    [JsonPropertyName("action")]
+    public string Action { 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>Inputs for completing a deferred-idle drain.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class QueueFinishDeferredIdleDrainRequest
 {
-    /// <summary>Output reserve plus the tokens past the buffer-exhaustion blocking threshold. Mirrors `SessionContextInfo.bufferTokens`.</summary>
-    [JsonPropertyName("bufferTokens")]
-    public long BufferTokens { 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>Successful compaction history for the session.</summary>
-    [JsonPropertyName("compactions")]
-    public MetadataContextAttributionResultContextAttributionCompactions Compactions { get => field ??= new(); set; }
-
-    /// <summary>Token count at which background compaction starts. Mirrors `SessionContextInfo.compactionThreshold`.</summary>
-    [JsonPropertyName("compactionThreshold")]
-    public long CompactionThreshold { get; set; }
-
-    /// <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>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>Whether the host still has active background work.</summary>
+    [JsonPropertyName("activeBackgroundWork")]
+    public bool ActiveBackgroundWork { 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>Whether native queued work remains.</summary>
+    [JsonPropertyName("hasPending")]
+    public bool HasPending { 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>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <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>Inputs for marking session.idle deferred in native state.</summary>
+[Experimental(global::GitHub.Copilot.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>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>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Per-source attribution breakdown for the session's current context window, or null if uninitialized.</summary>
+/// <summary>Indicates whether a user-facing pending item was removed.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class MetadataContextAttributionResult
+public sealed class QueueRemoveMostRecentResult
 {
-    /// <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>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>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionMetadataGetContextAttributionRequest
+internal sealed class SessionQueueRemoveMostRecentRequest
 {
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>A single large message currently in context.</summary>
+/// <summary>Identifies the target session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ContextHeaviestMessage
+internal sealed class SessionQueueClearRequest
 {
-    /// <summary>Stable identifier for this message within the snapshot.</summary>
-    [JsonPropertyName("id")]
-    public string Id { 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>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>The heaviest individual messages in the session's context window, most-expensive first.</summary>
+/// <summary>Internal filter for consuming queued system notifications.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class MetadataContextHeaviestMessagesResult
+internal sealed class QueueConsumeSystemNotificationsRequest
 {
-    /// <summary>Heaviest messages, most-expensive first.</summary>
-    [JsonPropertyName("messages")]
-    public IList<ContextHeaviestMessage> Messages { get => field ??= []; set; }
+    /// <summary>Opaque runtime-owned filter object.</summary>
+    [JsonPropertyName("filter")]
+    public JsonElement Filter { get; 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>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Parameters for the heaviest-messages query.</summary>
+/// <summary>Result of enqueueing the resume-pending wake item.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class MetadataContextHeaviestMessagesRequest
+internal sealed class QueueEnqueueResumePendingResult
 {
-    /// <summary>Maximum number of messages to return, most-expensive first. Omit for the server default.</summary>
-    [JsonPropertyName("limit")]
-    public long? Limit { get; set; }
+    /// <summary>True when a wake item was newly queued.</summary>
+    [JsonPropertyName("queued")]
+    public bool Queued { get; set; }
+}
 
+/// <summary>Identifies the target session.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class SessionQueueEnqueueResumePendingRequest
+{
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <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>Identifies the target session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class MetadataRecordContextChangeResult
+internal sealed class SessionQueueProcessRequest
 {
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Updated working directory and git context. Emitted as the new payload of `session.context_changed`.</summary>
+/// <summary>Cursor, batch size, and optional long-poll/filter parameters for reading session events.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionWorkingDirectoryContext
+internal sealed class EventLogReadRequest
 {
-    /// <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>Current working directory path.</summary>
-    [JsonPropertyName("cwd")]
-    public string Cwd { get; set; } = string.Empty;
-
-    /// <summary>Root directory of the git repository, resolved via git rev-parse.</summary>
-    [JsonPropertyName("gitRoot")]
-    public string? GitRoot { 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>Head commit of the current git branch.</summary>
-    [JsonPropertyName("headCommit")]
-    public string? HeadCommit { 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>Hosting platform type of the repository.</summary>
-    [JsonPropertyName("hostType")]
-    public SessionWorkingDirectoryContextHostType? HostType { 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>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>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>Raw host string from the git remote URL (e.g. "github.com", "dev.azure.com").</summary>
-    [JsonPropertyName("repositoryHost")]
-    public string? RepositoryHost { 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>Updated working-directory/git context to record on the session.</summary>
-[Experimental(global::GitHub.Copilot.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; }
+    /// <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>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>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>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>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class MetadataSetWorkingDirectoryResult
+public sealed class EventLogTailResult
 {
-    /// <summary>Working directory after the update.</summary>
-    [JsonPropertyName("workingDirectory")]
-    public string WorkingDirectory { 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>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>
+/// <summary>Identifies the target session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class MetadataSetWorkingDirectoryRequest
+internal sealed class SessionEventLogTailRequest
 {
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
-
-    /// <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>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>Opaque handle representing an event-type interest registration.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class MetadataRecomputeContextTokensResult
+public sealed class RegisterEventInterestResult
 {
-    /// <summary>Tokens contributed by user/assistant/tool messages (excludes system/developer prompts).</summary>
-    [JsonPropertyName("messagesTokenCount")]
-    public long MessagesTokenCount { 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>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>Model identifier to use when re-tokenizing the session's existing messages.</summary>
+/// <summary>Event type to register consumer interest for, used by runtime gating logic.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class MetadataRecomputeContextTokensRequest
+internal sealed class RegisterEventInterestParams
 {
-    /// <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 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>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Availability of built-in job tools surfaced to boundary consumers.</summary>
+/// <summary>Indicates whether the operation succeeded.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionSettingsBuiltInToolAvailabilitySnapshot
+public sealed class EventLogReleaseInterestResult
 {
-    /// <summary>Whether the create-pull-request tool is available.</summary>
-    [JsonPropertyName("createPullRequest")]
-    public bool? CreatePullRequest { get; set; }
-
-    /// <summary>Whether the report-progress tool is available.</summary>
-    [JsonPropertyName("reportProgress")]
-    public bool? ReportProgress { get; set; }
+    /// <summary>Whether the operation succeeded.</summary>
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
 }
 
-/// <summary>Redacted job settings for a session. The job nonce is excluded.</summary>
+/// <summary>Opaque handle previously returned by `registerInterest` to release.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionSettingsJobSnapshot
+internal sealed class ReleaseEventInterestParams
 {
-    /// <summary>Availability of job-specific built-in tools.</summary>
-    [JsonPropertyName("builtInToolAvailability")]
-    public SessionSettingsBuiltInToolAvailabilitySnapshot? BuiltInToolAvailability { 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>GitHub Actions event type for the job.</summary>
-    [JsonPropertyName("eventType")]
-    public string? EventType { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <summary>Whether this is the workflow's trigger job.</summary>
-    [JsonPropertyName("isTriggerJob")]
-    public bool? IsTriggerJob { get; set; }
+/// <summary>Identifies the target session.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class SessionUsageGetMetricsRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Redacted model routing settings for a session.</summary>
+/// <summary>Internal absolute code-change totals reported by the owning host.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionSettingsModelSnapshot
+internal sealed class SessionUsageSetCodeChangesRequest
 {
-    /// <summary>Agent service callback URL for job and progress updates.</summary>
-    [JsonPropertyName("callbackUrl")]
-    public string? CallbackUrl { get; set; }
+    /// <summary>Absolute changed-file count; omission preserves the previous count.</summary>
+    [JsonPropertyName("filesCount")]
+    public double? FilesCount { get; set; }
 
-    /// <summary>Default reasoning effort for the selected model.</summary>
-    [JsonPropertyName("defaultReasoningEffort")]
-    public string? DefaultReasoningEffort { get; set; }
+    /// <summary>Absolute added-line total, replacing the previous reading.</summary>
+    [JsonPropertyName("linesAdded")]
+    public double LinesAdded { get; set; }
 
-    /// <summary>Agent job identifier for the session.</summary>
-    [JsonPropertyName("instanceId")]
-    public string? InstanceId { get; set; }
+    /// <summary>Absolute removed-line total, replacing the previous reading.</summary>
+    [JsonPropertyName("linesRemoved")]
+    public double LinesRemoved { get; set; }
 
-    /// <summary>Selected model identifier.</summary>
-    [JsonPropertyName("model")]
-    public string? Model { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Online-evaluation settings safe to expose across the SDK boundary.</summary>
+/// <summary>Existing delegation guidance for an account without delegation access.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionSettingsOnlineEvaluationSnapshot
+public sealed class SessionQuotaDelegateWarning
 {
-    /// <summary>Whether online evaluation is disabled.</summary>
-    [JsonPropertyName("disableOnlineEvaluation")]
-    public bool? DisableOnlineEvaluation { get; set; }
+    /// <summary>User-facing guidance.</summary>
+    [JsonPropertyName("text")]
+    public string Text { get; set; } = string.Empty;
 
-    /// <summary>Whether online-evaluation output-file generation is enabled.</summary>
-    [JsonPropertyName("enableOnlineEvaluationOutputFile")]
-    public bool? EnableOnlineEvaluationOutputFile { get; set; }
+    /// <summary>Link to upgrade the account.</summary>
+    [JsonPropertyName("url")]
+    public string Url { get; set; } = string.Empty;
 }
 
-/// <summary>Redacted repository and GitHub host settings for a session.</summary>
+/// <summary>Session quota snapshot, preserving the incumbent numeric units and reset metadata.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionSettingsRepoSnapshot
+public sealed class SessionQuotaSnapshot
 {
-    /// <summary>Checked-out repository branch.</summary>
-    [JsonPropertyName("branch")]
-    public string? Branch { get; set; }
+    /// <summary>Entitled quantity in this quota's units.</summary>
+    [JsonPropertyName("entitlementRequests")]
+    public double EntitlementRequests { get; set; }
 
-    /// <summary>Checked-out commit SHA.</summary>
-    [JsonPropertyName("commit")]
-    public string? Commit { get; set; }
+    /// <summary>Whether the provider reports available quota.</summary>
+    [JsonPropertyName("hasQuota")]
+    public bool? HasQuota { get; set; }
 
-    /// <summary>GitHub server host name.</summary>
-    [JsonPropertyName("host")]
-    public string? Host { get; set; }
+    /// <summary>Whether the entitlement is unlimited.</summary>
+    [JsonPropertyName("isUnlimitedEntitlement")]
+    public bool IsUnlimitedEntitlement { get; set; }
 
-    /// <summary>Protocol used to access the GitHub host.</summary>
-    [JsonPropertyName("hostProtocol")]
-    public string? HostProtocol { get; set; }
+    /// <summary>Additional usage in this quota's units.</summary>
+    [JsonPropertyName("overage")]
+    public double Overage { get; set; }
 
-    /// <summary>GitHub repository database ID.</summary>
-    [JsonPropertyName("id")]
-    public double? Id { get; set; }
+    /// <summary>Whether additional usage is allowed after quota exhaustion.</summary>
+    [JsonPropertyName("overageAllowedWithExhaustedQuota")]
+    public bool OverageAllowedWithExhaustedQuota { get; set; }
 
-    /// <summary>Repository name.</summary>
-    [JsonPropertyName("name")]
-    public string? Name { get; set; }
+    /// <summary>Additional-usage budget cap, when provided.</summary>
+    [JsonPropertyName("overageEntitlement")]
+    public double? OverageEntitlement { get; set; }
 
-    /// <summary>GitHub repository owner database ID.</summary>
-    [JsonPropertyName("ownerId")]
-    public double? OwnerId { get; set; }
+    /// <summary>Percentage of the entitlement remaining.</summary>
+    [JsonPropertyName("remainingPercentage")]
+    public double RemainingPercentage { get; set; }
 
-    /// <summary>Repository owner login.</summary>
-    [JsonPropertyName("ownerName")]
-    public string? OwnerName { get; set; }
+    /// <summary>Quota reset time in milliseconds since the Unix epoch, when known.</summary>
+    [JsonPropertyName("resetDateEpochMs")]
+    public double? ResetDateEpochMs { get; set; }
 
-    /// <summary>Number of commits in the pull request.</summary>
-    [JsonPropertyName("prCommitCount")]
-    public double? PrCommitCount { get; set; }
+    /// <summary>Whether the reset time is estimated.</summary>
+    [JsonPropertyName("resetDateEstimated")]
+    public bool? ResetDateEstimated { get; set; }
 
-    /// <summary>Whether the repository is writable.</summary>
-    [JsonPropertyName("readWrite")]
-    public bool? ReadWrite { get; set; }
+    /// <summary>Whether this quota uses token-based billing.</summary>
+    [JsonPropertyName("tokenBasedBilling")]
+    public bool? TokenBasedBilling { get; set; }
 
-    /// <summary>GitHub secret-scanning service URL.</summary>
-    [JsonPropertyName("secretScanningUrl")]
-    public string? SecretScanningUrl { get; set; }
+    /// <summary>Whether usage is allowed after quota exhaustion.</summary>
+    [JsonPropertyName("usageAllowedWithExhaustedQuota")]
+    public bool UsageAllowedWithExhaustedQuota { get; set; }
 
-    /// <summary>GitHub server base URL.</summary>
-    [JsonPropertyName("serverUrl")]
-    public string? ServerUrl { get; set; }
+    /// <summary>Consumed quantity in this quota's units.</summary>
+    [JsonPropertyName("usedRequests")]
+    public double UsedRequests { get; set; }
 }
 
-/// <summary>Redacted validation and memory-tool settings for a session.</summary>
+/// <summary>The incumbent session-owned quota and account projection.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionSettingsValidationSnapshot
+public sealed class SessionQuotaGetResult
 {
-    /// <summary>Whether advisory validation is enabled.</summary>
-    [JsonPropertyName("advisoryEnabled")]
-    public bool? AdvisoryEnabled { get; set; }
+    /// <summary>Whether the account can sign up for Copilot Free.</summary>
+    [JsonPropertyName("canSignupForCopilotFree")]
+    public bool CanSignupForCopilotFree { get; set; }
 
-    /// <summary>Whether CodeQL validation is enabled.</summary>
-    [JsonPropertyName("codeqlEnabled")]
-    public bool? CodeqlEnabled { get; set; }
+    /// <summary>Whether the account can delegate tasks to GitHub.</summary>
+    [JsonPropertyName("delegateAvailable")]
+    public bool DelegateAvailable { get; set; }
 
-    /// <summary>Whether code-review validation is enabled.</summary>
-    [JsonPropertyName("codeReviewEnabled")]
-    public bool? CodeReviewEnabled { get; set; }
+    /// <summary>Existing delegation warning for a free account.</summary>
+    [JsonPropertyName("delegateWarning")]
+    public SessionQuotaDelegateWarning? DelegateWarning { get; set; }
 
-    /// <summary>Model used for code-review validation.</summary>
-    [JsonPropertyName("codeReviewModel")]
-    public string? CodeReviewModel { get; set; }
+    /// <summary>Whether dynamic workflows are enabled for the active account.</summary>
+    [JsonPropertyName("dynamicWorkflowsEnabled")]
+    public bool DynamicWorkflowsEnabled { get; set; }
 
-    /// <summary>Dependabot validation timeout budget in seconds.</summary>
-    [JsonPropertyName("dependabotTimeout")]
-    public double? DependabotTimeout { get; set; }
+    /// <summary>Whether dynamic workflows are visible under the session's feature flags.</summary>
+    [JsonPropertyName("dynamicWorkflowsUiVisible")]
+    public bool DynamicWorkflowsUiVisible { get; set; }
 
-    /// <summary>Whether the memory-store tool is enabled.</summary>
-    [JsonPropertyName("memoryStoreEnabled")]
-    public bool? MemoryStoreEnabled { get; set; }
+    /// <summary>Whether the account uses the free limited Copilot plan.</summary>
+    [JsonPropertyName("isFreeUser")]
+    public bool IsFreeUser { get; set; }
 
-    /// <summary>Whether the memory-vote tool is enabled.</summary>
-    [JsonPropertyName("memoryVoteEnabled")]
-    public bool? MemoryVoteEnabled { get; set; }
+    /// <summary>Whether the account uses token-based billing.</summary>
+    [JsonPropertyName("isTbbUser")]
+    public bool IsTbbUser { get; set; }
 
-    /// <summary>Whether secret-scanning validation is enabled.</summary>
-    [JsonPropertyName("secretScanningEnabled")]
-    public bool? SecretScanningEnabled { get; set; }
+    /// <summary>Whether model cost columns should be shown.</summary>
+    [JsonPropertyName("modelCostColumnVisible")]
+    public bool ModelCostColumnVisible { get; set; }
 
-    /// <summary>General validation timeout budget in seconds.</summary>
-    [JsonPropertyName("timeout")]
-    public double? Timeout { get; set; }
+    /// <summary>Resolved Copilot plan tier.</summary>
+    [JsonPropertyName("planTier")]
+    public SessionQuotaPlanTier PlanTier { get; set; }
+
+    /// <summary>Whether premium-request costs are billable.</summary>
+    [JsonPropertyName("premiumRequestsBillable")]
+    public bool PremiumRequestsBillable { get; set; }
+
+    /// <summary>Provider-owned account quota state, including snapshots without numeric balances.</summary>
+    [JsonPropertyName("providerQuotas")]
+    public IList<ProviderQuotaState>? ProviderQuotas { get; set; }
+
+    /// <summary>Known quota snapshots, keyed by the provider's quota type.</summary>
+    [JsonPropertyName("snapshots")]
+    public IDictionary<string, SessionQuotaSnapshot> Snapshots { get => field ??= new Dictionary<string, SessionQuotaSnapshot>(); set; }
+
+    /// <summary>Upgrade link for a free account.</summary>
+    [JsonPropertyName("upgradeUrl")]
+    public string? UpgradeUrl { get; set; }
+}
+
+/// <summary>Identifies the target session.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class SessionQuotaGetRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Redacted, serializable view of session runtime settings for SDK boundary consumers. Secrets and raw feature flags are intentionally excluded.</summary>
+/// <summary>The incumbent session-owned quota and account projection.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionSettingsSnapshot
+public sealed class SessionQuotaRefreshResult
 {
-    /// <summary>Name of the SDK client that created the session.</summary>
-    [JsonPropertyName("clientName")]
-    public string? ClientName { get; set; }
+    /// <summary>Whether the account can sign up for Copilot Free.</summary>
+    [JsonPropertyName("canSignupForCopilotFree")]
+    public bool CanSignupForCopilotFree { get; set; }
 
-    /// <summary>Redacted job settings.</summary>
-    [JsonPropertyName("job")]
-    public SessionSettingsJobSnapshot Job { get => field ??= new(); set; }
+    /// <summary>Whether the account can delegate tasks to GitHub.</summary>
+    [JsonPropertyName("delegateAvailable")]
+    public bool DelegateAvailable { get; set; }
 
-    /// <summary>Redacted model routing settings.</summary>
-    [JsonPropertyName("model")]
-    public SessionSettingsModelSnapshot Model { get => field ??= new(); set; }
+    /// <summary>Existing delegation warning for a free account.</summary>
+    [JsonPropertyName("delegateWarning")]
+    public SessionQuotaDelegateWarning? DelegateWarning { get; set; }
 
-    /// <summary>Online-evaluation settings safe for SDK consumers.</summary>
-    [JsonPropertyName("onlineEvaluation")]
-    public SessionSettingsOnlineEvaluationSnapshot OnlineEvaluation { get => field ??= new(); set; }
+    /// <summary>Whether dynamic workflows are enabled for the active account.</summary>
+    [JsonPropertyName("dynamicWorkflowsEnabled")]
+    public bool DynamicWorkflowsEnabled { get; set; }
 
-    /// <summary>Redacted repository and host settings.</summary>
-    [JsonPropertyName("repo")]
-    public SessionSettingsRepoSnapshot Repo { get => field ??= new(); set; }
+    /// <summary>Whether dynamic workflows are visible under the session's feature flags.</summary>
+    [JsonPropertyName("dynamicWorkflowsUiVisible")]
+    public bool DynamicWorkflowsUiVisible { get; set; }
 
-    /// <summary>Session start time as Unix epoch milliseconds.</summary>
-    [JsonPropertyName("startTimeMs")]
-    public double? StartTimeMs { get; set; }
+    /// <summary>Whether the account uses the free limited Copilot plan.</summary>
+    [JsonPropertyName("isFreeUser")]
+    public bool IsFreeUser { get; set; }
 
-    /// <summary>Session timeout in milliseconds.</summary>
-    [JsonPropertyName("timeoutMs")]
-    public double? TimeoutMs { get; set; }
+    /// <summary>Whether the account uses token-based billing.</summary>
+    [JsonPropertyName("isTbbUser")]
+    public bool IsTbbUser { get; set; }
 
-    /// <summary>Redacted validation and memory-tool settings.</summary>
-    [JsonPropertyName("validation")]
-    public SessionSettingsValidationSnapshot Validation { get => field ??= new(); set; }
+    /// <summary>Whether model cost columns should be shown.</summary>
+    [JsonPropertyName("modelCostColumnVisible")]
+    public bool ModelCostColumnVisible { get; 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>Resolved Copilot plan tier.</summary>
+    [JsonPropertyName("planTier")]
+    public SessionQuotaPlanTier PlanTier { get; set; }
+
+    /// <summary>Whether premium-request costs are billable.</summary>
+    [JsonPropertyName("premiumRequestsBillable")]
+    public bool PremiumRequestsBillable { get; set; }
+
+    /// <summary>Provider-owned account quota state, including snapshots without numeric balances.</summary>
+    [JsonPropertyName("providerQuotas")]
+    public IList<ProviderQuotaState>? ProviderQuotas { get; set; }
+
+    /// <summary>Known quota snapshots, keyed by the provider's quota type.</summary>
+    [JsonPropertyName("snapshots")]
+    public IDictionary<string, SessionQuotaSnapshot> Snapshots { get => field ??= new Dictionary<string, SessionQuotaSnapshot>(); set; }
+
+    /// <summary>Upgrade link for a free account.</summary>
+    [JsonPropertyName("upgradeUrl")]
+    public string? UpgradeUrl { get; set; }
 }
 
 /// <summary>Identifies the target session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionSettingsSnapshotRequest
+internal sealed class SessionQuotaRefreshRequest
 {
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Result of evaluating a Rust-owned settings predicate.</summary>
+/// <summary>A pending session quota warning, consumed once by takeWarnings.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionSettingsEvaluatePredicateResult
+public sealed class QuotaWarningProjection
 {
-    /// <summary>Whether the named settings predicate evaluated to enabled.</summary>
-    [JsonPropertyName("enabled")]
-    public bool Enabled { get; set; }
+    /// <summary>User-facing warning text.</summary>
+    [JsonPropertyName("message")]
+    public string Message { get; set; } = string.Empty;
+
+    /// <summary>Related account or upgrade link.</summary>
+    [JsonPropertyName("url")]
+    public string? Url { get; set; }
+
+    /// <summary>Existing warning category.</summary>
+    [JsonPropertyName("warningType")]
+    public string WarningType { get; set; } = string.Empty;
 }
 
-/// <summary>Named Rust-owned settings predicate to evaluate for this session.</summary>
+/// <summary>Identifies the target session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionSettingsEvaluatePredicateRequest
+internal sealed class SessionQuotaTakeWarningsRequest
 {
-    /// <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;
-
-    /// <summary>Tool name for tool-scoped predicates such as trivial-change handling.</summary>
-    [JsonPropertyName("toolName")]
-    public string? ToolName { get; set; }
 }
 
-/// <summary>Content-exclusion decision for one requested path.</summary>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ContentExclusionPathCheck
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "kind",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(SessionLimitPredictionResultAvailable), "available")]
+[JsonDerivedType(typeof(SessionLimitPredictionResultUnavailable), "unavailable")]
+public partial class SessionLimitPredictionResult
 {
-    /// <summary>Whether the session's complete content-exclusion policy excludes the path.</summary>
-    [JsonPropertyName("excluded")]
-    public bool Excluded { get; set; }
-
-    /// <summary>The path supplied by the caller.</summary>
-    [JsonPropertyName("path")]
-    public string Path { get; set; } = string.Empty;
+    /// <summary>The type discriminator.</summary>
+    [JsonPropertyName("kind")]
+    public virtual string Kind { get; set; } = string.Empty;
 }
 
-/// <summary>Batch content-exclusion result. Callers must fail closed when policy evaluation is unavailable.</summary>
+
+/// <summary>Baseline data provenance for a prediction.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ContentExclusionCheckPathsResult
+public sealed class SessionLimitPredictionBaselineData
 {
-    /// <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>End of the baseline data slice.</summary>
+    [JsonPropertyName("windowEnd")]
+    public string WindowEnd { get; set; } = string.Empty;
 
-    /// <summary>Per-path decisions in request order. Empty when available is false.</summary>
-    [JsonPropertyName("checks")]
-    public IList<ContentExclusionPathCheck> Checks { get => field ??= []; set; }
+    /// <summary>Start of the baseline data slice.</summary>
+    [JsonPropertyName("windowStart")]
+    public string WindowStart { get; set; } = string.Empty;
 }
 
-/// <summary>Local file system absolute paths within the session working directory to check against its content-exclusion policy.</summary>
+/// <summary>Semantic usage tier and its AI-credit cap.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class ContentExclusionCheckPathsRequest
+public sealed class SessionLimitPredictionTierOption
 {
-    /// <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>AI-credit cap for this tier.</summary>
+    [JsonPropertyName("cap")]
+    public double Cap { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Semantic usage tier.</summary>
+    [JsonPropertyName("tier")]
+    public SessionLimitPredictionTier Tier { get; set; }
 }
 
-/// <summary>Identifier of the spawned shell process, usable with shell.kill while the process is running.</summary>
+/// <summary>Explainable AI-credit session-limit prediction.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ShellExecResult
+public sealed class SessionLimitPredictionDetails
 {
-    /// <summary>Identifier usable with shell.kill while the process is running.</summary>
-    [JsonPropertyName("processId")]
-    public string ProcessId { get; set; } = string.Empty;
-}
+    /// <summary>Baseline data provenance.</summary>
+    [JsonPropertyName("baselineData")]
+    public SessionLimitPredictionBaselineData BaselineData { get => field ??= new(); set; }
 
-/// <summary>Shell command to run, with optional working directory and timeout in milliseconds. Spawn failures return an RPC error.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class ShellExecRequest
-{
-    /// <summary>Shell command to execute.</summary>
-    [JsonPropertyName("command")]
-    public string Command { get; set; } = string.Empty;
+    /// <summary>Client population used for the prediction.</summary>
+    [JsonPropertyName("clientType")]
+    public SessionLimitPredictionClientType ClientType { get; set; }
 
-    /// <summary>Working directory (defaults to session working directory).</summary>
-    [JsonPropertyName("cwd")]
-    public string? Cwd { get; set; }
+    /// <summary>Resolved model family when known.</summary>
+    [JsonPropertyName("family")]
+    public string? Family { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Model identifier used for lookup.</summary>
+    [JsonPropertyName("modelId")]
+    public string ModelId { get; set; } = string.Empty;
 
-    /// <summary>Timeout in milliseconds (default: 30000).</summary>
-    [JsonConverter(typeof(MillisecondsTimeSpanConverter))]
-    [JsonPropertyName("timeout")]
-    public TimeSpan? Timeout { get; set; }
+    /// <summary>Recommended maximum AI credits for this session.</summary>
+    [JsonPropertyName("recommendedCap")]
+    public double RecommendedCap { get; set; }
+
+    /// <summary>Tier chosen as the recommended cap.</summary>
+    [JsonPropertyName("recommendedTier")]
+    public SessionLimitPredictionTier RecommendedTier { get; set; }
+
+    /// <summary>Baseline fallback level used to create the prediction.</summary>
+    [JsonPropertyName("source")]
+    public SessionLimitPredictionSource Source { 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>Indicates whether the signal was delivered; false if the process was unknown or already exited.</summary>
+/// <summary>The <c>available</c> variant of <see cref="SessionLimitPredictionResult"/>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ShellKillResult
+public partial class SessionLimitPredictionResultAvailable : SessionLimitPredictionResult
 {
-    /// <summary>Whether the signal was sent successfully.</summary>
-    [JsonPropertyName("killed")]
-    public bool Killed { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "available";
+
+    /// <summary>Predicted session limit details.</summary>
+    [JsonPropertyName("prediction")]
+    public required SessionLimitPredictionDetails Prediction { get; set; }
 }
 
-/// <summary>Identifier of a process previously returned by "shell.exec" and the signal to send.</summary>
+/// <summary>The <c>unavailable</c> variant of <see cref="SessionLimitPredictionResult"/>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class ShellKillRequest
+public partial class SessionLimitPredictionResultUnavailable : SessionLimitPredictionResult
 {
-    /// <summary>Process identifier returned by shell.exec.</summary>
-    [JsonPropertyName("processId")]
-    public string ProcessId { get; set; } = string.Empty;
-
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "unavailable";
 
-    /// <summary>Signal to send (default: SIGTERM).</summary>
-    [JsonPropertyName("signal")]
-    public ShellKillSignal? Signal { get; set; }
+    /// <summary>Reason no prediction is available.</summary>
+    [JsonPropertyName("reason")]
+    public required SessionLimitPredictionUnavailableReason Reason { get; set; }
 }
 
-/// <summary>Result of a user-requested shell command.</summary>
+/// <summary>RPC data type for SessionLimitPredictionPredict operations.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class UserRequestedShellCommandResult
+public sealed class SessionLimitPredictionPredictRequest
 {
-    /// <summary>Error output when the execution failed.</summary>
-    [JsonPropertyName("error")]
-    public string? Error { get; set; }
-
-    /// <summary>Process exit code, when available.</summary>
-    [JsonPropertyName("exitCode")]
-    public long? ExitCode { get; set; }
-
-    /// <summary>Captured command output.</summary>
-    [JsonPropertyName("output")]
-    public string Output { get; set; } = string.Empty;
-
-    /// <summary>Whether the command completed successfully.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { get; set; }
+    /// <summary>Client type to size for. Defaults to `cli-interactive`.</summary>
+    [JsonPropertyName("clientType")]
+    public SessionLimitPredictionClientType? ClientType { get; set; }
 
-    /// <summary>Tool call id emitted for the shell execution.</summary>
-    [JsonPropertyName("toolCallId")]
-    public string ToolCallId { get; set; } = string.Empty;
+    /// <summary>Optional model identifier override. If omitted, the session's current model is used.</summary>
+    [JsonPropertyName("modelId")]
+    public string? ModelId { get; set; }
 }
 
-/// <summary>User-requested shell command and cancellation handle.</summary>
+/// <summary>RPC data type for SessionLimitPredictionPredictRequestWithSession operations.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class ShellExecuteUserRequestedRequest
+internal sealed class SessionLimitPredictionPredictRequestWithSession
 {
-    /// <summary>Shell command to execute.</summary>
-    [JsonPropertyName("command")]
-    public string Command { get; set; } = string.Empty;
+    /// <summary>Client type to size for. Defaults to `cli-interactive`.</summary>
+    [JsonPropertyName("clientType")]
+    public SessionLimitPredictionClientType? ClientType { get; set; }
 
-    /// <summary>Caller-provided cancellation handle for this execution.</summary>
-    [JsonPropertyName("requestId")]
-    public string RequestId { get; set; } = string.Empty;
+    /// <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>Cancellation result for a user-requested shell command.</summary>
+/// <summary>GitHub URL for the session and a flag indicating whether remote steering is enabled.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class CancelUserRequestedShellCommandResult
+public sealed class RemoteEnableResult
 {
-    /// <summary>Whether an in-flight execution was found and signalled to cancel.</summary>
-    [JsonPropertyName("cancelled")]
-    public bool Cancelled { get; set; }
+    /// <summary>Whether remote steering is enabled.</summary>
+    [JsonPropertyName("remoteSteerable")]
+    public bool RemoteSteerable { get; set; }
+
+    /// <summary>GitHub frontend URL for this session.</summary>
+    [Url]
+    [StringSyntax(StringSyntaxAttribute.Uri)]
+    [JsonPropertyName("url")]
+    public string? Url { get; set; }
 }
 
-/// <summary>User-requested shell execution cancellation handle.</summary>
+/// <summary>Optional remote session mode ("off", "export", or "on"); defaults to enabling both export and remote steering.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class ShellCancelUserRequestedRequest
+internal sealed class RemoteEnableRequest
 {
-    /// <summary>Request ID previously passed to executeUserRequested.</summary>
-    [JsonPropertyName("requestId")]
-    public string RequestId { get; set; } = string.Empty;
+    /// <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>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Post-compaction context window usage breakdown.</summary>
+/// <summary>Identifies the target session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class HistoryCompactContextWindow
+internal sealed class SessionRemoteDisableRequest
 {
-    /// <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>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Compaction outcome with the number of tokens and messages removed, summary text, and the resulting context window breakdown.</summary>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class HistoryCompactResult
+public sealed class RemoteNotifySteerableChangedResult
 {
-    /// <summary>Post-compaction context window usage breakdown.</summary>
-    [JsonPropertyName("contextWindow")]
-    public HistoryCompactContextWindow? ContextWindow { get; set; }
-
-    /// <summary>Number of messages removed during compaction.</summary>
-    [JsonPropertyName("messagesRemoved")]
-    public long MessagesRemoved { get; set; }
-
-    /// <summary>Whether compaction completed successfully.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { get; set; }
+}
 
-    /// <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>New remote-steerability state to persist as a `session.remote_steerable_changed` event.</summary>
+[Experimental(global::GitHub.Copilot.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>Number of tokens freed by compaction.</summary>
-    [JsonPropertyName("tokensRemoved")]
-    public long TokensRemoved { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>RPC data type for SessionHistoryCompact operations.</summary>
+/// <summary>Current sharing status and shareable GitHub URL for a session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionHistoryCompactRequest
+public sealed class VisibilityGetResult
 {
-    /// <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>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>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>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>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>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>RPC data type for SessionHistoryCompactRequestWithSession operations.</summary>
+/// <summary>Identifies the target session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionHistoryCompactRequestWithSession
+internal sealed class SessionVisibilityGetRequest
 {
-    /// <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>Number of events that were removed by the truncation.</summary>
+/// <summary>Effective sharing status and shareable GitHub URL after updating session visibility.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class HistoryTruncateResult
+public sealed class VisibilitySetResult
 {
-    /// <summary>Failure detail when checkpointCleanupFailed is true.</summary>
-    [JsonPropertyName("checkpointCleanupError")]
-    public string? CheckpointCleanupError { get; set; }
+    /// <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>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>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>Number of events that were removed.</summary>
-    [JsonPropertyName("eventsRemoved")]
-    public long EventsRemoved { 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>Identifier of the event to truncate to; this event and all later events are removed.</summary>
+/// <summary>Desired sharing status for the session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class HistoryTruncateRequest
+internal sealed class VisibilitySetRequest
 {
-    /// <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>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>A root user turn that the session can rewind to.</summary>
+/// <summary>Scheduled prompt entry with ID, timing (`intervalMs`, `cron`, or `at`), prompt text, recurrence, and next run time.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class HistoryRewindPoint
+public sealed class ScheduleEntry
 {
-    /// <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>Absolute fire time (epoch milliseconds) for a one-shot calendar schedule.</summary>
+    [JsonPropertyName("at")]
+    public long? At { 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>5-field cron expression for a recurring calendar schedule, evaluated in `tz`.</summary>
+    [JsonPropertyName("cron")]
+    public string? Cron { 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>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>Whether this turn was an automatically injected autopilot continuation.</summary>
-    [JsonPropertyName("isAutopilotContinuation")]
-    public bool IsAutopilotContinuation { 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>Lines added by this turn's captured file changes.</summary>
-    [JsonPropertyName("linesAdded")]
-    public long LinesAdded { get; set; }
+    /// <summary>Interval between scheduled ticks, in milliseconds (relative-interval schedules).</summary>
+    [JsonConverter(typeof(MillisecondsTimeSpanConverter))]
+    [JsonPropertyName("intervalMs")]
+    public TimeSpan? Interval { get; set; }
 
-    /// <summary>Lines removed by this turn's captured file changes.</summary>
-    [JsonPropertyName("linesRemoved")]
-    public long LinesRemoved { get; set; }
+    /// <summary>ISO 8601 timestamp when the next tick is scheduled to fire.</summary>
+    [JsonPropertyName("nextRunAt")]
+    public DateTimeOffset NextRunAt { get; set; }
 
-    /// <summary>ISO timestamp of the user turn.</summary>
-    [JsonPropertyName("timestamp")]
-    public string Timestamp { get; set; } = string.Empty;
+    /// <summary>Prompt text that gets enqueued on every tick.</summary>
+    [JsonPropertyName("prompt")]
+    public string Prompt { get; set; } = string.Empty;
 
-    /// <summary>Whether this turn itself captured any file changes.</summary>
-    [JsonPropertyName("turnChangedFiles")]
-    public bool TurnChangedFiles { get; set; }
+    /// <summary>Whether the schedule re-arms after each tick (`/every`) or fires once (`/after`).</summary>
+    [JsonPropertyName("recurring")]
+    public bool Recurring { get; set; }
 
-    /// <summary>User-visible message text for the turn.</summary>
-    [JsonPropertyName("userMessage")]
-    public string UserMessage { get; set; } = string.Empty;
+    /// <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>Rewind points and file-change-tracking availability for the session.</summary>
+/// <summary>Snapshot of the currently active recurring prompts for this session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class HistoryListRewindPointsResult
+public sealed class ScheduleList
 {
-    /// <summary>Whether this session captured file changes from its first turn.</summary>
-    [JsonPropertyName("fileChangeTrackingEnabled")]
-    public bool FileChangeTrackingEnabled { get; set; }
+    /// <summary>Active scheduled prompts, ordered by id.</summary>
+    [JsonPropertyName("entries")]
+    public IList<ScheduleEntry> Entries { get => field ??= []; set; }
+}
 
-    /// <summary>Root user turns in chronological order. Empty when `unavailableReason` is set.</summary>
-    [JsonPropertyName("points")]
-    public IList<HistoryRewindPoint> Points { get => field ??= []; set; }
+/// <summary>Identifies the target session.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class SessionScheduleListRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <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>Identifies the target session.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed class SessionScheduleHydrateRequest
+{
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
+
+/// <summary>Whether the session currently has an active self-paced schedule.</summary>
+[Experimental(global::GitHub.Copilot.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; }
 }
 
 /// <summary>Identifies the target session.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionHistoryListRewindPointsRequest
+internal sealed class SessionScheduleHasSelfPacedRequest
 {
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>A file that a conversation-and-files rewind would restore.</summary>
+/// <summary>Result of registering or re-arming a scheduled prompt.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class HistoryRewindFilePreview
+internal sealed class ScheduleAddResult
 {
-    /// <summary>Aggregate change made across the discarded turns.</summary>
-    [JsonPropertyName("changeType")]
-    public HistoryRewindChangeType ChangeType { get; set; }
-
-    /// <summary>Lines added across the discarded turns.</summary>
-    [JsonPropertyName("linesAdded")]
-    public long LinesAdded { get; set; }
-
-    /// <summary>Lines removed across the discarded turns.</summary>
-    [JsonPropertyName("linesRemoved")]
-    public long LinesRemoved { get; set; }
+    /// <summary>The registered or updated schedule entry.</summary>
+    [JsonPropertyName("entry")]
+    public ScheduleEntry? Entry { get; set; }
 
-    /// <summary>Absolute path of the captured file.</summary>
-    [JsonPropertyName("path")]
-    public string Path { get; set; } = string.Empty;
+    /// <summary>User-facing validation error, when registration failed.</summary>
+    [JsonPropertyName("error")]
+    public string? Error { get; set; }
 }
 
-/// <summary>Files and aggregate changes for a prospective rewind.</summary>
+/// <summary>Register a relative-interval scheduled prompt.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class HistoryPreviewRewindResult
+internal sealed class ScheduleAddRequest
 {
-    /// <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>Number of unique files in the preview.</summary>
-    [JsonPropertyName("fileCount")]
-    public long FileCount { get; set; }
+    /// <summary>Optional display-only prompt label.</summary>
+    [JsonPropertyName("displayPrompt")]
+    public string? DisplayPrompt { get; set; }
 
-    /// <summary>Files ordered by path.</summary>
-    [JsonPropertyName("files")]
-    public IList<HistoryRewindFilePreview> Files { get => field ??= []; set; }
+    /// <summary>Human-readable interval such as `30s`, `5m`, or `2h`.</summary>
+    [JsonPropertyName("interval")]
+    public string Interval { get; set; } = string.Empty;
 
-    /// <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>Prompt text to enqueue when the schedule fires.</summary>
+    [JsonPropertyName("prompt")]
+    public string Prompt { get; set; } = string.Empty;
 
-/// <summary>Event boundary to preview for conversation-and-files rewind.</summary>
-[Experimental(global::GitHub.Copilot.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;
+    /// <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>A captured file that rewind intentionally left unchanged.</summary>
+/// <summary>Register a cron scheduled prompt.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class HistorySkippedFileRestore
+internal sealed class ScheduleAddCronRequest
 {
-    /// <summary>Absolute path of the skipped file.</summary>
-    [JsonPropertyName("path")]
-    public string Path { get; set; } = string.Empty;
-
-    /// <summary>Reason the file was not restored.</summary>
-    [JsonPropertyName("reason")]
-    public HistoryFileRestoreSkipReason Reason { get; set; }
-}
+    /// <summary>5-field cron expression.</summary>
+    [JsonPropertyName("cron")]
+    public string Cron { get; set; } = string.Empty;
 
-/// <summary>Structured outcome of a rewind request.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class HistoryRewindResult
-{
-    /// <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>Optional display-only prompt label.</summary>
+    [JsonPropertyName("displayPrompt")]
+    public string? DisplayPrompt { 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>Prompt text to enqueue when the schedule fires.</summary>
+    [JsonPropertyName("prompt")]
+    public string Prompt { get; set; } = string.Empty;
 
-    /// <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>Whether the schedule should re-arm after each tick. Defaults to true.</summary>
+    [JsonPropertyName("recurring")]
+    public bool? Recurring { 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>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 
-    /// <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>IANA timezone for evaluating the cron expression.</summary>
+    [JsonPropertyName("tz")]
+    public string? Tz { get; set; }
 }
 
-/// <summary>Boundary and mode for rewinding session history.</summary>
+/// <summary>Register an absolute-time scheduled prompt.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class HistoryRewindRequest
+internal sealed class ScheduleAddAtRequest
 {
-    /// <summary>ID of the user.message event that begins the discarded suffix.</summary>
-    [JsonPropertyName("eventId")]
-    public string EventId { get; set; } = string.Empty;
+    /// <summary>Epoch milliseconds when the prompt should fire.</summary>
+    [JsonPropertyName("at")]
+    public long At { get; set; }
 
-    /// <summary>Whether to rewind only conversation history or also restore captured files.</summary>
-    [JsonPropertyName("mode")]
-    public HistoryRewindMode 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 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 an in-progress background compaction was cancelled.</summary>
+/// <summary>Register a self-paced scheduled prompt.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class HistoryCancelBackgroundCompactionResult
+internal sealed class ScheduleAddSelfPacedRequest
 {
-    /// <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>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>Identifies the target session.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionHistoryCancelBackgroundCompactionRequest
-{
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Indicates whether an in-progress manual compaction was aborted.</summary>
+/// <summary>Re-arm a self-paced scheduled prompt.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class HistoryAbortManualCompactionResult
+internal sealed class ScheduleRearmSelfPacedRequest
 {
-    /// <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>Epoch milliseconds when the prompt should next fire.</summary>
+    [JsonPropertyName("at")]
+    public long At { get; set; }
+
+    /// <summary>Id of the self-paced scheduled prompt.</summary>
+    [JsonPropertyName("id")]
+    public long Id { get; set; }
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionHistoryAbortManualCompactionRequest
-{
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Markdown summary of the conversation context (empty when not available).</summary>
+/// <summary>Remove a scheduled prompt by id. The result entry is omitted if the id was unknown.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class HistorySummarizeForHandoffResult
+public sealed class ScheduleStopResult
 {
-    /// <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>The removed entry, or omitted if no entry matched.</summary>
+    [JsonPropertyName("entry")]
+    public ScheduleEntry? Entry { get; set; }
 }
 
-/// <summary>Identifies the target session.</summary>
+/// <summary>Identifier of the scheduled prompt to remove.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionHistorySummarizeForHandoffRequest
+internal sealed class ScheduleStopRequest
 {
+    /// <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>What a successful clear removed. A clear that could not be applied rejects instead of reporting a count.</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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class HistoryClearContextResult
+public sealed class ProviderTokenAcquireResult
 {
-    /// <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>The bearer token value (without the `Bearer ` prefix).</summary>
+    [JsonPropertyName("token")]
+    public string Token { get; set; } = string.Empty;
 }
 
-/// <summary>Parameters for clearing the conversation and seeding the window that replaces it.</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(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class HistoryClearContextRequest
+public sealed class ProviderTokenAcquireRequest
 {
-    /// <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>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>User-facing pending queue entry, with kind and display text for a queued message, slash command, or model change.</summary>
+/// <summary>Result returned by an extension workflow closure.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class QueuePendingItems
+public sealed class WorkflowExecuteResult
 {
-    /// <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>Stable identity of the queued user message. Present for message rows and absent for slash commands and model changes.</summary>
-    [JsonPropertyName("messageId")]
-    public string? MessageId { get; set; }
-
-    /// <summary>Optional source tag associated with this pending queue entry. This is an open string, not authenticated authorship. In particular, `user` does not prove that a person typed the message. If the source is absent or unrecognized, consumers must not infer human or agent authorship and should handle the entry neutrally. Consumers should tolerate future source values.</summary>
-    [JsonPropertyName("source")]
-    public string? Source { get; set; }
+    /// <summary>Workflow result value.</summary>
+    [JsonPropertyName("result")]
+    public JsonElement? Result { get; set; }
 }
 
-/// <summary>Snapshot of the session's pending queued items and immediate-steering messages.</summary>
+/// <summary>Parameters sent to the owning extension to execute a workflow closure.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class QueuePendingItemsResult
+public sealed class WorkflowExecuteRequest
 {
-    /// <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>Workflow input value.</summary>
+    [JsonPropertyName("args")]
+    public JsonElement Args { 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>Opaque token identifying this workflow execution attempt.</summary>
+    [JsonPropertyName("executionToken")]
+    public string ExecutionToken { get; set; } = string.Empty;
 
-    /// <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>Registered workflow name.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
 
-    /// <summary>ID of the running turn's user message while the model has not answered it, so `withdrawMessage` can still take it back once nothing sent after it is pending. A message leaves `items` when its turn starts, before its `user.message` is recorded; this tells that message apart from one that was removed. Absent when no turn prompt can be taken back.</summary>
-    [JsonPropertyName("withdrawableTurnMessageId")]
-    public string? WithdrawableTurnMessageId { get; set; }
-}
+    /// <summary>Workflow run identifier.</summary>
+    [JsonPropertyName("runId")]
+    public string RunId { get; set; } = string.Empty;
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionQueuePendingItemsRequest
-{
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Internal snapshot of native queue state for local session orchestration.</summary>
+/// <summary>Parameters for cooperatively aborting a workflow body.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class QueueSnapshotResult
+public sealed class WorkflowAbortRequest
 {
-    /// <summary>Queue item identifier of a model switch that has been dequeued but not yet applied.</summary>
-    [JsonPropertyName("inFlightModelChangeId")]
-    public string? InFlightModelChangeId { 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>Opaque token identifying the execution attempt to abort.</summary>
+    [JsonPropertyName("executionToken")]
+    public string ExecutionToken { get; set; } = string.Empty;
 
-    /// <summary>Immediate steering messages waiting for an active turn.</summary>
-    [JsonPropertyName("steeringMessages")]
-    public IList<string> SteeringMessages { get => field ??= []; set; }
-}
+    /// <summary>Workflow run identifier.</summary>
+    [JsonPropertyName("runId")]
+    public string RunId { get; set; } = string.Empty;
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionQueueSnapshotRequest
-{
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Result of moving a queued item.</summary>
+/// <summary>Whether the client authoritatively confirmed its external work stopped.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class QueueMoveItemResult
+public sealed class ClientTaskCancelResult
 {
-    /// <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>True only when the owner confirms that external work stopped before responding.</summary>
+    [JsonPropertyName("cancelled")]
+    public bool Cancelled { get; set; }
 }
 
-/// <summary>Parameters for moving a queued item by stable id.</summary>
+/// <summary>Runtime-to-owner cancellation request for a client-owned task.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class QueueMoveItemRequest
+public sealed class ClientTaskCancelRequest
 {
-    /// <summary>Stable opaque queued-item id.</summary>
+    /// <summary>Opaque identifier shared by coalesced cancellation callers.</summary>
+    [JsonPropertyName("cancellationId")]
+    public string CancellationId { get; set; } = string.Empty;
+
+    /// <summary>Owner-scoped task key included for correlation.</summary>
+    [JsonPropertyName("clientTaskId")]
+    public string ClientTaskId { get; set; } = string.Empty;
+
+    /// <summary>Canonical runtime-generated task identifier.</summary>
     [JsonPropertyName("id")]
     public string Id { get; set; } = string.Empty;
 
-    /// <summary>Target session identifier.</summary>
+    /// <summary>Reason the runtime requests cancellation.</summary>
+    [JsonPropertyName("reason")]
+    public ClientTaskCancelReason Reason { get; set; }
+
+    /// <summary>Session that owns the client task.</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>Result of inserting a queued message.</summary>
+/// <summary>Describes a filesystem error.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class QueueInsertAtResult
+public sealed class SessionFsError
 {
-    /// <summary>Fresh stable opaque id assigned to the inserted item.</summary>
-    [JsonPropertyName("id")]
-    public string Id { get; set; } = string.Empty;
+    /// <summary>Error classification.</summary>
+    [JsonPropertyName("code")]
+    public SessionFsErrorCode Code { get; set; }
+
+    /// <summary>Free-form detail about the error, for logging/diagnostics.</summary>
+    [JsonPropertyName("message")]
+    public string? Message { get; set; }
+
+    /// <summary>For failed writeFile requests only: true if the provider changed the target before failing. Omit when unknown or unchanged.</summary>
+    [JsonPropertyName("writeChanged")]
+    public bool? WriteChanged { get; set; }
 }
 
-/// <summary>Serializable message fields accepted by queue.insertAt.</summary>
+/// <summary>File content as a UTF-8 string, or a filesystem error if the read failed.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class QueueInsertMessage
+public sealed class SessionFsReadFileResult
 {
-    /// <summary>Optional explicit agent mode. When omitted, the session's current mode is assigned.</summary>
-    [JsonPropertyName("agentMode")]
-    public SendAgentMode? AgentMode { get; set; }
-
-    /// <summary>Optional attachments for the message.</summary>
-    [JsonPropertyName("attachments")]
-    public IList<Attachment>? Attachments { get; set; }
-
-    /// <summary>Whether the message is billable.</summary>
-    [JsonPropertyName("billable")]
-    public bool? Billable { get; set; }
-
-    /// <summary>Accepted for internal SendOptions compatibility but ignored; delivery is derived from current session activity.</summary>
-    [JsonPropertyName("delivery")]
-    public string? Delivery { get; set; }
-
-    /// <summary>Optional user-facing display text.</summary>
-    [JsonPropertyName("displayPrompt")]
-    public string? DisplayPrompt { 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>Accepted for SendOptions compatibility but ignored; the requested public position controls placement.</summary>
-    [JsonPropertyName("prepend")]
-    public bool? Prepend { get; set; }
+    /// <summary>File content as UTF-8 string.</summary>
+    [JsonPropertyName("content")]
+    public string Content { get; set; } = string.Empty;
 
-    /// <summary>The user message text.</summary>
-    [JsonPropertyName("prompt")]
-    public string Prompt { get; set; } = string.Empty;
+    /// <summary>Describes a filesystem error.</summary>
+    [JsonPropertyName("error")]
+    public SessionFsError? Error { get; set; }
+}
 
-    /// <summary>Per-turn request headers.</summary>
-    [JsonPropertyName("requestHeaders")]
-    public IDictionary<string, string>? RequestHeaders { get; set; }
+/// <summary>Path of the file to read from the client-provided session filesystem.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class SessionFsReadFileRequest
+{
+    /// <summary>Path using SessionFs conventions.</summary>
+    [JsonPropertyName("path")]
+    public string Path { get; set; } = string.Empty;
 
-    /// <summary>Required tool name for the turn, when any.</summary>
-    [JsonPropertyName("requiredTool")]
-    public string? RequiredTool { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
+}
 
-    /// <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>File bytes as standard base64, or a filesystem error if the read failed.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class SessionFsReadFileBytesResult
+{
+    /// <summary>Exact file bytes encoded as standard base64.</summary>
+    [JsonPropertyName("content")]
+    public string Content { get; set; } = string.Empty;
 
-    /// <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>Describes a filesystem error.</summary>
+    [JsonPropertyName("error")]
+    public SessionFsError? Error { get; set; }
 }
 
-/// <summary>Parameters for inserting a queued message at a public visible position.</summary>
+/// <summary>Path of the binary file to read from the client-provided session filesystem.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class QueueInsertAtRequest
+public sealed class SessionFsReadFileBytesRequest
 {
-    /// <summary>Queued message contents and delivery metadata.</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>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>Result of removing a queued item.</summary>
+/// <summary>File path, content to write, and optional mode for the client-provided session filesystem.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class QueueRemoveAtResult
+public sealed class SessionFsWriteFileRequest
 {
-    /// <summary>True when the addressed item was removed.</summary>
-    [JsonPropertyName("removed")]
-    public bool Removed { get; set; }
-}
+    /// <summary>Content to write.</summary>
+    [JsonPropertyName("content")]
+    public string Content { get; set; } = string.Empty;
 
-/// <summary>Parameters for removing a queued item by stable id.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class QueueRemoveAtRequest
-{
-    /// <summary>Stable opaque ID of the queued item to remove.</summary>
-    [JsonPropertyName("id")]
-    public string Id { get; set; } = string.Empty;
+    /// <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>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Result of editing a queued message.</summary>
+/// <summary>File path, standard-base64-encoded bytes to write, and optional mode for the client-provided session filesystem.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class QueueUpdateTextResult
+public sealed class SessionFsWriteFileBytesRequest
 {
-    /// <summary>True when the stored text changed.</summary>
-    [JsonPropertyName("updated")]
-    public bool Updated { get; set; }
+    /// <summary>Exact file bytes encoded as standard base64.</summary>
+    [JsonPropertyName("content")]
+    public string Content { get; set; } = string.Empty;
+
+    /// <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>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Parameters for editing a single queued message.</summary>
+/// <summary>File path, content to append, and optional mode for the client-provided session filesystem. Implementations create parent directories as needed.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class QueueUpdateTextRequest
+public sealed class SessionFsAppendFileRequest
 {
-    /// <summary>Optional replacement prompt displayed to the user.</summary>
-    [JsonPropertyName("displayPrompt")]
-    public string? DisplayPrompt { get; set; }
+    /// <summary>Content to append.</summary>
+    [JsonPropertyName("content")]
+    public string Content { 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>Optional POSIX-style mode for newly created files.</summary>
+    [JsonPropertyName("mode")]
+    public long? Mode { get; set; }
 
-    /// <summary>Replacement prompt sent to the model.</summary>
-    [JsonPropertyName("prompt")]
-    public string Prompt { get; set; } = string.Empty;
+    /// <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>Result of withdrawing a user message.</summary>
+/// <summary>Indicates whether the requested path exists in the client-provided session filesystem.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class QueueWithdrawMessageResult
+public sealed class SessionFsExistsResult
 {
-    /// <summary>True when the running turn was interrupted to withdraw the message. With removed false, the turn was interrupted but its events could not be removed, for example because the model answered first, so the message stays in the interrupted turn.</summary>
-    [JsonPropertyName("interrupted")]
-    public bool Interrupted { get; set; }
-
-    /// <summary>True when the message left the queue or, for a running turn, history.</summary>
-    [JsonPropertyName("removed")]
-    public bool Removed { get; set; }
+    /// <summary>Whether the path exists.</summary>
+    [JsonPropertyName("exists")]
+    public bool Exists { get; set; }
 }
 
-/// <summary>Conditional withdrawal of a single user message, from its queue or from the running turn it started.</summary>
+/// <summary>Path to test for existence in the client-provided session filesystem.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class QueueWithdrawMessageRequest
+public sealed class SessionFsExistsRequest
 {
-    /// <summary>The prompt originally sent. A message edited since submission is not withdrawn, so an obsolete draft cannot replace the edit.</summary>
-    [JsonPropertyName("expectedPrompt")]
-    public string ExpectedPrompt { get; set; } = string.Empty;
-
-    /// <summary>Message identity returned by send, not the queue item id. Batch messages are not eligible.</summary>
-    [JsonPropertyName("messageId")]
-    public string MessageId { get; set; } = string.Empty;
+    /// <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>Append to one pending steering message without changing its identity or delivery position.</summary>
+/// <summary>Filesystem metadata for the requested path, or a filesystem error if the stat failed.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class QueueAppendSteeringRequest
+public sealed class SessionFsStatResult
 {
-    /// <summary>Mode captured at submission. Only steering messages in the same mode may be combined.</summary>
-    [JsonPropertyName("agentMode")]
-    public SendAgentMode AgentMode { get; set; }
-
-    /// <summary>Attachments to add after the message's existing attachments. An empty list preserves the existing attachments.</summary>
-    [JsonPropertyName("attachments")]
-    public IList<Attachment> Attachments { get => field ??= []; set; }
-
-    /// <summary>Display text to append to the existing preview after a blank line.</summary>
-    [JsonPropertyName("displayPrompt")]
-    public string DisplayPrompt { get; set; } = string.Empty;
+    /// <summary>ISO 8601 timestamp of creation.</summary>
+    [JsonPropertyName("birthtime")]
+    public DateTimeOffset Birthtime { get; set; }
 
-    /// <summary>Expected current prompt, including any previous appends. The runtime applies plan-mode normalization before comparing and refuses a changed message.</summary>
-    [JsonPropertyName("expectedPrompt")]
-    public string ExpectedPrompt { get; set; } = string.Empty;
+    /// <summary>Describes a filesystem error.</summary>
+    [JsonPropertyName("error")]
+    public SessionFsError? Error { get; set; }
 
-    /// <summary>Message identity returned by send, not the queue item id. Only unclaimed user steering messages are eligible.</summary>
-    [JsonPropertyName("messageId")]
-    public string MessageId { get; set; } = string.Empty;
+    /// <summary>Whether the path is a directory.</summary>
+    [JsonPropertyName("isDirectory")]
+    public bool IsDirectory { get; set; }
 
-    /// <summary>Text to append after a blank line.</summary>
-    [JsonPropertyName("prompt")]
-    public string Prompt { get; set; } = string.Empty;
+    /// <summary>Whether the path is a file.</summary>
+    [JsonPropertyName("isFile")]
+    public bool IsFile { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>ISO 8601 timestamp of last modification.</summary>
+    [JsonPropertyName("mtime")]
+    public DateTimeOffset Mtime { get; set; }
 
-/// <summary>Result of duplicating a queued item.</summary>
-[Experimental(global::GitHub.Copilot.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;
+    /// <summary>File size in bytes.</summary>
+    [JsonPropertyName("size")]
+    public long Size { get; set; }
 }
 
-/// <summary>Parameters for duplicating a queued item.</summary>
+/// <summary>Path whose metadata should be returned from the client-provided session filesystem.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class QueueDuplicateAtRequest
+public sealed class SessionFsStatRequest
 {
-    /// <summary>Stable opaque ID of the queued item to duplicate.</summary>
-    [JsonPropertyName("id")]
-    public string Id { get; set; } = string.Empty;
+    /// <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>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>
+/// <summary>Directory path to create in the client-provided session filesystem, with options for recursive creation and POSIX mode.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class QueueSetDrainPausedRequest
+public sealed class SessionFsMkdirRequest
 {
-    /// <summary>Whether queued-lane draining should be paused.</summary>
-    [JsonPropertyName("paused")]
-    public bool Paused { get; set; }
+    /// <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>Result of trying to steer a queued message into a live turn.</summary>
+/// <summary>Names of entries in the requested directory, or a filesystem error if the read failed.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class QueueSendNowResult
+public sealed class SessionFsReaddirResult
 {
-    /// <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>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>Parameters for steering a queued message into a live turn.</summary>
+/// <summary>Directory path whose entries should be listed from the client-provided session filesystem.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class QueueSendNowRequest
+public sealed class SessionFsReaddirRequest
 {
-    /// <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>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>Whether the native queue has pending work.</summary>
+/// <summary>Directory entry returned by session filesystem `readdirWithTypes`, with name and entry type.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class QueueHasPendingResult
+public sealed class SessionFsReaddirWithTypesEntry
 {
-    /// <summary>True when queued or immediate native work is pending.</summary>
-    [JsonPropertyName("hasPending")]
-    public bool HasPending { get; set; }
-}
+    /// <summary>Entry name.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionQueueHasPendingRequest
-{
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Entry type.</summary>
+    [JsonPropertyName("type")]
+    public SessionFsReaddirWithTypesEntryType Type { get; set; }
 }
 
-/// <summary>Whether a deferred-idle drain should run.</summary>
+/// <summary>Entries in the requested directory paired with file/directory type information, or a filesystem error if the read failed.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class QueueBeginDeferredIdleDrainResult
+public sealed class SessionFsReaddirWithTypesResult
 {
-    /// <summary>True when the host should run finishDeferredIdleDrain asynchronously.</summary>
-    [JsonPropertyName("shouldDrain")]
-    public bool ShouldDrain { get; set; }
+    /// <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>Inputs for starting a deferred-idle drain.</summary>
+/// <summary>Directory path whose entries (with type information) should be listed from the client-provided session filesystem.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class QueueBeginDeferredIdleDrainRequest
+public sealed class SessionFsReaddirWithTypesRequest
 {
-    /// <summary>Whether the host still has active background work.</summary>
-    [JsonPropertyName("activeBackgroundWork")]
-    public bool ActiveBackgroundWork { get; set; }
+    /// <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>Action selected by the native deferred-idle drain.</summary>
+/// <summary>Path to remove from the client-provided session filesystem, with options for recursive removal and force.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class QueueFinishDeferredIdleDrainResult
+public sealed class SessionFsRmRequest
 {
-    /// <summary>Whether the deferred idle was caused by an aborted foreground turn.</summary>
-    [JsonPropertyName("aborted")]
-    public bool Aborted { get; set; }
-
-    /// <summary>One of none, processQueue, or emitSessionIdle.</summary>
-    [JsonPropertyName("action")]
-    public string Action { get; set; } = string.Empty;
-}
+    /// <summary>Ignore errors if the path does not exist.</summary>
+    [JsonPropertyName("force")]
+    public bool? Force { get; set; }
 
-/// <summary>Inputs for completing a deferred-idle drain.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class QueueFinishDeferredIdleDrainRequest
-{
-    /// <summary>Whether the host still has active background work.</summary>
-    [JsonPropertyName("activeBackgroundWork")]
-    public bool ActiveBackgroundWork { get; set; }
+    /// <summary>Path using SessionFs conventions.</summary>
+    [JsonPropertyName("path")]
+    public string Path { get; set; } = string.Empty;
 
-    /// <summary>Whether native queued work remains.</summary>
-    [JsonPropertyName("hasPending")]
-    public bool HasPending { get; set; }
+    /// <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>Inputs for marking session.idle deferred in native state.</summary>
+/// <summary>Source and destination paths for renaming or moving an entry in the client-provided session filesystem.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class QueueDeferSessionIdleRequest
+public sealed class SessionFsRenameRequest
 {
-    /// <summary>Whether the deferred idle was caused by an aborted foreground turn.</summary>
-    [JsonPropertyName("aborted")]
-    public bool Aborted { get; set; }
+    /// <summary>Destination path using SessionFs conventions.</summary>
+    [JsonPropertyName("dest")]
+    public string Dest { get; set; } = string.Empty;
 
     /// <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>Indicates whether a user-facing pending item was removed.</summary>
+/// <summary>Query results including rows, columns, and rows affected, or a filesystem error if execution failed.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class QueueRemoveMostRecentResult
+public sealed class SessionFsSqliteQueryResult
 {
-    /// <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>Column names from the result set.</summary>
+    [JsonPropertyName("columns")]
+    public IList<string> Columns { get => field ??= []; 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>Identifies the target session.</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(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionQueueRemoveMostRecentRequest
+public sealed class SessionFsSqliteQueryRequest
 {
+    /// <summary>Optional named bind parameters.</summary>
+    [JsonPropertyName("params")]
+    public IDictionary<string, JsonElement>? Params { get; set; }
+
+    /// <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>Identifies the target session.</summary>
+/// <summary>Classified SQLite transaction failure. busyOrLocked guarantees rollback; postCommitAmbiguous must never be retried.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionQueueClearRequest
+public sealed class SessionFsSqliteTransactionError
 {
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <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>Internal filter for consuming queued system notifications.</summary>
+/// <summary>Per-statement results, or a classified transaction error.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class QueueConsumeSystemNotificationsRequest
+public sealed class SessionFsSqliteTransactionResult
 {
-    /// <summary>Opaque runtime-owned filter object.</summary>
-    [JsonPropertyName("filter")]
-    public JsonElement Filter { get; set; }
+    /// <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>Result of enqueueing the resume-pending wake item.</summary>
+/// <summary>One statement in an atomic SQLite transaction.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class QueueEnqueueResumePendingResult
+public sealed class SessionFsSqliteTransactionStatement
 {
-    /// <summary>True when a wake item was newly queued.</summary>
-    [JsonPropertyName("queued")]
-    public bool Queued { 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>Identifies the target session.</summary>
+/// <summary>Statements to execute atomically. Providers apply busy handling for every call.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionQueueEnqueueResumePendingRequest
+public sealed class SessionFsSqliteTransactionRequest
 {
     /// <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>Identifies the target session.</summary>
+/// <summary>Indicates whether the per-session SQLite database already exists.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionQueueProcessRequest
+public sealed class SessionFsSqliteExistsResult
+{
+    /// <summary>Whether the session database already exists.</summary>
+    [JsonPropertyName("exists")]
+    public bool Exists { get; set; }
+}
+
+/// <summary>Identifies the target session.</summary>
+public sealed class SessionFsSqliteExistsRequest
 {
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Cursor, batch size, and optional long-poll/filter parameters for reading session events.</summary>
+/// <summary>Canvas open result returned by the provider.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class EventLogReadRequest
+public sealed class CanvasProviderOpenResult
 {
-    /// <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>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>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>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>Provider-supplied status text.</summary>
+    [JsonPropertyName("status")]
+    public string? Status { 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>Provider-supplied title.</summary>
+    [JsonPropertyName("title")]
+    public string? Title { 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>URL for web-rendered canvases.</summary>
+    [JsonPropertyName("url")]
+    public string? Url { get; set; }
 }
 
-/// <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>
+/// <summary>Host capabilities.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class EventLogTailResult
+public sealed class CanvasHostContextCapabilities
 {
-    /// <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>Whether canvas rendering is supported.</summary>
+    [JsonPropertyName("canvases")]
+    public bool? Canvases { get; set; }
 }
 
-/// <summary>Identifies the target session.</summary>
+/// <summary>Host context supplied by the runtime.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionEventLogTailRequest
+public sealed class CanvasHostContext
 {
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Host capabilities.</summary>
+    [JsonPropertyName("capabilities")]
+    public CanvasHostContextCapabilities? Capabilities { get; set; }
 }
 
-/// <summary>Opaque handle representing an event-type interest registration.</summary>
+/// <summary>Session context supplied by the runtime.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class RegisterEventInterestResult
+public sealed class CanvasSessionContext
 {
-    /// <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>Active session working directory, when known.</summary>
+    [JsonPropertyName("workingDirectory")]
+    public string? WorkingDirectory { get; set; }
 }
 
-/// <summary>Event type to register consumer interest for, used by runtime gating logic.</summary>
+/// <summary>Canvas open parameters sent to the provider.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class RegisterEventInterestParams
+public sealed class CanvasProviderOpenRequest
 {
-    /// <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>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>Host context supplied by the runtime.</summary>
+    [JsonPropertyName("host")]
+    public CanvasHostContext? Host { get; set; }
+
+    /// <summary>Canvas open input.</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>Session context supplied by the runtime.</summary>
+    [JsonPropertyName("session")]
+    public CanvasSessionContext? Session { get; set; }
 
     /// <summary>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Indicates whether the operation succeeded.</summary>
+/// <summary>Canvas close parameters sent to the provider.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class EventLogReleaseInterestResult
+public sealed class CanvasProviderCloseRequest
 {
-    /// <summary>Whether the operation succeeded.</summary>
-    [JsonPropertyName("success")]
-    public bool Success { get; set; }
-}
+    /// <summary>Provider-local canvas identifier.</summary>
+    [JsonPropertyName("canvasId")]
+    public string CanvasId { get; set; } = string.Empty;
 
-/// <summary>Opaque handle previously returned by `registerInterest` to release.</summary>
-[Experimental(global::GitHub.Copilot.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;
+    /// <summary>Owning provider identifier.</summary>
+    [JsonPropertyName("extensionId")]
+    public string ExtensionId { get; set; } = string.Empty;
+
+    /// <summary>Host context supplied by the runtime.</summary>
+    [JsonPropertyName("host")]
+    public CanvasHostContext? Host { 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>Target session identifier.</summary>
     [JsonPropertyName("sessionId")]
     public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Request count and cost metrics for this model.</summary>
+/// <summary>Canvas action invocation parameters sent to the provider.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class UsageMetricsModelMetricRequests
+public sealed class CanvasProviderInvokeActionRequest
 {
-    /// <summary>User-initiated premium request cost (with multiplier applied).</summary>
-    [JsonPropertyName("cost")]
-    public double Cost { get; set; }
+    /// <summary>Action name to invoke.</summary>
+    [JsonPropertyName("actionName")]
+    public string ActionName { get; set; } = string.Empty;
 
-    /// <summary>Number of API requests made with this model.</summary>
-    [JsonPropertyName("count")]
-    public long Count { get; set; }
-}
+    /// <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>Host context supplied by the runtime.</summary>
+    [JsonPropertyName("host")]
+    public CanvasHostContext? Host { get; set; }
+
+    /// <summary>Action input.</summary>
+    [JsonPropertyName("input")]
+    public JsonElement? Input { 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>Per-model token-detail entry containing the accumulated token count for one token type.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class UsageMetricsModelMetricTokenDetail
-{
-    /// <summary>Accumulated token count for this token type.</summary>
-    [JsonPropertyName("tokenCount")]
-    public long TokenCount { get; set; }
+    /// <summary>Target session identifier.</summary>
+    [JsonPropertyName("sessionId")]
+    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <summary>Token usage metrics for this model.</summary>
+/// <summary>Reports a supervised listener's hosting-task termination and cleanup outcome.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class UsageMetricsModelMetricUsage
+public sealed class HostExitedRequest
 {
-    /// <summary>Total tokens read from prompt cache.</summary>
-    [JsonPropertyName("cacheReadTokens")]
-    public long CacheReadTokens { get; set; }
-
-    /// <summary>Total tokens written to prompt cache.</summary>
-    [JsonPropertyName("cacheWriteTokens")]
-    public long CacheWriteTokens { get; set; }
+    /// <summary>Explicit startup or teardown failure, when present.</summary>
+    [JsonPropertyName("error")]
+    public string? Error { get; set; }
 
-    /// <summary>Total input tokens consumed.</summary>
-    [JsonPropertyName("inputTokens")]
-    public long InputTokens { get; set; }
+    /// <summary>Process exit status when available; absent for in-process listener tasks.</summary>
+    [JsonPropertyName("exitCode")]
+    public long? ExitCode { get; set; }
 
-    /// <summary>Total output tokens produced.</summary>
-    [JsonPropertyName("outputTokens")]
-    public long OutputTokens { get; set; }
+    /// <summary>Listener UUID.</summary>
+    [JsonPropertyName("hostId")]
+    public string HostId { get; set; } = string.Empty;
 
-    /// <summary>Total output tokens used for reasoning.</summary>
-    [JsonPropertyName("reasoningTokens")]
-    public long? ReasoningTokens { get; set; }
+    /// <summary>Cause of termination.</summary>
+    [JsonPropertyName("reason")]
+    public HostExitReason Reason { get; set; }
 }
 
-/// <summary>Per-model usage metrics, including request counts/costs, token usage, nano-AI units, and per-token-type details.</summary>
+/// <summary>Opaque integrator-owned process launch profile for one extension entrypoint.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class UsageMetricsModelMetric
+public sealed class ExtensionLaunchProfile
 {
-    /// <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>Request count and cost metrics for this model.</summary>
-    [JsonPropertyName("requests")]
-    public UsageMetricsModelMetricRequests Requests { get => field ??= new(); set; }
-
-    /// <summary>Token count details per type.</summary>
-    [JsonPropertyName("tokenDetails")]
-    public IDictionary<string, UsageMetricsModelMetricTokenDetail>? TokenDetails { get; set; }
+    /// <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>Accumulated nano-AI units cost for this model.</summary>
-    [JsonPropertyName("totalNanoAiu")]
-    public double? TotalNanoAiu { get; 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>Token usage metrics for this model.</summary>
-    [JsonPropertyName("usage")]
-    public UsageMetricsModelMetricUsage Usage { get => field ??= new(); 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>Usage attributed to one agent instance, including its identity, API duration, AI units, and per-model breakdown.</summary>
+/// <summary>The launch profile for a supported entrypoint. Omit launch when the provider does not support the entrypoint.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class UsageMetricsAgentMetric
+public sealed class ExtensionLaunchProviderResolveResult
 {
-    /// <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>Configured agent name, when this is a subagent.</summary>
-    [JsonPropertyName("agentName")]
-    public string? AgentName { 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>Opaque launch profile, omitted when this provider does not support the entrypoint.</summary>
+    [JsonPropertyName("launch")]
+    public ExtensionLaunchProfile? Launch { get; set; }
 }
 
-/// <summary>Aggregated code change metrics.</summary>
+/// <summary>A discovered extension entrypoint that the registered integrator may classify and resolve to an opaque launch profile.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class UsageMetricsCodeChanges
+public sealed class ExtensionLaunchProviderResolveRequest
 {
-    /// <summary>Distinct file paths modified during the session.</summary>
-    [JsonPropertyName("filesModified")]
-    public IList<string> FilesModified { get => field ??= []; set; }
+    /// <summary>Source-qualified extension identifier.</summary>
+    [JsonPropertyName("id")]
+    public string Id { get; set; } = string.Empty;
 
-    /// <summary>Number of distinct files modified.</summary>
-    [JsonPropertyName("filesModifiedCount")]
-    public long FilesModifiedCount { get; set; }
+    /// <summary>Absolute path to the discovered extension entrypoint.</summary>
+    [JsonPropertyName("modulePath")]
+    public string ModulePath { get; set; } = string.Empty;
 
-    /// <summary>Total lines of code added.</summary>
-    [JsonPropertyName("linesAdded")]
-    public long LinesAdded { get; set; }
+    /// <summary>Human-readable extension name.</summary>
+    [JsonPropertyName("name")]
+    public string Name { get; set; } = string.Empty;
 
-    /// <summary>Total lines of code removed.</summary>
-    [JsonPropertyName("linesRemoved")]
-    public long LinesRemoved { get; set; }
+    /// <summary>Discovery source for the extension entrypoint.</summary>
+    [JsonPropertyName("source")]
+    public ExtensionSource Source { get; set; }
 }
 
-/// <summary>Session-wide token-detail entry containing the accumulated token count for one token type.</summary>
+/// <summary>Acknowledgement. Returning successfully simply means the SDK accepted the start frame; it does not imply the request will succeed.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class UsageMetricsTokenDetail
+public sealed class LlmInferenceHttpRequestStartResult
 {
-    /// <summary>Accumulated token count for this token type.</summary>
-    [JsonPropertyName("tokenCount")]
-    public long TokenCount { get; set; }
 }
 
-/// <summary>Accumulated session usage metrics, including premium request cost, token counts, model breakdown, and code-change totals.</summary>
+/// <summary>The head of an outbound model-layer HTTP request.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class UsageGetMetricsResult
+public sealed class LlmInferenceHttpRequestStartRequest
 {
-    /// <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>Aggregated code change metrics.</summary>
-    [JsonPropertyName("codeChanges")]
-    public UsageMetricsCodeChanges CodeChanges { get => field ??= new(); set; }
-
-    /// <summary>Currently active model identifier.</summary>
-    [JsonPropertyName("currentModel")]
-    public string? CurrentModel { 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>Input tokens from the most recent main-agent API call.</summary>
-    [JsonPropertyName("lastCallInputTokens")]
-    public long LastCallInputTokens { 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>Output tokens from the most recent main-agent API call.</summary>
-    [JsonPropertyName("lastCallOutputTokens")]
-    public long LastCallOutputTokens { 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>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>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>ISO 8601 timestamp when the session started.</summary>
-    [JsonPropertyName("sessionStartTime")]
-    public DateTimeOffset SessionStartTime { get; set; }
+    /// <summary>HTTP method, e.g. GET, POST.</summary>
+    [JsonPropertyName("method")]
+    public string Method { get; set; } = string.Empty;
 
-    /// <summary>Session-wide per-token-type accumulated token counts.</summary>
-    [JsonPropertyName("tokenDetails")]
-    public IDictionary<string, UsageMetricsTokenDetail>? TokenDetails { get; set; }
+    /// <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>Total time spent in model API calls (milliseconds).</summary>
-    [JsonConverter(typeof(MillisecondsTimeSpanConverter))]
-    [JsonPropertyName("totalApiDurationMs")]
-    public TimeSpan TotalApiDuration { 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>Session-wide accumulated nano-AI units cost.</summary>
-    [JsonPropertyName("totalNanoAiu")]
-    public double? TotalNanoAiu { 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>Total user-initiated premium request cost across all models (may be fractional due to multipliers).</summary>
-    [JsonPropertyName("totalPremiumRequestCost")]
-    public double TotalPremiumRequestCost { 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>Raw count of user-initiated API requests.</summary>
-    [JsonPropertyName("totalUserRequests")]
-    public long TotalUserRequests { get; set; }
+    /// <summary>Absolute request URL.</summary>
+    [JsonPropertyName("url")]
+    public string Url { get; set; } = string.Empty;
 }
 
-/// <summary>Identifies the target session.</summary>
+/// <summary>Acknowledgement. The SDK is free to ignore the ack and treat chunk delivery as fire-and-forget.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionUsageGetMetricsRequest
+public sealed class LlmInferenceHttpRequestChunkResult
 {
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
 }
 
-/// <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>
+/// <summary>A request body chunk or cancellation signal.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-[JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "kind",
-    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(SessionLimitPredictionResultAvailable), "available")]
-[JsonDerivedType(typeof(SessionLimitPredictionResultUnavailable), "unavailable")]
-public partial class SessionLimitPredictionResult
+public sealed class LlmInferenceHttpRequestChunkRequest
 {
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("kind")]
-    public virtual string Kind { get; set; } = string.Empty;
-}
+    /// <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>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>Baseline data provenance for a prediction.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionLimitPredictionBaselineData
-{
-    /// <summary>End of the baseline data slice.</summary>
-    [JsonPropertyName("windowEnd")]
-    public string WindowEnd { get; set; } = string.Empty;
+    /// <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>Start of the baseline data slice.</summary>
-    [JsonPropertyName("windowStart")]
-    public string WindowStart { get; set; } = string.Empty;
-}
+    /// <summary>Optional human-readable reason for the cancellation, propagated for logging.</summary>
+    [JsonPropertyName("cancelReason")]
+    public string? CancelReason { get; set; }
 
-/// <summary>Semantic usage tier and its AI-credit cap.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionLimitPredictionTierOption
-{
-    /// <summary>AI-credit cap for this tier.</summary>
-    [JsonPropertyName("cap")]
-    public double Cap { 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>Semantic usage tier.</summary>
-    [JsonPropertyName("tier")]
-    public SessionLimitPredictionTier Tier { get; set; }
+    /// <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>Explainable AI-credit session-limit prediction.</summary>
+/// <summary>Client environment metadata describing the process that produced a telemetry event.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionLimitPredictionDetails
+public sealed class GitHubTelemetryClientInfo
 {
-    /// <summary>Baseline data provenance.</summary>
-    [JsonPropertyName("baselineData")]
-    public SessionLimitPredictionBaselineData BaselineData { get => field ??= new(); set; }
-
-    /// <summary>Client population used for the prediction.</summary>
-    [JsonPropertyName("clientType")]
-    public SessionLimitPredictionClientType ClientType { get; set; }
+    /// <summary>Copilot CLI version string.</summary>
+    [JsonPropertyName("cli_version")]
+    public string CliVersion { get; set; } = string.Empty;
 
-    /// <summary>Resolved model family when known.</summary>
-    [JsonPropertyName("family")]
-    public string? Family { get; set; }
+    /// <summary>Name of the client application.</summary>
+    [JsonPropertyName("client_name")]
+    public string? ClientName { get; set; }
 
-    /// <summary>Model identifier used for lookup.</summary>
-    [JsonPropertyName("modelId")]
-    public string ModelId { get; set; } = string.Empty;
+    /// <summary>Type of client.</summary>
+    [JsonPropertyName("client_type")]
+    public string? ClientType { get; set; }
 
-    /// <summary>Recommended maximum AI credits for this session.</summary>
-    [JsonPropertyName("recommendedCap")]
-    public double RecommendedCap { get; set; }
+    /// <summary>Copilot subscription plan, when known.</summary>
+    [JsonPropertyName("copilot_plan")]
+    public string? CopilotPlan { get; set; }
 
-    /// <summary>Tier chosen as the recommended cap.</summary>
-    [JsonPropertyName("recommendedTier")]
-    public SessionLimitPredictionTier RecommendedTier { get; set; }
+    /// <summary>Number of logical CPU cores on the host.</summary>
+    [JsonPropertyName("cpu_count")]
+    public long? CpuCount { get; set; }
 
-    /// <summary>Baseline fallback level used to create the prediction.</summary>
-    [JsonPropertyName("source")]
-    public SessionLimitPredictionSource Source { get; set; }
+    /// <summary>Distinct CPU model names for the host, comma-separated.</summary>
+    [JsonPropertyName("cpu_model")]
+    public string? CpuModel { 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>Stable machine identifier for the device.</summary>
+    [JsonPropertyName("dev_device_id")]
+    public string? DevDeviceId { get; set; }
 
-    /// <summary>Ordered usage tiers and their AI-credit caps.</summary>
-    [JsonPropertyName("tiers")]
-    public IList<SessionLimitPredictionTierOption> Tiers { get => field ??= []; set; }
-}
+    /// <summary>Whether the user is a GitHub/Microsoft staff member.</summary>
+    [JsonPropertyName("is_staff")]
+    public bool? IsStaff { get; set; }
 
-/// <summary>The <c>available</c> variant of <see cref="SessionLimitPredictionResult"/>.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class SessionLimitPredictionResultAvailable : SessionLimitPredictionResult
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "available";
+    /// <summary>Node.js runtime version string.</summary>
+    [JsonPropertyName("node_version")]
+    public string NodeVersion { get; set; } = string.Empty;
 
-    /// <summary>Predicted session limit details.</summary>
-    [JsonPropertyName("prediction")]
-    public required SessionLimitPredictionDetails Prediction { get; set; }
-}
+    /// <summary>Operating system architecture (e.g. arm64, x64).</summary>
+    [JsonPropertyName("os_arch")]
+    public string OsArch { get; set; } = string.Empty;
 
-/// <summary>The <c>unavailable</c> variant of <see cref="SessionLimitPredictionResult"/>.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class SessionLimitPredictionResultUnavailable : SessionLimitPredictionResult
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "unavailable";
+    /// <summary>Operating system platform (e.g. darwin, linux, win32).</summary>
+    [JsonPropertyName("os_platform")]
+    public string OsPlatform { get; set; } = string.Empty;
 
-    /// <summary>Reason no prediction is available.</summary>
-    [JsonPropertyName("reason")]
-    public required SessionLimitPredictionUnavailableReason Reason { get; set; }
+    /// <summary>Operating system version string.</summary>
+    [JsonPropertyName("os_version")]
+    public string OsVersion { get; set; } = string.Empty;
 }
 
-/// <summary>RPC data type for SessionLimitPredictionPredict operations.</summary>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionLimitPredictionPredictRequest
+public sealed class GitHubTelemetryEvent
 {
-    /// <summary>Client type to size for. Defaults to `cli-interactive`.</summary>
-    [JsonPropertyName("clientType")]
-    public SessionLimitPredictionClientType? ClientType { get; set; }
+    /// <summary>Client environment metadata.</summary>
+    [JsonPropertyName("client")]
+    public GitHubTelemetryClientInfo? Client { 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>Copilot tracking ID for user-level attribution.</summary>
+    [JsonPropertyName("copilot_tracking_id")]
+    public string? CopilotTrackingId { get; set; }
 
-/// <summary>RPC data type for SessionLimitPredictionPredictRequestWithSession operations.</summary>
-[Experimental(global::GitHub.Copilot.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>Timestamp when the event was created (ISO 8601 format).</summary>
+    [JsonPropertyName("created_at")]
+    public string? CreatedAt { 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>Experiment assignment context.</summary>
+    [JsonPropertyName("exp_assignment_context")]
+    public string? ExpAssignmentContext { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <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>GitHub URL for the session and a flag indicating whether remote steering is enabled.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class RemoteEnableResult
-{
-    /// <summary>Whether remote steering is enabled.</summary>
-    [JsonPropertyName("remoteSteerable")]
-    public bool RemoteSteerable { 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>GitHub frontend URL for this session.</summary>
-    [Url]
-    [StringSyntax(StringSyntaxAttribute.Uri)]
-    [JsonPropertyName("url")]
-    public string? Url { get; set; }
-}
+    /// <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>Optional remote session mode ("off", "export", or "on"); defaults to enabling both export and remote steering.</summary>
-[Experimental(global::GitHub.Copilot.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>Reference to the model call that produced this event.</summary>
+    [JsonPropertyName("model_call_id")]
+    public string? ModelCallId { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <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>Identifies the target session.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionRemoteDisableRequest
-{
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Session identifier the event belongs to.</summary>
+    [JsonPropertyName("session_id")]
+    public string? SessionId { get; set; }
 }
 
-/// <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>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class RemoteNotifySteerableChangedResult
+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>New remote-steerability state to persist as a `session.remote_steerable_changed` event.</summary>
-[Experimental(global::GitHub.Copilot.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>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>Target session identifier.</summary>
+    /// <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; } = string.Empty;
+    public string? SessionId { get; set; }
 }
 
-/// <summary>Current sharing status and shareable GitHub URL for a session.</summary>
+/// <summary>SDK host response to a GitHub credential request.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class VisibilityGetResult
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "kind",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(GitHubTokenAcquireResultToken), "token")]
+[JsonDerivedType(typeof(GitHubTokenAcquireResultCancelled), "cancelled")]
+public partial class GitHubTokenAcquireResult
 {
-    /// <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>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 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>The type discriminator.</summary>
+    [JsonPropertyName("kind")]
+    public virtual string Kind { get; set; } = string.Empty;
 }
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionVisibilityGetRequest
-{
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
 
-/// <summary>Effective sharing status and shareable GitHub URL after updating session visibility.</summary>
+/// <summary>The <c>token</c> variant of <see cref="GitHubTokenAcquireResult"/>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class VisibilitySetResult
+public partial class GitHubTokenAcquireResultToken : GitHubTokenAcquireResult
 {
-    /// <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 />
+    [JsonIgnore]
+    public override string Kind => "token";
 
-    /// <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>GitHub access token acquired by the SDK host.</summary>
+    [JsonPropertyName("accessToken")]
+    public required string AccessToken { 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>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>Desired sharing status for the session.</summary>
+/// <summary>The <c>cancelled</c> variant of <see cref="GitHubTokenAcquireResult"/>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class VisibilitySetRequest
+public partial class GitHubTokenAcquireResultCancelled : GitHubTokenAcquireResult
 {
-    /// <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; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Kind => "cancelled";
 }
 
-/// <summary>Scheduled prompt entry with ID, timing (`intervalMs`, `cron`, or `at`), prompt text, recurrence, and next run time.</summary>
+/// <summary>Asks the SDK client to acquire a GitHub access token from an opaque callback registration.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ScheduleEntry
+public sealed class GitHubTokenAcquireRequest
 {
-    /// <summary>Absolute fire time (epoch milliseconds) for a one-shot calendar schedule.</summary>
-    [JsonPropertyName("at")]
-    public long? At { get; set; }
-
-    /// <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>Effective GitHub host for which the callback must return a token.</summary>
+    [JsonPropertyName("host")]
+    public string Host { get; set; } = string.Empty;
 
-    /// <summary>IANA timezone the `cron` expression is evaluated in.</summary>
-    [JsonPropertyName("tz")]
-    public string? Tz { get; set; }
-}
+    /// <summary>Why the runtime is requesting a GitHub credential.</summary>
+    [JsonPropertyName("reason")]
+    public GitHubTokenAcquireReason Reason { get; set; }
 
-/// <summary>Snapshot of the currently active recurring prompts for this session.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ScheduleList
-{
-    /// <summary>Active scheduled prompts, ordered by id.</summary>
-    [JsonPropertyName("entries")]
-    public IList<ScheduleEntry> Entries { get => field ??= []; set; }
-}
+    /// <summary>Opaque identifier generated by the SDK for this callback registration.</summary>
+    [JsonPropertyName("registrationId")]
+    public string RegistrationId { get; set; } = string.Empty;
 
-/// <summary>Identifies the target session.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionScheduleListRequest
-{
-    /// <summary>Target session identifier.</summary>
+    /// <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>Identifies the target session.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionScheduleHydrateRequest
+/// <summary>A response is meaningful only on the connection and request that issued its challenge.</summary>
+public sealed class InstallationsConfirmResult
 {
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Exact challenge from the request.</summary>
+    [JsonPropertyName("confirmationId")]
+    public string ConfirmationId { get; set; } = string.Empty;
+
+    /// <summary>Fresh explicit user decision. There is no default.</summary>
+    [JsonPropertyName("decision")]
+    public InstallationDecision Decision { get; set; }
+
+    /// <summary>Exact review commitment from the request.</summary>
+    [JsonPropertyName("reviewFingerprint")]
+    public string ReviewFingerprint { get; set; } = string.Empty;
 }
 
-/// <summary>Whether the session currently has an active self-paced schedule.</summary>
+/// <summary>Only resource kinds with an implemented installation engine have a review variant.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>resource</c>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class ScheduleHasSelfPacedResult
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "resource",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(InstallationReviewMcp), "mcp")]
+[JsonDerivedType(typeof(InstallationReviewSkill), "skill")]
+public partial class InstallationReview
 {
-    /// <summary>True when at least one active schedule is self-paced.</summary>
-    [JsonPropertyName("hasSelfPaced")]
-    public bool HasSelfPaced { get; set; }
+    /// <summary>The type discriminator.</summary>
+    [JsonPropertyName("resource")]
+    public virtual string Resource { get; set; } = string.Empty;
 }
 
-/// <summary>Identifies the target session.</summary>
+
+/// <summary>Safe MCP review fields. No raw card, retrieval URL, plan handle or secret value.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>action</c>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class SessionScheduleHasSelfPacedRequest
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "action",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(McpInstallationReviewInstall), "install")]
+[JsonDerivedType(typeof(McpInstallationReviewUninstall), "uninstall")]
+public partial class McpInstallationReview
 {
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>The type discriminator.</summary>
+    [JsonPropertyName("action")]
+    public virtual string Action { get; set; } = string.Empty;
 }
 
-/// <summary>Result of registering or re-arming a scheduled prompt.</summary>
+
+/// <summary>
+/// Final remote configuration, not a template. The producer refuses external-value
+/// expansion before presenting this review. Receipt-owned secrets appear only as
+/// `${installation-secret:&lt;id&gt;}` references whose `&lt;id&gt;` matches a reviewed
+/// `${secret:&lt;id&gt;}` placeholder; values are never included.
+/// </summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class ScheduleAddResult
+public sealed class McpInstallationRemoteConfiguration
 {
-    /// <summary>The registered or updated schedule entry.</summary>
-    [JsonPropertyName("entry")]
-    public ScheduleEntry? Entry { get; set; }
+    /// <summary>
+    /// Configured headers, excluding separately authorised OAuth tokens. Values may
+    /// contain owned secret references, never secret values.
+    /// </summary>
+    [JsonPropertyName("headers")]
+    public IDictionary<string, string> Headers { get => field ??= new Dictionary<string, string>(); set; }
 
-    /// <summary>User-facing validation error, when registration failed.</summary>
-    [JsonPropertyName("error")]
-    public string? Error { get; set; }
+    /// <summary>Configured tool selection, not permission to invoke those tools.</summary>
+    [JsonPropertyName("tools")]
+    public IList<string> Tools { get => field ??= []; set; }
+
+    /// <summary>Transport in the effective persisted remote configuration.</summary>
+    [JsonPropertyName("transport")]
+    public McpPlanRemoteTransport Transport { get; set; }
+
+    /// <summary>Exact resolved endpoint, without templates or secret placeholders.</summary>
+    [JsonPropertyName("url")]
+    public string Url { get; set; } = string.Empty;
 }
 
-/// <summary>Register a relative-interval scheduled prompt.</summary>
+/// <summary>The <c>install</c> variant of <see cref="McpInstallationReview"/>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class ScheduleAddRequest
+public partial class McpInstallationReviewInstall : McpInstallationReview
 {
-    /// <summary>Optional display-only prompt label.</summary>
-    [JsonPropertyName("displayPrompt")]
-    public string? DisplayPrompt { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Action => "install";
 
-    /// <summary>Human-readable interval such as `30s`, `5m`, or `2h`.</summary>
-    [JsonPropertyName("interval")]
-    public string Interval { get; set; } = string.Empty;
+    /// <summary>Catalogue identity retained from the bound candidate when available.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("catalogue")]
+    public InstallationCatalogueIdentity? Catalogue { get; set; }
 
-    /// <summary>Prompt text to enqueue when the schedule fires.</summary>
-    [JsonPropertyName("prompt")]
-    public string Prompt { get; set; } = string.Empty;
+    /// <summary>Original catalogue trust metadata, not a verification claim.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("catalogueTrust")]
+    public CatalogTrustSnapshot? CatalogueTrust { get; set; }
 
-    /// <summary>Whether the schedule should re-arm after each tick. Defaults to true.</summary>
-    [JsonPropertyName("recurring")]
-    public bool? Recurring { get; set; }
+    /// <summary>The configuration change for the selected alternative only.</summary>
+    [JsonPropertyName("configurationChange")]
+    public required McpPlanConfigurationChange ConfigurationChange { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>
+    /// Complete effective remote configuration for final installation review.
+    /// Earlier private selection reviews and package choices omit this field.
+    /// The owned remote resource requires it before issuing confirmation.
+    /// </summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("effectiveConfiguration")]
+    public McpInstallationRemoteConfiguration? EffectiveConfiguration { get; set; }
 
-/// <summary>Register a cron scheduled prompt.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class ScheduleAddCronRequest
-{
-    /// <summary>5-field cron expression.</summary>
-    [JsonPropertyName("cron")]
-    public string Cron { get; set; } = string.Empty;
+    /// <summary>Identity from the retained plan, not caller display text.</summary>
+    [JsonPropertyName("identity")]
+    public required McpPlanResourceIdentity Identity { get; set; }
 
-    /// <summary>Optional display-only prompt label.</summary>
-    [JsonPropertyName("displayPrompt")]
-    public string? DisplayPrompt { get; set; }
+    /// <summary>Non-secret values supplied for this selected alternative.</summary>
+    [JsonPropertyName("inputs")]
+    public required IList<McpInstallationInput> Inputs { get; set; }
 
-    /// <summary>Prompt text to enqueue when the schedule fires.</summary>
-    [JsonPropertyName("prompt")]
-    public string Prompt { get; set; } = string.Empty;
+    /// <summary>Policy decision bound to this plan.</summary>
+    [JsonPropertyName("policy")]
+    public required McpPlanPolicyResult Policy { get; set; }
 
-    /// <summary>Whether the schedule should re-arm after each tick. Defaults to true.</summary>
-    [JsonPropertyName("recurring")]
-    public bool? Recurring { get; set; }
+    /// <summary>Original source identity and content commitment.</summary>
+    [JsonPropertyName("provenance")]
+    public required McpPlanProvenance Provenance { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Explicit reviewed backend selection; no backend is accessed when no secrets are supplied.</summary>
+    [JsonPropertyName("secretStorage")]
+    public required McpInstallationSecretStorage SecretStorage { get; set; }
 
-    /// <summary>IANA timezone for evaluating the cron expression.</summary>
-    [JsonPropertyName("tz")]
-    public string? Tz { get; set; }
+    /// <summary>Only the selected alternative is applied.</summary>
+    [JsonPropertyName("selectedChoice")]
+    public required McpPlanTransportChoice SelectedChoice { get; set; }
+
+    /// <summary>Exact reviewed placeholders supplied separately. Never secret values.</summary>
+    [JsonPropertyName("suppliedSecrets")]
+    public required IList<string> SuppliedSecrets { get; set; }
+
+    /// <summary>Exact reviewed user-scope destination.</summary>
+    [JsonPropertyName("target")]
+    public required McpPlanTarget Target { get; set; }
 }
 
-/// <summary>Register an absolute-time scheduled prompt.</summary>
+/// <summary>The <c>uninstall</c> variant of <see cref="McpInstallationReview"/>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class ScheduleAddAtRequest
+public partial class McpInstallationReviewUninstall : McpInstallationReview
 {
-    /// <summary>Epoch milliseconds when the prompt should fire.</summary>
-    [JsonPropertyName("at")]
-    public long At { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Action => "uninstall";
 
-    /// <summary>Optional display-only prompt label.</summary>
-    [JsonPropertyName("displayPrompt")]
-    public string? DisplayPrompt { get; set; }
+    /// <summary>Identity from the installed receipt.</summary>
+    [JsonPropertyName("identity")]
+    public required McpPlanResourceIdentity Identity { get; set; }
 
-    /// <summary>Prompt text to enqueue when the schedule fires.</summary>
-    [JsonPropertyName("prompt")]
-    public string Prompt { get; set; } = string.Empty;
+    /// <summary>Receipt-owned installation being removed.</summary>
+    [JsonPropertyName("installationId")]
+    public required string InstallationId { get; set; }
 
-    /// <summary>Whether the schedule should re-arm after each tick. Defaults to false.</summary>
-    [JsonPropertyName("recurring")]
-    public bool? Recurring { get; set; }
+    /// <summary>Exact planner-owned secret slots to remove, excluding shared OAuth grants.</summary>
+    [JsonPropertyName("ownedSecretCount")]
+    public required long OwnedSecretCount { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Current removal policy, independent of permission to activate the server.</summary>
+    [JsonPropertyName("policy")]
+    public required McpPlanPolicyResult Policy { get; set; }
 
-/// <summary>Register a self-paced scheduled prompt.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class ScheduleAddSelfPacedRequest
-{
-    /// <summary>Optional display-only prompt label.</summary>
-    [JsonPropertyName("displayPrompt")]
-    public string? DisplayPrompt { get; set; }
+    /// <summary>Shared profile authentication is deliberately retained, not pending cleanup.</summary>
+    [JsonPropertyName("preservesSharedAuthentication")]
+    public required bool PreservesSharedAuthentication { get; set; }
 
-    /// <summary>Prompt text to enqueue when the schedule fires.</summary>
-    [JsonPropertyName("prompt")]
-    public string Prompt { get; set; } = string.Empty;
+    /// <summary>Source identity and content commitment retained by the installed receipt.</summary>
+    [JsonPropertyName("provenance")]
+    public required McpPlanProvenance Provenance { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Whether uninstall restores a protected pre-install configuration.</summary>
+    [JsonPropertyName("restoresPreviousConfiguration")]
+    public required bool RestoresPreviousConfiguration { get; set; }
+
+    /// <summary>Exact destination, checked for intervening changes before mutation.</summary>
+    [JsonPropertyName("target")]
+    public required McpPlanTarget Target { get; set; }
 }
 
-/// <summary>Re-arm a self-paced scheduled prompt.</summary>
+/// <summary>The <c>mcp</c> variant of <see cref="InstallationReview"/>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class ScheduleRearmSelfPacedRequest
+public partial class InstallationReviewMcp : InstallationReview
 {
-    /// <summary>Epoch milliseconds when the prompt should next fire.</summary>
-    [JsonPropertyName("at")]
-    public long At { get; set; }
-
-    /// <summary>Id of the self-paced scheduled prompt.</summary>
-    [JsonPropertyName("id")]
-    public long Id { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Resource => "mcp";
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>The exact MCP action and its reviewed changes.</summary>
+    [JsonPropertyName("review")]
+    public required McpInstallationReview Review { get; set; }
 }
 
-/// <summary>Remove a scheduled prompt by id. The result entry is omitted if the id was unknown.</summary>
+/// <summary>The <c>skill</c> variant of <see cref="InstallationReview"/>.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ScheduleStopResult
+public partial class InstallationReviewSkill : InstallationReview
 {
-    /// <summary>The removed entry, or omitted if no entry matched.</summary>
-    [JsonPropertyName("entry")]
-    public ScheduleEntry? Entry { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Resource => "skill";
+
+    /// <summary>The exact verified Skill action and its reviewed files.</summary>
+    [JsonPropertyName("review")]
+    public required SkillInstallationReview Review { get; set; }
 }
 
-/// <summary>Identifier of the scheduled prompt to remove.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed class ScheduleStopRequest
+/// <summary>One connection-owned, expiring request for a trusted host's explicit user decision.</summary>
+public sealed class InstallationsConfirmRequest
 {
-    /// <summary>Id of the scheduled prompt to remove.</summary>
-    [JsonPropertyName("id")]
-    public long Id { get; set; }
+    /// <summary>Opaque one-use challenge. Return unchanged; never log or persist.</summary>
+    [JsonPropertyName("confirmationId")]
+    public string ConfirmationId { get; set; } = string.Empty;
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Original plan expiry as an ISO 8601 timestamp. Confirmation never extends it.</summary>
+    [JsonPropertyName("expiresAt")]
+    public string ExpiresAt { get; set; } = string.Empty;
 
-/// <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(global::GitHub.Copilot.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>Random identifier of this installation operation, not a plan handle.</summary>
+    [JsonPropertyName("operationId")]
+    public string OperationId { get; set; } = string.Empty;
 
-/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
-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>
+    /// Original engine-resolved selector for a bound operation, never a dispatch default.
+    /// Bound MCP confirmation always includes it; correlate it with the original pending action.
+    /// </summary>
+    [JsonPropertyName("policySessionId")]
+    public string? PolicySessionId { get; set; }
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Resource-specific review to present before collecting the user's decision.</summary>
+    [JsonPropertyName("review")]
+    public InstallationReview Review { get => field ??= new(); set; }
 
-/// <summary>Result returned by an extension workflow closure.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class WorkflowExecuteResult
-{
-    /// <summary>Workflow result value.</summary>
-    [JsonPropertyName("result")]
-    public JsonElement? Result { get; set; }
+    /// <summary>Opaque commitment to the exact review and inputs. Return unchanged; never log.</summary>
+    [JsonPropertyName("reviewFingerprint")]
+    public string ReviewFingerprint { get; set; } = string.Empty;
 }
 
-/// <summary>Parameters sent to the owning extension to execute a workflow closure.</summary>
+/// <summary>Closed set of public task kinds a connection can negotiate.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class WorkflowExecuteRequest
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct TaskKind : IEquatable<TaskKind>
 {
-    /// <summary>Workflow input value.</summary>
-    [JsonPropertyName("args")]
-    public JsonElement Args { get; set; }
+    private readonly string? _value;
 
-    /// <summary>Opaque token identifying this workflow execution attempt.</summary>
-    [JsonPropertyName("executionToken")]
-    public string ExecutionToken { get; set; } = string.Empty;
+    /// <summary>Initializes a new instance of the <see cref="TaskKind"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="TaskKind"/>.</param>
+    [JsonConstructor]
+    public TaskKind(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
 
-    /// <summary>Registered workflow name.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Gets the value associated with this <see cref="TaskKind"/>.</summary>
+    public string Value => _value ?? string.Empty;
 
-    /// <summary>Workflow run identifier.</summary>
-    [JsonPropertyName("runId")]
-    public string RunId { get; set; } = string.Empty;
+    /// <summary>Runtime-owned background agent task.</summary>
+    public static TaskKind Agent { get; } = new("agent");
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Runtime-owned shell task.</summary>
+    public static TaskKind Shell { get; } = new("shell");
 
-/// <summary>Parameters for cooperatively aborting a workflow body.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class WorkflowAbortRequest
-{
-    /// <summary>Opaque token identifying the execution attempt to abort.</summary>
-    [JsonPropertyName("executionToken")]
-    public string ExecutionToken { get; set; } = string.Empty;
+    /// <summary>Client-owned externally executed task.</summary>
+    public static TaskKind Client { get; } = new("client");
 
-    /// <summary>Workflow run identifier.</summary>
-    [JsonPropertyName("runId")]
-    public string RunId { get; set; } = string.Empty;
+    /// <summary>Returns a value indicating whether two <see cref="TaskKind"/> instances are equivalent.</summary>
+    public static bool operator ==(TaskKind left, TaskKind 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="TaskKind"/> instances are not equivalent.</summary>
+    public static bool operator !=(TaskKind left, TaskKind right) => !(left == right);
 
-/// <summary>Whether the client authoritatively confirmed its external work stopped.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ClientTaskCancelResult
-{
-    /// <summary>True only when the owner confirms that external work stopped before responding.</summary>
-    [JsonPropertyName("cancelled")]
-    public bool Cancelled { get; set; }
-}
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is TaskKind other && Equals(other);
 
-/// <summary>Runtime-to-owner cancellation request for a client-owned task.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ClientTaskCancelRequest
-{
-    /// <summary>Opaque identifier shared by coalesced cancellation callers.</summary>
-    [JsonPropertyName("cancellationId")]
-    public string CancellationId { get; set; } = string.Empty;
+    /// <inheritdoc />
+    public bool Equals(TaskKind other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
-    /// <summary>Owner-scoped task key included for correlation.</summary>
-    [JsonPropertyName("clientTaskId")]
-    public string ClientTaskId { get; set; } = string.Empty;
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
 
-    /// <summary>Canonical runtime-generated task identifier.</summary>
-    [JsonPropertyName("id")]
-    public string Id { get; set; } = string.Empty;
+    /// <inheritdoc />
+    public override string ToString() => Value;
 
-    /// <summary>Reason the runtime requests cancellation.</summary>
-    [JsonPropertyName("reason")]
-    public ClientTaskCancelReason Reason { get; set; }
+    /// <summary>Provides a <see cref="JsonConverter{TaskKind}"/> for serializing <see cref="TaskKind"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<TaskKind>
+    {
+        /// <inheritdoc />
+        public override TaskKind Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
 
-    /// <summary>Session that owns the client task.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, TaskKind value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(TaskKind));
+        }
+    }
 }
 
-/// <summary>Describes a filesystem error.</summary>
+
+/// <summary>State of the persistent certificate authority of the sandbox credential proxy.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionFsError
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct SandboxProxyCaState : IEquatable<SandboxProxyCaState>
 {
-    /// <summary>Error classification.</summary>
-    [JsonPropertyName("code")]
-    public SessionFsErrorCode Code { get; set; }
+    private readonly string? _value;
 
-    /// <summary>Free-form detail about the error, for logging/diagnostics.</summary>
-    [JsonPropertyName("message")]
-    public string? Message { get; set; }
+    /// <summary>Initializes a new instance of the <see cref="SandboxProxyCaState"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="SandboxProxyCaState"/>.</param>
+    [JsonConstructor]
+    public SandboxProxyCaState(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
 
-    /// <summary>For failed writeFile requests only: true if the provider changed the target before failing. Omit when unknown or unchanged.</summary>
-    [JsonPropertyName("writeChanged")]
-    public bool? WriteChanged { get; set; }
-}
+    /// <summary>Gets the value associated with this <see cref="SandboxProxyCaState"/>.</summary>
+    public string Value => _value ?? string.Empty;
 
-/// <summary>File content as a UTF-8 string, or a filesystem error if the read failed.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionFsReadFileResult
-{
-    /// <summary>File content as UTF-8 string.</summary>
-    [JsonPropertyName("content")]
-    public string Content { get; set; } = string.Empty;
+    /// <summary>This platform has no supported OS trust store. The proxy uses a per-process certificate bundle.</summary>
+    public static SandboxProxyCaState Unsupported { get; } = new("unsupported");
 
-    /// <summary>Describes a filesystem error.</summary>
-    [JsonPropertyName("error")]
-    public SessionFsError? Error { get; set; }
-}
+    /// <summary>OS trust does not include the certificate authority, or none is stored.</summary>
+    public static SandboxProxyCaState NotInstalled { get; } = new("notInstalled");
 
-/// <summary>Path of the file to read from the client-provided session filesystem.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionFsReadFileRequest
-{
-    /// <summary>Path using SessionFs conventions.</summary>
-    [JsonPropertyName("path")]
-    public string Path { get; set; } = string.Empty;
+    /// <summary>OS trust includes the stored certificate authority.</summary>
+    public static SandboxProxyCaState Installed { get; } = new("installed");
+
+    /// <summary>The runtime could not read the certificate authority or the OS trust store.</summary>
+    public static SandboxProxyCaState Error { get; } = new("error");
+
+    /// <summary>Returns a value indicating whether two <see cref="SandboxProxyCaState"/> instances are equivalent.</summary>
+    public static bool operator ==(SandboxProxyCaState left, SandboxProxyCaState right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="SandboxProxyCaState"/> instances are not equivalent.</summary>
+    public static bool operator !=(SandboxProxyCaState left, SandboxProxyCaState right) => !(left == right);
+
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is SandboxProxyCaState other && Equals(other);
+
+    /// <inheritdoc />
+    public bool Equals(SandboxProxyCaState 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{SandboxProxyCaState}"/> for serializing <see cref="SandboxProxyCaState"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<SandboxProxyCaState>
+    {
+        /// <inheritdoc />
+        public override SandboxProxyCaState 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, SandboxProxyCaState value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SandboxProxyCaState));
+        }
+    }
 }
 
-/// <summary>File bytes as standard base64, or a filesystem error if the read failed.</summary>
+
+/// <summary>What the one-time staff update-channel migration did.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionFsReadFileBytesResult
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct StaffUpdateChannelMigrationStatus : IEquatable<StaffUpdateChannelMigrationStatus>
 {
-    /// <summary>Exact file bytes encoded as standard base64.</summary>
-    [JsonPropertyName("content")]
-    public string Content { get; set; } = string.Empty;
+    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="StaffUpdateChannelMigrationStatus"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="StaffUpdateChannelMigrationStatus"/>.</param>
+    [JsonConstructor]
+    public StaffUpdateChannelMigrationStatus(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
 
-/// <summary>Path of the binary file to read from the client-provided session filesystem.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionFsReadFileBytesRequest
-{
-    /// <summary>Path using SessionFs conventions.</summary>
-    [JsonPropertyName("path")]
-    public string Path { get; set; } = string.Empty;
+    /// <summary>Gets the value associated with this <see cref="StaffUpdateChannelMigrationStatus"/>.</summary>
+    public string Value => _value ?? string.Empty;
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>The account is not a staff account, so the migration does not apply and nothing was recorded.</summary>
+    public static StaffUpdateChannelMigrationStatus Ineligible { get; } = new("ineligible");
 
-/// <summary>File path, content to write, and optional mode for the client-provided session filesystem.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionFsWriteFileRequest
-{
-    /// <summary>Content to write.</summary>
-    [JsonPropertyName("content")]
-    public string Content { get; set; } = string.Empty;
+    /// <summary>The migration already ran within the cutoff window; the stored completion timestamp is returned unchanged.</summary>
+    public static StaffUpdateChannelMigrationStatus Current { get; } = new("current");
 
-    /// <summary>Optional POSIX-style mode for newly created files.</summary>
-    [JsonPropertyName("mode")]
-    public long? Mode { get; set; }
+    /// <summary>The persisted update channel was changed to stable. Only this outcome requires the host to reload its configuration.</summary>
+    public static StaffUpdateChannelMigrationStatus Migrated { get; } = new("migrated");
 
-    /// <summary>Path using SessionFs conventions.</summary>
-    [JsonPropertyName("path")]
-    public string Path { get; set; } = string.Empty;
+    /// <summary>The persisted channel was already stable, so nothing changed, but the migration is now recorded as done.</summary>
+    public static StaffUpdateChannelMigrationStatus Completed { get; } = new("completed");
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>The account is on the experimental channel, which the migration deliberately leaves alone, and the migration is recorded as done.</summary>
+    public static StaffUpdateChannelMigrationStatus ExcludedExperimental { get; } = new("excluded-experimental");
 
-/// <summary>File path, standard-base64-encoded bytes to write, and optional mode for the client-provided session filesystem.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionFsWriteFileBytesRequest
-{
-    /// <summary>Exact file bytes encoded as standard base64.</summary>
-    [JsonPropertyName("content")]
-    public string Content { get; set; } = string.Empty;
+    /// <summary>Returns a value indicating whether two <see cref="StaffUpdateChannelMigrationStatus"/> instances are equivalent.</summary>
+    public static bool operator ==(StaffUpdateChannelMigrationStatus left, StaffUpdateChannelMigrationStatus 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="StaffUpdateChannelMigrationStatus"/> instances are not equivalent.</summary>
+    public static bool operator !=(StaffUpdateChannelMigrationStatus left, StaffUpdateChannelMigrationStatus 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 StaffUpdateChannelMigrationStatus other && Equals(other);
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <inheritdoc />
+    public bool Equals(StaffUpdateChannelMigrationStatus other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
-/// <summary>File path, content to append, and optional mode for the client-provided session filesystem. Implementations create parent directories as needed.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionFsAppendFileRequest
-{
-    /// <summary>Content to append.</summary>
-    [JsonPropertyName("content")]
-    public string Content { get; set; } = string.Empty;
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
 
-    /// <summary>Optional POSIX-style mode for newly created files.</summary>
-    [JsonPropertyName("mode")]
-    public long? Mode { get; set; }
+    /// <inheritdoc />
+    public override string ToString() => Value;
 
-    /// <summary>Path using SessionFs conventions.</summary>
-    [JsonPropertyName("path")]
-    public string Path { get; set; } = string.Empty;
+    /// <summary>Provides a <see cref="JsonConverter{StaffUpdateChannelMigrationStatus}"/> for serializing <see cref="StaffUpdateChannelMigrationStatus"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<StaffUpdateChannelMigrationStatus>
+    {
+        /// <inheritdoc />
+        public override StaffUpdateChannelMigrationStatus 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, StaffUpdateChannelMigrationStatus value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(StaffUpdateChannelMigrationStatus));
+        }
+    }
 }
 
-/// <summary>Indicates whether the requested path exists in the client-provided session filesystem.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionFsExistsResult
-{
-    /// <summary>Whether the path exists.</summary>
-    [JsonPropertyName("exists")]
-    public bool Exists { get; set; }
-}
 
-/// <summary>Path to test for existence in the client-provided session filesystem.</summary>
+/// <summary>What the one-time staff log-level migration did.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionFsExistsRequest
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct StaffLogLevelMigrationStatus : IEquatable<StaffLogLevelMigrationStatus>
 {
-    /// <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="StaffLogLevelMigrationStatus"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="StaffLogLevelMigrationStatus"/>.</param>
+    [JsonConstructor]
+    public StaffLogLevelMigrationStatus(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
 
-/// <summary>Filesystem metadata for the requested path, or a filesystem error if the stat failed.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionFsStatResult
-{
-    /// <summary>ISO 8601 timestamp of creation.</summary>
-    [JsonPropertyName("birthtime")]
-    public DateTimeOffset Birthtime { get; set; }
+    /// <summary>Gets the value associated with this <see cref="StaffLogLevelMigrationStatus"/>.</summary>
+    public string Value => _value ?? string.Empty;
 
-    /// <summary>Describes a filesystem error.</summary>
-    [JsonPropertyName("error")]
-    public SessionFsError? Error { get; set; }
+    /// <summary>The account is not a staff account, so the migration does not apply and nothing was recorded.</summary>
+    public static StaffLogLevelMigrationStatus Ineligible { get; } = new("ineligible");
 
-    /// <summary>Whether the path is a directory.</summary>
-    [JsonPropertyName("isDirectory")]
-    public bool IsDirectory { get; set; }
+    /// <summary>The migration already ran; the stored completion timestamp is returned unchanged.</summary>
+    public static StaffLogLevelMigrationStatus Current { get; } = new("current");
 
-    /// <summary>Whether the path is a file.</summary>
-    [JsonPropertyName("isFile")]
-    public bool IsFile { get; set; }
+    /// <summary>The migration ran now. The persisted settings may have changed, so the host should adopt the returned settings when they are present.</summary>
+    public static StaffLogLevelMigrationStatus Refreshed { get; } = new("refreshed");
 
-    /// <summary>ISO 8601 timestamp of last modification.</summary>
-    [JsonPropertyName("mtime")]
-    public DateTimeOffset Mtime { get; set; }
+    /// <summary>Returns a value indicating whether two <see cref="StaffLogLevelMigrationStatus"/> instances are equivalent.</summary>
+    public static bool operator ==(StaffLogLevelMigrationStatus left, StaffLogLevelMigrationStatus right) => left.Equals(right);
 
-    /// <summary>File size in bytes.</summary>
-    [JsonPropertyName("size")]
-    public long Size { get; set; }
-}
+    /// <summary>Returns a value indicating whether two <see cref="StaffLogLevelMigrationStatus"/> instances are not equivalent.</summary>
+    public static bool operator !=(StaffLogLevelMigrationStatus left, StaffLogLevelMigrationStatus right) => !(left == right);
 
-/// <summary>Path whose metadata should be returned from the client-provided session filesystem.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionFsStatRequest
-{
-    /// <summary>Path using SessionFs conventions.</summary>
-    [JsonPropertyName("path")]
-    public string Path { get; set; } = string.Empty;
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is StaffLogLevelMigrationStatus other && Equals(other);
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <inheritdoc />
+    public bool Equals(StaffLogLevelMigrationStatus other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
-/// <summary>Directory path to create in the client-provided session filesystem, with options for recursive creation and POSIX mode.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionFsMkdirRequest
-{
-    /// <summary>Optional POSIX-style mode for newly created directories.</summary>
-    [JsonPropertyName("mode")]
-    public long? Mode { get; set; }
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
 
-    /// <summary>Path using SessionFs conventions.</summary>
-    [JsonPropertyName("path")]
-    public string Path { get; set; } = string.Empty;
+    /// <inheritdoc />
+    public override string ToString() => Value;
 
-    /// <summary>Create parent directories as needed.</summary>
-    [JsonPropertyName("recursive")]
-    public bool? Recursive { get; set; }
+    /// <summary>Provides a <see cref="JsonConverter{StaffLogLevelMigrationStatus}"/> for serializing <see cref="StaffLogLevelMigrationStatus"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<StaffLogLevelMigrationStatus>
+    {
+        /// <inheritdoc />
+        public override StaffLogLevelMigrationStatus 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, StaffLogLevelMigrationStatus value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(StaffLogLevelMigrationStatus));
+        }
+    }
 }
 
-/// <summary>Names of entries in the requested directory, or a filesystem error if the read failed.</summary>
+
+/// <summary>What the one-time obsolete-settings cleanup did to the document.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionFsReaddirResult
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct UserSettingsMigrateObsoleteOnDiskStatus : IEquatable<UserSettingsMigrateObsoleteOnDiskStatus>
 {
-    /// <summary>Entry names in the directory.</summary>
-    [JsonPropertyName("entries")]
-    public IList<string> Entries { get => field ??= []; 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="UserSettingsMigrateObsoleteOnDiskStatus"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="UserSettingsMigrateObsoleteOnDiskStatus"/>.</param>
+    [JsonConstructor]
+    public UserSettingsMigrateObsoleteOnDiskStatus(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
 
-/// <summary>Directory path whose entries should be listed from the client-provided session filesystem.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionFsReaddirRequest
-{
-    /// <summary>Path using SessionFs conventions.</summary>
-    [JsonPropertyName("path")]
-    public string Path { get; set; } = string.Empty;
+    /// <summary>Gets the value associated with this <see cref="UserSettingsMigrateObsoleteOnDiskStatus"/>.</summary>
+    public string Value => _value ?? string.Empty;
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>No settings document exists, so there was nothing to clean.</summary>
+    public static UserSettingsMigrateObsoleteOnDiskStatus Missing { get; } = new("missing");
 
-/// <summary>Directory entry returned by session filesystem `readdirWithTypes`, with name and entry type.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionFsReaddirWithTypesEntry
-{
-    /// <summary>Entry name.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>The document could not be parsed, so it was left untouched rather than rewritten from a partial read.</summary>
+    public static UserSettingsMigrateObsoleteOnDiskStatus Invalid { get; } = new("invalid");
 
-    /// <summary>Entry type.</summary>
-    [JsonPropertyName("type")]
-    public SessionFsReaddirWithTypesEntryType Type { get; set; }
-}
+    /// <summary>The document parsed and held nothing obsolete, so nothing was written.</summary>
+    public static UserSettingsMigrateObsoleteOnDiskStatus Unchanged { get; } = new("unchanged");
 
-/// <summary>Entries in the requested directory paired with file/directory type information, or a filesystem error if the read failed.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionFsReaddirWithTypesResult
-{
-    /// <summary>Directory entries with type information.</summary>
-    [JsonPropertyName("entries")]
-    public IList<SessionFsReaddirWithTypesEntry> Entries { get => field ??= []; set; }
+    /// <summary>Obsolete keys were removed and the document was rewritten.</summary>
+    public static UserSettingsMigrateObsoleteOnDiskStatus Changed { get; } = new("changed");
 
-    /// <summary>Describes a filesystem error.</summary>
-    [JsonPropertyName("error")]
-    public SessionFsError? Error { get; set; }
-}
+    /// <summary>Returns a value indicating whether two <see cref="UserSettingsMigrateObsoleteOnDiskStatus"/> instances are equivalent.</summary>
+    public static bool operator ==(UserSettingsMigrateObsoleteOnDiskStatus left, UserSettingsMigrateObsoleteOnDiskStatus right) => left.Equals(right);
 
-/// <summary>Directory path whose entries (with type information) should be listed from the client-provided session filesystem.</summary>
-[Experimental(global::GitHub.Copilot.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="UserSettingsMigrateObsoleteOnDiskStatus"/> instances are not equivalent.</summary>
+    public static bool operator !=(UserSettingsMigrateObsoleteOnDiskStatus left, UserSettingsMigrateObsoleteOnDiskStatus 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 UserSettingsMigrateObsoleteOnDiskStatus other && Equals(other);
 
-/// <summary>Path to remove from the client-provided session filesystem, with options for recursive removal and force.</summary>
-[Experimental(global::GitHub.Copilot.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(UserSettingsMigrateObsoleteOnDiskStatus 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{UserSettingsMigrateObsoleteOnDiskStatus}"/> for serializing <see cref="UserSettingsMigrateObsoleteOnDiskStatus"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<UserSettingsMigrateObsoleteOnDiskStatus>
+    {
+        /// <inheritdoc />
+        public override UserSettingsMigrateObsoleteOnDiskStatus Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, UserSettingsMigrateObsoleteOnDiskStatus value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(UserSettingsMigrateObsoleteOnDiskStatus));
+        }
+    }
 }
 
-/// <summary>Source and destination paths for renaming or moving an entry in the client-provided session filesystem.</summary>
+
+/// <summary>Whether one atomic settings edit changed a file.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionFsRenameRequest
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct SettingsEditStatus : IEquatable<SettingsEditStatus>
 {
-    /// <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="SettingsEditStatus"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="SettingsEditStatus"/>.</param>
+    [JsonConstructor]
+    public SettingsEditStatus(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="SettingsEditStatus"/>.</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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionFsSqliteQueryResult
-{
-    /// <summary>Column names from the result set.</summary>
-    [JsonPropertyName("columns")]
-    public IList<string> Columns { get => field ??= []; set; }
+    /// <summary>The edit changed the setting and was stored.</summary>
+    public static SettingsEditStatus Changed { get; } = new("changed");
 
-    /// <summary>Describes a filesystem error.</summary>
-    [JsonPropertyName("error")]
-    public SessionFsError? Error { get; set; }
+    /// <summary>The setting already had the requested state.</summary>
+    public static SettingsEditStatus Unchanged { get; } = new("unchanged");
 
-    /// <summary>SQLite last_insert_rowid() value for INSERT.</summary>
-    [JsonPropertyName("lastInsertRowid")]
-    public long? LastInsertRowid { get; set; }
+    /// <summary>The existing settings file could not be edited safely; nothing was written.</summary>
+    public static SettingsEditStatus Invalid { get; } = new("invalid");
 
-    /// <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="SettingsEditStatus"/> instances are equivalent.</summary>
+    public static bool operator ==(SettingsEditStatus left, SettingsEditStatus 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="SettingsEditStatus"/> instances are not equivalent.</summary>
+    public static bool operator !=(SettingsEditStatus left, SettingsEditStatus 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(global::GitHub.Copilot.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 SettingsEditStatus other && Equals(other);
 
-    /// <summary>SQL query to execute.</summary>
-    [JsonPropertyName("query")]
-    public string Query { get; set; } = string.Empty;
+    /// <inheritdoc />
+    public bool Equals(SettingsEditStatus 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>Classified SQLite transaction failure. busyOrLocked guarantees rollback; postCommitAmbiguous must never be retried.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionFsSqliteTransactionError
-{
-    /// <summary>Machine-readable classification of the transaction failure.</summary>
-    [JsonPropertyName("errorClass")]
-    public SessionFsSqliteTransactionErrorClass ErrorClass { get; set; }
+    /// <summary>Provides a <see cref="JsonConverter{SettingsEditStatus}"/> for serializing <see cref="SettingsEditStatus"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<SettingsEditStatus>
+    {
+        /// <inheritdoc />
+        public override SettingsEditStatus Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
 
-    /// <summary>Human-readable transaction failure message.</summary>
-    [JsonPropertyName("message")]
-    public string Message { get; set; } = string.Empty;
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, SettingsEditStatus value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SettingsEditStatus));
+        }
+    }
 }
 
-/// <summary>Per-statement results, or a classified transaction error.</summary>
+
+/// <summary>One atomic settings mutation.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionFsSqliteTransactionResult
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct SettingsEditOperation : IEquatable<SettingsEditOperation>
 {
-    /// <summary>Classified transaction failure, when execution did not succeed.</summary>
-    [JsonPropertyName("error")]
-    public SessionFsSqliteTransactionError? Error { get; set; }
+    private readonly string? _value;
 
-    /// <summary>Per-statement query results in input order.</summary>
-    [JsonPropertyName("results")]
-    public IList<SessionFsSqliteQueryResult> Results { get => field ??= []; set; }
-}
+    /// <summary>Initializes a new instance of the <see cref="SettingsEditOperation"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="SettingsEditOperation"/>.</param>
+    [JsonConstructor]
+    public SettingsEditOperation(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
 
-/// <summary>One statement in an atomic SQLite transaction.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionFsSqliteTransactionStatement
-{
-    /// <summary>Optional named bind parameters.</summary>
-    [JsonPropertyName("params")]
-    public IDictionary<string, JsonElement>? Params { get; set; }
+    /// <summary>Gets the value associated with this <see cref="SettingsEditOperation"/>.</summary>
+    public string Value => _value ?? string.Empty;
 
-    /// <summary>SQL statement to execute.</summary>
-    [JsonPropertyName("query")]
-    public string Query { get; set; } = string.Empty;
+    /// <summary>Set one scalar value.</summary>
+    public static SettingsEditOperation Set { get; } = new("set");
 
-    /// <summary>How to execute the statement.</summary>
-    [JsonPropertyName("queryType")]
-    public SessionFsSqliteQueryType QueryType { get; set; }
-}
+    /// <summary>Add one string to a list, unless present.</summary>
+    public static SettingsEditOperation AddItem { get; } = new("add-item");
 
-/// <summary>Statements to execute atomically. Providers apply busy handling for every call.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionFsSqliteTransactionRequest
-{
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
+    /// <summary>Remove one string from a list, unless absent.</summary>
+    public static SettingsEditOperation RemoveItem { get; } = new("remove-item");
 
-    /// <summary>Ordered SQL statements to execute in one transaction.</summary>
-    [JsonPropertyName("statements")]
-    public IList<SessionFsSqliteTransactionStatement> Statements { get => field ??= []; set; }
-}
+    /// <summary>Remove the setting without supplying a value.</summary>
+    public static SettingsEditOperation Remove { get; } = new("remove");
 
-/// <summary>Indicates whether the per-session SQLite database already exists.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class SessionFsSqliteExistsResult
-{
-    /// <summary>Whether the session database already exists.</summary>
-    [JsonPropertyName("exists")]
-    public bool Exists { get; set; }
-}
+    /// <summary>Returns a value indicating whether two <see cref="SettingsEditOperation"/> instances are equivalent.</summary>
+    public static bool operator ==(SettingsEditOperation left, SettingsEditOperation right) => left.Equals(right);
 
-/// <summary>Identifies the target session.</summary>
-public sealed class SessionFsSqliteExistsRequest
-{
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Returns a value indicating whether two <see cref="SettingsEditOperation"/> instances are not equivalent.</summary>
+    public static bool operator !=(SettingsEditOperation left, SettingsEditOperation right) => !(left == right);
 
-/// <summary>Canvas open result returned by the provider.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class CanvasProviderOpenResult
-{
-    /// <summary>Provider-supplied status text.</summary>
-    [JsonPropertyName("status")]
-    public string? Status { get; set; }
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is SettingsEditOperation other && Equals(other);
 
-    /// <summary>Provider-supplied title.</summary>
-    [JsonPropertyName("title")]
-    public string? Title { get; set; }
+    /// <inheritdoc />
+    public bool Equals(SettingsEditOperation other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
-    /// <summary>URL for web-rendered canvases.</summary>
-    [JsonPropertyName("url")]
-    public string? Url { get; set; }
-}
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
 
-/// <summary>Host capabilities.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class CanvasHostContextCapabilities
-{
-    /// <summary>Whether canvas rendering is supported.</summary>
-    [JsonPropertyName("canvases")]
-    public bool? Canvases { get; set; }
-}
+    /// <inheritdoc />
+    public override string ToString() => Value;
 
-/// <summary>Host context supplied by the runtime.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class CanvasHostContext
-{
-    /// <summary>Host capabilities.</summary>
-    [JsonPropertyName("capabilities")]
-    public CanvasHostContextCapabilities? Capabilities { get; set; }
-}
+    /// <summary>Provides a <see cref="JsonConverter{SettingsEditOperation}"/> for serializing <see cref="SettingsEditOperation"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<SettingsEditOperation>
+    {
+        /// <inheritdoc />
+        public override SettingsEditOperation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
 
-/// <summary>Session context supplied by the runtime.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class CanvasSessionContext
-{
-    /// <summary>Active session working directory, when known.</summary>
-    [JsonPropertyName("workingDirectory")]
-    public string? WorkingDirectory { get; set; }
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, SettingsEditOperation value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SettingsEditOperation));
+        }
+    }
 }
 
-/// <summary>Canvas open parameters sent to the provider.</summary>
+
+/// <summary>Which repository settings file to edit.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class CanvasProviderOpenRequest
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct RepoSettingsEditScope : IEquatable<RepoSettingsEditScope>
 {
-    /// <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="RepoSettingsEditScope"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="RepoSettingsEditScope"/>.</param>
+    [JsonConstructor]
+    public RepoSettingsEditScope(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="RepoSettingsEditScope"/>.</summary>
+    public string Value => _value ?? string.Empty;
 
-    /// <summary>Canvas open input.</summary>
-    [JsonPropertyName("input")]
-    public JsonElement? Input { get; set; }
+    /// <summary>The shared repository settings file.</summary>
+    public static RepoSettingsEditScope Repo { get; } = new("repo");
 
-    /// <summary>Stable caller-supplied canvas instance identifier.</summary>
-    [JsonPropertyName("instanceId")]
-    public string InstanceId { get; set; } = string.Empty;
+    /// <summary>The local repository settings file.</summary>
+    public static RepoSettingsEditScope Local { get; } = new("local");
 
-    /// <summary>Session context supplied by the runtime.</summary>
-    [JsonPropertyName("session")]
-    public CanvasSessionContext? Session { get; set; }
+    /// <summary>Returns a value indicating whether two <see cref="RepoSettingsEditScope"/> instances are equivalent.</summary>
+    public static bool operator ==(RepoSettingsEditScope left, RepoSettingsEditScope 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="RepoSettingsEditScope"/> instances are not equivalent.</summary>
+    public static bool operator !=(RepoSettingsEditScope left, RepoSettingsEditScope right) => !(left == right);
 
-/// <summary>Canvas close parameters sent to the provider.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class CanvasProviderCloseRequest
-{
-    /// <summary>Provider-local canvas identifier.</summary>
-    [JsonPropertyName("canvasId")]
-    public string CanvasId { get; set; } = string.Empty;
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is RepoSettingsEditScope other && Equals(other);
 
-    /// <summary>Owning provider identifier.</summary>
-    [JsonPropertyName("extensionId")]
-    public string ExtensionId { get; set; } = string.Empty;
+    /// <inheritdoc />
+    public bool Equals(RepoSettingsEditScope other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
-    /// <summary>Host context supplied by the runtime.</summary>
-    [JsonPropertyName("host")]
-    public CanvasHostContext? Host { get; set; }
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
 
-    /// <summary>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{RepoSettingsEditScope}"/> for serializing <see cref="RepoSettingsEditScope"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<RepoSettingsEditScope>
+    {
+        /// <inheritdoc />
+        public override RepoSettingsEditScope 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, RepoSettingsEditScope value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(RepoSettingsEditScope));
+        }
+    }
 }
 
-/// <summary>Canvas action invocation parameters sent to the provider.</summary>
+
+/// <summary>The population a feature flag is declared for, before overrides.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class CanvasProviderInvokeActionRequest
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct FeatureFlagAvailability : IEquatable<FeatureFlagAvailability>
 {
-    /// <summary>Action name to invoke.</summary>
-    [JsonPropertyName("actionName")]
-    public string ActionName { get; set; } = string.Empty;
+    private readonly string? _value;
 
-    /// <summary>Provider-local canvas identifier.</summary>
-    [JsonPropertyName("canvasId")]
-    public string CanvasId { get; set; } = string.Empty;
+    /// <summary>Initializes a new instance of the <see cref="FeatureFlagAvailability"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="FeatureFlagAvailability"/>.</param>
+    [JsonConstructor]
+    public FeatureFlagAvailability(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
 
-    /// <summary>Owning provider identifier.</summary>
-    [JsonPropertyName("extensionId")]
-    public string ExtensionId { get; set; } = string.Empty;
+    /// <summary>Gets the value associated with this <see cref="FeatureFlagAvailability"/>.</summary>
+    public string Value => _value ?? string.Empty;
 
-    /// <summary>Host context supplied by the runtime.</summary>
-    [JsonPropertyName("host")]
-    public CanvasHostContext? Host { get; set; }
+    /// <summary>Enabled for everyone, before any override.</summary>
+    public static FeatureFlagAvailability On { get; } = new("on");
 
-    /// <summary>Action input.</summary>
-    [JsonPropertyName("input")]
-    public JsonElement? Input { get; set; }
+    /// <summary>Enabled only for accounts on the owning team.</summary>
+    public static FeatureFlagAvailability Team { get; } = new("team");
 
-    /// <summary>Canvas instance identifier.</summary>
-    [JsonPropertyName("instanceId")]
-    public string InstanceId { get; set; } = string.Empty;
+    /// <summary>Enabled only for staff accounts that have also opted into experimental features.</summary>
+    public static FeatureFlagAvailability StaffAndExperimental { get; } = new("staff-and-experimental");
 
-    /// <summary>Session context supplied by the runtime.</summary>
-    [JsonPropertyName("session")]
-    public CanvasSessionContext? Session { get; set; }
+    /// <summary>Enabled for staff accounts and for accounts that opted into experimental features.</summary>
+    public static FeatureFlagAvailability StaffOrExperimental { get; } = new("staff-or-experimental");
 
-    /// <summary>Target session identifier.</summary>
-    [JsonPropertyName("sessionId")]
-    public string SessionId { get; set; } = string.Empty;
-}
+    /// <summary>Enabled for any staff account, GitHub or Microsoft.</summary>
+    public static FeatureFlagAvailability Staff { get; } = new("staff");
 
-/// <summary>Reports a supervised listener's hosting-task termination and cleanup outcome.</summary>
-public sealed class HostExitedRequest
-{
-    /// <summary>Explicit startup or teardown failure, when present.</summary>
-    [JsonPropertyName("error")]
-    public string? Error { get; set; }
+    /// <summary>Enabled for GitHub staff accounts only.</summary>
+    public static FeatureFlagAvailability StaffGitHub { get; } = new("staff-github");
 
-    /// <summary>Process exit status when available; absent for in-process listener tasks.</summary>
-    [JsonPropertyName("exitCode")]
-    public long? ExitCode { get; set; }
+    /// <summary>Enabled for Microsoft staff accounts only.</summary>
+    public static FeatureFlagAvailability StaffMicrosoft { get; } = new("staff-microsoft");
 
-    /// <summary>Listener UUID.</summary>
-    [JsonPropertyName("hostId")]
-    public string HostId { get; set; } = string.Empty;
+    /// <summary>Enabled only for accounts that opted into experimental features.</summary>
+    public static FeatureFlagAvailability Experimental { get; } = new("experimental");
 
-    /// <summary>Cause of termination.</summary>
-    [JsonPropertyName("reason")]
-    public HostExitReason Reason { get; set; }
-}
+    /// <summary>Disabled for everyone, before any override.</summary>
+    public static FeatureFlagAvailability Off { get; } = new("off");
 
-/// <summary>Opaque integrator-owned process launch profile for one extension entrypoint.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-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>Returns a value indicating whether two <see cref="FeatureFlagAvailability"/> instances are equivalent.</summary>
+    public static bool operator ==(FeatureFlagAvailability left, FeatureFlagAvailability right) => left.Equals(right);
 
-    /// <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>Returns a value indicating whether two <see cref="FeatureFlagAvailability"/> instances are not equivalent.</summary>
+    public static bool operator !=(FeatureFlagAvailability left, FeatureFlagAvailability right) => !(left == right);
 
-    /// <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;
-}
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is FeatureFlagAvailability other && Equals(other);
 
-/// <summary>The launch profile for a supported entrypoint. Omit launch when the provider does not support the entrypoint.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ExtensionLaunchProviderResolveResult
-{
-    /// <summary>Opaque launch profile, omitted when this provider does not support the entrypoint.</summary>
-    [JsonPropertyName("launch")]
-    public ExtensionLaunchProfile? Launch { get; set; }
-}
+    /// <inheritdoc />
+    public bool Equals(FeatureFlagAvailability other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
-/// <summary>A discovered extension entrypoint that the registered integrator may classify and resolve to an opaque launch profile.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ExtensionLaunchProviderResolveRequest
-{
-    /// <summary>Source-qualified extension identifier.</summary>
-    [JsonPropertyName("id")]
-    public string Id { get; set; } = string.Empty;
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
 
-    /// <summary>Absolute path to the discovered extension entrypoint.</summary>
-    [JsonPropertyName("modulePath")]
-    public string ModulePath { get; set; } = string.Empty;
+    /// <inheritdoc />
+    public override string ToString() => Value;
 
-    /// <summary>Human-readable extension name.</summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    /// <summary>Provides a <see cref="JsonConverter{FeatureFlagAvailability}"/> for serializing <see cref="FeatureFlagAvailability"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<FeatureFlagAvailability>
+    {
+        /// <inheritdoc />
+        public override FeatureFlagAvailability Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
 
-    /// <summary>Discovery source for the extension entrypoint.</summary>
-    [JsonPropertyName("source")]
-    public ExtensionSource Source { get; set; }
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, FeatureFlagAvailability value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(FeatureFlagAvailability));
+        }
+    }
 }
 
-/// <summary>Acknowledgement. Returning successfully simply means the SDK accepted the start frame; it does not imply the request will succeed.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class LlmInferenceHttpRequestStartResult
-{
-}
 
-/// <summary>The head of an outbound model-layer HTTP request.</summary>
+/// <summary>Which layer disabled bypass-permissions mode. The layer matters because only a server-delivered disable is pinned to an account and can later be lifted by signing in elsewhere.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class LlmInferenceHttpRequestStartRequest
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct ManagedSettingsBypassDisableSource : IEquatable<ManagedSettingsBypassDisableSource>
 {
-    /// <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; }
+    private readonly string? _value;
 
-    /// <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>Initializes a new instance of the <see cref="ManagedSettingsBypassDisableSource"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="ManagedSettingsBypassDisableSource"/>.</param>
+    [JsonConstructor]
+    public ManagedSettingsBypassDisableSource(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
 
-    /// <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>Gets the value associated with this <see cref="ManagedSettingsBypassDisableSource"/>.</summary>
+    public string Value => _value ?? string.Empty;
 
-    /// <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>The user turned bypass mode off themselves.</summary>
+    public static ManagedSettingsBypassDisableSource User { get; } = new("user");
 
-    /// <summary>HTTP method, e.g. GET, POST.</summary>
-    [JsonPropertyName("method")]
-    public string Method { get; set; } = string.Empty;
+    /// <summary>The account's server-delivered org policy disabled it. Pinned to the account named by `currentManagedIdentity`.</summary>
+    public static ManagedSettingsBypassDisableSource Managed { get; } = new("managed");
 
-    /// <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>The device/MDM layer disabled it. Outranks the account, so no server answer lifts it.</summary>
+    public static ManagedSettingsBypassDisableSource Mdm { get; } = new("mdm");
 
-    /// <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>Returns a value indicating whether two <see cref="ManagedSettingsBypassDisableSource"/> instances are equivalent.</summary>
+    public static bool operator ==(ManagedSettingsBypassDisableSource left, ManagedSettingsBypassDisableSource right) => left.Equals(right);
 
-    /// <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>Returns a value indicating whether two <see cref="ManagedSettingsBypassDisableSource"/> instances are not equivalent.</summary>
+    public static bool operator !=(ManagedSettingsBypassDisableSource left, ManagedSettingsBypassDisableSource right) => !(left == right);
 
-    /// <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; }
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is ManagedSettingsBypassDisableSource other && Equals(other);
 
-    /// <summary>Absolute request URL.</summary>
-    [JsonPropertyName("url")]
-    public string Url { get; set; } = string.Empty;
-}
+    /// <inheritdoc />
+    public bool Equals(ManagedSettingsBypassDisableSource other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
-/// <summary>Acknowledgement. The SDK is free to ignore the ack and treat chunk delivery as fire-and-forget.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class LlmInferenceHttpRequestChunkResult
-{
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
+
+    /// <inheritdoc />
+    public override string ToString() => Value;
+
+    /// <summary>Provides a <see cref="JsonConverter{ManagedSettingsBypassDisableSource}"/> for serializing <see cref="ManagedSettingsBypassDisableSource"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<ManagedSettingsBypassDisableSource>
+    {
+        /// <inheritdoc />
+        public override ManagedSettingsBypassDisableSource Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, ManagedSettingsBypassDisableSource value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ManagedSettingsBypassDisableSource));
+        }
+    }
 }
 
-/// <summary>A request body chunk or cancellation signal.</summary>
+
+/// <summary>What the managed-policy resolution said about bypass-permissions mode. `unknown` is a third answer rather than a missing one, and the caller must send it explicitly when it has no verdict.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class LlmInferenceHttpRequestChunkRequest
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct ManagedSettingsBypassPolicyResolution : IEquatable<ManagedSettingsBypassPolicyResolution>
 {
-    /// <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; }
+    private readonly string? _value;
 
-    /// <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>Initializes a new instance of the <see cref="ManagedSettingsBypassPolicyResolution"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="ManagedSettingsBypassPolicyResolution"/>.</param>
+    [JsonConstructor]
+    public ManagedSettingsBypassPolicyResolution(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
 
-    /// <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>Gets the value associated with this <see cref="ManagedSettingsBypassPolicyResolution"/>.</summary>
+    public string Value => _value ?? string.Empty;
 
-    /// <summary>Optional human-readable reason for the cancellation, propagated for logging.</summary>
-    [JsonPropertyName("cancelReason")]
-    public string? CancelReason { get; set; }
+    /// <summary>The policy resolved and does not disable bypass mode.</summary>
+    public static ManagedSettingsBypassPolicyResolution Allowed { get; } = new("allowed");
 
-    /// <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>The policy resolved and disables bypass mode.</summary>
+    public static ManagedSettingsBypassPolicyResolution Disabled { get; } = new("disabled");
 
-    /// <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>No verdict: the fetch failed, or the service declared a policy this build may not enforce. Whatever is in force is preserved, because reverting to permissive on an unreadable policy would widen access.</summary>
+    public static ManagedSettingsBypassPolicyResolution Unknown { get; } = new("unknown");
 
-    /// <summary>Matches the requestId from the originating httpRequestStart frame.</summary>
-    [JsonPropertyName("requestId")]
-    public string RequestId { get; set; } = string.Empty;
+    /// <summary>Returns a value indicating whether two <see cref="ManagedSettingsBypassPolicyResolution"/> instances are equivalent.</summary>
+    public static bool operator ==(ManagedSettingsBypassPolicyResolution left, ManagedSettingsBypassPolicyResolution right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="ManagedSettingsBypassPolicyResolution"/> instances are not equivalent.</summary>
+    public static bool operator !=(ManagedSettingsBypassPolicyResolution left, ManagedSettingsBypassPolicyResolution right) => !(left == right);
+
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is ManagedSettingsBypassPolicyResolution other && Equals(other);
+
+    /// <inheritdoc />
+    public bool Equals(ManagedSettingsBypassPolicyResolution 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{ManagedSettingsBypassPolicyResolution}"/> for serializing <see cref="ManagedSettingsBypassPolicyResolution"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<ManagedSettingsBypassPolicyResolution>
+    {
+        /// <inheritdoc />
+        public override ManagedSettingsBypassPolicyResolution Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, ManagedSettingsBypassPolicyResolution value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ManagedSettingsBypassPolicyResolution));
+        }
+    }
 }
 
-/// <summary>Client environment metadata describing the process that produced a telemetry event.</summary>
+
+/// <summary>Severity of a diagnostic emitted while ingesting managed settings.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class GitHubTelemetryClientInfo
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct ManagedSettingsLogLevel : IEquatable<ManagedSettingsLogLevel>
 {
-    /// <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="ManagedSettingsLogLevel"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="ManagedSettingsLogLevel"/>.</param>
+    [JsonConstructor]
+    public ManagedSettingsLogLevel(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="ManagedSettingsLogLevel"/>.</summary>
+    public string Value => _value ?? string.Empty;
 
-    /// <summary>Copilot subscription plan, when known.</summary>
-    [JsonPropertyName("copilot_plan")]
-    public string? CopilotPlan { get; set; }
+    /// <summary>Detail useful only when diagnosing an ingestion.</summary>
+    public static ManagedSettingsLogLevel Debug { get; } = new("debug");
 
-    /// <summary>Number of logical CPU cores on the host.</summary>
-    [JsonPropertyName("cpu_count")]
-    public long? CpuCount { get; set; }
+    /// <summary>Ordinary progress worth surfacing under a verbose flag.</summary>
+    public static ManagedSettingsLogLevel Info { get; } = new("info");
 
-    /// <summary>Distinct CPU model names for the host, comma-separated.</summary>
-    [JsonPropertyName("cpu_model")]
-    public string? CpuModel { get; set; }
+    /// <summary>A condition the operator should see but which did not stop the ingestion.</summary>
+    public static ManagedSettingsLogLevel Warning { get; } = new("warning");
 
-    /// <summary>Stable machine identifier for the device.</summary>
-    [JsonPropertyName("dev_device_id")]
-    public string? DevDeviceId { get; set; }
+    /// <summary>A failure that changed the outcome of the ingestion.</summary>
+    public static ManagedSettingsLogLevel Error { get; } = new("error");
 
-    /// <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="ManagedSettingsLogLevel"/> instances are equivalent.</summary>
+    public static bool operator ==(ManagedSettingsLogLevel left, ManagedSettingsLogLevel 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="ManagedSettingsLogLevel"/> instances are not equivalent.</summary>
+    public static bool operator !=(ManagedSettingsLogLevel left, ManagedSettingsLogLevel 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 ManagedSettingsLogLevel 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(ManagedSettingsLogLevel 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{ManagedSettingsLogLevel}"/> for serializing <see cref="ManagedSettingsLogLevel"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<ManagedSettingsLogLevel>
+    {
+        /// <inheritdoc />
+        public override ManagedSettingsLogLevel Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, ManagedSettingsLogLevel value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ManagedSettingsLogLevel));
+        }
+    }
 }
 
-/// <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>Which channel registered the policy helper that produced a helper layer.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class GitHubTelemetryEvent
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct ManagedSettingsPolicyHelperAuthority : IEquatable<ManagedSettingsPolicyHelperAuthority>
 {
-    /// <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="ManagedSettingsPolicyHelperAuthority"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="ManagedSettingsPolicyHelperAuthority"/>.</param>
+    [JsonConstructor]
+    public ManagedSettingsPolicyHelperAuthority(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="ManagedSettingsPolicyHelperAuthority"/>.</summary>
+    public string Value => _value ?? string.Empty;
 
-    /// <summary>Experiment assignment context.</summary>
-    [JsonPropertyName("exp_assignment_context")]
-    public string? ExpAssignmentContext { get; set; }
+    /// <summary>The helper was registered by the device (MDM or managed file) layer.</summary>
+    public static ManagedSettingsPolicyHelperAuthority Device { get; } = new("device");
 
-    /// <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>The helper was registered by the account's server-delivered policy.</summary>
+    public static ManagedSettingsPolicyHelperAuthority Server { get; } = new("server");
 
-    /// <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>Returns a value indicating whether two <see cref="ManagedSettingsPolicyHelperAuthority"/> instances are equivalent.</summary>
+    public static bool operator ==(ManagedSettingsPolicyHelperAuthority left, ManagedSettingsPolicyHelperAuthority right) => left.Equals(right);
 
-    /// <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>Returns a value indicating whether two <see cref="ManagedSettingsPolicyHelperAuthority"/> instances are not equivalent.</summary>
+    public static bool operator !=(ManagedSettingsPolicyHelperAuthority left, ManagedSettingsPolicyHelperAuthority 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 ManagedSettingsPolicyHelperAuthority 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(ManagedSettingsPolicyHelperAuthority 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(global::GitHub.Copilot.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{ManagedSettingsPolicyHelperAuthority}"/> for serializing <see cref="ManagedSettingsPolicyHelperAuthority"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<ManagedSettingsPolicyHelperAuthority>
+    {
+        /// <inheritdoc />
+        public override ManagedSettingsPolicyHelperAuthority 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, ManagedSettingsPolicyHelperAuthority value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ManagedSettingsPolicyHelperAuthority));
+        }
+    }
 }
 
-/// <summary>SDK host response to a GitHub credential request.</summary>
-/// <remarks>Polymorphic base type discriminated by <c>kind</c>.</remarks>
+
+/// <summary>How the server layer of an ingestion was resolved.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-[JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "kind",
-    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(GitHubTokenAcquireResultToken), "token")]
-[JsonDerivedType(typeof(GitHubTokenAcquireResultCancelled), "cancelled")]
-public partial class GitHubTokenAcquireResult
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct ManagedSettingsServerPolicyResolution : IEquatable<ManagedSettingsServerPolicyResolution>
 {
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("kind")]
-    public virtual string Kind { get; set; } = string.Empty;
-}
+    private readonly string? _value;
 
+    /// <summary>Initializes a new instance of the <see cref="ManagedSettingsServerPolicyResolution"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="ManagedSettingsServerPolicyResolution"/>.</param>
+    [JsonConstructor]
+    public ManagedSettingsServerPolicyResolution(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
 
-/// <summary>The <c>token</c> variant of <see cref="GitHubTokenAcquireResult"/>.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class GitHubTokenAcquireResultToken : GitHubTokenAcquireResult
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "token";
+    /// <summary>Gets the value associated with this <see cref="ManagedSettingsServerPolicyResolution"/>.</summary>
+    public string Value => _value ?? string.Empty;
 
-    /// <summary>GitHub access token acquired by the SDK host.</summary>
-    [JsonPropertyName("accessToken")]
-    public required string AccessToken { get; set; }
+    /// <summary>A live fetch succeeded.</summary>
+    public static ManagedSettingsServerPolicyResolution Live { get; } = new("live");
 
-    /// <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>A recent cached entry was served without a live fetch.</summary>
+    public static ManagedSettingsServerPolicyResolution FreshCache { get; } = new("freshCache");
 
-    /// <summary>OAuth token type. Defaults to bearer when omitted.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("tokenType")]
-    public string? TokenType { get; set; }
-}
+    /// <summary>No cached policy or confirmed no-policy result exists.</summary>
+    public static ManagedSettingsServerPolicyResolution CacheMiss { get; } = new("cacheMiss");
 
-/// <summary>The <c>cancelled</c> variant of <see cref="GitHubTokenAcquireResult"/>.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class GitHubTokenAcquireResultCancelled : GitHubTokenAcquireResult
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Kind => "cancelled";
-}
+    /// <summary>A live fetch failed and a cached entry was served in its place.</summary>
+    public static ManagedSettingsServerPolicyResolution FallbackCache { get; } = new("fallbackCache");
 
-/// <summary>Asks the SDK client to acquire a GitHub access token from an opaque callback registration.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class GitHubTokenAcquireRequest
-{
-    /// <summary>Effective GitHub host for which the callback must return a token.</summary>
-    [JsonPropertyName("host")]
-    public string Host { get; set; } = string.Empty;
+    /// <summary>No policy could be resolved and the host proceeds unmanaged.</summary>
+    public static ManagedSettingsServerPolicyResolution FailOpen { get; } = new("failOpen");
 
-    /// <summary>Why the runtime is requesting a GitHub credential.</summary>
-    [JsonPropertyName("reason")]
-    public GitHubTokenAcquireReason Reason { get; set; }
+    /// <summary>No policy could be resolved and the host applies the fail-closed gates.</summary>
+    public static ManagedSettingsServerPolicyResolution FailClosed { get; } = new("failClosed");
 
-    /// <summary>Opaque identifier generated by the SDK for this callback registration.</summary>
-    [JsonPropertyName("registrationId")]
-    public string RegistrationId { get; set; } = string.Empty;
+    /// <summary>No fetch was attempted because no usable token was available.</summary>
+    public static ManagedSettingsServerPolicyResolution SkippedNoToken { get; } = new("skippedNoToken");
 
-    /// <summary>Session receiving the token. Absent only before a cloud session has been assigned its id.</summary>
-    [JsonPropertyName("sessionId")]
-    public string? SessionId { get; set; }
-}
+    /// <summary>Returns a value indicating whether two <see cref="ManagedSettingsServerPolicyResolution"/> instances are equivalent.</summary>
+    public static bool operator ==(ManagedSettingsServerPolicyResolution left, ManagedSettingsServerPolicyResolution right) => left.Equals(right);
 
-/// <summary>A response is meaningful only on the connection and request that issued its challenge.</summary>
-public sealed class InstallationsConfirmResult
-{
-    /// <summary>Exact challenge from the request.</summary>
-    [JsonPropertyName("confirmationId")]
-    public string ConfirmationId { get; set; } = string.Empty;
+    /// <summary>Returns a value indicating whether two <see cref="ManagedSettingsServerPolicyResolution"/> instances are not equivalent.</summary>
+    public static bool operator !=(ManagedSettingsServerPolicyResolution left, ManagedSettingsServerPolicyResolution right) => !(left == right);
+
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is ManagedSettingsServerPolicyResolution other && Equals(other);
+
+    /// <inheritdoc />
+    public bool Equals(ManagedSettingsServerPolicyResolution other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
+
+    /// <inheritdoc />
+    public override string ToString() => Value;
 
-    /// <summary>Fresh explicit user decision. There is no default.</summary>
-    [JsonPropertyName("decision")]
-    public InstallationDecision Decision { get; set; }
+    /// <summary>Provides a <see cref="JsonConverter{ManagedSettingsServerPolicyResolution}"/> for serializing <see cref="ManagedSettingsServerPolicyResolution"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<ManagedSettingsServerPolicyResolution>
+    {
+        /// <inheritdoc />
+        public override ManagedSettingsServerPolicyResolution Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
 
-    /// <summary>Exact review commitment from the request.</summary>
-    [JsonPropertyName("reviewFingerprint")]
-    public string ReviewFingerprint { get; set; } = string.Empty;
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, ManagedSettingsServerPolicyResolution value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ManagedSettingsServerPolicyResolution));
+        }
+    }
 }
 
-/// <summary>Only resource kinds with an implemented installation engine have a review variant.</summary>
-/// <remarks>Polymorphic base type discriminated by <c>resource</c>.</remarks>
+
+/// <summary>The operation that requires a policy-helper response.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-[JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "resource",
-    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(InstallationReviewMcp), "mcp")]
-[JsonDerivedType(typeof(InstallationReviewSkill), "skill")]
-public partial class InstallationReview
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct ManagedSettingsPolicyHelperReason : IEquatable<ManagedSettingsPolicyHelperReason>
 {
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("resource")]
-    public virtual string Resource { get; set; } = string.Empty;
-}
+    private readonly string? _value;
 
+    /// <summary>Initializes a new instance of the <see cref="ManagedSettingsPolicyHelperReason"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="ManagedSettingsPolicyHelperReason"/>.</param>
+    [JsonConstructor]
+    public ManagedSettingsPolicyHelperReason(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
 
-/// <summary>Safe MCP review fields. No raw card, retrieval URL, plan handle or secret value.</summary>
-/// <remarks>Polymorphic base type discriminated by <c>action</c>.</remarks>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-[JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "action",
-    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(McpInstallationReviewInstall), "install")]
-[JsonDerivedType(typeof(McpInstallationReviewUninstall), "uninstall")]
-public partial class McpInstallationReview
-{
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("action")]
-    public virtual string Action { get; set; } = string.Empty;
-}
+    /// <summary>Gets the value associated with this <see cref="ManagedSettingsPolicyHelperReason"/>.</summary>
+    public string Value => _value ?? string.Empty;
 
+    /// <summary>Resolve policy for session startup.</summary>
+    public static ManagedSettingsPolicyHelperReason SessionStart { get; } = new("sessionStart");
 
-/// <summary>
-/// Final remote configuration, not a template. The producer refuses external-value
-/// expansion before presenting this review. Receipt-owned secrets appear only as
-/// `${installation-secret:&lt;id&gt;}` references whose `&lt;id&gt;` matches a reviewed
-/// `${secret:&lt;id&gt;}` placeholder; values are never included.
-/// </summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class McpInstallationRemoteConfiguration
-{
-    /// <summary>
-    /// Configured headers, excluding separately authorised OAuth tokens. Values may
-    /// contain owned secret references, never secret values.
-    /// </summary>
-    [JsonPropertyName("headers")]
-    public IDictionary<string, string> Headers { get => field ??= new Dictionary<string, string>(); set; }
+    /// <summary>Resolve policy before plugin activation.</summary>
+    public static ManagedSettingsPolicyHelperReason PluginActivation { get; } = new("pluginActivation");
 
-    /// <summary>Configured tool selection, not permission to invoke those tools.</summary>
-    [JsonPropertyName("tools")]
-    public IList<string> Tools { get => field ??= []; set; }
+    /// <summary>Returns a value indicating whether two <see cref="ManagedSettingsPolicyHelperReason"/> instances are equivalent.</summary>
+    public static bool operator ==(ManagedSettingsPolicyHelperReason left, ManagedSettingsPolicyHelperReason right) => left.Equals(right);
 
-    /// <summary>Transport in the effective persisted remote configuration.</summary>
-    [JsonPropertyName("transport")]
-    public McpPlanRemoteTransport Transport { get; set; }
+    /// <summary>Returns a value indicating whether two <see cref="ManagedSettingsPolicyHelperReason"/> instances are not equivalent.</summary>
+    public static bool operator !=(ManagedSettingsPolicyHelperReason left, ManagedSettingsPolicyHelperReason right) => !(left == right);
 
-    /// <summary>Exact resolved endpoint, without templates or secret placeholders.</summary>
-    [JsonPropertyName("url")]
-    public string Url { get; set; } = string.Empty;
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is ManagedSettingsPolicyHelperReason other && Equals(other);
+
+    /// <inheritdoc />
+    public bool Equals(ManagedSettingsPolicyHelperReason 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{ManagedSettingsPolicyHelperReason}"/> for serializing <see cref="ManagedSettingsPolicyHelperReason"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<ManagedSettingsPolicyHelperReason>
+    {
+        /// <inheritdoc />
+        public override ManagedSettingsPolicyHelperReason Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, ManagedSettingsPolicyHelperReason value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ManagedSettingsPolicyHelperReason));
+        }
+    }
 }
 
-/// <summary>The <c>install</c> variant of <see cref="McpInstallationReview"/>.</summary>
+
+/// <summary>How an ingestion may use the on-disk server-policy cache.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class McpInstallationReviewInstall : McpInstallationReview
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct ManagedSettingsServerPolicyCacheMode : IEquatable<ManagedSettingsServerPolicyCacheMode>
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Action => "install";
+    private readonly string? _value;
 
-    /// <summary>Catalogue identity retained from the bound candidate when available.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("catalogue")]
-    public InstallationCatalogueIdentity? Catalogue { get; set; }
+    /// <summary>Initializes a new instance of the <see cref="ManagedSettingsServerPolicyCacheMode"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="ManagedSettingsServerPolicyCacheMode"/>.</param>
+    [JsonConstructor]
+    public ManagedSettingsServerPolicyCacheMode(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
 
-    /// <summary>Original catalogue trust metadata, not a verification claim.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("catalogueTrust")]
-    public CatalogTrustSnapshot? CatalogueTrust { get; set; }
+    /// <summary>Gets the value associated with this <see cref="ManagedSettingsServerPolicyCacheMode"/>.</summary>
+    public string Value => _value ?? string.Empty;
 
-    /// <summary>The configuration change for the selected alternative only.</summary>
-    [JsonPropertyName("configurationChange")]
-    public required McpPlanConfigurationChange ConfigurationChange { get; set; }
+    /// <summary>Serve a recent cache entry before a live fetch.</summary>
+    public static ManagedSettingsServerPolicyCacheMode PreferFresh { get; } = new("preferFresh");
 
-    /// <summary>
-    /// Complete effective remote configuration for final installation review.
-    /// Earlier private selection reviews and package choices omit this field.
-    /// The owned remote resource requires it before issuing confirmation.
-    /// </summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("effectiveConfiguration")]
-    public McpInstallationRemoteConfiguration? EffectiveConfiguration { get; set; }
+    /// <summary>Read cached policy without a network request.</summary>
+    public static ManagedSettingsServerPolicyCacheMode CacheOnly { get; } = new("cacheOnly");
 
-    /// <summary>Identity from the retained plan, not caller display text.</summary>
-    [JsonPropertyName("identity")]
-    public required McpPlanResourceIdentity Identity { get; set; }
+    /// <summary>Serve a cached entry only as a fallback after a failed live fetch.</summary>
+    public static ManagedSettingsServerPolicyCacheMode FallbackOnly { get; } = new("fallbackOnly");
 
-    /// <summary>Non-secret values supplied for this selected alternative.</summary>
-    [JsonPropertyName("inputs")]
-    public required IList<McpInstallationInput> Inputs { get; set; }
+    /// <summary>Ignore the cache entirely and rely on the live fetch alone.</summary>
+    public static ManagedSettingsServerPolicyCacheMode Disabled { get; } = new("disabled");
 
-    /// <summary>Policy decision bound to this plan.</summary>
-    [JsonPropertyName("policy")]
-    public required McpPlanPolicyResult Policy { get; set; }
+    /// <summary>Returns a value indicating whether two <see cref="ManagedSettingsServerPolicyCacheMode"/> instances are equivalent.</summary>
+    public static bool operator ==(ManagedSettingsServerPolicyCacheMode left, ManagedSettingsServerPolicyCacheMode right) => left.Equals(right);
 
-    /// <summary>Original source identity and content commitment.</summary>
-    [JsonPropertyName("provenance")]
-    public required McpPlanProvenance Provenance { get; set; }
+    /// <summary>Returns a value indicating whether two <see cref="ManagedSettingsServerPolicyCacheMode"/> instances are not equivalent.</summary>
+    public static bool operator !=(ManagedSettingsServerPolicyCacheMode left, ManagedSettingsServerPolicyCacheMode right) => !(left == right);
 
-    /// <summary>Explicit reviewed backend selection; no backend is accessed when no secrets are supplied.</summary>
-    [JsonPropertyName("secretStorage")]
-    public required McpInstallationSecretStorage SecretStorage { get; set; }
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is ManagedSettingsServerPolicyCacheMode other && Equals(other);
 
-    /// <summary>Only the selected alternative is applied.</summary>
-    [JsonPropertyName("selectedChoice")]
-    public required McpPlanTransportChoice SelectedChoice { get; set; }
+    /// <inheritdoc />
+    public bool Equals(ManagedSettingsServerPolicyCacheMode other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
-    /// <summary>Exact reviewed placeholders supplied separately. Never secret values.</summary>
-    [JsonPropertyName("suppliedSecrets")]
-    public required IList<string> SuppliedSecrets { get; set; }
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
 
-    /// <summary>Exact reviewed user-scope destination.</summary>
-    [JsonPropertyName("target")]
-    public required McpPlanTarget Target { get; set; }
+    /// <inheritdoc />
+    public override string ToString() => Value;
+
+    /// <summary>Provides a <see cref="JsonConverter{ManagedSettingsServerPolicyCacheMode}"/> for serializing <see cref="ManagedSettingsServerPolicyCacheMode"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<ManagedSettingsServerPolicyCacheMode>
+    {
+        /// <inheritdoc />
+        public override ManagedSettingsServerPolicyCacheMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, ManagedSettingsServerPolicyCacheMode value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ManagedSettingsServerPolicyCacheMode));
+        }
+    }
 }
 
-/// <summary>The <c>uninstall</c> variant of <see cref="McpInstallationReview"/>.</summary>
+
+/// <summary>Severity of a managed-settings validation finding.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class McpInstallationReviewUninstall : McpInstallationReview
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct ManagedSettingsDiagnosticSeverity : IEquatable<ManagedSettingsDiagnosticSeverity>
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Action => "uninstall";
+    private readonly string? _value;
 
-    /// <summary>Identity from the installed receipt.</summary>
-    [JsonPropertyName("identity")]
-    public required McpPlanResourceIdentity Identity { get; set; }
+    /// <summary>Initializes a new instance of the <see cref="ManagedSettingsDiagnosticSeverity"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="ManagedSettingsDiagnosticSeverity"/>.</param>
+    [JsonConstructor]
+    public ManagedSettingsDiagnosticSeverity(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
 
-    /// <summary>Receipt-owned installation being removed.</summary>
-    [JsonPropertyName("installationId")]
-    public required string InstallationId { get; set; }
+    /// <summary>Gets the value associated with this <see cref="ManagedSettingsDiagnosticSeverity"/>.</summary>
+    public string Value => _value ?? string.Empty;
 
-    /// <summary>Exact planner-owned secret slots to remove, excluding shared OAuth grants.</summary>
-    [JsonPropertyName("ownedSecretCount")]
-    public required long OwnedSecretCount { get; set; }
+    /// <summary>The runtime rejects the document.</summary>
+    public static ManagedSettingsDiagnosticSeverity Error { get; } = new("error");
 
-    /// <summary>Current removal policy, independent of permission to activate the server.</summary>
-    [JsonPropertyName("policy")]
-    public required McpPlanPolicyResult Policy { get; set; }
+    /// <summary>The runtime accepts the document but ignores the flagged content.</summary>
+    public static ManagedSettingsDiagnosticSeverity Warning { get; } = new("warning");
 
-    /// <summary>Shared profile authentication is deliberately retained, not pending cleanup.</summary>
-    [JsonPropertyName("preservesSharedAuthentication")]
-    public required bool PreservesSharedAuthentication { get; set; }
+    /// <summary>Returns a value indicating whether two <see cref="ManagedSettingsDiagnosticSeverity"/> instances are equivalent.</summary>
+    public static bool operator ==(ManagedSettingsDiagnosticSeverity left, ManagedSettingsDiagnosticSeverity right) => left.Equals(right);
 
-    /// <summary>Source identity and content commitment retained by the installed receipt.</summary>
-    [JsonPropertyName("provenance")]
-    public required McpPlanProvenance Provenance { get; set; }
+    /// <summary>Returns a value indicating whether two <see cref="ManagedSettingsDiagnosticSeverity"/> instances are not equivalent.</summary>
+    public static bool operator !=(ManagedSettingsDiagnosticSeverity left, ManagedSettingsDiagnosticSeverity right) => !(left == right);
 
-    /// <summary>Whether uninstall restores a protected pre-install configuration.</summary>
-    [JsonPropertyName("restoresPreviousConfiguration")]
-    public required bool RestoresPreviousConfiguration { get; set; }
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is ManagedSettingsDiagnosticSeverity other && Equals(other);
 
-    /// <summary>Exact destination, checked for intervening changes before mutation.</summary>
-    [JsonPropertyName("target")]
-    public required McpPlanTarget Target { get; set; }
-}
+    /// <inheritdoc />
+    public bool Equals(ManagedSettingsDiagnosticSeverity other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
-/// <summary>The <c>mcp</c> variant of <see cref="InstallationReview"/>.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class InstallationReviewMcp : InstallationReview
-{
     /// <inheritdoc />
-    [JsonIgnore]
-    public override string Resource => "mcp";
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
 
-    /// <summary>The exact MCP action and its reviewed changes.</summary>
-    [JsonPropertyName("review")]
-    public required McpInstallationReview Review { get; set; }
+    /// <inheritdoc />
+    public override string ToString() => Value;
+
+    /// <summary>Provides a <see cref="JsonConverter{ManagedSettingsDiagnosticSeverity}"/> for serializing <see cref="ManagedSettingsDiagnosticSeverity"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<ManagedSettingsDiagnosticSeverity>
+    {
+        /// <inheritdoc />
+        public override ManagedSettingsDiagnosticSeverity Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, ManagedSettingsDiagnosticSeverity value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ManagedSettingsDiagnosticSeverity));
+        }
+    }
 }
 
-/// <summary>The <c>skill</c> variant of <see cref="InstallationReview"/>.</summary>
+
+/// <summary>A channel accepted by managedSettings.compose.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public partial class InstallationReviewSkill : InstallationReview
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct ManagedSettingsChannel : IEquatable<ManagedSettingsChannel>
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Resource => "skill";
+    private readonly string? _value;
 
-    /// <summary>The exact verified Skill action and its reviewed files.</summary>
-    [JsonPropertyName("review")]
-    public required SkillInstallationReview Review { get; set; }
-}
+    /// <summary>Initializes a new instance of the <see cref="ManagedSettingsChannel"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="ManagedSettingsChannel"/>.</param>
+    [JsonConstructor]
+    public ManagedSettingsChannel(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
 
-/// <summary>One connection-owned, expiring request for a trusted host's explicit user decision.</summary>
-public sealed class InstallationsConfirmRequest
-{
-    /// <summary>Opaque one-use challenge. Return unchanged; never log or persist.</summary>
-    [JsonPropertyName("confirmationId")]
-    public string ConfirmationId { get; set; } = string.Empty;
+    /// <summary>Gets the value associated with this <see cref="ManagedSettingsChannel"/>.</summary>
+    public string Value => _value ?? string.Empty;
 
-    /// <summary>Original plan expiry as an ISO 8601 timestamp. Confirmation never extends it.</summary>
-    [JsonPropertyName("expiresAt")]
-    public string ExpiresAt { get; set; } = string.Empty;
+    /// <summary>Device policy, the strongest channel.</summary>
+    public static ManagedSettingsChannel Device { get; } = new("device");
 
-    /// <summary>Random identifier of this installation operation, not a plan handle.</summary>
-    [JsonPropertyName("operationId")]
-    public string OperationId { get; set; } = string.Empty;
+    /// <summary>Account or organization policy.</summary>
+    public static ManagedSettingsChannel Server { get; } = new("server");
 
-    /// <summary>
-    /// Original engine-resolved selector for a bound operation, never a dispatch default.
-    /// Bound MCP confirmation always includes it; correlate it with the original pending action.
-    /// </summary>
-    [JsonPropertyName("policySessionId")]
-    public string? PolicySessionId { get; set; }
+    /// <summary>Session-local helper output, the weakest channel.</summary>
+    public static ManagedSettingsChannel PolicyHelper { get; } = new("policyHelper");
 
-    /// <summary>Resource-specific review to present before collecting the user's decision.</summary>
-    [JsonPropertyName("review")]
-    public InstallationReview Review { get => field ??= new(); set; }
+    /// <summary>Returns a value indicating whether two <see cref="ManagedSettingsChannel"/> instances are equivalent.</summary>
+    public static bool operator ==(ManagedSettingsChannel left, ManagedSettingsChannel right) => left.Equals(right);
 
-    /// <summary>Opaque commitment to the exact review and inputs. Return unchanged; never log.</summary>
-    [JsonPropertyName("reviewFingerprint")]
-    public string ReviewFingerprint { get; set; } = string.Empty;
+    /// <summary>Returns a value indicating whether two <see cref="ManagedSettingsChannel"/> instances are not equivalent.</summary>
+    public static bool operator !=(ManagedSettingsChannel left, ManagedSettingsChannel right) => !(left == right);
+
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is ManagedSettingsChannel other && Equals(other);
+
+    /// <inheritdoc />
+    public bool Equals(ManagedSettingsChannel 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{ManagedSettingsChannel}"/> for serializing <see cref="ManagedSettingsChannel"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<ManagedSettingsChannel>
+    {
+        /// <inheritdoc />
+        public override ManagedSettingsChannel Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, ManagedSettingsChannel value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ManagedSettingsChannel));
+        }
+    }
 }
 
-/// <summary>Closed set of public task kinds a connection can negotiate.</summary>
+
+/// <summary>Managed-policy verdict only: deny blocks the URL, ask requires approval, allow approves under managed policy, and unmanaged leaves the normal consumer permission flow in effect. No verdict bypasses other security controls.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct TaskKind : IEquatable<TaskKind>
+public readonly struct ManagedPermissionVerdict : IEquatable<ManagedPermissionVerdict>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="TaskKind"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="TaskKind"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="ManagedPermissionVerdict"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="ManagedPermissionVerdict"/>.</param>
     [JsonConstructor]
-    public TaskKind(string value)
+    public ManagedPermissionVerdict(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="TaskKind"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="ManagedPermissionVerdict"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Runtime-owned background agent task.</summary>
-    public static TaskKind Agent { get; } = new("agent");
+    /// <summary>Managed policy prohibits the operation; do not offer approval.</summary>
+    public static ManagedPermissionVerdict Deny { get; } = new("deny");
 
-    /// <summary>Runtime-owned shell task.</summary>
-    public static TaskKind Shell { get; } = new("shell");
+    /// <summary>Managed policy requires the consumer to obtain approval.</summary>
+    public static ManagedPermissionVerdict Ask { get; } = new("ask");
 
-    /// <summary>Client-owned externally executed task.</summary>
-    public static TaskKind Client { get; } = new("client");
+    /// <summary>Managed policy allows the operation, subject to other security controls.</summary>
+    public static ManagedPermissionVerdict Allow { get; } = new("allow");
 
-    /// <summary>Returns a value indicating whether two <see cref="TaskKind"/> instances are equivalent.</summary>
-    public static bool operator ==(TaskKind left, TaskKind right) => left.Equals(right);
+    /// <summary>Managed policy does not decide the operation; use the consumer's normal permission flow.</summary>
+    public static ManagedPermissionVerdict Unmanaged { get; } = new("unmanaged");
 
-    /// <summary>Returns a value indicating whether two <see cref="TaskKind"/> instances are not equivalent.</summary>
-    public static bool operator !=(TaskKind left, TaskKind right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="ManagedPermissionVerdict"/> instances are equivalent.</summary>
+    public static bool operator ==(ManagedPermissionVerdict left, ManagedPermissionVerdict right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="ManagedPermissionVerdict"/> instances are not equivalent.</summary>
+    public static bool operator !=(ManagedPermissionVerdict left, ManagedPermissionVerdict right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is TaskKind other && Equals(other);
+    public override bool Equals(object? obj) => obj is ManagedPermissionVerdict other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(TaskKind other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(ManagedPermissionVerdict other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -26704,20 +31377,20 @@ public TaskKind(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{TaskKind}"/> for serializing <see cref="TaskKind"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{ManagedPermissionVerdict}"/> for serializing <see cref="ManagedPermissionVerdict"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<TaskKind>
+    public sealed class Converter : JsonConverter<ManagedPermissionVerdict>
     {
         /// <inheritdoc />
-        public override TaskKind Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override ManagedPermissionVerdict Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, TaskKind value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, ManagedPermissionVerdict value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(TaskKind));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ManagedPermissionVerdict));
         }
     }
 }
@@ -27242,43 +31915,64 @@ public override void Write(Utf8JsonWriter writer, ModelPolicyState value, JsonSe
 }
 
 
-/// <summary>The neutral kind of a model provider — the model analog of `AccountKind`. A model provider is the live, entitled source a model came from; central code never branches on this beyond a single dispatch.</summary>
+/// <summary>Authentication type.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct ModelProviderKind : IEquatable<ModelProviderKind>
+public readonly struct AuthInfoType : IEquatable<AuthInfoType>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="ModelProviderKind"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="ModelProviderKind"/>.</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 ModelProviderKind(string value)
+    public AuthInfoType(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="ModelProviderKind"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="AuthInfoType"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>GitHub Copilot / CAPI models, spawned by a github-resolving account that holds a Copilot seat.</summary>
-    public static ModelProviderKind Copilot { get; } = new("copilot");
+    /// <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 from a selected provider-owned account, without a GitHub credential.</summary>
+    public static AuthInfoType Account { get; } = new("account");
+
+    /// <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>Microsoft 365 Copilot (Loki) inference models, spawned by a resolvable Entra-derived Loki account.</summary>
-    public static ModelProviderKind Loki { get; } = new("loki");
+    /// <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="ModelProviderKind"/> instances are equivalent.</summary>
-    public static bool operator ==(ModelProviderKind left, ModelProviderKind right) => left.Equals(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="ModelProviderKind"/> instances are not equivalent.</summary>
-    public static bool operator !=(ModelProviderKind left, ModelProviderKind right) => !(left == 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 ModelProviderKind other && Equals(other);
+    public override bool Equals(object? obj) => obj is AuthInfoType other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(ModelProviderKind 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);
@@ -27286,68 +31980,68 @@ public ModelProviderKind(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{ModelProviderKind}"/> for serializing <see cref="ModelProviderKind"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{AuthInfoType}"/> for serializing <see cref="AuthInfoType"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<ModelProviderKind>
+    public sealed class Converter : JsonConverter<AuthInfoType>
     {
         /// <inheritdoc />
-        public override ModelProviderKind 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, ModelProviderKind value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, AuthInfoType value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ModelProviderKind));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(AuthInfoType));
         }
     }
 }
 
 
-/// <summary>State of the persistent certificate authority of the sandbox credential proxy.</summary>
+/// <summary>Server transport type: stdio, http, sse (deprecated), or memory.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct SandboxProxyCaState : IEquatable<SandboxProxyCaState>
+public readonly struct DiscoveredMcpServerType : IEquatable<DiscoveredMcpServerType>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="SandboxProxyCaState"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="SandboxProxyCaState"/>.</param>
+    /// <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 SandboxProxyCaState(string value)
+    public DiscoveredMcpServerType(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="SandboxProxyCaState"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="DiscoveredMcpServerType"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>This platform has no supported OS trust store. The proxy uses a per-process certificate bundle.</summary>
-    public static SandboxProxyCaState Unsupported { get; } = new("unsupported");
+    /// <summary>Server communicates over stdio with a local child process.</summary>
+    public static DiscoveredMcpServerType Stdio { get; } = new("stdio");
 
-    /// <summary>OS trust does not include the certificate authority, or none is stored.</summary>
-    public static SandboxProxyCaState NotInstalled { get; } = new("notInstalled");
+    /// <summary>Server communicates over streamable HTTP.</summary>
+    public static DiscoveredMcpServerType Http { get; } = new("http");
 
-    /// <summary>OS trust includes the stored certificate authority.</summary>
-    public static SandboxProxyCaState Installed { get; } = new("installed");
+    /// <summary>Server communicates over Server-Sent Events (deprecated).</summary>
+    public static DiscoveredMcpServerType Sse { get; } = new("sse");
 
-    /// <summary>The runtime could not read the certificate authority or the OS trust store.</summary>
-    public static SandboxProxyCaState Error { get; } = new("error");
+    /// <summary>Server is backed by an in-memory runtime implementation.</summary>
+    public static DiscoveredMcpServerType Memory { get; } = new("memory");
 
-    /// <summary>Returns a value indicating whether two <see cref="SandboxProxyCaState"/> instances are equivalent.</summary>
-    public static bool operator ==(SandboxProxyCaState left, SandboxProxyCaState right) => left.Equals(right);
+    /// <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="SandboxProxyCaState"/> instances are not equivalent.</summary>
-    public static bool operator !=(SandboxProxyCaState left, SandboxProxyCaState right) => !(left == 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);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is SandboxProxyCaState other && Equals(other);
+    public override bool Equals(object? obj) => obj is DiscoveredMcpServerType other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(SandboxProxyCaState other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(DiscoveredMcpServerType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -27355,68 +32049,62 @@ public SandboxProxyCaState(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{SandboxProxyCaState}"/> for serializing <see cref="SandboxProxyCaState"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{DiscoveredMcpServerType}"/> for serializing <see cref="DiscoveredMcpServerType"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<SandboxProxyCaState>
+    public sealed class Converter : JsonConverter<DiscoveredMcpServerType>
     {
         /// <inheritdoc />
-        public override SandboxProxyCaState Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        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, SandboxProxyCaState value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, DiscoveredMcpServerType value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SandboxProxyCaState));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(DiscoveredMcpServerType));
         }
     }
 }
 
 
-/// <summary>Server transport type: stdio, http, sse (deprecated), or memory.</summary>
+/// <summary>Controls how availableTools (allowlist) and excludedTools (denylist) combine when both are set.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct DiscoveredMcpServerType : IEquatable<DiscoveredMcpServerType>
+public readonly struct OptionsUpdateToolFilterPrecedence : IEquatable<OptionsUpdateToolFilterPrecedence>
 {
     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="OptionsUpdateToolFilterPrecedence"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="OptionsUpdateToolFilterPrecedence"/>.</param>
     [JsonConstructor]
-    public DiscoveredMcpServerType(string value)
+    public OptionsUpdateToolFilterPrecedence(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="OptionsUpdateToolFilterPrecedence"/>.</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>Server communicates over Server-Sent Events (deprecated).</summary>
-    public static DiscoveredMcpServerType Sse { get; } = new("sse");
+    /// <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>Server is backed by an in-memory runtime implementation.</summary>
-    public static DiscoveredMcpServerType Memory { get; } = new("memory");
+    /// <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="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="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="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="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 DiscoveredMcpServerType other && Equals(other);
+    public override bool Equals(object? obj) => obj is OptionsUpdateToolFilterPrecedence other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(DiscoveredMcpServerType 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);
@@ -27424,20 +32112,20 @@ 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{OptionsUpdateToolFilterPrecedence}"/> for serializing <see cref="OptionsUpdateToolFilterPrecedence"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<DiscoveredMcpServerType>
+    public sealed class Converter : JsonConverter<OptionsUpdateToolFilterPrecedence>
     {
         /// <inheritdoc />
-        public override DiscoveredMcpServerType 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, DiscoveredMcpServerType value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, OptionsUpdateToolFilterPrecedence value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(DiscoveredMcpServerType));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(OptionsUpdateToolFilterPrecedence));
         }
     }
 }
@@ -29837,6 +34525,285 @@ public override void Write(Utf8JsonWriter writer, DiscoveredExtensionMode value,
 }
 
 
+/// <summary>Where this source lives — used for UI grouping.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct InstructionSourceLocation : IEquatable<InstructionSourceLocation>
+{
+    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>
+    [JsonConstructor]
+    public InstructionSourceLocation(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
+
+    /// <summary>Gets the value associated with this <see cref="InstructionSourceLocation"/>.</summary>
+    public string Value => _value ?? string.Empty;
+
+    /// <summary>Instructions live in user-level configuration.</summary>
+    public static InstructionSourceLocation User { get; } = new("user");
+
+    /// <summary>Instructions live in repository-level configuration.</summary>
+    public static InstructionSourceLocation Repository { get; } = new("repository");
+
+    /// <summary>Instructions live under the current working directory.</summary>
+    public static InstructionSourceLocation WorkingDirectory { get; } = new("working-directory");
+
+    /// <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);
+
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is InstructionSourceLocation other && Equals(other);
+
+    /// <inheritdoc />
+    public bool Equals(InstructionSourceLocation 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{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));
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, InstructionSourceLocation value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(InstructionSourceLocation));
+        }
+    }
+}
+
+
+/// <summary>Category of instruction source — used for merge logic.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct InstructionSourceType : IEquatable<InstructionSourceType>
+{
+    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>
+    [JsonConstructor]
+    public InstructionSourceType(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
+
+    /// <summary>Gets the value associated with this <see cref="InstructionSourceType"/>.</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>Instructions loaded from VS Code instruction files.</summary>
+    public static InstructionSourceType Vscode { get; } = new("vscode");
+
+    /// <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 InstructionSourceType other && Equals(other);
+
+    /// <inheritdoc />
+    public bool Equals(InstructionSourceType 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{InstructionSourceType}"/> for serializing <see cref="InstructionSourceType"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<InstructionSourceType>
+    {
+        /// <inheritdoc />
+        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, InstructionSourceType value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(InstructionSourceType));
+        }
+    }
+}
+
+
+/// <summary>Whether the target is a single file or a directory of instruction files.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct InstructionDiscoveryPathKind : IEquatable<InstructionDiscoveryPathKind>
+{
+    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>
+    [JsonConstructor]
+    public InstructionDiscoveryPathKind(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
+
+    /// <summary>Gets the value associated with this <see cref="InstructionDiscoveryPathKind"/>.</summary>
+    public string Value => _value ?? string.Empty;
+
+    /// <summary>The target is a single instruction file.</summary>
+    public static InstructionDiscoveryPathKind File { get; } = new("file");
+
+    /// <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="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="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 InstructionDiscoveryPathKind other && Equals(other);
+
+    /// <inheritdoc />
+    public bool Equals(InstructionDiscoveryPathKind 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{InstructionDiscoveryPathKind}"/> for serializing <see cref="InstructionDiscoveryPathKind"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<InstructionDiscoveryPathKind>
+    {
+        /// <inheritdoc />
+        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, InstructionDiscoveryPathKind value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(InstructionDiscoveryPathKind));
+        }
+    }
+}
+
+
+/// <summary>Which tier this target belongs to.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct InstructionDiscoveryPathLocation : IEquatable<InstructionDiscoveryPathLocation>
+{
+    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>
+    [JsonConstructor]
+    public InstructionDiscoveryPathLocation(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
+
+    /// <summary>Gets the value associated with this <see cref="InstructionDiscoveryPathLocation"/>.</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>Instructions live under the current working directory.</summary>
+    public static InstructionDiscoveryPathLocation WorkingDirectory { get; } = new("working-directory");
+
+    /// <summary>Instructions live in plugin-provided configuration.</summary>
+    public static InstructionDiscoveryPathLocation Plugin { get; } = new("plugin");
+
+    /// <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="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 InstructionDiscoveryPathLocation other && Equals(other);
+
+    /// <inheritdoc />
+    public bool Equals(InstructionDiscoveryPathLocation 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{InstructionDiscoveryPathLocation}"/> for serializing <see cref="InstructionDiscoveryPathLocation"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<InstructionDiscoveryPathLocation>
+    {
+        /// <inheritdoc />
+        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, InstructionDiscoveryPathLocation value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(InstructionDiscoveryPathLocation));
+        }
+    }
+}
+
+
 /// <summary>Defines the allowed values.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
@@ -30965,285 +35932,6 @@ public override void Write(Utf8JsonWriter writer, AgentDiscoveryPathScope value,
 }
 
 
-/// <summary>Where this source lives — used for UI grouping.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-[JsonConverter(typeof(Converter))]
-[DebuggerDisplay("{Value,nq}")]
-public readonly struct InstructionSourceLocation : IEquatable<InstructionSourceLocation>
-{
-    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>
-    [JsonConstructor]
-    public InstructionSourceLocation(string value)
-    {
-        ArgumentException.ThrowIfNullOrWhiteSpace(value);
-        _value = value;
-    }
-
-    /// <summary>Gets the value associated with this <see cref="InstructionSourceLocation"/>.</summary>
-    public string Value => _value ?? string.Empty;
-
-    /// <summary>Instructions live in user-level configuration.</summary>
-    public static InstructionSourceLocation User { get; } = new("user");
-
-    /// <summary>Instructions live in repository-level configuration.</summary>
-    public static InstructionSourceLocation Repository { get; } = new("repository");
-
-    /// <summary>Instructions live under the current working directory.</summary>
-    public static InstructionSourceLocation WorkingDirectory { get; } = new("working-directory");
-
-    /// <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);
-
-    /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is InstructionSourceLocation other && Equals(other);
-
-    /// <inheritdoc />
-    public bool Equals(InstructionSourceLocation 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{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));
-        }
-
-        /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, InstructionSourceLocation value, JsonSerializerOptions options)
-        {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(InstructionSourceLocation));
-        }
-    }
-}
-
-
-/// <summary>Category of instruction source — used for merge logic.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-[JsonConverter(typeof(Converter))]
-[DebuggerDisplay("{Value,nq}")]
-public readonly struct InstructionSourceType : IEquatable<InstructionSourceType>
-{
-    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>
-    [JsonConstructor]
-    public InstructionSourceType(string value)
-    {
-        ArgumentException.ThrowIfNullOrWhiteSpace(value);
-        _value = value;
-    }
-
-    /// <summary>Gets the value associated with this <see cref="InstructionSourceType"/>.</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>Instructions loaded from VS Code instruction files.</summary>
-    public static InstructionSourceType Vscode { get; } = new("vscode");
-
-    /// <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 InstructionSourceType other && Equals(other);
-
-    /// <inheritdoc />
-    public bool Equals(InstructionSourceType 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{InstructionSourceType}"/> for serializing <see cref="InstructionSourceType"/> instances.</summary>
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<InstructionSourceType>
-    {
-        /// <inheritdoc />
-        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, InstructionSourceType value, JsonSerializerOptions options)
-        {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(InstructionSourceType));
-        }
-    }
-}
-
-
-/// <summary>Whether the target is a single file or a directory of instruction files.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-[JsonConverter(typeof(Converter))]
-[DebuggerDisplay("{Value,nq}")]
-public readonly struct InstructionDiscoveryPathKind : IEquatable<InstructionDiscoveryPathKind>
-{
-    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>
-    [JsonConstructor]
-    public InstructionDiscoveryPathKind(string value)
-    {
-        ArgumentException.ThrowIfNullOrWhiteSpace(value);
-        _value = value;
-    }
-
-    /// <summary>Gets the value associated with this <see cref="InstructionDiscoveryPathKind"/>.</summary>
-    public string Value => _value ?? string.Empty;
-
-    /// <summary>The target is a single instruction file.</summary>
-    public static InstructionDiscoveryPathKind File { get; } = new("file");
-
-    /// <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="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="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 InstructionDiscoveryPathKind other && Equals(other);
-
-    /// <inheritdoc />
-    public bool Equals(InstructionDiscoveryPathKind 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{InstructionDiscoveryPathKind}"/> for serializing <see cref="InstructionDiscoveryPathKind"/> instances.</summary>
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<InstructionDiscoveryPathKind>
-    {
-        /// <inheritdoc />
-        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, InstructionDiscoveryPathKind value, JsonSerializerOptions options)
-        {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(InstructionDiscoveryPathKind));
-        }
-    }
-}
-
-
-/// <summary>Which tier this target belongs to.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-[JsonConverter(typeof(Converter))]
-[DebuggerDisplay("{Value,nq}")]
-public readonly struct InstructionDiscoveryPathLocation : IEquatable<InstructionDiscoveryPathLocation>
-{
-    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>
-    [JsonConstructor]
-    public InstructionDiscoveryPathLocation(string value)
-    {
-        ArgumentException.ThrowIfNullOrWhiteSpace(value);
-        _value = value;
-    }
-
-    /// <summary>Gets the value associated with this <see cref="InstructionDiscoveryPathLocation"/>.</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>Instructions live under the current working directory.</summary>
-    public static InstructionDiscoveryPathLocation WorkingDirectory { get; } = new("working-directory");
-
-    /// <summary>Instructions live in plugin-provided configuration.</summary>
-    public static InstructionDiscoveryPathLocation Plugin { get; } = new("plugin");
-
-    /// <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="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 InstructionDiscoveryPathLocation other && Equals(other);
-
-    /// <inheritdoc />
-    public bool Equals(InstructionDiscoveryPathLocation 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{InstructionDiscoveryPathLocation}"/> for serializing <see cref="InstructionDiscoveryPathLocation"/> instances.</summary>
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<InstructionDiscoveryPathLocation>
-    {
-        /// <inheritdoc />
-        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, InstructionDiscoveryPathLocation value, JsonSerializerOptions options)
-        {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(InstructionDiscoveryPathLocation));
-        }
-    }
-}
-
-
 /// <summary>Optional completion hint for the input (e.g. 'directory' for filesystem path completion).</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
@@ -31370,109 +36058,43 @@ public override void Write(Utf8JsonWriter writer, SlashCommandKind value, JsonSe
 }
 
 
-/// <summary>Severity of a managed-settings validation finding.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-[JsonConverter(typeof(Converter))]
-[DebuggerDisplay("{Value,nq}")]
-public readonly struct ManagedSettingsDiagnosticSeverity : IEquatable<ManagedSettingsDiagnosticSeverity>
-{
-    private readonly string? _value;
-
-    /// <summary>Initializes a new instance of the <see cref="ManagedSettingsDiagnosticSeverity"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="ManagedSettingsDiagnosticSeverity"/>.</param>
-    [JsonConstructor]
-    public ManagedSettingsDiagnosticSeverity(string value)
-    {
-        ArgumentException.ThrowIfNullOrWhiteSpace(value);
-        _value = value;
-    }
-
-    /// <summary>Gets the value associated with this <see cref="ManagedSettingsDiagnosticSeverity"/>.</summary>
-    public string Value => _value ?? string.Empty;
-
-    /// <summary>The runtime rejects the document.</summary>
-    public static ManagedSettingsDiagnosticSeverity Error { get; } = new("error");
-
-    /// <summary>The runtime accepts the document but ignores the flagged content.</summary>
-    public static ManagedSettingsDiagnosticSeverity Warning { get; } = new("warning");
-
-    /// <summary>Returns a value indicating whether two <see cref="ManagedSettingsDiagnosticSeverity"/> instances are equivalent.</summary>
-    public static bool operator ==(ManagedSettingsDiagnosticSeverity left, ManagedSettingsDiagnosticSeverity right) => left.Equals(right);
-
-    /// <summary>Returns a value indicating whether two <see cref="ManagedSettingsDiagnosticSeverity"/> instances are not equivalent.</summary>
-    public static bool operator !=(ManagedSettingsDiagnosticSeverity left, ManagedSettingsDiagnosticSeverity right) => !(left == right);
-
-    /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is ManagedSettingsDiagnosticSeverity other && Equals(other);
-
-    /// <inheritdoc />
-    public bool Equals(ManagedSettingsDiagnosticSeverity 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{ManagedSettingsDiagnosticSeverity}"/> for serializing <see cref="ManagedSettingsDiagnosticSeverity"/> instances.</summary>
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<ManagedSettingsDiagnosticSeverity>
-    {
-        /// <inheritdoc />
-        public override ManagedSettingsDiagnosticSeverity Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-        {
-            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
-        }
-
-        /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, ManagedSettingsDiagnosticSeverity value, JsonSerializerOptions options)
-        {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ManagedSettingsDiagnosticSeverity));
-        }
-    }
-}
-
-
-/// <summary>A channel accepted by managedSettings.compose.</summary>
+/// <summary>Hosting platform type of the repository.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct ManagedSettingsChannel : IEquatable<ManagedSettingsChannel>
+public readonly struct SessionWorkingDirectoryContextHostType : IEquatable<SessionWorkingDirectoryContextHostType>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="ManagedSettingsChannel"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="ManagedSettingsChannel"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="SessionWorkingDirectoryContextHostType"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="SessionWorkingDirectoryContextHostType"/>.</param>
     [JsonConstructor]
-    public ManagedSettingsChannel(string value)
+    public SessionWorkingDirectoryContextHostType(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="ManagedSettingsChannel"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="SessionWorkingDirectoryContextHostType"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Device policy, the strongest channel.</summary>
-    public static ManagedSettingsChannel Device { get; } = new("device");
-
-    /// <summary>Account or organization policy.</summary>
-    public static ManagedSettingsChannel Server { get; } = new("server");
+    /// <summary>The working directory repository is hosted on GitHub.</summary>
+    public static SessionWorkingDirectoryContextHostType GitHub { get; } = new("github");
 
-    /// <summary>Session-local helper output, the weakest channel.</summary>
-    public static ManagedSettingsChannel PolicyHelper { get; } = new("policyHelper");
+    /// <summary>The working directory repository is hosted on Azure DevOps.</summary>
+    public static SessionWorkingDirectoryContextHostType Ado { get; } = new("ado");
 
-    /// <summary>Returns a value indicating whether two <see cref="ManagedSettingsChannel"/> instances are equivalent.</summary>
-    public static bool operator ==(ManagedSettingsChannel left, ManagedSettingsChannel right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="SessionWorkingDirectoryContextHostType"/> instances are equivalent.</summary>
+    public static bool operator ==(SessionWorkingDirectoryContextHostType left, SessionWorkingDirectoryContextHostType right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="ManagedSettingsChannel"/> instances are not equivalent.</summary>
-    public static bool operator !=(ManagedSettingsChannel left, ManagedSettingsChannel right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="SessionWorkingDirectoryContextHostType"/> instances are not equivalent.</summary>
+    public static bool operator !=(SessionWorkingDirectoryContextHostType left, SessionWorkingDirectoryContextHostType right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is ManagedSettingsChannel other && Equals(other);
+    public override bool Equals(object? obj) => obj is SessionWorkingDirectoryContextHostType other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(ManagedSettingsChannel other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(SessionWorkingDirectoryContextHostType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -31480,20 +36102,20 @@ public ManagedSettingsChannel(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{ManagedSettingsChannel}"/> for serializing <see cref="ManagedSettingsChannel"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{SessionWorkingDirectoryContextHostType}"/> for serializing <see cref="SessionWorkingDirectoryContextHostType"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<ManagedSettingsChannel>
+    public sealed class Converter : JsonConverter<SessionWorkingDirectoryContextHostType>
     {
         /// <inheritdoc />
-        public override ManagedSettingsChannel Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override SessionWorkingDirectoryContextHostType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, ManagedSettingsChannel value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, SessionWorkingDirectoryContextHostType value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ManagedSettingsChannel));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SessionWorkingDirectoryContextHostType));
         }
     }
 }
@@ -32765,6 +37387,144 @@ public override void Write(Utf8JsonWriter writer, AgentRegistrySpawnPermissionMo
 }
 
 
+/// <summary>Availability.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct ConnectorDiscoveryAvailability : IEquatable<ConnectorDiscoveryAvailability>
+{
+    private readonly string? _value;
+
+    /// <summary>Initializes a new instance of the <see cref="ConnectorDiscoveryAvailability"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="ConnectorDiscoveryAvailability"/>.</param>
+    [JsonConstructor]
+    public ConnectorDiscoveryAvailability(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
+
+    /// <summary>Gets the value associated with this <see cref="ConnectorDiscoveryAvailability"/>.</summary>
+    public string Value => _value ?? string.Empty;
+
+    /// <summary>Enabled.</summary>
+    public static ConnectorDiscoveryAvailability Enabled { get; } = new("enabled");
+
+    /// <summary>Disabled.</summary>
+    public static ConnectorDiscoveryAvailability Disabled { get; } = new("disabled");
+
+    /// <summary>Unavailable.</summary>
+    public static ConnectorDiscoveryAvailability Unavailable { get; } = new("unavailable");
+
+    /// <summary>Returns a value indicating whether two <see cref="ConnectorDiscoveryAvailability"/> instances are equivalent.</summary>
+    public static bool operator ==(ConnectorDiscoveryAvailability left, ConnectorDiscoveryAvailability right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="ConnectorDiscoveryAvailability"/> instances are not equivalent.</summary>
+    public static bool operator !=(ConnectorDiscoveryAvailability left, ConnectorDiscoveryAvailability right) => !(left == right);
+
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is ConnectorDiscoveryAvailability other && Equals(other);
+
+    /// <inheritdoc />
+    public bool Equals(ConnectorDiscoveryAvailability 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{ConnectorDiscoveryAvailability}"/> for serializing <see cref="ConnectorDiscoveryAvailability"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<ConnectorDiscoveryAvailability>
+    {
+        /// <inheritdoc />
+        public override ConnectorDiscoveryAvailability Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, ConnectorDiscoveryAvailability value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ConnectorDiscoveryAvailability));
+        }
+    }
+}
+
+
+/// <summary>Authoritative service connection state for one Connector.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct ConnectorCatalogStatus : IEquatable<ConnectorCatalogStatus>
+{
+    private readonly string? _value;
+
+    /// <summary>Initializes a new instance of the <see cref="ConnectorCatalogStatus"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="ConnectorCatalogStatus"/>.</param>
+    [JsonConstructor]
+    public ConnectorCatalogStatus(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
+
+    /// <summary>Gets the value associated with this <see cref="ConnectorCatalogStatus"/>.</summary>
+    public string Value => _value ?? string.Empty;
+
+    /// <summary>The Connector is available but not connected.</summary>
+    public static ConnectorCatalogStatus NotConnected { get; } = new("not_connected");
+
+    /// <summary>The Connector service is still completing connection or consent.</summary>
+    public static ConnectorCatalogStatus Pending { get; } = new("pending");
+
+    /// <summary>The Connector is connected and may contribute MCP servers.</summary>
+    public static ConnectorCatalogStatus Connected { get; } = new("connected");
+
+    /// <summary>The Connector service reports an unusable connection.</summary>
+    public static ConnectorCatalogStatus Error { get; } = new("error");
+
+    /// <summary>The service returned a future or unrecognized state.</summary>
+    public static ConnectorCatalogStatus Unknown { get; } = new("unknown");
+
+    /// <summary>Returns a value indicating whether two <see cref="ConnectorCatalogStatus"/> instances are equivalent.</summary>
+    public static bool operator ==(ConnectorCatalogStatus left, ConnectorCatalogStatus right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="ConnectorCatalogStatus"/> instances are not equivalent.</summary>
+    public static bool operator !=(ConnectorCatalogStatus left, ConnectorCatalogStatus right) => !(left == right);
+
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is ConnectorCatalogStatus other && Equals(other);
+
+    /// <inheritdoc />
+    public bool Equals(ConnectorCatalogStatus 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{ConnectorCatalogStatus}"/> for serializing <see cref="ConnectorCatalogStatus"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<ConnectorCatalogStatus>
+    {
+        /// <inheritdoc />
+        public override ConnectorCatalogStatus Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, ConnectorCatalogStatus value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ConnectorCatalogStatus));
+        }
+    }
+}
+
+
 /// <summary>The UI mode the agent was in when this message was sent. Defaults to the session's current mode.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
@@ -34217,87 +38977,6 @@ public override void Write(Utf8JsonWriter writer, PermissionDecisionSurface valu
 }
 
 
-/// <summary>Authentication type.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-[JsonConverter(typeof(Converter))]
-[DebuggerDisplay("{Value,nq}")]
-public readonly struct AuthInfoType : IEquatable<AuthInfoType>
-{
-    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>
-    [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");
-
-    /// <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="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 AuthInfoType other && Equals(other);
-
-    /// <inheritdoc />
-    public bool Equals(AuthInfoType 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{AuthInfoType}"/> for serializing <see cref="AuthInfoType"/> instances.</summary>
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<AuthInfoType>
-    {
-        /// <inheritdoc />
-        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, AuthInfoType value, JsonSerializerOptions options)
-        {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(AuthInfoType));
-        }
-    }
-}
-
-
 /// <summary>The provider kind stamped on a signed-in account.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
@@ -34436,7 +39115,7 @@ public override void Write(Utf8JsonWriter writer, LoginProviderKind value, JsonS
 }
 
 
-/// <summary>Terminal disposition of a login persistence attempt.</summary>
+/// <summary>Disposition of a login attempt, including pending user decisions.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
@@ -34456,12 +39135,15 @@ public AuthLoginResultStatus(string value)
     /// <summary>Gets the value associated with this <see cref="AuthLoginResultStatus"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>The credential was persisted and the account is signed in.</summary>
+    /// <summary>The credential was persisted and the selected account is signed in.</summary>
     public static AuthLoginResultStatus Completed { get; } = new("completed");
 
     /// <summary>Persistence needs explicit consent to store the token in plaintext.</summary>
     public static AuthLoginResultStatus NeedsPlaintextConsent { get; } = new("needs-plaintext-consent");
 
+    /// <summary>Credentials are saved; select an account using a returned selectionId as advance input to complete sign-in.</summary>
+    public static AuthLoginResultStatus NeedsAccountSelection { get; } = new("needs-account-selection");
+
     /// <summary>The user declined plaintext persistence.</summary>
     public static AuthLoginResultStatus Declined { get; } = new("declined");
 
@@ -37777,86 +42459,14 @@ public ConnectorAuthorizationScope(string value)
     /// <summary>Returns a value indicating whether two <see cref="ConnectorAuthorizationScope"/> instances are equivalent.</summary>
     public static bool operator ==(ConnectorAuthorizationScope left, ConnectorAuthorizationScope right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="ConnectorAuthorizationScope"/> instances are not equivalent.</summary>
-    public static bool operator !=(ConnectorAuthorizationScope left, ConnectorAuthorizationScope right) => !(left == right);
-
-    /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is ConnectorAuthorizationScope other && Equals(other);
-
-    /// <inheritdoc />
-    public bool Equals(ConnectorAuthorizationScope 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{ConnectorAuthorizationScope}"/> for serializing <see cref="ConnectorAuthorizationScope"/> instances.</summary>
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<ConnectorAuthorizationScope>
-    {
-        /// <inheritdoc />
-        public override ConnectorAuthorizationScope Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-        {
-            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
-        }
-
-        /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, ConnectorAuthorizationScope value, JsonSerializerOptions options)
-        {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ConnectorAuthorizationScope));
-        }
-    }
-}
-
-
-/// <summary>Authoritative service connection state for one Connector.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-[JsonConverter(typeof(Converter))]
-[DebuggerDisplay("{Value,nq}")]
-public readonly struct ConnectorCatalogStatus : IEquatable<ConnectorCatalogStatus>
-{
-    private readonly string? _value;
-
-    /// <summary>Initializes a new instance of the <see cref="ConnectorCatalogStatus"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="ConnectorCatalogStatus"/>.</param>
-    [JsonConstructor]
-    public ConnectorCatalogStatus(string value)
-    {
-        ArgumentException.ThrowIfNullOrWhiteSpace(value);
-        _value = value;
-    }
-
-    /// <summary>Gets the value associated with this <see cref="ConnectorCatalogStatus"/>.</summary>
-    public string Value => _value ?? string.Empty;
-
-    /// <summary>The Connector is available but not connected.</summary>
-    public static ConnectorCatalogStatus NotConnected { get; } = new("not_connected");
-
-    /// <summary>The Connector service is still completing connection or consent.</summary>
-    public static ConnectorCatalogStatus Pending { get; } = new("pending");
-
-    /// <summary>The Connector is connected and may contribute MCP servers.</summary>
-    public static ConnectorCatalogStatus Connected { get; } = new("connected");
-
-    /// <summary>The Connector service reports an unusable connection.</summary>
-    public static ConnectorCatalogStatus Error { get; } = new("error");
-
-    /// <summary>The service returned a future or unrecognized state.</summary>
-    public static ConnectorCatalogStatus Unknown { get; } = new("unknown");
-
-    /// <summary>Returns a value indicating whether two <see cref="ConnectorCatalogStatus"/> instances are equivalent.</summary>
-    public static bool operator ==(ConnectorCatalogStatus left, ConnectorCatalogStatus right) => left.Equals(right);
-
-    /// <summary>Returns a value indicating whether two <see cref="ConnectorCatalogStatus"/> instances are not equivalent.</summary>
-    public static bool operator !=(ConnectorCatalogStatus left, ConnectorCatalogStatus right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="ConnectorAuthorizationScope"/> instances are not equivalent.</summary>
+    public static bool operator !=(ConnectorAuthorizationScope left, ConnectorAuthorizationScope right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is ConnectorCatalogStatus other && Equals(other);
+    public override bool Equals(object? obj) => obj is ConnectorAuthorizationScope other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(ConnectorCatalogStatus other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(ConnectorAuthorizationScope other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -37864,20 +42474,20 @@ public ConnectorCatalogStatus(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{ConnectorCatalogStatus}"/> for serializing <see cref="ConnectorCatalogStatus"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{ConnectorAuthorizationScope}"/> for serializing <see cref="ConnectorAuthorizationScope"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<ConnectorCatalogStatus>
+    public sealed class Converter : JsonConverter<ConnectorAuthorizationScope>
     {
         /// <inheritdoc />
-        public override ConnectorCatalogStatus Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override ConnectorAuthorizationScope Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, ConnectorCatalogStatus value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, ConnectorAuthorizationScope value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ConnectorCatalogStatus));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ConnectorAuthorizationScope));
         }
     }
 }
@@ -37961,6 +42571,81 @@ public override void Write(Utf8JsonWriter writer, ConnectorMcpStatus value, Json
 }
 
 
+/// <summary>What retrying did for one plugin required by managed settings.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct ManagedPluginRetryStatus : IEquatable<ManagedPluginRetryStatus>
+{
+    private readonly string? _value;
+
+    /// <summary>Initializes a new instance of the <see cref="ManagedPluginRetryStatus"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="ManagedPluginRetryStatus"/>.</param>
+    [JsonConstructor]
+    public ManagedPluginRetryStatus(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
+
+    /// <summary>Gets the value associated with this <see cref="ManagedPluginRetryStatus"/>.</summary>
+    public string Value => _value ?? string.Empty;
+
+    /// <summary>The plugin was missing and is now installed.</summary>
+    public static ManagedPluginRetryStatus Installed { get; } = new("installed");
+
+    /// <summary>An update was available and is now installed.</summary>
+    public static ManagedPluginRetryStatus Updated { get; } = new("updated");
+
+    /// <summary>The plugin was already installed and current, so nothing was done.</summary>
+    public static ManagedPluginRetryStatus AlreadyPresent { get; } = new("already_present");
+
+    /// <summary>Checking, installing, or updating the plugin failed. See `error`.</summary>
+    public static ManagedPluginRetryStatus Failed { get; } = new("failed");
+
+    /// <summary>The plugin was not prepared because another session was changing plugins or the managed settings changed during the retry. It is prepared again before a later message.</summary>
+    public static ManagedPluginRetryStatus Deferred { get; } = new("deferred");
+
+    /// <summary>The session's managed settings do not require this plugin, so nothing was done.</summary>
+    public static ManagedPluginRetryStatus NotRequired { get; } = new("not_required");
+
+    /// <summary>Returns a value indicating whether two <see cref="ManagedPluginRetryStatus"/> instances are equivalent.</summary>
+    public static bool operator ==(ManagedPluginRetryStatus left, ManagedPluginRetryStatus right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="ManagedPluginRetryStatus"/> instances are not equivalent.</summary>
+    public static bool operator !=(ManagedPluginRetryStatus left, ManagedPluginRetryStatus right) => !(left == right);
+
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is ManagedPluginRetryStatus other && Equals(other);
+
+    /// <inheritdoc />
+    public bool Equals(ManagedPluginRetryStatus 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{ManagedPluginRetryStatus}"/> for serializing <see cref="ManagedPluginRetryStatus"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<ManagedPluginRetryStatus>
+    {
+        /// <inheritdoc />
+        public override ManagedPluginRetryStatus Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, ManagedPluginRetryStatus value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ManagedPluginRetryStatus));
+        }
+    }
+}
+
+
 /// <summary>Allowed values for the `OptionsUpdateAdditionalContentExclusionPolicyScope` enumeration.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
@@ -38410,17 +43095,467 @@ public ShellInitProfile(string value)
     /// <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="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="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="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 ShellInitProfile other && Equals(other);
+
+    /// <inheritdoc />
+    public bool Equals(ShellInitProfile 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{ShellInitProfile}"/> for serializing <see cref="ShellInitProfile"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<ShellInitProfile>
+    {
+        /// <inheritdoc />
+        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, ShellInitProfile value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ShellInitProfile));
+        }
+    }
+}
+
+
+/// <summary>Supported built-in shells for initialization scripts.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct ShellInitScriptShell : IEquatable<ShellInitScriptShell>
+{
+    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>
+    [JsonConstructor]
+    public ShellInitScriptShell(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
+
+    /// <summary>Gets the value associated with this <see cref="ShellInitScriptShell"/>.</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>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="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="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 ShellInitScriptShell other && Equals(other);
+
+    /// <inheritdoc />
+    public bool Equals(ShellInitScriptShell 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{ShellInitScriptShell}"/> for serializing <see cref="ShellInitScriptShell"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<ShellInitScriptShell>
+    {
+        /// <inheritdoc />
+        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, ShellInitScriptShell value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ShellInitScriptShell));
+        }
+    }
+}
+
+
+/// <summary>Discovery source: project (.github/extensions/), user (~/.copilot/extensions/), plugin (installed plugin), or session (session-state/&lt;id&gt;/extensions/).</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct ExtensionSource : IEquatable<ExtensionSource>
+{
+    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>
+    [JsonConstructor]
+    public ExtensionSource(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
+
+    /// <summary>Gets the value associated with this <see cref="ExtensionSource"/>.</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>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 ExtensionSource other && Equals(other);
+
+    /// <inheritdoc />
+    public bool Equals(ExtensionSource 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{ExtensionSource}"/> for serializing <see cref="ExtensionSource"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<ExtensionSource>
+    {
+        /// <inheritdoc />
+        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, ExtensionSource value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ExtensionSource));
+        }
+    }
+}
+
+
+/// <summary>Current status: running, disabled, failed, or starting.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct ExtensionStatus : IEquatable<ExtensionStatus>
+{
+    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>
+    [JsonConstructor]
+    public ExtensionStatus(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
+
+    /// <summary>Gets the value associated with this <see cref="ExtensionStatus"/>.</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>The extension failed to start or crashed.</summary>
+    public static ExtensionStatus Failed { get; } = new("failed");
+
+    /// <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 ExtensionStatus other && Equals(other);
+
+    /// <inheritdoc />
+    public bool Equals(ExtensionStatus 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{ExtensionStatus}"/> for serializing <see cref="ExtensionStatus"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<ExtensionStatus>
+    {
+        /// <inheritdoc />
+        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, ExtensionStatus value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ExtensionStatus));
+        }
+    }
+}
+
+
+/// <summary>Type of GitHub reference.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct PushAttachmentGitHubReferenceType : IEquatable<PushAttachmentGitHubReferenceType>
+{
+    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>
+    [JsonConstructor]
+    public PushAttachmentGitHubReferenceType(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
+
+    /// <summary>Gets the value associated with this <see cref="PushAttachmentGitHubReferenceType"/>.</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>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 PushAttachmentGitHubReferenceType other && Equals(other);
+
+    /// <inheritdoc />
+    public bool Equals(PushAttachmentGitHubReferenceType 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{PushAttachmentGitHubReferenceType}"/> for serializing <see cref="PushAttachmentGitHubReferenceType"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<PushAttachmentGitHubReferenceType>
+    {
+        /// <inheritdoc />
+        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, PushAttachmentGitHubReferenceType value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(PushAttachmentGitHubReferenceType));
+        }
+    }
+}
+
+
+/// <summary>Custom input-format kind.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct BuiltinToolFormatType : IEquatable<BuiltinToolFormatType>
+{
+    private readonly string? _value;
+
+    /// <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 BuiltinToolFormatType(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
+
+    /// <summary>Gets the value associated with this <see cref="BuiltinToolFormatType"/>.</summary>
+    public string Value => _value ?? string.Empty;
+
+    /// <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="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="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 BuiltinToolFormatType other && Equals(other);
+
+    /// <inheritdoc />
+    public bool Equals(BuiltinToolFormatType 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{BuiltinToolFormatType}"/> for serializing <see cref="BuiltinToolFormatType"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<BuiltinToolFormatType>
+    {
+        /// <inheritdoc />
+        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, BuiltinToolFormatType value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(BuiltinToolFormatType));
+        }
+    }
+}
+
+
+/// <summary>Root JSON Schema type for a built-in tool input.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct BuiltinToolInputSchemaType : IEquatable<BuiltinToolInputSchemaType>
+{
+    private readonly string? _value;
+
+    /// <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 BuiltinToolInputSchemaType(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
+
+    /// <summary>Gets the value associated with this <see cref="BuiltinToolInputSchemaType"/>.</summary>
+    public string Value => _value ?? string.Empty;
+
+    /// <summary>The tool accepts a JSON object.</summary>
+    public static BuiltinToolInputSchemaType Object { get; } = new("object");
+
+    /// <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="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 BuiltinToolInputSchemaType other && Equals(other);
+
+    /// <inheritdoc />
+    public bool Equals(BuiltinToolInputSchemaType 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{BuiltinToolInputSchemaType}"/> for serializing <see cref="BuiltinToolInputSchemaType"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<BuiltinToolInputSchemaType>
+    {
+        /// <inheritdoc />
+        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, BuiltinToolInputSchemaType value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(BuiltinToolInputSchemaType));
+        }
+    }
+}
+
+
+/// <summary>Binary result type discriminator. Use "image" for images and "resource" for other binary data.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct ExternalToolTextResultForLlmBinaryResultsForLlmType : IEquatable<ExternalToolTextResultForLlmBinaryResultsForLlmType>
+{
+    private readonly string? _value;
+
+    /// <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 ExternalToolTextResultForLlmBinaryResultsForLlmType(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
+
+    /// <summary>Gets the value associated with this <see cref="ExternalToolTextResultForLlmBinaryResultsForLlmType"/>.</summary>
+    public string Value => _value ?? string.Empty;
+
+    /// <summary>Binary image data.</summary>
+    public static ExternalToolTextResultForLlmBinaryResultsForLlmType Image { get; } = new("image");
+
+    /// <summary>Other binary resource data.</summary>
+    public static ExternalToolTextResultForLlmBinaryResultsForLlmType Resource { get; } = new("resource");
+
+    /// <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);
@@ -38428,62 +43563,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(global::GitHub.Copilot.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);
@@ -38491,62 +43626,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(global::GitHub.Copilot.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);
@@ -38554,68 +43698,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(global::GitHub.Copilot.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);
@@ -38623,68 +43761,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(global::GitHub.Copilot.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);
@@ -38692,65 +43827,62 @@ 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>A session-scoped sandbox transition applied while handling a slash command.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct PushAttachmentGitHubReferenceType : IEquatable<PushAttachmentGitHubReferenceType>
+public readonly struct SandboxSessionChange : IEquatable<SandboxSessionChange>
 {
     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="SandboxSessionChange"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="SandboxSessionChange"/>.</param>
     [JsonConstructor]
-    public PushAttachmentGitHubReferenceType(string value)
+    public SandboxSessionChange(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="SandboxSessionChange"/>.</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>The sandbox is off for the rest of this session; nothing was persisted and a new session starts from managed policy.</summary>
+    public static SandboxSessionChange Disabled { get; } = new("disabled");
 
-    /// <summary>GitHub discussion reference.</summary>
-    public static PushAttachmentGitHubReferenceType Discussion { get; } = new("discussion");
+    /// <summary>A previous session-scoped opt-out was cleared and the sandbox is enforced again.</summary>
+    public static SandboxSessionChange Restored { get; } = new("restored");
 
-    /// <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="SandboxSessionChange"/> instances are equivalent.</summary>
+    public static bool operator ==(SandboxSessionChange left, SandboxSessionChange 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="SandboxSessionChange"/> instances are not equivalent.</summary>
+    public static bool operator !=(SandboxSessionChange left, SandboxSessionChange right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is PushAttachmentGitHubReferenceType other && Equals(other);
+    public override bool Equals(object? obj) => obj is SandboxSessionChange other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(PushAttachmentGitHubReferenceType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(SandboxSessionChange other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -38758,59 +43890,59 @@ 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{SandboxSessionChange}"/> for serializing <see cref="SandboxSessionChange"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<PushAttachmentGitHubReferenceType>
+    public sealed class Converter : JsonConverter<SandboxSessionChange>
     {
         /// <inheritdoc />
-        public override PushAttachmentGitHubReferenceType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override SandboxSessionChange 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, SandboxSessionChange value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(PushAttachmentGitHubReferenceType));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SandboxSessionChange));
         }
     }
 }
 
 
-/// <summary>Custom input-format kind.</summary>
+/// <summary>Defines the allowed values.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct BuiltinToolFormatType : IEquatable<BuiltinToolFormatType>
+public readonly struct CommandsInvocationOrigin : IEquatable<CommandsInvocationOrigin>
 {
     private readonly string? _value;
 
-    /// <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>
+    /// <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 BuiltinToolFormatType(string value)
+    public CommandsInvocationOrigin(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="BuiltinToolFormatType"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="CommandsInvocationOrigin"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>The tool input is parsed with the supplied grammar.</summary>
-    public static BuiltinToolFormatType Grammar { get; } = new("grammar");
+    /// <summary>Gets the <c>settings</c> value.</summary>
+    public static CommandsInvocationOrigin Settings { get; } = new("settings");
 
-    /// <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="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="BuiltinToolFormatType"/> instances are not equivalent.</summary>
-    public static bool operator !=(BuiltinToolFormatType left, BuiltinToolFormatType 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 BuiltinToolFormatType other && Equals(other);
+    public override bool Equals(object? obj) => obj is CommandsInvocationOrigin other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(BuiltinToolFormatType 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);
@@ -38818,59 +43950,62 @@ public BuiltinToolFormatType(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{BuiltinToolFormatType}"/> for serializing <see cref="BuiltinToolFormatType"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{CommandsInvocationOrigin}"/> for serializing <see cref="CommandsInvocationOrigin"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<BuiltinToolFormatType>
+    public sealed class Converter : JsonConverter<CommandsInvocationOrigin>
     {
         /// <inheritdoc />
-        public override BuiltinToolFormatType 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, BuiltinToolFormatType value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, CommandsInvocationOrigin value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(BuiltinToolFormatType));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(CommandsInvocationOrigin));
         }
     }
 }
 
 
-/// <summary>Root JSON Schema type for a built-in tool input.</summary>
+/// <summary>Whether a pending slash-command invocation effect was applied or cancelled by the host.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct BuiltinToolInputSchemaType : IEquatable<BuiltinToolInputSchemaType>
+public readonly struct CommandsInvocationEffectOutcome : IEquatable<CommandsInvocationEffectOutcome>
 {
     private readonly string? _value;
 
-    /// <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>
+    /// <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 BuiltinToolInputSchemaType(string value)
+    public CommandsInvocationEffectOutcome(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="BuiltinToolInputSchemaType"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="CommandsInvocationEffectOutcome"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>The tool accepts a JSON object.</summary>
-    public static BuiltinToolInputSchemaType Object { get; } = new("object");
+    /// <summary>The host applied the pending invocation effect.</summary>
+    public static CommandsInvocationEffectOutcome Applied { get; } = new("applied");
 
-    /// <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>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="BuiltinToolInputSchemaType"/> instances are not equivalent.</summary>
-    public static bool operator !=(BuiltinToolInputSchemaType left, BuiltinToolInputSchemaType right) => !(left == 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="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 BuiltinToolInputSchemaType other && Equals(other);
+    public override bool Equals(object? obj) => obj is CommandsInvocationEffectOutcome other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(BuiltinToolInputSchemaType 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);
@@ -38878,62 +44013,65 @@ public BuiltinToolInputSchemaType(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{BuiltinToolInputSchemaType}"/> for serializing <see cref="BuiltinToolInputSchemaType"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{CommandsInvocationEffectOutcome}"/> for serializing <see cref="CommandsInvocationEffectOutcome"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<BuiltinToolInputSchemaType>
+    public sealed class Converter : JsonConverter<CommandsInvocationEffectOutcome>
     {
         /// <inheritdoc />
-        public override BuiltinToolInputSchemaType 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, BuiltinToolInputSchemaType value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, CommandsInvocationEffectOutcome value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(BuiltinToolInputSchemaType));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(CommandsInvocationEffectOutcome));
         }
     }
 }
 
 
-/// <summary>Binary result type discriminator. Use "image" for images and "resource" for other binary data.</summary>
+/// <summary>The user's response: accept (submitted), decline (rejected), or cancel (dismissed).</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct ExternalToolTextResultForLlmBinaryResultsForLlmType : IEquatable<ExternalToolTextResultForLlmBinaryResultsForLlmType>
+public readonly struct UIElicitationResponseAction : IEquatable<UIElicitationResponseAction>
 {
     private readonly string? _value;
 
-    /// <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>
+    /// <summary>Initializes a new instance of the <see cref="UIElicitationResponseAction"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="UIElicitationResponseAction"/>.</param>
     [JsonConstructor]
-    public ExternalToolTextResultForLlmBinaryResultsForLlmType(string value)
+    public UIElicitationResponseAction(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="ExternalToolTextResultForLlmBinaryResultsForLlmType"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="UIElicitationResponseAction"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Binary image data.</summary>
-    public static ExternalToolTextResultForLlmBinaryResultsForLlmType Image { get; } = new("image");
+    /// <summary>The user submitted the requested form values.</summary>
+    public static UIElicitationResponseAction Accept { get; } = new("accept");
 
-    /// <summary>Other binary resource data.</summary>
-    public static ExternalToolTextResultForLlmBinaryResultsForLlmType Resource { get; } = new("resource");
+    /// <summary>The user explicitly declined to provide the requested input.</summary>
+    public static UIElicitationResponseAction Decline { get; } = new("decline");
 
-    /// <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>The user dismissed the elicitation request.</summary>
+    public static UIElicitationResponseAction Cancel { get; } = new("cancel");
 
-    /// <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);
+    /// <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 ExternalToolTextResultForLlmBinaryResultsForLlmType other && Equals(other);
+    public override bool Equals(object? obj) => obj is UIElicitationResponseAction other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(ExternalToolTextResultForLlmBinaryResultsForLlmType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(UIElicitationResponseAction other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -38941,62 +44079,59 @@ public ExternalToolTextResultForLlmBinaryResultsForLlmType(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{ExternalToolTextResultForLlmBinaryResultsForLlmType}"/> for serializing <see cref="ExternalToolTextResultForLlmBinaryResultsForLlmType"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{UIElicitationResponseAction}"/> for serializing <see cref="UIElicitationResponseAction"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<ExternalToolTextResultForLlmBinaryResultsForLlmType>
+    public sealed class Converter : JsonConverter<UIElicitationResponseAction>
     {
         /// <inheritdoc />
-        public override ExternalToolTextResultForLlmBinaryResultsForLlmType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        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, ExternalToolTextResultForLlmBinaryResultsForLlmType value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, UIElicitationResponseAction value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ExternalToolTextResultForLlmBinaryResultsForLlmType));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(UIElicitationResponseAction));
         }
     }
 }
 
 
-/// <summary>Theme variant this icon is intended for.</summary>
+/// <summary>Structured MCP elicitation mode.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct ExternalToolTextResultForLlmContentResourceLinkIconTheme : IEquatable<ExternalToolTextResultForLlmContentResourceLinkIconTheme>
+public readonly struct McpElicitationFormMode : IEquatable<McpElicitationFormMode>
 {
     private readonly string? _value;
 
-    /// <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>
+    /// <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 ExternalToolTextResultForLlmContentResourceLinkIconTheme(string value)
+    public McpElicitationFormMode(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="ExternalToolTextResultForLlmContentResourceLinkIconTheme"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="McpElicitationFormMode"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Icon intended for light themes.</summary>
-    public static ExternalToolTextResultForLlmContentResourceLinkIconTheme Light { get; } = new("light");
-
-    /// <summary>Icon intended for dark themes.</summary>
-    public static ExternalToolTextResultForLlmContentResourceLinkIconTheme Dark { get; } = new("dark");
+    /// <summary>Gets the <c>form</c> value.</summary>
+    public static McpElicitationFormMode Form { get; } = new("form");
 
-    /// <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="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="ExternalToolTextResultForLlmContentResourceLinkIconTheme"/> instances are not equivalent.</summary>
-    public static bool operator !=(ExternalToolTextResultForLlmContentResourceLinkIconTheme left, ExternalToolTextResultForLlmContentResourceLinkIconTheme right) => !(left == 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 ExternalToolTextResultForLlmContentResourceLinkIconTheme other && Equals(other);
+    public override bool Equals(object? obj) => obj is McpElicitationFormMode other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(ExternalToolTextResultForLlmContentResourceLinkIconTheme 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);
@@ -39004,71 +44139,65 @@ public ExternalToolTextResultForLlmContentResourceLinkIconTheme(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{ExternalToolTextResultForLlmContentResourceLinkIconTheme}"/> for serializing <see cref="ExternalToolTextResultForLlmContentResourceLinkIconTheme"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{McpElicitationFormMode}"/> for serializing <see cref="McpElicitationFormMode"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<ExternalToolTextResultForLlmContentResourceLinkIconTheme>
+    public sealed class Converter : JsonConverter<McpElicitationFormMode>
     {
         /// <inheritdoc />
-        public override ExternalToolTextResultForLlmContentResourceLinkIconTheme 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, ExternalToolTextResultForLlmContentResourceLinkIconTheme value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, McpElicitationFormMode value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ExternalToolTextResultForLlmContentResourceLinkIconTheme));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(McpElicitationFormMode));
         }
     }
 }
 
 
-/// <summary>Execution outcome classification.</summary>
+/// <summary>User's choice for auto-mode switching: yes (allow this turn), yes_always (allow + persist as setting), or no (decline).</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct ToolResultType : IEquatable<ToolResultType>
+public readonly struct UIAutoModeSwitchResponse : IEquatable<UIAutoModeSwitchResponse>
 {
     private readonly string? _value;
 
-    /// <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>
+    /// <summary>Initializes a new instance of the <see cref="UIAutoModeSwitchResponse"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="UIAutoModeSwitchResponse"/>.</param>
     [JsonConstructor]
-    public ToolResultType(string value)
+    public UIAutoModeSwitchResponse(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="ToolResultType"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="UIAutoModeSwitchResponse"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>The tool completed successfully.</summary>
-    public static ToolResultType Success { get; } = new("success");
-
-    /// <summary>The tool failed.</summary>
-    public static ToolResultType Failure { get; } = new("failure");
-
-    /// <summary>The tool exceeded its execution timeout.</summary>
-    public static ToolResultType Timeout { get; } = new("timeout");
+    /// <summary>Allow the automatic mode switch for this turn.</summary>
+    public static UIAutoModeSwitchResponse Yes { get; } = new("yes");
 
-    /// <summary>The tool request was rejected before execution.</summary>
-    public static ToolResultType Rejected { get; } = new("rejected");
+    /// <summary>Allow this mode switch and persist the preference.</summary>
+    public static UIAutoModeSwitchResponse YesAlways { get; } = new("yes_always");
 
-    /// <summary>Permission policy denied the tool request.</summary>
-    public static ToolResultType Denied { get; } = new("denied");
+    /// <summary>Decline the automatic mode switch.</summary>
+    public static UIAutoModeSwitchResponse No { get; } = new("no");
 
-    /// <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="UIAutoModeSwitchResponse"/> instances are equivalent.</summary>
+    public static bool operator ==(UIAutoModeSwitchResponse left, UIAutoModeSwitchResponse 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);
+    /// <summary>Returns a value indicating whether two <see cref="UIAutoModeSwitchResponse"/> instances are not equivalent.</summary>
+    public static bool operator !=(UIAutoModeSwitchResponse left, UIAutoModeSwitchResponse right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is ToolResultType other && Equals(other);
+    public override bool Equals(object? obj) => obj is UIAutoModeSwitchResponse other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(ToolResultType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(UIAutoModeSwitchResponse other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -39076,62 +44205,68 @@ public ToolResultType(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{ToolResultType}"/> for serializing <see cref="ToolResultType"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{UIAutoModeSwitchResponse}"/> for serializing <see cref="UIAutoModeSwitchResponse"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<ToolResultType>
+    public sealed class Converter : JsonConverter<UIAutoModeSwitchResponse>
     {
         /// <inheritdoc />
-        public override ToolResultType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override UIAutoModeSwitchResponse Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, ToolResultType value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, UIAutoModeSwitchResponse value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ToolResultType));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(UIAutoModeSwitchResponse));
         }
     }
 }
 
 
-/// <summary>Controls whether the runtime may defer loading an external tool definition.</summary>
+/// <summary>User action selected for an exhausted session limit.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct ProtocolExternalToolDefer : IEquatable<ProtocolExternalToolDefer>
+public readonly struct UISessionLimitsExhaustedResponseAction : IEquatable<UISessionLimitsExhaustedResponseAction>
 {
     private readonly string? _value;
 
-    /// <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>
+    /// <summary>Initializes a new instance of the <see cref="UISessionLimitsExhaustedResponseAction"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="UISessionLimitsExhaustedResponseAction"/>.</param>
     [JsonConstructor]
-    public ProtocolExternalToolDefer(string value)
+    public UISessionLimitsExhaustedResponseAction(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="ProtocolExternalToolDefer"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="UISessionLimitsExhaustedResponseAction"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>The runtime may defer the tool according to its tool-loading policy.</summary>
-    public static ProtocolExternalToolDefer Auto { get; } = new("auto");
+    /// <summary>Increase the current max by an exact AI Credits amount.</summary>
+    public static UISessionLimitsExhaustedResponseAction Add { get; } = new("add");
 
-    /// <summary>The runtime must include the tool without deferring it.</summary>
-    public static ProtocolExternalToolDefer Never { get; } = new("never");
+    /// <summary>Set a new absolute max AI Credits value.</summary>
+    public static UISessionLimitsExhaustedResponseAction Set { get; } = new("set");
 
-    /// <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>Remove the current session limit.</summary>
+    public static UISessionLimitsExhaustedResponseAction Unset { get; } = new("unset");
 
-    /// <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);
+    /// <summary>Leave the limit unchanged and cancel the blocked model request.</summary>
+    public static UISessionLimitsExhaustedResponseAction Cancel { get; } = new("cancel");
+
+    /// <summary>Returns a value indicating whether two <see cref="UISessionLimitsExhaustedResponseAction"/> instances are equivalent.</summary>
+    public static bool operator ==(UISessionLimitsExhaustedResponseAction left, UISessionLimitsExhaustedResponseAction right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="UISessionLimitsExhaustedResponseAction"/> instances are not equivalent.</summary>
+    public static bool operator !=(UISessionLimitsExhaustedResponseAction left, UISessionLimitsExhaustedResponseAction right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is ProtocolExternalToolDefer other && Equals(other);
+    public override bool Equals(object? obj) => obj is UISessionLimitsExhaustedResponseAction other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(ProtocolExternalToolDefer other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(UISessionLimitsExhaustedResponseAction other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -39139,65 +44274,68 @@ public ProtocolExternalToolDefer(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{ProtocolExternalToolDefer}"/> for serializing <see cref="ProtocolExternalToolDefer"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{UISessionLimitsExhaustedResponseAction}"/> for serializing <see cref="UISessionLimitsExhaustedResponseAction"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<ProtocolExternalToolDefer>
+    public sealed class Converter : JsonConverter<UISessionLimitsExhaustedResponseAction>
     {
         /// <inheritdoc />
-        public override ProtocolExternalToolDefer Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override UISessionLimitsExhaustedResponseAction Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, ProtocolExternalToolDefer value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, UISessionLimitsExhaustedResponseAction value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ProtocolExternalToolDefer));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(UISessionLimitsExhaustedResponseAction));
         }
     }
 }
 
 
-/// <summary>Context tier override for matching subagents.</summary>
+/// <summary>The action the user selected. Defaults to 'autopilot' when autoApproveEdits is true, otherwise 'interactive'.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct SubagentSettingsEntryContextTier : IEquatable<SubagentSettingsEntryContextTier>
+public readonly struct UIExitPlanModeAction : IEquatable<UIExitPlanModeAction>
 {
     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="UIExitPlanModeAction"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="UIExitPlanModeAction"/>.</param>
     [JsonConstructor]
-    public SubagentSettingsEntryContextTier(string value)
+    public UIExitPlanModeAction(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="UIExitPlanModeAction"/>.</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>Exit plan mode without starting implementation.</summary>
+    public static UIExitPlanModeAction ExitOnly { get; } = new("exit_only");
 
-    /// <summary>Use the model's default context window.</summary>
-    public static SubagentSettingsEntryContextTier Default { get; } = new("default");
+    /// <summary>Exit plan mode and continue interactively.</summary>
+    public static UIExitPlanModeAction Interactive { get; } = new("interactive");
 
-    /// <summary>Pin the subagent to the long-context tier when supported.</summary>
-    public static SubagentSettingsEntryContextTier LongContext { get; } = new("long_context");
+    /// <summary>Exit plan mode and continue in autopilot mode.</summary>
+    public static UIExitPlanModeAction Autopilot { get; } = new("autopilot");
 
-    /// <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>Exit plan mode and continue in autopilot mode with parallel subagent execution.</summary>
+    public static UIExitPlanModeAction AutopilotFleet { get; } = new("autopilot_fleet");
 
-    /// <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="UIExitPlanModeAction"/> instances are equivalent.</summary>
+    public static bool operator ==(UIExitPlanModeAction left, UIExitPlanModeAction right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="UIExitPlanModeAction"/> instances are not equivalent.</summary>
+    public static bool operator !=(UIExitPlanModeAction left, UIExitPlanModeAction right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is SubagentSettingsEntryContextTier other && Equals(other);
+    public override bool Equals(object? obj) => obj is UIExitPlanModeAction other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(SubagentSettingsEntryContextTier other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(UIExitPlanModeAction other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -39205,62 +44343,62 @@ 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{UIExitPlanModeAction}"/> for serializing <see cref="UIExitPlanModeAction"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<SubagentSettingsEntryContextTier>
+    public sealed class Converter : JsonConverter<UIExitPlanModeAction>
     {
         /// <inheritdoc />
-        public override SubagentSettingsEntryContextTier Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override UIExitPlanModeAction 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, UIExitPlanModeAction value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SubagentSettingsEntryContextTier));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(UIExitPlanModeAction));
         }
     }
 }
 
 
-/// <summary>A session-scoped sandbox transition applied while handling a slash command.</summary>
+/// <summary>Allowed values for the `PermissionsConfigureAdditionalContentExclusionPolicyScope` enumeration.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct SandboxSessionChange : IEquatable<SandboxSessionChange>
+public readonly struct PermissionsConfigureAdditionalContentExclusionPolicyScope : IEquatable<PermissionsConfigureAdditionalContentExclusionPolicyScope>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="SandboxSessionChange"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="SandboxSessionChange"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="PermissionsConfigureAdditionalContentExclusionPolicyScope"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="PermissionsConfigureAdditionalContentExclusionPolicyScope"/>.</param>
     [JsonConstructor]
-    public SandboxSessionChange(string value)
+    public PermissionsConfigureAdditionalContentExclusionPolicyScope(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="SandboxSessionChange"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="PermissionsConfigureAdditionalContentExclusionPolicyScope"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>The sandbox is off for the rest of this session; nothing was persisted and a new session starts from managed policy.</summary>
-    public static SandboxSessionChange Disabled { get; } = new("disabled");
+    /// <summary>The content exclusion policy applies to the current repository.</summary>
+    public static PermissionsConfigureAdditionalContentExclusionPolicyScope Repo { get; } = new("repo");
 
-    /// <summary>A previous session-scoped opt-out was cleared and the sandbox is enforced again.</summary>
-    public static SandboxSessionChange Restored { get; } = new("restored");
+    /// <summary>The content exclusion policy applies across all repositories.</summary>
+    public static PermissionsConfigureAdditionalContentExclusionPolicyScope All { get; } = new("all");
 
-    /// <summary>Returns a value indicating whether two <see cref="SandboxSessionChange"/> instances are equivalent.</summary>
-    public static bool operator ==(SandboxSessionChange left, SandboxSessionChange right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="PermissionsConfigureAdditionalContentExclusionPolicyScope"/> instances are equivalent.</summary>
+    public static bool operator ==(PermissionsConfigureAdditionalContentExclusionPolicyScope left, PermissionsConfigureAdditionalContentExclusionPolicyScope right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="SandboxSessionChange"/> instances are not equivalent.</summary>
-    public static bool operator !=(SandboxSessionChange left, SandboxSessionChange right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="PermissionsConfigureAdditionalContentExclusionPolicyScope"/> instances are not equivalent.</summary>
+    public static bool operator !=(PermissionsConfigureAdditionalContentExclusionPolicyScope left, PermissionsConfigureAdditionalContentExclusionPolicyScope right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is SandboxSessionChange other && Equals(other);
+    public override bool Equals(object? obj) => obj is PermissionsConfigureAdditionalContentExclusionPolicyScope other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(SandboxSessionChange other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(PermissionsConfigureAdditionalContentExclusionPolicyScope other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -39268,59 +44406,71 @@ public SandboxSessionChange(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{SandboxSessionChange}"/> for serializing <see cref="SandboxSessionChange"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{PermissionsConfigureAdditionalContentExclusionPolicyScope}"/> for serializing <see cref="PermissionsConfigureAdditionalContentExclusionPolicyScope"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<SandboxSessionChange>
+    public sealed class Converter : JsonConverter<PermissionsConfigureAdditionalContentExclusionPolicyScope>
     {
         /// <inheritdoc />
-        public override SandboxSessionChange Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override PermissionsConfigureAdditionalContentExclusionPolicyScope Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, SandboxSessionChange value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, PermissionsConfigureAdditionalContentExclusionPolicyScope value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SandboxSessionChange));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(PermissionsConfigureAdditionalContentExclusionPolicyScope));
         }
     }
 }
 
 
-/// <summary>Defines the allowed values.</summary>
+/// <summary>Optional source for allow-all telemetry. Defaults to `rpc` when omitted for SDK callers.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct CommandsInvocationOrigin : IEquatable<CommandsInvocationOrigin>
+public readonly struct PermissionsSetApproveAllSource : IEquatable<PermissionsSetApproveAllSource>
 {
     private readonly string? _value;
 
-    /// <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>
+    /// <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 CommandsInvocationOrigin(string value)
+    public PermissionsSetApproveAllSource(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="CommandsInvocationOrigin"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="PermissionsSetApproveAllSource"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Gets the <c>settings</c> value.</summary>
-    public static CommandsInvocationOrigin Settings { get; } = new("settings");
+    /// <summary>Allow-all was enabled from a CLI command-line flag.</summary>
+    public static PermissionsSetApproveAllSource CliFlag { get; } = new("cli_flag");
 
-    /// <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>Allow-all was enabled by a slash command.</summary>
+    public static PermissionsSetApproveAllSource SlashCommand { get; } = new("slash_command");
 
-    /// <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);
+    /// <summary>Allow-all was enabled by confirming autopilot behavior.</summary>
+    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 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 CommandsInvocationOrigin other && Equals(other);
+    public override bool Equals(object? obj) => obj is PermissionsSetApproveAllSource other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(CommandsInvocationOrigin other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(PermissionsSetApproveAllSource other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -39328,62 +44478,74 @@ public CommandsInvocationOrigin(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{CommandsInvocationOrigin}"/> for serializing <see cref="CommandsInvocationOrigin"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{PermissionsSetApproveAllSource}"/> for serializing <see cref="PermissionsSetApproveAllSource"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<CommandsInvocationOrigin>
+    public sealed class Converter : JsonConverter<PermissionsSetApproveAllSource>
     {
         /// <inheritdoc />
-        public override CommandsInvocationOrigin Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        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, CommandsInvocationOrigin value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, PermissionsSetApproveAllSource value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(CommandsInvocationOrigin));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(PermissionsSetApproveAllSource));
         }
     }
 }
 
 
-/// <summary>Whether a pending slash-command invocation effect was applied or cancelled by the host.</summary>
+/// <summary>Optional source for permission-mode telemetry. `organization_targeting` is reserved for startup selection after the authenticated account matches an organization targeting policy; SDK callers default to `rpc` and cannot claim targeting provenance.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct CommandsInvocationEffectOutcome : IEquatable<CommandsInvocationEffectOutcome>
+public readonly struct PermissionModeSource : IEquatable<PermissionModeSource>
 {
     private readonly string? _value;
 
-    /// <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>
+    /// <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 CommandsInvocationEffectOutcome(string value)
+    public PermissionModeSource(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="CommandsInvocationEffectOutcome"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="PermissionModeSource"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>The host applied the pending invocation effect.</summary>
-    public static CommandsInvocationEffectOutcome Applied { get; } = new("applied");
+    /// <summary>The mode was set from a CLI command-line flag.</summary>
+    public static PermissionModeSource CliFlag { get; } = new("cli_flag");
 
-    /// <summary>The host cancelled the pending invocation effect, so any provisional state must be reverted.</summary>
-    public static CommandsInvocationEffectOutcome Cancelled { get; } = new("cancelled");
+    /// <summary>The mode was set by a slash command.</summary>
+    public static PermissionModeSource SlashCommand { get; } = new("slash_command");
 
-    /// <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>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="CommandsInvocationEffectOutcome"/> instances are not equivalent.</summary>
-    public static bool operator !=(CommandsInvocationEffectOutcome left, CommandsInvocationEffectOutcome right) => !(left == right);
+    /// <summary>The mode was set at startup by the `defaultPermissionMode` user setting.</summary>
+    public static PermissionModeSource UserSetting { get; } = new("user_setting");
+
+    /// <summary>The mode was set at startup because the authenticated account matched an organization targeting policy.</summary>
+    public static PermissionModeSource OrganizationTargeting { get; } = new("organization_targeting");
+
+    /// <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 CommandsInvocationEffectOutcome other && Equals(other);
+    public override bool Equals(object? obj) => obj is PermissionModeSource other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(CommandsInvocationEffectOutcome 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);
@@ -39391,65 +44553,62 @@ public CommandsInvocationEffectOutcome(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{CommandsInvocationEffectOutcome}"/> for serializing <see cref="CommandsInvocationEffectOutcome"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{PermissionModeSource}"/> for serializing <see cref="PermissionModeSource"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<CommandsInvocationEffectOutcome>
+    public sealed class Converter : JsonConverter<PermissionModeSource>
     {
         /// <inheritdoc />
-        public override CommandsInvocationEffectOutcome 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, CommandsInvocationEffectOutcome value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, PermissionModeSource value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(CommandsInvocationEffectOutcome));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(PermissionModeSource));
         }
     }
 }
 
 
-/// <summary>The user's response: accept (submitted), decline (rejected), or cancel (dismissed).</summary>
+/// <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>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct UIElicitationResponseAction : IEquatable<UIElicitationResponseAction>
+public readonly struct PermissionsModifyRulesScope : IEquatable<PermissionsModifyRulesScope>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="UIElicitationResponseAction"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="UIElicitationResponseAction"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="PermissionsModifyRulesScope"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="PermissionsModifyRulesScope"/>.</param>
     [JsonConstructor]
-    public UIElicitationResponseAction(string value)
+    public PermissionsModifyRulesScope(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="UIElicitationResponseAction"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="PermissionsModifyRulesScope"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>The user submitted the requested form values.</summary>
-    public static UIElicitationResponseAction Accept { get; } = new("accept");
-
-    /// <summary>The user explicitly declined to provide the requested input.</summary>
-    public static UIElicitationResponseAction Decline { get; } = new("decline");
+    /// <summary>Apply the rule change only to this session.</summary>
+    public static PermissionsModifyRulesScope Session { get; } = new("session");
 
-    /// <summary>The user dismissed the elicitation request.</summary>
-    public static UIElicitationResponseAction Cancel { get; } = new("cancel");
+    /// <summary>Persist the rule change for this project location.</summary>
+    public static PermissionsModifyRulesScope Location { get; } = new("location");
 
-    /// <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="PermissionsModifyRulesScope"/> instances are equivalent.</summary>
+    public static bool operator ==(PermissionsModifyRulesScope left, PermissionsModifyRulesScope 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);
+    /// <summary>Returns a value indicating whether two <see cref="PermissionsModifyRulesScope"/> instances are not equivalent.</summary>
+    public static bool operator !=(PermissionsModifyRulesScope left, PermissionsModifyRulesScope right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is UIElicitationResponseAction other && Equals(other);
+    public override bool Equals(object? obj) => obj is PermissionsModifyRulesScope other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(UIElicitationResponseAction other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(PermissionsModifyRulesScope other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -39457,59 +44616,62 @@ 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{PermissionsModifyRulesScope}"/> for serializing <see cref="PermissionsModifyRulesScope"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<UIElicitationResponseAction>
+    public sealed class Converter : JsonConverter<PermissionsModifyRulesScope>
     {
         /// <inheritdoc />
-        public override UIElicitationResponseAction Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override PermissionsModifyRulesScope 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, PermissionsModifyRulesScope value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(UIElicitationResponseAction));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(PermissionsModifyRulesScope));
         }
     }
 }
 
 
-/// <summary>Structured MCP elicitation mode.</summary>
+/// <summary>Whether the location is a git repo or directory.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct McpElicitationFormMode : IEquatable<McpElicitationFormMode>
+public readonly struct PermissionLocationType : IEquatable<PermissionLocationType>
 {
     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>
+    /// <summary>Initializes a new instance of the <see cref="PermissionLocationType"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="PermissionLocationType"/>.</param>
     [JsonConstructor]
-    public McpElicitationFormMode(string value)
+    public PermissionLocationType(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="McpElicitationFormMode"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="PermissionLocationType"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Gets the <c>form</c> value.</summary>
-    public static McpElicitationFormMode Form { get; } = new("form");
+    /// <summary>The permission location is persisted at the git repository root.</summary>
+    public static PermissionLocationType Repo { get; } = new("repo");
 
-    /// <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>The permission location is persisted at the working directory.</summary>
+    public static PermissionLocationType Dir { get; } = new("dir");
 
-    /// <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);
+    /// <summary>Returns a value indicating whether two <see cref="PermissionLocationType"/> instances are equivalent.</summary>
+    public static bool operator ==(PermissionLocationType left, PermissionLocationType right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="PermissionLocationType"/> instances are not equivalent.</summary>
+    public static bool operator !=(PermissionLocationType left, PermissionLocationType right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is McpElicitationFormMode other && Equals(other);
+    public override bool Equals(object? obj) => obj is PermissionLocationType other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(McpElicitationFormMode other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(PermissionLocationType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -39517,65 +44679,65 @@ public McpElicitationFormMode(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{McpElicitationFormMode}"/> for serializing <see cref="McpElicitationFormMode"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{PermissionLocationType}"/> for serializing <see cref="PermissionLocationType"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<McpElicitationFormMode>
+    public sealed class Converter : JsonConverter<PermissionLocationType>
     {
         /// <inheritdoc />
-        public override McpElicitationFormMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override PermissionLocationType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, McpElicitationFormMode value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, PermissionLocationType value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(McpElicitationFormMode));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(PermissionLocationType));
         }
     }
 }
 
 
-/// <summary>User's choice for auto-mode switching: yes (allow this turn), yes_always (allow + persist as setting), or no (decline).</summary>
+/// <summary>The current agent mode for this session (e.g., 'interactive', 'plan', 'autopilot').</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct UIAutoModeSwitchResponse : IEquatable<UIAutoModeSwitchResponse>
+public readonly struct MetadataSnapshotCurrentMode : IEquatable<MetadataSnapshotCurrentMode>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="UIAutoModeSwitchResponse"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="UIAutoModeSwitchResponse"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="MetadataSnapshotCurrentMode"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="MetadataSnapshotCurrentMode"/>.</param>
     [JsonConstructor]
-    public UIAutoModeSwitchResponse(string value)
+    public MetadataSnapshotCurrentMode(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="UIAutoModeSwitchResponse"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="MetadataSnapshotCurrentMode"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Allow the automatic mode switch for this turn.</summary>
-    public static UIAutoModeSwitchResponse Yes { get; } = new("yes");
+    /// <summary>The agent is responding interactively to the user.</summary>
+    public static MetadataSnapshotCurrentMode Interactive { get; } = new("interactive");
 
-    /// <summary>Allow this mode switch and persist the preference.</summary>
-    public static UIAutoModeSwitchResponse YesAlways { get; } = new("yes_always");
+    /// <summary>The agent is preparing a plan before making changes.</summary>
+    public static MetadataSnapshotCurrentMode Plan { get; } = new("plan");
 
-    /// <summary>Decline the automatic mode switch.</summary>
-    public static UIAutoModeSwitchResponse No { get; } = new("no");
+    /// <summary>The agent is working autonomously toward task completion.</summary>
+    public static MetadataSnapshotCurrentMode Autopilot { get; } = new("autopilot");
 
-    /// <summary>Returns a value indicating whether two <see cref="UIAutoModeSwitchResponse"/> instances are equivalent.</summary>
-    public static bool operator ==(UIAutoModeSwitchResponse left, UIAutoModeSwitchResponse right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="MetadataSnapshotCurrentMode"/> instances are equivalent.</summary>
+    public static bool operator ==(MetadataSnapshotCurrentMode left, MetadataSnapshotCurrentMode right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="UIAutoModeSwitchResponse"/> instances are not equivalent.</summary>
-    public static bool operator !=(UIAutoModeSwitchResponse left, UIAutoModeSwitchResponse right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="MetadataSnapshotCurrentMode"/> instances are not equivalent.</summary>
+    public static bool operator !=(MetadataSnapshotCurrentMode left, MetadataSnapshotCurrentMode right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is UIAutoModeSwitchResponse other && Equals(other);
+    public override bool Equals(object? obj) => obj is MetadataSnapshotCurrentMode other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(UIAutoModeSwitchResponse other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(MetadataSnapshotCurrentMode other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -39583,68 +44745,62 @@ public UIAutoModeSwitchResponse(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{UIAutoModeSwitchResponse}"/> for serializing <see cref="UIAutoModeSwitchResponse"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{MetadataSnapshotCurrentMode}"/> for serializing <see cref="MetadataSnapshotCurrentMode"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<UIAutoModeSwitchResponse>
+    public sealed class Converter : JsonConverter<MetadataSnapshotCurrentMode>
     {
         /// <inheritdoc />
-        public override UIAutoModeSwitchResponse Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override MetadataSnapshotCurrentMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, UIAutoModeSwitchResponse value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, MetadataSnapshotCurrentMode value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(UIAutoModeSwitchResponse));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(MetadataSnapshotCurrentMode));
         }
     }
 }
 
 
-/// <summary>User action selected for an exhausted session limit.</summary>
+/// <summary>Whether the remote task originated from Copilot Coding Agent (cca) or a CLI `--remote` invocation.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct UISessionLimitsExhaustedResponseAction : IEquatable<UISessionLimitsExhaustedResponseAction>
+public readonly struct MetadataSnapshotRemoteMetadataTaskType : IEquatable<MetadataSnapshotRemoteMetadataTaskType>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="UISessionLimitsExhaustedResponseAction"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="UISessionLimitsExhaustedResponseAction"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="MetadataSnapshotRemoteMetadataTaskType"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="MetadataSnapshotRemoteMetadataTaskType"/>.</param>
     [JsonConstructor]
-    public UISessionLimitsExhaustedResponseAction(string value)
+    public MetadataSnapshotRemoteMetadataTaskType(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="UISessionLimitsExhaustedResponseAction"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="MetadataSnapshotRemoteMetadataTaskType"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Increase the current max by an exact AI Credits amount.</summary>
-    public static UISessionLimitsExhaustedResponseAction Add { get; } = new("add");
-
-    /// <summary>Set a new absolute max AI Credits value.</summary>
-    public static UISessionLimitsExhaustedResponseAction Set { get; } = new("set");
-
-    /// <summary>Remove the current session limit.</summary>
-    public static UISessionLimitsExhaustedResponseAction Unset { get; } = new("unset");
+    /// <summary>Remote task originated from Copilot Coding Agent.</summary>
+    public static MetadataSnapshotRemoteMetadataTaskType Cca { get; } = new("cca");
 
-    /// <summary>Leave the limit unchanged and cancel the blocked model request.</summary>
-    public static UISessionLimitsExhaustedResponseAction Cancel { get; } = new("cancel");
+    /// <summary>Remote task originated from a CLI remote-session invocation.</summary>
+    public static MetadataSnapshotRemoteMetadataTaskType Cli { get; } = new("cli");
 
-    /// <summary>Returns a value indicating whether two <see cref="UISessionLimitsExhaustedResponseAction"/> instances are equivalent.</summary>
-    public static bool operator ==(UISessionLimitsExhaustedResponseAction left, UISessionLimitsExhaustedResponseAction right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="MetadataSnapshotRemoteMetadataTaskType"/> instances are equivalent.</summary>
+    public static bool operator ==(MetadataSnapshotRemoteMetadataTaskType left, MetadataSnapshotRemoteMetadataTaskType right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="UISessionLimitsExhaustedResponseAction"/> instances are not equivalent.</summary>
-    public static bool operator !=(UISessionLimitsExhaustedResponseAction left, UISessionLimitsExhaustedResponseAction right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="MetadataSnapshotRemoteMetadataTaskType"/> instances are not equivalent.</summary>
+    public static bool operator !=(MetadataSnapshotRemoteMetadataTaskType left, MetadataSnapshotRemoteMetadataTaskType right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is UISessionLimitsExhaustedResponseAction other && Equals(other);
+    public override bool Equals(object? obj) => obj is MetadataSnapshotRemoteMetadataTaskType other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(UISessionLimitsExhaustedResponseAction other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(MetadataSnapshotRemoteMetadataTaskType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -39652,68 +44808,62 @@ public UISessionLimitsExhaustedResponseAction(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{UISessionLimitsExhaustedResponseAction}"/> for serializing <see cref="UISessionLimitsExhaustedResponseAction"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{MetadataSnapshotRemoteMetadataTaskType}"/> for serializing <see cref="MetadataSnapshotRemoteMetadataTaskType"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<UISessionLimitsExhaustedResponseAction>
+    public sealed class Converter : JsonConverter<MetadataSnapshotRemoteMetadataTaskType>
     {
         /// <inheritdoc />
-        public override UISessionLimitsExhaustedResponseAction Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override MetadataSnapshotRemoteMetadataTaskType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, UISessionLimitsExhaustedResponseAction value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, MetadataSnapshotRemoteMetadataTaskType value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(UISessionLimitsExhaustedResponseAction));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(MetadataSnapshotRemoteMetadataTaskType));
         }
     }
 }
 
 
-/// <summary>The action the user selected. Defaults to 'autopilot' when autoApproveEdits is true, otherwise 'interactive'.</summary>
+/// <summary>Repository host type, if known.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct UIExitPlanModeAction : IEquatable<UIExitPlanModeAction>
+public readonly struct WorkspaceSummaryHostType : IEquatable<WorkspaceSummaryHostType>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="UIExitPlanModeAction"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="UIExitPlanModeAction"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="WorkspaceSummaryHostType"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="WorkspaceSummaryHostType"/>.</param>
     [JsonConstructor]
-    public UIExitPlanModeAction(string value)
+    public WorkspaceSummaryHostType(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="UIExitPlanModeAction"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="WorkspaceSummaryHostType"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Exit plan mode without starting implementation.</summary>
-    public static UIExitPlanModeAction ExitOnly { get; } = new("exit_only");
-
-    /// <summary>Exit plan mode and continue interactively.</summary>
-    public static UIExitPlanModeAction Interactive { get; } = new("interactive");
-
-    /// <summary>Exit plan mode and continue in autopilot mode.</summary>
-    public static UIExitPlanModeAction Autopilot { get; } = new("autopilot");
+    /// <summary>Workspace summary repository is hosted on GitHub.</summary>
+    public static WorkspaceSummaryHostType GitHub { get; } = new("github");
 
-    /// <summary>Exit plan mode and continue in autopilot mode with parallel subagent execution.</summary>
-    public static UIExitPlanModeAction AutopilotFleet { get; } = new("autopilot_fleet");
+    /// <summary>Workspace summary repository is hosted on Azure DevOps.</summary>
+    public static WorkspaceSummaryHostType Ado { get; } = new("ado");
 
-    /// <summary>Returns a value indicating whether two <see cref="UIExitPlanModeAction"/> instances are equivalent.</summary>
-    public static bool operator ==(UIExitPlanModeAction left, UIExitPlanModeAction right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="WorkspaceSummaryHostType"/> instances are equivalent.</summary>
+    public static bool operator ==(WorkspaceSummaryHostType left, WorkspaceSummaryHostType right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="UIExitPlanModeAction"/> instances are not equivalent.</summary>
-    public static bool operator !=(UIExitPlanModeAction left, UIExitPlanModeAction right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="WorkspaceSummaryHostType"/> instances are not equivalent.</summary>
+    public static bool operator !=(WorkspaceSummaryHostType left, WorkspaceSummaryHostType right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is UIExitPlanModeAction other && Equals(other);
+    public override bool Equals(object? obj) => obj is WorkspaceSummaryHostType other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(UIExitPlanModeAction other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(WorkspaceSummaryHostType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -39721,62 +44871,113 @@ public UIExitPlanModeAction(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{UIExitPlanModeAction}"/> for serializing <see cref="UIExitPlanModeAction"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{WorkspaceSummaryHostType}"/> for serializing <see cref="WorkspaceSummaryHostType"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<UIExitPlanModeAction>
+    public sealed class Converter : JsonConverter<WorkspaceSummaryHostType>
     {
         /// <inheritdoc />
-        public override UIExitPlanModeAction Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override WorkspaceSummaryHostType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, UIExitPlanModeAction value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, WorkspaceSummaryHostType value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(UIExitPlanModeAction));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(WorkspaceSummaryHostType));
         }
     }
 }
 
 
-/// <summary>Allowed values for the `PermissionsConfigureAdditionalContentExclusionPolicyScope` enumeration.</summary>
+/// <summary>Rust-owned settings predicates exposed across the SDK boundary. Raw feature-flag names are intentionally not part of the contract.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct PermissionsConfigureAdditionalContentExclusionPolicyScope : IEquatable<PermissionsConfigureAdditionalContentExclusionPolicyScope>
+public readonly struct SessionSettingsPredicateName : IEquatable<SessionSettingsPredicateName>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="PermissionsConfigureAdditionalContentExclusionPolicyScope"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="PermissionsConfigureAdditionalContentExclusionPolicyScope"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="SessionSettingsPredicateName"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="SessionSettingsPredicateName"/>.</param>
     [JsonConstructor]
-    public PermissionsConfigureAdditionalContentExclusionPolicyScope(string value)
+    public SessionSettingsPredicateName(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="PermissionsConfigureAdditionalContentExclusionPolicyScope"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="SessionSettingsPredicateName"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>The content exclusion policy applies to the current repository.</summary>
-    public static PermissionsConfigureAdditionalContentExclusionPolicyScope Repo { get; } = new("repo");
+    /// <summary>Whether the security-tools feature flag enables security tool wiring.</summary>
+    public static SessionSettingsPredicateName SecurityToolsEnabled { get; } = new("securityToolsEnabled");
 
-    /// <summary>The content exclusion policy applies across all repositories.</summary>
-    public static PermissionsConfigureAdditionalContentExclusionPolicyScope All { get; } = new("all");
+    /// <summary>Whether third-party security tools should receive the security prompt.</summary>
+    public static SessionSettingsPredicateName ThirdPartySecurityPromptEnabled { get; } = new("thirdPartySecurityPromptEnabled");
 
-    /// <summary>Returns a value indicating whether two <see cref="PermissionsConfigureAdditionalContentExclusionPolicyScope"/> instances are equivalent.</summary>
-    public static bool operator ==(PermissionsConfigureAdditionalContentExclusionPolicyScope left, PermissionsConfigureAdditionalContentExclusionPolicyScope right) => left.Equals(right);
+    /// <summary>Whether validation may run in parallel.</summary>
+    public static SessionSettingsPredicateName ParallelValidationEnabled { get; } = new("parallelValidationEnabled");
 
-    /// <summary>Returns a value indicating whether two <see cref="PermissionsConfigureAdditionalContentExclusionPolicyScope"/> instances are not equivalent.</summary>
-    public static bool operator !=(PermissionsConfigureAdditionalContentExclusionPolicyScope left, PermissionsConfigureAdditionalContentExclusionPolicyScope right) => !(left == right);
+    /// <summary>Whether runtime timing telemetry is enabled.</summary>
+    public static SessionSettingsPredicateName RuntimeTimingTelemetryEnabled { get; } = new("runtimeTimingTelemetryEnabled");
+
+    /// <summary>Whether the co-author hook is enabled.</summary>
+    public static SessionSettingsPredicateName CoAuthorHookEnabled { get; } = new("coAuthorHookEnabled");
+
+    /// <summary>Whether Chronicle integration is enabled.</summary>
+    public static SessionSettingsPredicateName ChronicleEnabled { get; } = new("chronicleEnabled");
+
+    /// <summary>Whether content-exclusion policy may self-fetch data.</summary>
+    public static SessionSettingsPredicateName ContentExclusionSelfFetchEnabled { get; } = new("contentExclusionSelfFetchEnabled");
+
+    /// <summary>Whether Claude Opus token-limit caps should be applied.</summary>
+    public static SessionSettingsPredicateName CapClaudeOpusTokenLimitsEnabled { get; } = new("capClaudeOpusTokenLimitsEnabled");
+
+    /// <summary>Whether code-review behavior is enabled.</summary>
+    public static SessionSettingsPredicateName CodeReviewFeatureEnabled { get; } = new("codeReviewFeatureEnabled");
+
+    /// <summary>Whether CCA should use the TypeScript autofind behavior.</summary>
+    public static SessionSettingsPredicateName CcaUseTsAutofindEnabled { get; } = new("ccaUseTsAutofindEnabled");
+
+    /// <summary>Whether the dependency checker is enabled.</summary>
+    public static SessionSettingsPredicateName DependencyCheckerEnabled { get; } = new("dependencyCheckerEnabled");
+
+    /// <summary>Whether the Dependabot checker is enabled.</summary>
+    public static SessionSettingsPredicateName DependabotCheckerEnabled { get; } = new("dependabotCheckerEnabled");
+
+    /// <summary>Whether the CodeQL checker is enabled.</summary>
+    public static SessionSettingsPredicateName CodeqlCheckerEnabled { get; } = new("codeqlCheckerEnabled");
+
+    /// <summary>Whether trivial-change handling is enabled.</summary>
+    public static SessionSettingsPredicateName TrivialChangeEnabled { get; } = new("trivialChangeEnabled");
+
+    /// <summary>Whether trivial-change skip behavior is enabled.</summary>
+    public static SessionSettingsPredicateName TrivialChangeSkipEnabled { get; } = new("trivialChangeSkipEnabled");
+
+    /// <summary>Whether trivial-change handling is enabled for code review.</summary>
+    public static SessionSettingsPredicateName TrivialChangeEnabledForCodeReview { get; } = new("trivialChangeEnabledForCodeReview");
+
+    /// <summary>Whether trivial-change skip behavior is enabled for code review.</summary>
+    public static SessionSettingsPredicateName TrivialChangeSkipEnabledForCodeReview { get; } = new("trivialChangeSkipEnabledForCodeReview");
+
+    /// <summary>Whether trivial-change handling is enabled for a specific tool.</summary>
+    public static SessionSettingsPredicateName TrivialChangeEnabledForTool { get; } = new("trivialChangeEnabledForTool");
+
+    /// <summary>Whether trivial-change skip behavior is enabled for a specific tool.</summary>
+    public static SessionSettingsPredicateName TrivialChangeSkipEnabledForTool { get; } = new("trivialChangeSkipEnabledForTool");
+
+    /// <summary>Returns a value indicating whether two <see cref="SessionSettingsPredicateName"/> instances are equivalent.</summary>
+    public static bool operator ==(SessionSettingsPredicateName left, SessionSettingsPredicateName right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="SessionSettingsPredicateName"/> instances are not equivalent.</summary>
+    public static bool operator !=(SessionSettingsPredicateName left, SessionSettingsPredicateName right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is PermissionsConfigureAdditionalContentExclusionPolicyScope other && Equals(other);
+    public override bool Equals(object? obj) => obj is SessionSettingsPredicateName other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(PermissionsConfigureAdditionalContentExclusionPolicyScope other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(SessionSettingsPredicateName other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -39784,71 +44985,65 @@ public PermissionsConfigureAdditionalContentExclusionPolicyScope(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{PermissionsConfigureAdditionalContentExclusionPolicyScope}"/> for serializing <see cref="PermissionsConfigureAdditionalContentExclusionPolicyScope"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{SessionSettingsPredicateName}"/> for serializing <see cref="SessionSettingsPredicateName"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<PermissionsConfigureAdditionalContentExclusionPolicyScope>
+    public sealed class Converter : JsonConverter<SessionSettingsPredicateName>
     {
         /// <inheritdoc />
-        public override PermissionsConfigureAdditionalContentExclusionPolicyScope Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override SessionSettingsPredicateName Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, PermissionsConfigureAdditionalContentExclusionPolicyScope value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, SessionSettingsPredicateName value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(PermissionsConfigureAdditionalContentExclusionPolicyScope));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SessionSettingsPredicateName));
         }
     }
 }
 
 
-/// <summary>Optional source for allow-all telemetry. Defaults to `rpc` when omitted for SDK callers.</summary>
+/// <summary>Signal to send (default: SIGTERM).</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct PermissionsSetApproveAllSource : IEquatable<PermissionsSetApproveAllSource>
+public readonly struct ShellKillSignal : IEquatable<ShellKillSignal>
 {
     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="ShellKillSignal"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="ShellKillSignal"/>.</param>
     [JsonConstructor]
-    public PermissionsSetApproveAllSource(string value)
+    public ShellKillSignal(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="ShellKillSignal"/>.</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>Allow-all was enabled by a slash command.</summary>
-    public static PermissionsSetApproveAllSource SlashCommand { get; } = new("slash_command");
-
-    /// <summary>Allow-all was enabled by confirming autopilot behavior.</summary>
-    public static PermissionsSetApproveAllSource AutopilotConfirmation { get; } = new("autopilot_confirmation");
+    /// <summary>Request graceful process termination.</summary>
+    public static ShellKillSignal SIGTERM { get; } = new("SIGTERM");
 
-    /// <summary>Allow-all was enabled at startup by the `defaultPermissionMode` user setting.</summary>
-    public static PermissionsSetApproveAllSource UserSetting { get; } = new("user_setting");
+    /// <summary>Forcefully terminate the process.</summary>
+    public static ShellKillSignal SIGKILL { get; } = new("SIGKILL");
 
-    /// <summary>Allow-all was enabled through an RPC caller.</summary>
-    public static PermissionsSetApproveAllSource Rpc { get; } = new("rpc");
+    /// <summary>Send an interrupt signal to the process.</summary>
+    public static ShellKillSignal SIGINT { get; } = new("SIGINT");
 
-    /// <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="ShellKillSignal"/> instances are equivalent.</summary>
+    public static bool operator ==(ShellKillSignal left, ShellKillSignal 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);
+    /// <summary>Returns a value indicating whether two <see cref="ShellKillSignal"/> instances are not equivalent.</summary>
+    public static bool operator !=(ShellKillSignal left, ShellKillSignal right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is PermissionsSetApproveAllSource other && Equals(other);
+    public override bool Equals(object? obj) => obj is ShellKillSignal other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(PermissionsSetApproveAllSource other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(ShellKillSignal other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -39856,74 +45051,61 @@ 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{ShellKillSignal}"/> for serializing <see cref="ShellKillSignal"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<PermissionsSetApproveAllSource>
+    public sealed class Converter : JsonConverter<ShellKillSignal>
     {
         /// <inheritdoc />
-        public override PermissionsSetApproveAllSource Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override ShellKillSignal 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, ShellKillSignal value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(PermissionsSetApproveAllSource));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ShellKillSignal));
         }
     }
 }
 
 
-/// <summary>Optional source for permission-mode telemetry. `organization_targeting` is reserved for startup selection after the authenticated account matches an organization targeting policy; SDK callers default to `rpc` and cannot claim targeting provenance.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+/// <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>
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct PermissionModeSource : IEquatable<PermissionModeSource>
+public readonly struct SessionHistoryCompactRequestTrigger : IEquatable<SessionHistoryCompactRequestTrigger>
 {
     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>
+    /// <summary>Initializes a new instance of the <see cref="SessionHistoryCompactRequestTrigger"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="SessionHistoryCompactRequestTrigger"/>.</param>
     [JsonConstructor]
-    public PermissionModeSource(string value)
+    public SessionHistoryCompactRequestTrigger(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="PermissionModeSource"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="SessionHistoryCompactRequestTrigger"/>.</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>The mode was set at startup by the `defaultPermissionMode` user setting.</summary>
-    public static PermissionModeSource UserSetting { get; } = new("user_setting");
-
-    /// <summary>The mode was set at startup because the authenticated account matched an organization targeting policy.</summary>
-    public static PermissionModeSource OrganizationTargeting { get; } = new("organization_targeting");
+    /// <summary>User-requested compaction, e.g. the /compact command or a direct history.compact call.</summary>
+    public static SessionHistoryCompactRequestTrigger Manual { get; } = new("manual");
 
-    /// <summary>The mode was set through an RPC caller.</summary>
-    public static PermissionModeSource Rpc { get; } = new("rpc");
+    /// <summary>Compaction requested while switching to a model with a smaller context window.</summary>
+    public static SessionHistoryCompactRequestTrigger ModelSwitch { get; } = new("model_switch");
 
-    /// <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="SessionHistoryCompactRequestTrigger"/> instances are equivalent.</summary>
+    public static bool operator ==(SessionHistoryCompactRequestTrigger left, SessionHistoryCompactRequestTrigger 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);
+    /// <summary>Returns a value indicating whether two <see cref="SessionHistoryCompactRequestTrigger"/> instances are not equivalent.</summary>
+    public static bool operator !=(SessionHistoryCompactRequestTrigger left, SessionHistoryCompactRequestTrigger right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is PermissionModeSource other && Equals(other);
+    public override bool Equals(object? obj) => obj is SessionHistoryCompactRequestTrigger other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(PermissionModeSource other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(SessionHistoryCompactRequestTrigger other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -39931,62 +45113,65 @@ public PermissionModeSource(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{PermissionModeSource}"/> for serializing <see cref="PermissionModeSource"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{SessionHistoryCompactRequestTrigger}"/> for serializing <see cref="SessionHistoryCompactRequestTrigger"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<PermissionModeSource>
+    public sealed class Converter : JsonConverter<SessionHistoryCompactRequestTrigger>
     {
         /// <inheritdoc />
-        public override PermissionModeSource Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override SessionHistoryCompactRequestTrigger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, PermissionModeSource value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, SessionHistoryCompactRequestTrigger value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(PermissionModeSource));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SessionHistoryCompactRequestTrigger));
         }
     }
 }
 
 
-/// <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>
+/// <summary>Aggregate file change represented by a rewind preview.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct PermissionsModifyRulesScope : IEquatable<PermissionsModifyRulesScope>
+public readonly struct HistoryRewindChangeType : IEquatable<HistoryRewindChangeType>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="PermissionsModifyRulesScope"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="PermissionsModifyRulesScope"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="HistoryRewindChangeType"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="HistoryRewindChangeType"/>.</param>
     [JsonConstructor]
-    public PermissionsModifyRulesScope(string value)
+    public HistoryRewindChangeType(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="PermissionsModifyRulesScope"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="HistoryRewindChangeType"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Apply the rule change only to this session.</summary>
-    public static PermissionsModifyRulesScope Session { get; } = new("session");
+    /// <summary>The discarded turns created the file.</summary>
+    public static HistoryRewindChangeType Created { get; } = new("created");
 
-    /// <summary>Persist the rule change for this project location.</summary>
-    public static PermissionsModifyRulesScope Location { get; } = new("location");
+    /// <summary>The discarded turns deleted the file.</summary>
+    public static HistoryRewindChangeType Deleted { get; } = new("deleted");
 
-    /// <summary>Returns a value indicating whether two <see cref="PermissionsModifyRulesScope"/> instances are equivalent.</summary>
-    public static bool operator ==(PermissionsModifyRulesScope left, PermissionsModifyRulesScope right) => left.Equals(right);
+    /// <summary>The discarded turns modified the file.</summary>
+    public static HistoryRewindChangeType Modified { get; } = new("modified");
 
-    /// <summary>Returns a value indicating whether two <see cref="PermissionsModifyRulesScope"/> instances are not equivalent.</summary>
-    public static bool operator !=(PermissionsModifyRulesScope left, PermissionsModifyRulesScope right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="HistoryRewindChangeType"/> instances are equivalent.</summary>
+    public static bool operator ==(HistoryRewindChangeType left, HistoryRewindChangeType right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="HistoryRewindChangeType"/> instances are not equivalent.</summary>
+    public static bool operator !=(HistoryRewindChangeType left, HistoryRewindChangeType right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is PermissionsModifyRulesScope other && Equals(other);
+    public override bool Equals(object? obj) => obj is HistoryRewindChangeType other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(PermissionsModifyRulesScope other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(HistoryRewindChangeType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -39994,62 +45179,83 @@ public PermissionsModifyRulesScope(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{PermissionsModifyRulesScope}"/> for serializing <see cref="PermissionsModifyRulesScope"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{HistoryRewindChangeType}"/> for serializing <see cref="HistoryRewindChangeType"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<PermissionsModifyRulesScope>
+    public sealed class Converter : JsonConverter<HistoryRewindChangeType>
     {
         /// <inheritdoc />
-        public override PermissionsModifyRulesScope Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override HistoryRewindChangeType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, PermissionsModifyRulesScope value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, HistoryRewindChangeType value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(PermissionsModifyRulesScope));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(HistoryRewindChangeType));
         }
     }
 }
 
 
-/// <summary>Whether the location is a git repo or directory.</summary>
+/// <summary>Outcome of a rewind request.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct PermissionLocationType : IEquatable<PermissionLocationType>
+public readonly struct HistoryRewindOutcome : IEquatable<HistoryRewindOutcome>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="PermissionLocationType"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="PermissionLocationType"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="HistoryRewindOutcome"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="HistoryRewindOutcome"/>.</param>
     [JsonConstructor]
-    public PermissionLocationType(string value)
+    public HistoryRewindOutcome(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="PermissionLocationType"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="HistoryRewindOutcome"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>The permission location is persisted at the git repository root.</summary>
-    public static PermissionLocationType Repo { get; } = new("repo");
+    /// <summary>The requested rewind completed; reachable in either mode.</summary>
+    public static HistoryRewindOutcome Success { get; } = new("success");
 
-    /// <summary>The permission location is persisted at the working directory.</summary>
-    public static PermissionLocationType Dir { get; } = new("dir");
+    /// <summary>The session still has work that may mutate files or history; reachable in either mode.</summary>
+    public static HistoryRewindOutcome SessionBusy { get; } = new("session-busy");
 
-    /// <summary>Returns a value indicating whether two <see cref="PermissionLocationType"/> instances are equivalent.</summary>
-    public static bool operator ==(PermissionLocationType left, PermissionLocationType right) => left.Equals(right);
+    /// <summary>A conversation-and-files rewind was requested for a session that did not enable capture; conversation-only rewinds never produce this.</summary>
+    public static HistoryRewindOutcome FileChangeTrackingDisabled { get; } = new("file-change-tracking-disabled");
 
-    /// <summary>Returns a value indicating whether two <see cref="PermissionLocationType"/> instances are not equivalent.</summary>
-    public static bool operator !=(PermissionLocationType left, PermissionLocationType right) => !(left == right);
+    /// <summary>Remote-backed rewind routing is not supported; reachable in either mode.</summary>
+    public static HistoryRewindOutcome UnsupportedRemoteSession { get; } = new("unsupported-remote-session");
+
+    /// <summary>File restore failed and all applied file changes were rolled back; only conversation-and-files rewinds produce this.</summary>
+    public static HistoryRewindOutcome FilesRolledBack { get; } = new("files-rolled-back");
+
+    /// <summary>File restore failed and its rollback could not fully restore the pre-rewind state; only conversation-and-files rewinds produce this.</summary>
+    public static HistoryRewindOutcome RollbackIncomplete { get; } = new("rollback-incomplete");
+
+    /// <summary>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.</summary>
+    public static HistoryRewindOutcome TruncationFailed { get; } = new("truncation-failed");
+
+    /// <summary>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.</summary>
+    public static HistoryRewindOutcome CheckpointCleanupFailed { get; } = new("checkpoint-cleanup-failed");
+
+    /// <summary>Files and conversation were rewound, but obsolete file snapshots could not be removed; only conversation-and-files rewinds produce this.</summary>
+    public static HistoryRewindOutcome SnapshotPruneFailed { get; } = new("snapshot-prune-failed");
+
+    /// <summary>Returns a value indicating whether two <see cref="HistoryRewindOutcome"/> instances are equivalent.</summary>
+    public static bool operator ==(HistoryRewindOutcome left, HistoryRewindOutcome right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="HistoryRewindOutcome"/> instances are not equivalent.</summary>
+    public static bool operator !=(HistoryRewindOutcome left, HistoryRewindOutcome right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is PermissionLocationType other && Equals(other);
+    public override bool Equals(object? obj) => obj is HistoryRewindOutcome other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(PermissionLocationType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(HistoryRewindOutcome other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -40057,65 +45263,62 @@ public PermissionLocationType(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{PermissionLocationType}"/> for serializing <see cref="PermissionLocationType"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{HistoryRewindOutcome}"/> for serializing <see cref="HistoryRewindOutcome"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<PermissionLocationType>
+    public sealed class Converter : JsonConverter<HistoryRewindOutcome>
     {
         /// <inheritdoc />
-        public override PermissionLocationType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override HistoryRewindOutcome Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, PermissionLocationType value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, HistoryRewindOutcome value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(PermissionLocationType));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(HistoryRewindOutcome));
         }
     }
 }
 
 
-/// <summary>The current agent mode for this session (e.g., 'interactive', 'plan', 'autopilot').</summary>
+/// <summary>Reason a captured file was not restored.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct MetadataSnapshotCurrentMode : IEquatable<MetadataSnapshotCurrentMode>
+public readonly struct HistoryFileRestoreSkipReason : IEquatable<HistoryFileRestoreSkipReason>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="MetadataSnapshotCurrentMode"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="MetadataSnapshotCurrentMode"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="HistoryFileRestoreSkipReason"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="HistoryFileRestoreSkipReason"/>.</param>
     [JsonConstructor]
-    public MetadataSnapshotCurrentMode(string value)
+    public HistoryFileRestoreSkipReason(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="MetadataSnapshotCurrentMode"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="HistoryFileRestoreSkipReason"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>The agent is responding interactively to the user.</summary>
-    public static MetadataSnapshotCurrentMode Interactive { get; } = new("interactive");
-
-    /// <summary>The agent is preparing a plan before making changes.</summary>
-    public static MetadataSnapshotCurrentMode Plan { get; } = new("plan");
+    /// <summary>The file changed after Copilot's last captured write.</summary>
+    public static HistoryFileRestoreSkipReason UserModified { get; } = new("user-modified");
 
-    /// <summary>The agent is working autonomously toward task completion.</summary>
-    public static MetadataSnapshotCurrentMode Autopilot { get; } = new("autopilot");
+    /// <summary>A faithful preimage was not captured.</summary>
+    public static HistoryFileRestoreSkipReason SkippedCapture { get; } = new("skipped-capture");
 
-    /// <summary>Returns a value indicating whether two <see cref="MetadataSnapshotCurrentMode"/> instances are equivalent.</summary>
-    public static bool operator ==(MetadataSnapshotCurrentMode left, MetadataSnapshotCurrentMode right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="HistoryFileRestoreSkipReason"/> instances are equivalent.</summary>
+    public static bool operator ==(HistoryFileRestoreSkipReason left, HistoryFileRestoreSkipReason right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="MetadataSnapshotCurrentMode"/> instances are not equivalent.</summary>
-    public static bool operator !=(MetadataSnapshotCurrentMode left, MetadataSnapshotCurrentMode right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="HistoryFileRestoreSkipReason"/> instances are not equivalent.</summary>
+    public static bool operator !=(HistoryFileRestoreSkipReason left, HistoryFileRestoreSkipReason right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is MetadataSnapshotCurrentMode other && Equals(other);
+    public override bool Equals(object? obj) => obj is HistoryFileRestoreSkipReason other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(MetadataSnapshotCurrentMode other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(HistoryFileRestoreSkipReason other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -40123,62 +45326,62 @@ public MetadataSnapshotCurrentMode(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{MetadataSnapshotCurrentMode}"/> for serializing <see cref="MetadataSnapshotCurrentMode"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{HistoryFileRestoreSkipReason}"/> for serializing <see cref="HistoryFileRestoreSkipReason"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<MetadataSnapshotCurrentMode>
+    public sealed class Converter : JsonConverter<HistoryFileRestoreSkipReason>
     {
         /// <inheritdoc />
-        public override MetadataSnapshotCurrentMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override HistoryFileRestoreSkipReason Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, MetadataSnapshotCurrentMode value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, HistoryFileRestoreSkipReason value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(MetadataSnapshotCurrentMode));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(HistoryFileRestoreSkipReason));
         }
     }
 }
 
 
-/// <summary>Whether the remote task originated from Copilot Coding Agent (cca) or a CLI `--remote` invocation.</summary>
+/// <summary>Scope of a rewind operation.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct MetadataSnapshotRemoteMetadataTaskType : IEquatable<MetadataSnapshotRemoteMetadataTaskType>
+public readonly struct HistoryRewindMode : IEquatable<HistoryRewindMode>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="MetadataSnapshotRemoteMetadataTaskType"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="MetadataSnapshotRemoteMetadataTaskType"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="HistoryRewindMode"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="HistoryRewindMode"/>.</param>
     [JsonConstructor]
-    public MetadataSnapshotRemoteMetadataTaskType(string value)
+    public HistoryRewindMode(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="MetadataSnapshotRemoteMetadataTaskType"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="HistoryRewindMode"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Remote task originated from Copilot Coding Agent.</summary>
-    public static MetadataSnapshotRemoteMetadataTaskType Cca { get; } = new("cca");
+    /// <summary>Discard conversation events while leaving files unchanged.</summary>
+    public static HistoryRewindMode Conversation { get; } = new("conversation");
 
-    /// <summary>Remote task originated from a CLI remote-session invocation.</summary>
-    public static MetadataSnapshotRemoteMetadataTaskType Cli { get; } = new("cli");
+    /// <summary>Discard conversation events and restore captured files changed by those turns.</summary>
+    public static HistoryRewindMode ConversationAndFiles { get; } = new("conversation-and-files");
 
-    /// <summary>Returns a value indicating whether two <see cref="MetadataSnapshotRemoteMetadataTaskType"/> instances are equivalent.</summary>
-    public static bool operator ==(MetadataSnapshotRemoteMetadataTaskType left, MetadataSnapshotRemoteMetadataTaskType right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="HistoryRewindMode"/> instances are equivalent.</summary>
+    public static bool operator ==(HistoryRewindMode left, HistoryRewindMode right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="MetadataSnapshotRemoteMetadataTaskType"/> instances are not equivalent.</summary>
-    public static bool operator !=(MetadataSnapshotRemoteMetadataTaskType left, MetadataSnapshotRemoteMetadataTaskType right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="HistoryRewindMode"/> instances are not equivalent.</summary>
+    public static bool operator !=(HistoryRewindMode left, HistoryRewindMode right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is MetadataSnapshotRemoteMetadataTaskType other && Equals(other);
+    public override bool Equals(object? obj) => obj is HistoryRewindMode other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(MetadataSnapshotRemoteMetadataTaskType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(HistoryRewindMode other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -40186,62 +45389,62 @@ public MetadataSnapshotRemoteMetadataTaskType(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{MetadataSnapshotRemoteMetadataTaskType}"/> for serializing <see cref="MetadataSnapshotRemoteMetadataTaskType"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{HistoryRewindMode}"/> for serializing <see cref="HistoryRewindMode"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<MetadataSnapshotRemoteMetadataTaskType>
+    public sealed class Converter : JsonConverter<HistoryRewindMode>
     {
         /// <inheritdoc />
-        public override MetadataSnapshotRemoteMetadataTaskType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override HistoryRewindMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, MetadataSnapshotRemoteMetadataTaskType value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, HistoryRewindMode value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(MetadataSnapshotRemoteMetadataTaskType));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(HistoryRewindMode));
         }
     }
 }
 
 
-/// <summary>Repository host type, if known.</summary>
+/// <summary>Whether this item is a queued user message or a queued slash command / model change.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct WorkspaceSummaryHostType : IEquatable<WorkspaceSummaryHostType>
+public readonly struct QueuePendingItemsKind : IEquatable<QueuePendingItemsKind>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="WorkspaceSummaryHostType"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="WorkspaceSummaryHostType"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="QueuePendingItemsKind"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="QueuePendingItemsKind"/>.</param>
     [JsonConstructor]
-    public WorkspaceSummaryHostType(string value)
+    public QueuePendingItemsKind(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="WorkspaceSummaryHostType"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="QueuePendingItemsKind"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Workspace summary repository is hosted on GitHub.</summary>
-    public static WorkspaceSummaryHostType GitHub { get; } = new("github");
+    /// <summary>A queued user message.</summary>
+    public static QueuePendingItemsKind Message { get; } = new("message");
 
-    /// <summary>Workspace summary repository is hosted on Azure DevOps.</summary>
-    public static WorkspaceSummaryHostType Ado { get; } = new("ado");
+    /// <summary>A queued slash command or model-change command.</summary>
+    public static QueuePendingItemsKind Command { get; } = new("command");
 
-    /// <summary>Returns a value indicating whether two <see cref="WorkspaceSummaryHostType"/> instances are equivalent.</summary>
-    public static bool operator ==(WorkspaceSummaryHostType left, WorkspaceSummaryHostType right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="QueuePendingItemsKind"/> instances are equivalent.</summary>
+    public static bool operator ==(QueuePendingItemsKind left, QueuePendingItemsKind right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="WorkspaceSummaryHostType"/> instances are not equivalent.</summary>
-    public static bool operator !=(WorkspaceSummaryHostType left, WorkspaceSummaryHostType right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="QueuePendingItemsKind"/> instances are not equivalent.</summary>
+    public static bool operator !=(QueuePendingItemsKind left, QueuePendingItemsKind right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is WorkspaceSummaryHostType other && Equals(other);
+    public override bool Equals(object? obj) => obj is QueuePendingItemsKind other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(WorkspaceSummaryHostType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(QueuePendingItemsKind other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -40249,62 +45452,62 @@ public WorkspaceSummaryHostType(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{WorkspaceSummaryHostType}"/> for serializing <see cref="WorkspaceSummaryHostType"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{QueuePendingItemsKind}"/> for serializing <see cref="QueuePendingItemsKind"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<WorkspaceSummaryHostType>
+    public sealed class Converter : JsonConverter<QueuePendingItemsKind>
     {
         /// <inheritdoc />
-        public override WorkspaceSummaryHostType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override QueuePendingItemsKind Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, WorkspaceSummaryHostType value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, QueuePendingItemsKind value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(WorkspaceSummaryHostType));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(QueuePendingItemsKind));
         }
     }
 }
 
 
-/// <summary>Hosting platform type of the repository.</summary>
+/// <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>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct SessionWorkingDirectoryContextHostType : IEquatable<SessionWorkingDirectoryContextHostType>
+public readonly struct EventsAgentScope : IEquatable<EventsAgentScope>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="SessionWorkingDirectoryContextHostType"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="SessionWorkingDirectoryContextHostType"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="EventsAgentScope"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="EventsAgentScope"/>.</param>
     [JsonConstructor]
-    public SessionWorkingDirectoryContextHostType(string value)
+    public EventsAgentScope(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="SessionWorkingDirectoryContextHostType"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="EventsAgentScope"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>The working directory repository is hosted on GitHub.</summary>
-    public static SessionWorkingDirectoryContextHostType GitHub { get; } = new("github");
+    /// <summary>Return main-agent events and typed subagent lifecycle events.</summary>
+    public static EventsAgentScope Primary { get; } = new("primary");
 
-    /// <summary>The working directory repository is hosted on Azure DevOps.</summary>
-    public static SessionWorkingDirectoryContextHostType Ado { get; } = new("ado");
+    /// <summary>Return events from all agents.</summary>
+    public static EventsAgentScope All { get; } = new("all");
 
-    /// <summary>Returns a value indicating whether two <see cref="SessionWorkingDirectoryContextHostType"/> instances are equivalent.</summary>
-    public static bool operator ==(SessionWorkingDirectoryContextHostType left, SessionWorkingDirectoryContextHostType right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="EventsAgentScope"/> instances are equivalent.</summary>
+    public static bool operator ==(EventsAgentScope left, EventsAgentScope right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="SessionWorkingDirectoryContextHostType"/> instances are not equivalent.</summary>
-    public static bool operator !=(SessionWorkingDirectoryContextHostType left, SessionWorkingDirectoryContextHostType right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="EventsAgentScope"/> instances are not equivalent.</summary>
+    public static bool operator !=(EventsAgentScope left, EventsAgentScope right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is SessionWorkingDirectoryContextHostType other && Equals(other);
+    public override bool Equals(object? obj) => obj is EventsAgentScope other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(SessionWorkingDirectoryContextHostType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(EventsAgentScope other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -40312,113 +45515,80 @@ public SessionWorkingDirectoryContextHostType(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{SessionWorkingDirectoryContextHostType}"/> for serializing <see cref="SessionWorkingDirectoryContextHostType"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{EventsAgentScope}"/> for serializing <see cref="EventsAgentScope"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<SessionWorkingDirectoryContextHostType>
+    public sealed class Converter : JsonConverter<EventsAgentScope>
     {
         /// <inheritdoc />
-        public override SessionWorkingDirectoryContextHostType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override EventsAgentScope Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, SessionWorkingDirectoryContextHostType value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, EventsAgentScope value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SessionWorkingDirectoryContextHostType));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(EventsAgentScope));
         }
     }
 }
 
 
-/// <summary>Rust-owned settings predicates exposed across the SDK boundary. Raw feature-flag names are intentionally not part of the contract.</summary>
+/// <summary>Copilot plan tier used by the session quota projection.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct SessionSettingsPredicateName : IEquatable<SessionSettingsPredicateName>
+public readonly struct SessionQuotaPlanTier : IEquatable<SessionQuotaPlanTier>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="SessionSettingsPredicateName"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="SessionSettingsPredicateName"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="SessionQuotaPlanTier"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="SessionQuotaPlanTier"/>.</param>
     [JsonConstructor]
-    public SessionSettingsPredicateName(string value)
+    public SessionQuotaPlanTier(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="SessionSettingsPredicateName"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="SessionQuotaPlanTier"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Whether the security-tools feature flag enables security tool wiring.</summary>
-    public static SessionSettingsPredicateName SecurityToolsEnabled { get; } = new("securityToolsEnabled");
-
-    /// <summary>Whether third-party security tools should receive the security prompt.</summary>
-    public static SessionSettingsPredicateName ThirdPartySecurityPromptEnabled { get; } = new("thirdPartySecurityPromptEnabled");
-
-    /// <summary>Whether validation may run in parallel.</summary>
-    public static SessionSettingsPredicateName ParallelValidationEnabled { get; } = new("parallelValidationEnabled");
-
-    /// <summary>Whether runtime timing telemetry is enabled.</summary>
-    public static SessionSettingsPredicateName RuntimeTimingTelemetryEnabled { get; } = new("runtimeTimingTelemetryEnabled");
-
-    /// <summary>Whether the co-author hook is enabled.</summary>
-    public static SessionSettingsPredicateName CoAuthorHookEnabled { get; } = new("coAuthorHookEnabled");
-
-    /// <summary>Whether Chronicle integration is enabled.</summary>
-    public static SessionSettingsPredicateName ChronicleEnabled { get; } = new("chronicleEnabled");
-
-    /// <summary>Whether content-exclusion policy may self-fetch data.</summary>
-    public static SessionSettingsPredicateName ContentExclusionSelfFetchEnabled { get; } = new("contentExclusionSelfFetchEnabled");
-
-    /// <summary>Whether Claude Opus token-limit caps should be applied.</summary>
-    public static SessionSettingsPredicateName CapClaudeOpusTokenLimitsEnabled { get; } = new("capClaudeOpusTokenLimitsEnabled");
-
-    /// <summary>Whether code-review behavior is enabled.</summary>
-    public static SessionSettingsPredicateName CodeReviewFeatureEnabled { get; } = new("codeReviewFeatureEnabled");
-
-    /// <summary>Whether CCA should use the TypeScript autofind behavior.</summary>
-    public static SessionSettingsPredicateName CcaUseTsAutofindEnabled { get; } = new("ccaUseTsAutofindEnabled");
-
-    /// <summary>Whether the dependency checker is enabled.</summary>
-    public static SessionSettingsPredicateName DependencyCheckerEnabled { get; } = new("dependencyCheckerEnabled");
+    /// <summary>Copilot Free.</summary>
+    public static SessionQuotaPlanTier Free { get; } = new("free");
 
-    /// <summary>Whether the Dependabot checker is enabled.</summary>
-    public static SessionSettingsPredicateName DependabotCheckerEnabled { get; } = new("dependabotCheckerEnabled");
-
-    /// <summary>Whether the CodeQL checker is enabled.</summary>
-    public static SessionSettingsPredicateName CodeqlCheckerEnabled { get; } = new("codeqlCheckerEnabled");
+    /// <summary>Copilot education entitlement.</summary>
+    public static SessionQuotaPlanTier Edu { get; } = new("edu");
 
-    /// <summary>Whether trivial-change handling is enabled.</summary>
-    public static SessionSettingsPredicateName TrivialChangeEnabled { get; } = new("trivialChangeEnabled");
+    /// <summary>Copilot Pro.</summary>
+    public static SessionQuotaPlanTier Pro { get; } = new("pro");
 
-    /// <summary>Whether trivial-change skip behavior is enabled.</summary>
-    public static SessionSettingsPredicateName TrivialChangeSkipEnabled { get; } = new("trivialChangeSkipEnabled");
+    /// <summary>Copilot Pro+.</summary>
+    public static SessionQuotaPlanTier ProPlus { get; } = new("pro_plus");
 
-    /// <summary>Whether trivial-change handling is enabled for code review.</summary>
-    public static SessionSettingsPredicateName TrivialChangeEnabledForCodeReview { get; } = new("trivialChangeEnabledForCodeReview");
+    /// <summary>Copilot Business.</summary>
+    public static SessionQuotaPlanTier Business { get; } = new("business");
 
-    /// <summary>Whether trivial-change skip behavior is enabled for code review.</summary>
-    public static SessionSettingsPredicateName TrivialChangeSkipEnabledForCodeReview { get; } = new("trivialChangeSkipEnabledForCodeReview");
+    /// <summary>Copilot Enterprise.</summary>
+    public static SessionQuotaPlanTier Enterprise { get; } = new("enterprise");
 
-    /// <summary>Whether trivial-change handling is enabled for a specific tool.</summary>
-    public static SessionSettingsPredicateName TrivialChangeEnabledForTool { get; } = new("trivialChangeEnabledForTool");
+    /// <summary>Copilot Max.</summary>
+    public static SessionQuotaPlanTier Max { get; } = new("max");
 
-    /// <summary>Whether trivial-change skip behavior is enabled for a specific tool.</summary>
-    public static SessionSettingsPredicateName TrivialChangeSkipEnabledForTool { get; } = new("trivialChangeSkipEnabledForTool");
+    /// <summary>The account's plan tier is not known.</summary>
+    public static SessionQuotaPlanTier Unknown { get; } = new("unknown");
 
-    /// <summary>Returns a value indicating whether two <see cref="SessionSettingsPredicateName"/> instances are equivalent.</summary>
-    public static bool operator ==(SessionSettingsPredicateName left, SessionSettingsPredicateName right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="SessionQuotaPlanTier"/> instances are equivalent.</summary>
+    public static bool operator ==(SessionQuotaPlanTier left, SessionQuotaPlanTier right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="SessionSettingsPredicateName"/> instances are not equivalent.</summary>
-    public static bool operator !=(SessionSettingsPredicateName left, SessionSettingsPredicateName right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="SessionQuotaPlanTier"/> instances are not equivalent.</summary>
+    public static bool operator !=(SessionQuotaPlanTier left, SessionQuotaPlanTier right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is SessionSettingsPredicateName other && Equals(other);
+    public override bool Equals(object? obj) => obj is SessionQuotaPlanTier other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(SessionSettingsPredicateName other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(SessionQuotaPlanTier other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -40426,65 +45596,62 @@ public SessionSettingsPredicateName(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{SessionSettingsPredicateName}"/> for serializing <see cref="SessionSettingsPredicateName"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{SessionQuotaPlanTier}"/> for serializing <see cref="SessionQuotaPlanTier"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<SessionSettingsPredicateName>
+    public sealed class Converter : JsonConverter<SessionQuotaPlanTier>
     {
         /// <inheritdoc />
-        public override SessionSettingsPredicateName Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override SessionQuotaPlanTier Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, SessionSettingsPredicateName value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, SessionQuotaPlanTier value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SessionSettingsPredicateName));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SessionQuotaPlanTier));
         }
     }
 }
 
 
-/// <summary>Signal to send (default: SIGTERM).</summary>
+/// <summary>Client population used for the prediction baseline.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct ShellKillSignal : IEquatable<ShellKillSignal>
+public readonly struct SessionLimitPredictionClientType : IEquatable<SessionLimitPredictionClientType>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="ShellKillSignal"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="ShellKillSignal"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="SessionLimitPredictionClientType"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="SessionLimitPredictionClientType"/>.</param>
     [JsonConstructor]
-    public ShellKillSignal(string value)
+    public SessionLimitPredictionClientType(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="ShellKillSignal"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="SessionLimitPredictionClientType"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Request graceful process termination.</summary>
-    public static ShellKillSignal SIGTERM { get; } = new("SIGTERM");
-
-    /// <summary>Forcefully terminate the process.</summary>
-    public static ShellKillSignal SIGKILL { get; } = new("SIGKILL");
+    /// <summary>Interactive CLI sessions where a user can accept, edit, or top up the limit.</summary>
+    public static SessionLimitPredictionClientType CliInteractive { get; } = new("cli-interactive");
 
-    /// <summary>Send an interrupt signal to the process.</summary>
-    public static ShellKillSignal SIGINT { get; } = new("SIGINT");
+    /// <summary>Prompt/non-interactive CLI sessions where the initial limit must cover more of the run.</summary>
+    public static SessionLimitPredictionClientType CliPrompt { get; } = new("cli-prompt");
 
-    /// <summary>Returns a value indicating whether two <see cref="ShellKillSignal"/> instances are equivalent.</summary>
-    public static bool operator ==(ShellKillSignal left, ShellKillSignal right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="SessionLimitPredictionClientType"/> instances are equivalent.</summary>
+    public static bool operator ==(SessionLimitPredictionClientType left, SessionLimitPredictionClientType right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="ShellKillSignal"/> instances are not equivalent.</summary>
-    public static bool operator !=(ShellKillSignal left, ShellKillSignal right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="SessionLimitPredictionClientType"/> instances are not equivalent.</summary>
+    public static bool operator !=(SessionLimitPredictionClientType left, SessionLimitPredictionClientType right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is ShellKillSignal other && Equals(other);
+    public override bool Equals(object? obj) => obj is SessionLimitPredictionClientType other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(ShellKillSignal other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(SessionLimitPredictionClientType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -40492,61 +45659,68 @@ public ShellKillSignal(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{ShellKillSignal}"/> for serializing <see cref="ShellKillSignal"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{SessionLimitPredictionClientType}"/> for serializing <see cref="SessionLimitPredictionClientType"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<ShellKillSignal>
+    public sealed class Converter : JsonConverter<SessionLimitPredictionClientType>
     {
         /// <inheritdoc />
-        public override ShellKillSignal Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override SessionLimitPredictionClientType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, ShellKillSignal value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, SessionLimitPredictionClientType value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ShellKillSignal));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SessionLimitPredictionClientType));
         }
     }
 }
 
 
-/// <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>
+/// <summary>Semantic usage tier used for a recommended cap or additional headroom.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct SessionHistoryCompactRequestTrigger : IEquatable<SessionHistoryCompactRequestTrigger>
+public readonly struct SessionLimitPredictionTier : IEquatable<SessionLimitPredictionTier>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="SessionHistoryCompactRequestTrigger"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="SessionHistoryCompactRequestTrigger"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="SessionLimitPredictionTier"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="SessionLimitPredictionTier"/>.</param>
     [JsonConstructor]
-    public SessionHistoryCompactRequestTrigger(string value)
+    public SessionLimitPredictionTier(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="SessionHistoryCompactRequestTrigger"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="SessionLimitPredictionTier"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>User-requested compaction, e.g. the /compact command or a direct history.compact call.</summary>
-    public static SessionHistoryCompactRequestTrigger Manual { get; } = new("manual");
+    /// <summary>Recommended starting tier.</summary>
+    public static SessionLimitPredictionTier Recommended { get; } = new("recommended");
 
-    /// <summary>Compaction requested while switching to a model with a smaller context window.</summary>
-    public static SessionHistoryCompactRequestTrigger ModelSwitch { get; } = new("model_switch");
+    /// <summary>Additional headroom for longer-running sessions.</summary>
+    public static SessionLimitPredictionTier AdditionalHeadroom { get; } = new("additional_headroom");
 
-    /// <summary>Returns a value indicating whether two <see cref="SessionHistoryCompactRequestTrigger"/> instances are equivalent.</summary>
-    public static bool operator ==(SessionHistoryCompactRequestTrigger left, SessionHistoryCompactRequestTrigger right) => left.Equals(right);
+    /// <summary>Generous headroom for unusually high usage.</summary>
+    public static SessionLimitPredictionTier GenerousHeadroom { get; } = new("generous_headroom");
 
-    /// <summary>Returns a value indicating whether two <see cref="SessionHistoryCompactRequestTrigger"/> instances are not equivalent.</summary>
-    public static bool operator !=(SessionHistoryCompactRequestTrigger left, SessionHistoryCompactRequestTrigger right) => !(left == right);
+    /// <summary>Maximum available headroom tier.</summary>
+    public static SessionLimitPredictionTier MaximumHeadroom { get; } = new("maximum_headroom");
+
+    /// <summary>Returns a value indicating whether two <see cref="SessionLimitPredictionTier"/> instances are equivalent.</summary>
+    public static bool operator ==(SessionLimitPredictionTier left, SessionLimitPredictionTier right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="SessionLimitPredictionTier"/> instances are not equivalent.</summary>
+    public static bool operator !=(SessionLimitPredictionTier left, SessionLimitPredictionTier right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is SessionHistoryCompactRequestTrigger other && Equals(other);
+    public override bool Equals(object? obj) => obj is SessionLimitPredictionTier other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(SessionHistoryCompactRequestTrigger other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(SessionLimitPredictionTier other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -40554,65 +45728,65 @@ public SessionHistoryCompactRequestTrigger(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{SessionHistoryCompactRequestTrigger}"/> for serializing <see cref="SessionHistoryCompactRequestTrigger"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{SessionLimitPredictionTier}"/> for serializing <see cref="SessionLimitPredictionTier"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<SessionHistoryCompactRequestTrigger>
+    public sealed class Converter : JsonConverter<SessionLimitPredictionTier>
     {
         /// <inheritdoc />
-        public override SessionHistoryCompactRequestTrigger Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override SessionLimitPredictionTier Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, SessionHistoryCompactRequestTrigger value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, SessionLimitPredictionTier value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SessionHistoryCompactRequestTrigger));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SessionLimitPredictionTier));
         }
     }
 }
 
 
-/// <summary>Aggregate file change represented by a rewind preview.</summary>
+/// <summary>Baseline fallback level used to create the prediction.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct HistoryRewindChangeType : IEquatable<HistoryRewindChangeType>
+public readonly struct SessionLimitPredictionSource : IEquatable<SessionLimitPredictionSource>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="HistoryRewindChangeType"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="HistoryRewindChangeType"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="SessionLimitPredictionSource"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="SessionLimitPredictionSource"/>.</param>
     [JsonConstructor]
-    public HistoryRewindChangeType(string value)
+    public SessionLimitPredictionSource(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="HistoryRewindChangeType"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="SessionLimitPredictionSource"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>The discarded turns created the file.</summary>
-    public static HistoryRewindChangeType Created { get; } = new("created");
+    /// <summary>The prediction used the exact resolved model's baseline cell.</summary>
+    public static SessionLimitPredictionSource Model { get; } = new("model");
 
-    /// <summary>The discarded turns deleted the file.</summary>
-    public static HistoryRewindChangeType Deleted { get; } = new("deleted");
+    /// <summary>The exact model was unavailable, so the prediction used the model family's baseline cell.</summary>
+    public static SessionLimitPredictionSource Family { get; } = new("family");
 
-    /// <summary>The discarded turns modified the file.</summary>
-    public static HistoryRewindChangeType Modified { get; } = new("modified");
+    /// <summary>No model or family cell was available, so the prediction used the global client-type baseline cell.</summary>
+    public static SessionLimitPredictionSource Global { get; } = new("global");
 
-    /// <summary>Returns a value indicating whether two <see cref="HistoryRewindChangeType"/> instances are equivalent.</summary>
-    public static bool operator ==(HistoryRewindChangeType left, HistoryRewindChangeType right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="SessionLimitPredictionSource"/> instances are equivalent.</summary>
+    public static bool operator ==(SessionLimitPredictionSource left, SessionLimitPredictionSource right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="HistoryRewindChangeType"/> instances are not equivalent.</summary>
-    public static bool operator !=(HistoryRewindChangeType left, HistoryRewindChangeType right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="SessionLimitPredictionSource"/> instances are not equivalent.</summary>
+    public static bool operator !=(SessionLimitPredictionSource left, SessionLimitPredictionSource right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is HistoryRewindChangeType other && Equals(other);
+    public override bool Equals(object? obj) => obj is SessionLimitPredictionSource other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(HistoryRewindChangeType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(SessionLimitPredictionSource other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -40620,83 +45794,62 @@ public HistoryRewindChangeType(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{HistoryRewindChangeType}"/> for serializing <see cref="HistoryRewindChangeType"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{SessionLimitPredictionSource}"/> for serializing <see cref="SessionLimitPredictionSource"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<HistoryRewindChangeType>
+    public sealed class Converter : JsonConverter<SessionLimitPredictionSource>
     {
         /// <inheritdoc />
-        public override HistoryRewindChangeType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override SessionLimitPredictionSource Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, HistoryRewindChangeType value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, SessionLimitPredictionSource value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(HistoryRewindChangeType));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SessionLimitPredictionSource));
         }
     }
 }
 
 
-/// <summary>Outcome of a rewind request.</summary>
+/// <summary>Reason a prediction could not be computed.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct HistoryRewindOutcome : IEquatable<HistoryRewindOutcome>
+public readonly struct SessionLimitPredictionUnavailableReason : IEquatable<SessionLimitPredictionUnavailableReason>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="HistoryRewindOutcome"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="HistoryRewindOutcome"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="SessionLimitPredictionUnavailableReason"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="SessionLimitPredictionUnavailableReason"/>.</param>
     [JsonConstructor]
-    public HistoryRewindOutcome(string value)
+    public SessionLimitPredictionUnavailableReason(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="HistoryRewindOutcome"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="SessionLimitPredictionUnavailableReason"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>The requested rewind completed; reachable in either mode.</summary>
-    public static HistoryRewindOutcome Success { get; } = new("success");
-
-    /// <summary>The session still has work that may mutate files or history; reachable in either mode.</summary>
-    public static HistoryRewindOutcome SessionBusy { get; } = new("session-busy");
-
-    /// <summary>A conversation-and-files rewind was requested for a session that did not enable capture; conversation-only rewinds never produce this.</summary>
-    public static HistoryRewindOutcome FileChangeTrackingDisabled { get; } = new("file-change-tracking-disabled");
-
-    /// <summary>Remote-backed rewind routing is not supported; reachable in either mode.</summary>
-    public static HistoryRewindOutcome UnsupportedRemoteSession { get; } = new("unsupported-remote-session");
-
-    /// <summary>File restore failed and all applied file changes were rolled back; only conversation-and-files rewinds produce this.</summary>
-    public static HistoryRewindOutcome FilesRolledBack { get; } = new("files-rolled-back");
-
-    /// <summary>File restore failed and its rollback could not fully restore the pre-rewind state; only conversation-and-files rewinds produce this.</summary>
-    public static HistoryRewindOutcome RollbackIncomplete { get; } = new("rollback-incomplete");
-
-    /// <summary>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.</summary>
-    public static HistoryRewindOutcome TruncationFailed { get; } = new("truncation-failed");
-
-    /// <summary>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.</summary>
-    public static HistoryRewindOutcome CheckpointCleanupFailed { get; } = new("checkpoint-cleanup-failed");
+    /// <summary>The current model is auto and has not resolved to a concrete model yet.</summary>
+    public static SessionLimitPredictionUnavailableReason AutoUnresolved { get; } = new("auto_unresolved");
 
-    /// <summary>Files and conversation were rewound, but obsolete file snapshots could not be removed; only conversation-and-files rewinds produce this.</summary>
-    public static HistoryRewindOutcome SnapshotPruneFailed { get; } = new("snapshot-prune-failed");
+    /// <summary>No model was provided and the session does not currently have a selected model.</summary>
+    public static SessionLimitPredictionUnavailableReason NoModel { get; } = new("no_model");
 
-    /// <summary>Returns a value indicating whether two <see cref="HistoryRewindOutcome"/> instances are equivalent.</summary>
-    public static bool operator ==(HistoryRewindOutcome left, HistoryRewindOutcome right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="SessionLimitPredictionUnavailableReason"/> instances are equivalent.</summary>
+    public static bool operator ==(SessionLimitPredictionUnavailableReason left, SessionLimitPredictionUnavailableReason right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="HistoryRewindOutcome"/> instances are not equivalent.</summary>
-    public static bool operator !=(HistoryRewindOutcome left, HistoryRewindOutcome right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="SessionLimitPredictionUnavailableReason"/> instances are not equivalent.</summary>
+    public static bool operator !=(SessionLimitPredictionUnavailableReason left, SessionLimitPredictionUnavailableReason right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is HistoryRewindOutcome other && Equals(other);
+    public override bool Equals(object? obj) => obj is SessionLimitPredictionUnavailableReason other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(HistoryRewindOutcome other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(SessionLimitPredictionUnavailableReason other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -40704,62 +45857,65 @@ public HistoryRewindOutcome(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{HistoryRewindOutcome}"/> for serializing <see cref="HistoryRewindOutcome"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{SessionLimitPredictionUnavailableReason}"/> for serializing <see cref="SessionLimitPredictionUnavailableReason"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<HistoryRewindOutcome>
+    public sealed class Converter : JsonConverter<SessionLimitPredictionUnavailableReason>
     {
         /// <inheritdoc />
-        public override HistoryRewindOutcome Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override SessionLimitPredictionUnavailableReason Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, HistoryRewindOutcome value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, SessionLimitPredictionUnavailableReason value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(HistoryRewindOutcome));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SessionLimitPredictionUnavailableReason));
         }
     }
 }
 
 
-/// <summary>Reason a captured file was not restored.</summary>
+/// <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>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct HistoryFileRestoreSkipReason : IEquatable<HistoryFileRestoreSkipReason>
+public readonly struct RemoteSessionMode : IEquatable<RemoteSessionMode>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="HistoryFileRestoreSkipReason"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="HistoryFileRestoreSkipReason"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="RemoteSessionMode"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="RemoteSessionMode"/>.</param>
     [JsonConstructor]
-    public HistoryFileRestoreSkipReason(string value)
+    public RemoteSessionMode(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="HistoryFileRestoreSkipReason"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="RemoteSessionMode"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>The file changed after Copilot's last captured write.</summary>
-    public static HistoryFileRestoreSkipReason UserModified { get; } = new("user-modified");
+    /// <summary>Disable remote session export and steering.</summary>
+    public static RemoteSessionMode Off { get; } = new("off");
 
-    /// <summary>A faithful preimage was not captured.</summary>
-    public static HistoryFileRestoreSkipReason SkippedCapture { get; } = new("skipped-capture");
+    /// <summary>Export session events to GitHub without enabling remote steering.</summary>
+    public static RemoteSessionMode Export { get; } = new("export");
 
-    /// <summary>Returns a value indicating whether two <see cref="HistoryFileRestoreSkipReason"/> instances are equivalent.</summary>
-    public static bool operator ==(HistoryFileRestoreSkipReason left, HistoryFileRestoreSkipReason right) => left.Equals(right);
+    /// <summary>Enable both remote session export and remote steering.</summary>
+    public static RemoteSessionMode On { get; } = new("on");
 
-    /// <summary>Returns a value indicating whether two <see cref="HistoryFileRestoreSkipReason"/> instances are not equivalent.</summary>
-    public static bool operator !=(HistoryFileRestoreSkipReason left, HistoryFileRestoreSkipReason right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="RemoteSessionMode"/> instances are equivalent.</summary>
+    public static bool operator ==(RemoteSessionMode left, RemoteSessionMode right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="RemoteSessionMode"/> instances are not equivalent.</summary>
+    public static bool operator !=(RemoteSessionMode left, RemoteSessionMode right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is HistoryFileRestoreSkipReason other && Equals(other);
+    public override bool Equals(object? obj) => obj is RemoteSessionMode other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(HistoryFileRestoreSkipReason other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(RemoteSessionMode other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -40767,62 +45923,62 @@ public HistoryFileRestoreSkipReason(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{HistoryFileRestoreSkipReason}"/> for serializing <see cref="HistoryFileRestoreSkipReason"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{RemoteSessionMode}"/> for serializing <see cref="RemoteSessionMode"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<HistoryFileRestoreSkipReason>
+    public sealed class Converter : JsonConverter<RemoteSessionMode>
     {
         /// <inheritdoc />
-        public override HistoryFileRestoreSkipReason Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override RemoteSessionMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, HistoryFileRestoreSkipReason value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, RemoteSessionMode value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(HistoryFileRestoreSkipReason));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(RemoteSessionMode));
         }
     }
 }
 
 
-/// <summary>Scope of a rewind operation.</summary>
+/// <summary>Sharing status for a synced session. "repo" makes the session visible to anyone with read access to the repository; "unshared" restricts it to the creator and collaborators.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct HistoryRewindMode : IEquatable<HistoryRewindMode>
+public readonly struct SessionVisibilityStatus : IEquatable<SessionVisibilityStatus>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="HistoryRewindMode"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="HistoryRewindMode"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="SessionVisibilityStatus"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="SessionVisibilityStatus"/>.</param>
     [JsonConstructor]
-    public HistoryRewindMode(string value)
+    public SessionVisibilityStatus(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="HistoryRewindMode"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="SessionVisibilityStatus"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Discard conversation events while leaving files unchanged.</summary>
-    public static HistoryRewindMode Conversation { get; } = new("conversation");
+    /// <summary>The session is visible to repository readers.</summary>
+    public static SessionVisibilityStatus Repo { get; } = new("repo");
 
-    /// <summary>Discard conversation events and restore captured files changed by those turns.</summary>
-    public static HistoryRewindMode ConversationAndFiles { get; } = new("conversation-and-files");
+    /// <summary>The session is restricted to its creator and collaborators.</summary>
+    public static SessionVisibilityStatus Unshared { get; } = new("unshared");
 
-    /// <summary>Returns a value indicating whether two <see cref="HistoryRewindMode"/> instances are equivalent.</summary>
-    public static bool operator ==(HistoryRewindMode left, HistoryRewindMode right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="SessionVisibilityStatus"/> instances are equivalent.</summary>
+    public static bool operator ==(SessionVisibilityStatus left, SessionVisibilityStatus right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="HistoryRewindMode"/> instances are not equivalent.</summary>
-    public static bool operator !=(HistoryRewindMode left, HistoryRewindMode right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="SessionVisibilityStatus"/> instances are not equivalent.</summary>
+    public static bool operator !=(SessionVisibilityStatus left, SessionVisibilityStatus right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is HistoryRewindMode other && Equals(other);
+    public override bool Equals(object? obj) => obj is SessionVisibilityStatus other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(HistoryRewindMode other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(SessionVisibilityStatus other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -40830,62 +45986,62 @@ public HistoryRewindMode(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{HistoryRewindMode}"/> for serializing <see cref="HistoryRewindMode"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{SessionVisibilityStatus}"/> for serializing <see cref="SessionVisibilityStatus"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<HistoryRewindMode>
+    public sealed class Converter : JsonConverter<SessionVisibilityStatus>
     {
         /// <inheritdoc />
-        public override HistoryRewindMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override SessionVisibilityStatus Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, HistoryRewindMode value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, SessionVisibilityStatus value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(HistoryRewindMode));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SessionVisibilityStatus));
         }
     }
 }
 
 
-/// <summary>Whether this item is a queued user message or a queued slash command / model change.</summary>
+/// <summary>Why the runtime requests client-task cancellation.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct QueuePendingItemsKind : IEquatable<QueuePendingItemsKind>
+public readonly struct ClientTaskCancelReason : IEquatable<ClientTaskCancelReason>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="QueuePendingItemsKind"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="QueuePendingItemsKind"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="ClientTaskCancelReason"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="ClientTaskCancelReason"/>.</param>
     [JsonConstructor]
-    public QueuePendingItemsKind(string value)
+    public ClientTaskCancelReason(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="QueuePendingItemsKind"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="ClientTaskCancelReason"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>A queued user message.</summary>
-    public static QueuePendingItemsKind Message { get; } = new("message");
+    /// <summary>A caller requested task cancellation.</summary>
+    public static ClientTaskCancelReason CancelRequested { get; } = new("cancel_requested");
 
-    /// <summary>A queued slash command or model-change command.</summary>
-    public static QueuePendingItemsKind Command { get; } = new("command");
+    /// <summary>The session is shutting down.</summary>
+    public static ClientTaskCancelReason SessionShutdown { get; } = new("session_shutdown");
 
-    /// <summary>Returns a value indicating whether two <see cref="QueuePendingItemsKind"/> instances are equivalent.</summary>
-    public static bool operator ==(QueuePendingItemsKind left, QueuePendingItemsKind right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="ClientTaskCancelReason"/> instances are equivalent.</summary>
+    public static bool operator ==(ClientTaskCancelReason left, ClientTaskCancelReason right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="QueuePendingItemsKind"/> instances are not equivalent.</summary>
-    public static bool operator !=(QueuePendingItemsKind left, QueuePendingItemsKind right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="ClientTaskCancelReason"/> instances are not equivalent.</summary>
+    public static bool operator !=(ClientTaskCancelReason left, ClientTaskCancelReason right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is QueuePendingItemsKind other && Equals(other);
+    public override bool Equals(object? obj) => obj is ClientTaskCancelReason other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(QueuePendingItemsKind other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(ClientTaskCancelReason other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -40893,62 +46049,62 @@ public QueuePendingItemsKind(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{QueuePendingItemsKind}"/> for serializing <see cref="QueuePendingItemsKind"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{ClientTaskCancelReason}"/> for serializing <see cref="ClientTaskCancelReason"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<QueuePendingItemsKind>
+    public sealed class Converter : JsonConverter<ClientTaskCancelReason>
     {
         /// <inheritdoc />
-        public override QueuePendingItemsKind Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override ClientTaskCancelReason Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, QueuePendingItemsKind value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, ClientTaskCancelReason value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(QueuePendingItemsKind));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ClientTaskCancelReason));
         }
     }
 }
 
 
-/// <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>
+/// <summary>Error classification.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct EventsAgentScope : IEquatable<EventsAgentScope>
+public readonly struct SessionFsErrorCode : IEquatable<SessionFsErrorCode>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="EventsAgentScope"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="EventsAgentScope"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="SessionFsErrorCode"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="SessionFsErrorCode"/>.</param>
     [JsonConstructor]
-    public EventsAgentScope(string value)
+    public SessionFsErrorCode(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="EventsAgentScope"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="SessionFsErrorCode"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Return main-agent events and typed subagent lifecycle events.</summary>
-    public static EventsAgentScope Primary { get; } = new("primary");
+    /// <summary>The requested path does not exist.</summary>
+    public static SessionFsErrorCode ENOENT { get; } = new("ENOENT");
 
-    /// <summary>Return events from all agents.</summary>
-    public static EventsAgentScope All { get; } = new("all");
+    /// <summary>The filesystem operation failed for an unspecified reason.</summary>
+    public static SessionFsErrorCode UNKNOWN { get; } = new("UNKNOWN");
 
-    /// <summary>Returns a value indicating whether two <see cref="EventsAgentScope"/> instances are equivalent.</summary>
-    public static bool operator ==(EventsAgentScope left, EventsAgentScope right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="SessionFsErrorCode"/> instances are equivalent.</summary>
+    public static bool operator ==(SessionFsErrorCode left, SessionFsErrorCode right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="EventsAgentScope"/> instances are not equivalent.</summary>
-    public static bool operator !=(EventsAgentScope left, EventsAgentScope right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="SessionFsErrorCode"/> instances are not equivalent.</summary>
+    public static bool operator !=(SessionFsErrorCode left, SessionFsErrorCode right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is EventsAgentScope other && Equals(other);
+    public override bool Equals(object? obj) => obj is SessionFsErrorCode other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(EventsAgentScope other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(SessionFsErrorCode other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -40956,62 +46112,62 @@ public EventsAgentScope(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{EventsAgentScope}"/> for serializing <see cref="EventsAgentScope"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{SessionFsErrorCode}"/> for serializing <see cref="SessionFsErrorCode"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<EventsAgentScope>
+    public sealed class Converter : JsonConverter<SessionFsErrorCode>
     {
         /// <inheritdoc />
-        public override EventsAgentScope Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override SessionFsErrorCode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, EventsAgentScope value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, SessionFsErrorCode value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(EventsAgentScope));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SessionFsErrorCode));
         }
     }
 }
 
 
-/// <summary>Client population used for the prediction baseline.</summary>
+/// <summary>Entry type.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct SessionLimitPredictionClientType : IEquatable<SessionLimitPredictionClientType>
+public readonly struct SessionFsReaddirWithTypesEntryType : IEquatable<SessionFsReaddirWithTypesEntryType>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="SessionLimitPredictionClientType"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="SessionLimitPredictionClientType"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="SessionFsReaddirWithTypesEntryType"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="SessionFsReaddirWithTypesEntryType"/>.</param>
     [JsonConstructor]
-    public SessionLimitPredictionClientType(string value)
+    public SessionFsReaddirWithTypesEntryType(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="SessionLimitPredictionClientType"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="SessionFsReaddirWithTypesEntryType"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Interactive CLI sessions where a user can accept, edit, or top up the limit.</summary>
-    public static SessionLimitPredictionClientType CliInteractive { get; } = new("cli-interactive");
+    /// <summary>The entry is a file.</summary>
+    public static SessionFsReaddirWithTypesEntryType File { get; } = new("file");
 
-    /// <summary>Prompt/non-interactive CLI sessions where the initial limit must cover more of the run.</summary>
-    public static SessionLimitPredictionClientType CliPrompt { get; } = new("cli-prompt");
+    /// <summary>The entry is a directory.</summary>
+    public static SessionFsReaddirWithTypesEntryType Directory { get; } = new("directory");
 
-    /// <summary>Returns a value indicating whether two <see cref="SessionLimitPredictionClientType"/> instances are equivalent.</summary>
-    public static bool operator ==(SessionLimitPredictionClientType left, SessionLimitPredictionClientType right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="SessionFsReaddirWithTypesEntryType"/> instances are equivalent.</summary>
+    public static bool operator ==(SessionFsReaddirWithTypesEntryType left, SessionFsReaddirWithTypesEntryType right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="SessionLimitPredictionClientType"/> instances are not equivalent.</summary>
-    public static bool operator !=(SessionLimitPredictionClientType left, SessionLimitPredictionClientType right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="SessionFsReaddirWithTypesEntryType"/> instances are not equivalent.</summary>
+    public static bool operator !=(SessionFsReaddirWithTypesEntryType left, SessionFsReaddirWithTypesEntryType right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is SessionLimitPredictionClientType other && Equals(other);
+    public override bool Equals(object? obj) => obj is SessionFsReaddirWithTypesEntryType other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(SessionLimitPredictionClientType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(SessionFsReaddirWithTypesEntryType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -41019,68 +46175,65 @@ public SessionLimitPredictionClientType(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{SessionLimitPredictionClientType}"/> for serializing <see cref="SessionLimitPredictionClientType"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{SessionFsReaddirWithTypesEntryType}"/> for serializing <see cref="SessionFsReaddirWithTypesEntryType"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<SessionLimitPredictionClientType>
+    public sealed class Converter : JsonConverter<SessionFsReaddirWithTypesEntryType>
     {
         /// <inheritdoc />
-        public override SessionLimitPredictionClientType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override SessionFsReaddirWithTypesEntryType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, SessionLimitPredictionClientType value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, SessionFsReaddirWithTypesEntryType value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SessionLimitPredictionClientType));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SessionFsReaddirWithTypesEntryType));
         }
     }
 }
 
 
-/// <summary>Semantic usage tier used for a recommended cap or additional headroom.</summary>
+/// <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>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct SessionLimitPredictionTier : IEquatable<SessionLimitPredictionTier>
+public readonly struct SessionFsSqliteQueryType : IEquatable<SessionFsSqliteQueryType>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="SessionLimitPredictionTier"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="SessionLimitPredictionTier"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="SessionFsSqliteQueryType"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="SessionFsSqliteQueryType"/>.</param>
     [JsonConstructor]
-    public SessionLimitPredictionTier(string value)
+    public SessionFsSqliteQueryType(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="SessionLimitPredictionTier"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="SessionFsSqliteQueryType"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Recommended starting tier.</summary>
-    public static SessionLimitPredictionTier Recommended { get; } = new("recommended");
-
-    /// <summary>Additional headroom for longer-running sessions.</summary>
-    public static SessionLimitPredictionTier AdditionalHeadroom { get; } = new("additional_headroom");
+    /// <summary>Execute DDL or multi-statement SQL without returning rows.</summary>
+    public static SessionFsSqliteQueryType Exec { get; } = new("exec");
 
-    /// <summary>Generous headroom for unusually high usage.</summary>
-    public static SessionLimitPredictionTier GenerousHeadroom { get; } = new("generous_headroom");
+    /// <summary>Execute a SELECT-style query and return rows.</summary>
+    public static SessionFsSqliteQueryType Query { get; } = new("query");
 
-    /// <summary>Maximum available headroom tier.</summary>
-    public static SessionLimitPredictionTier MaximumHeadroom { get; } = new("maximum_headroom");
+    /// <summary>Execute INSERT, UPDATE, or DELETE SQL and return affected-row metadata.</summary>
+    public static SessionFsSqliteQueryType Run { get; } = new("run");
 
-    /// <summary>Returns a value indicating whether two <see cref="SessionLimitPredictionTier"/> instances are equivalent.</summary>
-    public static bool operator ==(SessionLimitPredictionTier left, SessionLimitPredictionTier right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="SessionFsSqliteQueryType"/> instances are equivalent.</summary>
+    public static bool operator ==(SessionFsSqliteQueryType left, SessionFsSqliteQueryType right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="SessionLimitPredictionTier"/> instances are not equivalent.</summary>
-    public static bool operator !=(SessionLimitPredictionTier left, SessionLimitPredictionTier right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="SessionFsSqliteQueryType"/> instances are not equivalent.</summary>
+    public static bool operator !=(SessionFsSqliteQueryType left, SessionFsSqliteQueryType right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is SessionLimitPredictionTier other && Equals(other);
+    public override bool Equals(object? obj) => obj is SessionFsSqliteQueryType other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(SessionLimitPredictionTier other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(SessionFsSqliteQueryType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -41088,65 +46241,65 @@ public SessionLimitPredictionTier(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{SessionLimitPredictionTier}"/> for serializing <see cref="SessionLimitPredictionTier"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{SessionFsSqliteQueryType}"/> for serializing <see cref="SessionFsSqliteQueryType"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<SessionLimitPredictionTier>
+    public sealed class Converter : JsonConverter<SessionFsSqliteQueryType>
     {
         /// <inheritdoc />
-        public override SessionLimitPredictionTier Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override SessionFsSqliteQueryType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, SessionLimitPredictionTier value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, SessionFsSqliteQueryType value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SessionLimitPredictionTier));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SessionFsSqliteQueryType));
         }
     }
 }
 
 
-/// <summary>Baseline fallback level used to create the prediction.</summary>
+/// <summary>SQLite transaction failure classification.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct SessionLimitPredictionSource : IEquatable<SessionLimitPredictionSource>
+public readonly struct SessionFsSqliteTransactionErrorClass : IEquatable<SessionFsSqliteTransactionErrorClass>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="SessionLimitPredictionSource"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="SessionLimitPredictionSource"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="SessionFsSqliteTransactionErrorClass"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="SessionFsSqliteTransactionErrorClass"/>.</param>
     [JsonConstructor]
-    public SessionLimitPredictionSource(string value)
+    public SessionFsSqliteTransactionErrorClass(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="SessionLimitPredictionSource"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="SessionFsSqliteTransactionErrorClass"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>The prediction used the exact resolved model's baseline cell.</summary>
-    public static SessionLimitPredictionSource Model { get; } = new("model");
+    /// <summary>SQLite reported BUSY or LOCKED before commit; the transaction was rolled back and may be retried.</summary>
+    public static SessionFsSqliteTransactionErrorClass BusyOrLocked { get; } = new("busyOrLocked");
 
-    /// <summary>The exact model was unavailable, so the prediction used the model family's baseline cell.</summary>
-    public static SessionLimitPredictionSource Family { get; } = new("family");
+    /// <summary>The statement, database, or provider failed definitively and must not be retried automatically.</summary>
+    public static SessionFsSqliteTransactionErrorClass Fatal { get; } = new("fatal");
 
-    /// <summary>No model or family cell was available, so the prediction used the global client-type baseline cell.</summary>
-    public static SessionLimitPredictionSource Global { get; } = new("global");
+    /// <summary>The transport failed after the provider may have committed; retrying could duplicate effects.</summary>
+    public static SessionFsSqliteTransactionErrorClass PostCommitAmbiguous { get; } = new("postCommitAmbiguous");
 
-    /// <summary>Returns a value indicating whether two <see cref="SessionLimitPredictionSource"/> instances are equivalent.</summary>
-    public static bool operator ==(SessionLimitPredictionSource left, SessionLimitPredictionSource right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="SessionFsSqliteTransactionErrorClass"/> instances are equivalent.</summary>
+    public static bool operator ==(SessionFsSqliteTransactionErrorClass left, SessionFsSqliteTransactionErrorClass right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="SessionLimitPredictionSource"/> instances are not equivalent.</summary>
-    public static bool operator !=(SessionLimitPredictionSource left, SessionLimitPredictionSource right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="SessionFsSqliteTransactionErrorClass"/> instances are not equivalent.</summary>
+    public static bool operator !=(SessionFsSqliteTransactionErrorClass left, SessionFsSqliteTransactionErrorClass right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is SessionLimitPredictionSource other && Equals(other);
+    public override bool Equals(object? obj) => obj is SessionFsSqliteTransactionErrorClass other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(SessionLimitPredictionSource other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(SessionFsSqliteTransactionErrorClass other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -41154,62 +46307,68 @@ public SessionLimitPredictionSource(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{SessionLimitPredictionSource}"/> for serializing <see cref="SessionLimitPredictionSource"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{SessionFsSqliteTransactionErrorClass}"/> for serializing <see cref="SessionFsSqliteTransactionErrorClass"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<SessionLimitPredictionSource>
+    public sealed class Converter : JsonConverter<SessionFsSqliteTransactionErrorClass>
     {
         /// <inheritdoc />
-        public override SessionLimitPredictionSource Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override SessionFsSqliteTransactionErrorClass Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, SessionLimitPredictionSource value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, SessionFsSqliteTransactionErrorClass value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SessionLimitPredictionSource));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SessionFsSqliteTransactionErrorClass));
         }
     }
 }
 
 
-/// <summary>Reason a prediction could not be computed.</summary>
+/// <summary>Defines the allowed values.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct SessionLimitPredictionUnavailableReason : IEquatable<SessionLimitPredictionUnavailableReason>
+public readonly struct HostExitReason : IEquatable<HostExitReason>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="SessionLimitPredictionUnavailableReason"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="SessionLimitPredictionUnavailableReason"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="HostExitReason"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="HostExitReason"/>.</param>
     [JsonConstructor]
-    public SessionLimitPredictionUnavailableReason(string value)
+    public HostExitReason(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="SessionLimitPredictionUnavailableReason"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="HostExitReason"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>The current model is auto and has not resolved to a concrete model yet.</summary>
-    public static SessionLimitPredictionUnavailableReason AutoUnresolved { get; } = new("auto_unresolved");
+    /// <summary>The owner requested disposal.</summary>
+    public static HostExitReason Disposed { get; } = new("disposed");
 
-    /// <summary>No model was provided and the session does not currently have a selected model.</summary>
-    public static SessionLimitPredictionUnavailableReason NoModel { get; } = new("no_model");
+    /// <summary>The hosting task or its SDK transport exited; this does not mean the runtime process exited.</summary>
+    public static HostExitReason Exited { get; } = new("exited");
 
-    /// <summary>Returns a value indicating whether two <see cref="SessionLimitPredictionUnavailableReason"/> instances are equivalent.</summary>
-    public static bool operator ==(SessionLimitPredictionUnavailableReason left, SessionLimitPredictionUnavailableReason right) => left.Equals(right);
+    /// <summary>The owning SDK connection disconnected.</summary>
+    public static HostExitReason OwnerDisconnected { get; } = new("ownerDisconnected");
 
-    /// <summary>Returns a value indicating whether two <see cref="SessionLimitPredictionUnavailableReason"/> instances are not equivalent.</summary>
-    public static bool operator !=(SessionLimitPredictionUnavailableReason left, SessionLimitPredictionUnavailableReason right) => !(left == right);
+    /// <summary>The runtime is shutting down.</summary>
+    public static HostExitReason RuntimeShutdown { get; } = new("runtimeShutdown");
+
+    /// <summary>Returns a value indicating whether two <see cref="HostExitReason"/> instances are equivalent.</summary>
+    public static bool operator ==(HostExitReason left, HostExitReason right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="HostExitReason"/> instances are not equivalent.</summary>
+    public static bool operator !=(HostExitReason left, HostExitReason right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is SessionLimitPredictionUnavailableReason other && Equals(other);
+    public override bool Equals(object? obj) => obj is HostExitReason other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(SessionLimitPredictionUnavailableReason other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(HostExitReason other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -41217,65 +46376,62 @@ public SessionLimitPredictionUnavailableReason(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{SessionLimitPredictionUnavailableReason}"/> for serializing <see cref="SessionLimitPredictionUnavailableReason"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{HostExitReason}"/> for serializing <see cref="HostExitReason"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<SessionLimitPredictionUnavailableReason>
+    public sealed class Converter : JsonConverter<HostExitReason>
     {
         /// <inheritdoc />
-        public override SessionLimitPredictionUnavailableReason Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override HostExitReason Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, SessionLimitPredictionUnavailableReason value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, HostExitReason value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SessionLimitPredictionUnavailableReason));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(HostExitReason));
         }
     }
 }
 
 
-/// <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>
+/// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct RemoteSessionMode : IEquatable<RemoteSessionMode>
+public readonly struct LlmInferenceHttpRequestStartTransport : IEquatable<LlmInferenceHttpRequestStartTransport>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="RemoteSessionMode"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="RemoteSessionMode"/>.</param>
+    /// <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 RemoteSessionMode(string value)
+    public LlmInferenceHttpRequestStartTransport(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="RemoteSessionMode"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="LlmInferenceHttpRequestStartTransport"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Disable remote session export and steering.</summary>
-    public static RemoteSessionMode Off { get; } = new("off");
-
-    /// <summary>Export session events to GitHub without enabling remote steering.</summary>
-    public static RemoteSessionMode Export { get; } = new("export");
+    /// <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>Enable both remote session export and remote steering.</summary>
-    public static RemoteSessionMode On { get; } = new("on");
+    /// <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="RemoteSessionMode"/> instances are equivalent.</summary>
-    public static bool operator ==(RemoteSessionMode left, RemoteSessionMode right) => left.Equals(right);
+    /// <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="RemoteSessionMode"/> instances are not equivalent.</summary>
-    public static bool operator !=(RemoteSessionMode left, RemoteSessionMode right) => !(left == 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 RemoteSessionMode other && Equals(other);
+    public override bool Equals(object? obj) => obj is LlmInferenceHttpRequestStartTransport other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(RemoteSessionMode other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(LlmInferenceHttpRequestStartTransport other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -41283,62 +46439,62 @@ public RemoteSessionMode(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{RemoteSessionMode}"/> for serializing <see cref="RemoteSessionMode"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{LlmInferenceHttpRequestStartTransport}"/> for serializing <see cref="LlmInferenceHttpRequestStartTransport"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<RemoteSessionMode>
+    public sealed class Converter : JsonConverter<LlmInferenceHttpRequestStartTransport>
     {
         /// <inheritdoc />
-        public override RemoteSessionMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        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, RemoteSessionMode value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, LlmInferenceHttpRequestStartTransport value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(RemoteSessionMode));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(LlmInferenceHttpRequestStartTransport));
         }
     }
 }
 
 
-/// <summary>Sharing status for a synced session. "repo" makes the session visible to anyone with read access to the repository; "unshared" restricts it to the creator and collaborators.</summary>
+/// <summary>Why the runtime is requesting a GitHub credential.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct SessionVisibilityStatus : IEquatable<SessionVisibilityStatus>
+public readonly struct GitHubTokenAcquireReason : IEquatable<GitHubTokenAcquireReason>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="SessionVisibilityStatus"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="SessionVisibilityStatus"/>.</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 SessionVisibilityStatus(string value)
+    public GitHubTokenAcquireReason(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="SessionVisibilityStatus"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="GitHubTokenAcquireReason"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>The session is visible to repository readers.</summary>
-    public static SessionVisibilityStatus Repo { get; } = new("repo");
+    /// <summary>The runtime is acquiring the registration's first credential.</summary>
+    public static GitHubTokenAcquireReason Initial { get; } = new("initial");
 
-    /// <summary>The session is restricted to its creator and collaborators.</summary>
-    public static SessionVisibilityStatus Unshared { get; } = new("unshared");
+    /// <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="SessionVisibilityStatus"/> instances are equivalent.</summary>
-    public static bool operator ==(SessionVisibilityStatus left, SessionVisibilityStatus 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="SessionVisibilityStatus"/> instances are not equivalent.</summary>
-    public static bool operator !=(SessionVisibilityStatus left, SessionVisibilityStatus 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 SessionVisibilityStatus other && Equals(other);
+    public override bool Equals(object? obj) => obj is GitHubTokenAcquireReason other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(SessionVisibilityStatus 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);
@@ -41346,62 +46502,65 @@ public SessionVisibilityStatus(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{SessionVisibilityStatus}"/> for serializing <see cref="SessionVisibilityStatus"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{GitHubTokenAcquireReason}"/> for serializing <see cref="GitHubTokenAcquireReason"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<SessionVisibilityStatus>
+    public sealed class Converter : JsonConverter<GitHubTokenAcquireReason>
     {
         /// <inheritdoc />
-        public override SessionVisibilityStatus 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, SessionVisibilityStatus value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, GitHubTokenAcquireReason value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SessionVisibilityStatus));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(GitHubTokenAcquireReason));
         }
     }
 }
 
 
-/// <summary>Why the runtime requests client-task cancellation.</summary>
+/// <summary>Explicit user decisions, never inferred from a permission grant or model response.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct ClientTaskCancelReason : IEquatable<ClientTaskCancelReason>
+public readonly struct InstallationDecision : IEquatable<InstallationDecision>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="ClientTaskCancelReason"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="ClientTaskCancelReason"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="InstallationDecision"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="InstallationDecision"/>.</param>
     [JsonConstructor]
-    public ClientTaskCancelReason(string value)
+    public InstallationDecision(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="ClientTaskCancelReason"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="InstallationDecision"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>A caller requested task cancellation.</summary>
-    public static ClientTaskCancelReason CancelRequested { get; } = new("cancel_requested");
+    /// <summary>The user explicitly approved the exact review on this request.</summary>
+    public static InstallationDecision Confirm { get; } = new("confirm");
 
-    /// <summary>The session is shutting down.</summary>
-    public static ClientTaskCancelReason SessionShutdown { get; } = new("session_shutdown");
+    /// <summary>The user declined the reviewed operation.</summary>
+    public static InstallationDecision Decline { get; } = new("decline");
 
-    /// <summary>Returns a value indicating whether two <see cref="ClientTaskCancelReason"/> instances are equivalent.</summary>
-    public static bool operator ==(ClientTaskCancelReason left, ClientTaskCancelReason right) => left.Equals(right);
+    /// <summary>The user cancelled the pending decision without granting consent.</summary>
+    public static InstallationDecision Cancel { get; } = new("cancel");
 
-    /// <summary>Returns a value indicating whether two <see cref="ClientTaskCancelReason"/> instances are not equivalent.</summary>
-    public static bool operator !=(ClientTaskCancelReason left, ClientTaskCancelReason right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="InstallationDecision"/> instances are equivalent.</summary>
+    public static bool operator ==(InstallationDecision left, InstallationDecision right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="InstallationDecision"/> instances are not equivalent.</summary>
+    public static bool operator !=(InstallationDecision left, InstallationDecision right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is ClientTaskCancelReason other && Equals(other);
+    public override bool Equals(object? obj) => obj is InstallationDecision other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(ClientTaskCancelReason other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(InstallationDecision other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -41409,724 +46568,1436 @@ public ClientTaskCancelReason(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{ClientTaskCancelReason}"/> for serializing <see cref="ClientTaskCancelReason"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{InstallationDecision}"/> for serializing <see cref="InstallationDecision"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<ClientTaskCancelReason>
+    public sealed class Converter : JsonConverter<InstallationDecision>
     {
         /// <inheritdoc />
-        public override ClientTaskCancelReason Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override InstallationDecision Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, ClientTaskCancelReason value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, InstallationDecision value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ClientTaskCancelReason));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(InstallationDecision));
         }
     }
 }
 
 
-/// <summary>Error classification.</summary>
+/// <summary>Provides server-scoped RPC methods (no session required).</summary>
+public sealed class ServerRpc
+{
+    private readonly JsonRpc _rpc;
+
+    internal ServerRpc(JsonRpc rpc)
+    {
+        _rpc = rpc;
+    }
+
+    /// <summary>Checks server responsiveness and returns protocol information.</summary>
+    /// <param name="message">Optional message to echo back.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Server liveness response, including the echoed message, current server timestamp, and protocol version.</returns>
+    [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+    public async Task<PingResult> PingAsync(string? message = null, CancellationToken cancellationToken = default)
+    {
+        var request = new PingRequest { Message = message };
+        return await CopilotClient.InvokeRpcAsync<PingResult>(_rpc, "ping", [request], cancellationToken);
+    }
+
+    /// <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="enableGitHubTelemetryForwarding">Opt this connection in to GitHub telemetry forwarding for its lifetime. When set, the runtime forwards this host's telemetry across all its sessions, its sessionless events, and explicitly process-wide events over the `gitHubTelemetry.event` notification. Connections intentionally sharing one server receive that server's events; independently embedded runtime hosts do not receive each other's host-owned events. 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="supportedTaskKinds">Task kinds this connection can decode when observing session tasks. Omit to retain agent and shell compatibility.</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(global::GitHub.Copilot.Diagnostics.Experimental)]
+    internal async Task<ConnectResult> ConnectAsync(bool? enableGitHubTelemetryForwarding = null, ConnectClientInfo? clientInfo = null, IList<TaskKind>? supportedTaskKinds = null, string? token = null, CancellationToken cancellationToken = default)
+    {
+        var request = new ConnectRequest { EnableGitHubTelemetryForwarding = enableGitHubTelemetryForwarding, ClientInfo = clientInfo, SupportedTaskKinds = supportedTaskKinds, 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 uses its built-in extension launcher.</summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+    public async Task RegisterExtensionLaunchProviderAsync(CancellationToken cancellationToken = default)
+    {
+        await CopilotClient.InvokeRpcAsync(_rpc, "registerExtensionLaunchProvider", [], cancellationToken);
+    }
+
+    /// <summary>Sandbox APIs.</summary>
+    public ServerSandboxApi Sandbox =>
+        field ??
+        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
+        field;
+
+    /// <summary>Persistence APIs.</summary>
+    public ServerPersistenceApi Persistence =>
+        field ??
+        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
+        field;
+
+    /// <summary>User APIs.</summary>
+    public ServerUserApi User =>
+        field ??
+        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
+        field;
+
+    /// <summary>Repo APIs.</summary>
+    public ServerRepoApi Repo =>
+        field ??
+        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
+        field;
+
+    /// <summary>FeatureFlags APIs.</summary>
+    public ServerFeatureFlagsApi FeatureFlags =>
+        field ??
+        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
+        field;
+
+    /// <summary>Permissions APIs.</summary>
+    public ServerPermissionsApi Permissions =>
+        field ??
+        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>Environments APIs.</summary>
+    public ServerEnvironmentsApi Environments =>
+        field ??
+        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
+        field;
+
+    /// <summary>Host APIs.</summary>
+    public ServerHostApi Host =>
+        field ??
+        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
+        field;
+
+    /// <summary>Hooks APIs.</summary>
+    public ServerHooksApi Hooks =>
+        field ??
+        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
+        field;
+
+    /// <summary>Models APIs.</summary>
+    public ServerModelsApi Models =>
+        field ??
+        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
+        field;
+
+    /// <summary>Tools APIs.</summary>
+    public ServerToolsApi Tools =>
+        field ??
+        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
+        field;
+
+    /// <summary>Account APIs.</summary>
+    public ServerAccountApi Account =>
+        field ??
+        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
+        field;
+
+    /// <summary>Secrets APIs.</summary>
+    public ServerSecretsApi Secrets =>
+        field ??
+        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
+        field;
+
+    /// <summary>Mcp APIs.</summary>
+    public ServerMcpApi Mcp =>
+        field ??
+        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
+        field;
+
+    /// <summary>Extensions APIs.</summary>
+    public ServerExtensionsApi Extensions =>
+        field ??
+        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
+        field;
+
+    /// <summary>Instructions APIs.</summary>
+    public ServerInstructionsApi Instructions =>
+        field ??
+        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
+        field;
+
+    /// <summary>Skills APIs.</summary>
+    public ServerSkillsApi Skills =>
+        field ??
+        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 ??
+        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
+        field;
+
+    /// <summary>Agents APIs.</summary>
+    public ServerAgentsApi Agents =>
+        field ??
+        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
+        field;
+
+    /// <summary>GlobalState APIs.</summary>
+    public ServerGlobalStateApi GlobalState =>
+        field ??
+        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
+        field;
+
+    /// <summary>Commands APIs.</summary>
+    public ServerCommandsApi Commands =>
+        field ??
+        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
+        field;
+
+    /// <summary>GitHubRepository APIs.</summary>
+    public ServerGitHubRepositoryApi GitHubRepository =>
+        field ??
+        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
+        field;
+
+    /// <summary>GitHubOwners APIs.</summary>
+    public ServerGitHubOwnersApi GitHubOwners =>
+        field ??
+        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
+        field;
+
+    /// <summary>Git APIs.</summary>
+    public ServerGitApi Git =>
+        field ??
+        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
+        field;
+
+    /// <summary>Runtime APIs.</summary>
+    public ServerRuntimeApi Runtime =>
+        field ??
+        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
+        field;
+
+    /// <summary>SessionFs APIs.</summary>
+    public ServerSessionFsApi SessionFs =>
+        field ??
+        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
+        field;
+
+    /// <summary>LlmInference APIs.</summary>
+    public ServerLlmInferenceApi LlmInference =>
+        field ??
+        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
+        field;
+
+    /// <summary>Sessions APIs.</summary>
+    public ServerSessionsApi Sessions =>
+        field ??
+        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
+        field;
+
+    /// <summary>AgentRegistry APIs.</summary>
+    public ServerAgentRegistryApi AgentRegistry =>
+        field ??
+        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
+        field;
+
+    /// <summary>Connectors APIs.</summary>
+    public ServerConnectorsApi Connectors =>
+        field ??
+        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
+        field;
+}
+
+/// <summary>Provides server-scoped Sandbox APIs.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class ServerSandboxApi
+{
+    private readonly JsonRpc _rpc;
+
+    internal ServerSandboxApi(JsonRpc rpc)
+    {
+        _rpc = rpc;
+    }
+
+    /// <summary>Raises a user's sandbox settings to an administrator's managed sandbox floor and returns the result a session should actually run under. The floor can only tighten: an enterprise force-on is reflected even when the user's own `enabled` is false, and a user cannot lower a setting the floor raised. The result is normalized through the declared sandbox shape, so a key reorder or an undeclared passthrough key is not mistaken for a policy change by callers that diff two results. A host must call this rather than merge the two layers itself, because reimplementing the direction of the fold is what turns an administrator's floor into a suggestion.</summary>
+    /// <param name="userSandbox">The user's own `sandbox` settings slice. Omitted when the user has configured none, which still yields the managed floor rather than a disabled sandbox.</param>
+    /// <param name="managedSandbox">The effective managed `sandbox` slice acting as a floor. Omitted when no administrator policy applies, in which case the user's own settings stand unchanged.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>The user's sandbox settings raised to the managed floor.</returns>
+    internal async Task<SandboxResolveFlooredConfigResult> ResolveFlooredConfigAsync(object? userSandbox = null, object? managedSandbox = null, CancellationToken cancellationToken = default)
+    {
+        var request = new SandboxResolveFlooredConfigParams { UserSandbox = CopilotClient.ToJsonElementForWire(userSandbox), ManagedSandbox = CopilotClient.ToJsonElementForWire(managedSandbox) };
+        return await CopilotClient.InvokeRpcAsync<SandboxResolveFlooredConfigResult>(_rpc, "sandbox.resolveFlooredConfig", [request], cancellationToken);
+    }
+
+    /// <summary>Builds the effective filesystem policy one `@`-file picker checks its suggestions against, so Git discovery and grant canonicalization run once for the picker's lifetime instead of on every debounced keystroke. Returns no policy when the sandbox is absent or disabled, which the paired filter reads as "keep every candidate". A host must pair this with `sandbox.filterPickerCandidates` rather than resolve a grant list itself, because the picker's grants are narrower than a file tool's — the same path a built-in tool may read can be one the picker must not offer.</summary>
+    /// <param name="cwd">The session's working directory. Git discovery and grant canonicalization are resolved against it.</param>
+    /// <param name="sandbox">The session's resolved `sandbox` slice. Omitted, or disabled, yields no policy and every candidate is kept.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>The prepared file-picker policy, or none when the sandbox is disabled.</returns>
+    internal async Task<SandboxPreparePickerPolicyResult> PreparePickerPolicyAsync(string cwd, object? sandbox = null, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(cwd);
+
+        var request = new SandboxPreparePickerPolicyParams { Cwd = cwd, Sandbox = CopilotClient.ToJsonElementForWire(sandbox) };
+        return await CopilotClient.InvokeRpcAsync<SandboxPreparePickerPolicyResult>(_rpc, "sandbox.preparePickerPolicy", [request], cancellationToken);
+    }
+
+    /// <summary>Checks a batch of `@`-file picker suggestions against a policy prepared by `sandbox.preparePickerPolicy` and returns one allow decision per candidate, positionally aligned with the request. Batched deliberately: each check canonicalizes a path component-by-component through the real filesystem, so one call amortizes that over a single hop rather than dozens while the user types. A directory the policy does not itself allow can still be kept as a waypoint to an allowed subtree. An absent policy keeps every candidate.</summary>
+    /// <param name="candidates">The candidates to check, in the order the answers are returned.</param>
+    /// <param name="cwd">The session's working directory, matching the one the policy was prepared from.</param>
+    /// <param name="sandbox">The policy returned by `sandbox.preparePickerPolicy`. Omitted keeps every candidate.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Per-candidate allow decisions, positionally aligned with the request.</returns>
+    internal async Task<SandboxFilterPickerCandidatesResult> FilterPickerCandidatesAsync(IList<SandboxPickerCandidate> candidates, string cwd, object? sandbox = null, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(candidates);
+        ArgumentNullException.ThrowIfNull(cwd);
+
+        var request = new SandboxFilterPickerCandidatesParams { Candidates = candidates, Cwd = cwd, Sandbox = CopilotClient.ToJsonElementForWire(sandbox) };
+        return await CopilotClient.InvokeRpcAsync<SandboxFilterPickerCandidatesResult>(_rpc, "sandbox.filterPickerCandidates", [request], cancellationToken);
+    }
+
+    /// <summary>The sandbox a single named feature actually launches under, which is not the same as the session's sandbox. A feature is routed out of the sandbox by its own flag — `sandboxMcpServers`, `sandboxLspServers` — so an enabled session can still start one server confined and another free. Returns a disabled sandbox rather than an error when the host has no sandbox slice at all, so an absent config and an opted-out feature read alike at the launch site. A host must ask per feature rather than reuse the session config, because reading only `enabled` confines a server the user opted out of, or reports as sandboxed one that is not.</summary>
+    /// <param name="routingFlag">The routing flag naming the feature being launched, such as `sandboxMcpServers` or `sandboxLspServers`.</param>
+    /// <param name="sandbox">The session's resolved `sandbox` slice. Omitted when the host has none, which yields a disabled sandbox rather than an error.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>The sandbox a named feature actually launches under.</returns>
+    internal async Task<SandboxEffectiveForOptionalResult> ResolveForOptionalAsync(string routingFlag, object? sandbox = null, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(routingFlag);
+
+        var request = new SandboxEffectiveForOptionalParams { RoutingFlag = routingFlag, Sandbox = CopilotClient.ToJsonElementForWire(sandbox) };
+        return await CopilotClient.InvokeRpcAsync<SandboxEffectiveForOptionalResult>(_rpc, "sandbox.resolveForOptional", [request], cancellationToken);
+    }
+
+    /// <summary>Reports whether this machine can run an OS-level command sandbox at all. A host must ask before it offers sandboxing, because the answer is a property of the machine rather than of any setting: on Linux it depends on bubblewrap being installed, and on Windows on the OS build supporting BaseContainer. Probing it requires spawning a process the first time, so the answer is cached for the life of the runtime. A host that assumes support and enables the sandbox anyway produces a session in which every shell command fails.</summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>True when an OS-level sandbox can run on this host.</returns>
+    internal async Task<bool> CheckPlatformSupportAsync(CancellationToken cancellationToken = default)
+    {
+        return await CopilotClient.InvokeRpcAsync<bool>(_rpc, "sandbox.checkPlatformSupport", [], cancellationToken);
+    }
+
+    /// <summary>Reports whether this Windows host's BaseContainer implementation can reach the host's loopback interface directly, which is what a local-network policy needs to avoid routing through the egress proxy. Like `sandbox.checkPlatformSupport`, the answer is a property of the machine's OS build rather than of any setting, and resolving it the first time spawns a platform probe. A host that offers the direct local-network option on a machine that lacks the capability produces a session whose sandboxed commands cannot reach local services. Always false off Windows.</summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>True when the sandbox on this host can reach host loopback directly.</returns>
+    internal async Task<bool> CheckWindowsHostLoopbackSupportAsync(CancellationToken cancellationToken = default)
+    {
+        return await CopilotClient.InvokeRpcAsync<bool>(_rpc, "sandbox.checkWindowsHostLoopbackSupport", [], cancellationToken);
+    }
+
+    /// <summary>The explanation a host shows when it refuses an explicit request to turn the sandbox on for a machine that cannot run one. Carries the platform-specific remedy — install bubblewrap, update Windows — and the documentation link, so a host that got `false` from `sandbox.checkPlatformSupport` does not have to compose its own reason and cannot describe the same machine differently from the runtime's own spawn path.</summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>The user-facing refusal, including the platform remedy and the documentation link.</returns>
+    internal async Task<string> GetUnsupportedMessageAsync(CancellationToken cancellationToken = default)
+    {
+        return await CopilotClient.InvokeRpcAsync<string>(_rpc, "sandbox.getUnsupportedMessage", [], cancellationToken);
+    }
+
+    /// <summary>The notice a host shows when a stored `sandbox` setting is being ignored for this session because the machine cannot enforce it. Distinct from `sandbox.getUnsupportedMessage`, which refuses an explicit request: this one reports that a setting the user already saved is inert, states that commands will run unsandboxed, and confirms the stored setting itself is left alone. A host that stays silent here leaves the user believing a sandbox is active.</summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>The user-facing notice that a saved sandbox setting is inert for this session.</returns>
+    internal async Task<string> GetUnsupportedSettingDisabledNoticeAsync(CancellationToken cancellationToken = default)
+    {
+        return await CopilotClient.InvokeRpcAsync<string>(_rpc, "sandbox.getUnsupportedSettingDisabledNotice", [], cancellationToken);
+    }
+
+    /// <summary>The warning a host prints at startup when a session asked for a sandbox on a machine that cannot run one. The third of the unsupported notices, and the only one that depends on the policy in force: it names the remedy the reader can actually act on, which is the stored setting for an unmanaged host, an administrator for a managed one, and waiting for the policy to resolve when the sandbox stayed on only because the policy could not be determined. Returns no notice when the machine does support a sandbox, so a host can call it unconditionally on the startup path. A host that composes its own warning tells a managed user to change a setting their policy will overwrite.</summary>
+    /// <param name="managedSandbox">The managed `sandbox` slice, when a policy supplies one. The notice treats the sandbox as enforced only when this both enables it and sets `failIfUnavailable`, because a managed sandbox that tolerates being unavailable still leaves the user able to turn it off.</param>
+    /// <param name="enabledByUndeterminedPolicy">True when the sandbox stayed on only because the managed policy could not be determined. Distinguishes a policy that positively enforces the sandbox from one that merely failed to resolve, which is the difference between telling the user to contact an administrator and telling them to wait. Defaults to false.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>The startup warning, absent when the machine can run a sandbox.</returns>
+    internal async Task<SandboxUnsupportedStartupNoticeResult> GetUnsupportedStartupNoticeAsync(object? managedSandbox = null, bool? enabledByUndeterminedPolicy = null, CancellationToken cancellationToken = default)
+    {
+        var request = new SandboxUnsupportedStartupNoticeParams { ManagedSandbox = CopilotClient.ToJsonElementForWire(managedSandbox), EnabledByUndeterminedPolicy = enabledByUndeterminedPolicy };
+        return await CopilotClient.InvokeRpcAsync<SandboxUnsupportedStartupNoticeResult>(_rpc, "sandbox.getUnsupportedStartupNotice", [request], cancellationToken);
+    }
+
+    /// <summary>Whether one slash command stays reachable while sandbox enforcement is unavailable and the session is otherwise blocked. The permitted set is deliberately narrow — commands that only report state, and the few that let the user repair or leave the situation — and it is keyed on the arguments as well as the name, so `/sandbox status` is admitted where `/sandbox enable` is not. A host must ask rather than keep its own list: a command this returns false for is one the runtime would refuse anyway, and a divergent list either strands the user with no way out or admits a command that acts on an unenforced session.</summary>
+    /// <param name="commandName">The command name as the user typed it, with or without its leading slash.</param>
+    /// <param name="args">The command's arguments, in order. Pass an empty array for a bare command: several entries in the allowlist admit the bare form and refuse every argument.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>True when the command stays available while enforcement is blocked.</returns>
+    internal async Task<bool> CheckEnforcementCommandAsync(string commandName, IList<string> args, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(commandName);
+        ArgumentNullException.ThrowIfNull(args);
+
+        var request = new SandboxEnforcementCommandAllowedParams { CommandName = commandName, Args = args };
+        return await CopilotClient.InvokeRpcAsync<bool>(_rpc, "sandbox.checkEnforcementCommand", [request], cancellationToken);
+    }
+
+    /// <summary>Returns the documentation URL a host should point a user at when it declines or downgrades a sandbox setting. The runtime owns the address so every surface cites the same page and a host does not hard-code a link that later moves.</summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>The documentation URL a host cites when it declines or downgrades a sandbox setting.</returns>
+    internal async Task<SandboxDocsUrlResult> GetDocsUrlAsync(CancellationToken cancellationToken = default)
+    {
+        return await CopilotClient.InvokeRpcAsync<SandboxDocsUrlResult>(_rpc, "sandbox.getDocsUrl", [], cancellationToken);
+    }
+
+    /// <summary>Reports whether the host running this runtime can run the command sandbox, without starting a session or spawning a sandboxed command.</summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Whether the host running this runtime can run the command sandbox. The runtime checks `supported` once per process. A capability answer can change while the process runs, for example after the user installs a missing package.</returns>
+    public async Task<SandboxHostSupport> GetHostSupportAsync(CancellationToken cancellationToken = default)
+    {
+        return await CopilotClient.InvokeRpcAsync<SandboxHostSupport>(_rpc, "sandbox.getHostSupport", [], cancellationToken);
+    }
+
+    /// <summary>ProxyCa APIs.</summary>
+    public ServerSandboxProxyCaApi ProxyCa =>
+        field ??
+        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
+        field;
+
+    /// <summary>ProxySecret APIs.</summary>
+    public ServerSandboxProxySecretApi ProxySecret =>
+        field ??
+        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
+        field;
+
+    /// <summary>Settings APIs.</summary>
+    public ServerSandboxSettingsApi Settings =>
+        field ??
+        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
+        field;
+}
+
+/// <summary>Provides server-scoped SandboxProxyCa APIs.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class ServerSandboxProxyCaApi
+{
+    private readonly JsonRpc _rpc;
+
+    internal ServerSandboxProxyCaApi(JsonRpc rpc)
+    {
+        _rpc = rpc;
+    }
+
+    /// <summary>Reports whether this runtime process can offer installing the sandbox credential-proxy certificate authority into OS trust.</summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>True when this process can offer installing the sandbox credential-proxy certificate authority into OS trust.</returns>
+    public async Task<bool> CheckInstallationSupportAsync(CancellationToken cancellationToken = default)
+    {
+        return await CopilotClient.InvokeRpcAsync<bool>(_rpc, "sandbox.proxyCa.checkInstallationSupport", [], cancellationToken);
+    }
+
+    /// <summary>Reports whether this sandbox configuration uses the credential proxy and can need certificate-authority setup.</summary>
+    /// <param name="sandboxConfig">The sandbox configuration that the host gives its sessions. The runtime reads the credential hosts from `auth` and `credentials`; it ignores `enabled` and the other fields.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>True when the sandbox configuration uses the credential proxy and can need certificate-authority setup.</returns>
+    public async Task<bool> CheckRelevanceAsync(SandboxConfig? sandboxConfig = null, CancellationToken cancellationToken = default)
+    {
+        var request = new SandboxProxyCaRequest { SandboxConfig = sandboxConfig };
+        return await CopilotClient.InvokeRpcAsync<bool>(_rpc, "sandbox.proxyCa.checkRelevance", [request], cancellationToken);
+    }
+
+    /// <summary>Reports whether the persistent certificate authority of the sandbox credential proxy exists, whether OS trust includes it, and whether it must be rotated. Changes nothing.</summary>
+    /// <param name="sandboxConfig">The sandbox configuration that the host gives its sessions. The runtime reads the credential hosts from `auth` and `credentials`; it ignores `enabled` and the other fields.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Status of the persistent certificate authority of the sandbox credential proxy.</returns>
+    public async Task<SandboxProxyCaStatus> GetStatusAsync(SandboxConfig? sandboxConfig = null, CancellationToken cancellationToken = default)
+    {
+        var request = new SandboxProxyCaRequest { SandboxConfig = sandboxConfig };
+        return await CopilotClient.InvokeRpcAsync<SandboxProxyCaStatus>(_rpc, "sandbox.proxyCa.getStatus", [request], cancellationToken);
+    }
+
+    /// <summary>Creates the persistent certificate authority of the sandbox credential proxy if none is stored, without changing OS trust, and returns the path of its public certificate. Keeps an existing certificate authority, even one that must be rotated. Fails where OS trust is unsupported. Trust it with sandbox.proxyCa.trust: the CLI trusts only the hosts in the saved user settings, so it refuses a certificate authority that also covers hosts from sandboxConfig.</summary>
+    /// <param name="sandboxConfig">The sandbox configuration that the host gives its sessions. The runtime reads the credential hosts from `auth` and `credentials`; it ignores `enabled` and the other fields.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Result of creating the persistent certificate authority of the sandbox credential proxy.</returns>
+    public async Task<SandboxProxyCaCreateResult> CreateAsync(SandboxConfig? sandboxConfig = null, CancellationToken cancellationToken = default)
+    {
+        var request = new SandboxProxyCaRequest { SandboxConfig = sandboxConfig };
+        return await CopilotClient.InvokeRpcAsync<SandboxProxyCaCreateResult>(_rpc, "sandbox.proxyCa.create", [request], cancellationToken);
+    }
+
+    /// <summary>Replaces the persistent certificate authority of the sandbox credential proxy with a new one for the current credential hosts. If OS trust included the old one, removes it and trusts the new one, which can show an OS authentication prompt. Running sandboxed tools keep the old certificate authority until they restart.</summary>
+    /// <param name="sandboxConfig">The sandbox configuration that the host gives its sessions. The runtime reads the credential hosts from `auth` and `credentials`; it ignores `enabled` and the other fields.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Status of the persistent certificate authority of the sandbox credential proxy.</returns>
+    public async Task<SandboxProxyCaStatus> RotateAsync(SandboxConfig? sandboxConfig = null, CancellationToken cancellationToken = default)
+    {
+        var request = new SandboxProxyCaRequest { SandboxConfig = sandboxConfig };
+        return await CopilotClient.InvokeRpcAsync<SandboxProxyCaStatus>(_rpc, "sandbox.proxyCa.rotate", [request], cancellationToken);
+    }
+
+    /// <summary>Adds the persistent certificate authority of the sandbox credential proxy to OS trust, so sandboxed clients that read only OS trust accept the proxy. Call create first. Refuses a certificate authority that is not constrained to the current credential hosts. Can show an OS authentication prompt.</summary>
+    /// <param name="sandboxConfig">The sandbox configuration that the host gives its sessions. The runtime reads the credential hosts from `auth` and `credentials`; it ignores `enabled` and the other fields.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Status of the persistent certificate authority of the sandbox credential proxy.</returns>
+    public async Task<SandboxProxyCaStatus> TrustAsync(SandboxConfig? sandboxConfig = null, CancellationToken cancellationToken = default)
+    {
+        var request = new SandboxProxyCaRequest { SandboxConfig = sandboxConfig };
+        return await CopilotClient.InvokeRpcAsync<SandboxProxyCaStatus>(_rpc, "sandbox.proxyCa.trust", [request], cancellationToken);
+    }
+
+    /// <summary>Removes the persistent certificate authority of the sandbox credential proxy from OS trust. Keeps the stored certificate authority. Can show an OS authentication prompt. Sandboxed clients that read only OS trust then reject the proxy; clients that read the per-process certificate bundle continue to work.</summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Status of the persistent certificate authority of the sandbox credential proxy.</returns>
+    public async Task<SandboxProxyCaStatus> RemoveAsync(CancellationToken cancellationToken = default)
+    {
+        return await CopilotClient.InvokeRpcAsync<SandboxProxyCaStatus>(_rpc, "sandbox.proxyCa.remove", [], cancellationToken);
+    }
+}
+
+/// <summary>Provides server-scoped SandboxProxySecret APIs.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-[JsonConverter(typeof(Converter))]
-[DebuggerDisplay("{Value,nq}")]
-public readonly struct SessionFsErrorCode : IEquatable<SessionFsErrorCode>
+public sealed class ServerSandboxProxySecretApi
 {
-    private readonly string? _value;
+    private readonly JsonRpc _rpc;
 
-    /// <summary>Initializes a new instance of the <see cref="SessionFsErrorCode"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="SessionFsErrorCode"/>.</param>
-    [JsonConstructor]
-    public SessionFsErrorCode(string value)
+    internal ServerSandboxProxySecretApi(JsonRpc rpc)
     {
-        ArgumentException.ThrowIfNullOrWhiteSpace(value);
-        _value = value;
+        _rpc = rpc;
     }
 
-    /// <summary>Gets the value associated with this <see cref="SessionFsErrorCode"/>.</summary>
-    public string Value => _value ?? string.Empty;
-
-    /// <summary>The requested path does not exist.</summary>
-    public static SessionFsErrorCode ENOENT { get; } = new("ENOENT");
-
-    /// <summary>The filesystem operation failed for an unspecified reason.</summary>
-    public static SessionFsErrorCode UNKNOWN { get; } = new("UNKNOWN");
-
-    /// <summary>Returns a value indicating whether two <see cref="SessionFsErrorCode"/> instances are equivalent.</summary>
-    public static bool operator ==(SessionFsErrorCode left, SessionFsErrorCode right) => left.Equals(right);
-
-    /// <summary>Returns a value indicating whether two <see cref="SessionFsErrorCode"/> instances are not equivalent.</summary>
-    public static bool operator !=(SessionFsErrorCode left, SessionFsErrorCode right) => !(left == right);
-
-    /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is SessionFsErrorCode other && Equals(other);
+    /// <summary>Reports where this runtime keeps the sandbox proxy password: the credential store directory and the entry identifier within it. Both are derived from the configuration directory this runtime was started with, so a host does not resolve them itself. Read this to recognize a `${secret:…}` value in stored sandbox settings as this runtime's own proxy password rather than a reference the user wrote by hand. Marked internal because it exists to carry a CLI call site off the napi boundary onto the SDK contract.</summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Where this runtime keeps the sandbox proxy password.</returns>
+    internal async Task<SandboxProxySecretLocation> GetLocationAsync(CancellationToken cancellationToken = default)
+    {
+        return await CopilotClient.InvokeRpcAsync<SandboxProxySecretLocation>(_rpc, "sandbox.proxySecret.getLocation", [], cancellationToken);
+    }
 
-    /// <inheritdoc />
-    public bool Equals(SessionFsErrorCode other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    /// <summary>Reads the stored sandbox proxy password from the credential store `sandbox.proxySecret.getLocation` names, preferring the OS keychain and falling back to the on-disk store. Reports an absent value rather than failing when no entry exists. Marked internal because it exists to carry a CLI call site off the napi boundary onto the SDK contract.</summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>The stored sandbox proxy password, if one is present.</returns>
+    internal async Task<SandboxProxySecretGetResult> GetAsync(CancellationToken cancellationToken = default)
+    {
+        return await CopilotClient.InvokeRpcAsync<SandboxProxySecretGetResult>(_rpc, "sandbox.proxySecret.get", [], cancellationToken);
+    }
 
-    /// <inheritdoc />
-    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
+    /// <summary>Stores the sandbox proxy password in the credential store `sandbox.proxySecret.getLocation` names, replacing any existing entry. Reports whether the OS keychain accepted it or it fell back to the on-disk store. Marked internal because it exists to carry a CLI call site off the napi boundary onto the SDK contract.</summary>
+    /// <param name="value">The password to store for the sandbox proxy.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Where the sandbox proxy password was stored.</returns>
+    internal async Task<SandboxProxySecretSaveResult> SaveAsync(string value, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(value);
 
-    /// <inheritdoc />
-    public override string ToString() => Value;
+        var request = new SandboxProxySecretSaveRequest { Value = value };
+        return await CopilotClient.InvokeRpcAsync<SandboxProxySecretSaveResult>(_rpc, "sandbox.proxySecret.save", [request], cancellationToken);
+    }
 
-    /// <summary>Provides a <see cref="JsonConverter{SessionFsErrorCode}"/> for serializing <see cref="SessionFsErrorCode"/> instances.</summary>
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<SessionFsErrorCode>
+    /// <summary>Removes the stored sandbox proxy password from the credential store `sandbox.proxySecret.getLocation` names. Succeeds when no entry exists, so it is safe to call while clearing a proxy password whose origin is unknown. Marked internal because it exists to carry a CLI call site off the napi boundary onto the SDK contract.</summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    internal async Task DeleteAsync(CancellationToken cancellationToken = default)
     {
-        /// <inheritdoc />
-        public override SessionFsErrorCode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-        {
-            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
-        }
-
-        /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, SessionFsErrorCode value, JsonSerializerOptions options)
-        {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SessionFsErrorCode));
-        }
+        await CopilotClient.InvokeRpcAsync(_rpc, "sandbox.proxySecret.delete", [], cancellationToken);
     }
 }
 
-
-/// <summary>Entry type.</summary>
+/// <summary>Provides server-scoped SandboxSettings APIs.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-[JsonConverter(typeof(Converter))]
-[DebuggerDisplay("{Value,nq}")]
-public readonly struct SessionFsReaddirWithTypesEntryType : IEquatable<SessionFsReaddirWithTypesEntryType>
+public sealed class ServerSandboxSettingsApi
 {
-    private readonly string? _value;
+    private readonly JsonRpc _rpc;
 
-    /// <summary>Initializes a new instance of the <see cref="SessionFsReaddirWithTypesEntryType"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="SessionFsReaddirWithTypesEntryType"/>.</param>
-    [JsonConstructor]
-    public SessionFsReaddirWithTypesEntryType(string value)
+    internal ServerSandboxSettingsApi(JsonRpc rpc)
     {
-        ArgumentException.ThrowIfNullOrWhiteSpace(value);
-        _value = value;
+        _rpc = rpc;
     }
 
-    /// <summary>Gets the value associated with this <see cref="SessionFsReaddirWithTypesEntryType"/>.</summary>
-    public string Value => _value ?? string.Empty;
-
-    /// <summary>The entry is a file.</summary>
-    public static SessionFsReaddirWithTypesEntryType File { get; } = new("file");
-
-    /// <summary>The entry is a directory.</summary>
-    public static SessionFsReaddirWithTypesEntryType Directory { get; } = new("directory");
-
-    /// <summary>Returns a value indicating whether two <see cref="SessionFsReaddirWithTypesEntryType"/> instances are equivalent.</summary>
-    public static bool operator ==(SessionFsReaddirWithTypesEntryType left, SessionFsReaddirWithTypesEntryType right) => left.Equals(right);
-
-    /// <summary>Returns a value indicating whether two <see cref="SessionFsReaddirWithTypesEntryType"/> instances are not equivalent.</summary>
-    public static bool operator !=(SessionFsReaddirWithTypesEntryType left, SessionFsReaddirWithTypesEntryType right) => !(left == right);
-
-    /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is SessionFsReaddirWithTypesEntryType other && Equals(other);
-
-    /// <inheritdoc />
-    public bool Equals(SessionFsReaddirWithTypesEntryType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    /// <summary>Resolves a stored sandbox settings object into the effective one, filling every value the user left unset with its default. Read this to render or reason about the sandbox configuration a session would actually run under, rather than the sparse document the user wrote.</summary>
+    /// <param name="stored">The sandbox settings as stored in the settings file. An empty object resolves to the defaults alone.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>The effective sandbox settings, with every unset value resolved to its default.</returns>
+    internal async Task<IDictionary<string, JsonElement>> ApplyDefaultsAsync(object? stored, CancellationToken cancellationToken = default)
+    {
+        var request = new SandboxApplyDefaultsRequest { Stored = CopilotClient.ToJsonElementForWire(stored) ?? JsonElement.Parse("null") };
+        return await CopilotClient.InvokeRpcAsync<IDictionary<string, JsonElement>>(_rpc, "sandbox.settings.applyDefaults", [request], cancellationToken);
+    }
+}
 
-    /// <inheritdoc />
-    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
+/// <summary>Provides server-scoped Persistence APIs.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class ServerPersistenceApi
+{
+    private readonly JsonRpc _rpc;
 
-    /// <inheritdoc />
-    public override string ToString() => Value;
+    internal ServerPersistenceApi(JsonRpc rpc)
+    {
+        _rpc = rpc;
+    }
 
-    /// <summary>Provides a <see cref="JsonConverter{SessionFsReaddirWithTypesEntryType}"/> for serializing <see cref="SessionFsReaddirWithTypesEntryType"/> instances.</summary>
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<SessionFsReaddirWithTypesEntryType>
+    /// <summary>Atomically replaces a JSON file's entire contents while holding the runtime's per-path lock. The lock lives in the runtime process, so a host that writes these files itself takes no part in it and can tear a concurrent runtime write; route the write here instead. Unlike a merging write this never reads or parses the existing file, so a previously corrupted snapshot is replaced wholesale rather than failing every later write. Use it only for callers that always persist a complete snapshot.</summary>
+    /// <param name="path">Absolute path of the file to replace. Parent directories are created when missing.</param>
+    /// <param name="dataJson">The serialized JSON document to write. It replaces the file's contents entirely; nothing is merged.</param>
+    /// <param name="fileHeader">Comment lines to emit above the document, for a format that tolerates them. Omit for strict JSON.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>The outcome of a locked snapshot write.</returns>
+    internal async Task<PersistenceWriteRawJsonLockedResult> WriteRawJsonLockedAsync(string path, string dataJson, string? fileHeader = null, CancellationToken cancellationToken = default)
     {
-        /// <inheritdoc />
-        public override SessionFsReaddirWithTypesEntryType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-        {
-            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
-        }
+        ArgumentNullException.ThrowIfNull(path);
+        ArgumentNullException.ThrowIfNull(dataJson);
 
-        /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, SessionFsReaddirWithTypesEntryType value, JsonSerializerOptions options)
-        {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SessionFsReaddirWithTypesEntryType));
-        }
+        var request = new PersistenceWriteRawJsonLockedRequest { Path = path, DataJson = dataJson, FileHeader = fileHeader };
+        return await CopilotClient.InvokeRpcAsync<PersistenceWriteRawJsonLockedResult>(_rpc, "persistence.writeRawJsonLocked", [request], cancellationToken);
     }
 }
 
-
-/// <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>
+/// <summary>Provides server-scoped User APIs.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-[JsonConverter(typeof(Converter))]
-[DebuggerDisplay("{Value,nq}")]
-public readonly struct SessionFsSqliteQueryType : IEquatable<SessionFsSqliteQueryType>
+public sealed class ServerUserApi
 {
-    private readonly string? _value;
+    private readonly JsonRpc _rpc;
 
-    /// <summary>Initializes a new instance of the <see cref="SessionFsSqliteQueryType"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="SessionFsSqliteQueryType"/>.</param>
-    [JsonConstructor]
-    public SessionFsSqliteQueryType(string value)
+    internal ServerUserApi(JsonRpc rpc)
     {
-        ArgumentException.ThrowIfNullOrWhiteSpace(value);
-        _value = value;
+        _rpc = rpc;
     }
 
-    /// <summary>Gets the value associated with this <see cref="SessionFsSqliteQueryType"/>.</summary>
-    public string Value => _value ?? string.Empty;
+    /// <summary>Settings APIs.</summary>
+    public ServerUserSettingsApi Settings =>
+        field ??
+        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
+        field;
+}
 
-    /// <summary>Execute DDL or multi-statement SQL without returning rows.</summary>
-    public static SessionFsSqliteQueryType Exec { get; } = new("exec");
+/// <summary>Provides server-scoped UserSettings APIs.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class ServerUserSettingsApi
+{
+    private readonly JsonRpc _rpc;
 
-    /// <summary>Execute a SELECT-style query and return rows.</summary>
-    public static SessionFsSqliteQueryType Query { get; } = new("query");
+    internal ServerUserSettingsApi(JsonRpc rpc)
+    {
+        _rpc = rpc;
+    }
 
-    /// <summary>Execute INSERT, UPDATE, or DELETE SQL and return affected-row metadata.</summary>
-    public static SessionFsSqliteQueryType Run { get; } = new("run");
+    /// <summary>Adds or removes one hook key in the user `disabledHooks` setting, rewriting settings.json in place and leaving every other setting untouched. Reports a typed outcome rather than failing the call, so a host can tell an unparseable settings file apart from a write that could not complete.</summary>
+    /// <param name="settingsPath">Path of the settings.json to rewrite.</param>
+    /// <param name="disableKey">Durable content-hash key of the hook, as `hooks.loadResources` reports it.</param>
+    /// <param name="disabled">True adds the key to `disabledHooks`, false removes it.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Outcome of rewriting the `disabledHooks` setting.</returns>
+    internal async Task<UserSettingsSetHookDisabledResult> SetHookDisabledAsync(string settingsPath, string disableKey, bool disabled, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(settingsPath);
+        ArgumentNullException.ThrowIfNull(disableKey);
 
-    /// <summary>Returns a value indicating whether two <see cref="SessionFsSqliteQueryType"/> instances are equivalent.</summary>
-    public static bool operator ==(SessionFsSqliteQueryType left, SessionFsSqliteQueryType right) => left.Equals(right);
+        var request = new UserSettingsSetHookDisabledRequest { SettingsPath = settingsPath, DisableKey = disableKey, Disabled = disabled };
+        return await CopilotClient.InvokeRpcAsync<UserSettingsSetHookDisabledResult>(_rpc, "user.settings.setHookDisabled", [request], cancellationToken);
+    }
 
-    /// <summary>Returns a value indicating whether two <see cref="SessionFsSqliteQueryType"/> instances are not equivalent.</summary>
-    public static bool operator !=(SessionFsSqliteQueryType left, SessionFsSqliteQueryType right) => !(left == right);
+    /// <summary>Reads the user's settings document exactly as `user.settings.load` does, but from a caller-supplied configuration directory instead of the one the server resolved for itself. Use this when a consumer scopes a session to its own Copilot home — the SDK's per-session `configDir` override — so the settings read match the directory that session actually uses. An absent or empty `configDir` resolves the server's own home, making this identical to `user.settings.load`. Hook-validation relaxations are deliberately not caller-supplied: they continue to come from the server's environment, so a consumer cannot widen the host's hook policy through this method.</summary>
+    /// <param name="configDir">Copilot configuration directory to read the settings document from, taking precedence over the server's own `COPILOT_HOME` and default home. Omit it, or pass an empty string, to read the directory the server resolved for itself.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>The stored user settings document, keyed by setting name.</returns>
+    internal async Task<IDictionary<string, JsonElement>> LoadForConfigDirAsync(string? configDir = null, CancellationToken cancellationToken = default)
+    {
+        var request = new UserSettingsLoadForConfigDirRequest { ConfigDir = configDir };
+        return await CopilotClient.InvokeRpcAsync<IDictionary<string, JsonElement>>(_rpc, "user.settings.loadForConfigDir", [request], cancellationToken);
+    }
 
-    /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is SessionFsSqliteQueryType other && Equals(other);
+    /// <summary>Reads a repository's checked-in settings document as stored, normalized, together with any diagnostic raised while reading it. This is the repository half of the layering `user.settings.get` reports: `user.settings.load` reads the user's own document, and this reads the one a repository checks in to govern the keys `user.settings.governanceKeys` lists as repo-governable. A document that fails to parse, or that sets a key a repository may not govern, is reported through `warning` while the settings that did load are still returned, so a consumer surfaces the diagnostic and continues rather than failing the session. When `repoRoot` is the user's home directory the Claude-compatible configuration is skipped, so a home-directory session does not inherit a personal config as repository policy.</summary>
+    /// <param name="repoRoot">Absolute path of the repository root whose settings to read. When this is the user's home directory, the Claude-compatible configuration is skipped, so a home-directory session does not inherit a personal config as if it were repository policy.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>A repository's settings as stored, together with any diagnostic raised while reading them.</returns>
+    internal async Task<UserSettingsLoadRepoResult> LoadRepoAsync(string repoRoot, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(repoRoot);
 
-    /// <inheritdoc />
-    public bool Equals(SessionFsSqliteQueryType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+        var request = new UserSettingsLoadRepoRequest { RepoRoot = repoRoot };
+        return await CopilotClient.InvokeRpcAsync<UserSettingsLoadRepoResult>(_rpc, "user.settings.loadRepo", [request], cancellationToken);
+    }
 
-    /// <inheritdoc />
-    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
+    /// <summary>Reads a repository's settings and merges them over a supplied user layer in one step, returning the settings a consumer should act on inside that repository. Use this rather than reading the two layers separately: the merge is per setting and collection-aware, so a repository adds to the collections it is allowed to influence without replacing the user's own entries, and a whole-document overlay would get that wrong. Any diagnostic raised while reading the repository layer is returned rather than printed, so the consumer decides how to surface it; the settings that did load are merged regardless.</summary>
+    /// <param name="repoRoot">Absolute path of the repository root whose settings to read. When this is the user's home directory, the Claude-compatible configuration is skipped, so a home-directory session does not inherit a personal config as if it were repository policy.</param>
+    /// <param name="userSettings">The user's own settings, keyed by setting name. The repository layer is merged over this; a repository may only add to the collection settings it is allowed to influence, so a user setting it does not name survives unchanged.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>The settings a consumer should act on inside a repository, together with any diagnostic raised while reading the repository layer.</returns>
+    internal async Task<UserSettingsLoadAndMergeRepoResult> LoadAndMergeRepoAsync(string repoRoot, IDictionary<string, JsonElement> userSettings, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(repoRoot);
+        ArgumentNullException.ThrowIfNull(userSettings);
 
-    /// <inheritdoc />
-    public override string ToString() => Value;
+        var request = new UserSettingsLoadAndMergeRepoRequest { RepoRoot = repoRoot, UserSettings = userSettings };
+        return await CopilotClient.InvokeRpcAsync<UserSettingsLoadAndMergeRepoResult>(_rpc, "user.settings.loadAndMergeRepo", [request], cancellationToken);
+    }
 
-    /// <summary>Provides a <see cref="JsonConverter{SessionFsSqliteQueryType}"/> for serializing <see cref="SessionFsSqliteQueryType"/> instances.</summary>
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<SessionFsSqliteQueryType>
+    /// <summary>Reports the on-disk path of the settings document `user.settings.load` and `user.settings.set` read and write. Resolved the same way those methods resolve it, so a host that shows or opens the settings file names the file the runtime actually uses, including the extensionless legacy `settings` file when that is what is present.</summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>The on-disk location of the user's settings document.</returns>
+    internal async Task<UserSettingsPathResult> GetPathAsync(CancellationToken cancellationToken = default)
     {
-        /// <inheritdoc />
-        public override SessionFsSqliteQueryType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-        {
-            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
-        }
-
-        /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, SessionFsSqliteQueryType value, JsonSerializerOptions options)
-        {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SessionFsSqliteQueryType));
-        }
+        return await CopilotClient.InvokeRpcAsync<UserSettingsPathResult>(_rpc, "user.settings.getPath", [], cancellationToken);
     }
-}
 
+    /// <summary>Reads the user's stored settings together with the diagnostic raised while reading them. This is `user.settings.load` plus the reason part of the document was ignored: that one answers the document alone, so a caller cannot tell a clean read from a salvaged one. Read this when the caller is about to write the file back, where accepting a partial parse would discard every value the loader could not read. The settings that did load are still reported alongside the warning, so a consumer may surface it and continue instead of failing.</summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>The user's stored settings, together with any diagnostic raised while reading them.</returns>
+    internal async Task<UserSettingsLoadWithWarningResult> LoadWithWarningAsync(CancellationToken cancellationToken = default)
+    {
+        return await CopilotClient.InvokeRpcAsync<UserSettingsLoadWithWarningResult>(_rpc, "user.settings.loadWithWarning", [], cancellationToken);
+    }
 
-/// <summary>SQLite transaction failure classification.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-[JsonConverter(typeof(Converter))]
-[DebuggerDisplay("{Value,nq}")]
-public readonly struct SessionFsSqliteTransactionErrorClass : IEquatable<SessionFsSqliteTransactionErrorClass>
-{
-    private readonly string? _value;
+    /// <summary>Folds a user settings layer over a managed (enterprise policy) layer and returns the merged settings. The managed layer's governance keys win, `autoTier` resolves through its overridable form, and the two per-entry control maps (`enabledPlugins`, `extraKnownMarketplaces`) union across the layers and are then stamped back from the managed layer, so each entry an administrator declares wins while the user keeps control of the rest. The parameters are named for their layers rather than being a generic base/override pair: nothing about a settings object identifies which layer produced it, so the runtime cannot detect a transposed call, and transposing one resolves the governance keys in the user's favour instead of the administrator's. Supplying only one layer returns it unchanged, and supplying neither returns an empty object. Rejects a managed `autoTier` that is neither a user-configurable tier nor a single-key overridable form, rather than silently dropping it.</summary>
+    /// <param name="managed">The managed layer. Its governance keys win, and the per-entry `enabledPlugins` and `extraKnownMarketplaces` control maps are stamped back from it after the union. Omitted when the host is unmanaged.</param>
+    /// <param name="user">The user's own settings layer. Wins on every key the managed layer does not govern. Omitted when the user has no settings yet.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>The user layer folded over the managed layer.</returns>
+    internal async Task<UserSettingsMergeManagedAndUserResult> MergeManagedAndUserAsync(object? managed = null, object? user = null, CancellationToken cancellationToken = default)
+    {
+        var request = new UserSettingsMergeManagedAndUserParams { Managed = CopilotClient.ToJsonElementForWire(managed), User = CopilotClient.ToJsonElementForWire(user) };
+        return await CopilotClient.InvokeRpcAsync<UserSettingsMergeManagedAndUserResult>(_rpc, "user.settings.mergeManagedAndUser", [request], cancellationToken);
+    }
 
-    /// <summary>Initializes a new instance of the <see cref="SessionFsSqliteTransactionErrorClass"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="SessionFsSqliteTransactionErrorClass"/>.</param>
-    [JsonConstructor]
-    public SessionFsSqliteTransactionErrorClass(string value)
+    /// <summary>Folds a repository's settings layer into the user layer. Each repo-overridable key carries a directional policy chosen so a repository can only add restrictions and never relax the user's own. The two per-entry managed control maps are the exception those directional rules cannot express — a repository may legitimately enable plugins and declare marketplaces — so they are re-stamped afterwards from the runtime's ambient managed policy. That makes the result depend on the runtime process's managed state and not on the arguments alone: a host must call this rather than reimplement the fold, or a repository could relax a restriction the administrator imposed. Rejects when either layer is not a JSON object.</summary>
+    /// <param name="userSettings">The user's settings, already resolved against any managed layer.</param>
+    /// <param name="repoSettings">The repository's checked-in settings layer.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>The repository layer folded into the user layer.</returns>
+    internal async Task<UserSettingsMergeRepoValueResult> MergeRepoValueAsync(object? userSettings, object? repoSettings, CancellationToken cancellationToken = default)
     {
-        ArgumentException.ThrowIfNullOrWhiteSpace(value);
-        _value = value;
+        var request = new UserSettingsMergeRepoValueParams { UserSettings = CopilotClient.ToJsonElementForWire(userSettings) ?? JsonElement.Parse("null"), RepoSettings = CopilotClient.ToJsonElementForWire(repoSettings) ?? JsonElement.Parse("null") };
+        return await CopilotClient.InvokeRpcAsync<UserSettingsMergeRepoValueResult>(_rpc, "user.settings.mergeRepoValue", [request], cancellationToken);
     }
 
-    /// <summary>Gets the value associated with this <see cref="SessionFsSqliteTransactionErrorClass"/>.</summary>
-    public string Value => _value ?? string.Empty;
+    /// <summary>Runs the one-time migration that moves a staff account's update channel to stable, and records that it ran. Idempotent and self-gating: it takes a lock over the global-state file, re-reads the completion stamp inside it, and returns `current` rather than migrating twice, so two hosts racing at startup cannot both migrate. Only a `migrated` status means the persisted settings changed and the caller should reload them. An account on the experimental channel is deliberately left alone and reported as `excluded-experimental`.</summary>
+    /// <param name="homeDirectory">The user's home directory, used when neither a configuration directory nor `COPILOT_HOME` is set.</param>
+    /// <param name="environment">The host's environment variables. `COPILOT_HOME` is read from here, as are the variables a settings hook may expand.</param>
+    /// <param name="configDir">The Copilot configuration directory, when the host set one. Takes precedence over `COPILOT_HOME` and the home directory.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>The outcome of the one-time staff update-channel migration.</returns>
+    internal async Task<UserSettingsMigrateStaffUpdateChannelOnceResult> MigrateStaffUpdateChannelOnceAsync(string homeDirectory, IDictionary<string, JsonElement> environment, string? configDir = null, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(homeDirectory);
+        ArgumentNullException.ThrowIfNull(environment);
 
-    /// <summary>SQLite reported BUSY or LOCKED before commit; the transaction was rolled back and may be retried.</summary>
-    public static SessionFsSqliteTransactionErrorClass BusyOrLocked { get; } = new("busyOrLocked");
+        var request = new UserSettingsHostContext { HomeDirectory = homeDirectory, Environment = environment, ConfigDir = configDir };
+        return await CopilotClient.InvokeRpcAsync<UserSettingsMigrateStaffUpdateChannelOnceResult>(_rpc, "user.settings.migrateStaffUpdateChannelOnce", [request], cancellationToken);
+    }
 
-    /// <summary>The statement, database, or provider failed definitively and must not be retried automatically.</summary>
-    public static SessionFsSqliteTransactionErrorClass Fatal { get; } = new("fatal");
+    /// <summary>Runs the one-time reset that clears a staff account's pinned model selection, and reports the timestamp the host should record. Idempotent and self-gating: the reset is gated on a fixed cutoff, so a caller that passes back the timestamp it recorded gets `didReset: false` rather than a second reset. It applies to staff accounts only; any other account is reported as not reset without the settings document being opened. Only `didReset: true` means the persisted settings changed, and only then are the updated settings returned for the host to adopt.</summary>
+    /// <param name="context">The configuration directory, home directory and environment to resolve the settings and global-state documents from. A host that scopes a session to its own Copilot home must pass that directory here, or the reset is evaluated against the server's own home instead.</param>
+    /// <param name="staff">Whether the signed-in account is a staff account. The reset applies only to staff, so anything other than `true` returns `didReset: false` without touching the settings document.</param>
+    /// <param name="staffModelResetAt">When the caller last recorded this reset, as an ISO-8601 timestamp. A timestamp at or after the cutoff means the reset already ran and is returned unchanged.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>The outcome of the one-time staff model-selection reset.</returns>
+    internal async Task<UserSettingsResetStaffModelSelectionOnceResult> ResetStaffModelSelectionOnceAsync(UserSettingsHostContext context, bool? staff = null, string? staffModelResetAt = null, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(context);
 
-    /// <summary>The transport failed after the provider may have committed; retrying could duplicate effects.</summary>
-    public static SessionFsSqliteTransactionErrorClass PostCommitAmbiguous { get; } = new("postCommitAmbiguous");
+        var request = new UserSettingsResetStaffModelSelectionOnceRequest { Context = context, Staff = staff, StaffModelResetAt = staffModelResetAt };
+        return await CopilotClient.InvokeRpcAsync<UserSettingsResetStaffModelSelectionOnceResult>(_rpc, "user.settings.resetStaffModelSelectionOnce", [request], cancellationToken);
+    }
 
-    /// <summary>Returns a value indicating whether two <see cref="SessionFsSqliteTransactionErrorClass"/> instances are equivalent.</summary>
-    public static bool operator ==(SessionFsSqliteTransactionErrorClass left, SessionFsSqliteTransactionErrorClass right) => left.Equals(right);
+    /// <summary>Reports the top-level keys in the user settings document that the runtime does not recognize, phrased for display to the user. This is a separate question from the warning `user.settings.loadWithWarning` returns: that one describes parts of the document the loader had to ignore to load the rest, whereas an unknown key parses cleanly and is simply not a setting, so a host that surfaces only the load warning silently accepts a misspelled key that will never take effect. Nothing is reported when the document is absent, unreadable, or failed to load, because an unknown-key list derived from a document the runtime could not read would be misleading rather than helpful. Inspection never modifies the document.</summary>
+    /// <param name="context">The configuration directory, home directory and environment to resolve the settings document from. A host that scopes a session to its own Copilot home must pass that directory here, or the server's own home is inspected instead.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>The unrecognized top-level keys found in the user settings document, already phrased for display.</returns>
+    internal async Task<UserSettingsUnknownKeysWarningResult> GetUnknownKeysWarningAsync(UserSettingsHostContext context, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(context);
 
-    /// <summary>Returns a value indicating whether two <see cref="SessionFsSqliteTransactionErrorClass"/> instances are not equivalent.</summary>
-    public static bool operator !=(SessionFsSqliteTransactionErrorClass left, SessionFsSqliteTransactionErrorClass right) => !(left == right);
+        var request = new UserSettingsUnknownKeysWarningRequest { Context = context };
+        return await CopilotClient.InvokeRpcAsync<UserSettingsUnknownKeysWarningResult>(_rpc, "user.settings.getUnknownKeysWarning", [request], cancellationToken);
+    }
 
-    /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is SessionFsSqliteTransactionErrorClass other && Equals(other);
+    /// <summary>Resolves the effective runtime settings for a host that is about to start a session, layering the given overrides over the settings documents, the environment and the platform defaults. A host cannot assemble this itself: the precedence between a user document, a repository document, the managed layers and the environment is the runtime's own rule, and a host that re-implements it drifts from the server it is configuring. The working directory, environment and platform are taken as arguments rather than read from the server process, so a host resolving settings for a directory other than its own gets that directory's answer. Nothing is written; this only computes.</summary>
+    /// <param name="workingDirectory">The directory the settings are being resolved for. This selects the repository-scoped document, so a host resolving settings for a directory other than its own process working directory must pass that directory here.</param>
+    /// <param name="environment">The environment to read settings-bearing variables from. Passed explicitly rather than read from the server process so a host can resolve settings for an environment it is about to create rather than the one it runs in.</param>
+    /// <param name="platform">The platform to apply platform-specific defaults for, in the same spelling the host's own runtime reports.</param>
+    /// <param name="overrides">Settings that take precedence over every document and environment layer, such as the values a host derived from its own command line. Keyed by setting name, with each value carried verbatim, so a host may pass keys this runtime does not recognize. Absent when the host contributes no overrides of its own.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>The effective runtime settings, keyed by setting name. Keys this runtime does not recognize are preserved rather than dropped, so a caller reading a document written by a newer runtime keeps every value.</returns>
+    internal async Task<IDictionary<string, JsonElement>> BuildRuntimeAsync(string workingDirectory, IDictionary<string, string> environment, string platform, IDictionary<string, JsonElement>? overrides = null, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(workingDirectory);
+        ArgumentNullException.ThrowIfNull(environment);
+        ArgumentNullException.ThrowIfNull(platform);
 
-    /// <inheritdoc />
-    public bool Equals(SessionFsSqliteTransactionErrorClass other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+        var request = new UserSettingsBuildRuntimeRequest { WorkingDirectory = workingDirectory, Environment = environment, Platform = platform, Overrides = overrides };
+        return await CopilotClient.InvokeRpcAsync<IDictionary<string, JsonElement>>(_rpc, "user.settings.buildRuntime", [request], cancellationToken);
+    }
 
-    /// <inheritdoc />
-    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
+    /// <summary>Runs the one-time migration that moves a staff account's log level to the current default, and records that it ran. Idempotent and self-gating: it takes a lock over the global-state file and re-reads the completion stamp inside it, so two hosts racing at startup cannot both migrate. Only `refreshed` can have changed the persisted settings, and the settings it returns are the document re-read after the write, so a host should adopt them rather than reloading separately and racing the next writer.</summary>
+    /// <param name="context">The configuration directory, home directory and environment to resolve the settings and global-state documents from. A host that scopes a session to its own Copilot home must pass that directory here, or the migration is evaluated against the server's own home instead.</param>
+    /// <param name="cachedCompletedAt">When the caller last recorded this migration, as an ISO-8601 timestamp. Supplying it lets the runtime answer `current` without re-running the evaluation.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>The outcome of the one-time staff log-level migration.</returns>
+    internal async Task<UserSettingsMigrateStaffLogLevelOnceResult> MigrateStaffLogLevelOnceAsync(UserSettingsHostContext context, string? cachedCompletedAt = null, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(context);
 
-    /// <inheritdoc />
-    public override string ToString() => Value;
+        var request = new UserSettingsMigrateStaffLogLevelOnceRequest { Context = context, CachedCompletedAt = cachedCompletedAt };
+        return await CopilotClient.InvokeRpcAsync<UserSettingsMigrateStaffLogLevelOnceResult>(_rpc, "user.settings.migrateStaffLogLevelOnce", [request], cancellationToken);
+    }
 
-    /// <summary>Provides a <see cref="JsonConverter{SessionFsSqliteTransactionErrorClass}"/> for serializing <see cref="SessionFsSqliteTransactionErrorClass"/> instances.</summary>
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<SessionFsSqliteTransactionErrorClass>
+    /// <summary>Runs the one-time cleanup that removes obsolete CLI-owned settings and legacy rubber-duck keys from the user's settings document, and reports what it did. Idempotent and safe to call on every startup: with nothing obsolete left it reports `unchanged` and writes nothing. The cleanup preserves every key it does not recognize, so a setting written by a newer host is never dropped by an older one, and a document that fails to parse is reported `invalid` and left untouched rather than rewritten from a partial read. The cleaned document is not returned: it is written before this replies, so `user.settings.load` reads it authoritatively. A host that surfaces unrecognized keys through `user.settings.unknownKeys` wants this first, because the keys this retires would otherwise be shown to the user as if they were misspelled settings.</summary>
+    /// <param name="configDir">The configuration directory holding the settings document to clean. A host that scopes a session to its own Copilot home passes that directory here; omit it to clean the document under the home the server resolved for itself. The home directory and environment are deliberately not caller-supplied: they decide only the settings path root and the two hook-parsing flags, and those describe the process doing the reading rather than the caller.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>The outcome of the one-time obsolete-settings cleanup.</returns>
+    internal async Task<UserSettingsMigrateObsoleteOnDiskResult> MigrateObsoleteOnDiskAsync(string? configDir = null, CancellationToken cancellationToken = default)
     {
-        /// <inheritdoc />
-        public override SessionFsSqliteTransactionErrorClass Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-        {
-            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
-        }
-
-        /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, SessionFsSqliteTransactionErrorClass value, JsonSerializerOptions options)
-        {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SessionFsSqliteTransactionErrorClass));
-        }
+        var request = new UserSettingsMigrateObsoleteOnDiskRequest { ConfigDir = configDir };
+        return await CopilotClient.InvokeRpcAsync<UserSettingsMigrateObsoleteOnDiskResult>(_rpc, "user.settings.migrateObsoleteOnDisk", [request], cancellationToken);
     }
-}
 
+    /// <summary>Lists every known user setting from settings.json, each with its effective value, its default, and whether it is at the default — so settings the user has never set still appear with their default value. Does not include repository- or enterprise-managed overrides that the runtime layers on top at session time.</summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Per-key metadata for every known user setting in settings.json, including settings left at their default. Excludes repository- and enterprise-managed overrides.</returns>
+    public async Task<UserSettingsGetResult> GetAsync(CancellationToken cancellationToken = default)
+    {
+        return await CopilotClient.InvokeRpcAsync<UserSettingsGetResult>(_rpc, "user.settings.get", [], cancellationToken);
+    }
 
-/// <summary>Defines the allowed values.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-[JsonConverter(typeof(Converter))]
-[DebuggerDisplay("{Value,nq}")]
-public readonly struct HostExitReason : IEquatable<HostExitReason>
-{
-    private readonly string? _value;
+    /// <summary>Resolves the on-disk locations of the settings files this runtime reads, so a consumer can show or open them. The user path is the same file `user.settings.get`, `user.settings.load`, and `user.settings.set` operate on. Supply `repoRoot` to also resolve that repository's checked-in and local settings paths. A path is reported whether or not the file exists.</summary>
+    /// <param name="repoRoot">Absolute path of a repository root. Supply it to also resolve that repository's two settings file paths; omit it to resolve only the user path.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>On-disk locations of the settings files this runtime reads. A path is reported whether or not the file exists.</returns>
+    internal async Task<UserSettingsGetPathsResult> GetPathsAsync(string? repoRoot = null, CancellationToken cancellationToken = default)
+    {
+        var request = new UserSettingsGetPathsRequest { RepoRoot = repoRoot };
+        return await CopilotClient.InvokeRpcAsync<UserSettingsGetPathsResult>(_rpc, "user.settings.getPaths", [request], cancellationToken);
+    }
 
-    /// <summary>Initializes a new instance of the <see cref="HostExitReason"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="HostExitReason"/>.</param>
-    [JsonConstructor]
-    public HostExitReason(string value)
+    /// <summary>Writes one or more user settings to settings.json, replacing each provided top-level key. A key whose value is null is removed.</summary>
+    /// <param name="settings">Partial user settings to write, as a free-form object keyed by setting name.</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(object? settings, CancellationToken cancellationToken = default)
     {
-        ArgumentException.ThrowIfNullOrWhiteSpace(value);
-        _value = value;
+        var request = new UserSettingsSetRequest { Settings = CopilotClient.ToJsonElementForWire(settings) ?? JsonElement.Parse("null") };
+        await CopilotClient.InvokeRpcAsync(_rpc, "user.settings.set", [request], cancellationToken);
     }
 
-    /// <summary>Gets the value associated with this <see cref="HostExitReason"/>.</summary>
-    public string Value => _value ?? string.Empty;
+    /// <summary>Lists the top-level user-setting keys by who is allowed to govern them: `repo` keys a repository may override through `.github/copilot/settings.json`, `claudeRepo` keys a repository may override through a Claude-compatible config, and `managed` keys an enterprise policy may fix. The lists are static for a given runtime build and fail closed: a key absent from a list cannot be governed that way.</summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Top-level user-setting keys grouped by who may govern them.</returns>
+    internal async Task<UserSettingsGovernanceKeysResult> ListGovernanceKeysAsync(CancellationToken cancellationToken = default)
+    {
+        return await CopilotClient.InvokeRpcAsync<UserSettingsGovernanceKeysResult>(_rpc, "user.settings.listGovernanceKeys", [], cancellationToken);
+    }
 
-    /// <summary>The owner requested disposal.</summary>
-    public static HostExitReason Disposed { get; } = new("disposed");
+    /// <summary>Atomically edits one canonical user setting inside its settings-file lock. Reads, canonicalizes touched aliases, applies the edit, validates the resulting top-level setting and writes before releasing the lock. An explicit autoUpdatesChannel set completes the staff migration in the same transaction. Only a malformed existing file returns `invalid`; refused keys, invalid values and I/O errors reject the call.</summary>
+    /// <param name="canonicalPath">Nonempty canonical path segments of the setting to edit, starting with its top-level key.</param>
+    /// <param name="operation">Set a scalar, add or remove a string list item, or remove the setting. The handler rejects a missing or incompatible value.</param>
+    /// <param name="configDir">Configuration directory to edit. Omitted or empty resolves the server's own home, as in `user.settings.loadForConfigDir`.</param>
+    /// <param name="value">Required boolean, string or number for set, required string for add-item and remove-item, and forbidden for remove. The runtime rejects all other JSON values.</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 atomic user or repository settings edit.</returns>
+    internal async Task<SettingsEditResult> EditAsync(IList<string> canonicalPath, SettingsEditOperation operation, string? configDir = null, object? value = null, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(canonicalPath);
 
-    /// <summary>The hosting task or its SDK transport exited; this does not mean the runtime process exited.</summary>
-    public static HostExitReason Exited { get; } = new("exited");
+        var request = new UserSettingsEditRequest { CanonicalPath = canonicalPath, Operation = operation, ConfigDir = configDir, Value = CopilotClient.ToJsonElementForWire(value) };
+        return await CopilotClient.InvokeRpcAsync<SettingsEditResult>(_rpc, "user.settings.edit", [request], cancellationToken);
+    }
 
-    /// <summary>The owning SDK connection disconnected.</summary>
-    public static HostExitReason OwnerDisconnected { get; } = new("ownerDisconnected");
+    /// <summary>Rewrites legacy and snake_case setting names in a settings object to their canonical spelling. A caller editing settings.json must normalize before writing: a legacy key left in place survives the write, is re-normalized on the next load, and silently shadows the canonical value the write just stored.</summary>
+    /// <param name="settings">Free-form settings object, possibly using legacy or snake_case key names.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Settings object with canonical key names.</returns>
+    internal async Task<UserSettingsNormalizeResult> NormalizeAsync(object? settings, CancellationToken cancellationToken = default)
+    {
+        var request = new UserSettingsNormalizeRequest { Settings = CopilotClient.ToJsonElementForWire(settings) ?? JsonElement.Parse("null") };
+        return await CopilotClient.InvokeRpcAsync<UserSettingsNormalizeResult>(_rpc, "user.settings.normalize", [request], cancellationToken);
+    }
 
-    /// <summary>The runtime is shutting down.</summary>
-    public static HostExitReason RuntimeShutdown { get; } = new("runtimeShutdown");
+    /// <summary>Diagnoses a set of already-loaded settings layers, reporting each key that will not take effect and why. Settings load tolerantly so that one bad key does not stop a session from starting; this method surfaces what was dropped so a caller can report it instead of silently ignoring the user's intent. Takes the layers as given rather than reading them, so a caller can diagnose exactly the content it is showing, including unsaved edits. Never echoes a setting's value, because a value may be a token or another secret. Marked internal because it exists to carry a CLI call site off the native addon, not to serve a consumer-facing need; it becomes public once an SDK consumer needs to inspect settings health itself.</summary>
+    /// <param name="sources">Layers to diagnose, in the precedence order the caller applies them.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>The settings that will not take effect across the given layers.</returns>
+    internal async Task<UserSettingsProblemsResult> DiagnoseProblemsAsync(IList<UserSettingsProblemSource>? sources = null, CancellationToken cancellationToken = default)
+    {
+        var request = new UserSettingsProblemsRequest { Sources = sources };
+        return await CopilotClient.InvokeRpcAsync<UserSettingsProblemsResult>(_rpc, "user.settings.diagnoseProblems", [request], cancellationToken);
+    }
 
-    /// <summary>Returns a value indicating whether two <see cref="HostExitReason"/> instances are equivalent.</summary>
-    public static bool operator ==(HostExitReason left, HostExitReason right) => left.Equals(right);
+    /// <summary>Validates one top-level setting subtree and writes just that key to settings.json as a single step. Doing both here closes the race a caller cannot close itself: between a separate preflight read and the write, the file may change. Rewriting only the touched key keeps legacy siblings out of settings.json. Answers a status rather than failing, so a validation problem and a write problem stay distinguishable.</summary>
+    /// <param name="canonicalPath">Canonical path of the setting the caller is editing. Currently informational only.</param>
+    /// <param name="topKey">Top-level setting name to write.</param>
+    /// <param name="value">Value to write for the whole top-level key. Omitted when `delete` is true. Explicit null is preserved and validated as null.</param>
+    /// <param name="delete">True to remove the top-level key instead of writing it.</param>
+    /// <param name="completeStaffUpdateChannelMigration">Records that the user chose an update channel explicitly, so the one-time staff channel migration stops reapplying. Honored only for the `autoUpdatesChannel` key.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Outcome of validating and writing one top-level setting subtree.</returns>
+    internal async Task<UserSettingsApplyTopKeyResult> ApplyTopKeyAsync(IList<string> canonicalPath, string topKey, object? value = null, bool? delete = null, bool? completeStaffUpdateChannelMigration = null, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(canonicalPath);
+        ArgumentNullException.ThrowIfNull(topKey);
 
-    /// <summary>Returns a value indicating whether two <see cref="HostExitReason"/> instances are not equivalent.</summary>
-    public static bool operator !=(HostExitReason left, HostExitReason right) => !(left == right);
+        var request = new UserSettingsApplyTopKeyRequest { CanonicalPath = canonicalPath, TopKey = topKey, Value = CopilotClient.ToJsonElementForWire(value), Delete = delete, CompleteStaffUpdateChannelMigration = completeStaffUpdateChannelMigration };
+        var payload = JsonSerializer.SerializeToNode(request, RpcJsonContext.Default.UserSettingsApplyTopKeyRequest)!.AsObject();
+        if (request.Delete != true && request.Value is null) payload["value"] = null;
+        return await CopilotClient.InvokeRpcAsync<UserSettingsApplyTopKeyResult>(_rpc, "user.settings.applyTopKey", [payload], cancellationToken);
+    }
 
-    /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is HostExitReason other && Equals(other);
+    /// <summary>Replaces the user settings file's entire content in one write. A key absent from `settings` is removed, which is what distinguishes this from `user.settings.set`: that one merges, so it can never clear a key the caller has dropped. For a caller saving the result of a raw edit, a merge would silently resurrect every key the user deleted. Records the same one-time mutation marks a per-key write records, so a setting the user has now chosen explicitly stops being migrated for them.</summary>
+    /// <param name="settings">The settings object to store. It replaces the file's entire content, so a key absent here is removed.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    internal async Task WriteAllAsync(object? settings, CancellationToken cancellationToken = default)
+    {
+        var request = new UserSettingsWriteAllRequest { Settings = CopilotClient.ToJsonElementForWire(settings) ?? JsonElement.Parse("null") };
+        await CopilotClient.InvokeRpcAsync(_rpc, "user.settings.writeAll", [request], cancellationToken);
+    }
 
-    /// <inheritdoc />
-    public bool Equals(HostExitReason other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    /// <summary>Merges a partial object into one top-level user setting, re-reading the stored value inside this runtime process's settings.json write lock so that concurrent writers in this process to different sub-fields of the same key do not clobber each other. Unlike `user.settings.set`, which replaces a key's whole value with what the caller last read, this keeps sub-fields the caller did not name when both the stored value and supplied value are objects; otherwise the supplied value replaces the stored value. Use it whenever two independent surfaces own different sub-fields of one setting. Returns the key's stored value after the write, in `value`.</summary>
+    /// <param name="key">Top-level user-setting key to merge into, such as `extensions`.</param>
+    /// <param name="value">Value to store for `key`. When both the stored value and this value are objects, their fields are shallow-merged and fields this object does not name are preserved. Otherwise this value replaces the stored value.</param>
+    /// <param name="configDir">Copilot configuration directory to write the settings document in, taking precedence over the server's own `COPILOT_HOME` and default home. Omit it, or pass an empty string, to use the directory the server resolved for itself.</param>
+    /// <param name="subDir">Single-component name for the settings document at `&lt;configDir&gt;/settings/&lt;subDir&gt;.json`; path separators, `.` and `..` are rejected. Omit it, or pass an empty string, to use the main settings document.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>The stored value of the user setting after the merge.</returns>
+    internal async Task<UserSettingsUpdateResult> UpdateAsync(string key, object? value, string? configDir = null, string? subDir = null, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(key);
 
-    /// <inheritdoc />
-    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
+        var request = new UserSettingsUpdateRequest { Key = key, Value = CopilotClient.ToJsonElementForWire(value) ?? JsonElement.Parse("null"), ConfigDir = configDir, SubDir = subDir };
+        return await CopilotClient.InvokeRpcAsync<UserSettingsUpdateResult>(_rpc, "user.settings.update", [request], cancellationToken);
+    }
 
-    /// <inheritdoc />
-    public override string ToString() => Value;
+    /// <summary>Reads settings.json as stored for a caller that is about to edit it. Unlike `user.settings.get`, this returns file values rather than per-key metadata and defaults. Reports `missing` for an absent file and `invalid` when the existing file will not parse. Retired config.json and extensionless files are not read.</summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Contents of settings.json as stored, for a caller about to rewrite it.</returns>
+    internal async Task<UserSettingsLoadForEditResult> LoadForEditAsync(CancellationToken cancellationToken = default)
+    {
+        return await CopilotClient.InvokeRpcAsync<UserSettingsLoadForEditResult>(_rpc, "user.settings.loadForEdit", [], cancellationToken);
+    }
 
-    /// <summary>Provides a <see cref="JsonConverter{HostExitReason}"/> for serializing <see cref="HostExitReason"/> instances.</summary>
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<HostExitReason>
+    /// <summary>Validates one top-level setting subtree without writing it, reporting each problem with the path it applies to. Scoped to a single top-level key on purpose: validating the whole file would reject an edit whenever an unrelated pre-existing field is malformed, locking the user out of the very tool that could fix it.</summary>
+    /// <param name="topKey">Top-level setting name to validate.</param>
+    /// <param name="value">Value to validate. Omitted when `delete` is true.</param>
+    /// <param name="delete">True to validate a removal of this key. The current settings file is not read.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Outcome of validating one top-level setting subtree.</returns>
+    internal async Task<UserSettingsValidateResult> ValidateAsync(string topKey, object? value = null, bool? delete = null, CancellationToken cancellationToken = default)
     {
-        /// <inheritdoc />
-        public override HostExitReason Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-        {
-            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
-        }
+        ArgumentNullException.ThrowIfNull(topKey);
 
-        /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, HostExitReason value, JsonSerializerOptions options)
-        {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(HostExitReason));
-        }
+        var request = new UserSettingsValidateRequest { TopKey = topKey, Value = CopilotClient.ToJsonElementForWire(value), Delete = delete };
+        return await CopilotClient.InvokeRpcAsync<UserSettingsValidateResult>(_rpc, "user.settings.validate", [request], cancellationToken);
     }
 }
 
-
-/// <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>Provides server-scoped Repo APIs.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-[JsonConverter(typeof(Converter))]
-[DebuggerDisplay("{Value,nq}")]
-public readonly struct LlmInferenceHttpRequestStartTransport : IEquatable<LlmInferenceHttpRequestStartTransport>
+public sealed class ServerRepoApi
 {
-    private readonly string? _value;
+    private readonly JsonRpc _rpc;
 
-    /// <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)
+    internal ServerRepoApi(JsonRpc rpc)
     {
-        ArgumentException.ThrowIfNullOrWhiteSpace(value);
-        _value = value;
+        _rpc = rpc;
     }
 
-    /// <summary>Gets the value associated with this <see cref="LlmInferenceHttpRequestStartTransport"/>.</summary>
-    public string Value => _value ?? string.Empty;
+    /// <summary>Settings APIs.</summary>
+    public ServerRepoSettingsApi Settings =>
+        field ??
+        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
+        field;
+}
 
-    /// <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>Provides server-scoped RepoSettings APIs.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class ServerRepoSettingsApi
+{
+    private readonly JsonRpc _rpc;
 
-    /// <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");
+    internal ServerRepoSettingsApi(JsonRpc rpc)
+    {
+        _rpc = rpc;
+    }
 
-    /// <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>Atomically edits one allowed top-level repository setting. Reads the raw file, preserves unrelated keys, applies one scalar or list edit, validates the result and writes under one file lock, so concurrent sibling or list edits are not lost. A malformed or unsafe existing file returns `invalid` without a write; rejected keys, invalid values and I/O errors reject the call.</summary>
+    /// <param name="repoRoot">Absolute path of the repository root.</param>
+    /// <param name="scope">Shared or local repository settings file.</param>
+    /// <param name="key">One canonical top-level repository setting that the allowlist permits.</param>
+    /// <param name="operation">Set a scalar, add or remove a string list item, or remove the setting. The handler rejects a missing or incompatible value.</param>
+    /// <param name="value">Required boolean, string or number for set, required string for add-item and remove-item, and forbidden for remove. The runtime rejects all other JSON values.</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 atomic user or repository settings edit.</returns>
+    internal async Task<SettingsEditResult> EditAsync(string repoRoot, RepoSettingsEditScope scope, string key, SettingsEditOperation operation, object? value = null, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(repoRoot);
+        ArgumentNullException.ThrowIfNull(key);
 
-    /// <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);
+        var request = new RepoSettingsEditRequest { RepoRoot = repoRoot, Scope = scope, Key = key, Operation = operation, Value = CopilotClient.ToJsonElementForWire(value) };
+        return await CopilotClient.InvokeRpcAsync<SettingsEditResult>(_rpc, "repo.settings.edit", [request], cancellationToken);
+    }
 
-    /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is LlmInferenceHttpRequestStartTransport other && Equals(other);
+    /// <summary>Reads one repository settings file without settings normalization or layering. The existing JSONC parser accepts comments and trailing commas and applies its prototype-safety rules. Missing or blank files return an empty valid config. Invalid files return an empty config with invalid=true; other read failures reject.</summary>
+    /// <param name="repoRoot">Absolute path of the repository root.</param>
+    /// <param name="scope">Use repo for shared settings or local for settings.local.json. Other scopes are rejected.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Parsed repository settings without normalization or layering.</returns>
+    internal async Task<RepoSettingsReadRawResult> ReadRawAsync(string repoRoot, string scope, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(repoRoot);
+        ArgumentNullException.ThrowIfNull(scope);
 
-    /// <inheritdoc />
-    public bool Equals(LlmInferenceHttpRequestStartTransport other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+        var request = new RepoSettingsReadRawRequest { RepoRoot = repoRoot, Scope = scope };
+        return await CopilotClient.InvokeRpcAsync<RepoSettingsReadRawResult>(_rpc, "repo.settings.readRaw", [request], cancellationToken);
+    }
 
-    /// <inheritdoc />
-    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
+    /// <summary>Writes or removes one allowed top-level repository setting through the existing validator and file lock. Preserves unrelated stored keys. Invalid keys, values, existing documents, and I/O errors reject without replacing the file. Deletion requires delete=true; otherwise value must be present.</summary>
+    /// <param name="repoRoot">Absolute path of the repository root.</param>
+    /// <param name="scope">Use repo for shared settings or local for settings.local.json. Other scopes are rejected.</param>
+    /// <param name="key">Canonical top-level key permitted by the repository settings allowlist.</param>
+    /// <param name="value">Value to validate and write. Required unless delete is true; a null value is validated, not treated as deletion.</param>
+    /// <param name="delete">True to remove the key instead of writing it.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    internal async Task WriteKeyAsync(string repoRoot, string scope, string key, object? value = null, bool? delete = null, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(repoRoot);
+        ArgumentNullException.ThrowIfNull(scope);
+        ArgumentNullException.ThrowIfNull(key);
 
-    /// <inheritdoc />
-    public override string ToString() => Value;
+        var request = new RepoSettingsWriteKeyRequest { RepoRoot = repoRoot, Scope = scope, Key = key, Value = CopilotClient.ToJsonElementForWire(value), Delete = delete };
+        var payload = JsonSerializer.SerializeToNode(request, RpcJsonContext.Default.RepoSettingsWriteKeyRequest)!.AsObject();
+        if (request.Delete != true && request.Value is null) payload["value"] = null;
+        await CopilotClient.InvokeRpcAsync(_rpc, "repo.settings.writeKey", [payload], cancellationToken);
+    }
 
-    /// <summary>Provides a <see cref="JsonConverter{LlmInferenceHttpRequestStartTransport}"/> for serializing <see cref="LlmInferenceHttpRequestStartTransport"/> instances.</summary>
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<LlmInferenceHttpRequestStartTransport>
+    /// <summary>Replaces the repository-overridable settings in one locked write. Allowed keys present in settings are validated and written; allowed keys absent from settings are removed. Other input keys are ignored, and unknown keys already stored in the file remain unchanged. Invalid values or an invalid existing file reject without a partial write.</summary>
+    /// <param name="repoRoot">Absolute path of the repository root.</param>
+    /// <param name="scope">Use repo for shared settings or local for settings.local.json. Other scopes are rejected.</param>
+    /// <param name="settings">Object of allowed settings to store. Missing allowlisted keys are removed. Other input keys are ignored, while unknown stored keys are preserved.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    internal async Task WriteAllAsync(string repoRoot, string scope, object? settings, CancellationToken cancellationToken = default)
     {
-        /// <inheritdoc />
-        public override LlmInferenceHttpRequestStartTransport Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-        {
-            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
-        }
+        ArgumentNullException.ThrowIfNull(repoRoot);
+        ArgumentNullException.ThrowIfNull(scope);
 
-        /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, LlmInferenceHttpRequestStartTransport value, JsonSerializerOptions options)
-        {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(LlmInferenceHttpRequestStartTransport));
-        }
+        var request = new RepoSettingsWriteAllRequest { RepoRoot = repoRoot, Scope = scope, Settings = CopilotClient.ToJsonElementForWire(settings) ?? JsonElement.Parse("null") };
+        await CopilotClient.InvokeRpcAsync(_rpc, "repo.settings.writeAll", [request], cancellationToken);
     }
 }
 
-
-/// <summary>Why the runtime is requesting a GitHub credential.</summary>
+/// <summary>Provides server-scoped FeatureFlags APIs.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-[JsonConverter(typeof(Converter))]
-[DebuggerDisplay("{Value,nq}")]
-public readonly struct GitHubTokenAcquireReason : IEquatable<GitHubTokenAcquireReason>
+public sealed class ServerFeatureFlagsApi
 {
-    private readonly string? _value;
+    private readonly JsonRpc _rpc;
 
-    /// <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 GitHubTokenAcquireReason(string value)
+    internal ServerFeatureFlagsApi(JsonRpc rpc)
     {
-        ArgumentException.ThrowIfNullOrWhiteSpace(value);
-        _value = value;
+        _rpc = rpc;
     }
 
-    /// <summary>Gets the value associated with this <see cref="GitHubTokenAcquireReason"/>.</summary>
-    public string Value => _value ?? string.Empty;
-
-    /// <summary>The runtime is acquiring the registration's first credential.</summary>
-    public static GitHubTokenAcquireReason Initial { get; } = new("initial");
-
-    /// <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="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="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 GitHubTokenAcquireReason other && Equals(other);
-
-    /// <inheritdoc />
-    public bool Equals(GitHubTokenAcquireReason other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
-
-    /// <inheritdoc />
-    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
+    /// <summary>Resolves named gates against this installation's cached online-experiment assignment, for the account the runtime is already authenticated as. Unlike `featureFlags.resolve`, which layers static availability with the populations supplied, this reads the experiment assignment the runtime cached for its own current authentication, so a launch can honor a rollout before any session exists. The account is never taken from the request: naming one would read another account's cached assignments. The cached assignment answers immediately and any network refresh happens behind it, so this call does not wait on the network. Not available to an extension, which cannot carry the user's consent to read their assignment.</summary>
+    /// <param name="flags">The feature flags to resolve. A name this runtime does not declare is reported as an error rather than as a disabled flag.</param>
+    /// <param name="isStaff">Whether the caller is GitHub or Microsoft staff.</param>
+    /// <param name="isExperimental">Whether the caller is in an experimental population.</param>
+    /// <param name="isTeam">Whether the caller belongs to a team plan.</param>
+    /// <param name="streamerMode">Whether streamer mode is on, which withholds the populations an experiment would otherwise segment on.</param>
+    /// <param name="refreshWithoutSession">Whether the runtime may refresh the cached assignment over the network without an active session. The refresh never blocks this call: the answer comes from the cache either way, so a refresh only affects a later launch.</param>
+    /// <param name="isStaffGithub">GitHub-staff membership. Omit when it was never recorded: a legacy staff account then counts as both staff populations and keeps every staff feature.</param>
+    /// <param name="isStaffMicrosoft">Microsoft-staff membership. Omitted the same way as `isStaffGitHub`.</param>
+    /// <param name="environment">Environment to read flag overrides from. Defaults to this runtime process's own environment.</param>
+    /// <param name="config">User settings document whose `featureFlags` block is layered on top of the resolved set.</param>
+    /// <param name="firstLaunchAtMillis">When this installation first launched, in milliseconds since the Unix epoch. Experiments that segment on installation age read it. Omit when the first launch was never recorded.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>The resolved gates, keyed by flag name.</returns>
+    internal async Task<IDictionary<string, bool>> ResolveStartupGatesAsync(IList<string> flags, bool isStaff, bool isExperimental, bool isTeam, bool streamerMode, bool refreshWithoutSession, bool? isStaffGithub = null, bool? isStaffMicrosoft = null, IDictionary<string, string>? environment = null, object? config = null, double? firstLaunchAtMillis = null, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(flags);
 
-    /// <inheritdoc />
-    public override string ToString() => Value;
+        var request = new FeatureFlagsResolveStartupGatesRequest { Flags = flags, IsStaff = isStaff, IsExperimental = isExperimental, IsTeam = isTeam, StreamerMode = streamerMode, RefreshWithoutSession = refreshWithoutSession, IsStaffGitHub = isStaffGithub, IsStaffMicrosoft = isStaffMicrosoft, Environment = environment, Config = CopilotClient.ToJsonElementForWire(config), FirstLaunchAtMillis = firstLaunchAtMillis };
+        return await CopilotClient.InvokeRpcAsync<IDictionary<string, bool>>(_rpc, "featureFlags.resolveStartupGates", [request], cancellationToken);
+    }
 
-    /// <summary>Provides a <see cref="JsonConverter{GitHubTokenAcquireReason}"/> for serializing <see cref="GitHubTokenAcquireReason"/> instances.</summary>
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<GitHubTokenAcquireReason>
+    /// <summary>Lists every feature flag this runtime declares, with the population each one is declared for, its experimental description, and the online-experiment flag it maps to. This is the static catalog: it describes how each flag is defined, not whether it is on for anyone. Use `featureFlags.resolve` for static values with caller overrides, not active runtime values or experiment assignments.</summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Every feature flag this runtime declares, with the shape each one was declared with.</returns>
+    internal async Task<FeatureFlagsMetadataResult> ListMetadataAsync(CancellationToken cancellationToken = default)
     {
-        /// <inheritdoc />
-        public override GitHubTokenAcquireReason Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-        {
-            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
-        }
+        return await CopilotClient.InvokeRpcAsync<FeatureFlagsMetadataResult>(_rpc, "featureFlags.listMetadata", [], cancellationToken);
+    }
 
-        /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, GitHubTokenAcquireReason value, JsonSerializerOptions options)
-        {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(GitHubTokenAcquireReason));
-        }
+    /// <summary>Computes static feature flags from the supplied population and overrides without changing runtime state or verifying audience membership. Starts from declared availability, then applies direct feature-flag environment values, user settings, and explicit `flagOverrides`. It does not apply `COPILOT_EXP_*` experiment assignments, authenticated startup gates, or active runtime state. Settings include `enabledFeatureFlags`, the legacy `feature_flags.enabled` list, and supported convenience settings. Supply `baseFlags` to use an existing flag set instead of declared availability. Omit `isStaffGitHub` or `isStaffMicrosoft` when membership was never recorded: a legacy staff account then counts as both populations.</summary>
+    /// <param name="isStaff">Whether the caller is GitHub or Microsoft staff.</param>
+    /// <param name="isExperimental">Whether the caller is in an experimental population.</param>
+    /// <param name="isTeam">Whether the caller belongs to the team population used by feature availability.</param>
+    /// <param name="isStaffGithub">GitHub-staff membership. Omit when it was never recorded: a legacy staff account then counts as both staff populations and keeps every staff feature.</param>
+    /// <param name="isStaffMicrosoft">Microsoft-staff membership. Omitted the same way as `isStaffGitHub`.</param>
+    /// <param name="baseFlags">Resolve against this already-computed flag set rather than each flag's declared availability. Keyed by flag name.</param>
+    /// <param name="environment">Environment for direct feature-flag overrides and `COPILOT_CLI_ENABLED_FEATURE_FLAGS`. Does not apply `COPILOT_EXP_*` experiment assignments. Defaults to this runtime process's own environment.</param>
+    /// <param name="config">User settings to apply, including `enabledFeatureFlags`, legacy `feature_flags.enabled`, and supported convenience settings.</param>
+    /// <param name="flagOverrides">Flags forced to a value after every other layer, keyed by flag name.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>The resolved feature flags, keyed by flag name.</returns>
+    internal async Task<IDictionary<string, bool>> ResolveAsync(bool isStaff, bool isExperimental, bool isTeam, bool? isStaffGithub = null, bool? isStaffMicrosoft = null, IDictionary<string, bool>? baseFlags = null, IDictionary<string, string>? environment = null, object? config = null, IDictionary<string, bool>? flagOverrides = null, CancellationToken cancellationToken = default)
+    {
+        var request = new FeatureFlagsResolveRequest { IsStaff = isStaff, IsExperimental = isExperimental, IsTeam = isTeam, IsStaffGitHub = isStaffGithub, IsStaffMicrosoft = isStaffMicrosoft, BaseFlags = baseFlags, Environment = environment, Config = CopilotClient.ToJsonElementForWire(config), FlagOverrides = flagOverrides };
+        return await CopilotClient.InvokeRpcAsync<IDictionary<string, bool>>(_rpc, "featureFlags.resolve", [request], cancellationToken);
     }
 }
 
-
-/// <summary>Explicit user decisions, never inferred from a permission grant or model response.</summary>
+/// <summary>Provides server-scoped Permissions APIs.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-[JsonConverter(typeof(Converter))]
-[DebuggerDisplay("{Value,nq}")]
-public readonly struct InstallationDecision : IEquatable<InstallationDecision>
+public sealed class ServerPermissionsApi
 {
-    private readonly string? _value;
+    private readonly JsonRpc _rpc;
 
-    /// <summary>Initializes a new instance of the <see cref="InstallationDecision"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="InstallationDecision"/>.</param>
-    [JsonConstructor]
-    public InstallationDecision(string value)
+    internal ServerPermissionsApi(JsonRpc rpc)
     {
-        ArgumentException.ThrowIfNullOrWhiteSpace(value);
-        _value = value;
+        _rpc = rpc;
     }
 
-    /// <summary>Gets the value associated with this <see cref="InstallationDecision"/>.</summary>
-    public string Value => _value ?? string.Empty;
-
-    /// <summary>The user explicitly approved the exact review on this request.</summary>
-    public static InstallationDecision Confirm { get; } = new("confirm");
-
-    /// <summary>The user declined the reviewed operation.</summary>
-    public static InstallationDecision Decline { get; } = new("decline");
+    /// <summary>Interprets a verbatim managed `permissions` slice into the three policy questions a host asks before granting elevated permissions: whether bypass-permissions mode is forbidden, whether a policy exists that this build could not determine, and whether the layer supplies permission rules the session must enforce. An absent or empty slice means no managed policy applies. The runtime and its permission service share one policy type, so a new managed permission setting is interpreted in exactly one place; a host that reimplements the reading would silently diverge the first time that set grows. Hosts must fail closed on an undetermined policy rather than treating it as permission granted.</summary>
+    /// <param name="permissions">The `permissions` object from a managed settings layer, for example `{"disableBypassPermissionsMode":"disable"}`. Omitted or null means no managed policy applies.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>The policy questions a host asks before granting elevated permissions.</returns>
+    internal async Task<PermissionsEvaluateManagedPolicyResult> EvaluateManagedPolicyAsync(object? permissions = null, CancellationToken cancellationToken = default)
+    {
+        var request = new PermissionsEvaluateManagedPolicyParams { Permissions = CopilotClient.ToJsonElementForWire(permissions) };
+        return await CopilotClient.InvokeRpcAsync<PermissionsEvaluateManagedPolicyResult>(_rpc, "permissions.evaluateManagedPolicy", [request], cancellationToken);
+    }
 
-    /// <summary>The user cancelled the pending decision without granting consent.</summary>
-    public static InstallationDecision Cancel { get; } = new("cancel");
+    /// <summary>Locations APIs.</summary>
+    public ServerPermissionsLocationsApi Locations =>
+        field ??
+        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
+        field;
 
-    /// <summary>Returns a value indicating whether two <see cref="InstallationDecision"/> instances are equivalent.</summary>
-    public static bool operator ==(InstallationDecision left, InstallationDecision right) => left.Equals(right);
+    /// <summary>FolderTrust APIs.</summary>
+    public ServerPermissionsFolderTrustApi FolderTrust =>
+        field ??
+        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
+        field;
+}
 
-    /// <summary>Returns a value indicating whether two <see cref="InstallationDecision"/> instances are not equivalent.</summary>
-    public static bool operator !=(InstallationDecision left, InstallationDecision right) => !(left == right);
+/// <summary>Provides server-scoped PermissionsLocations APIs.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class ServerPermissionsLocationsApi
+{
+    private readonly JsonRpc _rpc;
 
-    /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is InstallationDecision other && Equals(other);
+    internal ServerPermissionsLocationsApi(JsonRpc rpc)
+    {
+        _rpc = rpc;
+    }
 
-    /// <inheritdoc />
-    public bool Equals(InstallationDecision other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    /// <summary>Drops stored per-location permission grants whose directory no longer exists, and reports which location keys were removed. Runs against the permission store under the runtime's own Copilot home, the same store `session.permissions.locations.resolve` reads. Marked internal because it exists to carry a CLI call site off the napi boundary onto the SDK contract; it is migration plumbing, not a surface consumers are meant to depend on. It can become public once an SDK consumer needs to prune its own permission store.</summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Which stored location permissions were dropped because their directory is gone.</returns>
+    internal async Task<LocationPermissionsCleanupResult> CleanupOrphanedAsync(CancellationToken cancellationToken = default)
+    {
+        return await CopilotClient.InvokeRpcAsync<LocationPermissionsCleanupResult>(_rpc, "permissions.locations.cleanupOrphaned", [], cancellationToken);
+    }
+}
 
-    /// <inheritdoc />
-    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
+/// <summary>Provides server-scoped PermissionsFolderTrust APIs.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class ServerPermissionsFolderTrustApi
+{
+    private readonly JsonRpc _rpc;
 
-    /// <inheritdoc />
-    public override string ToString() => Value;
+    internal ServerPermissionsFolderTrustApi(JsonRpc rpc)
+    {
+        _rpc = rpc;
+    }
 
-    /// <summary>Provides a <see cref="JsonConverter{InstallationDecision}"/> for serializing <see cref="InstallationDecision"/> instances.</summary>
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<InstallationDecision>
+    /// <summary>Reports whether a folder is trusted, reading the persisted trusted-folders list directly rather than through a session. Use this from a host that has no session yet, such as a one-shot command deciding whether to honor a checkout's own settings. It differs from the session-scoped check in two ways that matter: it takes the configuration directory to read the list from, instead of inheriting the session's, and it answers only from the persisted list, so trust a user granted for the lifetime of one session is not visible here. A host that has a session should prefer the session-scoped check, which also covers session-only trust.</summary>
+    /// <param name="path">Folder to check. A folder counts as trusted when it is itself listed, when an ancestor is listed, or when its git root is listed.</param>
+    /// <param name="configDir">Configuration directory to read the trusted-folders list from. Omit it to read the default location; supply it when the host has redirected its configuration, or the check answers from a list the host is not using.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Folder trust check result.</returns>
+    internal async Task<FolderTrustCheckResult> CheckTrustAsync(string path, string? configDir = null, CancellationToken cancellationToken = default)
     {
-        /// <inheritdoc />
-        public override InstallationDecision Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-        {
-            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
-        }
+        ArgumentNullException.ThrowIfNull(path);
 
-        /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, InstallationDecision value, JsonSerializerOptions options)
-        {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(InstallationDecision));
-        }
+        var request = new FolderTrustIsTrustedParams { Path = path, ConfigDir = configDir };
+        return await CopilotClient.InvokeRpcAsync<FolderTrustCheckResult>(_rpc, "permissions.folderTrust.checkTrust", [request], cancellationToken);
     }
 }
 
-
-/// <summary>Provides server-scoped RPC methods (no session required).</summary>
-public sealed class ServerRpc
+/// <summary>Provides server-scoped ManagedSettings APIs.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class ServerManagedSettingsApi
 {
     private readonly JsonRpc _rpc;
 
-    internal ServerRpc(JsonRpc rpc)
+    internal ServerManagedSettingsApi(JsonRpc rpc)
     {
         _rpc = rpc;
     }
 
-    /// <summary>Checks server responsiveness and returns protocol information.</summary>
-    /// <param name="message">Optional message to echo back.</param>
+    /// <summary>Discovers device-managed settings the way the runtime's own device layer does, and reports the sandbox floor and the load outcome alongside the validated document. This differs from `managedSettings.read` in three ways a policy-enforcing host depends on: a document that validates to an empty object is reported as absent rather than as an empty policy, a discovery error does not suppress a document that still validates, and a failure is reported as a flag rather than only as error text. Hosts that compose the device layer into an effective policy use this, because `managedSettings.read` cannot distinguish "no device policy" from "device policy could not be read" and would silently hand the user's own layer the win.</summary>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
-    /// <returns>Server liveness response, including the echoed message, current server timestamp, and protocol version.</returns>
-    [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-    public async Task<PingResult> PingAsync(string? message = null, CancellationToken cancellationToken = default)
+    /// <returns>The device-managed settings layer, with the sandbox floor and the load outcome a host needs to compose it into an effective policy.</returns>
+    internal async Task<ManagedSettingsReadDeviceResult> ReadDeviceAsync(CancellationToken cancellationToken = default)
     {
-        var request = new PingRequest { Message = message };
-        return await CopilotClient.InvokeRpcAsync<PingResult>(_rpc, "ping", [request], cancellationToken);
+        return await CopilotClient.InvokeRpcAsync<ManagedSettingsReadDeviceResult>(_rpc, "managedSettings.readDevice", [], cancellationToken);
     }
 
-    /// <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="enableGitHubTelemetryForwarding">Opt this connection in to GitHub telemetry forwarding for its lifetime. When set, the runtime forwards this host's telemetry across all its sessions, its sessionless events, and explicitly process-wide events over the `gitHubTelemetry.event` notification. Connections intentionally sharing one server receive that server's events; independently embedded runtime hosts do not receive each other's host-owned events. 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="supportedTaskKinds">Task kinds this connection can decode when observing session tasks. Omit to retain agent and shell compatibility.</param>
-    /// <param name="token">Connection token; required when the server was started with COPILOT_CONNECTION_TOKEN.</param>
+    /// <summary>Retains the supplied managed layers as this runtime process's startup policy and re-applies the result to every live session. Hosts that own their own short-lived process policy use this, so a guarded mutation is checked against the policy the host actually fetched. Retaining is a whole-process replacement rather than a merge, so a host that already resolved a good policy must not retain a partial one over it. The failure flags are honest inputs rather than assumptions: reporting a fetch or load that failed keeps the layers already retained, and the interim fail-closed state, instead of clearing them.</summary>
+    /// <param name="deviceSourceFound">Whether a device policy source demonstrably exists. This, not a read error, is the evidence a device is managed, so a fail-closed policy gates on it.</param>
+    /// <param name="managedPolicyPresent">Whether any managed policy source exists, independently of fetch failures.</param>
+    /// <param name="serverSourceFound">Whether the server policy source exists, even when its response is unavailable.</param>
+    /// <param name="serverForcedRefreshFailure">Whether a required fresh server-policy confirmation failed.</param>
+    /// <param name="preserveServerState">Preserve the retained server layer during a device-only resolution.</param>
+    /// <param name="deviceSandboxUndetermined">Whether the device sandbox intent is unreadable independently of its other settings.</param>
+    /// <param name="sandboxFloorUndetermined">Whether the shared sandbox policy is undetermined. Diagnostic errors alone do not imply this flag.</param>
+    /// <param name="permissionPolicyUndetermined">Whether permission policy is undetermined. Sandbox-only uncertainty does not imply this flag.</param>
+    /// <param name="sandboxEnabledByUndeterminedPolicy">Whether uncertainty alone enabled the shared sandbox floor.</param>
+    /// <param name="serverFetchFailed">Whether the server fetch failed. Report it honestly: true keeps the already-retained server layer rather than replacing it with an absent one.</param>
+    /// <param name="deviceLoadFailed">Whether the device load failed. Report it honestly, for the same reason as `serverFetchFailed`.</param>
+    /// <param name="serverResponse">The resolved server policy. A known source can lack a response after a forced-refresh failure.</param>
+    /// <param name="deviceResponse">The device/MDM policy layer.</param>
+    /// <param name="deviceSandboxFloor">Sandbox floor declared by the device layer, carried separately so a document that failed validation can still raise the floor.</param>
+    /// <param name="sharedSandboxFloor">Shared server/device sandbox floor, excluding session-local helper policy.</param>
+    /// <param name="policyHelperResponse">The policy helper's response: the third managed layer that a process owning its startup policy resolves. It is retained with the other two so that every ambient read in this process, including the mutation guards and the governed marketplace allowlist that the `plugins.*` handlers derive, sees the whole policy the process fetched. A session-owning process omits it, because it resolves a helper per session against that session's working directory.</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(global::GitHub.Copilot.Diagnostics.Experimental)]
-    internal async Task<ConnectResult> ConnectAsync(bool? enableGitHubTelemetryForwarding = null, ConnectClientInfo? clientInfo = null, IList<TaskKind>? supportedTaskKinds = null, string? token = null, CancellationToken cancellationToken = default)
+    internal async Task RetainPolicyAsync(bool deviceSourceFound, bool managedPolicyPresent, bool serverSourceFound, bool serverForcedRefreshFailure, bool preserveServerState, bool deviceSandboxUndetermined, bool sandboxFloorUndetermined, bool permissionPolicyUndetermined, bool sandboxEnabledByUndeterminedPolicy, bool serverFetchFailed, bool deviceLoadFailed, object? serverResponse = null, object? deviceResponse = null, object? deviceSandboxFloor = null, object? sharedSandboxFloor = null, object? policyHelperResponse = null, CancellationToken cancellationToken = default)
     {
-        var request = new ConnectRequest { EnableGitHubTelemetryForwarding = enableGitHubTelemetryForwarding, ClientInfo = clientInfo, SupportedTaskKinds = supportedTaskKinds, Token = token };
-        return await CopilotClient.InvokeRpcAsync<ConnectResult>(_rpc, "connect", [request], cancellationToken);
+        var request = new ManagedSettingsRetainPolicyParams { DeviceSourceFound = deviceSourceFound, ManagedPolicyPresent = managedPolicyPresent, ServerSourceFound = serverSourceFound, ServerForcedRefreshFailure = serverForcedRefreshFailure, PreserveServerState = preserveServerState, DeviceSandboxUndetermined = deviceSandboxUndetermined, SandboxFloorUndetermined = sandboxFloorUndetermined, PermissionPolicyUndetermined = permissionPolicyUndetermined, SandboxEnabledByUndeterminedPolicy = sandboxEnabledByUndeterminedPolicy, ServerFetchFailed = serverFetchFailed, DeviceLoadFailed = deviceLoadFailed, ServerResponse = CopilotClient.ToJsonElementForWire(serverResponse), DeviceResponse = CopilotClient.ToJsonElementForWire(deviceResponse), DeviceSandboxFloor = CopilotClient.ToJsonElementForWire(deviceSandboxFloor), SharedSandboxFloor = CopilotClient.ToJsonElementForWire(sharedSandboxFloor), PolicyHelperResponse = CopilotClient.ToJsonElementForWire(policyHelperResponse) };
+        await CopilotClient.InvokeRpcAsync(_rpc, "managedSettings.retainPolicy", [request], cancellationToken);
     }
 
-    /// <summary>Registers the calling SDK client as the per-entrypoint extension launch provider. Call before creating any sessions. When omitted, the runtime uses its built-in extension launcher.</summary>
+    /// <summary>Stamps an effective managed policy's individually-controlled entries onto a user settings document, returning the settings a host should actually act on. The managed layer wins on every plugin spec and marketplace name it names, and leaves everything it does not name as the user wrote it. Hosts use this rather than merging the two documents themselves, because the merge is per entry rather than per document and a whole-document overlay would either discard the user's unmanaged entries or let a user entry outrank a managed one. Omitting the managed layer returns the settings unchanged, which is what an unmanaged host wants. Rejects when either document is present but is not a JSON object rather than treating it as absent, since silently dropping a malformed policy hands the user's layer the win on exactly the entries the policy exists to control.</summary>
+    /// <param name="settings">The user settings document to stamp. Entries the managed layer does not name are returned exactly as supplied.</param>
+    /// <param name="managed">The effective managed policy, as composed by `managedSettings.resolveEffectiveValue`. Omit it on an unmanaged host: the settings then come back unchanged.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
-    [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-    public async Task RegisterExtensionLaunchProviderAsync(CancellationToken cancellationToken = default)
+    /// <returns>The user settings with the managed layer's controlled entries stamped on.</returns>
+    internal async Task<ManagedSettingsApplyControlsResult> ApplyControlsAsync(object? settings, object? managed = null, CancellationToken cancellationToken = default)
     {
-        await CopilotClient.InvokeRpcAsync(_rpc, "registerExtensionLaunchProvider", [], cancellationToken);
+        var request = new ManagedSettingsApplyControlsParams { Settings = CopilotClient.ToJsonElementForWire(settings) ?? JsonElement.Parse("null"), Managed = CopilotClient.ToJsonElementForWire(managed) };
+        return await CopilotClient.InvokeRpcAsync<ManagedSettingsApplyControlsResult>(_rpc, "managedSettings.applyControls", [request], cancellationToken);
     }
 
-    /// <summary>Environments APIs.</summary>
-    public ServerEnvironmentsApi Environments =>
-        field ??
-        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
-        field;
-
-    /// <summary>Host APIs.</summary>
-    public ServerHostApi Host =>
-        field ??
-        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
-        field;
-
-    /// <summary>Hooks APIs.</summary>
-    public ServerHooksApi Hooks =>
-        field ??
-        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
-        field;
+    /// <summary>Validates the managed settings a client is supplying for a session it is about to open, and returns them reduced to the keys a client is allowed to set. A client-supplied policy is not the same thing as an administrator's: it may only narrow permissions, so this accepts `permissions` and rejects every other key outright rather than ignoring it. Rejecting is the point — a host that silently dropped an unsupported key would report a policy as applied while running without it. Hosts call this before opening the session rather than letting the open fail, so a malformed policy is reported against the request that carried it. The runtime applies the same rule again when the session starts, so this cannot be used to smuggle a wider document past it. An accepted document that sets nothing comes back as an empty object, which is distinct from supplying nothing at all.</summary>
+    /// <param name="settings">The managed settings a client is supplying for a session it is about to open. Omit them when the client is imposing no policy of its own.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>The accepted managed settings, reduced to the keys a client is allowed to set.</returns>
+    internal async Task<ManagedSettingsParseClientValueResult> ParseClientValueAsync(object? settings = null, CancellationToken cancellationToken = default)
+    {
+        var request = new ManagedSettingsParseClientValueParams { Settings = CopilotClient.ToJsonElementForWire(settings) };
+        return await CopilotClient.InvokeRpcAsync<ManagedSettingsParseClientValueResult>(_rpc, "managedSettings.parseClientValue", [request], cancellationToken);
+    }
 
-    /// <summary>Models APIs.</summary>
-    public ServerModelsApi Models =>
-        field ??
-        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
-        field;
+    /// <summary>Composes the supplied server, device/MDM, device sandbox floor and policy-helper layers into the single effective managed policy a host should enforce, resolving each key across the layers by the runtime's own precedence rules. Hosts that assemble managed layers themselves use this so their precedence matches the runtime's exactly instead of reimplementing it. The composition is not a pure function of its inputs: an advisory sandbox force-on that arrived over the server channel is declined when this host cannot run a sandbox, so the result reflects the runtime host's capabilities, and the returned settings carry `sandboxAdvisoryFloorDeclined: true` when that happened. Enforced channels (device/MDM and policy helper) are never declined, and a server force-on carrying `failIfUnavailable` is preserved so the session fails loudly instead of quietly running unsandboxed. Rejects when a supplied layer is present but is not a JSON object, rather than treating it as unmanaged, because silently dropping a malformed policy would hand the user's own layer the win on exactly the keys the policy exists to control.</summary>
+    /// <param name="server">The account's server-delivered org policy, as returned by a managed-settings fetch. Omitted before sign-in or when the fetch has not landed.</param>
+    /// <param name="mdm">The device layer: native MDM and managed-file settings describing the machine rather than the account.</param>
+    /// <param name="deviceSandboxFloor">The device sandbox floor, folded into the device layer under `sandbox` before composition.</param>
+    /// <param name="policyHelper">The policy-helper layer, an enforced channel sourced from a platform policy helper process.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>The effective managed policy composed from the supplied layers.</returns>
+    internal async Task<ManagedSettingsResolveEffectiveValueResult> ResolveEffectiveValueAsync(object? server = null, object? mdm = null, object? deviceSandboxFloor = null, object? policyHelper = null, CancellationToken cancellationToken = default)
+    {
+        var request = new ManagedSettingsResolveEffectiveValueParams { Server = CopilotClient.ToJsonElementForWire(server), Mdm = CopilotClient.ToJsonElementForWire(mdm), DeviceSandboxFloor = CopilotClient.ToJsonElementForWire(deviceSandboxFloor), PolicyHelper = CopilotClient.ToJsonElementForWire(policyHelper) };
+        return await CopilotClient.InvokeRpcAsync<ManagedSettingsResolveEffectiveValueResult>(_rpc, "managedSettings.resolveEffectiveValue", [request], cancellationToken);
+    }
 
-    /// <summary>Sandbox APIs.</summary>
-    public ServerSandboxApi Sandbox =>
-        field ??
-        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
-        field;
+    /// <summary>Decides what a host must do to its bypass-permissions state after a managed-policy resolution lands, given the state already in force and the account now signed in. A host holds two pieces of state — which layer disabled bypass mode, and for a server-delivered disable, the account it was pinned to — and cannot decide the next step from the new policy alone. Three rules make that so, and each one is a control rather than a preference. A device/MDM disable outranks the account, so a later server answer never lifts it. An unknown policy, which is what a failed fetch or a refusal this build cannot enforce yields, preserves whatever is in force instead of reverting to permissive. And a server disable is lifted only when the account it was pinned to is no longer the signed-in one, which is what makes signing in to an unrestricted account recover without a restart while a reconnect on the same restricted account does not. Hosts call this rather than reimplementing it because getting the pinning backwards either strands a disable on an account that never carried one or drops one that still applies. `setDisabledState` is omitted when the host must leave its stored flag untouched, which is distinct from being told to set it to false.</summary>
+    /// <param name="activeIdentity">The account signed in now. A `managed` disable pinned to a different account is lifted.</param>
+    /// <param name="policy">What the resolution said about bypass mode. Send `unknown` rather than omitting the field when there is no verdict.</param>
+    /// <param name="currentSource">Which layer currently disables bypass mode. Omit it when nothing does.</param>
+    /// <param name="currentManagedIdentity">The account a `managed` disable is pinned to. Omit it when the current source is not `managed`; it is ignored for the other sources.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>The bypass-permissions state a host should hold after the resolution, and what it must do to get there.</returns>
+    internal async Task<ManagedSettingsResolveBypassDisableTransitionResult> ResolveBypassDisableTransitionAsync(string activeIdentity, ManagedSettingsBypassPolicyResolution policy, ManagedSettingsBypassDisableSource? currentSource = null, string? currentManagedIdentity = null, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(activeIdentity);
 
-    /// <summary>Tools APIs.</summary>
-    public ServerToolsApi Tools =>
-        field ??
-        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
-        field;
+        var request = new ManagedSettingsResolveBypassDisableTransitionParams { ActiveIdentity = activeIdentity, Policy = policy, CurrentSource = currentSource, CurrentManagedIdentity = currentManagedIdentity };
+        return await CopilotClient.InvokeRpcAsync<ManagedSettingsResolveBypassDisableTransitionResult>(_rpc, "managedSettings.resolveBypassDisableTransition", [request], cancellationToken);
+    }
 
-    /// <summary>Account APIs.</summary>
-    public ServerAccountApi Account =>
-        field ??
-        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
-        field;
+    /// <summary>Resolves managed (enterprise policy) settings for a host from every layer at once: the account's server-delivered policy, the device/MDM layer, and a platform policy helper. Hosts use this instead of fetching and composing the layers themselves, because the per-layer precedence and the fail-closed rules that apply when a layer cannot be confirmed are the runtime's own and must match the policy a session will later enforce. It does not retain or apply anything to process-global policy state, so a host may call it before any session exists — which is the point, since plugin activation and one-shot commands resolve policy before a session is available to carry it. The returned per-layer outcome flags are load-bearing rather than diagnostic: a host must distinguish an unmanaged device from a managed device whose policy could not be confirmed, and apply its fail-closed gates in the second case. Reports its diagnostics in `logMessages` rather than logging them, so a host that runs before a log sink exists still sees them.</summary>
+    /// <param name="userAgent">User agent to send with the policy fetch.</param>
+    /// <param name="environment">The host's environment variables, read for cache location and policy overrides. Supplied by the host rather than read from the runtime process so a command that selected its own configuration home is honored.</param>
+    /// <param name="platform">The host's platform, in Node's `process.platform` spelling, used to locate platform-specific cache and policy paths.</param>
+    /// <param name="homeDirectory">The host's home directory, used to resolve cache and managed-file locations.</param>
+    /// <param name="policyHelperReason">The policy-helper invocation reason. Defaults to sessionStart.</param>
+    /// <param name="selfFetch">Whether to run ingestion. Omit or set false to return an empty result without discovering or fetching policy.</param>
+    /// <param name="authInfo">The authenticated identity to resolve policy for. Omitted before sign-in, in which case no server layer is fetched.</param>
+    /// <param name="sessionId">The session whose credential store and working directory the policy helper should use. Omit it when no session exists yet and the process-wide store applies.</param>
+    /// <param name="deviceResponse">A device layer supplied by the host instead of discovered from the machine. Pair it with `hasDeviceResponse` so an explicit absence is distinguishable from an omitted override.</param>
+    /// <param name="hasDeviceResponse">Whether `deviceResponse` is an override at all. True with a null `deviceResponse` asserts the device layer is empty; false discovers it from the machine.</param>
+    /// <param name="bypassCacheRead">Whether to ignore a cached server policy when reading, forcing the resolution to come from a live fetch.</param>
+    /// <param name="serverPolicyCacheMode">How this ingestion may use the on-disk server-policy cache. Defaults to the runtime's own policy when omitted.</param>
+    /// <param name="policyHelperEnabled">Whether a configured platform policy helper may be run to produce an enforced helper layer.</param>
+    /// <param name="policyHelperWorkingDirectory">Directory the policy helper runs in when this ingestion is not owned by a registered session. A host resolving policy before its session exists must pass this, or a directory-sensitive helper judges the wrong repository.</param>
+    /// <param name="clientName">Name of the embedding client, reported to the managed-settings service as `client_id` so it can refuse to deliver a policy this client is too old to enforce. Omit it and the runtime reports a generic identity; the runtime version sent alongside is the gate that actually matters.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>The managed policy layers an ingestion resolved, together with the per-layer outcome flags a host needs to decide how much to trust the result. The flags are reported rather than folded into the settings because a host must be able to distinguish an unmanaged device from a managed device whose policy could not be confirmed, and apply its fail-closed gates in the second case.</returns>
+    internal async Task<ManagedSettingsIngestResult> IngestAsync(string userAgent, object? environment, string platform, string homeDirectory, ManagedSettingsPolicyHelperReason? policyHelperReason = null, bool? selfFetch = null, object? authInfo = null, string? sessionId = null, object? deviceResponse = null, bool? hasDeviceResponse = null, bool? bypassCacheRead = null, ManagedSettingsServerPolicyCacheMode? serverPolicyCacheMode = null, bool? policyHelperEnabled = null, string? policyHelperWorkingDirectory = null, string? clientName = null, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(userAgent);
+        ArgumentNullException.ThrowIfNull(platform);
+        ArgumentNullException.ThrowIfNull(homeDirectory);
 
-    /// <summary>Secrets APIs.</summary>
-    public ServerSecretsApi Secrets =>
-        field ??
-        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
-        field;
+        var request = new ManagedSettingsIngestParams { UserAgent = userAgent, Environment = CopilotClient.ToJsonElementForWire(environment) ?? JsonElement.Parse("null"), Platform = platform, HomeDirectory = homeDirectory, PolicyHelperReason = policyHelperReason, SelfFetch = selfFetch, AuthInfo = CopilotClient.ToJsonElementForWire(authInfo), SessionId = sessionId, DeviceResponse = CopilotClient.ToJsonElementForWire(deviceResponse), HasDeviceResponse = hasDeviceResponse, BypassCacheRead = bypassCacheRead, ServerPolicyCacheMode = serverPolicyCacheMode, PolicyHelperEnabled = policyHelperEnabled, PolicyHelperWorkingDirectory = policyHelperWorkingDirectory, ClientName = clientName };
+        return await CopilotClient.InvokeRpcAsync<ManagedSettingsIngestResult>(_rpc, "managedSettings.ingest", [request], cancellationToken);
+    }
+
+    /// <summary>Resolves the managed (enterprise policy) settings a host must enforce from startup, and judges the account against the enterprise sign-in pin in the same pass. This composes the layers the way `managedSettings.ingest` does and then answers the two questions a host cannot answer for itself: which fail-closed floors apply when a layer could not be confirmed, and whether this credential is allowed to sign in at all. The sign-in verdict is the reason a host must not assemble this itself from `managedSettings.ingest` — a pinned organization is an access control, and a host that composed the layers but skipped the pin would let a developer sign in with a personal or another enterprise's account and escape every control that keys off the signed-in identity. The verdict is computed on every resolution, including one that is not retained, so declining to apply policy never widens access. Set `retainAndApply` to keep the resolved policy as this runtime process's startup policy; leave it false to resolve without side effects.</summary>
+    /// <param name="userAgent">User agent to send with the policy fetch.</param>
+    /// <param name="environment">The host's environment variables, read for cache location, policy overrides, and the variables that would make a membership snapshot forgeable.</param>
+    /// <param name="platform">The host's platform, in Node's `process.platform` spelling, used to locate platform-specific cache and policy paths.</param>
+    /// <param name="homeDirectory">The host's home directory, used to resolve cache and managed-file locations.</param>
+    /// <param name="retainAndApply">Whether to retain the resolved policy as this runtime process's startup policy, so later work in the process enforces it. Set false to resolve without side effects, which is what a protocol host wants before session creation: its sessions apply the complete policy through the normal lifecycle, and retaining here would let a readiness credential affect unrelated sessions. The returned verdict is identical either way — this decides only whether the process keeps it.</param>
+    /// <param name="policyHelperReason">The policy-helper invocation reason. Defaults to sessionStart.</param>
+    /// <param name="selfFetch">Whether to run ingestion. Omit or set false to return an empty result without discovering or fetching policy.</param>
+    /// <param name="authInfo">The authenticated identity to resolve policy for. Omitted before sign-in, in which case no server layer is fetched and the sign-in pin is evaluated against no credential.</param>
+    /// <param name="sessionId">The session whose credential store, working directory and client kind the resolution should use. Omit it when no session exists yet and the process-wide store applies. A resolution whose session names a credential other than `authInfo` is returned but not retained, so a stale sign-in cannot apply policy for an account that has already been switched away from.</param>
+    /// <param name="deviceResponse">A device layer supplied by the host instead of discovered from the machine. Pair it with `hasDeviceResponse` so an explicit absence is distinguishable from an omitted override.</param>
+    /// <param name="hasDeviceResponse">Whether `deviceResponse` is an override at all. True with a null `deviceResponse` asserts the device layer is empty; false discovers it from the machine.</param>
+    /// <param name="bypassCacheRead">Whether to ignore a cached server policy when reading, forcing the resolution to come from a live fetch.</param>
+    /// <param name="serverPolicyCacheMode">How this resolution may use the on-disk server-policy cache. Defaults to the runtime's own policy when omitted. Rejected when combined with `bypassCacheRead`, because the two express the same decision and accepting both would leave the caller unsure which one the runtime honored.</param>
+    /// <param name="policyHelperEnabled">Whether a configured platform policy helper may be run to produce an enforced helper layer.</param>
+    /// <param name="policyHelperWorkingDirectory">Directory the policy helper runs in when this resolution is not owned by a registered session. A host resolving policy before its session exists must pass this, or a directory-sensitive helper judges the wrong repository.</param>
+    /// <param name="clientName">Name of the embedding client, reported to the managed-settings service as `client_id` so it can refuse to deliver a policy this client is too old to enforce.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>The startup policy a resolution composed, the per-layer outcome flags a host needs to decide how much to trust it, and the enterprise sign-in verdict for the credential it ran against. The flags are reported rather than folded into the settings because a host must distinguish an unmanaged device from a managed device whose policy could not be confirmed, and apply its fail-closed gates in the second case.</returns>
+    internal async Task<ManagedSettingsResolveStartupPolicyResult> ResolveStartupPolicyAsync(string userAgent, object? environment, string platform, string homeDirectory, bool retainAndApply, ManagedSettingsPolicyHelperReason? policyHelperReason = null, bool? selfFetch = null, object? authInfo = null, string? sessionId = null, object? deviceResponse = null, bool? hasDeviceResponse = null, bool? bypassCacheRead = null, ManagedSettingsServerPolicyCacheMode? serverPolicyCacheMode = null, bool? policyHelperEnabled = null, string? policyHelperWorkingDirectory = null, string? clientName = null, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(userAgent);
+        ArgumentNullException.ThrowIfNull(platform);
+        ArgumentNullException.ThrowIfNull(homeDirectory);
 
-    /// <summary>Mcp APIs.</summary>
-    public ServerMcpApi Mcp =>
-        field ??
-        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
-        field;
+        var request = new ManagedSettingsResolveStartupPolicyParams { UserAgent = userAgent, Environment = CopilotClient.ToJsonElementForWire(environment) ?? JsonElement.Parse("null"), Platform = platform, HomeDirectory = homeDirectory, RetainAndApply = retainAndApply, PolicyHelperReason = policyHelperReason, SelfFetch = selfFetch, AuthInfo = CopilotClient.ToJsonElementForWire(authInfo), SessionId = sessionId, DeviceResponse = CopilotClient.ToJsonElementForWire(deviceResponse), HasDeviceResponse = hasDeviceResponse, BypassCacheRead = bypassCacheRead, ServerPolicyCacheMode = serverPolicyCacheMode, PolicyHelperEnabled = policyHelperEnabled, PolicyHelperWorkingDirectory = policyHelperWorkingDirectory, ClientName = clientName };
+        return await CopilotClient.InvokeRpcAsync<ManagedSettingsResolveStartupPolicyResult>(_rpc, "managedSettings.resolveStartupPolicy", [request], cancellationToken);
+    }
 
-    /// <summary>Extensions APIs.</summary>
-    public ServerExtensionsApi Extensions =>
-        field ??
-        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
-        field;
+    /// <summary>Resolves the managed `remoteControl` policy for an account on its own, for a host deciding whether a remote-control session may start. Composes the same layers as `managedSettings.ingest` and returns only that one key, so a host does not have to know which layer won. An absent policy means the account is unmanaged for this capability and the host may proceed; that default is safe only while absence really does mean "no policy", so a service refusal that says an account policy exists which this client is too old to enforce resolves to an explicit disabled policy instead of to absence. A resolution that cannot be completed is rejected rather than answered as absence, for the same reason.</summary>
+    /// <param name="userAgent">User agent to send with the policy fetch.</param>
+    /// <param name="environment">The host's environment variables, read for cache location and policy overrides.</param>
+    /// <param name="platform">The host's platform, in Node's `process.platform` spelling, used to locate platform-specific cache and policy paths.</param>
+    /// <param name="homeDirectory">The host's home directory, used to resolve cache and managed-file locations.</param>
+    /// <param name="policyHelperReason">The policy-helper invocation reason. Defaults to sessionStart.</param>
+    /// <param name="selfFetch">Whether to run ingestion. Omit or set false to return an empty result without discovering or fetching policy.</param>
+    /// <param name="authInfo">The authenticated identity to resolve policy for. Omitted before sign-in, in which case no server layer is fetched.</param>
+    /// <param name="deviceResponse">A device layer supplied by the host instead of discovered from the machine. Pair it with `hasDeviceResponse` so an explicit absence is distinguishable from an omitted override.</param>
+    /// <param name="hasDeviceResponse">Whether `deviceResponse` is an override at all. True with a null `deviceResponse` asserts the device layer is empty; false discovers it from the machine.</param>
+    /// <param name="policyHelperEnabled">Whether a configured platform policy helper may be run to produce an enforced helper layer.</param>
+    /// <param name="clientName">Name of the embedding client, reported to the managed-settings service as `client_id` so it can refuse to deliver a policy this client is too old to enforce. That refusal is exactly what turns into an explicit `disabled` below, so a host that omits this field forfeits the protection.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>The managed remote-control policy in force for an account, if any. An absent policy means the account is unmanaged for this capability, which a host reads as allowed — so absence here is a positive statement that no policy applies, never a stand-in for a resolution that failed. A resolution that cannot be completed is rejected instead.</returns>
+    internal async Task<ManagedSettingsLoadRemoteControlResult> LoadRemoteControlAsync(string userAgent, object? environment, string platform, string homeDirectory, ManagedSettingsPolicyHelperReason? policyHelperReason = null, bool? selfFetch = null, object? authInfo = null, object? deviceResponse = null, bool? hasDeviceResponse = null, bool? policyHelperEnabled = null, string? clientName = null, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(userAgent);
+        ArgumentNullException.ThrowIfNull(platform);
+        ArgumentNullException.ThrowIfNull(homeDirectory);
+
+        var request = new ManagedSettingsLoadRemoteControlParams { UserAgent = userAgent, Environment = CopilotClient.ToJsonElementForWire(environment) ?? JsonElement.Parse("null"), Platform = platform, HomeDirectory = homeDirectory, PolicyHelperReason = policyHelperReason, SelfFetch = selfFetch, AuthInfo = CopilotClient.ToJsonElementForWire(authInfo), DeviceResponse = CopilotClient.ToJsonElementForWire(deviceResponse), HasDeviceResponse = hasDeviceResponse, PolicyHelperEnabled = policyHelperEnabled, ClientName = clientName };
+        return await CopilotClient.InvokeRpcAsync<ManagedSettingsLoadRemoteControlResult>(_rpc, "managedSettings.loadRemoteControl", [request], cancellationToken);
+    }
+
+    /// <summary>Evaluates the device-channel enterprise sign-in pin (MDM plist, registry, or managed-settings file) against a credential, without resolving any server-delivered policy. This is the gate an entry point runs before it branches, and the only one that can refuse a developer's first sign-in: it is local, needs no credential, and a server-delivered pin only ever reaches accounts already inside the organization. It fails closed by construction — a discovery that cannot determine whether a pin exists refuses rather than allows, because a control that fails open under a triggerable condition is not a control. Hosts that also want the server channel should call `managedSettings.resolveStartupPolicy`, which folds both channels into one verdict.</summary>
+    /// <param name="environment">The host's environment variables. Read for the variables that would make an identity's membership snapshot forgeable, so a credential whose provenance cannot be trusted is refused rather than accepted.</param>
+    /// <param name="authInfo">The authenticated identity to judge. Omitted when signed out, which is the case the device channel exists to serve: it can refuse a first sign-in before any credential exists.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>The verdict of the `forceLoginOrgs` enterprise sign-in pin for one credential. A managed device may pin Copilot to an approved set of GitHub organizations so a developer cannot sign in with a personal — or another enterprise's — account and escape every control that keys off the signed-in identity. A host must refuse to proceed when `allowed` is false; the remaining fields explain the refusal rather than qualifying it.</returns>
+    internal async Task<ForceLoginOrgsDecision> ResolveDeviceForceLoginOrgsGateAsync(object? environment, object? authInfo = null, CancellationToken cancellationToken = default)
+    {
+        var request = new ManagedSettingsResolveDeviceForceLoginOrgsGateParams { Environment = CopilotClient.ToJsonElementForWire(environment) ?? JsonElement.Parse("null"), AuthInfo = CopilotClient.ToJsonElementForWire(authInfo) };
+        return await CopilotClient.InvokeRpcAsync<ForceLoginOrgsDecision>(_rpc, "managedSettings.resolveDeviceForceLoginOrgsGate", [request], cancellationToken);
+    }
 
-    /// <summary>Skills APIs.</summary>
-    public ServerSkillsApi Skills =>
-        field ??
-        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
-        field;
+    /// <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. `managedSettings.resolve` returns the same device settings together with the account's server policy.</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>Catalog APIs.</summary>
-    public ServerCatalogApi Catalog =>
-        field ??
-        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
-        field;
+    /// <summary>Force-refreshes enterprise managed settings for every account: wipes the persistent server-policy cache (the whole `&lt;cacheHome&gt;/managed-settings` directory) and drops this runtime process's in-memory retained server policy. It does not itself fetch policy — the effect is that the next time a session resolves managed settings for an account, that resolution re-fetches the account's org policy from the network instead of serving a cached response. Note that `managedSettings.read` returns only device/MDM settings and never triggers the account server-policy fetch, so a host implementing "sync account policy" should call `managedSettings.resolve` or start a fresh session resolution rather than treat a subsequent `managedSettings.read` as the refreshed org policy. Mirrors the invalidation a sign-out performs, broadened from the one signing-out account to all of them; device/MDM layers describe the machine, not the account, and are left untouched. Rejects if the on-disk cache cannot be removed.</summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    public async Task ClearCacheAsync(CancellationToken cancellationToken = default)
+    {
+        await CopilotClient.InvokeRpcAsync(_rpc, "managedSettings.clearCache", [], cancellationToken);
+    }
 
-    /// <summary>Plugins APIs.</summary>
-    public ServerPluginsApi Plugins =>
-        field ??
-        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
-        field;
+    /// <summary>Resolves the effective enterprise managed settings without a session, from the device channel and, when an account is available, the account's server policy through the same per-account cache sessions use. A cached server policy less than an hour old is used without a fetch; otherwise the policy is fetched, and when the fetch fails a cached policy up to 24 hours old is used instead, unless `forceRemoteSettingsRefresh` requires a live fetch. With no account requested or signed in, it reports device policy only; signing out removes the account's cached policy. It can fetch server policy over the network when the cache is stale, so call it off latency-critical paths such as startup rather than before listing models. The policy helper is not run. `layers` lists each channel's document before merging, and `values` and `meta` carry typed effective values and their lock state for the keys typed so far.</summary>
+    /// <param name="selectionId">Opaque account identifier returned by `account.getAllUsers`. When omitted, the current account is used, or device policy only when no account is signed in.</param>
+    /// <param name="gitHubToken">GitHub token to resolve instead of the current account. The call fails when the token cannot be resolved.</param>
+    /// <param name="clientName">Embedding client identity for server policy requests, as in session creation. Omit for the CLI identity.</param>
+    /// <param name="workingDirectory">Working directory used to run an organization policy helper. When omitted, sessionless resolution does not run the helper.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Effective enterprise managed settings for an account, resolved without a session.</returns>
+    public async Task<ManagedSettingsResolveResult> ResolveAsync(string? selectionId = null, string? gitHubToken = null, string? clientName = null, string? workingDirectory = null, CancellationToken cancellationToken = default)
+    {
+        var request = new ManagedSettingsResolveRequest { SelectionId = selectionId, GitHubToken = gitHubToken, ClientName = clientName, WorkingDirectory = workingDirectory };
+        return await CopilotClient.InvokeRpcAsync<ManagedSettingsResolveResult>(_rpc, "managedSettings.resolve", [request], cancellationToken);
+    }
 
-    /// <summary>Agents APIs.</summary>
-    public ServerAgentsApi Agents =>
-        field ??
-        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
-        field;
+    /// <summary>Compatibility overload preserving the positional CancellationToken parameter from before workingDirectory was added.</summary>
+    public Task<ManagedSettingsResolveResult> ResolveAsync(string? selectionId, string? gitHubToken, string? clientName, CancellationToken cancellationToken)
+        => ResolveAsync(selectionId, gitHubToken, clientName, workingDirectory: null, cancellationToken);
 
-    /// <summary>Instructions APIs.</summary>
-    public ServerInstructionsApi Instructions =>
-        field ??
-        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
-        field;
+    /// <summary>Returns the managed-settings authoring JSON schema with descriptive `x-composition` annotations aligned with the shared settings-engine vocabulary. These annotations are not a complete runtime composition contract: model, effortLevel, and contextTier remain coupled. Use `managedSettings.compose` for the runtime's effective result. Performs no I/O.</summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>The authoring JSON schema for managed settings recognized by this runtime.</returns>
+    public async Task<ManagedSettingsSchemaResult> SchemaAsync(CancellationToken cancellationToken = default)
+    {
+        return await CopilotClient.InvokeRpcAsync<ManagedSettingsSchemaResult>(_rpc, "managedSettings.schema", [], cancellationToken);
+    }
 
-    /// <summary>Commands APIs.</summary>
-    public ServerCommandsApi Commands =>
-        field ??
-        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
-        field;
+    /// <summary>Validates a candidate managed-settings document the way the runtime validates delivered policy, without applying it. Reports errors that would reject the document, warnings for content the runtime ignores, and the canonical document it would apply. Document text nested more than 64 levels deep is rejected. Performs no I/O.</summary>
+    /// <param name="content">The document to validate: a JSON object, or a string containing the document's JSON text. Preview documents are limited to 1 MiB and 64 levels of nesting, a stricter resource limit than delivered-policy parsing; violations are returned as diagnostics.</param>
+    /// <param name="layer">Channel the document is meant for (`device`, `server`, or `policyHelper`). Some keys are only honored in some channels; for example, a `policyHelper` registration is ignored in policy-helper output. When omitted, no channel-specific checks run.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Result of validating a managed-settings document.</returns>
+    public async Task<ManagedSettingsValidateResult> ValidateAsync(object? content, string? layer = null, CancellationToken cancellationToken = default)
+    {
+        var request = new ManagedSettingsValidateRequest { Content = CopilotClient.ToJsonElementForWire(content) ?? JsonElement.Parse("null"), Layer = layer };
+        return await CopilotClient.InvokeRpcAsync<ManagedSettingsValidateResult>(_rpc, "managedSettings.validate", [request], cancellationToken);
+    }
 
-    /// <summary>User APIs.</summary>
-    public ServerUserApi User =>
-        field ??
-        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
-        field;
+    /// <summary>Merges candidate managed-settings documents for the device, server, and policy-helper channels into the effective settings the runtime would enforce on this host, using the same precedence and composition rules as live resolution, without applying them. Like live resolution, a server's advisory sandbox force-enable is declined on a host that cannot run the sandbox. Does not fetch policy or read policy files, but may perform blocking OS or subprocess probes for sandbox support. Preview documents are limited to 1 MiB and 64 levels of nesting.</summary>
+    /// <param name="layers">One entry per channel. `source` must be `device`, `server`, or `policyHelper`, each at most once (checked at runtime); order does not matter, because channel precedence is fixed. To preview documents from resolve output, map recognized source strings to ManagedSettingsChannel and copy their settings; generated resolve and compose layer types are distinct. Omitted settings means this channel delivered no document. Supplied documents must be valid within the preview limits; warnings are returned in diagnostics. Compose does not reproduce source-failure state or retained enforcement floors from resolve.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>The effective managed settings the runtime would enforce for the given documents, in the same shape `managedSettings.resolve` returns.</returns>
+    public async Task<ManagedSettingsComposeResult> ComposeAsync(IList<ManagedSettingsComposeLayer> layers, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(layers);
 
-    /// <summary>ManagedSettings APIs.</summary>
-    public ServerManagedSettingsApi ManagedSettings =>
-        field ??
-        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
-        field;
+        var request = new ManagedSettingsComposeRequest { Layers = layers };
+        return await CopilotClient.InvokeRpcAsync<ManagedSettingsComposeResult>(_rpc, "managedSettings.compose", [request], cancellationToken);
+    }
 
-    /// <summary>Runtime APIs.</summary>
-    public ServerRuntimeApi Runtime =>
+    /// <summary>Permissions APIs.</summary>
+    public ServerManagedSettingsPermissionsApi Permissions =>
         field ??
         Interlocked.CompareExchange(ref field, new(_rpc), null) ??
         field;
+}
 
-    /// <summary>SessionFs APIs.</summary>
-    public ServerSessionFsApi SessionFs =>
-        field ??
-        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
-        field;
+/// <summary>Provides server-scoped ManagedSettingsPermissions APIs.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class ServerManagedSettingsPermissionsApi
+{
+    private readonly JsonRpc _rpc;
 
-    /// <summary>LlmInference APIs.</summary>
-    public ServerLlmInferenceApi LlmInference =>
-        field ??
-        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
-        field;
+    internal ServerManagedSettingsPermissionsApi(JsonRpc rpc)
+    {
+        _rpc = rpc;
+    }
 
-    /// <summary>Sessions APIs.</summary>
-    public ServerSessionsApi Sessions =>
-        field ??
-        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
-        field;
+    /// <summary>Pure, sessionless evaluation of operations against a supplied permissionsContext. Performs no policy discovery, I/O, prompting, navigation, permission grants, or sandbox changes. Obtain the context from managedSettings.resolve or session.managedSettings.get, or reuse an in-memory context. Results preserve input order and duplicates. Consumers must block deny, obtain approval for ask, and use their normal permission flow for unmanaged. Unknown policy returns failClosed with every operation denied. This is not a substitute for user permissions or other security controls.</summary>
+    /// <param name="context">Trusted, reusable managed permission policy snapshot; no policy is discovered during evaluation.</param>
+    /// <param name="operations">Operations to evaluate, preserving input order and duplicates. An empty batch is valid.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Ordered managed permission verdicts and the supplied policy's fail-closed posture.</returns>
+    public async Task<ManagedSettingsPermissionsEvaluateResult> EvaluateAsync(ManagedPermissionsContext context, IList<ManagedPermissionOperation> operations, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(context);
+        ArgumentNullException.ThrowIfNull(operations);
 
-    /// <summary>AgentRegistry APIs.</summary>
-    public ServerAgentRegistryApi AgentRegistry =>
-        field ??
-        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
-        field;
+        var request = new ManagedSettingsPermissionsEvaluateRequest { Context = context, Operations = operations };
+        return await CopilotClient.InvokeRpcAsync<ManagedSettingsPermissionsEvaluateResult>(_rpc, "managedSettings.permissions.evaluate", [request], cancellationToken);
+    }
 }
 
 /// <summary>Provides server-scoped Environments APIs.</summary>
@@ -42201,18 +48072,35 @@ public async Task<HostPublishSessionResult> PublishSessionAsync(string hostId, s
         return await CopilotClient.InvokeRpcAsync<HostPublishSessionResult>(_rpc, "host.publishSession", [request], cancellationToken);
     }
 
+    /// <summary>Reads the complete advertised live and dormant session catalog of an existing host owned by this connection. Does not start hosting, subscribe to sessions, or guarantee resumability.</summary>
+    /// <param name="hostId">
+    /// Listener UUID returned by host.start; the caller must own it. Omit to read
+    /// the saved default compute-identity catalog without starting a listener.
+    /// </param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>The complete live and dormant advertised catalog, without subscribing to sessions.</returns>
+    public async Task<HostListSessionsResult> ListSessionsAsync(string? hostId = null, CancellationToken cancellationToken = default)
+    {
+        var request = new HostListSessionsRequest { HostId = hostId };
+        return await CopilotClient.InvokeRpcAsync<HostListSessionsResult>(_rpc, "host.listSessions", [request], cancellationToken);
+    }
+
     /// <summary>Requests app-owned materialization over the owning SDK participant.</summary>
     /// <param name="handoffId">Unique identity for this participation, independent of the session lifetime.</param>
     /// <param name="config">Host-selected SDK creation or resume settings, without executable callbacks or tools.</param>
     /// <param name="resume">Resume an app-owned durable session instead of creating a new session.</param>
+    /// <param name="preferResident">
+    /// For an explicit publication, borrow an existing owning-connection resident
+    /// instead of invoking the resume factory. Cold sessions still use the factory.
+    /// </param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
     /// <returns>The resident session the application has materialized on its own connection.</returns>
-    internal async Task<HostCreateSessionResult> CreateSessionAsync(string handoffId, IDictionary<string, JsonElement> config, bool? resume = null, CancellationToken cancellationToken = default)
+    internal async Task<HostCreateSessionResult> CreateSessionAsync(string handoffId, IDictionary<string, JsonElement> config, bool? resume = null, bool? preferResident = null, CancellationToken cancellationToken = default)
     {
         ArgumentNullException.ThrowIfNull(handoffId);
         ArgumentNullException.ThrowIfNull(config);
 
-        var request = new HostCreateSessionRequest { HandoffId = handoffId, Config = config, Resume = resume };
+        var request = new HostCreateSessionRequest { HandoffId = handoffId, Config = config, Resume = resume, PreferResident = preferResident };
         return await CopilotClient.InvokeRpcAsync<HostCreateSessionResult>(_rpc, "host.createSession", [request], cancellationToken);
     }
 
@@ -42244,6 +48132,17 @@ public async Task<HostStartResult> StartAsync(string hostId, HostLocalServerOpti
         return await CopilotClient.InvokeRpcAsync<HostStartResult>(_rpc, "host.start", [request], cancellationToken);
     }
 
+    /// <summary>Starts a connection-owned AHP host with explicit localServer and/or githubEnvironment transports as a supervised SDK participant.</summary>
+    /// <param name="request">Starts a supervised AHP host with at least one explicitly selected transport.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Listener readiness, returned only after binding and the supervised participant's SDK handshake.</returns>
+    public async Task<HostStartResult> StartAsync(HostStartRequest request, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(request);
+        ArgumentNullException.ThrowIfNull(request.HostId);
+        return await CopilotClient.InvokeRpcAsync<HostStartResult>(_rpc, "host.start", [request], cancellationToken);
+    }
+
     /// <summary>Stops a listener owned by this SDK connection and joins its cleanup without deleting sessions.</summary>
     /// <param name="hostId">Listener UUID. Unknown or successfully stopped IDs are harmless.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
@@ -42306,6 +48205,16 @@ public async Task<HooksDiscoverResult> DiscoverAsync(IList<string>? projectPaths
         var request = new HooksDiscoverRequest { ProjectPaths = projectPaths, ExcludeHostHooks = excludeHostHooks };
         return await CopilotClient.InvokeRpcAsync<HooksDiscoverResult>(_rpc, "hooks.discover", [request], cancellationToken);
     }
+
+    /// <summary>Discovers hook actions enabled under server-side discovery settings from user, repository, plugin, and managed-policy sources.</summary>
+    /// <param name="request">Optional project paths and host-exclusion behavior for server-scoped hook discovery.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Server-discovered hook actions and partial-load diagnostics from user, repository, plugin, and managed-policy sources. Concrete sessions may include additional session-specific hook sources.</returns>
+    public async Task<HooksDiscoverResult> DiscoverAsync(HooksDiscoverRequest request, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(request);
+        return await CopilotClient.InvokeRpcAsync<HooksDiscoverResult>(_rpc, "hooks.discover", [request], cancellationToken);
+    }
 }
 
 /// <summary>Provides server-scoped Models APIs.</summary>
@@ -42339,92 +48248,6 @@ public async Task<BuiltInModelCatalog> GetBuiltInCatalogAsync(CancellationToken
     }
 }
 
-/// <summary>Provides server-scoped Sandbox APIs.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ServerSandboxApi
-{
-    private readonly JsonRpc _rpc;
-
-    internal ServerSandboxApi(JsonRpc rpc)
-    {
-        _rpc = rpc;
-    }
-
-    /// <summary>Reports whether the host running this runtime can run the command sandbox, without starting a session or spawning a sandboxed command.</summary>
-    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
-    /// <returns>Whether the host running this runtime can run the command sandbox. The runtime checks `supported` once per process. A capability answer can change while the process runs, for example after the user installs a missing package.</returns>
-    public async Task<SandboxHostSupport> GetHostSupportAsync(CancellationToken cancellationToken = default)
-    {
-        return await CopilotClient.InvokeRpcAsync<SandboxHostSupport>(_rpc, "sandbox.getHostSupport", [], cancellationToken);
-    }
-
-    /// <summary>ProxyCa APIs.</summary>
-    public ServerSandboxProxyCaApi ProxyCa =>
-        field ??
-        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
-        field;
-}
-
-/// <summary>Provides server-scoped SandboxProxyCa APIs.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ServerSandboxProxyCaApi
-{
-    private readonly JsonRpc _rpc;
-
-    internal ServerSandboxProxyCaApi(JsonRpc rpc)
-    {
-        _rpc = rpc;
-    }
-
-    /// <summary>Reports whether the persistent certificate authority of the sandbox credential proxy exists, whether OS trust includes it, and whether it must be rotated. Changes nothing.</summary>
-    /// <param name="sandboxConfig">The sandbox configuration that the host gives its sessions. The runtime reads the credential hosts from `auth` and `credentials`; it ignores `enabled` and the other fields.</param>
-    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
-    /// <returns>Status of the persistent certificate authority of the sandbox credential proxy.</returns>
-    public async Task<SandboxProxyCaStatus> GetStatusAsync(SandboxConfig? sandboxConfig = null, CancellationToken cancellationToken = default)
-    {
-        var request = new SandboxProxyCaRequest { SandboxConfig = sandboxConfig };
-        return await CopilotClient.InvokeRpcAsync<SandboxProxyCaStatus>(_rpc, "sandbox.proxyCa.getStatus", [request], cancellationToken);
-    }
-
-    /// <summary>Creates the persistent certificate authority of the sandbox credential proxy if none is stored, without changing OS trust, and returns the path of its public certificate. Keeps an existing certificate authority, even one that must be rotated. Fails where OS trust is unsupported. Trust it with sandbox.proxyCa.trust: the CLI trusts only the hosts in the saved user settings, so it refuses a certificate authority that also covers hosts from sandboxConfig.</summary>
-    /// <param name="sandboxConfig">The sandbox configuration that the host gives its sessions. The runtime reads the credential hosts from `auth` and `credentials`; it ignores `enabled` and the other fields.</param>
-    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
-    /// <returns>Result of creating the persistent certificate authority of the sandbox credential proxy.</returns>
-    public async Task<SandboxProxyCaCreateResult> CreateAsync(SandboxConfig? sandboxConfig = null, CancellationToken cancellationToken = default)
-    {
-        var request = new SandboxProxyCaRequest { SandboxConfig = sandboxConfig };
-        return await CopilotClient.InvokeRpcAsync<SandboxProxyCaCreateResult>(_rpc, "sandbox.proxyCa.create", [request], cancellationToken);
-    }
-
-    /// <summary>Replaces the persistent certificate authority of the sandbox credential proxy with a new one for the current credential hosts. If OS trust included the old one, removes it and trusts the new one, which can show an OS authentication prompt. Running sandboxed tools keep the old certificate authority until they restart.</summary>
-    /// <param name="sandboxConfig">The sandbox configuration that the host gives its sessions. The runtime reads the credential hosts from `auth` and `credentials`; it ignores `enabled` and the other fields.</param>
-    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
-    /// <returns>Status of the persistent certificate authority of the sandbox credential proxy.</returns>
-    public async Task<SandboxProxyCaStatus> RotateAsync(SandboxConfig? sandboxConfig = null, CancellationToken cancellationToken = default)
-    {
-        var request = new SandboxProxyCaRequest { SandboxConfig = sandboxConfig };
-        return await CopilotClient.InvokeRpcAsync<SandboxProxyCaStatus>(_rpc, "sandbox.proxyCa.rotate", [request], cancellationToken);
-    }
-
-    /// <summary>Adds the persistent certificate authority of the sandbox credential proxy to OS trust, so sandboxed clients that read only OS trust accept the proxy. Call create first. Refuses a certificate authority that is not constrained to the current credential hosts. Can show an OS authentication prompt.</summary>
-    /// <param name="sandboxConfig">The sandbox configuration that the host gives its sessions. The runtime reads the credential hosts from `auth` and `credentials`; it ignores `enabled` and the other fields.</param>
-    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
-    /// <returns>Status of the persistent certificate authority of the sandbox credential proxy.</returns>
-    public async Task<SandboxProxyCaStatus> TrustAsync(SandboxConfig? sandboxConfig = null, CancellationToken cancellationToken = default)
-    {
-        var request = new SandboxProxyCaRequest { SandboxConfig = sandboxConfig };
-        return await CopilotClient.InvokeRpcAsync<SandboxProxyCaStatus>(_rpc, "sandbox.proxyCa.trust", [request], cancellationToken);
-    }
-
-    /// <summary>Removes the persistent certificate authority of the sandbox credential proxy from OS trust. Keeps the stored certificate authority. Can show an OS authentication prompt. Sandboxed clients that read only OS trust then reject the proxy; clients that read the per-process certificate bundle continue to work.</summary>
-    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
-    /// <returns>Status of the persistent certificate authority of the sandbox credential proxy.</returns>
-    public async Task<SandboxProxyCaStatus> RemoveAsync(CancellationToken cancellationToken = default)
-    {
-        return await CopilotClient.InvokeRpcAsync<SandboxProxyCaStatus>(_rpc, "sandbox.proxyCa.remove", [], cancellationToken);
-    }
-}
-
 /// <summary>Provides server-scoped Tools APIs.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 public sealed class ServerToolsApi
@@ -42510,6 +48333,51 @@ public async Task<AccountLogoutResult> LogoutAsync(string? selectionId = null, A
         var request = new AccountLogoutRequest { SelectionId = selectionId, AuthInfo = authInfo };
         return await CopilotClient.InvokeRpcAsync<AccountLogoutResult>(_rpc, "account.logout", [request], cancellationToken);
     }
+
+    /// <summary>Renders the sign-in banner and the one-line account description the runtime uses for an authentication identity. The runtime words these in several places for its own callers, so a host that announces a sign-in or an account switch should render them from here rather than composing its own, which would let the two spellings drift apart.</summary>
+    /// <param name="identity">Identity to describe.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>The wording the runtime uses for an authentication identity.</returns>
+    internal async Task<AccountDescribeAuthInfoResult> DescribeAuthInfoAsync(AuthIdentity identity, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(identity);
+
+        var request = new AccountDescribeAuthInfoRequest { Identity = identity };
+        return await CopilotClient.InvokeRpcAsync<AccountDescribeAuthInfoResult>(_rpc, "account.describeAuthInfo", [request], cancellationToken);
+    }
+
+    /// <summary>Reports whether the supplied identity can create gists. Gists are unavailable on GitHub Enterprise Cloud with data residency, and to Enterprise Managed Users on github.com, so a host that offers gist actions should hide or disable them when this reports no support.</summary>
+    /// <param name="identity">Identity to evaluate.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Whether the identity can create gists, and why not when it cannot.</returns>
+    internal async Task<AccountGetGistSupportResult> GetGistSupportAsync(AuthIdentity identity, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(identity);
+
+        var request = new AccountGetGistSupportRequest { Identity = identity };
+        return await CopilotClient.InvokeRpcAsync<AccountGetGistSupportResult>(_rpc, "account.getGistSupport", [request], cancellationToken);
+    }
+
+    /// <summary>Resolves a path on the identity's GitHub host into an absolute URL, so a host can link to settings or documentation on the enterprise instance the user is signed in to rather than to github.com. Falls back to the public host when no identity is supplied.</summary>
+    /// <param name="path">Host-relative path, without a leading slash, for example `settings/copilot/features`.</param>
+    /// <param name="identity">Identity whose host the path resolves against. Omit to resolve against the public github.com host.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>An absolute URL on the identity's GitHub host.</returns>
+    internal async Task<AccountGetWebUrlResult> GetWebUrlAsync(string path, AuthIdentity? identity = null, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(path);
+
+        var request = new AccountGetWebUrlRequest { Path = path, Identity = identity };
+        return await CopilotClient.InvokeRpcAsync<AccountGetWebUrlResult>(_rpc, "account.getWebUrl", [request], cancellationToken);
+    }
+
+    /// <summary>Names the environment variable supplying a classic personal access token, if one is set. A classic token cannot be upgraded in place, so a host that finds one should tell the user which variable to unset rather than starting an interactive sign-in that the variable would override.</summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>The environment variable supplying a classic personal access token, when one is set.</returns>
+    internal async Task<AccountGetTokenEnvVarResult> GetTokenEnvVarAsync(CancellationToken cancellationToken = default)
+    {
+        return await CopilotClient.InvokeRpcAsync<AccountGetTokenEnvVarResult>(_rpc, "account.getTokenEnvVar", [], cancellationToken);
+    }
 }
 
 /// <summary>Provides server-scoped Secrets APIs.</summary>
@@ -42558,6 +48426,26 @@ public async Task<McpDiscoverResult> DiscoverAsync(string? workingDirectory = nu
         return await CopilotClient.InvokeRpcAsync<McpDiscoverResult>(_rpc, "mcp.discover", [request], cancellationToken);
     }
 
+    /// <summary>Lists the MCP servers the runtime supplies itself, so a host that disables the built-ins wholesale suppresses exactly the set the runtime would otherwise add. The names are fixed for a build and depend on no configuration, session or account.</summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Names of the MCP servers the runtime supplies itself.</returns>
+    internal async Task<McpListBuiltinServerNamesResult> ListBuiltinServerNamesAsync(CancellationToken cancellationToken = default)
+    {
+        return await CopilotClient.InvokeRpcAsync<McpListBuiltinServerNamesResult>(_rpc, "mcp.listBuiltinServerNames", [], cancellationToken);
+    }
+
+    /// <summary>Reports whether the gh-replaceable GitHub MCP tools may be clipped for a session, which a host feeds back as the `excludeGhReplaceableTools` build option. The tools are redundant only when the session can reach a shell *and* the host has the `gh` that would replace them, so both halves are decided here. The shell half runs the platform shell tool through the runtime's own tool-filter matcher, so entry forms like `builtin:bash` and `builtin:*` behave exactly as they do when a session builds its tool catalog. The host half probes for `gh`, and is skipped entirely when the filters already rule the shell out. Host presence alone is not enough: a session restricted to, say, `view` would otherwise lose the built-in issue-read fallback while having no shell to replace it with. The answer describes the host the runtime runs on, so it is never forwarded to a remote engine.</summary>
+    /// <param name="availableTools">The session's tool allowlist, when it set one. Omitted means the session constrains nothing this way.</param>
+    /// <param name="excludedTools">The session's tool denylist, when it set one. Omitted means the session constrains nothing this way.</param>
+    /// <param name="toolFilterPrecedence">How the allowlist and denylist combine when both are set. Omitted means the default every session gets, so a caller that never chose a precedence is answered as its sessions behave.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Whether the gh-replaceable GitHub MCP tools may be clipped for the session described by the request.</returns>
+    internal async Task<McpShouldExcludeGitHubToolsResult> ShouldExcludeGitHubToolsAsync(IList<string>? availableTools = null, IList<string>? excludedTools = null, OptionsUpdateToolFilterPrecedence? toolFilterPrecedence = null, CancellationToken cancellationToken = default)
+    {
+        var request = new McpShouldExcludeGitHubToolsRequest { AvailableTools = availableTools, ExcludedTools = excludedTools, ToolFilterPrecedence = toolFilterPrecedence };
+        return await CopilotClient.InvokeRpcAsync<McpShouldExcludeGitHubToolsResult>(_rpc, "mcp.shouldExcludeGitHubTools", [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>
@@ -42670,6 +48558,12 @@ public async Task<McpInstallationResult> ApplyUninstallAsync(CatalogClientContra
         Interlocked.CompareExchange(ref field, new(_rpc), null) ??
         field;
 
+    /// <summary>Registry APIs.</summary>
+    public ServerMcpRegistryApi Registry =>
+        field ??
+        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
+        field;
+
     /// <summary>Installations APIs.</summary>
     public ServerMcpInstallationsApi Installations =>
         field ??
@@ -42700,12 +48594,11 @@ public async Task<McpConfigList> ListAsync(CancellationToken cancellationToken =
     /// <param name="name">Unique name for the MCP server.</param>
     /// <param name="config">MCP server configuration (stdio process or remote HTTP/SSE).</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
-    public async Task AddAsync(string name, object config, CancellationToken cancellationToken = default)
+    public async Task AddAsync(string name, object? config, CancellationToken cancellationToken = default)
     {
         ArgumentNullException.ThrowIfNull(name);
-        ArgumentNullException.ThrowIfNull(config);
 
-        var request = new McpConfigAddRequest { Name = name, Config = CopilotClient.ToJsonElementForWire(config)!.Value };
+        var request = new McpConfigAddRequest { Name = name, Config = CopilotClient.ToJsonElementForWire(config) ?? JsonElement.Parse("null") };
         await CopilotClient.InvokeRpcAsync(_rpc, "mcp.config.add", [request], cancellationToken);
     }
 
@@ -42713,12 +48606,11 @@ public async Task AddAsync(string name, object config, CancellationToken cancell
     /// <param name="name">Name of the MCP server to update.</param>
     /// <param name="config">MCP server configuration (stdio process or remote HTTP/SSE).</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
-    public async Task UpdateAsync(string name, object config, CancellationToken cancellationToken = default)
+    public async Task UpdateAsync(string name, object? config, CancellationToken cancellationToken = default)
     {
         ArgumentNullException.ThrowIfNull(name);
-        ArgumentNullException.ThrowIfNull(config);
 
-        var request = new McpConfigUpdateRequest { Name = name, Config = CopilotClient.ToJsonElementForWire(config)!.Value };
+        var request = new McpConfigUpdateRequest { Name = name, Config = CopilotClient.ToJsonElementForWire(config) ?? JsonElement.Parse("null") };
         await CopilotClient.InvokeRpcAsync(_rpc, "mcp.config.update", [request], cancellationToken);
     }
 
@@ -42764,6 +48656,50 @@ public async Task ReloadAsync(CancellationToken cancellationToken = default)
     }
 }
 
+/// <summary>Provides server-scoped McpRegistry APIs.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class ServerMcpRegistryApi
+{
+    private readonly JsonRpc _rpc;
+
+    internal ServerMcpRegistryApi(JsonRpc rpc)
+    {
+        _rpc = rpc;
+    }
+
+    /// <summary>Allocates an ID for one cancellable MCP registry search. The ID exists before the search starts, so callers can cancel before it starts. The networking stack supplies the cancellation namespace. The runtime retains at most 1,024 unused IDs. At capacity, another allocation can reclaim an unused ID. Active searches retain their IDs until they finish.</summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Request id naming a cancellable registry search.</returns>
+    internal async Task<McpRegistryRequestIdResult> AllocateRequestIdAsync(CancellationToken cancellationToken = default)
+    {
+        return await CopilotClient.InvokeRpcAsync<McpRegistryRequestIdResult>(_rpc, "mcp.registry.allocateRequestId", [], cancellationToken);
+    }
+
+    /// <summary>Searches the MCP registry the supplied credential may read, resolving the registry endpoint from policy first. Hosts usually send credential-free `AuthIdentity`; a `token` identity can be resolved only when it embeds a token, while `env` and `gh-cli` identities can use a token embedded in the request first. The runtime follows registry pages, keeps the newest entry per server name, cuts the list to `limit`, and sorts an empty-query result by GitHub stars. Each server object is carried opaquely.</summary>
+    /// <param name="requestId">Request ID from `mcp.registry.allocateRequestId`. The search refuses unknown, reclaimed, or canceled IDs and IDs that another search or request already uses.</param>
+    /// <param name="authInfo">The credential the search runs under, carried opaquely. Hosts usually send credential-free `AuthIdentity`; a `token` identity can be resolved only when it embeds a token, while `env` and `gh-cli` identities can use a token embedded in the request first.</param>
+    /// <param name="limit">Maximum number of servers to return.</param>
+    /// <param name="query">Free-text query. Omitted or empty asks the registry for its top servers rather than searching. A value that is not a string is refused.</param>
+    /// <param name="repository">Repository used for the policy lookup, as `owner/name`. The policy selects the registry URL and whether the user token goes to the registry. The registry receives this repository only when the policy entry lists it as required context. A value that is not a string is refused.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Servers selected from the registry response.</returns>
+    internal async Task<McpRegistrySearchResult> SearchAsync(long requestId, object? authInfo, long limit, string? query = null, string? repository = null, CancellationToken cancellationToken = default)
+    {
+        var request = new McpRegistrySearchRequest { RequestId = requestId, AuthInfo = CopilotClient.ToJsonElementForWire(authInfo) ?? JsonElement.Parse("null"), Limit = limit, Query = query, Repository = repository };
+        return await CopilotClient.InvokeRpcAsync<McpRegistrySearchResult>(_rpc, "mcp.registry.search", [request], cancellationToken);
+    }
+
+    /// <summary>Abandons the registry search that uses the given request ID. It acts only on IDs from `mcp.registry.allocateRequestId`, so it never cancels another component's request. Answers `canceled: true` when it stops a running search. Answers `canceled: false` for unknown or reclaimed IDs, completed or canceled searches, and unused reservations. It releases an unused reservation, so a later search with that ID is refused.</summary>
+    /// <param name="requestId">Request ID from `mcp.registry.allocateRequestId` that the search uses.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Whether the cancel reached a live search.</returns>
+    internal async Task<McpRegistryCancelResult> CancelAsync(long requestId, CancellationToken cancellationToken = default)
+    {
+        var request = new McpRegistryCancelRequest { RequestId = requestId };
+        return await CopilotClient.InvokeRpcAsync<McpRegistryCancelResult>(_rpc, "mcp.registry.cancel", [request], cancellationToken);
+    }
+}
+
 /// <summary>Provides server-scoped McpInstallations APIs.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 public sealed class ServerMcpInstallationsApi
@@ -42874,6 +48810,92 @@ public async Task DisableAsync(IList<string> ids, CancellationToken cancellation
     }
 }
 
+/// <summary>Provides server-scoped Instructions APIs.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class ServerInstructionsApi
+{
+    private readonly JsonRpc _rpc;
+
+    internal ServerInstructionsApi(JsonRpc rpc)
+    {
+        _rpc = rpc;
+    }
+
+    /// <summary>Returns the prompt the `init` command runs to author repository instructions. A host offering its own initialize action sends this text so the instructions it produces match the ones the CLI produces. The text is fixed for a build and depends on no configuration, session or repository.</summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>The prompt the init command runs.</returns>
+    internal async Task<InstructionsInitPromptResult> GetInitPromptAsync(CancellationToken cancellationToken = default)
+    {
+        return await CopilotClient.InvokeRpcAsync<InstructionsInitPromptResult>(_rpc, "instructions.getInitPrompt", [], cancellationToken);
+    }
+
+    /// <summary>Discovers instruction sources across user, repository, and plugin sources.</summary>
+    /// <param name="projectPaths">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).</param>
+    /// <param name="excludeHostInstructions">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.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Instruction sources discovered across user, repository, and plugin sources.</returns>
+    public async Task<ServerInstructionSourceList> DiscoverAsync(IList<string>? projectPaths = null, bool? excludeHostInstructions = null, CancellationToken cancellationToken = default)
+    {
+        var request = new InstructionsDiscoverRequest { ProjectPaths = projectPaths, ExcludeHostInstructions = excludeHostInstructions };
+        return await CopilotClient.InvokeRpcAsync<ServerInstructionSourceList>(_rpc, "instructions.discover", [request], cancellationToken);
+    }
+
+    /// <summary>Discovers instruction sources across user, repository, and plugin sources.</summary>
+    /// <param name="request">Optional project paths to include in instruction discovery.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Instruction sources discovered across user, repository, and plugin sources.</returns>
+    public async Task<ServerInstructionSourceList> DiscoverAsync(InstructionsDiscoverRequest request, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(request);
+        return await CopilotClient.InvokeRpcAsync<ServerInstructionSourceList>(_rpc, "instructions.discover", [request], cancellationToken);
+    }
+
+    /// <summary>Discovers the instruction sources for one caller-named location and returns them in the order the runtime applies them. `discover` answers for a set of project paths and derives the rest of its scope itself; this one instead takes every argument from the caller — the extra directories to scan and whether to descend into nested instruction files — and honors them as given. It also includes instruction directories from trusted repository settings, matching native repository discovery. Use it when the caller knows its own scope and no session exists to derive that scope from, such as a host reporting how many instruction files a directory contributes before any session starts. Marked internal because it exists to carry a CLI call site off the napi boundary onto the SDK contract; it is migration plumbing, not a surface consumers are meant to depend on.</summary>
+    /// <param name="location">Repository location to discover. An empty string selects no repository scope; cwdPath can still supply working-directory sources.</param>
+    /// <param name="isCli">When true, include the sources a command-line host reads. Hosts that are not the CLI omit it.</param>
+    /// <param name="cwdPath">Working directory whose instruction sources should also be included. Omission adds no separate working-directory scope.</param>
+    /// <param name="configDir">Copilot configuration directory for user-level sources. An omitted or empty value uses the server's configuration home.</param>
+    /// <param name="additionalDirs">Extra directories to scan alongside instruction directories configured in the runtime environment.</param>
+    /// <param name="enableChildInstructions">When true, also discover instruction files nested below the location.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Instruction sources discovered across user, repository, and plugin sources.</returns>
+    internal async Task<ServerInstructionSourceList> DiscoverRepoSourcesAsync(string location, bool? isCli = null, string? cwdPath = null, string? configDir = null, IList<string>? additionalDirs = null, bool? enableChildInstructions = null, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(location);
+
+        var request = new InstructionsDiscoverRepoSourcesRequest { Location = location, IsCli = isCli, CwdPath = cwdPath, ConfigDir = configDir, AdditionalDirs = additionalDirs, EnableChildInstructions = enableChildInstructions };
+        return await CopilotClient.InvokeRpcAsync<ServerInstructionSourceList>(_rpc, "instructions.discoverRepoSources", [request], cancellationToken);
+    }
+
+    /// <summary>Returns the canonical files and directories where a client may create custom instructions that the runtime will recognize, including ones that do not exist yet. Repository targets become active once created.</summary>
+    /// <param name="projectPaths">Optional list of project directory paths. When omitted or empty, only the user-level targets are returned.</param>
+    /// <param name="excludeHostInstructions">When true, omit the host's user-level instruction targets, leaving only repository targets. For multitenant deployments (mirrors `discover`'s `excludeHostInstructions`).</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Canonical files and directories where custom instructions can be created so the runtime will recognize them.</returns>
+    public async Task<InstructionDiscoveryPathList> GetDiscoveryPathsAsync(IList<string>? projectPaths = null, bool? excludeHostInstructions = null, CancellationToken cancellationToken = default)
+    {
+        var request = new InstructionsGetDiscoveryPathsRequest { ProjectPaths = projectPaths, ExcludeHostInstructions = excludeHostInstructions };
+        return await CopilotClient.InvokeRpcAsync<InstructionDiscoveryPathList>(_rpc, "instructions.getDiscoveryPaths", [request], cancellationToken);
+    }
+
+    /// <summary>Returns the canonical files and directories where a client may create custom instructions that the runtime will recognize, including ones that do not exist yet. Repository targets become active once created.</summary>
+    /// <param name="request">Optional project paths to include when enumerating instruction discovery targets.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Canonical files and directories where custom instructions can be created so the runtime will recognize them.</returns>
+    public async Task<InstructionDiscoveryPathList> GetDiscoveryPathsAsync(InstructionsGetDiscoveryPathsRequest request, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(request);
+        return await CopilotClient.InvokeRpcAsync<InstructionDiscoveryPathList>(_rpc, "instructions.getDiscoveryPaths", [request], cancellationToken);
+    }
+
+    /// <summary>Drops the runtime's in-memory cache of discovered custom instructions so the next discovery reads them from disk again. A host calls this after it changes instruction files, or after it trusts a folder whose instructions an earlier discovery skipped, so that a session started afterwards sees the current files instead of a cached earlier answer. The call performs no I/O of its own and removes nothing from disk; it only invalidates, so the cost lands on the next discovery.         Returns once the cache is clear, which is what lets a caller order a session start after it. Marked internal because it exists to carry a CLI call site off the napi boundary onto the SDK contract; it is migration plumbing, not a surface consumers are meant to depend on.</summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    internal async Task ClearCacheAsync(CancellationToken cancellationToken = default)
+    {
+        await CopilotClient.InvokeRpcAsync(_rpc, "instructions.clearCache", [], cancellationToken);
+    }
+}
+
 /// <summary>Provides server-scoped Skills APIs.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 public sealed class ServerSkillsApi
@@ -42951,7 +48973,7 @@ public async Task<SkillInstallationResult> ApplyUninstallAsync(CatalogClientCont
 
     /// <summary>Discovers skills across global and project sources.</summary>
     /// <param name="projectPaths">Optional list of project directory paths to scan for project-scoped skills.</param>
-    /// <param name="skillDirectories">Optional list of additional skill directory paths to include.</param>
+    /// <param name="skillDirectories">Explicit discovery-only skill roots, not filesystem grants. Available without ambient discovery, subject to skill/managed disables. Relative paths resolve against the request's effective working directory when supplied. Null and omission are equivalent; an empty array contributes no explicit roots.</param>
     /// <param name="ignoredSkillsLocations">Optional skill scan paths to exclude from discovery.</param>
     /// <param name="excludeHostSkills">When true, omit skills from the host's global sources (personal, custom, plugin, and built-in), returning only project-scoped skills. For multitenant deployments.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
@@ -42974,6 +48996,16 @@ public async Task<SkillDiscoveryPathList> GetDiscoveryPathsAsync(IList<string>?
         return await CopilotClient.InvokeRpcAsync<SkillDiscoveryPathList>(_rpc, "skills.getDiscoveryPaths", [request], cancellationToken);
     }
 
+    /// <summary>Returns the canonical directories where a client may create skills that the runtime will recognize, including ones that do not exist yet. Project directories become active once created.</summary>
+    /// <param name="request">Optional project paths to enumerate.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Canonical locations where skills can be created so the runtime will recognize them.</returns>
+    public async Task<SkillDiscoveryPathList> GetDiscoveryPathsAsync(SkillsGetDiscoveryPathsRequest request, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(request);
+        return await CopilotClient.InvokeRpcAsync<SkillDiscoveryPathList>(_rpc, "skills.getDiscoveryPaths", [request], cancellationToken);
+    }
+
     /// <summary>Installations APIs.</summary>
     public ServerSkillsInstallationsApi Installations =>
         field ??
@@ -43379,6 +49411,16 @@ public async Task<ServerAgentList> DiscoverAsync(IList<string>? projectPaths = n
         return await CopilotClient.InvokeRpcAsync<ServerAgentList>(_rpc, "agents.discover", [request], cancellationToken);
     }
 
+    /// <summary>Discovers custom agents across user, project, plugin, and remote sources.</summary>
+    /// <param name="request">Optional project paths to include in agent discovery.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Agents discovered across user, project, plugin, and remote sources.</returns>
+    public async Task<ServerAgentList> DiscoverAsync(AgentsDiscoverRequest request, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(request);
+        return await CopilotClient.InvokeRpcAsync<ServerAgentList>(_rpc, "agents.discover", [request], cancellationToken);
+    }
+
     /// <summary>Returns the canonical directories where a client may create custom agents that the runtime will recognize, including ones that do not exist yet. Project directories become active once created.</summary>
     /// <param name="projectPaths">Optional list of project directory paths. When omitted or empty, only the user-level directory is returned.</param>
     /// <param name="excludeHostAgents">When true, omit the host's user-level agent directory, leaving only project directories. For multitenant deployments (mirrors `discover`'s `excludeHostAgents`).</param>
@@ -43389,39 +49431,116 @@ public async Task<AgentDiscoveryPathList> GetDiscoveryPathsAsync(IList<string>?
         var request = new AgentsGetDiscoveryPathsRequest { ProjectPaths = projectPaths, ExcludeHostAgents = excludeHostAgents };
         return await CopilotClient.InvokeRpcAsync<AgentDiscoveryPathList>(_rpc, "agents.getDiscoveryPaths", [request], cancellationToken);
     }
+
+    /// <summary>Returns the canonical directories where a client may create custom agents that the runtime will recognize, including ones that do not exist yet. Project directories become active once created.</summary>
+    /// <param name="request">Optional project paths to include when enumerating agent discovery directories.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Canonical locations where custom agents can be created so the runtime will recognize them.</returns>
+    public async Task<AgentDiscoveryPathList> GetDiscoveryPathsAsync(AgentsGetDiscoveryPathsRequest request, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(request);
+        return await CopilotClient.InvokeRpcAsync<AgentDiscoveryPathList>(_rpc, "agents.getDiscoveryPaths", [request], cancellationToken);
+    }
+
+    /// <summary>Lists the agents this runtime ships, by name. A consumer separating shipped agents from ones the user or a plugin authored should compare against these names rather than against `AgentInfo.source`: an authored agent may carry the `builtin` source while not being one of these, and the runtime treats the two as separate questions. `disableableNames` is the subset a user may turn off, which a client needs to decide whether to offer a toggle. `yamlBasedNames` is the subset backed by a shipped YAML definition, which a client needs before asking the runtime to load one.</summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>The agents this runtime ships, named so a consumer can tell them apart from authored ones.</returns>
+    internal async Task<AgentsGetBuiltinsResult> GetBuiltinsAsync(CancellationToken cancellationToken = default)
+    {
+        return await CopilotClient.InvokeRpcAsync<AgentsGetBuiltinsResult>(_rpc, "agents.getBuiltins", [], cancellationToken);
+    }
+
+    /// <summary>Lists the shipped agents a client should offer right now, filtered by the feature flags it passes. `getBuiltins` names every agent the runtime knows about; some of those are gated, so a client rendering a picker wants this narrower list together with the description to show beside each name.</summary>
+    /// <param name="featureFlags">Feature flag values keyed by name, evaluated with the runtime's truthiness rules. Omit or pass null for no flags.</param>
+    /// <param name="overrides">Flag overrides keyed by name. A null entry uses the corresponding base flag; false explicitly disables it. Omit or pass null for no overrides.</param>
+    /// <param name="context">The surface asking, which gates agents that only apply to one client. Omit or pass null to apply no client filter.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>The shipped agents available under the requested flags.</returns>
+    internal async Task<AgentsGetAvailableBuiltinsResult> GetAvailableBuiltinsAsync(IDictionary<string, JsonElement>? featureFlags = null, IDictionary<string, JsonElement>? overrides = null, string? context = null, CancellationToken cancellationToken = default)
+    {
+        var request = new AgentsGetAvailableBuiltinsRequest { FeatureFlags = featureFlags, Overrides = overrides, Context = context };
+        return await CopilotClient.InvokeRpcAsync<AgentsGetAvailableBuiltinsResult>(_rpc, "agents.getAvailableBuiltins", [request], cancellationToken);
+    }
+
+    /// <summary>Loads one shipped agent's YAML definition, for a client that needs what the agent declares rather than only its name. `getBuiltins` reports which names have a definition to load: a name outside its `yamlBasedNames` is special-cased in code and has none. The definition crosses as its own JSON rather than as contract-typed fields, because the runtime parses it with the agent schema's tolerant shape and re-typing it here would drop the keys that shape accepts and this one does not. The projected `__nativeCustomAgent` view the runtime derives is included, so a caller reading the declared model and a caller rendering the agent see the same definition.</summary>
+    /// <param name="name">The agent name, which must be one of `getBuiltins`'s `yamlBasedNames`. A name outside that list is special-cased in code and has no definition, and is reported as an error rather than as an empty definition.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>One shipped agent's definition.</returns>
+    internal async Task<AgentsGetBuiltinDefinitionResult> GetBuiltinDefinitionAsync(string name, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(name);
+
+        var request = new AgentsGetBuiltinDefinitionRequest { Name = name };
+        return await CopilotClient.InvokeRpcAsync<AgentsGetBuiltinDefinitionResult>(_rpc, "agents.getBuiltinDefinition", [request], cancellationToken);
+    }
+
+    /// <summary>Projects one shipped agent the way a picker lists it, reading only the metadata at the head of the definition file and stopping before the prompt body. `getBuiltinDefinition` answers the whole definition instead, so a client listing every shipped agent should prefer this one: the cost of a listing grows with the number of agents, and the prompt body is the part a listing never shows. The two also differ in shape. This returns the projected custom agent on its own, whereas `getBuiltinDefinition` returns the authored definition with that projection nested under `__nativeCustomAgent`.</summary>
+    /// <param name="name">The agent name, taken from `getAvailableBuiltins`. Unlike `getBuiltinDefinition`, the agent that `getBuiltins` reports as special-cased rather than YAML-based is answered here too, from its in-code definition.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>One shipped agent, projected for a listing.</returns>
+    internal async Task<AgentsGetBuiltinListingDefinitionResult> GetBuiltinListingDefinitionAsync(string name, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(name);
+
+        var request = new AgentsGetBuiltinListingDefinitionRequest { Name = name };
+        return await CopilotClient.InvokeRpcAsync<AgentsGetBuiltinListingDefinitionResult>(_rpc, "agents.getBuiltinListingDefinition", [request], cancellationToken);
+    }
+
+    /// <summary>Resolves the model a custom agent asks for against the models actually available, and answers both the model to switch to and the warning a user should see when the agent's preference cannot be met. A custom agent may name several acceptable models in preference order, so the decision is a match rather than a lookup, and an agent whose preference is unavailable is a normal outcome that produces a warning rather than an error. A host must call this rather than pick the first available name itself, because the preference order and the wording of the warning are what keep one installation's agent selection the same as another's.</summary>
+    /// <param name="agentModelsJson">The agent's declared `model:` entry, serialized. A single name or an ordered list of acceptable names.</param>
+    /// <param name="availableModelsJson">The models available to this session, serialized in the shape the model list carries.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>The model to switch to, and the warning to show when the agent's preference could not be met.</returns>
+    internal async Task<AgentsCustomAgentInitialModelDecisionResult> CustomAgentInitialModelDecisionAsync(string agentModelsJson, string availableModelsJson, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(agentModelsJson);
+        ArgumentNullException.ThrowIfNull(availableModelsJson);
+
+        var request = new AgentsCustomAgentInitialModelDecisionParams { AgentModelsJson = agentModelsJson, AvailableModelsJson = availableModelsJson };
+        return await CopilotClient.InvokeRpcAsync<AgentsCustomAgentInitialModelDecisionResult>(_rpc, "agents.customAgentInitialModelDecision", [request], cancellationToken);
+    }
 }
 
-/// <summary>Provides server-scoped Instructions APIs.</summary>
+/// <summary>Provides server-scoped GlobalState APIs.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ServerInstructionsApi
+public sealed class ServerGlobalStateApi
 {
     private readonly JsonRpc _rpc;
 
-    internal ServerInstructionsApi(JsonRpc rpc)
+    internal ServerGlobalStateApi(JsonRpc rpc)
     {
         _rpc = rpc;
     }
 
-    /// <summary>Discovers instruction sources across user, repository, and plugin sources.</summary>
-    /// <param name="projectPaths">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).</param>
-    /// <param name="excludeHostInstructions">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.</param>
+    /// <summary>Reads the host's machine-wide state: which plugins are installed and the one-off flags and timestamps that record what the user has already been shown or migrated. This is the state that outlives a single session and a single workspace, so a host reads it to decide whether to run a first-launch step, offer an onboarding prompt, or skip one it has already completed. The stored credentials are deliberately not part of this result; a caller that needs an authenticated identity asks the account methods for it instead. Reading is non-destructive and every field is optional, because a fresh install has recorded nothing yet.</summary>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
-    /// <returns>Instruction sources discovered across user, repository, and plugin sources.</returns>
-    public async Task<ServerInstructionSourceList> DiscoverAsync(IList<string>? projectPaths = null, bool? excludeHostInstructions = null, CancellationToken cancellationToken = default)
+    /// <returns>The host's machine-wide state. Every field is optional because a fresh install has recorded nothing yet, so a reader must treat an absent field as `not yet`, never as a negative answer. Stored credentials are deliberately absent from this shape.</returns>
+    internal async Task<GlobalStateLoadResult> LoadAsync(CancellationToken cancellationToken = default)
     {
-        var request = new InstructionsDiscoverRequest { ProjectPaths = projectPaths, ExcludeHostInstructions = excludeHostInstructions };
-        return await CopilotClient.InvokeRpcAsync<ServerInstructionSourceList>(_rpc, "instructions.discover", [request], cancellationToken);
+        return await CopilotClient.InvokeRpcAsync<GlobalStateLoadResult>(_rpc, "globalState.load", [], cancellationToken);
     }
 
-    /// <summary>Returns the canonical files and directories where a client may create custom instructions that the runtime will recognize, including ones that do not exist yet. Repository targets become active once created.</summary>
-    /// <param name="projectPaths">Optional list of project directory paths. When omitted or empty, only the user-level targets are returned.</param>
-    /// <param name="excludeHostInstructions">When true, omit the host's user-level instruction targets, leaving only repository targets. For multitenant deployments (mirrors `discover`'s `excludeHostInstructions`).</param>
+    /// <summary>Reads the host's machine-wide state exactly as `globalState.load` does, but from a caller-supplied configuration directory instead of the one the server resolved for itself. Use this when a consumer scopes a session to its own Copilot home — the SDK's per-session `configDir` override — so the state read matches the directory that session actually uses. An absent or empty `configDir` resolves the server's own home, making this identical to `globalState.load`. The stored credentials are omitted here for the same reason they are omitted from `globalState.load`: a caller that needs an authenticated identity asks the account methods instead, so pointing this at another directory cannot be used to read the credentials kept in it.</summary>
+    /// <param name="configDir">Copilot configuration directory to read the state document from, taking precedence over the server's own `COPILOT_HOME` and default home. Omit it, or pass an empty string, to read the directory the server resolved for itself.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
-    /// <returns>Canonical files and directories where custom instructions can be created so the runtime will recognize them.</returns>
-    public async Task<InstructionDiscoveryPathList> GetDiscoveryPathsAsync(IList<string>? projectPaths = null, bool? excludeHostInstructions = null, CancellationToken cancellationToken = default)
+    /// <returns>The host's machine-wide state. Every field is optional because a fresh install has recorded nothing yet, so a reader must treat an absent field as `not yet`, never as a negative answer. Stored credentials are deliberately absent from this shape.</returns>
+    internal async Task<GlobalStateLoadResult> LoadForConfigDirAsync(string? configDir = null, CancellationToken cancellationToken = default)
     {
-        var request = new InstructionsGetDiscoveryPathsRequest { ProjectPaths = projectPaths, ExcludeHostInstructions = excludeHostInstructions };
-        return await CopilotClient.InvokeRpcAsync<InstructionDiscoveryPathList>(_rpc, "instructions.getDiscoveryPaths", [request], cancellationToken);
+        var request = new GlobalStateLoadForConfigDirRequest { ConfigDir = configDir };
+        return await CopilotClient.InvokeRpcAsync<GlobalStateLoadResult>(_rpc, "globalState.loadForConfigDir", [request], cancellationToken);
+    }
+
+    /// <summary>Records one top-level key in the host's machine-wide state, the counterpart to `globalState.load`. A host calls this to remember that it has shown an onboarding step, asked a one-off question, or completed a migration, so the next run can skip it. Only the named key is replaced and the rest of the document is preserved, which lets two writers record different flags without overwriting each other; passing no value removes the key instead. Only the keys a host records itself are writable: `appTipShown`, `askedSetupTerminals`, `autoFeedbackLastPromptedAt`, `firstLaunchAt`, `recentModelIds`, `sandboxCredentialProxyCaDeclined` and `sandboxOnboardingShown`. Every other key is refused, including `installedPlugins`, the stored credentials, `trustedFolders`, the staff flags and the signed-in accounts. Plugin enablement must use the plugin APIs, which apply repository and managed-policy checks.</summary>
+    /// <param name="key">Top-level key to write, named as it appears in the result of `globalState.load`. It must be one of the writable keys that `globalState.writeKey` lists.</param>
+    /// <param name="configDir">Copilot configuration directory to write the state document in, taking precedence over the server's own `COPILOT_HOME` and default home. Omit it, or pass an empty string, to write the directory the server resolved for itself. Mirrors `globalState.loadForConfigDir`, so a caller can read and write the same directory.</param>
+    /// <param name="value">Value to store for the key. Omit it, or pass null, to remove the key instead.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    internal async Task WriteKeyAsync(string key, string? configDir = null, object? value = null, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(key);
+
+        var request = new GlobalStateWriteKeyRequest { Key = key, ConfigDir = configDir, Value = CopilotClient.ToJsonElementForWire(value) };
+        await CopilotClient.InvokeRpcAsync(_rpc, "globalState.writeKey", [request], cancellationToken);
     }
 }
 
@@ -43445,132 +49564,116 @@ public async Task<CommandList> ListAsync(CancellationToken cancellationToken = d
     }
 }
 
-/// <summary>Provides server-scoped User APIs.</summary>
+/// <summary>Provides server-scoped GitHubRepository APIs.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ServerUserApi
+public sealed class ServerGitHubRepositoryApi
 {
     private readonly JsonRpc _rpc;
 
-    internal ServerUserApi(JsonRpc rpc)
+    internal ServerGitHubRepositoryApi(JsonRpc rpc)
     {
         _rpc = rpc;
     }
 
-    /// <summary>Settings APIs.</summary>
-    public ServerUserSettingsApi Settings =>
-        field ??
-        Interlocked.CompareExchange(ref field, new(_rpc), null) ??
-        field;
+    /// <summary>Resolves the GitHub repository that owns a working-tree path by reading the selected git remote configured for it, preferring `origin`. Returns a null `repository` when the path is inside a git working tree but that selected remote does not resolve to a GitHub host. Fails when the path is not inside a git working tree at all, so a caller can tell 'not a repository' apart from 'a repository with no GitHub remote'.</summary>
+    /// <param name="path">Absolute path to a directory inside the git working tree to resolve.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>The GitHub repository that owns the requested path, when the selected remote (`origin`, else the first) is on a GitHub host.</returns>
+    internal async Task<GitHubRepositoryAtPathResult> AtPathAsync(string path, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(path);
+
+        var request = new GitHubRepositoryAtPathRequest { Path = path };
+        return await CopilotClient.InvokeRpcAsync<GitHubRepositoryAtPathResult>(_rpc, "gitHubRepository.atPath", [request], cancellationToken);
+    }
 }
 
-/// <summary>Provides server-scoped UserSettings APIs.</summary>
+/// <summary>Provides server-scoped GitHubOwners APIs.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ServerUserSettingsApi
+public sealed class ServerGitHubOwnersApi
 {
     private readonly JsonRpc _rpc;
 
-    internal ServerUserSettingsApi(JsonRpc rpc)
+    internal ServerGitHubOwnersApi(JsonRpc rpc)
     {
         _rpc = rpc;
     }
 
-    /// <summary>Drops this runtime process's in-memory user settings cache so the next settings read observes disk.</summary>
+    /// <summary>Registers a cancellable owner listing and returns its request id. Separate from `gitHubOwners.list` so the id exists before the listing starts: a caller that abandons the listing the moment it begins would otherwise have nothing to name in `gitHubOwners.cancel`. The id serves one listing only. Long-abandoned unused ids can be released by later allocations.</summary>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
-    public async Task ReloadAsync(CancellationToken cancellationToken = default)
+    /// <returns>A freshly registered request id. Registering it before the listing starts is what lets a cancel that races the request still find the owner listing slot. The id serves one listing only. Long-abandoned unused ids can be released by later allocations.</returns>
+    internal async Task<GitHubOwnersRequestIdResult> NextRequestIdAsync(CancellationToken cancellationToken = default)
     {
-        await CopilotClient.InvokeRpcAsync(_rpc, "user.settings.reload", [], cancellationToken);
+        return await CopilotClient.InvokeRpcAsync<GitHubOwnersRequestIdResult>(_rpc, "gitHubOwners.nextRequestId", [], cancellationToken);
     }
 
-    /// <summary>Lists every known user setting (settings.json overlaid with the legacy config.json, config.json wins), each with its effective value, its default, and whether it is at the default — so settings the user has never set still appear with their default value. Does not include repository- or enterprise-managed overrides that the runtime layers on top at session time.</summary>
+    /// <summary>Lists the logins the authenticated user may act as — their own account first, then the organizations they belong to — by asking the GitHub API under the supplied credential. No credential travels in the request: `authInfo` selects one the runtime already holds, and the runtime resolves the token and the GitHub host from it. A failure the caller should render arrives as `message`; one it should raise arrives as `throwError`.</summary>
+    /// <param name="requestId">Request id from `gitHubOwners.nextRequestId`. An id that was never registered, canceled before use, released after being abandoned, or already used is refused rather than silently running uncancellable.</param>
+    /// <param name="authInfo">The credential the listing runs under, carried opaquely because its shape is the host's own and the runtime only resolves a token and a GitHub host from it. No credential travels: this selects one the runtime already holds.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
-    /// <returns>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.</returns>
-    public async Task<UserSettingsGetResult> GetAsync(CancellationToken cancellationToken = default)
+    /// <returns>Outcome of an owner listing. Exactly one of `owners` and `message` is present, except that `throwError` reports a failure the caller is expected to raise rather than render.</returns>
+    internal async Task<GitHubOwnersListResult> ListAsync(long requestId, object? authInfo, CancellationToken cancellationToken = default)
     {
-        return await CopilotClient.InvokeRpcAsync<UserSettingsGetResult>(_rpc, "user.settings.get", [], cancellationToken);
+        var request = new GitHubOwnersListRequest { RequestId = requestId, AuthInfo = CopilotClient.ToJsonElementForWire(authInfo) ?? JsonElement.Parse("null") };
+        return await CopilotClient.InvokeRpcAsync<GitHubOwnersListResult>(_rpc, "gitHubOwners.list", [request], cancellationToken);
     }
 
-    /// <summary>Writes one or more user settings to settings.json, replacing each provided top-level key. A key whose value is null is removed. Returns the keys whose new value is shadowed by a legacy config.json entry (config.json wins on read), which the runtime leaves in place — such writes do not take effect until the legacy value is removed.</summary>
-    /// <param name="settings">Partial user settings to write, as a free-form object keyed by setting name.</param>
+    /// <summary>Abandons an owner listing started with the given request id. Answers `canceled: true` while a listing with that id is running. Answers `canceled: false` when the id was never registered, was registered but not used, was released after being abandoned, or its listing has ended. Canceling an unused id releases it, and a later `list` with that id is refused. The cancel acts only on owner listings and never reaches another request of the host.</summary>
+    /// <param name="requestId">Request id the listing was started with.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
-    /// <returns>Outcome of writing user settings.</returns>
-    public async Task<UserSettingsSetResult> SetAsync(object settings, CancellationToken cancellationToken = default)
+    /// <returns>Whether the id named a running owner listing.</returns>
+    internal async Task<GitHubOwnersCancelResult> CancelAsync(long requestId, CancellationToken cancellationToken = default)
     {
-        ArgumentNullException.ThrowIfNull(settings);
-
-        var request = new UserSettingsSetRequest { Settings = CopilotClient.ToJsonElementForWire(settings)!.Value };
-        return await CopilotClient.InvokeRpcAsync<UserSettingsSetResult>(_rpc, "user.settings.set", [request], cancellationToken);
+        var request = new GitHubOwnersCancelRequest { RequestId = requestId };
+        return await CopilotClient.InvokeRpcAsync<GitHubOwnersCancelResult>(_rpc, "gitHubOwners.cancel", [request], cancellationToken);
     }
 }
 
-/// <summary>Provides server-scoped ManagedSettings APIs.</summary>
+/// <summary>Provides server-scoped Git APIs.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed class ServerManagedSettingsApi
+public sealed class ServerGitApi
 {
     private readonly JsonRpc _rpc;
 
-    internal ServerManagedSettingsApi(JsonRpc rpc)
+    internal ServerGitApi(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. `managedSettings.resolve` returns the same device settings together with the account's server policy.</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>Force-refreshes enterprise managed settings for every account: wipes the persistent server-policy cache (the whole `&lt;cacheHome&gt;/managed-settings` directory) and drops this runtime process's in-memory retained server policy. It does not itself fetch policy — the effect is that the next time a session resolves managed settings for an account, that resolution re-fetches the account's org policy from the network instead of serving a cached response. Note that `managedSettings.read` returns only device/MDM settings and never triggers the account server-policy fetch, so a host implementing "sync account policy" should call `managedSettings.resolve` or start a fresh session resolution rather than treat a subsequent `managedSettings.read` as the refreshed org policy. Mirrors the invalidation a sign-out performs, broadened from the one signing-out account to all of them; device/MDM layers describe the machine, not the account, and are left untouched. Rejects if the on-disk cache cannot be removed.</summary>
+    /// <summary>Reads the remote that the branch checked out in a working tree tracks, as `branch.&lt;name&gt;.remote` configures it. Reports `origin` rather than failing whenever there is no tracking configuration to read — on a detached HEAD, on a branch with no upstream, or when git itself fails — because a caller asking which remote to talk to needs an answer it can act on, not an error. Marked internal because it exists to carry a CLI call site off the napi boundary onto the SDK contract; it is migration plumbing, not a surface consumers are meant to depend on.</summary>
+    /// <param name="cwd">Absolute path to a directory inside the git working tree to query.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
-    public async Task ClearCacheAsync(CancellationToken cancellationToken = default)
+    /// <returns>The remote the checked-out branch tracks.</returns>
+    internal async Task<GitCurrentBranchRemoteResult> CurrentBranchRemoteAsync(string cwd, CancellationToken cancellationToken = default)
     {
-        await CopilotClient.InvokeRpcAsync(_rpc, "managedSettings.clearCache", [], cancellationToken);
-    }
-
-    /// <summary>Resolves the effective enterprise managed settings without a session, from the device channel and, when an account is available, the account's server policy through the same per-account cache sessions use. A cached server policy less than an hour old is used without a fetch; otherwise the policy is fetched, and when the fetch fails a cached policy up to 24 hours old is used instead, unless `forceRemoteSettingsRefresh` requires a live fetch. With no account requested or signed in, it reports device policy only; signing out removes the account's cached policy. It can fetch server policy over the network when the cache is stale, so call it off latency-critical paths such as startup rather than before listing models. The policy helper is not run. `layers` lists each channel's document before merging, and `values` and `meta` carry typed effective values and their lock state for the keys typed so far.</summary>
-    /// <param name="selectionId">Opaque account identifier returned by `account.getAllUsers`. When omitted, the current account is used, or device policy only when no account is signed in.</param>
-    /// <param name="gitHubToken">GitHub token to resolve instead of the current account. The call fails when the token cannot be resolved.</param>
-    /// <param name="clientName">Embedding client identity for server policy requests, as in session creation. Omit for the CLI identity.</param>
-    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
-    /// <returns>Effective enterprise managed settings for an account, resolved without a session.</returns>
-    public async Task<ManagedSettingsResolveResult> ResolveAsync(string? selectionId = null, string? gitHubToken = null, string? clientName = null, CancellationToken cancellationToken = default)
-    {
-        var request = new ManagedSettingsResolveRequest { SelectionId = selectionId, GitHubToken = gitHubToken, ClientName = clientName };
-        return await CopilotClient.InvokeRpcAsync<ManagedSettingsResolveResult>(_rpc, "managedSettings.resolve", [request], cancellationToken);
-    }
+        ArgumentNullException.ThrowIfNull(cwd);
 
-    /// <summary>Returns the managed-settings authoring JSON schema with descriptive `x-composition` annotations aligned with the shared settings-engine vocabulary. These annotations are not a complete runtime composition contract: model, effortLevel, and contextTier remain coupled. Use `managedSettings.compose` for the runtime's effective result. Performs no I/O.</summary>
-    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
-    /// <returns>The authoring JSON schema for managed settings recognized by this runtime.</returns>
-    public async Task<ManagedSettingsSchemaResult> SchemaAsync(CancellationToken cancellationToken = default)
-    {
-        return await CopilotClient.InvokeRpcAsync<ManagedSettingsSchemaResult>(_rpc, "managedSettings.schema", [], cancellationToken);
+        var request = new GitCwdRequest { Cwd = cwd };
+        return await CopilotClient.InvokeRpcAsync<GitCurrentBranchRemoteResult>(_rpc, "git.currentBranchRemote", [request], cancellationToken);
     }
 
-    /// <summary>Validates a candidate managed-settings document the way the runtime validates delivered policy, without applying it. Reports errors that would reject the document, warnings for content the runtime ignores, and the canonical document it would apply. Document text nested more than 64 levels deep is rejected. Performs no I/O.</summary>
-    /// <param name="content">The document to validate: a JSON object, or a string containing the document's JSON text. Preview documents are limited to 1 MiB and 64 levels of nesting, a stricter resource limit than delivered-policy parsing; violations are returned as diagnostics.</param>
-    /// <param name="layer">Channel the document is meant for (`device`, `server`, or `policyHelper`). Some keys are only honored in some channels; for example, a `policyHelper` registration is ignored in policy-helper output. When omitted, no channel-specific checks run.</param>
+    /// <summary>Collects the repository context of a working directory in one call: working tree root, repository identifier and host, current branch, and the HEAD and base commits. Every repository field is omitted when the path is not inside a git working tree, and the requested path is echoed back as `cwd`. The answer is the same `SessionWorkingDirectoryContext` that `session.metadata.recordContextChange` accepts, so a caller polling for a context change can forward the result unchanged. Marked internal because it exists to carry a CLI call site off the napi boundary onto the SDK contract; it is migration plumbing, not a surface consumers are meant to depend on. It can become public once an SDK consumer needs to derive session context from a directory itself.</summary>
+    /// <param name="cwd">Absolute path to a directory inside the git working tree to query.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
-    /// <returns>Result of validating a managed-settings document.</returns>
-    public async Task<ManagedSettingsValidateResult> ValidateAsync(object content, string? layer = null, CancellationToken cancellationToken = default)
+    /// <returns>Updated working directory and git context. Emitted as the new payload of `session.context_changed`.</returns>
+    internal async Task<SessionWorkingDirectoryContext> WorkingDirectoryContextAsync(string cwd, CancellationToken cancellationToken = default)
     {
-        ArgumentNullException.ThrowIfNull(content);
+        ArgumentNullException.ThrowIfNull(cwd);
 
-        var request = new ManagedSettingsValidateRequest { Content = CopilotClient.ToJsonElementForWire(content)!.Value, Layer = layer };
-        return await CopilotClient.InvokeRpcAsync<ManagedSettingsValidateResult>(_rpc, "managedSettings.validate", [request], cancellationToken);
+        var request = new GitCwdRequest { Cwd = cwd };
+        return await CopilotClient.InvokeRpcAsync<SessionWorkingDirectoryContext>(_rpc, "git.workingDirectoryContext", [request], cancellationToken);
     }
 
-    /// <summary>Merges candidate managed-settings documents for the device, server, and policy-helper channels into the effective settings the runtime would enforce on this host, using the same precedence and composition rules as live resolution, without applying them. Like live resolution, a server's advisory sandbox force-enable is declined on a host that cannot run the sandbox. Does not fetch policy or read policy files, but may perform blocking OS or subprocess probes for sandbox support. Preview documents are limited to 1 MiB and 64 levels of nesting.</summary>
-    /// <param name="layers">One entry per channel. `source` must be `device`, `server`, or `policyHelper`, each at most once (checked at runtime); order does not matter, because channel precedence is fixed. To preview documents from resolve output, map recognized source strings to ManagedSettingsChannel and copy their settings; generated resolve and compose layer types are distinct. Omitted settings means this channel delivered no document. Supplied documents must be valid within the preview limits; warnings are returned in diagnostics. Compose does not reproduce source-failure state or retained enforcement floors from resolve.</param>
+    /// <summary>Lists the GitHub repositories a working tree's remotes point at, one entry per distinct repository, so a caller can resolve a base and head repository without parsing remote URLs itself. When several remotes name the same repository, only the first is listed, and the entry keeps that remote name. Remotes pointing at no GitHub host are left out, so an empty list means the tree reaches GitHub through no remote. Failing to read the remotes is reported as an error rather than as an empty list, because the two mean different things to a caller. Marked internal because it exists to carry a CLI call site off the napi boundary onto the SDK contract; it is migration plumbing, not a surface consumers are meant to depend on.</summary>
+    /// <param name="gitRoot">Absolute path to the root of the git working tree.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
-    /// <returns>The effective managed settings the runtime would enforce for the given documents, in the same shape `managedSettings.resolve` returns.</returns>
-    public async Task<ManagedSettingsComposeResult> ComposeAsync(IList<ManagedSettingsComposeLayer> layers, CancellationToken cancellationToken = default)
+    /// <returns>The GitHub repositories a working tree's remotes point at.</returns>
+    internal async Task<GitReposFromRemotesResult> ReposFromRemotesAsync(string gitRoot, CancellationToken cancellationToken = default)
     {
-        ArgumentNullException.ThrowIfNull(layers);
+        ArgumentNullException.ThrowIfNull(gitRoot);
 
-        var request = new ManagedSettingsComposeRequest { Layers = layers };
-        return await CopilotClient.InvokeRpcAsync<ManagedSettingsComposeResult>(_rpc, "managedSettings.compose", [request], cancellationToken);
+        var request = new GitReposFromRemotesRequest { GitRoot = gitRoot };
+        return await CopilotClient.InvokeRpcAsync<GitReposFromRemotesResult>(_rpc, "git.reposFromRemotes", [request], cancellationToken);
     }
 }
 
@@ -43946,6 +50049,54 @@ public async Task<SessionEnrichMetadataResult> EnrichMetadataAsync(IList<LocalSe
         return await CopilotClient.InvokeRpcAsync<SessionEnrichMetadataResult>(_rpc, "sessions.enrichMetadata", [request], cancellationToken);
     }
 
+    /// <summary>Creates the workspace record for a session that has not been opened yet. A host that hands a session off to another application — writing the record and then launching that application against the session ID — needs the record on disk before any session exists to carry it, which the session-scoped workspace methods cannot do. Replaces any existing record and resets the checkpoint index. When writing to the local filesystem, a stored `fork_count` survives on disk. Returns the record it built, so a surviving stored `fork_count` can differ from the answer.</summary>
+    /// <param name="sessionId">Session ID the workspace record belongs to.</param>
+    /// <param name="sessionStatePath">Directory the session's state is written under when no session filesystem provider is configured. Ignored when a provider is configured; the provider's session state path is used instead.</param>
+    /// <param name="convention">`windows` (any letter case) selects Windows path rules. Any other value selects POSIX path rules.</param>
+    /// <param name="context">Starting working-directory context. The record keeps `cwd`, `gitRoot`, `repository`, `hostType`, `branch`, and `clientName`. Other fields, including `repositoryHost`, `headCommit`, and `baseCommit`, are ignored. `hostType` must be `github` or `ado`.</param>
+    /// <param name="name">User-supplied display name for the workspace.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>The workspace record that was written.</returns>
+    internal async Task<SessionsCreateWorkspaceResult> CreateWorkspaceAsync(string sessionId, string sessionStatePath, string convention, SessionWorkingDirectoryContextWithClient? context = null, string? name = null, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(sessionId);
+        ArgumentNullException.ThrowIfNull(sessionStatePath);
+        ArgumentNullException.ThrowIfNull(convention);
+
+        var request = new SessionsCreateWorkspaceRequest { SessionId = sessionId, SessionStatePath = sessionStatePath, Convention = convention, Context = context, Name = name };
+        return await CopilotClient.InvokeRpcAsync<SessionsCreateWorkspaceResult>(_rpc, "sessions.createWorkspace", [request], cancellationToken);
+    }
+
+    /// <summary>Reads a session's workspace record straight from disk, without opening the session. Resuming by session ID has to know where the session lives before it can connect, so the lookup cannot come from the session-scoped workspace methods, which resolve their location from a live session's context. Returns no record when the file is absent.</summary>
+    /// <param name="sessionsHome">Root directory every session's state directory sits under.</param>
+    /// <param name="sessionId">Session ID naming the state directory under the sessions home. Rejected when it is absolute or contains a parent component, so it cannot escape the sessions home.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>The workspace record on disk, omitted when the session has none.</returns>
+    internal async Task<SessionsLoadWorkspaceResult> LoadWorkspaceAsync(string sessionsHome, string sessionId, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(sessionsHome);
+        ArgumentNullException.ThrowIfNull(sessionId);
+
+        var request = new SessionsLoadWorkspaceRequest { SessionsHome = sessionsHome, SessionId = sessionId };
+        return await CopilotClient.InvokeRpcAsync<SessionsLoadWorkspaceResult>(_rpc, "sessions.loadWorkspace", [request], cancellationToken);
+    }
+
+    /// <summary>Merges fields into a session's workspace record on disk, creating the record when it is absent. The counterpart to `sessions.loadWorkspace`, for the same before-the-session-exists case. It preserves stored workspace-schema fields the request does not supply, does not preserve stored keys outside the workspace schema, and never replaces a stored `fork_count`.</summary>
+    /// <param name="sessionsHome">Root directory every session's state directory sits under.</param>
+    /// <param name="sessionId">Session ID naming the state directory under the sessions home. Rejected when it is absolute or contains a parent component, so it cannot escape the sessions home.</param>
+    /// <param name="fieldsJson">Workspace-schema fields to merge into the record, as a JSON object. Fields the object omits keep their stored values, except stored keys outside the schema are not preserved and a stored `fork_count` is never replaced.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>The merge completed. The record carries the supplied workspace-schema fields, but a stored `fork_count` stays.</returns>
+    internal async Task<SessionsUpdateWorkspaceFieldsResult> UpdateWorkspaceFieldsAsync(string sessionsHome, string sessionId, string fieldsJson, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(sessionsHome);
+        ArgumentNullException.ThrowIfNull(sessionId);
+        ArgumentNullException.ThrowIfNull(fieldsJson);
+
+        var request = new SessionsUpdateWorkspaceFieldsRequest { SessionsHome = sessionsHome, SessionId = sessionId, FieldsJson = fieldsJson };
+        return await CopilotClient.InvokeRpcAsync<SessionsUpdateWorkspaceFieldsResult>(_rpc, "sessions.updateWorkspaceFields", [request], cancellationToken);
+    }
+
     /// <summary>Reloads user, plugin, and (optionally) repo hooks on the active session.</summary>
     /// <param name="sessionId">Active session ID to reload hooks for.</param>
     /// <param name="deferRepoHooks">When true, skip repo-level hooks. Use before folder trust is confirmed; loadDeferredRepoHooks loads them post-trust.</param>
@@ -44092,6 +50243,58 @@ public async Task<AgentRegistrySpawnResult> SpawnAsync(string cwd, string? agent
     }
 }
 
+/// <summary>Provides server-scoped Connectors APIs.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class ServerConnectorsApi
+{
+    private readonly JsonRpc _rpc;
+
+    internal ServerConnectorsApi(JsonRpc rpc)
+    {
+        _rpc = rpc;
+    }
+
+    /// <summary>Returns feature availability.</summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Feature availability.</returns>
+    public async Task<ConnectorDiscoveryCapabilities> GetCapabilitiesAsync(CancellationToken cancellationToken = default)
+    {
+        return await CopilotClient.InvokeRpcAsync<ConnectorDiscoveryCapabilities>(_rpc, "connectors.getCapabilities", [], cancellationToken);
+    }
+
+    /// <summary>Returns eligible accounts.</summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Eligible accounts.</returns>
+    public async Task<ConnectorDiscoveryAccountList> GetAccountsAsync(CancellationToken cancellationToken = default)
+    {
+        return await CopilotClient.InvokeRpcAsync<ConnectorDiscoveryAccountList>(_rpc, "connectors.getAccounts", [], cancellationToken);
+    }
+
+    /// <summary>Lists entries for the selected account.</summary>
+    /// <param name="accountId">Opaque account ID.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Entries for the selected account.</returns>
+    public async Task<ConnectorDiscoveryCatalogResult> ListAsync(string accountId, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(accountId);
+
+        var request = new ConnectorDiscoveryAccountRequest { AccountId = accountId };
+        return await CopilotClient.InvokeRpcAsync<ConnectorDiscoveryCatalogResult>(_rpc, "connectors.list", [request], cancellationToken);
+    }
+
+    /// <summary>Refreshes entries for the selected account.</summary>
+    /// <param name="accountId">Opaque account ID.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Entries for the selected account.</returns>
+    public async Task<ConnectorDiscoveryCatalogResult> RefreshAsync(string accountId, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(accountId);
+
+        var request = new ConnectorDiscoveryAccountRequest { AccountId = accountId };
+        return await CopilotClient.InvokeRpcAsync<ConnectorDiscoveryCatalogResult>(_rpc, "connectors.refresh", [request], cancellationToken);
+    }
+}
+
 /// <summary>Provides typed session-scoped RPC methods.</summary>
 public sealed class SessionRpc
 {
@@ -44356,6 +50559,12 @@ internal SessionRpc(CopilotSession session)
         Interlocked.CompareExchange(ref field, new(_session), null) ??
         field;
 
+    /// <summary>Quota APIs.</summary>
+    public QuotaApi Quota =>
+        field ??
+        Interlocked.CompareExchange(ref field, new(_session), null) ??
+        field;
+
     /// <summary>LimitPrediction APIs.</summary>
     public LimitPredictionApi LimitPrediction =>
         field ??
@@ -44645,6 +50854,17 @@ public async Task<SandboxEnforcementStatus> GetEnforcementStatusAsync(Cancellati
         return await CopilotClient.InvokeRpcAsync<SandboxEnforcementStatus>(_session.Rpc, "session.sandbox.getEnforcementStatus", [request], cancellationToken);
     }
 
+    /// <summary>Lists possible secret-bearing environment variables available to new sandboxed shells that are not already covered by credential masking. Uses local name rules and known-provider host suggestions, never returns secret values, and changes no settings or network permissions. Returns no suggestions while the session is not sandboxed.</summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Possible unconfigured secrets in the sandbox shell environment, sorted by variable name, with no secret values.</returns>
+    public async Task<SandboxCredentialSuggestionsResult> GetCredentialSuggestionsAsync(CancellationToken cancellationToken = default)
+    {
+        _session.ThrowIfDisposed();
+
+        var request = new SessionSandboxGetCredentialSuggestionsRequest { SessionId = _session.SessionId };
+        return await CopilotClient.InvokeRpcAsync<SandboxCredentialSuggestionsResult>(_session.Rpc, "session.sandbox.getCredentialSuggestions", [request], cancellationToken);
+    }
+
     /// <summary>Disables sandboxing for the remainder of the current session and approves the referenced pending sandbox-bypass permission request. The request is rejected unless the exact request is still pending and the effective sandbox policy permits bypass.</summary>
     /// <param name="requestId">Identifier of the exact pending sandbox-bypass permission request that authorized the session opt-out.</param>
     /// <param name="decisionContext">Optional attribution for the permission decision.</param>
@@ -45061,14 +51281,13 @@ internal CanvasProviderApi(CopilotSession session)
     /// <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)
+    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() };
+        var request = new CanvasProviderRegisterRequest { SessionId = _session.SessionId, ConnectionId = connectionId, Info = CopilotClient.ToJsonElementForWire(info) ?? JsonElement.Parse("null"), Canvases = canvases.Select(static v => CopilotClient.ToJsonElementForWire(v)!.Value).ToList() };
         await CopilotClient.InvokeRpcAsync(_session.Rpc, "session.canvas.provider.register", [request], cancellationToken);
     }
 
@@ -45102,13 +51321,12 @@ internal WorkflowApi(CopilotSession session)
     /// <param name="options">Workflow invocation options.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
     /// <returns>Complete current or terminal workflow run envelope.</returns>
-    public async Task<WorkflowRunResult> RunAsync(string name, object args, WorkflowRunOptions? options = null, CancellationToken cancellationToken = default)
+    public async Task<WorkflowRunResult> RunAsync(string name, object? args, WorkflowRunOptions? options = null, CancellationToken cancellationToken = default)
     {
         ArgumentNullException.ThrowIfNull(name);
-        ArgumentNullException.ThrowIfNull(args);
         _session.ThrowIfDisposed();
 
-        var request = new WorkflowRunRequest { SessionId = _session.SessionId, Name = name, Args = CopilotClient.ToJsonElementForWire(args)!.Value, Options = options };
+        var request = new WorkflowRunRequest { SessionId = _session.SessionId, Name = name, Args = CopilotClient.ToJsonElementForWire(args) ?? JsonElement.Parse("null"), Options = options };
         return await CopilotClient.InvokeRpcAsync<WorkflowRunResult>(_session.Rpc, "session.workflow.run", [request], cancellationToken);
     }
 
@@ -45135,13 +51353,12 @@ public async Task<WorkflowResumeResult> ResumeAsync(string runId, WorkflowRunLim
     /// <param name="toolCallId">Opaque identifier of the originating tool call.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
     /// <returns>Complete current or terminal workflow run envelope.</returns>
-    internal async Task<WorkflowRunResult> RunFromToolAsync(string name, object args, WorkflowToolRunOptions? options = null, string? toolCallId = null, CancellationToken cancellationToken = default)
+    internal async Task<WorkflowRunResult> RunFromToolAsync(string name, object? args, WorkflowToolRunOptions? options = null, string? toolCallId = null, CancellationToken cancellationToken = default)
     {
         ArgumentNullException.ThrowIfNull(name);
-        ArgumentNullException.ThrowIfNull(args);
         _session.ThrowIfDisposed();
 
-        var request = new WorkflowToolRunRequest { SessionId = _session.SessionId, Name = name, Args = CopilotClient.ToJsonElementForWire(args)!.Value, Options = options, ToolCallId = toolCallId };
+        var request = new WorkflowToolRunRequest { SessionId = _session.SessionId, Name = name, Args = CopilotClient.ToJsonElementForWire(args) ?? JsonElement.Parse("null"), Options = options, ToolCallId = toolCallId };
         return await CopilotClient.InvokeRpcAsync<WorkflowRunResult>(_session.Rpc, "session.workflow.runFromTool", [request], cancellationToken);
     }
 
@@ -45337,15 +51554,14 @@ public async Task<WorkflowJournalGetResult> GetAsync(string runId, string execut
     /// <param name="resultJson">JSON result to memoize.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
     /// <returns>Acknowledgement that a workflow request was accepted.</returns>
-    public async Task<WorkflowAckResult> PutAsync(string runId, string executionToken, string key, object resultJson, CancellationToken cancellationToken = default)
+    public async Task<WorkflowAckResult> PutAsync(string runId, string executionToken, string key, object? resultJson, CancellationToken cancellationToken = default)
     {
         ArgumentNullException.ThrowIfNull(runId);
         ArgumentNullException.ThrowIfNull(executionToken);
         ArgumentNullException.ThrowIfNull(key);
-        ArgumentNullException.ThrowIfNull(resultJson);
         _session.ThrowIfDisposed();
 
-        var request = new WorkflowJournalPutRequest { SessionId = _session.SessionId, RunId = runId, ExecutionToken = executionToken, Key = key, ResultJson = CopilotClient.ToJsonElementForWire(resultJson)!.Value };
+        var request = new WorkflowJournalPutRequest { SessionId = _session.SessionId, RunId = runId, ExecutionToken = executionToken, Key = key, ResultJson = CopilotClient.ToJsonElementForWire(resultJson) ?? JsonElement.Parse("null") };
         return await CopilotClient.InvokeRpcAsync<WorkflowAckResult>(_session.Rpc, "session.workflow.journal.put", [request], cancellationToken);
     }
 }
@@ -45373,7 +51589,7 @@ public async Task<CurrentModel> GetCurrentAsync(CancellationToken cancellationTo
     }
 
     /// <summary>Switches the session to a model and optional reasoning configuration.</summary>
-    /// <param name="modelId">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.</param>
+    /// <param name="modelId">Model id to switch to, as returned by `list`. Include providerId to select an exact catalog entry when providers share the id. Without providerId, a bare id retains incumbent selection behavior; a registry-qualified id (`provider/id`, e.g. `acme/claude-sonnet`) targets a BYOK model.</param>
     /// <param name="autoTier">Optional Auto routing preference to stage atomically with selecting `auto`. Pass null to return to provider-default Auto routing. This field is rejected when `modelId` is not `auto`.</param>
     /// <param name="reasoningEffort">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. Pass null to clear any session effort override and fall back to the model's default. When omitted, the session's current effort is kept.</param>
     /// <param name="reasoningSummary">Reasoning summary mode to request for supported model clients.</param>
@@ -45395,10 +51611,23 @@ public async Task<ModelSwitchToResult> SwitchToAsync(string modelId, AutoTier? a
         ArgumentNullException.ThrowIfNull(modelId);
         _session.ThrowIfDisposed();
 
-        var request = new ModelSwitchToRequest { SessionId = _session.SessionId, ModelId = modelId, AutoTier = autoTier, 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 };
+        var request = new ModelSwitchToRequestWithSession { SessionId = _session.SessionId, ModelId = modelId, AutoTier = autoTier, 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>Switches the session to a model and optional reasoning configuration.</summary>
+    /// <param name="request">Target model identifier and optional reasoning effort, summary, capability overrides, and context tier.</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(ModelSwitchToRequest request, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(request);
+        ArgumentNullException.ThrowIfNull(request.ModelId);
+        _session.ThrowIfDisposed();
+        var wireRequest = new ModelSwitchToRequestWithSession { SessionId = _session.SessionId, ModelId = request.ModelId, ProviderId = request.ProviderId, AutoTier = request.AutoTier, ReasoningEffort = request.ReasoningEffort, ReasoningSummary = request.ReasoningSummary, Verbosity = request.Verbosity, ModelCapabilities = request.ModelCapabilities, ContextTier = request.ContextTier, Source = request.Source, DeferIfModelChangeQueued = request.DeferIfModelChangeQueued, CompactionDecision = request.CompactionDecision, RunCompactionPreflight = request.RunCompactionPreflight, RepoScope = request.RepoScope, ModelChangeScope = request.ModelChangeScope, RequireAvailable = request.RequireAvailable, PickerPersistence = request.PickerPersistence };
+        return await CopilotClient.InvokeRpcAsync<ModelSwitchToResult>(_session.Rpc, "session.model.switchTo", [wireRequest], cancellationToken);
+    }
+
     /// <summary>Requests an Auto preference change without changing the session's selected model. The latest unclaimed request wins; the runtime commits it only after a later prompt using the `auto` model mints a usable model and token pair. A `pending` response confirms that the request was accepted, not that it committed. Observe eventual success through `session.model_change`, failure through the ephemeral `session.auto_tier_switch_failed` event, or current unclaimed state through `session.model.getCurrent`.</summary>
     /// <param name="autoTier">Auto preference to activate when a future user turn using the `auto` model safely mints a replacement model and token pair. Pass null to return to provider-default Auto routing.</param>
     /// <param name="source">Origin to record on the effective `session.model_change` event. Defaults to `sdk` when omitted.</param>
@@ -45418,6 +51647,7 @@ public async Task<ModelSwitchAutoTierResult> SwitchAutoTierAsync(AutoTier? autoT
     /// <param name="policyHelperModel">Startup default model from the enterprise policy helper, when configured. Weakest of the managed sources: it applies only when neither device nor server policy names a model, and an explicit user selection still wins.</param>
     /// <param name="autoTier">Effective default Auto routing preference from user and managed settings. Applies only to fresh sessions and never replaces a per-session selection.</param>
     /// <param name="repoModel">Model selected by repository settings, when configured.</param>
+    /// <param name="repoModelProviderId">Provider owning the repository-selected model. Omitted repository provider identity retains legacy bare-model behavior.</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="repoAutoTier">Auto routing preference selected by repository settings, when configured. Applied only when the overlay selects the Auto model; beside a concrete model it stays dormant.</param>
@@ -45427,14 +51657,27 @@ public async Task<ModelSwitchAutoTierResult> SwitchAutoTierAsync(AutoTier? autoT
     /// <param name="managedContextTier">Context tier paired with the effective organization-managed model. Applies only when that concrete managed model is selected; it is ignored for Auto and for CLI, resume, or user overrides.</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? policyHelperModel = null, AutoTier? autoTier = null, string? repoModel = null, string? repoReasoningEffort = null, string? repoContextTier = null, string? repoAutoTier = null, string? cliModel = null, bool? deferredResume = null, string? managedReasoningEffort = null, string? managedContextTier = null, CancellationToken cancellationToken = default)
+    internal async Task<ModelSwitchToResult> ApplyStartupOverlayAsync(string? deviceManagedModel = null, string? serverManagedModel = null, string? policyHelperModel = null, AutoTier? autoTier = null, string? repoModel = null, string? repoModelProviderId = null, string? repoReasoningEffort = null, string? repoContextTier = null, string? repoAutoTier = null, string? cliModel = null, bool? deferredResume = null, string? managedReasoningEffort = null, string? managedContextTier = null, CancellationToken cancellationToken = default)
     {
         _session.ThrowIfDisposed();
 
-        var request = new ModelApplyStartupOverlayRequest { SessionId = _session.SessionId, DeviceManagedModel = deviceManagedModel, ServerManagedModel = serverManagedModel, PolicyHelperModel = policyHelperModel, AutoTier = autoTier, RepoModel = repoModel, RepoReasoningEffort = repoReasoningEffort, RepoContextTier = repoContextTier, RepoAutoTier = repoAutoTier, CliModel = cliModel, DeferredResume = deferredResume, ManagedReasoningEffort = managedReasoningEffort, ManagedContextTier = managedContextTier };
+        var request = new ModelApplyStartupOverlayRequest { SessionId = _session.SessionId, DeviceManagedModel = deviceManagedModel, ServerManagedModel = serverManagedModel, PolicyHelperModel = policyHelperModel, AutoTier = autoTier, RepoModel = repoModel, RepoModelProviderId = repoModelProviderId, RepoReasoningEffort = repoReasoningEffort, RepoContextTier = repoContextTier, RepoAutoTier = repoAutoTier, CliModel = cliModel, DeferredResume = deferredResume, ManagedReasoningEffort = managedReasoningEffort, ManagedContextTier = managedContextTier };
         return await CopilotClient.InvokeRpcAsync<ModelSwitchToResult>(_session.Rpc, "session.model.applyStartupOverlay", [request], cancellationToken);
     }
 
+    /// <summary>Clears an unchanged startup model/provider seed before default-model resolution. Never clears a resumed or user-selected model.</summary>
+    /// <param name="expectedModel">The expectedModel parameter.</param>
+    /// <param name="expectedProviderId">Provider captured with the startup seed; omission matches only an unqualified seed.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    internal async Task<SessionModelClearStartupSeedResult> ClearStartupSeedAsync(string expectedModel, string? expectedProviderId = null, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(expectedModel);
+        _session.ThrowIfDisposed();
+
+        var request = new SessionModelClearStartupSeedRequest { SessionId = _session.SessionId, ExpectedModel = expectedModel, ExpectedProviderId = expectedProviderId };
+        return await CopilotClient.InvokeRpcAsync<SessionModelClearStartupSeedResult>(_session.Rpc, "session.model.clearStartupSeed", [request], cancellationToken);
+    }
+
     /// <summary>Replaces or clears the host-supplied model allowlist for a running session.</summary>
     /// <param name="allowedModels">Exact model IDs to permit, or null to clear the host restriction.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
@@ -45460,6 +51703,19 @@ public async Task<ModelSetReasoningEffortResult> SetReasoningEffortAsync(string
         return await CopilotClient.InvokeRpcAsync<ModelSetReasoningEffortResult>(_session.Rpc, "session.model.setReasoningEffort", [request], cancellationToken);
     }
 
+    /// <summary>Computes whether the session's current model shows reasoning summaries and how a host should present them: the default Ctrl+T visibility, reasoning headers, the hidden-summaries hint, and whether a persisted `showReasoning` setting is redundant. The runtime folds in the session's model catalog, selection and reasoning-summaries experiment assignment; the host supplies only its own persisted setting and current visibility. This method reads the session's resolved model catalog rather than resolving it, so call `session.model.list` first on a session that has not listed models or run a turn; until then the result is `ready: false`. A session that resolves models without a Copilot catalog, that is a BYOK registry or an alternate provider, never caches one and stays `ready: false`.</summary>
+    /// <param name="persistedShowReasoning">The host's persisted `showReasoning` user setting, omitted when unset.</param>
+    /// <param name="summariesVisible">Whether the host is currently showing reasoning summaries. Defaults to false.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Reasoning-summaries presentation policy for the session's current model.</returns>
+    public async Task<ModelGetReasoningSummariesResult> GetReasoningSummariesAsync(bool? persistedShowReasoning = null, bool? summariesVisible = null, CancellationToken cancellationToken = default)
+    {
+        _session.ThrowIfDisposed();
+
+        var request = new ModelGetReasoningSummariesRequest { SessionId = _session.SessionId, PersistedShowReasoning = persistedShowReasoning, SummariesVisible = summariesVisible };
+        return await CopilotClient.InvokeRpcAsync<ModelGetReasoningSummariesResult>(_session.Rpc, "session.model.getReasoningSummaries", [request], cancellationToken);
+    }
+
     /// <summary>Lists models available to this session using its own auth and integration context. Connected hosts (CLI TUI, GitHub App) should call this through the session client so remote sessions return the remote CLI's available models rather than the caller's.</summary>
     /// <param name="request">Optional listing options.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
@@ -45501,6 +51757,7 @@ public async Task<SessionMode> GetAsync(CancellationToken cancellationToken = de
     /// <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="planModelProviderId">Provider owning planModel. Omit for legacy bare-model selection.</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>
@@ -45510,11 +51767,11 @@ public async Task<SessionMode> GetAsync(CancellationToken cancellationToken = de
     /// <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, SessionMode? expectedMode = null, 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)
+    public async Task<ModeSetResult> SetAsync(SessionMode mode, SessionMode? expectedMode = null, string? inheritPlanBaseFromSessionId = null, bool? planModelConfigured = null, string? planModel = null, string? planModelProviderId = 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, ExpectedMode = expectedMode, InheritPlanBaseFromSessionId = inheritPlanBaseFromSessionId, PlanModelConfigured = planModelConfigured, PlanModel = planModel, PlanReasoningEffort = planReasoningEffort, PlanContextTier = planContextTier, CompactionDecision = compactionDecision, RestorePlanModel = restorePlanModel, PersistPlanSelection = persistPlanSelection, PickerSettingsContext = pickerSettingsContext, PlanExitAction = planExitAction };
+        var request = new ModeSetRequest { SessionId = _session.SessionId, Mode = mode, ExpectedMode = expectedMode, InheritPlanBaseFromSessionId = inheritPlanBaseFromSessionId, PlanModelConfigured = planModelConfigured, PlanModel = planModel, PlanModelProviderId = planModelProviderId, 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);
     }
 }
@@ -45891,9 +52148,21 @@ public async Task<WorkspaceDiffResult> DiffAsync(WorkspaceDiffMode mode, bool? i
     {
         _session.ThrowIfDisposed();
 
-        var request = new WorkspacesDiffRequest { SessionId = _session.SessionId, Mode = mode, IgnoreWhitespace = ignoreWhitespace };
+        var request = new WorkspacesDiffRequestWithSession { SessionId = _session.SessionId, Mode = mode, IgnoreWhitespace = ignoreWhitespace };
         return await CopilotClient.InvokeRpcAsync<WorkspaceDiffResult>(_session.Rpc, "session.workspaces.diff", [request], cancellationToken);
     }
+
+    /// <summary>Computes a diff for the session workspace. Never rejects for a busy session: a `session`-mode diff that cannot read the session's file-change captures falls back to an unstaged git diff with `isFallback: true` and reports why in `unavailableReason`.</summary>
+    /// <param name="request">Parameters for computing a workspace diff.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Workspace diff result for the requested mode.</returns>
+    public async Task<WorkspaceDiffResult> DiffAsync(WorkspacesDiffRequest request, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(request);
+        _session.ThrowIfDisposed();
+        var wireRequest = new WorkspacesDiffRequestWithSession { SessionId = _session.SessionId, Mode = request.Mode, IgnoreWhitespace = request.IgnoreWhitespace, IncludeContents = request.IncludeContents };
+        return await CopilotClient.InvokeRpcAsync<WorkspaceDiffResult>(_session.Rpc, "session.workspaces.diff", [wireRequest], cancellationToken);
+    }
 }
 
 /// <summary>Provides session-scoped AutopilotObjective APIs.</summary>
@@ -46402,7 +52671,18 @@ internal McpApi(CopilotSession session)
         _session = session;
     }
 
-    /// <summary>Lists MCP servers configured for the session, their connection status, and host-level state. The host-level state (disabled/filtered servers, failed/needs-auth/pending connections, mcp3p policy, full config) is empty/zero when no MCP host has been initialized for the session.</summary>
+    /// <summary>Records the IDE the host is connected to, so the agent's system prompt can name it and its workspace folder. Null or an omitted `ide` clears the recorded value, which is how a host reports that it is disconnected; there is no separate clear method. Both `ideName` and `workspaceFolder` are required together, because half a state cannot be attributed to a project.</summary>
+    /// <param name="ide">The connected IDE. Null or omitted clears the recorded IDE, which is how a host reports that it is disconnected.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    internal async Task SetConnectedIdeInfoAsync(SessionConnectedIdeInfo? ide = null, CancellationToken cancellationToken = default)
+    {
+        _session.ThrowIfDisposed();
+
+        var request = new SessionMcpSetConnectedIdeInfoParams { SessionId = _session.SessionId, Ide = ide };
+        await CopilotClient.InvokeRpcAsync(_session.Rpc, "session.mcp.setConnectedIdeInfo", [request], cancellationToken);
+    }
+
+    /// <summary>Lists materialized MCP servers and their connection status. Cache misses may start and wait for MCP servers.</summary>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
     /// <returns>MCP servers configured for the session, with their connection status and host-level state.</returns>
     public async Task<McpServerList> ListAsync(CancellationToken cancellationToken = default)
@@ -46413,6 +52693,17 @@ public async Task<McpServerList> ListAsync(CancellationToken cancellationToken =
         return await CopilotClient.InvokeRpcAsync<McpServerList>(_session.Rpc, "session.mcp.list", [request], cancellationToken);
     }
 
+    /// <summary>Lists effective MCP configuration without starting, restarting, authenticating, or waiting for servers. An optional live observation is from an already materialized matching server; this is not a readiness guarantee.</summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Effective MCP configuration with optional live observations from matching already materialized servers.</returns>
+    public async Task<McpConfiguredServerList> ListConfiguredAsync(CancellationToken cancellationToken = default)
+    {
+        _session.ThrowIfDisposed();
+
+        var request = new SessionMcpListConfiguredRequest { SessionId = _session.SessionId };
+        return await CopilotClient.InvokeRpcAsync<McpConfiguredServerList>(_session.Rpc, "session.mcp.listConfigured", [request], cancellationToken);
+    }
+
     /// <summary>Lists the tools exposed by a connected MCP server on this session's host. This performs a live `tools/list` request. Tool UI metadata is returned independently of whether MCP Apps rendering is enabled for the session.</summary>
     /// <param name="serverName">Name of the connected MCP server whose tools to list.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
@@ -46513,15 +52804,13 @@ internal async Task<McpStartServersResult> ReloadWithConfigAsync(CancellationTok
     /// <param name="request">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.</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 sampling execution: success result, failure error, or cancellation.</returns>
-    public async Task<McpSamplingExecutionResult> ExecuteSamplingAsync(string requestId, string serverName, object mcpRequestId, McpExecuteSamplingRequest request, CancellationToken cancellationToken = default)
+    public async Task<McpSamplingExecutionResult> ExecuteSamplingAsync(string requestId, string serverName, object? mcpRequestId, object? request, CancellationToken cancellationToken = default)
     {
         ArgumentNullException.ThrowIfNull(requestId);
         ArgumentNullException.ThrowIfNull(serverName);
-        ArgumentNullException.ThrowIfNull(mcpRequestId);
-        ArgumentNullException.ThrowIfNull(request);
         _session.ThrowIfDisposed();
 
-        var rpcRequest = new McpExecuteSamplingParams { SessionId = _session.SessionId, RequestId = requestId, ServerName = serverName, McpRequestId = CopilotClient.ToJsonElementForWire(mcpRequestId)!.Value, Request = request };
+        var rpcRequest = new McpExecuteSamplingParams { SessionId = _session.SessionId, RequestId = requestId, ServerName = serverName, McpRequestId = CopilotClient.ToJsonElementForWire(mcpRequestId) ?? JsonElement.Parse("null"), Request = CopilotClient.ToJsonElementForWire(request) ?? JsonElement.Parse("null") };
         return await CopilotClient.InvokeRpcAsync<McpSamplingExecutionResult>(_session.Rpc, "session.mcp.executeSampling", [rpcRequest], cancellationToken);
     }
 
@@ -47435,6 +53724,18 @@ public async Task ReloadAsync(SessionPluginsReloadRequest? request = null, Cance
         await CopilotClient.InvokeRpcAsync(_session.Rpc, "session.plugins.reload", [rpcRequest], cancellationToken);
     }
 
+    /// <summary>Installs or updates the plugins the session's managed settings require now, without waiting for the next automatic attempt after a failure, then reloads plugins. Reports progress and failures with the same `session.info` and `session.warning` events as automatic preparation. Fails when the runtime does not prepare managed plugins for the session.</summary>
+    /// <param name="request">Plugins required by the session's managed settings to install or update again.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Per-plugin outcomes of retrying the plugins required by the session's managed settings.</returns>
+    public async Task<SessionPluginsRetryManagedResult> RetryManagedAsync(SessionPluginsRetryManagedRequest? request = null, CancellationToken cancellationToken = default)
+    {
+        _session.ThrowIfDisposed();
+
+        var rpcRequest = new SessionPluginsRetryManagedRequestWithSession { SessionId = _session.SessionId, Plugins = request?.Plugins };
+        return await CopilotClient.InvokeRpcAsync<SessionPluginsRetryManagedResult>(_session.Rpc, "session.plugins.retryManaged", [rpcRequest], cancellationToken);
+    }
+
     /// <summary>Marketplaces APIs.</summary>
     public PluginsMarketplacesApi Marketplaces =>
         field ??
@@ -47620,7 +53921,10 @@ internal OptionsApi(CopilotSession session)
     /// <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="skillDirectories">Explicit discovery-only skill roots, not filesystem grants. Available without enableConfigDiscovery, subject to skill/managed disables. Relative SDK paths resolve once when supplied against the request's effective workingDirectory; retained roots do not move on cwd changes. Null and omission are equivalent; [] clears only the explicit SDK contribution.</param>
+    /// <param name="agentDirectories">Explicit discovery-only agent roots, separate from customAgents and filesystem grants. Available without enableConfigDiscovery, subject to managed/source disables. Relative SDK paths resolve once when supplied against the request's effective workingDirectory; retained roots do not move on cwd changes. Null and omission are equivalent; [] clears only the explicit SDK contribution.</param>
+    /// <param name="instructionDirectories">Explicit discovery-only instruction roots using existing SDK instruction formats, not filesystem grants. Available without enableConfigDiscovery, subject to instruction/managed disables. Relative SDK paths resolve once when supplied against the request's effective workingDirectory; retained roots do not move on cwd changes. Null and omission are equivalent; [] clears only the explicit SDK contribution.</param>
+    /// <param name="hookDirectories">Explicit discovery-only file-hook roots, separate from callback hooks and filesystem grants. Available without enableConfigDiscovery or enableFileHooks, which controls repository-origin hooks only; hook/managed disables still apply. Relative SDK paths resolve once when supplied against the request's effective workingDirectory; retained roots do not move on cwd changes. Null and omission are equivalent; [] clears only the explicit SDK contribution.</param>
     /// <param name="ignoredSkillsLocations">Skill scan directories and descendants excluded from discovery. Supports `~`-relative paths.</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>
@@ -47647,19 +53951,19 @@ internal OptionsApi(CopilotSession session)
     /// <param name="sessionCapabilities">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.</param>
     /// <param name="skipEmbeddingRetrieval">Whether to skip embedding retrieval pipeline initialization and execution.</param>
     /// <param name="organizationCustomInstructions">Organization-level custom instructions to inject into the system prompt.</param>
-    /// <param name="enableFileHooks">Whether to enable loading of `.github/hooks/` filesystem hooks. Separate from the SDK callback hook mechanism.</param>
+    /// <param name="enableFileHooks">Whether to enable repository-origin file hooks from `.github/hooks/` and trusted repository-configured roots. Does not control explicit hookDirectories or SDK callback hooks.</param>
     /// <param name="enableHostGitOperations">Whether to enable host git operations (context resolution, child repo scanning, git info in system prompt).</param>
     /// <param name="enableSessionStore">Whether to enable cross-session store writes and reads.</param>
-    /// <param name="enableSkills">Whether skill loading is enabled. Explicit false disables every source, including a bound SDK provider; changing the value invalidates the loaded skill snapshot. When omitted, creation falls back to enableConfigDiscovery unless an SDK skill provider is registered.</param>
+    /// <param name="enableSkills">Whether skill loading is enabled. Explicit false disables every source, including explicit SDK roots and a bound SDK provider; changing the value invalidates the loaded skill snapshot. When omitted, creation falls back to enableConfigDiscovery unless explicit SDK skill roots or an SDK skill provider are supplied.</param>
     /// <param name="contextTier">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.</param>
     /// <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, SandboxConfigSource? sandboxConfigSource = null, bool? logInteractiveShells = null, OptionsUpdateEnvValueMode? envValueMode = null, bool? allowAllMcpServerInstructions = null, IList<string>? skillDirectories = null, IList<string>? ignoredSkillsLocations = 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)
+    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>? agentDirectories = null, IList<string>? instructionDirectories = null, IList<string>? hookDirectories = null, IList<string>? ignoredSkillsLocations = 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, SandboxConfigSource = sandboxConfigSource, LogInteractiveShells = logInteractiveShells, EnvValueMode = envValueMode, AllowAllMcpServerInstructions = allowAllMcpServerInstructions, SkillDirectories = skillDirectories, IgnoredSkillsLocations = ignoredSkillsLocations, 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 };
+        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, AgentDirectories = agentDirectories, InstructionDirectories = instructionDirectories, HookDirectories = hookDirectories, IgnoredSkillsLocations = ignoredSkillsLocations, 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);
     }
 }
@@ -47711,7 +54015,7 @@ public async Task<ExtensionList> ListAsync(CancellationToken cancellationToken =
         return await CopilotClient.InvokeRpcAsync<ExtensionList>(_session.Rpc, "session.extensions.list", [request], cancellationToken);
     }
 
-    /// <summary>Enables an extension for the session.</summary>
+    /// <summary>Enables an extension for the session and persists the preference when the session has a settings store. Hosts synchronizing effective membership should use extensions.reconcile instead.</summary>
     /// <param name="id">Source-qualified extension ID to enable.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
     public async Task EnableAsync(string id, CancellationToken cancellationToken = default)
@@ -47723,7 +54027,7 @@ public async Task EnableAsync(string id, CancellationToken cancellationToken = d
         await CopilotClient.InvokeRpcAsync(_session.Rpc, "session.extensions.enable", [request], cancellationToken);
     }
 
-    /// <summary>Disables an extension for the session.</summary>
+    /// <summary>Disables an extension for the session and persists the preference when the session has a settings store. Hosts synchronizing effective membership should use extensions.reconcile instead.</summary>
     /// <param name="id">Source-qualified extension ID to disable.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
     public async Task DisableAsync(string id, CancellationToken cancellationToken = default)
@@ -47745,6 +54049,17 @@ public async Task ReloadAsync(CancellationToken cancellationToken = default)
         await CopilotClient.InvokeRpcAsync(_session.Rpc, "session.extensions.reload", [request], cancellationToken);
     }
 
+    /// <summary>Host-only reconciliation of authoritative session-effective extension membership and enablement. Refreshes runtime-owned discovery and preferences without persisting settings, installing plugins, or restarting unchanged activations. Returns ExtensionList only after required starts and process/contribution cleanup settle. Takes no caller inventory or overrides. Missing controllers, unready/incomplete discovery, unavailable workspaces, superseded inputs, and lifecycle failures are errors, not empty membership. Independently proven revocations may be applied before an error; retry converges without restarting healthy activations. Error data contains lifecycleChangesApplied and code: extension_reconciliation_host_required, extension_reconciliation_unavailable, extension_reconciliation_not_ready, extension_reconciliation_discovery_failed, extension_reconciliation_workspace_unavailable, extension_reconciliation_superseded, or extension_reconciliation_lifecycle_failed. Mark host reconciliation state applied only on success. On older runtimes, method-not-found must not fall back to global discovery and persistent extension disables.</summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Extensions discovered for the session, with their current status.</returns>
+    public async Task<ExtensionList> ReconcileAsync(CancellationToken cancellationToken = default)
+    {
+        _session.ThrowIfDisposed();
+
+        var request = new SessionExtensionsReconcileRequest { SessionId = _session.SessionId };
+        return await CopilotClient.InvokeRpcAsync<ExtensionList>(_session.Rpc, "session.extensions.reconcile", [request], cancellationToken);
+    }
+
     /// <summary>Push attachments into the next user-message turn from an extension. The host should surface them as composer pills and forward them via the next session.send call. Callable only by extension-owned connections.</summary>
     /// <param name="attachments">Attachments to push into the next user-message turn. extension_context entries take the slim shape; standard variants take their full AttachmentSchema shape.</param>
     /// <param name="instanceId">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.</param>
@@ -47776,13 +54091,12 @@ internal ToolsApi(CopilotSession session)
     /// <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)
+    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 };
+        var request = new ToolsExecuteRequest { SessionId = _session.SessionId, Name = name, Arguments = CopilotClient.ToJsonElementForWire(arguments) ?? JsonElement.Parse("null"), ToolCallId = toolCallId };
         return await CopilotClient.InvokeRpcAsync<JsonElement>(_session.Rpc, "session.tools.execute", [request], cancellationToken);
     }
 
@@ -47809,13 +54123,12 @@ public async Task<ToolsGetBuiltinDescriptorsResult> GetBuiltinDescriptorsAsync(b
     /// <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)
+    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 };
+        var request = new ToolsTaskCompleteEventDataRequest { SessionId = _session.SessionId, ToolArgs = CopilotClient.ToJsonElementForWire(toolArgs) ?? JsonElement.Parse("null"), FinalResult = finalResult };
         return await CopilotClient.InvokeRpcAsync<TaskCompleteData>(_session.Rpc, "session.tools.taskCompleteEventData", [request], cancellationToken);
     }
 
@@ -47834,6 +54147,17 @@ public async Task<HandlePendingToolCallResult> HandlePendingToolCallAsync(string
         return await CopilotClient.InvokeRpcAsync<HandlePendingToolCallResult>(_session.Rpc, "session.tools.handlePendingToolCall", [request], cancellationToken);
     }
 
+    /// <summary>Lists the external tool calls of the session and its sub-agents that are still waiting for session.tools.handlePendingToolCall.</summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>External tool calls still waiting for a result.</returns>
+    public async Task<PendingExternalToolRequestList> ListPendingRequestsAsync(CancellationToken cancellationToken = default)
+    {
+        _session.ThrowIfDisposed();
+
+        var request = new ToolsListPendingRequestsRequest { SessionId = _session.SessionId };
+        return await CopilotClient.InvokeRpcAsync<PendingExternalToolRequestList>(_session.Rpc, "session.tools.listPendingRequests", [request], cancellationToken);
+    }
+
     /// <summary>Resolves, builds, and validates the runtime tool list 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>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.</returns>
@@ -47925,7 +54249,7 @@ public async Task<SlashCommandInvocationResult> InvokeAsync(string name, string?
     /// <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)
+    internal async Task<CommandsFinalizeInvocationEffectResult> FinalizeInvocationEffectAsync(IDictionary<string, JsonElement> effect, CommandsInvocationEffectOutcome outcome, CancellationToken cancellationToken = default)
     {
         ArgumentNullException.ThrowIfNull(effect);
         _session.ThrowIfDisposed();
@@ -48135,12 +54459,12 @@ internal async Task<UIHandlePendingResult> HandleHumanUserInputAsync(string requ
     /// <param name="response">Optional sampling result payload. Omit to reject/cancel the sampling request without providing a result.</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 pending UI request was resolved by this call.</returns>
-    public async Task<UIHandlePendingResult> HandlePendingSamplingAsync(string requestId, UIHandlePendingSamplingResponse? response = null, CancellationToken cancellationToken = default)
+    public async Task<UIHandlePendingResult> HandlePendingSamplingAsync(string requestId, object? response = null, CancellationToken cancellationToken = default)
     {
         ArgumentNullException.ThrowIfNull(requestId);
         _session.ThrowIfDisposed();
 
-        var request = new UIHandlePendingSamplingRequest { SessionId = _session.SessionId, RequestId = requestId, Response = response };
+        var request = new UIHandlePendingSamplingRequest { SessionId = _session.SessionId, RequestId = requestId, Response = CopilotClient.ToJsonElementForWire(response) };
         return await CopilotClient.InvokeRpcAsync<UIHandlePendingResult>(_session.Rpc, "session.ui.handlePendingSampling", [request], cancellationToken);
     }
 
@@ -48658,16 +54982,17 @@ public async Task<SessionActivity> ActivityAsync(CancellationToken cancellationT
     }
 
     /// <summary>Returns the token breakdown for the session's current context window for a given model.</summary>
-    /// <param name="promptTokenLimit">Maximum prompt tokens allowed by the target model. Pass 0 to use the runtime default.</param>
-    /// <param name="outputTokenLimit">Maximum output tokens allowed by the target model. Pass 0 if unknown.</param>
+    /// <param name="promptTokenLimit">Advertised prompt allowance. Pass 0 to resolve the selected model and context tier from the session.</param>
+    /// <param name="outputTokenLimit">Requested output allowance to reserve against the combined context ceiling. Pass 0 to resolve the session's request cap, falling back to the model's advertised output limit.</param>
     /// <param name="selectedModel">Model identifier used for tokenization. Omit to use the session default. Used both for token counting and to compute display values.</param>
+    /// <param name="providerId">Provider owning selectedModel. Omit to use the current provider for the current model, or deterministic legacy lookup for a different model.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
     /// <returns>Token breakdown for the session's current context window, or null if uninitialized.</returns>
-    public async Task<MetadataContextInfoResult> ContextInfoAsync(long promptTokenLimit, long outputTokenLimit, string? selectedModel = null, CancellationToken cancellationToken = default)
+    public async Task<MetadataContextInfoResult> ContextInfoAsync(long promptTokenLimit, long outputTokenLimit, string? selectedModel = null, string? providerId = null, CancellationToken cancellationToken = default)
     {
         _session.ThrowIfDisposed();
 
-        var request = new MetadataContextInfoRequest { SessionId = _session.SessionId, PromptTokenLimit = promptTokenLimit, OutputTokenLimit = outputTokenLimit, SelectedModel = selectedModel };
+        var request = new MetadataContextInfoRequest { SessionId = _session.SessionId, PromptTokenLimit = promptTokenLimit, OutputTokenLimit = outputTokenLimit, SelectedModel = selectedModel, ProviderId = providerId };
         return await CopilotClient.InvokeRpcAsync<MetadataContextInfoResult>(_session.Rpc, "session.metadata.contextInfo", [request], cancellationToken);
     }
 
@@ -49221,12 +55546,11 @@ public async Task ClearAsync(CancellationToken cancellationToken = default)
     /// <param name="filter">Opaque runtime-owned filter object.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
     /// <returns>Indicates whether a user-facing pending item was removed.</returns>
-    internal async Task<QueueRemoveMostRecentResult> ConsumeSystemNotificationsAsync(object filter, CancellationToken cancellationToken = default)
+    internal async Task<QueueRemoveMostRecentResult> ConsumeSystemNotificationsAsync(object? filter, CancellationToken cancellationToken = default)
     {
-        ArgumentNullException.ThrowIfNull(filter);
         _session.ThrowIfDisposed();
 
-        var request = new QueueConsumeSystemNotificationsRequest { SessionId = _session.SessionId, Filter = CopilotClient.ToJsonElementForWire(filter)!.Value };
+        var request = new QueueConsumeSystemNotificationsRequest { SessionId = _session.SessionId, Filter = CopilotClient.ToJsonElementForWire(filter) ?? JsonElement.Parse("null") };
         return await CopilotClient.InvokeRpcAsync<QueueRemoveMostRecentResult>(_session.Rpc, "session.queue.consumeSystemNotifications", [request], cancellationToken);
     }
 
@@ -49341,6 +55665,64 @@ public async Task<UsageGetMetricsResult> GetMetricsAsync(CancellationToken cance
         var request = new SessionUsageGetMetricsRequest { SessionId = _session.SessionId };
         return await CopilotClient.InvokeRpcAsync<UsageGetMetricsResult>(_session.Rpc, "session.usage.getMetrics", [request], cancellationToken);
     }
+
+    /// <summary>Internal host-only replacement of absolute code-change totals reported by a relay host.</summary>
+    /// <param name="linesAdded">Absolute added-line total, replacing the previous reading.</param>
+    /// <param name="linesRemoved">Absolute removed-line total, replacing the previous reading.</param>
+    /// <param name="filesCount">Absolute changed-file count; omission preserves the previous count.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    internal async Task SetCodeChangesAsync(double linesAdded, double linesRemoved, double? filesCount = null, CancellationToken cancellationToken = default)
+    {
+        _session.ThrowIfDisposed();
+
+        var request = new SessionUsageSetCodeChangesRequest { SessionId = _session.SessionId, LinesAdded = linesAdded, LinesRemoved = linesRemoved, FilesCount = filesCount };
+        await CopilotClient.InvokeRpcAsync(_session.Rpc, "session.usage.setCodeChanges", [request], cancellationToken);
+    }
+}
+
+/// <summary>Provides session-scoped Quota APIs.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed class QuotaApi
+{
+    private readonly CopilotSession _session;
+
+    internal QuotaApi(CopilotSession session)
+    {
+        _session = session;
+    }
+
+    /// <summary>Gets the session's current quota and account projection without making a network request.</summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>The incumbent session-owned quota and account projection.</returns>
+    public async Task<SessionQuotaGetResult> GetAsync(CancellationToken cancellationToken = default)
+    {
+        _session.ThrowIfDisposed();
+
+        var request = new SessionQuotaGetRequest { SessionId = _session.SessionId };
+        return await CopilotClient.InvokeRpcAsync<SessionQuotaGetResult>(_session.Rpc, "session.quota.get", [request], cancellationToken);
+    }
+
+    /// <summary>Refreshes the session's provider model catalog bypassing its cache, folds quota snapshots into session state, and returns the updated projection. Failures leave the last known quota intact.</summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>The incumbent session-owned quota and account projection.</returns>
+    public async Task<SessionQuotaRefreshResult> RefreshAsync(CancellationToken cancellationToken = default)
+    {
+        _session.ThrowIfDisposed();
+
+        var request = new SessionQuotaRefreshRequest { SessionId = _session.SessionId };
+        return await CopilotClient.InvokeRpcAsync<SessionQuotaRefreshResult>(_session.Rpc, "session.quota.refresh", [request], cancellationToken);
+    }
+
+    /// <summary>Returns and clears the session's pending quota warnings. Reading or refreshing quota does not drain warnings.</summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Pending warnings returned and cleared by session.quota.takeWarnings.</returns>
+    public async Task<IList<QuotaWarningProjection>> TakeWarningsAsync(CancellationToken cancellationToken = default)
+    {
+        _session.ThrowIfDisposed();
+
+        var request = new SessionQuotaTakeWarningsRequest { SessionId = _session.SessionId };
+        return await CopilotClient.InvokeRpcAsync<IList<QuotaWarningProjection>>(_session.Rpc, "session.quota.takeWarnings", [request], cancellationToken);
+    }
 }
 
 /// <summary>Provides session-scoped LimitPrediction APIs.</summary>
@@ -50042,6 +56424,7 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(GitHub.Copilot.AgentInterruptedData), TypeInfoPropertyName = "SessionEventsAgentInterruptedData")]
 [JsonSerializable(typeof(GitHub.Copilot.AgentInterruptedEvent), TypeInfoPropertyName = "SessionEventsAgentInterruptedEvent")]
 [JsonSerializable(typeof(GitHub.Copilot.AgentModelPolicy), TypeInfoPropertyName = "SessionEventsAgentModelPolicy")]
+[JsonSerializable(typeof(GitHub.Copilot.AiCreditsStatus), TypeInfoPropertyName = "SessionEventsAiCreditsStatus")]
 [JsonSerializable(typeof(GitHub.Copilot.AssistantFusionPhaseActivityEvent), TypeInfoPropertyName = "SessionEventsAssistantFusionPhaseActivityEvent")]
 [JsonSerializable(typeof(GitHub.Copilot.AssistantFusionPhaseCompletedEvent), TypeInfoPropertyName = "SessionEventsAssistantFusionPhaseCompletedEvent")]
 [JsonSerializable(typeof(GitHub.Copilot.AssistantFusionPhaseFailedEvent), TypeInfoPropertyName = "SessionEventsAssistantFusionPhaseFailedEvent")]
@@ -50211,6 +56594,8 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(GitHub.Copilot.IndexedSearchIncrementalPhase), TypeInfoPropertyName = "SessionEventsIndexedSearchIncrementalPhase")]
 [JsonSerializable(typeof(GitHub.Copilot.IndexedSearchOutcome), TypeInfoPropertyName = "SessionEventsIndexedSearchOutcome")]
 [JsonSerializable(typeof(GitHub.Copilot.IndexedSearchState), TypeInfoPropertyName = "SessionEventsIndexedSearchState")]
+[JsonSerializable(typeof(GitHub.Copilot.ManagedPermissionsContext), TypeInfoPropertyName = "SessionEventsManagedPermissionsContext")]
+[JsonSerializable(typeof(GitHub.Copilot.ManagedPluginProgressPhase), TypeInfoPropertyName = "SessionEventsManagedPluginProgressPhase")]
 [JsonSerializable(typeof(GitHub.Copilot.ManagedSettingsEnforcedAction), TypeInfoPropertyName = "SessionEventsManagedSettingsEnforcedAction")]
 [JsonSerializable(typeof(GitHub.Copilot.ManagedSettingsEnforcedEscalation), TypeInfoPropertyName = "SessionEventsManagedSettingsEnforcedEscalation")]
 [JsonSerializable(typeof(GitHub.Copilot.ManagedSettingsResolvedSource), TypeInfoPropertyName = "SessionEventsManagedSettingsResolvedSource")]
@@ -50255,10 +56640,15 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [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.ModelCallRequestBodyEncoding), TypeInfoPropertyName = "SessionEventsModelCallRequestBodyEncoding")]
 [JsonSerializable(typeof(GitHub.Copilot.ModelCallStartData), TypeInfoPropertyName = "SessionEventsModelCallStartData")]
 [JsonSerializable(typeof(GitHub.Copilot.ModelCallStartEvent), TypeInfoPropertyName = "SessionEventsModelCallStartEvent")]
+[JsonSerializable(typeof(GitHub.Copilot.ModelCallWebSocketFallbackErrorKind), TypeInfoPropertyName = "SessionEventsModelCallWebSocketFallbackErrorKind")]
+[JsonSerializable(typeof(GitHub.Copilot.ModelCallWebSocketFallbackReason), TypeInfoPropertyName = "SessionEventsModelCallWebSocketFallbackReason")]
 [JsonSerializable(typeof(GitHub.Copilot.ModelChangeSource), TypeInfoPropertyName = "SessionEventsModelChangeSource")]
 [JsonSerializable(typeof(GitHub.Copilot.ModelDeselectedReason), TypeInfoPropertyName = "SessionEventsModelDeselectedReason")]
+[JsonSerializable(typeof(GitHub.Copilot.ModelProviderKind), TypeInfoPropertyName = "SessionEventsModelProviderKind")]
+[JsonSerializable(typeof(GitHub.Copilot.ModelProviderRef), TypeInfoPropertyName = "SessionEventsModelProviderRef")]
 [JsonSerializable(typeof(GitHub.Copilot.OmittedBinaryOmittedReason), TypeInfoPropertyName = "SessionEventsOmittedBinaryOmittedReason")]
 [JsonSerializable(typeof(GitHub.Copilot.OmittedBinaryResult), TypeInfoPropertyName = "SessionEventsOmittedBinaryResult")]
 [JsonSerializable(typeof(GitHub.Copilot.OmittedBinaryType), TypeInfoPropertyName = "SessionEventsOmittedBinaryType")]
@@ -50332,12 +56722,25 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(GitHub.Copilot.PermissionRule), TypeInfoPropertyName = "SessionEventsPermissionRule")]
 [JsonSerializable(typeof(GitHub.Copilot.PermissionSandboxPathGrant), TypeInfoPropertyName = "SessionEventsPermissionSandboxPathGrant")]
 [JsonSerializable(typeof(GitHub.Copilot.PermissionSandboxPathGrantAccess), TypeInfoPropertyName = "SessionEventsPermissionSandboxPathGrantAccess")]
+[JsonSerializable(typeof(GitHub.Copilot.PermissionWriteFileContent), TypeInfoPropertyName = "SessionEventsPermissionWriteFileContent")]
+[JsonSerializable(typeof(GitHub.Copilot.PermissionWriteFileEdit), TypeInfoPropertyName = "SessionEventsPermissionWriteFileEdit")]
 [JsonSerializable(typeof(GitHub.Copilot.PersistedBinaryImage), TypeInfoPropertyName = "SessionEventsPersistedBinaryImage")]
 [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.ProviderMonthlyUsage), TypeInfoPropertyName = "SessionEventsProviderMonthlyUsage")]
+[JsonSerializable(typeof(GitHub.Copilot.ProviderMonthlyUsageScope), TypeInfoPropertyName = "SessionEventsProviderMonthlyUsageScope")]
+[JsonSerializable(typeof(GitHub.Copilot.ProviderMonthlyUsageState), TypeInfoPropertyName = "SessionEventsProviderMonthlyUsageState")]
+[JsonSerializable(typeof(GitHub.Copilot.ProviderQuotaAccessState), TypeInfoPropertyName = "SessionEventsProviderQuotaAccessState")]
+[JsonSerializable(typeof(GitHub.Copilot.ProviderQuotaAcquisitionStatus), TypeInfoPropertyName = "SessionEventsProviderQuotaAcquisitionStatus")]
+[JsonSerializable(typeof(GitHub.Copilot.ProviderQuotaBudgetMetadata), TypeInfoPropertyName = "SessionEventsProviderQuotaBudgetMetadata")]
+[JsonSerializable(typeof(GitHub.Copilot.ProviderQuotaCapacityState), TypeInfoPropertyName = "SessionEventsProviderQuotaCapacityState")]
+[JsonSerializable(typeof(GitHub.Copilot.ProviderQuotaObservationKind), TypeInfoPropertyName = "SessionEventsProviderQuotaObservationKind")]
+[JsonSerializable(typeof(GitHub.Copilot.ProviderQuotaQuantityKind), TypeInfoPropertyName = "SessionEventsProviderQuotaQuantityKind")]
+[JsonSerializable(typeof(GitHub.Copilot.ProviderQuotaState), TypeInfoPropertyName = "SessionEventsProviderQuotaState")]
+[JsonSerializable(typeof(GitHub.Copilot.ProviderQuotaUnit), TypeInfoPropertyName = "SessionEventsProviderQuotaUnit")]
 [JsonSerializable(typeof(GitHub.Copilot.ReasoningSummary), TypeInfoPropertyName = "SessionEventsReasoningSummary")]
 [JsonSerializable(typeof(GitHub.Copilot.RecommendedAutoTier), TypeInfoPropertyName = "SessionEventsRecommendedAutoTier")]
 [JsonSerializable(typeof(GitHub.Copilot.RemediationAction), TypeInfoPropertyName = "SessionEventsRemediationAction")]
@@ -50476,6 +56879,16 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [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.UsageAccountingIdentity), TypeInfoPropertyName = "SessionEventsUsageAccountingIdentity")]
+[JsonSerializable(typeof(GitHub.Copilot.UsageGetMetricsResult), TypeInfoPropertyName = "SessionEventsUsageGetMetricsResult")]
+[JsonSerializable(typeof(GitHub.Copilot.UsageMetricsAgentMetric), TypeInfoPropertyName = "SessionEventsUsageMetricsAgentMetric")]
+[JsonSerializable(typeof(GitHub.Copilot.UsageMetricsCodeChanges), TypeInfoPropertyName = "SessionEventsUsageMetricsCodeChanges")]
+[JsonSerializable(typeof(GitHub.Copilot.UsageMetricsModelMetric), TypeInfoPropertyName = "SessionEventsUsageMetricsModelMetric")]
+[JsonSerializable(typeof(GitHub.Copilot.UsageMetricsModelMetricRequests), TypeInfoPropertyName = "SessionEventsUsageMetricsModelMetricRequests")]
+[JsonSerializable(typeof(GitHub.Copilot.UsageMetricsModelMetricTokenDetail), TypeInfoPropertyName = "SessionEventsUsageMetricsModelMetricTokenDetail")]
+[JsonSerializable(typeof(GitHub.Copilot.UsageMetricsModelMetricUsage), TypeInfoPropertyName = "SessionEventsUsageMetricsModelMetricUsage")]
+[JsonSerializable(typeof(GitHub.Copilot.UsageMetricsProviderModelMetric), TypeInfoPropertyName = "SessionEventsUsageMetricsProviderModelMetric")]
+[JsonSerializable(typeof(GitHub.Copilot.UsageMetricsTokenDetail), TypeInfoPropertyName = "SessionEventsUsageMetricsTokenDetail")]
 [JsonSerializable(typeof(GitHub.Copilot.UserInputCompletedData), TypeInfoPropertyName = "SessionEventsUserInputCompletedData")]
 [JsonSerializable(typeof(GitHub.Copilot.UserInputCompletedEvent), TypeInfoPropertyName = "SessionEventsUserInputCompletedEvent")]
 [JsonSerializable(typeof(GitHub.Copilot.UserInputRequestedData), TypeInfoPropertyName = "SessionEventsUserInputRequestedData")]
@@ -50511,9 +56924,16 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(AbortRequest))]
 [JsonSerializable(typeof(AbortResult))]
 [JsonSerializable(typeof(AccountAllUsers))]
+[JsonSerializable(typeof(AccountDescribeAuthInfoRequest))]
+[JsonSerializable(typeof(AccountDescribeAuthInfoResult))]
 [JsonSerializable(typeof(AccountGetCurrentAuthResult))]
+[JsonSerializable(typeof(AccountGetGistSupportRequest))]
+[JsonSerializable(typeof(AccountGetGistSupportResult))]
 [JsonSerializable(typeof(AccountGetQuotaRequest))]
 [JsonSerializable(typeof(AccountGetQuotaResult))]
+[JsonSerializable(typeof(AccountGetTokenEnvVarResult))]
+[JsonSerializable(typeof(AccountGetWebUrlRequest))]
+[JsonSerializable(typeof(AccountGetWebUrlResult))]
 [JsonSerializable(typeof(AccountLoginRequest))]
 [JsonSerializable(typeof(AccountLoginResult))]
 [JsonSerializable(typeof(AccountLogoutRequest))]
@@ -50536,13 +56956,23 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(AgentSelectRequest))]
 [JsonSerializable(typeof(AgentSelectResult))]
 [JsonSerializable(typeof(AgentSetPromptRequest))]
+[JsonSerializable(typeof(AgentsCustomAgentInitialModelDecisionParams))]
+[JsonSerializable(typeof(AgentsCustomAgentInitialModelDecisionResult))]
 [JsonSerializable(typeof(AgentsDiscoverRequest))]
+[JsonSerializable(typeof(AgentsGetAvailableBuiltinsRequest))]
+[JsonSerializable(typeof(AgentsGetAvailableBuiltinsResult))]
+[JsonSerializable(typeof(AgentsGetBuiltinDefinitionRequest))]
+[JsonSerializable(typeof(AgentsGetBuiltinDefinitionResult))]
+[JsonSerializable(typeof(AgentsGetBuiltinListingDefinitionRequest))]
+[JsonSerializable(typeof(AgentsGetBuiltinListingDefinitionResult))]
+[JsonSerializable(typeof(AgentsGetBuiltinsResult))]
 [JsonSerializable(typeof(AgentsGetDiscoveryPathsRequest))]
 [JsonSerializable(typeof(AuthEnumerateQuery))]
 [JsonSerializable(typeof(AuthEnumerateValue))]
 [JsonSerializable(typeof(AuthIdentity))]
 [JsonSerializable(typeof(AuthIdentityMetadata))]
 [JsonSerializable(typeof(AuthInfo))]
+[JsonSerializable(typeof(AuthLoginAccount))]
 [JsonSerializable(typeof(AuthLoginAdvanceRequest))]
 [JsonSerializable(typeof(AuthLoginBeginRequest))]
 [JsonSerializable(typeof(AuthLoginBegun))]
@@ -50555,11 +56985,15 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(AuthValidationError))]
 [JsonSerializable(typeof(AuthWrite))]
 [JsonSerializable(typeof(AuthWriteResult))]
+[JsonSerializable(typeof(AutoTierDescriptor))]
+[JsonSerializable(typeof(AutoTierMetadata))]
+[JsonSerializable(typeof(AutoTierStatus))]
 [JsonSerializable(typeof(AutopilotObjectiveCreditLimit))]
 [JsonSerializable(typeof(AutopilotObjectiveGetStateResult))]
 [JsonSerializable(typeof(AutopilotObjectiveState))]
 [JsonSerializable(typeof(BuiltInModelCatalog))]
 [JsonSerializable(typeof(BuiltInModelCatalogEntry))]
+[JsonSerializable(typeof(BuiltinAgentSummary))]
 [JsonSerializable(typeof(BuiltinToolDescriptor))]
 [JsonSerializable(typeof(BuiltinToolFormat))]
 [JsonSerializable(typeof(BuiltinToolInputSchema))]
@@ -50602,7 +57036,6 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(ClientTaskCancelResult))]
 [JsonSerializable(typeof(CommandList))]
 [JsonSerializable(typeof(CommandsFinalizeInvocationEffectRequest))]
-[JsonSerializable(typeof(CommandsFinalizeInvocationEffectRequestEffect))]
 [JsonSerializable(typeof(CommandsFinalizeInvocationEffectResult))]
 [JsonSerializable(typeof(CommandsHandlePendingCommandRequest))]
 [JsonSerializable(typeof(CommandsHandlePendingCommandResult))]
@@ -50628,6 +57061,13 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(ConnectorConnectResult))]
 [JsonSerializable(typeof(ConnectorContinueRequest))]
 [JsonSerializable(typeof(ConnectorDisconnectResult))]
+[JsonSerializable(typeof(ConnectorDiscoveryAccount))]
+[JsonSerializable(typeof(ConnectorDiscoveryAccountList))]
+[JsonSerializable(typeof(ConnectorDiscoveryAccountRequest))]
+[JsonSerializable(typeof(ConnectorDiscoveryAuthInfo))]
+[JsonSerializable(typeof(ConnectorDiscoveryCapabilities))]
+[JsonSerializable(typeof(ConnectorDiscoveryCatalogEntry))]
+[JsonSerializable(typeof(ConnectorDiscoveryCatalogResult))]
 [JsonSerializable(typeof(ConnectorReconcileRequest))]
 [JsonSerializable(typeof(ConnectorReconcileRequestWithSession))]
 [JsonSerializable(typeof(ConnectorRuntimeStatus))]
@@ -50697,17 +57137,40 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(ExternalToolTextResultForLlmBinaryResultsForLlm))]
 [JsonSerializable(typeof(ExternalToolTextResultForLlmContent))]
 [JsonSerializable(typeof(ExternalToolTextResultForLlmContentResourceLinkIcon))]
+[JsonSerializable(typeof(FeatureFlagMetadata))]
+[JsonSerializable(typeof(FeatureFlagsMetadataResult))]
+[JsonSerializable(typeof(FeatureFlagsResolveRequest))]
+[JsonSerializable(typeof(FeatureFlagsResolveStartupGatesRequest))]
 [JsonSerializable(typeof(FleetStartRequest))]
 [JsonSerializable(typeof(FleetStartResult))]
 [JsonSerializable(typeof(FolderTrustAddParams))]
 [JsonSerializable(typeof(FolderTrustCheckParams))]
 [JsonSerializable(typeof(FolderTrustCheckResult))]
+[JsonSerializable(typeof(FolderTrustIsTrustedParams))]
+[JsonSerializable(typeof(ForceLoginOrgsDecision))]
+[JsonSerializable(typeof(GitCurrentBranchRemoteResult))]
+[JsonSerializable(typeof(GitCwdRequest))]
 [JsonSerializable(typeof(GitHubEnvironment))]
+[JsonSerializable(typeof(GitHubOwnerOption))]
+[JsonSerializable(typeof(GitHubOwnersCancelRequest))]
+[JsonSerializable(typeof(GitHubOwnersCancelResult))]
+[JsonSerializable(typeof(GitHubOwnersListRequest))]
+[JsonSerializable(typeof(GitHubOwnersListResult))]
+[JsonSerializable(typeof(GitHubOwnersRequestIdResult))]
+[JsonSerializable(typeof(GitHubRepositoryAtPathRequest))]
+[JsonSerializable(typeof(GitHubRepositoryAtPathResult))]
+[JsonSerializable(typeof(GitHubRepositoryIdentity))]
 [JsonSerializable(typeof(GitHubTelemetryClientInfo))]
 [JsonSerializable(typeof(GitHubTelemetryEvent))]
 [JsonSerializable(typeof(GitHubTelemetryNotification))]
 [JsonSerializable(typeof(GitHubTokenAcquireRequest))]
 [JsonSerializable(typeof(GitHubTokenAcquireResult))]
+[JsonSerializable(typeof(GitRemoteRepository))]
+[JsonSerializable(typeof(GitReposFromRemotesRequest))]
+[JsonSerializable(typeof(GitReposFromRemotesResult))]
+[JsonSerializable(typeof(GlobalStateLoadForConfigDirRequest))]
+[JsonSerializable(typeof(GlobalStateLoadResult))]
+[JsonSerializable(typeof(GlobalStateWriteKeyRequest))]
 [JsonSerializable(typeof(HandlePendingToolCallRequest))]
 [JsonSerializable(typeof(HandlePendingToolCallResult))]
 [JsonSerializable(typeof(HistoryAbortManualCompactionResult))]
@@ -50737,6 +57200,8 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(HostGetConfigurationResult))]
 [JsonSerializable(typeof(HostGetEnvironmentCredentialsResult))]
 [JsonSerializable(typeof(HostGitHubEnvironmentOptions))]
+[JsonSerializable(typeof(HostListSessionsRequest))]
+[JsonSerializable(typeof(HostListSessionsResult))]
 [JsonSerializable(typeof(HostLocalServerConfiguration))]
 [JsonSerializable(typeof(HostLocalServerOptions))]
 [JsonSerializable(typeof(HostPublishSessionRequest))]
@@ -50745,12 +57210,15 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(HostReadyResult))]
 [JsonSerializable(typeof(HostReleaseSessionRequest))]
 [JsonSerializable(typeof(HostReleaseSessionResult))]
+[JsonSerializable(typeof(HostSessionSummary))]
 [JsonSerializable(typeof(HostStartRequest))]
 [JsonSerializable(typeof(HostStartResult))]
 [JsonSerializable(typeof(IDictionary<string, JsonElement>))]
+[JsonSerializable(typeof(IDictionary<string, bool>))]
 [JsonSerializable(typeof(IDictionary<string, string>))]
 [JsonSerializable(typeof(IList<AccountAllUsers>))]
 [JsonSerializable(typeof(IList<AuthValidationError>))]
+[JsonSerializable(typeof(IList<QuotaWarningProjection>))]
 [JsonSerializable(typeof(IList<SessionAuthStatus>))]
 [JsonSerializable(typeof(IList<SessionsClientMetadataEntry>))]
 [JsonSerializable(typeof(InstallationCatalogueIdentity))]
@@ -50762,9 +57230,11 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(InstructionDiscoveryPath))]
 [JsonSerializable(typeof(InstructionDiscoveryPathList))]
 [JsonSerializable(typeof(InstructionSource))]
+[JsonSerializable(typeof(InstructionsDiscoverRepoSourcesRequest))]
 [JsonSerializable(typeof(InstructionsDiscoverRequest))]
 [JsonSerializable(typeof(InstructionsGetDiscoveryPathsRequest))]
 [JsonSerializable(typeof(InstructionsGetSourcesResult))]
+[JsonSerializable(typeof(InstructionsInitPromptResult))]
 [JsonSerializable(typeof(InterruptMainTurnRequest))]
 [JsonSerializable(typeof(InterruptMainTurnResult))]
 [JsonSerializable(typeof(JsonSchemaResponseFormat))]
@@ -50779,20 +57249,45 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(LlmInferenceHttpResponseStartResult))]
 [JsonSerializable(typeof(LlmInferenceSetProviderResult))]
 [JsonSerializable(typeof(LocalSessionMetadataValue))]
+[JsonSerializable(typeof(LocationPermissionsCleanupResult))]
 [JsonSerializable(typeof(LogRequest))]
 [JsonSerializable(typeof(LogResult))]
+[JsonSerializable(typeof(LoggedInUser))]
 [JsonSerializable(typeof(LspInitializeRequest))]
+[JsonSerializable(typeof(ManagedPermissionEvaluation))]
+[JsonSerializable(typeof(ManagedPermissionOperation))]
+[JsonSerializable(typeof(ManagedPluginRetryEntry))]
 [JsonSerializable(typeof(ManagedSettingMeta))]
+[JsonSerializable(typeof(ManagedSettingsApplyControlsParams))]
+[JsonSerializable(typeof(ManagedSettingsApplyControlsResult))]
 [JsonSerializable(typeof(ManagedSettingsComposeLayer))]
 [JsonSerializable(typeof(ManagedSettingsComposeRequest))]
 [JsonSerializable(typeof(ManagedSettingsComposeResult))]
 [JsonSerializable(typeof(ManagedSettingsDiagnostic))]
+[JsonSerializable(typeof(ManagedSettingsIngestParams))]
+[JsonSerializable(typeof(ManagedSettingsIngestResult))]
 [JsonSerializable(typeof(ManagedSettingsLayer))]
+[JsonSerializable(typeof(ManagedSettingsLoadRemoteControlParams))]
+[JsonSerializable(typeof(ManagedSettingsLoadRemoteControlResult))]
+[JsonSerializable(typeof(ManagedSettingsLogMessage))]
 [JsonSerializable(typeof(ManagedSettingsMeta))]
+[JsonSerializable(typeof(ManagedSettingsParseClientValueParams))]
+[JsonSerializable(typeof(ManagedSettingsParseClientValueResult))]
+[JsonSerializable(typeof(ManagedSettingsPermissionsEvaluateRequest))]
+[JsonSerializable(typeof(ManagedSettingsPermissionsEvaluateResult))]
+[JsonSerializable(typeof(ManagedSettingsReadDeviceResult))]
 [JsonSerializable(typeof(ManagedSettingsReadResult))]
+[JsonSerializable(typeof(ManagedSettingsResolveBypassDisableTransitionParams))]
+[JsonSerializable(typeof(ManagedSettingsResolveBypassDisableTransitionResult))]
+[JsonSerializable(typeof(ManagedSettingsResolveDeviceForceLoginOrgsGateParams))]
+[JsonSerializable(typeof(ManagedSettingsResolveEffectiveValueParams))]
+[JsonSerializable(typeof(ManagedSettingsResolveEffectiveValueResult))]
 [JsonSerializable(typeof(ManagedSettingsResolveRequest))]
 [JsonSerializable(typeof(ManagedSettingsResolveResult))]
+[JsonSerializable(typeof(ManagedSettingsResolveStartupPolicyParams))]
+[JsonSerializable(typeof(ManagedSettingsResolveStartupPolicyResult))]
 [JsonSerializable(typeof(ManagedSettingsResolvedData))]
+[JsonSerializable(typeof(ManagedSettingsRetainPolicyParams))]
 [JsonSerializable(typeof(ManagedSettingsSchemaResult))]
 [JsonSerializable(typeof(ManagedSettingsValidateRequest))]
 [JsonSerializable(typeof(ManagedSettingsValidateResult))]
@@ -50832,6 +57327,9 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(McpConfigUpdateRequest))]
 [JsonSerializable(typeof(McpConfigureGitHubRequest))]
 [JsonSerializable(typeof(McpConfigureGitHubResult))]
+[JsonSerializable(typeof(McpConfiguredServer))]
+[JsonSerializable(typeof(McpConfiguredServerList))]
+[JsonSerializable(typeof(McpConfiguredServerState))]
 [JsonSerializable(typeof(McpDiagnosticDetails))]
 [JsonSerializable(typeof(McpDiagnosticSourceConfiguration))]
 [JsonSerializable(typeof(McpDisableRequest))]
@@ -50841,8 +57339,6 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(McpEnableRequest))]
 [JsonSerializable(typeof(McpEnableRequestWithSession))]
 [JsonSerializable(typeof(McpExecuteSamplingParams))]
-[JsonSerializable(typeof(McpExecuteSamplingRequest))]
-[JsonSerializable(typeof(McpExecuteSamplingResult))]
 [JsonSerializable(typeof(McpFailedServer))]
 [JsonSerializable(typeof(McpFilteredServer))]
 [JsonSerializable(typeof(McpHeadersHandlePendingHeadersRefreshRequest))]
@@ -50864,6 +57360,7 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(McpInstallationsRequest))]
 [JsonSerializable(typeof(McpIsServerRunningRequest))]
 [JsonSerializable(typeof(McpIsServerRunningResult))]
+[JsonSerializable(typeof(McpListBuiltinServerNamesResult))]
 [JsonSerializable(typeof(McpListToolsRequest))]
 [JsonSerializable(typeof(McpListToolsResult))]
 [JsonSerializable(typeof(McpOauthAuthenticationStateChangedRequest))]
@@ -50902,6 +57399,11 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(McpPromptsListRequest))]
 [JsonSerializable(typeof(McpPromptsListResult))]
 [JsonSerializable(typeof(McpRegisterExternalClientRequest))]
+[JsonSerializable(typeof(McpRegistryCancelRequest))]
+[JsonSerializable(typeof(McpRegistryCancelResult))]
+[JsonSerializable(typeof(McpRegistryRequestIdResult))]
+[JsonSerializable(typeof(McpRegistrySearchRequest))]
+[JsonSerializable(typeof(McpRegistrySearchResult))]
 [JsonSerializable(typeof(McpReloadWithConfigRequest))]
 [JsonSerializable(typeof(McpRemoveGitHubResult))]
 [JsonSerializable(typeof(McpResource))]
@@ -50926,6 +57428,8 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(McpServerOwnership))]
 [JsonSerializable(typeof(McpSetEnvValueModeParams))]
 [JsonSerializable(typeof(McpSetEnvValueModeResult))]
+[JsonSerializable(typeof(McpShouldExcludeGitHubToolsRequest))]
+[JsonSerializable(typeof(McpShouldExcludeGitHubToolsResult))]
 [JsonSerializable(typeof(McpSourceFile))]
 [JsonSerializable(typeof(McpSourcePlugin))]
 [JsonSerializable(typeof(McpSourceRef))]
@@ -50976,11 +57480,12 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(ModelCapabilitiesOverrideLimitsVision))]
 [JsonSerializable(typeof(ModelCapabilitiesOverrideSupports))]
 [JsonSerializable(typeof(ModelCapabilitiesSupports))]
+[JsonSerializable(typeof(ModelGetReasoningSummariesRequest))]
+[JsonSerializable(typeof(ModelGetReasoningSummariesResult))]
 [JsonSerializable(typeof(ModelList))]
 [JsonSerializable(typeof(ModelMessage))]
 [JsonSerializable(typeof(ModelPickerPersistenceRequest))]
 [JsonSerializable(typeof(ModelPickerSettingsContext))]
-[JsonSerializable(typeof(ModelPickerSettingsContextEnvironment))]
 [JsonSerializable(typeof(ModelPolicy))]
 [JsonSerializable(typeof(ModelProviderAdapterCatalog))]
 [JsonSerializable(typeof(ModelProviderAdapterDescriptor))]
@@ -50998,7 +57503,6 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(ModelProviderOperationOutcome))]
 [JsonSerializable(typeof(ModelProviderPrepareConfigurationRequest))]
 [JsonSerializable(typeof(ModelProviderProvenance))]
-[JsonSerializable(typeof(ModelProviderRef))]
 [JsonSerializable(typeof(ModelProviderStatus))]
 [JsonSerializable(typeof(ModelProviderWarning))]
 [JsonSerializable(typeof(ModelSetAllowedModelsRequest))]
@@ -51009,6 +57513,7 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(ModelSwitchAutoTierResult))]
 [JsonSerializable(typeof(ModelSwitchConfirmation))]
 [JsonSerializable(typeof(ModelSwitchToRequest))]
+[JsonSerializable(typeof(ModelSwitchToRequestWithSession))]
 [JsonSerializable(typeof(ModelSwitchToResult))]
 [JsonSerializable(typeof(ModelWarningText))]
 [JsonSerializable(typeof(ModelsListRequest))]
@@ -51022,6 +57527,8 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(OptionsUpdateAdditionalContentExclusionPolicy))]
 [JsonSerializable(typeof(OptionsUpdateAdditionalContentExclusionPolicyRule))]
 [JsonSerializable(typeof(OptionsUpdateAdditionalContentExclusionPolicyRuleSource))]
+[JsonSerializable(typeof(PendingExternalToolRequest))]
+[JsonSerializable(typeof(PendingExternalToolRequestList))]
 [JsonSerializable(typeof(PendingPermissionRequest))]
 [JsonSerializable(typeof(PendingPermissionRequestList))]
 [JsonSerializable(typeof(PermissionDecision))]
@@ -51052,6 +57559,8 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(PermissionsConfigureAdditionalContentExclusionPolicyRuleSource))]
 [JsonSerializable(typeof(PermissionsConfigureParams))]
 [JsonSerializable(typeof(PermissionsConfigureResult))]
+[JsonSerializable(typeof(PermissionsEvaluateManagedPolicyParams))]
+[JsonSerializable(typeof(PermissionsEvaluateManagedPolicyResult))]
 [JsonSerializable(typeof(PermissionsFolderTrustAddTrustedResult))]
 [JsonSerializable(typeof(PermissionsGetModeRequest))]
 [JsonSerializable(typeof(PermissionsGetModeResult))]
@@ -51073,6 +57582,8 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(PermissionsSetRequiredRequest))]
 [JsonSerializable(typeof(PermissionsSetRequiredResult))]
 [JsonSerializable(typeof(PermissionsUrlsSetUnrestrictedModeResult))]
+[JsonSerializable(typeof(PersistenceWriteRawJsonLockedRequest))]
+[JsonSerializable(typeof(PersistenceWriteRawJsonLockedResult))]
 [JsonSerializable(typeof(PingRequest))]
 [JsonSerializable(typeof(PingResult))]
 [JsonSerializable(typeof(PlanReadResult))]
@@ -51163,6 +57674,7 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(QueueWithdrawMessageRequest))]
 [JsonSerializable(typeof(QueueWithdrawMessageResult))]
 [JsonSerializable(typeof(QueuedCommandResult))]
+[JsonSerializable(typeof(QuotaWarningProjection))]
 [JsonSerializable(typeof(RegisterEventInterestParams))]
 [JsonSerializable(typeof(RegisterEventInterestResult))]
 [JsonSerializable(typeof(ReleaseEventInterestParams))]
@@ -51179,7 +57691,13 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(RemoteSessionConnectionResult))]
 [JsonSerializable(typeof(RemoteSessionMetadataRepository))]
 [JsonSerializable(typeof(RemoteSessionMetadataValue))]
+[JsonSerializable(typeof(RepoSettingsEditRequest))]
+[JsonSerializable(typeof(RepoSettingsReadRawRequest))]
+[JsonSerializable(typeof(RepoSettingsReadRawResult))]
+[JsonSerializable(typeof(RepoSettingsWriteAllRequest))]
+[JsonSerializable(typeof(RepoSettingsWriteKeyRequest))]
 [JsonSerializable(typeof(ResponseFormat))]
+[JsonSerializable(typeof(SandboxApplyDefaultsRequest))]
 [JsonSerializable(typeof(SandboxConfig))]
 [JsonSerializable(typeof(SandboxConfigAuth))]
 [JsonSerializable(typeof(SandboxConfigUserPolicy))]
@@ -51189,18 +57707,37 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(SandboxConfigUserPolicyNetwork))]
 [JsonSerializable(typeof(SandboxConfigUserPolicyNetworkProxy))]
 [JsonSerializable(typeof(SandboxConfigUserPolicySeatbelt))]
+[JsonSerializable(typeof(SandboxCredentialSuggestion))]
+[JsonSerializable(typeof(SandboxCredentialSuggestionsResult))]
 [JsonSerializable(typeof(SandboxCredentialsConfig))]
 [JsonSerializable(typeof(SandboxDisableForSessionRequest))]
 [JsonSerializable(typeof(SandboxDisableForSessionResult))]
+[JsonSerializable(typeof(SandboxDocsUrlResult))]
+[JsonSerializable(typeof(SandboxEffectiveForOptionalParams))]
+[JsonSerializable(typeof(SandboxEffectiveForOptionalResult))]
+[JsonSerializable(typeof(SandboxEnforcementCommandAllowedParams))]
 [JsonSerializable(typeof(SandboxEnforcementStatus))]
+[JsonSerializable(typeof(SandboxFilterPickerCandidatesParams))]
+[JsonSerializable(typeof(SandboxFilterPickerCandidatesResult))]
 [JsonSerializable(typeof(SandboxGrantPathForRequestRequest))]
 [JsonSerializable(typeof(SandboxGrantPathForRequestResult))]
 [JsonSerializable(typeof(SandboxHostCapability))]
 [JsonSerializable(typeof(SandboxHostSupport))]
 [JsonSerializable(typeof(SandboxMaskedEnvVar))]
+[JsonSerializable(typeof(SandboxPickerCandidate))]
+[JsonSerializable(typeof(SandboxPreparePickerPolicyParams))]
+[JsonSerializable(typeof(SandboxPreparePickerPolicyResult))]
 [JsonSerializable(typeof(SandboxProxyCaCreateResult))]
 [JsonSerializable(typeof(SandboxProxyCaRequest))]
 [JsonSerializable(typeof(SandboxProxyCaStatus))]
+[JsonSerializable(typeof(SandboxProxySecretGetResult))]
+[JsonSerializable(typeof(SandboxProxySecretLocation))]
+[JsonSerializable(typeof(SandboxProxySecretSaveRequest))]
+[JsonSerializable(typeof(SandboxProxySecretSaveResult))]
+[JsonSerializable(typeof(SandboxResolveFlooredConfigParams))]
+[JsonSerializable(typeof(SandboxResolveFlooredConfigResult))]
+[JsonSerializable(typeof(SandboxUnsupportedStartupNoticeParams))]
+[JsonSerializable(typeof(SandboxUnsupportedStartupNoticeResult))]
 [JsonSerializable(typeof(ScheduleAddAtRequest))]
 [JsonSerializable(typeof(ScheduleAddCronRequest))]
 [JsonSerializable(typeof(ScheduleAddRequest))]
@@ -51244,6 +57781,7 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(SessionCommandsListRequestWithSession))]
 [JsonSerializable(typeof(SessionCompletionItem))]
 [JsonSerializable(typeof(SessionCompletionsGetTriggerCharactersRequest))]
+[JsonSerializable(typeof(SessionConnectedIdeInfo))]
 [JsonSerializable(typeof(SessionConnectorsGetAccountRequest))]
 [JsonSerializable(typeof(SessionConnectorsGetCapabilitiesRequest))]
 [JsonSerializable(typeof(SessionConnectorsGetStatusRequest))]
@@ -51253,6 +57791,7 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(SessionEnrichMetadataResult))]
 [JsonSerializable(typeof(SessionEventLogTailRequest))]
 [JsonSerializable(typeof(SessionExtensionsListRequest))]
+[JsonSerializable(typeof(SessionExtensionsReconcileRequest))]
 [JsonSerializable(typeof(SessionExtensionsReloadRequest))]
 [JsonSerializable(typeof(SessionFsAppendFileRequest))]
 [JsonSerializable(typeof(SessionFsError))]
@@ -51312,6 +57851,7 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(SessionLoadDeferredRepoHooksResult))]
 [JsonSerializable(typeof(SessionManagedSettingsGetRequest))]
 [JsonSerializable(typeof(SessionMcpAppsGetHostContextRequest))]
+[JsonSerializable(typeof(SessionMcpListConfiguredRequest))]
 [JsonSerializable(typeof(SessionMcpListRequest))]
 [JsonSerializable(typeof(SessionMcpMoveLoadingToBackgroundRequest))]
 [JsonSerializable(typeof(SessionMcpOauthCancelLoginRequest))]
@@ -51320,6 +57860,7 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(SessionMcpOauthPrepareLoginResult))]
 [JsonSerializable(typeof(SessionMcpReloadRequest))]
 [JsonSerializable(typeof(SessionMcpRemoveGitHubRequest))]
+[JsonSerializable(typeof(SessionMcpSetConnectedIdeInfoParams))]
 [JsonSerializable(typeof(SessionMetadataActivityRequest))]
 [JsonSerializable(typeof(SessionMetadataGetClientMetadataRequest))]
 [JsonSerializable(typeof(SessionMetadataGetContextAttributionRequest))]
@@ -51328,6 +57869,8 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(SessionMetadataSnapshotRequest))]
 [JsonSerializable(typeof(SessionMetadataSnapshotWorkspace))]
 [JsonSerializable(typeof(SessionModeGetRequest))]
+[JsonSerializable(typeof(SessionModelClearStartupSeedRequest))]
+[JsonSerializable(typeof(SessionModelClearStartupSeedResult))]
 [JsonSerializable(typeof(SessionModelGetCurrentRequest))]
 [JsonSerializable(typeof(SessionModelList))]
 [JsonSerializable(typeof(SessionModelListRequest))]
@@ -51348,6 +57891,9 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(SessionPluginsMarketplacesRefreshRequestWithSession))]
 [JsonSerializable(typeof(SessionPluginsReloadRequest))]
 [JsonSerializable(typeof(SessionPluginsReloadRequestWithSession))]
+[JsonSerializable(typeof(SessionPluginsRetryManagedRequest))]
+[JsonSerializable(typeof(SessionPluginsRetryManagedRequestWithSession))]
+[JsonSerializable(typeof(SessionPluginsRetryManagedResult))]
 [JsonSerializable(typeof(SessionProviderGetEndpointRequest))]
 [JsonSerializable(typeof(SessionProviderGetEndpointRequestWithSession))]
 [JsonSerializable(typeof(SessionProvidersGetCatalogRequest))]
@@ -51359,7 +57905,15 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(SessionQueueProcessRequest))]
 [JsonSerializable(typeof(SessionQueueRemoveMostRecentRequest))]
 [JsonSerializable(typeof(SessionQueueSnapshotRequest))]
+[JsonSerializable(typeof(SessionQuotaDelegateWarning))]
+[JsonSerializable(typeof(SessionQuotaGetRequest))]
+[JsonSerializable(typeof(SessionQuotaGetResult))]
+[JsonSerializable(typeof(SessionQuotaRefreshRequest))]
+[JsonSerializable(typeof(SessionQuotaRefreshResult))]
+[JsonSerializable(typeof(SessionQuotaSnapshot))]
+[JsonSerializable(typeof(SessionQuotaTakeWarningsRequest))]
 [JsonSerializable(typeof(SessionRemoteDisableRequest))]
+[JsonSerializable(typeof(SessionSandboxGetCredentialSuggestionsRequest))]
 [JsonSerializable(typeof(SessionSandboxGetEnforcementStatusRequest))]
 [JsonSerializable(typeof(SessionScheduleHasSelfPacedRequest))]
 [JsonSerializable(typeof(SessionScheduleHydrateRequest))]
@@ -51395,9 +57949,11 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(SessionUpdateOptionsParams))]
 [JsonSerializable(typeof(SessionUpdateOptionsResult))]
 [JsonSerializable(typeof(SessionUsageGetMetricsRequest))]
+[JsonSerializable(typeof(SessionUsageSetCodeChangesRequest))]
 [JsonSerializable(typeof(SessionVisibilityGetRequest))]
 [JsonSerializable(typeof(SessionWorkflowPauseAtCheckpointResult))]
 [JsonSerializable(typeof(SessionWorkingDirectoryContext))]
+[JsonSerializable(typeof(SessionWorkingDirectoryContextWithClient))]
 [JsonSerializable(typeof(SessionWorkspacesAutopilotObjectiveExistsRequest))]
 [JsonSerializable(typeof(SessionWorkspacesDeleteAutopilotObjectiveRequest))]
 [JsonSerializable(typeof(SessionWorkspacesGetWorkspaceRequest))]
@@ -51410,6 +57966,8 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(SessionsClientMetadataEntry))]
 [JsonSerializable(typeof(SessionsCloseRequest))]
 [JsonSerializable(typeof(SessionsCloseResult))]
+[JsonSerializable(typeof(SessionsCreateWorkspaceRequest))]
+[JsonSerializable(typeof(SessionsCreateWorkspaceResult))]
 [JsonSerializable(typeof(SessionsDeleteRequest))]
 [JsonSerializable(typeof(SessionsEnrichMetadataRequest))]
 [JsonSerializable(typeof(SessionsFindByPrefixRequest))]
@@ -51433,6 +57991,8 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(SessionsListNonEmptySessionIdsResult))]
 [JsonSerializable(typeof(SessionsListRequest))]
 [JsonSerializable(typeof(SessionsLoadDeferredRepoHooksRequest))]
+[JsonSerializable(typeof(SessionsLoadWorkspaceRequest))]
+[JsonSerializable(typeof(SessionsLoadWorkspaceResult))]
 [JsonSerializable(typeof(SessionsOpenProgress))]
 [JsonSerializable(typeof(SessionsPruneOldRequest))]
 [JsonSerializable(typeof(SessionsReadPersistedEventsRequest))]
@@ -51448,7 +58008,10 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(SessionsStartRemoteControlRequest))]
 [JsonSerializable(typeof(SessionsStopRemoteControlRequest))]
 [JsonSerializable(typeof(SessionsTransferRemoteControlRequest))]
+[JsonSerializable(typeof(SessionsUpdateWorkspaceFieldsRequest))]
+[JsonSerializable(typeof(SessionsUpdateWorkspaceFieldsResult))]
 [JsonSerializable(typeof(SettableAuthInfo))]
+[JsonSerializable(typeof(SettingsEditResult))]
 [JsonSerializable(typeof(ShellCancelUserRequestedRequest))]
 [JsonSerializable(typeof(ShellCredentials))]
 [JsonSerializable(typeof(ShellExecRequest))]
@@ -51495,7 +58058,6 @@ 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))]
@@ -51540,6 +58102,7 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(ToolsGetBuiltinDescriptorsResult))]
 [JsonSerializable(typeof(ToolsGetCurrentMetadataResult))]
 [JsonSerializable(typeof(ToolsInitializeAndValidateResult))]
+[JsonSerializable(typeof(ToolsListPendingRequestsRequest))]
 [JsonSerializable(typeof(ToolsListRequest))]
 [JsonSerializable(typeof(ToolsSetRequest))]
 [JsonSerializable(typeof(ToolsSetResult))]
@@ -51558,7 +58121,6 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(UIHandlePendingExitPlanModeRequest))]
 [JsonSerializable(typeof(UIHandlePendingResult))]
 [JsonSerializable(typeof(UIHandlePendingSamplingRequest))]
-[JsonSerializable(typeof(UIHandlePendingSamplingResponse))]
 [JsonSerializable(typeof(UIHandlePendingSessionLimitsExhaustedRequest))]
 [JsonSerializable(typeof(UIHandlePendingUserInputRequest))]
 [JsonSerializable(typeof(UIRegisterDirectAutoModeSwitchHandlerResult))]
@@ -51568,19 +58130,54 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(UIUserInputResponse))]
 [JsonSerializable(typeof(UpdateSubagentSettingsRequest))]
 [JsonSerializable(typeof(UpdateSubagentSettingsRequestSubagents))]
-[JsonSerializable(typeof(UsageGetMetricsResult))]
-[JsonSerializable(typeof(UsageMetricsAgentMetric))]
-[JsonSerializable(typeof(UsageMetricsCodeChanges))]
-[JsonSerializable(typeof(UsageMetricsModelMetric))]
-[JsonSerializable(typeof(UsageMetricsModelMetricRequests))]
-[JsonSerializable(typeof(UsageMetricsModelMetricTokenDetail))]
-[JsonSerializable(typeof(UsageMetricsModelMetricUsage))]
-[JsonSerializable(typeof(UsageMetricsTokenDetail))]
 [JsonSerializable(typeof(UserRequestedShellCommandResult))]
 [JsonSerializable(typeof(UserSettingMetadata))]
+[JsonSerializable(typeof(UserSettingsApplyTopKeyRequest))]
+[JsonSerializable(typeof(UserSettingsApplyTopKeyResult))]
+[JsonSerializable(typeof(UserSettingsBuildRuntimeRequest))]
+[JsonSerializable(typeof(UserSettingsEditRequest))]
+[JsonSerializable(typeof(UserSettingsGetPathsRequest))]
+[JsonSerializable(typeof(UserSettingsGetPathsResult))]
 [JsonSerializable(typeof(UserSettingsGetResult))]
+[JsonSerializable(typeof(UserSettingsGovernanceKeysResult))]
+[JsonSerializable(typeof(UserSettingsHostContext))]
+[JsonSerializable(typeof(UserSettingsLoadAndMergeRepoRequest))]
+[JsonSerializable(typeof(UserSettingsLoadAndMergeRepoResult))]
+[JsonSerializable(typeof(UserSettingsLoadForConfigDirRequest))]
+[JsonSerializable(typeof(UserSettingsLoadForEditResult))]
+[JsonSerializable(typeof(UserSettingsLoadRepoRequest))]
+[JsonSerializable(typeof(UserSettingsLoadRepoResult))]
+[JsonSerializable(typeof(UserSettingsLoadWithWarningResult))]
+[JsonSerializable(typeof(UserSettingsMergeManagedAndUserParams))]
+[JsonSerializable(typeof(UserSettingsMergeManagedAndUserResult))]
+[JsonSerializable(typeof(UserSettingsMergeRepoValueParams))]
+[JsonSerializable(typeof(UserSettingsMergeRepoValueResult))]
+[JsonSerializable(typeof(UserSettingsMigrateObsoleteOnDiskRequest))]
+[JsonSerializable(typeof(UserSettingsMigrateObsoleteOnDiskResult))]
+[JsonSerializable(typeof(UserSettingsMigrateStaffLogLevelOnceRequest))]
+[JsonSerializable(typeof(UserSettingsMigrateStaffLogLevelOnceResult))]
+[JsonSerializable(typeof(UserSettingsMigrateStaffUpdateChannelOnceResult))]
+[JsonSerializable(typeof(UserSettingsNormalizeRequest))]
+[JsonSerializable(typeof(UserSettingsNormalizeResult))]
+[JsonSerializable(typeof(UserSettingsPathResult))]
+[JsonSerializable(typeof(UserSettingsProblem))]
+[JsonSerializable(typeof(UserSettingsProblemLocation))]
+[JsonSerializable(typeof(UserSettingsProblemSource))]
+[JsonSerializable(typeof(UserSettingsProblemsRequest))]
+[JsonSerializable(typeof(UserSettingsProblemsResult))]
+[JsonSerializable(typeof(UserSettingsResetStaffModelSelectionOnceRequest))]
+[JsonSerializable(typeof(UserSettingsResetStaffModelSelectionOnceResult))]
+[JsonSerializable(typeof(UserSettingsSetHookDisabledRequest))]
+[JsonSerializable(typeof(UserSettingsSetHookDisabledResult))]
 [JsonSerializable(typeof(UserSettingsSetRequest))]
-[JsonSerializable(typeof(UserSettingsSetResult))]
+[JsonSerializable(typeof(UserSettingsUnknownKeysWarningRequest))]
+[JsonSerializable(typeof(UserSettingsUnknownKeysWarningResult))]
+[JsonSerializable(typeof(UserSettingsUpdateRequest))]
+[JsonSerializable(typeof(UserSettingsUpdateResult))]
+[JsonSerializable(typeof(UserSettingsValidateRequest))]
+[JsonSerializable(typeof(UserSettingsValidateResult))]
+[JsonSerializable(typeof(UserSettingsValidationIssue))]
+[JsonSerializable(typeof(UserSettingsWriteAllRequest))]
 [JsonSerializable(typeof(VisibilityGetResult))]
 [JsonSerializable(typeof(VisibilitySetRequest))]
 [JsonSerializable(typeof(VisibilitySetResult))]
@@ -51624,18 +58221,18 @@ public static void RegisterClientGlobalApiHandlers(JsonRpc rpc, ClientGlobalApiH
 [JsonSerializable(typeof(WorkflowToolResumeRequest))]
 [JsonSerializable(typeof(WorkflowToolRunOptions))]
 [JsonSerializable(typeof(WorkflowToolRunRequest))]
+[JsonSerializable(typeof(WorkspaceDiffContents))]
 [JsonSerializable(typeof(WorkspaceDiffFileChange))]
 [JsonSerializable(typeof(WorkspaceDiffResult))]
 [JsonSerializable(typeof(WorkspacesAddSummaryRequest))]
 [JsonSerializable(typeof(WorkspacesAddSummaryResult))]
-[JsonSerializable(typeof(WorkspacesAddSummaryResultSummary))]
-[JsonSerializable(typeof(WorkspacesAddSummaryResultWorkspace))]
 [JsonSerializable(typeof(WorkspacesAutopilotObjectiveExistsResult))]
 [JsonSerializable(typeof(WorkspacesCheckpoints))]
 [JsonSerializable(typeof(WorkspacesCreateDirectoryRequest))]
 [JsonSerializable(typeof(WorkspacesCreateFileRequest))]
 [JsonSerializable(typeof(WorkspacesDeleteAutopilotObjectiveResult))]
 [JsonSerializable(typeof(WorkspacesDiffRequest))]
+[JsonSerializable(typeof(WorkspacesDiffRequestWithSession))]
 [JsonSerializable(typeof(WorkspacesEnsureRequest))]
 [JsonSerializable(typeof(WorkspacesGetWorkspaceResult))]
 [JsonSerializable(typeof(WorkspacesGetWorkspaceResultWorkspace))]
diff --git a/dotnet/src/Generated/SessionEvents.cs b/dotnet/src/Generated/SessionEvents.cs
index c482a8a69f..190624d478 100644
--- a/dotnet/src/Generated/SessionEvents.cs
+++ b/dotnet/src/Generated/SessionEvents.cs
@@ -119,6 +119,7 @@ namespace GitHub.Copilot;
 [JsonDerivedType(typeof(SessionIdleEvent), "session.idle")]
 [JsonDerivedType(typeof(SessionIndexedSearchEvent), "session.indexed_search")]
 [JsonDerivedType(typeof(SessionInfoEvent), "session.info")]
+[JsonDerivedType(typeof(SessionManagedPluginProgressEvent), "session.managed_plugin_progress")]
 [JsonDerivedType(typeof(SessionManagedSettingsEnforcedEvent), "session.managed_settings_enforced")]
 [JsonDerivedType(typeof(SessionManagedSettingsResolvedEvent), "session.managed_settings_resolved")]
 [JsonDerivedType(typeof(SessionMcpServerNeedsReconnectEvent), "session.mcp_server_needs_reconnect")]
@@ -132,6 +133,7 @@ namespace GitHub.Copilot;
 [JsonDerivedType(typeof(SessionPermissionRecoveryEvent), "session.permission_recovery")]
 [JsonDerivedType(typeof(SessionPermissionsChangedEvent), "session.permissions_changed")]
 [JsonDerivedType(typeof(SessionPlanChangedEvent), "session.plan_changed")]
+[JsonDerivedType(typeof(SessionQuotaObservationEvent), "session.quota_observation")]
 [JsonDerivedType(typeof(SessionRemoteSteerableChangedEvent), "session.remote_steerable_changed")]
 [JsonDerivedType(typeof(SessionResumeEvent), "session.resume")]
 [JsonDerivedType(typeof(SessionScheduleCancelledEvent), "session.schedule_cancelled")]
@@ -483,6 +485,8 @@ internal sealed partial class SessionEventJsonConverter : JsonConverter<SessionE
                     return SessionEventsJsonContext.Default.PermissionCarriedForwardEvent;
                 if (type.SequenceEqual("session.extensions_loaded"u8))
                     return SessionEventsJsonContext.Default.SessionExtensionsLoadedEvent;
+                if (type.SequenceEqual("session.quota_observation"u8))
+                    return SessionEventsJsonContext.Default.SessionQuotaObservationEvent;
                 break;
             case 26:
                 if (type.SequenceEqual("auto_mode_switch.completed"u8))
@@ -557,6 +561,8 @@ internal sealed partial class SessionEventJsonConverter : JsonConverter<SessionE
                     return SessionEventsJsonContext.Default.SessionAutoTierSwitchFailedEvent;
                 if (type.SequenceEqual("session.canvas.registry_changed"u8))
                     return SessionEventsJsonContext.Default.SessionCanvasRegistryChangedEvent;
+                if (type.SequenceEqual("session.managed_plugin_progress"u8))
+                    return SessionEventsJsonContext.Default.SessionManagedPluginProgressEvent;
                 break;
             case 32:
                 if (type.SequenceEqual("assistant.fusion_phase_completed"u8))
@@ -1111,6 +1117,20 @@ public sealed partial class SessionUsageCheckpointEvent : SessionEvent
     public required SessionUsageCheckpointData Data { get; set; }
 }
 
+/// <summary>A provider-owned quota observation, distinct from per-call usage and charge accounting.</summary>
+/// <remarks>Represents the <c>session.quota_observation</c> event.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed partial class SessionQuotaObservationEvent : SessionEvent
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "session.quota_observation";
+
+    /// <summary>The <c>session.quota_observation</c> event payload.</summary>
+    [JsonPropertyName("data")]
+    public required SessionQuotaObservationData Data { get; set; }
+}
+
 /// <summary>Working directory and git context at session start.</summary>
 /// <remarks>Represents the <c>session.context_changed</c> event.</remarks>
 public sealed partial class SessionContextChangedEvent : SessionEvent
@@ -2347,6 +2367,20 @@ public sealed partial class SessionAutoModeResolvedEvent : SessionEvent
     public required SessionAutoModeResolvedData Data { get; set; }
 }
 
+/// <summary>Experimental transient presentation-neutral progress for organization-required plugin preparation. Clients should localize the phase copy and display plugin specs without translating them.</summary>
+/// <remarks>Represents the <c>session.managed_plugin_progress</c> event.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed partial class SessionManagedPluginProgressEvent : SessionEvent
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "session.managed_plugin_progress";
+
+    /// <summary>The <c>session.managed_plugin_progress</c> event payload.</summary>
+    [JsonPropertyName("data")]
+    public required SessionManagedPluginProgressData Data { get; set; }
+}
+
 /// <summary>Effective enterprise managed settings and contributing channels. Session events report applied policy; sessionless resolve reports an account/device snapshot, and compose reports a non-applying preview of candidate documents. Device values take precedence over server values, then the policy helper, per ordinary key, while permissions compose restrictively. Session-local SDK-client policy is included only in session results. Marked experimental while the managed-settings surface stabilizes.</summary>
 /// <remarks>Represents the <c>session.managed_settings_resolved</c> event.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
@@ -2361,7 +2395,7 @@ public sealed partial class SessionManagedSettingsResolvedEvent : SessionEvent
     public required SessionManagedSettingsResolvedData Data { get; set; }
 }
 
-/// <summary>Runtime enforcement of enterprise managed settings: fires when the session blocks or caps a runtime action because enterprise policy governs it, so SDK clients can explain *why* an action was governed. Unlike `session.managed_settings_resolved` (which reports *what* is managed), this reports a concrete governed action — e.g. a user or host tried to turn on a bypass-permissions escalation while policy disables it. Emitted live (not persisted to the session event log) on user/host-initiated attempts only, never for silent policy application. Marked experimental while the managed-settings surface stabilizes.</summary>
+/// <summary>Runtime enforcement of enterprise managed settings: fires when the session blocks or caps a runtime action because enterprise policy governs it, so SDK clients can explain *why* an action was governed. Unlike `session.managed_settings_resolved` (which reports *what* is managed), this reports a concrete governed action — e.g. a user or host tried to turn on bypass permissions or Assisted Permissions while the corresponding policy disables it. Emitted live (not persisted to the session event log) on user/host-initiated attempts only, never for silent policy application. Marked experimental while the managed-settings surface stabilizes.</summary>
 /// <remarks>Represents the <c>session.managed_settings_enforced</c> event.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 public sealed partial class SessionManagedSettingsEnforcedEvent : SessionEvent
@@ -2761,6 +2795,11 @@ public sealed partial class SessionStartData
     [JsonPropertyName("autoTier")]
     public AutoTier? AutoTier { get; set; }
 
+    /// <summary>True when autoTier is a managed-policy default. Omitted for user-authored and legacy values.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("autoTierManaged")]
+    public bool? AutoTierManaged { get; set; }
+
     /// <summary>Working directory and git context at session start.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("context")]
@@ -2771,6 +2810,11 @@ public sealed partial class SessionStartData
     [JsonPropertyName("contextTier")]
     public ContextTier? ContextTier { get; set; }
 
+    /// <summary>True when contextTier is a managed-policy default. Omitted for user-authored and legacy values.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("contextTierManaged")]
+    public bool? ContextTierManaged { get; set; }
+
     /// <summary>Version string of the Copilot application.</summary>
     [JsonPropertyName("copilotVersion")]
     public required string CopilotVersion { get; set; }
@@ -2789,11 +2833,21 @@ public sealed partial class SessionStartData
     [JsonPropertyName("producer")]
     public required string Producer { get; set; }
 
+    /// <summary>Provider of selectedModel at creation time, when explicitly selected.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("providerId")]
+    public string? ProviderId { get; set; }
+
     /// <summary>Reasoning effort level used for model calls, if applicable (e.g. "none", "low", "medium", "high", "xhigh", "max").</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("reasoningEffort")]
     public string? ReasoningEffort { get; set; }
 
+    /// <summary>True when the reasoning effort is a managed-policy default bound to reasoningEffortModel. Omitted for agent-authored, user-authored, independent, and legacy effort.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("reasoningEffortManaged")]
+    public bool? ReasoningEffortManaged { get; set; }
+
     /// <summary>Model that owns effort embedded in an authored model selection. Omitted for independent reasoning-effort overrides and legacy events.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("reasoningEffortModel")]
@@ -2850,6 +2904,11 @@ public sealed partial class SessionResumeData
     [JsonPropertyName("autoTier")]
     public AutoTier? AutoTier { get; set; }
 
+    /// <summary>True when autoTier is a managed-policy default. Omitted for user-authored and legacy values.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("autoTierManaged")]
+    public bool? AutoTierManaged { get; set; }
+
     /// <summary>Updated working directory and git context at resume time.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("context")]
@@ -2860,6 +2919,11 @@ public sealed partial class SessionResumeData
     [JsonPropertyName("contextTier")]
     public ContextTier? ContextTier { get; set; }
 
+    /// <summary>True when contextTier is a managed-policy default. Omitted for user-authored and legacy values.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("contextTierManaged")]
+    public bool? ContextTierManaged { get; set; }
+
     /// <summary>When true, tool calls and permission requests left in flight by the previous session lifetime remain pending after resume and the agentic loop awaits their results. User sends are queued behind the pending work until all such requests reach a terminal state. When false or omitted, pending work is normally marked as interrupted unless the resume passively joined live work owned by another client; sessionWasActive distinguishes that case.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("continuePendingWork")]
@@ -2874,11 +2938,21 @@ public sealed partial class SessionResumeData
     [JsonPropertyName("eventsFileSizeBytes")]
     public long? EventsFileSizeBytes { get; set; }
 
+    /// <summary>Provider of selectedModel at resume time, when explicitly selected.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("providerId")]
+    public string? ProviderId { get; set; }
+
     /// <summary>Reasoning effort level used for model calls, if applicable (e.g. "none", "low", "medium", "high", "xhigh", "max").</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("reasoningEffort")]
     public string? ReasoningEffort { get; set; }
 
+    /// <summary>True when the reasoning effort is a managed-policy default bound to reasoningEffortModel. Omitted for agent-authored, user-authored, independent, and legacy effort.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("reasoningEffortManaged")]
+    public bool? ReasoningEffortManaged { get; set; }
+
     /// <summary>Model that owns effort embedded in an authored model selection. Omitted for independent reasoning-effort overrides and legacy events.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("reasoningEffortModel")]
@@ -2940,7 +3014,7 @@ public sealed partial class SessionErrorData
     [JsonPropertyName("errorCode")]
     public string? ErrorCode { get; set; }
 
-    /// <summary>Category of error (e.g., "authentication", "authorization", "quota", "rate_limit", "context_limit", "query").</summary>
+    /// <summary>Category of error (e.g., "authentication", "authorization", "policy", "quota", "rate_limit", "context_limit", "query").</summary>
     [JsonPropertyName("errorType")]
     public required string ErrorType { get; set; }
 
@@ -2953,6 +3027,16 @@ public sealed partial class SessionErrorData
     [JsonPropertyName("providerCallId")]
     public string? ProviderCallId { get; set; }
 
+    /// <summary>Sanitized provider-defined error parameter preserved from a structured upstream error envelope, when available.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("providerErrorParam")]
+    public string? ProviderErrorParam { get; set; }
+
+    /// <summary>Provider-defined error type preserved from a structured upstream error envelope, when available (for example, `invalid_request_error`).</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("providerErrorType")]
+    public string? ProviderErrorType { get; set; }
+
     /// <summary>What the user must do to recover, when the runtime knows of an action. The `message` never names a client affordance, so a client that offers one — a slash command, a settings pane, a link — renders it from this value.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("remediation")]
@@ -3161,6 +3245,11 @@ public sealed partial class SessionModelChangeData
     [JsonPropertyName("autoTier")]
     public AutoTier? AutoTier { get; set; }
 
+    /// <summary>True when autoTier is a managed-policy default. Omitted for user-authored and legacy values.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("autoTierManaged")]
+    public bool? AutoTierManaged { get; set; }
+
     /// <summary>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.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("cause")]
@@ -3171,6 +3260,11 @@ public sealed partial class SessionModelChangeData
     [JsonPropertyName("contextTier")]
     public ContextTier? ContextTier { get; set; }
 
+    /// <summary>True when contextTier is a managed-policy default. Omitted for user-authored and legacy values.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("contextTierManaged")]
+    public bool? ContextTierManaged { get; set; }
+
     /// <summary>Newly selected model identifier.</summary>
     [JsonPropertyName("newModel")]
     public required string NewModel { get; set; }
@@ -3185,6 +3279,11 @@ public sealed partial class SessionModelChangeData
     [JsonPropertyName("previousModel")]
     public string? PreviousModel { get; set; }
 
+    /// <summary>Provider of previousModel, when known. A provider-only change is a model selection change even when the model identifiers are equal.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("previousProviderId")]
+    public string? PreviousProviderId { get; set; }
+
     /// <summary>Reasoning effort level before the model change, if applicable.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("previousReasoningEffort")]
@@ -3200,11 +3299,21 @@ public sealed partial class SessionModelChangeData
     [JsonPropertyName("previousVerbosity")]
     public Verbosity? PreviousVerbosity { get; set; }
 
+    /// <summary>Provider selected for newModel. Omitted for legacy or unattributed selections; never inferred from a later selection.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("providerId")]
+    public string? ProviderId { get; set; }
+
     /// <summary>Reasoning effort level after the model change, if applicable.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("reasoningEffort")]
     public string? ReasoningEffort { get; set; }
 
+    /// <summary>True when the reasoning effort is a managed-policy default bound to reasoningEffortModel. Omitted for agent-authored, user-authored, independent, and legacy effort.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("reasoningEffortManaged")]
+    public bool? ReasoningEffortManaged { get; set; }
+
     /// <summary>Model that owns effort embedded in an authored model selection. Omitted for independent reasoning-effort overrides and legacy events.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("reasoningEffortModel")]
@@ -3438,6 +3547,12 @@ public sealed partial class SessionSnapshotRewindData
 /// <summary>Session termination metrics including usage statistics, code changes, and shutdown reason.</summary>
 public sealed partial class SessionShutdownData
 {
+    /// <summary>Complete accounting state captured atomically with receipt watermarks.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonInclude]
+    [JsonPropertyName("accountingSnapshot")]
+    internal UsageGetMetricsResult? AccountingSnapshot { get; set; }
+
     /// <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")]
@@ -3476,6 +3591,11 @@ public sealed partial class SessionShutdownData
     [JsonPropertyName("modelMetrics")]
     public required IDictionary<string, ShutdownModelMetric> ModelMetrics { get; set; }
 
+    /// <summary>Provider/model accounting preserved for replay without consulting current provider selection.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("providerModelMetrics")]
+    public UsageMetricsProviderModelMetric[]? ProviderModelMetrics { get; set; }
+
     /// <summary>Unix timestamp (milliseconds) when the session started.</summary>
     [JsonPropertyName("sessionStartTime")]
     public required long SessionStartTime { get; set; }
@@ -3515,11 +3635,22 @@ public sealed partial class SessionShutdownData
     [JsonInclude]
     [JsonPropertyName("totalPremiumRequests")]
     internal double? TotalPremiumRequests { get; set; }
+
+    /// <summary>Per-source accounting sequence watermarks subsuming preceding usage receipts.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("usageAccountingWatermarks")]
+    public IDictionary<string, long>? UsageAccountingWatermarks { get; set; }
 }
 
 /// <summary>Durable session usage checkpoint for reconstructing aggregate accounting on resume.</summary>
 public sealed partial class SessionUsageCheckpointData
 {
+    /// <summary>Complete accounting state captured atomically with the receipt watermarks.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonInclude]
+    [JsonPropertyName("accountingSnapshot")]
+    internal UsageGetMetricsResult? AccountingSnapshot { get; set; }
+
     /// <summary>Internal per-model prompt-cache state used to restore expiration tracking on resume.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonInclude]
@@ -3532,6 +3663,11 @@ public sealed partial class SessionUsageCheckpointData
     [JsonPropertyName("promptCacheBreakState")]
     internal JsonElement[]? PromptCacheBreakState { get; set; }
 
+    /// <summary>Provider/model accounting snapshot that subsumes preceding usage receipts.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("providerModelMetrics")]
+    public UsageMetricsProviderModelMetric[]? ProviderModelMetrics { get; set; }
+
     /// <summary>Session-wide accumulated nano-AI units cost at checkpoint time.</summary>
     [JsonPropertyName("totalNanoAiu")]
     public required double TotalNanoAiu { get; set; }
@@ -3541,6 +3677,20 @@ public sealed partial class SessionUsageCheckpointData
     [JsonInclude]
     [JsonPropertyName("totalPremiumRequests")]
     internal double? TotalPremiumRequests { get; set; }
+
+    /// <summary>Highest accounted sequence per source session; no per-call deduplication history is retained.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("usageAccountingWatermarks")]
+    public IDictionary<string, long>? UsageAccountingWatermarks { get; set; }
+}
+
+/// <summary>A provider-owned quota observation, distinct from per-call usage and charge accounting.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed partial class SessionQuotaObservationData
+{
+    /// <summary>The admitted provider's state observation. Admission balances and percentages remain absent; separate monthly usage may report its own amount and cycle.</summary>
+    [JsonPropertyName("observation")]
+    public required ProviderQuotaState Observation { get; set; }
 }
 
 /// <summary>Working directory and git context at session start.</summary>
@@ -4156,6 +4306,16 @@ public sealed partial class SessionPermissionRecoveryData
     [JsonPropertyName("onBlocked")]
     public required PermissionRecoveryOnBlocked OnBlocked { get; set; }
 
+    /// <summary>Subagent identifier that owns this recovery episode when the request was delegated through a parent permission service.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("ownerAgentId")]
+    public string? OwnerAgentId { get; set; }
+
+    /// <summary>Root or child execution-session identifier that owns this recovery episode; omitted for legacy snapshots.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("ownerSessionId")]
+    public string? OwnerSessionId { get; set; }
+
     /// <summary>Controlled reason for the latest episode transition.</summary>
     [JsonPropertyName("reason")]
     public required PermissionRecoveryReason Reason { get; set; }
@@ -4735,6 +4895,11 @@ public sealed partial class AssistantMessageData
     [JsonPropertyName("phase")]
     public string? Phase { get; set; }
 
+    /// <summary>Opaque origin provider identity captured at dispatch. Only an exact match with the target provider permits replay of reasoningOpaque, encryptedContent, reasoningBlocks, serverTools, and provider response/item identifiers. Matching model ids or wire protocols is insufficient. Omitted for legacy or unattributed messages; the runtime excludes unproven opaque state when projecting to a known provider. Text content and client tool requests/results remain portable semantic history.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("providerId")]
+    public string? ProviderId { 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")]
@@ -4857,6 +5022,16 @@ public sealed partial class AssistantUsageData
     [JsonPropertyName("acceptedPredictionTokens")]
     public long? AcceptedPredictionTokens { get; set; }
 
+    /// <summary>Runtime-owned identity shared with the durable accounting receipt.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("accounting")]
+    public UsageAccountingIdentity? Accounting { get; set; }
+
+    /// <summary>Availability of this call's reported AI-credit amount. Missing billing is unavailable, not a zero charge.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("aiCreditsStatus")]
+    public AiCreditsStatus? AiCreditsStatus { get; set; }
+
     /// <summary>Completion ID from the model provider (e.g., chatcmpl-abc123).</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("apiCallId")]
@@ -4989,6 +5164,11 @@ public sealed partial class AssistantUsageData
     [JsonPropertyName("model")]
     public required string Model { get; set; }
 
+    /// <summary>Model display name captured for this call, not derived from the current selection.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("modelDisplayName")]
+    public string? ModelDisplayName { get; set; }
+
     /// <summary>Fixed-set provider family serving the bring-your-own-key model (for example "openai", "anthropic", "azure_openai", "ollama", "llama_cpp", or "other"). Never the caller-supplied provider name. Absent for Copilot-served models.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("modelProvider")]
@@ -5022,6 +5202,11 @@ public sealed partial class AssistantUsageData
     [JsonPropertyName("parentToolCallId")]
     public string? ParentToolCallId { get; set; }
 
+    /// <summary>Provider identity and product label captured by the actual call's dispatch path.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("provider")]
+    public ModelProviderRef? Provider { get; set; }
+
     /// <summary>GitHub request tracing ID (x-github-request-id header) for server-side log correlation.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("providerCallId")]
@@ -5053,6 +5238,21 @@ public sealed partial class AssistantUsageData
     [JsonPropertyName("rejectedPredictionTokens")]
     public long? RejectedPredictionTokens { get; set; }
 
+    /// <summary>Serialized (uncompressed) byte length of the request body, before any Content-Encoding. A content-free size signal.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("requestBodyBytes")]
+    public long? RequestBodyBytes { get; set; }
+
+    /// <summary>Content-Encoding applied to the request body of the attempt that produced this outcome; identity when uncompressed.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("requestBodyEncoding")]
+    public ModelCallRequestBodyEncoding? RequestBodyEncoding { get; set; }
+
+    /// <summary>Byte length of the request body actually sent on the wire for the attempt that produced this outcome, after any Content-Encoding. Equals requestBodyBytes when the body was not compressed.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("requestBodyWireBytes")]
+    public long? RequestBodyWireBytes { 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")]
@@ -5097,6 +5297,42 @@ public sealed partial class AssistantUsageData
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("transport")]
     public AssistantUsageTransport? Transport { get; set; }
+
+    /// <summary>Milliseconds spent on the WebSocket attempt before falling back to HTTP.</summary>
+    [JsonConverter(typeof(MillisecondsTimeSpanConverter))]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("websocketFallbackAfterMs")]
+    public TimeSpan? WebsocketFallbackAfter { get; set; }
+
+    /// <summary>WebSocket close code received before the HTTP fallback.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("websocketFallbackCloseCode")]
+    public int? WebsocketFallbackCloseCode { get; set; }
+
+    /// <summary>Normalized cause of the WebSocket failure that triggered the HTTP fallback; absent when no fallback occurred or the cause is unknown.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("websocketFallbackErrorKind")]
+    public ModelCallWebSocketFallbackErrorKind? WebsocketFallbackErrorKind { get; set; }
+
+    /// <summary>Why the call was carried by the HTTP fallback of a WebSocket-capable dispatcher; absent when no fallback occurred.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("websocketFallbackReason")]
+    public ModelCallWebSocketFallbackReason? WebsocketFallbackReason { get; set; }
+
+    /// <summary>Whether a WebSocket reconnect was attempted before falling back to HTTP.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("websocketFallbackReconnectAttempted")]
+    public bool? WebsocketFallbackReconnectAttempted { get; set; }
+
+    /// <summary>Whether the HTTP fallback started during this model call, rather than being inherited from an earlier call.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("websocketFallbackStartedThisCall")]
+    public bool? WebsocketFallbackStartedThisCall { get; set; }
+
+    /// <summary>HTTP status of the WebSocket upgrade rejection or WebSocket API error that triggered the HTTP fallback.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("websocketFallbackStatusCode")]
+    public int? WebsocketFallbackStatusCode { get; set; }
 }
 
 /// <summary>A detected loss of a previously cached prompt prefix.</summary>
@@ -5351,11 +5587,31 @@ public sealed partial class ModelCallFailureData
     [JsonPropertyName("reasoningEffort")]
     public string? ReasoningEffort { get; set; }
 
+    /// <summary>Serialized (uncompressed) byte length of the failed request body, before any Content-Encoding. A content-free size signal.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("requestBodyBytes")]
+    public long? RequestBodyBytes { get; set; }
+
+    /// <summary>Content-Encoding applied to the failed request body; identity when uncompressed.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("requestBodyEncoding")]
+    public ModelCallRequestBodyEncoding? RequestBodyEncoding { get; set; }
+
+    /// <summary>Byte length of the failed request body actually sent on the wire, after any Content-Encoding. Equals requestBodyBytes when the body was not compressed.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("requestBodyWireBytes")]
+    public long? RequestBodyWireBytes { get; set; }
+
     /// <summary>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.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("requestFingerprint")]
     public ModelCallFailureRequestFingerprint? RequestFingerprint { get; set; }
 
+    /// <summary>Zero-based orchestrator retry index of the failed attempt.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("retryAttempt")]
+    public long? RetryAttempt { 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")]
@@ -5379,6 +5635,42 @@ public sealed partial class ModelCallFailureData
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("transport")]
     public ModelCallFailureTransport? Transport { get; set; }
+
+    /// <summary>Milliseconds spent on the WebSocket attempt before falling back to HTTP.</summary>
+    [JsonConverter(typeof(MillisecondsTimeSpanConverter))]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("websocketFallbackAfterMs")]
+    public TimeSpan? WebsocketFallbackAfter { get; set; }
+
+    /// <summary>WebSocket close code received before the HTTP fallback.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("websocketFallbackCloseCode")]
+    public int? WebsocketFallbackCloseCode { get; set; }
+
+    /// <summary>Normalized cause of the WebSocket failure that triggered the HTTP fallback; absent when no fallback occurred or the cause is unknown.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("websocketFallbackErrorKind")]
+    public ModelCallWebSocketFallbackErrorKind? WebsocketFallbackErrorKind { get; set; }
+
+    /// <summary>Why the failed call was carried by the HTTP fallback of a WebSocket-capable dispatcher; absent when no fallback occurred.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("websocketFallbackReason")]
+    public ModelCallWebSocketFallbackReason? WebsocketFallbackReason { get; set; }
+
+    /// <summary>Whether a WebSocket reconnect was attempted before falling back to HTTP.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("websocketFallbackReconnectAttempted")]
+    public bool? WebsocketFallbackReconnectAttempted { get; set; }
+
+    /// <summary>Whether the HTTP fallback started during this model call, rather than being inherited from an earlier call.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("websocketFallbackStartedThisCall")]
+    public bool? WebsocketFallbackStartedThisCall { get; set; }
+
+    /// <summary>HTTP status of the WebSocket upgrade rejection or WebSocket API error that triggered the HTTP fallback.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("websocketFallbackStatusCode")]
+    public int? WebsocketFallbackStatusCode { get; set; }
 }
 
 /// <summary>Internal telemetry result for one logical model operation after all orchestrator-owned retries settle.</summary>
@@ -6354,6 +6646,16 @@ public sealed partial class PermissionRequestedData
     [JsonPropertyName("agentMode")]
     public SessionMode? AgentMode { get; set; }
 
+    /// <summary>Delegated agent that owns permission recovery when the owner session multiplexes remote agents. Absent otherwise.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("ownerAgentId")]
+    public string? OwnerAgentId { get; set; }
+
+    /// <summary>Execution session that owns permission recovery for this request. Absent on historical events.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("ownerSessionId")]
+    public string? OwnerSessionId { get; set; }
+
     /// <summary>Permission mode captured when evaluation began. Absent on historical events.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("permissionMode")]
@@ -7076,11 +7378,24 @@ public sealed partial class SessionAutoModeResolvedData
     public bool? StickyOverride { get; set; }
 }
 
+/// <summary>Experimental transient presentation-neutral progress for organization-required plugin preparation. Clients should localize the phase copy and display plugin specs without translating them.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed partial class SessionManagedPluginProgressData
+{
+    /// <summary>Current preparation phase.</summary>
+    [JsonPropertyName("phase")]
+    public required ManagedPluginProgressPhase Phase { get; set; }
+
+    /// <summary>Ordered plugin install specs affected by this phase. Empty while managed settings initialize and when preparation completes.</summary>
+    [JsonPropertyName("pluginSpecs")]
+    public required string[] PluginSpecs { get; set; }
+}
+
 /// <summary>Effective enterprise managed settings and contributing channels. Session events report applied policy; sessionless resolve reports an account/device snapshot, and compose reports a non-applying preview of candidate documents. Device values take precedence over server values, then the policy helper, per ordinary key, while permissions compose restrictively. Session-local SDK-client policy is included only in session results. Marked experimental while the managed-settings surface stabilizes.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 public sealed partial class SessionManagedSettingsResolvedData
 {
-    /// <summary>Whether enterprise policy disables bypass-permissions ("yolo") mode for this session. Deny-wins across layers, and forced on when `failClosed` is true.</summary>
+    /// <summary>Whether an explicit enterprise policy restriction disables bypass-permissions ("yolo") mode for this session. Deny-wins across layers; an unresolved policy does not force this on by itself.</summary>
     [JsonPropertyName("bypassPermissionsDisabled")]
     public required bool BypassPermissionsDisabled { get; set; }
 
@@ -7093,7 +7408,7 @@ public sealed partial class SessionManagedSettingsResolvedData
     [JsonPropertyName("deviceManaged")]
     public required bool DeviceManaged { get; set; }
 
-    /// <summary>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.</summary>
+    /// <summary>Whether managed policy could not be determined (e.g. a failed server fetch) and unresolved-policy safeguards remain active. This does not by itself disable bypass-permissions; `bypassPermissionsDisabled` reports only an explicit policy restriction.</summary>
     [JsonPropertyName("failClosed")]
     public required bool FailClosed { get; set; }
 
@@ -7106,6 +7421,11 @@ public sealed partial class SessionManagedSettingsResolvedData
     [JsonPropertyName("permissionsAllowIntersected")]
     public bool? PermissionsAllowIntersected { get; set; }
 
+    /// <summary>Reusable retained managed permission policy for managedSettings.permissions.evaluate, including source composition and session-local injection. Provided by live session snapshots; absent in older events. Refresh the context when managed policy changes.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("permissionsContext")]
+    public ManagedPermissionsContext? PermissionsContext { get; set; }
+
     /// <summary>Whether the policy-helper managed-settings layer was present. The policy helper is the weakest channel: it fills keys no enterprise source set and can never replace one.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("policyHelperManaged")]
@@ -7130,7 +7450,7 @@ public sealed partial class SessionManagedSettingsResolvedData
     public required ManagedSettingsResolvedSource Source { get; set; }
 }
 
-/// <summary>Runtime enforcement of enterprise managed settings: fires when the session blocks or caps a runtime action because enterprise policy governs it, so SDK clients can explain *why* an action was governed. Unlike `session.managed_settings_resolved` (which reports *what* is managed), this reports a concrete governed action — e.g. a user or host tried to turn on a bypass-permissions escalation while policy disables it. Emitted live (not persisted to the session event log) on user/host-initiated attempts only, never for silent policy application. Marked experimental while the managed-settings surface stabilizes.</summary>
+/// <summary>Runtime enforcement of enterprise managed settings: fires when the session blocks or caps a runtime action because enterprise policy governs it, so SDK clients can explain *why* an action was governed. Unlike `session.managed_settings_resolved` (which reports *what* is managed), this reports a concrete governed action — e.g. a user or host tried to turn on bypass permissions or Assisted Permissions while the corresponding policy disables it. Emitted live (not persisted to the session event log) on user/host-initiated attempts only, never for silent policy application. Marked experimental while the managed-settings surface stabilizes.</summary>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 public sealed partial class SessionManagedSettingsEnforcedData
 {
@@ -7138,7 +7458,7 @@ public sealed partial class SessionManagedSettingsEnforcedData
     [JsonPropertyName("action")]
     public required ManagedSettingsEnforcedAction Action { get; set; }
 
-    /// <summary>For a `bypass_permissions_blocked` action, which permission-escalation primitive was refused. Absent for actions without a specific escalation primitive.</summary>
+    /// <summary>For a `bypass_permissions_blocked` action, which permission-mode or escalation primitive was refused. Absent for actions without a specific primitive.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("escalation")]
     public ManagedSettingsEnforcedEscalation? Escalation { get; set; }
@@ -7151,7 +7471,7 @@ public sealed partial class SessionManagedSettingsEnforcedData
     [JsonPropertyName("message")]
     public required string Message { get; set; }
 
-    /// <summary>The managed setting key responsible for the enforcement (e.g. `permissions.disableBypassPermissionsMode`).</summary>
+    /// <summary>The managed setting key responsible for the enforcement (for example `permissions.disableBypassPermissionsMode` or `permissions.disableAssistedPermissionsMode`).</summary>
     [JsonPropertyName("setting")]
     public required string Setting { get; set; }
 }
@@ -7823,85 +8143,90 @@ public sealed partial class HandoffRepository
     public required string Owner { get; set; }
 }
 
-/// <summary>Request count and cost metrics.</summary>
-/// <remarks>Nested data type for <c>ShutdownModelMetricRequests</c>.</remarks>
-public sealed partial class ShutdownModelMetricRequests
+/// <summary>Request count and cost metrics for this model.</summary>
+/// <remarks>Nested data type for <c>UsageMetricsModelMetricRequests</c>.</remarks>
+public sealed partial class UsageMetricsModelMetricRequests
 {
-    /// <summary>Cumulative cost multiplier for requests to this model.</summary>
-    [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    /// <summary>User-initiated premium request cost (with multiplier applied).</summary>
     [JsonPropertyName("cost")]
-    public double? Cost { get; set; }
+    public required double Cost { get; set; }
 
-    /// <summary>Total number of API requests made to this model.</summary>
-    [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    /// <summary>Number of API requests made with this model.</summary>
     [JsonPropertyName("count")]
-    public long? Count { get; set; }
+    public required long Count { get; set; }
 }
 
-/// <summary>A token-type entry in a shutdown model metric, storing the accumulated token count.</summary>
-/// <remarks>Nested data type for <c>ShutdownModelMetricTokenDetail</c>.</remarks>
-public sealed partial class ShutdownModelMetricTokenDetail
+/// <summary>Per-model token-detail entry containing the accumulated token count for one token type.</summary>
+/// <remarks>Nested data type for <c>UsageMetricsModelMetricTokenDetail</c>.</remarks>
+public sealed partial class UsageMetricsModelMetricTokenDetail
 {
     /// <summary>Accumulated token count for this token type.</summary>
     [JsonPropertyName("tokenCount")]
     public required long TokenCount { get; set; }
 }
 
-/// <summary>Token usage breakdown.</summary>
-/// <remarks>Nested data type for <c>ShutdownModelMetricUsage</c>.</remarks>
-public sealed partial class ShutdownModelMetricUsage
+/// <summary>Token usage metrics for this model.</summary>
+/// <remarks>Nested data type for <c>UsageMetricsModelMetricUsage</c>.</remarks>
+public sealed partial class UsageMetricsModelMetricUsage
 {
-    /// <summary>Total tokens read from prompt cache across all requests.</summary>
+    /// <summary>Total tokens read from prompt cache.</summary>
     [JsonPropertyName("cacheReadTokens")]
     public required long CacheReadTokens { get; set; }
 
-    /// <summary>Total tokens written to prompt cache across all requests.</summary>
+    /// <summary>Total tokens written to prompt cache.</summary>
     [JsonPropertyName("cacheWriteTokens")]
     public required long CacheWriteTokens { get; set; }
 
-    /// <summary>Total input tokens consumed across all requests to this model.</summary>
+    /// <summary>Total input tokens consumed.</summary>
     [JsonPropertyName("inputTokens")]
     public required long InputTokens { get; set; }
 
-    /// <summary>Total output tokens produced across all requests to this model.</summary>
+    /// <summary>Total output tokens produced.</summary>
     [JsonPropertyName("outputTokens")]
     public required long OutputTokens { get; set; }
 
-    /// <summary>Total reasoning tokens produced across all requests to this model.</summary>
+    /// <summary>Total output tokens used for reasoning.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("reasoningTokens")]
     public long? ReasoningTokens { get; set; }
 }
 
-/// <summary>Per-model shutdown metrics with request counts, token usage, nano-AI units, and token details.</summary>
-/// <remarks>Nested data type for <c>ShutdownModelMetric</c>.</remarks>
-public sealed partial class ShutdownModelMetric
+/// <summary>Per-model usage metrics, including request counts/costs, token usage, nano-AI units, and per-token-type details.</summary>
+/// <remarks>Nested data type for <c>UsageMetricsModelMetric</c>.</remarks>
+public sealed partial class UsageMetricsModelMetric
 {
-    /// <summary>Request count and cost metrics.</summary>
+    /// <summary>Completeness of this model's reported AI-credit subtotal. Explicitly reported zero is complete, not unavailable.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("aiCreditsStatus")]
+    public AiCreditsStatus? AiCreditsStatus { get; set; }
+
+    /// <summary>Latest known prompt-cache expiration for this model. A timestamp in the past indicates that the observed cache has expired.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("cacheExpiresAt")]
+    public DateTimeOffset? CacheExpiresAt { get; set; }
+
+    /// <summary>Request count and cost metrics for this model.</summary>
     [JsonPropertyName("requests")]
-    public required ShutdownModelMetricRequests Requests { get; set; }
+    public required UsageMetricsModelMetricRequests Requests { get; set; }
 
     /// <summary>Token count details per type.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("tokenDetails")]
-    public IDictionary<string, ShutdownModelMetricTokenDetail>? TokenDetails { get; set; }
+    public IDictionary<string, UsageMetricsModelMetricTokenDetail>? TokenDetails { get; set; }
 
     /// <summary>Accumulated nano-AI units cost for this model.</summary>
-    [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("totalNanoAiu")]
     public double? TotalNanoAiu { get; set; }
 
-    /// <summary>Token usage breakdown.</summary>
+    /// <summary>Token usage metrics for this model.</summary>
     [JsonPropertyName("usage")]
-    public required ShutdownModelMetricUsage Usage { get; set; }
+    public required UsageMetricsModelMetricUsage 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>Usage attributed to one agent instance, including its identity, API duration, AI units, and per-model breakdown.</summary>
+/// <remarks>Nested data type for <c>UsageMetricsAgentMetric</c>.</remarks>
+public sealed partial class UsageMetricsAgentMetric
 {
     /// <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)]
@@ -7915,7 +8240,7 @@ public sealed partial class ShutdownAgentMetric
 
     /// <summary>Per-model usage for this agent, keyed by model identifier.</summary>
     [JsonPropertyName("modelMetrics")]
-    public required IDictionary<string, ShutdownModelMetric> ModelMetrics { get; set; }
+    public required IDictionary<string, UsageMetricsModelMetric> ModelMetrics { get; set; }
 
     /// <summary>Time spent in model API calls by this agent, in milliseconds.</summary>
     [JsonConverter(typeof(MillisecondsTimeSpanConverter))]
@@ -7927,811 +8252,846 @@ public sealed partial class ShutdownAgentMetric
     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>Aggregated code change metrics.</summary>
+/// <remarks>Nested data type for <c>UsageMetricsCodeChanges</c>.</remarks>
+public sealed partial class UsageMetricsCodeChanges
 {
-    /// <summary>List of file paths that were modified during the session.</summary>
+    /// <summary>Distinct file paths modified during the session.</summary>
     [JsonPropertyName("filesModified")]
     public required string[] FilesModified { get; set; }
 
-    /// <summary>Total number of lines added during the session.</summary>
+    /// <summary>Number of distinct files modified.</summary>
+    [JsonPropertyName("filesModifiedCount")]
+    public required long FilesModifiedCount { get; set; }
+
+    /// <summary>Total lines of code added.</summary>
     [JsonPropertyName("linesAdded")]
     public required long LinesAdded { get; set; }
 
-    /// <summary>Total number of lines removed during the session.</summary>
+    /// <summary>Total lines of code removed.</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
+/// <summary>A neutral reference to the model provider that produced a model: an opaque id, a human-readable label, and the provider kind. Carried on each enumerated Model so consumers can group by provider without reaching into a provider-shaped internal type.</summary>
+/// <remarks>Nested data type for <c>ModelProviderRef</c>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed partial class ModelProviderRef
 {
-    /// <summary>Accumulated token count for this token type.</summary>
-    [JsonPropertyName("tokenCount")]
-    public required long TokenCount { get; set; }
+    /// <summary>Opaque, stable id of the provider that produced this model. Matches the enumerated `ModelProviderDescriptor.id`.</summary>
+    [JsonPropertyName("id")]
+    public required string Id { get; set; }
+
+    /// <summary>The provider kind.</summary>
+    [JsonPropertyName("kind")]
+    public required ModelProviderKind Kind { get; set; }
+
+    /// <summary>Human-readable provider label, owned by the runtime so every consumer renders identical text.</summary>
+    [JsonPropertyName("label")]
+    public required string Label { get; set; }
 }
 
-/// <summary>Internal prompt-cache expiration state for one model.</summary>
-/// <remarks>Nested data type for <c>UsageCheckpointModelCacheState</c>.</remarks>
-internal sealed partial class UsageCheckpointModelCacheState
+/// <summary>Usage for one recorded provider and model, without merging identical model IDs across providers.</summary>
+/// <remarks>Nested data type for <c>UsageMetricsProviderModelMetric</c>.</remarks>
+public sealed partial class UsageMetricsProviderModelMetric
 {
-    /// <summary>Latest known prompt-cache expiration.</summary>
-    [JsonPropertyName("cacheExpiresAt")]
-    public required DateTimeOffset CacheExpiresAt { get; set; }
+    /// <summary>Request, token, and cost totals for this provider/model.</summary>
+    [JsonPropertyName("metrics")]
+    public required UsageMetricsModelMetric Metrics { get; set; }
 
-    /// <summary>Retained cache lifetime in seconds, used to refresh expiration after a cache read.</summary>
-    [JsonInclude]
-    [JsonPropertyName("cacheTtlSeconds")]
-    internal required long CacheTtlSeconds { get; set; }
+    /// <summary>Model display name captured at call time, when known.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("modelDisplayName")]
+    public string? ModelDisplayName { get; set; }
 
-    /// <summary>Model identifier associated with this cache state.</summary>
+    /// <summary>Model identity, or null for legacy aggregate-only usage.</summary>
     [JsonPropertyName("modelId")]
-    public required string ModelId { get; set; }
+    public string? ModelId { get; set; }
+
+    /// <summary>Provider identity and product label captured when the call was dispatched; null when unknown.</summary>
+    [JsonPropertyName("provider")]
+    public ModelProviderRef? Provider { get; set; }
 }
 
-/// <summary>Token usage detail for a single billing category.</summary>
-/// <remarks>Nested data type for <c>CompactionCompleteCompactionTokensUsedCopilotUsageTokenDetail</c>.</remarks>
-public sealed partial class CompactionCompleteCompactionTokensUsedCopilotUsageTokenDetail
+/// <summary>Session-wide token-detail entry containing the accumulated token count for one token type.</summary>
+/// <remarks>Nested data type for <c>UsageMetricsTokenDetail</c>.</remarks>
+public sealed partial class UsageMetricsTokenDetail
 {
-    /// <summary>Number of tokens in this billing batch.</summary>
-    [JsonPropertyName("batchSize")]
-    public required long BatchSize { get; set; }
-
-    /// <summary>Cost per batch of tokens.</summary>
-    [JsonPropertyName("costPerBatch")]
-    public required long CostPerBatch { get; set; }
-
-    /// <summary>Model responsible for this billing entry.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("model")]
-    public string? Model { get; set; }
-
-    /// <summary>Total token count for this entry.</summary>
+    /// <summary>Accumulated token count for this token type.</summary>
     [JsonPropertyName("tokenCount")]
     public required long TokenCount { get; set; }
-
-    /// <summary>Token category (e.g., "input", "output").</summary>
-    [JsonPropertyName("tokenType")]
-    public required string TokenType { get; set; }
 }
 
-/// <summary>Per-request cost and usage data from the CAPI copilot_usage response field.</summary>
-/// <remarks>Nested data type for <c>CompactionCompleteCompactionTokensUsedCopilotUsage</c>.</remarks>
-internal sealed partial class CompactionCompleteCompactionTokensUsedCopilotUsage
+/// <summary>Accumulated session usage metrics, including premium request cost, token counts, model breakdown, and code-change totals.</summary>
+/// <remarks>Nested data type for <c>UsageGetMetricsResult</c>.</remarks>
+public sealed partial class UsageGetMetricsResult
 {
-    /// <summary>Default billing model for token details that do not identify their own model.</summary>
+    /// <summary>Per-agent usage metrics, keyed by agent instance identifier. The main conversation uses the stable key `main`.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonInclude]
-    [JsonPropertyName("model")]
-    internal string? Model { get; set; }
+    [JsonPropertyName("agentMetrics")]
+    public IDictionary<string, UsageMetricsAgentMetric>? AgentMetrics { get; set; }
 
-    /// <summary>Itemized token usage breakdown.</summary>
+    /// <summary>Completeness of totalNanoAiu. Numeric totals remain the reported subtotal; zero is not a claim of free usage when unavailable.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonInclude]
-    [JsonPropertyName("tokenDetails")]
-    internal CompactionCompleteCompactionTokensUsedCopilotUsageTokenDetail[]? TokenDetails { get; set; }
+    [JsonPropertyName("aiCreditsStatus")]
+    public AiCreditsStatus? AiCreditsStatus { get; set; }
 
-    /// <summary>Total cost in nano-AI units for this request.</summary>
-    [JsonPropertyName("totalNanoAiu")]
-    public required double TotalNanoAiu { get; set; }
-}
+    /// <summary>Aggregated code change metrics.</summary>
+    [JsonPropertyName("codeChanges")]
+    public required UsageMetricsCodeChanges CodeChanges { get; set; }
 
-/// <summary>Token usage breakdown for the compaction LLM call (aligned with assistant.usage format).</summary>
-/// <remarks>Nested data type for <c>CompactionCompleteCompactionTokensUsed</c>.</remarks>
-public sealed partial class CompactionCompleteCompactionTokensUsed
-{
-    /// <summary>Cached input tokens reused in the compaction LLM call.</summary>
+    /// <summary>Currently active model identifier.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("cacheReadTokens")]
-    public long? CacheReadTokens { get; set; }
+    [JsonPropertyName("currentModel")]
+    public string? CurrentModel { get; set; }
 
-    /// <summary>Tokens written to prompt cache in the compaction LLM call.</summary>
+    /// <summary>Input tokens from the most recent main-agent API call.</summary>
+    [JsonPropertyName("lastCallInputTokens")]
+    public required long LastCallInputTokens { get; set; }
+
+    /// <summary>Output tokens from the most recent main-agent API call.</summary>
+    [JsonPropertyName("lastCallOutputTokens")]
+    public required long LastCallOutputTokens { get; set; }
+
+    /// <summary>Per-model token and request metrics, keyed by model identifier.</summary>
+    [JsonPropertyName("modelMetrics")]
+    public required IDictionary<string, UsageMetricsModelMetric> ModelMetrics { get; set; }
+
+    /// <summary>
+    /// Provider-attributed model metrics, ordered by first observed provider and model.
+    /// Null attribution preserves historical usage whose provider or model was not recorded.
+    /// </summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("cacheWriteTokens")]
-    public long? CacheWriteTokens { get; set; }
+    [JsonPropertyName("providerModelMetrics")]
+    public UsageMetricsProviderModelMetric[]? ProviderModelMetrics { get; set; }
 
-    /// <summary>Per-request cost and usage data from the CAPI copilot_usage response field.</summary>
+    /// <summary>ISO 8601 timestamp when the session started.</summary>
+    [JsonPropertyName("sessionStartTime")]
+    public required DateTimeOffset SessionStartTime { get; set; }
+
+    /// <summary>Session-wide per-token-type accumulated token counts.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonInclude]
-    [JsonPropertyName("copilotUsage")]
-    internal CompactionCompleteCompactionTokensUsedCopilotUsage? CopilotUsage { get; set; }
+    [JsonPropertyName("tokenDetails")]
+    public IDictionary<string, UsageMetricsTokenDetail>? TokenDetails { get; set; }
 
-    /// <summary>Duration of the compaction LLM call in milliseconds.</summary>
+    /// <summary>Total time spent in model API calls (milliseconds).</summary>
     [JsonConverter(typeof(MillisecondsTimeSpanConverter))]
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("duration")]
-    public TimeSpan? Duration { get; set; }
+    [JsonPropertyName("totalApiDurationMs")]
+    public required TimeSpan TotalApiDuration { get; set; }
 
-    /// <summary>Input tokens consumed by the compaction LLM call.</summary>
+    /// <summary>Session-wide accumulated nano-AI units cost.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("inputTokens")]
-    public long? InputTokens { get; set; }
+    [JsonPropertyName("totalNanoAiu")]
+    public double? TotalNanoAiu { get; set; }
 
-    /// <summary>Model identifier used for the compaction LLM call.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("model")]
-    public string? Model { get; set; }
+    /// <summary>Total user-initiated premium request cost across all models (may be fractional due to multipliers).</summary>
+    [JsonPropertyName("totalPremiumRequestCost")]
+    public required double TotalPremiumRequestCost { get; set; }
 
-    /// <summary>Output tokens produced by the compaction LLM call.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("outputTokens")]
-    public long? OutputTokens { get; set; }
+    /// <summary>Raw count of user-initiated API requests.</summary>
+    [JsonPropertyName("totalUserRequests")]
+    public required long TotalUserRequests { get; set; }
 }
 
-/// <summary>Original request-level and effective conversation reasoning effort for a provider history boundary; the historical type name is retained for compatibility.</summary>
-/// <remarks>Nested data type for <c>ResponsesReasoning</c>.</remarks>
-public sealed partial class ResponsesReasoning
+/// <summary>Request count and cost metrics.</summary>
+/// <remarks>Nested data type for <c>ShutdownModelMetricRequests</c>.</remarks>
+public sealed partial class ShutdownModelMetricRequests
 {
-    /// <summary>Effective effort selected before this message, independent of the response-level reasoning field.</summary>
-    [JsonPropertyName("effort")]
-    public required string Effort { get; set; }
+    /// <summary>Cumulative cost multiplier for requests to this model.</summary>
+    [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("cost")]
+    public double? Cost { get; set; }
 
-    /// <summary>Original request-level effort, retained while replaying this conversation prefix.</summary>
-    [JsonPropertyName("initialEffort")]
-    public required string InitialEffort { get; set; }
+    /// <summary>Total number of API requests made to this model.</summary>
+    [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("count")]
+    public long? Count { get; set; }
+}
 
-    /// <summary>Provider model whose reasoning settings this boundary records.</summary>
-    [JsonPropertyName("model")]
-    public required string Model { get; set; }
+/// <summary>A token-type entry in a shutdown model metric, storing the accumulated token count.</summary>
+/// <remarks>Nested data type for <c>ShutdownModelMetricTokenDetail</c>.</remarks>
+public sealed partial class ShutdownModelMetricTokenDetail
+{
+    /// <summary>Accumulated token count for this token type.</summary>
+    [JsonPropertyName("tokenCount")]
+    public required long TokenCount { get; set; }
 }
 
-/// <summary>Nested data type for <c>PermissionRecoveryAttempt</c>.</summary>
-public sealed partial class PermissionRecoveryAttempt
+/// <summary>Token usage breakdown.</summary>
+/// <remarks>Nested data type for <c>ShutdownModelMetricUsage</c>.</remarks>
+public sealed partial class ShutdownModelMetricUsage
 {
-    /// <summary>Unique identifier for this attempt record.</summary>
-    [JsonPropertyName("attemptId")]
-    public required string AttemptId { get; set; }
+    /// <summary>Total tokens read from prompt cache across all requests.</summary>
+    [JsonPropertyName("cacheReadTokens")]
+    public required long CacheReadTokens { get; set; }
 
-    /// <summary>How the runtime handled this attempt.</summary>
-    [JsonPropertyName("disposition")]
-    public required PermissionRecoveryAttemptDisposition Disposition { get; set; }
+    /// <summary>Total tokens written to prompt cache across all requests.</summary>
+    [JsonPropertyName("cacheWriteTokens")]
+    public required long CacheWriteTokens { get; set; }
 
-    /// <summary>One-based position of this attempt in the episode.</summary>
-    [JsonPropertyName("ordinal")]
-    public required long Ordinal { get; set; }
+    /// <summary>Total input tokens consumed across all requests to this model.</summary>
+    [JsonPropertyName("inputTokens")]
+    public required long InputTokens { get; set; }
 
-    /// <summary>Controlled permission request kind, such as shell, path, URL, or tool.</summary>
-    [JsonPropertyName("permissionKind")]
-    public required string PermissionKind { get; set; }
+    /// <summary>Total output tokens produced across all requests to this model.</summary>
+    [JsonPropertyName("outputTokens")]
+    public required long OutputTokens { get; set; }
 
-    /// <summary>Controlled reason for the attempt disposition.</summary>
-    [JsonPropertyName("reason")]
-    public required PermissionRecoveryAttemptReason Reason { get; set; }
+    /// <summary>Total reasoning tokens produced across all requests to this model.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("reasoningTokens")]
+    public long? ReasoningTokens { get; set; }
+}
 
-    /// <summary>Relationship between this attempt and earlier attempts in the episode.</summary>
-    [JsonPropertyName("relation")]
-    public required PermissionRecoveryAttemptRelation Relation { get; set; }
+/// <summary>Per-model shutdown metrics with request counts, token usage, nano-AI units, and token details.</summary>
+/// <remarks>Nested data type for <c>ShutdownModelMetric</c>.</remarks>
+public sealed partial class ShutdownModelMetric
+{
+    /// <summary>Request count and cost metrics.</summary>
+    [JsonPropertyName("requests")]
+    public required ShutdownModelMetricRequests Requests { get; set; }
 
-    /// <summary>SHA-256 fingerprint of normalized request data; raw permission arguments are not included.</summary>
-    [JsonPropertyName("requestFingerprint")]
-    public required string RequestFingerprint { get; set; }
+    /// <summary>Token count details per type.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("tokenDetails")]
+    public IDictionary<string, ShutdownModelMetricTokenDetail>? TokenDetails { get; set; }
 
-    /// <summary>Tool-call identifier associated with this attempt, when available.</summary>
+    /// <summary>Accumulated nano-AI units cost for this model.</summary>
+    [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("toolCallId")]
-    public string? ToolCallId { get; set; }
+    [JsonPropertyName("totalNanoAiu")]
+    public double? TotalNanoAiu { get; set; }
+
+    /// <summary>Token usage breakdown.</summary>
+    [JsonPropertyName("usage")]
+    public required ShutdownModelMetricUsage Usage { get; set; }
 }
 
-/// <summary>Authoritative snapshot of an Autopilot permission-recovery episode.</summary>
-/// <remarks>Nested data type for <c>PermissionRecoveryData</c>.</remarks>
-public sealed partial class PermissionRecoveryData
+/// <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>Ordered privacy-safe record of permission attempts and the successful alternative, when any.</summary>
-    [JsonPropertyName("attempts")]
-    public required PermissionRecoveryAttempt[] Attempts { get; set; }
-
-    /// <summary>Stable identifier shared by every transition in this recovery episode.</summary>
-    [JsonPropertyName("episodeId")]
-    public required string EpisodeId { get; set; }
+    /// <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>Maximum number of distinct autonomous permission attempts allowed before escalation.</summary>
-    [JsonPropertyName("maxAttempts")]
-    public required long MaxAttempts { get; set; }
+    /// <summary>Configured agent name, when this is a subagent.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("agentName")]
+    public string? AgentName { get; set; }
 
-    /// <summary>Policy selected from the current client's response capability; mode or client changes may update it during recovery.</summary>
-    [JsonPropertyName("onBlocked")]
-    public required PermissionRecoveryOnBlocked OnBlocked { 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>Controlled reason for the latest episode transition.</summary>
-    [JsonPropertyName("reason")]
-    public required PermissionRecoveryReason Reason { 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>Current lifecycle state of the recovery episode.</summary>
-    [JsonPropertyName("status")]
-    public required PermissionRecoveryStatus Status { get; set; }
+    /// <summary>Accumulated nano-AI units cost for this agent.</summary>
+    [JsonPropertyName("totalNanoAiu")]
+    public required double TotalNanoAiu { get; set; }
 }
 
-/// <summary>Structured reason that the task cannot continue without intervention.</summary>
-/// <remarks>Nested data type for <c>TaskBlocker</c>.</remarks>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed partial class TaskBlocker
+/// <summary>Aggregate code change metrics for the session.</summary>
+/// <remarks>Nested data type for <c>ShutdownCodeChanges</c>.</remarks>
+public sealed partial class ShutdownCodeChanges
 {
-    /// <summary>Category of intervention that blocked the task.</summary>
-    [JsonPropertyName("kind")]
-    public required TaskBlockerKind Kind { get; set; }
+    /// <summary>List of file paths that were modified during the session.</summary>
+    [JsonPropertyName("filesModified")]
+    public required string[] FilesModified { get; set; }
 
-    /// <summary>Permission-recovery episode that produced this blocker.</summary>
-    [JsonPropertyName("permissionRecovery")]
-    public required PermissionRecoveryData PermissionRecovery { get; set; }
+    /// <summary>Total number of lines added during the session.</summary>
+    [JsonPropertyName("linesAdded")]
+    public required long LinesAdded { get; set; }
 
-    /// <summary>Controlled reason for the current blocked state.</summary>
-    [JsonPropertyName("reason")]
-    public required PermissionRecoveryReason Reason { get; set; }
+    /// <summary>Total number of lines removed during the session.</summary>
+    [JsonPropertyName("linesRemoved")]
+    public required long LinesRemoved { get; set; }
+}
 
-    /// <summary>Whether a later user response or steering message can resume the task.</summary>
-    [JsonPropertyName("resumable")]
-    public required bool Resumable { 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
+{
+    /// <summary>Accumulated token count for this token type.</summary>
+    [JsonPropertyName("tokenCount")]
+    public required long TokenCount { get; set; }
 }
 
-/// <summary>Inclusive durable event range summarized by a completion receipt.</summary>
-/// <remarks>Nested data type for <c>CompletionReceiptEventRange</c>.</remarks>
-public sealed partial class CompletionReceiptEventRange
+/// <summary>Internal prompt-cache expiration state for one model.</summary>
+/// <remarks>Nested data type for <c>UsageCheckpointModelCacheState</c>.</remarks>
+internal sealed partial class UsageCheckpointModelCacheState
 {
-    /// <summary>Identifier of the assistant turn-end event that ends the covered exchange. Always equals the receipt's sourceEventId, so either field is a valid join key.</summary>
-    [JsonPropertyName("endEventId")]
-    public required string EndEventId { get; set; }
+    /// <summary>Latest known prompt-cache expiration.</summary>
+    [JsonPropertyName("cacheExpiresAt")]
+    public required DateTimeOffset CacheExpiresAt { get; set; }
 
-    /// <summary>Identifier of the user message that starts the covered exchange.</summary>
-    [JsonPropertyName("startEventId")]
-    public required string StartEventId { get; set; }
+    /// <summary>Retained cache lifetime in seconds, used to refresh expiration after a cache read.</summary>
+    [JsonInclude]
+    [JsonPropertyName("cacheTtlSeconds")]
+    internal required long CacheTtlSeconds { get; set; }
+
+    /// <summary>Model identifier associated with this cache state.</summary>
+    [JsonPropertyName("modelId")]
+    public required string ModelId { get; set; }
 }
 
-/// <summary>Final structured tool completion in the covered event range.</summary>
-/// <remarks>Nested data type for <c>CompletionReceiptFinalTool</c>.</remarks>
-public sealed partial class CompletionReceiptFinalTool
+/// <summary>Authoritative budget measurements and policy metadata, independent of provider.</summary>
+/// <remarks>Nested data type for <c>ProviderQuotaBudgetMetadata</c>.</remarks>
+public sealed partial class ProviderQuotaBudgetMetadata
 {
-    /// <summary>Process exit code from a structured shell result, when available.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("exitCode")]
-    public long? ExitCode { get; set; }
+    /// <summary>Exact measured consumption in the budget's unit.</summary>
+    [JsonPropertyName("consumed")]
+    public required double Consumed { get; set; }
 
-    /// <summary>Structured success or failure status from the tool completion event.</summary>
-    [JsonPropertyName("status")]
-    public required CompletionReceiptToolStatus Status { get; set; }
+    /// <summary>Exact budget entitlement, retaining incumbent fractional-unit compatibility.</summary>
+    [JsonPropertyName("entitlement")]
+    public required double Entitlement { get; set; }
 
-    /// <summary>Unique identifier of the completed tool call.</summary>
-    [JsonPropertyName("toolCallId")]
-    public required string ToolCallId { get; set; }
+    /// <summary>Usage beyond entitlement, in the budget's unit.</summary>
+    [JsonPropertyName("overage")]
+    public required double Overage { get; set; }
 
-    /// <summary>Tool name from the matching tool execution start event, when available.</summary>
+    /// <summary>Whether additional usage is allowed when the budget is exhausted.</summary>
+    [JsonPropertyName("overageAllowedWhenExhausted")]
+    public required bool OverageAllowedWhenExhausted { get; set; }
+
+    /// <summary>Optional additional-usage budget cap.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("toolName")]
-    public string? ToolName { get; set; }
-}
+    [JsonPropertyName("overageLimit")]
+    public double? OverageLimit { get; set; }
 
-/// <summary>Nested data type for <c>FusionCritic</c>.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed partial class FusionCritic
-{
-    /// <summary>Concrete model selected for this critic.</summary>
-    [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-    [JsonPropertyName("model")]
-    public required string Model { get; set; }
+    /// <summary>Service-reported remaining percentage for authoritative budget presentation.</summary>
+    [JsonPropertyName("remainingPercentage")]
+    public required double RemainingPercentage { get; set; }
 
-    /// <summary>Unique execution phase identifier for this critic.</summary>
-    [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-    [JsonPropertyName("phaseId")]
-    public required string PhaseId { get; set; }
+    /// <summary>Reset instant in epoch milliseconds when this budget actually defines a window.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("resetAtEpochMs")]
+    public double? ResetAtEpochMs { get; set; }
 
-    /// <summary>Explicit reasoning effort selected for this critic, if supplied.</summary>
-    [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+    /// <summary>Whether the reset instant is an estimate.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("reasoningEffort")]
-    public string? ReasoningEffort { get; set; }
-}
+    [JsonPropertyName("resetEstimated")]
+    public bool? ResetEstimated { get; set; }
 
-/// <summary>Durable server recommendation for subsequent HydraFusion turns.</summary>
-/// <remarks>Nested data type for <c>FusionFollowUpRecommendation</c>.</remarks>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed partial class FusionFollowUpRecommendation
-{
-    /// <summary>Recommended routing action for the next compaction turn.</summary>
-    [JsonPropertyName("compactionTurn")]
-    public required FusionFollowUpAction CompactionTurn { get; set; }
+    /// <summary>Whether this budget uses token-based billing.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("tokenBasedBilling")]
+    public bool? TokenBasedBilling { get; set; }
 
-    /// <summary>Recommended routing action for the next user-message turn.</summary>
-    [JsonPropertyName("userTurn")]
-    public required FusionFollowUpAction UserTurn { get; set; }
+    /// <summary>Whether the budget has unlimited entitlement.</summary>
+    [JsonPropertyName("unlimited")]
+    public required bool Unlimited { get; set; }
+
+    /// <summary>Whether service policy allows continued usage after exhaustion.</summary>
+    [JsonPropertyName("usageAllowedWhenExhausted")]
+    public required bool UsageAllowedWhenExhausted { get; set; }
 }
 
-/// <summary>Presentation-neutral phase planned for a HydraFusion turn.</summary>
-/// <remarks>Nested data type for <c>FusionPhasePlanStep</c>.</remarks>
+/// <summary>An authoritative monthly usage reading for the observation's provider, account, and service.</summary>
+/// <remarks>Nested data type for <c>ProviderMonthlyUsage</c>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed partial class FusionPhasePlanStep
+public sealed partial class ProviderMonthlyUsage
 {
-    /// <summary>Whether the phase executes only when an earlier phase requests it.</summary>
-    [JsonPropertyName("conditional")]
-    public required bool Conditional { get; set; }
+    /// <summary>Nonnegative finite consumption reported by the service, preserving zero and fractions. Present only when state is available; never computed from tokens or balance differences.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("consumedQuantity")]
+    public double? ConsumedQuantity { get; set; }
 
-    /// <summary>Kind of phase that may execute.</summary>
-    [JsonPropertyName("kind")]
-    public required FusionPhaseKind Kind { get; set; }
+    /// <summary>Start of the service-reported monthly billing cycle, in UTC RFC 3339.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("cycleStart")]
+    public string? CycleStart { get; set; }
 
-    /// <summary>Semantic role assigned to the phase.</summary>
-    [JsonPropertyName("role")]
-    public required string Role { get; set; }
+    /// <summary>Service read time in UTC RFC 3339, not a ledger reconciliation watermark or confirmation of the latest inference charge.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("queriedAt")]
+    public string? QueriedAt { get; set; }
 
-    /// <summary>Conversation scope in which the phase executes.</summary>
+    /// <summary>End of the service-reported monthly billing cycle, in UTC RFC 3339.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("resetOn")]
+    public string? ResetOn { get; set; }
+
+    /// <summary>Identity scope of the reading within its provider and service.</summary>
     [JsonPropertyName("scope")]
-    public required FusionConversationScope Scope { get; set; }
+    public required ProviderMonthlyUsageScope Scope { get; set; }
+
+    /// <summary>Availability of monthly consumption. Missing or unavailable usage must never be interpreted as zero.</summary>
+    [JsonPropertyName("state")]
+    public required ProviderMonthlyUsageState State { get; set; }
+
+    /// <summary>Unit of consumedQuantity; independent of the parent observation's balance unit.</summary>
+    [JsonPropertyName("unit")]
+    public required ProviderQuotaUnit Unit { get; set; }
 }
 
-/// <summary>Validated HydraFusion routing capability scores.</summary>
-/// <remarks>Nested data type for <c>FusionScores</c>.</remarks>
+/// <summary>An account quota reading. Absence of a quantity is unknown, never zero.</summary>
+/// <remarks>Nested data type for <c>ProviderQuotaState</c>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed partial class FusionScores
+public sealed partial class ProviderQuotaState
 {
-    /// <summary>Code-generation capability score returned by the authenticated router.</summary>
-    [JsonPropertyName("codeGen")]
-    public required double CodeGen { get; set; }
+    /// <summary>Whether the service permits access, independently of balance.</summary>
+    [JsonPropertyName("accessState")]
+    public required ProviderQuotaAccessState AccessState { get; set; }
 
-    /// <summary>Debugging capability score returned by the authenticated router.</summary>
-    [JsonPropertyName("debugging")]
-    public required double Debugging { get; set; }
+    /// <summary>Service error code or client acquisition category, separate from the business-state reason.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("acquisitionError")]
+    public string? AcquisitionError { get; set; }
 
-    /// <summary>Reasoning capability score returned by the authenticated router.</summary>
-    [JsonPropertyName("reasoning")]
-    public required double Reasoning { get; set; }
+    /// <summary>Acquisition outcome. Unavailable/failed readings have no service verdict; access/capacity unavailable are compatibility placeholders only.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("acquisitionStatus")]
+    public ProviderQuotaAcquisitionStatus? AcquisitionStatus { get; set; }
 
-    /// <summary>Tool-use capability score returned by the authenticated router.</summary>
-    [JsonPropertyName("toolUse")]
-    public required double ToolUse { get; set; }
-}
+    /// <summary>Independently reported signed 64-bit available quantity. Zero does not override the service access/capacity verdict; omission and null are preserved.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("availableQuantity")]
+    public long? AvailableQuantity { get; set; }
 
-/// <summary>Optional line range to scope the attachment to a specific section of the file.</summary>
-/// <remarks>Nested data type for <c>AttachmentFileLineRange</c>.</remarks>
-public sealed partial class AttachmentFileLineRange
-{
-    /// <summary>End line number (1-based, inclusive).</summary>
-    [JsonPropertyName("end")]
-    public required long End { get; set; }
+    /// <summary>Optional metadata for an authoritative budget. Advisory balances and admission-only observations do not populate this.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("budgetMetadata")]
+    public ProviderQuotaBudgetMetadata? BudgetMetadata { get; set; }
 
-    /// <summary>Start line number (1-based).</summary>
-    [JsonPropertyName("start")]
-    public required long Start { get; set; }
-}
+    /// <summary>Service capacity state; missing quantities do not imply exhaustion.</summary>
+    [JsonPropertyName("capacityState")]
+    public required ProviderQuotaCapacityState CapacityState { get; set; }
 
-/// <summary>File attachment.</summary>
-/// <remarks>The <c>file</c> variant of <see cref="Attachment"/>.</remarks>
-public sealed partial class AttachmentFile : Attachment
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "file";
+    /// <summary>Key for the backwards-compatible snapshots projection, when the authoritative budget supports that contract.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("compatibilityKey")]
+    public string? CompatibilityKey { get; set; }
 
-    /// <summary>Internal: content-addressed id of the session.binary_asset event holding this attachment's model-facing bytes (e.g. "sha256:..."). Absent externally.</summary>
+    /// <summary>Independently reported signed 64-bit entitlement. -1 is an unlimited sentinel, not a capacity-state rewrite; omission and null are preserved.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("assetId")]
-    public string? AssetId { get; set; }
+    [JsonPropertyName("entitledQuantity")]
+    public long? EntitledQuantity { get; set; }
 
-    /// <summary>Internal: decoded byte length of the attachment's model-facing bytes. Absent externally.</summary>
+    /// <summary>Explicit service admission flag, when reported.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("byteLength")]
-    public long? ByteLength { get; set; }
+    [JsonPropertyName("hasQuota")]
+    public bool? HasQuota { get; set; }
 
-    /// <summary>User-facing display name for the attachment.</summary>
-    [JsonPropertyName("displayName")]
-    public required string DisplayName { get; set; }
+    /// <summary>HTTP status from acquisition, when available.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("httpStatus")]
+    public long? HttpStatus { get; set; }
 
-    /// <summary>Optional line range to scope the attachment to a specific section of the file.</summary>
+    /// <summary>Service-reported monthly consumption, independent of quota balances and per-call or session cost. Omitted when the service does not report monthly usage.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("lineRange")]
-    public AttachmentFileLineRange? LineRange { get; set; }
+    [JsonPropertyName("monthlyUsage")]
+    public ProviderMonthlyUsage? MonthlyUsage { get; set; }
 
-    /// <summary>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.</summary>
+    /// <summary>Whether this is a GET account reading or a pre-response admission observation. Observations are never merged across kinds.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("mimeType")]
-    public string? MimeType { get; set; }
+    [JsonPropertyName("observationKind")]
+    public ProviderQuotaObservationKind? ObservationKind { get; set; }
 
-    /// <summary>Internal: why model-facing bytes are absent from persistence. Absent externally.</summary>
+    /// <summary>When the runtime observed this reading, not a charge timestamp or guarantee that consumption has settled.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("omittedReason")]
-    public OmittedBinaryOmittedReason? OmittedReason { get; set; }
+    [JsonPropertyName("observedAt")]
+    public string? ObservedAt { get; set; }
 
-    /// <summary>Absolute file path.</summary>
-    [JsonPropertyName("path")]
-    public required string Path { get; set; }
+    /// <summary>Provider/account whose service reported this state.</summary>
+    [JsonPropertyName("provider")]
+    public required ModelProviderRef Provider { get; set; }
 
-    /// <summary>Frozen rendered line this attachment contributed to the &lt;tagged_files&gt; 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 &lt;tagged_files&gt; (mutually exclusive with assetId, which marks bytes sent natively).</summary>
+    /// <summary>Whether quantities are authoritative budget measurements, advisory balances, or absent. Only authoritative budgets support percentage presentation.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("taggedFilesEntry")]
-    public string? TaggedFilesEntry { get; set; }
-}
+    [JsonPropertyName("quantityKind")]
+    public ProviderQuotaQuantityKind? QuantityKind { get; set; }
 
-/// <summary>Directory attachment.</summary>
-/// <remarks>The <c>directory</c> variant of <see cref="Attachment"/>.</remarks>
-public sealed partial class AttachmentDirectory : Attachment
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "directory";
+    /// <summary>Service-owned quota identifier within this provider.</summary>
+    [JsonPropertyName("quotaId")]
+    public required string QuotaId { get; set; }
 
-    /// <summary>User-facing display name for the attachment.</summary>
-    [JsonPropertyName("displayName")]
-    public required string DisplayName { get; set; }
+    /// <summary>Service-reported explanation for the state.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("reason")]
+    public string? Reason { get; set; }
 
-    /// <summary>Absolute directory path.</summary>
-    [JsonPropertyName("path")]
-    public required string Path { get; set; }
+    /// <summary>Service name owning this reading.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("service")]
+    public string? Service { get; set; }
 
-    /// <summary>Frozen rendered line this attachment contributed to the &lt;tagged_files&gt; 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.</summary>
+    /// <summary>Service-reported quota source.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("taggedFilesEntry")]
-    public string? TaggedFilesEntry { get; set; }
+    [JsonPropertyName("source")]
+    public string? Source { get; set; }
+
+    /// <summary>Unit of entitledQuantity and availableQuantity.</summary>
+    [JsonPropertyName("unit")]
+    public required ProviderQuotaUnit Unit { get; set; }
 }
 
-/// <summary>End position of the selection.</summary>
-/// <remarks>Nested data type for <c>AttachmentSelectionDetailsEnd</c>.</remarks>
-public sealed partial class AttachmentSelectionDetailsEnd
+/// <summary>Token usage detail for a single billing category.</summary>
+/// <remarks>Nested data type for <c>CompactionCompleteCompactionTokensUsedCopilotUsageTokenDetail</c>.</remarks>
+public sealed partial class CompactionCompleteCompactionTokensUsedCopilotUsageTokenDetail
 {
-    /// <summary>End character offset within the line (0-based).</summary>
-    [JsonPropertyName("character")]
-    public required long Character { get; set; }
+    /// <summary>Number of tokens in this billing batch.</summary>
+    [JsonPropertyName("batchSize")]
+    public required long BatchSize { get; set; }
 
-    /// <summary>End line number (0-based).</summary>
-    [JsonPropertyName("line")]
-    public required long Line { get; set; }
-}
+    /// <summary>Cost per batch of tokens.</summary>
+    [JsonPropertyName("costPerBatch")]
+    public required long CostPerBatch { get; set; }
 
-/// <summary>Start position of the selection.</summary>
-/// <remarks>Nested data type for <c>AttachmentSelectionDetailsStart</c>.</remarks>
-public sealed partial class AttachmentSelectionDetailsStart
-{
-    /// <summary>Start character offset within the line (0-based).</summary>
-    [JsonPropertyName("character")]
-    public required long Character { get; set; }
+    /// <summary>Model responsible for this billing entry.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("model")]
+    public string? Model { get; set; }
 
-    /// <summary>Start line number (0-based).</summary>
-    [JsonPropertyName("line")]
-    public required long Line { get; set; }
+    /// <summary>Total token count for this entry.</summary>
+    [JsonPropertyName("tokenCount")]
+    public required long TokenCount { get; set; }
+
+    /// <summary>Token category (e.g., "input", "output").</summary>
+    [JsonPropertyName("tokenType")]
+    public required string TokenType { get; set; }
 }
 
-/// <summary>Position range of the selection within the file.</summary>
-/// <remarks>Nested data type for <c>AttachmentSelectionDetails</c>.</remarks>
-public sealed partial class AttachmentSelectionDetails
+/// <summary>Per-request cost and usage data from the CAPI copilot_usage response field.</summary>
+/// <remarks>Nested data type for <c>CompactionCompleteCompactionTokensUsedCopilotUsage</c>.</remarks>
+internal sealed partial class CompactionCompleteCompactionTokensUsedCopilotUsage
 {
-    /// <summary>End position of the selection.</summary>
-    [JsonPropertyName("end")]
-    public required AttachmentSelectionDetailsEnd End { get; set; }
+    /// <summary>Default billing model for token details that do not identify their own model.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonInclude]
+    [JsonPropertyName("model")]
+    internal string? Model { get; set; }
 
-    /// <summary>Start position of the selection.</summary>
-    [JsonPropertyName("start")]
-    public required AttachmentSelectionDetailsStart Start { get; set; }
+    /// <summary>Itemized token usage breakdown.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonInclude]
+    [JsonPropertyName("tokenDetails")]
+    internal CompactionCompleteCompactionTokensUsedCopilotUsageTokenDetail[]? TokenDetails { get; set; }
+
+    /// <summary>Total cost in nano-AI units for this request.</summary>
+    [JsonPropertyName("totalNanoAiu")]
+    public required double TotalNanoAiu { get; set; }
 }
 
-/// <summary>Code selection attachment from an editor.</summary>
-/// <remarks>The <c>selection</c> variant of <see cref="Attachment"/>.</remarks>
-public sealed partial class AttachmentSelection : Attachment
+/// <summary>Token usage breakdown for the compaction LLM call (aligned with assistant.usage format).</summary>
+/// <remarks>Nested data type for <c>CompactionCompleteCompactionTokensUsed</c>.</remarks>
+public sealed partial class CompactionCompleteCompactionTokensUsed
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "selection";
+    /// <summary>Whether the compaction's credit amount was reported for all, some, or none of its calls.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("aiCreditsStatus")]
+    public AiCreditsStatus? AiCreditsStatus { get; set; }
 
-    /// <summary>User-facing display name for the selection.</summary>
-    [JsonPropertyName("displayName")]
-    public required string DisplayName { get; set; }
+    /// <summary>Cached input tokens reused in the compaction LLM call.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("cacheReadTokens")]
+    public long? CacheReadTokens { get; set; }
 
-    /// <summary>Absolute path to the file containing the selection.</summary>
-    [JsonPropertyName("filePath")]
-    public required string FilePath { get; set; }
+    /// <summary>Tokens written to prompt cache in the compaction LLM call.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("cacheWriteTokens")]
+    public long? CacheWriteTokens { get; set; }
 
-    /// <summary>Position range of the selection within the file.</summary>
-    [JsonPropertyName("selection")]
-    public required AttachmentSelectionDetails Selection { get; set; }
+    /// <summary>Per-request cost and usage data from the CAPI copilot_usage response field.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonInclude]
+    [JsonPropertyName("copilotUsage")]
+    internal CompactionCompleteCompactionTokensUsedCopilotUsage? CopilotUsage { get; set; }
 
-    /// <summary>The selected text content.</summary>
-    [JsonPropertyName("text")]
-    public required string Text { get; set; }
-}
+    /// <summary>Duration of the compaction LLM call in milliseconds.</summary>
+    [JsonConverter(typeof(MillisecondsTimeSpanConverter))]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("duration")]
+    public TimeSpan? Duration { get; set; }
 
-/// <summary>GitHub issue, pull request, or discussion reference.</summary>
-/// <remarks>The <c>github_reference</c> variant of <see cref="Attachment"/>.</remarks>
-public sealed partial class AttachmentGitHubReference : Attachment
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "github_reference";
+    /// <summary>Input tokens consumed by the compaction LLM call.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("inputTokens")]
+    public long? InputTokens { get; set; }
 
-    /// <summary>Issue, pull request, or discussion number.</summary>
-    [JsonPropertyName("number")]
-    public required long Number { get; set; }
+    /// <summary>Model identifier used for the compaction LLM call.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("model")]
+    public string? Model { get; set; }
 
-    /// <summary>Type of GitHub reference.</summary>
-    [JsonPropertyName("referenceType")]
-    public required AttachmentGitHubReferenceType ReferenceType { get; set; }
+    /// <summary>Model display name captured for the compaction call.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("modelDisplayName")]
+    public string? ModelDisplayName { get; set; }
 
-    /// <summary>Current state of the referenced item (e.g., open, closed, merged).</summary>
-    [JsonPropertyName("state")]
-    public required string State { get; set; }
+    /// <summary>Output tokens produced by the compaction LLM call.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("outputTokens")]
+    public long? OutputTokens { get; set; }
 
-    /// <summary>Title of the referenced item.</summary>
-    [JsonPropertyName("title")]
-    public required string Title { get; set; }
+    /// <summary>Provider captured for the compaction call; absent when attribution is unknown.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("provider")]
+    public ModelProviderRef? Provider { get; set; }
 
-    /// <summary>URL to the referenced item on GitHub.</summary>
-    [JsonPropertyName("url")]
-    public required string Url { get; set; }
+    /// <summary>Number of model requests represented by this aggregated compaction usage.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("requestCount")]
+    public long? RequestCount { get; set; }
 }
 
-/// <summary>Pointer to a GitHub repository.</summary>
-/// <remarks>Nested data type for <c>GitHubRepoRef</c>.</remarks>
-public sealed partial class GitHubRepoRef
+/// <summary>Original request-level and effective conversation reasoning effort for a provider history boundary; the historical type name is retained for compatibility.</summary>
+/// <remarks>Nested data type for <c>ResponsesReasoning</c>.</remarks>
+public sealed partial class ResponsesReasoning
 {
-    /// <summary>Numeric GitHub repository id.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("id")]
-    public long? Id { get; set; }
+    /// <summary>Effective effort selected before this message, independent of the response-level reasoning field.</summary>
+    [JsonPropertyName("effort")]
+    public required string Effort { get; set; }
 
-    /// <summary>Repository name (without owner).</summary>
-    [JsonPropertyName("name")]
-    public required string Name { get; set; }
+    /// <summary>Original request-level effort, retained while replaying this conversation prefix.</summary>
+    [JsonPropertyName("initialEffort")]
+    public required string InitialEffort { get; set; }
 
-    /// <summary>Repository owner login (user or organization).</summary>
-    [JsonPropertyName("owner")]
-    public required string Owner { get; set; }
+    /// <summary>Provider model whose reasoning settings this boundary records.</summary>
+    [JsonPropertyName("model")]
+    public required string Model { get; set; }
 }
 
-/// <summary>Pointer to a GitHub commit.</summary>
-/// <remarks>The <c>github_commit</c> variant of <see cref="Attachment"/>.</remarks>
-public sealed partial class AttachmentGitHubCommit : Attachment
+/// <summary>Nested data type for <c>PermissionRecoveryAttempt</c>.</summary>
+public sealed partial class PermissionRecoveryAttempt
 {
-    /// <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>Unique identifier for this attempt record.</summary>
+    [JsonPropertyName("attemptId")]
+    public required string AttemptId { get; set; }
 
-    /// <summary>Repository the commit belongs to.</summary>
-    [JsonPropertyName("repo")]
-    public required GitHubRepoRef Repo { get; set; }
+    /// <summary>How the runtime handled this attempt.</summary>
+    [JsonPropertyName("disposition")]
+    public required PermissionRecoveryAttemptDisposition Disposition { get; set; }
 
-    /// <summary>URL to the commit on GitHub.</summary>
-    [JsonPropertyName("url")]
-    public required string Url { get; set; }
-}
+    /// <summary>One-based position of this attempt in the episode.</summary>
+    [JsonPropertyName("ordinal")]
+    public required long Ordinal { get; set; }
 
-/// <summary>Pointer to a GitHub release.</summary>
-/// <remarks>The <c>github_release</c> variant of <see cref="Attachment"/>.</remarks>
-public sealed partial class AttachmentGitHubRelease : Attachment
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "github_release";
+    /// <summary>Controlled permission request kind, such as shell, path, URL, or tool.</summary>
+    [JsonPropertyName("permissionKind")]
+    public required string PermissionKind { get; set; }
 
-    /// <summary>Human-readable release name.</summary>
-    [JsonPropertyName("name")]
-    public required string Name { get; set; }
+    /// <summary>Controlled reason for the attempt disposition.</summary>
+    [JsonPropertyName("reason")]
+    public required PermissionRecoveryAttemptReason Reason { get; set; }
 
-    /// <summary>Repository the release belongs to.</summary>
-    [JsonPropertyName("repo")]
-    public required GitHubRepoRef Repo { get; set; }
+    /// <summary>Relationship between this attempt and earlier attempts in the episode.</summary>
+    [JsonPropertyName("relation")]
+    public required PermissionRecoveryAttemptRelation Relation { get; set; }
 
-    /// <summary>Git tag the release is anchored to.</summary>
-    [JsonPropertyName("tagName")]
-    public required string TagName { get; set; }
+    /// <summary>SHA-256 fingerprint of normalized request data; raw permission arguments are not included.</summary>
+    [JsonPropertyName("requestFingerprint")]
+    public required string RequestFingerprint { get; set; }
 
-    /// <summary>URL to the release on GitHub.</summary>
-    [JsonPropertyName("url")]
-    public required string Url { get; set; }
+    /// <summary>Tool-call identifier associated with this attempt, when available.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("toolCallId")]
+    public string? ToolCallId { get; set; }
 }
 
-/// <summary>Pointer to a GitHub Actions job.</summary>
-/// <remarks>The <c>github_actions_job</c> variant of <see cref="Attachment"/>.</remarks>
-public sealed partial class AttachmentGitHubActionsJob : Attachment
+/// <summary>Authoritative snapshot of an Autopilot permission-recovery episode.</summary>
+/// <remarks>Nested data type for <c>PermissionRecoveryData</c>.</remarks>
+public sealed partial class PermissionRecoveryData
 {
-    /// <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 GitHubRepoRef Repo { get; set; }
+    /// <summary>Ordered privacy-safe record of permission attempts and the successful alternative, when any.</summary>
+    [JsonPropertyName("attempts")]
+    public required PermissionRecoveryAttempt[] Attempts { get; set; }
 
-    /// <summary>URL to the job on GitHub.</summary>
-    [JsonPropertyName("url")]
-    public required string Url { get; set; }
+    /// <summary>Stable identifier shared by every transition in this recovery episode.</summary>
+    [JsonPropertyName("episodeId")]
+    public required string EpisodeId { get; set; }
 
-    /// <summary>Display name of the workflow the job ran in.</summary>
-    [JsonPropertyName("workflowName")]
-    public required string WorkflowName { get; set; }
-}
+    /// <summary>Maximum number of distinct autonomous permission attempts allowed before escalation.</summary>
+    [JsonPropertyName("maxAttempts")]
+    public required long MaxAttempts { get; set; }
 
-/// <summary>Pointer to a GitHub repository.</summary>
-/// <remarks>The <c>github_repository</c> variant of <see cref="Attachment"/>.</remarks>
-public sealed partial class AttachmentGitHubRepository : Attachment
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "github_repository";
+    /// <summary>Policy selected from the current client's response capability; mode or client changes may update it during recovery.</summary>
+    [JsonPropertyName("onBlocked")]
+    public required PermissionRecoveryOnBlocked OnBlocked { get; set; }
 
-    /// <summary>Short description of the repository.</summary>
+    /// <summary>Subagent identifier that owns this recovery episode when the request was delegated through a parent permission service.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("description")]
-    public string? Description { get; set; }
+    [JsonPropertyName("ownerAgentId")]
+    public string? OwnerAgentId { get; set; }
 
-    /// <summary>Git ref this attachment is anchored at (branch, tag, or commit). When absent the default branch is implied.</summary>
+    /// <summary>Root or child execution-session identifier that owns this recovery episode; omitted for legacy snapshots.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("ref")]
-    public string? Ref { get; set; }
+    [JsonPropertyName("ownerSessionId")]
+    public string? OwnerSessionId { get; set; }
 
-    /// <summary>Repository pointer.</summary>
-    [JsonPropertyName("repo")]
-    public required GitHubRepoRef Repo { get; set; }
+    /// <summary>Controlled reason for the latest episode transition.</summary>
+    [JsonPropertyName("reason")]
+    public required PermissionRecoveryReason Reason { get; set; }
 
-    /// <summary>URL to the repository on GitHub.</summary>
-    [JsonPropertyName("url")]
-    public required string Url { get; set; }
+    /// <summary>Current lifecycle state of the recovery episode.</summary>
+    [JsonPropertyName("status")]
+    public required PermissionRecoveryStatus Status { get; set; }
 }
 
-/// <summary>One side of a file diff (head or base).</summary>
-/// <remarks>Nested data type for <c>AttachmentGitHubFileDiffSide</c>.</remarks>
-public sealed partial class AttachmentGitHubFileDiffSide
+/// <summary>Structured reason that the task cannot continue without intervention.</summary>
+/// <remarks>Nested data type for <c>TaskBlocker</c>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed partial class TaskBlocker
 {
-    /// <summary>Repository-relative path to the file.</summary>
-    [JsonPropertyName("path")]
-    public required string Path { get; set; }
+    /// <summary>Category of intervention that blocked the task.</summary>
+    [JsonPropertyName("kind")]
+    public required TaskBlockerKind Kind { get; set; }
 
-    /// <summary>Git ref (branch, tag, or commit SHA) the file is read at.</summary>
-    [JsonPropertyName("ref")]
-    public required string Ref { get; set; }
+    /// <summary>Permission-recovery episode that produced this blocker.</summary>
+    [JsonPropertyName("permissionRecovery")]
+    public required PermissionRecoveryData PermissionRecovery { get; set; }
 
-    /// <summary>Repository the file lives in.</summary>
-    [JsonPropertyName("repo")]
-    public required GitHubRepoRef Repo { get; set; }
+    /// <summary>Controlled reason for the current blocked state.</summary>
+    [JsonPropertyName("reason")]
+    public required PermissionRecoveryReason Reason { get; set; }
+
+    /// <summary>Whether a later user response or steering message can resume the task.</summary>
+    [JsonPropertyName("resumable")]
+    public required bool Resumable { 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="Attachment"/>.</remarks>
-public sealed partial class AttachmentGitHubFileDiff : Attachment
+/// <summary>Inclusive durable event range summarized by a completion receipt.</summary>
+/// <remarks>Nested data type for <c>CompletionReceiptEventRange</c>.</remarks>
+public sealed partial class CompletionReceiptEventRange
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "github_file_diff";
+    /// <summary>Identifier of the assistant turn-end event that ends the covered exchange. Always equals the receipt's sourceEventId, so either field is a valid join key.</summary>
+    [JsonPropertyName("endEventId")]
+    public required string EndEventId { get; set; }
 
-    /// <summary>File location on the base side of the diff. Absent for additions.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("base")]
-    public AttachmentGitHubFileDiffSide? Base { get; set; }
+    /// <summary>Identifier of the user message that starts the covered exchange.</summary>
+    [JsonPropertyName("startEventId")]
+    public required string StartEventId { get; set; }
+}
 
-    /// <summary>File location on the head side of the diff. Absent for deletions.</summary>
+/// <summary>Final structured tool completion in the covered event range.</summary>
+/// <remarks>Nested data type for <c>CompletionReceiptFinalTool</c>.</remarks>
+public sealed partial class CompletionReceiptFinalTool
+{
+    /// <summary>Process exit code from a structured shell result, when available.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("head")]
-    public AttachmentGitHubFileDiffSide? Head { get; set; }
+    [JsonPropertyName("exitCode")]
+    public long? ExitCode { 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>Structured success or failure status from the tool completion event.</summary>
+    [JsonPropertyName("status")]
+    public required CompletionReceiptToolStatus Status { get; set; }
 
-/// <summary>One side of a tree comparison (head or base).</summary>
-/// <remarks>Nested data type for <c>AttachmentGitHubTreeComparisonSide</c>.</remarks>
-public sealed partial class AttachmentGitHubTreeComparisonSide
-{
-    /// <summary>Repository the revision belongs to.</summary>
-    [JsonPropertyName("repo")]
-    public required GitHubRepoRef Repo { get; set; }
+    /// <summary>Unique identifier of the completed tool call.</summary>
+    [JsonPropertyName("toolCallId")]
+    public required string ToolCallId { get; set; }
 
-    /// <summary>Git revision (branch, tag, or commit SHA).</summary>
-    [JsonPropertyName("revision")]
-    public required string Revision { get; set; }
+    /// <summary>Tool name from the matching tool execution start event, when available.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("toolName")]
+    public string? ToolName { get; set; }
 }
 
-/// <summary>Pointer to a comparison between two git revisions.</summary>
-/// <remarks>The <c>github_tree_comparison</c> variant of <see cref="Attachment"/>.</remarks>
-public sealed partial class AttachmentGitHubTreeComparison : Attachment
+/// <summary>Nested data type for <c>FusionCritic</c>.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed partial class FusionCritic
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "github_tree_comparison";
-
-    /// <summary>Base side of the comparison.</summary>
-    [JsonPropertyName("base")]
-    public required AttachmentGitHubTreeComparisonSide Base { get; set; }
+    /// <summary>Concrete model selected for this critic.</summary>
+    [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+    [JsonPropertyName("model")]
+    public required string Model { get; set; }
 
-    /// <summary>Head side of the comparison.</summary>
-    [JsonPropertyName("head")]
-    public required AttachmentGitHubTreeComparisonSide Head { get; set; }
+    /// <summary>Unique execution phase identifier for this critic.</summary>
+    [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+    [JsonPropertyName("phaseId")]
+    public required string PhaseId { get; set; }
 
-    /// <summary>URL to the comparison on GitHub.</summary>
-    [JsonPropertyName("url")]
-    public required string Url { get; set; }
+    /// <summary>Explicit reasoning effort selected for this critic, if supplied.</summary>
+    [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("reasoningEffort")]
+    public string? ReasoningEffort { get; set; }
 }
 
-/// <summary>Generic GitHub URL reference.</summary>
-/// <remarks>The <c>github_url</c> variant of <see cref="Attachment"/>.</remarks>
-public sealed partial class AttachmentGitHubUrl : Attachment
+/// <summary>Durable server recommendation for subsequent HydraFusion turns.</summary>
+/// <remarks>Nested data type for <c>FusionFollowUpRecommendation</c>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed partial class FusionFollowUpRecommendation
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "github_url";
+    /// <summary>Recommended routing action for the next compaction turn.</summary>
+    [JsonPropertyName("compactionTurn")]
+    public required FusionFollowUpAction CompactionTurn { get; set; }
 
-    /// <summary>URL to the GitHub resource.</summary>
-    [JsonPropertyName("url")]
-    public required string Url { get; set; }
+    /// <summary>Recommended routing action for the next user-message turn.</summary>
+    [JsonPropertyName("userTurn")]
+    public required FusionFollowUpAction UserTurn { 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="Attachment"/>.</remarks>
-public sealed partial class AttachmentGitHubFile : Attachment
+/// <summary>Presentation-neutral phase planned for a HydraFusion turn.</summary>
+/// <remarks>Nested data type for <c>FusionPhasePlanStep</c>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed partial class FusionPhasePlanStep
 {
-    /// <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>Whether the phase executes only when an earlier phase requests it.</summary>
+    [JsonPropertyName("conditional")]
+    public required bool Conditional { 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>Kind of phase that may execute.</summary>
+    [JsonPropertyName("kind")]
+    public required FusionPhaseKind Kind { get; set; }
 
-    /// <summary>Repository the file lives in.</summary>
-    [JsonPropertyName("repo")]
-    public required GitHubRepoRef Repo { get; set; }
+    /// <summary>Semantic role assigned to the phase.</summary>
+    [JsonPropertyName("role")]
+    public required string Role { get; set; }
 
-    /// <summary>URL to the file on GitHub.</summary>
-    [JsonPropertyName("url")]
-    public required string Url { get; set; }
+    /// <summary>Conversation scope in which the phase executes.</summary>
+    [JsonPropertyName("scope")]
+    public required FusionConversationScope Scope { 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="Attachment"/>.</remarks>
-public sealed partial class AttachmentGitHubSnippet : Attachment
+/// <summary>Validated HydraFusion routing capability scores.</summary>
+/// <remarks>Nested data type for <c>FusionScores</c>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed partial class FusionScores
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "github_snippet";
+    /// <summary>Code-generation capability score returned by the authenticated router.</summary>
+    [JsonPropertyName("codeGen")]
+    public required double CodeGen { get; set; }
 
-    /// <summary>Line range the snippet covers.</summary>
-    [JsonPropertyName("lineRange")]
-    public required AttachmentFileLineRange LineRange { get; set; }
+    /// <summary>Debugging capability score returned by the authenticated router.</summary>
+    [JsonPropertyName("debugging")]
+    public required double Debugging { get; set; }
 
-    /// <summary>Repository-relative path to the file.</summary>
-    [JsonPropertyName("path")]
-    public required string Path { get; set; }
+    /// <summary>Reasoning capability score returned by the authenticated router.</summary>
+    [JsonPropertyName("reasoning")]
+    public required double Reasoning { 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>Tool-use capability score returned by the authenticated router.</summary>
+    [JsonPropertyName("toolUse")]
+    public required double ToolUse { get; set; }
+}
 
-    /// <summary>Repository the file lives in.</summary>
-    [JsonPropertyName("repo")]
-    public required GitHubRepoRef Repo { get; set; }
+/// <summary>Optional line range to scope the attachment to a specific section of the file.</summary>
+/// <remarks>Nested data type for <c>AttachmentFileLineRange</c>.</remarks>
+public sealed partial class AttachmentFileLineRange
+{
+    /// <summary>End line number (1-based, inclusive).</summary>
+    [JsonPropertyName("end")]
+    public required long End { get; set; }
 
-    /// <summary>URL to the snippet on GitHub (with line anchor).</summary>
-    [JsonPropertyName("url")]
-    public required string Url { get; set; }
+    /// <summary>Start line number (1-based).</summary>
+    [JsonPropertyName("start")]
+    public required long Start { get; set; }
 }
 
-/// <summary>Blob attachment with inline base64-encoded data.</summary>
-/// <remarks>The <c>blob</c> variant of <see cref="Attachment"/>.</remarks>
-public sealed partial class AttachmentBlob : Attachment
+/// <summary>File attachment.</summary>
+/// <remarks>The <c>file</c> variant of <see cref="Attachment"/>.</remarks>
+public sealed partial class AttachmentFile : Attachment
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Type => "blob";
+    public override string Type => "file";
 
     /// <summary>Internal: content-addressed id of the session.binary_asset event holding this attachment's model-facing bytes (e.g. "sha256:..."). Absent externally.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
@@ -8743,1511 +9103,1975 @@ public sealed partial class AttachmentBlob : Attachment
     [JsonPropertyName("byteLength")]
     public long? ByteLength { get; set; }
 
-    /// <summary>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.</summary>
-    [Base64String]
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("data")]
-    public string? Data { get; set; }
-
     /// <summary>User-facing display name for the attachment.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("displayName")]
-    public string? DisplayName { get; set; }
+    public required string DisplayName { get; set; }
 
-    /// <summary>MIME type of the inline data.</summary>
+    /// <summary>Optional line range to scope the attachment to a specific section of the file.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("lineRange")]
+    public AttachmentFileLineRange? LineRange { get; set; }
+
+    /// <summary>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.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("mimeType")]
-    public required string MimeType { get; set; }
+    public string? MimeType { get; set; }
 
     /// <summary>Internal: why model-facing bytes are absent from persistence. Absent externally.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("omittedReason")]
     public OmittedBinaryOmittedReason? OmittedReason { get; set; }
+
+    /// <summary>Absolute file path.</summary>
+    [JsonPropertyName("path")]
+    public required string Path { get; set; }
+
+    /// <summary>Frozen rendered line this attachment contributed to the &lt;tagged_files&gt; 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 &lt;tagged_files&gt; (mutually exclusive with assetId, which marks bytes sent natively).</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("taggedFilesEntry")]
+    public string? TaggedFilesEntry { get; set; }
 }
 
-/// <summary>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 &lt;extension_context&gt; XML block.</summary>
-/// <remarks>The <c>extension_context</c> variant of <see cref="Attachment"/>.</remarks>
-public sealed partial class AttachmentExtensionContext : Attachment
+/// <summary>Directory attachment.</summary>
+/// <remarks>The <c>directory</c> variant of <see cref="Attachment"/>.</remarks>
+public sealed partial class AttachmentDirectory : Attachment
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Type => "extension_context";
-
-    /// <summary>Provider-local canvas identifier when the push was bound to a canvas instance.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("canvasId")]
-    public string? CanvasId { get; set; }
+    public override string Type => "directory";
 
-    /// <summary>ISO 8601 timestamp captured by the runtime when the push was accepted.</summary>
-    [JsonPropertyName("capturedAt")]
-    public required DateTimeOffset CapturedAt { get; set; }
+    /// <summary>User-facing display name for the attachment.</summary>
+    [JsonPropertyName("displayName")]
+    public required string DisplayName { get; set; }
 
-    /// <summary>Owning extension identifier. Runtime-derived from the caller's connection when produced via session.extensions.sendAttachmentsToMessage; preserved verbatim on subsequent transports.</summary>
-    [JsonPropertyName("extensionId")]
-    public required string ExtensionId { get; set; }
+    /// <summary>Absolute directory path.</summary>
+    [JsonPropertyName("path")]
+    public required string Path { get; set; }
 
-    /// <summary>Open canvas instance identifier when the push was bound to a canvas instance.</summary>
+    /// <summary>Frozen rendered line this attachment contributed to the &lt;tagged_files&gt; 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.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("instanceId")]
-    public string? InstanceId { get; set; }
+    [JsonPropertyName("taggedFilesEntry")]
+    public string? TaggedFilesEntry { get; set; }
+}
 
-    /// <summary>Caller-supplied JSON payload.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("payload")]
-    public JsonElement? Payload { get; set; }
+/// <summary>End position of the selection.</summary>
+/// <remarks>Nested data type for <c>AttachmentSelectionDetailsEnd</c>.</remarks>
+public sealed partial class AttachmentSelectionDetailsEnd
+{
+    /// <summary>End character offset within the line (0-based).</summary>
+    [JsonPropertyName("character")]
+    public required long Character { 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>End line number (0-based).</summary>
+    [JsonPropertyName("line")]
+    public required long Line { get; set; }
 }
 
-/// <summary>A user message attachment — a file, directory, code selection, blob, GitHub reference, GitHub-anchored pointer, or extension-supplied context payload.</summary>
-/// <remarks>Polymorphic base type discriminated by <c>type</c>.</remarks>
-[JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "type",
-    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(AttachmentFile), "file")]
-[JsonDerivedType(typeof(AttachmentDirectory), "directory")]
-[JsonDerivedType(typeof(AttachmentSelection), "selection")]
-[JsonDerivedType(typeof(AttachmentGitHubReference), "github_reference")]
-[JsonDerivedType(typeof(AttachmentGitHubCommit), "github_commit")]
-[JsonDerivedType(typeof(AttachmentGitHubRelease), "github_release")]
-[JsonDerivedType(typeof(AttachmentGitHubActionsJob), "github_actions_job")]
-[JsonDerivedType(typeof(AttachmentGitHubRepository), "github_repository")]
-[JsonDerivedType(typeof(AttachmentGitHubFileDiff), "github_file_diff")]
-[JsonDerivedType(typeof(AttachmentGitHubTreeComparison), "github_tree_comparison")]
-[JsonDerivedType(typeof(AttachmentGitHubUrl), "github_url")]
-[JsonDerivedType(typeof(AttachmentGitHubFile), "github_file")]
-[JsonDerivedType(typeof(AttachmentGitHubSnippet), "github_snippet")]
-[JsonDerivedType(typeof(AttachmentBlob), "blob")]
-[JsonDerivedType(typeof(AttachmentExtensionContext), "extension_context")]
-public partial class Attachment
+/// <summary>Start position of the selection.</summary>
+/// <remarks>Nested data type for <c>AttachmentSelectionDetailsStart</c>.</remarks>
+public sealed partial class AttachmentSelectionDetailsStart
 {
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("type")]
-    public virtual string Type { get; set; } = string.Empty;
+    /// <summary>Start character offset within the line (0-based).</summary>
+    [JsonPropertyName("character")]
+    public required long Character { get; set; }
+
+    /// <summary>Start line number (0-based).</summary>
+    [JsonPropertyName("line")]
+    public required long Line { get; set; }
 }
 
+/// <summary>Position range of the selection within the file.</summary>
+/// <remarks>Nested data type for <c>AttachmentSelectionDetails</c>.</remarks>
+public sealed partial class AttachmentSelectionDetails
+{
+    /// <summary>End position of the selection.</summary>
+    [JsonPropertyName("end")]
+    public required AttachmentSelectionDetailsEnd End { get; set; }
 
-/// <summary>Internal durable terminal request staged by a HydraFusion phase until an idempotent final commit selects it.</summary>
-/// <remarks>Nested data type for <c>FusionStagedTerminal</c>.</remarks>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-internal sealed partial class FusionStagedTerminal
+    /// <summary>Start position of the selection.</summary>
+    [JsonPropertyName("start")]
+    public required AttachmentSelectionDetailsStart Start { get; set; }
+}
+
+/// <summary>Code selection attachment from an editor.</summary>
+/// <remarks>The <c>selection</c> variant of <see cref="Attachment"/>.</remarks>
+public sealed partial class AttachmentSelection : Attachment
 {
-    /// <summary>Gets or sets the <c>arguments</c> value.</summary>
-    [JsonPropertyName("arguments")]
-    public required string Arguments { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "selection";
 
-    /// <summary>Gets or sets the <c>assistantMessage</c> value.</summary>
-    [JsonPropertyName("assistantMessage")]
-    public required JsonElement AssistantMessage { get; set; }
+    /// <summary>User-facing display name for the selection.</summary>
+    [JsonPropertyName("displayName")]
+    public required string DisplayName { get; set; }
 
-    /// <summary>Gets or sets the <c>phaseId</c> value.</summary>
-    [JsonPropertyName("phaseId")]
-    public required string PhaseId { get; set; }
+    /// <summary>Absolute path to the file containing the selection.</summary>
+    [JsonPropertyName("filePath")]
+    public required string FilePath { get; set; }
 
-    /// <summary>Gets or sets the <c>toolCallId</c> value.</summary>
-    [JsonPropertyName("toolCallId")]
-    public required string ToolCallId { get; set; }
+    /// <summary>Position range of the selection within the file.</summary>
+    [JsonPropertyName("selection")]
+    public required AttachmentSelectionDetails Selection { get; set; }
 
-    /// <summary>Gets or sets the <c>toolName</c> value.</summary>
-    [JsonPropertyName("toolName")]
-    public required string ToolName { get; set; }
+    /// <summary>The selected text content.</summary>
+    [JsonPropertyName("text")]
+    public required string Text { get; set; }
 }
 
-/// <summary>Aggregate concrete-model usage for one HydraFusion phase.</summary>
-/// <remarks>Nested data type for <c>FusionPhaseUsage</c>.</remarks>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed partial class FusionPhaseUsage
+/// <summary>GitHub issue, pull request, or discussion reference.</summary>
+/// <remarks>The <c>github_reference</c> variant of <see cref="Attachment"/>.</remarks>
+public sealed partial class AttachmentGitHubReference : Attachment
 {
-    /// <summary>Total cached input tokens reported for the phase.</summary>
-    [JsonPropertyName("cachedTokens")]
-    public required long CachedTokens { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "github_reference";
 
-    /// <summary>Total tokens written to prompt cache during the phase.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("cacheWriteTokens")]
-    public long? CacheWriteTokens { get; set; }
+    /// <summary>Issue, pull request, or discussion number.</summary>
+    [JsonPropertyName("number")]
+    public required long Number { get; set; }
 
-    /// <summary>Total input tokens consumed by the phase.</summary>
-    [JsonPropertyName("inputTokens")]
-    public required long InputTokens { get; set; }
+    /// <summary>Type of GitHub reference.</summary>
+    [JsonPropertyName("referenceType")]
+    public required AttachmentGitHubReferenceType ReferenceType { get; set; }
 
-    /// <summary>Total output tokens produced by the phase.</summary>
-    [JsonPropertyName("outputTokens")]
-    public required long OutputTokens { get; set; }
+    /// <summary>Current state of the referenced item (e.g., open, closed, merged).</summary>
+    [JsonPropertyName("state")]
+    public required string State { get; set; }
 
-    /// <summary>Number of concrete model requests made by the phase.</summary>
-    [JsonPropertyName("requestCount")]
-    public required long RequestCount { get; set; }
+    /// <summary>Title of the referenced item.</summary>
+    [JsonPropertyName("title")]
+    public required string Title { get; set; }
 
-    /// <summary>Total normalized AI-unit cost reported for the phase, in nano-AIU.</summary>
-    [JsonPropertyName("totalNanoAiu")]
-    public required double TotalNanoAiu { get; set; }
+    /// <summary>URL to the referenced item on GitHub.</summary>
+    [JsonPropertyName("url")]
+    public required string Url { get; set; }
 }
 
-/// <summary>A source that backs one or more cited spans in the assistant's response.</summary>
-/// <remarks>Nested data type for <c>CitationSource</c>.</remarks>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed partial class CitationSource
+/// <summary>Pointer to a GitHub repository.</summary>
+/// <remarks>Nested data type for <c>GitHubRepoRef</c>.</remarks>
+public sealed partial class GitHubRepoRef
 {
-    /// <summary>Stable, turn-scoped identifier for this source, referenced by CitationReference.sourceId.</summary>
+    /// <summary>Numeric GitHub repository id.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("id")]
-    public required string Id { get; set; }
+    public long? Id { get; set; }
 
-    /// <summary>File path relative to the agent's workspace root, when the source is a file.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("path")]
-    public string? Path { get; set; }
+    /// <summary>Repository name (without owner).</summary>
+    [JsonPropertyName("name")]
+    public required string Name { get; set; }
 
-    /// <summary>The system that produced this citation.</summary>
-    [JsonPropertyName("provider")]
-    public required CitationProvider Provider { get; set; }
+    /// <summary>Repository owner login (user or organization).</summary>
+    [JsonPropertyName("owner")]
+    public required string Owner { get; set; }
+}
 
-    /// <summary>Human-readable title of the source.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("title")]
-    public string? Title { get; set; }
+/// <summary>Pointer to a GitHub commit.</summary>
+/// <remarks>The <c>github_commit</c> variant of <see cref="Attachment"/>.</remarks>
+public sealed partial class AttachmentGitHubCommit : Attachment
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "github_commit";
 
-    /// <summary>URL of the source, when it is a web resource.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    /// <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 GitHubRepoRef Repo { get; set; }
+
+    /// <summary>URL to the commit on GitHub.</summary>
     [JsonPropertyName("url")]
-    public string? Url { get; set; }
+    public required string Url { get; set; }
 }
 
-/// <summary>A character range within the source's text content.</summary>
-/// <remarks>The <c>char</c> variant of <see cref="CitationLocation"/>.</remarks>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed partial class CitationLocationChar : CitationLocation
+/// <summary>Pointer to a GitHub release.</summary>
+/// <remarks>The <c>github_release</c> variant of <see cref="Attachment"/>.</remarks>
+public sealed partial class AttachmentGitHubRelease : Attachment
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Type => "char";
+    public override string Type => "github_release";
 
-    /// <summary>End character offset within the source text (zero-based, exclusive).</summary>
-    [JsonPropertyName("endIndex")]
-    public required long EndIndex { get; set; }
+    /// <summary>Human-readable release name.</summary>
+    [JsonPropertyName("name")]
+    public required string Name { get; set; }
 
-    /// <summary>Start character offset within the source text (zero-based, inclusive).</summary>
-    [JsonPropertyName("startIndex")]
-    public required long StartIndex { get; set; }
+    /// <summary>Repository the release belongs to.</summary>
+    [JsonPropertyName("repo")]
+    public required GitHubRepoRef 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>A page range within a paginated source document.</summary>
-/// <remarks>The <c>page</c> variant of <see cref="CitationLocation"/>.</remarks>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed partial class CitationLocationPage : CitationLocation
+/// <summary>Pointer to a GitHub Actions job.</summary>
+/// <remarks>The <c>github_actions_job</c> variant of <see cref="Attachment"/>.</remarks>
+public sealed partial class AttachmentGitHubActionsJob : Attachment
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Type => "page";
+    public override string Type => "github_actions_job";
 
-    /// <summary>Last page number of the cited range (inclusive).</summary>
-    [JsonPropertyName("endPage")]
-    public required long EndPage { 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>First page number of the cited range.</summary>
-    [JsonPropertyName("startPage")]
-    public required long StartPage { 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 GitHubRepoRef 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>A content-block range within a structured source document.</summary>
-/// <remarks>The <c>block</c> variant of <see cref="CitationLocation"/>.</remarks>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed partial class CitationLocationBlock : CitationLocation
+/// <summary>Pointer to a GitHub repository.</summary>
+/// <remarks>The <c>github_repository</c> variant of <see cref="Attachment"/>.</remarks>
+public sealed partial class AttachmentGitHubRepository : Attachment
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Type => "block";
+    public override string Type => "github_repository";
 
-    /// <summary>Index of the last content block of the cited range (zero-based, exclusive).</summary>
-    [JsonPropertyName("endBlock")]
-    public required long EndBlock { get; set; }
+    /// <summary>Short description of the repository.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("description")]
+    public string? Description { get; set; }
 
-    /// <summary>Index of the first content block of the cited range (zero-based, inclusive).</summary>
-    [JsonPropertyName("startBlock")]
-    public required long StartBlock { 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 GitHubRepoRef Repo { get; set; }
+
+    /// <summary>URL to the repository on GitHub.</summary>
+    [JsonPropertyName("url")]
+    public required string Url { get; set; }
 }
 
-/// <summary>Location within a cited source (character, page, or content-block range) that supports a span.</summary>
-/// <remarks>Polymorphic base type discriminated by <c>type</c>.</remarks>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-[JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "type",
-    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(CitationLocationChar), "char")]
-[JsonDerivedType(typeof(CitationLocationPage), "page")]
-[JsonDerivedType(typeof(CitationLocationBlock), "block")]
-public partial class CitationLocation
+/// <summary>One side of a file diff (head or base).</summary>
+/// <remarks>Nested data type for <c>AttachmentGitHubFileDiffSide</c>.</remarks>
+public sealed partial class AttachmentGitHubFileDiffSide
 {
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("type")]
-    public virtual string Type { get; set; } = string.Empty;
-}
+    /// <summary>Repository-relative path to the file.</summary>
+    [JsonPropertyName("path")]
+    public required string Path { get; set; }
 
+    /// <summary>Git ref (branch, tag, or commit SHA) the file is read at.</summary>
+    [JsonPropertyName("ref")]
+    public required string Ref { get; set; }
 
-/// <summary>A single citation occurrence linking a span of generated text to a supporting source.</summary>
-/// <remarks>Nested data type for <c>CitationReference</c>.</remarks>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed partial class CitationReference
+    /// <summary>Repository the file lives in.</summary>
+    [JsonPropertyName("repo")]
+    public required GitHubRepoRef Repo { 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="Attachment"/>.</remarks>
+public sealed partial class AttachmentGitHubFileDiff : Attachment
 {
-    /// <summary>The exact text from the source that supports the cited span, when provided by the model.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("citedText")]
-    public string? CitedText { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "github_file_diff";
 
-    /// <summary>Location within the source that supports the cited span, when the provider reports one.</summary>
+    /// <summary>File location on the base side of the diff. Absent for additions.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("location")]
-    public CitationLocation? Location { get; set; }
+    [JsonPropertyName("base")]
+    public AttachmentGitHubFileDiffSide? Base { get; set; }
 
-    /// <summary>Provider-native citation correlation data (e.g. Anthropic search_result_index / document_index), passed through opaquely for debugging and forward compatibility.</summary>
+    /// <summary>File location on the head side of the diff. Absent for deletions.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("providerMetadata")]
-    public JsonElement? ProviderMetadata { get; set; }
+    [JsonPropertyName("head")]
+    public AttachmentGitHubFileDiffSide? Head { get; set; }
 
-    /// <summary>Identifier of the CitationSource this reference points to (CitationSource.id).</summary>
-    [JsonPropertyName("sourceId")]
-    public required string SourceId { 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>A contiguous span of generated assistant text and the source references that support it.</summary>
-/// <remarks>Nested data type for <c>CitationSpan</c>.</remarks>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed partial class CitationSpan
+/// <summary>One side of a tree comparison (head or base).</summary>
+/// <remarks>Nested data type for <c>AttachmentGitHubTreeComparisonSide</c>.</remarks>
+public sealed partial class AttachmentGitHubTreeComparisonSide
 {
-    /// <summary>End offset of the cited span within the final assistant message content (UTF-16 code units, zero-based, exclusive).</summary>
-    [JsonPropertyName("endIndex")]
-    public required long EndIndex { get; set; }
-
-    /// <summary>The sources that support this span of generated text.</summary>
-    [JsonPropertyName("references")]
-    public required CitationReference[] References { get; set; }
+    /// <summary>Repository the revision belongs to.</summary>
+    [JsonPropertyName("repo")]
+    public required GitHubRepoRef Repo { get; set; }
 
-    /// <summary>Start offset of the cited span within the final assistant message content (UTF-16 code units, zero-based, inclusive).</summary>
-    [JsonPropertyName("startIndex")]
-    public required long StartIndex { get; set; }
+    /// <summary>Git revision (branch, tag, or commit SHA).</summary>
+    [JsonPropertyName("revision")]
+    public required string Revision { get; set; }
 }
 
-/// <summary>Provider-agnostic citations linking spans of the assistant's response to their supporting sources.</summary>
-/// <remarks>Nested data type for <c>Citations</c>.</remarks>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed partial class Citations
+/// <summary>Pointer to a comparison between two git revisions.</summary>
+/// <remarks>The <c>github_tree_comparison</c> variant of <see cref="Attachment"/>.</remarks>
+public sealed partial class AttachmentGitHubTreeComparison : Attachment
 {
-    /// <summary>Deduplicated set of sources referenced by the citation spans.</summary>
-    [JsonPropertyName("sources")]
-    public required CitationSource[] Sources { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "github_tree_comparison";
 
-    /// <summary>Spans of generated text annotated with the sources that support them.</summary>
-    [JsonPropertyName("spans")]
-    public required CitationSpan[] Spans { get; set; }
+    /// <summary>Base side of the comparison.</summary>
+    [JsonPropertyName("base")]
+    public required AttachmentGitHubTreeComparisonSide Base { get; set; }
+
+    /// <summary>Head side of the comparison.</summary>
+    [JsonPropertyName("head")]
+    public required AttachmentGitHubTreeComparisonSide Head { get; set; }
+
+    /// <summary>URL to the comparison on GitHub.</summary>
+    [JsonPropertyName("url")]
+    public required string Url { get; set; }
 }
 
-/// <summary>Experimental attribution linking an ordinary event to the HydraFusion turn, phase, and concrete source that produced it.</summary>
-/// <remarks>Nested data type for <c>FusionAttribution</c>.</remarks>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed partial class FusionAttribution
+/// <summary>Generic GitHub URL reference.</summary>
+/// <remarks>The <c>github_url</c> variant of <see cref="Attachment"/>.</remarks>
+public sealed partial class AttachmentGitHubUrl : Attachment
 {
-    /// <summary>Idempotency identifier for the authoritative commit, when the event belongs to the selected output.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("commitId")]
-    public string? CommitId { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "github_url";
 
-    /// <summary>Conversation scope in which the concrete phase executed.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("conversationScope")]
-    public string? ConversationScope { get; set; }
+    /// <summary>URL to the GitHub resource.</summary>
+    [JsonPropertyName("url")]
+    public required string Url { get; set; }
+}
 
-    /// <summary>Stable identifier for the HydraFusion turn that produced the event.</summary>
-    [JsonPropertyName("fusionId")]
-    public required string FusionId { 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="Attachment"/>.</remarks>
+public sealed partial class AttachmentGitHubFile : Attachment
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "github_file";
 
-    /// <summary>Whether this model request consumed a user steering message rather than only internal Fusion work.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("hasUserSteering")]
-    public bool? HasUserSteering { get; set; }
+    /// <summary>Repository-relative path to the file.</summary>
+    [JsonPropertyName("path")]
+    public required string Path { get; set; }
 
-    /// <summary>HydraFusion orchestration pattern selected for the turn.</summary>
-    [JsonPropertyName("pattern")]
-    public required string Pattern { 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 the concrete phase that produced the event.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("phaseId")]
-    public string? PhaseId { get; set; }
+    /// <summary>Repository the file lives in.</summary>
+    [JsonPropertyName("repo")]
+    public required GitHubRepoRef Repo { get; set; }
 
-    /// <summary>Kind of concrete phase that produced the event.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("phaseKind")]
-    public string? PhaseKind { get; set; }
+    /// <summary>URL to the file on GitHub.</summary>
+    [JsonPropertyName("url")]
+    public required string Url { get; set; }
+}
 
-    /// <summary>HydraFusion routing policy used for the turn.</summary>
-    [JsonPropertyName("policy")]
-    public required string Policy { 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="Attachment"/>.</remarks>
+public sealed partial class AttachmentGitHubSnippet : Attachment
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "github_snippet";
 
-    /// <summary>Semantic role assigned to the concrete phase.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("role")]
-    public string? Role { get; set; }
+    /// <summary>Line range the snippet covers.</summary>
+    [JsonPropertyName("lineRange")]
+    public required AttachmentFileLineRange LineRange { get; set; }
 
-    /// <summary>Concrete model that produced the attributed event.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("sourceModel")]
-    public string? SourceModel { get; set; }
+    /// <summary>Repository-relative path to the file.</summary>
+    [JsonPropertyName("path")]
+    public required string Path { get; set; }
 
-    /// <summary>Phase whose output supplied the authoritative content, when different from the executing phase.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("sourcePhaseId")]
-    public string? SourcePhaseId { 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>Synthetic HydraFusion model selected for the session.</summary>
-    [JsonPropertyName("syntheticModel")]
-    public required string SyntheticModel { get; set; }
+    /// <summary>Repository the file lives in.</summary>
+    [JsonPropertyName("repo")]
+    public required GitHubRepoRef Repo { get; set; }
+
+    /// <summary>URL to the snippet on GitHub (with line anchor).</summary>
+    [JsonPropertyName("url")]
+    public required string Url { 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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed partial class AssistantMessageReasoningBlocks
+/// <summary>Blob attachment with inline base64-encoded data.</summary>
+/// <remarks>The <c>blob</c> variant of <see cref="Attachment"/>.</remarks>
+public sealed partial class AttachmentBlob : Attachment
 {
-    /// <summary>Provider-native reasoning items or content blocks preserved verbatim, in order. A single response can carry several, and provider signatures or identifiers may depend on their exact content and ordering.</summary>
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "blob";
+
+    /// <summary>Internal: content-addressed id of the session.binary_asset event holding this attachment's model-facing bytes (e.g. "sha256:..."). Absent externally.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("blocks")]
-    public JsonElement[]? Blocks { get; set; }
+    [JsonPropertyName("assetId")]
+    public string? AssetId { get; set; }
 
-    /// <summary>Anthropic Messages assistant block ordering preserved when the legacy reasoning-only representation cannot reproduce it exactly. Thinking and text blocks remain verbatim; tool-use entries retain identity and a payload fingerprint when later signed reasoning depends on them, and are hydrated from the message's tool requests during replay.</summary>
+    /// <summary>Internal: decoded byte length of the attachment's model-facing bytes. Absent externally.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("orderedBlocks")]
-    public JsonElement[]? OrderedBlocks { get; set; }
+    [JsonPropertyName("byteLength")]
+    public long? ByteLength { 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(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed partial class AssistantMessageServerTools
-{
-    /// <summary>Advisor model identifier associated with the server-tool payload.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("advisorModel")]
-    public string? AdvisorModel { get; set; }
-
-    /// <summary>Provider function-call namespaces keyed by function-call identifier.</summary>
+    /// <summary>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.</summary>
+    [Base64String]
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("functionCallNamespaces")]
-    public IDictionary<string, string>? FunctionCallNamespaces { get; set; }
+    [JsonPropertyName("data")]
+    public string? Data { get; set; }
 
-    /// <summary>Provider-native server-tool call and output items preserved verbatim for replay.</summary>
+    /// <summary>User-facing display name for the attachment.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("items")]
-    public JsonElement[]? Items { get; set; }
+    [JsonPropertyName("displayName")]
+    public string? DisplayName { get; set; }
 
-    /// <summary>Model provider that produced this server-tool payload.</summary>
-    [JsonPropertyName("provider")]
-    public required string Provider { get; set; }
+    /// <summary>MIME type of the inline data.</summary>
+    [JsonPropertyName("mimeType")]
+    public required string MimeType { get; set; }
 
-    /// <summary>Raw provider content blocks retained for verbatim round-tripping.</summary>
+    /// <summary>Internal: why model-facing bytes are absent from persistence. Absent externally.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("rawContentBlocks")]
-    public JsonElement[]? RawContentBlocks { get; set; }
+    [JsonPropertyName("omittedReason")]
+    public OmittedBinaryOmittedReason? OmittedReason { get; set; }
 }
 
-/// <summary>Hosted program that requested this client tool call.</summary>
-/// <remarks>Nested data type for <c>AssistantMessageToolRequestCaller</c>.</remarks>
-public sealed partial class AssistantMessageToolRequestCaller
+/// <summary>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 &lt;extension_context&gt; XML block.</summary>
+/// <remarks>The <c>extension_context</c> variant of <see cref="Attachment"/>.</remarks>
+public sealed partial class AttachmentExtensionContext : Attachment
 {
-    /// <summary>Provider-assigned identifier for the hosted caller.</summary>
-    [JsonPropertyName("callerId")]
-    public required string CallerId { get; set; }
-
-    /// <summary>Kind of hosted caller that requested the client tool call.</summary>
-    [JsonPropertyName("type")]
-    public required AssistantMessageToolRequestCallerType Type { get; set; }
-}
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "extension_context";
 
-/// <summary>A tool invocation request from the assistant.</summary>
-/// <remarks>Nested data type for <c>AssistantMessageToolRequest</c>.</remarks>
-public sealed partial class AssistantMessageToolRequest
-{
-    /// <summary>Arguments to pass to the tool, format depends on the tool.</summary>
+    /// <summary>Provider-local canvas identifier when the push was bound to a canvas instance.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("arguments")]
-    public JsonElement? Arguments { get; set; }
+    [JsonPropertyName("canvasId")]
+    public string? CanvasId { get; set; }
 
-    /// <summary>Hosted program that requested this client tool call.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("caller")]
-    public AssistantMessageToolRequestCaller? Caller { get; set; }
+    /// <summary>ISO 8601 timestamp captured by the runtime when the push was accepted.</summary>
+    [JsonPropertyName("capturedAt")]
+    public required DateTimeOffset CapturedAt { get; set; }
 
-    /// <summary>Resolved intention summary describing what this specific call does.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("intentionSummary")]
-    public string? IntentionSummary { get; set; }
+    /// <summary>Owning extension identifier. Runtime-derived from the caller's connection when produced via session.extensions.sendAttachmentsToMessage; preserved verbatim on subsequent transports.</summary>
+    [JsonPropertyName("extensionId")]
+    public required string ExtensionId { get; set; }
 
-    /// <summary>Name of the MCP server hosting this tool, when the tool is an MCP tool.</summary>
+    /// <summary>Open canvas instance identifier when the push was bound to a canvas instance.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("mcpServerName")]
-    public string? McpServerName { get; set; }
+    [JsonPropertyName("instanceId")]
+    public string? InstanceId { get; set; }
 
-    /// <summary>Original tool name on the MCP server, when the tool is an MCP tool.</summary>
+    /// <summary>Caller-supplied JSON payload.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("mcpToolName")]
-    public string? McpToolName { get; set; }
-
-    /// <summary>Name of the tool being invoked.</summary>
-    [JsonPropertyName("name")]
-    public required string Name { get; set; }
-
-    /// <summary>Unique identifier for this tool call.</summary>
-    [JsonPropertyName("toolCallId")]
-    public required string ToolCallId { get; set; }
+    [JsonPropertyName("payload")]
+    public JsonElement? Payload { get; set; }
 
-    /// <summary>Human-readable display title for the tool.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("toolTitle")]
-    public string? ToolTitle { 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>Tool call type: "function" for standard tool calls, "custom" for grammar-based tool calls. Defaults to "function" when absent.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+/// <summary>A user message attachment — a file, directory, code selection, blob, GitHub reference, GitHub-anchored pointer, or extension-supplied context payload.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>type</c>.</remarks>
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "type",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(AttachmentFile), "file")]
+[JsonDerivedType(typeof(AttachmentDirectory), "directory")]
+[JsonDerivedType(typeof(AttachmentSelection), "selection")]
+[JsonDerivedType(typeof(AttachmentGitHubReference), "github_reference")]
+[JsonDerivedType(typeof(AttachmentGitHubCommit), "github_commit")]
+[JsonDerivedType(typeof(AttachmentGitHubRelease), "github_release")]
+[JsonDerivedType(typeof(AttachmentGitHubActionsJob), "github_actions_job")]
+[JsonDerivedType(typeof(AttachmentGitHubRepository), "github_repository")]
+[JsonDerivedType(typeof(AttachmentGitHubFileDiff), "github_file_diff")]
+[JsonDerivedType(typeof(AttachmentGitHubTreeComparison), "github_tree_comparison")]
+[JsonDerivedType(typeof(AttachmentGitHubUrl), "github_url")]
+[JsonDerivedType(typeof(AttachmentGitHubFile), "github_file")]
+[JsonDerivedType(typeof(AttachmentGitHubSnippet), "github_snippet")]
+[JsonDerivedType(typeof(AttachmentBlob), "blob")]
+[JsonDerivedType(typeof(AttachmentExtensionContext), "extension_context")]
+public partial class Attachment
+{
+    /// <summary>The type discriminator.</summary>
     [JsonPropertyName("type")]
-    public AssistantMessageToolRequestType? Type { get; set; }
+    public virtual string Type { get; set; } = string.Empty;
 }
 
-/// <summary>Token usage detail for a single billing category.</summary>
-/// <remarks>Nested data type for <c>AssistantUsageCopilotUsageTokenDetail</c>.</remarks>
-public sealed partial class AssistantUsageCopilotUsageTokenDetail
+
+/// <summary>Internal durable terminal request staged by a HydraFusion phase until an idempotent final commit selects it.</summary>
+/// <remarks>Nested data type for <c>FusionStagedTerminal</c>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+internal sealed partial class FusionStagedTerminal
 {
-    /// <summary>Number of tokens in this billing batch.</summary>
-    [JsonPropertyName("batchSize")]
-    public required long BatchSize { get; set; }
+    /// <summary>Gets or sets the <c>arguments</c> value.</summary>
+    [JsonPropertyName("arguments")]
+    public required string Arguments { get; set; }
 
-    /// <summary>Cost per batch of tokens.</summary>
-    [JsonPropertyName("costPerBatch")]
-    public required long CostPerBatch { get; set; }
+    /// <summary>Gets or sets the <c>assistantMessage</c> value.</summary>
+    [JsonPropertyName("assistantMessage")]
+    public required JsonElement AssistantMessage { get; set; }
 
-    /// <summary>Model responsible for this billing entry.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("model")]
-    public string? Model { get; set; }
+    /// <summary>Gets or sets the <c>phaseId</c> value.</summary>
+    [JsonPropertyName("phaseId")]
+    public required string PhaseId { get; set; }
 
-    /// <summary>Total token count for this entry.</summary>
-    [JsonPropertyName("tokenCount")]
-    public required long TokenCount { get; set; }
+    /// <summary>Gets or sets the <c>toolCallId</c> value.</summary>
+    [JsonPropertyName("toolCallId")]
+    public required string ToolCallId { get; set; }
 
-    /// <summary>Token category (e.g., "input", "output").</summary>
-    [JsonPropertyName("tokenType")]
-    public required string TokenType { get; set; }
+    /// <summary>Gets or sets the <c>toolName</c> value.</summary>
+    [JsonPropertyName("toolName")]
+    public required string ToolName { get; set; }
 }
 
-/// <summary>Per-request cost and usage data from the CAPI copilot_usage response field.</summary>
-/// <remarks>Nested data type for <c>AssistantUsageCopilotUsage</c>.</remarks>
-public sealed partial class AssistantUsageCopilotUsage
+/// <summary>Aggregate concrete-model usage for one HydraFusion phase.</summary>
+/// <remarks>Nested data type for <c>FusionPhaseUsage</c>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed partial class FusionPhaseUsage
 {
-    /// <summary>Default billing model for token details that do not identify their own model.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("model")]
-    public string? Model { get; set; }
+    /// <summary>Total cached input tokens reported for the phase.</summary>
+    [JsonPropertyName("cachedTokens")]
+    public required long CachedTokens { get; set; }
 
-    /// <summary>Itemized token usage breakdown.</summary>
+    /// <summary>Total tokens written to prompt cache during the phase.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonInclude]
-    [JsonPropertyName("tokenDetails")]
-    internal AssistantUsageCopilotUsageTokenDetail[]? TokenDetails { get; set; }
+    [JsonPropertyName("cacheWriteTokens")]
+    public long? CacheWriteTokens { get; set; }
 
-    /// <summary>Total cost in nano-AI units for this request.</summary>
+    /// <summary>Total input tokens consumed by the phase.</summary>
+    [JsonPropertyName("inputTokens")]
+    public required long InputTokens { get; set; }
+
+    /// <summary>Total output tokens produced by the phase.</summary>
+    [JsonPropertyName("outputTokens")]
+    public required long OutputTokens { get; set; }
+
+    /// <summary>Number of concrete model requests made by the phase.</summary>
+    [JsonPropertyName("requestCount")]
+    public required long RequestCount { get; set; }
+
+    /// <summary>Total normalized AI-unit cost reported for the phase, in nano-AIU.</summary>
     [JsonPropertyName("totalNanoAiu")]
     public required double TotalNanoAiu { get; set; }
 }
 
-/// <summary>Internal per-quota snapshot for assistant usage, including entitlement, consumed requests, overage, reset date, and remaining quota.</summary>
-/// <remarks>Nested data type for <c>AssistantUsageQuotaSnapshot</c>.</remarks>
-internal sealed partial class AssistantUsageQuotaSnapshot
+/// <summary>A source that backs one or more cited spans in the assistant's response.</summary>
+/// <remarks>Nested data type for <c>CitationSource</c>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed partial class CitationSource
 {
-    /// <summary>Total requests allowed by the entitlement.</summary>
-    [JsonInclude]
-    [JsonPropertyName("entitlementRequests")]
-    internal required long EntitlementRequests { get; set; }
+    /// <summary>Stable, turn-scoped identifier for this source, referenced by CitationReference.sourceId.</summary>
+    [JsonPropertyName("id")]
+    public required string Id { get; set; }
 
-    /// <summary>Whether the user currently has quota available for use.</summary>
+    /// <summary>File path relative to the agent's workspace root, when the source is a file.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonInclude]
-    [JsonPropertyName("hasQuota")]
-    internal bool? HasQuota { get; set; }
-
-    /// <summary>Whether the user has an unlimited usage entitlement.</summary>
-    [JsonInclude]
-    [JsonPropertyName("isUnlimitedEntitlement")]
-    internal required bool IsUnlimitedEntitlement { get; set; }
+    [JsonPropertyName("path")]
+    public string? Path { get; set; }
 
-    /// <summary>Number of additional usage requests made this period.</summary>
-    [JsonInclude]
-    [JsonPropertyName("overage")]
-    internal required double Overage { get; set; }
+    /// <summary>The system that produced this citation.</summary>
+    [JsonPropertyName("provider")]
+    public required CitationProvider Provider { get; set; }
 
-    /// <summary>Whether additional usage is allowed when quota is exhausted.</summary>
-    [JsonInclude]
-    [JsonPropertyName("overageAllowedWithExhaustedQuota")]
-    internal required bool OverageAllowedWithExhaustedQuota { get; set; }
+    /// <summary>Human-readable title of the source.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("title")]
+    public string? Title { get; set; }
 
-    /// <summary>Pay-as-you-go additional-usage budget cap in AI credits (1 credit = $0.01); present only when CAPI emits a finite value.</summary>
+    /// <summary>URL of the source, when it is a web resource.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonInclude]
-    [JsonPropertyName("overageEntitlement")]
-    internal double? OverageEntitlement { get; set; }
-
-    /// <summary>Percentage of quota remaining (0 to 100).</summary>
-    [JsonInclude]
-    [JsonPropertyName("remainingPercentage")]
-    internal required double RemainingPercentage { get; set; }
-
-    /// <summary>Date when the quota resets.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonInclude]
-    [JsonPropertyName("resetDate")]
-    internal DateTimeOffset? ResetDate { get; set; }
-
-    /// <summary>Whether this snapshot uses token-based billing (AI-credits allocation).</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonInclude]
-    [JsonPropertyName("tokenBasedBilling")]
-    internal bool? TokenBasedBilling { get; set; }
-
-    /// <summary>Whether usage is still permitted after quota exhaustion.</summary>
-    [JsonInclude]
-    [JsonPropertyName("usageAllowedWithExhaustedQuota")]
-    internal required bool UsageAllowedWithExhaustedQuota { get; set; }
-
-    /// <summary>Number of requests already consumed.</summary>
-    [JsonInclude]
-    [JsonPropertyName("usedRequests")]
-    internal required long UsedRequests { get; set; }
+    [JsonPropertyName("url")]
+    public string? Url { get; set; }
 }
 
-/// <summary>Content-free structural summary of the failing request for diagnosing malformed 4xx calls.</summary>
-/// <remarks>Nested data type for <c>ModelCallFailureRequestFingerprint</c>.</remarks>
-public sealed partial class ModelCallFailureRequestFingerprint
+/// <summary>A character range within the source's text content.</summary>
+/// <remarks>The <c>char</c> variant of <see cref="CitationLocation"/>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed partial class CitationLocationChar : CitationLocation
 {
-    /// <summary>Total number of image content parts.</summary>
-    [JsonPropertyName("imagePartCount")]
-    public required long ImagePartCount { get; set; }
-
-    /// <summary>Image parts whose media type cannot be determined (rejected by strict providers).</summary>
-    [JsonPropertyName("imagePartsMissingMediaType")]
-    public required long ImagePartsMissingMediaType { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "char";
 
-    /// <summary>Role of the final message in the request.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("lastMessageRole")]
-    public string? LastMessageRole { get; set; }
+    /// <summary>End character offset within the source text (zero-based, exclusive).</summary>
+    [JsonPropertyName("endIndex")]
+    public required long EndIndex { get; set; }
 
-    /// <summary>Total number of messages in the request.</summary>
-    [JsonPropertyName("messageCount")]
-    public required long MessageCount { get; set; }
+    /// <summary>Start character offset within the source text (zero-based, inclusive).</summary>
+    [JsonPropertyName("startIndex")]
+    public required long StartIndex { get; set; }
+}
 
-    /// <summary>Tool calls whose name is missing or empty (rejected by strict providers).</summary>
-    [JsonPropertyName("namelessToolCallCount")]
-    public required long NamelessToolCallCount { get; set; }
+/// <summary>A page range within a paginated source document.</summary>
+/// <remarks>The <c>page</c> variant of <see cref="CitationLocation"/>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed partial class CitationLocationPage : CitationLocation
+{
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "page";
 
-    /// <summary>Total number of tool calls across assistant messages.</summary>
-    [JsonPropertyName("toolCallCount")]
-    public required long ToolCallCount { get; set; }
+    /// <summary>Last page number of the cited range (inclusive).</summary>
+    [JsonPropertyName("endPage")]
+    public required long EndPage { get; set; }
 
-    /// <summary>Number of "tool" result messages in the request.</summary>
-    [JsonPropertyName("toolResultMessageCount")]
-    public required long ToolResultMessageCount { get; set; }
+    /// <summary>First page number of the cited range.</summary>
+    [JsonPropertyName("startPage")]
+    public required long StartPage { get; set; }
 }
 
-/// <summary>Shell-aware path hints for a shell tool's command, captured at start time so consumers can snapshot a file's pre-image before the tool runs.</summary>
-/// <remarks>Nested data type for <c>ToolExecutionStartShellToolInfo</c>.</remarks>
-public sealed partial class ToolExecutionStartShellToolInfo
+/// <summary>A content-block range within a structured source document.</summary>
+/// <remarks>The <c>block</c> variant of <see cref="CitationLocation"/>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed partial class CitationLocationBlock : CitationLocation
 {
-    /// <summary>The command with a redundant leading `cd` into the working directory removed, present only when there was one to remove. Computed with the same routine the shell driver applies before spawning, so a surface that renders this shows the text that actually runs. Consumers that display it should keep the original tool arguments available on demand.</summary>
-    [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("displayCommand")]
-    public string? DisplayCommand { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "block";
 
-    /// <summary>Whether the command includes a file write redirection (e.g., &gt; or &gt;&gt;).</summary>
-    [JsonPropertyName("hasWriteFileRedirection")]
-    public required bool HasWriteFileRedirection { get; set; }
+    /// <summary>Index of the last content block of the cited range (zero-based, exclusive).</summary>
+    [JsonPropertyName("endBlock")]
+    public required long EndBlock { get; set; }
 
-    /// <summary>File paths the command may read or write, derived from the command at start time. 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.</summary>
-    [JsonPropertyName("possiblePaths")]
-    public required string[] PossiblePaths { get; set; }
+    /// <summary>Index of the first content block of the cited range (zero-based, inclusive).</summary>
+    [JsonPropertyName("startBlock")]
+    public required long StartBlock { get; set; }
 }
 
-/// <summary>MCP Apps tool `_meta.ui` resource URI and visibility captured on `tool.execution_start`.</summary>
-/// <remarks>Nested data type for <c>ToolExecutionStartToolDescriptionMetaUI</c>.</remarks>
-public sealed partial class ToolExecutionStartToolDescriptionMetaUI
+/// <summary>Location within a cited source (character, page, or content-block range) that supports a span.</summary>
+/// <remarks>Polymorphic base type discriminated by <c>type</c>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "type",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(CitationLocationChar), "char")]
+[JsonDerivedType(typeof(CitationLocationPage), "page")]
+[JsonDerivedType(typeof(CitationLocationBlock), "block")]
+public partial class CitationLocation
 {
-    /// <summary>URI of the UI resource.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("resourceUri")]
-    public string? ResourceUri { get; set; }
-
-    /// <summary>Who can access this tool.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("visibility")]
-    public ToolExecutionStartToolDescriptionMetaUIVisibility[]? Visibility { get; set; }
+    /// <summary>The type discriminator.</summary>
+    [JsonPropertyName("type")]
+    public virtual string Type { get; set; } = string.Empty;
 }
 
-/// <summary>MCP Apps metadata for UI resource association.</summary>
-/// <remarks>Nested data type for <c>ToolExecutionStartToolDescriptionMeta</c>.</remarks>
-public sealed partial class ToolExecutionStartToolDescriptionMeta
+
+/// <summary>A single citation occurrence linking a span of generated text to a supporting source.</summary>
+/// <remarks>Nested data type for <c>CitationReference</c>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed partial class CitationReference
 {
-    /// <summary>MCP Apps tool `_meta.ui` resource URI and visibility captured on `tool.execution_start`.</summary>
+    /// <summary>The exact text from the source that supports the cited span, when provided by the model.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("ui")]
-    public ToolExecutionStartToolDescriptionMetaUI? Ui { get; set; }
-}
+    [JsonPropertyName("citedText")]
+    public string? CitedText { get; set; }
 
-/// <summary>Tool definition metadata, present for MCP tools with MCP Apps support.</summary>
-/// <remarks>Nested data type for <c>ToolExecutionStartToolDescription</c>.</remarks>
-public sealed partial class ToolExecutionStartToolDescription
-{
-    /// <summary>MCP Apps metadata for UI resource association.</summary>
+    /// <summary>Location within the source that supports the cited span, when the provider reports one.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("_meta")]
-    public ToolExecutionStartToolDescriptionMeta? Meta { get; set; }
+    [JsonPropertyName("location")]
+    public CitationLocation? Location { get; set; }
 
-    /// <summary>Tool description.</summary>
+    /// <summary>Provider-native citation correlation data (e.g. Anthropic search_result_index / document_index), passed through opaquely for debugging and forward compatibility.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("description")]
-    public string? Description { get; set; }
+    [JsonPropertyName("providerMetadata")]
+    public JsonElement? ProviderMetadata { get; set; }
 
-    /// <summary>Tool name.</summary>
-    [JsonPropertyName("name")]
-    public required string Name { get; set; }
+    /// <summary>Identifier of the CitationSource this reference points to (CitationSource.id).</summary>
+    [JsonPropertyName("sourceId")]
+    public required string SourceId { get; set; }
 }
 
-/// <summary>Error details when the tool execution failed.</summary>
-/// <remarks>Nested data type for <c>ToolExecutionCompleteError</c>.</remarks>
-public sealed partial class ToolExecutionCompleteError
+/// <summary>A contiguous span of generated assistant text and the source references that support it.</summary>
+/// <remarks>Nested data type for <c>CitationSpan</c>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed partial class CitationSpan
 {
-    /// <summary>Machine-readable error code.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("code")]
-    public string? Code { get; set; }
+    /// <summary>End offset of the cited span within the final assistant message content (UTF-16 code units, zero-based, exclusive).</summary>
+    [JsonPropertyName("endIndex")]
+    public required long EndIndex { get; set; }
 
-    /// <summary>Human-readable error message.</summary>
-    [JsonPropertyName("message")]
-    public required string Message { get; set; }
+    /// <summary>The sources that support this span of generated text.</summary>
+    [JsonPropertyName("references")]
+    public required CitationReference[] References { get; set; }
 
-    /// <summary>What the user must do to recover, when the runtime knows of an action. Set on sandbox policy denials, where `message` names the rule that blocked the call but never the client affordance that relaxes it.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("remediation")]
-    public RemediationAction? Remediation { get; set; }
+    /// <summary>Start offset of the cited span within the final assistant message content (UTF-16 code units, zero-based, inclusive).</summary>
+    [JsonPropertyName("startIndex")]
+    public required long StartIndex { get; set; }
 }
 
-/// <summary>A file mutation that was actually committed by a built-in file editing tool.</summary>
-/// <remarks>Nested data type for <c>ToolExecutionCompleteFileEdit</c>.</remarks>
+/// <summary>Provider-agnostic citations linking spans of the assistant's response to their supporting sources.</summary>
+/// <remarks>Nested data type for <c>Citations</c>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed partial class ToolExecutionCompleteFileEdit
+public sealed partial class Citations
 {
-    /// <summary>Kind of mutation committed at this path.</summary>
-    [JsonPropertyName("kind")]
-    public required ToolExecutionCompleteFileEditKind Kind { get; set; }
+    /// <summary>Deduplicated set of sources referenced by the citation spans.</summary>
+    [JsonPropertyName("sources")]
+    public required CitationSource[] Sources { get; set; }
 
-    /// <summary>Absolute path in the session filesystem namespace.</summary>
-    [JsonPropertyName("path")]
-    public required string Path { get; set; }
+    /// <summary>Spans of generated text annotated with the sources that support them.</summary>
+    [JsonPropertyName("spans")]
+    public required CitationSpan[] Spans { get; set; }
 }
 
-/// <summary>Binary result returned by a tool for the model.</summary>
-/// <remarks>Nested data type for <c>PersistedBinaryImage</c>.</remarks>
-public sealed partial class PersistedBinaryImage
+/// <summary>Experimental attribution linking an ordinary event to the HydraFusion turn, phase, and concrete source that produced it.</summary>
+/// <remarks>Nested data type for <c>FusionAttribution</c>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed partial class FusionAttribution
 {
-    /// <summary>Base64-encoded binary data.</summary>
-    [Base64String]
-    [JsonPropertyName("data")]
-    public required string Data { get; set; }
+    /// <summary>Idempotency identifier for the authoritative commit, when the event belongs to the selected output.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("commitId")]
+    public string? CommitId { get; set; }
 
-    /// <summary>Human-readable description of the binary data.</summary>
+    /// <summary>Conversation scope in which the concrete phase executed.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("description")]
-    public string? Description { get; set; }
+    [JsonPropertyName("conversationScope")]
+    public string? ConversationScope { get; set; }
 
-    /// <summary>Optional metadata from the producing tool.</summary>
+    /// <summary>Stable identifier for the HydraFusion turn that produced the event.</summary>
+    [JsonPropertyName("fusionId")]
+    public required string FusionId { get; set; }
+
+    /// <summary>Whether this model request consumed a user steering message rather than only internal Fusion work.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("metadata")]
-    public IDictionary<string, JsonElement>? Metadata { get; set; }
+    [JsonPropertyName("hasUserSteering")]
+    public bool? HasUserSteering { get; set; }
 
-    /// <summary>MIME type of the binary data.</summary>
-    [JsonPropertyName("mimeType")]
-    public required string MimeType { get; set; }
+    /// <summary>HydraFusion orchestration pattern selected for the turn.</summary>
+    [JsonPropertyName("pattern")]
+    public required string Pattern { get; set; }
 
-    /// <summary>Binary result type discriminator. Use "image" for images and "resource" for other binary data.</summary>
-    [JsonPropertyName("type")]
-    public required PersistedBinaryImageType Type { get; set; }
-}
-
-/// <summary>A binary result whose data was omitted from persistence due to the inline size limit.</summary>
-/// <remarks>Nested data type for <c>OmittedBinaryResult</c>.</remarks>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed partial class OmittedBinaryResult
-{
-    /// <summary>Decoded byte length of the omitted binary data.</summary>
-    [JsonPropertyName("byteLength")]
-    public required long ByteLength { get; set; }
+    /// <summary>Identifier of the concrete phase that produced the event.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("phaseId")]
+    public string? PhaseId { get; set; }
 
-    /// <summary>Human-readable description of the binary data.</summary>
+    /// <summary>Kind of concrete phase that produced the event.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("description")]
-    public string? Description { get; set; }
+    [JsonPropertyName("phaseKind")]
+    public string? PhaseKind { get; set; }
 
-    /// <summary>Optional metadata from the producing tool.</summary>
+    /// <summary>HydraFusion routing policy used for the turn.</summary>
+    [JsonPropertyName("policy")]
+    public required string Policy { get; set; }
+
+    /// <summary>Semantic role assigned to the concrete phase.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("metadata")]
-    public IDictionary<string, JsonElement>? Metadata { get; set; }
+    [JsonPropertyName("role")]
+    public string? Role { get; set; }
 
-    /// <summary>MIME type of the omitted binary data.</summary>
-    [JsonPropertyName("mimeType")]
-    public required string MimeType { get; set; }
+    /// <summary>Concrete model that produced the attributed event.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("sourceModel")]
+    public string? SourceModel { get; set; }
 
-    /// <summary>Why the binary data is absent: it exceeded the inline size limit, or its asset was unavailable.</summary>
-    [JsonPropertyName("omittedReason")]
-    public required OmittedBinaryOmittedReason OmittedReason { get; set; }
+    /// <summary>Phase whose output supplied the authoritative content, when different from the executing phase.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("sourcePhaseId")]
+    public string? SourcePhaseId { get; set; }
 
-    /// <summary>Binary result type discriminator. Use "image" for images and "resource" for other binary data.</summary>
-    [JsonPropertyName("type")]
-    public required OmittedBinaryType Type { get; set; }
+    /// <summary>Synthetic HydraFusion model selected for the session.</summary>
+    [JsonPropertyName("syntheticModel")]
+    public required string SyntheticModel { get; set; }
 }
 
-/// <summary>A reference to binary data persisted once on a session.binary_asset event and shared by id.</summary>
-/// <remarks>Nested data type for <c>BinaryAssetReference</c>.</remarks>
+/// <summary>Neutral provider-tagged reasoning content blocks preserved verbatim for round-tripping.</summary>
+/// <remarks>Nested data type for <c>AssistantMessageReasoningBlocks</c>.</remarks>
 [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed partial class BinaryAssetReference
+public sealed partial class AssistantMessageReasoningBlocks
 {
-    /// <summary>Content-addressed id of the session.binary_asset event that holds this binary's bytes (e.g. "sha256:...").</summary>
-    [JsonPropertyName("assetId")]
-    public required string AssetId { get; set; }
+    /// <summary>Provider-native reasoning items or content blocks preserved verbatim, in order. A single response can carry several, and provider signatures or identifiers may depend on their exact content and ordering.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("blocks")]
+    public JsonElement[]? Blocks { get; set; }
 
-    /// <summary>Decoded byte length of the referenced binary data.</summary>
-    [JsonPropertyName("byteLength")]
-    public required long ByteLength { get; set; }
+    /// <summary>Anthropic Messages assistant block ordering preserved when the legacy reasoning-only representation cannot reproduce it exactly. Thinking and text blocks remain verbatim; tool-use entries retain identity and a payload fingerprint when later signed reasoning depends on them, and are hydrated from the message's tool requests during replay.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("orderedBlocks")]
+    public JsonElement[]? OrderedBlocks { get; set; }
 
-    /// <summary>Human-readable description of the binary data.</summary>
+    /// <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(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed partial class AssistantMessageServerTools
+{
+    /// <summary>Advisor model identifier associated with the server-tool payload.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("description")]
-    public string? Description { get; set; }
+    [JsonPropertyName("advisorModel")]
+    public string? AdvisorModel { get; set; }
 
-    /// <summary>Optional metadata from the producing tool.</summary>
+    /// <summary>Provider function-call namespaces keyed by function-call identifier.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("metadata")]
-    public IDictionary<string, JsonElement>? Metadata { get; set; }
+    [JsonPropertyName("functionCallNamespaces")]
+    public IDictionary<string, string>? FunctionCallNamespaces { get; set; }
 
-    /// <summary>MIME type of the referenced binary data.</summary>
-    [JsonPropertyName("mimeType")]
-    public required string MimeType { get; set; }
+    /// <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>Binary result type discriminator. Use "image" for images and "resource" for other binary data.</summary>
-    [JsonPropertyName("type")]
-    public required BinaryAssetReferenceType Type { get; set; }
+    /// <summary>Model provider that produced this server-tool payload.</summary>
+    [JsonPropertyName("provider")]
+    public required string Provider { get; set; }
+
+    /// <summary>Raw provider content blocks retained for verbatim round-tripping.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("rawContentBlocks")]
+    public JsonElement[]? RawContentBlocks { get; set; }
 }
 
-/// <summary>A model-facing binary result as persisted: full inline data, a size-omitted marker, or a deduplicated asset reference.</summary>
-/// <remarks>JSON union data type for <c>PersistedBinaryResult</c>.</remarks>
-[JsonConverter(typeof(Converter))]
-public sealed partial class PersistedBinaryResult
+/// <summary>Hosted program that requested this client tool call.</summary>
+/// <remarks>Nested data type for <c>AssistantMessageToolRequestCaller</c>.</remarks>
+public sealed partial class AssistantMessageToolRequestCaller
 {
-    /// <summary>Gets the value when this instance contains <see cref="PersistedBinaryImage"/>.</summary>
-    public PersistedBinaryImage? PersistedBinaryImage { get; }
+    /// <summary>Provider-assigned identifier for the hosted caller.</summary>
+    [JsonPropertyName("callerId")]
+    public required string CallerId { get; set; }
 
-    /// <summary>Gets the value when this instance contains <see cref="OmittedBinaryResult"/>.</summary>
-    public OmittedBinaryResult? OmittedBinaryResult { get; }
+    /// <summary>Kind of hosted caller that requested the client tool call.</summary>
+    [JsonPropertyName("type")]
+    public required AssistantMessageToolRequestCallerType Type { get; set; }
+}
 
-    /// <summary>Gets the value when this instance contains <see cref="BinaryAssetReference"/>.</summary>
-    public BinaryAssetReference? BinaryAssetReference { get; }
+/// <summary>A tool invocation request from the assistant.</summary>
+/// <remarks>Nested data type for <c>AssistantMessageToolRequest</c>.</remarks>
+public sealed partial class AssistantMessageToolRequest
+{
+    /// <summary>Arguments to pass to the tool, format depends on the tool.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("arguments")]
+    public JsonElement? Arguments { get; set; }
 
-    /// <summary>Initializes a new instance of the <see cref="PersistedBinaryResult"/> class from <see cref="PersistedBinaryImage"/>.</summary>
-    public PersistedBinaryResult(PersistedBinaryImage value)
-    {
-        ArgumentNullException.ThrowIfNull(value);
-        PersistedBinaryImage = value;
-    }
+    /// <summary>Hosted program that requested this client tool call.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("caller")]
+    public AssistantMessageToolRequestCaller? Caller { get; set; }
 
-    /// <summary>Converts <see cref="PersistedBinaryImage"/> to <see cref="PersistedBinaryResult"/>.</summary>
-    public static implicit operator PersistedBinaryResult(PersistedBinaryImage value) => new(value);
+    /// <summary>Resolved intention summary describing what this specific call does.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("intentionSummary")]
+    public string? IntentionSummary { get; set; }
 
-    /// <summary>Initializes a new instance of the <see cref="PersistedBinaryResult"/> class from <see cref="OmittedBinaryResult"/>.</summary>
-    public PersistedBinaryResult(OmittedBinaryResult value)
-    {
-        ArgumentNullException.ThrowIfNull(value);
-        OmittedBinaryResult = value;
-    }
+    /// <summary>Name of the MCP server hosting this tool, when the tool is an MCP tool.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("mcpServerName")]
+    public string? McpServerName { get; set; }
 
-    /// <summary>Converts <see cref="OmittedBinaryResult"/> to <see cref="PersistedBinaryResult"/>.</summary>
-    public static implicit operator PersistedBinaryResult(OmittedBinaryResult value) => new(value);
+    /// <summary>Original tool name on the MCP server, when the tool is an MCP tool.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("mcpToolName")]
+    public string? McpToolName { get; set; }
 
-    /// <summary>Initializes a new instance of the <see cref="PersistedBinaryResult"/> class from <see cref="BinaryAssetReference"/>.</summary>
-    public PersistedBinaryResult(BinaryAssetReference value)
-    {
-        ArgumentNullException.ThrowIfNull(value);
-        BinaryAssetReference = value;
-    }
+    /// <summary>Name of the tool being invoked.</summary>
+    [JsonPropertyName("name")]
+    public required string Name { get; set; }
 
-    /// <summary>Converts <see cref="BinaryAssetReference"/> to <see cref="PersistedBinaryResult"/>.</summary>
-    public static implicit operator PersistedBinaryResult(BinaryAssetReference value) => new(value);
+    /// <summary>Unique identifier for this tool call.</summary>
+    [JsonPropertyName("toolCallId")]
+    public required string ToolCallId { get; set; }
 
-    /// <summary>Provides a <see cref="JsonConverter{PersistedBinaryResult}"/> for serializing <see cref="PersistedBinaryResult"/> instances.</summary>
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<PersistedBinaryResult>
-    {
-        /// <inheritdoc />
-        public override PersistedBinaryResult Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-        {
-            if (reader.TokenType == JsonTokenType.Null)
-            {
-                throw new JsonException("Expected JSON object for PersistedBinaryResult.");
-            }
+    /// <summary>Human-readable display title for the tool.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("toolTitle")]
+    public string? ToolTitle { get; set; }
 
-            using var document = JsonDocument.ParseValue(ref reader);
-            var element = document.RootElement;
-            if (element.ValueKind == JsonValueKind.Object && element.TryGetProperty("data", out _) && !element.TryGetProperty("assetId", out _) && !element.TryGetProperty("byteLength", out _) && !element.TryGetProperty("omittedReason", out _))
-            {
-                var persistedBinaryImage = JsonSerializer.Deserialize(element, SessionEventsJsonContext.Default.PersistedBinaryImage);
-                return persistedBinaryImage is null ? throw new JsonException("Expected PersistedBinaryImage value.") : new PersistedBinaryResult(persistedBinaryImage);
-            }
-            if (element.ValueKind == JsonValueKind.Object && element.TryGetProperty("omittedReason", out _) && !element.TryGetProperty("assetId", out _) && !element.TryGetProperty("data", out _))
-            {
-                var omittedBinaryResult = JsonSerializer.Deserialize(element, SessionEventsJsonContext.Default.OmittedBinaryResult);
-                return omittedBinaryResult is null ? throw new JsonException("Expected OmittedBinaryResult value.") : new PersistedBinaryResult(omittedBinaryResult);
-            }
-            if (element.ValueKind == JsonValueKind.Object && element.TryGetProperty("assetId", out _) && !element.TryGetProperty("data", out _) && !element.TryGetProperty("omittedReason", out _))
-            {
-                var binaryAssetReference = JsonSerializer.Deserialize(element, SessionEventsJsonContext.Default.BinaryAssetReference);
-                return binaryAssetReference is null ? throw new JsonException("Expected BinaryAssetReference value.") : new PersistedBinaryResult(binaryAssetReference);
-            }
+    /// <summary>Tool call type: "function" for standard tool calls, "custom" for grammar-based tool calls. Defaults to "function" when absent.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("type")]
+    public AssistantMessageToolRequestType? Type { get; set; }
+}
 
-            throw new JsonException("JSON value did not match any PersistedBinaryResult variant.");
-        }
+/// <summary>Ordered accounting identity assigned under the source session's emission lock.</summary>
+/// <remarks>Nested data type for <c>UsageAccountingIdentity</c>.</remarks>
+public sealed partial class UsageAccountingIdentity
+{
+    /// <summary>Monotonically increasing sequence within the source session.</summary>
+    [JsonPropertyName("sequence")]
+    public required long Sequence { get; set; }
 
-        /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, PersistedBinaryResult value, JsonSerializerOptions options)
-        {
-            if (value.PersistedBinaryImage is { } persistedBinaryImage)
-            {
-                JsonSerializer.Serialize(writer, persistedBinaryImage, SessionEventsJsonContext.Default.PersistedBinaryImage);
-                return;
-            }
-            if (value.OmittedBinaryResult is { } omittedBinaryResult)
-            {
-                JsonSerializer.Serialize(writer, omittedBinaryResult, SessionEventsJsonContext.Default.OmittedBinaryResult);
-                return;
-            }
-            if (value.BinaryAssetReference is { } binaryAssetReference)
-            {
-                JsonSerializer.Serialize(writer, binaryAssetReference, SessionEventsJsonContext.Default.BinaryAssetReference);
-                return;
-            }
+    /// <summary>Session that assigned this accounting sequence.</summary>
+    [JsonPropertyName("sourceSessionId")]
+    public required string SourceSessionId { get; set; }
 
-            throw new JsonException("No PersistedBinaryResult variant value is set.");
-        }
-    }
+    /// <summary>Existing API call identifier, or a runtime-generated identity when none was supplied.</summary>
+    [JsonPropertyName("usageId")]
+    public required string UsageId { get; set; }
 }
 
-/// <summary>A source supplied by a tool that should be made available to the model as citable content.</summary>
-/// <remarks>Nested data type for <c>CitableSource</c>.</remarks>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed partial class CitableSource
-{
-    /// <summary>The source text made available to the model as citable content.</summary>
-    [JsonPropertyName("content")]
-    public required string Content { get; set; }
+/// <summary>Token usage detail for a single billing category.</summary>
+/// <remarks>Nested data type for <c>AssistantUsageCopilotUsageTokenDetail</c>.</remarks>
+public sealed partial class AssistantUsageCopilotUsageTokenDetail
+{
+    /// <summary>Number of tokens in this billing batch.</summary>
+    [JsonPropertyName("batchSize")]
+    public required long BatchSize { get; set; }
 
-    /// <summary>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.</summary>
-    [JsonPropertyName("id")]
-    public required string Id { get; set; }
+    /// <summary>Cost per batch of tokens.</summary>
+    [JsonPropertyName("costPerBatch")]
+    public required long CostPerBatch { get; set; }
 
-    /// <summary>File path relative to the agent's workspace root, when the source is a file.</summary>
+    /// <summary>Model responsible for this billing entry.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("path")]
-    public string? Path { get; set; }
+    [JsonPropertyName("model")]
+    public string? Model { get; set; }
 
-    /// <summary>Human-readable title of the source.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("title")]
-    public string? Title { get; set; }
+    /// <summary>Total token count for this entry.</summary>
+    [JsonPropertyName("tokenCount")]
+    public required long TokenCount { get; set; }
 
-    /// <summary>URL of the source, when it is a web resource.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("url")]
-    public string? Url { get; set; }
+    /// <summary>Token category (e.g., "input", "output").</summary>
+    [JsonPropertyName("tokenType")]
+    public required string TokenType { get; set; }
 }
 
-/// <summary>Plain text content block.</summary>
-/// <remarks>The <c>text</c> variant of <see cref="ToolExecutionCompleteContent"/>.</remarks>
-public sealed partial class ToolExecutionCompleteContentText : ToolExecutionCompleteContent
+/// <summary>Per-request cost and usage data from the CAPI copilot_usage response field.</summary>
+/// <remarks>Nested data type for <c>AssistantUsageCopilotUsage</c>.</remarks>
+public sealed partial class AssistantUsageCopilotUsage
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "text";
+    /// <summary>Default billing model for token details that do not identify their own model.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("model")]
+    public string? Model { get; set; }
 
-    /// <summary>The text content.</summary>
-    [JsonPropertyName("text")]
-    public required string Text { get; set; }
+    /// <summary>Itemized token usage breakdown.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonInclude]
+    [JsonPropertyName("tokenDetails")]
+    internal AssistantUsageCopilotUsageTokenDetail[]? TokenDetails { get; set; }
+
+    /// <summary>Total cost in nano-AI units for this request.</summary>
+    [JsonPropertyName("totalNanoAiu")]
+    public required double TotalNanoAiu { get; set; }
 }
 
-/// <summary>Deprecated for shell command exit metadata. Use ToolExecutionCompleteContentShellExit instead.</summary>
-/// <remarks>The <c>terminal</c> variant of <see cref="ToolExecutionCompleteContent"/>.</remarks>
-[EditorBrowsable(EditorBrowsableState.Never)]
-#if NET5_0_OR_GREATER
-[Obsolete("This member is deprecated and will be removed in a future version.", DiagnosticId = "GHCP001")]
-#else
-[Obsolete("This member is deprecated and will be removed in a future version.")]
-#endif
-public sealed partial class ToolExecutionCompleteContentTerminal : ToolExecutionCompleteContent
+/// <summary>Internal per-quota snapshot for assistant usage, including entitlement, consumed requests, overage, reset date, and remaining quota.</summary>
+/// <remarks>Nested data type for <c>AssistantUsageQuotaSnapshot</c>.</remarks>
+internal sealed partial class AssistantUsageQuotaSnapshot
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "terminal";
+    /// <summary>Total requests allowed by the entitlement.</summary>
+    [JsonInclude]
+    [JsonPropertyName("entitlementRequests")]
+    internal required long EntitlementRequests { get; set; }
 
-    /// <summary>Working directory where the command was executed.</summary>
+    /// <summary>Whether the user currently has quota available for use.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("cwd")]
-    public string? Cwd { get; set; }
+    [JsonInclude]
+    [JsonPropertyName("hasQuota")]
+    internal bool? HasQuota { get; set; }
 
-    /// <summary>Process exit code, if the command has completed.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("exitCode")]
-    public long? ExitCode { get; set; }
+    /// <summary>Whether the user has an unlimited usage entitlement.</summary>
+    [JsonInclude]
+    [JsonPropertyName("isUnlimitedEntitlement")]
+    internal required bool IsUnlimitedEntitlement { get; set; }
 
-    /// <summary>Terminal/shell output text.</summary>
-    [JsonPropertyName("text")]
-    public required string Text { get; set; }
-}
+    /// <summary>Number of additional usage requests made this period.</summary>
+    [JsonInclude]
+    [JsonPropertyName("overage")]
+    internal required double Overage { get; set; }
 
-/// <summary>Shell command exit metadata with optional output preview.</summary>
-/// <remarks>The <c>shell_exit</c> variant of <see cref="ToolExecutionCompleteContent"/>.</remarks>
-public sealed partial class ToolExecutionCompleteContentShellExit : ToolExecutionCompleteContent
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "shell_exit";
+    /// <summary>Whether additional usage is allowed when quota is exhausted.</summary>
+    [JsonInclude]
+    [JsonPropertyName("overageAllowedWithExhaustedQuota")]
+    internal required bool OverageAllowedWithExhaustedQuota { get; set; }
 
-    /// <summary>Working directory where the shell command was executed.</summary>
+    /// <summary>Pay-as-you-go additional-usage budget cap in AI credits (1 credit = $0.01); present only when CAPI emits a finite value.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("cwd")]
-    public string? Cwd { get; set; }
+    [JsonInclude]
+    [JsonPropertyName("overageEntitlement")]
+    internal double? OverageEntitlement { get; set; }
 
-    /// <summary>Exit code from the completed shell command.</summary>
-    [JsonPropertyName("exitCode")]
-    public required long ExitCode { get; set; }
+    /// <summary>Percentage of quota remaining (0 to 100).</summary>
+    [JsonInclude]
+    [JsonPropertyName("remainingPercentage")]
+    internal required double RemainingPercentage { get; set; }
 
-    /// <summary>Path reported in the shell session's filesystem namespace when shell output exceeded the configured large-output threshold.</summary>
+    /// <summary>Date when the quota resets.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("outputFilePath")]
-    public string? OutputFilePath { get; set; }
+    [JsonInclude]
+    [JsonPropertyName("resetDate")]
+    internal DateTimeOffset? ResetDate { 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>
+    /// <summary>Whether this snapshot uses token-based billing (AI-credits allocation).</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("outputPreview")]
-    public string? OutputPreview { get; set; }
+    [JsonInclude]
+    [JsonPropertyName("tokenBasedBilling")]
+    internal bool? TokenBasedBilling { 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>Whether usage is still permitted after quota exhaustion.</summary>
+    [JsonInclude]
+    [JsonPropertyName("usageAllowedWithExhaustedQuota")]
+    internal required bool UsageAllowedWithExhaustedQuota { get; set; }
 
-    /// <summary>Shell id, as assigned by Copilot runtime.</summary>
-    [JsonPropertyName("shellId")]
-    public required string ShellId { get; set; }
+    /// <summary>Number of requests already consumed.</summary>
+    [JsonInclude]
+    [JsonPropertyName("usedRequests")]
+    internal required long UsedRequests { get; set; }
 }
 
-/// <summary>Image content block with base64-encoded data.</summary>
-/// <remarks>The <c>image</c> variant of <see cref="ToolExecutionCompleteContent"/>.</remarks>
-public sealed partial class ToolExecutionCompleteContentImage : ToolExecutionCompleteContent
+/// <summary>Content-free structural summary of the failing request for diagnosing malformed 4xx calls.</summary>
+/// <remarks>Nested data type for <c>ModelCallFailureRequestFingerprint</c>.</remarks>
+public sealed partial class ModelCallFailureRequestFingerprint
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "image";
+    /// <summary>Summed byte length of opaque or encrypted reasoning payloads.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("encryptedContentBytes")]
+    public long? EncryptedContentBytes { get; set; }
 
-    /// <summary>Base64-encoded image data.</summary>
-    [Base64String]
-    [JsonPropertyName("data")]
-    public required string Data { get; set; }
+    /// <summary>Summed byte length of inline image payloads (data URLs and base64 sources).</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("imageBytes")]
+    public long? ImageBytes { get; set; }
 
-    /// <summary>MIME type of the image (e.g., image/png, image/jpeg).</summary>
-    [JsonPropertyName("mimeType")]
-    public required string MimeType { get; set; }
-}
+    /// <summary>Total number of image content parts.</summary>
+    [JsonPropertyName("imagePartCount")]
+    public required long ImagePartCount { get; set; }
 
-/// <summary>Audio content block with base64-encoded data.</summary>
-/// <remarks>The <c>audio</c> variant of <see cref="ToolExecutionCompleteContent"/>.</remarks>
-public sealed partial class ToolExecutionCompleteContentAudio : ToolExecutionCompleteContent
-{
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "audio";
+    /// <summary>Image parts whose media type cannot be determined (rejected by strict providers).</summary>
+    [JsonPropertyName("imagePartsMissingMediaType")]
+    public required long ImagePartsMissingMediaType { get; set; }
 
-    /// <summary>Base64-encoded audio data.</summary>
-    [Base64String]
-    [JsonPropertyName("data")]
-    public required string Data { get; set; }
+    /// <summary>Role of the final message in the request.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("lastMessageRole")]
+    public string? LastMessageRole { get; set; }
 
-    /// <summary>MIME type of the audio (e.g., audio/wav, audio/mpeg).</summary>
-    [JsonPropertyName("mimeType")]
-    public required string MimeType { get; set; }
-}
+    /// <summary>Total number of messages in the request.</summary>
+    [JsonPropertyName("messageCount")]
+    public required long MessageCount { get; set; }
 
-/// <summary>Icon image for a resource.</summary>
-/// <remarks>Nested data type for <c>ToolExecutionCompleteContentResourceLinkIcon</c>.</remarks>
-public sealed partial class ToolExecutionCompleteContentResourceLinkIcon
-{
-    /// <summary>MIME type of the icon image.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("mimeType")]
-    public string? MimeType { get; set; }
+    /// <summary>Tool calls whose name is missing or empty (rejected by strict providers).</summary>
+    [JsonPropertyName("namelessToolCallCount")]
+    public required long NamelessToolCallCount { get; set; }
 
-    /// <summary>Available icon sizes (e.g., ['16x16', '32x32']).</summary>
+    /// <summary>Number of messages carrying opaque or encrypted reasoning.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("sizes")]
-    public string[]? Sizes { get; set; }
+    [JsonPropertyName("reasoningItemCount")]
+    public long? ReasoningItemCount { get; set; }
 
-    /// <summary>URL or path to the icon image.</summary>
-    [JsonPropertyName("src")]
-    public required string Src { get; set; }
+    /// <summary>Total number of tool calls across assistant messages.</summary>
+    [JsonPropertyName("toolCallCount")]
+    public required long ToolCallCount { get; set; }
 
-    /// <summary>Theme variant this icon is intended for.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("theme")]
-    public ToolExecutionCompleteContentResourceLinkIconTheme? Theme { get; set; }
+    /// <summary>Number of "tool" result messages in the request.</summary>
+    [JsonPropertyName("toolResultMessageCount")]
+    public required long ToolResultMessageCount { get; set; }
 }
 
-/// <summary>Resource link content block referencing an external resource.</summary>
-/// <remarks>The <c>resource_link</c> variant of <see cref="ToolExecutionCompleteContent"/>.</remarks>
-public sealed partial class ToolExecutionCompleteContentResourceLink : ToolExecutionCompleteContent
+/// <summary>Shell-aware path hints for a shell tool's command, captured at start time so consumers can snapshot a file's pre-image before the tool runs.</summary>
+/// <remarks>Nested data type for <c>ToolExecutionStartShellToolInfo</c>.</remarks>
+public sealed partial class ToolExecutionStartShellToolInfo
 {
-    /// <inheritdoc />
-    [JsonIgnore]
-    public override string Type => "resource_link";
-
-    /// <summary>Human-readable description of the resource.</summary>
+    /// <summary>The command with a redundant leading `cd` into the working directory removed, present only when there was one to remove. Computed with the same routine the shell driver applies before spawning, so a surface that renders this shows the text that actually runs. Consumers that display it should keep the original tool arguments available on demand.</summary>
+    [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("description")]
-    public string? Description { get; set; }
+    [JsonPropertyName("displayCommand")]
+    public string? DisplayCommand { get; set; }
 
-    /// <summary>Icons associated with this resource.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("icons")]
-    public ToolExecutionCompleteContentResourceLinkIcon[]? Icons { get; set; }
+    /// <summary>Whether the command includes a file write redirection (e.g., &gt; or &gt;&gt;).</summary>
+    [JsonPropertyName("hasWriteFileRedirection")]
+    public required bool HasWriteFileRedirection { get; set; }
 
-    /// <summary>MIME type of the resource content.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("mimeType")]
-    public string? MimeType { get; set; }
+    /// <summary>File paths the command may read or write, derived from the command at start time. 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.</summary>
+    [JsonPropertyName("possiblePaths")]
+    public required string[] PossiblePaths { get; set; }
+}
 
-    /// <summary>Resource name identifier.</summary>
+/// <summary>MCP Apps tool `_meta.ui` resource URI and visibility captured on `tool.execution_start`.</summary>
+/// <remarks>Nested data type for <c>ToolExecutionStartToolDescriptionMetaUI</c>.</remarks>
+public sealed partial class ToolExecutionStartToolDescriptionMetaUI
+{
+    /// <summary>URI of the UI resource.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("resourceUri")]
+    public string? ResourceUri { get; set; }
+
+    /// <summary>Who can access this tool.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("visibility")]
+    public ToolExecutionStartToolDescriptionMetaUIVisibility[]? Visibility { get; set; }
+}
+
+/// <summary>MCP Apps metadata for UI resource association.</summary>
+/// <remarks>Nested data type for <c>ToolExecutionStartToolDescriptionMeta</c>.</remarks>
+public sealed partial class ToolExecutionStartToolDescriptionMeta
+{
+    /// <summary>MCP Apps tool `_meta.ui` resource URI and visibility captured on `tool.execution_start`.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("ui")]
+    public ToolExecutionStartToolDescriptionMetaUI? Ui { get; set; }
+}
+
+/// <summary>Tool definition metadata, present for MCP tools with MCP Apps support.</summary>
+/// <remarks>Nested data type for <c>ToolExecutionStartToolDescription</c>.</remarks>
+public sealed partial class ToolExecutionStartToolDescription
+{
+    /// <summary>MCP Apps metadata for UI resource association.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("_meta")]
+    public ToolExecutionStartToolDescriptionMeta? Meta { get; set; }
+
+    /// <summary>Tool description.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("description")]
+    public string? Description { get; set; }
+
+    /// <summary>Tool name.</summary>
     [JsonPropertyName("name")]
     public required string Name { get; set; }
+}
 
-    /// <summary>Size of the resource in bytes.</summary>
+/// <summary>Error details when the tool execution failed.</summary>
+/// <remarks>Nested data type for <c>ToolExecutionCompleteError</c>.</remarks>
+public sealed partial class ToolExecutionCompleteError
+{
+    /// <summary>Machine-readable error code.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("size")]
-    public long? Size { get; set; }
+    [JsonPropertyName("code")]
+    public string? Code { get; set; }
 
-    /// <summary>Human-readable display title for the resource.</summary>
+    /// <summary>Human-readable error message.</summary>
+    [JsonPropertyName("message")]
+    public required string Message { get; set; }
+
+    /// <summary>What the user must do to recover, when the runtime knows of an action. Set on sandbox policy denials, where `message` names the rule that blocked the call but never the client affordance that relaxes it.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("title")]
-    public string? Title { get; set; }
+    [JsonPropertyName("remediation")]
+    public RemediationAction? Remediation { get; set; }
+}
 
-    /// <summary>URI identifying the resource.</summary>
-    [JsonPropertyName("uri")]
-    public required string Uri { get; set; }
+/// <summary>A file mutation that was actually committed by a built-in file editing tool.</summary>
+/// <remarks>Nested data type for <c>ToolExecutionCompleteFileEdit</c>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed partial class ToolExecutionCompleteFileEdit
+{
+    /// <summary>Kind of mutation committed at this path.</summary>
+    [JsonPropertyName("kind")]
+    public required ToolExecutionCompleteFileEditKind Kind { get; set; }
+
+    /// <summary>Absolute path in the session filesystem namespace.</summary>
+    [JsonPropertyName("path")]
+    public required string Path { get; set; }
 }
 
-/// <summary>Embedded text resource contents identified by a URI, with an optional MIME type and a text payload.</summary>
-/// <remarks>Nested data type for <c>EmbeddedTextResourceContents</c>.</remarks>
-public sealed partial class EmbeddedTextResourceContents
+/// <summary>Binary result returned by a tool for the model.</summary>
+/// <remarks>Nested data type for <c>PersistedBinaryImage</c>.</remarks>
+public sealed partial class PersistedBinaryImage
 {
-    /// <summary>MIME type of the text content.</summary>
+    /// <summary>Base64-encoded binary data.</summary>
+    [Base64String]
+    [JsonPropertyName("data")]
+    public required string Data { get; set; }
+
+    /// <summary>Human-readable description of the binary data.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("description")]
+    public string? Description { get; set; }
+
+    /// <summary>Optional metadata from the producing tool.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("metadata")]
+    public IDictionary<string, JsonElement>? Metadata { get; set; }
+
+    /// <summary>MIME type of the binary data.</summary>
     [JsonPropertyName("mimeType")]
-    public string? MimeType { get; set; }
+    public required string MimeType { get; set; }
 
-    /// <summary>Text content of the resource.</summary>
-    [JsonPropertyName("text")]
-    public required string Text { get; set; }
+    /// <summary>Binary result type discriminator. Use "image" for images and "resource" for other binary data.</summary>
+    [JsonPropertyName("type")]
+    public required PersistedBinaryImageType Type { get; set; }
+}
 
-    /// <summary>URI identifying the resource.</summary>
-    [JsonPropertyName("uri")]
-    public required string Uri { get; set; }
+/// <summary>A binary result whose data was omitted from persistence due to the inline size limit.</summary>
+/// <remarks>Nested data type for <c>OmittedBinaryResult</c>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed partial class OmittedBinaryResult
+{
+    /// <summary>Decoded byte length of the omitted binary data.</summary>
+    [JsonPropertyName("byteLength")]
+    public required long ByteLength { get; set; }
+
+    /// <summary>Human-readable description of the binary data.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("description")]
+    public string? Description { get; set; }
+
+    /// <summary>Optional metadata from the producing tool.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("metadata")]
+    public IDictionary<string, JsonElement>? Metadata { get; set; }
+
+    /// <summary>MIME type of the omitted binary data.</summary>
+    [JsonPropertyName("mimeType")]
+    public required string MimeType { get; set; }
+
+    /// <summary>Why the binary data is absent: it exceeded the inline size limit, or its asset was unavailable.</summary>
+    [JsonPropertyName("omittedReason")]
+    public required OmittedBinaryOmittedReason OmittedReason { get; set; }
+
+    /// <summary>Binary result type discriminator. Use "image" for images and "resource" for other binary data.</summary>
+    [JsonPropertyName("type")]
+    public required OmittedBinaryType Type { get; set; }
 }
 
-/// <summary>Embedded binary resource contents identified by a URI, with an optional MIME type and a base64-encoded blob.</summary>
-/// <remarks>Nested data type for <c>EmbeddedBlobResourceContents</c>.</remarks>
-public sealed partial class EmbeddedBlobResourceContents
+/// <summary>A reference to binary data persisted once on a session.binary_asset event and shared by id.</summary>
+/// <remarks>Nested data type for <c>BinaryAssetReference</c>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed partial class BinaryAssetReference
 {
-    /// <summary>Base64-encoded binary content of the resource.</summary>
-    [Base64String]
-    [JsonPropertyName("blob")]
-    public required string Blob { get; set; }
+    /// <summary>Content-addressed id of the session.binary_asset event that holds this binary's bytes (e.g. "sha256:...").</summary>
+    [JsonPropertyName("assetId")]
+    public required string AssetId { get; set; }
 
-    /// <summary>MIME type of the blob content.</summary>
+    /// <summary>Decoded byte length of the referenced binary data.</summary>
+    [JsonPropertyName("byteLength")]
+    public required long ByteLength { get; set; }
+
+    /// <summary>Human-readable description of the binary data.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("description")]
+    public string? Description { get; set; }
+
+    /// <summary>Optional metadata from the producing tool.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("metadata")]
+    public IDictionary<string, JsonElement>? Metadata { get; set; }
+
+    /// <summary>MIME type of the referenced binary data.</summary>
     [JsonPropertyName("mimeType")]
-    public string? MimeType { get; set; }
+    public required string MimeType { get; set; }
 
-    /// <summary>URI identifying the resource.</summary>
-    [JsonPropertyName("uri")]
-    public required string Uri { get; set; }
+    /// <summary>Binary result type discriminator. Use "image" for images and "resource" for other binary data.</summary>
+    [JsonPropertyName("type")]
+    public required BinaryAssetReferenceType Type { get; set; }
 }
 
-/// <summary>The embedded resource contents, either text or base64-encoded binary.</summary>
-/// <remarks>JSON union data type for <c>ToolExecutionCompleteContentResourceDetails</c>.</remarks>
+/// <summary>A model-facing binary result as persisted: full inline data, a size-omitted marker, or a deduplicated asset reference.</summary>
+/// <remarks>JSON union data type for <c>PersistedBinaryResult</c>.</remarks>
 [JsonConverter(typeof(Converter))]
-public sealed partial class ToolExecutionCompleteContentResourceDetails
+public sealed partial class PersistedBinaryResult
 {
-    /// <summary>Gets the value when this instance contains <see cref="EmbeddedTextResourceContents"/>.</summary>
-    public EmbeddedTextResourceContents? EmbeddedTextResourceContents { get; }
+    /// <summary>Gets the value when this instance contains <see cref="PersistedBinaryImage"/>.</summary>
+    public PersistedBinaryImage? PersistedBinaryImage { get; }
 
-    /// <summary>Gets the value when this instance contains <see cref="EmbeddedBlobResourceContents"/>.</summary>
-    public EmbeddedBlobResourceContents? EmbeddedBlobResourceContents { get; }
+    /// <summary>Gets the value when this instance contains <see cref="OmittedBinaryResult"/>.</summary>
+    public OmittedBinaryResult? OmittedBinaryResult { get; }
 
-    /// <summary>Initializes a new instance of the <see cref="ToolExecutionCompleteContentResourceDetails"/> class from <see cref="EmbeddedTextResourceContents"/>.</summary>
-    public ToolExecutionCompleteContentResourceDetails(EmbeddedTextResourceContents value)
+    /// <summary>Gets the value when this instance contains <see cref="BinaryAssetReference"/>.</summary>
+    public BinaryAssetReference? BinaryAssetReference { get; }
+
+    /// <summary>Initializes a new instance of the <see cref="PersistedBinaryResult"/> class from <see cref="PersistedBinaryImage"/>.</summary>
+    public PersistedBinaryResult(PersistedBinaryImage value)
     {
         ArgumentNullException.ThrowIfNull(value);
-        EmbeddedTextResourceContents = value;
+        PersistedBinaryImage = value;
     }
 
-    /// <summary>Converts <see cref="EmbeddedTextResourceContents"/> to <see cref="ToolExecutionCompleteContentResourceDetails"/>.</summary>
-    public static implicit operator ToolExecutionCompleteContentResourceDetails(EmbeddedTextResourceContents value) => new(value);
+    /// <summary>Converts <see cref="PersistedBinaryImage"/> to <see cref="PersistedBinaryResult"/>.</summary>
+    public static implicit operator PersistedBinaryResult(PersistedBinaryImage value) => new(value);
 
-    /// <summary>Initializes a new instance of the <see cref="ToolExecutionCompleteContentResourceDetails"/> class from <see cref="EmbeddedBlobResourceContents"/>.</summary>
-    public ToolExecutionCompleteContentResourceDetails(EmbeddedBlobResourceContents value)
+    /// <summary>Initializes a new instance of the <see cref="PersistedBinaryResult"/> class from <see cref="OmittedBinaryResult"/>.</summary>
+    public PersistedBinaryResult(OmittedBinaryResult value)
     {
         ArgumentNullException.ThrowIfNull(value);
-        EmbeddedBlobResourceContents = value;
+        OmittedBinaryResult = value;
     }
 
-    /// <summary>Converts <see cref="EmbeddedBlobResourceContents"/> to <see cref="ToolExecutionCompleteContentResourceDetails"/>.</summary>
-    public static implicit operator ToolExecutionCompleteContentResourceDetails(EmbeddedBlobResourceContents value) => new(value);
+    /// <summary>Converts <see cref="OmittedBinaryResult"/> to <see cref="PersistedBinaryResult"/>.</summary>
+    public static implicit operator PersistedBinaryResult(OmittedBinaryResult value) => new(value);
 
-    /// <summary>Provides a <see cref="JsonConverter{ToolExecutionCompleteContentResourceDetails}"/> for serializing <see cref="ToolExecutionCompleteContentResourceDetails"/> instances.</summary>
+    /// <summary>Initializes a new instance of the <see cref="PersistedBinaryResult"/> class from <see cref="BinaryAssetReference"/>.</summary>
+    public PersistedBinaryResult(BinaryAssetReference value)
+    {
+        ArgumentNullException.ThrowIfNull(value);
+        BinaryAssetReference = value;
+    }
+
+    /// <summary>Converts <see cref="BinaryAssetReference"/> to <see cref="PersistedBinaryResult"/>.</summary>
+    public static implicit operator PersistedBinaryResult(BinaryAssetReference value) => new(value);
+
+    /// <summary>Provides a <see cref="JsonConverter{PersistedBinaryResult}"/> for serializing <see cref="PersistedBinaryResult"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<ToolExecutionCompleteContentResourceDetails>
+    public sealed class Converter : JsonConverter<PersistedBinaryResult>
     {
         /// <inheritdoc />
-        public override ToolExecutionCompleteContentResourceDetails Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override PersistedBinaryResult Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             if (reader.TokenType == JsonTokenType.Null)
             {
-                throw new JsonException("Expected JSON object for ToolExecutionCompleteContentResourceDetails.");
+                throw new JsonException("Expected JSON object for PersistedBinaryResult.");
             }
 
             using var document = JsonDocument.ParseValue(ref reader);
             var element = document.RootElement;
-            if (element.ValueKind == JsonValueKind.Object && element.TryGetProperty("text", out _) && !element.TryGetProperty("blob", out _))
+            if (element.ValueKind == JsonValueKind.Object && element.TryGetProperty("data", out _) && !element.TryGetProperty("assetId", out _) && !element.TryGetProperty("byteLength", out _) && !element.TryGetProperty("omittedReason", out _))
             {
-                var embeddedTextResourceContents = JsonSerializer.Deserialize(element, SessionEventsJsonContext.Default.EmbeddedTextResourceContents);
-                return embeddedTextResourceContents is null ? throw new JsonException("Expected EmbeddedTextResourceContents value.") : new ToolExecutionCompleteContentResourceDetails(embeddedTextResourceContents);
+                var persistedBinaryImage = JsonSerializer.Deserialize(element, SessionEventsJsonContext.Default.PersistedBinaryImage);
+                return persistedBinaryImage is null ? throw new JsonException("Expected PersistedBinaryImage value.") : new PersistedBinaryResult(persistedBinaryImage);
             }
-            if (element.ValueKind == JsonValueKind.Object && element.TryGetProperty("blob", out _) && !element.TryGetProperty("text", out _))
+            if (element.ValueKind == JsonValueKind.Object && element.TryGetProperty("omittedReason", out _) && !element.TryGetProperty("assetId", out _) && !element.TryGetProperty("data", out _))
             {
-                var embeddedBlobResourceContents = JsonSerializer.Deserialize(element, SessionEventsJsonContext.Default.EmbeddedBlobResourceContents);
-                return embeddedBlobResourceContents is null ? throw new JsonException("Expected EmbeddedBlobResourceContents value.") : new ToolExecutionCompleteContentResourceDetails(embeddedBlobResourceContents);
+                var omittedBinaryResult = JsonSerializer.Deserialize(element, SessionEventsJsonContext.Default.OmittedBinaryResult);
+                return omittedBinaryResult is null ? throw new JsonException("Expected OmittedBinaryResult value.") : new PersistedBinaryResult(omittedBinaryResult);
             }
-
-            throw new JsonException("JSON value did not match any ToolExecutionCompleteContentResourceDetails variant.");
-        }
-
+            if (element.ValueKind == JsonValueKind.Object && element.TryGetProperty("assetId", out _) && !element.TryGetProperty("data", out _) && !element.TryGetProperty("omittedReason", out _))
+            {
+                var binaryAssetReference = JsonSerializer.Deserialize(element, SessionEventsJsonContext.Default.BinaryAssetReference);
+                return binaryAssetReference is null ? throw new JsonException("Expected BinaryAssetReference value.") : new PersistedBinaryResult(binaryAssetReference);
+            }
+
+            throw new JsonException("JSON value did not match any PersistedBinaryResult variant.");
+        }
+
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, ToolExecutionCompleteContentResourceDetails value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, PersistedBinaryResult value, JsonSerializerOptions options)
         {
-            if (value.EmbeddedTextResourceContents is { } embeddedTextResourceContents)
+            if (value.PersistedBinaryImage is { } persistedBinaryImage)
             {
-                JsonSerializer.Serialize(writer, embeddedTextResourceContents, SessionEventsJsonContext.Default.EmbeddedTextResourceContents);
+                JsonSerializer.Serialize(writer, persistedBinaryImage, SessionEventsJsonContext.Default.PersistedBinaryImage);
                 return;
             }
-            if (value.EmbeddedBlobResourceContents is { } embeddedBlobResourceContents)
+            if (value.OmittedBinaryResult is { } omittedBinaryResult)
             {
-                JsonSerializer.Serialize(writer, embeddedBlobResourceContents, SessionEventsJsonContext.Default.EmbeddedBlobResourceContents);
+                JsonSerializer.Serialize(writer, omittedBinaryResult, SessionEventsJsonContext.Default.OmittedBinaryResult);
+                return;
+            }
+            if (value.BinaryAssetReference is { } binaryAssetReference)
+            {
+                JsonSerializer.Serialize(writer, binaryAssetReference, SessionEventsJsonContext.Default.BinaryAssetReference);
                 return;
             }
 
-            throw new JsonException("No ToolExecutionCompleteContentResourceDetails variant value is set.");
+            throw new JsonException("No PersistedBinaryResult variant value is set.");
         }
     }
 }
 
-/// <summary>Embedded resource content block with inline text or binary data.</summary>
-/// <remarks>The <c>resource</c> variant of <see cref="ToolExecutionCompleteContent"/>.</remarks>
-public sealed partial class ToolExecutionCompleteContentResource : ToolExecutionCompleteContent
+/// <summary>A source supplied by a tool that should be made available to the model as citable content.</summary>
+/// <remarks>Nested data type for <c>CitableSource</c>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed partial class CitableSource
+{
+    /// <summary>The source text made available to the model as citable content.</summary>
+    [JsonPropertyName("content")]
+    public required string Content { get; set; }
+
+    /// <summary>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.</summary>
+    [JsonPropertyName("id")]
+    public required string Id { get; set; }
+
+    /// <summary>File path relative to the agent's workspace root, when the source is a file.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("path")]
+    public string? Path { get; set; }
+
+    /// <summary>Human-readable title of the source.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("title")]
+    public string? Title { get; set; }
+
+    /// <summary>URL of the source, when it is a web resource.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("url")]
+    public string? Url { get; set; }
+}
+
+/// <summary>Plain text content block.</summary>
+/// <remarks>The <c>text</c> variant of <see cref="ToolExecutionCompleteContent"/>.</remarks>
+public sealed partial class ToolExecutionCompleteContentText : ToolExecutionCompleteContent
 {
     /// <inheritdoc />
     [JsonIgnore]
-    public override string Type => "resource";
+    public override string Type => "text";
 
-    /// <summary>The embedded resource contents, either text or base64-encoded binary.</summary>
-    [JsonPropertyName("resource")]
-    public required ToolExecutionCompleteContentResourceDetails Resource { get; set; }
+    /// <summary>The text content.</summary>
+    [JsonPropertyName("text")]
+    public required string Text { 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>
-[JsonPolymorphic(
-    TypeDiscriminatorPropertyName = "type",
-    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
-[JsonDerivedType(typeof(ToolExecutionCompleteContentText), "text")]
-[JsonDerivedType(typeof(ToolExecutionCompleteContentTerminal), "terminal")]
-[JsonDerivedType(typeof(ToolExecutionCompleteContentShellExit), "shell_exit")]
-[JsonDerivedType(typeof(ToolExecutionCompleteContentImage), "image")]
-[JsonDerivedType(typeof(ToolExecutionCompleteContentAudio), "audio")]
-[JsonDerivedType(typeof(ToolExecutionCompleteContentResourceLink), "resource_link")]
-[JsonDerivedType(typeof(ToolExecutionCompleteContentResource), "resource")]
-public partial class ToolExecutionCompleteContent
+/// <summary>Deprecated for shell command exit metadata. Use ToolExecutionCompleteContentShellExit instead.</summary>
+/// <remarks>The <c>terminal</c> variant of <see cref="ToolExecutionCompleteContent"/>.</remarks>
+[EditorBrowsable(EditorBrowsableState.Never)]
+#if NET5_0_OR_GREATER
+[Obsolete("This member is deprecated and will be removed in a future version.", DiagnosticId = "GHCP001")]
+#else
+[Obsolete("This member is deprecated and will be removed in a future version.")]
+#endif
+public sealed partial class ToolExecutionCompleteContentTerminal : ToolExecutionCompleteContent
 {
-    /// <summary>The type discriminator.</summary>
-    [JsonPropertyName("type")]
-    public virtual string Type { get; set; } = string.Empty;
-}
+    /// <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>CSP domain allowlists for an MCP Apps UI resource, including connect, resource, frame, and base URI domains.</summary>
-/// <remarks>Nested data type for <c>ToolExecutionCompleteUIResourceMetaUICsp</c>.</remarks>
-public sealed partial class ToolExecutionCompleteUIResourceMetaUICsp
+    /// <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="ToolExecutionCompleteContent"/>.</remarks>
+public sealed partial class ToolExecutionCompleteContentShellExit : ToolExecutionCompleteContent
 {
-    /// <summary>Domains the UI resource may use as document base URIs.</summary>
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "shell_exit";
+
+    /// <summary>Working directory where the shell command was executed.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("baseUriDomains")]
-    public string[]? BaseUriDomains { get; set; }
+    [JsonPropertyName("cwd")]
+    public string? Cwd { get; set; }
 
-    /// <summary>Domains the UI resource may connect to.</summary>
+    /// <summary>Exit code from the completed shell command.</summary>
+    [JsonPropertyName("exitCode")]
+    public required long ExitCode { get; set; }
+
+    /// <summary>Path reported in the shell session's filesystem namespace when shell output exceeded the configured large-output threshold.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("connectDomains")]
-    public string[]? ConnectDomains { get; set; }
+    [JsonPropertyName("outputFilePath")]
+    public string? OutputFilePath { get; set; }
 
-    /// <summary>Domains the UI resource may embed as nested frames.</summary>
+    /// <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("frameDomains")]
-    public string[]? FrameDomains { get; set; }
+    [JsonPropertyName("outputPreview")]
+    public string? OutputPreview { get; set; }
 
-    /// <summary>Domains from which the UI resource may load scripts, styles, images, and other resources.</summary>
+    /// <summary>Whether outputPreview is known to be incomplete or truncated.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("resourceDomains")]
-    public string[]? ResourceDomains { get; set; }
-}
+    [JsonPropertyName("outputTruncated")]
+    public bool? OutputTruncated { get; set; }
 
-/// <summary>Marker object for camera permission on an MCP Apps UI resource.</summary>
-/// <remarks>Nested data type for <c>ToolExecutionCompleteUIResourceMetaUIPermissionsCamera</c>.</remarks>
-public sealed partial class ToolExecutionCompleteUIResourceMetaUIPermissionsCamera
-{
+    /// <summary>Shell id, as assigned by Copilot runtime.</summary>
+    [JsonPropertyName("shellId")]
+    public required string ShellId { get; set; }
 }
 
-/// <summary>Marker object for clipboard-write permission on an MCP Apps UI resource.</summary>
-/// <remarks>Nested data type for <c>ToolExecutionCompleteUIResourceMetaUIPermissionsClipboardWrite</c>.</remarks>
-public sealed partial class ToolExecutionCompleteUIResourceMetaUIPermissionsClipboardWrite
+/// <summary>Image content block with base64-encoded data.</summary>
+/// <remarks>The <c>image</c> variant of <see cref="ToolExecutionCompleteContent"/>.</remarks>
+public sealed partial class ToolExecutionCompleteContentImage : ToolExecutionCompleteContent
 {
-}
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "image";
 
-/// <summary>Marker object for geolocation permission on an MCP Apps UI resource.</summary>
-/// <remarks>Nested data type for <c>ToolExecutionCompleteUIResourceMetaUIPermissionsGeolocation</c>.</remarks>
-public sealed partial class ToolExecutionCompleteUIResourceMetaUIPermissionsGeolocation
-{
+    /// <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>Marker object for microphone permission on an MCP Apps UI resource.</summary>
-/// <remarks>Nested data type for <c>ToolExecutionCompleteUIResourceMetaUIPermissionsMicrophone</c>.</remarks>
-public sealed partial class ToolExecutionCompleteUIResourceMetaUIPermissionsMicrophone
+/// <summary>Audio content block with base64-encoded data.</summary>
+/// <remarks>The <c>audio</c> variant of <see cref="ToolExecutionCompleteContent"/>.</remarks>
+public sealed partial class ToolExecutionCompleteContentAudio : ToolExecutionCompleteContent
 {
+    /// <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>Browser permission metadata for an MCP Apps UI resource, including camera, microphone, geolocation, and clipboard-write.</summary>
-/// <remarks>Nested data type for <c>ToolExecutionCompleteUIResourceMetaUIPermissions</c>.</remarks>
-public sealed partial class ToolExecutionCompleteUIResourceMetaUIPermissions
+/// <summary>Icon image for a resource.</summary>
+/// <remarks>Nested data type for <c>ToolExecutionCompleteContentResourceLinkIcon</c>.</remarks>
+public sealed partial class ToolExecutionCompleteContentResourceLinkIcon
 {
-    /// <summary>Marker object for camera permission on an MCP Apps UI resource.</summary>
+    /// <summary>MIME type of the icon image.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("camera")]
-    public ToolExecutionCompleteUIResourceMetaUIPermissionsCamera? Camera { get; set; }
+    [JsonPropertyName("mimeType")]
+    public string? MimeType { get; set; }
 
-    /// <summary>Marker object for clipboard-write permission on an MCP Apps UI resource.</summary>
+    /// <summary>Available icon sizes (e.g., ['16x16', '32x32']).</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("clipboardWrite")]
-    public ToolExecutionCompleteUIResourceMetaUIPermissionsClipboardWrite? ClipboardWrite { get; set; }
+    [JsonPropertyName("sizes")]
+    public string[]? Sizes { get; set; }
 
-    /// <summary>Marker object for geolocation permission on an MCP Apps UI resource.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("geolocation")]
-    public ToolExecutionCompleteUIResourceMetaUIPermissionsGeolocation? Geolocation { get; set; }
+    /// <summary>URL or path to the icon image.</summary>
+    [JsonPropertyName("src")]
+    public required string Src { get; set; }
 
-    /// <summary>Marker object for microphone permission on an MCP Apps UI resource.</summary>
+    /// <summary>Theme variant this icon is intended for.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("microphone")]
-    public ToolExecutionCompleteUIResourceMetaUIPermissionsMicrophone? Microphone { get; set; }
+    [JsonPropertyName("theme")]
+    public ToolExecutionCompleteContentResourceLinkIconTheme? Theme { get; set; }
 }
 
-/// <summary>MCP Apps UI resource metadata for a completed tool result, including CSP, permissions, domain, and border preference.</summary>
-/// <remarks>Nested data type for <c>ToolExecutionCompleteUIResourceMetaUI</c>.</remarks>
-public sealed partial class ToolExecutionCompleteUIResourceMetaUI
+/// <summary>Resource link content block referencing an external resource.</summary>
+/// <remarks>The <c>resource_link</c> variant of <see cref="ToolExecutionCompleteContent"/>.</remarks>
+public sealed partial class ToolExecutionCompleteContentResourceLink : ToolExecutionCompleteContent
 {
-    /// <summary>CSP domain allowlists for an MCP Apps UI resource, including connect, resource, frame, and base URI domains.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("csp")]
-    public ToolExecutionCompleteUIResourceMetaUICsp? Csp { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "resource_link";
 
-    /// <summary>Optional dedicated origin for the rendered MCP Apps UI resource.</summary>
+    /// <summary>Human-readable description of the resource.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("domain")]
-    public string? Domain { get; set; }
+    [JsonPropertyName("description")]
+    public string? Description { get; set; }
 
-    /// <summary>Browser permission metadata for an MCP Apps UI resource, including camera, microphone, geolocation, and clipboard-write.</summary>
+    /// <summary>Icons associated with this resource.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("permissions")]
-    public ToolExecutionCompleteUIResourceMetaUIPermissions? Permissions { get; set; }
+    [JsonPropertyName("icons")]
+    public ToolExecutionCompleteContentResourceLinkIcon[]? Icons { get; set; }
 
-    /// <summary>Whether the host should render a border around the MCP Apps UI resource.</summary>
+    /// <summary>MIME type of the resource content.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("prefersBorder")]
-    public bool? PrefersBorder { get; set; }
-}
+    [JsonPropertyName("mimeType")]
+    public string? MimeType { get; set; }
 
-/// <summary>Resource-level UI metadata (CSP, permissions, visual preferences).</summary>
-/// <remarks>Nested data type for <c>ToolExecutionCompleteUIResourceMeta</c>.</remarks>
-public sealed partial class ToolExecutionCompleteUIResourceMeta
-{
-    /// <summary>MCP Apps UI resource metadata for a completed tool result, including CSP, permissions, domain, and border preference.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("ui")]
-    public ToolExecutionCompleteUIResourceMetaUI? Ui { get; set; }
-}
+    /// <summary>Resource name identifier.</summary>
+    [JsonPropertyName("name")]
+    public required string Name { get; set; }
 
-/// <summary>MCP Apps UI resource content for rendering in a sandboxed iframe.</summary>
-/// <remarks>Nested data type for <c>ToolExecutionCompleteUIResource</c>.</remarks>
-public sealed partial class ToolExecutionCompleteUIResource
-{
-    /// <summary>Resource-level UI metadata (CSP, permissions, visual preferences).</summary>
+    /// <summary>Size of the resource in bytes.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("_meta")]
-    public ToolExecutionCompleteUIResourceMeta? Meta { get; set; }
+    [JsonPropertyName("size")]
+    public long? Size { get; set; }
 
-    /// <summary>Base64-encoded HTML content.</summary>
+    /// <summary>Human-readable display title for the resource.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("blob")]
-    public string? Blob { get; set; }
+    [JsonPropertyName("title")]
+    public string? Title { get; set; }
 
-    /// <summary>MIME type of the content.</summary>
-    [JsonPropertyName("mimeType")]
-    public required string MimeType { get; set; }
+    /// <summary>URI identifying the resource.</summary>
+    [JsonPropertyName("uri")]
+    public required string Uri { get; set; }
+}
 
-    /// <summary>HTML content as a string.</summary>
+/// <summary>Embedded text resource contents identified by a URI, with an optional MIME type and a text payload.</summary>
+/// <remarks>Nested data type for <c>EmbeddedTextResourceContents</c>.</remarks>
+public sealed partial class EmbeddedTextResourceContents
+{
+    /// <summary>MIME type of the text content.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("mimeType")]
+    public string? MimeType { get; set; }
+
+    /// <summary>Text content of the resource.</summary>
     [JsonPropertyName("text")]
-    public string? Text { get; set; }
+    public required string Text { get; set; }
 
-    /// <summary>The ui:// URI of the resource.</summary>
+    /// <summary>URI identifying the resource.</summary>
     [JsonPropertyName("uri")]
     public required string Uri { get; set; }
 }
 
-/// <summary>Tool execution result on success.</summary>
-/// <remarks>Nested data type for <c>ToolExecutionCompleteResult</c>.</remarks>
-public sealed partial class ToolExecutionCompleteResult
+/// <summary>Embedded binary resource contents identified by a URI, with an optional MIME type and a base64-encoded blob.</summary>
+/// <remarks>Nested data type for <c>EmbeddedBlobResourceContents</c>.</remarks>
+public sealed partial class EmbeddedBlobResourceContents
 {
-    /// <summary>Model-facing binary results (base64 inline or size-omitted markers) sent to the LLM for this tool call.</summary>
-    [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("binaryResultsForLlm")]
-    public PersistedBinaryResult[]? BinaryResultsForLlm { get; set; }
+    /// <summary>Base64-encoded binary content of the resource.</summary>
+    [Base64String]
+    [JsonPropertyName("blob")]
+    public required string Blob { get; set; }
 
-    /// <summary>Provider-neutral source material this tool makes available to the model as citable content. Persisted so it survives session resume. Experimental.</summary>
-    [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+    /// <summary>MIME type of the blob content.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("citableSources")]
-    public CitableSource[]? CitableSources { get; set; }
+    [JsonPropertyName("mimeType")]
+    public string? MimeType { get; set; }
 
-    /// <summary>Concise tool result text sent to the LLM for chat completion, potentially truncated for token efficiency.</summary>
-    [JsonPropertyName("content")]
-    public required string Content { get; set; }
+    /// <summary>URI identifying the resource.</summary>
+    [JsonPropertyName("uri")]
+    public required string Uri { get; set; }
+}
 
-    /// <summary>Structured content blocks (text, images, audio, resources) returned by the tool in their native format.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("contents")]
-    public ToolExecutionCompleteContent[]? Contents { get; set; }
+/// <summary>The embedded resource contents, either text or base64-encoded binary.</summary>
+/// <remarks>JSON union data type for <c>ToolExecutionCompleteContentResourceDetails</c>.</remarks>
+[JsonConverter(typeof(Converter))]
+public sealed partial class ToolExecutionCompleteContentResourceDetails
+{
+    /// <summary>Gets the value when this instance contains <see cref="EmbeddedTextResourceContents"/>.</summary>
+    public EmbeddedTextResourceContents? EmbeddedTextResourceContents { get; }
 
-    /// <summary>Detailed tool result for UI/timeline display, preserving complete content such as diffs for most tools. Successful skill invocations intentionally use the concise model-facing content here; the authoritative skill body is carried by the corresponding skill invocation event. Falls back to content when absent.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("detailedContent")]
-    public string? DetailedContent { get; set; }
+    /// <summary>Gets the value when this instance contains <see cref="EmbeddedBlobResourceContents"/>.</summary>
+    public EmbeddedBlobResourceContents? EmbeddedBlobResourceContents { get; }
 
-    /// <summary>FIDES IFC label projected from tool ingress metadata (MCP `CallToolResult._meta` or synthesized built-in ingress labels) — persisted as `{ ifc: ... }` (only the `ifc` key, not the whole `_meta`). Persisted so the FIDES IFC label survives session resume: the engine rehydrates accumulated taint by replaying these on load. Populated for ingress sources when FIDES IFC is on. Experimental.</summary>
-    [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("mcpMeta")]
-    public JsonElement? McpMeta { get; set; }
+    /// <summary>Initializes a new instance of the <see cref="ToolExecutionCompleteContentResourceDetails"/> class from <see cref="EmbeddedTextResourceContents"/>.</summary>
+    public ToolExecutionCompleteContentResourceDetails(EmbeddedTextResourceContents value)
+    {
+        ArgumentNullException.ThrowIfNull(value);
+        EmbeddedTextResourceContents = value;
+    }
 
-    /// <summary>Structured content (arbitrary JSON) returned verbatim by the MCP tool.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("structuredContent")]
-    public JsonElement? StructuredContent { get; set; }
+    /// <summary>Converts <see cref="EmbeddedTextResourceContents"/> to <see cref="ToolExecutionCompleteContentResourceDetails"/>.</summary>
+    public static implicit operator ToolExecutionCompleteContentResourceDetails(EmbeddedTextResourceContents value) => new(value);
 
-    /// <summary>MCP Apps UI resource content for rendering in a sandboxed iframe.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("uiResource")]
-    public ToolExecutionCompleteUIResource? UiResource { get; set; }
-}
+    /// <summary>Initializes a new instance of the <see cref="ToolExecutionCompleteContentResourceDetails"/> class from <see cref="EmbeddedBlobResourceContents"/>.</summary>
+    public ToolExecutionCompleteContentResourceDetails(EmbeddedBlobResourceContents value)
+    {
+        ArgumentNullException.ThrowIfNull(value);
+        EmbeddedBlobResourceContents = value;
+    }
 
-/// <summary>Experimental shell completion facts retained independently of the full tool result.</summary>
-/// <remarks>Nested data type for <c>ToolExecutionCompleteShellExecution</c>.</remarks>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
-public sealed partial class ToolExecutionCompleteShellExecution
-{
-    /// <summary>Process exit code reported by the shell driver.</summary>
-    [JsonPropertyName("exitCode")]
-    public required long ExitCode { get; set; }
+    /// <summary>Converts <see cref="EmbeddedBlobResourceContents"/> to <see cref="ToolExecutionCompleteContentResourceDetails"/>.</summary>
+    public static implicit operator ToolExecutionCompleteContentResourceDetails(EmbeddedBlobResourceContents value) => new(value);
+
+    /// <summary>Provides a <see cref="JsonConverter{ToolExecutionCompleteContentResourceDetails}"/> for serializing <see cref="ToolExecutionCompleteContentResourceDetails"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<ToolExecutionCompleteContentResourceDetails>
+    {
+        /// <inheritdoc />
+        public override ToolExecutionCompleteContentResourceDetails Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            if (reader.TokenType == JsonTokenType.Null)
+            {
+                throw new JsonException("Expected JSON object for ToolExecutionCompleteContentResourceDetails.");
+            }
+
+            using var document = JsonDocument.ParseValue(ref reader);
+            var element = document.RootElement;
+            if (element.ValueKind == JsonValueKind.Object && element.TryGetProperty("text", out _) && !element.TryGetProperty("blob", out _))
+            {
+                var embeddedTextResourceContents = JsonSerializer.Deserialize(element, SessionEventsJsonContext.Default.EmbeddedTextResourceContents);
+                return embeddedTextResourceContents is null ? throw new JsonException("Expected EmbeddedTextResourceContents value.") : new ToolExecutionCompleteContentResourceDetails(embeddedTextResourceContents);
+            }
+            if (element.ValueKind == JsonValueKind.Object && element.TryGetProperty("blob", out _) && !element.TryGetProperty("text", out _))
+            {
+                var embeddedBlobResourceContents = JsonSerializer.Deserialize(element, SessionEventsJsonContext.Default.EmbeddedBlobResourceContents);
+                return embeddedBlobResourceContents is null ? throw new JsonException("Expected EmbeddedBlobResourceContents value.") : new ToolExecutionCompleteContentResourceDetails(embeddedBlobResourceContents);
+            }
+
+            throw new JsonException("JSON value did not match any ToolExecutionCompleteContentResourceDetails variant.");
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, ToolExecutionCompleteContentResourceDetails value, JsonSerializerOptions options)
+        {
+            if (value.EmbeddedTextResourceContents is { } embeddedTextResourceContents)
+            {
+                JsonSerializer.Serialize(writer, embeddedTextResourceContents, SessionEventsJsonContext.Default.EmbeddedTextResourceContents);
+                return;
+            }
+            if (value.EmbeddedBlobResourceContents is { } embeddedBlobResourceContents)
+            {
+                JsonSerializer.Serialize(writer, embeddedBlobResourceContents, SessionEventsJsonContext.Default.EmbeddedBlobResourceContents);
+                return;
+            }
+
+            throw new JsonException("No ToolExecutionCompleteContentResourceDetails variant value is set.");
+        }
+    }
 }
 
-/// <summary>MCP Apps tool `_meta.ui` resource URI and visibility captured on `tool.execution_complete`.</summary>
-/// <remarks>Nested data type for <c>ToolExecutionCompleteToolDescriptionMetaUI</c>.</remarks>
-public sealed partial class ToolExecutionCompleteToolDescriptionMetaUI
+/// <summary>Embedded resource content block with inline text or binary data.</summary>
+/// <remarks>The <c>resource</c> variant of <see cref="ToolExecutionCompleteContent"/>.</remarks>
+public sealed partial class ToolExecutionCompleteContentResource : ToolExecutionCompleteContent
 {
-    /// <summary>URI of the UI resource.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("resourceUri")]
-    public string? ResourceUri { get; set; }
+    /// <inheritdoc />
+    [JsonIgnore]
+    public override string Type => "resource";
 
-    /// <summary>Who can access this tool.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("visibility")]
-    public ToolExecutionCompleteToolDescriptionMetaUIVisibility[]? Visibility { get; set; }
+    /// <summary>The embedded resource contents, either text or base64-encoded binary.</summary>
+    [JsonPropertyName("resource")]
+    public required ToolExecutionCompleteContentResourceDetails Resource { get; set; }
 }
 
-/// <summary>MCP Apps metadata for UI resource association.</summary>
-/// <remarks>Nested data type for <c>ToolExecutionCompleteToolDescriptionMeta</c>.</remarks>
-public sealed partial class ToolExecutionCompleteToolDescriptionMeta
+/// <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>
+[JsonPolymorphic(
+    TypeDiscriminatorPropertyName = "type",
+    UnknownDerivedTypeHandling = JsonUnknownDerivedTypeHandling.FallBackToBaseType)]
+[JsonDerivedType(typeof(ToolExecutionCompleteContentText), "text")]
+[JsonDerivedType(typeof(ToolExecutionCompleteContentTerminal), "terminal")]
+[JsonDerivedType(typeof(ToolExecutionCompleteContentShellExit), "shell_exit")]
+[JsonDerivedType(typeof(ToolExecutionCompleteContentImage), "image")]
+[JsonDerivedType(typeof(ToolExecutionCompleteContentAudio), "audio")]
+[JsonDerivedType(typeof(ToolExecutionCompleteContentResourceLink), "resource_link")]
+[JsonDerivedType(typeof(ToolExecutionCompleteContentResource), "resource")]
+public partial class ToolExecutionCompleteContent
 {
-    /// <summary>MCP Apps tool `_meta.ui` resource URI and visibility captured on `tool.execution_complete`.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("ui")]
-    public ToolExecutionCompleteToolDescriptionMetaUI? Ui { get; set; }
+    /// <summary>The type discriminator.</summary>
+    [JsonPropertyName("type")]
+    public virtual string Type { get; set; } = string.Empty;
 }
 
-/// <summary>Tool definition metadata, present for MCP tools with MCP Apps support.</summary>
-/// <remarks>Nested data type for <c>ToolExecutionCompleteToolDescription</c>.</remarks>
-public sealed partial class ToolExecutionCompleteToolDescription
+
+/// <summary>CSP domain allowlists for an MCP Apps UI resource, including connect, resource, frame, and base URI domains.</summary>
+/// <remarks>Nested data type for <c>ToolExecutionCompleteUIResourceMetaUICsp</c>.</remarks>
+public sealed partial class ToolExecutionCompleteUIResourceMetaUICsp
 {
-    /// <summary>MCP Apps metadata for UI resource association.</summary>
+    /// <summary>Domains the UI resource may use as document base URIs.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("_meta")]
-    public ToolExecutionCompleteToolDescriptionMeta? Meta { get; set; }
+    [JsonPropertyName("baseUriDomains")]
+    public string[]? BaseUriDomains { get; set; }
 
-    /// <summary>Tool description.</summary>
+    /// <summary>Domains the UI resource may connect to.</summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("description")]
-    public string? Description { get; set; }
+    [JsonPropertyName("connectDomains")]
+    public string[]? ConnectDomains { get; set; }
 
-    /// <summary>Tool name.</summary>
-    [JsonPropertyName("name")]
-    public required string Name { get; set; }
-}
+    /// <summary>Domains the UI resource may embed as nested frames.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("frameDomains")]
+    public string[]? FrameDomains { get; set; }
 
-/// <summary>Effective sandbox filesystem rules, in policy order. Only populated when content capture is enabled, since these are real host paths.</summary>
-/// <remarks>Nested data type for <c>SandboxFilesystemPolicyDetails</c>.</remarks>
+    /// <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; }
+}
+
+/// <summary>Marker object for camera permission on an MCP Apps UI resource.</summary>
+/// <remarks>Nested data type for <c>ToolExecutionCompleteUIResourceMetaUIPermissionsCamera</c>.</remarks>
+public sealed partial class ToolExecutionCompleteUIResourceMetaUIPermissionsCamera
+{
+}
+
+/// <summary>Marker object for clipboard-write permission on an MCP Apps UI resource.</summary>
+/// <remarks>Nested data type for <c>ToolExecutionCompleteUIResourceMetaUIPermissionsClipboardWrite</c>.</remarks>
+public sealed partial class ToolExecutionCompleteUIResourceMetaUIPermissionsClipboardWrite
+{
+}
+
+/// <summary>Marker object for geolocation permission on an MCP Apps UI resource.</summary>
+/// <remarks>Nested data type for <c>ToolExecutionCompleteUIResourceMetaUIPermissionsGeolocation</c>.</remarks>
+public sealed partial class ToolExecutionCompleteUIResourceMetaUIPermissionsGeolocation
+{
+}
+
+/// <summary>Marker object for microphone permission on an MCP Apps UI resource.</summary>
+/// <remarks>Nested data type for <c>ToolExecutionCompleteUIResourceMetaUIPermissionsMicrophone</c>.</remarks>
+public sealed partial class ToolExecutionCompleteUIResourceMetaUIPermissionsMicrophone
+{
+}
+
+/// <summary>Browser permission metadata for an MCP Apps UI resource, including camera, microphone, geolocation, and clipboard-write.</summary>
+/// <remarks>Nested data type for <c>ToolExecutionCompleteUIResourceMetaUIPermissions</c>.</remarks>
+public sealed partial class ToolExecutionCompleteUIResourceMetaUIPermissions
+{
+    /// <summary>Marker object for camera permission on an MCP Apps UI resource.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("camera")]
+    public ToolExecutionCompleteUIResourceMetaUIPermissionsCamera? Camera { get; set; }
+
+    /// <summary>Marker object for clipboard-write permission on an MCP Apps UI resource.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("clipboardWrite")]
+    public ToolExecutionCompleteUIResourceMetaUIPermissionsClipboardWrite? ClipboardWrite { get; set; }
+
+    /// <summary>Marker object for geolocation permission on an MCP Apps UI resource.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("geolocation")]
+    public ToolExecutionCompleteUIResourceMetaUIPermissionsGeolocation? Geolocation { get; set; }
+
+    /// <summary>Marker object for microphone permission on an MCP Apps UI resource.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("microphone")]
+    public ToolExecutionCompleteUIResourceMetaUIPermissionsMicrophone? Microphone { get; set; }
+}
+
+/// <summary>MCP Apps UI resource metadata for a completed tool result, including CSP, permissions, domain, and border preference.</summary>
+/// <remarks>Nested data type for <c>ToolExecutionCompleteUIResourceMetaUI</c>.</remarks>
+public sealed partial class ToolExecutionCompleteUIResourceMetaUI
+{
+    /// <summary>CSP domain allowlists for an MCP Apps UI resource, including connect, resource, frame, and base URI domains.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("csp")]
+    public ToolExecutionCompleteUIResourceMetaUICsp? Csp { get; set; }
+
+    /// <summary>Optional dedicated origin for the rendered MCP Apps UI resource.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("domain")]
+    public string? Domain { get; set; }
+
+    /// <summary>Browser permission metadata for an MCP Apps UI resource, including camera, microphone, geolocation, and clipboard-write.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("permissions")]
+    public ToolExecutionCompleteUIResourceMetaUIPermissions? Permissions { get; set; }
+
+    /// <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; }
+}
+
+/// <summary>Resource-level UI metadata (CSP, permissions, visual preferences).</summary>
+/// <remarks>Nested data type for <c>ToolExecutionCompleteUIResourceMeta</c>.</remarks>
+public sealed partial class ToolExecutionCompleteUIResourceMeta
+{
+    /// <summary>MCP Apps UI resource metadata for a completed tool result, including CSP, permissions, domain, and border preference.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("ui")]
+    public ToolExecutionCompleteUIResourceMetaUI? Ui { get; set; }
+}
+
+/// <summary>MCP Apps UI resource content for rendering in a sandboxed iframe.</summary>
+/// <remarks>Nested data type for <c>ToolExecutionCompleteUIResource</c>.</remarks>
+public sealed partial class ToolExecutionCompleteUIResource
+{
+    /// <summary>Resource-level UI metadata (CSP, permissions, visual preferences).</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("_meta")]
+    public ToolExecutionCompleteUIResourceMeta? Meta { get; set; }
+
+    /// <summary>Base64-encoded HTML content.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("blob")]
+    public string? Blob { get; set; }
+
+    /// <summary>MIME type of the content.</summary>
+    [JsonPropertyName("mimeType")]
+    public required string MimeType { get; set; }
+
+    /// <summary>HTML content as a string.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("text")]
+    public string? Text { get; set; }
+
+    /// <summary>The ui:// URI of the resource.</summary>
+    [JsonPropertyName("uri")]
+    public required string Uri { get; set; }
+}
+
+/// <summary>Tool execution result on success.</summary>
+/// <remarks>Nested data type for <c>ToolExecutionCompleteResult</c>.</remarks>
+public sealed partial class ToolExecutionCompleteResult
+{
+    /// <summary>Model-facing binary results (base64 inline or size-omitted markers) sent to the LLM for this tool call.</summary>
+    [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("binaryResultsForLlm")]
+    public PersistedBinaryResult[]? BinaryResultsForLlm { get; set; }
+
+    /// <summary>Provider-neutral source material this tool makes available to the model as citable content. Persisted so it survives session resume. Experimental.</summary>
+    [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("citableSources")]
+    public CitableSource[]? CitableSources { get; set; }
+
+    /// <summary>Concise tool result text sent to the LLM for chat completion, potentially truncated for token efficiency.</summary>
+    [JsonPropertyName("content")]
+    public required string Content { get; set; }
+
+    /// <summary>Structured content blocks (text, images, audio, resources) returned by the tool in their native format.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("contents")]
+    public ToolExecutionCompleteContent[]? Contents { get; set; }
+
+    /// <summary>Detailed tool result for UI/timeline display, preserving complete content such as diffs for most tools. Successful skill invocations intentionally use the concise model-facing content here; the authoritative skill body is carried by the corresponding skill invocation event. Falls back to content when absent.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("detailedContent")]
+    public string? DetailedContent { get; set; }
+
+    /// <summary>FIDES IFC label projected from tool ingress metadata (MCP `CallToolResult._meta` or synthesized built-in ingress labels) — persisted as `{ ifc: ... }` (only the `ifc` key, not the whole `_meta`). Persisted so the FIDES IFC label survives session resume: the engine rehydrates accumulated taint by replaying these on load. Populated for ingress sources when FIDES IFC is on. Experimental.</summary>
+    [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("mcpMeta")]
+    public JsonElement? McpMeta { get; set; }
+
+    /// <summary>Structured content (arbitrary JSON) returned verbatim by the MCP tool.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("structuredContent")]
+    public JsonElement? StructuredContent { get; set; }
+
+    /// <summary>MCP Apps UI resource content for rendering in a sandboxed iframe.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("uiResource")]
+    public ToolExecutionCompleteUIResource? UiResource { get; set; }
+}
+
+/// <summary>Experimental shell completion facts retained independently of the full tool result.</summary>
+/// <remarks>Nested data type for <c>ToolExecutionCompleteShellExecution</c>.</remarks>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+public sealed partial class ToolExecutionCompleteShellExecution
+{
+    /// <summary>Process exit code reported by the shell driver.</summary>
+    [JsonPropertyName("exitCode")]
+    public required long ExitCode { get; set; }
+}
+
+/// <summary>MCP Apps tool `_meta.ui` resource URI and visibility captured on `tool.execution_complete`.</summary>
+/// <remarks>Nested data type for <c>ToolExecutionCompleteToolDescriptionMetaUI</c>.</remarks>
+public sealed partial class ToolExecutionCompleteToolDescriptionMetaUI
+{
+    /// <summary>URI of the UI resource.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("resourceUri")]
+    public string? ResourceUri { get; set; }
+
+    /// <summary>Who can access this tool.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("visibility")]
+    public ToolExecutionCompleteToolDescriptionMetaUIVisibility[]? Visibility { get; set; }
+}
+
+/// <summary>MCP Apps metadata for UI resource association.</summary>
+/// <remarks>Nested data type for <c>ToolExecutionCompleteToolDescriptionMeta</c>.</remarks>
+public sealed partial class ToolExecutionCompleteToolDescriptionMeta
+{
+    /// <summary>MCP Apps tool `_meta.ui` resource URI and visibility captured on `tool.execution_complete`.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("ui")]
+    public ToolExecutionCompleteToolDescriptionMetaUI? Ui { get; set; }
+}
+
+/// <summary>Tool definition metadata, present for MCP tools with MCP Apps support.</summary>
+/// <remarks>Nested data type for <c>ToolExecutionCompleteToolDescription</c>.</remarks>
+public sealed partial class ToolExecutionCompleteToolDescription
+{
+    /// <summary>MCP Apps metadata for UI resource association.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("_meta")]
+    public ToolExecutionCompleteToolDescriptionMeta? Meta { get; set; }
+
+    /// <summary>Tool description.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("description")]
+    public string? Description { get; set; }
+
+    /// <summary>Tool name.</summary>
+    [JsonPropertyName("name")]
+    public required string Name { get; set; }
+}
+
+/// <summary>Effective sandbox filesystem rules, in policy order. Only populated when content capture is enabled, since these are real host paths.</summary>
+/// <remarks>Nested data type for <c>SandboxFilesystemPolicyDetails</c>.</remarks>
 public sealed partial class SandboxFilesystemPolicyDetails
 {
     /// <summary>Paths the sandboxed process may not access at all.</summary>
@@ -11208,6 +12032,34 @@ public override bool? ManagedApprovalRequired
     public string? Warning { get; set; }
 }
 
+/// <summary>A named, complete UTF-8 text snapshot for a pending file operation.</summary>
+/// <remarks>Nested data type for <c>PermissionWriteFileContent</c>.</remarks>
+public sealed partial class PermissionWriteFileContent
+{
+    /// <summary>Complete file contents, including an empty string for an empty file.</summary>
+    [JsonPropertyName("content")]
+    public required string Content { get; set; }
+
+    /// <summary>Absolute path in the session filesystem namespace.</summary>
+    [JsonPropertyName("path")]
+    public required string Path { get; set; }
+}
+
+/// <summary>Complete text snapshots for one proposed file change. At least one side is present. Different before and after paths describe a move.</summary>
+/// <remarks>Nested data type for <c>PermissionWriteFileEdit</c>.</remarks>
+public sealed partial class PermissionWriteFileEdit
+{
+    /// <summary>Complete file content the operation plans to write. Absent only when the file is being deleted.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("after")]
+    public PermissionWriteFileContent? After { get; set; }
+
+    /// <summary>File content read while planning the operation. Absent only when the file is being created.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("before")]
+    public PermissionWriteFileContent? Before { get; set; }
+}
+
 /// <summary>File write permission request.</summary>
 /// <remarks>The <c>write</c> variant of <see cref="PermissionRequest"/>.</remarks>
 public sealed partial class PermissionRequestWrite : PermissionRequest
@@ -11224,6 +12076,11 @@ public sealed partial class PermissionRequestWrite : PermissionRequest
     [JsonPropertyName("diff")]
     public required string Diff { get; set; }
 
+    /// <summary>Complete before/after text previews captured while planning this request. Omitted when a complete preview is unavailable, including pre-read sandbox requests and non-UTF-8 files. Missing sides mean creation or deletion, not unavailable content.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("fileEdits")]
+    public PermissionWriteFileEdit[]? FileEdits { get; set; }
+
     /// <summary>Path of the file being written to.</summary>
     [JsonPropertyName("fileName")]
     public required string FileName { get; set; }
@@ -11872,6 +12729,11 @@ public sealed partial class PermissionPromptRequestWrite : PermissionPromptReque
     [JsonPropertyName("diff")]
     public required string Diff { get; set; }
 
+    /// <summary>Complete before/after text previews captured while planning this request. Omitted when a complete preview is unavailable, including pre-read sandbox requests and non-UTF-8 files. Missing sides mean creation or deletion, not unavailable content.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("fileEdits")]
+    public PermissionWriteFileEdit[]? FileEdits { get; set; }
+
     /// <summary>Path of the file being written to.</summary>
     [JsonPropertyName("fileName")]
     public required string FileName { get; set; }
@@ -12849,6 +13711,20 @@ public sealed partial class SessionLimitsExhaustedResponse
     public double? MaxAiCredits { get; set; }
 }
 
+/// <summary>Reusable managed permission evaluation context. Treat permissions as runtime-owned policy data and retain it verbatim; it includes source-aware composition metadata. This is a snapshot, not a capability or approval token; only use contexts obtained from trusted policy sources.</summary>
+/// <remarks>Nested data type for <c>ManagedPermissionsContext</c>.</remarks>
+public sealed partial class ManagedPermissionsContext
+{
+    /// <summary>Policy could not be determined; evaluation must deny every operation.</summary>
+    [JsonPropertyName("failClosed")]
+    public required bool FailClosed { get; set; }
+
+    /// <summary>Runtime-owned composed permissions object. Absent when no permission policy is configured.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("permissions")]
+    public JsonElement? Permissions { get; set; }
+}
+
 /// <summary>A single slash command available in the session, as listed by the `commands.changed` event.</summary>
 /// <remarks>Nested data type for <c>CommandsChangedCommand</c>.</remarks>
 public sealed partial class CommandsChangedCommand
@@ -13193,116 +14069,765 @@ public sealed partial class CanvasRegistryChangedCanvas
     [JsonPropertyName("actions")]
     public CanvasRegistryChangedCanvasAction[]? Actions { get; set; }
 
-    /// <summary>Provider-local canvas identifier.</summary>
-    [JsonPropertyName("canvasId")]
-    public required string CanvasId { get; set; }
+    /// <summary>Provider-local canvas identifier.</summary>
+    [JsonPropertyName("canvasId")]
+    public required string CanvasId { get; 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 required string Description { get; set; }
+
+    /// <summary>Human-readable canvas name.</summary>
+    [JsonPropertyName("displayName")]
+    public required string DisplayName { get; set; }
+
+    /// <summary>Owning provider identifier.</summary>
+    [JsonPropertyName("extensionId")]
+    public required string ExtensionId { get; set; }
+
+    /// <summary>Owning extension display name, when available.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("extensionName")]
+    public string? ExtensionName { get; set; }
+
+    /// <summary>Host-local PNG path for the canvas icon, when supplied.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("icon")]
+    public string? Icon { get; set; }
+
+    /// <summary>JSON Schema for canvas open input.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("inputSchema")]
+    public JsonElement? InputSchema { get; set; }
+}
+
+/// <summary>Set when the underlying tools/call threw an error before returning a CallToolResult.</summary>
+/// <remarks>Nested data type for <c>McpAppToolCallCompleteError</c>.</remarks>
+public sealed partial class McpAppToolCallCompleteError
+{
+    /// <summary>Human-readable error message.</summary>
+    [JsonPropertyName("message")]
+    public required string Message { get; set; }
+}
+
+/// <summary>MCP App tool `_meta.ui` resource URI and SEP-1865 visibility captured with an `mcp_app.tool_call_complete` result.</summary>
+/// <remarks>Nested data type for <c>McpAppToolCallCompleteToolMetaUI</c>.</remarks>
+public sealed partial class McpAppToolCallCompleteToolMetaUI
+{
+    /// <summary>`ui://` URI declared by the tool's `_meta.ui.resourceUri`.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("resourceUri")]
+    public string? ResourceUri { get; set; }
+
+    /// <summary>Tool visibility per SEP-1865 (typically a subset of `["model","app"]`).</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("visibility")]
+    public string[]? Visibility { get; set; }
+}
+
+/// <summary>The tool's `_meta.ui` block at the time of the call, so consumers can decide whether to forward the result to the model without re-listing tools.</summary>
+/// <remarks>Nested data type for <c>McpAppToolCallCompleteToolMeta</c>.</remarks>
+public sealed partial class McpAppToolCallCompleteToolMeta
+{
+    /// <summary>MCP App tool `_meta.ui` resource URI and SEP-1865 visibility captured with an `mcp_app.tool_call_complete` result.</summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("ui")]
+    public McpAppToolCallCompleteToolMetaUI? Ui { get; set; }
+}
+
+/// <summary>Extensible routing preference for the virtual `auto` model. New identifiers must be advertised and enabled by the provider. `fast` is an integrator-only latency preset.</summary>
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct AutoTier : IEquatable<AutoTier>
+{
+    private readonly string? _value;
+
+    /// <summary>Initializes a new instance of the <see cref="AutoTier"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="AutoTier"/>.</param>
+    [JsonConstructor]
+    public AutoTier(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
+
+    /// <summary>Gets the value associated with this <see cref="AutoTier"/>.</summary>
+    public string Value => _value ?? string.Empty;
+
+    /// <summary>Optimize for efficiency.</summary>
+    public static AutoTier Efficiency { get; } = new("efficiency");
+
+    /// <summary>Balance efficiency and intelligence.</summary>
+    public static AutoTier Balance { get; } = new("balance");
+
+    /// <summary>Optimize for intelligence.</summary>
+    public static AutoTier Intelligence { get; } = new("intelligence");
+
+    /// <summary>Integrator-only preset that optimizes for latency.</summary>
+    public static AutoTier Fast { get; } = new("fast");
+
+    /// <summary>Returns a value indicating whether two <see cref="AutoTier"/> instances are equivalent.</summary>
+    public static bool operator ==(AutoTier left, AutoTier right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="AutoTier"/> instances are not equivalent.</summary>
+    public static bool operator !=(AutoTier left, AutoTier right) => !(left == right);
+
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is AutoTier other && Equals(other);
+
+    /// <inheritdoc />
+    public bool Equals(AutoTier other) => string.Equals(Value, other.Value, StringComparison.Ordinal);
+
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.Ordinal.GetHashCode(Value);
+
+    /// <inheritdoc />
+    public override string ToString() => Value;
+
+    /// <summary>Provides a <see cref="JsonConverter{AutoTier}"/> for serializing <see cref="AutoTier"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<AutoTier>
+    {
+        /// <inheritdoc />
+        public override AutoTier Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, AutoTier value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(AutoTier));
+        }
+    }
+}
+
+/// <summary>Hosting platform type of the repository (github or ado).</summary>
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct WorkingDirectoryContextHostType : IEquatable<WorkingDirectoryContextHostType>
+{
+    private readonly string? _value;
+
+    /// <summary>Initializes a new instance of the <see cref="WorkingDirectoryContextHostType"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="WorkingDirectoryContextHostType"/>.</param>
+    [JsonConstructor]
+    public WorkingDirectoryContextHostType(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
+
+    /// <summary>Gets the value associated with this <see cref="WorkingDirectoryContextHostType"/>.</summary>
+    public string Value => _value ?? string.Empty;
+
+    /// <summary>Repository is hosted on GitHub.</summary>
+    public static WorkingDirectoryContextHostType GitHub { get; } = new("github");
+
+    /// <summary>Repository is hosted on Azure DevOps.</summary>
+    public static WorkingDirectoryContextHostType Ado { get; } = new("ado");
+
+    /// <summary>Returns a value indicating whether two <see cref="WorkingDirectoryContextHostType"/> instances are equivalent.</summary>
+    public static bool operator ==(WorkingDirectoryContextHostType left, WorkingDirectoryContextHostType right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="WorkingDirectoryContextHostType"/> instances are not equivalent.</summary>
+    public static bool operator !=(WorkingDirectoryContextHostType left, WorkingDirectoryContextHostType right) => !(left == right);
+
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is WorkingDirectoryContextHostType other && Equals(other);
+
+    /// <inheritdoc />
+    public bool Equals(WorkingDirectoryContextHostType 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{WorkingDirectoryContextHostType}"/> for serializing <see cref="WorkingDirectoryContextHostType"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<WorkingDirectoryContextHostType>
+    {
+        /// <inheritdoc />
+        public override WorkingDirectoryContextHostType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, WorkingDirectoryContextHostType value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(WorkingDirectoryContextHostType));
+        }
+    }
+}
+
+/// <summary>Allowed values for the `ContextTier` enumeration.</summary>
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct ContextTier : IEquatable<ContextTier>
+{
+    private readonly string? _value;
+
+    /// <summary>Initializes a new instance of the <see cref="ContextTier"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="ContextTier"/>.</param>
+    [JsonConstructor]
+    public ContextTier(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
+
+    /// <summary>Gets the value associated with this <see cref="ContextTier"/>.</summary>
+    public string Value => _value ?? string.Empty;
+
+    /// <summary>Default context tier with standard context window size.</summary>
+    public static ContextTier Default { get; } = new("default");
+
+    /// <summary>Extended context tier with a larger context window.</summary>
+    public static ContextTier LongContext { get; } = new("long_context");
+
+    /// <summary>Returns a value indicating whether two <see cref="ContextTier"/> instances are equivalent.</summary>
+    public static bool operator ==(ContextTier left, ContextTier right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="ContextTier"/> instances are not equivalent.</summary>
+    public static bool operator !=(ContextTier left, ContextTier right) => !(left == right);
+
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is ContextTier other && Equals(other);
+
+    /// <inheritdoc />
+    public bool Equals(ContextTier 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{ContextTier}"/> for serializing <see cref="ContextTier"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<ContextTier>
+    {
+        /// <inheritdoc />
+        public override ContextTier Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, ContextTier value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ContextTier));
+        }
+    }
+}
+
+/// <summary>Reasoning summary mode used for model calls, if applicable (e.g. "none", "concise", "detailed").</summary>
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct ReasoningSummary : IEquatable<ReasoningSummary>
+{
+    private readonly string? _value;
+
+    /// <summary>Initializes a new instance of the <see cref="ReasoningSummary"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="ReasoningSummary"/>.</param>
+    [JsonConstructor]
+    public ReasoningSummary(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
+
+    /// <summary>Gets the value associated with this <see cref="ReasoningSummary"/>.</summary>
+    public string Value => _value ?? string.Empty;
+
+    /// <summary>Do not request reasoning summaries from the model.</summary>
+    public static ReasoningSummary None { get; } = new("none");
+
+    /// <summary>Request a concise summary of the model's reasoning.</summary>
+    public static ReasoningSummary Concise { get; } = new("concise");
+
+    /// <summary>Request a detailed summary of the model's reasoning.</summary>
+    public static ReasoningSummary Detailed { get; } = new("detailed");
+
+    /// <summary>Returns a value indicating whether two <see cref="ReasoningSummary"/> instances are equivalent.</summary>
+    public static bool operator ==(ReasoningSummary left, ReasoningSummary right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="ReasoningSummary"/> instances are not equivalent.</summary>
+    public static bool operator !=(ReasoningSummary left, ReasoningSummary right) => !(left == right);
+
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is ReasoningSummary other && Equals(other);
+
+    /// <inheritdoc />
+    public bool Equals(ReasoningSummary 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{ReasoningSummary}"/> for serializing <see cref="ReasoningSummary"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<ReasoningSummary>
+    {
+        /// <inheritdoc />
+        public override ReasoningSummary Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, ReasoningSummary value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ReasoningSummary));
+        }
+    }
+}
+
+/// <summary>Output verbosity level used for supported model calls (e.g. "low", "medium", "high").</summary>
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct Verbosity : IEquatable<Verbosity>
+{
+    private readonly string? _value;
+
+    /// <summary>Initializes a new instance of the <see cref="Verbosity"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="Verbosity"/>.</param>
+    [JsonConstructor]
+    public Verbosity(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
+
+    /// <summary>Gets the value associated with this <see cref="Verbosity"/>.</summary>
+    public string Value => _value ?? string.Empty;
+
+    /// <summary>A terse response was requested.</summary>
+    public static Verbosity Low { get; } = new("low");
+
+    /// <summary>A medium amount of response detail was requested.</summary>
+    public static Verbosity Medium { get; } = new("medium");
+
+    /// <summary>A more detailed response was requested.</summary>
+    public static Verbosity High { get; } = new("high");
+
+    /// <summary>Returns a value indicating whether two <see cref="Verbosity"/> instances are equivalent.</summary>
+    public static bool operator ==(Verbosity left, Verbosity right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="Verbosity"/> instances are not equivalent.</summary>
+    public static bool operator !=(Verbosity left, Verbosity right) => !(left == right);
+
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is Verbosity other && Equals(other);
+
+    /// <inheritdoc />
+    public bool Equals(Verbosity 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{Verbosity}"/> for serializing <see cref="Verbosity"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<Verbosity>
+    {
+        /// <inheritdoc />
+        public override Verbosity Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, Verbosity value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(Verbosity));
+        }
+    }
+}
+
+/// <summary>What the user must do to recover from a failure, named as an action rather than as one client's affordance. The runtime cannot know which affordance a client offers — a slash command, a settings pane, a link — so the accompanying message stays host-agnostic and each client renders its own copy from this value. Absent when the runtime knows of no action the user can take.</summary>
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct RemediationAction : IEquatable<RemediationAction>
+{
+    private readonly string? _value;
+
+    /// <summary>Initializes a new instance of the <see cref="RemediationAction"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="RemediationAction"/>.</param>
+    [JsonConstructor]
+    public RemediationAction(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
+
+    /// <summary>Gets the value associated with this <see cref="RemediationAction"/>.</summary>
+    public string Value => _value ?? string.Empty;
+
+    /// <summary>Authenticate again with the Copilot backend. The current credential is absent, expired, or rejected.</summary>
+    public static RemediationAction SignIn { get; } = new("sign_in");
+
+    /// <summary>Authenticate as a different account. The current account exists but lacks access to the requested resource.</summary>
+    public static RemediationAction SwitchAccount { get; } = new("switch_account");
+
+    /// <summary>Inspect which account is currently authenticated before deciding what to change.</summary>
+    public static RemediationAction ShowAccount { get; } = new("show_account");
+
+    /// <summary>Review or widen the sandbox policy. The blocked path or host is named by the accompanying message or by the tool result the action arrived with.</summary>
+    public static RemediationAction ReviewSandboxPolicy { get; } = new("review_sandbox_policy");
+
+    /// <summary>Permit outbound network access in the sandbox policy.</summary>
+    public static RemediationAction AllowSandboxOutbound { get; } = new("allow_sandbox_outbound");
+
+    /// <summary>Discard conversation history back through the blocked request before continuing.</summary>
+    public static RemediationAction RewindConversation { get; } = new("rewind_conversation");
+
+    /// <summary>Returns a value indicating whether two <see cref="RemediationAction"/> instances are equivalent.</summary>
+    public static bool operator ==(RemediationAction left, RemediationAction right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="RemediationAction"/> instances are not equivalent.</summary>
+    public static bool operator !=(RemediationAction left, RemediationAction right) => !(left == right);
+
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is RemediationAction other && Equals(other);
+
+    /// <inheritdoc />
+    public bool Equals(RemediationAction 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{RemediationAction}"/> for serializing <see cref="RemediationAction"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<RemediationAction>
+    {
+        /// <inheritdoc />
+        public override RemediationAction Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, RemediationAction value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(RemediationAction));
+        }
+    }
+}
+
+/// <summary>The session mode the agent is operating in.</summary>
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct SessionMode : IEquatable<SessionMode>
+{
+    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>
+    [JsonConstructor]
+    public SessionMode(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
+
+    /// <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>
+    public static ScheduleOrigin User { get; } = new("user");
+
+    /// <summary>The schedule was created by the agent via the `manage_schedule` tool.</summary>
+    public static ScheduleOrigin Model { get; } = new("model");
+
+    /// <summary>Returns a value indicating whether two <see cref="ScheduleOrigin"/> instances are equivalent.</summary>
+    public static bool operator ==(ScheduleOrigin left, ScheduleOrigin right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="ScheduleOrigin"/> instances are not equivalent.</summary>
+    public static bool operator !=(ScheduleOrigin left, ScheduleOrigin right) => !(left == right);
+
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is ScheduleOrigin other && Equals(other);
+
+    /// <inheritdoc />
+    public bool Equals(ScheduleOrigin 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{ScheduleOrigin}"/> for serializing <see cref="ScheduleOrigin"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<ScheduleOrigin>
+    {
+        /// <inheritdoc />
+        public override ScheduleOrigin Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, ScheduleOrigin value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ScheduleOrigin));
+        }
+    }
+}
+
+/// <summary>The type of operation performed on the autopilot objective state file.</summary>
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct AutopilotObjectiveChangedOperation : IEquatable<AutopilotObjectiveChangedOperation>
+{
+    private readonly string? _value;
+
+    /// <summary>Initializes a new instance of the <see cref="AutopilotObjectiveChangedOperation"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="AutopilotObjectiveChangedOperation"/>.</param>
+    [JsonConstructor]
+    public AutopilotObjectiveChangedOperation(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
+
+    /// <summary>Gets the value associated with this <see cref="AutopilotObjectiveChangedOperation"/>.</summary>
+    public string Value => _value ?? string.Empty;
+
+    /// <summary>Autopilot objective state file was created for a new objective.</summary>
+    public static AutopilotObjectiveChangedOperation Create { get; } = new("create");
+
+    /// <summary>Autopilot objective state file was updated for an existing objective.</summary>
+    public static AutopilotObjectiveChangedOperation Update { get; } = new("update");
+
+    /// <summary>Autopilot objective state file was deleted or cleared.</summary>
+    public static AutopilotObjectiveChangedOperation Delete { get; } = new("delete");
+
+    /// <summary>Returns a value indicating whether two <see cref="AutopilotObjectiveChangedOperation"/> instances are equivalent.</summary>
+    public static bool operator ==(AutopilotObjectiveChangedOperation left, AutopilotObjectiveChangedOperation right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="AutopilotObjectiveChangedOperation"/> instances are not equivalent.</summary>
+    public static bool operator !=(AutopilotObjectiveChangedOperation left, AutopilotObjectiveChangedOperation right) => !(left == right);
+
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is AutopilotObjectiveChangedOperation other && Equals(other);
+
+    /// <inheritdoc />
+    public bool Equals(AutopilotObjectiveChangedOperation 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{AutopilotObjectiveChangedOperation}"/> for serializing <see cref="AutopilotObjectiveChangedOperation"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<AutopilotObjectiveChangedOperation>
+    {
+        /// <inheritdoc />
+        public override AutopilotObjectiveChangedOperation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, AutopilotObjectiveChangedOperation value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(AutopilotObjectiveChangedOperation));
+        }
+    }
+}
+
+/// <summary>Current autopilot objective status, if one exists.</summary>
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct AutopilotObjectiveChangedStatus : IEquatable<AutopilotObjectiveChangedStatus>
+{
+    private readonly string? _value;
+
+    /// <summary>Initializes a new instance of the <see cref="AutopilotObjectiveChangedStatus"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="AutopilotObjectiveChangedStatus"/>.</param>
+    [JsonConstructor]
+    public AutopilotObjectiveChangedStatus(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
+
+    /// <summary>Gets the value associated with this <see cref="AutopilotObjectiveChangedStatus"/>.</summary>
+    public string Value => _value ?? 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 required string Description { get; set; }
+    /// <summary>Objective is active and can drive autopilot continuations.</summary>
+    public static AutopilotObjectiveChangedStatus Active { get; } = new("active");
 
-    /// <summary>Human-readable canvas name.</summary>
-    [JsonPropertyName("displayName")]
-    public required string DisplayName { get; set; }
+    /// <summary>Objective is paused and will not drive autopilot continuations.</summary>
+    public static AutopilotObjectiveChangedStatus Paused { get; } = new("paused");
 
-    /// <summary>Owning provider identifier.</summary>
-    [JsonPropertyName("extensionId")]
-    public required string ExtensionId { get; set; }
+    /// <summary>Legacy objective state indicating the previous continuation cap was reached.</summary>
+    public static AutopilotObjectiveChangedStatus CapReached { get; } = new("cap_reached");
 
-    /// <summary>Owning extension display name, when available.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("extensionName")]
-    public string? ExtensionName { get; set; }
+    /// <summary>Objective was completed by the agent.</summary>
+    public static AutopilotObjectiveChangedStatus Completed { get; } = new("completed");
 
-    /// <summary>Host-local PNG path for the canvas icon, when supplied.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("icon")]
-    public string? Icon { get; set; }
+    /// <summary>Returns a value indicating whether two <see cref="AutopilotObjectiveChangedStatus"/> instances are equivalent.</summary>
+    public static bool operator ==(AutopilotObjectiveChangedStatus left, AutopilotObjectiveChangedStatus right) => left.Equals(right);
 
-    /// <summary>JSON Schema for canvas open input.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("inputSchema")]
-    public JsonElement? InputSchema { get; set; }
-}
+    /// <summary>Returns a value indicating whether two <see cref="AutopilotObjectiveChangedStatus"/> instances are not equivalent.</summary>
+    public static bool operator !=(AutopilotObjectiveChangedStatus left, AutopilotObjectiveChangedStatus right) => !(left == right);
 
-/// <summary>Set when the underlying tools/call threw an error before returning a CallToolResult.</summary>
-/// <remarks>Nested data type for <c>McpAppToolCallCompleteError</c>.</remarks>
-public sealed partial class McpAppToolCallCompleteError
-{
-    /// <summary>Human-readable error message.</summary>
-    [JsonPropertyName("message")]
-    public required string Message { get; set; }
-}
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is AutopilotObjectiveChangedStatus other && Equals(other);
 
-/// <summary>MCP App tool `_meta.ui` resource URI and SEP-1865 visibility captured with an `mcp_app.tool_call_complete` result.</summary>
-/// <remarks>Nested data type for <c>McpAppToolCallCompleteToolMetaUI</c>.</remarks>
-public sealed partial class McpAppToolCallCompleteToolMetaUI
-{
-    /// <summary>`ui://` URI declared by the tool's `_meta.ui.resourceUri`.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("resourceUri")]
-    public string? ResourceUri { get; set; }
+    /// <inheritdoc />
+    public bool Equals(AutopilotObjectiveChangedStatus other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
-    /// <summary>Tool visibility per SEP-1865 (typically a subset of `["model","app"]`).</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("visibility")]
-    public string[]? Visibility { get; set; }
-}
+    /// <inheritdoc />
+    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
 
-/// <summary>The tool's `_meta.ui` block at the time of the call, so consumers can decide whether to forward the result to the model without re-listing tools.</summary>
-/// <remarks>Nested data type for <c>McpAppToolCallCompleteToolMeta</c>.</remarks>
-public sealed partial class McpAppToolCallCompleteToolMeta
-{
-    /// <summary>MCP App tool `_meta.ui` resource URI and SEP-1865 visibility captured with an `mcp_app.tool_call_complete` result.</summary>
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [JsonPropertyName("ui")]
-    public McpAppToolCallCompleteToolMetaUI? Ui { get; set; }
+    /// <inheritdoc />
+    public override string ToString() => Value;
+
+    /// <summary>Provides a <see cref="JsonConverter{AutopilotObjectiveChangedStatus}"/> for serializing <see cref="AutopilotObjectiveChangedStatus"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<AutopilotObjectiveChangedStatus>
+    {
+        /// <inheritdoc />
+        public override AutopilotObjectiveChangedStatus Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, AutopilotObjectiveChangedStatus value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(AutopilotObjectiveChangedStatus));
+        }
+    }
 }
 
-/// <summary>Routing preference used when the session model is `auto`. `fast` is an integrator-only latency preset and is not a first-party GitHub Copilot product preference.</summary>
+/// <summary>Live indexed-search state for this session activation, never inferred from persisted history.</summary>
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct AutoTier : IEquatable<AutoTier>
+public readonly struct IndexedSearchState : IEquatable<IndexedSearchState>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="AutoTier"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="AutoTier"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="IndexedSearchState"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="IndexedSearchState"/>.</param>
     [JsonConstructor]
-    public AutoTier(string value)
+    public IndexedSearchState(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="AutoTier"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="IndexedSearchState"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Optimize for efficiency.</summary>
-    public static AutoTier Efficiency { get; } = new("efficiency");
+    /// <summary>Indexed search is not active for this session.</summary>
+    public static IndexedSearchState Disabled { get; } = new("disabled");
 
-    /// <summary>Balance efficiency and intelligence.</summary>
-    public static AutoTier Balance { get; } = new("balance");
+    /// <summary>Indexed-search startup is in progress.</summary>
+    public static IndexedSearchState Starting { get; } = new("starting");
 
-    /// <summary>Optimize for intelligence.</summary>
-    public static AutoTier Intelligence { get; } = new("intelligence");
+    /// <summary>The indexed-search server started successfully; its index may still be warming.</summary>
+    public static IndexedSearchState Enabled { get; } = new("enabled");
 
-    /// <summary>Integrator-only preset that optimizes for latency.</summary>
-    public static AutoTier Fast { get; } = new("fast");
+    /// <summary>The indexed-search server and its index are ready.</summary>
+    public static IndexedSearchState Ready { get; } = new("ready");
 
-    /// <summary>Returns a value indicating whether two <see cref="AutoTier"/> instances are equivalent.</summary>
-    public static bool operator ==(AutoTier left, AutoTier right) => left.Equals(right);
+    /// <summary>Indexed-search startup or the active server failed.</summary>
+    public static IndexedSearchState Failed { get; } = new("failed");
 
-    /// <summary>Returns a value indicating whether two <see cref="AutoTier"/> instances are not equivalent.</summary>
-    public static bool operator !=(AutoTier left, AutoTier right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="IndexedSearchState"/> instances are equivalent.</summary>
+    public static bool operator ==(IndexedSearchState left, IndexedSearchState right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="IndexedSearchState"/> instances are not equivalent.</summary>
+    public static bool operator !=(IndexedSearchState left, IndexedSearchState right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is AutoTier other && Equals(other);
+    public override bool Equals(object? obj) => obj is IndexedSearchState other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(AutoTier other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(IndexedSearchState other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -13310,60 +14835,81 @@ public AutoTier(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{AutoTier}"/> for serializing <see cref="AutoTier"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{IndexedSearchState}"/> for serializing <see cref="IndexedSearchState"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<AutoTier>
+    public sealed class Converter : JsonConverter<IndexedSearchState>
     {
         /// <inheritdoc />
-        public override AutoTier Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override IndexedSearchState Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, AutoTier value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, IndexedSearchState value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(AutoTier));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(IndexedSearchState));
         }
     }
 }
 
-/// <summary>Hosting platform type of the repository (github or ado).</summary>
+/// <summary>Configuration, policy, or workspace condition that disabled indexed search.</summary>
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct WorkingDirectoryContextHostType : IEquatable<WorkingDirectoryContextHostType>
+public readonly struct IndexedSearchDisabledReason : IEquatable<IndexedSearchDisabledReason>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="WorkingDirectoryContextHostType"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="WorkingDirectoryContextHostType"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="IndexedSearchDisabledReason"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="IndexedSearchDisabledReason"/>.</param>
     [JsonConstructor]
-    public WorkingDirectoryContextHostType(string value)
+    public IndexedSearchDisabledReason(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="WorkingDirectoryContextHostType"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="IndexedSearchDisabledReason"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Repository is hosted on GitHub.</summary>
-    public static WorkingDirectoryContextHostType GitHub { get; } = new("github");
+    /// <summary>Indexed search was explicitly disabled by the environment.</summary>
+    public static IndexedSearchDisabledReason UseTgrepFalse { get; } = new("use_tgrep_false");
 
-    /// <summary>Repository is hosted on Azure DevOps.</summary>
-    public static WorkingDirectoryContextHostType Ado { get; } = new("ado");
+    /// <summary>Search uses the external ripgrep binary instead of bundled search.</summary>
+    public static IndexedSearchDisabledReason UseBuiltinRipgrepFalse { get; } = new("use_builtin_ripgrep_false");
 
-    /// <summary>Returns a value indicating whether two <see cref="WorkingDirectoryContextHostType"/> instances are equivalent.</summary>
-    public static bool operator ==(WorkingDirectoryContextHostType left, WorkingDirectoryContextHostType right) => left.Equals(right);
+    /// <summary>Organization policy disables indexed search.</summary>
+    public static IndexedSearchDisabledReason Organization { get; } = new("organization");
 
-    /// <summary>Returns a value indicating whether two <see cref="WorkingDirectoryContextHostType"/> instances are not equivalent.</summary>
-    public static bool operator !=(WorkingDirectoryContextHostType left, WorkingDirectoryContextHostType right) => !(left == right);
+    /// <summary>Authentication has not resolved organization policy.</summary>
+    public static IndexedSearchDisabledReason OrganizationPolicyAuthPending { get; } = new("organization_policy_auth_pending");
+
+    /// <summary>Organization policy could not be determined.</summary>
+    public static IndexedSearchDisabledReason OrganizationPolicyUnknown { get; } = new("organization_policy_unknown");
+
+    /// <summary>The workspace uses a virtualized or network filesystem.</summary>
+    public static IndexedSearchDisabledReason VirtualFilesystem { get; } = new("virtual_filesystem");
+
+    /// <summary>The workspace is inside a Windows cloud-sync root.</summary>
+    public static IndexedSearchDisabledReason CloudSyncRoot { get; } = new("cloud_sync_root");
+
+    /// <summary>The Windows cloud-sync safety check failed.</summary>
+    public static IndexedSearchDisabledReason CloudSyncDetectionFailed { get; } = new("cloud_sync_detection_failed");
+
+    /// <summary>The workspace is not available on the runtime's local filesystem.</summary>
+    public static IndexedSearchDisabledReason WorkspaceNotLocal { get; } = new("workspace_not_local");
+
+    /// <summary>Returns a value indicating whether two <see cref="IndexedSearchDisabledReason"/> instances are equivalent.</summary>
+    public static bool operator ==(IndexedSearchDisabledReason left, IndexedSearchDisabledReason right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="IndexedSearchDisabledReason"/> instances are not equivalent.</summary>
+    public static bool operator !=(IndexedSearchDisabledReason left, IndexedSearchDisabledReason right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is WorkingDirectoryContextHostType other && Equals(other);
+    public override bool Equals(object? obj) => obj is IndexedSearchDisabledReason other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(WorkingDirectoryContextHostType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(IndexedSearchDisabledReason other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -13371,60 +14917,72 @@ public WorkingDirectoryContextHostType(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{WorkingDirectoryContextHostType}"/> for serializing <see cref="WorkingDirectoryContextHostType"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{IndexedSearchDisabledReason}"/> for serializing <see cref="IndexedSearchDisabledReason"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<WorkingDirectoryContextHostType>
+    public sealed class Converter : JsonConverter<IndexedSearchDisabledReason>
     {
         /// <inheritdoc />
-        public override WorkingDirectoryContextHostType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override IndexedSearchDisabledReason Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, WorkingDirectoryContextHostType value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, IndexedSearchDisabledReason value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(WorkingDirectoryContextHostType));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(IndexedSearchDisabledReason));
         }
     }
 }
 
-/// <summary>Allowed values for the `ContextTier` enumeration.</summary>
+/// <summary>Result of an indexed-search startup attempt.</summary>
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct ContextTier : IEquatable<ContextTier>
+public readonly struct IndexedSearchOutcome : IEquatable<IndexedSearchOutcome>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="ContextTier"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="ContextTier"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="IndexedSearchOutcome"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="IndexedSearchOutcome"/>.</param>
     [JsonConstructor]
-    public ContextTier(string value)
+    public IndexedSearchOutcome(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="ContextTier"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="IndexedSearchOutcome"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Default context tier with standard context window size.</summary>
-    public static ContextTier Default { get; } = new("default");
+    /// <summary>A new indexed-search server was started.</summary>
+    public static IndexedSearchOutcome Started { get; } = new("started");
 
-    /// <summary>Extended context tier with a larger context window.</summary>
-    public static ContextTier LongContext { get; } = new("long_context");
+    /// <summary>The repository has too few files for automatic indexing.</summary>
+    public static IndexedSearchOutcome SkippedBelowThreshold { get; } = new("skipped_below_threshold");
 
-    /// <summary>Returns a value indicating whether two <see cref="ContextTier"/> instances are equivalent.</summary>
-    public static bool operator ==(ContextTier left, ContextTier right) => left.Equals(right);
+    /// <summary>No Git repository was found and indexing was not forced.</summary>
+    public static IndexedSearchOutcome SkippedNoGitroot { get; } = new("skipped_no_gitroot");
 
-    /// <summary>Returns a value indicating whether two <see cref="ContextTier"/> instances are not equivalent.</summary>
-    public static bool operator !=(ContextTier left, ContextTier right) => !(left == right);
+    /// <summary>Configuration, policy, or workspace safety disabled indexing.</summary>
+    public static IndexedSearchOutcome SkippedDisabled { get; } = new("skipped_disabled");
+
+    /// <summary>An existing indexed-search server was reused.</summary>
+    public static IndexedSearchOutcome ReusedExisting { get; } = new("reused_existing");
+
+    /// <summary>The startup attempt failed.</summary>
+    public static IndexedSearchOutcome Failed { get; } = new("failed");
+
+    /// <summary>Returns a value indicating whether two <see cref="IndexedSearchOutcome"/> instances are equivalent.</summary>
+    public static bool operator ==(IndexedSearchOutcome left, IndexedSearchOutcome right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="IndexedSearchOutcome"/> instances are not equivalent.</summary>
+    public static bool operator !=(IndexedSearchOutcome left, IndexedSearchOutcome right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is ContextTier other && Equals(other);
+    public override bool Equals(object? obj) => obj is IndexedSearchOutcome other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(ContextTier other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(IndexedSearchOutcome other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -13432,63 +14990,63 @@ public ContextTier(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{ContextTier}"/> for serializing <see cref="ContextTier"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{IndexedSearchOutcome}"/> for serializing <see cref="IndexedSearchOutcome"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<ContextTier>
+    public sealed class Converter : JsonConverter<IndexedSearchOutcome>
     {
         /// <inheritdoc />
-        public override ContextTier Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override IndexedSearchOutcome Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, ContextTier value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, IndexedSearchOutcome value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ContextTier));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(IndexedSearchOutcome));
         }
     }
 }
 
-/// <summary>Reasoning summary mode used for model calls, if applicable (e.g. "none", "concise", "detailed").</summary>
+/// <summary>Category of an indexed-search server failure.</summary>
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct ReasoningSummary : IEquatable<ReasoningSummary>
+public readonly struct IndexedSearchErrorType : IEquatable<IndexedSearchErrorType>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="ReasoningSummary"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="ReasoningSummary"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="IndexedSearchErrorType"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="IndexedSearchErrorType"/>.</param>
     [JsonConstructor]
-    public ReasoningSummary(string value)
+    public IndexedSearchErrorType(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="ReasoningSummary"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="IndexedSearchErrorType"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Do not request reasoning summaries from the model.</summary>
-    public static ReasoningSummary None { get; } = new("none");
+    /// <summary>The indexed-search server could not be spawned.</summary>
+    public static IndexedSearchErrorType SpawnError { get; } = new("spawn_error");
 
-    /// <summary>Request a concise summary of the model's reasoning.</summary>
-    public static ReasoningSummary Concise { get; } = new("concise");
+    /// <summary>The indexed-search server exited unexpectedly.</summary>
+    public static IndexedSearchErrorType UnexpectedExit { get; } = new("unexpected_exit");
 
-    /// <summary>Request a detailed summary of the model's reasoning.</summary>
-    public static ReasoningSummary Detailed { get; } = new("detailed");
+    /// <summary>The indexed-search server was terminated by a signal.</summary>
+    public static IndexedSearchErrorType KilledBySignal { get; } = new("killed_by_signal");
 
-    /// <summary>Returns a value indicating whether two <see cref="ReasoningSummary"/> instances are equivalent.</summary>
-    public static bool operator ==(ReasoningSummary left, ReasoningSummary right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="IndexedSearchErrorType"/> instances are equivalent.</summary>
+    public static bool operator ==(IndexedSearchErrorType left, IndexedSearchErrorType right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="ReasoningSummary"/> instances are not equivalent.</summary>
-    public static bool operator !=(ReasoningSummary left, ReasoningSummary right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="IndexedSearchErrorType"/> instances are not equivalent.</summary>
+    public static bool operator !=(IndexedSearchErrorType left, IndexedSearchErrorType right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is ReasoningSummary other && Equals(other);
+    public override bool Equals(object? obj) => obj is IndexedSearchErrorType other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(ReasoningSummary other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(IndexedSearchErrorType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -13496,63 +15054,60 @@ public ReasoningSummary(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{ReasoningSummary}"/> for serializing <see cref="ReasoningSummary"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{IndexedSearchErrorType}"/> for serializing <see cref="IndexedSearchErrorType"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<ReasoningSummary>
+    public sealed class Converter : JsonConverter<IndexedSearchErrorType>
     {
         /// <inheritdoc />
-        public override ReasoningSummary Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override IndexedSearchErrorType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, ReasoningSummary value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, IndexedSearchErrorType value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ReasoningSummary));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(IndexedSearchErrorType));
         }
     }
 }
 
-/// <summary>Output verbosity level used for supported model calls (e.g. "low", "medium", "high").</summary>
+/// <summary>Phase of an incremental indexed-search update.</summary>
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct Verbosity : IEquatable<Verbosity>
+public readonly struct IndexedSearchIncrementalPhase : IEquatable<IndexedSearchIncrementalPhase>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="Verbosity"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="Verbosity"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="IndexedSearchIncrementalPhase"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="IndexedSearchIncrementalPhase"/>.</param>
     [JsonConstructor]
-    public Verbosity(string value)
+    public IndexedSearchIncrementalPhase(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="Verbosity"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="IndexedSearchIncrementalPhase"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>A terse response was requested.</summary>
-    public static Verbosity Low { get; } = new("low");
-
-    /// <summary>A medium amount of response detail was requested.</summary>
-    public static Verbosity Medium { get; } = new("medium");
+    /// <summary>A workspace scan found changes to index.</summary>
+    public static IndexedSearchIncrementalPhase ChangesDetected { get; } = new("changes_detected");
 
-    /// <summary>A more detailed response was requested.</summary>
-    public static Verbosity High { get; } = new("high");
+    /// <summary>The incremental index update completed.</summary>
+    public static IndexedSearchIncrementalPhase Updated { get; } = new("updated");
 
-    /// <summary>Returns a value indicating whether two <see cref="Verbosity"/> instances are equivalent.</summary>
-    public static bool operator ==(Verbosity left, Verbosity right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="IndexedSearchIncrementalPhase"/> instances are equivalent.</summary>
+    public static bool operator ==(IndexedSearchIncrementalPhase left, IndexedSearchIncrementalPhase right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="Verbosity"/> instances are not equivalent.</summary>
-    public static bool operator !=(Verbosity left, Verbosity right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="IndexedSearchIncrementalPhase"/> instances are not equivalent.</summary>
+    public static bool operator !=(IndexedSearchIncrementalPhase left, IndexedSearchIncrementalPhase right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is Verbosity other && Equals(other);
+    public override bool Equals(object? obj) => obj is IndexedSearchIncrementalPhase other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(Verbosity other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(IndexedSearchIncrementalPhase other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -13560,69 +15115,93 @@ public Verbosity(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{Verbosity}"/> for serializing <see cref="Verbosity"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{IndexedSearchIncrementalPhase}"/> for serializing <see cref="IndexedSearchIncrementalPhase"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<Verbosity>
+    public sealed class Converter : JsonConverter<IndexedSearchIncrementalPhase>
     {
         /// <inheritdoc />
-        public override Verbosity Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override IndexedSearchIncrementalPhase Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, Verbosity value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, IndexedSearchIncrementalPhase value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(Verbosity));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(IndexedSearchIncrementalPhase));
         }
     }
 }
 
-/// <summary>What the user must do to recover from a failure, named as an action rather than as one client's affordance. The runtime cannot know which affordance a client offers — a slash command, a settings pane, a link — so the accompanying message stays host-agnostic and each client renders its own copy from this value. Absent when the runtime knows of no action the user can take.</summary>
+/// <summary>Origin of an effective session model change.</summary>
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct RemediationAction : IEquatable<RemediationAction>
+public readonly struct ModelChangeSource : IEquatable<ModelChangeSource>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="RemediationAction"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="RemediationAction"/>.</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 RemediationAction(string value)
+    public ModelChangeSource(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="RemediationAction"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="ModelChangeSource"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Authenticate again with the Copilot backend. The current credential is absent, expired, or rejected.</summary>
-    public static RemediationAction SignIn { get; } = new("sign_in");
+    /// <summary>The user selected a model directly with `/model &lt;id&gt;`.</summary>
+    public static ModelChangeSource ModelCommand { get; } = new("model_command");
 
-    /// <summary>Authenticate as a different account. The current account exists but lacks access to the requested resource.</summary>
-    public static RemediationAction SwitchAccount { get; } = new("switch_account");
+    /// <summary>The user selected the model with `/settings`.</summary>
+    public static ModelChangeSource SettingsCommand { get; } = new("settings_command");
 
-    /// <summary>Inspect which account is currently authenticated before deciding what to change.</summary>
-    public static RemediationAction ShowAccount { get; } = new("show_account");
+    /// <summary>The user selected the model with the `/config` alias.</summary>
+    public static ModelChangeSource ConfigCommand { get; } = new("config_command");
 
-    /// <summary>Review or widen the sandbox policy. The blocked path or host is named by the accompanying message or by the tool result the action arrived with.</summary>
-    public static RemediationAction ReviewSandboxPolicy { get; } = new("review_sandbox_policy");
+    /// <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>Permit outbound network access in the sandbox policy.</summary>
-    public static RemediationAction AllowSandboxOutbound { get; } = new("allow_sandbox_outbound");
+    /// <summary>Organization-managed settings selected the model.</summary>
+    public static ModelChangeSource ManagedSettings { get; } = new("managed_settings");
 
-    /// <summary>Returns a value indicating whether two <see cref="RemediationAction"/> instances are equivalent.</summary>
-    public static bool operator ==(RemediationAction left, RemediationAction right) => left.Equals(right);
+    /// <summary>Repository settings selected the model.</summary>
+    public static ModelChangeSource RepoSettings { get; } = new("repo_settings");
 
-    /// <summary>Returns a value indicating whether two <see cref="RemediationAction"/> instances are not equivalent.</summary>
-    public static bool operator !=(RemediationAction left, RemediationAction right) => !(left == right);
+    /// <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>The user selected the promoted model from the changeboarding card or its keyboard shortcut.</summary>
+    public static ModelChangeSource ChangeboardingShortcut { get; } = new("changeboarding_shortcut");
+
+    /// <summary>An SDK or RPC caller selected the model.</summary>
+    public static ModelChangeSource Sdk { get; } = new("sdk");
+
+    /// <summary>The user accepted a CAPI-issued Auto tier recommendation.</summary>
+    public static ModelChangeSource AutoTierRecommendation { get; } = new("auto_tier_recommendation");
+
+    /// <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 RemediationAction other && Equals(other);
+    public override bool Equals(object? obj) => obj is ModelChangeSource other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(RemediationAction 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);
@@ -13630,63 +15209,57 @@ public RemediationAction(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{RemediationAction}"/> for serializing <see cref="RemediationAction"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{ModelChangeSource}"/> for serializing <see cref="ModelChangeSource"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<RemediationAction>
+    public sealed class Converter : JsonConverter<ModelChangeSource>
     {
         /// <inheritdoc />
-        public override RemediationAction 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, RemediationAction value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, ModelChangeSource value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(RemediationAction));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ModelChangeSource));
         }
     }
 }
 
-/// <summary>The session mode the agent is operating in.</summary>
+/// <summary>Why the session no longer has an explicitly selected model.</summary>
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct SessionMode : IEquatable<SessionMode>
+public readonly struct ModelDeselectedReason : IEquatable<ModelDeselectedReason>
 {
     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="ModelDeselectedReason"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="ModelDeselectedReason"/>.</param>
     [JsonConstructor]
-    public SessionMode(string value)
+    public ModelDeselectedReason(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="ModelDeselectedReason"/>.</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>A host-managed provider snapshot no longer publishes the selected model.</summary>
+    public static ModelDeselectedReason ProviderWithdrawn { get; } = new("provider_withdrawn");
 
-    /// <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="ModelDeselectedReason"/> instances are equivalent.</summary>
+    public static bool operator ==(ModelDeselectedReason left, ModelDeselectedReason 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);
+    /// <summary>Returns a value indicating whether two <see cref="ModelDeselectedReason"/> instances are not equivalent.</summary>
+    public static bool operator !=(ModelDeselectedReason left, ModelDeselectedReason right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is SessionMode other && Equals(other);
+    public override bool Equals(object? obj) => obj is ModelDeselectedReason other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(SessionMode other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(ModelDeselectedReason other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -13694,124 +15267,130 @@ 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{ModelDeselectedReason}"/> for serializing <see cref="ModelDeselectedReason"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<SessionMode>
+    public sealed class Converter : JsonConverter<ModelDeselectedReason>
     {
         /// <inheritdoc />
-        public override SessionMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override ModelDeselectedReason 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, ModelDeselectedReason value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(SessionMode));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ModelDeselectedReason));
         }
     }
 }
 
-/// <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>Enabled Auto preferences that Copilot API can recommend.</summary>
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct ScheduleOrigin : IEquatable<ScheduleOrigin>
+public readonly struct RecommendedAutoTier : IEquatable<RecommendedAutoTier>
 {
     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="RecommendedAutoTier"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="RecommendedAutoTier"/>.</param>
     [JsonConstructor]
-    public ScheduleOrigin(string value)
+    public RecommendedAutoTier(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="RecommendedAutoTier"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>The schedule was created by an explicit user action, such as `/every` or `/after`.</summary>
-    public static ScheduleOrigin User { get; } = new("user");
+    /// <summary>Optimize for efficiency.</summary>
+    public static RecommendedAutoTier Efficiency { get; } = new("efficiency");
 
-    /// <summary>The schedule was created by the agent via the `manage_schedule` tool.</summary>
-    public static ScheduleOrigin Model { get; } = new("model");
+    /// <summary>Balance efficiency and intelligence.</summary>
+    public static RecommendedAutoTier Balance { get; } = new("balance");
 
-    /// <summary>Returns a value indicating whether two <see cref="ScheduleOrigin"/> instances are equivalent.</summary>
-    public static bool operator ==(ScheduleOrigin left, ScheduleOrigin right) => left.Equals(right);
+    /// <summary>Optimize for intelligence.</summary>
+    public static RecommendedAutoTier Intelligence { get; } = new("intelligence");
 
-    /// <summary>Returns a value indicating whether two <see cref="ScheduleOrigin"/> instances are not equivalent.</summary>
-    public static bool operator !=(ScheduleOrigin left, ScheduleOrigin right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="RecommendedAutoTier"/> instances are equivalent.</summary>
+    public static bool operator ==(RecommendedAutoTier left, RecommendedAutoTier right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="RecommendedAutoTier"/> instances are not equivalent.</summary>
+    public static bool operator !=(RecommendedAutoTier left, RecommendedAutoTier right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is ScheduleOrigin other && Equals(other);
+    public override bool Equals(object? obj) => obj is RecommendedAutoTier other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(ScheduleOrigin other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(RecommendedAutoTier other) => string.Equals(Value, other.Value, StringComparison.Ordinal);
 
     /// <inheritdoc />
-    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
+    public override int GetHashCode() => StringComparer.Ordinal.GetHashCode(Value);
 
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{ScheduleOrigin}"/> for serializing <see cref="ScheduleOrigin"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{RecommendedAutoTier}"/> for serializing <see cref="RecommendedAutoTier"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<ScheduleOrigin>
+    public sealed class Converter : JsonConverter<RecommendedAutoTier>
     {
         /// <inheritdoc />
-        public override ScheduleOrigin Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override RecommendedAutoTier Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, ScheduleOrigin value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, RecommendedAutoTier value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ScheduleOrigin));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(RecommendedAutoTier));
         }
     }
 }
 
-/// <summary>The type of operation performed on the autopilot objective state file.</summary>
+/// <summary>Terminal reason an Auto preference activation failed.</summary>
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct AutopilotObjectiveChangedOperation : IEquatable<AutopilotObjectiveChangedOperation>
+public readonly struct AutoTierSwitchFailureReason : IEquatable<AutoTierSwitchFailureReason>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="AutopilotObjectiveChangedOperation"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="AutopilotObjectiveChangedOperation"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="AutoTierSwitchFailureReason"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="AutoTierSwitchFailureReason"/>.</param>
     [JsonConstructor]
-    public AutopilotObjectiveChangedOperation(string value)
+    public AutoTierSwitchFailureReason(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="AutopilotObjectiveChangedOperation"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="AutoTierSwitchFailureReason"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Autopilot objective state file was created for a new objective.</summary>
-    public static AutopilotObjectiveChangedOperation Create { get; } = new("create");
+    /// <summary>The candidate model was rejected by model policy.</summary>
+    public static AutoTierSwitchFailureReason PolicyRejected { get; } = new("policy_rejected");
 
-    /// <summary>Autopilot objective state file was updated for an existing objective.</summary>
-    public static AutopilotObjectiveChangedOperation Update { get; } = new("update");
+    /// <summary>The Auto routing request failed or returned an unusable response.</summary>
+    public static AutoTierSwitchFailureReason RequestFailed { get; } = new("request_failed");
 
-    /// <summary>Autopilot objective state file was deleted or cleared.</summary>
-    public static AutopilotObjectiveChangedOperation Delete { get; } = new("delete");
+    /// <summary>The runtime could not prepare the Auto routing request.</summary>
+    public static AutoTierSwitchFailureReason SetupFailed { get; } = new("setup_failed");
 
-    /// <summary>Returns a value indicating whether two <see cref="AutopilotObjectiveChangedOperation"/> instances are equivalent.</summary>
-    public static bool operator ==(AutopilotObjectiveChangedOperation left, AutopilotObjectiveChangedOperation right) => left.Equals(right);
+    /// <summary>The provider does not support Auto routing.</summary>
+    public static AutoTierSwitchFailureReason Unsupported { get; } = new("unsupported");
 
-    /// <summary>Returns a value indicating whether two <see cref="AutopilotObjectiveChangedOperation"/> instances are not equivalent.</summary>
-    public static bool operator !=(AutopilotObjectiveChangedOperation left, AutopilotObjectiveChangedOperation right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="AutoTierSwitchFailureReason"/> instances are equivalent.</summary>
+    public static bool operator ==(AutoTierSwitchFailureReason left, AutoTierSwitchFailureReason right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="AutoTierSwitchFailureReason"/> instances are not equivalent.</summary>
+    public static bool operator !=(AutoTierSwitchFailureReason left, AutoTierSwitchFailureReason right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is AutopilotObjectiveChangedOperation other && Equals(other);
+    public override bool Equals(object? obj) => obj is AutoTierSwitchFailureReason other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(AutopilotObjectiveChangedOperation other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(AutoTierSwitchFailureReason other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -13819,66 +15398,64 @@ public AutopilotObjectiveChangedOperation(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{AutopilotObjectiveChangedOperation}"/> for serializing <see cref="AutopilotObjectiveChangedOperation"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{AutoTierSwitchFailureReason}"/> for serializing <see cref="AutoTierSwitchFailureReason"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<AutopilotObjectiveChangedOperation>
+    public sealed class Converter : JsonConverter<AutoTierSwitchFailureReason>
     {
         /// <inheritdoc />
-        public override AutopilotObjectiveChangedOperation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override AutoTierSwitchFailureReason Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, AutopilotObjectiveChangedOperation value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, AutoTierSwitchFailureReason value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(AutopilotObjectiveChangedOperation));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(AutoTierSwitchFailureReason));
         }
     }
 }
 
-/// <summary>Current autopilot objective status, if one exists.</summary>
+/// <summary>Permission mode for the session.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct AutopilotObjectiveChangedStatus : IEquatable<AutopilotObjectiveChangedStatus>
+public readonly struct PermissionMode : IEquatable<PermissionMode>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="AutopilotObjectiveChangedStatus"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="AutopilotObjectiveChangedStatus"/>.</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 AutopilotObjectiveChangedStatus(string value)
+    public PermissionMode(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="AutopilotObjectiveChangedStatus"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="PermissionMode"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Objective is active and can drive autopilot continuations.</summary>
-    public static AutopilotObjectiveChangedStatus Active { get; } = new("active");
-
-    /// <summary>Objective is paused and will not drive autopilot continuations.</summary>
-    public static AutopilotObjectiveChangedStatus Paused { get; } = new("paused");
+    /// <summary>Permission requests follow the normal approval flow.</summary>
+    public static PermissionMode Manual { get; } = new("manual");
 
-    /// <summary>Legacy objective state indicating the previous continuation cap was reached.</summary>
-    public static AutopilotObjectiveChangedStatus CapReached { get; } = new("cap_reached");
+    /// <summary>Permission requests include an LLM safety recommendation; clients may automatically approve requests judged acceptable.</summary>
+    public static PermissionMode Assisted { get; } = new("assisted");
 
-    /// <summary>Objective was completed by the agent.</summary>
-    public static AutopilotObjectiveChangedStatus Completed { get; } = new("completed");
+    /// <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="AutopilotObjectiveChangedStatus"/> instances are equivalent.</summary>
-    public static bool operator ==(AutopilotObjectiveChangedStatus left, AutopilotObjectiveChangedStatus 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="AutopilotObjectiveChangedStatus"/> instances are not equivalent.</summary>
-    public static bool operator !=(AutopilotObjectiveChangedStatus left, AutopilotObjectiveChangedStatus 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 AutopilotObjectiveChangedStatus other && Equals(other);
+    public override bool Equals(object? obj) => obj is PermissionMode other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(AutopilotObjectiveChangedStatus 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);
@@ -13886,69 +15463,63 @@ public AutopilotObjectiveChangedStatus(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{AutopilotObjectiveChangedStatus}"/> for serializing <see cref="AutopilotObjectiveChangedStatus"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{PermissionMode}"/> for serializing <see cref="PermissionMode"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<AutopilotObjectiveChangedStatus>
+    public sealed class Converter : JsonConverter<PermissionMode>
     {
         /// <inheritdoc />
-        public override AutopilotObjectiveChangedStatus 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, AutopilotObjectiveChangedStatus value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, PermissionMode value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(AutopilotObjectiveChangedStatus));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(PermissionMode));
         }
     }
 }
 
-/// <summary>Live indexed-search state for this session activation, never inferred from persisted history.</summary>
+/// <summary>The type of operation performed on the plan file.</summary>
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct IndexedSearchState : IEquatable<IndexedSearchState>
+public readonly struct PlanChangedOperation : IEquatable<PlanChangedOperation>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="IndexedSearchState"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="IndexedSearchState"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="PlanChangedOperation"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="PlanChangedOperation"/>.</param>
     [JsonConstructor]
-    public IndexedSearchState(string value)
+    public PlanChangedOperation(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="IndexedSearchState"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="PlanChangedOperation"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Indexed search is not active for this session.</summary>
-    public static IndexedSearchState Disabled { get; } = new("disabled");
-
-    /// <summary>Indexed-search startup is in progress.</summary>
-    public static IndexedSearchState Starting { get; } = new("starting");
-
-    /// <summary>The indexed-search server started successfully; its index may still be warming.</summary>
-    public static IndexedSearchState Enabled { get; } = new("enabled");
+    /// <summary>The plan file was created.</summary>
+    public static PlanChangedOperation Create { get; } = new("create");
 
-    /// <summary>The indexed-search server and its index are ready.</summary>
-    public static IndexedSearchState Ready { get; } = new("ready");
+    /// <summary>The plan file was updated.</summary>
+    public static PlanChangedOperation Update { get; } = new("update");
 
-    /// <summary>Indexed-search startup or the active server failed.</summary>
-    public static IndexedSearchState Failed { get; } = new("failed");
+    /// <summary>The plan file was deleted.</summary>
+    public static PlanChangedOperation Delete { get; } = new("delete");
 
-    /// <summary>Returns a value indicating whether two <see cref="IndexedSearchState"/> instances are equivalent.</summary>
-    public static bool operator ==(IndexedSearchState left, IndexedSearchState right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="PlanChangedOperation"/> instances are equivalent.</summary>
+    public static bool operator ==(PlanChangedOperation left, PlanChangedOperation right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="IndexedSearchState"/> instances are not equivalent.</summary>
-    public static bool operator !=(IndexedSearchState left, IndexedSearchState right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="PlanChangedOperation"/> instances are not equivalent.</summary>
+    public static bool operator !=(PlanChangedOperation left, PlanChangedOperation right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is IndexedSearchState other && Equals(other);
+    public override bool Equals(object? obj) => obj is PlanChangedOperation other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(IndexedSearchState other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(PlanChangedOperation other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -13956,81 +15527,60 @@ public IndexedSearchState(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{IndexedSearchState}"/> for serializing <see cref="IndexedSearchState"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{PlanChangedOperation}"/> for serializing <see cref="PlanChangedOperation"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<IndexedSearchState>
+    public sealed class Converter : JsonConverter<PlanChangedOperation>
     {
         /// <inheritdoc />
-        public override IndexedSearchState Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override PlanChangedOperation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, IndexedSearchState value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, PlanChangedOperation value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(IndexedSearchState));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(PlanChangedOperation));
         }
     }
 }
 
-/// <summary>Configuration, policy, or workspace condition that disabled indexed search.</summary>
+/// <summary>Whether the file was newly created or updated.</summary>
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct IndexedSearchDisabledReason : IEquatable<IndexedSearchDisabledReason>
+public readonly struct WorkspaceFileChangedOperation : IEquatable<WorkspaceFileChangedOperation>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="IndexedSearchDisabledReason"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="IndexedSearchDisabledReason"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="WorkspaceFileChangedOperation"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="WorkspaceFileChangedOperation"/>.</param>
     [JsonConstructor]
-    public IndexedSearchDisabledReason(string value)
+    public WorkspaceFileChangedOperation(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="IndexedSearchDisabledReason"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="WorkspaceFileChangedOperation"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Indexed search was explicitly disabled by the environment.</summary>
-    public static IndexedSearchDisabledReason UseTgrepFalse { get; } = new("use_tgrep_false");
-
-    /// <summary>Search uses the external ripgrep binary instead of bundled search.</summary>
-    public static IndexedSearchDisabledReason UseBuiltinRipgrepFalse { get; } = new("use_builtin_ripgrep_false");
-
-    /// <summary>Organization policy disables indexed search.</summary>
-    public static IndexedSearchDisabledReason Organization { get; } = new("organization");
-
-    /// <summary>Authentication has not resolved organization policy.</summary>
-    public static IndexedSearchDisabledReason OrganizationPolicyAuthPending { get; } = new("organization_policy_auth_pending");
-
-    /// <summary>Organization policy could not be determined.</summary>
-    public static IndexedSearchDisabledReason OrganizationPolicyUnknown { get; } = new("organization_policy_unknown");
-
-    /// <summary>The workspace uses a virtualized or network filesystem.</summary>
-    public static IndexedSearchDisabledReason VirtualFilesystem { get; } = new("virtual_filesystem");
-
-    /// <summary>The workspace is inside a Windows cloud-sync root.</summary>
-    public static IndexedSearchDisabledReason CloudSyncRoot { get; } = new("cloud_sync_root");
-
-    /// <summary>The Windows cloud-sync safety check failed.</summary>
-    public static IndexedSearchDisabledReason CloudSyncDetectionFailed { get; } = new("cloud_sync_detection_failed");
+    /// <summary>The workspace file was created.</summary>
+    public static WorkspaceFileChangedOperation Create { get; } = new("create");
 
-    /// <summary>The workspace is not available on the runtime's local filesystem.</summary>
-    public static IndexedSearchDisabledReason WorkspaceNotLocal { get; } = new("workspace_not_local");
+    /// <summary>The workspace file was updated.</summary>
+    public static WorkspaceFileChangedOperation Update { get; } = new("update");
 
-    /// <summary>Returns a value indicating whether two <see cref="IndexedSearchDisabledReason"/> instances are equivalent.</summary>
-    public static bool operator ==(IndexedSearchDisabledReason left, IndexedSearchDisabledReason right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="WorkspaceFileChangedOperation"/> instances are equivalent.</summary>
+    public static bool operator ==(WorkspaceFileChangedOperation left, WorkspaceFileChangedOperation right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="IndexedSearchDisabledReason"/> instances are not equivalent.</summary>
-    public static bool operator !=(IndexedSearchDisabledReason left, IndexedSearchDisabledReason right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="WorkspaceFileChangedOperation"/> instances are not equivalent.</summary>
+    public static bool operator !=(WorkspaceFileChangedOperation left, WorkspaceFileChangedOperation right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is IndexedSearchDisabledReason other && Equals(other);
+    public override bool Equals(object? obj) => obj is WorkspaceFileChangedOperation other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(IndexedSearchDisabledReason other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(WorkspaceFileChangedOperation other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -14038,72 +15588,60 @@ public IndexedSearchDisabledReason(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{IndexedSearchDisabledReason}"/> for serializing <see cref="IndexedSearchDisabledReason"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{WorkspaceFileChangedOperation}"/> for serializing <see cref="WorkspaceFileChangedOperation"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<IndexedSearchDisabledReason>
+    public sealed class Converter : JsonConverter<WorkspaceFileChangedOperation>
     {
         /// <inheritdoc />
-        public override IndexedSearchDisabledReason Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override WorkspaceFileChangedOperation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, IndexedSearchDisabledReason value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, WorkspaceFileChangedOperation value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(IndexedSearchDisabledReason));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(WorkspaceFileChangedOperation));
         }
     }
 }
 
-/// <summary>Result of an indexed-search startup attempt.</summary>
+/// <summary>Origin type of the session being handed off.</summary>
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct IndexedSearchOutcome : IEquatable<IndexedSearchOutcome>
+public readonly struct HandoffSourceType : IEquatable<HandoffSourceType>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="IndexedSearchOutcome"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="IndexedSearchOutcome"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="HandoffSourceType"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="HandoffSourceType"/>.</param>
     [JsonConstructor]
-    public IndexedSearchOutcome(string value)
+    public HandoffSourceType(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="IndexedSearchOutcome"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="HandoffSourceType"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>A new indexed-search server was started.</summary>
-    public static IndexedSearchOutcome Started { get; } = new("started");
-
-    /// <summary>The repository has too few files for automatic indexing.</summary>
-    public static IndexedSearchOutcome SkippedBelowThreshold { get; } = new("skipped_below_threshold");
-
-    /// <summary>No Git repository was found and indexing was not forced.</summary>
-    public static IndexedSearchOutcome SkippedNoGitroot { get; } = new("skipped_no_gitroot");
-
-    /// <summary>Configuration, policy, or workspace safety disabled indexing.</summary>
-    public static IndexedSearchOutcome SkippedDisabled { get; } = new("skipped_disabled");
-
-    /// <summary>An existing indexed-search server was reused.</summary>
-    public static IndexedSearchOutcome ReusedExisting { get; } = new("reused_existing");
+    /// <summary>The handoff originated from a remote session.</summary>
+    public static HandoffSourceType Remote { get; } = new("remote");
 
-    /// <summary>The startup attempt failed.</summary>
-    public static IndexedSearchOutcome Failed { get; } = new("failed");
+    /// <summary>The handoff originated from a local session.</summary>
+    public static HandoffSourceType Local { get; } = new("local");
 
-    /// <summary>Returns a value indicating whether two <see cref="IndexedSearchOutcome"/> instances are equivalent.</summary>
-    public static bool operator ==(IndexedSearchOutcome left, IndexedSearchOutcome right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="HandoffSourceType"/> instances are equivalent.</summary>
+    public static bool operator ==(HandoffSourceType left, HandoffSourceType right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="IndexedSearchOutcome"/> instances are not equivalent.</summary>
-    public static bool operator !=(IndexedSearchOutcome left, IndexedSearchOutcome right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="HandoffSourceType"/> instances are not equivalent.</summary>
+    public static bool operator !=(HandoffSourceType left, HandoffSourceType right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is IndexedSearchOutcome other && Equals(other);
+    public override bool Equals(object? obj) => obj is HandoffSourceType other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(IndexedSearchOutcome other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(HandoffSourceType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -14111,63 +15649,63 @@ public IndexedSearchOutcome(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{IndexedSearchOutcome}"/> for serializing <see cref="IndexedSearchOutcome"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{HandoffSourceType}"/> for serializing <see cref="HandoffSourceType"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<IndexedSearchOutcome>
+    public sealed class Converter : JsonConverter<HandoffSourceType>
     {
         /// <inheritdoc />
-        public override IndexedSearchOutcome Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override HandoffSourceType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, IndexedSearchOutcome value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, HandoffSourceType value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(IndexedSearchOutcome));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(HandoffSourceType));
         }
     }
 }
 
-/// <summary>Category of an indexed-search server failure.</summary>
+/// <summary>Whether the accumulated numeric AI-credit subtotal covers the observed calls.</summary>
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct IndexedSearchErrorType : IEquatable<IndexedSearchErrorType>
+public readonly struct AiCreditsStatus : IEquatable<AiCreditsStatus>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="IndexedSearchErrorType"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="IndexedSearchErrorType"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="AiCreditsStatus"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="AiCreditsStatus"/>.</param>
     [JsonConstructor]
-    public IndexedSearchErrorType(string value)
+    public AiCreditsStatus(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="IndexedSearchErrorType"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="AiCreditsStatus"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>The indexed-search server could not be spawned.</summary>
-    public static IndexedSearchErrorType SpawnError { get; } = new("spawn_error");
+    /// <summary>Every observed call supplied an AI-credit amount, including an explicit zero.</summary>
+    public static AiCreditsStatus Complete { get; } = new("complete");
 
-    /// <summary>The indexed-search server exited unexpectedly.</summary>
-    public static IndexedSearchErrorType UnexpectedExit { get; } = new("unexpected_exit");
+    /// <summary>Some calls supplied amounts and some did not; the numeric value is only a reported subtotal.</summary>
+    public static AiCreditsStatus Partial { get; } = new("partial");
 
-    /// <summary>The indexed-search server was terminated by a signal.</summary>
-    public static IndexedSearchErrorType KilledBySignal { get; } = new("killed_by_signal");
+    /// <summary>No AI-credit amount was reported for the observed calls. Numeric zero is not a zero-cost claim.</summary>
+    public static AiCreditsStatus Unavailable { get; } = new("unavailable");
 
-    /// <summary>Returns a value indicating whether two <see cref="IndexedSearchErrorType"/> instances are equivalent.</summary>
-    public static bool operator ==(IndexedSearchErrorType left, IndexedSearchErrorType right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="AiCreditsStatus"/> instances are equivalent.</summary>
+    public static bool operator ==(AiCreditsStatus left, AiCreditsStatus right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="IndexedSearchErrorType"/> instances are not equivalent.</summary>
-    public static bool operator !=(IndexedSearchErrorType left, IndexedSearchErrorType right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="AiCreditsStatus"/> instances are not equivalent.</summary>
+    public static bool operator !=(AiCreditsStatus left, AiCreditsStatus right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is IndexedSearchErrorType other && Equals(other);
+    public override bool Equals(object? obj) => obj is AiCreditsStatus other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(IndexedSearchErrorType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(AiCreditsStatus other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -14175,60 +15713,61 @@ public IndexedSearchErrorType(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{IndexedSearchErrorType}"/> for serializing <see cref="IndexedSearchErrorType"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{AiCreditsStatus}"/> for serializing <see cref="AiCreditsStatus"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<IndexedSearchErrorType>
+    public sealed class Converter : JsonConverter<AiCreditsStatus>
     {
         /// <inheritdoc />
-        public override IndexedSearchErrorType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override AiCreditsStatus Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, IndexedSearchErrorType value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, AiCreditsStatus value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(IndexedSearchErrorType));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(AiCreditsStatus));
         }
     }
 }
 
-/// <summary>Phase of an incremental indexed-search update.</summary>
+/// <summary>The neutral kind of a model provider — the model analog of `AccountKind`. A model provider is the live, entitled source a model came from; central code never branches on this beyond a single dispatch.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct IndexedSearchIncrementalPhase : IEquatable<IndexedSearchIncrementalPhase>
+public readonly struct ModelProviderKind : IEquatable<ModelProviderKind>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="IndexedSearchIncrementalPhase"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="IndexedSearchIncrementalPhase"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="ModelProviderKind"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="ModelProviderKind"/>.</param>
     [JsonConstructor]
-    public IndexedSearchIncrementalPhase(string value)
+    public ModelProviderKind(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="IndexedSearchIncrementalPhase"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="ModelProviderKind"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>A workspace scan found changes to index.</summary>
-    public static IndexedSearchIncrementalPhase ChangesDetected { get; } = new("changes_detected");
+    /// <summary>GitHub Copilot / CAPI models, spawned by a github-resolving account that holds a Copilot seat.</summary>
+    public static ModelProviderKind Copilot { get; } = new("copilot");
 
-    /// <summary>The incremental index update completed.</summary>
-    public static IndexedSearchIncrementalPhase Updated { get; } = new("updated");
+    /// <summary>Microsoft 365 Copilot (Loki) inference models, spawned by a resolvable Entra-derived Loki account.</summary>
+    public static ModelProviderKind Loki { get; } = new("loki");
 
-    /// <summary>Returns a value indicating whether two <see cref="IndexedSearchIncrementalPhase"/> instances are equivalent.</summary>
-    public static bool operator ==(IndexedSearchIncrementalPhase left, IndexedSearchIncrementalPhase right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="ModelProviderKind"/> instances are equivalent.</summary>
+    public static bool operator ==(ModelProviderKind left, ModelProviderKind right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="IndexedSearchIncrementalPhase"/> instances are not equivalent.</summary>
-    public static bool operator !=(IndexedSearchIncrementalPhase left, IndexedSearchIncrementalPhase right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="ModelProviderKind"/> instances are not equivalent.</summary>
+    public static bool operator !=(ModelProviderKind left, ModelProviderKind right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is IndexedSearchIncrementalPhase other && Equals(other);
+    public override bool Equals(object? obj) => obj is ModelProviderKind other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(IndexedSearchIncrementalPhase other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(ModelProviderKind other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -14236,93 +15775,60 @@ public IndexedSearchIncrementalPhase(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{IndexedSearchIncrementalPhase}"/> for serializing <see cref="IndexedSearchIncrementalPhase"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{ModelProviderKind}"/> for serializing <see cref="ModelProviderKind"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<IndexedSearchIncrementalPhase>
+    public sealed class Converter : JsonConverter<ModelProviderKind>
     {
         /// <inheritdoc />
-        public override IndexedSearchIncrementalPhase Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override ModelProviderKind Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, IndexedSearchIncrementalPhase value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, ModelProviderKind value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(IndexedSearchIncrementalPhase));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ModelProviderKind));
         }
     }
 }
 
-/// <summary>Origin of an effective session model change.</summary>
+/// <summary>Whether the session ended normally ("routine") or due to a crash/fatal error ("error").</summary>
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct ModelChangeSource : IEquatable<ModelChangeSource>
+public readonly struct ShutdownType : IEquatable<ShutdownType>
 {
     private readonly string? _value;
 
-    /// <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>
+    /// <summary>Initializes a new instance of the <see cref="ShutdownType"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="ShutdownType"/>.</param>
     [JsonConstructor]
-    public ModelChangeSource(string value)
+    public ShutdownType(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="ModelChangeSource"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="ShutdownType"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>The user selected a model directly with `/model &lt;id&gt;`.</summary>
-    public static ModelChangeSource ModelCommand { get; } = new("model_command");
-
-    /// <summary>The user selected the model with `/settings`.</summary>
-    public static ModelChangeSource SettingsCommand { get; } = new("settings_command");
-
-    /// <summary>The user selected the model with the `/config` alias.</summary>
-    public static ModelChangeSource ConfigCommand { get; } = new("config_command");
-
-    /// <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>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>The user selected the promoted model from the changeboarding card or its keyboard shortcut.</summary>
-    public static ModelChangeSource ChangeboardingShortcut { get; } = new("changeboarding_shortcut");
-
-    /// <summary>An SDK or RPC caller selected the model.</summary>
-    public static ModelChangeSource Sdk { get; } = new("sdk");
+    /// <summary>The session ended normally.</summary>
+    public static ShutdownType Routine { get; } = new("routine");
 
-    /// <summary>The user accepted a CAPI-issued Auto tier recommendation.</summary>
-    public static ModelChangeSource AutoTierRecommendation { get; } = new("auto_tier_recommendation");
+    /// <summary>The session ended because of a crash or fatal error.</summary>
+    public static ShutdownType Error { get; } = new("error");
 
-    /// <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="ShutdownType"/> instances are equivalent.</summary>
+    public static bool operator ==(ShutdownType left, ShutdownType 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);
+    /// <summary>Returns a value indicating whether two <see cref="ShutdownType"/> instances are not equivalent.</summary>
+    public static bool operator !=(ShutdownType left, ShutdownType right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is ModelChangeSource other && Equals(other);
+    public override bool Equals(object? obj) => obj is ShutdownType other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(ModelChangeSource other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(ShutdownType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -14330,57 +15836,69 @@ public ModelChangeSource(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{ModelChangeSource}"/> for serializing <see cref="ModelChangeSource"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{ShutdownType}"/> for serializing <see cref="ShutdownType"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<ModelChangeSource>
+    public sealed class Converter : JsonConverter<ShutdownType>
     {
         /// <inheritdoc />
-        public override ModelChangeSource Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override ShutdownType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, ModelChangeSource value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, ShutdownType value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ModelChangeSource));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ShutdownType));
         }
     }
 }
 
-/// <summary>Why the session no longer has an explicitly selected model.</summary>
+/// <summary>Access policy reported by the quota service.</summary>
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct ModelDeselectedReason : IEquatable<ModelDeselectedReason>
+public readonly struct ProviderQuotaAccessState : IEquatable<ProviderQuotaAccessState>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="ModelDeselectedReason"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="ModelDeselectedReason"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="ProviderQuotaAccessState"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="ProviderQuotaAccessState"/>.</param>
     [JsonConstructor]
-    public ModelDeselectedReason(string value)
+    public ProviderQuotaAccessState(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="ModelDeselectedReason"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="ProviderQuotaAccessState"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>A host-managed provider snapshot no longer publishes the selected model.</summary>
-    public static ModelDeselectedReason ProviderWithdrawn { get; } = new("provider_withdrawn");
+    /// <summary>Access is allowed.</summary>
+    public static ProviderQuotaAccessState Allowed { get; } = new("allowed");
 
-    /// <summary>Returns a value indicating whether two <see cref="ModelDeselectedReason"/> instances are equivalent.</summary>
-    public static bool operator ==(ModelDeselectedReason left, ModelDeselectedReason right) => left.Equals(right);
+    /// <summary>Access is denied.</summary>
+    public static ProviderQuotaAccessState Denied { get; } = new("denied");
 
-    /// <summary>Returns a value indicating whether two <see cref="ModelDeselectedReason"/> instances are not equivalent.</summary>
-    public static bool operator !=(ModelDeselectedReason left, ModelDeselectedReason right) => !(left == right);
+    /// <summary>Quota is not required for this access.</summary>
+    public static ProviderQuotaAccessState NotRequired { get; } = new("not_required");
+
+    /// <summary>The service did not supply a recognized access state.</summary>
+    public static ProviderQuotaAccessState Unknown { get; } = new("unknown");
+
+    /// <summary>Client-only compatibility placeholder when acquisitionStatus is unavailable or failed; not an observed service verdict.</summary>
+    public static ProviderQuotaAccessState Unavailable { get; } = new("unavailable");
+
+    /// <summary>Returns a value indicating whether two <see cref="ProviderQuotaAccessState"/> instances are equivalent.</summary>
+    public static bool operator ==(ProviderQuotaAccessState left, ProviderQuotaAccessState right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="ProviderQuotaAccessState"/> instances are not equivalent.</summary>
+    public static bool operator !=(ProviderQuotaAccessState left, ProviderQuotaAccessState right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is ModelDeselectedReason other && Equals(other);
+    public override bool Equals(object? obj) => obj is ProviderQuotaAccessState other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(ModelDeselectedReason other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(ProviderQuotaAccessState other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -14388,63 +15906,63 @@ public ModelDeselectedReason(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{ModelDeselectedReason}"/> for serializing <see cref="ModelDeselectedReason"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{ProviderQuotaAccessState}"/> for serializing <see cref="ProviderQuotaAccessState"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<ModelDeselectedReason>
+    public sealed class Converter : JsonConverter<ProviderQuotaAccessState>
     {
         /// <inheritdoc />
-        public override ModelDeselectedReason Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override ProviderQuotaAccessState Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, ModelDeselectedReason value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, ProviderQuotaAccessState value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ModelDeselectedReason));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ProviderQuotaAccessState));
         }
     }
 }
 
-/// <summary>Auto preferences that Copilot API can recommend.</summary>
+/// <summary>Acquisition state, independent of the service's business access/capacity verdict.</summary>
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct RecommendedAutoTier : IEquatable<RecommendedAutoTier>
+public readonly struct ProviderQuotaAcquisitionStatus : IEquatable<ProviderQuotaAcquisitionStatus>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="RecommendedAutoTier"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="RecommendedAutoTier"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="ProviderQuotaAcquisitionStatus"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="ProviderQuotaAcquisitionStatus"/>.</param>
     [JsonConstructor]
-    public RecommendedAutoTier(string value)
+    public ProviderQuotaAcquisitionStatus(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="RecommendedAutoTier"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="ProviderQuotaAcquisitionStatus"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Optimize for efficiency.</summary>
-    public static RecommendedAutoTier Efficiency { get; } = new("efficiency");
+    /// <summary>A service quota observation was received.</summary>
+    public static ProviderQuotaAcquisitionStatus Succeeded { get; } = new("succeeded");
 
-    /// <summary>Balance efficiency and intelligence.</summary>
-    public static RecommendedAutoTier Balance { get; } = new("balance");
+    /// <summary>No service snapshot is available for this caller or surface.</summary>
+    public static ProviderQuotaAcquisitionStatus Unavailable { get; } = new("unavailable");
 
-    /// <summary>Optimize for intelligence.</summary>
-    public static RecommendedAutoTier Intelligence { get; } = new("intelligence");
+    /// <summary>Acquisition failed; inspect httpStatus/acquisitionError without inferring a business verdict.</summary>
+    public static ProviderQuotaAcquisitionStatus Failed { get; } = new("failed");
 
-    /// <summary>Returns a value indicating whether two <see cref="RecommendedAutoTier"/> instances are equivalent.</summary>
-    public static bool operator ==(RecommendedAutoTier left, RecommendedAutoTier right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="ProviderQuotaAcquisitionStatus"/> instances are equivalent.</summary>
+    public static bool operator ==(ProviderQuotaAcquisitionStatus left, ProviderQuotaAcquisitionStatus right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="RecommendedAutoTier"/> instances are not equivalent.</summary>
-    public static bool operator !=(RecommendedAutoTier left, RecommendedAutoTier right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="ProviderQuotaAcquisitionStatus"/> instances are not equivalent.</summary>
+    public static bool operator !=(ProviderQuotaAcquisitionStatus left, ProviderQuotaAcquisitionStatus right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is RecommendedAutoTier other && Equals(other);
+    public override bool Equals(object? obj) => obj is ProviderQuotaAcquisitionStatus other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(RecommendedAutoTier other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(ProviderQuotaAcquisitionStatus other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -14452,66 +15970,75 @@ public RecommendedAutoTier(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{RecommendedAutoTier}"/> for serializing <see cref="RecommendedAutoTier"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{ProviderQuotaAcquisitionStatus}"/> for serializing <see cref="ProviderQuotaAcquisitionStatus"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<RecommendedAutoTier>
+    public sealed class Converter : JsonConverter<ProviderQuotaAcquisitionStatus>
     {
         /// <inheritdoc />
-        public override RecommendedAutoTier Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override ProviderQuotaAcquisitionStatus Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, RecommendedAutoTier value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, ProviderQuotaAcquisitionStatus value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(RecommendedAutoTier));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ProviderQuotaAcquisitionStatus));
         }
     }
 }
 
-/// <summary>Terminal reason an Auto preference activation failed.</summary>
+/// <summary>Capacity is independent of whether a numeric balance was supplied.</summary>
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct AutoTierSwitchFailureReason : IEquatable<AutoTierSwitchFailureReason>
+public readonly struct ProviderQuotaCapacityState : IEquatable<ProviderQuotaCapacityState>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="AutoTierSwitchFailureReason"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="AutoTierSwitchFailureReason"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="ProviderQuotaCapacityState"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="ProviderQuotaCapacityState"/>.</param>
     [JsonConstructor]
-    public AutoTierSwitchFailureReason(string value)
+    public ProviderQuotaCapacityState(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="AutoTierSwitchFailureReason"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="ProviderQuotaCapacityState"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>The candidate model was rejected by model policy.</summary>
-    public static AutoTierSwitchFailureReason PolicyRejected { get; } = new("policy_rejected");
+    /// <summary>Capacity is available.</summary>
+    public static ProviderQuotaCapacityState Available { get; } = new("available");
 
-    /// <summary>The Auto routing request failed or returned an unusable response.</summary>
-    public static AutoTierSwitchFailureReason RequestFailed { get; } = new("request_failed");
+    /// <summary>The service explicitly reports exhaustion.</summary>
+    public static ProviderQuotaCapacityState Exhausted { get; } = new("exhausted");
 
-    /// <summary>The runtime could not prepare the Auto routing request.</summary>
-    public static AutoTierSwitchFailureReason SetupFailed { get; } = new("setup_failed");
+    /// <summary>The reported entitlement is unlimited.</summary>
+    public static ProviderQuotaCapacityState Unlimited { get; } = new("unlimited");
 
-    /// <summary>The provider does not support Auto routing.</summary>
-    public static AutoTierSwitchFailureReason Unsupported { get; } = new("unsupported");
+    /// <summary>No billable quota is required.</summary>
+    public static ProviderQuotaCapacityState NotRequired { get; } = new("not_required");
 
-    /// <summary>Returns a value indicating whether two <see cref="AutoTierSwitchFailureReason"/> instances are equivalent.</summary>
-    public static bool operator ==(AutoTierSwitchFailureReason left, AutoTierSwitchFailureReason right) => left.Equals(right);
+    /// <summary>The service reports that capacity is not applicable.</summary>
+    public static ProviderQuotaCapacityState NotApplicable { get; } = new("not_applicable");
 
-    /// <summary>Returns a value indicating whether two <see cref="AutoTierSwitchFailureReason"/> instances are not equivalent.</summary>
-    public static bool operator !=(AutoTierSwitchFailureReason left, AutoTierSwitchFailureReason right) => !(left == right);
+    /// <summary>No recognized capacity state was supplied.</summary>
+    public static ProviderQuotaCapacityState Unknown { get; } = new("unknown");
+
+    /// <summary>Client-only compatibility placeholder when acquisitionStatus is unavailable or failed; not an observed service verdict.</summary>
+    public static ProviderQuotaCapacityState Unavailable { get; } = new("unavailable");
+
+    /// <summary>Returns a value indicating whether two <see cref="ProviderQuotaCapacityState"/> instances are equivalent.</summary>
+    public static bool operator ==(ProviderQuotaCapacityState left, ProviderQuotaCapacityState right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="ProviderQuotaCapacityState"/> instances are not equivalent.</summary>
+    public static bool operator !=(ProviderQuotaCapacityState left, ProviderQuotaCapacityState right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is AutoTierSwitchFailureReason other && Equals(other);
+    public override bool Equals(object? obj) => obj is ProviderQuotaCapacityState other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(AutoTierSwitchFailureReason other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(ProviderQuotaCapacityState other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -14519,64 +16046,60 @@ public AutoTierSwitchFailureReason(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{AutoTierSwitchFailureReason}"/> for serializing <see cref="AutoTierSwitchFailureReason"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{ProviderQuotaCapacityState}"/> for serializing <see cref="ProviderQuotaCapacityState"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<AutoTierSwitchFailureReason>
+    public sealed class Converter : JsonConverter<ProviderQuotaCapacityState>
     {
         /// <inheritdoc />
-        public override AutoTierSwitchFailureReason Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override ProviderQuotaCapacityState Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, AutoTierSwitchFailureReason value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, ProviderQuotaCapacityState value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(AutoTierSwitchFailureReason));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ProviderQuotaCapacityState));
         }
     }
 }
 
-/// <summary>Permission mode for the session.</summary>
-[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+/// <summary>Identity scope of a monthly usage reading.</summary>
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct PermissionMode : IEquatable<PermissionMode>
+public readonly struct ProviderMonthlyUsageScope : IEquatable<ProviderMonthlyUsageScope>
 {
     private readonly string? _value;
 
-    /// <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>
+    /// <summary>Initializes a new instance of the <see cref="ProviderMonthlyUsageScope"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="ProviderMonthlyUsageScope"/>.</param>
     [JsonConstructor]
-    public PermissionMode(string value)
+    public ProviderMonthlyUsageScope(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="PermissionMode"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="ProviderMonthlyUsageScope"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>Permission requests follow the normal approval flow.</summary>
-    public static PermissionMode Manual { get; } = new("manual");
-
-    /// <summary>Permission requests include an LLM safety recommendation; clients may automatically approve requests judged acceptable.</summary>
-    public static PermissionMode Assisted { get; } = new("assisted");
+    /// <summary>Consumption of the authenticated user within the parent observation's service and returned cycle.</summary>
+    public static ProviderMonthlyUsageScope User { get; } = new("user");
 
-    /// <summary>Tool, path, and URL permission requests are automatically approved.</summary>
-    public static PermissionMode AllowAll { get; } = new("allow-all");
+    /// <summary>The service did not establish a recognized usage scope.</summary>
+    public static ProviderMonthlyUsageScope Unknown { get; } = new("unknown");
 
-    /// <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="ProviderMonthlyUsageScope"/> instances are equivalent.</summary>
+    public static bool operator ==(ProviderMonthlyUsageScope left, ProviderMonthlyUsageScope right) => left.Equals(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);
+    /// <summary>Returns a value indicating whether two <see cref="ProviderMonthlyUsageScope"/> instances are not equivalent.</summary>
+    public static bool operator !=(ProviderMonthlyUsageScope left, ProviderMonthlyUsageScope right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is PermissionMode other && Equals(other);
+    public override bool Equals(object? obj) => obj is ProviderMonthlyUsageScope other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(PermissionMode other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(ProviderMonthlyUsageScope other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -14584,63 +16107,66 @@ public PermissionMode(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{PermissionMode}"/> for serializing <see cref="PermissionMode"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{ProviderMonthlyUsageScope}"/> for serializing <see cref="ProviderMonthlyUsageScope"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<PermissionMode>
+    public sealed class Converter : JsonConverter<ProviderMonthlyUsageScope>
     {
         /// <inheritdoc />
-        public override PermissionMode Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override ProviderMonthlyUsageScope Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, PermissionMode value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, ProviderMonthlyUsageScope value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(PermissionMode));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ProviderMonthlyUsageScope));
         }
     }
 }
 
-/// <summary>The type of operation performed on the plan file.</summary>
+/// <summary>Availability of a service's monthly consumption reading.</summary>
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct PlanChangedOperation : IEquatable<PlanChangedOperation>
+public readonly struct ProviderMonthlyUsageState : IEquatable<ProviderMonthlyUsageState>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="PlanChangedOperation"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="PlanChangedOperation"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="ProviderMonthlyUsageState"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="ProviderMonthlyUsageState"/>.</param>
     [JsonConstructor]
-    public PlanChangedOperation(string value)
+    public ProviderMonthlyUsageState(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="PlanChangedOperation"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="ProviderMonthlyUsageState"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>The plan file was created.</summary>
-    public static PlanChangedOperation Create { get; } = new("create");
+    /// <summary>The service reported a usable consumption reading, including an explicit zero.</summary>
+    public static ProviderMonthlyUsageState Available { get; } = new("available");
 
-    /// <summary>The plan file was updated.</summary>
-    public static PlanChangedOperation Update { get; } = new("update");
+    /// <summary>The service found no usage policy; no consumption amount is known.</summary>
+    public static ProviderMonthlyUsageState NoPolicy { get; } = new("no_policy");
 
-    /// <summary>The plan file was deleted.</summary>
-    public static PlanChangedOperation Delete { get; } = new("delete");
+    /// <summary>The read failed or its data could not be used; consumption is unknown.</summary>
+    public static ProviderMonthlyUsageState Unavailable { get; } = new("unavailable");
 
-    /// <summary>Returns a value indicating whether two <see cref="PlanChangedOperation"/> instances are equivalent.</summary>
-    public static bool operator ==(PlanChangedOperation left, PlanChangedOperation right) => left.Equals(right);
+    /// <summary>The service reported an unrecognized usage state.</summary>
+    public static ProviderMonthlyUsageState Unknown { get; } = new("unknown");
 
-    /// <summary>Returns a value indicating whether two <see cref="PlanChangedOperation"/> instances are not equivalent.</summary>
-    public static bool operator !=(PlanChangedOperation left, PlanChangedOperation right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="ProviderMonthlyUsageState"/> instances are equivalent.</summary>
+    public static bool operator ==(ProviderMonthlyUsageState left, ProviderMonthlyUsageState right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="ProviderMonthlyUsageState"/> instances are not equivalent.</summary>
+    public static bool operator !=(ProviderMonthlyUsageState left, ProviderMonthlyUsageState right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is PlanChangedOperation other && Equals(other);
+    public override bool Equals(object? obj) => obj is ProviderMonthlyUsageState other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(PlanChangedOperation other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(ProviderMonthlyUsageState other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -14648,60 +16174,66 @@ public PlanChangedOperation(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{PlanChangedOperation}"/> for serializing <see cref="PlanChangedOperation"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{ProviderMonthlyUsageState}"/> for serializing <see cref="ProviderMonthlyUsageState"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<PlanChangedOperation>
+    public sealed class Converter : JsonConverter<ProviderMonthlyUsageState>
     {
         /// <inheritdoc />
-        public override PlanChangedOperation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override ProviderMonthlyUsageState Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, PlanChangedOperation value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, ProviderMonthlyUsageState value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(PlanChangedOperation));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ProviderMonthlyUsageState));
         }
     }
 }
 
-/// <summary>Whether the file was newly created or updated.</summary>
+/// <summary>Units explicitly reported by a quota provider.</summary>
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct WorkspaceFileChangedOperation : IEquatable<WorkspaceFileChangedOperation>
+public readonly struct ProviderQuotaUnit : IEquatable<ProviderQuotaUnit>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="WorkspaceFileChangedOperation"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="WorkspaceFileChangedOperation"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="ProviderQuotaUnit"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="ProviderQuotaUnit"/>.</param>
     [JsonConstructor]
-    public WorkspaceFileChangedOperation(string value)
+    public ProviderQuotaUnit(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="WorkspaceFileChangedOperation"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="ProviderQuotaUnit"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>The workspace file was created.</summary>
-    public static WorkspaceFileChangedOperation Create { get; } = new("create");
+    /// <summary>AI credits, not tokens or currency.</summary>
+    public static ProviderQuotaUnit AiCredits { get; } = new("ai_credits");
 
-    /// <summary>The workspace file was updated.</summary>
-    public static WorkspaceFileChangedOperation Update { get; } = new("update");
+    /// <summary>Requests charged against an entitlement.</summary>
+    public static ProviderQuotaUnit Requests { get; } = new("requests");
 
-    /// <summary>Returns a value indicating whether two <see cref="WorkspaceFileChangedOperation"/> instances are equivalent.</summary>
-    public static bool operator ==(WorkspaceFileChangedOperation left, WorkspaceFileChangedOperation right) => left.Equals(right);
+    /// <summary>Model tokens.</summary>
+    public static ProviderQuotaUnit Tokens { get; } = new("tokens");
 
-    /// <summary>Returns a value indicating whether two <see cref="WorkspaceFileChangedOperation"/> instances are not equivalent.</summary>
-    public static bool operator !=(WorkspaceFileChangedOperation left, WorkspaceFileChangedOperation right) => !(left == right);
+    /// <summary>The observation does not establish a quantity unit.</summary>
+    public static ProviderQuotaUnit Unknown { get; } = new("unknown");
+
+    /// <summary>Returns a value indicating whether two <see cref="ProviderQuotaUnit"/> instances are equivalent.</summary>
+    public static bool operator ==(ProviderQuotaUnit left, ProviderQuotaUnit right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="ProviderQuotaUnit"/> instances are not equivalent.</summary>
+    public static bool operator !=(ProviderQuotaUnit left, ProviderQuotaUnit right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is WorkspaceFileChangedOperation other && Equals(other);
+    public override bool Equals(object? obj) => obj is ProviderQuotaUnit other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(WorkspaceFileChangedOperation other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(ProviderQuotaUnit other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -14709,60 +16241,60 @@ public WorkspaceFileChangedOperation(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{WorkspaceFileChangedOperation}"/> for serializing <see cref="WorkspaceFileChangedOperation"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{ProviderQuotaUnit}"/> for serializing <see cref="ProviderQuotaUnit"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<WorkspaceFileChangedOperation>
+    public sealed class Converter : JsonConverter<ProviderQuotaUnit>
     {
         /// <inheritdoc />
-        public override WorkspaceFileChangedOperation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override ProviderQuotaUnit Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, WorkspaceFileChangedOperation value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, ProviderQuotaUnit value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(WorkspaceFileChangedOperation));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ProviderQuotaUnit));
         }
     }
 }
 
-/// <summary>Origin type of the session being handed off.</summary>
+/// <summary>Timing and purpose of a provider quota observation.</summary>
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct HandoffSourceType : IEquatable<HandoffSourceType>
+public readonly struct ProviderQuotaObservationKind : IEquatable<ProviderQuotaObservationKind>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="HandoffSourceType"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="HandoffSourceType"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="ProviderQuotaObservationKind"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="ProviderQuotaObservationKind"/>.</param>
     [JsonConstructor]
-    public HandoffSourceType(string value)
+    public ProviderQuotaObservationKind(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="HandoffSourceType"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="ProviderQuotaObservationKind"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>The handoff originated from a remote session.</summary>
-    public static HandoffSourceType Remote { get; } = new("remote");
+    /// <summary>An explicit account read; consumption may still be subject to service aggregation delay.</summary>
+    public static ProviderQuotaObservationKind AccountSnapshot { get; } = new("account_snapshot");
 
-    /// <summary>The handoff originated from a local session.</summary>
-    public static HandoffSourceType Local { get; } = new("local");
+    /// <summary>A verdict attached before an inference response. May be cached; never a post-charge balance.</summary>
+    public static ProviderQuotaObservationKind AdmissionState { get; } = new("admission_state");
 
-    /// <summary>Returns a value indicating whether two <see cref="HandoffSourceType"/> instances are equivalent.</summary>
-    public static bool operator ==(HandoffSourceType left, HandoffSourceType right) => left.Equals(right);
+    /// <summary>Returns a value indicating whether two <see cref="ProviderQuotaObservationKind"/> instances are equivalent.</summary>
+    public static bool operator ==(ProviderQuotaObservationKind left, ProviderQuotaObservationKind right) => left.Equals(right);
 
-    /// <summary>Returns a value indicating whether two <see cref="HandoffSourceType"/> instances are not equivalent.</summary>
-    public static bool operator !=(HandoffSourceType left, HandoffSourceType right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="ProviderQuotaObservationKind"/> instances are not equivalent.</summary>
+    public static bool operator !=(ProviderQuotaObservationKind left, ProviderQuotaObservationKind right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is HandoffSourceType other && Equals(other);
+    public override bool Equals(object? obj) => obj is ProviderQuotaObservationKind other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(HandoffSourceType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(ProviderQuotaObservationKind other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -14770,60 +16302,63 @@ public HandoffSourceType(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{HandoffSourceType}"/> for serializing <see cref="HandoffSourceType"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{ProviderQuotaObservationKind}"/> for serializing <see cref="ProviderQuotaObservationKind"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<HandoffSourceType>
+    public sealed class Converter : JsonConverter<ProviderQuotaObservationKind>
     {
         /// <inheritdoc />
-        public override HandoffSourceType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override ProviderQuotaObservationKind Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, HandoffSourceType value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, ProviderQuotaObservationKind value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(HandoffSourceType));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ProviderQuotaObservationKind));
         }
     }
 }
 
-/// <summary>Whether the session ended normally ("routine") or due to a crash/fatal error ("error").</summary>
+/// <summary>Interpretation permitted for independently reported quantities.</summary>
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
-public readonly struct ShutdownType : IEquatable<ShutdownType>
+public readonly struct ProviderQuotaQuantityKind : IEquatable<ProviderQuotaQuantityKind>
 {
     private readonly string? _value;
 
-    /// <summary>Initializes a new instance of the <see cref="ShutdownType"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="ShutdownType"/>.</param>
+    /// <summary>Initializes a new instance of the <see cref="ProviderQuotaQuantityKind"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="ProviderQuotaQuantityKind"/>.</param>
     [JsonConstructor]
-    public ShutdownType(string value)
+    public ProviderQuotaQuantityKind(string value)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(value);
         _value = value;
     }
 
-    /// <summary>Gets the value associated with this <see cref="ShutdownType"/>.</summary>
+    /// <summary>Gets the value associated with this <see cref="ProviderQuotaQuantityKind"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>The session ended normally.</summary>
-    public static ShutdownType Routine { get; } = new("routine");
+    /// <summary>Quantities form an authoritative available-of-entitled budget suitable for percentage presentation.</summary>
+    public static ProviderQuotaQuantityKind AuthoritativeBudget { get; } = new("authoritative_budget");
 
-    /// <summary>The session ended because of a crash or fatal error.</summary>
-    public static ShutdownType Error { get; } = new("error");
+    /// <summary>Raw advisory quantities; do not infer permission, usage percentage, reset cadence, or post-charge balance.</summary>
+    public static ProviderQuotaQuantityKind AdvisoryBalance { get; } = new("advisory_balance");
 
-    /// <summary>Returns a value indicating whether two <see cref="ShutdownType"/> instances are equivalent.</summary>
-    public static bool operator ==(ShutdownType left, ShutdownType right) => left.Equals(right);
+    /// <summary>No quantity measurement, as with admission-only response headers.</summary>
+    public static ProviderQuotaQuantityKind None { get; } = new("none");
 
-    /// <summary>Returns a value indicating whether two <see cref="ShutdownType"/> instances are not equivalent.</summary>
-    public static bool operator !=(ShutdownType left, ShutdownType right) => !(left == right);
+    /// <summary>Returns a value indicating whether two <see cref="ProviderQuotaQuantityKind"/> instances are equivalent.</summary>
+    public static bool operator ==(ProviderQuotaQuantityKind left, ProviderQuotaQuantityKind right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="ProviderQuotaQuantityKind"/> instances are not equivalent.</summary>
+    public static bool operator !=(ProviderQuotaQuantityKind left, ProviderQuotaQuantityKind right) => !(left == right);
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is ShutdownType other && Equals(other);
+    public override bool Equals(object? obj) => obj is ProviderQuotaQuantityKind other && Equals(other);
 
     /// <inheritdoc />
-    public bool Equals(ShutdownType other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
+    public bool Equals(ProviderQuotaQuantityKind other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
 
     /// <inheritdoc />
     public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
@@ -14831,20 +16366,20 @@ public ShutdownType(string value)
     /// <inheritdoc />
     public override string ToString() => Value;
 
-    /// <summary>Provides a <see cref="JsonConverter{ShutdownType}"/> for serializing <see cref="ShutdownType"/> instances.</summary>
+    /// <summary>Provides a <see cref="JsonConverter{ProviderQuotaQuantityKind}"/> for serializing <see cref="ProviderQuotaQuantityKind"/> instances.</summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<ShutdownType>
+    public sealed class Converter : JsonConverter<ProviderQuotaQuantityKind>
     {
         /// <inheritdoc />
-        public override ShutdownType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override ProviderQuotaQuantityKind Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
         }
 
         /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, ShutdownType value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, ProviderQuotaQuantityKind value, JsonSerializerOptions options)
         {
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ShutdownType));
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ProviderQuotaQuantityKind));
         }
     }
 }
@@ -16811,6 +18346,70 @@ public override void Write(Utf8JsonWriter writer, AssistantUsageApiEndpoint valu
     }
 }
 
+/// <summary>Content-Encoding applied to the request body sent on the wire.</summary>
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct ModelCallRequestBodyEncoding : IEquatable<ModelCallRequestBodyEncoding>
+{
+    private readonly string? _value;
+
+    /// <summary>Initializes a new instance of the <see cref="ModelCallRequestBodyEncoding"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="ModelCallRequestBodyEncoding"/>.</param>
+    [JsonConstructor]
+    public ModelCallRequestBodyEncoding(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
+
+    /// <summary>Gets the value associated with this <see cref="ModelCallRequestBodyEncoding"/>.</summary>
+    public string Value => _value ?? string.Empty;
+
+    /// <summary>The request body was sent uncompressed (including every WebSocket request).</summary>
+    public static ModelCallRequestBodyEncoding Identity { get; } = new("identity");
+
+    /// <summary>The request body was sent gzip-compressed.</summary>
+    public static ModelCallRequestBodyEncoding Gzip { get; } = new("gzip");
+
+    /// <summary>The request body was sent zstd-compressed.</summary>
+    public static ModelCallRequestBodyEncoding Zstd { get; } = new("zstd");
+
+    /// <summary>Returns a value indicating whether two <see cref="ModelCallRequestBodyEncoding"/> instances are equivalent.</summary>
+    public static bool operator ==(ModelCallRequestBodyEncoding left, ModelCallRequestBodyEncoding right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="ModelCallRequestBodyEncoding"/> instances are not equivalent.</summary>
+    public static bool operator !=(ModelCallRequestBodyEncoding left, ModelCallRequestBodyEncoding right) => !(left == right);
+
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is ModelCallRequestBodyEncoding other && Equals(other);
+
+    /// <inheritdoc />
+    public bool Equals(ModelCallRequestBodyEncoding 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{ModelCallRequestBodyEncoding}"/> for serializing <see cref="ModelCallRequestBodyEncoding"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<ModelCallRequestBodyEncoding>
+    {
+        /// <inheritdoc />
+        public override ModelCallRequestBodyEncoding Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, ModelCallRequestBodyEncoding value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ModelCallRequestBodyEncoding));
+        }
+    }
+}
+
 /// <summary>Transport used for a successful model call.</summary>
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
@@ -16872,6 +18471,167 @@ public override void Write(Utf8JsonWriter writer, AssistantUsageTransport value,
     }
 }
 
+/// <summary>Normalized cause of the WebSocket failure that triggered the HTTP fallback.</summary>
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct ModelCallWebSocketFallbackErrorKind : IEquatable<ModelCallWebSocketFallbackErrorKind>
+{
+    private readonly string? _value;
+
+    /// <summary>Initializes a new instance of the <see cref="ModelCallWebSocketFallbackErrorKind"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="ModelCallWebSocketFallbackErrorKind"/>.</param>
+    [JsonConstructor]
+    public ModelCallWebSocketFallbackErrorKind(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
+
+    /// <summary>Gets the value associated with this <see cref="ModelCallWebSocketFallbackErrorKind"/>.</summary>
+    public string Value => _value ?? string.Empty;
+
+    /// <summary>DNS resolution of the WebSocket host failed.</summary>
+    public static ModelCallWebSocketFallbackErrorKind Dns { get; } = new("dns");
+
+    /// <summary>The TLS handshake or a TLS record failed.</summary>
+    public static ModelCallWebSocketFallbackErrorKind Tls { get; } = new("tls");
+
+    /// <summary>A WebSocket connect or read timed out.</summary>
+    public static ModelCallWebSocketFallbackErrorKind Timeout { get; } = new("timeout");
+
+    /// <summary>The peer refused the TCP connection.</summary>
+    public static ModelCallWebSocketFallbackErrorKind ConnectionRefused { get; } = new("connection_refused");
+
+    /// <summary>The connection was reset, aborted, or ended mid-stream without a close.</summary>
+    public static ModelCallWebSocketFallbackErrorKind ConnectionReset { get; } = new("connection_reset");
+
+    /// <summary>The peer closed the WebSocket.</summary>
+    public static ModelCallWebSocketFallbackErrorKind ClosedByPeer { get; } = new("closed_by_peer");
+
+    /// <summary>The runtime closed the WebSocket itself.</summary>
+    public static ModelCallWebSocketFallbackErrorKind ClosedLocally { get; } = new("closed_locally");
+
+    /// <summary>The socket was already closed before it was used.</summary>
+    public static ModelCallWebSocketFallbackErrorKind NotConnected { get; } = new("not_connected");
+
+    /// <summary>The upgrade or request was rejected with an HTTP status.</summary>
+    public static ModelCallWebSocketFallbackErrorKind HttpStatus { get; } = new("http_status");
+
+    /// <summary>A WebSocket protocol violation or an undecodable frame.</summary>
+    public static ModelCallWebSocketFallbackErrorKind Protocol { get; } = new("protocol");
+
+    /// <summary>The WebSocket request could not be built.</summary>
+    public static ModelCallWebSocketFallbackErrorKind Configuration { get; } = new("configuration");
+
+    /// <summary>A failure that maps onto none of the other kinds.</summary>
+    public static ModelCallWebSocketFallbackErrorKind Other { get; } = new("other");
+
+    /// <summary>Returns a value indicating whether two <see cref="ModelCallWebSocketFallbackErrorKind"/> instances are equivalent.</summary>
+    public static bool operator ==(ModelCallWebSocketFallbackErrorKind left, ModelCallWebSocketFallbackErrorKind right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="ModelCallWebSocketFallbackErrorKind"/> instances are not equivalent.</summary>
+    public static bool operator !=(ModelCallWebSocketFallbackErrorKind left, ModelCallWebSocketFallbackErrorKind right) => !(left == right);
+
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is ModelCallWebSocketFallbackErrorKind other && Equals(other);
+
+    /// <inheritdoc />
+    public bool Equals(ModelCallWebSocketFallbackErrorKind 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{ModelCallWebSocketFallbackErrorKind}"/> for serializing <see cref="ModelCallWebSocketFallbackErrorKind"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<ModelCallWebSocketFallbackErrorKind>
+    {
+        /// <inheritdoc />
+        public override ModelCallWebSocketFallbackErrorKind Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, ModelCallWebSocketFallbackErrorKind value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ModelCallWebSocketFallbackErrorKind));
+        }
+    }
+}
+
+/// <summary>Why a WebSocket-capable model call was carried by the HTTP fallback.</summary>
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct ModelCallWebSocketFallbackReason : IEquatable<ModelCallWebSocketFallbackReason>
+{
+    private readonly string? _value;
+
+    /// <summary>Initializes a new instance of the <see cref="ModelCallWebSocketFallbackReason"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="ModelCallWebSocketFallbackReason"/>.</param>
+    [JsonConstructor]
+    public ModelCallWebSocketFallbackReason(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
+
+    /// <summary>Gets the value associated with this <see cref="ModelCallWebSocketFallbackReason"/>.</summary>
+    public string Value => _value ?? string.Empty;
+
+    /// <summary>The WebSocket connection could not be established.</summary>
+    public static ModelCallWebSocketFallbackReason ConnectFailed { get; } = new("connect_failed");
+
+    /// <summary>No usable WebSocket connection was available for the request.</summary>
+    public static ModelCallWebSocketFallbackReason ConnectionUnavailable { get; } = new("connection_unavailable");
+
+    /// <summary>Sending the request over the WebSocket failed.</summary>
+    public static ModelCallWebSocketFallbackReason SendFailed { get; } = new("send_failed");
+
+    /// <summary>The WebSocket returned a retryable API error.</summary>
+    public static ModelCallWebSocketFallbackReason ApiError { get; } = new("api_error");
+
+    /// <summary>The WebSocket transport failed before any output reached the consumer.</summary>
+    public static ModelCallWebSocketFallbackReason TransportFailed { get; } = new("transport_failed");
+
+    /// <summary>Returns a value indicating whether two <see cref="ModelCallWebSocketFallbackReason"/> instances are equivalent.</summary>
+    public static bool operator ==(ModelCallWebSocketFallbackReason left, ModelCallWebSocketFallbackReason right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="ModelCallWebSocketFallbackReason"/> instances are not equivalent.</summary>
+    public static bool operator !=(ModelCallWebSocketFallbackReason left, ModelCallWebSocketFallbackReason right) => !(left == right);
+
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is ModelCallWebSocketFallbackReason other && Equals(other);
+
+    /// <inheritdoc />
+    public bool Equals(ModelCallWebSocketFallbackReason 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{ModelCallWebSocketFallbackReason}"/> for serializing <see cref="ModelCallWebSocketFallbackReason"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<ModelCallWebSocketFallbackReason>
+    {
+        /// <inheritdoc />
+        public override ModelCallWebSocketFallbackReason Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, ModelCallWebSocketFallbackReason value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ModelCallWebSocketFallbackReason));
+        }
+    }
+}
+
 /// <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}")]
@@ -17271,7 +19031,7 @@ public override void Write(Utf8JsonWriter writer, AbortReason value, JsonSeriali
     }
 }
 
-/// <summary>Configuration source: user, workspace, plugin, builtin, or managed.</summary>
+/// <summary>Configuration source: user, workspace, plugin, builtin, managed, or account.</summary>
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
 public readonly struct McpServerSource : IEquatable<McpServerSource>
@@ -17305,6 +19065,9 @@ public McpServerSource(string value)
     /// <summary>Server supplied by a trusted host-managed catalog.</summary>
     public static McpServerSource Managed { get; } = new("managed");
 
+    /// <summary>Server contributed by a signed-in account; enablement and organization policy still apply.</summary>
+    public static McpServerSource Account { get; } = new("account");
+
     /// <summary>Returns a value indicating whether two <see cref="McpServerSource"/> instances are equivalent.</summary>
     public static bool operator ==(McpServerSource left, McpServerSource right) => left.Equals(right);
 
@@ -19634,6 +21397,9 @@ public PermissionApprovalEvaluationReasonCode(string value)
     /// <summary>The script path was not authorized for inspection.</summary>
     public static PermissionApprovalEvaluationReasonCode PathNotAuthorized { get; } = new("path-not-authorized");
 
+    /// <summary>A code source was excluded from review by content exclusion policy.</summary>
+    public static PermissionApprovalEvaluationReasonCode ContentExcluded { get; } = new("content-excluded");
+
     /// <summary>The script working directory was invalid.</summary>
     public static PermissionApprovalEvaluationReasonCode InvalidWorkingDirectory { get; } = new("invalid-working-directory");
 
@@ -19670,6 +21436,24 @@ public PermissionApprovalEvaluationReasonCode(string value)
     /// <summary>The script argument binding could not be reviewed.</summary>
     public static PermissionApprovalEvaluationReasonCode ArgumentBindingUnreviewable { get; } = new("argument-binding-unreviewable");
 
+    /// <summary>The shell command could not be analyzed for execution evidence.</summary>
+    public static PermissionApprovalEvaluationReasonCode UnsupportedCommandShape { get; } = new("unsupported-command-shape");
+
+    /// <summary>The shell command used a code source that cannot be bound for review.</summary>
+    public static PermissionApprovalEvaluationReasonCode UnsupportedSource { get; } = new("unsupported-source");
+
+    /// <summary>The shell command used a code source computed at run time.</summary>
+    public static PermissionApprovalEvaluationReasonCode DynamicSource { get; } = new("dynamic-source");
+
+    /// <summary>The shell command referenced more code sources than can be reviewed.</summary>
+    public static PermissionApprovalEvaluationReasonCode TooManySources { get; } = new("too-many-sources");
+
+    /// <summary>A code-bearing executable could not be inspected.</summary>
+    public static PermissionApprovalEvaluationReasonCode ExecutableUnavailable { get; } = new("executable-unavailable");
+
+    /// <summary>A code-bearing executable exceeded the binding size limit.</summary>
+    public static PermissionApprovalEvaluationReasonCode ExecutableTooLarge { get; } = new("executable-too-large");
+
     /// <summary>The script review metadata was malformed.</summary>
     public static PermissionApprovalEvaluationReasonCode MalformedScriptActionReview { get; } = new("malformed-script-action-review");
 
@@ -20892,6 +22676,74 @@ public override void Write(Utf8JsonWriter writer, AutoModeResolvedReasoningBucke
     }
 }
 
+/// <summary>Current phase of organization-required plugin preparation.</summary>
+[Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+[JsonConverter(typeof(Converter))]
+[DebuggerDisplay("{Value,nq}")]
+public readonly struct ManagedPluginProgressPhase : IEquatable<ManagedPluginProgressPhase>
+{
+    private readonly string? _value;
+
+    /// <summary>Initializes a new instance of the <see cref="ManagedPluginProgressPhase"/> struct.</summary>
+    /// <param name="value">The value to associate with this <see cref="ManagedPluginProgressPhase"/>.</param>
+    [JsonConstructor]
+    public ManagedPluginProgressPhase(string value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        _value = value;
+    }
+
+    /// <summary>Gets the value associated with this <see cref="ManagedPluginProgressPhase"/>.</summary>
+    public string Value => _value ?? string.Empty;
+
+    /// <summary>Managed settings are still resolving before plugin preparation can be planned.</summary>
+    public static ManagedPluginProgressPhase Initializing { get; } = new("initializing");
+
+    /// <summary>Required plugin content is being installed.</summary>
+    public static ManagedPluginProgressPhase Installing { get; } = new("installing");
+
+    /// <summary>Installed required plugin content is being updated.</summary>
+    public static ManagedPluginProgressPhase Updating { get; } = new("updating");
+
+    /// <summary>Managed plugin preparation has completed.</summary>
+    public static ManagedPluginProgressPhase Complete { get; } = new("complete");
+
+    /// <summary>Returns a value indicating whether two <see cref="ManagedPluginProgressPhase"/> instances are equivalent.</summary>
+    public static bool operator ==(ManagedPluginProgressPhase left, ManagedPluginProgressPhase right) => left.Equals(right);
+
+    /// <summary>Returns a value indicating whether two <see cref="ManagedPluginProgressPhase"/> instances are not equivalent.</summary>
+    public static bool operator !=(ManagedPluginProgressPhase left, ManagedPluginProgressPhase right) => !(left == right);
+
+    /// <inheritdoc />
+    public override bool Equals(object? obj) => obj is ManagedPluginProgressPhase other && Equals(other);
+
+    /// <inheritdoc />
+    public bool Equals(ManagedPluginProgressPhase 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{ManagedPluginProgressPhase}"/> for serializing <see cref="ManagedPluginProgressPhase"/> instances.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class Converter : JsonConverter<ManagedPluginProgressPhase>
+    {
+        /// <inheritdoc />
+        public override ManagedPluginProgressPhase Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, ManagedPluginProgressPhase value, JsonSerializerOptions options)
+        {
+            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ManagedPluginProgressPhase));
+        }
+    }
+}
+
 /// <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}")]
@@ -20984,7 +22836,7 @@ public ManagedSettingsEnforcedAction(string value)
     /// <summary>Gets the value associated with this <see cref="ManagedSettingsEnforcedAction"/>.</summary>
     public string Value => _value ?? string.Empty;
 
-    /// <summary>An attempt to turn on a bypass-permissions ("yolo") escalation was refused or capped because policy disables bypass-permissions mode.</summary>
+    /// <summary>An attempt to enter a permission mode governed by managed policy was refused or capped. The `setting` and `escalation` fields identify whether this was bypass permissions or Assisted Permissions.</summary>
     public static ManagedSettingsEnforcedAction BypassPermissionsBlocked { get; } = new("bypass_permissions_blocked");
 
     /// <summary>Returns a value indicating whether two <see cref="ManagedSettingsEnforcedAction"/> instances are equivalent.</summary>
@@ -21023,7 +22875,7 @@ public override void Write(Utf8JsonWriter writer, ManagedSettingsEnforcedAction
     }
 }
 
-/// <summary>For a `bypass_permissions_blocked` action, which permission-escalation primitive was refused.</summary>
+/// <summary>For a `bypass_permissions_blocked` action, which permission-mode or escalation primitive was refused.</summary>
 [JsonConverter(typeof(Converter))]
 [DebuggerDisplay("{Value,nq}")]
 public readonly struct ManagedSettingsEnforcedEscalation : IEquatable<ManagedSettingsEnforcedEscalation>
@@ -21048,7 +22900,7 @@ public ManagedSettingsEnforcedEscalation(string value)
     /// <summary>Automatic approval of all tool permission requests.</summary>
     public static ManagedSettingsEnforcedEscalation ApproveAll { get; } = new("approve_all");
 
-    /// <summary>Assisted mode — keeps normal prompt paths and adds an LLM recommendation, distinct from allow-all.</summary>
+    /// <summary>Assisted Permissions — uses an LLM review to reduce prompts, distinct from allow-all and not a hard security boundary.</summary>
     public static ManagedSettingsEnforcedEscalation AssistedApproval { get; } = new("assisted_approval");
 
     /// <summary>Unrestricted filesystem access outside the session's allowed directories.</summary>
@@ -21471,7 +23323,7 @@ public McpServerStatus(string value)
     /// <summary>The server is configured but disabled.</summary>
     public static McpServerStatus Disabled { get; } = new("disabled");
 
-    /// <summary>The server was intentionally stopped and can be restarted on demand when policy permits; a server quarantined by restrictive managed policy stays stopped and cannot be restarted until the policy allows it.</summary>
+    /// <summary>The server is not running: it may not have started yet, may have been explicitly stopped, or may be quarantined by restrictive managed policy. It can be restarted on demand when policy permits.</summary>
     public static McpServerStatus Stopped { get; } = new("stopped");
 
     /// <summary>The server is not configured for this session.</summary>
@@ -21795,6 +23647,7 @@ public override void Write(Utf8JsonWriter writer, ExtensionsLoadedExtensionStatu
 [JsonSerializable(typeof(HumanResponseRecordedResponseAskUser))]
 [JsonSerializable(typeof(HumanResponseRecordedResponseExitPlanMode))]
 [JsonSerializable(typeof(HumanResponseRecordedResponseUserInput))]
+[JsonSerializable(typeof(ManagedPermissionsContext))]
 [JsonSerializable(typeof(McpAppToolCallCompleteData))]
 [JsonSerializable(typeof(McpAppToolCallCompleteError))]
 [JsonSerializable(typeof(McpAppToolCallCompleteEvent))]
@@ -21828,6 +23681,7 @@ public override void Write(Utf8JsonWriter writer, ExtensionsLoadedExtensionStatu
 [JsonSerializable(typeof(ModelCallFinishedEvent))]
 [JsonSerializable(typeof(ModelCallStartData))]
 [JsonSerializable(typeof(ModelCallStartEvent))]
+[JsonSerializable(typeof(ModelProviderRef))]
 [JsonSerializable(typeof(OmittedBinaryResult))]
 [JsonSerializable(typeof(PendingMessagesModifiedData))]
 [JsonSerializable(typeof(PendingMessagesModifiedEvent))]
@@ -21894,10 +23748,15 @@ public override void Write(Utf8JsonWriter writer, ExtensionsLoadedExtensionStatu
 [JsonSerializable(typeof(PermissionResultDeniedNoApprovalRuleAndCouldNotRequestFromUser))]
 [JsonSerializable(typeof(PermissionRule))]
 [JsonSerializable(typeof(PermissionSandboxPathGrant))]
+[JsonSerializable(typeof(PermissionWriteFileContent))]
+[JsonSerializable(typeof(PermissionWriteFileEdit))]
 [JsonSerializable(typeof(PersistedBinaryImage))]
 [JsonSerializable(typeof(PersistedBinaryResult))]
 [JsonSerializable(typeof(PromptCacheBreakData))]
 [JsonSerializable(typeof(PromptCacheBreakEvent))]
+[JsonSerializable(typeof(ProviderMonthlyUsage))]
+[JsonSerializable(typeof(ProviderQuotaBudgetMetadata))]
+[JsonSerializable(typeof(ProviderQuotaState))]
 [JsonSerializable(typeof(ResponsesReasoning))]
 [JsonSerializable(typeof(SamplingCompletedData))]
 [JsonSerializable(typeof(SamplingCompletedEvent))]
@@ -21986,6 +23845,8 @@ public override void Write(Utf8JsonWriter writer, ExtensionsLoadedExtensionStatu
 [JsonSerializable(typeof(SessionLimitsExhaustedRequestedData))]
 [JsonSerializable(typeof(SessionLimitsExhaustedRequestedEvent))]
 [JsonSerializable(typeof(SessionLimitsExhaustedResponse))]
+[JsonSerializable(typeof(SessionManagedPluginProgressData))]
+[JsonSerializable(typeof(SessionManagedPluginProgressEvent))]
 [JsonSerializable(typeof(SessionManagedSettingsEnforcedData))]
 [JsonSerializable(typeof(SessionManagedSettingsEnforcedEvent))]
 [JsonSerializable(typeof(SessionManagedSettingsResolvedData))]
@@ -22012,6 +23873,8 @@ public override void Write(Utf8JsonWriter writer, ExtensionsLoadedExtensionStatu
 [JsonSerializable(typeof(SessionPermissionsChangedEvent))]
 [JsonSerializable(typeof(SessionPlanChangedData))]
 [JsonSerializable(typeof(SessionPlanChangedEvent))]
+[JsonSerializable(typeof(SessionQuotaObservationData))]
+[JsonSerializable(typeof(SessionQuotaObservationEvent))]
 [JsonSerializable(typeof(SessionRemoteSteerableChangedData))]
 [JsonSerializable(typeof(SessionRemoteSteerableChangedEvent))]
 [JsonSerializable(typeof(SessionResumeData))]
@@ -22143,7 +24006,17 @@ public override void Write(Utf8JsonWriter writer, ExtensionsLoadedExtensionStatu
 [JsonSerializable(typeof(ToolUserRequestedEvent))]
 [JsonSerializable(typeof(UiEphemeralQueryData))]
 [JsonSerializable(typeof(UiEphemeralQueryEvent))]
+[JsonSerializable(typeof(UsageAccountingIdentity))]
 [JsonSerializable(typeof(UsageCheckpointModelCacheState))]
+[JsonSerializable(typeof(UsageGetMetricsResult))]
+[JsonSerializable(typeof(UsageMetricsAgentMetric))]
+[JsonSerializable(typeof(UsageMetricsCodeChanges))]
+[JsonSerializable(typeof(UsageMetricsModelMetric))]
+[JsonSerializable(typeof(UsageMetricsModelMetricRequests))]
+[JsonSerializable(typeof(UsageMetricsModelMetricTokenDetail))]
+[JsonSerializable(typeof(UsageMetricsModelMetricUsage))]
+[JsonSerializable(typeof(UsageMetricsProviderModelMetric))]
+[JsonSerializable(typeof(UsageMetricsTokenDetail))]
 [JsonSerializable(typeof(UserInputCompletedData))]
 [JsonSerializable(typeof(UserInputCompletedEvent))]
 [JsonSerializable(typeof(UserInputRequestedData))]
diff --git a/dotnet/src/Host.cs b/dotnet/src/Host.cs
index 5835ea3a4c..9ce98c3212 100644
--- a/dotnet/src/Host.cs
+++ b/dotnet/src/Host.cs
@@ -39,6 +39,8 @@ public sealed record AhpSessionResumeRequest(string SessionId, ResumeSessionConf
 [Experimental(Diagnostics.Experimental)]
 public sealed class AhpHostOptions
 {
+    /// <summary>Stable durable catalog identity; must agree with GitHubEnvironment.ComputeId when both are supplied.</summary>
+    public string? ComputeId { get; init; }
     /// <summary>Local WebSocket transport settings; absent disables the local listener.</summary>
     public HostLocalServerOptions? LocalServer { get; init; }
     /// <summary>GitHub Mission Control transport settings, with required Name and ComputeId; absent disables it.</summary>
@@ -84,10 +86,14 @@ internal AhpHost(HostStartResult info, ServerHostApi rpc)
     /// <summary>The GitHub Mission Control environment ID, absent without a GitHub environment.</summary>
     public string? EnvironmentId { get; }
 
-    /// <summary>Publishes a resident session without invoking factories or transferring ownership.</summary>
+    /// <summary>Durably advertises an attached session without invoking factories or transferring ownership.</summary>
     public Task<HostPublishSessionResult> PublishSessionAsync(string sessionId, CancellationToken cancellationToken = default)
         => _rpc.PublishSessionAsync(HostId, sessionId, cancellationToken);
 
+    /// <summary>Lists all live and dormant catalog sessions advertised by this host.</summary>
+    public Task<HostListSessionsResult> ListSessionsAsync(CancellationToken cancellationToken = default)
+        => _rpc.ListSessionsAsync(HostId, cancellationToken);
+
     /// <summary>Stops and joins listener cleanup without deleting application sessions.</summary>
     public ValueTask DisposeAsync() => new(DisposeAsync(CancellationToken.None));
 
@@ -121,7 +127,8 @@ public async Task<AhpHost> StartAhpHostAsync(AhpHostOptions options, Cancellatio
         var githubEnvironment = options.GitHubEnvironment is { } github ? new HostGitHubEnvironmentOptions
         {
             Name = github.Name,
-            ComputeId = github.ComputeId
+            ComputeId = github.ComputeId,
+            RequireConnectionBinding = github.RequireConnectionBinding
         } : null;
         if (localServer is null && githubEnvironment is null)
             throw new ArgumentException("At least one AHP transport must be configured", nameof(options));
@@ -130,9 +137,15 @@ public async Task<AhpHost> StartAhpHostAsync(AhpHostOptions options, Cancellatio
         var hostId = Guid.NewGuid().ToString();
         lock (_ahpGate) _ahpHosts.Add(hostId, options);
         var rpc = connection.Server.Host;
-        var startup = rpc.StartAsync(hostId, localServer, githubEnvironment,
-            options.CreateSession is not null ? true : null,
-            options.ResumeSession is not null ? true : null, CancellationToken.None);
+        var startup = rpc.StartAsync(new HostStartRequest
+        {
+            HostId = hostId,
+            ComputeId = options.ComputeId,
+            LocalServer = localServer,
+            GitHubEnvironment = githubEnvironment,
+            SessionFactory = options.CreateSession is not null ? true : null,
+            ResumeFactory = options.ResumeSession is not null ? true : null
+        }, CancellationToken.None);
         try
         {
             var info = await startup.WaitAsync(Timeout.InfiniteTimeSpan, cancellationToken).ConfigureAwait(false);
diff --git a/dotnet/src/JsonRpc.cs b/dotnet/src/JsonRpc.cs
index 26d4fe297a..8d45eb6f4a 100644
--- a/dotnet/src/JsonRpc.cs
+++ b/dotnet/src/JsonRpc.cs
@@ -1039,11 +1039,12 @@ private sealed class IncomingRequestCancellation : IDisposable
         public IncomingRequestCancellation(long id, CancellationToken connectionClosedToken)
         {
             Id = id;
-            _combinedSource = CancellationTokenSource.CreateLinkedTokenSource(_requestSource.Token, connectionClosedToken);
             _registration = _requestSource.Token.Register(static state =>
             {
                 ((TaskCompletionSource)state!).TrySetResult();
             }, _requestCancelled);
+            // Cancellation callbacks run in reverse registration order: propagate to handlers before replying.
+            _combinedSource = CancellationTokenSource.CreateLinkedTokenSource(_requestSource.Token, connectionClosedToken);
         }
 
         public long Id { get; }
diff --git a/dotnet/src/Session.StructuredOutput.cs b/dotnet/src/Session.StructuredOutput.cs
index 6df54d121e..c190c13ee3 100644
--- a/dotnet/src/Session.StructuredOutput.cs
+++ b/dotnet/src/Session.StructuredOutput.cs
@@ -192,10 +192,10 @@ void ProcessEvent(SessionEvent evt)
                 }
                 pendingEvents.Clear();
             }
-            await Task.WhenAny(completion.Task, JsonRpc.Completion, _eventChannel.Reader.Completion);
+            await Task.WhenAny(completion.Task, _eventDispatchStopped.Task, JsonRpc.Completion, _eventChannel.Reader.Completion);
             if (!completion.Task.IsCompleted)
             {
-                throw new IOException("The session closed before a final structured response was received.");
+                completion.TrySetException(new IOException("The session closed before a final structured response was received."));
             }
             return await completion.Task;
         }
diff --git a/dotnet/src/Session.cs b/dotnet/src/Session.cs
index f0cdde8999..79afecd20b 100644
--- a/dotnet/src/Session.cs
+++ b/dotnet/src/Session.cs
@@ -59,8 +59,10 @@ namespace GitHub.Copilot;
 public sealed partial class CopilotSession : IAsyncDisposable
 {
     private IReadOnlyDictionary<string, AIFunction> _toolHandlers = new Dictionary<string, AIFunction>(StringComparer.Ordinal);
-    private readonly Dictionary<string, Func<CommandContext, Task>> _commandHandlers = [];
-    private readonly Dictionary<string, Func<ProviderTokenArgs, Task<string>>> _bearerTokenProviders = new(StringComparer.Ordinal);
+    private Dictionary<string, Func<CommandContext, Task>> _commandHandlers = new(StringComparer.Ordinal);
+    private IReadOnlyDictionary<string, Func<ProviderTokenArgs, Task<string>>> _bearerTokenProviders = new Dictionary<string, Func<ProviderTokenArgs, Task<string>>>(StringComparer.Ordinal);
+    private readonly object _callbackLock = new();
+    private bool _callbacksRetired;
     private readonly ConcurrentDictionary<string, CancellationTokenSource> _pendingExternalTools = new(StringComparer.Ordinal);
     private readonly CancellationTokenSource _externalToolLifetime = new();
     private readonly ILogger _logger;
@@ -73,16 +75,29 @@ public sealed partial class CopilotSession : IAsyncDisposable
     private volatile Func<ElicitationContext, Task<ElicitationResult>>? _elicitationHandler;
     private volatile Func<ExitPlanModeRequest, ExitPlanModeInvocation, Task<ExitPlanModeResult>>? _exitPlanModeHandler;
     private volatile Func<AutoModeSwitchRequest, AutoModeSwitchInvocation, Task<AutoModeSwitchResponse>>? _autoModeSwitchHandler;
+    private volatile ISkillProvider? _skillProvider;
     private ImmutableArray<EventSubscription> _eventHandlers = ImmutableArray<EventSubscription>.Empty;
 
-    private sealed record EventSubscription(Type EventType, Action<SessionEvent> Handler, bool RootAgentOnly);
+    private sealed class EventSubscription(Type eventType, Action<SessionEvent> handler, bool rootAgentOnly)
+    {
+        private Action<SessionEvent>? _handler = handler;
+
+        public Type EventType { get; } = eventType;
+        public bool RootAgentOnly { get; } = rootAgentOnly;
+
+        // Keep the user handler out of the retained unsubscribe callback's closure.
+        public static EventSubscription Create<T>(Action<T> handler, bool rootAgentOnly) where T : SessionEvent =>
+            new(typeof(T), evt => handler((T)evt), rootAgentOnly);
+
+        public void Invoke(SessionEvent sessionEvent) => Volatile.Read(ref _handler)?.Invoke(sessionEvent);
+
+        public void ClearHandler() => Interlocked.Exchange(ref _handler, null);
+    }
 
     private SessionHooks? _hooks;
-    private readonly SemaphoreSlim _hooksLock = new(1, 1);
     private readonly SemaphoreSlim _setToolsLock = new(1, 1);
 
     private Dictionary<string, Func<string, Task<string>>>? _transformCallbacks;
-    private readonly SemaphoreSlim _transformCallbacksLock = new(1, 1);
 
     private IReadOnlyList<OpenCanvasInstance> _openCanvases = Array.Empty<OpenCanvasInstance>();
 
@@ -93,9 +108,10 @@ private sealed record EventSubscription(Type EventType, Action<SessionEvent> Han
     /// Channel that serializes event dispatch. <see cref="DispatchEvent"/> enqueues;
     /// a single background consumer (<see cref="ProcessEventsAsync"/>) dequeues and
     /// invokes handlers one at a time, preserving arrival order.
+    /// Shutdown can drain concurrently without waiting for an in-flight handler.
     /// </summary>
-    private readonly Channel<SessionEvent> _eventChannel = Channel.CreateUnbounded<SessionEvent>(
-        new() { SingleReader = true });
+    private readonly Channel<SessionEvent> _eventChannel = Channel.CreateUnbounded<SessionEvent>();
+    private readonly TaskCompletionSource<bool> _eventDispatchStopped = new(TaskCreationOptions.RunContinuationsAsynchronously);
 
     /// <summary>
     /// Fixed name of the runtime's built-in tool-search tool. A client can
@@ -213,19 +229,56 @@ internal void RemoveFromClient()
     }
 
     /// <summary>
-    /// Stops the session's event consumer (<see cref="ProcessEventsAsync"/>) without
-    /// making an RPC. <see cref="CopilotClient.CreateSessionAsync"/> and
-    /// <see cref="CopilotClient.ResumeSessionAsync"/> use this on error paths where a
-    /// locally registered session fails before it can be returned to the caller:
-    /// <see cref="StartProcessingEvents"/> starts the consumer eagerly, and no caller
-    /// ever receives the failed session to dispose it. Safe to call more than once —
-    /// <see cref="ChannelWriter{T}.TryComplete"/> is idempotent.
+    /// Retires the event consumer without making an RPC or joining an admitted handler.
+    /// Releases queued events and subscriptions and fails pending response waiters.
+    /// Also used for registered sessions that fail before being returned to the caller.
+    /// Safe to call more than once.
     /// </summary>
     internal void CloseEventChannel()
     {
+        _eventDispatchStopped.TrySetResult(true);
         _eventChannel.Writer.TryComplete();
+        while (_eventChannel.Reader.TryRead(out _))
+        {
+            // Discard queued events; retirement must not dispatch their handlers.
+        }
+        var subscriptions = ImmutableInterlocked.InterlockedExchange(ref _eventHandlers, ImmutableArray<EventSubscription>.Empty);
+        foreach (var subscription in subscriptions)
+        {
+            subscription.ClearHandler();
+        }
+    }
+
+    /// <summary>Releases local callback ownership without an RPC or joining admitted handlers.</summary>
+    internal void Retire()
+    {
+        lock (_callbackLock)
+        {
+            _callbacksRetired = true;
+            Volatile.Write(ref _toolHandlers, new Dictionary<string, AIFunction>(StringComparer.Ordinal));
+            _commandHandlers = new Dictionary<string, Func<CommandContext, Task>>(StringComparer.Ordinal);
+            _bearerTokenProviders = new Dictionary<string, Func<ProviderTokenArgs, Task<string>>>(StringComparer.Ordinal);
+            _permissionHandler = null;
+            _mcpAuthHandler = null;
+            _userInputHandler = null;
+            _elicitationHandler = null;
+            _exitPlanModeHandler = null;
+            _autoModeSwitchHandler = null;
+            _skillProvider = null;
+            _hooks = null;
+            _transformCallbacks = null;
+            ClientSessionApis.ProviderToken = null;
+            ClientSessionApis.Canvas = null;
+            ClientSessionApis.SessionFs = null;
+        }
+        CancelPendingExternalTools();
+        CloseEventChannel();
+        ReleaseGitHubTokenProviderRegistration();
     }
 
+    private void ThrowIfCallbacksRetired() =>
+        ObjectDisposedException.ThrowIf(_callbacksRetired, this);
+
     /// <summary>
     /// Removes the session from its parent client and stops its event consumer.
     /// Used on session-creation/resume error paths where the session was registered
@@ -233,8 +286,7 @@ internal void CloseEventChannel()
     /// </summary>
     internal void Unregister()
     {
-        CancelPendingExternalTools();
-        CloseEventChannel();
+        Retire();
         RemoveFromClient();
     }
 
@@ -369,6 +421,7 @@ public async Task<string> SendAsync(MessageOptions options, CancellationToken ca
     /// <exception cref="TimeoutException">Thrown if the timeout is reached before the session becomes idle.</exception>
     /// <exception cref="OperationCanceledException">Thrown if the <paramref name="cancellationToken"/> is cancelled.</exception>
     /// <exception cref="InvalidOperationException">Thrown if the session has been disposed.</exception>
+    /// <exception cref="IOException">Thrown if session event delivery stops before a final response arrives.</exception>
     /// <remarks>
     /// <para>
     /// This is a convenience method that combines <see cref="SendAsync(MessageOptions, CancellationToken)"/> with waiting for
@@ -454,6 +507,11 @@ void Handler(SessionEvent evt)
         });
         try
         {
+            await Task.WhenAny(tcs.Task, _eventDispatchStopped.Task);
+            if (!tcs.Task.IsCompleted)
+            {
+                tcs.TrySetException(new IOException("The session closed before a final response was received."));
+            }
             var result = await tcs.Task;
             LoggingHelpers.LogTiming(_logger, LogLevel.Debug, null,
                 "CopilotSession.SendAndWaitAsync complete. Elapsed={Elapsed}, SessionId={SessionId}, CompletedBy={CompletedBy}, AssistantMessageReceived={AssistantMessageReceived}",
@@ -488,6 +546,8 @@ void Handler(SessionEvent evt)
     /// </summary>
     /// <param name="handler">A callback to be invoked when a session event occurs.</param>
     /// <returns>An <see cref="IDisposable"/> that, when disposed, unsubscribes the handler.</returns>
+    /// <exception cref="ObjectDisposedException">Thrown if the session has been disposed.</exception>
+    /// <exception cref="IOException">Thrown if session event delivery has stopped.</exception>
     /// <remarks>
     /// <para>
     /// Events include assistant messages, tool executions, errors, and session state changes.
@@ -498,6 +558,10 @@ void Handler(SessionEvent evt)
     /// A handler will never be called concurrently with itself or with other handlers
     /// on the same session.
     /// </para>
+    /// <para>
+    /// Unsubscribing or closing the session releases handlers that have not been admitted
+    /// for dispatch. A handler already admitted may finish; disposal does not wait for it.
+    /// </para>
     /// </remarks>
     /// <example>
     /// <code>
@@ -529,9 +593,20 @@ private ActionDisposable OnCore<T>(Action<T> handler, bool rootAgentOnly) where
         ArgumentNullException.ThrowIfNull(handler);
         ThrowIfDisposed();
 
-        var subscription = new EventSubscription(typeof(T), evt => handler((T)evt), rootAgentOnly);
+        var subscription = EventSubscription.Create(handler, rootAgentOnly);
         ImmutableInterlocked.Update(ref _eventHandlers, array => array.Add(subscription));
-        return new ActionDisposable(() => ImmutableInterlocked.Update(ref _eventHandlers, array => array.Remove(subscription)));
+        if (_eventDispatchStopped.Task.IsCompleted)
+        {
+            subscription.ClearHandler();
+            ImmutableInterlocked.Update(ref _eventHandlers, array => array.Remove(subscription));
+            ThrowIfDisposed();
+            throw new IOException("The session event dispatch has stopped.");
+        }
+        return new ActionDisposable(() =>
+        {
+            subscription.ClearHandler();
+            ImmutableInterlocked.Update(ref _eventHandlers, array => array.Remove(subscription));
+        });
     }
 
     /// <summary>
@@ -567,12 +642,20 @@ private async Task ProcessEventsAsync()
     {
         await foreach (var sessionEvent in _eventChannel.Reader.ReadAllAsync())
         {
+            if (_eventDispatchStopped.Task.IsCompleted)
+            {
+                return;
+            }
             var dispatchTimestamp = Stopwatch.GetTimestamp();
             var eventType = sessionEvent.GetType();
             // Preserve wire attribution without moving waiters ahead of earlier user handlers.
             var isRootAgentEvent = string.IsNullOrEmpty(sessionEvent.AgentId);
             foreach (var subscription in _eventHandlers)
             {
+                if (_eventDispatchStopped.Task.IsCompleted)
+                {
+                    return;
+                }
                 if (!subscription.EventType.IsAssignableFrom(eventType) ||
                     (subscription.RootAgentOnly && !isRootAgentEvent))
                 {
@@ -580,7 +663,7 @@ private async Task ProcessEventsAsync()
                 }
                 try
                 {
-                    subscription.Handler(sessionEvent);
+                    subscription.Invoke(sessionEvent);
                 }
                 catch (Exception ex)
                 {
@@ -606,7 +689,16 @@ private async Task ProcessEventsAsync()
     /// </remarks>
     internal void RegisterTools(ICollection<AIFunctionDeclaration> tools)
     {
-        Volatile.Write(ref _toolHandlers, BuildToolHandlerMap(tools));
+        SetToolHandlers(BuildToolHandlerMap(tools));
+    }
+
+    private void SetToolHandlers(Dictionary<string, AIFunction> handlers)
+    {
+        lock (_callbackLock)
+        {
+            ThrowIfCallbacksRetired();
+            Volatile.Write(ref _toolHandlers, handlers);
+        }
     }
 
     private static Dictionary<string, AIFunction> BuildToolHandlerMap(ICollection<AIFunctionDeclaration> tools)
@@ -693,9 +785,10 @@ private static Dictionary<string, JsonElement> ToJsonElementDictionary(IDictiona
     /// are the same as the tools supplied when creating or resuming a session.
     /// </para>
     /// <para>
-    /// Tool handlers switch after the runtime accepts the replacement. Tool calls already running finish with the handlers
-    /// that started them. If the runtime rejects the replacement, the previous handlers remain installed and the exception is
-    /// propagated. Concurrent calls are applied in order.
+    /// Tool handlers switch when the runtime's acceptance response arrives, before subsequent tool requests are dispatched.
+    /// Tool calls already running finish with the handlers that started them. If the runtime rejects the replacement, the
+    /// previous handlers remain installed and the exception is propagated. Concurrent calls are applied in order.
+    /// Acceptance after local retirement fails the replacement without restoring its handlers.
     /// </para>
     /// <para>
     /// The agent sees the new tools from its next model request, which can fall within a turn in progress. A model request
@@ -714,9 +807,8 @@ public async Task SetToolsAsync(ICollection<AIFunctionDeclaration> tools, Cancel
         var wireTools = tools.Select(ToProtocolExternalToolDefinition).ToList();
         var handlers = BuildToolHandlerMap(tools);
 
-        // Cancelling while an earlier call holds the lock sends nothing. Once this call holds it, the
-        // request runs to completion even if the caller stops waiting, so an accepted replacement still
-        // installs its handlers.
+        // Cancelling before sending the request leaves handlers unchanged. Once sent, the request runs
+        // to completion even if the caller stops waiting, so an accepted replacement still installs its handlers.
         var replacement = ReplaceToolsAsync(wireTools, handlers, cancellationToken);
         try
         {
@@ -741,8 +833,13 @@ private async Task ReplaceToolsAsync(
         await _setToolsLock.WaitAsync(lockCancellationToken);
         try
         {
-            await Rpc.Tools.SetAsync(wireTools, CancellationToken.None);
-            Volatile.Write(ref _toolHandlers, handlers);
+            // SemaphoreSlim can grant a released slot while its cancellation continuation is pending.
+            lockCancellationToken.ThrowIfCancellationRequested();
+            ThrowIfDisposed();
+            var request = new ToolsSetRequest { SessionId = SessionId, Tools = wireTools };
+            await CopilotClient.InvokeRpcAsync<ToolsSetResult>(
+                JsonRpc, "session.tools.set", [request], null, CancellationToken.None,
+                onResponseInline: _ => SetToolHandlers(handlers));
         }
         finally
         {
@@ -757,8 +854,12 @@ private async Task ReplaceToolsAsync(
     /// <returns>The tool if found; otherwise, <c>null</c>.</returns>
     internal AIFunction? GetTool(string name)
     {
-        var handlers = Volatile.Read(ref _toolHandlers);
-        return handlers.TryGetValue(name, out var tool) ? tool : null;
+        lock (_callbackLock)
+        {
+            ThrowIfCallbacksRetired();
+            var handlers = Volatile.Read(ref _toolHandlers);
+            return handlers.TryGetValue(name, out var tool) ? tool : null;
+        }
     }
 
     /// <summary>
@@ -774,13 +875,21 @@ internal void RegisterPermissionHandler(
         Func<PermissionRequest, PermissionInvocation, Task<PermissionDecision>>? handler,
         bool managedSettingsEnabled)
     {
-        _permissionHandler = handler;
-        _managedSettingsEnabled = managedSettingsEnabled;
+        lock (_callbackLock)
+        {
+            ThrowIfCallbacksRetired();
+            _permissionHandler = handler;
+            _managedSettingsEnabled = managedSettingsEnabled;
+        }
     }
 
     internal void RegisterMcpAuthHandler(Func<McpAuthContext, Task<McpAuthResult?>>? handler)
     {
-        _mcpAuthHandler = handler;
+        lock (_callbackLock)
+        {
+            ThrowIfCallbacksRetired();
+            _mcpAuthHandler = handler;
+        }
     }
 
     /// <summary>
@@ -790,7 +899,12 @@ internal void RegisterMcpAuthHandler(Func<McpAuthContext, Task<McpAuthResult?>>?
     /// <returns>A task that resolves with the permission decision.</returns>
     internal async Task<PermissionDecision> HandlePermissionRequestAsync(JsonElement permissionRequestData)
     {
-        var handler = _permissionHandler;
+        Func<PermissionRequest, PermissionInvocation, Task<PermissionDecision>>? handler;
+        lock (_callbackLock)
+        {
+            ThrowIfCallbacksRetired();
+            handler = _permissionHandler;
+        }
 
         if (handler == null)
         {
@@ -838,7 +952,7 @@ private async Task HandleBroadcastEventAsync(SessionEvent sessionEvent)
                             return; // This client doesn't handle this tool; another client will.
 
                         using (TelemetryHelpers.RestoreTraceContext(data.Traceparent, data.Tracestate))
-                            await ExecuteToolAndRespondAsync(data.RequestId, data.ToolName, data.ToolCallId, data.Arguments, tool);
+                            await ExecuteToolAndRespondAsync(data.RequestId, data.ToolName, data.ToolCallId, data.Arguments, tool, toolEvent.AgentId);
                         break;
                     }
 
@@ -855,7 +969,12 @@ private async Task HandleBroadcastEventAsync(SessionEvent sessionEvent)
                         if (data.ResolvedByHook == true)
                             return; // Already resolved by a permissionRequest hook; no client action needed.
 
-                        var handler = _permissionHandler;
+                        Func<PermissionRequest, PermissionInvocation, Task<PermissionDecision>>? handler;
+                        lock (_callbackLock)
+                        {
+                            ThrowIfCallbacksRetired();
+                            handler = _permissionHandler;
+                        }
                         if (handler is null)
                             return; // This client doesn't handle permissions; another client will.
 
@@ -869,7 +988,12 @@ private async Task HandleBroadcastEventAsync(SessionEvent sessionEvent)
                         if (string.IsNullOrEmpty(data.RequestId))
                             return;
 
-                        var handler = _mcpAuthHandler;
+                        Func<McpAuthContext, Task<McpAuthResult?>>? handler;
+                        lock (_callbackLock)
+                        {
+                            ThrowIfCallbacksRetired();
+                            handler = _mcpAuthHandler;
+                        }
                         if (handler is null)
                         {
                             if (_logger.IsEnabled(LogLevel.Warning))
@@ -1053,7 +1177,7 @@ private async Task TryCancelMcpAuthRequestAsync(string requestId)
     /// <summary>
     /// Executes a tool handler and sends the result back via the HandlePendingToolCall RPC.
     /// </summary>
-    private async Task ExecuteToolAndRespondAsync(string requestId, string toolName, string toolCallId, JsonElement? arguments, AIFunction tool)
+    private async Task ExecuteToolAndRespondAsync(string requestId, string toolName, string toolCallId, JsonElement? arguments, AIFunction tool, string? agentId)
     {
         if (_externalToolLifetime.IsCancellationRequested)
         {
@@ -1078,7 +1202,9 @@ private async Task ExecuteToolAndRespondAsync(string requestId, string toolName,
                 SessionId = SessionId,
                 ToolCallId = toolCallId,
                 ToolName = toolName,
-                Arguments = arguments
+                Arguments = arguments,
+                AgentId = string.IsNullOrEmpty(agentId) ? null : agentId,
+                RequestId = requestId
             };
 
             // The built-in tool-search tool receives a snapshot of the session's
@@ -1358,7 +1484,11 @@ private async Task ExecutePermissionAndRespondAsync(string requestId, Permission
     /// <param name="handler">The handler to invoke when user input is requested.</param>
     internal void RegisterUserInputHandler(Func<UserInputRequest, UserInputInvocation, Task<UserInputResponse>> handler)
     {
-        _userInputHandler = handler;
+        lock (_callbackLock)
+        {
+            ThrowIfCallbacksRetired();
+            _userInputHandler = handler;
+        }
     }
 
     /// <summary>
@@ -1367,11 +1497,18 @@ internal void RegisterUserInputHandler(Func<UserInputRequest, UserInputInvocatio
     /// <param name="commands">The command definitions to register.</param>
     internal void RegisterCommands(IEnumerable<CommandDefinition>? commands)
     {
-        _commandHandlers.Clear();
-        if (commands is null) return;
-        foreach (var cmd in commands)
+        var handlers = new Dictionary<string, Func<CommandContext, Task>>(StringComparer.Ordinal);
+        if (commands is not null)
+        {
+            foreach (var cmd in commands)
+            {
+                handlers[cmd.Name] = cmd.Handler;
+            }
+        }
+        lock (_callbackLock)
         {
-            _commandHandlers[cmd.Name] = cmd.Handler;
+            ThrowIfCallbacksRetired();
+            _commandHandlers = handlers;
         }
     }
 
@@ -1381,7 +1518,11 @@ internal void RegisterCommands(IEnumerable<CommandDefinition>? commands)
     /// <param name="handler">The handler to invoke when an elicitation request is received.</param>
     internal void RegisterElicitationHandler(Func<ElicitationContext, Task<ElicitationResult>>? handler)
     {
-        _elicitationHandler = handler;
+        lock (_callbackLock)
+        {
+            ThrowIfCallbacksRetired();
+            _elicitationHandler = handler;
+        }
     }
 
     /// <summary>
@@ -1390,7 +1531,11 @@ internal void RegisterElicitationHandler(Func<ElicitationContext, Task<Elicitati
     /// <param name="handler">The handler to invoke when an exit-plan-mode request is received.</param>
     internal void RegisterExitPlanModeHandler(Func<ExitPlanModeRequest, ExitPlanModeInvocation, Task<ExitPlanModeResult>>? handler)
     {
-        _exitPlanModeHandler = handler;
+        lock (_callbackLock)
+        {
+            ThrowIfCallbacksRetired();
+            _exitPlanModeHandler = handler;
+        }
     }
 
     /// <summary>
@@ -1399,7 +1544,73 @@ internal void RegisterExitPlanModeHandler(Func<ExitPlanModeRequest, ExitPlanMode
     /// <param name="handler">The handler to invoke when an auto-mode-switch request is received.</param>
     internal void RegisterAutoModeSwitchHandler(Func<AutoModeSwitchRequest, AutoModeSwitchInvocation, Task<AutoModeSwitchResponse>>? handler)
     {
-        _autoModeSwitchHandler = handler;
+        lock (_callbackLock)
+        {
+            ThrowIfCallbacksRetired();
+            _autoModeSwitchHandler = handler;
+        }
+    }
+
+    /// <summary>
+    /// Registers the session-scoped skill provider callback.
+    /// </summary>
+    internal void RegisterSkillProvider(ISkillProvider? provider)
+    {
+        lock (_callbackLock)
+        {
+            ThrowIfCallbacksRetired();
+            _skillProvider = provider;
+        }
+    }
+
+    internal void ClearSkillProvider()
+    {
+        lock (_callbackLock)
+        {
+            _skillProvider = null;
+        }
+    }
+
+    internal async ValueTask<CopilotClient.SkillProviderListResult> HandleSkillProviderListAsync(CancellationToken cancellationToken)
+    {
+        ISkillProvider provider;
+        lock (_callbackLock)
+        {
+            ThrowIfCallbacksRetired();
+            provider = _skillProvider ?? throw new InvalidOperationException($"No skill provider for session: {SessionId}");
+        }
+
+        try
+        {
+            var skills = await provider.ListSkillsAsync(cancellationToken).ConfigureAwait(false);
+            return new CopilotClient.SkillProviderListResult(skills?.ToList() ?? []);
+        }
+        catch (Exception ex) when (ex is not OperationCanceledException || !cancellationToken.IsCancellationRequested)
+        {
+            LogSkillProviderFailed(ex, "listSkills", SessionId);
+            throw new InvalidOperationException("Skill provider listSkills failed", ex);
+        }
+    }
+
+    internal async ValueTask<CopilotClient.SkillProviderReadResult> HandleSkillProviderReadAsync(string name, CancellationToken cancellationToken)
+    {
+        ISkillProvider provider;
+        lock (_callbackLock)
+        {
+            ThrowIfCallbacksRetired();
+            provider = _skillProvider ?? throw new InvalidOperationException($"No skill provider for session: {SessionId}");
+        }
+
+        try
+        {
+            var markdown = await provider.ReadSkillAsync(name, cancellationToken).ConfigureAwait(false);
+            return new CopilotClient.SkillProviderReadResult(markdown);
+        }
+        catch (Exception ex) when (ex is not OperationCanceledException || !cancellationToken.IsCancellationRequested)
+        {
+            LogSkillProviderFailed(ex, "readSkill", SessionId);
+            throw new InvalidOperationException("Skill provider readSkill failed", ex);
+        }
     }
 
     /// <summary>
@@ -1416,17 +1627,20 @@ internal void RegisterAutoModeSwitchHandler(Func<AutoModeSwitchRequest, AutoMode
     /// <param name="providers">Map of provider name to callback, or null/empty to clear.</param>
     internal void RegisterBearerTokenProviders(IReadOnlyDictionary<string, Func<ProviderTokenArgs, Task<string>>>? providers)
     {
-        _bearerTokenProviders.Clear();
-        if (providers is null || providers.Count == 0)
+        var callbacks = new Dictionary<string, Func<ProviderTokenArgs, Task<string>>>(StringComparer.Ordinal);
+        if (providers is not null)
         {
-            ClientSessionApis.ProviderToken = null;
-            return;
+            foreach (var (name, callback) in providers)
+            {
+                callbacks[name] = callback;
+            }
         }
-        foreach (var (name, callback) in providers)
+        lock (_callbackLock)
         {
-            _bearerTokenProviders[name] = callback;
+            ThrowIfCallbacksRetired();
+            _bearerTokenProviders = callbacks;
+            ClientSessionApis.ProviderToken = callbacks.Count == 0 ? null : new BearerTokenProviderHandler(this);
         }
-        ClientSessionApis.ProviderToken = new BearerTokenProviderHandler(this);
     }
 
     /// <summary>
@@ -1437,10 +1651,15 @@ private sealed class BearerTokenProviderHandler(CopilotSession session) : IProvi
     {
         public async Task<ProviderTokenAcquireResult> GetTokenAsync(ProviderTokenAcquireRequest request, CancellationToken cancellationToken = default)
         {
-            if (!session._bearerTokenProviders.TryGetValue(request.ProviderName, out var callback))
+            Func<ProviderTokenArgs, Task<string>>? callback;
+            lock (session._callbackLock)
             {
-                throw new InvalidOperationException(
-                    $"No bearer-token provider registered for provider \"{request.ProviderName}\"");
+                session.ThrowIfCallbacksRetired();
+                if (!session._bearerTokenProviders.TryGetValue(request.ProviderName, out callback))
+                {
+                    throw new InvalidOperationException(
+                        $"No bearer-token provider registered for provider \"{request.ProviderName}\"");
+                }
             }
             var token = await callback(new ProviderTokenArgs { ProviderName = request.ProviderName, SessionId = request.SessionId }).ConfigureAwait(false);
             return new ProviderTokenAcquireResult { Token = token };
@@ -1523,7 +1742,20 @@ private void RemoveOpenCanvas(string instanceId)
 
     internal void SetCanvasHandler(ICanvasHandler? handler)
     {
-        ClientSessionApis.Canvas = handler is null ? null : new CanvasHandlerAdapter(handler);
+        lock (_callbackLock)
+        {
+            ThrowIfCallbacksRetired();
+            ClientSessionApis.Canvas = handler is null ? null : new CanvasHandlerAdapter(handler);
+        }
+    }
+
+    internal void SetSessionFsHandler(Rpc.ISessionFsHandler handler)
+    {
+        lock (_callbackLock)
+        {
+            ThrowIfCallbacksRetired();
+            ClientSessionApis.SessionFs = handler;
+        }
     }
 
     private static readonly JsonElement NullJsonElement = JsonElement.Parse("null");
@@ -1592,7 +1824,13 @@ public async Task<object> InvokeAsync(CanvasProviderInvokeActionRequest request,
     /// </summary>
     private async Task ExecuteCommandAndRespondAsync(string requestId, string commandName, string command, string args)
     {
-        if (!_commandHandlers.TryGetValue(commandName, out var handler))
+        Func<CommandContext, Task>? handler;
+        lock (_callbackLock)
+        {
+            ThrowIfCallbacksRetired();
+            _commandHandlers.TryGetValue(commandName, out handler);
+        }
+        if (handler is null)
         {
             try
             {
@@ -1652,7 +1890,12 @@ await handler(new CommandContext
     /// </summary>
     private async Task HandleElicitationRequestAsync(ElicitationContext context, string requestId)
     {
-        var handler = _elicitationHandler;
+        Func<ElicitationContext, Task<ElicitationResult>>? handler;
+        lock (_callbackLock)
+        {
+            ThrowIfCallbacksRetired();
+            handler = _elicitationHandler;
+        }
         if (handler is null) return;
 
         try
@@ -1852,7 +2095,12 @@ public async Task<bool> ConfirmAsync(string message, CancellationToken cancellat
     /// <returns>A task that resolves with the user's response.</returns>
     internal async Task<UserInputResponse> HandleUserInputRequestAsync(UserInputRequest request)
     {
-        var handler = _userInputHandler ?? throw new InvalidOperationException("No user input handler registered");
+        Func<UserInputRequest, UserInputInvocation, Task<UserInputResponse>> handler;
+        lock (_callbackLock)
+        {
+            ThrowIfCallbacksRetired();
+            handler = _userInputHandler ?? throw new InvalidOperationException("No user input handler registered");
+        }
         var invocation = new UserInputInvocation
         {
             SessionId = SessionId
@@ -1874,7 +2122,12 @@ internal async Task<UserInputResponse> HandleUserInputRequestAsync(UserInputRequ
     /// <returns>A task that resolves with the user's decision.</returns>
     internal async Task<ExitPlanModeResult> HandleExitPlanModeRequestAsync(ExitPlanModeRequest request)
     {
-        var handler = _exitPlanModeHandler;
+        Func<ExitPlanModeRequest, ExitPlanModeInvocation, Task<ExitPlanModeResult>>? handler;
+        lock (_callbackLock)
+        {
+            ThrowIfCallbacksRetired();
+            handler = _exitPlanModeHandler;
+        }
         if (handler is null)
         {
             return new ExitPlanModeResult { Approved = true };
@@ -1897,7 +2150,12 @@ internal async Task<ExitPlanModeResult> HandleExitPlanModeRequestAsync(ExitPlanM
     /// <returns>A task that resolves with the user's decision.</returns>
     internal async Task<AutoModeSwitchResponse> HandleAutoModeSwitchRequestAsync(AutoModeSwitchRequest request)
     {
-        var handler = _autoModeSwitchHandler;
+        Func<AutoModeSwitchRequest, AutoModeSwitchInvocation, Task<AutoModeSwitchResponse>>? handler;
+        lock (_callbackLock)
+        {
+            ThrowIfCallbacksRetired();
+            handler = _autoModeSwitchHandler;
+        }
         if (handler is null)
         {
             return AutoModeSwitchResponse.No;
@@ -1919,15 +2177,11 @@ internal async Task<AutoModeSwitchResponse> HandleAutoModeSwitchRequestAsync(Aut
     /// <param name="hooks">The hooks configuration.</param>
     internal void RegisterHooks(SessionHooks hooks)
     {
-        _hooksLock.Wait();
-        try
+        lock (_callbackLock)
         {
+            ThrowIfCallbacksRetired();
             _hooks = hooks;
         }
-        finally
-        {
-            _hooksLock.Release();
-        }
     }
 
     /// <summary>
@@ -1938,16 +2192,12 @@ internal void RegisterHooks(SessionHooks hooks)
     /// <returns>A task that resolves with the hook output.</returns>
     internal async Task<object?> HandleHooksInvokeAsync(string hookType, JsonElement input)
     {
-        await _hooksLock.WaitAsync();
         SessionHooks? hooks;
-        try
+        lock (_callbackLock)
         {
+            ThrowIfCallbacksRetired();
             hooks = _hooks;
         }
-        finally
-        {
-            _hooksLock.Release();
-        }
 
         if (hooks == null)
         {
@@ -2051,15 +2301,11 @@ internal void RegisterHooks(SessionHooks hooks)
     /// <param name="callbacks">The transform callbacks keyed by section identifier.</param>
     internal void RegisterTransformCallbacks(Dictionary<string, Func<string, Task<string>>>? callbacks)
     {
-        _transformCallbacksLock.Wait();
-        try
+        lock (_callbackLock)
         {
+            ThrowIfCallbacksRetired();
             _transformCallbacks = callbacks;
         }
-        finally
-        {
-            _transformCallbacksLock.Release();
-        }
     }
 
     /// <summary>
@@ -2070,15 +2316,11 @@ internal void RegisterTransformCallbacks(Dictionary<string, Func<string, Task<st
     internal async Task<SystemMessageTransformRpcResponse> HandleSystemMessageTransformAsync(JsonElement sections)
     {
         Dictionary<string, Func<string, Task<string>>>? callbacks;
-        await _transformCallbacksLock.WaitAsync();
-        try
+        lock (_callbackLock)
         {
+            ThrowIfCallbacksRetired();
             callbacks = _transformCallbacks;
         }
-        finally
-        {
-            _transformCallbacksLock.Release();
-        }
 
         var parsed = JsonSerializer.Deserialize(
             sections.GetRawText(),
@@ -2224,7 +2466,7 @@ public async Task SetModelAsync(string model, SetModelOptions options, Cancellat
 
         if (options.ResetAutoTier)
         {
-            var request = new ModelSwitchToRequest
+            var request = new ModelSwitchToRequestWithSession
             {
                 SessionId = SessionId,
                 ModelId = model,
@@ -2236,7 +2478,7 @@ public async Task SetModelAsync(string model, SetModelOptions options, Cancellat
             await CopilotClient.InvokeRpcAsync(
                 Rpc,
                 "session.model.switchTo",
-                [WithExplicitNullAutoTier(request, RpcJsonContext.Default.ModelSwitchToRequest)],
+                [WithExplicitNullAutoTier(request, RpcJsonContext.Default.ModelSwitchToRequestWithSession)],
                 cancellationToken);
             return;
         }
@@ -2373,6 +2615,11 @@ public async Task LogAsync(string message, SessionLogLevel? level = null, bool?
     /// <para>
     /// After calling this method, the session object can no longer be used.
     /// </para>
+    /// <para>
+    /// Stops subscribed event delivery and releases queued events and subscriptions.
+    /// Handlers already admitted for dispatch may finish; disposal does not wait for them.
+    /// Pending response waiters fail if the session closes before their final response.
+    /// </para>
     /// </remarks>
     /// <example>
     /// <code>
@@ -2392,6 +2639,7 @@ public async ValueTask DisposeAsync()
             return;
         }
 
+        ClearSkillProvider();
         CancelPendingExternalTools();
         CloseEventChannel();
 
@@ -2414,20 +2662,10 @@ public async ValueTask DisposeAsync()
         }
         finally
         {
-            ReleaseGitHubTokenProviderRegistration();
+            Retire();
             RemoveFromClient();
             GC.SuppressFinalize(this);
         }
-
-        _eventHandlers = ImmutableInterlocked.InterlockedExchange(ref _eventHandlers, ImmutableArray<EventSubscription>.Empty);
-        Volatile.Write(ref _toolHandlers, new Dictionary<string, AIFunction>(StringComparer.Ordinal));
-        _commandHandlers.Clear();
-
-        _permissionHandler = null;
-        _userInputHandler = null;
-        _elicitationHandler = null;
-        _exitPlanModeHandler = null;
-        _autoModeSwitchHandler = null;
     }
 
     [LoggerMessage(Level = LogLevel.Error, Message = "Unhandled exception in broadcast event handler")]
@@ -2445,6 +2683,9 @@ public async ValueTask DisposeAsync()
     [LoggerMessage(Level = LogLevel.Error, Message = "Permission handler or response delivery failed. SessionId={SessionId}, RequestId={RequestId}")]
     private partial void LogPermissionHandlerOrDeliveryFailed(Exception exception, string sessionId, string requestId);
 
+    [LoggerMessage(Level = LogLevel.Warning, Message = "Skill provider {Operation} failed. SessionId={SessionId}")]
+    private partial void LogSkillProviderFailed(Exception exception, string operation, string sessionId);
+
     internal record SendMessageRequest
     {
         public string SessionId { get; init; } = string.Empty;
diff --git a/dotnet/src/Types.cs b/dotnet/src/Types.cs
index 7ed04c279b..9a70de1fc3 100644
--- a/dotnet/src/Types.cs
+++ b/dotnet/src/Types.cs
@@ -52,6 +52,74 @@ internal static class Diagnostics
     internal const string Experimental = "GHCP001";
 }
 
+/// <summary>
+/// Describes a skill supplied by a session-scoped <see cref="ISkillProvider"/>.
+/// </summary>
+/// <remarks>
+/// Experimental. The runtime validates descriptor limits, name syntax, and
+/// case-insensitive uniqueness when it reads the provider catalog.
+/// </remarks>
+[Experimental(Diagnostics.Experimental)]
+public sealed class SkillProviderDescriptor
+{
+    /// <summary>Stable skill name.</summary>
+    [JsonPropertyName("name")]
+    public required string Name { get; set; }
+
+    /// <summary>Human-readable description of what the skill teaches the model.</summary>
+    [JsonPropertyName("description")]
+    public required string Description { get; set; }
+
+    /// <summary>
+    /// Whether users can invoke the skill explicitly. When unset, the runtime default is <see langword="true"/>.
+    /// </summary>
+    [JsonPropertyName("userInvocable")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public bool? UserInvocable { get; set; }
+
+    /// <summary>
+    /// Whether model-initiated invocation is disabled. When unset, the runtime default is <see langword="false"/>.
+    /// </summary>
+    [JsonPropertyName("disableModelInvocation")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public bool? DisableModelInvocation { get; set; }
+
+    /// <summary>Optional argument hint shown for explicit invocations.</summary>
+    [JsonPropertyName("argumentHint")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public string? ArgumentHint { get; set; }
+}
+
+/// <summary>
+/// Provides session-scoped skills to the Copilot runtime.
+/// </summary>
+/// <remarks>
+/// Experimental. Implementations can be called concurrently and must be safe for
+/// concurrent use. The provider is not persisted; supply it again when resuming a
+/// session. Returning <see langword="null"/> from <see cref="ReadSkillAsync"/>
+/// reports that the requested skill was not found.
+/// </remarks>
+[Experimental(Diagnostics.Experimental)]
+public interface ISkillProvider
+{
+    /// <summary>Lists the skills currently available from this provider.</summary>
+    /// <param name="cancellationToken">
+    /// Cancels when the runtime abandons the request (for example, on timeout, session disposal,
+    /// or provider replacement on resume) or the connection closes.
+    /// </param>
+    /// <returns>The available skill descriptors.</returns>
+    Task<IReadOnlyList<SkillProviderDescriptor>> ListSkillsAsync(CancellationToken cancellationToken);
+
+    /// <summary>Reads the SKILL.md markdown for a named skill.</summary>
+    /// <param name="name">The skill name requested by the runtime.</param>
+    /// <param name="cancellationToken">
+    /// Cancels when the runtime abandons the request (for example, on timeout, session disposal,
+    /// or provider replacement on resume) or the connection closes.
+    /// </param>
+    /// <returns>The skill markdown, or <see langword="null"/> when the skill is not found.</returns>
+    Task<string?> ReadSkillAsync(string name, CancellationToken cancellationToken);
+}
+
 /// <summary>
 /// Log level for the Copilot runtime. Use the well-known values exposed as
 /// static members (<see cref="None"/>, <see cref="Error"/>, <see cref="Warning"/>,
@@ -890,6 +958,21 @@ public sealed class ToolInvocation
     /// issuing its own RPC. <c>null</c> for every other tool invocation.
     /// </summary>
     public IList<CurrentToolMetadata>? AvailableTools { get; set; }
+    /// <summary>
+    /// Sub-agent instance that issued this call (the <see cref="SessionEvent.AgentId"/>
+    /// of its session events). <c>null</c> for a root-agent call, and for every call
+    /// when the runtime does not attribute sub-agent tool calls.
+    /// </summary>
+    [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+    public string? AgentId { get; set; }
+    /// <summary>
+    /// Runtime request id of this call: the key <c>session.tools.handlePendingToolCall</c>
+    /// and <c>session.tools.listPendingRequests</c> use. A root-agent call stays answerable
+    /// after the session is resumed with pending work continued; a sub-agent's call can
+    /// be answered only while that sub-agent is still running.
+    /// </summary>
+    [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+    public string? RequestId { get; set; }
 }
 
 /// <summary>
@@ -3048,6 +3131,12 @@ public sealed class McpHttpServerConfig : McpServerConfig
 /// </summary>
 public sealed class CustomAgentConfig
 {
+    /// <summary>
+    /// Declarative hook actions keyed by event name, active only for this agent.
+    /// </summary>
+    [JsonPropertyName("hooks")]
+    public IDictionary<string, IList<IDictionary<string, JsonElement>>>? Hooks { get; set; }
+
     /// <summary>
     /// Unique name of the custom agent.
     /// </summary>
@@ -3193,6 +3282,21 @@ public sealed class LargeToolOutputConfig
     public string? OutputDirectory { get; set; }
 }
 
+/// <summary>Non-persisted opt-in to image generation.</summary>
+/// <remarks>Experimental. This API may change or be removed in a future release.</remarks>
+[Experimental(Diagnostics.Experimental)]
+public sealed class ImageGenerationConfig
+{
+    /// <summary>
+    /// Opt in to an authorized Copilot image model. False disables image generation.
+    /// Omission disables on create/cold resume and preserves resident resume state.
+    /// Not persisted: re-supply after runtime restart. Policy, permissions, offline
+    /// mode, and tool filters still apply. BYOK image generation is not supported.
+    /// </summary>
+    [JsonPropertyName("enabled")]
+    public bool? Enabled { get; set; }
+}
+
 /// <summary>
 /// Overrides the runtime's built-in tool-search behavior.
 /// Defers tools to keep the model's active tool set small.
@@ -3423,6 +3527,14 @@ public sealed class ManagedSettingsPermissions
     [JsonPropertyName("disableBypassPermissionsMode")]
     public string? DisableBypassPermissionsMode { get; set; }
 
+    /// <summary>
+    /// When <see langword="true"/>, prevents Assisted Permissions from being
+    /// activated. Omit or set to <see langword="false"/> to impose no restriction.
+    /// Serialized as <c>disableAssistedPermissionsMode</c>.
+    /// </summary>
+    [JsonPropertyName("disableAssistedPermissionsMode")]
+    public bool? DisableAssistedPermissionsMode { get; set; }
+
     /// <summary>Tool-permission patterns that are always denied.</summary>
     [JsonPropertyName("deny")]
     public IList<string>? Deny { get; set; }
@@ -3434,6 +3546,15 @@ public sealed class ManagedSettingsPermissions
     /// <summary>Tool-permission patterns that are allowed without prompting.</summary>
     [JsonPropertyName("allow")]
     public IList<string>? Allow { get; set; }
+
+    /// <summary>
+    /// Closed-world host boundary expressed as <c>Domain(hostname)</c>,
+    /// <c>Domain(IP)</c>, or <c>Domain(*.example.com)</c> rules. Schemes, ports,
+    /// paths, queries, and fragments are rejected. Multiple managed layers
+    /// intersect their lists. A present empty list denies all hosts.
+    /// </summary>
+    [JsonPropertyName("limitTo")]
+    public IList<string>? LimitTo { get; set; }
 }
 
 /// <summary>
@@ -3530,6 +3651,7 @@ protected SessionConfigBase(SessionConfigBase? other)
         InfiniteSessions = other.InfiniteSessions;
         LargeOutput = other.LargeOutput;
         ToolSearch = other.ToolSearch;
+        ImageGeneration = other.ImageGeneration;
         Memory = other.Memory;
         McpServers = other.McpServers is not null
             ? (other.McpServers is Dictionary<string, McpServerConfig> dict
@@ -3571,7 +3693,9 @@ protected SessionConfigBase(SessionConfigBase? other)
             : null;
         ExpAssignments = other.ExpAssignments;
         EnableManagedSettings = other.EnableManagedSettings;
+        EnforceManagedModelDefaults = other.EnforceManagedModelDefaults;
         ManagedSettings = other.ManagedSettings;
+        SkillProvider = other.SkillProvider;
 #pragma warning disable GHCP001
         Canvases = other.Canvases is not null ? [.. other.Canvases] : null;
         RequestCanvasRenderer = other.RequestCanvasRenderer;
@@ -3582,6 +3706,8 @@ protected SessionConfigBase(SessionConfigBase? other)
         CanvasHandler = other.CanvasHandler;
 #pragma warning restore GHCP001
         SkillDirectories = other.SkillDirectories is not null ? [.. other.SkillDirectories] : null;
+        AgentDirectories = other.AgentDirectories is not null ? [.. other.AgentDirectories] : null;
+        HookDirectories = other.HookDirectories is not null ? [.. other.HookDirectories] : null;
         PluginDirectories = other.PluginDirectories is not null ? [.. other.PluginDirectories] : null;
         InstructionDirectories = other.InstructionDirectories is not null ? [.. other.InstructionDirectories] : null;
         SessionLimits = other.SessionLimits;
@@ -3686,9 +3812,9 @@ protected SessionConfigBase(SessionConfigBase? other)
     public bool? EnableOnDemandInstructionDiscovery { get; set; }
 
     /// <summary>
-    /// When <see langword="true"/>, enables loading of file-based hooks from
-    /// <c>.github/hooks/</c>. This is separate from <see cref="Hooks"/>, which
-    /// controls SDK hook callback registration.
+    /// When <see langword="true"/>, enables repository-origin file hooks from
+    /// <c>.github/hooks/</c> and trusted repository-configured roots.
+    /// Does not control explicit <see cref="HookDirectories"/> or callback <see cref="Hooks"/>.
     /// </summary>
     public bool? EnableFileHooks { get; set; }
 
@@ -3714,6 +3840,20 @@ protected SessionConfigBase(SessionConfigBase? other)
     /// </summary>
     public bool? EnableSkills { get; set; }
 
+    /// <summary>
+    /// Session-scoped skill provider. When set, the runtime can list and read
+    /// skills by calling back into this SDK host.
+    /// </summary>
+    /// <remarks>
+    /// Experimental. The provider is ephemeral and is never persisted; supply it
+    /// again when resuming a session. In <see cref="CopilotClientMode.Empty"/>,
+    /// set <see cref="EnableSkills"/> to <see langword="true"/> to make provider
+    /// skills active. Providers can be called concurrently.
+    /// </remarks>
+    [JsonIgnore]
+    [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+    public ISkillProvider? SkillProvider { get; set; }
+
     /// <summary>
     /// Built-in skill names to include in the session. In
     /// <see cref="CopilotClientMode.Empty"/>, omitting this option excludes all
@@ -3963,9 +4103,34 @@ protected SessionConfigBase(SessionConfigBase? other)
     /// </summary>
     public string? Agent { get; set; }
 
-    /// <summary>Directories to load skills from.</summary>
+    /// <summary>Explicit discovery-only skill roots, not general filesystem grants.</summary>
+    /// <remarks>
+    /// Available without <see cref="EnableConfigDiscovery"/>, subject to skill/managed disables.
+    /// Relative paths resolve once when supplied against the request's effective
+    /// <see cref="WorkingDirectory"/>; retained roots do not move when it changes.
+    /// Null and omission are equivalent; an empty list clears only the explicit SDK contribution.
+    /// </remarks>
     public IList<string>? SkillDirectories { get; set; }
 
+    /// <summary>Explicit discovery-only agent roots, separate from <see cref="CustomAgents"/>.</summary>
+    /// <remarks>
+    /// No general filesystem grant. Available without <see cref="EnableConfigDiscovery"/>,
+    /// subject to source/managed disables. Relative paths resolve once when supplied against
+    /// the request's effective <see cref="WorkingDirectory"/>; retained roots do not move.
+    /// Null and omission are equivalent; an empty list clears only the explicit SDK contribution.
+    /// </remarks>
+    public IList<string>? AgentDirectories { get; set; }
+
+    /// <summary>Explicit discovery-only file-hook roots, separate from callback <see cref="Hooks"/>.</summary>
+    /// <remarks>
+    /// No general filesystem grant. Available without <see cref="EnableConfigDiscovery"/> or
+    /// <see cref="EnableFileHooks"/> (repository-origin hooks only), subject to hook/managed disables.
+    /// Relative paths resolve once when supplied against the request's effective
+    /// <see cref="WorkingDirectory"/>; retained roots do not move when it changes.
+    /// Null and omission are equivalent; an empty list clears only the explicit SDK contribution.
+    /// </remarks>
+    public IList<string>? HookDirectories { get; set; }
+
     /// <summary>
     /// Local filesystem paths to Open Plugins-format directories
     /// (https://open-plugins.com/) to load for this session.
@@ -3977,7 +4142,13 @@ protected SessionConfigBase(SessionConfigBase? other)
     /// </remarks>
     public IList<string>? PluginDirectories { get; set; }
 
-    /// <summary>Additional directories to search for custom instruction files.</summary>
+    /// <summary>Explicit discovery-only instruction roots using existing SDK formats.</summary>
+    /// <remarks>
+    /// No general filesystem grant. Available without <see cref="EnableConfigDiscovery"/>,
+    /// subject to instruction/managed disables. Relative paths resolve once when supplied
+    /// against the request's effective <see cref="WorkingDirectory"/>; retained roots do not move.
+    /// Null and omission are equivalent; an empty list clears only the explicit SDK contribution.
+    /// </remarks>
     public IList<string>? InstructionDirectories { get; set; }
 
     /// <summary>List of skill names to disable.</summary>
@@ -4021,6 +4192,10 @@ protected SessionConfigBase(SessionConfigBase? other)
     /// </summary>
     public ToolSearchConfig? ToolSearch { get; set; }
 
+    /// <summary>Non-persisted image generation opt-in. Re-supply after runtime restart.</summary>
+    [Experimental(global::GitHub.Copilot.Diagnostics.Experimental)]
+    public ImageGenerationConfig? ImageGeneration { get; set; }
+
     /// <summary>
     /// Configuration for session memory. When set, controls whether the
     /// session can read and write persistent memory.
@@ -4099,6 +4274,13 @@ protected SessionConfigBase(SessionConfigBase? other)
     /// </summary>
     public bool? EnableManagedSettings { get; set; }
 
+    /// <summary>
+    /// When true, enforces locked managed model controls for this session.
+    /// Conflicting model changes are rejected; overridable managed defaults
+    /// remain mutable.
+    /// </summary>
+    public bool? EnforceManagedModelDefaults { get; set; }
+
     /// <summary>
     /// Optional managed-settings layer injected at session bootstrap. Currently
     /// carries a permissions object that composes restrictively with any
@@ -4197,6 +4379,7 @@ private SessionConfig(SessionConfig? other) : base(other)
         if (other is null) return;
 
         SessionId = other.SessionId;
+        Name = other.Name;
         Cloud = other.Cloud;
         RefreshCustomInstructions = other.RefreshCustomInstructions;
     }
@@ -4204,6 +4387,15 @@ private SessionConfig(SessionConfig? other) : base(other)
     /// <summary>Optional session identifier; a new ID is generated if not provided.</summary>
     public string? SessionId { get; set; }
 
+    /// <summary>
+    /// Names the session at creation, as <c>session.name.set</c> would, and is validated the
+    /// same way: non-empty, no leading or trailing whitespace, at most 100 UTF-16 units, no
+    /// control characters, and no double quotes. A name also makes the session persist from
+    /// the start, so it can be listed and resumed without ever running a turn.
+    /// Local sessions only: cloud creation rejects it.
+    /// </summary>
+    public string? Name { get; set; }
+
     /// <summary>
     /// Creates a remote session in the cloud instead of a local session.
     /// The optional repository is associated with the cloud session.
@@ -4877,6 +5069,7 @@ public sealed class SystemMessageTransformRpcResponse
 [JsonSerializable(typeof(SectionOverride))]
 [JsonSerializable(typeof(SessionMetadata))]
 [JsonSerializable(typeof(SetForegroundSessionResponse))]
+[JsonSerializable(typeof(SkillProviderDescriptor))]
 [JsonSerializable(typeof(SystemMessageConfig))]
 [JsonSerializable(typeof(ToolBinaryResult))]
 [JsonSerializable(typeof(ToolBinaryResultType))]
diff --git a/dotnet/test/E2E/ClientOptionsE2ETests.cs b/dotnet/test/E2E/ClientOptionsE2ETests.cs
index d15dccc457..2c3888011d 100644
--- a/dotnet/test/E2E/ClientOptionsE2ETests.cs
+++ b/dotnet/test/E2E/ClientOptionsE2ETests.cs
@@ -278,6 +278,7 @@ public async Task Should_Forward_Granular_Multitenancy_Fields_In_Create_Wire_Req
 
         var session = await Ctx.CreateSessionAsync(client, new SessionConfig
         {
+            Name = "named at create",
             SkipEmbeddingRetrieval = false,
             OrganizationCustomInstructions = "Follow org policy.",
             EnableOnDemandInstructionDiscovery = true,
@@ -291,6 +292,7 @@ public async Task Should_Forward_Granular_Multitenancy_Fields_In_Create_Wire_Req
 
         using var capture = JsonDocument.Parse(await File.ReadAllTextAsync(capturePath));
         var createRequest = GetCapturedRequestParams(capture.RootElement, "session.create");
+        Assert.Equal("named at create", createRequest.GetProperty("name").GetString());
         Assert.False(createRequest.GetProperty("skipEmbeddingRetrieval").GetBoolean());
         Assert.Equal("Follow org policy.", createRequest.GetProperty("organizationCustomInstructions").GetString());
         Assert.True(createRequest.GetProperty("enableOnDemandInstructionDiscovery").GetBoolean());
@@ -537,6 +539,7 @@ public async Task Should_Apply_Empty_Mode_Defaults_To_CreateSession_Wire_Request
         Assert.False(createRequest.GetProperty("enableSkills").GetBoolean());
         Assert.True(createRequest.GetProperty("customAgentsLocalOnly").GetBoolean());
         Assert.False(createRequest.TryGetProperty("organizationCustomInstructions", out _));
+        Assert.False(createRequest.TryGetProperty("name", out _));
 
         await session.DisposeAsync();
     }
diff --git a/dotnet/test/E2E/PendingWorkResumeE2ETests.cs b/dotnet/test/E2E/PendingWorkResumeE2ETests.cs
index cdbfe82ae8..f6b539fa9d 100644
--- a/dotnet/test/E2E/PendingWorkResumeE2ETests.cs
+++ b/dotnet/test/E2E/PendingWorkResumeE2ETests.cs
@@ -21,6 +21,7 @@ public class PendingWorkResumeE2ETests(E2ETestFixture fixture, ITestOutputHelper
 
     [Fact]
     public async Task Should_Continue_Pending_Permission_Request_After_Resume()
+        => await WithSdkDiagnosticsAsync(async () =>
     {
         var originalPermissionRequest = new TaskCompletionSource<PermissionRequest>(TaskCreationOptions.RunContinuationsAsynchronously);
         var releaseOriginalPermission = new TaskCompletionSource<PermissionDecision>(TaskCreationOptions.RunContinuationsAsynchronously);
@@ -54,7 +55,7 @@ await session1.SendAsync(new MessageOptions
             var permissionEvent = await permissionRequested;
             Assert.IsType<PermissionRequestCustomTool>(initialRequest);
 
-            await suspendedClient.ForceStopAsync();
+            await ForceStopAfterSessionLockObservedAsync(suspendedClient, sessionId);
 
             await using var resumedTcpClient = Ctx.CreateClient(options: new CopilotClientOptions { Connection = RuntimeConnection.ForUri(cliUrl, connectionToken: SharedToken) });
             var session2 = await Ctx.ResumeSessionAsync(resumedTcpClient, sessionId, new ResumeSessionConfig
@@ -69,6 +70,8 @@ await session1.SendAsync(new MessageOptions
                         "resume_permission_tool")
                 ],
             });
+            var resumeEvent = await GetSingleResumeEventAsync(session2);
+            Assert.False(resumeEvent.Data.SessionWasActive);
 
             var permissionResult = await session2.Rpc.Permissions.HandlePendingPermissionRequestAsync(
                 permissionEvent.Data.RequestId,
@@ -86,10 +89,11 @@ await session1.SendAsync(new MessageOptions
         [Description("Transforms a value after permission is granted")]
         static string ResumePermissionTool([Description("Value to transform")] string value) =>
             $"ORIGINAL_SHOULD_NOT_RUN_{value}";
-    }
+    });
 
     [Fact]
     public async Task Should_Continue_Pending_External_Tool_Request_After_Resume()
+        => await WithSdkDiagnosticsAsync(async () =>
     {
         var originalToolStarted = new TaskCompletionSource<string>(TaskCreationOptions.RunContinuationsAsynchronously);
         var releaseOriginalTool = new TaskCompletionSource<string>(TaskCreationOptions.RunContinuationsAsynchronously);
@@ -154,7 +158,7 @@ async Task<string> BlockingExternalTool(
             originalToolStarted.TrySetResult(value);
             return await releaseOriginalTool.Task.WaitAsync(Timeout.InfiniteTimeSpan, cancellationToken);
         }
-    }
+    });
 
     [Fact]
     public Task Should_Keep_Pending_External_Tool_Handleable_On_Warm_Resume_When_ContinuePendingWork_Is_False() =>
@@ -170,10 +174,39 @@ public Task Should_Keep_Pending_External_Tool_Handleable_On_Cold_Resume_When_Con
             expectedSessionWasActive: false,
             expectedHandleResult: false);
 
+    private async Task ForceStopAfterSessionLockObservedAsync(CopilotClient suspendedClient, string sessionId)
+    {
+        await using var lockObserver = Ctx.CreateClient(options: new CopilotClientOptions
+        {
+            Connection = RuntimeConnection.ForStdio(),
+        });
+        await lockObserver.StartAsync();
+        await TestHelper.WaitForConditionAsync(
+            async () =>
+            {
+                var result = await lockObserver.Rpc.Sessions.CheckInUseAsync([sessionId]);
+                return result.InUse.Contains(sessionId);
+            },
+            timeout: PendingWorkTimeout,
+            timeoutMessage: $"Timed out waiting for session '{sessionId}' to acquire its lock.");
+
+        await suspendedClient.ForceStopAsync();
+
+        await TestHelper.WaitForConditionAsync(
+            async () =>
+            {
+                var result = await lockObserver.Rpc.Sessions.CheckInUseAsync([sessionId]);
+                return !result.InUse.Contains(sessionId);
+            },
+            timeout: PendingWorkTimeout,
+            timeoutMessage: $"Timed out waiting for session '{sessionId}' to release its lock.");
+    }
+
     private async Task AssertPendingExternalToolHandleableOnResumeAsync(
         bool disconnectOriginalClient,
         bool expectedSessionWasActive,
         bool expectedHandleResult)
+        => await WithSdkDiagnosticsAsync(async () =>
     {
         var originalToolStarted = new TaskCompletionSource<string>(TaskCreationOptions.RunContinuationsAsynchronously);
         var releaseOriginalTool = new TaskCompletionSource<string>(TaskCreationOptions.RunContinuationsAsynchronously);
@@ -210,30 +243,7 @@ await session1.SendAsync(new MessageOptions
 
             if (disconnectOriginalClient)
             {
-                await using var lockObserver = Ctx.CreateClient(options: new CopilotClientOptions
-                {
-                    Connection = RuntimeConnection.ForStdio(),
-                });
-                await lockObserver.StartAsync();
-                await TestHelper.WaitForConditionAsync(
-                    async () =>
-                    {
-                        var result = await lockObserver.Rpc.Sessions.CheckInUseAsync([sessionId]);
-                        return result.InUse.Contains(sessionId);
-                    },
-                    timeout: PendingWorkTimeout,
-                    timeoutMessage: $"Timed out waiting for session '{sessionId}' to acquire its lock.");
-
-                await suspendedClient.ForceStopAsync();
-
-                await TestHelper.WaitForConditionAsync(
-                    async () =>
-                    {
-                        var result = await lockObserver.Rpc.Sessions.CheckInUseAsync([sessionId]);
-                        return !result.InUse.Contains(sessionId);
-                    },
-                    timeout: PendingWorkTimeout,
-                    timeoutMessage: $"Timed out waiting for session '{sessionId}' to release its lock.");
+                await ForceStopAfterSessionLockObservedAsync(suspendedClient, sessionId);
             }
 
             await using var resumedClient = Ctx.CreateClient(options: new CopilotClientOptions { Connection = RuntimeConnection.ForUri(cliUrl, connectionToken: SharedToken) });
@@ -307,10 +317,11 @@ async Task<string> BlockingExternalTool(
         [Description("Looks up a value after resumption")]
         string ResumedExternalTool([Description("Value to look up")] string value) =>
             throw new InvalidOperationException("Resumed-session handler should not be invoked");
-    }
+    });
 
     [Fact]
     public async Task Should_Continue_Parallel_Pending_External_Tool_Requests_After_Resume()
+        => await WithSdkDiagnosticsAsync(async () =>
     {
         var originalToolAStarted = new TaskCompletionSource<string>(TaskCreationOptions.RunContinuationsAsynchronously);
         var originalToolBStarted = new TaskCompletionSource<string>(TaskCreationOptions.RunContinuationsAsynchronously);
@@ -441,7 +452,7 @@ async Task<string> BlockingToolB(
             originalToolBStarted.TrySetResult(value);
             return await releaseOriginalToolB.Task.WaitAsync(Timeout.InfiniteTimeSpan, cancellationToken);
         }
-    }
+    });
 
     [Fact]
     public async Task Should_Resume_Successfully_When_No_Pending_Work_Exists()
diff --git a/dotnet/test/E2E/PermissionE2ETests.cs b/dotnet/test/E2E/PermissionE2ETests.cs
index 78e792c2c2..77b0e588ff 100644
--- a/dotnet/test/E2E/PermissionE2ETests.cs
+++ b/dotnet/test/E2E/PermissionE2ETests.cs
@@ -5,6 +5,7 @@
 using GitHub.Copilot.Rpc;
 using GitHub.Copilot.Test.Harness;
 using Microsoft.Extensions.AI;
+using Microsoft.Extensions.Logging;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using Xunit;
@@ -173,23 +174,64 @@ internal static async Task AssertApproveAllPermissionHandlerAsync(CopilotSession
     [Fact]
     public async Task Should_Handle_Async_Permission_Handler()
     {
+        await Ctx.ConfigureForTestAsync("permissions", "Should_Handle_Async_Permission_Handler_Dotnet");
+
+        const string toolName = "async_permission_echo";
+        const string expectedResult = "DOTNET_ASYNC_PERMISSION_RESULT";
         var permissionRequestReceived = false;
-        var session = await CreateSessionAsync(new SessionConfig
+        var toolCalls = 0;
+        string? permissionToolCallId = null;
+        CopilotSession? session = null;
+        session = await CreateSessionAsync(new SessionConfig
         {
+            Tools =
+            [
+                AIFunctionFactory.Create(
+                    Echo,
+                    toolName,
+                    "Returns the result for the asynchronous permission test.",
+                    serializerOptions: PermissionJsonContext.Default.Options),
+            ],
+            AvailableTools = [toolName],
             OnPermissionRequest = async (request, invocation) =>
             {
-                permissionRequestReceived = true;
+                var customToolRequest = Assert.IsType<PermissionRequestCustomTool>(request);
+                Assert.Equal(toolName, customToolRequest.ToolName);
+                Assert.Equal(session!.SessionId, invocation.SessionId);
+                Assert.False(string.IsNullOrWhiteSpace(customToolRequest.ToolCallId));
+                permissionToolCallId = customToolRequest.ToolCallId;
                 await Task.Yield();
+                permissionRequestReceived = true;
                 return PermissionDecision.ApproveOnce();
             }
         });
 
-        await TestHelper.SendAndGetFinalAssistantMessageAsync(session, new MessageOptions
+        ToolExecutionCompleteEvent? toolCompleted = null;
+        using var subscription = session.On<ToolExecutionCompleteEvent>(evt =>
+        {
+            if (evt.Data.ToolCallId == permissionToolCallId)
+            {
+                toolCompleted = evt;
+            }
+        });
+        var message = await TestHelper.SendAndGetFinalAssistantMessageAsync(session, new MessageOptions
         {
-            Prompt = "Run 'echo test' and tell me what happens"
+            Prompt = "Call async_permission_echo once and reply with only its returned text."
         });
 
         Assert.True(permissionRequestReceived, "Permission request should have been received");
+        Assert.Equal(1, toolCalls);
+        Assert.NotNull(toolCompleted);
+        Assert.True(toolCompleted.Data.Success);
+        Assert.Equal(expectedResult, toolCompleted.Data.Result?.Content);
+        Assert.Contains(expectedResult, message.Data.Content);
+
+        string Echo()
+        {
+            Assert.True(permissionRequestReceived, "The yielding permission handler must finish before the tool runs.");
+            Interlocked.Increment(ref toolCalls);
+            return expectedResult;
+        }
     }
 
     [Fact]
@@ -330,6 +372,7 @@ public async Task Should_Receive_ToolCallId_In_Permission_Requests()
 
     [Fact]
     public async Task Should_Wait_For_Slow_Permission_Handler()
+        => await WithSdkDiagnosticsAsync(async () =>
     {
         var handlerEntered = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
         var releaseHandler = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
@@ -388,7 +431,21 @@ void AddLifecycleEvent(string phase, string? toolCallId)
 
         releaseHandler.SetResult();
 
-        var message = await sendTask;
+        AssistantMessageEvent? message;
+        try
+        {
+            message = await sendTask;
+        }
+        catch (TimeoutException)
+        {
+            lock (lifecycleLock)
+            {
+                Logger.LogWarning(
+                    "Slow-permission timeout lifecycle: {Lifecycle}",
+                    string.Join(", ", lifecycle.Select(evt => $"{evt.Phase}:{evt.ToolCallId}")));
+            }
+            throw;
+        }
         var persistedEvents = await WaitForPersistedEventsAsync(
             session,
             events =>
@@ -424,7 +481,7 @@ void AddLifecycleEvent(string phase, string? toolCallId)
 
         // The tool should have actually run after permission was granted
         Assert.Contains("slow_handler_test", message?.Data.Content ?? string.Empty);
-    }
+    });
 
     [Fact]
     public async Task Should_Handle_Concurrent_Permission_Requests_From_Parallel_Tools()
diff --git a/dotnet/test/E2E/RuntimeHostE2ETests.cs b/dotnet/test/E2E/RuntimeHostE2ETests.cs
index 231f29c733..690e925653 100644
--- a/dotnet/test/E2E/RuntimeHostE2ETests.cs
+++ b/dotnet/test/E2E/RuntimeHostE2ETests.cs
@@ -44,6 +44,8 @@ private sealed class Application(E2ETestContext context, CopilotClient client)
         public CopilotSession? Session;
         public int Creates;
         public int Resumes;
+        public string? CreateSessionId;
+        public string? ResumeSessionId;
         public int ToolCalls;
         public readonly ConcurrentQueue<string> HookSessions = new();
         public readonly ConcurrentQueue<CopilotSession> Releases = new();
@@ -82,8 +84,12 @@ private string MagicNumber([Description("A seed value")] string seed)
                 Interlocked.Increment(ref Creates);
                 Assert.False(request.CancellationToken.IsCancellationRequested);
                 Assert.Equal(context.WorkDir, request.Config.WorkingDirectory);
+                CreateSessionId = request.Config.SessionId;
+                Assert.False(string.IsNullOrEmpty(CreateSessionId));
                 Configure(request.Config);
-                return Session = await context.CreateSessionAsync(client, request.Config);
+                Session = await context.CreateSessionAsync(client, request.Config);
+                Assert.Equal(CreateSessionId, Session.SessionId);
+                return Session;
             },
             ResumeSession = async request =>
             {
@@ -91,8 +97,11 @@ private string MagicNumber([Description("A seed value")] string seed)
                 Assert.False(request.CancellationToken.IsCancellationRequested);
                 Assert.False(request.Config.ContinuePendingWork);
                 Assert.Equal(context.WorkDir, request.Config.WorkingDirectory);
+                ResumeSessionId = request.SessionId;
                 Configure(request.Config);
-                return Session = await context.ResumeSessionAsync(client, request.SessionId, request.Config);
+                Session = await context.ResumeSessionAsync(client, request.SessionId, request.Config);
+                Assert.Equal(ResumeSessionId, Session.SessionId);
+                return Session;
             },
             OnSessionReleased = session =>
             {
@@ -166,7 +175,8 @@ public async Task Creates_Or_Publishes_Exact_Application_Session(bool publish)
             var created = await ahp.RequestAsync(new() { ["op"] = "create", ["clientId"] = clientId, ["workDir"] = Ctx.WorkDir });
             sessionId = created.GetProperty("sessionId").GetString()!;
             Assert.Equal(1, app.Creates);
-            Assert.Equal(sessionId, app.Session!.SessionId);
+            Assert.Equal(app.CreateSessionId, app.Session!.SessionId);
+            Assert.NotEqual(sessionId, app.Session.SessionId);
         }
         var response = await ahp.RequestAsync(new()
         {
@@ -176,7 +186,7 @@ public async Task Creates_Or_Publishes_Exact_Application_Session(bool publish)
             ["prompt"] = ToolPrompt
         });
         Assert.Contains("MAGIC_hello_42", response.GetProperty("text").GetString());
-        await AssertApplicationAsync(app, sessionId);
+        await AssertApplicationAsync(app, app.Session!.SessionId);
         await Task.WhenAll(host.DisposeAsync().AsTask(), host.DisposeAsync().AsTask());
         await ahp.RequestAsync(new() { ["op"] = "stopped", ["clientId"] = clientId, ["url"] = host.Url });
         if (publish)
@@ -215,6 +225,9 @@ public async Task Resumes_After_Runtime_Restart_And_Composes_Tools()
                 ["clientTools"] = true
             });
             sessionId = created.GetProperty("sessionId").GetString()!;
+            Assert.Equal(1, first.Creates);
+            Assert.Equal(first.CreateSessionId, first.Session!.SessionId);
+            Assert.NotEqual(sessionId, first.Session.SessionId);
             var answer = await ahp.RequestAsync(new()
             {
                 ["op"] = "turn",
@@ -247,7 +260,8 @@ public async Task Resumes_After_Runtime_Restart_And_Composes_Tools()
             .Select(turn => turn.GetProperty("message").GetProperty("text").GetString()));
         Assert.Equal(0, resumed.Creates);
         Assert.Equal(1, resumed.Resumes);
-        Assert.Equal(sessionId, resumed.Session!.SessionId);
+        Assert.Equal(first.Session!.SessionId, resumed.ResumeSessionId);
+        Assert.Equal(first.Session.SessionId, resumed.Session!.SessionId);
         Assert.NotSame(first.Session, resumed.Session);
         var response = await ahp.RequestAsync(new()
         {
@@ -260,7 +274,7 @@ public async Task Resumes_After_Runtime_Restart_And_Composes_Tools()
         Assert.Contains("MAGIC_hello_42", response.GetProperty("text").GetString());
         Assert.Contains("CLIENT_ECHO_ping", response.GetProperty("text").GetString());
         Assert.Equal(1, response.GetProperty("clientToolCalls").GetInt32());
-        await AssertApplicationAsync(resumed, sessionId);
+        await AssertApplicationAsync(resumed, first.Session.SessionId);
         await replacement.DisposeAsync();
         await ahp.RequestAsync(new() { ["op"] = "stopped", ["clientId"] = clientId, ["url"] = replacement.Url });
         await resumed.Released.Task.WaitAsync(TimeSpan.FromSeconds(10));
diff --git a/dotnet/test/E2E/ScenarioTestingProvidersE2ETests.cs b/dotnet/test/E2E/ScenarioTestingProvidersE2ETests.cs
index 13270d3e43..da8f0eccf2 100644
--- a/dotnet/test/E2E/ScenarioTestingProvidersE2ETests.cs
+++ b/dotnet/test/E2E/ScenarioTestingProvidersE2ETests.cs
@@ -281,7 +281,7 @@ public async Task Should_Ignore_Failing_Unselected_Provider_But_Surface_Selected
                 Prompt = "This selected provider should fail.",
             }));
         Assert.Contains("offline", failure.ToString(), StringComparison.OrdinalIgnoreCase);
-        Assert.Contains(handler.InferenceRequests, request => request.Host == "offline.scenario.invalid");
+        Assert.Single(handler.InferenceRequests, request => request.Host == "offline.scenario.invalid");
     }
 
     private CopilotClient CreateProviderClient(ScenarioProviderRequestHandler handler) =>
@@ -385,7 +385,8 @@ protected override async Task<HttpResponseMessage> SendRequestAsync(
 
         if (string.Equals(uri.Host, failingHost, StringComparison.Ordinal))
         {
-            return new HttpResponseMessage(HttpStatusCode.BadGateway)
+            // Provider selection is the contract here, not transient-error retry backoff.
+            return new HttpResponseMessage(HttpStatusCode.BadRequest)
             {
                 Content = new StringContent(
                     "{\"error\":{\"message\":\"offline scenario provider\"}}",
diff --git a/dotnet/test/E2E/SessionE2ETests.cs b/dotnet/test/E2E/SessionE2ETests.cs
index 9855bc8eae..c3b9e7bdd9 100644
--- a/dotnet/test/E2E/SessionE2ETests.cs
+++ b/dotnet/test/E2E/SessionE2ETests.cs
@@ -476,15 +476,22 @@ public async Task Should_Receive_Session_Events()
 
     [Fact]
     public async Task Send_Returns_Immediately_While_Events_Stream_In_Background()
+        => await WithSdkDiagnosticsAsync(async () =>
     {
-        var session = await CreateSessionAsync(new SessionConfig
+        // Reuse a custom-tool capture instead of depending on a native shell completing within its wait.
+        await Ctx.ConfigureForTestAsync(
+            "pending_work_resume", "should_continue_pending_external_tool_request_after_resume", replayOnly: true);
+        var toolStarted = new TaskCompletionSource<string>(TaskCreationOptions.RunContinuationsAsynchronously);
+        var releaseTool = new TaskCompletionSource<string>(TaskCreationOptions.RunContinuationsAsynchronously);
+        await using var session = await CreateSessionAsync(new SessionConfig
         {
+            Tools = [AIFunctionFactory.Create(BlockingTool, "resume_external_tool")],
             OnPermissionRequest = PermissionHandler.ApproveAll,
         });
         var events = new ConcurrentQueue<string>();
         AssistantMessageEvent? message = null;
 
-        session.On<SessionEvent>(evt =>
+        using var subscription = session.On<SessionEvent>(evt =>
         {
             events.Enqueue(evt.Type);
             if (evt is AssistantMessageEvent assistantMessage)
@@ -494,19 +501,36 @@ public async Task Send_Returns_Immediately_While_Events_Stream_In_Background()
         });
         var idle = TestHelper.GetNextEventOfTypeAsync<SessionIdleEvent>(session);
 
-        // Use a slow command so we can verify SendAsync() returns before completion
-        await session.SendAsync(new MessageOptions { Prompt = "Run 'sleep 2 && echo done'" });
-
-        // SendAsync() should return before turn completes (no session.idle yet)
-        Assert.DoesNotContain("session.idle", events);
-
-        // Wait for turn to complete
-        await idle;
+        try
+        {
+            var send = session.SendAsync(new MessageOptions
+            {
+                Prompt = "Use resume_external_tool with value 'beta', then reply with the result.",
+            });
+            Assert.Equal("beta", await toolStarted.Task.WaitAsync(TimeSpan.FromSeconds(60)));
+            await send.WaitAsync(TimeSpan.FromSeconds(60));
+            Assert.DoesNotContain("session.idle", events);
+            Assert.False(idle.IsCompleted);
+
+            releaseTool.TrySetResult("EXTERNAL_RESUMED_BETA");
+            await idle;
+
+            Assert.Contains("EXTERNAL_RESUMED_BETA", message?.Data.Content ?? string.Empty);
+            Assert.Contains("session.idle", events);
+            Assert.Contains("assistant.message", events);
+        }
+        finally
+        {
+            releaseTool.TrySetResult("EXTERNAL_RESUMED_BETA");
+        }
 
-        Assert.Contains("done", message?.Data.Content ?? string.Empty);
-        Assert.Contains("session.idle", events);
-        Assert.Contains("assistant.message", events);
-    }
+        [Description("Blocks until the test releases the active turn")]
+        async Task<string> BlockingTool([Description("Value to return")] string value, CancellationToken cancellationToken)
+        {
+            toolStarted.TrySetResult(value);
+            return await releaseTool.Task.WaitAsync(Timeout.InfiniteTimeSpan, cancellationToken);
+        }
+    });
 
     [Fact]
     public async Task SendAndWait_Blocks_Until_Session_Idle_And_Returns_Final_Assistant_Message()
diff --git a/dotnet/test/E2E/SkillProviderE2ETests.cs b/dotnet/test/E2E/SkillProviderE2ETests.cs
new file mode 100644
index 0000000000..3b2d593824
--- /dev/null
+++ b/dotnet/test/E2E/SkillProviderE2ETests.cs
@@ -0,0 +1,418 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+using System.Collections.Concurrent;
+using System.Reflection;
+using GitHub.Copilot.Rpc;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace GitHub.Copilot.Test.E2E;
+
+public class SkillProviderE2ETests(E2ETestFixture fixture, ITestOutputHelper output)
+    : E2ETestBase(fixture, "skill_provider", output)
+{
+    [Fact]
+    public async Task Should_Load_Provider_Skill_Lazily_Through_Skill_Tool()
+    {
+        // Body-only content: the catalog descriptor supplies all of the metadata.
+        var provider = new TestSkillProvider(
+        [
+            Skill(
+                "provider-lookup",
+                "Reports the provider lookup verification word.",
+                "# Provider lookup\n\nThe verification word is TANGERINE_QUARTZ_19. Reply with it.\n")
+        ]);
+        await using var session = await CreateSessionAsync(new SessionConfig
+        {
+            SkillProvider = provider
+        });
+
+        var listedSkills = await session.Rpc.Skills.ListAsync();
+        var listed = Assert.Single(listedSkills.Skills, skill => skill.Name == "provider-lookup");
+        Assert.Equal(SkillSource.Sdk, listed.Source);
+        Assert.True(listed.Enabled);
+        Assert.True(string.IsNullOrEmpty(listed.Path));
+        Assert.Empty(provider.Reads);
+
+        var message = await session.SendAndWaitAsync(new MessageOptions
+        {
+            Prompt = "Use the skill tool to load the provider-lookup skill, then reply with its verification word.",
+        }, TimeSpan.FromMinutes(3));
+
+        Assert.Equal(["provider-lookup"], provider.Reads);
+        Assert.NotNull(message);
+        // Validate the final assistant response arrived (guards against truncated captures)
+        Assert.Contains("TANGERINE_QUARTZ_19", message!.Data.Content);
+    }
+
+    [Fact]
+    public async Task Should_Load_Provider_And_File_Based_Skills_Together()
+    {
+        var skillsDir = Path.Join(Ctx.WorkDir, "file-skills");
+        if (Directory.Exists(skillsDir))
+        {
+            Directory.Delete(skillsDir, recursive: true);
+        }
+
+        Directory.CreateDirectory(Path.Join(skillsDir, "file-notes"));
+        File.WriteAllText(
+            Path.Join(skillsDir, "file-notes", "SKILL.md"),
+            "---\nname: file-notes\ndescription: Reports the file notes verification word.\n---\n\nThe file notes verification word is MAPLE_FALCON_27.\n");
+
+        // Frontmatter may restate catalog metadata and is the only source of allowed-tools.
+        var provider = new TestSkillProvider(
+        [
+            Skill(
+                "provider-audit",
+                "Reports the provider audit verification word.",
+                "---\nname: provider-audit\nallowed-tools: view\n---\n\nThe provider audit verification word is COBALT_HERON_58.\n")
+        ]);
+        await using var session = await CreateSessionAsync(new SessionConfig
+        {
+            SkillDirectories = [skillsDir],
+            SkillProvider = provider
+        });
+
+        var listedSkills = await session.Rpc.Skills.ListAsync();
+        var fileSkill = Assert.Single(listedSkills.Skills, skill => skill.Name == "file-notes");
+        var providerSkill = Assert.Single(listedSkills.Skills, skill => skill.Name == "provider-audit");
+        Assert.NotEqual(SkillSource.Sdk, fileSkill.Source);
+        Assert.False(string.IsNullOrWhiteSpace(fileSkill.Path));
+        Assert.Equal(SkillSource.Sdk, providerSkill.Source);
+
+        var message = await session.SendAndWaitAsync(new MessageOptions
+        {
+            Prompt = "Use the skill tool to load the file-notes skill and the provider-audit skill, then reply with both verification words.",
+        }, TimeSpan.FromMinutes(3));
+
+        Assert.Equal(["provider-audit"], provider.Reads);
+        Assert.NotNull(message);
+        Assert.Contains("MAPLE_FALCON_27", message!.Data.Content);
+        // Validate the final assistant response arrived (guards against truncated captures)
+        Assert.Contains("COBALT_HERON_58", message.Data.Content);
+    }
+
+    [Fact]
+    public async Task Should_Rebind_Skill_Provider_On_Resume()
+    {
+        var original = new TestSkillProvider(
+        [
+            Skill(
+                "rebind-check",
+                "Reports the rebind verification word.",
+                "The rebind verification word is AMBER_ALPHA_11.\n")
+        ]);
+        var replacement = new TestSkillProvider(
+        [
+            Skill(
+                "rebind-check",
+                "Reports the rebind verification word.",
+                "The rebind verification word is BRONZE_BETA_22.\n")
+        ]);
+        var first = await CreateSessionAsync(new SessionConfig
+        {
+            SkillProvider = original
+        });
+        var sessionId = first.SessionId;
+        var ready = await first.SendAndWaitAsync(new MessageOptions
+        {
+            Prompt = "Without using any tools or skills, reply with exactly REBIND_READY.",
+        }, TimeSpan.FromMinutes(3));
+        Assert.NotNull(ready);
+        Assert.Contains("REBIND_READY", ready!.Data.Content);
+
+        await first.DisposeAsync();
+        Assert.Empty(original.Reads);
+        var originalCallsBeforeResume = original.Calls.Count;
+
+        await using var session = await ResumeSessionAsync(sessionId, new ResumeSessionConfig
+        {
+            SkillProvider = replacement
+        });
+
+        var message = await session.SendAndWaitAsync(new MessageOptions
+        {
+            Prompt = "Use the skill tool to load the rebind-check skill, then reply with its verification word.",
+        }, TimeSpan.FromMinutes(3));
+
+        Assert.Equal(["rebind-check"], replacement.Reads);
+        Assert.Equal(originalCallsBeforeResume, original.Calls.Count);
+        Assert.NotNull(message);
+        // Validate the final assistant response arrived (guards against truncated captures)
+        Assert.Contains("BRONZE_BETA_22", message!.Data.Content);
+        Assert.DoesNotContain("AMBER_ALPHA_11", message.Data.Content);
+    }
+
+    [Fact]
+    public async Task Should_Report_Provider_Read_Failure_Without_Leaking_Details()
+    {
+        const string secret = "PROVIDER_SECRET_7F3A9C";
+        var provider = new TestSkillProvider(
+        [
+            new ProvidedSkill(
+                new SkillProviderDescriptor
+                {
+                    Name = "broken-lookup",
+                    Description = "Reports the broken lookup verification word.",
+                },
+                () => throw new InvalidOperationException($"database unavailable: {secret}"))
+        ]);
+        var events = new ConcurrentQueue<SessionEvent>();
+        await using var session = await CreateSessionAsync(new SessionConfig
+        {
+            SkillProvider = provider,
+            OnEvent = events.Enqueue
+        });
+
+        var message = await session.SendAndWaitAsync(new MessageOptions
+        {
+            Prompt = "Use the skill tool to load the broken-lookup skill. If loading fails, reply with exactly LOAD_FAILED.",
+        }, TimeSpan.FromMinutes(3));
+
+        Assert.Contains("broken-lookup", provider.Reads);
+        var failures = events
+            .OfType<ToolExecutionCompleteEvent>()
+            .Where(evt => !evt.Data.Success)
+            .ToArray();
+        var failure = Assert.Single(failures);
+        Assert.DoesNotContain(secret, string.Join("\n", events.Select(evt => evt.ToJson())), StringComparison.Ordinal);
+        Assert.NotNull(failure.Data.Error);
+        Assert.NotNull(message);
+        // Validate the final assistant response arrived (guards against truncated captures)
+        Assert.Contains("LOAD_FAILED", message!.Data.Content);
+    }
+
+    [Fact]
+    public async Task Should_Report_Missing_Provider_Skill_As_Not_Found()
+    {
+        var provider = new TestSkillProvider(
+        [
+            new ProvidedSkill(
+                new SkillProviderDescriptor
+                {
+                    Name = "vanished-lookup",
+                    Description = "Reports the vanished lookup verification word.",
+                },
+                () => null)
+        ]);
+        var events = new ConcurrentQueue<SessionEvent>();
+        await using var session = await CreateSessionAsync(new SessionConfig
+        {
+            SkillProvider = provider,
+            OnEvent = events.Enqueue
+        });
+
+        var message = await session.SendAndWaitAsync(new MessageOptions
+        {
+            Prompt = "Use the skill tool to load the vanished-lookup skill. If loading fails, reply with exactly LOAD_FAILED.",
+        }, TimeSpan.FromMinutes(3));
+
+        Assert.Contains("vanished-lookup", provider.Reads);
+        var failures = events
+            .OfType<ToolExecutionCompleteEvent>()
+            .Where(evt => !evt.Data.Success)
+            .ToArray();
+        var failure = Assert.Single(failures);
+        Assert.Contains("not found", failure.ToJson(), StringComparison.OrdinalIgnoreCase);
+        Assert.NotNull(message);
+        // Validate the final assistant response arrived (guards against truncated captures)
+        Assert.Contains("LOAD_FAILED", message!.Data.Content);
+    }
+
+    [Fact]
+    public async Task Should_Keep_Provider_Dormant_When_Skills_Disabled()
+    {
+        var provider = new TestSkillProvider(
+        [
+            Skill("dormant-lookup", "Never listed.", "Never read.\n")
+        ]);
+        await using var session = await CreateSessionAsync(new SessionConfig
+        {
+            EnableSkills = false,
+            SkillProvider = provider
+        });
+
+        await session.Rpc.Skills.EnsureLoadedAsync();
+        var listedSkills = await session.Rpc.Skills.ListAsync();
+
+        Assert.DoesNotContain(listedSkills.Skills, skill => skill.Source == SkillSource.Sdk);
+        Assert.Empty(provider.Calls);
+    }
+
+    [Fact]
+    public async Task Should_Unbind_Provider_When_Resumed_Without_One()
+    {
+        var provider = new TestSkillProvider(
+        [
+            Skill("unbound-lookup", "Reports the unbound lookup word.", "Unbound.\n")
+        ]);
+        var first = await CreateSessionAsync(new SessionConfig
+        {
+            SkillProvider = provider
+        });
+        var before = await first.Rpc.Skills.ListAsync();
+        Assert.Contains(before.Skills, skill => skill.Name == "unbound-lookup");
+        var callsBeforeResume = provider.Calls.Count;
+
+        UntrackSessionWithoutDetach(first);
+
+        CopilotSession? session = null;
+        try
+        {
+            session = await Ctx.ResumeSessionAsync(Client, first.SessionId, new ResumeSessionConfig
+            {
+                OnPermissionRequest = PermissionHandler.ApproveAll,
+            });
+
+            await session.Rpc.Skills.ReloadAsync();
+            var listedSkills = await session.Rpc.Skills.ListAsync();
+
+            Assert.DoesNotContain(listedSkills.Skills, skill => skill.Source == SkillSource.Sdk);
+            Assert.Equal(callsBeforeResume, provider.Calls.Count);
+        }
+        finally
+        {
+            if (session is not null)
+            {
+                await session.DisposeAsync();
+            }
+
+            await first.DisposeAsync();
+        }
+    }
+
+    [Fact]
+    public async Task Should_Cancel_A_Blocked_Provider_Call_When_The_Session_Is_Disposed()
+    {
+        var provider = new BlockingSkillProvider();
+        var session = await CreateSessionAsync(new SessionConfig
+        {
+            SkillProvider = provider
+        });
+
+        // The list RPC may fail or omit provider skills once the binding is removed;
+        // only the provider's cancellation matters here.
+        var list = session.Rpc.Skills.ListAsync();
+        await provider.Entered.WaitAsync(TimeSpan.FromSeconds(30));
+
+        await session.DisposeAsync();
+
+        await provider.Cancelled.WaitAsync(TimeSpan.FromSeconds(10));
+        await Record.ExceptionAsync(() => list);
+    }
+
+    [Fact]
+    public async Task Should_Reject_Skill_Provider_For_Cloud_Sessions()
+    {
+        var provider = new TestSkillProvider(
+        [
+            Skill("cloud-lookup", "Never listed.", "Never read.\n")
+        ]);
+
+        var exception = await Assert.ThrowsAsync<ArgumentException>(() =>
+            Client.CreateSessionAsync(new SessionConfig
+            {
+                Cloud = new CloudSessionOptions(),
+                SkillProvider = provider,
+            }));
+
+        Assert.Equal("Skill providers are not supported for cloud sessions.", exception.Message);
+        Assert.Empty(provider.Calls);
+    }
+
+    private static ProvidedSkill Skill(string name, string description, string markdown) =>
+        new(
+            new SkillProviderDescriptor
+            {
+                Name = name,
+                Description = description,
+            },
+            () => markdown);
+
+    private static void UntrackSessionWithoutDetach(CopilotSession session)
+    {
+        // Match a warm runtime resume: remove the SDK wrapper so resume is allowed, but do not detach the runtime session.
+        var removeFromClient = typeof(CopilotSession).GetMethod(
+            "RemoveFromClient",
+            BindingFlags.Instance | BindingFlags.NonPublic)
+            ?? throw new InvalidOperationException("CopilotSession.RemoveFromClient was not found.");
+        removeFromClient.Invoke(session, null);
+    }
+
+    private sealed record ProvidedSkill(SkillProviderDescriptor Descriptor, Func<string?> Read);
+
+    private sealed class BlockingSkillProvider : ISkillProvider
+    {
+        private readonly TaskCompletionSource _entered = new(TaskCreationOptions.RunContinuationsAsynchronously);
+        private readonly TaskCompletionSource _cancelled = new(TaskCreationOptions.RunContinuationsAsynchronously);
+
+        public Task Entered => _entered.Task;
+
+        public Task Cancelled => _cancelled.Task;
+
+        public async Task<IReadOnlyList<SkillProviderDescriptor>> ListSkillsAsync(CancellationToken cancellationToken)
+        {
+            _entered.TrySetResult();
+            try
+            {
+                await Task.Delay(Timeout.Infinite, cancellationToken);
+            }
+            catch (OperationCanceledException) when (cancellationToken.IsCancellationRequested)
+            {
+                // Not a token callback: if cancellation resumes this method inline, disposing
+                // a registration whose callback has not run yet drops it.
+                _cancelled.TrySetResult();
+                throw;
+            }
+
+            return [];
+        }
+
+        public Task<string?> ReadSkillAsync(string name, CancellationToken cancellationToken) =>
+            Task.FromResult<string?>(null);
+    }
+
+    private sealed class TestSkillProvider(IReadOnlyList<ProvidedSkill> skills) : ISkillProvider
+    {
+        private readonly object _lock = new();
+        private readonly List<string> _calls = [];
+
+        public IReadOnlyList<string> Calls
+        {
+            get
+            {
+                lock (_lock)
+                {
+                    return [.. _calls];
+                }
+            }
+        }
+
+        public IReadOnlyList<string> Reads => Calls
+            .Where(call => call.StartsWith("read:", StringComparison.Ordinal))
+            .Select(call => call["read:".Length..])
+            .ToArray();
+
+        public Task<IReadOnlyList<SkillProviderDescriptor>> ListSkillsAsync(CancellationToken cancellationToken)
+        {
+            AddCall("list");
+            return Task.FromResult<IReadOnlyList<SkillProviderDescriptor>>(skills.Select(skill => skill.Descriptor).ToArray());
+        }
+
+        public Task<string?> ReadSkillAsync(string name, CancellationToken cancellationToken)
+        {
+            AddCall($"read:{name}");
+            return Task.FromResult(skills.FirstOrDefault(skill => skill.Descriptor.Name == name)?.Read());
+        }
+
+        private void AddCall(string call)
+        {
+            lock (_lock)
+            {
+                _calls.Add(call);
+            }
+        }
+    }
+}
diff --git a/dotnet/test/E2E/StructuredOutputE2ETests.cs b/dotnet/test/E2E/StructuredOutputE2ETests.cs
index b18e93b492..e82e31d008 100644
--- a/dotnet/test/E2E/StructuredOutputE2ETests.cs
+++ b/dotnet/test/E2E/StructuredOutputE2ETests.cs
@@ -392,6 +392,15 @@ public async Task Rejects_Unsupported_Or_Oversized_Schemas_Before_Admission()
         {
             var config = StructuredSessionConfig();
             config.Model = model;
+            config.EnableExperimentalMode = model == "hydrafusion";
+            if (model == "hydrafusion")
+            {
+                config.FeatureFlags = new Dictionary<string, bool>
+                {
+                    ["HYDRAFUSION"] = true,
+                    ["HYDRAFUSION_ROLLOUT"] = true,
+                };
+            }
             config.OnPermissionRequest = PermissionHandler.ApproveAll;
             await using var session = await Ctx.CreateSessionAsync(client, config);
             await Assert.ThrowsAsync<ArgumentException>(() => session.SendAndWaitAsync<CorrectionResult>(
diff --git a/dotnet/test/GitHub.Copilot.SDK.Test.csproj b/dotnet/test/GitHub.Copilot.SDK.Test.csproj
index 3f1c24f973..9c8b6fc9c5 100644
--- a/dotnet/test/GitHub.Copilot.SDK.Test.csproj
+++ b/dotnet/test/GitHub.Copilot.SDK.Test.csproj
@@ -16,6 +16,12 @@
     <JsonSerializerIsReflectionEnabledByDefault Condition="'$(TargetFramework)' == 'net8.0'">false</JsonSerializerIsReflectionEnabledByDefault>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net8.0'">
+    <!-- Restore the RID packs used by the offline MSBuild tool-package fixtures during setup. -->
+    <RuntimeIdentifiers Condition="'$(RuntimeIdentifier)' != ''">$(RuntimeIdentifier)</RuntimeIdentifiers>
+    <RuntimeIdentifiers Condition="'$(RuntimeIdentifier)' == ''">$(NETCoreSdkPortableRuntimeIdentifier)</RuntimeIdentifiers>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.Data.Sqlite" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
diff --git a/dotnet/test/Harness/E2ETestBase.cs b/dotnet/test/Harness/E2ETestBase.cs
index a9b18bf6cf..008bbc8074 100644
--- a/dotnet/test/Harness/E2ETestBase.cs
+++ b/dotnet/test/Harness/E2ETestBase.cs
@@ -6,6 +6,7 @@
 using GitHub.Copilot.Test.Harness;
 using Microsoft.Extensions.Logging;
 using System.Data;
+using System.Diagnostics;
 using System.Reflection;
 using Xunit;
 using Xunit.Abstractions;
@@ -18,6 +19,7 @@ public abstract class E2ETestBase : IClassFixture<E2ETestFixture>, IAsyncLifetim
     private readonly string _snapshotCategory;
     private readonly string _testName;
     private readonly bool _replayOnly;
+    private readonly ITestOutputHelper _output;
 
     protected E2ETestContext Ctx => _fixture.Ctx;
     protected CopilotClient Client => _fixture.Client;
@@ -32,10 +34,12 @@ protected E2ETestBase(
         _snapshotCategory = snapshotCategory;
         _testName = GetTestName(output);
         _replayOnly = replayOnly;
+        _output = output;
         Logger = new XunitLogger(output);
 
         // Wire logger into the shared context so all clients created via Ctx.CreateClient get it.
         Ctx.Logger = Logger;
+        Ctx.DiagnosticsEnabled = snapshotCategory is "pending_work_resume" or "session" or "permissions";
     }
 
     /// <summary>Logger that forwards warnings and above to xunit test output.</summary>
@@ -75,6 +79,53 @@ public Task DisposeAsync()
         return Ctx.CleanupAfterTestAsync();
     }
 
+    protected async Task WithSdkDiagnosticsAsync(Func<Task> test)
+    {
+        try
+        {
+            await test();
+        }
+        catch
+        {
+            using var process = new Process
+            {
+                StartInfo = new ProcessStartInfo("node")
+                {
+                    RedirectStandardOutput = true,
+                    RedirectStandardError = true,
+                    UseShellExecute = false,
+                    CreateNoWindow = true,
+                },
+            };
+            var started = false;
+            try
+            {
+                process.StartInfo.Arguments = string.Join(" ",
+                    new[] { Path.Join(FindTestHarnessDir(), "sdk-diagnostics.mjs"), Ctx.HomeDir }
+                        .Select(argument => "\"" + argument.Replace("\"", "\\\"") + "\""));
+                process.Start();
+                started = true;
+                var text = process.StandardOutput.ReadToEndAsync();
+                var errors = process.StandardError.ReadToEndAsync();
+                await Task.WhenAll(text, errors, process.WaitForExitAsync()).WaitAsync(TimeSpan.FromSeconds(5));
+                _output.WriteLine(process.ExitCode == 0 ? await text : "SDK diagnostics unavailable");
+            }
+            catch
+            {
+                try
+                {
+                    if (started && !process.HasExited) process.Kill(entireProcessTree: true);
+                }
+                catch (Exception error) when (error is InvalidOperationException or System.ComponentModel.Win32Exception)
+                {
+                    _output.WriteLine("SDK diagnostics collector cleanup failed");
+                }
+                _output.WriteLine("SDK diagnostics unavailable");
+            }
+            throw;
+        }
+    }
+
     /// <summary>
     /// Creates a session with a default config that approves all permissions.
     /// Convenience wrapper for E2E tests.
diff --git a/dotnet/test/Harness/E2ETestContext.cs b/dotnet/test/Harness/E2ETestContext.cs
index b399372717..f35fe7a659 100644
--- a/dotnet/test/Harness/E2ETestContext.cs
+++ b/dotnet/test/Harness/E2ETestContext.cs
@@ -25,6 +25,7 @@ public sealed class E2ETestContext : IAsyncDisposable
 
     /// <summary>Optional logger injected by tests; applied to all clients created via <see cref="CreateClient"/>.</summary>
     public ILogger? Logger { get; set; }
+    public bool DiagnosticsEnabled { get; set; }
 
     private readonly ReplayProxy _proxy;
     private readonly string _repoRoot;
@@ -84,7 +85,7 @@ await proxy.ConfigureAsync(
             await proxy.SetCopilotUserByTokenAsync(DefaultGitHubToken, new CopilotUserConfig(
                 Login: "e2e-test-user",
                 CopilotPlan: "individual_pro",
-                Endpoints: new CopilotUserEndpoints(Api: context.ProxyUrl, Telemetry: "https://localhost:1/telemetry"),
+                Endpoints: new CopilotUserEndpoints(Api: context.ProxyUrl, Telemetry: context.ProxyUrl),
                 AnalyticsTrackingId: "e2e-test-tracking-id", Id: 12345));
 
             return context;
@@ -302,6 +303,10 @@ public Dictionary<string, string> GetEnvironment()
         // disables the method (runtime filters out empty HMAC keys).
         env["COPILOT_HMAC_KEY"] = "";
         env["CAPI_HMAC_KEY"] = "";
+        if (DiagnosticsEnabled)
+        {
+            env["RUST_LOG"] = "error,sdk_diagnostics=debug";
+        }
 
         return env!;
     }
@@ -322,6 +327,10 @@ public CopilotClient CreateClient(
         options ??= new CopilotClientOptions();
 
         options.Logger ??= Logger;
+        if (DiagnosticsEnabled)
+        {
+            options.LogLevel = CopilotLogLevel.Debug;
+        }
 
         // Resolve the working directory the worker should run in. Child-process and
         // URI transports take it as a per-client option; the in-process transport
diff --git a/dotnet/test/Harness/E2ETestFixture.cs b/dotnet/test/Harness/E2ETestFixture.cs
index 9bc0efcf71..b66476670f 100644
--- a/dotnet/test/Harness/E2ETestFixture.cs
+++ b/dotnet/test/Harness/E2ETestFixture.cs
@@ -12,15 +12,15 @@ public class E2ETestFixture : IAsyncLifetime
     internal const string SharedTcpConnectionToken = "e2e-shared-token";
 
     public E2ETestContext Ctx { get; private set; } = null!;
-    public CopilotClient Client { get; private set; } = null!;
+    private CopilotClient? _client;
+    public CopilotClient Client => _client ??= Ctx.CreateClient(options: new CopilotClientOptions
+    {
+        Connection = CreateSharedConnection(E2ETestContext.UsesInProcessTransport),
+    }, persistent: true);
 
     public async Task InitializeAsync()
     {
         Ctx = await E2ETestContext.CreateAsync();
-        Client = Ctx.CreateClient(options: new CopilotClientOptions
-        {
-            Connection = CreateSharedConnection(E2ETestContext.UsesInProcessTransport),
-        }, persistent: true);
     }
 
     internal static RuntimeConnection CreateSharedConnection(bool useInProcessTransport) =>
diff --git a/dotnet/test/Harness/ReplayProxy.cs b/dotnet/test/Harness/ReplayProxy.cs
index 140642a2f7..6891aeae71 100644
--- a/dotnet/test/Harness/ReplayProxy.cs
+++ b/dotnet/test/Harness/ReplayProxy.cs
@@ -32,7 +32,7 @@ async Task<string> StartCoreAsync()
             {
                 FileName = "node",
                 WorkingDirectory = Path.Join(FindRepoRoot(), "test", "harness"),
-                Arguments = "--import tsx server.ts",
+                Arguments = "startup.mjs",
                 UseShellExecute = false,
                 RedirectStandardOutput = true,
                 RedirectStandardError = true,
@@ -89,7 +89,10 @@ async Task<string> StartCoreAsync()
             {
                 if (e.Data == null) return;
                 diagnostics.AppendError(e.Data);
-                Console.Error.WriteLine(e.Data);
+                if (!e.Data.StartsWith("[SDK proxy startup]", StringComparison.Ordinal))
+                {
+                    Console.Error.WriteLine(e.Data);
+                }
             };
 
             try
diff --git a/dotnet/test/Unit/AutoTierIdentityTests.cs b/dotnet/test/Unit/AutoTierIdentityTests.cs
new file mode 100644
index 0000000000..9ca10e346d
--- /dev/null
+++ b/dotnet/test/Unit/AutoTierIdentityTests.cs
@@ -0,0 +1,46 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+using System.Text.Json;
+using System.Text.Json.Serialization.Metadata;
+using GitHub.Copilot.Rpc;
+using Xunit;
+
+#pragma warning disable GHCP001 // Exercise the public model RPC projection.
+
+namespace GitHub.Copilot.Test.Unit;
+
+public class AutoTierIdentityTests
+{
+    private static readonly JsonSerializerOptions JsonOptions = new()
+    {
+        TypeInfoResolver = new DefaultJsonTypeInfoResolver(),
+    };
+
+    [Fact]
+    public void CaseDistinctTierIdsRemainDistinctAcrossCollectionsAndJson()
+    {
+        var custom = new AutoTier("BALANCE");
+        Assert.NotEqual(AutoTier.Balance, custom);
+        Assert.Equal(2, new HashSet<AutoTier> { AutoTier.Balance, custom }.Count);
+        Assert.Equal("\"BALANCE\"", JsonSerializer.Serialize(custom, JsonOptions));
+        Assert.Equal(custom, JsonSerializer.Deserialize<AutoTier>("\"BALANCE\"", JsonOptions));
+        Assert.Equal("balance", AutoTier.Balance.Value);
+
+        var rpc = JsonSerializer.Deserialize<CurrentModel>("""{"modelId":"auto","autoTier":"BALANCE"}""", JsonOptions);
+        Assert.NotNull(rpc);
+        Assert.Equal(custom, rpc.AutoTier);
+        Assert.NotEqual(AutoTier.Balance, rpc.AutoTier);
+    }
+
+    [Fact]
+    public void CaseDistinctRecommendationIdsRemainDistinct()
+    {
+        var custom = new RecommendedAutoTier("BALANCE");
+        Assert.NotEqual(RecommendedAutoTier.Balance, custom);
+        Assert.Equal(2, new HashSet<RecommendedAutoTier> { RecommendedAutoTier.Balance, custom }.Count);
+        Assert.Equal("\"BALANCE\"", JsonSerializer.Serialize(custom, JsonOptions));
+        Assert.Equal(custom, JsonSerializer.Deserialize<RecommendedAutoTier>("\"BALANCE\"", JsonOptions));
+    }
+}
diff --git a/dotnet/test/Unit/ClientSessionLifetimeTests.AhpHost.cs b/dotnet/test/Unit/ClientSessionLifetimeTests.AhpHost.cs
index f0b584af7b..9fdea1bc92 100644
--- a/dotnet/test/Unit/ClientSessionLifetimeTests.AhpHost.cs
+++ b/dotnet/test/Unit/ClientSessionLifetimeTests.AhpHost.cs
@@ -74,7 +74,7 @@ public async Task Ahp_Snapshots_Transport_Settings_Before_Connecting()
             }
         };
         var local = new HostLocalServerOptions { Hostname = "127.0.0.1", Port = 0, Token = "original", RequireConnectionToken = true };
-        var github = new HostGitHubEnvironmentOptions { Name = "original", ComputeId = "compute" };
+        var github = new HostGitHubEnvironmentOptions { Name = "original", ComputeId = "compute", RequireConnectionBinding = false };
         var pending = client.StartAhpHostAsync(new() { LocalServer = local, GitHubEnvironment = github });
         await connecting.Task.WaitAsync(TimeSpan.FromSeconds(10));
         try
@@ -85,6 +85,7 @@ public async Task Ahp_Snapshots_Transport_Settings_Before_Connecting()
             local.RequireConnectionToken = false;
             github.Name = "";
             github.ComputeId = "";
+            github.RequireConnectionBinding = true;
         }
         finally
         {
@@ -100,6 +101,7 @@ public async Task Ahp_Snapshots_Transport_Settings_Before_Connecting()
         var githubSettings = request.GetProperty("githubEnvironment");
         Assert.Equal("original", githubSettings.GetProperty("name").GetString());
         Assert.Equal("compute", githubSettings.GetProperty("computeId").GetString());
+        Assert.False(githubSettings.GetProperty("requireConnectionBinding").GetBoolean());
     }
 
     [Theory]
@@ -112,10 +114,12 @@ public async Task Ahp_Forwards_Explicit_Transports_And_Optional_Readiness(bool l
         await using var client = new CopilotClient(new() { Connection = RuntimeConnection.ForUri(server.Url) });
         await using var host = await client.StartAhpHostAsync(new()
         {
+            ComputeId = "compute",
             LocalServer = local ? new() { Hostname = "127.0.0.1", Port = 0, Token = "test-token", RequireConnectionToken = true } : null,
             GitHubEnvironment = github ? new() { Name = "test host", ComputeId = "compute" } : null
         });
         var request = Assert.Single(server.Requests, request => request.Method == "host.start").Params;
+        Assert.Equal("compute", request.GetProperty("computeId").GetString());
         Assert.Equal(local, request.TryGetProperty("localServer", out var localSettings) && localSettings.ValueKind == JsonValueKind.Object);
         Assert.Equal(github, request.TryGetProperty("githubEnvironment", out var githubSettings) && githubSettings.ValueKind == JsonValueKind.Object);
         foreach (var oldField in new[] { "hostname", "port", "token", "requireConnectionToken" })
@@ -136,6 +140,60 @@ public async Task Ahp_Forwards_Explicit_Transports_And_Optional_Readiness(bool l
         Assert.Null(host.Pid);
     }
 
+    [Fact]
+    public async Task Ahp_Legacy_Positional_Start_And_Additive_Request_Overloads()
+    {
+        await using var server = await FakeCopilotServer.StartAsync();
+        await using var client = new CopilotClient(new() { Connection = RuntimeConnection.ForUri(server.Url) });
+        await client.StartAsync();
+        var local = new HostLocalServerOptions { Port = 12345 };
+        var github = new HostGitHubEnvironmentOptions { Name = "host", ComputeId = "compute" };
+
+        await client.Rpc.Host.StartAsync("legacy", local, github, true, false, CancellationToken.None);
+        await client.Rpc.Host.StartAsync("defaults");
+        await client.Rpc.Host.StartAsync(new HostStartRequest
+        {
+            HostId = "request",
+            ComputeId = "compute",
+            LocalServer = local,
+            GitHubEnvironment = github,
+            SessionFactory = true,
+            ResumeFactory = false
+        }, CancellationToken.None);
+
+        var requests = server.Requests.Where(request => request.Method == "host.start").ToArray();
+        Assert.Equal(3, requests.Length);
+        var legacy = requests[0].Params;
+        Assert.Equal("legacy", legacy.GetProperty("hostId").GetString());
+        Assert.False(legacy.TryGetProperty("computeId", out _));
+        Assert.Equal("defaults", requests[1].Params.GetProperty("hostId").GetString());
+        Assert.False(requests[1].Params.TryGetProperty("localServer", out _));
+        var additive = requests[2].Params;
+        Assert.Equal("request", additive.GetProperty("hostId").GetString());
+        Assert.Equal("compute", additive.GetProperty("computeId").GetString());
+        foreach (var parameters in new[] { legacy, additive })
+        {
+            Assert.Equal(12345, parameters.GetProperty("localServer").GetProperty("port").GetInt32());
+            Assert.Equal("compute", parameters.GetProperty("githubEnvironment").GetProperty("computeId").GetString());
+            Assert.True(parameters.GetProperty("sessionFactory").GetBoolean());
+            Assert.False(parameters.GetProperty("resumeFactory").GetBoolean());
+        }
+    }
+
+    [Fact]
+    public async Task Ahp_List_Sessions_Uses_Owning_Host()
+    {
+        await using var server = await FakeCopilotServer.StartAsync();
+        await using var client = new CopilotClient(new() { Connection = RuntimeConnection.ForUri(server.Url) });
+        await using var host = await client.StartAhpHostAsync(new() { LocalServer = new() });
+
+        var result = await host.ListSessionsAsync();
+
+        Assert.Empty(result.Sessions);
+        var request = Assert.Single(server.Requests, request => request.Method == "host.listSessions").Params;
+        Assert.Equal(host.HostId, request.GetProperty("hostId").GetString());
+    }
+
     [Theory]
     [InlineData(true)]
     [InlineData(false)]
diff --git a/dotnet/test/Unit/ClientSessionLifetimeTests.CustomizationDirectories.cs b/dotnet/test/Unit/ClientSessionLifetimeTests.CustomizationDirectories.cs
new file mode 100644
index 0000000000..7e7aee511f
--- /dev/null
+++ b/dotnet/test/Unit/ClientSessionLifetimeTests.CustomizationDirectories.cs
@@ -0,0 +1,157 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+
+#if NET8_0_OR_GREATER
+using GitHub.Copilot.Rpc;
+using Xunit;
+
+namespace GitHub.Copilot.Test.Unit;
+
+public sealed partial class ClientSessionLifetimeTests
+{
+    [Fact]
+    public async Task CustomizationDirectories_Preserve_Positional_Discovery_Calls()
+    {
+        await using var server = await FakeCopilotServer.StartAsync();
+        server.ResponseFactory = _ => new Dictionary<string, object?>
+        {
+            ["agents"] = Array.Empty<object>(),
+            ["hooks"] = Array.Empty<object>(),
+            ["sources"] = Array.Empty<object>(),
+            ["paths"] = Array.Empty<object>()
+        };
+        await using var client = new CopilotClient(new CopilotClientOptions
+        {
+            Connection = RuntimeConnection.ForUri(server.Url)
+        });
+        IList<string> projects = ["project-root"];
+        await client.StartAsync();
+        await client.Rpc.Agents.DiscoverAsync(projects, true, CancellationToken.None);
+        await client.Rpc.Agents.GetDiscoveryPathsAsync(projects, true, CancellationToken.None);
+        await client.Rpc.Hooks.DiscoverAsync(projects, true, CancellationToken.None);
+        await client.Rpc.Instructions.DiscoverAsync(projects, true, CancellationToken.None);
+        await client.Rpc.Instructions.GetDiscoveryPathsAsync(projects, true, CancellationToken.None);
+        await client.Rpc.Skills.GetDiscoveryPathsAsync(projects, ["ignored"], true, CancellationToken.None);
+        foreach (var method in new[]
+        {
+            "agents.discover", "agents.getDiscoveryPaths", "hooks.discover",
+            "instructions.discover", "instructions.getDiscoveryPaths", "skills.getDiscoveryPaths"
+        })
+        {
+            var payload = Assert.Single(server.Requests, request => request.Method == method).Params;
+            Assert.Equal("project-root", Assert.Single(payload.GetProperty("projectPaths").EnumerateArray()).GetString());
+            foreach (var key in new[] { "agentDirectories", "hookDirectories", "instructionDirectories", "skillDirectories" })
+            {
+                Assert.False(payload.TryGetProperty(key, out _));
+            }
+        }
+        await client.Rpc.Agents.DiscoverAsync(new AgentsDiscoverRequest
+        {
+            AgentDirectories = ["explicit-agent-root"]
+        });
+        var explicitPayload = server.Requests.Last(request => request.Method == "agents.discover").Params;
+        Assert.Equal("explicit-agent-root", Assert.Single(explicitPayload.GetProperty("agentDirectories").EnumerateArray()).GetString());
+        Assert.False(explicitPayload.TryGetProperty("projectPaths", out _));
+    }
+
+    [Theory]
+    [InlineData(0)]
+    [InlineData(1)]
+    [InlineData(2)]
+    public async Task CustomizationDirectories_Are_Preserved_On_Create_And_Resume(int kind)
+    {
+        IList<string>? roots = kind switch
+        {
+            0 => null,
+            1 => [],
+            _ => ["relative-root", "other-root"]
+        };
+        var directories = new Dictionary<string, IList<string>?>
+        {
+            ["skillDirectories"] = roots?.Select(root => root + "-skills").ToList(),
+            ["agentDirectories"] = roots?.Select(root => root + "-agents").ToList(),
+            ["instructionDirectories"] = roots?.Select(root => root + "-instructions").ToList(),
+            ["hookDirectories"] = roots?.Select(root => root + "-hooks").ToList()
+        };
+        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
+        {
+            WorkingDirectory = "request-cwd",
+            EnableConfigDiscovery = false,
+            EnableFileHooks = false,
+            SkillDirectories = directories["skillDirectories"],
+            AgentDirectories = directories["agentDirectories"],
+            InstructionDirectories = directories["instructionDirectories"],
+            HookDirectories = directories["hookDirectories"]
+        });
+        await using var resumed = await client.ResumeSessionAsync("resumed", new ResumeSessionConfig
+        {
+            WorkingDirectory = "resume-cwd",
+            EnableConfigDiscovery = false,
+            EnableFileHooks = false,
+            SkillDirectories = directories["skillDirectories"],
+            AgentDirectories = directories["agentDirectories"],
+            InstructionDirectories = directories["instructionDirectories"],
+            HookDirectories = directories["hookDirectories"]
+        });
+        foreach (var method in new[] { "session.create", "session.resume" })
+        {
+            var payload = Assert.Single(server.Requests, request => request.Method == method).Params;
+            foreach (var entry in directories)
+            {
+                if (entry.Value is null)
+                {
+                    Assert.False(payload.TryGetProperty(entry.Key, out _));
+                }
+                else
+                {
+                    Assert.Equal(entry.Value, payload.GetProperty(entry.Key).EnumerateArray().Select(item => item.GetString()));
+                }
+            }
+            Assert.False(payload.GetProperty("enableConfigDiscovery").GetBoolean());
+            Assert.False(payload.GetProperty("enableFileHooks").GetBoolean());
+            Assert.False(payload.TryGetProperty("additionalDirectories", out _));
+            Assert.False(payload.TryGetProperty("customAgents", out _));
+            Assert.False(payload.TryGetProperty("hooks", out _));
+        }
+    }
+
+    [Theory]
+    [InlineData(false)]
+    [InlineData(true)]
+    public void CustomizationDirectories_Clone_Owns_Its_Lists(bool resume)
+    {
+        SessionConfigBase original;
+        SessionConfigBase clone;
+        if (resume)
+        {
+            var config = new ResumeSessionConfig
+            {
+                AgentDirectories = ["agents"],
+                HookDirectories = ["hooks"]
+            };
+            original = config;
+            clone = config.Clone();
+        }
+        else
+        {
+            var config = new SessionConfig
+            {
+                AgentDirectories = ["agents"],
+                HookDirectories = ["hooks"]
+            };
+            original = config;
+            clone = config.Clone();
+        }
+        clone.AgentDirectories!.Add("clone-agents");
+        clone.HookDirectories!.Add("clone-hooks");
+        Assert.Equal("agents", Assert.Single(original.AgentDirectories!));
+        Assert.Equal("hooks", Assert.Single(original.HookDirectories!));
+        Assert.Collection(clone.AgentDirectories, item => Assert.Equal("agents", item), item => Assert.Equal("clone-agents", item));
+        Assert.Collection(clone.HookDirectories, item => Assert.Equal("hooks", item), item => Assert.Equal("clone-hooks", item));
+    }
+}
+#endif
diff --git a/dotnet/test/Unit/ClientSessionLifetimeTests.cs b/dotnet/test/Unit/ClientSessionLifetimeTests.cs
index d78ee57932..c3ea694395 100644
--- a/dotnet/test/Unit/ClientSessionLifetimeTests.cs
+++ b/dotnet/test/Unit/ClientSessionLifetimeTests.cs
@@ -9,6 +9,7 @@
 using System.Diagnostics;
 using System.Reflection;
 using System.Runtime.CompilerServices;
+using System.Runtime.ExceptionServices;
 using System.Text;
 using System.Text.Json;
 using GitHub.Copilot.Rpc;
@@ -23,6 +24,40 @@ public sealed partial class ClientSessionLifetimeTests
 {
     private sealed record RpcRequestRecord(string Method, JsonElement Params);
 
+    [Theory]
+    [InlineData(false, true)]
+    [InlineData(false, false)]
+    [InlineData(false, null)]
+    [InlineData(true, true)]
+    [InlineData(true, false)]
+    [InlineData(true, null)]
+    public async Task ImageGeneration_ForwardsCreateAndResumeOptIn(bool resume, bool? enabled)
+    {
+        await using var server = await FakeCopilotServer.StartAsync();
+        await using var client = new CopilotClient(new CopilotClientOptions { Connection = RuntimeConnection.ForUri(server.Url) });
+        var imageGeneration = enabled is null ? null : new ImageGenerationConfig { Enabled = enabled };
+        await using var session = resume
+            ? await client.ResumeSessionAsync("image-test", new ResumeSessionConfig
+            {
+                OnPermissionRequest = PermissionHandler.ApproveAll,
+                ImageGeneration = imageGeneration
+            }.Clone())
+            : await client.CreateSessionAsync(new SessionConfig
+            {
+                OnPermissionRequest = PermissionHandler.ApproveAll,
+                ImageGeneration = imageGeneration
+            }.Clone());
+        var request = Assert.Single(server.Requests, r => r.Method == (resume ? "session.resume" : "session.create")).Params;
+        if (enabled is null)
+        {
+            Assert.False(request.TryGetProperty("imageGeneration", out _), request.ToString());
+        }
+        else
+        {
+            Assert.Equal(enabled.Value, request.GetProperty("imageGeneration").GetProperty("enabled").GetBoolean());
+        }
+    }
+
     [Theory]
     [InlineData(CopilotClientMode.CopilotCli, null, null)]
     [InlineData(CopilotClientMode.Empty, null, null)]
@@ -1791,6 +1826,613 @@ async Task<string> BlockedTool(CancellationToken cancellationToken)
         }
     }
 
+    [Fact]
+    public Task ForceStopAsync_Does_Not_Invoke_Remaining_Event_Handlers() =>
+        AssertRemainingEventHandlersStoppedAsync(static (client, _, _) => client.ForceStopAsync());
+
+    [Fact]
+    public Task DisposeAsync_Does_Not_Invoke_Remaining_Event_Handlers() =>
+        AssertRemainingEventHandlersStoppedAsync(static (_, session, _) => session.DisposeAsync().AsTask());
+
+    [Fact]
+    public Task Unsubscribe_Releases_Unadmitted_Event_Handler_Captures() =>
+        AssertRemainingEventHandlersStoppedAsync(static (_, _, unsubscribe) =>
+        {
+            unsubscribe();
+            return Task.CompletedTask;
+        });
+
+    [Fact]
+    public Task ForceStopAsync_Fails_Pending_SendAndWait_After_Send_Response() =>
+        AssertPendingSendAndWaitStoppedAsync(static (client, _) => client.ForceStopAsync());
+
+    [Fact]
+    public Task DisposeAsync_Fails_Pending_SendAndWait_After_Send_Response() =>
+        AssertPendingSendAndWaitStoppedAsync(static (_, session) => session.DisposeAsync().AsTask());
+
+    [Fact]
+    public async Task ForceStopAsync_Rejects_Event_Handler_Registration()
+    {
+        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());
+
+        await client.ForceStopAsync();
+
+        Assert.Throws<IOException>(() => session.On<SessionEvent>(_ => { }));
+    }
+
+    [Theory]
+    [InlineData(false, true)]
+    [InlineData(true, true)]
+    [InlineData(false, false)]
+    [InlineData(true, false)]
+    public async Task Stop_Rejects_And_Retires_Session_Initialized_Before_Registration(bool resume, bool force)
+    {
+        await using var server = await FakeCopilotServer.StartAsync();
+        server.ResponseFactory = request => request.Method == "sessionFs.setProvider"
+            ? new Dictionary<string, object?> { ["success"] = true }
+            : throw new InvalidOperationException($"Unexpected RPC method '{request.Method}'.");
+        await using var client = new CopilotClient(new CopilotClientOptions
+        {
+            Connection = RuntimeConnection.ForUri(server.Url),
+            SessionFs = new SessionFsConfig
+            {
+                InitialWorkingDirectory = "/",
+                SessionStatePath = "/session-state",
+                Conventions = SessionFsSetProviderConventions.Posix
+            }
+        });
+        await client.StartAsync();
+        using var releaseSetup = new ManualResetEventSlim();
+        var setupStarted = new TaskCompletionSource<CopilotSession>(TaskCreationOptions.RunContinuationsAsynchronously);
+        SessionFsProvider CreateProvider(CopilotSession session)
+        {
+            setupStarted.SetResult(session);
+            releaseSetup.Wait();
+            return new TextOnlySessionFsProvider();
+        }
+        var creation = Task.Run(() => resume
+            ? client.ResumeSessionAsync("late-registration", new ResumeSessionConfig { CreateSessionFsProvider = CreateProvider })
+            : client.CreateSessionAsync(new SessionConfig { CreateSessionFsProvider = CreateProvider }));
+        try
+        {
+            var session = await setupStarted.Task.WaitAsync(TimeSpan.FromSeconds(5));
+            if (force)
+            {
+                await client.ForceStopAsync().WaitAsync(TimeSpan.FromSeconds(5));
+            }
+            else
+            {
+                await client.StopAsync().WaitAsync(TimeSpan.FromSeconds(5));
+            }
+            releaseSetup.Set();
+            var error = await Assert.ThrowsAsync<IOException>(() => creation.WaitAsync(TimeSpan.FromSeconds(5)));
+            Assert.Contains("stopped connection", error.Message);
+            Assert.Throws<IOException>(() => session.On<SessionEvent>(_ => { }));
+            Assert.DoesNotContain(server.Requests, request => request.Method is "session.create" or "session.resume");
+        }
+        finally
+        {
+            releaseSetup.Set();
+            await Record.ExceptionAsync(() => creation.WaitAsync(TimeSpan.FromSeconds(5)));
+        }
+    }
+
+    [Theory]
+    [InlineData(false)]
+    [InlineData(true)]
+    public async Task Stop_Closes_Session_Admission_Before_Transport_Cleanup(bool resume)
+    {
+        await using var server = await FakeCopilotServer.StartAsync();
+        server.ResponseFactory = request => request.Method == "sessionFs.setProvider"
+            ? new Dictionary<string, object?> { ["success"] = true }
+            : throw new InvalidOperationException($"Unexpected RPC method '{request.Method}'.");
+        await using var client = new CopilotClient(new CopilotClientOptions
+        {
+            Connection = RuntimeConnection.ForUri(server.Url),
+            SessionFs = new SessionFsConfig
+            {
+                InitialWorkingDirectory = "/",
+                SessionStatePath = "/session-state",
+                Conventions = SessionFsSetProviderConventions.Posix
+            }
+        });
+        _ = await client.CreateSessionAsync(new SessionConfig { CreateSessionFsProvider = _ => new TextOnlySessionFsProvider() });
+        server.DelayDestroy();
+        var stop = client.StopAsync();
+        await server.DestroyStarted.WaitAsync(TimeSpan.FromSeconds(5));
+        try
+        {
+            CopilotSession? initialized = null;
+            SessionFsProvider CreateProvider(CopilotSession session)
+            {
+                initialized = session;
+                return new TextOnlySessionFsProvider();
+            }
+            var creation = resume
+                ? client.ResumeSessionAsync("late-registration", new ResumeSessionConfig { CreateSessionFsProvider = CreateProvider })
+                : client.CreateSessionAsync(new SessionConfig { CreateSessionFsProvider = CreateProvider });
+            var error = await Assert.ThrowsAsync<IOException>(() => creation.WaitAsync(TimeSpan.FromSeconds(5)));
+            Assert.Contains("stopped connection", error.Message);
+            Assert.NotNull(initialized);
+            Assert.Throws<IOException>(() => initialized.On<SessionEvent>(_ => { }));
+            Assert.False(stop.IsCompleted);
+        }
+        finally
+        {
+            await client.ForceStopAsync().WaitAsync(TimeSpan.FromSeconds(5));
+            await stop.WaitAsync(TimeSpan.FromSeconds(5));
+        }
+    }
+
+    [Theory]
+    [InlineData(false)]
+    [InlineData(true)]
+    public async Task Cloud_Create_Cleanup_Does_Not_Reconnect_During_Stop(bool dispose)
+    {
+        await using var server = await FakeCopilotServer.StartAsync();
+        server.ResponseFactory = request => request.Method == "sessionFs.setProvider"
+            ? new Dictionary<string, object?> { ["success"] = true }
+            : throw new InvalidOperationException($"Unexpected RPC method '{request.Method}'.");
+        await using var client = new CopilotClient(new CopilotClientOptions
+        {
+            Connection = RuntimeConnection.ForUri(server.Url),
+            SessionFs = new SessionFsConfig
+            {
+                InitialWorkingDirectory = "/",
+                SessionStatePath = "/session-state",
+                Conventions = SessionFsSetProviderConventions.Posix
+            }
+        });
+        await client.StartAsync();
+        using var process = StartExitedProcess();
+        await ReplaceConnectionResourcesAsync(client, process);
+        using var releaseSetup = new ManualResetEventSlim();
+        using var reconnectCancellation = new CancellationTokenSource();
+        var reconnect = server.ObserveReconnectAsync(reconnectCancellation.Token);
+        var setupStarted = new TaskCompletionSource<CopilotSession>(TaskCreationOptions.RunContinuationsAsynchronously);
+        var shutdownStarted = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+        var releaseShutdown = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+        server.BeforeResponseAsync = async (request, token) =>
+        {
+            if (request.Method == "runtime.shutdown")
+            {
+                shutdownStarted.TrySetResult();
+                await releaseShutdown.Task.WaitAsync(token);
+            }
+        };
+        var creation = client.CreateSessionAsync(new SessionConfig
+        {
+            Cloud = new CloudSessionOptions
+            {
+                Repository = new CloudSessionRepository { Owner = "github", Name = "copilot-sdk", Branch = "main" }
+            },
+            CreateSessionFsProvider = session =>
+            {
+                setupStarted.TrySetResult(session);
+                releaseSetup.Wait();
+                return new TextOnlySessionFsProvider();
+            }
+        });
+        Task? stop = null;
+        Exception? failure = null;
+        var timeout = TimeSpan.FromSeconds(5);
+        try
+        {
+            var session = await setupStarted.Task.WaitAsync(timeout);
+            stop = dispose ? client.DisposeAsync().AsTask() : client.StopAsync();
+            await shutdownStarted.Task.WaitAsync(timeout);
+            releaseSetup.Set();
+            releaseShutdown.TrySetResult();
+
+            var error = await Assert.ThrowsAsync<IOException>(() => creation.WaitAsync(timeout));
+            Assert.Contains("stopped connection", error.Message);
+            await stop.WaitAsync(timeout);
+            Assert.Throws<IOException>(() => session.On<SessionEvent>(_ => { }));
+            Assert.False(server.ReconnectObserved, "Cloud-create cleanup reconnected after session admission closed.");
+        }
+        catch (Exception error)
+        {
+            failure = error;
+        }
+        finally
+        {
+            releaseSetup.Set();
+            releaseShutdown.TrySetResult();
+            foreach (var operation in new Task?[] { creation, stop })
+            {
+                if (operation is null) continue;
+                try
+                {
+                    await operation.WaitAsync(timeout);
+                }
+                catch (IOException) when (ReferenceEquals(operation, creation))
+                {
+                    // The rejected creation is the expected result, not a cleanup failure.
+                }
+                catch (Exception cleanupError)
+                {
+                    failure = failure is null ? cleanupError : new AggregateException(failure, cleanupError);
+                }
+            }
+            reconnectCancellation.Cancel();
+            try
+            {
+                await reconnect.WaitAsync(timeout);
+            }
+            catch (OperationCanceledException) when (reconnectCancellation.IsCancellationRequested)
+            {
+            }
+            catch (Exception cleanupError)
+            {
+                failure = failure is null ? cleanupError : new AggregateException(failure, cleanupError);
+            }
+        }
+        if (failure is not null)
+        {
+            ExceptionDispatchInfo.Capture(failure).Throw();
+        }
+    }
+
+    [Theory]
+    [InlineData("hooks", true)]
+    [InlineData("mcp", true)]
+    [InlineData("bearer", true)]
+    [InlineData("transforms", true)]
+    [InlineData("tools", true)]
+    [InlineData("commands", true)]
+    [InlineData("permission", true)]
+    [InlineData("input", true)]
+    [InlineData("hooks", false)]
+    [InlineData("mcp", false)]
+    [InlineData("bearer", false)]
+    [InlineData("transforms", false)]
+    [InlineData("tools", false)]
+    [InlineData("commands", false)]
+    [InlineData("permission", false)]
+    [InlineData("input", false)]
+    public async Task Retirement_Releases_Retained_Session_Callback_Captures(string registration, bool forceStop)
+    {
+        await using var server = await FakeCopilotServer.StartAsync();
+        await using var client = new CopilotClient(new CopilotClientOptions { Connection = RuntimeConnection.ForUri(server.Url) });
+        var (session, capture) = await CreateCapturedSessionAsync(client, registration);
+        await using var retainedSession = session;
+        ForceCollect();
+        Assert.True(CaptureIsAlive(capture));
+
+        if (forceStop)
+        {
+            await client.ForceStopAsync();
+        }
+        else
+        {
+            await session.DisposeAsync();
+        }
+        ForceCollect();
+
+        Assert.False(CaptureIsAlive(capture));
+        GC.KeepAlive(session);
+    }
+
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    private static bool CaptureIsAlive(WeakReference<object> capture) => capture.TryGetTarget(out _);
+
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    private static async Task<(CopilotSession Session, WeakReference<object> Capture)> CreateCapturedSessionAsync(
+        CopilotClient client, string registration)
+    {
+        var capture = new object();
+        var weak = new WeakReference<object>(capture);
+        var config = new SessionConfig { OnPermissionRequest = PermissionHandler.ApproveAll };
+        switch (registration)
+        {
+            case "hooks":
+                config.Hooks = new SessionHooks
+                {
+                    OnSessionStart = (_, _) =>
+                    {
+                        GC.KeepAlive(capture);
+                        return Task.FromResult<SessionStartHookOutput?>(null);
+                    }
+                };
+                break;
+            case "mcp":
+                config.OnMcpAuthRequest = _ =>
+                {
+                    GC.KeepAlive(capture);
+                    return Task.FromResult<McpAuthResult?>(McpAuthResult.Cancel());
+                };
+                break;
+            case "bearer":
+                config.Model = "test-model";
+                config.Provider = new ProviderConfig
+                {
+                    BaseUrl = "http://127.0.0.1",
+                    BearerTokenProvider = _ =>
+                    {
+                        GC.KeepAlive(capture);
+                        return Task.FromResult("test-token");
+                    }
+                };
+                break;
+            case "transforms":
+                config.SystemMessage = new SystemMessageConfig
+                {
+                    Mode = SystemMessageMode.Customize,
+                    Sections = new Dictionary<SystemMessageSection, SectionOverride>
+                    {
+                        [SystemMessageSection.Tone] = new()
+                        {
+                            Transform = content =>
+                            {
+                                GC.KeepAlive(capture);
+                                return Task.FromResult(content);
+                            }
+                        }
+                    }
+                };
+                break;
+            case "tools":
+                config.Tools = [AIFunctionFactory.Create(() =>
+                {
+                    GC.KeepAlive(capture);
+                    return "test-result";
+                }, "captured_tool")];
+                break;
+            case "commands":
+                config.Commands = [new CommandDefinition
+                {
+                    Name = "captured",
+                    Handler = _ =>
+                    {
+                        GC.KeepAlive(capture);
+                        return Task.CompletedTask;
+                    }
+                }];
+                break;
+            case "permission":
+                config.OnPermissionRequest = (_, _) =>
+                {
+                    GC.KeepAlive(capture);
+                    return Task.FromResult(PermissionDecision.UserNotAvailable());
+                };
+                break;
+            case "input":
+                config.OnUserInputRequest = (_, _) =>
+                {
+                    GC.KeepAlive(capture);
+                    return Task.FromResult(new UserInputResponse { Answer = "test-answer" });
+                };
+                break;
+            default:
+                throw new ArgumentOutOfRangeException(nameof(registration), registration, "Unknown callback registration.");
+        }
+        return (await client.CreateSessionAsync(config), weak);
+    }
+
+    [Fact]
+    public async Task DisposeAsync_Keeps_Hooks_Through_Detach_Acknowledgement()
+    {
+        await using var server = await FakeCopilotServer.StartAsync();
+        await using var client = new CopilotClient(new CopilotClientOptions { Connection = RuntimeConnection.ForUri(server.Url) });
+        var detachStarted = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+        var releaseDetach = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+        var hookStarted = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+        var hooks = new SessionHooks
+        {
+            OnSessionEnd = (_, _) =>
+            {
+                hookStarted.TrySetResult();
+                return Task.FromResult<SessionEndHookOutput?>(null);
+            }
+        };
+        var endHook = hooks.OnSessionEnd;
+        await using var session = await client.CreateSessionAsync(new SessionConfig { Hooks = hooks });
+        server.BeforeResponseAsync = async (request, token) =>
+        {
+            if (request.Method == "session.detach")
+            {
+                detachStarted.TrySetResult();
+                await releaseDetach.Task.WaitAsync(token);
+            }
+        };
+        var timeout = TimeSpan.FromSeconds(5);
+        var disposal = session.DisposeAsync().AsTask();
+        Task<JsonElement>? hookRequest = null;
+        Exception? bodyFailure = null;
+        try
+        {
+            await detachStarted.Task.WaitAsync(timeout);
+            hookRequest = server.SendRequestAsync("hooks.invoke", new Dictionary<string, object?>
+            {
+                ["sessionId"] = session.SessionId,
+                ["hookType"] = "sessionEnd",
+                ["input"] = new Dictionary<string, object?>
+                {
+                    ["sessionId"] = session.SessionId,
+                    ["timestamp"] = 1_730_000_000_000L,
+                    ["cwd"] = "workdir",
+                    ["reason"] = "complete"
+                }
+            });
+            await hookStarted.Task.WaitAsync(timeout);
+        }
+        catch (Exception error)
+        {
+            bodyFailure = error;
+        }
+        finally
+        {
+            releaseDetach.TrySetResult();
+            foreach (var operation in new Task?[] { disposal, hookRequest })
+            {
+                if (operation is null) continue;
+                try
+                {
+                    await operation.WaitAsync(timeout);
+                }
+                catch (Exception cleanupError)
+                {
+                    bodyFailure = bodyFailure is null ? cleanupError : new AggregateException(bodyFailure, cleanupError);
+                }
+            }
+        }
+        if (bodyFailure is not null)
+        {
+            ExceptionDispatchInfo.Capture(bodyFailure).Throw();
+        }
+        Assert.Same(endHook, hooks.OnSessionEnd);
+    }
+
+    [Fact]
+    public async Task DisposeAsync_Releases_Event_Handler_Captures()
+    {
+        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());
+        var capture = RegisterCapturedEventHandler(session, out _);
+
+        await session.DisposeAsync();
+        ForceCollect();
+
+        Assert.False(capture.TryGetTarget(out _));
+        GC.KeepAlive(session);
+    }
+
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    private static WeakReference<object> RegisterCapturedEventHandler(CopilotSession session, out IDisposable subscription)
+    {
+        var capture = new object();
+        subscription = session.On<AssistantMessageEvent>(_ => GC.KeepAlive(capture));
+        return new WeakReference<object>(capture);
+    }
+
+    private static async Task AssertPendingSendAndWaitStoppedAsync(Func<CopilotClient, CopilotSession, Task> stop)
+    {
+        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());
+        using var cancellation = new CancellationTokenSource();
+        var timeout = TimeSpan.FromSeconds(5);
+        var responseDrained = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+        server.AfterResponseAsync = async (request, token) =>
+        {
+            if (request.Method == "session.send")
+            {
+                await server.SendAndDrainSessionEventAsync(session, "assistant.message", new()
+                {
+                    ["messageId"] = "message-1",
+                    ["content"] = "WAITING_FOR_IDLE"
+                }, timeout, token);
+                responseDrained.TrySetResult();
+            }
+        };
+        var pending = session.SendAndWaitAsync(new MessageOptions { Prompt = "wait until idle" }, cancellationToken: cancellation.Token);
+        Exception? bodyFailure = null;
+        try
+        {
+            await responseDrained.Task.WaitAsync(timeout);
+            await stop(client, session).WaitAsync(timeout);
+            await Assert.ThrowsAsync<IOException>(() => pending.WaitAsync(timeout));
+        }
+        catch (Exception error)
+        {
+            bodyFailure = error;
+        }
+        finally
+        {
+            try
+            {
+                cancellation.Cancel();
+                await pending.WaitAsync(timeout);
+            }
+            catch (Exception error) when (error is IOException or OperationCanceledException)
+            {
+                // The stopped operation may fault, or the owned cleanup cancellation may end it.
+            }
+            catch (Exception cleanupError)
+            {
+                bodyFailure = bodyFailure is null ? cleanupError : new AggregateException(bodyFailure, cleanupError);
+            }
+        }
+        if (bodyFailure is not null)
+        {
+            ExceptionDispatchInfo.Capture(bodyFailure).Throw();
+        }
+    }
+
+    private static async Task AssertRemainingEventHandlersStoppedAsync(Func<CopilotClient, CopilotSession, Action, Task> stop)
+    {
+        await using var server = await FakeCopilotServer.StartAsync();
+        await using var client = new CopilotClient(new CopilotClientOptions { Connection = RuntimeConnection.ForUri(server.Url) });
+        // Channel closure may queue a final continuation after disposal; an idle pair owns no thread.
+        var scheduler = new ConcurrentExclusiveSchedulerPair(TaskScheduler.Default, maxConcurrencyLevel: 1);
+        var factory = new TaskFactory(CancellationToken.None, TaskCreationOptions.None, TaskContinuationOptions.None, scheduler.ExclusiveScheduler);
+        using var releaseHandler = new ManualResetEventSlim();
+        var handlerStarted = new TaskCompletionSource<TaskScheduler>(TaskCreationOptions.RunContinuationsAsynchronously);
+        var laterHandlerCalls = 0;
+        CopilotSession? session = null;
+        Exception? bodyFailure = null;
+        try
+        {
+            // Resume starts the event consumer on the caller's scheduler. A queued task fences
+            // that consumer's current dispatch without relying on a delay or private SDK state.
+            session = await factory.StartNew(() => client.ResumeSessionAsync("force-stop-event-handler", new ResumeSessionConfig
+            {
+                OnPermissionRequest = PermissionHandler.ApproveAll
+            })).Unwrap();
+            using var first = session.On<AssistantMessageEvent>(_ =>
+            {
+                handlerStarted.TrySetResult(TaskScheduler.Current);
+                releaseHandler.Wait();
+            });
+            using var second = session.On<AssistantMessageEvent>(_ => Interlocked.Increment(ref laterHandlerCalls));
+            var capture = RegisterCapturedEventHandler(session, out var capturedSubscription);
+            using var captureSubscription = capturedSubscription;
+            await server.SendSessionEventAsync(session.SessionId, "assistant.message", new()
+            {
+                ["messageId"] = "force-stop-dispatch",
+                ["content"] = "STOP_EVENT_DISPATCH"
+            });
+            Assert.Same(scheduler.ExclusiveScheduler, await handlerStarted.Task.WaitAsync(TimeSpan.FromSeconds(5)));
+            await stop(client, session, () =>
+            {
+                second.Dispose();
+                captureSubscription.Dispose();
+            }).WaitAsync(TimeSpan.FromSeconds(5));
+            ForceCollect();
+            Assert.False(capture.TryGetTarget(out _));
+            releaseHandler.Set();
+            await factory.StartNew(() => { }).WaitAsync(TimeSpan.FromSeconds(5));
+            Assert.Equal(0, Volatile.Read(ref laterHandlerCalls));
+        }
+        catch (Exception error)
+        {
+            bodyFailure = error;
+        }
+        finally
+        {
+            releaseHandler.Set();
+            try
+            {
+                await factory.StartNew(() => { }).WaitAsync(TimeSpan.FromSeconds(5));
+                if (session is not null)
+                {
+                    await session.DisposeAsync();
+                }
+            }
+            catch (Exception cleanupError)
+            {
+                bodyFailure = bodyFailure is null ? cleanupError : new AggregateException(bodyFailure, cleanupError);
+            }
+        }
+        if (bodyFailure is not null)
+        {
+            ExceptionDispatchInfo.Capture(bodyFailure).Throw();
+        }
+    }
+
     [Fact]
     public async Task ForceStopAsync_Does_Not_Start_Late_External_Tool()
     {
@@ -1888,6 +2530,86 @@ async Task<string> BlockedTool(CancellationToken cancellationToken)
         }
     }
 
+    [Fact]
+    public async Task ExternalTool_Invocation_Names_The_Sub_Agent_And_Request_Behind_The_Call()
+    {
+        await using var server = await FakeCopilotServer.StartAsync();
+        await using var client = new CopilotClient(new CopilotClientOptions { Connection = RuntimeConnection.ForUri(server.Url) });
+        var invocations = new ConcurrentQueue<ToolInvocation>();
+        var tool = CopilotTool.DefineTool(
+            (ToolInvocation invocation) =>
+            {
+                invocations.Enqueue(invocation);
+                return "ok";
+            },
+            factoryOptions: new AIFunctionFactoryOptions { Name = "calc" });
+        await using var session = await client.CreateSessionAsync(new SessionConfig
+        {
+            Tools = [tool],
+            OnPermissionRequest = PermissionHandler.ApproveAll
+        });
+        server.ClearRequests();
+
+        DispatchEvent(session, new ExternalToolRequestedEvent
+        {
+            AgentId = "task-agent-1",
+            Data = new ExternalToolRequestedData
+            {
+                RequestId = "req-sub-agent",
+                SessionId = session.SessionId,
+                ToolCallId = "tc-sub-agent",
+                ToolName = "calc"
+            }
+        });
+        await WaitForRequestAsync(server, "session.tools.handlePendingToolCall");
+        server.ClearRequests();
+        DispatchEvent(session, new ExternalToolRequestedEvent
+        {
+            Data = new ExternalToolRequestedData
+            {
+                RequestId = "req-root",
+                SessionId = session.SessionId,
+                ToolCallId = "tc-root",
+                ToolName = "calc"
+            }
+        });
+        await WaitForRequestAsync(server, "session.tools.handlePendingToolCall");
+        server.ClearRequests();
+        DispatchEvent(session, new ExternalToolRequestedEvent
+        {
+            AgentId = "",
+            Data = new ExternalToolRequestedData
+            {
+                RequestId = "req-blank-agent",
+                SessionId = session.SessionId,
+                ToolCallId = "tc-blank-agent",
+                ToolName = "calc"
+            }
+        });
+        await WaitForRequestAsync(server, "session.tools.handlePendingToolCall");
+
+        Assert.Collection(
+            invocations,
+            subAgentCall =>
+            {
+                Assert.Equal("tc-sub-agent", subAgentCall.ToolCallId);
+                Assert.Equal("task-agent-1", subAgentCall.AgentId);
+                Assert.Equal("req-sub-agent", subAgentCall.RequestId);
+            },
+            rootCall =>
+            {
+                Assert.Equal("tc-root", rootCall.ToolCallId);
+                Assert.Null(rootCall.AgentId);
+                Assert.Equal("req-root", rootCall.RequestId);
+            },
+            blankAgentCall =>
+            {
+                Assert.Equal("tc-blank-agent", blankAgentCall.ToolCallId);
+                Assert.Null(blankAgentCall.AgentId);
+                Assert.Equal("req-blank-agent", blankAgentCall.RequestId);
+            });
+    }
+
     private static ExternalToolRequestedEvent ExternalToolRequested(string requestId, string toolName = "blocked_tool") =>
         new()
         {
@@ -2503,7 +3225,8 @@ public async Task SendAndWaitAsync_Waits_For_Earlier_Idle_Handler()
         using var subscription = session.On<SessionIdleEvent>(_ =>
         {
             entered.TrySetResult();
-            handlerFinished = release.Wait(TimeSpan.FromSeconds(5));
+            release.Wait();
+            handlerFinished = true;
         });
         var pending = session.SendAndWaitAsync(new MessageOptions { Prompt = "hello" });
         await WaitForRequestAsync(server, "session.send");
@@ -2606,14 +3329,17 @@ public async Task CreateSessionAsync_Serializes_ManagedSettings_Permissions()
 
         await using var session = await client.CreateSessionAsync(new SessionConfig
         {
+            EnforceManagedModelDefaults = true,
             ManagedSettings = new ManagedSettings
             {
                 Permissions = new ManagedSettingsPermissions
                 {
                     DisableBypassPermissionsMode = DisableBypassPermissionsModes.Disable,
+                    DisableAssistedPermissionsMode = true,
                     Deny = ["shell(rm*)"],
                     Ask = ["write"],
-                    Allow = []
+                    Allow = [],
+                    LimitTo = ["Domain(github.com)"]
                 }
             },
             OnPermissionRequest = (_, invocation) =>
@@ -2624,12 +3350,17 @@ public async Task CreateSessionAsync_Serializes_ManagedSettings_Permissions()
         });
 
         var request = Assert.Single(server.Requests, request => request.Method == "session.create");
+        Assert.True(request.Params.GetProperty("enforceManagedModelDefaults").GetBoolean());
         Assert.False(request.Params.TryGetProperty("enableManagedSettings", out _));
         var permissions = request.Params.GetProperty("managedSettings").GetProperty("permissions");
         Assert.Equal("disable", permissions.GetProperty("disableBypassPermissionsMode").GetString());
+        Assert.True(permissions.GetProperty("disableAssistedPermissionsMode").GetBoolean());
         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());
+        Assert.Equal(
+            "Domain(github.com)",
+            Assert.Single(permissions.GetProperty("limitTo").EnumerateArray()).GetString());
 
         DispatchEvent(session, new PermissionRequestedEvent
         {
@@ -2895,6 +3626,7 @@ public async Task ResumeSessionAsync_Serializes_ManagedSettings_Permissions()
 
         await using var session = await client.ResumeSessionAsync("session-managed", new ResumeSessionConfig
         {
+            EnforceManagedModelDefaults = true,
             ManagedSettings = new ManagedSettings
             {
                 Permissions = new ManagedSettingsPermissions
@@ -2907,6 +3639,7 @@ public async Task ResumeSessionAsync_Serializes_ManagedSettings_Permissions()
         });
 
         var request = Assert.Single(server.Requests, request => request.Method == "session.resume");
+        Assert.True(request.Params.GetProperty("enforceManagedModelDefaults").GetBoolean());
         var permissions = request.Params.GetProperty("managedSettings").GetProperty("permissions");
         Assert.Equal("shell(rm*)", Assert.Single(permissions.GetProperty("deny").EnumerateArray()).GetString());
     }
@@ -2999,7 +3732,7 @@ private static Process StartExitedProcess()
         return process;
     }
 
-    private sealed class FakeCopilotServer : IAsyncDisposable
+    private sealed partial class FakeCopilotServer : IAsyncDisposable
     {
         private readonly TcpListener _listener;
         private readonly CancellationTokenSource _cts = new();
@@ -3018,6 +3751,7 @@ private sealed class FakeCopilotServer : IAsyncDisposable
         private bool _failRuntimeShutdown;
         private bool _failSessionCreate;
         private bool _failSessionSend;
+        private bool _reconnectObserved;
         private int _nextMessageId;
         public bool IncludeTranscriptRecovery { get; set; }
 
@@ -3025,6 +3759,7 @@ private sealed class FakeCopilotServer : IAsyncDisposable
         public bool UniqueMessageIds { get; set; }
         public bool FailSessionDelete { get; set; }
         public bool FailMcpAuthInterestRegistration { get; set; }
+        public bool ReconnectObserved => Volatile.Read(ref _reconnectObserved);
 
         public Func<string, Task>? BeforeSendResponse { get; set; }
 
@@ -3079,6 +3814,12 @@ public void ClearRequests()
             }
         }
 
+        public async Task ObserveReconnectAsync(CancellationToken cancellationToken)
+        {
+            using var connection = await _listener.AcceptTcpClientAsync(cancellationToken);
+            Volatile.Write(ref _reconnectObserved, true);
+        }
+
         public void DelayDestroy()
         {
             _delayDestroy = true;
@@ -3233,8 +3974,9 @@ private async Task RunAsync()
                 {
                     if (root.TryGetProperty("error", out var error))
                     {
-                        completion.TrySetException(new InvalidOperationException(
-                            error.GetProperty("message").GetString()));
+                        var exception = new InvalidOperationException(error.GetProperty("message").GetString());
+                        exception.Data["error"] = error.Clone();
+                        completion.TrySetException(exception);
                     }
                     else
                     {
@@ -3347,6 +4089,10 @@ private async Task HandleRequestAsync(Stream stream, JsonElement request, Cancel
                     ["sessionId"] = paramsElement.GetProperty("sessionId").GetString(),
                     ["sessionUri"] = "ahp-session:/" + paramsElement.GetProperty("sessionId").GetString()
                 },
+                "host.listSessions" => new Dictionary<string, object?>
+                {
+                    ["sessions"] = Array.Empty<object>()
+                },
                 "session.eventLog.registerInterest" => new Dictionary<string, object?>
                 {
                     ["id"] = "interest-1"
diff --git a/dotnet/test/Unit/ClientSessionSkillProviderTests.cs b/dotnet/test/Unit/ClientSessionSkillProviderTests.cs
new file mode 100644
index 0000000000..c99d1f090a
--- /dev/null
+++ b/dotnet/test/Unit/ClientSessionSkillProviderTests.cs
@@ -0,0 +1,397 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+#if NET8_0_OR_GREATER
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text.Json;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using Xunit;
+
+namespace GitHub.Copilot.Test.Unit;
+
+public sealed partial class ClientSessionLifetimeTests
+{
+    [Fact]
+    public async Task SkillProvider_Create_And_Resume_Set_Flag_Only_When_Provided()
+    {
+        await using var server = await FakeCopilotServer.StartAsync();
+        await using var client = new CopilotClient(new CopilotClientOptions { Connection = RuntimeConnection.ForUri(server.Url) });
+        var provider = new TestSkillProvider
+        {
+            ReadHandler = (name, _) => Task.FromResult<string?>($"# {name}")
+        };
+
+        await using var created = await client.CreateSessionAsync(new SessionConfig
+        {
+            SessionId = "skill-create",
+            SkillProvider = provider
+        });
+        await using var resumed = await client.ResumeSessionAsync("skill-resume", new ResumeSessionConfig
+        {
+            SkillProvider = provider
+        });
+
+        Assert.True(Assert.Single(server.Requests, request => request.Method == "session.create")
+            .Params.GetProperty("hasSkillProvider").GetBoolean());
+        Assert.True(Assert.Single(server.Requests, request => request.Method == "session.resume")
+            .Params.GetProperty("hasSkillProvider").GetBoolean());
+
+        var read = await server.SendRequestAsync("skillProvider.read", SkillReadRequest(resumed.SessionId, "resumed-skill"));
+        Assert.Equal("# resumed-skill", read.GetProperty("markdown").GetString());
+
+        await created.DisposeAsync();
+        await resumed.DisposeAsync();
+        server.ClearRequests();
+
+        await using var createWithoutProvider = await client.CreateSessionAsync(new SessionConfig
+        {
+            SessionId = "skill-create-no-provider"
+        });
+        await using var resumeWithoutProvider = await client.ResumeSessionAsync("skill-resume-no-provider", new ResumeSessionConfig());
+
+        Assert.False(Assert.Single(server.Requests, request => request.Method == "session.create")
+            .Params.TryGetProperty("hasSkillProvider", out _));
+        Assert.False(Assert.Single(server.Requests, request => request.Method == "session.resume")
+            .Params.TryGetProperty("hasSkillProvider", out _));
+    }
+
+    [Fact]
+    public async Task SkillProvider_Callbacks_Work_Before_Create_And_Resume_Response()
+    {
+        await using var server = await FakeCopilotServer.StartAsync();
+        await using var client = new CopilotClient(new CopilotClientOptions { Connection = RuntimeConnection.ForUri(server.Url) });
+        var provider = new TestSkillProvider();
+        var callbackResults = new List<Task<JsonElement>>();
+        server.BeforeResponseAsync = async (request, _) =>
+        {
+            if (request.Method is "session.create" or "session.resume"
+                && request.Params.TryGetProperty("sessionId", out var sessionId))
+            {
+                callbackResults.Add(await server.SendRequestWithoutWaitingAsync(
+                    "skillProvider.list",
+                    SkillListRequest(sessionId.GetString()!)));
+            }
+        };
+
+        await using var created = await client.CreateSessionAsync(new SessionConfig
+        {
+            SessionId = "pre-response-create",
+            SkillProvider = provider
+        });
+        await using var resumed = await client.ResumeSessionAsync("pre-response-resume", new ResumeSessionConfig
+        {
+            SkillProvider = provider
+        });
+
+        Assert.Equal(2, callbackResults.Count);
+        foreach (var callback in callbackResults)
+        {
+            var result = await callback.WaitAsync(TimeSpan.FromSeconds(5));
+            Assert.Equal("dynamic", Assert.Single(result.GetProperty("skills").EnumerateArray()).GetProperty("name").GetString());
+        }
+    }
+
+    [Fact]
+    public async Task SkillProvider_List_Returns_CamelCase_Descriptors_And_Omits_Null_Optionals()
+    {
+        await using var server = await FakeCopilotServer.StartAsync();
+        await using var client = new CopilotClient(new CopilotClientOptions { Connection = RuntimeConnection.ForUri(server.Url) });
+        var provider = new TestSkillProvider
+        {
+            ListHandler = _ => Task.FromResult<IReadOnlyList<SkillProviderDescriptor>>(
+            [
+                new()
+                {
+                    Name = "basic",
+                    Description = "Basic skill"
+                },
+                new()
+                {
+                    Name = "advanced",
+                    Description = "Advanced skill",
+                    UserInvocable = false,
+                    DisableModelInvocation = true,
+                    ArgumentHint = "<topic>"
+                }
+            ])
+        };
+        await using var session = await client.CreateSessionAsync(new SessionConfig { SkillProvider = provider });
+
+        var result = await server.SendRequestAsync("skillProvider.list", SkillListRequest(session.SessionId));
+        var skills = result.GetProperty("skills").EnumerateArray().ToArray();
+
+        Assert.Equal("basic", skills[0].GetProperty("name").GetString());
+        Assert.Equal("Basic skill", skills[0].GetProperty("description").GetString());
+        Assert.False(skills[0].TryGetProperty("userInvocable", out _));
+        Assert.False(skills[0].TryGetProperty("disableModelInvocation", out _));
+        Assert.False(skills[0].TryGetProperty("argumentHint", out _));
+        Assert.False(skills[0].TryGetProperty("UserInvocable", out _));
+        Assert.False(skills[0].TryGetProperty("DisableModelInvocation", out _));
+        Assert.False(skills[0].TryGetProperty("ArgumentHint", out _));
+        Assert.Equal("advanced", skills[1].GetProperty("name").GetString());
+        Assert.False(skills[1].GetProperty("userInvocable").GetBoolean());
+        Assert.True(skills[1].GetProperty("disableModelInvocation").GetBoolean());
+        Assert.Equal("<topic>", skills[1].GetProperty("argumentHint").GetString());
+    }
+
+    [Fact]
+    public async Task SkillProvider_Null_List_Result_Is_Empty()
+    {
+        await using var server = await FakeCopilotServer.StartAsync();
+        await using var client = new CopilotClient(new CopilotClientOptions { Connection = RuntimeConnection.ForUri(server.Url) });
+        var provider = new TestSkillProvider
+        {
+            ListHandler = _ => Task.FromResult<IReadOnlyList<SkillProviderDescriptor>>(null!)
+        };
+        await using var session = await client.CreateSessionAsync(new SessionConfig { SkillProvider = provider });
+
+        var result = await server.SendRequestAsync("skillProvider.list", SkillListRequest(session.SessionId));
+
+        Assert.Empty(result.GetProperty("skills").EnumerateArray());
+    }
+
+    [Fact]
+    public async Task SkillProvider_Read_Returns_Markdown_And_Null_For_Missing_Skill()
+    {
+        await using var server = await FakeCopilotServer.StartAsync();
+        await using var client = new CopilotClient(new CopilotClientOptions { Connection = RuntimeConnection.ForUri(server.Url) });
+        var provider = new TestSkillProvider
+        {
+            ReadHandler = (name, _) => Task.FromResult(name == "known" ? "# Known" : null)
+        };
+        await using var session = await client.CreateSessionAsync(new SessionConfig { SkillProvider = provider });
+
+        var read = await server.SendRequestAsync("skillProvider.read", SkillReadRequest(session.SessionId, "known"));
+
+        Assert.Equal("# Known", read.GetProperty("markdown").GetString());
+        var missing = await server.SendRequestAsync("skillProvider.read", SkillReadRequest(session.SessionId, "missing"));
+        Assert.True(missing.TryGetProperty("markdown", out var markdown), missing.ToString());
+        Assert.Equal(JsonValueKind.Null, markdown.ValueKind);
+    }
+
+    [Fact]
+    public async Task SkillProvider_Provider_Failures_Do_Not_Leak_Exception_Details()
+    {
+        await using var server = await FakeCopilotServer.StartAsync();
+        var logger = new SkillProviderLogger();
+        await using var client = new CopilotClient(new CopilotClientOptions { Connection = RuntimeConnection.ForUri(server.Url), Logger = logger });
+        var listFailure = new InvalidOperationException("secret list failure");
+        var readFailure = new InvalidOperationException("secret read failure");
+        var provider = new TestSkillProvider
+        {
+            ListHandler = _ => throw listFailure,
+            ReadHandler = (_, _) => throw readFailure
+        };
+        await using var session = await client.CreateSessionAsync(new SessionConfig { SkillProvider = provider });
+
+        var listError = await Assert.ThrowsAsync<InvalidOperationException>(() =>
+            server.SendRequestAsync("skillProvider.list", SkillListRequest(session.SessionId)));
+        AssertRpcError(listError, "Skill provider listSkills failed");
+
+        var readError = await Assert.ThrowsAsync<InvalidOperationException>(() =>
+            server.SendRequestAsync("skillProvider.read", SkillReadRequest(session.SessionId, "throws")));
+        AssertRpcError(readError, "Skill provider readSkill failed");
+
+        Assert.DoesNotContain("secret", listError.Message, StringComparison.OrdinalIgnoreCase);
+        Assert.DoesNotContain("secret", readError.Message, StringComparison.OrdinalIgnoreCase);
+        Assert.Contains(logger.Entries, entry =>
+            entry.Message == $"Skill provider listSkills failed. SessionId={session.SessionId}" && entry.Exception == listFailure);
+        Assert.Contains(logger.Entries, entry =>
+            entry.Message == $"Skill provider readSkill failed. SessionId={session.SessionId}" && entry.Exception == readFailure);
+    }
+
+    [Fact]
+    public async Task SkillProvider_Provider_Cancellation_Without_Request_Cancellation_Is_Provider_Failure()
+    {
+        await using var server = await FakeCopilotServer.StartAsync();
+        await using var client = new CopilotClient(new CopilotClientOptions { Connection = RuntimeConnection.ForUri(server.Url) });
+        var provider = new TestSkillProvider
+        {
+            ListHandler = _ => throw new TaskCanceledException("secret list timeout"),
+            ReadHandler = (_, _) => throw new TaskCanceledException("secret read timeout")
+        };
+        await using var session = await client.CreateSessionAsync(new SessionConfig { SkillProvider = provider });
+
+        var listError = await Assert.ThrowsAsync<InvalidOperationException>(() =>
+            server.SendRequestAsync("skillProvider.list", SkillListRequest(session.SessionId)).WaitAsync(TimeSpan.FromSeconds(10)));
+        AssertRpcError(listError, "Skill provider listSkills failed");
+
+        var readError = await Assert.ThrowsAsync<InvalidOperationException>(() =>
+            server.SendRequestAsync("skillProvider.read", SkillReadRequest(session.SessionId, "times-out")).WaitAsync(TimeSpan.FromSeconds(10)));
+        AssertRpcError(readError, "Skill provider readSkill failed");
+    }
+
+    [Fact]
+    public async Task SkillProvider_Rejects_Unknown_NoProvider_And_Disposed_Sessions()
+    {
+        await using var server = await FakeCopilotServer.StartAsync();
+        await using var client = new CopilotClient(new CopilotClientOptions { Connection = RuntimeConnection.ForUri(server.Url) });
+        await client.StartAsync();
+
+        var unknown = await Assert.ThrowsAsync<InvalidOperationException>(() =>
+            server.SendRequestAsync("skillProvider.list", SkillListRequest("unknown-session")));
+        AssertRpcError(unknown, "No skill provider for session: unknown-session");
+
+        await using var noProvider = await client.CreateSessionAsync(new SessionConfig { SessionId = "no-provider" });
+        var noProviderError = await Assert.ThrowsAsync<InvalidOperationException>(() =>
+            server.SendRequestAsync("skillProvider.list", SkillListRequest(noProvider.SessionId)));
+        AssertRpcError(noProviderError, "No skill provider for session: no-provider");
+
+        var providerSession = await client.CreateSessionAsync(new SessionConfig
+        {
+            SessionId = "disposed-provider",
+            SkillProvider = new TestSkillProvider()
+        });
+        await providerSession.DisposeAsync();
+        var disposed = await Assert.ThrowsAsync<InvalidOperationException>(() =>
+            server.SendRequestAsync("skillProvider.list", SkillListRequest("disposed-provider")));
+        AssertRpcError(disposed, "No skill provider for session: disposed-provider");
+    }
+
+    [Fact]
+    public async Task SkillProvider_Cloud_Create_Throws_Before_Connecting()
+    {
+        await using var client = new CopilotClient(new CopilotClientOptions
+        {
+            Connection = RuntimeConnection.ForUri("http://127.0.0.1:1")
+        });
+        var provider = new TestSkillProvider();
+
+        var error = await Assert.ThrowsAsync<ArgumentException>(() => client.CreateSessionAsync(new SessionConfig
+        {
+            Cloud = new CloudSessionOptions
+            {
+                Repository = new CloudSessionRepository
+                {
+                    Owner = "github",
+                    Name = "copilot-sdk",
+                    Branch = "main"
+                }
+            },
+            SkillProvider = provider
+        }));
+
+        Assert.Equal("Skill providers are not supported for cloud sessions.", error.Message);
+        Assert.Equal(0, provider.ListCalls);
+        Assert.Equal(0, provider.ReadCalls);
+    }
+
+    [Fact]
+    public async Task SkillProvider_EmptyMode_Defaults_EnableSkills_To_False()
+    {
+        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 session = await client.CreateSessionAsync(new SessionConfig
+        {
+            AvailableTools = [],
+            SkillProvider = new TestSkillProvider()
+        });
+
+        var request = Assert.Single(server.Requests, request => request.Method == "session.create");
+        Assert.True(request.Params.GetProperty("hasSkillProvider").GetBoolean());
+        Assert.False(request.Params.GetProperty("enableSkills").GetBoolean());
+    }
+
+    private static Dictionary<string, object?> SkillListRequest(string sessionId) => new()
+    {
+        ["sessionId"] = sessionId
+    };
+
+    private static Dictionary<string, object?> SkillReadRequest(string sessionId, string name) => new()
+    {
+        ["sessionId"] = sessionId,
+        ["name"] = name
+    };
+
+    private static void AssertRpcError(InvalidOperationException exception, string expectedMessage)
+    {
+        Assert.Equal(expectedMessage, exception.Message);
+        var error = Assert.IsType<JsonElement>(exception.Data["error"]);
+        Assert.Equal(-32603, error.GetProperty("code").GetInt32());
+        Assert.Equal(expectedMessage, error.GetProperty("message").GetString());
+        Assert.False(error.TryGetProperty("data", out _), error.ToString());
+    }
+
+    private sealed class SkillProviderLogger : ILogger
+    {
+        private readonly ConcurrentQueue<(string Message, Exception? Exception)> _entries = new();
+
+        public IReadOnlyCollection<(string Message, Exception? Exception)> Entries => _entries;
+
+        public IDisposable? BeginScope<TState>(TState state) where TState : notnull => null;
+
+        public bool IsEnabled(LogLevel logLevel) => true;
+
+        public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception? exception, Func<TState, Exception?, string> formatter) =>
+            _entries.Enqueue((formatter(state, exception), exception));
+    }
+
+    private sealed class TestSkillProvider : ISkillProvider
+    {
+        public int ListCalls;
+        public int ReadCalls;
+
+        public Func<CancellationToken, Task<IReadOnlyList<SkillProviderDescriptor>>> ListHandler { get; init; } =
+            _ => Task.FromResult<IReadOnlyList<SkillProviderDescriptor>>(
+            [
+                new()
+                {
+                    Name = "dynamic",
+                    Description = "Dynamic skill"
+                }
+            ]);
+
+        public Func<string, CancellationToken, Task<string?>> ReadHandler { get; init; } =
+            (name, _) => Task.FromResult<string?>($"# {name}");
+
+        public Task<IReadOnlyList<SkillProviderDescriptor>> ListSkillsAsync(CancellationToken cancellationToken)
+        {
+            Interlocked.Increment(ref ListCalls);
+            return ListHandler(cancellationToken);
+        }
+
+        public Task<string?> ReadSkillAsync(string name, CancellationToken cancellationToken)
+        {
+            Interlocked.Increment(ref ReadCalls);
+            return ReadHandler(name, cancellationToken);
+        }
+    }
+
+    private sealed partial class FakeCopilotServer
+    {
+        public async Task<Task<JsonElement>> SendRequestWithoutWaitingAsync(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 completion.Task.WaitAsync(_cts.Token);
+        }
+    }
+}
+#endif
diff --git a/dotnet/test/Unit/CloneTests.cs b/dotnet/test/Unit/CloneTests.cs
index c67bce8b4a..3ae4c0b009 100644
--- a/dotnet/test/Unit/CloneTests.cs
+++ b/dotnet/test/Unit/CloneTests.cs
@@ -88,6 +88,15 @@ private sealed class TestExtensionLaunchProvider : GitHub.Copilot.Rpc.IExtension
             Task.FromResult(new GitHub.Copilot.Rpc.ExtensionLaunchProviderResolveResult());
     }
 
+    private sealed class TestSkillProvider : ISkillProvider
+    {
+        public Task<IReadOnlyList<SkillProviderDescriptor>> ListSkillsAsync(CancellationToken cancellationToken) =>
+            Task.FromResult<IReadOnlyList<SkillProviderDescriptor>>([]);
+
+        public Task<string?> ReadSkillAsync(string name, CancellationToken cancellationToken) =>
+            Task.FromResult<string?>(null);
+    }
+
     [Fact]
     public void SessionConfig_Clone_CopiesAllProperties()
     {
@@ -205,6 +214,28 @@ public void SessionConfig_RefreshCustomInstructions_IsCreateOnlyAndDefaultsToNul
         Assert.Null(typeof(ResumeSessionConfig).GetProperty(nameof(SessionConfig.RefreshCustomInstructions)));
     }
 
+    [Fact]
+    public void SessionConfig_Clone_CopiesSkillProvider()
+    {
+        var provider = new TestSkillProvider();
+        var original = new SessionConfig { SkillProvider = provider };
+
+        var clone = original.Clone();
+
+        Assert.Same(provider, clone.SkillProvider);
+    }
+
+    [Fact]
+    public void ResumeSessionConfig_Clone_CopiesSkillProvider()
+    {
+        var provider = new TestSkillProvider();
+        var original = new ResumeSessionConfig { SkillProvider = provider };
+
+        var clone = original.Clone();
+
+        Assert.Same(provider, clone.SkillProvider);
+    }
+
     [Fact]
     public void SessionConfig_Clone_CollectionsAreIndependent()
     {
diff --git a/dotnet/test/Unit/E2ETestFixtureTests.cs b/dotnet/test/Unit/E2ETestFixtureTests.cs
index 933b82c1fc..afbb87fd6f 100644
--- a/dotnet/test/Unit/E2ETestFixtureTests.cs
+++ b/dotnet/test/Unit/E2ETestFixtureTests.cs
@@ -4,7 +4,11 @@
 
 using System.ComponentModel;
 using System.Diagnostics;
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
 using System.Reflection;
+using System.Text.Json;
 using GitHub.Copilot.Test.E2E;
 using GitHub.Copilot.Test.Harness;
 using Xunit;
@@ -13,6 +17,25 @@ namespace GitHub.Copilot.Test.Unit;
 
 public class E2ETestFixtureTests
 {
+    [Fact]
+    public async Task Default_Telemetry_Endpoint_Uses_The_Owned_Proxy()
+    {
+        await using var context = await E2ETestContext.CreateAsync();
+        using var client = new HttpClient();
+        using var userRequest = new HttpRequestMessage(HttpMethod.Get, context.ProxyUrl + "/copilot_internal/user");
+        userRequest.Headers.Authorization = new AuthenticationHeaderValue("Bearer", context.GetEnvironment()["GH_TOKEN"]);
+        using var userResponse = await client.SendAsync(userRequest);
+        Assert.Equal(HttpStatusCode.OK, userResponse.StatusCode);
+        using var user = JsonDocument.Parse(await userResponse.Content.ReadAsStringAsync());
+        var telemetryEndpoint = user.RootElement.GetProperty("endpoints").GetProperty("telemetry").GetString();
+        Assert.Equal(context.ProxyUrl, telemetryEndpoint);
+        using var content = new StringContent("{}\n");
+        using var telemetryResponse = await client.PostAsync(telemetryEndpoint + "/telemetry", content);
+        Assert.Equal(HttpStatusCode.NoContent, telemetryResponse.StatusCode);
+        Assert.Equal(string.Empty, await telemetryResponse.Content.ReadAsStringAsync());
+        Assert.Empty(await context.GetExchangesAsync());
+    }
+
     [Fact]
     public async Task Failed_Process_Launch_Reclaims_Context_Directories()
     {
diff --git a/dotnet/test/Unit/InProcessRuntimeArgumentsTests.cs b/dotnet/test/Unit/InProcessRuntimeArgumentsTests.cs
new file mode 100644
index 0000000000..1dc5e4d93e
--- /dev/null
+++ b/dotnet/test/Unit/InProcessRuntimeArgumentsTests.cs
@@ -0,0 +1,27 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+using System.Reflection;
+using GitHub.Copilot.Test.Harness;
+using Xunit;
+
+namespace GitHub.Copilot.Test.Unit;
+
+public sealed class InProcessRuntimeArgumentsTests
+{
+    [Fact]
+    public void Integration_Id_Is_Forwarded_To_The_Native_Host()
+    {
+        InProcessEnvIsolation.Apply("GITHUB_COPILOT_INTEGRATION_ID", "  microsoft/vscode  ");
+        var method = typeof(CopilotClient).GetMethod(
+            "BuildInProcessRuntimeArguments",
+            BindingFlags.Static | BindingFlags.NonPublic);
+        Assert.NotNull(method);
+
+        var args = Assert.IsType<List<string>>(
+            method!.Invoke(null, [new CopilotClientOptions()]));
+
+        Assert.Contains("--cli-login-sync-integration-id=microsoft/vscode", args);
+    }
+}
diff --git a/dotnet/test/Unit/MSBuildTargetsTests.cs b/dotnet/test/Unit/MSBuildTargetsTests.cs
index 0d02767dec..2e855a29be 100644
--- a/dotnet/test/Unit/MSBuildTargetsTests.cs
+++ b/dotnet/test/Unit/MSBuildTargetsTests.cs
@@ -450,6 +450,11 @@ public static MSBuildSandbox Create(bool packAsTool = false, string version = "0
                 </Project>
                 """;
             File.WriteAllText(Path.Combine(dir, "App.csproj"), csproj);
+            File.WriteAllText(Path.Combine(dir, "NuGet.Config"),
+                "<configuration><packageSources><clear /></packageSources></configuration>");
+            // Match the SDK used by setup restore, which provisioned the offline framework packs.
+            File.Copy(Path.Combine(Path.GetDirectoryName(TargetsFilePath)!, "..", "..", "global.json"),
+                Path.Combine(dir, "global.json"));
             File.WriteAllText(
                 Path.Combine(dir, "Stub.cs"),
                 packAsTool
diff --git a/dotnet/test/Unit/RpcMcpListTests.cs b/dotnet/test/Unit/RpcMcpListTests.cs
new file mode 100644
index 0000000000..a662d49212
--- /dev/null
+++ b/dotnet/test/Unit/RpcMcpListTests.cs
@@ -0,0 +1,78 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+#if NET8_0_OR_GREATER
+using System.Text.Json;
+using GitHub.Copilot.Rpc;
+using Xunit;
+
+namespace GitHub.Copilot.Test.Unit;
+
+public sealed partial class ClientSessionLifetimeTests
+{
+    private static readonly string[] ExpectedMcpLifecycleStatuses = ["not_configured", "connected", "needs-auth", "stopped", "failed"];
+
+    [Fact]
+    public async Task Session_Rpc_Mcp_ListConfigured_Preserves_Runtime_Lifecycle()
+    {
+        await using var server = await FakeCopilotServer.StartAsync();
+        using var response = JsonDocument.Parse("""
+            {
+                "servers": [
+                    { "name": "cold", "enabled": true, "live": { "status": "not_configured" } },
+                    { "name": "old-connection", "enabled": false, "live": { "status": "connected" } },
+                    { "name": "auth", "enabled": true, "live": { "status": "needs-auth" } },
+                    { "name": "stopped", "enabled": true, "live": { "status": "stopped" } },
+                    { "name": "failed", "enabled": true, "live": { "status": "failed", "error": "connection failed" } }
+                ]
+            }
+            """);
+        server.ResponseFactory = _ => response.RootElement;
+        await using var client = new CopilotClient(new CopilotClientOptions
+        {
+            Connection = RuntimeConnection.ForUri(server.Url)
+        });
+        await using var session = await client.CreateSessionAsync(new SessionConfig());
+        server.ClearRequests();
+
+        var inventory = await session.Rpc.Mcp.ListConfiguredAsync();
+        Assert.Equal(
+            ExpectedMcpLifecycleStatuses,
+            inventory.Servers.Select(entry => entry.Live.Status.Value));
+        Assert.False(inventory.Servers[1].Enabled);
+        Assert.Equal("connection failed", inventory.Servers[4].Live.Error);
+        AssertConnectorRequest(Assert.Single(server.Requests), "session.mcp.listConfigured", session.SessionId);
+    }
+
+    [Fact]
+    public async Task Session_Rpc_Mcp_List_And_ListConfigured_Use_Parameterless_Wire_Contracts()
+    {
+        await using var server = await FakeCopilotServer.StartAsync();
+        server.ResponseFactory = _ => new Dictionary<string, object?> { ["servers"] = Array.Empty<object>() };
+        await using var client = new CopilotClient(new CopilotClientOptions
+        {
+            Connection = RuntimeConnection.ForUri(server.Url)
+        });
+        await using var session = await client.CreateSessionAsync(new SessionConfig());
+        server.ClearRequests();
+
+        var mcp = session.Rpc.Mcp;
+        Func<CancellationToken, Task<McpServerList>> legacyList = mcp.ListAsync;
+        Func<CancellationToken, Task<McpConfiguredServerList>> configuredList = mcp.ListConfiguredAsync;
+        Assert.NotNull(mcp.GetType().GetMethod("ListAsync", [typeof(CancellationToken)]));
+        Assert.NotNull(mcp.GetType().GetMethod("ListConfiguredAsync", [typeof(CancellationToken)]));
+        await mcp.ListAsync();
+        await legacyList(CancellationToken.None);
+        await mcp.ListConfiguredAsync();
+        await configuredList(CancellationToken.None);
+
+        Assert.Collection(
+            server.Requests,
+            request => AssertConnectorRequest(request, "session.mcp.list", session.SessionId),
+            request => AssertConnectorRequest(request, "session.mcp.list", session.SessionId),
+            request => AssertConnectorRequest(request, "session.mcp.listConfigured", session.SessionId),
+            request => AssertConnectorRequest(request, "session.mcp.listConfigured", session.SessionId));
+    }
+}
+#endif
diff --git a/dotnet/test/Unit/RpcModelCompatibilityTests.cs b/dotnet/test/Unit/RpcModelCompatibilityTests.cs
new file mode 100644
index 0000000000..d638c86d35
--- /dev/null
+++ b/dotnet/test/Unit/RpcModelCompatibilityTests.cs
@@ -0,0 +1,104 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+#if NET8_0_OR_GREATER
+using GitHub.Copilot.Rpc;
+using Xunit;
+
+namespace GitHub.Copilot.Test.Unit;
+
+public sealed partial class ClientSessionLifetimeTests
+{
+    [Fact]
+    public void Existing_Model_Switch_Signature_And_Defaults_Are_Preserved()
+    {
+        Type[] types =
+        [
+            typeof(string), typeof(AutoTier?), typeof(string), typeof(ReasoningSummary?),
+            typeof(Verbosity?), typeof(ModelCapabilitiesOverride), typeof(ContextTier?),
+            typeof(ModelChangeSource?), typeof(bool?), typeof(string), typeof(bool?),
+            typeof(string), typeof(string), typeof(bool?), typeof(ModelPickerPersistenceRequest),
+            typeof(CancellationToken),
+        ];
+        var method = typeof(ModelApi).GetMethod("SwitchToAsync", types);
+        Assert.NotNull(method);
+        var parameters = method.GetParameters();
+        Assert.False(parameters[0].IsOptional);
+        Assert.Equal("cancellationToken", parameters[^1].Name);
+        Assert.All(parameters.Skip(1), parameter =>
+        {
+            Assert.True(parameter.IsOptional);
+            Assert.True(parameter.HasDefaultValue);
+            Assert.Null(parameter.DefaultValue);
+        });
+    }
+
+    [Fact]
+    public async Task Existing_Positional_Model_Switch_Calls_Preserve_Wire_Values()
+    {
+        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());
+        server.ClearRequests();
+
+        await session.Rpc.Model.SwitchToAsync("auto", AutoTier.Balance);
+        await session.Rpc.Model.SwitchToAsync(
+            "auto", AutoTier.Efficiency, "high", null, null, null, null, null,
+            true, "compact", true, "repo", "global", true, null, CancellationToken.None);
+
+        var requests = server.Requests.ToArray();
+        Assert.Equal(2, requests.Length);
+        foreach (var request in requests)
+        {
+            Assert.Equal("session.model.switchTo", request.Method);
+            Assert.Equal(session.SessionId, request.Params.GetProperty("sessionId").GetString());
+            Assert.Equal("auto", request.Params.GetProperty("modelId").GetString());
+            Assert.False(request.Params.TryGetProperty("providerId", out _));
+        }
+        Assert.Equal("balance", requests[0].Params.GetProperty("autoTier").GetString());
+        Assert.False(requests[0].Params.TryGetProperty("reasoningEffort", out _));
+        Assert.Equal("efficiency", requests[1].Params.GetProperty("autoTier").GetString());
+        Assert.Equal("high", requests[1].Params.GetProperty("reasoningEffort").GetString());
+        Assert.True(requests[1].Params.GetProperty("deferIfModelChangeQueued").GetBoolean());
+        Assert.Equal("compact", requests[1].Params.GetProperty("compactionDecision").GetString());
+        Assert.True(requests[1].Params.GetProperty("runCompactionPreflight").GetBoolean());
+        Assert.Equal("repo", requests[1].Params.GetProperty("repoScope").GetString());
+        Assert.Equal("global", requests[1].Params.GetProperty("modelChangeScope").GetString());
+        Assert.True(requests[1].Params.GetProperty("requireAvailable").GetBoolean());
+    }
+
+    [Fact]
+    public async Task Provider_Qualified_Model_Switch_Uses_Request_With_Sdk_Owned_Session()
+    {
+        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());
+        server.ClearRequests();
+
+        var result = await session.Rpc.Model.SwitchToAsync(new ModelSwitchToRequest
+        {
+            ModelId = "shared-model",
+            ProviderId = "provider-a",
+            ReasoningEffort = "high",
+        }, CancellationToken.None);
+
+        Assert.Null(typeof(ModelSwitchToRequest).GetProperty("SessionId"));
+        var request = Assert.Single(server.Requests);
+        Assert.Equal("session.model.switchTo", request.Method);
+        Assert.Equal(session.SessionId, request.Params.GetProperty("sessionId").GetString());
+        Assert.Equal("shared-model", request.Params.GetProperty("modelId").GetString());
+        Assert.Equal("provider-a", request.Params.GetProperty("providerId").GetString());
+        Assert.Equal("high", request.Params.GetProperty("reasoningEffort").GetString());
+        Assert.False(request.Params.TryGetProperty("autoTier", out _));
+        // The fake reports "auto"; the SDK must return the server's result, not the requested id.
+        Assert.Equal("auto", result.ModelId);
+    }
+}
+#endif
diff --git a/dotnet/test/Unit/RpcWorkspacesCompatibilityTests.cs b/dotnet/test/Unit/RpcWorkspacesCompatibilityTests.cs
new file mode 100644
index 0000000000..8653a6b09a
--- /dev/null
+++ b/dotnet/test/Unit/RpcWorkspacesCompatibilityTests.cs
@@ -0,0 +1,88 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+#if NET8_0_OR_GREATER
+using GitHub.Copilot.Rpc;
+using Xunit;
+
+namespace GitHub.Copilot.Test.Unit;
+
+public sealed partial class ClientSessionLifetimeTests
+{
+    [Fact]
+    public void Workspace_Diff_Preserves_Existing_Signature_And_Defaults()
+    {
+        var method = typeof(WorkspacesApi).GetMethod("DiffAsync",
+            [typeof(WorkspaceDiffMode), typeof(bool?), typeof(CancellationToken)]);
+        Assert.NotNull(method);
+        Assert.Equal(
+            new (string? Name, bool IsOptional)[]
+            {
+                ("mode", false),
+                ("ignoreWhitespace", true),
+                ("cancellationToken", true),
+            },
+            method.GetParameters().Select(parameter => (parameter.Name, parameter.IsOptional)));
+        Assert.All(method.GetParameters().Skip(1), parameter => Assert.Null(parameter.DefaultValue));
+    }
+
+    [Fact]
+    public async Task Workspace_Diff_Preserves_Positional_Calls_And_Offers_Contents_Through_Request()
+    {
+        await using var server = await FakeCopilotServer.StartAsync();
+        server.ResponseFactory = request => request.Method == "session.workspaces.diff"
+            ? new Dictionary<string, object?>
+            {
+                ["mode"] = "session",
+                ["requestedMode"] = "session",
+                ["isFallback"] = false,
+                ["changes"] = Array.Empty<object>(),
+            }
+            : throw new InvalidOperationException($"Unexpected workspace diff request '{request.Method}'.");
+        await using var client = new CopilotClient(new CopilotClientOptions
+        {
+            Connection = RuntimeConnection.ForUri(server.Url)
+        });
+        await using var session = await client.CreateSessionAsync(new SessionConfig());
+        server.ClearRequests();
+        var cancellation = CancellationToken.None;
+
+        await session.Rpc.Workspaces.DiffAsync(WorkspaceDiffMode.Session, false, cancellation);
+        await session.Rpc.Workspaces.DiffAsync(WorkspaceDiffMode.Session);
+        await session.Rpc.Workspaces.DiffAsync(WorkspaceDiffMode.Session, cancellationToken: cancellation);
+        await session.Rpc.Workspaces.DiffAsync(new WorkspacesDiffRequest
+        {
+            Mode = WorkspaceDiffMode.Session,
+            IgnoreWhitespace = false,
+            IncludeContents = true,
+        }, cancellation);
+        await session.Rpc.Workspaces.DiffAsync(new WorkspacesDiffRequest
+        {
+            Mode = WorkspaceDiffMode.Session,
+            IncludeContents = false,
+        }, cancellation);
+
+        Assert.Null(typeof(WorkspacesDiffRequest).GetProperty("SessionId"));
+        var requests = server.Requests.ToArray();
+        Assert.All(requests, request => Assert.Equal(
+            ("session.workspaces.diff", session.SessionId, "session"),
+            (request.Method, request.Params.GetProperty("sessionId").GetString(),
+                request.Params.GetProperty("mode").GetString())));
+        Assert.Equal(
+            new (bool? IgnoreWhitespace, bool? IncludeContents)[]
+            {
+                (false, null),
+                (null, null),
+                (null, null),
+                (false, true),
+                (null, false),
+            },
+            requests.Select(request => (
+                request.Params.TryGetProperty("ignoreWhitespace", out var ignoreWhitespace)
+                    ? ignoreWhitespace.GetBoolean() : (bool?)null,
+                request.Params.TryGetProperty("includeContents", out var includeContents)
+                    ? includeContents.GetBoolean() : (bool?)null)));
+    }
+}
+#endif
diff --git a/dotnet/test/Unit/RuntimeWrapperTests.cs b/dotnet/test/Unit/RuntimeWrapperTests.cs
index e7c77ab92d..47bcba2ab6 100644
--- a/dotnet/test/Unit/RuntimeWrapperTests.cs
+++ b/dotnet/test/Unit/RuntimeWrapperTests.cs
@@ -93,7 +93,8 @@ public async Task Marked_Bundled_Explicit_Cli_Does_Not_Require_Runtime_Pair()
         var nativeDirectory = Path.Combine(baseDirectory, "runtimes", rid, "native");
         Directory.CreateDirectory(nativeDirectory);
         var cliPath = Path.Combine(nativeDirectory, OperatingSystem.IsWindows() ? "copilot.exe" : "copilot");
-        await File.WriteAllTextAsync(cliPath, "not an executable");
+        // Nonempty invalid images can stall Windows process creation before it reports the launch error.
+        await File.WriteAllTextAsync(cliPath, string.Empty);
         await File.WriteAllTextAsync(Path.Combine(nativeDirectory, ".copilot-explicit-cli"), "explicit");
 
         try
diff --git a/dotnet/test/Unit/SerializationTests.cs b/dotnet/test/Unit/SerializationTests.cs
index 30ac2608d6..ef41cfa4aa 100644
--- a/dotnet/test/Unit/SerializationTests.cs
+++ b/dotnet/test/Unit/SerializationTests.cs
@@ -1283,7 +1283,7 @@ public void ModelSwitchRequests_DistinguishRequiredNullFromOmittedOptionalValue(
         Assert.True(switchAutoTierDocument.RootElement.TryGetProperty("autoTier", out var requiredAutoTier));
         Assert.Equal(JsonValueKind.Null, requiredAutoTier.ValueKind);
 
-        var switchToType = assembly.GetType("GitHub.Copilot.Rpc.ModelSwitchToRequest");
+        var switchToType = assembly.GetType("GitHub.Copilot.Rpc.ModelSwitchToRequestWithSession");
         Assert.NotNull(switchToType);
         var switchToRequest = CreateInternalRequest(
             switchToType!,
diff --git a/dotnet/test/Unit/SetToolsTests.cs b/dotnet/test/Unit/SetToolsTests.cs
index 4779a3a70e..c88dccb639 100644
--- a/dotnet/test/Unit/SetToolsTests.cs
+++ b/dotnet/test/Unit/SetToolsTests.cs
@@ -6,9 +6,11 @@
 #pragma warning disable GHCP001 // Live tool replacement is intentionally experimental.
 
 using Microsoft.Extensions.AI;
+using Microsoft.Extensions.Logging;
 using System.Net;
 using System.Net.Sockets;
 using System.Reflection;
+using System.Runtime.ExceptionServices;
 using System.Text;
 using System.Text.Json;
 using System.Text.Json.Nodes;
@@ -122,6 +124,53 @@ public async Task SetToolsAsync_Rejection_Leaves_Handlers_Unchanged()
         Assert.Equal("old", result);
     }
 
+    [Fact]
+    public async Task SetToolsAsync_Acceptance_After_Disposal_Cannot_Restore_Handlers_Or_Close_Connection()
+    {
+        await using var server = await SetToolsFakeServer.StartAsync();
+        var releaseSet = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+        server.BeforeSetToolsResponseAsync = _ => releaseSet.Task;
+        await using var client = new CopilotClient(new CopilotClientOptions { Connection = RuntimeConnection.ForUri(server.Url) });
+        await using var session = await client.CreateSessionAsync(new SessionConfig());
+        var replacement = session.SetToolsAsync([Tool("retired_tool", "must-not-install")]);
+        var timeout = TimeSpan.FromSeconds(5);
+        Exception? bodyFailure = null;
+        try
+        {
+            await server.WaitForRequestAsync("session.tools.set").WaitAsync(timeout);
+            await session.DisposeAsync().AsTask().WaitAsync(timeout);
+            releaseSet.TrySetResult();
+
+            await Assert.ThrowsAsync<ObjectDisposedException>(() => replacement.WaitAsync(timeout));
+            await using var liveSession = await client.CreateSessionAsync(new SessionConfig()).WaitAsync(timeout);
+            Assert.NotEqual(session.SessionId, liveSession.SessionId);
+        }
+        catch (Exception error)
+        {
+            bodyFailure = error;
+        }
+        finally
+        {
+            releaseSet.TrySetResult();
+            try
+            {
+                await replacement.WaitAsync(timeout);
+            }
+            catch (ObjectDisposedException)
+            {
+                // The acknowledged replacement was rejected by local retirement.
+            }
+            catch (Exception cleanupError)
+            {
+                bodyFailure = bodyFailure is null ? cleanupError : new AggregateException(bodyFailure, cleanupError);
+            }
+        }
+        if (bodyFailure is not null)
+        {
+            ExceptionDispatchInfo.Capture(bodyFailure).Throw();
+        }
+    }
+
     [Fact]
     public async Task SetToolsAsync_Empty_Set_Removes_Handlers()
     {
@@ -240,6 +289,40 @@ await Assert.ThrowsAnyAsync<OperationCanceledException>(() =>
         Assert.Equal("new", response.Params.GetProperty("result").GetProperty("textResultForLlm").GetString());
     }
 
+    [Fact]
+    public async Task SetToolsAsync_Publishes_Accepted_Replacement_Before_Next_Tool_Request()
+    {
+        await using var server = await SetToolsFakeServer.StartAsync();
+        var logger = new SetToolsResponseLogger();
+        var releaseSet = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+        server.BeforeSetToolsResponseAsync = _ => releaseSet.Task;
+        await using var client = new CopilotClient(new CopilotClientOptions { Connection = RuntimeConnection.ForUri(server.Url), Logger = logger });
+        await using var session = await client.CreateSessionAsync(new SessionConfig
+        {
+            Tools = [Tool("cancel_tool", "old")],
+        });
+
+        using var cts = new CancellationTokenSource();
+        try
+        {
+            var replacement = session.SetToolsAsync([Tool("cancel_tool", "new")], cts.Token);
+            await server.WaitForRequestAsync("session.tools.set");
+            await cts.CancelAsync();
+            await Assert.ThrowsAnyAsync<OperationCanceledException>(() => replacement);
+
+            releaseSet.SetResult();
+            await logger.ResponseReceived.Task.WaitAsync(TimeSpan.FromSeconds(5));
+
+            var result = await InvokeToolAsync(server, session, "cancel_tool", "cancel-request");
+            Assert.Equal("new", result);
+        }
+        finally
+        {
+            releaseSet.TrySetResult();
+            logger.ContinueResponse.TrySetResult();
+        }
+    }
+
     [Fact]
     public async Task SetToolsAsync_Cancellation_While_Queued_Does_Not_Send_Request()
     {
@@ -274,6 +357,52 @@ await Assert.ThrowsAnyAsync<OperationCanceledException>(() =>
         Assert.Equal("first", result);
     }
 
+    [Fact]
+    public async Task SetToolsAsync_Cancellation_Before_Queued_Waiter_Resumes_Does_Not_Send_Request()
+    {
+        await using var server = await SetToolsFakeServer.StartAsync();
+        var releaseSet = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+        server.BeforeSetToolsResponseAsync = _ => releaseSet.Task;
+        await using var client = new CopilotClient(new CopilotClientOptions { Connection = RuntimeConnection.ForUri(server.Url) });
+        await using var session = await client.CreateSessionAsync(new SessionConfig());
+
+        var first = session.SetToolsAsync([Tool("queued_tool", "first")]);
+        await server.WaitForRequestAsync("session.tools.set");
+        using var cts = new CancellationTokenSource();
+        var context = new PausedContinuationContext();
+        var previousContext = SynchronizationContext.Current;
+        Task queued;
+        try
+        {
+            SynchronizationContext.SetSynchronizationContext(context);
+            queued = session.SetToolsAsync([Tool("queued_tool", "queued")], cts.Token);
+        }
+        finally
+        {
+            SynchronizationContext.SetSynchronizationContext(previousContext);
+            releaseSet.TrySetResult();
+        }
+
+        await first;
+        var continuation = await context.Continuation.Task.WaitAsync(TimeSpan.FromSeconds(5));
+        try
+        {
+            await cts.CancelAsync();
+            await Assert.ThrowsAnyAsync<OperationCanceledException>(() => queued);
+        }
+        finally
+        {
+            continuation.Callback(continuation.State);
+        }
+
+        // A later completed replacement proves the cancelled waiter has left the queue.
+        await session.SetToolsAsync([Tool("queued_tool", "last")]);
+        Assert.Equal(
+            ["Returns first", "Returns last"],
+            server.Requests.Where(request => request.Method == "session.tools.set")
+                .Select(request => request.Params.GetProperty("tools")[0].GetProperty("description").GetString()));
+    }
+
     private static AIFunction Tool(string name, string result)
     {
         return AIFunctionFactory.Create(
@@ -441,6 +570,40 @@ public void Dispose()
         }
     }
 
+    private sealed class PausedContinuationContext : SynchronizationContext
+    {
+        public TaskCompletionSource<(SendOrPostCallback Callback, object? State)> Continuation { get; } =
+            new(TaskCreationOptions.RunContinuationsAsynchronously);
+
+        public override void Post(SendOrPostCallback callback, object? state)
+        {
+            if (!Continuation.TrySetResult((callback, state)))
+            {
+                base.Post(callback, state);
+            }
+        }
+    }
+
+    private sealed class SetToolsResponseLogger : ILogger
+    {
+        public TaskCompletionSource ResponseReceived { get; } = new(TaskCreationOptions.RunContinuationsAsynchronously);
+        public TaskCompletionSource ContinueResponse { get; } = new(TaskCreationOptions.RunContinuationsAsynchronously);
+        public IDisposable? BeginScope<TState>(TState state) where TState : notnull => null;
+        public bool IsEnabled(LogLevel logLevel) => true;
+
+        public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception? exception, Func<TState, Exception?, string> formatter)
+        {
+            if (state is IReadOnlyList<KeyValuePair<string, object?>> properties &&
+                properties.Any(entry => entry is { Key: "Method", Value: "session.tools.set" }) &&
+                properties.Any(entry => entry is { Key: "Status", Value: "Succeeded" }))
+            {
+                // Hold the RPC awaiter after acceptance without blocking the reader's next tool event.
+                ResponseReceived.TrySetResult();
+                ContinueResponse.Task.GetAwaiter().GetResult();
+            }
+        }
+    }
+
     private sealed class SetToolsFakeServer : IAsyncDisposable
     {
         private static readonly JsonSerializerOptions s_jsonOptions = new(JsonSerializerDefaults.Web)
@@ -453,6 +616,7 @@ private sealed class SetToolsFakeServer : IAsyncDisposable
         private readonly List<RpcRequestRecord> _requests = [];
         private readonly object _requestsLock = new();
         private readonly Task _serverTask;
+        private readonly List<Task> _requestTasks = [];
         private NetworkStream? _stream;
         private string? _nextSetToolsRejection;
         private readonly Dictionary<int, string> _setToolsRejections = [];
@@ -578,8 +742,19 @@ public async ValueTask DisposeAsync()
             {
             }
 
-            _cts.Dispose();
-            _writeLock.Dispose();
+            try
+            {
+                await Task.WhenAll(_requestTasks).WaitAsync(TimeSpan.FromSeconds(5));
+            }
+            catch (OperationCanceledException) when (_requestTasks.All(task => task.IsCanceled || task.IsCompletedSuccessfully))
+            {
+                // Shutdown cancellation may stop a writer, but every owned request must finish.
+            }
+            finally
+            {
+                _cts.Dispose();
+                _writeLock.Dispose();
+            }
         }
 
         private async Task RunAsync()
@@ -602,7 +777,7 @@ private async Task RunAsync()
                     continue;
                 }
 
-                _ = HandleRequestAsync(stream, root, id.Clone(), _cts.Token);
+                _requestTasks.Add(HandleRequestAsync(stream, root, id.Clone(), _cts.Token));
             }
         }
 
diff --git a/go/README.md b/go/README.md
index 000ae49086..fe297f069b 100644
--- a/go/README.md
+++ b/go/README.md
@@ -43,6 +43,12 @@ registers a Mission Control environment. Both can be enabled. Import `rpc` from
 Local hostname, port, token, and authentication settings belong inside `LocalServer`.
 The returned handle's `URL`, `Token`, `PID`, and `EnvironmentID` are optional pointers;
 Mission Control-only hosting has no local URL. These APIs are experimental.
+Call `host.ListSessions(ctx)` to read the complete advertised catalog of live and
+dormant sessions.
+Set top-level `ComputeID` to reuse the durable catalog across local and Mission
+Control hosting; it must agree with `GitHubEnvironment.ComputeID` when both are
+supplied. The runtime persists an omitted local-only identity. Publication
+survives host shutdown; dormant application sessions require your resume callback.
 Use the generated `client.RPC.Environments` namespace for environment list/get/delete operations.
 See [runtime-supervised AHP hosting](../docs/runtime-supervised-host.md) for creation
 and resume callbacks, resident-session publication, ownership, and shared-snapshot E2Es.
@@ -145,6 +151,56 @@ Avoid logging it indiscriminately: server-provided data may contain sensitive
 information. Its fields and data bytes are shared with the wrapped error; copy
 them before mutation.
 
+## Skill providers (experimental)
+
+Use `SessionConfig.SkillProvider` or `ResumeSessionConfig.SkillProvider` to
+serve session-scoped skills from your application instead of from `SKILL.md`
+files on disk. The provider is ephemeral: it is not serialized or persisted, so
+re-supply it on every resume. Resuming without a provider unbinds any previous
+provider for that session.
+
+<!-- docs-validate: skip -->
+
+```go
+type memorySkillProvider struct{}
+
+func (memorySkillProvider) ListSkills(ctx context.Context) ([]rpc.SkillProviderDescriptor, error) {
+    return []rpc.SkillProviderDescriptor{{
+        Name:        "review",
+        Description: "Review code using the host application's policy",
+    }}, nil
+}
+
+func (memorySkillProvider) ReadSkill(ctx context.Context, name string) (string, error) {
+    if name != "review" {
+        return "", copilot.ErrSkillNotFound
+    }
+    return "Review the changes and call out policy violations.", nil
+}
+
+session, err := client.CreateSession(ctx, &copilot.SessionConfig{
+    SkillProvider: memorySkillProvider{},
+    // Required only when ClientOptions.Mode is ModeEmpty.
+    // EnableSkills: copilot.Bool(true),
+})
+```
+
+`ReadSkill` returns an error for which
+`errors.Is(err, copilot.ErrSkillNotFound)` is true when a listed skill no
+longer exists. Other errors are reported to the runtime as generic provider
+failures so provider error text is not exposed to the model.
+
+Skill providers are not supported for cloud sessions. Creating a cloud session
+with a provider fails before the client connects with:
+`Skill providers are not supported for cloud sessions.`
+
+Provider methods can be called concurrently by the runtime, including from
+sub-agents that inherit the root session binding. Implementations must be safe
+for concurrent calls and should observe the `context.Context`. The context is
+cancelled when the runtime abandons the request: the call times out, the
+session disconnects or is deleted, or a resume replaces the provider. It is not
+cancelled when the connection closes or the client is force-stopped.
+
 ## Installation confirmation (experimental)
 
 Set `ClientOptions.InstallationConfirmationHandler` to receive the runtime's
@@ -257,7 +313,8 @@ Implemented with pure-Go FFI (via [purego](https://github.com/ebitengine/purego)
 - `NewClient(options *ClientOptions) *Client` - Create a new client
 - `Start(ctx context.Context) error` - Start the CLI server
 - `Stop() error` - Gracefully stop the CLI server. For an owned stdio process, requests runtime shutdown, closes stdin, and waits up to 10 seconds for host cleanup (including telemetry) and natural exit before falling back to a forced termination.
-- `ForceStop()` - Forcefully stop without graceful cleanup
+- `ForceStop()` - Forcefully stop without graceful RPC cleanup. Retires local event subscriptions and session callbacks, including entries held by dispatch snapshots or unsubscribe handles. Pending response waits fail without waiting for idle or their context deadlines; already-dispatched handlers are not joined. Late event registration is logged and returns a no-op unsubscribe, and a late tool-replacement acknowledgment cannot restore retired handlers.
+- A plain `SendAndWait` that has already received its terminal idle or error preserves that result when local session retirement races the wait. An earlier event handler may also call `Disconnect` on the terminal event without losing that result. Without retirement, the wait still lets earlier synchronous handlers finish; a forced stop does not join those handlers or complete waits whose terminal dispatch they are still blocking.
 - `CreateSession(ctx context.Context, config *SessionConfig) (*Session, error)` - Create a new session
 - `ResumeSession(ctx context.Context, sessionID string, config *ResumeSessionConfig) (*Session, error)` - Resume an existing session
 - `ResumeSessionWithOptions(ctx context.Context, sessionID string, config *ResumeSessionConfig) (*Session, error)` - Resume with additional configuration
diff --git a/go/client.go b/go/client.go
index 3b61dc4e3f..2d77f82956 100644
--- a/go/client.go
+++ b/go/client.go
@@ -42,6 +42,7 @@ import (
 	"os/exec"
 	"path/filepath"
 	"regexp"
+	"runtime/debug"
 	"strconv"
 	"strings"
 	"sync"
@@ -60,6 +61,12 @@ import (
 // whole-session [ProviderConfig]. Named providers are keyed by their own Name.
 const defaultBearerTokenProviderName = "default"
 
+type cloudSkillProviderError struct{}
+
+func (cloudSkillProviderError) Error() string {
+	return "Skill providers are not supported for cloud sessions."
+}
+
 // collectBearerTokenProviders gathers the per-provider [BearerTokenProvider] callbacks
 // from the singular provider and any named providers, keyed by provider name. The
 // singular provider uses the implicit name "default"; named providers use their
@@ -715,6 +722,14 @@ func (c *Client) logDebugTiming(start time.Time, message string) {
 //   - Force closes the connection
 //   - Kills the CLI process (if spawned by this client)
 //
+// Event processing observes the stop signal before dispatching each remaining
+// callback. Callbacks already being dispatched are not awaited and may finish
+// after this method returns; an event handler can itself call ForceStop.
+// Pending response waits fail when the session is retired, without waiting for
+// an idle event or their context deadline.
+// Registered session callbacks are released locally, including unadmitted event
+// handler entries retained by a dispatch snapshot.
+//
 // Example:
 //
 //	// If normal stop hangs, force stop
@@ -747,7 +762,9 @@ func (c *Client) ForceStop() {
 	c.sessions = make(map[string]*Session)
 	c.sessionsMux.Unlock()
 	for _, session := range sessions {
+		session.clearSkillProvider()
 		session.cancelPendingExternalTools()
+		session.stopEventProcessing()
 	}
 	c.clearGitHubTokenProviders()
 	c.closeCopilotRequestAdapter()
@@ -876,6 +893,9 @@ func (c *Client) CreateSession(ctx context.Context, config *SessionConfig) (*Ses
 	if config == nil {
 		config = &SessionConfig{}
 	}
+	if config.Cloud != nil && config.SkillProvider != nil {
+		return nil, cloudSkillProviderError{}
+	}
 	if config.GitHubToken != "" && config.GitHubTokenProvider != nil {
 		return nil, fmt.Errorf("GitHubToken and GitHubTokenProvider cannot be used together")
 	}
@@ -913,6 +933,9 @@ func (c *Client) CreateSession(ctx context.Context, config *SessionConfig) (*Ses
 	req.EnableHostGitOperations = config.EnableHostGitOperations
 	req.EnableSessionStore = config.EnableSessionStore
 	req.EnableSkills = config.EnableSkills
+	if config.SkillProvider != nil {
+		req.HasSkillProvider = Bool(true)
+	}
 	req.Tools = config.Tools
 	systemMessage := c.systemMessageForMode(config.SystemMessage)
 	wireSystemMessage, transformCallbacks := extractTransformCallbacks(systemMessage)
@@ -952,6 +975,8 @@ func (c *Client) CreateSession(ctx context.Context, config *SessionConfig) (*Ses
 	req.DefaultAgent = config.DefaultAgent
 	req.Agent = config.Agent
 	req.SkillDirectories = config.SkillDirectories
+	req.AgentDirectories = config.AgentDirectories
+	req.HookDirectories = config.HookDirectories
 	req.PluginDirectories = config.PluginDirectories
 	req.InstructionDirectories = config.InstructionDirectories
 	req.DisabledSkills = config.DisabledSkills
@@ -961,6 +986,7 @@ func (c *Client) CreateSession(ctx context.Context, config *SessionConfig) (*Ses
 	req.InfiniteSessions = config.InfiniteSessions
 	req.LargeOutput = config.LargeOutput
 	req.ToolSearch = config.ToolSearch
+	req.ImageGeneration = config.ImageGeneration
 	req.Memory = config.Memory
 	req.GitHubToken = config.GitHubToken
 	req.GitHubTokenProviderRegistrationID = registrationID
@@ -978,6 +1004,7 @@ func (c *Client) CreateSession(ctx context.Context, config *SessionConfig) (*Ses
 		req.FeatureFlags = &config.FeatureFlags
 	}
 	req.EnableManagedSettings = config.EnableManagedSettings
+	req.EnforceManagedModelDefaults = config.EnforceManagedModelDefaults
 	req.ManagedSettings = config.ManagedSettings
 
 	if len(config.Commands) > 0 {
@@ -1054,6 +1081,7 @@ func (c *Client) CreateSession(ctx context.Context, config *SessionConfig) (*Ses
 		localSessionID = uuid.NewString()
 	}
 	req.SessionID = localSessionID
+	req.Name = config.Name
 
 	// unregisterSession removes only the session created by this call and stops
 	// its event consumer. The latter is essential on CreateSession error paths:
@@ -1112,6 +1140,9 @@ func (c *Client) CreateSession(ctx context.Context, config *SessionConfig) (*Ses
 		if config.CanvasHandler != nil {
 			s.registerCanvasHandler(config.CanvasHandler)
 		}
+		if config.SkillProvider != nil {
+			s.registerSkillProvider(config.SkillProvider)
+		}
 		if bearerTokenProviders := collectBearerTokenProviders(config.Provider, config.Providers); bearerTokenProviders != nil {
 			s.registerBearerTokenProviders(bearerTokenProviders)
 		}
@@ -1411,6 +1442,9 @@ func (c *Client) ResumeSessionWithOptions(ctx context.Context, sessionID string,
 	req.EnableHostGitOperations = config.EnableHostGitOperations
 	req.EnableSessionStore = config.EnableSessionStore
 	req.EnableSkills = config.EnableSkills
+	if config.SkillProvider != nil {
+		req.HasSkillProvider = Bool(true)
+	}
 	if config.SuppressResumeEvent {
 		req.DisableResume = Bool(true)
 	}
@@ -1425,6 +1459,8 @@ func (c *Client) ResumeSessionWithOptions(ctx context.Context, sessionID string,
 	req.DefaultAgent = config.DefaultAgent
 	req.Agent = config.Agent
 	req.SkillDirectories = config.SkillDirectories
+	req.AgentDirectories = config.AgentDirectories
+	req.HookDirectories = config.HookDirectories
 	req.PluginDirectories = config.PluginDirectories
 	req.InstructionDirectories = config.InstructionDirectories
 	req.DisabledSkills = config.DisabledSkills
@@ -1434,6 +1470,7 @@ func (c *Client) ResumeSessionWithOptions(ctx context.Context, sessionID string,
 	req.InfiniteSessions = config.InfiniteSessions
 	req.LargeOutput = config.LargeOutput
 	req.ToolSearch = config.ToolSearch
+	req.ImageGeneration = config.ImageGeneration
 	req.Memory = config.Memory
 	req.GitHubToken = config.GitHubToken
 	req.GitHubTokenProviderRegistrationID = registrationID
@@ -1451,6 +1488,7 @@ func (c *Client) ResumeSessionWithOptions(ctx context.Context, sessionID string,
 		req.FeatureFlags = &config.FeatureFlags
 	}
 	req.EnableManagedSettings = config.EnableManagedSettings
+	req.EnforceManagedModelDefaults = config.EnforceManagedModelDefaults
 	req.ManagedSettings = config.ManagedSettings
 	if config.OnPermissionRequest != nil {
 		req.RequestPermission = Bool(true)
@@ -1520,6 +1558,9 @@ func (c *Client) ResumeSessionWithOptions(ctx context.Context, sessionID string,
 	if config.CanvasHandler != nil {
 		session.registerCanvasHandler(config.CanvasHandler)
 	}
+	if config.SkillProvider != nil {
+		session.registerSkillProvider(config.SkillProvider)
+	}
 	if bearerTokenProviders := collectBearerTokenProviders(config.Provider, config.Providers); bearerTokenProviders != nil {
 		session.registerBearerTokenProviders(bearerTokenProviders)
 	}
@@ -1743,6 +1784,7 @@ func (c *Client) DeleteSession(ctx context.Context, sessionID string) error {
 	delete(c.sessions, sessionID)
 	c.sessionsMux.Unlock()
 	if session != nil {
+		session.clearSkillProvider()
 		session.releaseGitHubTokenProviderRegistration()
 	}
 
@@ -2389,7 +2431,8 @@ func (c *Client) startInProcess(ctx context.Context) error {
 		return errors.New("in-process runtime unavailable: build with the bundled embedded runtime or set COPILOT_CLI_PATH to a compatible runtime package")
 	}
 
-	config := c.inProcessHostConfig()
+	integrationID := strings.TrimSpace(getEnvValue(c.options.Env, "GITHUB_COPILOT_INTEGRATION_ID"))
+	config := c.inProcessHostConfig(integrationID)
 
 	host, err := createInProcessHost(runtimePath, cliEntrypoint, config)
 	if err != nil {
@@ -2427,7 +2470,7 @@ func (c *Client) startInProcess(ctx context.Context) error {
 	return nil
 }
 
-func (c *Client) inProcessHostConfig() inProcessHostConfig {
+func (c *Client) inProcessHostConfig(cliLoginSyncIntegrationID string) inProcessHostConfig {
 	args := make([]string, 0, 8)
 	if c.options.LogLevel != "" {
 		args = append(args, "--log-level", c.options.LogLevel)
@@ -2450,6 +2493,9 @@ func (c *Client) inProcessHostConfig() inProcessHostConfig {
 	if c.options.EnableRemoteSessions {
 		args = append(args, "--remote")
 	}
+	if cliLoginSyncIntegrationID != "" {
+		args = append(args, "--cli-login-sync-integration-id="+cliLoginSyncIntegrationID)
+	}
 
 	environment := make(map[string]string)
 	if c.options.GitHubToken != "" {
@@ -2590,6 +2636,8 @@ func (c *Client) setupNotificationHandler() {
 	c.client.SetRequestHandler("exitPlanMode.request", jsonrpc2.RequestHandlerFor(c.handleExitPlanModeRequest))
 	c.client.SetRequestHandler("autoModeSwitch.request", jsonrpc2.RequestHandlerFor(c.handleAutoModeSwitchRequest))
 	c.client.SetRequestHandler("systemMessage.transform", jsonrpc2.RequestHandlerFor(c.handleSystemMessageTransform))
+	c.client.SetRequestContextHandler("skillProvider.list", c.handleSkillProviderList)
+	c.client.SetRequestContextHandler("skillProvider.read", c.handleSkillProviderRead)
 	rpc.RegisterClientSessionAPIHandlers(c.client, func(sessionID string) *rpc.ClientSessionAPIHandlers {
 		c.sessionsMux.Lock()
 		defer c.sessionsMux.Unlock()
@@ -2684,6 +2732,7 @@ func (c *Client) handleConnectionClose() {
 	}
 	c.sessionsMux.Unlock()
 	for _, session := range sessions {
+		session.clearSkillProvider()
 		session.cancelPendingExternalTools()
 	}
 	// Avoid deadlocking with Stop/ForceStop, which hold startStopMux while
@@ -2801,6 +2850,102 @@ func (c *Client) handleSessionEvent(req sessionEventRequest) {
 	}
 }
 
+func (c *Client) handleSkillProviderList(ctx context.Context, params json.RawMessage) (json.RawMessage, *jsonrpc2.Error) {
+	var req rpc.SkillProviderListRequest
+	if err := json.Unmarshal(params, &req); err != nil || req.SessionID == "" {
+		return nil, &jsonrpc2.Error{Code: -32602, Message: "invalid skill provider list payload"}
+	}
+
+	provider, rpcErr := c.resolveSkillProvider(req.SessionID)
+	if rpcErr != nil {
+		return nil, rpcErr
+	}
+
+	skills, err := callSkillProvider(ctx, req.SessionID, "listSkills", func() ([]rpc.SkillProviderDescriptor, error) {
+		return provider.ListSkills(ctx)
+	})
+	if err != nil {
+		return nil, &jsonrpc2.Error{Code: -32603, Message: "Skill provider listSkills failed"}
+	}
+	if skills == nil {
+		skills = []rpc.SkillProviderDescriptor{}
+	}
+
+	raw, err := json.Marshal(rpc.SkillProviderListResult{Skills: skills})
+	if err != nil {
+		return nil, &jsonrpc2.Error{Code: -32603, Message: fmt.Sprintf("Failed to marshal response: %v", err)}
+	}
+	return raw, nil
+}
+
+func (c *Client) handleSkillProviderRead(ctx context.Context, params json.RawMessage) (json.RawMessage, *jsonrpc2.Error) {
+	var req rpc.SkillProviderReadRequest
+	if err := json.Unmarshal(params, &req); err != nil || req.SessionID == "" || req.Name == "" {
+		return nil, &jsonrpc2.Error{Code: -32602, Message: "invalid skill provider read payload"}
+	}
+
+	provider, rpcErr := c.resolveSkillProvider(req.SessionID)
+	if rpcErr != nil {
+		return nil, rpcErr
+	}
+
+	// Classify not-found inside the guarded call: errors.Is runs provider
+	// Is/Unwrap methods, which may panic.
+	markdown, err := callSkillProvider(ctx, req.SessionID, "readSkill", func() (*string, error) {
+		markdown, err := provider.ReadSkill(ctx, req.Name)
+		if errors.Is(err, ErrSkillNotFound) {
+			return nil, nil
+		}
+		if err != nil {
+			return nil, err
+		}
+		return &markdown, nil
+	})
+	if err != nil {
+		return nil, &jsonrpc2.Error{Code: -32603, Message: "Skill provider readSkill failed"}
+	}
+
+	raw, err := json.Marshal(rpc.SkillProviderReadResult{Markdown: markdown})
+	if err != nil {
+		return nil, &jsonrpc2.Error{Code: -32603, Message: fmt.Sprintf("Failed to marshal response: %v", err)}
+	}
+	return raw, nil
+}
+
+func (c *Client) resolveSkillProvider(sessionID string) (SkillProvider, *jsonrpc2.Error) {
+	c.sessionsMux.Lock()
+	session := c.sessions[sessionID]
+	c.sessionsMux.Unlock()
+	if session == nil {
+		return nil, &jsonrpc2.Error{Code: -32603, Message: fmt.Sprintf("No skill provider for session: %s", sessionID)}
+	}
+	provider := session.getSkillProvider()
+	if provider == nil {
+		return nil, &jsonrpc2.Error{Code: -32603, Message: fmt.Sprintf("No skill provider for session: %s", sessionID)}
+	}
+	return provider, nil
+}
+
+var errSkillProviderPanic = errors.New("skill provider panicked")
+
+// callSkillProvider logs provider failures locally and converts panics into
+// an error, so the runtime only ever receives a generic failure.
+func callSkillProvider[T any](ctx context.Context, sessionID, operation string, call func() (T, error)) (result T, err error) {
+	defer func() {
+		if failure := recover(); failure != nil {
+			log.Printf("skill provider %s panicked: session_id=%s panic=%v\n%s", operation, sessionID, failure, debug.Stack())
+			var zero T
+			result, err = zero, errSkillProviderPanic
+		}
+	}()
+	result, err = call()
+	// A call the runtime cancelled is expected to fail; it isn't a provider failure.
+	if err != nil && ctx.Err() == nil {
+		log.Printf("skill provider %s failed: session_id=%s error=%v", operation, sessionID, err)
+	}
+	return result, err
+}
+
 // handleUserInputRequest handles a user input request from the CLI server.
 func (c *Client) handleUserInputRequest(req userInputRequest) (*userInputResponse, *jsonrpc2.Error) {
 	if req.SessionID == "" || req.Question == "" {
diff --git a/go/client_test.go b/go/client_test.go
index d9f3ffc4cd..289a8e4735 100644
--- a/go/client_test.go
+++ b/go/client_test.go
@@ -545,9 +545,33 @@ func TestClient_ForceStopAndExternalStopDoNotRequestRuntimeShutdown(t *testing.T
 	externalServer.Stop()
 }
 
+func TestClient_ForceStopStopsRegisteredSessionEventProcessing(t *testing.T) {
+	rpcClient, server, shutdownCalled := newRuntimeShutdownRpcPair(t)
+	t.Cleanup(server.Stop)
+	sessions := make(map[string]*Session)
+	for _, id := range []string{"session-1", "session-2"} {
+		session := newSession(id, rpcClient, "", false)
+		t.Cleanup(session.stopEventProcessing)
+		sessions[id] = session
+	}
+	client := &Client{
+		client:   rpcClient,
+		RPC:      rpc.NewServerRPC(rpcClient),
+		sessions: sessions,
+	}
+
+	client.ForceStop()
+	for _, session := range sessions {
+		assertSessionEventChannelClosed(t, session)
+	}
+	client.ForceStop()
+	assertRuntimeShutdownNotCalled(t, shutdownCalled)
+}
+
 func TestClient_ForceStopCancelsPendingExternalTools(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	session := &Session{
+		eventDone: make(chan struct{}),
 		pendingExternalTools: map[string]*pendingExternalTool{
 			"request-1": {ctx: ctx, cancel: cancel},
 		},
@@ -567,6 +591,89 @@ func TestClient_ForceStopCancelsPendingExternalTools(t *testing.T) {
 	}
 }
 
+func TestClient_ForceStopDropsRemainingEventHandlers(t *testing.T) {
+	for _, fromHandler := range []bool{false, true} {
+		name := "while handler is blocked"
+		if fromHandler {
+			name = "from event handler"
+		}
+		t.Run(name, func(t *testing.T) {
+			session := &Session{
+				eventCh:   make(chan SessionEvent, 1),
+				eventDone: make(chan struct{}),
+			}
+			client := &Client{sessions: map[string]*Session{"session-1": session}}
+			entered := make(chan struct{})
+			release := make(chan struct{})
+			releaseHandler := sync.OnceFunc(func() { close(release) })
+			forceStopped := make(chan struct{})
+			consumerExited := make(chan struct{})
+			unexpected := make(chan string, 3)
+			t.Cleanup(func() {
+				session.stopEventProcessing()
+				releaseHandler()
+				select {
+				case <-consumerExited:
+				case <-time.After(2 * time.Second):
+					t.Error("event consumer did not exit during cleanup")
+				}
+			})
+			session.On(func(event SessionEvent) {
+				if _, ok := event.Data.(*SessionIdleData); !ok {
+					unexpected <- "queued event"
+					return
+				}
+				close(entered)
+				<-release
+				if fromHandler {
+					client.ForceStop()
+					close(forceStopped)
+				}
+			})
+			session.On(func(SessionEvent) { unexpected <- "remaining handler" })
+			go func() {
+				defer close(consumerExited)
+				session.processEvents()
+			}()
+
+			session.eventCh <- newTestEvent()
+			select {
+			case <-entered:
+			case <-time.After(2 * time.Second):
+				t.Fatal("event handler did not enter its barrier")
+			}
+			session.eventCh <- SessionEvent{Data: &AssistantMessageData{
+				Content:   "queued",
+				MessageID: "queued",
+			}}
+			if fromHandler {
+				releaseHandler()
+			} else {
+				go func() {
+					client.ForceStop()
+					close(forceStopped)
+				}()
+			}
+			select {
+			case <-forceStopped:
+			case <-time.After(2 * time.Second):
+				t.Fatal("ForceStop waited for the in-flight event handler")
+			}
+			releaseHandler()
+			select {
+			case <-consumerExited:
+			case <-time.After(2 * time.Second):
+				t.Fatal("event consumer did not exit after the handler returned")
+			}
+			select {
+			case callback := <-unexpected:
+				t.Fatalf("ForceStop dispatched %s after cancellation", callback)
+			default:
+			}
+		})
+	}
+}
+
 func TestClient_ConnectionCloseCancelsPendingExternalTools(t *testing.T) {
 	rpcClient, server, _ := newRuntimeShutdownRpcPair(t)
 	server.SetRequestHandler("session.detach", func(params json.RawMessage) (json.RawMessage, *jsonrpc2.Error) {
@@ -1992,7 +2099,7 @@ func TestClient_InProcessConnection(t *testing.T) {
 			Mode:                      ModeEmpty,
 		})
 
-		config := client.inProcessHostConfig()
+		config := client.inProcessHostConfig("")
 		expectedArgs := []string{
 			"--log-level", "debug",
 			"--auth-token-env", "COPILOT_SDK_AUTH_TOKEN",
@@ -2012,6 +2119,33 @@ func TestClient_InProcessConnection(t *testing.T) {
 			t.Fatalf("Expected managed environment %v, got %v", expectedEnvironment, config.Environment)
 		}
 	})
+
+	t.Run("forwards supported CLI login sync integrations", func(t *testing.T) {
+		t.Setenv("GITHUB_COPILOT_INTEGRATION_ID", "github/github-app")
+		client := NewClient(&ClientOptions{Connection: InProcessConnection{}})
+		t.Setenv("GITHUB_COPILOT_INTEGRATION_ID", "changed/after-construction")
+
+		integrationID := getEnvValue(client.options.Env, "GITHUB_COPILOT_INTEGRATION_ID")
+		config := client.inProcessHostConfig(integrationID)
+
+		expectedArgs := []string{"--cli-login-sync-integration-id=github/github-app"}
+		if !reflect.DeepEqual(config.Args, expectedArgs) {
+			t.Fatalf("Expected CLI login sync arguments %v, got %v", expectedArgs, config.Args)
+		}
+	})
+
+	t.Run("forwards integration validation to the runtime", func(t *testing.T) {
+		t.Setenv("GITHUB_COPILOT_INTEGRATION_ID", "third-party/integration")
+		client := NewClient(&ClientOptions{Connection: InProcessConnection{}})
+
+		integrationID := getEnvValue(client.options.Env, "GITHUB_COPILOT_INTEGRATION_ID")
+		config := client.inProcessHostConfig(integrationID)
+
+		expectedArgs := []string{"--cli-login-sync-integration-id=third-party/integration"}
+		if !reflect.DeepEqual(config.Args, expectedArgs) {
+			t.Fatalf("Expected CLI login sync arguments %v, got %v", expectedArgs, config.Args)
+		}
+	})
 }
 
 func TestClient_DefaultConnection(t *testing.T) {
@@ -2178,6 +2312,38 @@ func TestCreateSessionRequest_ClientName(t *testing.T) {
 	})
 }
 
+func TestCreateSessionRequest_Name(t *testing.T) {
+	t.Run("includes name in JSON when set", func(t *testing.T) {
+		req := createSessionRequest{Name: "named at create"}
+		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["name"] != "named at create" {
+			t.Errorf("Expected name to be 'named at create', got %v", m["name"])
+		}
+	})
+
+	t.Run("omits name from JSON when empty", func(t *testing.T) {
+		req := createSessionRequest{}
+		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["name"]; ok {
+			t.Error("Expected name to be omitted when empty")
+		}
+	})
+}
+
 func TestResumeSessionRequest_ClientName(t *testing.T) {
 	t.Run("includes clientName in JSON when set", func(t *testing.T) {
 		req := resumeSessionRequest{SessionID: "s1", ClientName: "my-app"}
@@ -5187,18 +5353,22 @@ func TestIsTerminal(t *testing.T) {
 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(**)"},
+			DisableBypassPermissionsMode:   DisableBypassPermissionsModeDisable,
+			DisableAssistedPermissionsMode: Bool(true),
+			Deny:                           []string{"Shell(git push)"},
+			Ask:                            []string{"Domain(publish.example)"},
+			Allow:                          []string{"Read(**)"},
+			LimitTo:                        []string{"Domain(github.com)"},
 		},
 	}
 
 	expectedPermissions := map[string]any{
-		"disableBypassPermissionsMode": "disable",
-		"deny":                         []any{"Shell(git push)"},
-		"ask":                          []any{"Domain(publish.example)"},
-		"allow":                        []any{"Read(**)"},
+		"disableBypassPermissionsMode":   "disable",
+		"disableAssistedPermissionsMode": true,
+		"deny":                           []any{"Shell(git push)"},
+		"ask":                            []any{"Domain(publish.example)"},
+		"allow":                          []any{"Read(**)"},
+		"limitTo":                        []any{"Domain(github.com)"},
 	}
 
 	t.Run("direct injection enables managed safeguards", func(t *testing.T) {
@@ -5211,7 +5381,11 @@ func TestSessionRequests_ManagedSettings(t *testing.T) {
 	})
 
 	t.Run("includes managedSettings on create when set", func(t *testing.T) {
-		req := createSessionRequest{EnableManagedSettings: Bool(true), ManagedSettings: settings}
+		req := createSessionRequest{
+			EnableManagedSettings:       Bool(true),
+			EnforceManagedModelDefaults: Bool(true),
+			ManagedSettings:             settings,
+		}
 		data, err := json.Marshal(req)
 		if err != nil {
 			t.Fatalf("Failed to marshal: %v", err)
@@ -5223,6 +5397,9 @@ func TestSessionRequests_ManagedSettings(t *testing.T) {
 		if m["enableManagedSettings"] != true {
 			t.Errorf("Expected enableManagedSettings true, got %v", m["enableManagedSettings"])
 		}
+		if m["enforceManagedModelDefaults"] != true {
+			t.Errorf("Expected enforceManagedModelDefaults true, got %v", m["enforceManagedModelDefaults"])
+		}
 		ms, ok := m["managedSettings"].(map[string]any)
 		if !ok {
 			t.Fatalf("Expected managedSettings object, got %v", m["managedSettings"])
@@ -5290,6 +5467,7 @@ func TestSessionRequests_ManagedSettings(t *testing.T) {
 				Deny:                         []string{},
 				Ask:                          []string{},
 				Allow:                        []string{},
+				LimitTo:                      []string{},
 			},
 		}}
 		data, err := json.Marshal(req)
@@ -5302,7 +5480,7 @@ func TestSessionRequests_ManagedSettings(t *testing.T) {
 		if perms["disableBypassPermissionsMode"] != "disable" {
 			t.Errorf("Expected disableBypassPermissionsMode preserved, got %v", perms["disableBypassPermissionsMode"])
 		}
-		for _, key := range []string{"deny", "ask", "allow"} {
+		for _, key := range []string{"deny", "ask", "allow", "limitTo"} {
 			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])
 			}
diff --git a/go/customization_directories_test.go b/go/customization_directories_test.go
new file mode 100644
index 0000000000..7e7a638868
--- /dev/null
+++ b/go/customization_directories_test.go
@@ -0,0 +1,116 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+
+package copilot
+
+import (
+	"encoding/json"
+	"reflect"
+	"testing"
+
+	"github.com/github/copilot-sdk/go/internal/jsonrpc2"
+	"github.com/github/copilot-sdk/go/rpc"
+)
+
+func TestClient_CustomizationDirectoryAdapters(t *testing.T) {
+	for _, tt := range []struct {
+		name  string
+		roots []string
+	}{
+		{"omitted", nil},
+		{"empty", []string{}},
+		{"relative", []string{"relative-root", "other-root"}},
+	} {
+		t.Run(tt.name, func(t *testing.T) {
+			directories := make(map[string][]string)
+			for key, suffix := range map[string]string{
+				"skillDirectories":       "skills",
+				"agentDirectories":       "agents",
+				"instructionDirectories": "instructions",
+				"hookDirectories":        "hooks",
+			} {
+				if tt.roots != nil {
+					directories[key] = make([]string, 0, len(tt.roots))
+					for _, root := range tt.roots {
+						directories[key] = append(directories[key], root+"-"+suffix)
+					}
+				}
+			}
+			rpcClient, server, _ := newRuntimeShutdownRpcPair(t)
+			t.Cleanup(server.Stop)
+			t.Cleanup(rpcClient.Stop)
+			client := &Client{
+				client:   rpcClient,
+				RPC:      rpc.NewServerRPC(rpcClient),
+				sessions: make(map[string]*Session),
+			}
+			requests := make(chan json.RawMessage, 2)
+			for _, method := range []string{"session.create", "session.resume"} {
+				server.SetRequestHandler(method, func(params json.RawMessage) (json.RawMessage, *jsonrpc2.Error) {
+					requests <- append(json.RawMessage(nil), params...)
+					id := sessionIDFromParams(t, params)
+					response, err := json.Marshal(map[string]string{"sessionId": id})
+					if err != nil {
+						return nil, &jsonrpc2.Error{Code: -32603, Message: err.Error()}
+					}
+					return response, nil
+				})
+			}
+			_, err := client.CreateSession(t.Context(), &SessionConfig{
+				WorkingDirectory:       "request-cwd",
+				EnableConfigDiscovery:  Bool(false),
+				EnableFileHooks:        Bool(false),
+				SkillDirectories:       directories["skillDirectories"],
+				AgentDirectories:       directories["agentDirectories"],
+				InstructionDirectories: directories["instructionDirectories"],
+				HookDirectories:        directories["hookDirectories"],
+			})
+			if err != nil {
+				t.Fatal(err)
+			}
+			_, err = client.ResumeSessionWithOptions(t.Context(), "resumed", &ResumeSessionConfig{
+				WorkingDirectory:       "resume-cwd",
+				EnableConfigDiscovery:  Bool(false),
+				EnableFileHooks:        Bool(false),
+				SkillDirectories:       directories["skillDirectories"],
+				AgentDirectories:       directories["agentDirectories"],
+				InstructionDirectories: directories["instructionDirectories"],
+				HookDirectories:        directories["hookDirectories"],
+			})
+			if err != nil {
+				t.Fatal(err)
+			}
+			for range 2 {
+				var payload map[string]json.RawMessage
+				if err := json.Unmarshal(<-requests, &payload); err != nil {
+					t.Fatal(err)
+				}
+				for _, key := range []string{"skillDirectories", "agentDirectories", "instructionDirectories", "hookDirectories"} {
+					value, present := payload[key]
+					if tt.roots == nil {
+						if present {
+							t.Errorf("unexpected %s: %s", key, value)
+						}
+					} else {
+						var actual []string
+						if err := json.Unmarshal(value, &actual); err != nil {
+							t.Fatal(err)
+						}
+						if !reflect.DeepEqual(actual, directories[key]) {
+							t.Errorf("%s = %#v, want %#v", key, actual, directories[key])
+						}
+					}
+				}
+				for _, key := range []string{"enableConfigDiscovery", "enableFileHooks"} {
+					if string(payload[key]) != "false" {
+						t.Errorf("%s = %s, want false", key, payload[key])
+					}
+				}
+				for _, key := range []string{"additionalDirectories", "customAgents", "hooks"} {
+					if _, present := payload[key]; present {
+						t.Errorf("unexpected %s in %s", key, payload[key])
+					}
+				}
+			}
+		})
+	}
+}
diff --git a/go/force_stop_test.go b/go/force_stop_test.go
new file mode 100644
index 0000000000..89a5f6c874
--- /dev/null
+++ b/go/force_stop_test.go
@@ -0,0 +1,412 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+
+package copilot_test
+
+import (
+	"bufio"
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"net"
+	"runtime"
+	"strconv"
+	"strings"
+	"sync"
+	"testing"
+	"time"
+
+	copilot "github.com/github/copilot-sdk/go"
+)
+
+type responseRetirementPeer struct {
+	listener net.Listener
+	mu       sync.Mutex
+	conn     net.Conn
+	writeMu  sync.Mutex
+	sent     chan struct{}
+	done     chan error
+}
+
+func newResponseRetirementPeer(t *testing.T, expectedSends int) *responseRetirementPeer {
+	t.Helper()
+	listener, err := net.Listen("tcp", "127.0.0.1:0")
+	if err != nil {
+		t.Fatal(err)
+	}
+	peer := &responseRetirementPeer{
+		listener: listener,
+		sent:     make(chan struct{}),
+		done:     make(chan error, 1),
+	}
+	t.Cleanup(func() {
+		if err := listener.Close(); err != nil && !errors.Is(err, net.ErrClosed) {
+			t.Error("close peer listener:", err)
+		}
+		peer.mu.Lock()
+		conn := peer.conn
+		peer.mu.Unlock()
+		if conn != nil {
+			if err := conn.Close(); err != nil && !errors.Is(err, net.ErrClosed) {
+				t.Error("close peer connection:", err)
+			}
+		}
+		select {
+		case err := <-peer.done:
+			if err != nil {
+				t.Error("TCP peer:", err)
+			}
+		case <-time.After(5 * time.Second):
+			t.Error("TCP peer did not exit")
+		}
+	})
+	go func() { peer.done <- peer.serve(expectedSends) }()
+	return peer
+}
+
+func (p *responseRetirementPeer) serve(expectedSends int) error {
+	conn, err := p.listener.Accept()
+	if err != nil {
+		if errors.Is(err, net.ErrClosed) {
+			return nil
+		}
+		return err
+	}
+	p.mu.Lock()
+	p.conn = conn
+	p.mu.Unlock()
+	defer conn.Close()
+	reader := bufio.NewReader(conn)
+	sends := 0
+	for {
+		frame, err := readRetirementFrame(reader)
+		if err != nil {
+			if errors.Is(err, io.EOF) || errors.Is(err, net.ErrClosed) {
+				return nil
+			}
+			return err
+		}
+		var request struct {
+			ID     json.RawMessage `json:"id"`
+			Method string          `json:"method"`
+		}
+		if err := json.Unmarshal(frame, &request); err != nil {
+			return err
+		}
+		var result any
+		switch request.Method {
+		case "connect":
+			result = map[string]any{"ok": true, "protocolVersion": copilot.SDKProtocolVersion, "version": "force-stop-test"}
+		case "session.create":
+			result = map[string]any{"sessionId": "retirement-session"}
+		case "session.send":
+			sends++
+			result = map[string]any{"messageId": fmt.Sprintf("message-%d", sends)}
+		case "ping":
+			result = map[string]any{"message": "pong", "timestamp": "2026-01-01T00:00:00Z", "protocolVersion": copilot.SDKProtocolVersion}
+		default:
+			return fmt.Errorf("unexpected RPC: %s", request.Method)
+		}
+		if err := p.write(map[string]any{"jsonrpc": "2.0", "id": request.ID, "result": result}); err != nil {
+			return err
+		}
+		if request.Method == "session.send" && sends == expectedSends {
+			close(p.sent)
+		}
+	}
+}
+
+func readRetirementFrame(reader *bufio.Reader) ([]byte, error) {
+	length := -1
+	for {
+		line, err := reader.ReadString('\n')
+		if err != nil {
+			if errors.Is(err, io.EOF) && line == "" && length == -1 {
+				return nil, io.EOF
+			}
+			return nil, fmt.Errorf("read frame header: %w", err)
+		}
+		if line == "\r\n" {
+			break
+		}
+		name, value, ok := strings.Cut(line, ":")
+		if !ok {
+			return nil, fmt.Errorf("invalid frame header: %q", line)
+		}
+		if strings.EqualFold(name, "Content-Length") {
+			if length != -1 {
+				return nil, errors.New("duplicate Content-Length")
+			}
+			length, err = strconv.Atoi(strings.TrimSpace(value))
+			if err != nil {
+				return nil, err
+			}
+		}
+	}
+	if length <= 0 || length > 128*1024 {
+		return nil, fmt.Errorf("invalid frame length: %d", length)
+	}
+	body := make([]byte, length)
+	if _, err := io.ReadFull(reader, body); err != nil {
+		return nil, err
+	}
+	return body, nil
+}
+
+func (p *responseRetirementPeer) write(message any) error {
+	body, err := json.Marshal(message)
+	if err != nil {
+		return err
+	}
+	p.writeMu.Lock()
+	defer p.writeMu.Unlock()
+	p.mu.Lock()
+	conn := p.conn
+	p.mu.Unlock()
+	_, err = fmt.Fprintf(conn, "Content-Length: %d\r\n\r\n%s", len(body), body)
+	return err
+}
+
+type responseRetirementCapture struct {
+	data [64]byte
+}
+
+func capturedRetirementHandler() (copilot.SessionEventHandler, <-chan struct{}) {
+	capture := &responseRetirementCapture{data: [64]byte{1}}
+	collected := make(chan struct{})
+	runtime.AddCleanup(capture, func(done chan struct{}) { close(done) }, collected)
+	return func(copilot.SessionEvent) { runtime.KeepAlive(capture) }, collected
+}
+
+func awaitRetirementCapture(t *testing.T, collected <-chan struct{}) {
+	t.Helper()
+	deadline := time.Now().Add(5 * time.Second)
+	for {
+		runtime.GC()
+		select {
+		case <-collected:
+			return
+		default:
+		}
+		if time.Now().After(deadline) {
+			t.Fatal("force-stopped retained session still roots an unadmitted callback capture")
+		}
+		runtime.Gosched()
+	}
+}
+
+func TestForceStopReleasesRetainedEventCallbacks(t *testing.T) {
+	for _, blockedHandler := range []bool{false, true} {
+		t.Run(fmt.Sprintf("blocked handler=%t", blockedHandler), func(t *testing.T) {
+			t.Parallel()
+			peer := newResponseRetirementPeer(t, 0)
+			client := copilot.NewClient(&copilot.ClientOptions{
+				Connection: copilot.URIConnection{URL: peer.listener.Addr().String()},
+			})
+			t.Cleanup(client.ForceStop)
+			ctx, cancel := context.WithTimeout(t.Context(), 10*time.Second)
+			defer cancel()
+			if err := client.Start(ctx); err != nil {
+				t.Fatal("start:", err)
+			}
+			session, err := client.CreateSession(ctx, &copilot.SessionConfig{
+				SessionID: "retirement-session", OnPermissionRequest: copilot.PermissionHandler.ApproveAll,
+			})
+			if err != nil {
+				t.Fatal("create:", err)
+			}
+			entered := make(chan struct{})
+			release := make(chan struct{})
+			exited := make(chan struct{})
+			admitted := false
+			releaseHandler := sync.OnceFunc(func() { close(release) })
+			t.Cleanup(func() {
+				client.ForceStop()
+				releaseHandler()
+				if admitted {
+					select {
+					case <-exited:
+					case <-time.After(5 * time.Second):
+						t.Error("admitted event handler did not finish")
+					}
+				}
+			})
+			if blockedHandler {
+				session.On(func(copilot.SessionEvent) {
+					close(entered)
+					<-release
+					close(exited)
+				})
+			}
+			handler, collected := capturedRetirementHandler()
+			unsubscribe := session.On(handler)
+			if blockedHandler {
+				if err := peer.write(map[string]any{
+					"jsonrpc": "2.0", "method": "session.event",
+					"params": map[string]any{
+						"sessionId": session.SessionID,
+						"event": map[string]any{
+							"id": "00000000-0000-4000-8000-000000000002", "parentId": nil,
+							"timestamp": "2026-01-01T00:00:00Z", "type": "session.idle",
+							"ephemeral": true, "data": map[string]any{},
+						},
+					},
+				}); err != nil {
+					t.Fatal("notify:", err)
+				}
+				select {
+				case <-entered:
+					admitted = true
+				case <-ctx.Done():
+					t.Fatal("event handler did not enter:", ctx.Err())
+				}
+			}
+			client.ForceStop()
+			awaitRetirementCapture(t, collected)
+			runtime.KeepAlive(session)
+			runtime.KeepAlive(unsubscribe)
+		})
+	}
+}
+
+func createRetirementHookSession(t *testing.T, ctx context.Context, client *copilot.Client) (*copilot.Session, <-chan struct{}) {
+	t.Helper()
+	capture := &responseRetirementCapture{data: [64]byte{2}}
+	collected := make(chan struct{})
+	runtime.AddCleanup(capture, func(done chan struct{}) { close(done) }, collected)
+	session, err := client.CreateSession(ctx, &copilot.SessionConfig{
+		SessionID: "retirement-session", OnPermissionRequest: copilot.PermissionHandler.ApproveAll,
+		Hooks: &copilot.SessionHooks{
+			OnSessionEnd: func(copilot.SessionEndHookInput, copilot.HookInvocation) (*copilot.SessionEndHookOutput, error) {
+				runtime.KeepAlive(capture)
+				return nil, nil
+			},
+		},
+	})
+	if err != nil {
+		t.Fatal("create:", err)
+	}
+	return session, collected
+}
+
+func TestForceStopReleasesRetainedHookCallbacks(t *testing.T) {
+	peer := newResponseRetirementPeer(t, 0)
+	client := copilot.NewClient(&copilot.ClientOptions{
+		Connection: copilot.URIConnection{URL: peer.listener.Addr().String()},
+	})
+	t.Cleanup(client.ForceStop)
+	ctx, cancel := context.WithTimeout(t.Context(), 10*time.Second)
+	defer cancel()
+	if err := client.Start(ctx); err != nil {
+		t.Fatal("start:", err)
+	}
+	session, collected := createRetirementHookSession(t, ctx, client)
+	client.ForceStop()
+	awaitRetirementCapture(t, collected)
+	runtime.KeepAlive(session)
+}
+
+func TestForceStopRejectsAcknowledgedPlainResponseWaits(t *testing.T) {
+	for _, count := range []int{1, 2} {
+		for _, blockedHandler := range []bool{false, true} {
+			t.Run(fmt.Sprintf("%d waits/blocked handler=%t", count, blockedHandler), func(t *testing.T) {
+				t.Parallel()
+				peer := newResponseRetirementPeer(t, count)
+				client := copilot.NewClient(&copilot.ClientOptions{
+					Connection: copilot.URIConnection{URL: peer.listener.Addr().String()},
+				})
+				t.Cleanup(client.ForceStop)
+				operationCtx, cancelOperation := context.WithTimeout(t.Context(), 10*time.Second)
+				defer cancelOperation()
+				if err := client.Start(operationCtx); err != nil {
+					t.Fatal("start:", err)
+				}
+
+				session, err := client.CreateSession(operationCtx, &copilot.SessionConfig{
+					SessionID: "retirement-session", OnPermissionRequest: copilot.PermissionHandler.ApproveAll,
+				})
+				if err != nil {
+					t.Fatal("create session:", err)
+				}
+
+				entered := make(chan struct{})
+				release := make(chan struct{})
+				releaseHandler := sync.OnceFunc(func() { close(release) })
+				t.Cleanup(releaseHandler)
+				if blockedHandler {
+					session.On(func(copilot.SessionEvent) {
+						close(entered)
+						<-release
+					})
+				}
+				waitCtx, cancelWait := context.WithCancel(t.Context())
+				results := make(chan error, count)
+				var waits sync.WaitGroup
+				t.Cleanup(func() {
+					cancelWait()
+					releaseHandler()
+					waits.Wait()
+				})
+				for range count {
+					waits.Add(1)
+					go func() {
+						defer waits.Done()
+						_, err := session.SendAndWait(waitCtx, copilot.MessageOptions{Prompt: "hold the response"})
+						results <- err
+					}()
+				}
+				select {
+				case <-peer.sent:
+				case <-operationCtx.Done():
+					t.Fatal("send acknowledgments:", operationCtx.Err())
+				}
+				// This later reply proves every preceding send acknowledgment reached the transport.
+				if _, err := client.Ping(operationCtx, "barrier"); err != nil {
+					t.Fatal("ping:", err)
+				}
+				if blockedHandler {
+					err := peer.write(map[string]any{
+						"jsonrpc": "2.0", "method": "session.event",
+						"params": map[string]any{
+							"sessionId": session.SessionID,
+							"event": map[string]any{
+								"id": "00000000-0000-4000-8000-000000000001", "parentId": nil,
+								"timestamp": "2026-01-01T00:00:00Z", "type": "session.idle",
+								"ephemeral": true, "data": map[string]any{},
+							},
+						},
+					})
+					if err != nil {
+						t.Fatal("notify:", err)
+					}
+					select {
+					case <-entered:
+					case <-operationCtx.Done():
+						t.Fatal("event handler did not enter:", operationCtx.Err())
+					}
+				}
+				stopped := make(chan struct{})
+				go func() {
+					client.ForceStop()
+					close(stopped)
+				}()
+				select {
+				case <-stopped:
+				case <-operationCtx.Done():
+					t.Fatal("force stop joined the admitted handler:", operationCtx.Err())
+				}
+				for range count {
+					select {
+					case err := <-results:
+						if err == nil || !strings.Contains(err.Error(), "session closed before response completed") {
+							t.Fatalf("expected response retirement error, got %v", err)
+						}
+					case <-time.After(5 * time.Second):
+						t.Fatal("acknowledged response wait remained blocked after force stop")
+					}
+				}
+			})
+		}
+	}
+}
diff --git a/go/host.go b/go/host.go
index 0abdd5dc15..7a75d0d7fb 100644
--- a/go/host.go
+++ b/go/host.go
@@ -41,6 +41,9 @@ type AhpSessionResumeRequest struct {
 // At least one transport must be supplied. Both may be enabled.
 // Experimental: AHP hosting may change or be removed.
 type AhpHostOptions struct {
+	// ComputeID selects a durable catalog identity; defaults are runtime-owned.
+	// It must agree with GitHubEnvironment.ComputeID when both are supplied.
+	ComputeID *string
 	// LocalServer explicitly enables the local WebSocket listener.
 	LocalServer *rpc.HostLocalServerOptions
 	// GitHubEnvironment registers the host with Mission Control; Name and ComputeID are required.
@@ -73,12 +76,17 @@ func (h *AhpHost) Dispose(ctx context.Context) error {
 	return err
 }
 
-// PublishSession exposes the exact resident session attached to the owning client.
+// PublishSession durably advertises the exact attached session in the compute-scoped catalog.
 // It does not invoke factories or transfer ownership.
 func (h *AhpHost) PublishSession(ctx context.Context, sessionID string) (*rpc.HostPublishSessionResult, error) {
 	return h.rpc.PublishSession(ctx, &rpc.HostPublishSessionRequest{HostID: h.HostID, SessionID: sessionID})
 }
 
+// ListSessions returns all live and dormant catalog sessions advertised by this host.
+func (h *AhpHost) ListSessions(ctx context.Context) (*rpc.HostListSessionsResult, error) {
+	return h.rpc.ListSessions(ctx, &rpc.HostListSessionsRequest{HostID: &h.HostID})
+}
+
 type ahpHostState struct {
 	mu       sync.Mutex
 	hosts    map[string]AhpHostOptions
@@ -129,7 +137,7 @@ func (c *Client) StartAhpHost(ctx context.Context, options *AhpHostOptions) (*Ah
 	c.ahp.hosts[hostID] = opts
 	c.ahp.mu.Unlock()
 	params := &rpc.HostStartRequest{
-		HostID: hostID, LocalServer: opts.LocalServer,
+		HostID: hostID, ComputeID: opts.ComputeID, LocalServer: opts.LocalServer,
 		GitHubEnvironment: opts.GitHubEnvironment,
 	}
 	if opts.CreateSession != nil {
diff --git a/go/host_test.go b/go/host_test.go
index c660b9b3ea..a6450f0904 100644
--- a/go/host_test.go
+++ b/go/host_test.go
@@ -47,8 +47,8 @@ func TestAhpHostTransportsAndOptionalResults(t *testing.T) {
 	for _, transport := range []string{"local", "github", "both"} {
 		t.Run(transport, func(t *testing.T) {
 			client, server, _ := ahpFixture(t)
-			options := &AhpHostOptions{}
-			want := map[string]any{}
+			options := &AhpHostOptions{ComputeID: String("compute")}
+			want := map[string]any{"computeId": "compute"}
 			if transport != "github" {
 				port := int32(0)
 				options.LocalServer = &rpc.HostLocalServerOptions{
@@ -111,6 +111,27 @@ func TestAhpHostTransportsAndOptionalResults(t *testing.T) {
 	}
 }
 
+func TestAhpHostListSessionsUsesOwningHost(t *testing.T) {
+	client, server, _ := ahpFixture(t)
+	host, err := client.StartAhpHost(t.Context(), &AhpHostOptions{LocalServer: &rpc.HostLocalServerOptions{}})
+	if err != nil {
+		t.Fatal(err)
+	}
+	server.SetRequestHandler("host.listSessions", jsonrpc2.RequestHandlerFor(func(params *rpc.HostListSessionsRequest) (*rpc.HostListSessionsResult, *jsonrpc2.Error) {
+		if params.HostID == nil || *params.HostID != host.HostID {
+			t.Errorf("hostId = %v, want %q", params.HostID, host.HostID)
+		}
+		return &rpc.HostListSessionsResult{Sessions: []rpc.HostSessionSummary{}}, nil
+	}))
+	result, err := host.ListSessions(t.Context())
+	if err != nil {
+		t.Fatal(err)
+	}
+	if result.Sessions == nil || len(result.Sessions) != 0 {
+		t.Fatalf("sessions = %#v, want an empty catalog", result.Sessions)
+	}
+}
+
 func TestAhpFactoryCancellationLogging(t *testing.T) {
 	output := new(ahpTestLog)
 	previous := log.Writer()
diff --git a/go/image_generation_test.go b/go/image_generation_test.go
new file mode 100644
index 0000000000..1c6586692c
--- /dev/null
+++ b/go/image_generation_test.go
@@ -0,0 +1,48 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+
+package copilot
+
+import (
+	"encoding/json"
+	"testing"
+)
+
+func TestImageGenerationSerialization(t *testing.T) {
+	for _, enabled := range []*bool{Bool(true), Bool(false), nil} {
+		var config *ImageGenerationConfig
+		if enabled != nil {
+			config = &ImageGenerationConfig{Enabled: enabled}
+		}
+		for _, request := range []any{
+			createSessionRequest{ImageGeneration: config},
+			resumeSessionRequest{SessionID: "image-test", ImageGeneration: config},
+		} {
+			data, err := json.Marshal(request)
+			if err != nil {
+				t.Fatal(err)
+			}
+			var payload map[string]json.RawMessage
+			if err := json.Unmarshal(data, &payload); err != nil {
+				t.Fatal(err)
+			}
+			value, present := payload["imageGeneration"]
+			if enabled == nil {
+				if present {
+					t.Fatalf("expected omitted imageGeneration, got %s", data)
+				}
+			} else {
+				expected, err := json.Marshal(map[string]bool{"enabled": *enabled})
+				if err != nil {
+					t.Fatal(err)
+				}
+				if string(value) != string(expected) {
+					t.Fatalf("imageGeneration = %s, want %s", value, expected)
+				}
+			}
+		}
+	}
+	data, err := json.Marshal(ImageGenerationConfig{})
+	if err != nil || string(data) != "{}" {
+		t.Fatalf("unset enabled = %s, err = %v", data, err)
+	}
+}
diff --git a/go/internal/e2e/client_options_e2e_test.go b/go/internal/e2e/client_options_e2e_test.go
index 739f1a58da..49294ca052 100644
--- a/go/internal/e2e/client_options_e2e_test.go
+++ b/go/internal/e2e/client_options_e2e_test.go
@@ -412,6 +412,7 @@ func TestClientOptionsE2E(t *testing.T) {
 		extensionSDKPath := filepath.Join(ctx.WorkDir, "extension-sdk")
 		session, err := client.CreateSession(t.Context(), &copilot.SessionConfig{
 			SessionID:                          sessionID,
+			Name:                               "go named at create",
 			ClientName:                         "go-sdk-e2e-client",
 			Model:                              "claude-sonnet-5",
 			ReasoningEffort:                    "low",
@@ -471,6 +472,7 @@ func TestClientOptionsE2E(t *testing.T) {
 		}
 		expectedValues := map[string]any{
 			"sessionId":                          sessionID,
+			"name":                               "go named at create",
 			"clientName":                         "go-sdk-e2e-client",
 			"model":                              "claude-sonnet-5",
 			"reasoningEffort":                    "low",
diff --git a/go/internal/e2e/runtime_host_e2e_test.go b/go/internal/e2e/runtime_host_e2e_test.go
index b30325ca72..8f1ae6c4b7 100644
--- a/go/internal/e2e/runtime_host_e2e_test.go
+++ b/go/internal/e2e/runtime_host_e2e_test.go
@@ -72,6 +72,8 @@ type ahpApplication struct {
 	session  atomic.Pointer[copilot.Session]
 	creates  atomic.Int32
 	resumes  atomic.Int32
+	createID atomic.Value
+	resumeID atomic.Value
 	tools    atomic.Int32
 	hooks    atomic.Int32
 	released chan *copilot.Session
@@ -122,13 +124,21 @@ func (a *ahpApplication) options() *copilot.AhpHostOptions {
 			if ctx.Err() != nil || request.Config.WorkingDirectory != a.workDir {
 				return nil, fmt.Errorf("invalid create handoff")
 			}
+			if request.Config.SessionID == "" {
+				return nil, fmt.Errorf("create handoff omitted runtime session identity")
+			}
+			a.createID.Store(request.Config.SessionID)
 			a.createConfig(request.Config)
 			session, err := a.client.CreateSession(ctx, request.Config)
+			if err == nil && session.SessionID != request.Config.SessionID {
+				return nil, fmt.Errorf("create returned %q, requested %q", session.SessionID, request.Config.SessionID)
+			}
 			a.session.Store(session)
 			return session, err
 		},
 		ResumeSession: func(ctx context.Context, request copilot.AhpSessionResumeRequest) (*copilot.Session, error) {
 			a.resumes.Add(1)
+			a.resumeID.Store(request.SessionID)
 			config := request.Config
 			if ctx.Err() != nil || config.WorkingDirectory != a.workDir ||
 				config.ContinuePendingWork == nil || *config.ContinuePendingWork {
@@ -138,6 +148,9 @@ func (a *ahpApplication) options() *copilot.AhpHostOptions {
 			config.SystemMessage = &copilot.SystemMessageConfig{Mode: "append", Content: ahpPromptMarker}
 			config.Tools, config.Hooks = a.callbacks()
 			session, err := a.client.ResumeSessionWithOptions(ctx, request.SessionID, config)
+			if err == nil && session.SessionID != request.SessionID {
+				return nil, fmt.Errorf("resume returned %q, requested %q", session.SessionID, request.SessionID)
+			}
 			a.session.Store(session)
 			return session, err
 		},
@@ -228,7 +241,8 @@ func TestRuntimeHostE2E(t *testing.T) {
 				driveAhp(t, ahp, map[string]any{"op": "attach", "clientId": clientID, "sessionId": sessionID})
 			} else {
 				sessionID = driveAhp(t, ahp, map[string]any{"op": "create", "clientId": clientID, "workDir": ctx.WorkDir}).SessionID
-				if app.creates.Load() != 1 || app.session.Load().SessionID != sessionID {
+				if app.creates.Load() != 1 || app.session.Load().SessionID != app.createID.Load() ||
+					app.session.Load().SessionID == sessionID {
 					t.Fatal("create callback did not materialize the requested identity")
 				}
 			}
@@ -279,6 +293,10 @@ func TestRuntimeHostE2E(t *testing.T) {
 		}
 		clientID, closeFirst := connectAhpTest(t, ahp, host, "")
 		sessionID := driveAhp(t, ahp, map[string]any{"op": "create", "clientId": clientID, "workDir": ctx.WorkDir, "clientTools": true}).SessionID
+		runtimeID := first.session.Load().SessionID
+		if first.creates.Load() != 1 || first.createID.Load() != runtimeID || runtimeID == sessionID {
+			t.Fatal("create callback did not preserve its distinct runtime session identity")
+		}
 		answer := driveAhp(t, ahp, map[string]any{"op": "turn", "clientId": clientID, "sessionId": sessionID, "prompt": "What is 2+2?"})
 		if !strings.Contains(answer.Text, "4") {
 			t.Fatal(answer.Text)
@@ -310,7 +328,8 @@ func TestRuntimeHostE2E(t *testing.T) {
 			t.Fatalf("lost durable history: %+v", history)
 		}
 		if resumed.creates.Load() != 0 || resumed.resumes.Load() != 1 ||
-			resumed.session.Load() == first.session.Load() || resumed.session.Load().SessionID != sessionID {
+			resumed.resumeID.Load() != runtimeID ||
+			resumed.session.Load() == first.session.Load() || resumed.session.Load().SessionID != runtimeID {
 			t.Fatal("incorrect application resume callback or identity")
 		}
 		response := driveAhp(t, ahp, map[string]any{"op": "turn", "clientId": reconnected, "sessionId": sessionID, "prompt": ahpComposedPrompt, "clientTools": true})
diff --git a/go/internal/e2e/skill_provider_e2e_test.go b/go/internal/e2e/skill_provider_e2e_test.go
new file mode 100644
index 0000000000..d6c2dc93fb
--- /dev/null
+++ b/go/internal/e2e/skill_provider_e2e_test.go
@@ -0,0 +1,586 @@
+package e2e
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"os"
+	"path/filepath"
+	"strings"
+	"sync"
+	"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"
+)
+
+type providedSkill struct {
+	descriptor rpc.SkillProviderDescriptor
+	read       func() (string, error)
+}
+
+type testSkillProvider struct {
+	mu     sync.Mutex
+	skills []providedSkill
+	calls  []string
+}
+
+func newTestSkillProvider(skills []providedSkill) *testSkillProvider {
+	return &testSkillProvider{skills: skills}
+}
+
+func providedSkillWithMarkdown(name, description, markdown string) providedSkill {
+	return providedSkill{
+		descriptor: rpc.SkillProviderDescriptor{Name: name, Description: description},
+		read:       func() (string, error) { return markdown, nil },
+	}
+}
+
+func (p *testSkillProvider) ListSkills(ctx context.Context) ([]rpc.SkillProviderDescriptor, error) {
+	p.mu.Lock()
+	defer p.mu.Unlock()
+	p.calls = append(p.calls, "list")
+	skills := make([]rpc.SkillProviderDescriptor, 0, len(p.skills))
+	for _, skill := range p.skills {
+		skills = append(skills, skill.descriptor)
+	}
+	return skills, nil
+}
+
+func (p *testSkillProvider) ReadSkill(ctx context.Context, name string) (string, error) {
+	p.mu.Lock()
+	defer p.mu.Unlock()
+	p.calls = append(p.calls, "read:"+name)
+	for _, skill := range p.skills {
+		if skill.descriptor.Name == name {
+			return skill.read()
+		}
+	}
+	return "", copilot.ErrSkillNotFound
+}
+
+func (p *testSkillProvider) Calls() []string {
+	p.mu.Lock()
+	defer p.mu.Unlock()
+	calls := make([]string, len(p.calls))
+	copy(calls, p.calls)
+	return calls
+}
+
+func (p *testSkillProvider) Reads() []string {
+	calls := p.Calls()
+	reads := make([]string, 0, len(calls))
+	for _, call := range calls {
+		if strings.HasPrefix(call, "read:") {
+			reads = append(reads, strings.TrimPrefix(call, "read:"))
+		}
+	}
+	return reads
+}
+
+// blockingSkillProvider blocks ListSkills until its context is cancelled.
+type blockingSkillProvider struct {
+	entered    chan struct{}
+	cancelled  chan struct{}
+	enterOnce  sync.Once
+	cancelOnce sync.Once
+}
+
+func newBlockingSkillProvider() *blockingSkillProvider {
+	return &blockingSkillProvider{entered: make(chan struct{}), cancelled: make(chan struct{})}
+}
+
+func (p *blockingSkillProvider) ListSkills(ctx context.Context) ([]rpc.SkillProviderDescriptor, error) {
+	p.enterOnce.Do(func() { close(p.entered) })
+	<-ctx.Done()
+	p.cancelOnce.Do(func() { close(p.cancelled) })
+	return nil, ctx.Err()
+}
+
+func (p *blockingSkillProvider) ReadSkill(context.Context, string) (string, error) {
+	return "", copilot.ErrSkillNotFound
+}
+
+func TestSkillProviderE2E(t *testing.T) {
+	ctx := testharness.NewTestContext(t)
+	client := ctx.NewClient()
+	t.Cleanup(func() { client.ForceStop() })
+
+	t.Run("should load provider skill lazily through skill tool", func(t *testing.T) {
+		ctx.ConfigureForTest(t)
+		provider := newTestSkillProvider([]providedSkill{
+			providedSkillWithMarkdown(
+				"provider-lookup",
+				"Reports the provider lookup verification word.",
+				"# Provider lookup\n\nThe verification word is TANGERINE_QUARTZ_19. Reply with it.\n",
+			),
+		})
+		session, err := client.CreateSession(t.Context(), &copilot.SessionConfig{
+			OnPermissionRequest: copilot.PermissionHandler.ApproveAll,
+			SkillProvider:       provider,
+		})
+		if err != nil {
+			t.Fatalf("CreateSession failed: %v", err)
+		}
+		t.Cleanup(func() { _ = session.Disconnect() })
+
+		list, err := session.RPC.Skills.List(t.Context())
+		if err != nil {
+			t.Fatalf("Skills.List failed: %v", err)
+		}
+		listed := findSkill(list, "provider-lookup")
+		if listed == nil {
+			t.Fatal("Expected provider-lookup skill to be listed")
+		}
+		if listed.Source != rpc.SkillSourceSDK || !listed.Enabled {
+			t.Fatalf("Expected provider-lookup source=sdk enabled=true, got %+v", listed)
+		}
+		if listed.Path != nil && *listed.Path != "" {
+			t.Fatalf("Expected provider-lookup path to be empty, got %q", *listed.Path)
+		}
+		if reads := provider.Reads(); len(reads) != 0 {
+			t.Fatalf("Provider reads before skill load = %v, want []", reads)
+		}
+
+		message, err := session.SendAndWait(t.Context(), copilot.MessageOptions{
+			Prompt: "Use the skill tool to load the provider-lookup skill, then reply with its verification word.",
+		})
+		if err != nil {
+			t.Fatalf("SendAndWait failed: %v", err)
+		}
+
+		assertEqualStrings(t, provider.Reads(), []string{"provider-lookup"})
+		// Validate the final assistant response arrived (guards against truncated captures)
+		assertAssistantContains(t, message, "TANGERINE_QUARTZ_19")
+	})
+
+	t.Run("should load provider and file based skills together", func(t *testing.T) {
+		ctx.ConfigureForTest(t)
+		skillsDir := filepath.Join(ctx.WorkDir, "file-skills")
+		fileSkillDir := filepath.Join(skillsDir, "file-notes")
+		if err := os.MkdirAll(fileSkillDir, 0755); err != nil {
+			t.Fatalf("MkdirAll failed: %v", err)
+		}
+		if err := os.WriteFile(
+			filepath.Join(fileSkillDir, "SKILL.md"),
+			[]byte("---\nname: file-notes\ndescription: Reports the file notes verification word.\n---\n\nThe file notes verification word is MAPLE_FALCON_27.\n"),
+			0644,
+		); err != nil {
+			t.Fatalf("WriteFile failed: %v", err)
+		}
+		provider := newTestSkillProvider([]providedSkill{
+			providedSkillWithMarkdown(
+				"provider-audit",
+				"Reports the provider audit verification word.",
+				"---\nname: provider-audit\nallowed-tools: view\n---\n\nThe provider audit verification word is COBALT_HERON_58.\n",
+			),
+		})
+		session, err := client.CreateSession(t.Context(), &copilot.SessionConfig{
+			OnPermissionRequest: copilot.PermissionHandler.ApproveAll,
+			SkillDirectories:    []string{skillsDir},
+			SkillProvider:       provider,
+		})
+		if err != nil {
+			t.Fatalf("CreateSession failed: %v", err)
+		}
+		t.Cleanup(func() { _ = session.Disconnect() })
+
+		list, err := session.RPC.Skills.List(t.Context())
+		if err != nil {
+			t.Fatalf("Skills.List failed: %v", err)
+		}
+		fileSkill := findSkill(list, "file-notes")
+		providerSkill := findSkill(list, "provider-audit")
+		if fileSkill == nil || fileSkill.Source == rpc.SkillSourceSDK || fileSkill.Path == nil || *fileSkill.Path == "" {
+			t.Fatalf("Unexpected file-notes skill: %+v", fileSkill)
+		}
+		if providerSkill == nil || providerSkill.Source != rpc.SkillSourceSDK {
+			t.Fatalf("Unexpected provider-audit skill: %+v", providerSkill)
+		}
+
+		message, err := session.SendAndWait(t.Context(), copilot.MessageOptions{
+			Prompt: "Use the skill tool to load the file-notes skill and the provider-audit skill, then reply with both verification words.",
+		})
+		if err != nil {
+			t.Fatalf("SendAndWait failed: %v", err)
+		}
+
+		assertEqualStrings(t, provider.Reads(), []string{"provider-audit"})
+		assertAssistantContains(t, message, "MAPLE_FALCON_27")
+		// Validate the final assistant response arrived (guards against truncated captures)
+		assertAssistantContains(t, message, "COBALT_HERON_58")
+	})
+
+	t.Run("should rebind skill provider on resume", func(t *testing.T) {
+		ctx.ConfigureForTest(t)
+		original := newTestSkillProvider([]providedSkill{
+			providedSkillWithMarkdown(
+				"rebind-check",
+				"Reports the rebind verification word.",
+				"The rebind verification word is AMBER_ALPHA_11.\n",
+			),
+		})
+		replacement := newTestSkillProvider([]providedSkill{
+			providedSkillWithMarkdown(
+				"rebind-check",
+				"Reports the rebind verification word.",
+				"The rebind verification word is BRONZE_BETA_22.\n",
+			),
+		})
+		first, err := client.CreateSession(t.Context(), &copilot.SessionConfig{
+			OnPermissionRequest: copilot.PermissionHandler.ApproveAll,
+			SkillProvider:       original,
+		})
+		if err != nil {
+			t.Fatalf("CreateSession failed: %v", err)
+		}
+		sessionID := first.SessionID
+		if _, err := first.SendAndWait(t.Context(), copilot.MessageOptions{
+			Prompt: "Without using any tools or skills, reply with exactly REBIND_READY.",
+		}); err != nil {
+			t.Fatalf("Initial SendAndWait failed: %v", err)
+		}
+		if err := first.Disconnect(); err != nil {
+			t.Fatalf("Disconnect failed: %v", err)
+		}
+		if reads := original.Reads(); len(reads) != 0 {
+			t.Fatalf("Original provider reads before resume = %v, want []", reads)
+		}
+		originalCallsBeforeResume := len(original.Calls())
+
+		session, err := client.ResumeSession(t.Context(), sessionID, &copilot.ResumeSessionConfig{
+			OnPermissionRequest: copilot.PermissionHandler.ApproveAll,
+			SkillProvider:       replacement,
+		})
+		if err != nil {
+			t.Fatalf("ResumeSession failed: %v", err)
+		}
+		t.Cleanup(func() { _ = session.Disconnect() })
+
+		message, err := session.SendAndWait(t.Context(), copilot.MessageOptions{
+			Prompt: "Use the skill tool to load the rebind-check skill, then reply with its verification word.",
+		})
+		if err != nil {
+			t.Fatalf("SendAndWait failed: %v", err)
+		}
+
+		assertEqualStrings(t, replacement.Reads(), []string{"rebind-check"})
+		if got := len(original.Calls()); got != originalCallsBeforeResume {
+			t.Fatalf("Original provider call count after resume = %d, want %d", got, originalCallsBeforeResume)
+		}
+		// Validate the final assistant response arrived (guards against truncated captures)
+		assertAssistantContains(t, message, "BRONZE_BETA_22")
+		assertAssistantNotContains(t, message, "AMBER_ALPHA_11")
+	})
+
+	t.Run("should report provider read failure without leaking details", func(t *testing.T) {
+		ctx.ConfigureForTest(t)
+		secret := "PROVIDER_SECRET_7F3A9C"
+		provider := newTestSkillProvider([]providedSkill{
+			{
+				descriptor: rpc.SkillProviderDescriptor{
+					Name:        "broken-lookup",
+					Description: "Reports the broken lookup verification word.",
+				},
+				read: func() (string, error) {
+					return "", errors.New("database unavailable: " + secret)
+				},
+			},
+		})
+		events := newEventRecorder()
+		session, err := client.CreateSession(t.Context(), &copilot.SessionConfig{
+			OnPermissionRequest: copilot.PermissionHandler.ApproveAll,
+			SkillProvider:       provider,
+			OnEvent:             events.Record,
+		})
+		if err != nil {
+			t.Fatalf("CreateSession failed: %v", err)
+		}
+		t.Cleanup(func() { _ = session.Disconnect() })
+
+		message, err := session.SendAndWait(t.Context(), copilot.MessageOptions{
+			Prompt: "Use the skill tool to load the broken-lookup skill. If loading fails, reply with exactly LOAD_FAILED.",
+		})
+		if err != nil {
+			t.Fatalf("SendAndWait failed: %v", err)
+		}
+
+		assertContainsString(t, provider.Reads(), "broken-lookup")
+		failures := failedToolCompletions(events.Snapshot())
+		if len(failures) != 1 {
+			t.Fatalf("Expected exactly 1 failed tool completion, got %d", len(failures))
+		}
+		rawEvents, err := json.Marshal(events.Snapshot())
+		if err != nil {
+			t.Fatalf("Marshal events failed: %v", err)
+		}
+		if strings.Contains(string(rawEvents), secret) {
+			t.Fatalf("Provider error leaked secret in events: %s", rawEvents)
+		}
+		// Validate the final assistant response arrived (guards against truncated captures)
+		assertAssistantContains(t, message, "LOAD_FAILED")
+	})
+
+	t.Run("should report missing provider skill as not found", func(t *testing.T) {
+		ctx.ConfigureForTest(t)
+		provider := newTestSkillProvider([]providedSkill{
+			{
+				descriptor: rpc.SkillProviderDescriptor{
+					Name:        "vanished-lookup",
+					Description: "Reports the vanished lookup verification word.",
+				},
+				read: func() (string, error) {
+					return "", copilot.ErrSkillNotFound
+				},
+			},
+		})
+		events := newEventRecorder()
+		session, err := client.CreateSession(t.Context(), &copilot.SessionConfig{
+			OnPermissionRequest: copilot.PermissionHandler.ApproveAll,
+			SkillProvider:       provider,
+			OnEvent:             events.Record,
+		})
+		if err != nil {
+			t.Fatalf("CreateSession failed: %v", err)
+		}
+		t.Cleanup(func() { _ = session.Disconnect() })
+
+		message, err := session.SendAndWait(t.Context(), copilot.MessageOptions{
+			Prompt: "Use the skill tool to load the vanished-lookup skill. If loading fails, reply with exactly LOAD_FAILED.",
+		})
+		if err != nil {
+			t.Fatalf("SendAndWait failed: %v", err)
+		}
+
+		assertContainsString(t, provider.Reads(), "vanished-lookup")
+		failures := failedToolCompletions(events.Snapshot())
+		if len(failures) != 1 {
+			t.Fatalf("Expected exactly 1 failed tool completion, got %d", len(failures))
+		}
+		rawFailure, err := json.Marshal(failures[0])
+		if err != nil {
+			t.Fatalf("Marshal failure failed: %v", err)
+		}
+		if !strings.Contains(strings.ToLower(string(rawFailure)), "not found") {
+			t.Fatalf("Expected failure to mention not found, got %s", rawFailure)
+		}
+		// Validate the final assistant response arrived (guards against truncated captures)
+		assertAssistantContains(t, message, "LOAD_FAILED")
+	})
+
+	t.Run("should keep provider dormant when skills disabled", func(t *testing.T) {
+		ctx.ConfigureWithoutSnapshot(t)
+		provider := newTestSkillProvider([]providedSkill{
+			providedSkillWithMarkdown("dormant-lookup", "Never listed.", "Never read.\n"),
+		})
+		session, err := client.CreateSession(t.Context(), &copilot.SessionConfig{
+			OnPermissionRequest: copilot.PermissionHandler.ApproveAll,
+			EnableSkills:        copilot.Bool(false),
+			SkillProvider:       provider,
+		})
+		if err != nil {
+			t.Fatalf("CreateSession failed: %v", err)
+		}
+		t.Cleanup(func() { _ = session.Disconnect() })
+
+		if _, err := session.RPC.Skills.EnsureLoaded(t.Context()); err != nil {
+			t.Fatalf("Skills.EnsureLoaded failed: %v", err)
+		}
+		list, err := session.RPC.Skills.List(t.Context())
+		if err != nil {
+			t.Fatalf("Skills.List failed: %v", err)
+		}
+		if sdkSkills := sdkSkills(list); len(sdkSkills) != 0 {
+			t.Fatalf("Expected no sdk skills when disabled, got %+v", sdkSkills)
+		}
+		if calls := provider.Calls(); len(calls) != 0 {
+			t.Fatalf("Provider calls when skills disabled = %v, want []", calls)
+		}
+	})
+
+	t.Run("should unbind provider when resumed without one", func(t *testing.T) {
+		ctx.ConfigureWithoutSnapshot(t)
+		provider := newTestSkillProvider([]providedSkill{
+			providedSkillWithMarkdown("unbound-lookup", "Reports the unbound lookup word.", "Unbound.\n"),
+		})
+		first, err := client.CreateSession(t.Context(), &copilot.SessionConfig{
+			OnPermissionRequest: copilot.PermissionHandler.ApproveAll,
+			SkillProvider:       provider,
+		})
+		if err != nil {
+			t.Fatalf("CreateSession failed: %v", err)
+		}
+		before, err := first.RPC.Skills.List(t.Context())
+		if err != nil {
+			t.Fatalf("Skills.List before resume failed: %v", err)
+		}
+		if findSkill(before, "unbound-lookup") == nil {
+			t.Fatal("Expected unbound-lookup before resume")
+		}
+		callsBeforeResume := len(provider.Calls())
+
+		session, err := client.ResumeSession(t.Context(), first.SessionID, &copilot.ResumeSessionConfig{
+			OnPermissionRequest: copilot.PermissionHandler.ApproveAll,
+		})
+		if err != nil {
+			t.Fatalf("ResumeSession failed: %v", err)
+		}
+		t.Cleanup(func() { _ = session.Disconnect() })
+
+		if _, err := session.RPC.Skills.Reload(t.Context()); err != nil {
+			t.Fatalf("Skills.Reload failed: %v", err)
+		}
+		list, err := session.RPC.Skills.List(t.Context())
+		if err != nil {
+			t.Fatalf("Skills.List after resume failed: %v", err)
+		}
+		if sdkSkills := sdkSkills(list); len(sdkSkills) != 0 {
+			t.Fatalf("Expected no sdk skills after unbound resume, got %+v", sdkSkills)
+		}
+		if got := len(provider.Calls()); got != callsBeforeResume {
+			t.Fatalf("Provider call count after unbound resume = %d, want %d", got, callsBeforeResume)
+		}
+	})
+
+	t.Run("should cancel a blocked provider call when the session disconnects", func(t *testing.T) {
+		ctx.ConfigureWithoutSnapshot(t)
+		provider := newBlockingSkillProvider()
+		session, err := client.CreateSession(t.Context(), &copilot.SessionConfig{
+			OnPermissionRequest: copilot.PermissionHandler.ApproveAll,
+			SkillProvider:       provider,
+		})
+		if err != nil {
+			t.Fatalf("CreateSession failed: %v", err)
+		}
+
+		// The list RPC fails once the binding is removed; only the provider's
+		// cancellation matters here.
+		go func() { _, _ = session.RPC.Skills.List(context.Background()) }()
+		select {
+		case <-provider.entered:
+		case <-time.After(30 * time.Second):
+			t.Fatal("provider ListSkills was not called")
+		}
+
+		if err := session.Disconnect(); err != nil {
+			t.Fatalf("Disconnect failed: %v", err)
+		}
+		select {
+		case <-provider.cancelled:
+		case <-time.After(10 * time.Second):
+			t.Fatal("provider context was not cancelled after Disconnect")
+		}
+	})
+
+	t.Run("should reject skill provider for cloud sessions", func(t *testing.T) {
+		ctx.ConfigureWithoutSnapshot(t)
+		provider := newTestSkillProvider([]providedSkill{
+			providedSkillWithMarkdown("cloud-lookup", "Never listed.", "Never read.\n"),
+		})
+
+		_, err := client.CreateSession(t.Context(), &copilot.SessionConfig{
+			OnPermissionRequest: copilot.PermissionHandler.ApproveAll,
+			Cloud:               &copilot.CloudSessionOptions{},
+			SkillProvider:       provider,
+		})
+		if err == nil || err.Error() != "Skill providers are not supported for cloud sessions." {
+			t.Fatalf("CreateSession error = %v, want cloud skill provider rejection", err)
+		}
+		if calls := provider.Calls(); len(calls) != 0 {
+			t.Fatalf("Provider calls after cloud rejection = %v, want []", calls)
+		}
+	})
+}
+
+type eventRecorder struct {
+	mu     sync.Mutex
+	events []copilot.SessionEvent
+}
+
+func newEventRecorder() *eventRecorder {
+	return &eventRecorder{}
+}
+
+func (r *eventRecorder) Record(event copilot.SessionEvent) {
+	r.mu.Lock()
+	defer r.mu.Unlock()
+	r.events = append(r.events, event)
+}
+
+func (r *eventRecorder) Snapshot() []copilot.SessionEvent {
+	r.mu.Lock()
+	defer r.mu.Unlock()
+	events := make([]copilot.SessionEvent, len(r.events))
+	copy(events, r.events)
+	return events
+}
+
+func findSkill(list *rpc.SkillList, name string) *rpc.Skill {
+	if list == nil {
+		return nil
+	}
+	for i := range list.Skills {
+		if list.Skills[i].Name == name {
+			return &list.Skills[i]
+		}
+	}
+	return nil
+}
+
+func sdkSkills(list *rpc.SkillList) []rpc.Skill {
+	if list == nil {
+		return nil
+	}
+	var matches []rpc.Skill
+	for _, skill := range list.Skills {
+		if skill.Source == rpc.SkillSourceSDK {
+			matches = append(matches, skill)
+		}
+	}
+	return matches
+}
+
+func failedToolCompletions(events []copilot.SessionEvent) []*copilot.ToolExecutionCompleteData {
+	var failures []*copilot.ToolExecutionCompleteData
+	for _, event := range events {
+		if data, ok := event.Data.(*copilot.ToolExecutionCompleteData); ok && !data.Success {
+			failures = append(failures, data)
+		}
+	}
+	return failures
+}
+
+func assertAssistantNotContains(t *testing.T, event *copilot.SessionEvent, text string) {
+	t.Helper()
+	data, ok := event.Data.(*copilot.AssistantMessageData)
+	if !ok {
+		t.Fatalf("Expected AssistantMessageData, got %T", event.Data)
+	}
+	if strings.Contains(data.Content, text) {
+		t.Fatalf("Expected assistant response not to contain %q, got %q", text, data.Content)
+	}
+}
+
+func assertEqualStrings(t *testing.T, got, want []string) {
+	t.Helper()
+	if len(got) != len(want) {
+		t.Fatalf("strings = %v, want %v", got, want)
+	}
+	for i := range got {
+		if got[i] != want[i] {
+			t.Fatalf("strings = %v, want %v", got, want)
+		}
+	}
+}
+
+func assertContainsString(t *testing.T, got []string, want string) {
+	t.Helper()
+	for _, value := range got {
+		if value == want {
+			return
+		}
+	}
+	t.Fatalf("strings = %v, want to contain %q", got, want)
+}
diff --git a/go/internal/jsonrpc2/jsonrpc2.go b/go/internal/jsonrpc2/jsonrpc2.go
index d4898b6a9c..14566f7bea 100644
--- a/go/internal/jsonrpc2/jsonrpc2.go
+++ b/go/internal/jsonrpc2/jsonrpc2.go
@@ -329,11 +329,11 @@ func (c *Client) RequestWithInlineResponse(ctx context.Context, method string, p
 			return response.Result, nil
 		case <-c.processDone:
 			if err := c.getProcessError(); err != nil {
-				return nil, err
+				return responseAfterShutdown(responseChan, err)
 			}
-			return nil, fmt.Errorf("process exited unexpectedly")
+			return responseAfterShutdown(responseChan, fmt.Errorf("process exited unexpectedly"))
 		case <-c.stopChan:
-			return nil, fmt.Errorf("client stopped")
+			return responseAfterShutdown(responseChan, fmt.Errorf("client stopped"))
 		}
 	}
 	select {
@@ -345,9 +345,22 @@ func (c *Client) RequestWithInlineResponse(ctx context.Context, method string, p
 		}
 		return response.Result, nil
 	case <-c.connectionClosed:
-		return nil, fmt.Errorf("connection closed")
+		return responseAfterShutdown(responseChan, fmt.Errorf("connection closed"))
 	case <-c.stopChan:
-		return nil, fmt.Errorf("client stopped")
+		return responseAfterShutdown(responseChan, fmt.Errorf("client stopped"))
+	}
+}
+
+func responseAfterShutdown(responseChan <-chan *Response, shutdownErr error) (json.RawMessage, error) {
+	// Shutdown can win the outer select after the read loop has already admitted a reply.
+	select {
+	case response := <-responseChan:
+		if response.Error != nil {
+			return nil, response.Error
+		}
+		return response.Result, nil
+	default:
+		return nil, shutdownErr
 	}
 }
 
diff --git a/go/internal/jsonrpc2/jsonrpc2_test.go b/go/internal/jsonrpc2/jsonrpc2_test.go
index 258992e101..0c42f185aa 100644
--- a/go/internal/jsonrpc2/jsonrpc2_test.go
+++ b/go/internal/jsonrpc2/jsonrpc2_test.go
@@ -3,7 +3,9 @@ package jsonrpc2
 import (
 	"bytes"
 	"context"
+	"encoding/json"
 	"errors"
+	"fmt"
 	"io"
 	"sync"
 	"testing"
@@ -16,6 +18,10 @@ type writeCloser struct {
 
 func (w writeCloser) Close() error { return nil }
 
+type writeFunc func([]byte) (int, error)
+
+func (w writeFunc) Write(data []byte) (int, error) { return w(data) }
+
 func TestOnCloseCalledOnUnexpectedExit(t *testing.T) {
 	stdinR, stdinW := io.Pipe()
 	stdoutR, stdoutW := io.Pipe()
@@ -110,6 +116,135 @@ func TestRequestReturnsWhenConnectionCloses(t *testing.T) {
 	}
 }
 
+func TestRequestUnacknowledgedShutdown(t *testing.T) {
+	for _, shutdown := range []string{"stop", "connection closed", "process exited", "process error"} {
+		t.Run(shutdown, func(t *testing.T) {
+			stdinR, stdinW := io.Pipe()
+			defer stdinR.Close()
+			defer stdinW.Close()
+			client := NewClient(stdinW, io.NopCloser(bytes.NewReader(nil)))
+			done := make(chan struct{})
+			var processErr error
+			if shutdown == "process error" {
+				processErr = errors.New("CLI process exited: exit status 1")
+			}
+			if shutdown == "process exited" || shutdown == "process error" {
+				client.SetProcessDone(done, &processErr)
+			}
+			ctx, cancel := context.WithCancel(t.Context())
+			finished := make(chan struct{})
+			t.Cleanup(func() {
+				cancel()
+				stdinR.Close()
+				select {
+				case <-finished:
+				case <-time.After(time.Second):
+					t.Error("request did not finish during cleanup")
+				}
+			})
+			result := make(chan error, 1)
+			go func() {
+				defer close(finished)
+				_, err := client.Request(ctx, "test.method", nil)
+				result <- err
+			}()
+			if _, err := newHeaderReader(stdinR).Read(); err != nil {
+				t.Fatalf("Read request failed: %v", err)
+			}
+			var expected string
+			switch shutdown {
+			case "stop":
+				close(client.stopChan)
+				expected = "client stopped"
+			case "connection closed":
+				close(client.connectionClosed)
+				expected = "connection closed"
+			case "process exited":
+				close(done)
+				expected = "process exited unexpectedly"
+			case "process error":
+				close(done)
+				expected = processErr.Error()
+			}
+			select {
+			case err := <-result:
+				if err == nil || err.Error() != expected {
+					t.Fatalf("unacknowledged request error = %v, want %s", err, expected)
+				}
+			case <-time.After(time.Second):
+				t.Fatal("unacknowledged request did not stop")
+			}
+			client.mu.Lock()
+			pending, callbacks := len(client.pendingRequests), len(client.pendingInlineCallbacks)
+			client.mu.Unlock()
+			if pending != 0 || callbacks != 0 {
+				t.Fatalf("request cleanup left %d pending requests and %d callbacks", pending, callbacks)
+			}
+		})
+	}
+}
+
+func TestRequestAdmittedResponseSurvivesShutdown(t *testing.T) {
+	for _, shutdown := range []string{"stop", "connection closed", "process exited", "process error"} {
+		t.Run(shutdown, func(t *testing.T) {
+			for _, rpcError := range []bool{false, true} {
+				for iteration := range 32 {
+					t.Run(fmt.Sprintf("RPC_error=%t/%d", rpcError, iteration), func(t *testing.T) {
+						expected := json.RawMessage(`{"messageId":"acknowledged-message"}`)
+						var expectedErr *Error
+						if rpcError {
+							expectedErr = &Error{Code: -32001, Message: "acknowledged failure", Data: json.RawMessage(`{"detail":"original"}`)}
+						}
+						done := make(chan struct{})
+						var client *Client
+						writer := writeFunc(func(data []byte) (int, error) {
+							if bytes.HasPrefix(data, []byte("Content-Length:")) {
+								return len(data), nil
+							}
+							var request Request
+							if err := json.Unmarshal(data, &request); err != nil {
+								return 0, err
+							}
+							// Both outcomes are ready before Request reaches its response select.
+							client.handleResponse(&Response{ID: request.ID, Result: expected, Error: expectedErr})
+							switch shutdown {
+							case "stop":
+								close(client.stopChan)
+							case "connection closed":
+								close(client.connectionClosed)
+							default:
+								close(done)
+							}
+							return len(data), nil
+						})
+						client = NewClient(writeCloser{Writer: writer}, io.NopCloser(bytes.NewReader(nil)))
+						if shutdown == "process exited" || shutdown == "process error" {
+							var processErr error
+							if shutdown == "process error" {
+								processErr = errors.New("CLI process exited: exit status 1")
+							}
+							client.SetProcessDone(done, &processErr)
+						}
+
+						result, err := client.Request(t.Context(), "test.method", nil)
+
+						if expectedErr != nil {
+							if result != nil || err != expectedErr {
+								t.Fatalf("admitted error = (%s, %v), want original RPC error %v", result, err, expectedErr)
+							}
+						} else if err != nil || !bytes.Equal(result, expected) {
+							t.Fatalf("admitted response = (%s, %v), want (%s, nil)", result, err, expected)
+						}
+						if len(client.pendingRequests) != 0 || len(client.pendingInlineCallbacks) != 0 {
+							t.Fatal("completed request retained its pending response or callback")
+						}
+					})
+				}
+			}
+		})
+	}
+}
+
 // TestSetProcessDone_ErrorAvailableImmediately validates that getProcessError()
 // returns the correct error immediately after processDone is closed.
 // The current implementation stores a pointer to the process error
diff --git a/go/rpc/mcp_list_test.go b/go/rpc/mcp_list_test.go
new file mode 100644
index 0000000000..7a2f3e0427
--- /dev/null
+++ b/go/rpc/mcp_list_test.go
@@ -0,0 +1,89 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+
+package rpc
+
+import (
+	"context"
+	"encoding/json"
+	"io"
+	"testing"
+
+	"github.com/github/copilot-sdk/go/internal/jsonrpc2"
+)
+
+var _ interface {
+	List(context.Context) (*MCPServerList, error)
+	ListConfigured(context.Context) (*MCPConfiguredServerList, error)
+} = (*MCPAPI)(nil)
+
+func TestMCPListUsesParameterlessWireContract(t *testing.T) {
+	clientToServerReader, clientToServerWriter := io.Pipe()
+	serverToClientReader, serverToClientWriter := io.Pipe()
+	client := jsonrpc2.NewClient(clientToServerWriter, serverToClientReader)
+	server := jsonrpc2.NewClient(serverToClientWriter, clientToServerReader)
+	requests := make(chan map[string]any, 2)
+	server.SetRequestHandler("session.mcp.list", func(params json.RawMessage) (json.RawMessage, *jsonrpc2.Error) {
+		var request map[string]any
+		if err := json.Unmarshal(params, &request); err != nil {
+			return nil, &jsonrpc2.Error{Code: -32602, Message: err.Error()}
+		}
+		requests <- request
+		return json.RawMessage(`{"servers":[]}`), nil
+	})
+	server.SetRequestHandler("session.mcp.listConfigured", func(params json.RawMessage) (json.RawMessage, *jsonrpc2.Error) {
+		var request map[string]any
+		if err := json.Unmarshal(params, &request); err != nil {
+			return nil, &jsonrpc2.Error{Code: -32602, Message: err.Error()}
+		}
+		requests <- request
+		return json.RawMessage(`{"servers":[
+			{"name":"cold","enabled":true,"live":{"status":"not_configured"}},
+			{"name":"old-connection","enabled":false,"live":{"status":"connected"}},
+			{"name":"auth","enabled":true,"live":{"status":"needs-auth"}},
+			{"name":"stopped","enabled":true,"live":{"status":"stopped"}},
+			{"name":"failed","enabled":true,"live":{"status":"failed","error":"connection failed"}}
+		]}`), nil
+	})
+	client.Start()
+	server.Start()
+	t.Cleanup(func() {
+		client.Stop()
+		server.Stop()
+		_ = clientToServerWriter.Close()
+		_ = clientToServerReader.Close()
+		_ = serverToClientWriter.Close()
+		_ = serverToClientReader.Close()
+	})
+
+	mcp := NewSessionRPC(client, "session-1").MCP
+	if _, err := mcp.List(t.Context()); err != nil {
+		t.Fatal(err)
+	}
+	configured, err := mcp.ListConfigured(t.Context())
+	if err != nil {
+		t.Fatal(err)
+	}
+	want := []MCPServerStatus{"not_configured", "connected", "needs-auth", "stopped", "failed"}
+	if len(configured.Servers) != len(want) {
+		t.Fatalf("configured servers = %#v, want %d entries", configured.Servers, len(want))
+	}
+	for i, status := range want {
+		live := configured.Servers[i].Live
+		if live.Status != status {
+			t.Fatalf("live status = %q, want %q", live.Status, status)
+		}
+	}
+	if configured.Servers[1].Enabled || configured.Servers[4].Live.Error == nil ||
+		*configured.Servers[4].Live.Error != "connection failed" {
+		t.Fatalf("configuration enablement and runtime error were not preserved: %#v", configured.Servers)
+	}
+	got := make([]map[string]any, 2)
+	for i := range got {
+		got[i] = <-requests
+	}
+	for _, request := range got {
+		if request["sessionId"] != "session-1" || len(request) != 1 {
+			t.Fatalf("request = %#v, want only the bound session ID", request)
+		}
+	}
+}
diff --git a/go/rpc/repo_settings_test.go b/go/rpc/repo_settings_test.go
new file mode 100644
index 0000000000..529daa40ff
--- /dev/null
+++ b/go/rpc/repo_settings_test.go
@@ -0,0 +1,54 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+
+package rpc_test
+
+import (
+	"encoding/json"
+	"fmt"
+	"reflect"
+	"testing"
+
+	"github.com/github/copilot-sdk/go/rpc"
+)
+
+func ExampleRepoSettingsReadRawResult() {
+	const input = `{"config":{"custom":{"items":[true,null,12.5]}},"invalid":false}`
+	var result rpc.RepoSettingsReadRawResult
+	if err := json.Unmarshal([]byte(input), &result); err != nil {
+		panic(err)
+	}
+	output, err := json.Marshal(result)
+	if err != nil {
+		panic(err)
+	}
+	fmt.Println(string(output))
+	// Output: {"config":{"custom":{"items":[true,null,12.5]}},"invalid":false}
+}
+
+func TestRawRepoSettingsPreserveUnknownJSON(t *testing.T) {
+	for _, input := range []string{
+		`{"config":{"custom":{"items":[true,null,12.5],"text":"preserved"}},"invalid":false}`,
+		`{"config":{},"invalid":true}`,
+	} {
+		t.Run(input, func(t *testing.T) {
+			var decoded rpc.RepoSettingsReadRawResult
+			if err := json.Unmarshal([]byte(input), &decoded); err != nil {
+				t.Fatal(err)
+			}
+			output, err := json.Marshal(decoded)
+			if err != nil {
+				t.Fatal(err)
+			}
+			var expected, actual any
+			if err := json.Unmarshal([]byte(input), &expected); err != nil {
+				t.Fatal(err)
+			}
+			if err := json.Unmarshal(output, &actual); err != nil {
+				t.Fatal(err)
+			}
+			if !reflect.DeepEqual(actual, expected) {
+				t.Fatalf("repository settings changed:\nactual: %s\nexpected: %s", output, input)
+			}
+		})
+	}
+}
diff --git a/go/rpc/settings_presence_test.go b/go/rpc/settings_presence_test.go
new file mode 100644
index 0000000000..86c562e194
--- /dev/null
+++ b/go/rpc/settings_presence_test.go
@@ -0,0 +1,107 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+
+package rpc
+
+import (
+	"context"
+	"encoding/json"
+	"net"
+	"testing"
+	"time"
+
+	"github.com/github/copilot-sdk/go/internal/jsonrpc2"
+)
+
+func TestSettingsValuePresenceOnWire(t *testing.T) {
+	for _, method := range []string{"user.settings.applyTopKey", "repo.settings.writeKey", "user.settings.edit"} {
+		for _, test := range []struct {
+			name    string
+			value   any
+			present bool
+			delete  bool
+		}{
+			{name: "omitted"},
+			{name: "explicit null", value: json.RawMessage("null"), present: true},
+			{name: "value", value: "chosen", present: true},
+			{name: "delete", delete: true},
+		} {
+			t.Run(method+"/"+test.name, func(t *testing.T) {
+				clientConn, serverConn := net.Pipe()
+				defer clientConn.Close()
+				defer serverConn.Close()
+				client := jsonrpc2.NewClient(clientConn, clientConn)
+				server := jsonrpc2.NewClient(serverConn, serverConn)
+				requests := make(chan json.RawMessage, 1)
+				server.SetRequestHandler(method, func(params json.RawMessage) (json.RawMessage, *jsonrpc2.Error) {
+					requests <- params
+					return json.RawMessage(`{}`), nil
+				})
+				client.Start()
+				server.Start()
+				defer client.Stop()
+				defer server.Stop()
+				ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+				defer cancel()
+				api := NewInternalServerRPC(client)
+				var err error
+				switch method {
+				case "user.settings.applyTopKey":
+					var value *any
+					if test.present {
+						value = &test.value
+					}
+					_, err = api.User.Settings().ApplyTopKey(ctx, &UserSettingsApplyTopKeyRequest{
+						CanonicalPath: []string{"model"},
+						TopKey:        "model",
+						Value:         value,
+						Delete:        &test.delete,
+					})
+				case "repo.settings.writeKey":
+					_, err = api.Repo.Settings().WriteKey(ctx, &RepoSettingsWriteKeyRequest{
+						RepoRoot: t.TempDir(),
+						Scope:    "repo",
+						Key:      "model",
+						Value:    test.value,
+						Delete:   &test.delete,
+					})
+				case "user.settings.edit":
+					operation := SettingsEditOperationSet
+					if test.delete {
+						operation = SettingsEditOperationRemove
+					}
+					_, err = api.User.Settings().Edit(ctx, &UserSettingsEditRequest{
+						CanonicalPath: []string{"model"},
+						Operation:     operation,
+						Value:         test.value,
+					})
+				}
+				if err != nil {
+					t.Fatal(err)
+				}
+				select {
+				case raw := <-requests:
+					var fields map[string]json.RawMessage
+					if err := json.Unmarshal(raw, &fields); err != nil {
+						t.Fatal(err)
+					}
+					value, present := fields["value"]
+					wantPresent := test.present || (method == "user.settings.edit" && !test.delete)
+					if present != wantPresent {
+						t.Fatalf("value presence = %v, want %v; wire params: %s", present, wantPresent, raw)
+					}
+					if present {
+						expected, err := json.Marshal(test.value)
+						if err != nil {
+							t.Fatal(err)
+						}
+						if string(value) != string(expected) {
+							t.Fatalf("value = %s, want %s; wire params: %s", value, expected, raw)
+						}
+					}
+				case <-ctx.Done():
+					t.Fatal(ctx.Err())
+				}
+			})
+		}
+	}
+}
diff --git a/go/rpc/zrpc.go b/go/rpc/zrpc.go
index c0af9e58ab..cc7b86d136 100644
--- a/go/rpc/zrpc.go
+++ b/go/rpc/zrpc.go
@@ -39,6 +39,28 @@ type AccountAllUsers struct {
 	Token *string `json:"token,omitempty"`
 }
 
+// The authentication identity whose shared wording should be rendered.
+// Experimental: AccountDescribeAuthInfoRequest is part of an experimental API and may
+// change or be removed.
+// Internal: AccountDescribeAuthInfoRequest is an internal SDK API and is not part of the
+// public surface.
+type AccountDescribeAuthInfoRequest struct {
+	// Identity to describe.
+	Identity AuthIdentity `json:"identity"`
+}
+
+// The wording the runtime uses for an authentication identity.
+// Experimental: AccountDescribeAuthInfoResult is part of an experimental API and may change
+// or be removed.
+// Internal: AccountDescribeAuthInfoResult is an internal SDK API and is not part of the
+// public surface.
+type AccountDescribeAuthInfoResult struct {
+	// One-line description of the identity, suitable after a verb such as "Switched to".
+	Description string `json:"description"`
+	// Sign-in banner announcing the authenticated user.
+	Message string `json:"message"`
+}
+
 // List of all authenticated users
 // Experimental: AccountGetAllUsersResult is part of an experimental API and may change or
 // be removed.
@@ -54,6 +76,30 @@ type AccountGetCurrentAuthResult struct {
 	AuthInfo AuthInfo `json:"authInfo,omitempty"`
 }
 
+// The authentication identity whose gist support should be reported.
+// Experimental: AccountGetGistSupportRequest is part of an experimental API and may change
+// or be removed.
+// Internal: AccountGetGistSupportRequest is an internal SDK API and is not part of the
+// public surface.
+type AccountGetGistSupportRequest struct {
+	// Identity to evaluate.
+	Identity AuthIdentity `json:"identity"`
+}
+
+// Whether the identity can create gists, and why not when it cannot.
+// Experimental: AccountGetGistSupportResult is part of an experimental API and may change
+// or be removed.
+// Internal: AccountGetGistSupportResult is an internal SDK API and is not part of the
+// public surface.
+type AccountGetGistSupportResult struct {
+	// Machine-readable reason category when unsupported.
+	Kind *string `json:"kind,omitempty"`
+	// Human-readable explanation to show where the gist action would have been.
+	Reason *string `json:"reason,omitempty"`
+	// True when the identity can create gists.
+	Supported bool `json:"supported"`
+}
+
 // Experimental: AccountGetQuotaRequest is part of an experimental API and may change or be
 // removed.
 type AccountGetQuotaRequest struct {
@@ -73,6 +119,40 @@ type AccountGetQuotaResult struct {
 	QuotaSnapshots map[string]AccountQuotaSnapshot `json:"quotaSnapshots"`
 }
 
+// The environment variable supplying a classic personal access token, when one is set.
+// Experimental: AccountGetTokenEnvVarResult is part of an experimental API and may change
+// or be removed.
+// Internal: AccountGetTokenEnvVarResult is an internal SDK API and is not part of the
+// public surface.
+type AccountGetTokenEnvVarResult struct {
+	// Variable name, for example `GH_TOKEN`. Absent when no classic token is present in the
+	// environment.
+	Name *string `json:"name,omitempty"`
+}
+
+// A path to resolve against the GitHub host an identity is signed in to.
+// Experimental: AccountGetWebURLRequest is part of an experimental API and may change or be
+// removed.
+// Internal: AccountGetWebURLRequest is an internal SDK API and is not part of the public
+// surface.
+type AccountGetWebURLRequest struct {
+	// Identity whose host the path resolves against. Omit to resolve against the public
+	// github.com host.
+	Identity *AuthIdentity `json:"identity,omitempty"`
+	// Host-relative path, without a leading slash, for example `settings/copilot/features`.
+	Path string `json:"path"`
+}
+
+// An absolute URL on the identity's GitHub host.
+// Experimental: AccountGetWebURLResult is part of an experimental API and may change or be
+// removed.
+// Internal: AccountGetWebURLResult is an internal SDK API and is not part of the public
+// surface.
+type AccountGetWebURLResult struct {
+	// Absolute URL for the requested path.
+	URL string `json:"url"`
+}
+
 // 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
@@ -167,6 +247,9 @@ type AccountsSetRequest struct {
 type AccountStatus struct {
 	// Whether this is the active account.
 	Active bool `json:"active"`
+	// Human-readable credential source used to authenticate this account, such as `gh` or
+	// `GITHUB_TOKEN`.
+	AuthSource *string `json:"authSource,omitempty"`
 	// Opaque id of the account this one was derived from (e.g. an EMU account's base Entra
 	// identity); absent for a root account. Matches the base identity account's selectionId,
 	// forming the derivation edge.
@@ -223,6 +306,8 @@ type AgentInfo struct {
 	DisableModelInvocation *bool `json:"disableModelInvocation,omitempty"`
 	// Human-readable display name
 	DisplayName string `json:"displayName"`
+	// Declarative hook actions keyed by event name, executed only while this agent is active.
+	Hooks map[string][]any `json:"hooks,omitzero"`
 	// 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.
@@ -468,10 +553,46 @@ type AgentReloadResult struct {
 	Agents []AgentInfo `json:"agents"`
 }
 
+// The models a custom agent asks for, and the models actually available.
+// Experimental: AgentsCustomAgentInitialModelDecisionParams is part of an experimental API
+// and may change or be removed.
+// Internal: AgentsCustomAgentInitialModelDecisionParams is an internal SDK API and is not
+// part of the public surface.
+type AgentsCustomAgentInitialModelDecisionParams struct {
+	// The agent's declared `model:` entry, serialized. A single name or an ordered list of
+	// acceptable names.
+	AgentModelsJSON string `json:"agentModelsJson"`
+	// The models available to this session, serialized in the shape the model list carries.
+	AvailableModelsJSON string `json:"availableModelsJson"`
+}
+
+// The model to switch to, and the warning to show when the agent's preference could not be
+// met.
+// Experimental: AgentsCustomAgentInitialModelDecisionResult is part of an experimental API
+// and may change or be removed.
+// Internal: AgentsCustomAgentInitialModelDecisionResult is an internal SDK API and is not
+// part of the public surface.
+type AgentsCustomAgentInitialModelDecisionResult struct {
+	// The reasoning effort attached to the selected model preference. Absent when that
+	// preference does not specify an effort.
+	ReasoningEffort *string `json:"reasoningEffort,omitempty"`
+	// The first available model that matches the agent's preferences. Absent when none of the
+	// requested models is available.
+	TargetModel *string `json:"targetModel,omitempty"`
+	// What to tell the user about an unmet preference. Absent when the preference was met. A
+	// warning with no `targetModel` means the agent's models are all unavailable.
+	Warning *string `json:"warning,omitempty"`
+}
+
 // Optional project paths to include in agent discovery.
 // Experimental: AgentsDiscoverRequest is part of an experimental API and may change or be
 // removed.
 type AgentsDiscoverRequest struct {
+	// Explicit discovery-only agent roots, separate from customAgents and filesystem grants.
+	// Available without ambient discovery, subject to managed/source disables. Relative paths
+	// resolve against the request's effective working directory when supplied. Null and
+	// omission are equivalent; an empty array contributes no explicit roots.
+	AgentDirectories []string `json:"agentDirectories,omitzero"`
 	// 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.
 	ExcludeHostAgents *bool `json:"excludeHostAgents,omitempty"`
@@ -506,10 +627,110 @@ type AgentSetPromptRequest struct {
 	Prompt string `json:"prompt"`
 }
 
+// The feature flags to evaluate shipped agents against.
+// Experimental: AgentsGetAvailableBuiltinsRequest is part of an experimental API and may
+// change or be removed.
+// Internal: AgentsGetAvailableBuiltinsRequest is an internal SDK API and is not part of the
+// public surface.
+type AgentsGetAvailableBuiltinsRequest struct {
+	// The surface asking, which gates agents that only apply to one client. Omit or pass null
+	// to apply no client filter.
+	Context *string `json:"context,omitempty"`
+	// Feature flag values keyed by name, evaluated with the runtime's truthiness rules. Omit or
+	// pass null for no flags.
+	FeatureFlags map[string]any `json:"featureFlags,omitzero"`
+	// Flag overrides keyed by name. A null entry uses the corresponding base flag; false
+	// explicitly disables it. Omit or pass null for no overrides.
+	Overrides map[string]any `json:"overrides,omitzero"`
+}
+
+// The shipped agents available under the requested flags.
+// Experimental: AgentsGetAvailableBuiltinsResult is part of an experimental API and may
+// change or be removed.
+// Internal: AgentsGetAvailableBuiltinsResult is an internal SDK API and is not part of the
+// public surface.
+type AgentsGetAvailableBuiltinsResult struct {
+	// Available shipped agents, in the runtime's own order.
+	// Internal: Agents is part of the SDK's internal API surface and is not intended for
+	// external use.
+	Agents []BuiltinAgentSummary `json:"agents"`
+}
+
+// The shipped agent whose definition to load.
+// Experimental: AgentsGetBuiltinDefinitionRequest is part of an experimental API and may
+// change or be removed.
+// Internal: AgentsGetBuiltinDefinitionRequest is an internal SDK API and is not part of the
+// public surface.
+type AgentsGetBuiltinDefinitionRequest struct {
+	// The agent name, which must be one of `getBuiltins`'s `yamlBasedNames`. A name outside
+	// that list is special-cased in code and has no definition, and is reported as an error
+	// rather than as an empty definition.
+	Name string `json:"name"`
+}
+
+// One shipped agent's definition.
+// Experimental: AgentsGetBuiltinDefinitionResult is part of an experimental API and may
+// change or be removed.
+// Internal: AgentsGetBuiltinDefinitionResult is an internal SDK API and is not part of the
+// public surface.
+type AgentsGetBuiltinDefinitionResult struct {
+	// The agent's definition, serialized as JSON. It carries the authored keys plus the
+	// runtime's projected `__nativeCustomAgent` view of the same agent. It is a string rather
+	// than an object because the runtime parses it with the agent schema's tolerant shape,
+	// which accepts keys this contract does not name.
+	DefinitionJSON string `json:"definitionJson"`
+}
+
+// The shipped agent whose listing entry to load.
+// Experimental: AgentsGetBuiltinListingDefinitionRequest is part of an experimental API and
+// may change or be removed.
+// Internal: AgentsGetBuiltinListingDefinitionRequest is an internal SDK API and is not part
+// of the public surface.
+type AgentsGetBuiltinListingDefinitionRequest struct {
+	// The agent name, taken from `getAvailableBuiltins`. Unlike `getBuiltinDefinition`, the
+	// agent that `getBuiltins` reports as special-cased rather than YAML-based is answered here
+	// too, from its in-code definition.
+	Name string `json:"name"`
+}
+
+// One shipped agent, projected for a listing.
+// Experimental: AgentsGetBuiltinListingDefinitionResult is part of an experimental API and
+// may change or be removed.
+// Internal: AgentsGetBuiltinListingDefinitionResult is an internal SDK API and is not part
+// of the public surface.
+type AgentsGetBuiltinListingDefinitionResult struct {
+	// The agent projected as a custom agent, serialized as JSON. It is a string rather than an
+	// object for the same reason as `getBuiltinDefinition`: the runtime parses the underlying
+	// definition with the agent schema's tolerant shape, which accepts keys this contract does
+	// not name.
+	DefinitionJSON string `json:"definitionJson"`
+}
+
+// The agents this runtime ships, named so a consumer can tell them apart from authored ones.
+// Experimental: AgentsGetBuiltinsResult is part of an experimental API and may change or be
+// removed.
+// Internal: AgentsGetBuiltinsResult is an internal SDK API and is not part of the public
+// surface.
+type AgentsGetBuiltinsResult struct {
+	// The subset of `names` a user is allowed to turn off. A shipped agent outside this list is
+	// always active and a client should not offer a toggle for it.
+	DisableableNames []string `json:"disableableNames"`
+	// Every agent name this runtime ships.
+	Names []string `json:"names"`
+	// The subset of `names` defined by a shipped YAML definition. The remainder are
+	// special-cased in code and have no definition to load.
+	YamlBasedNames []string `json:"yamlBasedNames"`
+}
+
 // Optional project paths to include when enumerating agent discovery directories.
 // Experimental: AgentsGetDiscoveryPathsRequest is part of an experimental API and may
 // change or be removed.
 type AgentsGetDiscoveryPathsRequest struct {
+	// Explicit discovery-only agent roots to enumerate, including configured missing
+	// directories. Relative paths resolve against the request's effective working directory
+	// when supplied. These are not filesystem grants or preferred creation targets. Null and
+	// omission are equivalent.
+	AgentDirectories []string `json:"agentDirectories,omitzero"`
 	// When true, omit the host's user-level agent directory, leaving only project directories.
 	// For multitenant deployments (mirrors `discover`'s `excludeHostAgents`).
 	ExcludeHostAgents *bool `json:"excludeHostAgents,omitempty"`
@@ -1034,6 +1255,21 @@ func (r RawAuthInfoData) Type() AuthInfoType {
 	return r.Discriminator
 }
 
+// An interactive account whose model provider owns its credentials. It carries no GitHub
+// credential.
+// Experimental: AccountAuthInfo is part of an experimental API and may change or be removed.
+type AccountAuthInfo struct {
+	// Host coordinate owned by the account's model provider.
+	Host string `json:"host"`
+	// Login identifying the provider-owned account.
+	Login string `json:"login"`
+}
+
+func (AccountAuthInfo) authInfo() {}
+func (AccountAuthInfo) Type() AuthInfoType {
+	return AuthInfoTypeAccount
+}
+
 // 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.
@@ -1193,6 +1429,20 @@ func (UserAuthInfo) Type() AuthInfoType {
 	return AuthInfoTypeUser
 }
 
+// A credential-free account choice after sign-in.
+// Experimental: AuthLoginAccount is part of an experimental API and may change or be
+// removed.
+type AuthLoginAccount struct {
+	// Host coordinate owned by the selected account's provider.
+	Host string `json:"host"`
+	// Provider kind that owns this account choice.
+	Kind AccountKind `json:"kind"`
+	// Human-readable login for the account choice.
+	Login string `json:"login"`
+	// Opaque identifier supplied to the next login step to select this account.
+	SelectionID string `json:"selectionId"`
+}
+
 // Advance an in-flight login flow, optionally fulfilling an input-required step.
 // Experimental: AuthLoginAdvanceRequest is part of an experimental API and may change or be
 // removed.
@@ -1229,15 +1479,18 @@ type AuthLoginCancelRequest struct {
 	FlowID string `json:"flowId"`
 }
 
-// Terminal result of an interactive login flow.
+// Result of an interactive login flow. Pending consent or account selection is not terminal.
 // Experimental: AuthLoginResultDto is part of an experimental API and may change or be
 // removed.
 type AuthLoginResultDto struct {
+	// Available accounts when sign-in is awaiting account selection, ordered with Microsoft 365
+	// first.
+	Accounts []AuthLoginAccount `json:"accounts,omitzero"`
 	// Host that was signed in, when completed.
 	Host *string `json:"host,omitempty"`
 	// Login that was signed in, when completed.
 	Login *string `json:"login,omitempty"`
-	// Terminal disposition of the login.
+	// Current disposition of the login, including pending user decisions.
 	Status AuthLoginResultStatus `json:"status"`
 }
 
@@ -1271,7 +1524,8 @@ func (AuthLoginStepAwaiting) Kind() AuthLoginStepKind {
 }
 
 type AuthLoginStepCompleted struct {
-	// The terminal login result.
+	// Login result. When status is needs-plaintext-consent or needs-account-selection, advance
+	// with the user's decision to continue.
 	Result AuthLoginResultDto `json:"result"`
 }
 
@@ -1380,6 +1634,9 @@ func (r RawAuthReadValueData) Kind() AuthReadValueKind {
 type AuthReadValueActiveAccount struct {
 	// The active account, or absent when not logged in.
 	Account *AccountStatus `json:"account,omitempty"`
+	// Credential-free identity metadata for the active account, including resolved Copilot user
+	// information when available.
+	AuthInfo *AuthIdentity `json:"authInfo,omitempty"`
 }
 
 func (AuthReadValueActiveAccount) authReadValue() {}
@@ -1540,6 +1797,57 @@ type AutopilotObjectiveState struct {
 	TurnCount int64 `json:"turnCount"`
 }
 
+// A server-advertised routing preference. Identifiers and execution types are extensible.
+// Experimental: AutoTierDescriptor is part of an experimental API and may change or be
+// removed.
+type AutoTierDescriptor struct {
+	// Description displayed beside the preference.
+	Description string `json:"description"`
+	// Human-readable label, not a routing identifier.
+	DisplayName string `json:"displayName"`
+	// Opaque routing identifier transmitted unchanged to the provider.
+	ID string `json:"id"`
+	// Current account-specific availability.
+	Status AutoTierStatus `json:"status"`
+	// Execution kind; this client supports `auto` preferences on the Auto model.
+	Type string `json:"type"`
+}
+
+// Account-bound discovery metadata for the virtual `auto` model.
+// Experimental: AutoTierMetadata is part of an experimental API and may change or be
+// removed.
+type AutoTierMetadata struct {
+	// Provider-default preference, used only when no explicit preference exists.
+	DefaultTier string `json:"defaultTier"`
+	// Provider that supplied this metadata, when the catalog is provider-attributed.
+	ProviderID *string `json:"providerId,omitempty"`
+	// Routing preferences in the server's presentation order.
+	Tiers []AutoTierDescriptor `json:"tiers"`
+}
+
+// Availability of a server-advertised routing preference.
+// Experimental: AutoTierStatus is part of an experimental API and may change or be removed.
+type AutoTierStatus struct {
+	// Whether the provider permits selecting this preference.
+	Enabled bool `json:"enabled"`
+	// Human-readable explanation of availability.
+	Message *string `json:"message,omitempty"`
+	// Extensible machine-readable unavailability reason.
+	Reason *string `json:"reason,omitempty"`
+}
+
+// A shipped agent, named and described.
+// Experimental: BuiltinAgentSummary is part of an experimental API and may change or be
+// removed.
+// Internal: BuiltinAgentSummary is an internal SDK API and is not part of the public
+// surface.
+type BuiltinAgentSummary struct {
+	// One-line description of what the agent does.
+	Description string `json:"description"`
+	// The agent name, as it appears in `getBuiltins`.
+	Name string `json:"name"`
+}
+
 // 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
@@ -3237,6 +3545,94 @@ type ConnectorDisconnectResult struct {
 	Status ConnectorStatus `json:"status"`
 }
 
+// Eligible account.
+// Experimental: ConnectorDiscoveryAccount is part of an experimental API and may change or
+// be removed.
+type ConnectorDiscoveryAccount struct {
+	// Opaque account ID.
+	AccountID string `json:"accountId"`
+	// Account metadata.
+	AuthInfo ConnectorDiscoveryAuthInfo `json:"authInfo"`
+}
+
+// Eligible accounts.
+// Experimental: ConnectorDiscoveryAccountList is part of an experimental API and may change
+// or be removed.
+type ConnectorDiscoveryAccountList struct {
+	// Eligible accounts.
+	Accounts []ConnectorDiscoveryAccount `json:"accounts"`
+	// Availability.
+	Availability ConnectorDiscoveryAvailability `json:"availability"`
+}
+
+// Selected account.
+// Experimental: ConnectorDiscoveryAccountRequest is part of an experimental API and may
+// change or be removed.
+type ConnectorDiscoveryAccountRequest struct {
+	// Opaque account ID.
+	AccountID string `json:"accountId"`
+}
+
+// Account metadata.
+// Experimental: ConnectorDiscoveryAuthInfo is part of an experimental API and may change or
+// be removed.
+type ConnectorDiscoveryAuthInfo struct {
+	// Host.
+	Host string `json:"host"`
+	// Login.
+	Login string `json:"login"`
+	// Authentication type.
+	Type AuthInfoType `json:"type"`
+}
+
+// Feature availability.
+// Experimental: ConnectorDiscoveryCapabilities is part of an experimental API and may
+// change or be removed.
+type ConnectorDiscoveryCapabilities struct {
+	// API version.
+	APIVersion int64 `json:"apiVersion"`
+	// Availability.
+	Availability ConnectorDiscoveryAvailability `json:"availability"`
+	// Whether results are cached.
+	ConditionalCache bool `json:"conditionalCache"`
+	// Whether accounts are selected by opaque ID.
+	OpaqueAccountSelection bool `json:"opaqueAccountSelection"`
+}
+
+// Entry.
+// Experimental: ConnectorDiscoveryCatalogEntry is part of an experimental API and may
+// change or be removed.
+type ConnectorDiscoveryCatalogEntry struct {
+	// Description.
+	Description *string `json:"description,omitempty"`
+	// Display name.
+	DisplayName string `json:"displayName"`
+	// Logo.
+	Logo *string `json:"logo,omitempty"`
+	// Name.
+	Name string `json:"name"`
+	// Release tag.
+	ReleaseTag *string `json:"releaseTag,omitempty"`
+	// Status.
+	Status ConnectorCatalogStatus `json:"status"`
+	// Tier.
+	Tier *string `json:"tier,omitempty"`
+}
+
+// Entries for the selected account.
+// Experimental: ConnectorDiscoveryCatalogResult is part of an experimental API and may
+// change or be removed.
+type ConnectorDiscoveryCatalogResult struct {
+	// Opaque account ID.
+	AccountID string `json:"accountId"`
+	// Entries.
+	Connectors []ConnectorDiscoveryCatalogEntry `json:"connectors"`
+	// Refresh time in Unix epoch milliseconds.
+	RefreshedAtMs int64 `json:"refreshedAtMs"`
+	// Revision.
+	Revision int64 `json:"revision"`
+}
+
 // Requests authoritative Connector-to-MCP reconciliation for the pinned account.
 // Experimental: ConnectorReconcileRequest is part of an experimental API and may change or
 // be removed.
@@ -3634,6 +4030,11 @@ type CurrentModel struct {
 	// no plan override has captured a base model. Persistent agent model requirements apply to
 	// this model rather than the temporary plan model.
 	PlanBaseModelID *string `json:"planBaseModelId,omitempty"`
+	// Provider of planBaseModelId, when that saved selection is provider-qualified.
+	PlanBaseProviderID *string `json:"planBaseProviderId,omitempty"`
+	// Provider selected for this model. Together with modelId, identifies a catalog entry even
+	// when providers serve the same model. Omitted for unattributed legacy selections.
+	ProviderID *string `json:"providerId,omitempty"`
 	// 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.
@@ -4645,6 +5046,126 @@ type ExternalToolTextResultForLlmContentResourceLinkIcon struct {
 	Theme *ExternalToolTextResultForLlmContentResourceLinkIconTheme `json:"theme,omitempty"`
 }
 
+// The declared shape of one feature flag, independent of any caller population.
+// Experimental: FeatureFlagMetadata is part of an experimental API and may change or be
+// removed.
+// Internal: FeatureFlagMetadata is an internal SDK API and is not part of the public
+// surface.
+type FeatureFlagMetadata struct {
+	// The population the flag is declared for before any environment or user-settings override
+	// is applied.
+	// Internal: Availability is part of the SDK's internal API surface and is not intended for
+	// external use.
+	Availability FeatureFlagAvailability `json:"availability"`
+	// Whether the flag participates in the CAPI sanity suite.
+	CapiSanity bool `json:"capiSanity"`
+	// Text shown to a user choosing whether to turn the flag on in experimental mode. Absent
+	// when the flag is not user-facing.
+	ExperimentalDescription *string `json:"experimentalDescription,omitempty"`
+	// The online-experiment (ExP) flag this maps to, when the flag is assigned by an experiment
+	// rather than declared statically.
+	ExpFlag *string `json:"expFlag,omitempty"`
+	// Environment variable that overrides this flag's experiment assignment locally in the
+	// experiment service, not in `featureFlags.resolve`. Present exactly when `expFlag` is, and
+	// derived from it, so a caller reads a local override without reproducing the naming rule.
+	ExpFlagEnvVar *string `json:"expFlagEnvVar,omitempty"`
+	// The flag's name, matching the key it is listed under.
+	Name string `json:"name"`
+}
+
+// Every feature flag this runtime declares, with the shape each one was declared with.
+// Experimental: FeatureFlagsMetadataResult is part of an experimental API and may change or
+// be removed.
+// Internal: FeatureFlagsMetadataResult is an internal SDK API and is not part of the public
+// surface.
+type FeatureFlagsMetadataResult struct {
+	// Declared feature flags keyed by flag name.
+	// Internal: Flags is part of the SDK's internal API surface and is not intended for
+	// external use.
+	Flags map[string]FeatureFlagMetadata `json:"flags"`
+}
+
+// Caller population and overrides for static feature-flag resolution, independent of
+// experiment assignments and active runtime state.
+// Experimental: FeatureFlagsResolveRequest is part of an experimental API and may change or
+// be removed.
+// Internal: FeatureFlagsResolveRequest is an internal SDK API and is not part of the public
+// surface.
+type FeatureFlagsResolveRequest struct {
+	// Resolve against this already-computed flag set rather than each flag's declared
+	// availability. Keyed by flag name.
+	BaseFlags map[string]bool `json:"baseFlags,omitzero"`
+	// User settings to apply, including `enabledFeatureFlags`, legacy `feature_flags.enabled`,
+	// and supported convenience settings.
+	Config any `json:"config,omitempty"`
+	// Environment for direct feature-flag overrides and `COPILOT_CLI_ENABLED_FEATURE_FLAGS`.
+	// Does not apply `COPILOT_EXP_*` experiment assignments. Defaults to this runtime process's
+	// own environment.
+	Environment map[string]string `json:"environment,omitzero"`
+	// Flags forced to a value after every other layer, keyed by flag name.
+	FlagOverrides map[string]bool `json:"flagOverrides,omitzero"`
+	// Whether the caller is in an experimental population.
+	IsExperimental bool `json:"isExperimental"`
+	// Whether the caller is GitHub or Microsoft staff.
+	IsStaff bool `json:"isStaff"`
+	// GitHub-staff membership. Omit when it was never recorded: a legacy staff account then
+	// counts as both staff populations and keeps every staff feature.
+	IsStaffGitHub *bool `json:"isStaffGithub,omitempty"`
+	// Microsoft-staff membership. Omitted the same way as `isStaffGitHub`.
+	IsStaffMicrosoft *bool `json:"isStaffMicrosoft,omitempty"`
+	// Whether the caller belongs to the team population used by feature availability.
+	IsTeam bool `json:"isTeam"`
+}
+
+// The resolved feature flags, keyed by flag name.
+// Experimental: FeatureFlagsResolveResult is part of an experimental API and may change or
+// be removed.
+type FeatureFlagsResolveResult map[string]bool
+
+// Caller population and startup inputs to resolve named online-experiment gates for.
+// Carries no account: the runtime resolves the assignment for the authentication it already
+// holds.
+// Experimental: FeatureFlagsResolveStartupGatesRequest is part of an experimental API and
+// may change or be removed.
+// Internal: FeatureFlagsResolveStartupGatesRequest is an internal SDK API and is not part
+// of the public surface.
+type FeatureFlagsResolveStartupGatesRequest struct {
+	// User settings document whose `featureFlags` block is layered on top of the resolved set.
+	Config any `json:"config,omitempty"`
+	// Environment to read flag overrides from. Defaults to this runtime process's own
+	// environment.
+	Environment map[string]string `json:"environment,omitzero"`
+	// When this installation first launched, in milliseconds since the Unix epoch. Experiments
+	// that segment on installation age read it. Omit when the first launch was never recorded.
+	FirstLaunchAtMillis *float64 `json:"firstLaunchAtMillis,omitempty"`
+	// The feature flags to resolve. A name this runtime does not declare is reported as an
+	// error rather than as a disabled flag.
+	Flags []string `json:"flags"`
+	// Whether the caller is in an experimental population.
+	IsExperimental bool `json:"isExperimental"`
+	// Whether the caller is GitHub or Microsoft staff.
+	IsStaff bool `json:"isStaff"`
+	// GitHub-staff membership. Omit when it was never recorded: a legacy staff account then
+	// counts as both staff populations and keeps every staff feature.
+	IsStaffGitHub *bool `json:"isStaffGithub,omitempty"`
+	// Microsoft-staff membership. Omitted the same way as `isStaffGitHub`.
+	IsStaffMicrosoft *bool `json:"isStaffMicrosoft,omitempty"`
+	// Whether the caller belongs to a team plan.
+	IsTeam bool `json:"isTeam"`
+	// Whether the runtime may refresh the cached assignment over the network without an active
+	// session. The refresh never blocks this call: the answer comes from the cache either way,
+	// so a refresh only affects a later launch.
+	RefreshWithoutSession bool `json:"refreshWithoutSession"`
+	// Whether streamer mode is on, which withholds the populations an experiment would
+	// otherwise segment on.
+	StreamerMode bool `json:"streamerMode"`
+}
+
+// The resolved gates, keyed by flag name.
+// Experimental: FeatureFlagsResolveStartupGatesResult is part of an experimental API and
+// may change or be removed.
+type FeatureFlagsResolveStartupGatesResult map[string]bool
+
 // Content filtering mode to apply to all tools, or a map of tool name to content filtering
 // mode.
 // Experimental: FilterMapping is part of an experimental API and may change or be removed.
@@ -4710,6 +5231,79 @@ type FolderTrustCheckResult struct {
 	Trusted bool `json:"trusted"`
 }
 
+// A folder to check against a persisted trusted-folders list, and the configuration
+// directory holding that list.
+// Experimental: FolderTrustIsTrustedParams is part of an experimental API and may change or
+// be removed.
+// Internal: FolderTrustIsTrustedParams is an internal SDK API and is not part of the public
+// surface.
+type FolderTrustIsTrustedParams struct {
+	// Configuration directory to read the trusted-folders list from. Omit it to read the
+	// default location; supply it when the host has redirected its configuration, or the check
+	// answers from a list the host is not using.
+	ConfigDir *string `json:"configDir,omitempty"`
+	// Folder to check. A folder counts as trusted when it is itself listed, when an ancestor is
+	// listed, or when its git root is listed.
+	Path string `json:"path"`
+}
+
+// The verdict of the `forceLoginOrgs` enterprise sign-in pin for one credential. A managed
+// device may pin Copilot to an approved set of GitHub organizations so a developer cannot
+// sign in with a personal — or another enterprise's — account and escape every control that
+// keys off the signed-in identity. A host must refuse to proceed when `allowed` is false;
+// the remaining fields explain the refusal rather than qualifying it.
+// Experimental: ForceLoginOrgsDecision is part of an experimental API and may change or be
+// removed.
+// Internal: ForceLoginOrgsDecision is an internal SDK API and is not part of the public
+// surface.
+type ForceLoginOrgsDecision struct {
+	// Whether the client may proceed. True whenever no pin is in force, so an unmanaged host is
+	// never blocked.
+	Allowed bool `json:"allowed"`
+	// A stable kebab-case reason code when refused: `org-not-approved`,
+	// `unverifiable-credential`, `policy-undetermined`, `policy-invalid`, `not-signed-in`, or
+	// `membership-unknown`. Omitted when allowed. Treat an unrecognized code as a refusal
+	// rather than mapping it to an allow: a code this host has not been taught about still
+	// denied the credential.
+	Denial *string `json:"denial,omitempty"`
+	// Whether a pin applies at all. Distinguishes "allowed because unmanaged" from "allowed
+	// because the account is approved", which a diagnostics surface needs and which also
+	// decides whether a bring-your-own-key provider may serve inference.
+	Enforced bool `json:"enforced"`
+	// The approved organization the account matched, when allowed under a pin.
+	MatchedOrg *string `json:"matchedOrg,omitempty"`
+	// A developer-facing explanation of the refusal. Omitted when allowed.
+	Message *string `json:"message,omitempty"`
+	// Error-level detail from managed-policy discovery — which file failed to load, which field
+	// failed validation. Carried on the decision rather than left to the log because a refusal
+	// can exit the process before a log sink exists, which would discard the only actionable
+	// diagnostic a misconfigured managed device produces.
+	PolicyDiagnostics []string `json:"policyDiagnostics"`
+	// The approved organization logins, as configured. Enterprise configuration rather than
+	// user data, so it is safe to name in a message or a log line.
+	RequiredOrgs []string `json:"requiredOrgs"`
+}
+
+// The remote the checked-out branch tracks.
+// Experimental: GitCurrentBranchRemoteResult is part of an experimental API and may change
+// or be removed.
+// Internal: GitCurrentBranchRemoteResult is an internal SDK API and is not part of the
+// public surface.
+type GitCurrentBranchRemoteResult struct {
+	// Name of the tracked remote. Reports `origin` whenever the working tree has no tracking
+	// configuration to read, including on a detached HEAD, so this is never null and never
+	// empty.
+	Remote string `json:"remote"`
+}
+
+// Working-tree path a git query applies to.
+// Experimental: GitCwdRequest is part of an experimental API and may change or be removed.
+// Internal: GitCwdRequest is an internal SDK API and is not part of the public surface.
+type GitCwdRequest struct {
+	// Absolute path to a directory inside the git working tree to query.
+	Cwd string `json:"cwd"`
+}
+
 // Safe discovery information. Host-side relay bootstrap credentials are never included.
 // Experimental: GitHubEnvironment is part of an experimental API and may change or be
 // removed.
@@ -4736,6 +5330,93 @@ type GitHubEnvironment struct {
 	Status string `json:"status"`
 }
 
+// A GitHub login the authenticated user may act as: their own account, or an organization
+// they belong to.
+// Experimental: GitHubOwnerOption is part of an experimental API and may change or be
+// removed.
+// Internal: GitHubOwnerOption is an internal SDK API and is not part of the public surface.
+type GitHubOwnerOption struct {
+	// The owner's GitHub login.
+	Login string `json:"login"`
+	// Which kind of owner this is. The authenticated user's own account is always reported as
+	// `user`.
+	Type string `json:"type"`
+}
+
+// The owner listing to abandon.
+// Experimental: GitHubOwnersCancelRequest is part of an experimental API and may change or
+// be removed.
+// Internal: GitHubOwnersCancelRequest is an internal SDK API and is not part of the public
+// surface.
+type GitHubOwnersCancelRequest struct {
+	// Request id the listing was started with.
+	RequestID int64 `json:"requestId"`
+}
+
+// Whether the id named a running owner listing.
+// Experimental: GitHubOwnersCancelResult is part of an experimental API and may change or
+// be removed.
+// Internal: GitHubOwnersCancelResult is an internal SDK API and is not part of the public
+// surface.
+type GitHubOwnersCancelResult struct {
+	// True when a listing with the id was running and the cancel stopped it. False when the id
+	// was never registered, was registered but unused, was released after being abandoned, or
+	// its listing had ended. An unused id is released and cannot start a later listing.
+	Canceled bool `json:"canceled"`
+}
+
+// Credential to list owners under, and the request id that makes the listing cancellable.
+// Experimental: GitHubOwnersListRequest is part of an experimental API and may change or be
+// removed.
+// Internal: GitHubOwnersListRequest is an internal SDK API and is not part of the public
+// surface.
+type GitHubOwnersListRequest struct {
+	// The credential the listing runs under, carried opaquely because its shape is the host's
+	// own and the runtime only resolves a token and a GitHub host from it. No credential
+	// travels: this selects one the runtime already holds.
+	AuthInfo any `json:"authInfo"`
+	// Request id from `gitHubOwners.nextRequestId`. An id that was never registered, canceled
+	// before use, released after being abandoned, or already used is refused rather than
+	// silently running uncancellable.
+	RequestID int64 `json:"requestId"`
+}
+
+// Outcome of an owner listing. Exactly one of `owners` and `message` is present, except
+// that `throwError` reports a failure the caller is expected to raise rather than render.
+// Experimental: GitHubOwnersListResult is part of an experimental API and may change or be
+// removed.
+// Internal: GitHubOwnersListResult is an internal SDK API and is not part of the public
+// surface.
+type GitHubOwnersListResult struct {
+	// Why no owners could be listed, phrased for a user. Present when the listing failed in a
+	// way the caller should render rather than raise.
+	Message *string `json:"message,omitempty"`
+	// The owners, on success: the authenticated user first, then the organizations they belong
+	// to.
+	// Internal: Owners is part of the SDK's internal API surface and is not intended for
+	// external use.
+	Owners []GitHubOwnerOption `json:"owners,omitzero"`
+	// A malformed request or an unreadable credential, which the caller raises instead of
+	// rendering. Kept a field rather than a dispatch error so it stays distinct from `message`,
+	// which the caller renders.
+	ThrowError *string `json:"throwError,omitempty"`
+	// A line the caller should log. Present only alongside `message`, and only for failures
+	// worth recording.
+	Warning *string `json:"warning,omitempty"`
+}
+
+// A freshly registered request id. Registering it before the listing starts is what lets a
+// cancel that races the request still find the owner listing slot. The id serves one
+// listing only. Long-abandoned unused ids can be released by later allocations.
+// Experimental: GitHubOwnersRequestIDResult is part of an experimental API and may change
+// or be removed.
+// Internal: GitHubOwnersRequestIDResult is an internal SDK API and is not part of the
+// public surface.
+type GitHubOwnersRequestIDResult struct {
+	// Request id to pass to `gitHubOwners.list` and, to abandon it, `gitHubOwners.cancel`.
+	RequestID int64 `json:"requestId"`
+}
+
 // Pointer to a GitHub repository.
 // Experimental: GitHubRepoRef is part of an experimental API and may change or be removed.
 type GitHubRepoRef struct {
@@ -4747,6 +5428,39 @@ type GitHubRepoRef struct {
 	Owner string `json:"owner"`
 }
 
+// Working-tree path whose owning GitHub repository should be resolved.
+// Experimental: GitHubRepositoryAtPathRequest is part of an experimental API and may change
+// or be removed.
+// Internal: GitHubRepositoryAtPathRequest is an internal SDK API and is not part of the
+// public surface.
+type GitHubRepositoryAtPathRequest struct {
+	// Absolute path to a directory inside the git working tree to resolve.
+	Path string `json:"path"`
+}
+
+// The GitHub repository that owns the requested path, when the selected remote (`origin`,
+// else the first) is on a GitHub host.
+// Experimental: GitHubRepositoryAtPathResult is part of an experimental API and may change
+// or be removed.
+// Internal: GitHubRepositoryAtPathResult is an internal SDK API and is not part of the
+// public surface.
+type GitHubRepositoryAtPathResult struct {
+	// Resolved repository identity, or null when the selected remote resolves to no GitHub host.
+	Repository *GitHubRepositoryIdentity `json:"repository,omitempty"`
+}
+
+// Owner, name, and host of a GitHub repository, as resolved from a git remote URL.
+// Experimental: GitHubRepositoryIdentity is part of an experimental API and may change or
+// be removed.
+type GitHubRepositoryIdentity struct {
+	// Host the remote points at, for example `github.com` or a GitHub Enterprise hostname.
+	Host string `json:"host"`
+	// Repository name, without the owner prefix or the `.git` suffix.
+	Name string `json:"name"`
+	// Repository owner login (user or organization).
+	Owner string `json:"owner"`
+}
+
 // Client environment metadata describing the process that produced a telemetry event.
 // Experimental: GitHubTelemetryClientInfo is part of an experimental API and may change or
 // be removed.
@@ -4883,6 +5597,140 @@ func (GitHubTokenAcquireResultToken) Kind() GitHubTokenAcquireResultKind {
 	return GitHubTokenAcquireResultKindToken
 }
 
+// A GitHub repository one of a working tree's remotes points at.
+// Experimental: GitRemoteRepository is part of an experimental API and may change or be
+// removed.
+// Internal: GitRemoteRepository is an internal SDK API and is not part of the public
+// surface.
+type GitRemoteRepository struct {
+	// GitHub host serving the repository, which is not `github.com` for a GitHub Enterprise
+	// remote.
+	Host string `json:"host"`
+	// Repository name, without the owner.
+	Name string `json:"name"`
+	// Account or organization owning the repository.
+	Owner string `json:"owner"`
+	// Name of the first remote that produced this distinct repository entry, such as `origin`
+	// or `upstream`.
+	RemoteName string `json:"remoteName"`
+}
+
+// Git working tree whose GitHub remotes should be listed.
+// Experimental: GitReposFromRemotesRequest is part of an experimental API and may change or
+// be removed.
+// Internal: GitReposFromRemotesRequest is an internal SDK API and is not part of the public
+// surface.
+type GitReposFromRemotesRequest struct {
+	// Absolute path to the root of the git working tree.
+	GitRoot string `json:"gitRoot"`
+}
+
+// The GitHub repositories a working tree's remotes point at.
+// Experimental: GitReposFromRemotesResult is part of an experimental API and may change or
+// be removed.
+// Internal: GitReposFromRemotesResult is an internal SDK API and is not part of the public
+// surface.
+type GitReposFromRemotesResult struct {
+	// One entry per distinct GitHub repository, in the order git reports the first remote for
+	// each repository. Empty when no remote points at a GitHub host, which a caller should read
+	// as `not connected to GitHub`. Failing to read the remotes is an error, not an empty list.
+	// Internal: Repositories is part of the SDK's internal API surface and is not intended for
+	// external use.
+	Repositories []GitRemoteRepository `json:"repositories"`
+}
+
+// Selects the configuration directory whose machine-wide state to read.
+// Experimental: GlobalStateLoadForConfigDirRequest is part of an experimental API and may
+// change or be removed.
+// Internal: GlobalStateLoadForConfigDirRequest is an internal SDK API and is not part of
+// the public surface.
+type GlobalStateLoadForConfigDirRequest struct {
+	// Copilot configuration directory to read the state document from, taking precedence over
+	// the server's own `COPILOT_HOME` and default home. Omit it, or pass an empty string, to
+	// read the directory the server resolved for itself.
+	ConfigDir *string `json:"configDir,omitempty"`
+}
+
+// The host's machine-wide state. Every field is optional because a fresh install has
+// recorded nothing yet, so a reader must treat an absent field as `not yet`, never as a
+// negative answer. Stored credentials are deliberately absent from this shape.
+// Experimental: GlobalStateLoadResult is part of an experimental API and may change or be
+// removed.
+// Internal: GlobalStateLoadResult is an internal SDK API and is not part of the public
+// surface.
+type GlobalStateLoadResult struct {
+	// Whether the app tip has been shown.
+	AppTipShown *bool `json:"appTipShown,omitempty"`
+	// Terminals the user has already been asked to set up, so the host does not ask twice.
+	AskedSetupTerminals []string `json:"askedSetupTerminals,omitzero"`
+	// When the Auto-feedback hint was last shown, as an ISO 8601 timestamp. It enforces the
+	// once-per-day cap for non-staff users across restarts.
+	AutoFeedbackLastPromptedAt *string `json:"autoFeedbackLastPromptedAt,omitempty"`
+	// When the host first ran on this machine.
+	FirstLaunchAt *string `json:"firstLaunchAt,omitempty"`
+	// Plugins installed on this machine.
+	InstalledPlugins []InstalledPlugin `json:"installedPlugins,omitzero"`
+	// Account used for the most recent sign-in.
+	// Internal: LastLoggedInUser is part of the SDK's internal API surface and is not intended
+	// for external use.
+	LastLoggedInUser *LoggedInUser `json:"lastLoggedInUser,omitempty"`
+	// Every account the host has signed in to on this machine.
+	// Internal: LoggedInUsers is part of the SDK's internal API surface and is not intended for
+	// external use.
+	LoggedInUsers []LoggedInUser `json:"loggedInUsers,omitzero"`
+	// Whether the one-off cleanup of stored reasoning summaries has run.
+	ReasoningSummariesCleanupDone *bool `json:"reasoningSummariesCleanupDone,omitempty"`
+	// Models the user selected recently, most recent first.
+	RecentModelIDs []string `json:"recentModelIds,omitzero"`
+	// Whether the user declined to trust the sandbox credential proxy CA.
+	SandboxCredentialProxyCaDeclined *bool `json:"sandboxCredentialProxyCaDeclined,omitempty"`
+	// Whether the sandbox onboarding has been shown.
+	SandboxOnboardingShown *bool `json:"sandboxOnboardingShown,omitempty"`
+	// Whether the user is a GitHub or Microsoft staff member, which unlocks internal-only
+	// behavior.
+	Staff *bool `json:"staff,omitempty"`
+	// Whether the user was recognized as GitHub staff.
+	StaffGitHub *bool `json:"staffGithub,omitempty"`
+	// When the staff-only log level migration last ran.
+	StaffLogLevelMigrationAt *string `json:"staffLogLevelMigrationAt,omitempty"`
+	// Whether the user was recognized as Microsoft staff.
+	StaffMicrosoft *bool `json:"staffMicrosoft,omitempty"`
+	// When the staff-only model reset last ran.
+	StaffModelResetAt *string `json:"staffModelResetAt,omitempty"`
+	// When the staff-only update channel migration last ran.
+	StaffUpdateChannelMigrationAt *string `json:"staffUpdateChannelMigrationAt,omitempty"`
+	// Folders where the user declined the init prompt, so it stays hidden there.
+	SuppressInitFolders []string `json:"suppressInitFolders,omitzero"`
+	// Folders the user has marked as trusted.
+	TrustedFolders []string `json:"trustedFolders,omitzero"`
+}
+
+// A single top-level key to record in the host's machine-wide state. The write replaces
+// only that key and leaves the rest of the document untouched, so two writers recording
+// different one-off flags do not overwrite each other. The stored credential keys cannot be
+// written through this method.
+// Experimental: GlobalStateWriteKeyRequest is part of an experimental API and may change or
+// be removed.
+// Internal: GlobalStateWriteKeyRequest is an internal SDK API and is not part of the public
+// surface.
+type GlobalStateWriteKeyRequest struct {
+	// Copilot configuration directory to write the state document in, taking precedence over
+	// the server's own `COPILOT_HOME` and default home. Omit it, or pass an empty string, to
+	// write the directory the server resolved for itself. Mirrors
+	// `globalState.loadForConfigDir`, so a caller can read and write the same directory.
+	ConfigDir *string `json:"configDir,omitempty"`
+	// Top-level key to write, named as it appears in the result of `globalState.load`. It must
+	// be one of the writable keys that `globalState.writeKey` lists.
+	Key string `json:"key"`
+	// Value to store for the key. Omit it, or pass null, to remove the key instead.
+	Value any `json:"value,omitempty"`
+}
+
+// Experimental: GlobalStateWriteKeyResult is part of an experimental API and may change or
+// be removed.
+type GlobalStateWriteKeyResult struct {
+}
+
 // 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
@@ -5189,6 +6037,12 @@ type HooksDiscoverRequest struct {
 	// still contribute to each remaining row's effective enabled state. This filters sources
 	// rather than simulating a host with no settings.
 	ExcludeHostHooks *bool `json:"excludeHostHooks,omitempty"`
+	// Explicit discovery-only file-hook roots, separate from callback hooks and filesystem
+	// grants. Available without ambient discovery or repository file-hook enablement, subject
+	// to managed/hook disables. Relative paths resolve against the request's effective working
+	// directory when supplied. Null and omission are equivalent; an empty array contributes no
+	// explicit roots.
+	HookDirectories []string `json:"hookDirectories,omitzero"`
 	// Optional project directory paths whose trusted repository and project-expanded plugin
 	// hooks should be discovered. When omitted or empty, user, managed-policy, and globally
 	// enabled installed or explicit plugin hooks are returned without project expansion.
@@ -5325,6 +6179,28 @@ type HostGitHubEnvironmentOptions struct {
 	ComputeID string `json:"computeId"`
 	// Human-readable environment display name.
 	Name string `json:"name"`
+	// Require sealed, connection-bound authentication (default true), independent of listener
+	// address. False permits unsealed direct credentials and unbound sealed relay credentials;
+	// use only when the caller fully controls and trusts the direct transport. Relay token
+	// encryption remains mandatory.
+	RequireConnectionBinding *bool `json:"requireConnectionBinding,omitempty"`
+}
+
+// Reads a running host's catalog or the runtime's saved default catalog.
+// Experimental: HostListSessionsRequest is part of an experimental API and may change or be
+// removed.
+type HostListSessionsRequest struct {
+	// Listener UUID returned by host.start; the caller must own it. Omit to read
+	// the saved default compute-identity catalog without starting a listener.
+	HostID *string `json:"hostId,omitempty"`
+}
+
+// The complete live and dormant advertised catalog, without subscribing to sessions.
+// Experimental: HostListSessionsResult is part of an experimental API and may change or be
+// removed.
+type HostListSessionsResult struct {
+	// Complete advertised session summaries, in the host's catalog order.
+	Sessions []HostSessionSummary `json:"sessions"`
 }
 
 // Normalized local WebSocket listener settings.
@@ -5419,6 +6295,8 @@ type HostRegisterSessionRequest struct {
 }
 
 // The existing runtime identity and its resource on the listener.
+// Experimental: HostRegisterSessionResult is part of an experimental API and may change or
+// be removed.
 type HostRegisterSessionResult struct {
 	// Canonical runtime ID of the published session.
 	SessionID string `json:"sessionId"`
@@ -5454,6 +6332,9 @@ type HostSessionCreateRequest struct {
 	Config map[string]any `json:"config"`
 	// Unique identity for this participation, independent of the session lifetime.
 	HandoffID string `json:"handoffId"`
+	// For an explicit publication, borrow an existing owning-connection resident
+	// instead of invoking the resume factory. Cold sessions still use the factory.
+	PreferResident *bool `json:"preferResident,omitempty"`
 	// Resume an app-owned durable session instead of creating a new session.
 	Resume *bool `json:"resume,omitempty"`
 }
@@ -5489,6 +6370,25 @@ type HostSessionReleaseRequest struct {
 	HandoffID string `json:"handoffId"`
 }
 
+// Metadata advertised by the AHP host, not a guarantee that history can be resumed.
+// Experimental: HostSessionSummary is part of an experimental API and may change or be
+// removed.
+type HostSessionSummary struct {
+	// Optional activity description advertised by the host.
+	Activity *string `json:"activity,omitempty"`
+	// Session creation time as an ISO 8601 timestamp.
+	CreatedAt string `json:"createdAt"`
+	// Last modification time as an ISO 8601 timestamp.
+	ModifiedAt string `json:"modifiedAt"`
+	// Stable AHP resource URI identifying the session on this host.
+	Resource string `json:"resource"`
+	// Unsigned 32-bit AHP session status bitset (0..=4294967295); unknown bits must be
+	// preserved.
+	Status int64 `json:"status"`
+	// Authoritative title advertised by the host.
+	Title string `json:"title"`
+}
+
 // Empty acknowledgement for a completed host lifecycle operation.
 // Experimental: HostShutdownResult is part of an experimental API and may change or be
 // removed.
@@ -5499,6 +6399,9 @@ type HostShutdownResult struct {
 // Experimental: HostStartRequest is part of an experimental API and may change or be
 // removed.
 type HostStartRequest struct {
+	// Stable application identity selecting its durable host catalog. Defaults to the persisted
+	// runtime compute GUID; must agree with githubEnvironment.computeId when both are supplied.
+	ComputeID *string `json:"computeId,omitempty"`
 	// Registers a GitHub Mission Control environment and enables its relay transport.
 	GitHubEnvironment *HostGitHubEnvironmentOptions `json:"githubEnvironment,omitempty"`
 	// Caller-generated UUID identifying this connection-owned listener.
@@ -5783,6 +6686,37 @@ type InstructionDiscoveryPathList struct {
 	Paths []InstructionDiscoveryPath `json:"paths"`
 }
 
+// Experimental: InstructionsClearCacheResult is part of an experimental API and may change
+// or be removed.
+type InstructionsClearCacheResult struct {
+}
+
+// Explicit discovery arguments for one location, supplied by the caller rather than derived
+// from a session.
+// Experimental: InstructionsDiscoverRepoSourcesRequest is part of an experimental API and
+// may change or be removed.
+// Internal: InstructionsDiscoverRepoSourcesRequest is an internal SDK API and is not part
+// of the public surface.
+type InstructionsDiscoverRepoSourcesRequest struct {
+	// Extra directories to scan alongside instruction directories configured in the runtime
+	// environment.
+	AdditionalDirs []string `json:"additionalDirs,omitzero"`
+	// Copilot configuration directory for user-level sources. An omitted or empty value uses
+	// the server's configuration home.
+	ConfigDir *string `json:"configDir,omitempty"`
+	// Working directory whose instruction sources should also be included. Omission adds no
+	// separate working-directory scope.
+	CwdPath *string `json:"cwdPath,omitempty"`
+	// When true, also discover instruction files nested below the location.
+	EnableChildInstructions *bool `json:"enableChildInstructions,omitempty"`
+	// When true, include the sources a command-line host reads. Hosts that are not the CLI omit
+	// it.
+	IsCLI *bool `json:"isCli,omitempty"`
+	// Repository location to discover. An empty string selects no repository scope; cwdPath can
+	// still supply working-directory sources.
+	Location string `json:"location"`
+}
+
 // Optional project paths to include in instruction discovery.
 // Experimental: InstructionsDiscoverRequest is part of an experimental API and may change
 // or be removed.
@@ -5790,6 +6724,11 @@ type InstructionsDiscoverRequest struct {
 	// 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.
 	ExcludeHostInstructions *bool `json:"excludeHostInstructions,omitempty"`
+	// Explicit discovery-only instruction roots using existing SDK instruction formats, not
+	// filesystem grants. Available without ambient discovery, subject to instruction/managed
+	// disables. Relative paths resolve against the request's effective working directory when
+	// supplied. Null and omission are equivalent; an empty array contributes no explicit roots.
+	InstructionDirectories []string `json:"instructionDirectories,omitzero"`
 	// 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).
@@ -5803,6 +6742,11 @@ type InstructionsGetDiscoveryPathsRequest struct {
 	// When true, omit the host's user-level instruction targets, leaving only repository
 	// targets. For multitenant deployments (mirrors `discover`'s `excludeHostInstructions`).
 	ExcludeHostInstructions *bool `json:"excludeHostInstructions,omitempty"`
+	// Explicit discovery-only instruction roots to enumerate, including configured missing
+	// directories. Relative paths resolve against the request's effective working directory
+	// when supplied. These are not filesystem grants or preferred creation targets. Null and
+	// omission are equivalent.
+	InstructionDirectories []string `json:"instructionDirectories,omitzero"`
 	// Optional list of project directory paths. When omitted or empty, only the user-level
 	// targets are returned.
 	ProjectPaths []string `json:"projectPaths,omitzero"`
@@ -5816,6 +6760,16 @@ type InstructionsGetSourcesResult struct {
 	Sources []InstructionSource `json:"sources"`
 }
 
+// The prompt the init command runs.
+// Experimental: InstructionsInitPromptResult is part of an experimental API and may change
+// or be removed.
+// Internal: InstructionsInitPromptResult is an internal SDK API and is not part of the
+// public surface.
+type InstructionsInitPromptResult struct {
+	// Prompt text authoring repository instructions.
+	Prompt string `json:"prompt"`
+}
+
 // Loaded instruction source for a session, including path, content, category, location,
 // applicability, and optional description.
 // Experimental: InstructionSource is part of an experimental API and may change or be
@@ -6083,6 +7037,32 @@ type LocalSessionMetadataValue struct {
 	Summary *string `json:"summary,omitempty"`
 }
 
+// Which stored location permissions were dropped because their directory is gone.
+// Experimental: LocationPermissionsCleanupResult is part of an experimental API and may
+// change or be removed.
+// Internal: LocationPermissionsCleanupResult is an internal SDK API and is not part of the
+// public surface.
+type LocationPermissionsCleanupResult struct {
+	// Location keys whose grants were removed. Empty when every stored location still exists.
+	RemovedLocationKeys []string `json:"removedLocationKeys"`
+}
+
+// An account the host has signed in to, identified by the server it lives on and the login
+// it uses there. The same person can appear more than once when they use both github.com
+// and an Enterprise server.
+// Experimental: LoggedInUser is part of an experimental API and may change or be removed.
+// Internal: LoggedInUser is an internal SDK API and is not part of the public surface.
+type LoggedInUser struct {
+	// Source account this account was derived from, when one was recorded.
+	DerivedFrom *string `json:"derivedFrom,omitempty"`
+	// Host the account belongs to, such as `github.com` or an Enterprise server.
+	Host string `json:"host"`
+	// Account kind, when the host recorded one. Consumers must tolerate new strings.
+	Kind *string `json:"kind,omitempty"`
+	// Account login on that host.
+	Login string `json:"login"`
+}
+
 // Message text, optional severity level, persistence flag, optional follow-up URL, and
 // optional tip.
 // Experimental: LogRequest is part of an experimental API and may change or be removed.
@@ -6142,6 +7122,70 @@ type ManagedMCPServerConfig struct {
 	URL string `json:"url"`
 }
 
+// Experimental: ManagedPermissionEvaluation is part of an experimental API and may change
+// or be removed.
+type ManagedPermissionEvaluation struct {
+	// Original input operation associated with this verdict.
+	Operation ManagedPermissionOperation `json:"operation"`
+	// Managed-policy decision only; never bypasses user permissions or other security controls.
+	Verdict ManagedPermissionVerdict `json:"verdict"`
+}
+
+// Experimental: ManagedPermissionOperation is part of an experimental API and may change or
+// be removed.
+type ManagedPermissionOperation struct {
+	// Operation to evaluate. Currently only url is supported.
+	Kind ManagedPermissionOperationKind `json:"kind"`
+	// Absolute HTTP(S) URL with a host. Invalid URLs reject the entire evaluation batch.
+	URL string `json:"url"`
+}
+
+// Reusable managed permission evaluation context. Treat permissions as runtime-owned policy
+// data and retain it verbatim; it includes source-aware composition metadata. This is a
+// snapshot, not a capability or approval token; only use contexts obtained from trusted
+// policy sources.
+// Experimental: ManagedPermissionsContext is part of an experimental API and may change or
+// be removed.
+type ManagedPermissionsContext struct {
+	// Policy could not be determined; evaluation must deny every operation.
+	FailClosed bool `json:"failClosed"`
+	// Runtime-owned composed permissions object. Absent when no permission policy is configured.
+	Permissions any `json:"permissions,omitempty"`
+}
+
+// Managed policy context and ordered operations for pure, sessionless evaluation.
+// Experimental: ManagedPermissionsEvaluateRequest is part of an experimental API and may
+// change or be removed.
+type ManagedPermissionsEvaluateRequest struct {
+	// Trusted, reusable managed permission policy snapshot; no policy is discovered during
+	// evaluation.
+	Context ManagedPermissionsContext `json:"context"`
+	// Operations to evaluate, preserving input order and duplicates. An empty batch is valid.
+	Operations []ManagedPermissionOperation `json:"operations"`
+}
+
+// Ordered managed permission verdicts and the supplied policy's fail-closed posture.
+// Experimental: ManagedPermissionsEvaluateResult is part of an experimental API and may
+// change or be removed.
+type ManagedPermissionsEvaluateResult struct {
+	// Managed permission policy could not be determined; every operation is denied.
+	FailClosed bool `json:"failClosed"`
+	// One verdict per input operation, in the same order, including duplicates.
+	Results []ManagedPermissionEvaluation `json:"results"`
+}
+
+// Retry outcome for one plugin required by managed settings.
+// Experimental: ManagedPluginRetryEntry is part of an experimental API and may change or be
+// removed.
+type ManagedPluginRetryEntry struct {
+	// Why the plugin was not prepared. Present when `status` is `failed` or `deferred`.
+	Error *string `json:"error,omitempty"`
+	// Plugin spec in "plugin@marketplace" form.
+	Spec string `json:"spec"`
+	// What the retry did for this plugin.
+	Status ManagedPluginRetryStatus `json:"status"`
+}
+
 // Lock state and provenance of one managed setting.
 // Experimental: ManagedSettingMeta is part of an experimental API and may change or be
 // removed.
@@ -6149,12 +7193,40 @@ type ManagedSettingMeta struct {
 	// Whether users and repositories may choose a different value. `false` means policy locks
 	// the value.
 	Overridable bool `json:"overridable"`
+	// Original managed value when the runtime adjusted it to a supported effective value.
+	// Omitted when no adjustment was needed.
+	Requested *string `json:"requested,omitempty"`
 	// Channel that supplied this scalar value, matching a `layers[].source`: `device`,
 	// `server`, or `policyHelper`. These scalar defaults select one winning channel, not a
 	// mixed source. Treat unknown values as additional channels; more may be added.
 	Source string `json:"source"`
 }
 
+// A user settings document and the effective managed policy whose controlled entries should
+// be stamped onto it.
+// Experimental: ManagedSettingsApplyControlsParams is part of an experimental API and may
+// change or be removed.
+// Internal: ManagedSettingsApplyControlsParams is an internal SDK API and is not part of
+// the public surface.
+type ManagedSettingsApplyControlsParams struct {
+	// The effective managed policy, as composed by `managedSettings.resolveEffectiveValue`.
+	// Omit it on an unmanaged host: the settings then come back unchanged.
+	Managed any `json:"managed,omitempty"`
+	// The user settings document to stamp. Entries the managed layer does not name are returned
+	// exactly as supplied.
+	Settings any `json:"settings"`
+}
+
+// The user settings with the managed layer's controlled entries stamped on.
+// Experimental: ManagedSettingsApplyControlsResult is part of an experimental API and may
+// change or be removed.
+// Internal: ManagedSettingsApplyControlsResult is an internal SDK API and is not part of
+// the public surface.
+type ManagedSettingsApplyControlsResult struct {
+	// The resulting settings document.
+	SettingsJSON any `json:"settingsJson"`
+}
+
 // Experimental: ManagedSettingsClearCacheResult is part of an experimental API and may
 // change or be removed.
 type ManagedSettingsClearCacheResult struct {
@@ -6217,6 +7289,151 @@ type ManagedSettingsDiagnostic struct {
 	Severity ManagedSettingsDiagnosticSeverity `json:"severity"`
 }
 
+// Inputs describing the host and account an ingestion should resolve managed policy for.
+// Experimental: ManagedSettingsIngestParams is part of an experimental API and may change
+// or be removed.
+// Internal: ManagedSettingsIngestParams is an internal SDK API and is not part of the
+// public surface.
+type ManagedSettingsIngestParams struct {
+	// The authenticated identity to resolve policy for. Omitted before sign-in, in which case
+	// no server layer is fetched.
+	AuthInfo any `json:"authInfo,omitempty"`
+	// Whether to ignore a cached server policy when reading, forcing the resolution to come
+	// from a live fetch.
+	BypassCacheRead *bool `json:"bypassCacheRead,omitempty"`
+	// Name of the embedding client, reported to the managed-settings service as `client_id` so
+	// it can refuse to deliver a policy this client is too old to enforce. Omit it and the
+	// runtime reports a generic identity; the runtime version sent alongside is the gate that
+	// actually matters.
+	ClientName *string `json:"clientName,omitempty"`
+	// A device layer supplied by the host instead of discovered from the machine. Pair it with
+	// `hasDeviceResponse` so an explicit absence is distinguishable from an omitted override.
+	DeviceResponse any `json:"deviceResponse,omitempty"`
+	// The host's environment variables, read for cache location and policy overrides. Supplied
+	// by the host rather than read from the runtime process so a command that selected its own
+	// configuration home is honored.
+	Environment any `json:"environment"`
+	// Whether `deviceResponse` is an override at all. True with a null `deviceResponse` asserts
+	// the device layer is empty; false discovers it from the machine.
+	HasDeviceResponse *bool `json:"hasDeviceResponse,omitempty"`
+	// The host's home directory, used to resolve cache and managed-file locations.
+	HomeDirectory string `json:"homeDirectory"`
+	// The host's platform, in Node's `process.platform` spelling, used to locate
+	// platform-specific cache and policy paths.
+	Platform string `json:"platform"`
+	// Whether a configured platform policy helper may be run to produce an enforced helper
+	// layer.
+	PolicyHelperEnabled *bool `json:"policyHelperEnabled,omitempty"`
+	// The policy-helper invocation reason. Defaults to sessionStart.
+	// Internal: PolicyHelperReason is part of the SDK's internal API surface and is not
+	// intended for external use.
+	PolicyHelperReason *ManagedSettingsPolicyHelperReason `json:"policyHelperReason,omitempty"`
+	// Directory the policy helper runs in when this ingestion is not owned by a registered
+	// session. A host resolving policy before its session exists must pass this, or a
+	// directory-sensitive helper judges the wrong repository.
+	PolicyHelperWorkingDirectory *string `json:"policyHelperWorkingDirectory,omitempty"`
+	// Whether to run ingestion. Omit or set false to return an empty result without discovering
+	// or fetching policy.
+	SelfFetch *bool `json:"selfFetch,omitempty"`
+	// How this ingestion may use the on-disk server-policy cache. Defaults to the runtime's own
+	// policy when omitted.
+	// Internal: ServerPolicyCacheMode is part of the SDK's internal API surface and is not
+	// intended for external use.
+	ServerPolicyCacheMode *ManagedSettingsServerPolicyCacheMode `json:"serverPolicyCacheMode,omitempty"`
+	// The session whose credential store and working directory the policy helper should use.
+	// Omit it when no session exists yet and the process-wide store applies.
+	SessionID *string `json:"sessionId,omitempty"`
+	// User agent to send with the policy fetch.
+	UserAgent string `json:"userAgent"`
+}
+
+// The managed policy layers an ingestion resolved, together with the per-layer outcome
+// flags a host needs to decide how much to trust the result. The flags are reported rather
+// than folded into the settings because a host must be able to distinguish an unmanaged
+// device from a managed device whose policy could not be confirmed, and apply its
+// fail-closed gates in the second case.
+// Experimental: ManagedSettingsIngestResult is part of an experimental API and may change
+// or be removed.
+// Internal: ManagedSettingsIngestResult is an internal SDK API and is not part of the
+// public surface.
+type ManagedSettingsIngestResult struct {
+	// The device layer could not be read, so it is unconfirmed rather than known-absent.
+	DeviceLoadFailed bool `json:"deviceLoadFailed"`
+	// The device layer discovered from the machine, when one exists.
+	DeviceResponse any `json:"deviceResponse,omitempty"`
+	// The sandbox floor contributed by the device layer.
+	DeviceSandboxFloor any `json:"deviceSandboxFloor,omitempty"`
+	// Whether the device layer's sandbox intent could not be determined, so a consumer must not
+	// read its absence as permission to run unsandboxed.
+	DeviceSandboxUndetermined bool `json:"deviceSandboxUndetermined"`
+	// A device-managed policy is known to exist.
+	DeviceSourceFound bool `json:"deviceSourceFound"`
+	// Diagnostics emitted while resolving the layers, in the order they occurred.
+	// Internal: LogMessages is part of the SDK's internal API surface and is not intended for
+	// external use.
+	LogMessages []ManagedSettingsLogMessage `json:"logMessages"`
+	// The effective managed permissions layer, when the resolved policy carries one.
+	Permissions any `json:"permissions,omitempty"`
+	// Which channel registered the policy helper that produced the helper layer.
+	// Internal: PolicyHelperAuthority is part of the SDK's internal API surface and is not
+	// intended for external use.
+	PolicyHelperAuthority *ManagedSettingsPolicyHelperAuthority `json:"policyHelperAuthority,omitempty"`
+	// A policy helper is configured for this host.
+	PolicyHelperConfigured bool `json:"policyHelperConfigured"`
+	// The policy helper's failure must be treated as fail-closed rather than ignored.
+	PolicyHelperFailClosed bool `json:"policyHelperFailClosed"`
+	// The policy helper was configured but could not be run or its output could not be read.
+	PolicyHelperLoadFailed bool `json:"policyHelperLoadFailed"`
+	// The layer produced by the platform policy helper, when one ran.
+	PolicyHelperResponse any `json:"policyHelperResponse,omitempty"`
+	// A live fetch failed but a recent cached entry was served in its place, so
+	// `serverFetchFailed` stays false. Lets a consumer distinguish a clean fetch from a
+	// cache-backed fallback.
+	ServerCacheFallback bool `json:"serverCacheFallback"`
+	// Minimum client version requested by a successful response. Advisory only; the delivered
+	// policy remains active.
+	ServerClientUpdateRequested *string `json:"serverClientUpdateRequested,omitempty"`
+	// The server refused to deliver a policy because this client is too old to enforce it,
+	// carrying the user-facing sentence describing the refusal. No retry will help; the remedy
+	// is a client update. Gates that exist only because of managed policy should deny on this
+	// rather than falling back to their unmanaged default.
+	ServerClientUpdateRequired *string `json:"serverClientUpdateRequired,omitempty"`
+	// The error that made the server fetch fail, when one did.
+	ServerFetchError *string `json:"serverFetchError,omitempty"`
+	// The server fetch failed and no cached entry stood in for it, so the server layer is
+	// unconfirmed and fail-closed gates apply.
+	ServerFetchFailed bool `json:"serverFetchFailed"`
+	// The server fetch failed while a policy demanded a fresh confirmation, which is the strict
+	// posture an enterprise opted into rather than an ordinary transient failure.
+	ServerForcedRefreshFailure bool `json:"serverForcedRefreshFailure"`
+	// The synthesized fail-closed permissions layer applied in place of a policy a refused
+	// client may not enforce.
+	ServerPermissionsFloor any `json:"serverPermissionsFloor,omitempty"`
+	// How the server layer was resolved.
+	// Internal: ServerResolution is part of the SDK's internal API surface and is not intended
+	// for external use.
+	ServerResolution ManagedSettingsServerPolicyResolution `json:"serverResolution"`
+	// The account's server-delivered policy, when one was resolved.
+	ServerResponse any `json:"serverResponse,omitempty"`
+	// The server fetch failed in a way a later retry could succeed at, as opposed to a refusal
+	// that no retry will change.
+	ServerRetryableFailure bool `json:"serverRetryableFailure"`
+	// The sandbox object from a cached server policy that a forced refresh declined to serve in
+	// full. Folded back into the effective sandbox layer so an outage during a forced refresh
+	// still synthesizes the fail-closed sandbox floor from the administrator's known intent.
+	ServerSandboxFloor any `json:"serverSandboxFloor,omitempty"`
+	// A server-managed policy is known to exist even though `serverResponse` is intentionally
+	// unset. Consumers should OR this with the presence of `serverResponse` when deciding
+	// whether the device is managed, so a fresh start during an outage still applies the
+	// fail-closed gates instead of treating the device as unmanaged.
+	ServerSourceFound bool `json:"serverSourceFound"`
+	// No usable token was available, so no server fetch was attempted.
+	ServerTokenUnavailable bool `json:"serverTokenUnavailable"`
+	// The effective managed settings composed from every resolved layer. Omitted when no layer
+	// set anything, so an unmanaged host locks nothing.
+	Settings any `json:"settings,omitempty"`
+}
+
 // One managed-settings channel and the document it delivered.
 // Experimental: ManagedSettingsLayer is part of an experimental API and may change or be
 // removed.
@@ -6230,6 +7447,80 @@ type ManagedSettingsLayer struct {
 	Source string `json:"source"`
 }
 
+// Inputs describing the host and account whose managed remote-control policy should be
+// resolved. Mirrors `managedSettings.ingest`, and deliberately carries no retention
+// decision: reading this gate never becomes this runtime process's startup policy.
+// Experimental: ManagedSettingsLoadRemoteControlParams is part of an experimental API and
+// may change or be removed.
+// Internal: ManagedSettingsLoadRemoteControlParams is an internal SDK API and is not part
+// of the public surface.
+type ManagedSettingsLoadRemoteControlParams struct {
+	// The authenticated identity to resolve policy for. Omitted before sign-in, in which case
+	// no server layer is fetched.
+	AuthInfo any `json:"authInfo,omitempty"`
+	// Name of the embedding client, reported to the managed-settings service as `client_id` so
+	// it can refuse to deliver a policy this client is too old to enforce. That refusal is
+	// exactly what turns into an explicit `disabled` below, so a host that omits this field
+	// forfeits the protection.
+	ClientName *string `json:"clientName,omitempty"`
+	// A device layer supplied by the host instead of discovered from the machine. Pair it with
+	// `hasDeviceResponse` so an explicit absence is distinguishable from an omitted override.
+	DeviceResponse any `json:"deviceResponse,omitempty"`
+	// The host's environment variables, read for cache location and policy overrides.
+	Environment any `json:"environment"`
+	// Whether `deviceResponse` is an override at all. True with a null `deviceResponse` asserts
+	// the device layer is empty; false discovers it from the machine.
+	HasDeviceResponse *bool `json:"hasDeviceResponse,omitempty"`
+	// The host's home directory, used to resolve cache and managed-file locations.
+	HomeDirectory string `json:"homeDirectory"`
+	// The host's platform, in Node's `process.platform` spelling, used to locate
+	// platform-specific cache and policy paths.
+	Platform string `json:"platform"`
+	// Whether a configured platform policy helper may be run to produce an enforced helper
+	// layer.
+	PolicyHelperEnabled *bool `json:"policyHelperEnabled,omitempty"`
+	// The policy-helper invocation reason. Defaults to sessionStart.
+	// Internal: PolicyHelperReason is part of the SDK's internal API surface and is not
+	// intended for external use.
+	PolicyHelperReason *ManagedSettingsPolicyHelperReason `json:"policyHelperReason,omitempty"`
+	// Whether to run ingestion. Omit or set false to return an empty result without discovering
+	// or fetching policy.
+	SelfFetch *bool `json:"selfFetch,omitempty"`
+	// User agent to send with the policy fetch.
+	UserAgent string `json:"userAgent"`
+}
+
+// The managed remote-control policy in force for an account, if any. An absent policy means
+// the account is unmanaged for this capability, which a host reads as allowed — so absence
+// here is a positive statement that no policy applies, never a stand-in for a resolution
+// that failed. A resolution that cannot be completed is rejected instead.
+// Experimental: ManagedSettingsLoadRemoteControlResult is part of an experimental API and
+// may change or be removed.
+// Internal: ManagedSettingsLoadRemoteControlResult is an internal SDK API and is not part
+// of the public surface.
+type ManagedSettingsLoadRemoteControlResult struct {
+	// The account's `remoteControl` policy document. Absent when no managed policy governs
+	// remote control for this account. Reported as an explicit disabled policy, rather than as
+	// absence, when the service refused to deliver a policy this client is too old to enforce.
+	RemoteControl any `json:"remoteControl,omitempty"`
+}
+
+// One diagnostic emitted while ingesting managed settings. Returned rather than logged by
+// the runtime so the host decides where ingestion diagnostics go, which matters because an
+// ingestion runs before a session exists to carry a log sink.
+// Experimental: ManagedSettingsLogMessage is part of an experimental API and may change or
+// be removed.
+// Internal: ManagedSettingsLogMessage is an internal SDK API and is not part of the public
+// surface.
+type ManagedSettingsLogMessage struct {
+	// Severity of this diagnostic.
+	// Internal: Level is part of the SDK's internal API surface and is not intended for
+	// external use.
+	Level ManagedSettingsLogLevel `json:"level"`
+	// Human-readable diagnostic text.
+	Message string `json:"message"`
+}
+
 // Per-key lock state and provenance for `ManagedSettingsValues`, with the same field names.
 // Producers emit each typed key in values and meta together; both outer objects are omitted
 // when no typed key is set.
@@ -6238,10 +7529,67 @@ type ManagedSettingsLayer struct {
 type ManagedSettingsMeta struct {
 	// Lock state and provenance of `values.autoTier`.
 	AutoTier *ManagedSettingMeta `json:"autoTier,omitempty"`
+	// Lock state and provenance of `values.contextTier`.
+	ContextTier *ManagedSettingMeta `json:"contextTier,omitempty"`
+	// Lock state and provenance of `values.effortLevel`.
+	EffortLevel *ManagedSettingMeta `json:"effortLevel,omitempty"`
 	// Lock state and provenance of `values.model`.
 	Model *ManagedSettingMeta `json:"model,omitempty"`
 }
 
+// The client-supplied managed settings to validate and normalize. Omitting them is valid
+// and yields no policy.
+// Experimental: ManagedSettingsParseClientValueParams is part of an experimental API and
+// may change or be removed.
+// Internal: ManagedSettingsParseClientValueParams is an internal SDK API and is not part of
+// the public surface.
+type ManagedSettingsParseClientValueParams struct {
+	// The managed settings a client is supplying for a session it is about to open. Omit them
+	// when the client is imposing no policy of its own.
+	Settings any `json:"settings,omitempty"`
+}
+
+// The accepted managed settings, reduced to the keys a client is allowed to set.
+// Experimental: ManagedSettingsParseClientValueResult is part of an experimental API and
+// may change or be removed.
+// Internal: ManagedSettingsParseClientValueResult is an internal SDK API and is not part of
+// the public surface.
+type ManagedSettingsParseClientValueResult struct {
+	// The normalized settings. Omitted when the client supplied none. An accepted document that
+	// sets nothing comes back as an empty object, which is distinct from omission.
+	SettingsJSON any `json:"settingsJson,omitempty"`
+}
+
+// Ordered managed permission verdicts and the supplied policy's fail-closed posture.
+// Experimental: ManagedSettingsPermissionsEvaluateResult is part of an experimental API and
+// may change or be removed.
+type ManagedSettingsPermissionsEvaluateResult struct {
+	// Managed permission policy could not be determined; every operation is denied.
+	FailClosed bool `json:"failClosed"`
+	// One verdict per input operation, in the same order, including duplicates.
+	Results []ManagedPermissionEvaluation `json:"results"`
+}
+
+// The device-managed settings layer, with the sandbox floor and the load outcome a host
+// needs to compose it into an effective policy.
+// Experimental: ManagedSettingsReadDeviceResult is part of an experimental API and may
+// change or be removed.
+// Internal: ManagedSettingsReadDeviceResult is an internal SDK API and is not part of the
+// public surface.
+type ManagedSettingsReadDeviceResult struct {
+	// Whether discovery or validation failed. A host must treat this as "policy unknown" rather
+	// than "no policy": absent settings with this set false mean the device genuinely has none.
+	LoadFailed bool `json:"loadFailed"`
+	// Sandbox floor read from the discovered document before validation, so a document that is
+	// otherwise rejected can still raise the floor it declared.
+	SandboxFloor any `json:"sandboxFloor,omitempty"`
+	// Validated, canonical device-managed settings. Omitted when no device policy was
+	// discovered, when the discovered document failed validation, or when it validated to an
+	// empty object — an empty document carries no policy, and reporting it as present would
+	// outrank layers that do.
+	Settings any `json:"settings,omitempty"`
+}
+
 // Validated device-managed settings discovered before a session exists.
 // Experimental: ManagedSettingsReadResult is part of an experimental API and may change or
 // be removed.
@@ -6253,6 +7601,53 @@ type ManagedSettingsReadResult struct {
 	SettingsJSON any `json:"settingsJson,omitempty"`
 }
 
+// The bypass-permissions state a host holds today, the account now signed in, and what the
+// managed-policy resolution said.
+// Experimental: ManagedSettingsResolveBypassDisableTransitionParams is part of an
+// experimental API and may change or be removed.
+// Internal: ManagedSettingsResolveBypassDisableTransitionParams is an internal SDK API and
+// is not part of the public surface.
+type ManagedSettingsResolveBypassDisableTransitionParams struct {
+	// The account signed in now. A `managed` disable pinned to a different account is lifted.
+	ActiveIdentity string `json:"activeIdentity"`
+	// The account a `managed` disable is pinned to. Omit it when the current source is not
+	// `managed`; it is ignored for the other sources.
+	CurrentManagedIdentity *string `json:"currentManagedIdentity,omitempty"`
+	// Which layer currently disables bypass mode. Omit it when nothing does.
+	// Internal: CurrentSource is part of the SDK's internal API surface and is not intended for
+	// external use.
+	CurrentSource *ManagedSettingsBypassDisableSource `json:"currentSource,omitempty"`
+	// What the resolution said about bypass mode. Send `unknown` rather than omitting the field
+	// when there is no verdict.
+	// Internal: Policy is part of the SDK's internal API surface and is not intended for
+	// external use.
+	Policy ManagedSettingsBypassPolicyResolution `json:"policy"`
+}
+
+// The bypass-permissions state a host should hold after the resolution, and what it must do
+// to get there.
+// Experimental: ManagedSettingsResolveBypassDisableTransitionResult is part of an
+// experimental API and may change or be removed.
+// Internal: ManagedSettingsResolveBypassDisableTransitionResult is an internal SDK API and
+// is not part of the public surface.
+type ManagedSettingsResolveBypassDisableTransitionResult struct {
+	// The account the returned `managed` source is pinned to. Store it alongside `source`; the
+	// next call needs it to decide whether an account switch lifts the disable.
+	ManagedIdentity *string `json:"managedIdentity,omitempty"`
+	// The value to store in the host's own bypass-disabled flag. Omitted means leave it exactly
+	// as it is, which is not the same as being told to store `false`.
+	SetDisabledState *bool `json:"setDisabledState,omitempty"`
+	// Which layer disables bypass mode after this resolution. Omitted when none does, which is
+	// what a lifted disable looks like.
+	// Internal: Source is part of the SDK's internal API surface and is not intended for
+	// external use.
+	Source *ManagedSettingsBypassDisableSource `json:"source,omitempty"`
+	// Whether a bypass-permissions session already running must be turned off. True only when
+	// this resolution newly disables bypass mode, so a host that is already compliant is not
+	// interrupted.
+	SuppressRuntimeAllowAll bool `json:"suppressRuntimeAllowAll"`
+}
+
 // Effective enterprise managed settings and contributing channels. Session events report
 // applied policy; sessionless resolve reports an account/device snapshot, and compose
 // reports a non-applying preview of candidate documents. Device values take precedence over
@@ -6262,16 +7657,18 @@ type ManagedSettingsReadResult struct {
 // Experimental: ManagedSettingsResolvedData is part of an experimental API and may change
 // or be removed.
 type ManagedSettingsResolvedData struct {
-	// Whether enterprise policy disables bypass-permissions ("yolo") mode for this session.
-	// Deny-wins across layers, and forced on when `failClosed` is true.
+	// Whether an explicit enterprise policy restriction disables bypass-permissions ("yolo")
+	// mode for this session. Deny-wins across layers; an unresolved policy does not force this
+	// on by itself.
 	BypassPermissionsDisabled bool `json:"bypassPermissionsDisabled"`
 	// 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.
+	// Whether managed policy could not be determined (e.g. a failed server fetch) and
+	// unresolved-policy safeguards remain active. This does not by itself disable
+	// bypass-permissions; `bypassPermissionsDisabled` reports only an explicit policy
+	// restriction.
 	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.
@@ -6279,6 +7676,10 @@ type ManagedSettingsResolvedData struct {
 	// 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"`
+	// Reusable retained managed permission policy for managedSettings.permissions.evaluate,
+	// including source composition and session-local injection. Provided by live session
+	// snapshots; absent in older events. Refresh the context when managed policy changes.
+	PermissionsContext *ManagedPermissionsContext `json:"permissionsContext,omitempty"`
 	// Whether the policy-helper managed-settings layer was present. The policy helper is the
 	// weakest channel: it fills keys no enterprise source set and can never replace one.
 	PolicyHelperManaged *bool `json:"policyHelperManaged,omitempty"`
@@ -6298,6 +7699,54 @@ type ManagedSettingsResolvedData struct {
 	Source ManagedSettingsResolvedSource `json:"source"`
 }
 
+// The credential and environment to evaluate the device-channel sign-in pin against.
+// Experimental: ManagedSettingsResolveDeviceForceLoginOrgsGateParams is part of an
+// experimental API and may change or be removed.
+// Internal: ManagedSettingsResolveDeviceForceLoginOrgsGateParams is an internal SDK API and
+// is not part of the public surface.
+type ManagedSettingsResolveDeviceForceLoginOrgsGateParams struct {
+	// The authenticated identity to judge. Omitted when signed out, which is the case the
+	// device channel exists to serve: it can refuse a first sign-in before any credential
+	// exists.
+	AuthInfo any `json:"authInfo,omitempty"`
+	// The host's environment variables. Read for the variables that would make an identity's
+	// membership snapshot forgeable, so a credential whose provenance cannot be trusted is
+	// refused rather than accepted.
+	Environment any `json:"environment"`
+}
+
+// The managed-settings layers to compose into an effective policy. Every layer is optional;
+// omitting all of them yields no effective policy.
+// Experimental: ManagedSettingsResolveEffectiveValueParams is part of an experimental API
+// and may change or be removed.
+// Internal: ManagedSettingsResolveEffectiveValueParams is an internal SDK API and is not
+// part of the public surface.
+type ManagedSettingsResolveEffectiveValueParams struct {
+	// The device sandbox floor, folded into the device layer under `sandbox` before composition.
+	DeviceSandboxFloor any `json:"deviceSandboxFloor,omitempty"`
+	// The device layer: native MDM and managed-file settings describing the machine rather than
+	// the account.
+	Mdm any `json:"mdm,omitempty"`
+	// The policy-helper layer, an enforced channel sourced from a platform policy helper
+	// process.
+	PolicyHelper any `json:"policyHelper,omitempty"`
+	// The account's server-delivered org policy, as returned by a managed-settings fetch.
+	// Omitted before sign-in or when the fetch has not landed.
+	Server any `json:"server,omitempty"`
+}
+
+// The effective managed policy composed from the supplied layers.
+// Experimental: ManagedSettingsResolveEffectiveValueResult is part of an experimental API
+// and may change or be removed.
+// Internal: ManagedSettingsResolveEffectiveValueResult is an internal SDK API and is not
+// part of the public surface.
+type ManagedSettingsResolveEffectiveValueResult struct {
+	// The composed effective managed settings. Omitted when no layer sets anything, so an
+	// unmanaged host locks nothing. Carries `sandboxAdvisoryFloorDeclined: true` when an
+	// advisory server force-on was dropped because this host cannot run the sandbox.
+	SettingsJSON any `json:"settingsJson,omitempty"`
+}
+
 // Experimental: ManagedSettingsResolveRequest is part of an experimental API and may change
 // or be removed.
 type ManagedSettingsResolveRequest struct {
@@ -6310,6 +7759,9 @@ type ManagedSettingsResolveRequest struct {
 	// Opaque account identifier returned by `account.getAllUsers`. When omitted, the current
 	// account is used, or device policy only when no account is signed in.
 	SelectionID *string `json:"selectionId,omitempty"`
+	// Working directory used to run an organization policy helper. When omitted, sessionless
+	// resolution does not run the helper.
+	WorkingDirectory *string `json:"workingDirectory,omitempty"`
 }
 
 // Effective enterprise managed settings for an account, resolved without a session.
@@ -6330,6 +7782,11 @@ type ManagedSettingsResolveResult struct {
 	Layers []ManagedSettingsLayer `json:"layers"`
 	// Per-key lock state and provenance for the entries in `values`, using the same key names.
 	Meta *ManagedSettingsMeta `json:"meta,omitempty"`
+	// Reusable source-composed permission policy for managedSettings.permissions.evaluate.
+	// Unlike resolved.settings.permissions, this retains every source's allowlist and
+	// default-prompt semantics. Refresh through resolve when account/device policy changes.
+	// Absent on runtimes that do not support permission evaluation.
+	PermissionsContext *ManagedPermissionsContext `json:"permissionsContext,omitempty"`
 	// Effective managed settings from the device and account (server) channels, in the same
 	// shape as `session.managedSettings.get`, excluding session-local injection.
 	Resolved ManagedSettingsResolvedData `json:"resolved"`
@@ -6340,6 +7797,197 @@ type ManagedSettingsResolveResult struct {
 	Values *ManagedSettingsValues `json:"values,omitempty"`
 }
 
+// Inputs describing the host and account a startup policy resolution should run for.
+// Mirrors `managedSettings.ingest`, and adds the decision of whether the resolved policy is
+// retained for this runtime process.
+// Experimental: ManagedSettingsResolveStartupPolicyParams is part of an experimental API
+// and may change or be removed.
+// Internal: ManagedSettingsResolveStartupPolicyParams is an internal SDK API and is not
+// part of the public surface.
+type ManagedSettingsResolveStartupPolicyParams struct {
+	// The authenticated identity to resolve policy for. Omitted before sign-in, in which case
+	// no server layer is fetched and the sign-in pin is evaluated against no credential.
+	AuthInfo any `json:"authInfo,omitempty"`
+	// Whether to ignore a cached server policy when reading, forcing the resolution to come
+	// from a live fetch.
+	BypassCacheRead *bool `json:"bypassCacheRead,omitempty"`
+	// Name of the embedding client, reported to the managed-settings service as `client_id` so
+	// it can refuse to deliver a policy this client is too old to enforce.
+	ClientName *string `json:"clientName,omitempty"`
+	// A device layer supplied by the host instead of discovered from the machine. Pair it with
+	// `hasDeviceResponse` so an explicit absence is distinguishable from an omitted override.
+	DeviceResponse any `json:"deviceResponse,omitempty"`
+	// The host's environment variables, read for cache location, policy overrides, and the
+	// variables that would make a membership snapshot forgeable.
+	Environment any `json:"environment"`
+	// Whether `deviceResponse` is an override at all. True with a null `deviceResponse` asserts
+	// the device layer is empty; false discovers it from the machine.
+	HasDeviceResponse *bool `json:"hasDeviceResponse,omitempty"`
+	// The host's home directory, used to resolve cache and managed-file locations.
+	HomeDirectory string `json:"homeDirectory"`
+	// The host's platform, in Node's `process.platform` spelling, used to locate
+	// platform-specific cache and policy paths.
+	Platform string `json:"platform"`
+	// Whether a configured platform policy helper may be run to produce an enforced helper
+	// layer.
+	PolicyHelperEnabled *bool `json:"policyHelperEnabled,omitempty"`
+	// The policy-helper invocation reason. Defaults to sessionStart.
+	// Internal: PolicyHelperReason is part of the SDK's internal API surface and is not
+	// intended for external use.
+	PolicyHelperReason *ManagedSettingsPolicyHelperReason `json:"policyHelperReason,omitempty"`
+	// Directory the policy helper runs in when this resolution is not owned by a registered
+	// session. A host resolving policy before its session exists must pass this, or a
+	// directory-sensitive helper judges the wrong repository.
+	PolicyHelperWorkingDirectory *string `json:"policyHelperWorkingDirectory,omitempty"`
+	// Whether to retain the resolved policy as this runtime process's startup policy, so later
+	// work in the process enforces it. Set false to resolve without side effects, which is what
+	// a protocol host wants before session creation: its sessions apply the complete policy
+	// through the normal lifecycle, and retaining here would let a readiness credential affect
+	// unrelated sessions. The returned verdict is identical either way — this decides only
+	// whether the process keeps it.
+	RetainAndApply bool `json:"retainAndApply"`
+	// Whether to run ingestion. Omit or set false to return an empty result without discovering
+	// or fetching policy.
+	SelfFetch *bool `json:"selfFetch,omitempty"`
+	// How this resolution may use the on-disk server-policy cache. Defaults to the runtime's
+	// own policy when omitted. Rejected when combined with `bypassCacheRead`, because the two
+	// express the same decision and accepting both would leave the caller unsure which one the
+	// runtime honored.
+	// Internal: ServerPolicyCacheMode is part of the SDK's internal API surface and is not
+	// intended for external use.
+	ServerPolicyCacheMode *ManagedSettingsServerPolicyCacheMode `json:"serverPolicyCacheMode,omitempty"`
+	// The session whose credential store, working directory and client kind the resolution
+	// should use. Omit it when no session exists yet and the process-wide store applies. A
+	// resolution whose session names a credential other than `authInfo` is returned but not
+	// retained, so a stale sign-in cannot apply policy for an account that has already been
+	// switched away from.
+	SessionID *string `json:"sessionId,omitempty"`
+	// User agent to send with the policy fetch.
+	UserAgent string `json:"userAgent"`
+}
+
+// The startup policy a resolution composed, the per-layer outcome flags a host needs to
+// decide how much to trust it, and the enterprise sign-in verdict for the credential it ran
+// against. The flags are reported rather than folded into the settings because a host must
+// distinguish an unmanaged device from a managed device whose policy could not be
+// confirmed, and apply its fail-closed gates in the second case.
+// Experimental: ManagedSettingsResolveStartupPolicyResult is part of an experimental API
+// and may change or be removed.
+// Internal: ManagedSettingsResolveStartupPolicyResult is an internal SDK API and is not
+// part of the public surface.
+type ManagedSettingsResolveStartupPolicyResult struct {
+	// Advisory minimum client version from a successful server response.
+	ClientUpdateRequested *string `json:"clientUpdateRequested,omitempty"`
+	// The server refused to deliver a policy because this client is too old to enforce it,
+	// carrying the user-facing sentence describing the refusal. No retry will help; the remedy
+	// is a client update.
+	ClientUpdateRequired *string `json:"clientUpdateRequired,omitempty"`
+	// The device layer could not be read, so it is unconfirmed rather than known-absent.
+	DeviceLoadFailed bool `json:"deviceLoadFailed"`
+	// The device layer discovered from the machine, when one exists.
+	DeviceResponse any `json:"deviceResponse,omitempty"`
+	// The sandbox floor contributed by the device layer.
+	DeviceSandboxFloor any `json:"deviceSandboxFloor,omitempty"`
+	// The enterprise sign-in verdict for the credential this resolution ran against, evaluated
+	// over the effective policy so a server-delivered pin is honored alongside a device one.
+	// Computed on every resolution, including one that was not retained, so a host that
+	// declines to apply policy still cannot proceed past a pin.
+	// Internal: ForceLoginOrgs is part of the SDK's internal API surface and is not intended
+	// for external use.
+	ForceLoginOrgs ForceLoginOrgsDecision `json:"forceLoginOrgs"`
+	// A managed policy is known to apply to this host, from a discovered source or a resolved
+	// document.
+	ManagedPolicyPresent bool `json:"managedPolicyPresent"`
+	// The permissions layer specifically could not be confirmed, so permission gates apply
+	// their fail-closed posture.
+	PermissionPolicyUndetermined bool `json:"permissionPolicyUndetermined"`
+	// The policy helper was configured but could not be run, or its output could not be read.
+	PolicyHelperLoadFailed bool `json:"policyHelperLoadFailed"`
+	// The layer produced by the platform policy helper, when one ran.
+	PolicyHelperResponse any `json:"policyHelperResponse,omitempty"`
+	// Some layer of the policy could not be confirmed, so its absence must not be read as
+	// permission. Folds in a failed server fetch as well as an unreadable device layer.
+	PolicyUndetermined bool `json:"policyUndetermined"`
+	// The sandbox was enabled because policy could not be confirmed rather than because an
+	// administrator asked for it. Lets a host explain a sandbox the user did not configure.
+	SandboxEnabledByUndeterminedPolicy bool `json:"sandboxEnabledByUndeterminedPolicy"`
+	// The effective sandbox floor composed across every layer, which a host must apply rather
+	// than its own default.
+	SandboxFloor any `json:"sandboxFloor,omitempty"`
+	// The server fetch failed and no cached entry stood in for it, so the server layer is
+	// unconfirmed and fail-closed gates apply.
+	ServerFetchFailed bool `json:"serverFetchFailed"`
+	// How the current runtime resolved the server layer.
+	// Internal: ServerResolution is part of the SDK's internal API surface and is not intended
+	// for external use.
+	ServerResolution ManagedSettingsServerPolicyResolution `json:"serverResolution"`
+	// The account's server-delivered policy, when one was resolved.
+	ServerResponse any `json:"serverResponse,omitempty"`
+	// Telemetry describing which layers answered and how, for the host to report alongside its
+	// own startup events.
+	Telemetry any `json:"telemetry"`
+	// Warnings raised while resolving, in the order they occurred.
+	Warnings []string `json:"warnings"`
+}
+
+// The managed layers to retain as this process's startup policy, with the outcome of
+// fetching each one.
+// Experimental: ManagedSettingsRetainPolicyParams is part of an experimental API and may
+// change or be removed.
+// Internal: ManagedSettingsRetainPolicyParams is an internal SDK API and is not part of the
+// public surface.
+type ManagedSettingsRetainPolicyParams struct {
+	// Whether the device load failed. Report it honestly, for the same reason as
+	// `serverFetchFailed`.
+	DeviceLoadFailed bool `json:"deviceLoadFailed"`
+	// The device/MDM policy layer.
+	DeviceResponse any `json:"deviceResponse,omitempty"`
+	// Sandbox floor declared by the device layer, carried separately so a document that failed
+	// validation can still raise the floor.
+	DeviceSandboxFloor any `json:"deviceSandboxFloor,omitempty"`
+	// Whether the device sandbox intent is unreadable independently of its other settings.
+	DeviceSandboxUndetermined bool `json:"deviceSandboxUndetermined"`
+	// Whether a device policy source demonstrably exists. This, not a read error, is the
+	// evidence a device is managed, so a fail-closed policy gates on it.
+	DeviceSourceFound bool `json:"deviceSourceFound"`
+	// Whether any managed policy source exists, independently of fetch failures.
+	ManagedPolicyPresent bool `json:"managedPolicyPresent"`
+	// Whether permission policy is undetermined. Sandbox-only uncertainty does not imply this
+	// flag.
+	PermissionPolicyUndetermined bool `json:"permissionPolicyUndetermined"`
+	// The policy helper's response: the third managed layer that a process owning its startup
+	// policy resolves. It is retained with the other two so that every ambient read in this
+	// process, including the mutation guards and the governed marketplace allowlist that the
+	// `plugins.*` handlers derive, sees the whole policy the process fetched. A session-owning
+	// process omits it, because it resolves a helper per session against that session's working
+	// directory.
+	PolicyHelperResponse any `json:"policyHelperResponse,omitempty"`
+	// Preserve the retained server layer during a device-only resolution.
+	PreserveServerState bool `json:"preserveServerState"`
+	// Whether uncertainty alone enabled the shared sandbox floor.
+	SandboxEnabledByUndeterminedPolicy bool `json:"sandboxEnabledByUndeterminedPolicy"`
+	// Whether the shared sandbox policy is undetermined. Diagnostic errors alone do not imply
+	// this flag.
+	SandboxFloorUndetermined bool `json:"sandboxFloorUndetermined"`
+	// Whether the server fetch failed. Report it honestly: true keeps the already-retained
+	// server layer rather than replacing it with an absent one.
+	ServerFetchFailed bool `json:"serverFetchFailed"`
+	// Whether a required fresh server-policy confirmation failed.
+	ServerForcedRefreshFailure bool `json:"serverForcedRefreshFailure"`
+	// The resolved server policy. A known source can lack a response after a forced-refresh
+	// failure.
+	ServerResponse any `json:"serverResponse,omitempty"`
+	// Whether the server policy source exists, even when its response is unavailable.
+	ServerSourceFound bool `json:"serverSourceFound"`
+	// Shared server/device sandbox floor, excluding session-local helper policy.
+	SharedSandboxFloor any `json:"sharedSandboxFloor,omitempty"`
+}
+
+// Experimental: ManagedSettingsRetainPolicyResult is part of an experimental API and may
+// change or be removed.
+type ManagedSettingsRetainPolicyResult struct {
+}
+
 // The authoring JSON schema for managed settings recognized by this runtime.
 // Experimental: ManagedSettingsSchemaResult is part of an experimental API and may change
 // or be removed.
@@ -6387,8 +8035,14 @@ type ManagedSettingsValidateResult struct {
 type ManagedSettingsValues struct {
 	// Managed Auto routing preference, used when the selected model is `auto`.
 	AutoTier *AutoTier `json:"autoTier,omitempty"`
-	// Managed default model identifier, as configured. New sessions start with it; it can name
-	// a model the account cannot use, so hosts match it against the listed models.
+	// Managed context-tier default for the managed concrete model.
+	ContextTier *ContextTier `json:"contextTier,omitempty"`
+	// Managed reasoning-effort default for the managed concrete model. The runtime clamps it to
+	// an entitled effort when model availability is known.
+	EffortLevel *string `json:"effortLevel,omitempty"`
+	// Managed default model identifier. When model availability was resolved, aliases and
+	// family names are projected to a concrete available model ID; otherwise the configured
+	// value is returned.
 	Model *string `json:"model,omitempty"`
 }
 
@@ -6787,9 +8441,53 @@ type MCPConfigUpdateRequest struct {
 type MCPConfigUpdateResult struct {
 }
 
+// Effective MCP configuration entry. Configuration enablement is distinct from the optional
+// live observation.
+// Experimental: MCPConfiguredServer is part of an experimental API and may change or be
+// removed.
+type MCPConfiguredServer struct {
+	// Human-readable display name supplied by configuration.
+	DisplayName *string `json:"displayName,omitempty"`
+	// Whether this configured server is enabled after session configuration and policy
+	// filtering.
+	Enabled bool `json:"enabled"`
+	// Observed state from an already materialized matching server. Omitted when no live graph
+	// has this configured server; it never determines configuration enablement.
+	Live MCPConfiguredServerState `json:"live"`
+	// Server name (config key)
+	Name string `json:"name"`
+	// Configuration provenance: user, workspace, plugin, builtin, or managed.
+	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"`
+}
+
+// Effective MCP configuration with optional live observations from matching already
+// materialized servers.
+// Experimental: MCPConfiguredServerList is part of an experimental API and may change or be
+// removed.
+type MCPConfiguredServerList struct {
+	// Effective configured MCP servers.
+	Servers []MCPConfiguredServer `json:"servers"`
+}
+
+// Observational state for a matching already materialized MCP server.
+// Experimental: MCPConfiguredServerState is part of an experimental API and may change or
+// be removed.
+type MCPConfiguredServerState struct {
+	// Observed connection error, when the materialized server failed.
+	Error *string `json:"error,omitempty"`
+	// Observed connection status. This is not a configuration or readiness guarantee.
+	Status MCPServerStatus `json:"status"`
+}
+
 // Credential-free authentication identity used to configure GitHub MCP.
 // Experimental: MCPConfigureGitHubRequest is part of an experimental API and may change or
 // be removed.
+// Internal: MCPConfigureGitHubRequest is an internal SDK API and is not part of the public
+// surface.
 type MCPConfigureGitHubRequest struct {
 	// Opaque runtime auth info for GitHub MCP configuration. Marked internal: an in-process
 	// runtime shape (configureGitHubMcp is a no-op over the wire).
@@ -7598,6 +9296,17 @@ type MCPIsServerRunningResult struct {
 	Running bool `json:"running"`
 }
 
+// Names of the MCP servers the runtime supplies itself.
+// Experimental: MCPListBuiltinServerNamesResult is part of an experimental API and may
+// change or be removed.
+// Internal: MCPListBuiltinServerNamesResult is an internal SDK API and is not part of the
+// public surface.
+type MCPListBuiltinServerNamesResult struct {
+	// Every built-in server name. A host disabling the built-ins wholesale suppresses exactly
+	// this set.
+	Names []string `json:"names"`
+}
+
 // Server name whose tool list should be returned.
 // Experimental: MCPListToolsRequest is part of an experimental API and may change or be
 // removed.
@@ -8510,6 +10219,8 @@ type MCPPromptsListResult struct {
 // Registration parameters for an external MCP client.
 // Experimental: MCPRegisterExternalClientRequest is part of an experimental API and may
 // change or be removed.
+// Internal: MCPRegisterExternalClientRequest is an internal SDK API and is not part of the
+// public surface.
 type MCPRegisterExternalClientRequest struct {
 	// In-process MCP Client instance. Marked internal: cannot be serialized across the JSON-RPC
 	// boundary.
@@ -8530,8 +10241,80 @@ type MCPRegisterExternalClientRequest struct {
 	Transport any `json:"transport"`
 }
 
+// Registry search to abandon.
+// Experimental: MCPRegistryCancelRequest is part of an experimental API and may change or
+// be removed.
+// Internal: MCPRegistryCancelRequest is an internal SDK API and is not part of the public
+// surface.
+type MCPRegistryCancelRequest struct {
+	// Request ID from `mcp.registry.allocateRequestId` that the search uses.
+	RequestID int64 `json:"requestId"`
+}
+
+// Whether the cancel reached a live search.
+// Experimental: MCPRegistryCancelResult is part of an experimental API and may change or be
+// removed.
+// Internal: MCPRegistryCancelResult is an internal SDK API and is not part of the public
+// surface.
+type MCPRegistryCancelResult struct {
+	// True when the cancel stopped a running search. False for unknown or reclaimed IDs,
+	// completed or canceled searches, and unused reservations. The cancel releases an unused
+	// reservation.
+	Canceled bool `json:"canceled"`
+}
+
+// Request id naming a cancellable registry search.
+// Experimental: MCPRegistryRequestIDResult is part of an experimental API and may change or
+// be removed.
+// Internal: MCPRegistryRequestIDResult is an internal SDK API and is not part of the public
+// surface.
+type MCPRegistryRequestIDResult struct {
+	// Request ID for `mcp.registry.search` and `mcp.registry.cancel`. It serves one search.
+	// Allocation can reclaim unused IDs at the 1,024-ID reservation limit.
+	RequestID int64 `json:"requestId"`
+}
+
+// Registry search terms, the credential to search under, and the request id that makes the
+// search cancellable.
+// Experimental: MCPRegistrySearchRequest is part of an experimental API and may change or
+// be removed.
+// Internal: MCPRegistrySearchRequest is an internal SDK API and is not part of the public
+// surface.
+type MCPRegistrySearchRequest struct {
+	// The credential the search runs under, carried opaquely. Hosts usually send
+	// credential-free `AuthIdentity`; a `token` identity can be resolved only when it embeds a
+	// token, while `env` and `gh-cli` identities can use a token embedded in the request first.
+	AuthInfo any `json:"authInfo"`
+	// Maximum number of servers to return.
+	Limit int64 `json:"limit"`
+	// Free-text query. Omitted or empty asks the registry for its top servers rather than
+	// searching. A value that is not a string is refused.
+	Query *string `json:"query,omitempty"`
+	// Repository used for the policy lookup, as `owner/name`. The policy selects the registry
+	// URL and whether the user token goes to the registry. The registry receives this
+	// repository only when the policy entry lists it as required context. A value that is not a
+	// string is refused.
+	Repository *string `json:"repository,omitempty"`
+	// Request ID from `mcp.registry.allocateRequestId`. The search refuses unknown, reclaimed,
+	// or canceled IDs and IDs that another search or request already uses.
+	RequestID int64 `json:"requestId"`
+}
+
+// Servers selected from the registry response.
+// Experimental: MCPRegistrySearchResult is part of an experimental API and may change or be
+// removed.
+// Internal: MCPRegistrySearchResult is an internal SDK API and is not part of the public
+// surface.
+type MCPRegistrySearchResult struct {
+	// The server objects, carried opaquely. The runtime follows pages, keeps the newest entry
+	// per server name, cuts the list to `limit`, and sorts an empty-query result by GitHub
+	// stars. Each server object remains unchanged because the registry owns that shape.
+	Servers any `json:"servers"`
+}
+
 // In-process MCP reload configuration.
 // Experimental: MCPReloadConfig is part of an experimental API and may change or be removed.
+// Internal: MCPReloadConfig is an internal SDK API and is not part of the public surface.
 type MCPReloadConfig struct {
 	ActiveGitHubToken *string `json:"activeGitHubToken,omitempty"`
 	// Server names the CLI enabled for this session via `--enable-mcp-server`.
@@ -8552,6 +10335,8 @@ type MCPReloadConfig struct {
 // Opaque MCP reload configuration.
 // Experimental: MCPReloadWithConfigRequest is part of an experimental API and may change or
 // be removed.
+// Internal: MCPReloadWithConfigRequest is an internal SDK API and is not part of the public
+// surface.
 type MCPReloadWithConfigRequest struct {
 	// Opaque runtime MCP reload configuration. Marked internal: an in-process runtime shape
 	// (reloadMcpServers throws over the wire).
@@ -8962,6 +10747,9 @@ type MCPServer struct {
 	// Connection status: connected, failed, needs-auth, pending, disabled, stopped, or
 	// not_configured
 	Status MCPServerStatus `json:"status"`
+	// Configured URL for an HTTP/SSE server, regardless of configuration source. Omitted for
+	// local and in-memory servers.
+	URL *string `json:"url,omitempty"`
 }
 
 // Set to `true` to use defaults, or provide an object with additional auth or OIDC settings.
@@ -9054,6 +10842,8 @@ 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.
+// Internal: MCPServerConfigMemory is an internal SDK API and is not part of the public
+// surface.
 type MCPServerConfigMemory struct {
 	// Configuration warnings recorded while loading the server.
 	ConfigWarnings []string `json:"configWarnings,omitzero"`
@@ -9174,6 +10964,38 @@ type MCPSetEnvValueModeResult struct {
 	Mode MCPSetEnvValueModeDetails `json:"mode"`
 }
 
+// The session tool filters that decide whether the session still has a shell to run `gh`
+// with.
+// Experimental: MCPShouldExcludeGitHubToolsRequest is part of an experimental API and may
+// change or be removed.
+// Internal: MCPShouldExcludeGitHubToolsRequest is an internal SDK API and is not part of
+// the public surface.
+type MCPShouldExcludeGitHubToolsRequest struct {
+	// The session's tool allowlist, when it set one. Omitted means the session constrains
+	// nothing this way.
+	AvailableTools []string `json:"availableTools,omitzero"`
+	// The session's tool denylist, when it set one. Omitted means the session constrains
+	// nothing this way.
+	ExcludedTools []string `json:"excludedTools,omitzero"`
+	// How the allowlist and denylist combine when both are set. Omitted means the default every
+	// session gets, so a caller that never chose a precedence is answered as its sessions
+	// behave.
+	ToolFilterPrecedence *OptionsUpdateToolFilterPrecedence `json:"toolFilterPrecedence,omitempty"`
+}
+
+// Whether the gh-replaceable GitHub MCP tools may be clipped for the session described by
+// the request.
+// Experimental: MCPShouldExcludeGitHubToolsResult is part of an experimental API and may
+// change or be removed.
+// Internal: MCPShouldExcludeGitHubToolsResult is an internal SDK API and is not part of the
+// public surface.
+type MCPShouldExcludeGitHubToolsResult struct {
+	// True only when both halves hold: the session's filters still reach the platform shell
+	// tool, and the host actually has the `gh` those tools would be replaced by. Feed it
+	// straight back as the `excludeGhReplaceableTools` build option.
+	ExcludeGhReplaceableTools bool `json:"excludeGhReplaceableTools"`
+}
+
 // Concrete configuration file containing an MCP server declaration.
 // Experimental: MCPSourceFile is part of an experimental API and may change or be removed.
 type MCPSourceFile struct {
@@ -9300,6 +11122,8 @@ type MCPUninstallPlan struct {
 // Server name identifying the external client to remove.
 // Experimental: MCPUnregisterExternalClientRequest is part of an experimental API and may
 // change or be removed.
+// Internal: MCPUnregisterExternalClientRequest is an internal SDK API and is not part of
+// the public surface.
 type MCPUnregisterExternalClientRequest struct {
 	// Server name of the external client to unregister
 	ServerName string `json:"serverName"`
@@ -9346,10 +11170,15 @@ type MetadataContextHeaviestMessagesResult struct {
 // Experimental: MetadataContextInfoRequest is part of an experimental API and may change or
 // be removed.
 type MetadataContextInfoRequest struct {
-	// Maximum output tokens allowed by the target model. Pass 0 if unknown.
+	// Requested output allowance to reserve against the combined context ceiling. Pass 0 to
+	// resolve the session's request cap, falling back to the model's advertised output limit.
 	OutputTokenLimit int64 `json:"outputTokenLimit"`
-	// Maximum prompt tokens allowed by the target model. Pass 0 to use the runtime default.
+	// Advertised prompt allowance. Pass 0 to resolve the selected model and context tier from
+	// the session.
 	PromptTokenLimit int64 `json:"promptTokenLimit"`
+	// Provider owning selectedModel. Omit to use the current provider for the current model, or
+	// deterministic legacy lookup for a different model.
+	ProviderID *string `json:"providerId,omitempty"`
 	// Model identifier used for tokenization. Omit to use the session default. Used both for
 	// token counting and to compute display values.
 	SelectedModel *string `json:"selectedModel,omitempty"`
@@ -9538,6 +11367,11 @@ type Model struct {
 	SupportedContextTiers []string `json:"supportedContextTiers,omitzero"`
 	// Supported reasoning effort levels (only present if model supports reasoning effort)
 	SupportedReasoningEfforts []string `json:"supportedReasoningEfforts,omitzero"`
+	// Model vendor as the Copilot API reports it, for example "Anthropic" or "Azure OpenAI".
+	// Open vocabulary, passed through unchanged. It can name the vendor that serves the model
+	// instead of the one that built it, or a label that is not a vendor, such as
+	// "Experimental". Absent when the Copilot API reports no vendor.
+	Vendor *string `json:"vendor,omitempty"`
 	// 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.
@@ -9579,6 +11413,9 @@ type ModelApplyStartupOverlayRequest struct {
 	RepoContextTier *string `json:"repoContextTier,omitempty"`
 	// Model selected by repository settings, when configured.
 	RepoModel *string `json:"repoModel,omitempty"`
+	// Provider owning the repository-selected model. Omitted repository provider identity
+	// retains legacy bare-model behavior.
+	RepoModelProviderID *string `json:"repoModelProviderId,omitempty"`
 	// Reasoning effort selected by repository settings, when configured.
 	RepoReasoningEffort *string `json:"repoReasoningEffort,omitempty"`
 	// Model required by server-managed policy, when configured.
@@ -9809,6 +11646,86 @@ type ModelCapabilitiesSupports struct {
 	Vision *bool `json:"vision,omitempty"`
 }
 
+// Experimental: ModelClearStartupSeedRequest is part of an experimental API and may change
+// or be removed.
+// Internal: ModelClearStartupSeedRequest is an internal SDK API and is not part of the
+// public surface.
+type ModelClearStartupSeedRequest struct {
+	ExpectedModel string `json:"expectedModel"`
+	// Provider captured with the startup seed; omission matches only an unqualified seed.
+	ExpectedProviderID *string `json:"expectedProviderId,omitempty"`
+}
+
+// Experimental: ModelClearStartupSeedResult is part of an experimental API and may change
+// or be removed.
+// Internal: ModelClearStartupSeedResult is an internal SDK API and is not part of the
+// public surface.
+type ModelClearStartupSeedResult struct {
+	Cleared bool `json:"cleared"`
+}
+
+// Host presentation state the reasoning-summaries policy depends on.
+// Experimental: ModelGetReasoningSummariesRequest is part of an experimental API and may
+// change or be removed.
+type ModelGetReasoningSummariesRequest struct {
+	// The host's persisted `showReasoning` user setting, omitted when unset.
+	PersistedShowReasoning *bool `json:"persistedShowReasoning,omitempty"`
+	// Whether the host is currently showing reasoning summaries. Defaults to false.
+	SummariesVisible *bool `json:"summariesVisible,omitempty"`
+}
+
+// Reasoning-summaries presentation policy for the session's current model.
+// Experimental: ModelGetReasoningSummariesResult is part of an experimental API and may
+// change or be removed.
+type ModelGetReasoningSummariesResult struct {
+	// Whether the supplied `persistedShowReasoning` setting only restates the model default.
+	// This reports a redundancy, not a standing instruction to delete the setting: it stays
+	// true for as long as the setting and the model default agree, including for a user who
+	// later chose that value deliberately. It exists for a one-time migration of a legacy
+	// setting written before the model default made it redundant, so a host that acts on it
+	// owns the cleanup and must gate it behind its own persisted `done` marker, delete only a
+	// setting whose value still matches the one it read, and never repeat the deletion on a
+	// later launch. Under an off-by-default reasoning-summaries experiment an explicit
+	// `showReasoning: true` opt-in also reads as redundant on a summary-producing model, so an
+	// ungated host would keep deleting that opt-in and hide summaries again on every launch.
+	ClearRedundantSetting bool `json:"clearRedundantSetting"`
+	// Whether the session's reasoning-summaries experiment assignment has settled. False means
+	// this read does not wait for a pending assignment and reports the experiment-derived
+	// fields conservatively: `showHiddenHint` is false and `visibility` falls back to
+	// `persistedShowReasoning`, or is omitted when none was supplied. A host that wants the
+	// assigned answer re-reads until this is true.
+	ExperimentSettled bool `json:"experimentSettled"`
+	// Whether the selected model shows reasoning summaries by default.
+	ModelDefaultShowsSummaries bool `json:"modelDefaultShowsSummaries"`
+	// False until the session has a model catalog and a selected model. This read never
+	// resolves the catalog itself, and the runtime emits no readiness notification, so
+	// repeating this call alone leaves `ready` false indefinitely on a session that has neither
+	// listed models nor run a turn. `session.model.list` is the prerequisite and the signal: it
+	// resolves and caches the catalog for the session, so a successful return means the next
+	// read is ready. The exception is a session that resolves models without a Copilot catalog,
+	// that is a BYOK registry or an alternate provider: `session.model.list` returns an empty
+	// list without caching a catalog, so `ready` stays false and this policy is unavailable
+	// there. While false, every model-policy field is false and `visibility` is omitted;
+	// `experimentSettled` is independent of readiness and still reports the assignment state.
+	Ready bool `json:"ready"`
+	// Whether turns on this session produce reasoning summaries, honouring an explicit session
+	// reasoning-summary override.
+	SessionShowsSummaries bool `json:"sessionShowsSummaries"`
+	// Whether to show the hint that reasoning summaries are hidden. Always false while
+	// `experimentSettled` is false.
+	ShowHiddenHint bool `json:"showHiddenHint"`
+	// Whether the selected model emits reasoning headers.
+	ShowReasoningHeaders bool `json:"showReasoningHeaders"`
+	// Default reasoning visibility, and only meaningful once `ready` is true: false when the
+	// session produces no summaries, else the persisted setting, else the experiment's default.
+	// While `ready` is true it is omitted only when all three are unavailable, that is when the
+	// session produces summaries, no `persistedShowReasoning` was supplied, and
+	// `experimentSettled` is false. While `ready` is false there is no model policy to report
+	// and this field is always omitted, so an absent value alone does not imply a pending
+	// experiment.
+	Visibility *bool `json:"visibility,omitempty"`
+}
+
 // List of Copilot models available to the resolved user, including capabilities and billing
 // metadata.
 // Experimental: ModelList is part of an experimental API and may change or be removed.
@@ -10270,12 +12187,17 @@ type ModelSwitchToRequest struct {
 	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.
+	// Model id to switch to, as returned by `list`. Include providerId to select an exact
+	// catalog entry when providers share the id. Without providerId, a bare id retains
+	// incumbent selection behavior; a registry-qualified id (`provider/id`, e.g.
+	// `acme/claude-sonnet`) targets a BYOK model.
 	ModelID string `json:"modelId"`
 	// Optional settings context and explicit-override flags used to persist a picker selection.
 	PickerPersistence *ModelPickerPersistenceRequest `json:"pickerPersistence,omitempty"`
+	// Provider id from the selected list entry's provider reference. Selects this exact
+	// provider/model pair; an unavailable pair fails rather than using another provider. Omit
+	// for deterministic legacy bare-model selection.
+	ProviderID *string `json:"providerId,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. Pass null to clear any session effort override and fall back to the model's
@@ -10360,6 +12282,8 @@ type ModeSetRequest struct {
 	PlanModel *string `json:"planModel,omitempty"`
 	// Whether a dedicated plan model is configured.
 	PlanModelConfigured *bool `json:"planModelConfigured,omitempty"`
+	// Provider owning planModel. Omit for legacy bare-model selection.
+	PlanModelProviderID *string `json:"planModelProviderId,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.
@@ -10529,6 +12453,39 @@ type OptionsUpdateAdditionalContentExclusionPolicyRuleSource struct {
 	Type string `json:"type"`
 }
 
+// External tool call of the session or one of its sub-agents that is still waiting for
+// session.tools.handlePendingToolCall.
+// Experimental: PendingExternalToolRequest is part of an experimental API and may change or
+// be removed.
+type PendingExternalToolRequest struct {
+	// Sub-agent instance identifier (the envelope agentId of its events) of the agent that
+	// issued the call; absent for calls issued by the root agent
+	AgentID *string `json:"agentId,omitempty"`
+	// Arguments to pass to the external tool
+	Arguments any `json:"arguments,omitempty"`
+	// Stable identity of the provider that offered the tool, for hosts that route
+	// extension-owned tools by provider
+	ProviderID *string `json:"providerId,omitempty"`
+	// Request ID to pass to session.tools.handlePendingToolCall
+	RequestID string `json:"requestId"`
+	// Tool call ID assigned to this external tool invocation
+	ToolCallID string `json:"toolCallId"`
+	// Name of the external tool to invoke
+	ToolName string `json:"toolName"`
+}
+
+// External tool calls still waiting for a result.
+// Experimental: PendingExternalToolRequestList is part of an experimental API and may
+// change or be removed.
+type PendingExternalToolRequestList struct {
+	// External tool calls of the session and its sub-agents that
+	// session.tools.handlePendingToolCall would still accept, in the order they were requested.
+	// Includes calls that were pending when the session was last suspended and resumed with
+	// pending work continued, so a host that did not observe the original
+	// external_tool.requested event can answer them.
+	Items []PendingExternalToolRequest `json:"items"`
+}
+
 // Pending permission prompt reconstructed from event history, with request ID and
 // user-facing prompt details.
 // Experimental: PendingPermissionRequest is part of an experimental API and may change or
@@ -11370,6 +13327,12 @@ type PermissionRecoveryData struct {
 	// Policy selected from the current client's response capability; mode or client changes may
 	// update it during recovery
 	OnBlocked PermissionRecoveryOnBlocked `json:"onBlocked"`
+	// Subagent identifier that owns this recovery episode when the request was delegated
+	// through a parent permission service
+	OwnerAgentID *string `json:"ownerAgentId,omitempty"`
+	// Root or child execution-session identifier that owns this recovery episode; omitted for
+	// legacy snapshots
+	OwnerSessionID *string `json:"ownerSessionId,omitempty"`
 	// Controlled reason for the latest episode transition
 	Reason PermissionRecoveryReason `json:"reason"`
 	// Current lifecycle state of the recovery episode
@@ -11483,6 +13446,32 @@ type PermissionsConfigureResult struct {
 	Success bool `json:"success"`
 }
 
+// The verbatim managed `permissions` slice to interpret.
+// Experimental: PermissionsEvaluateManagedPolicyParams is part of an experimental API and
+// may change or be removed.
+// Internal: PermissionsEvaluateManagedPolicyParams is an internal SDK API and is not part
+// of the public surface.
+type PermissionsEvaluateManagedPolicyParams struct {
+	// The `permissions` object from a managed settings layer, for example
+	// `{"disableBypassPermissionsMode":"disable"}`. Omitted or null means no managed policy
+	// applies.
+	Permissions any `json:"permissions,omitempty"`
+}
+
+// The policy questions a host asks before granting elevated permissions.
+// Experimental: PermissionsEvaluateManagedPolicyResult is part of an experimental API and
+// may change or be removed.
+type PermissionsEvaluateManagedPolicyResult struct {
+	// True when managed policy forbids bypass-permissions mode, so allow-all style flags must
+	// not take effect.
+	BypassPermissionsDisabled bool `json:"bypassPermissionsDisabled"`
+	// True when the managed layer supplies permission rules that the session must enforce.
+	PermissionRulesActive bool `json:"permissionRulesActive"`
+	// True when a managed policy exists but this build could not determine its meaning. Hosts
+	// fail closed on it rather than assuming permission was granted.
+	PolicyUndetermined bool `json:"policyUndetermined"`
+}
+
 // Indicates whether the operation succeeded.
 // Experimental: PermissionsFolderTrustAddTrustedResult is part of an experimental API and
 // may change or be removed.
@@ -11862,6 +13851,31 @@ type PermissionURLsSetUnrestrictedModeParams struct {
 	Enabled bool `json:"enabled"`
 }
 
+// A complete JSON snapshot to write under the runtime's per-path file lock.
+// Experimental: PersistenceWriteRawJSONLockedRequest is part of an experimental API and may
+// change or be removed.
+type PersistenceWriteRawJSONLockedRequest struct {
+	// The serialized JSON document to write. It replaces the file's contents entirely; nothing
+	// is merged.
+	DataJSON string `json:"dataJson"`
+	// Comment lines to emit above the document, for a format that tolerates them. Omit for
+	// strict JSON.
+	FileHeader *string `json:"fileHeader,omitempty"`
+	// Absolute path of the file to replace. Parent directories are created when missing.
+	Path string `json:"path"`
+}
+
+// The outcome of a locked snapshot write.
+// Experimental: PersistenceWriteRawJSONLockedResult is part of an experimental API and may
+// change or be removed.
+type PersistenceWriteRawJSONLockedResult struct {
+	// Why the write failed. Absent when `success` is true. A lock the runtime could not acquire
+	// in time reports here rather than raising.
+	Error *string `json:"error,omitempty"`
+	// Whether the file now holds the requested contents.
+	Success bool `json:"success"`
+}
+
 // Optional message to echo back to the caller.
 // Experimental: PingRequest is part of an experimental API and may change or be removed.
 type PingRequest struct {
@@ -12484,6 +14498,114 @@ type ProviderModelConfig struct {
 	WireModel *string `json:"wireModel,omitempty"`
 }
 
+// An authoritative monthly usage reading for the observation's provider, account, and
+// service.
+// Experimental: ProviderMonthlyUsage is part of an experimental API and may change or be
+// removed.
+type ProviderMonthlyUsage struct {
+	// Nonnegative finite consumption reported by the service, preserving zero and fractions.
+	// Present only when state is available; never computed from tokens or balance differences.
+	ConsumedQuantity *float64 `json:"consumedQuantity,omitempty"`
+	// Start of the service-reported monthly billing cycle, in UTC RFC 3339.
+	CycleStart *string `json:"cycleStart,omitempty"`
+	// Service read time in UTC RFC 3339, not a ledger reconciliation watermark or confirmation
+	// of the latest inference charge.
+	QueriedAt *string `json:"queriedAt,omitempty"`
+	// End of the service-reported monthly billing cycle, in UTC RFC 3339.
+	ResetOn *string `json:"resetOn,omitempty"`
+	// Identity scope of the reading within its provider and service.
+	Scope ProviderMonthlyUsageScope `json:"scope"`
+	// Availability of monthly consumption. Missing or unavailable usage must never be
+	// interpreted as zero.
+	State ProviderMonthlyUsageState `json:"state"`
+	// Unit of consumedQuantity; independent of the parent observation's balance unit.
+	Unit ProviderQuotaUnit `json:"unit"`
+}
+
+// Authoritative budget measurements and policy metadata, independent of provider.
+// Experimental: ProviderQuotaBudgetMetadata is part of an experimental API and may change
+// or be removed.
+type ProviderQuotaBudgetMetadata struct {
+	// Exact measured consumption in the budget's unit.
+	Consumed float64 `json:"consumed"`
+	// Exact budget entitlement, retaining incumbent fractional-unit compatibility.
+	Entitlement float64 `json:"entitlement"`
+	// Usage beyond entitlement, in the budget's unit.
+	Overage float64 `json:"overage"`
+	// Whether additional usage is allowed when the budget is exhausted.
+	OverageAllowedWhenExhausted bool `json:"overageAllowedWhenExhausted"`
+	// Optional additional-usage budget cap.
+	OverageLimit *float64 `json:"overageLimit,omitempty"`
+	// Service-reported remaining percentage for authoritative budget presentation.
+	RemainingPercentage float64 `json:"remainingPercentage"`
+	// Reset instant in epoch milliseconds when this budget actually defines a window.
+	ResetAtEpochMs *float64 `json:"resetAtEpochMs,omitempty"`
+	// Whether the reset instant is an estimate.
+	ResetEstimated *bool `json:"resetEstimated,omitempty"`
+	// Whether this budget uses token-based billing.
+	TokenBasedBilling *bool `json:"tokenBasedBilling,omitempty"`
+	// Whether the budget has unlimited entitlement.
+	Unlimited bool `json:"unlimited"`
+	// Whether service policy allows continued usage after exhaustion.
+	UsageAllowedWhenExhausted bool `json:"usageAllowedWhenExhausted"`
+}
+
+// An account quota reading. Absence of a quantity is unknown, never zero.
+// Experimental: ProviderQuotaState is part of an experimental API and may change or be
+// removed.
+type ProviderQuotaState struct {
+	// Whether the service permits access, independently of balance.
+	AccessState ProviderQuotaAccessState `json:"accessState"`
+	// Service error code or client acquisition category, separate from the business-state
+	// reason.
+	AcquisitionError *string `json:"acquisitionError,omitempty"`
+	// Acquisition outcome. Unavailable/failed readings have no service verdict; access/capacity
+	// unavailable are compatibility placeholders only.
+	AcquisitionStatus *ProviderQuotaAcquisitionStatus `json:"acquisitionStatus,omitempty"`
+	// Independently reported signed 64-bit available quantity. Zero does not override the
+	// service access/capacity verdict; omission and null are preserved.
+	AvailableQuantity *int64 `json:"availableQuantity,omitempty"`
+	// Optional metadata for an authoritative budget. Advisory balances and admission-only
+	// observations do not populate this.
+	BudgetMetadata *ProviderQuotaBudgetMetadata `json:"budgetMetadata,omitempty"`
+	// Service capacity state; missing quantities do not imply exhaustion.
+	CapacityState ProviderQuotaCapacityState `json:"capacityState"`
+	// Key for the backwards-compatible snapshots projection, when the authoritative budget
+	// supports that contract.
+	CompatibilityKey *string `json:"compatibilityKey,omitempty"`
+	// Independently reported signed 64-bit entitlement. -1 is an unlimited sentinel, not a
+	// capacity-state rewrite; omission and null are preserved.
+	EntitledQuantity *int64 `json:"entitledQuantity,omitempty"`
+	// Explicit service admission flag, when reported.
+	HasQuota *bool `json:"hasQuota,omitempty"`
+	// HTTP status from acquisition, when available.
+	HTTPStatus *int64 `json:"httpStatus,omitempty"`
+	// Service-reported monthly consumption, independent of quota balances and per-call or
+	// session cost. Omitted when the service does not report monthly usage.
+	MonthlyUsage *ProviderMonthlyUsage `json:"monthlyUsage,omitempty"`
+	// Whether this is a GET account reading or a pre-response admission observation.
+	// Observations are never merged across kinds.
+	ObservationKind *ProviderQuotaObservationKind `json:"observationKind,omitempty"`
+	// When the runtime observed this reading, not a charge timestamp or guarantee that
+	// consumption has settled.
+	ObservedAt *string `json:"observedAt,omitempty"`
+	// Provider/account whose service reported this state.
+	Provider ModelProviderRef `json:"provider"`
+	// Whether quantities are authoritative budget measurements, advisory balances, or absent.
+	// Only authoritative budgets support percentage presentation.
+	QuantityKind *ProviderQuotaQuantityKind `json:"quantityKind,omitempty"`
+	// Service-owned quota identifier within this provider.
+	QuotaID string `json:"quotaId"`
+	// Service-reported explanation for the state.
+	Reason *string `json:"reason,omitempty"`
+	// Service name owning this reading.
+	Service *string `json:"service,omitempty"`
+	// Service-reported quota source.
+	Source *string `json:"source,omitempty"`
+	// Unit of entitledQuantity and availableQuantity.
+	Unit ProviderQuotaUnit `json:"unit"`
+}
+
 // 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.
 // Experimental: ProviderSessionToken is part of an experimental API and may change or be
@@ -13318,6 +15440,23 @@ type QueueWithdrawMessageResult struct {
 	Removed bool `json:"removed"`
 }
 
+// Pending warnings returned and cleared by session.quota.takeWarnings.
+// Experimental: QuotaTakeWarningsResult is part of an experimental API and may change or be
+// removed.
+type QuotaTakeWarningsResult []QuotaWarningProjection
+
+// A pending session quota warning, consumed once by takeWarnings.
+// Experimental: QuotaWarningProjection is part of an experimental API and may change or be
+// removed.
+type QuotaWarningProjection struct {
+	// User-facing warning text.
+	Message string `json:"message"`
+	// Related account or upgrade link.
+	URL *string `json:"url,omitempty"`
+	// Existing warning category.
+	WarningType string `json:"warningType"`
+}
+
 // Event type to register consumer interest for, used by runtime gating logic.
 // Experimental: RegisterEventInterestParams is part of an experimental API and may change
 // or be removed.
@@ -13581,6 +15720,100 @@ type RemoteSessionRepository struct {
 	Owner string `json:"owner"`
 }
 
+// One atomic edit of an allowed top-level repository setting.
+// Experimental: RepoSettingsEditRequest is part of an experimental API and may change or be
+// removed.
+// Internal: RepoSettingsEditRequest is an internal SDK API and is not part of the public
+// surface.
+type RepoSettingsEditRequest struct {
+	// One canonical top-level repository setting that the allowlist permits.
+	Key string `json:"key"`
+	// Set a scalar, add or remove a string list item, or remove the setting. The handler
+	// rejects a missing or incompatible value.
+	// Internal: Operation is part of the SDK's internal API surface and is not intended for
+	// external use.
+	Operation SettingsEditOperation `json:"operation"`
+	// Absolute path of the repository root.
+	RepoRoot string `json:"repoRoot"`
+	// Shared or local repository settings file.
+	// Internal: Scope is part of the SDK's internal API surface and is not intended for
+	// external use.
+	Scope RepoSettingsEditScope `json:"scope"`
+	// Required boolean, string or number for set, required string for add-item and remove-item,
+	// and forbidden for remove. The runtime rejects all other JSON values.
+	Value any `json:"value,omitempty"`
+}
+
+// Which repository settings file to read.
+// Experimental: RepoSettingsReadRawRequest is part of an experimental API and may change or
+// be removed.
+// Internal: RepoSettingsReadRawRequest is an internal SDK API and is not part of the public
+// surface.
+type RepoSettingsReadRawRequest struct {
+	// Absolute path of the repository root.
+	RepoRoot string `json:"repoRoot"`
+	// Use repo for shared settings or local for settings.local.json. Other scopes are rejected.
+	Scope string `json:"scope"`
+}
+
+// Parsed repository settings without normalization or layering.
+// Experimental: RepoSettingsReadRawResult is part of an experimental API and may change or
+// be removed.
+// Internal: RepoSettingsReadRawResult is an internal SDK API and is not part of the public
+// surface.
+type RepoSettingsReadRawResult struct {
+	// Stored JSON values after the existing JSONC parser and prototype-safety checks. Empty
+	// when the file is missing, blank, or invalid.
+	Config any `json:"config"`
+	// True when the file exists but did not parse, so `config` is empty for that reason rather
+	// than because nothing is set.
+	Invalid bool `json:"invalid"`
+}
+
+// The complete set of repository-overridable settings to store.
+// Experimental: RepoSettingsWriteAllRequest is part of an experimental API and may change
+// or be removed.
+// Internal: RepoSettingsWriteAllRequest is an internal SDK API and is not part of the
+// public surface.
+type RepoSettingsWriteAllRequest struct {
+	// Absolute path of the repository root.
+	RepoRoot string `json:"repoRoot"`
+	// Use repo for shared settings or local for settings.local.json. Other scopes are rejected.
+	Scope string `json:"scope"`
+	// Object of allowed settings to store. Missing allowlisted keys are removed. Other input
+	// keys are ignored, while unknown stored keys are preserved.
+	Settings any `json:"settings"`
+}
+
+// Experimental: RepoSettingsWriteAllResult is part of an experimental API and may change or
+// be removed.
+type RepoSettingsWriteAllResult struct {
+}
+
+// One key to write or remove in a repository settings file.
+// Experimental: RepoSettingsWriteKeyRequest is part of an experimental API and may change
+// or be removed.
+// Internal: RepoSettingsWriteKeyRequest is an internal SDK API and is not part of the
+// public surface.
+type RepoSettingsWriteKeyRequest struct {
+	// True to remove the key instead of writing it.
+	Delete *bool `json:"delete,omitempty"`
+	// Canonical top-level key permitted by the repository settings allowlist.
+	Key string `json:"key"`
+	// Absolute path of the repository root.
+	RepoRoot string `json:"repoRoot"`
+	// Use repo for shared settings or local for settings.local.json. Other scopes are rejected.
+	Scope string `json:"scope"`
+	// Value to validate and write. Required unless delete is true; a null value is validated,
+	// not treated as deletion.
+	Value any `json:"value,omitempty"`
+}
+
+// Experimental: RepoSettingsWriteKeyResult is part of an experimental API and may change or
+// be removed.
+type RepoSettingsWriteKeyResult struct {
+}
+
 // Experimental: ResponseFormat is part of an experimental API and may change or be removed.
 type ResponseFormat struct {
 	// JSON Schema and provider options for the turn's output.
@@ -13594,6 +15827,30 @@ type ResponseFormat struct {
 type RuntimeShutdownResult struct {
 }
 
+// The stored sandbox settings to resolve against the defaults.
+// Experimental: SandboxApplyDefaultsRequest is part of an experimental API and may change
+// or be removed.
+type SandboxApplyDefaultsRequest struct {
+	// The sandbox settings as stored in the settings file. An empty object resolves to the
+	// defaults alone.
+	Stored any `json:"stored"`
+}
+
+// True when the command stays available while enforcement is blocked.
+// Experimental: SandboxCheckEnforcementCommandResult is part of an experimental API and may
+// change or be removed.
+type SandboxCheckEnforcementCommandResult bool
+
+// True when an OS-level sandbox can run on this host.
+// Experimental: SandboxCheckPlatformSupportResult is part of an experimental API and may
+// change or be removed.
+type SandboxCheckPlatformSupportResult bool
+
+// True when the sandbox on this host can reach host loopback directly.
+// Experimental: SandboxCheckWindowsHostLoopbackSupportResult is part of an experimental API
+// and may change or be removed.
+type SandboxCheckWindowsHostLoopbackSupportResult bool
+
 // Resolved sandbox configuration.
 // Experimental: SandboxConfig is part of an experimental API and may change or be removed.
 type SandboxConfig struct {
@@ -13783,6 +16040,29 @@ type SandboxCredentialsConfig struct {
 	EnvVars map[string]SandboxMaskedEnvVar `json:"envVars"`
 }
 
+// A possible secret-bearing environment variable and optional locally suggested HTTPS
+// injection hosts. This is a draft for user review, not an active grant.
+// Experimental: SandboxCredentialSuggestion is part of an experimental API and may change
+// or be removed.
+type SandboxCredentialSuggestion struct {
+	// Environment variable name. The secret value is never returned.
+	Name string `json:"name"`
+	// HTTPS hostnames suggested by a local known-provider mapping. An empty list requires the
+	// user to supply injection hosts before adding a masking entry. These suggestions do not
+	// allow network access.
+	SuggestedInjectHosts []string `json:"suggestedInjectHosts"`
+}
+
+// Possible unconfigured secrets in the sandbox shell environment, sorted by variable name,
+// with no secret values.
+// Experimental: SandboxCredentialSuggestionsResult is part of an experimental API and may
+// change or be removed.
+type SandboxCredentialSuggestionsResult struct {
+	// Candidates for user review. Empty when sandboxing is disabled or no unconfigured
+	// candidates are present.
+	Suggestions []SandboxCredentialSuggestion `json:"suggestions"`
+}
+
 // Request to disable sandboxing for the current session while resolving an active
 // sandbox-bypass permission prompt.
 // Experimental: SandboxDisableForSessionRequest is part of an experimental API and may
@@ -13805,6 +16085,52 @@ type SandboxDisableForSessionResult struct {
 	Success bool `json:"success"`
 }
 
+// The documentation URL a host cites when it declines or downgrades a sandbox setting.
+// Experimental: SandboxDocsURLResult is part of an experimental API and may change or be
+// removed.
+type SandboxDocsURLResult struct {
+	// Documentation URL describing the sandbox and the settings that control it.
+	URL string `json:"url"`
+}
+
+// A sandbox config and the per-feature routing flag to resolve it for.
+// Experimental: SandboxEffectiveForOptionalParams is part of an experimental API and may
+// change or be removed.
+// Internal: SandboxEffectiveForOptionalParams is an internal SDK API and is not part of the
+// public surface.
+type SandboxEffectiveForOptionalParams struct {
+	// The routing flag naming the feature being launched, such as `sandboxMcpServers` or
+	// `sandboxLspServers`.
+	RoutingFlag string `json:"routingFlag"`
+	// The session's resolved `sandbox` slice. Omitted when the host has none, which yields a
+	// disabled sandbox rather than an error.
+	Sandbox any `json:"sandbox,omitempty"`
+}
+
+// The sandbox a named feature actually launches under.
+// Experimental: SandboxEffectiveForOptionalResult is part of an experimental API and may
+// change or be removed.
+// Internal: SandboxEffectiveForOptionalResult is an internal SDK API and is not part of the
+// public surface.
+type SandboxEffectiveForOptionalResult struct {
+	// The effective sandbox config for the requested feature, or a disabled sandbox when the
+	// feature is routed out of it.
+	SandboxJSON any `json:"sandboxJson"`
+}
+
+// One slash command, as typed, to test against the enforcement-block allowlist.
+// Experimental: SandboxEnforcementCommandAllowedParams is part of an experimental API and
+// may change or be removed.
+// Internal: SandboxEnforcementCommandAllowedParams is an internal SDK API and is not part
+// of the public surface.
+type SandboxEnforcementCommandAllowedParams struct {
+	// The command's arguments, in order. Pass an empty array for a bare command: several
+	// entries in the allowlist admit the bare form and refuse every argument.
+	Args []string `json:"args"`
+	// The command name as the user typed it, with or without its leading slash.
+	CommandName string `json:"commandName"`
+}
+
 // Managed sandbox enforcement state for a session.
 // Experimental: SandboxEnforcementStatus is part of an experimental API and may change or
 // be removed.
@@ -13817,6 +16143,43 @@ type SandboxEnforcementStatus struct {
 	Required bool `json:"required"`
 }
 
+// A batch of file-picker candidates to check against a prepared policy.
+// Experimental: SandboxFilterPickerCandidatesParams is part of an experimental API and may
+// change or be removed.
+// Internal: SandboxFilterPickerCandidatesParams is an internal SDK API and is not part of
+// the public surface.
+type SandboxFilterPickerCandidatesParams struct {
+	// The candidates to check, in the order the answers are returned.
+	// Internal: Candidates is part of the SDK's internal API surface and is not intended for
+	// external use.
+	Candidates []SandboxPickerCandidate `json:"candidates"`
+	// The session's working directory, matching the one the policy was prepared from.
+	Cwd string `json:"cwd"`
+	// The policy returned by `sandbox.preparePickerPolicy`. Omitted keeps every candidate.
+	Sandbox any `json:"sandbox,omitempty"`
+}
+
+// Per-candidate allow decisions, positionally aligned with the request.
+// Experimental: SandboxFilterPickerCandidatesResult is part of an experimental API and may
+// change or be removed.
+// Internal: SandboxFilterPickerCandidatesResult is an internal SDK API and is not part of
+// the public surface.
+type SandboxFilterPickerCandidatesResult struct {
+	// One decision per candidate, in the same order. Always the same length as the request's
+	// `candidates`.
+	Allowed []bool `json:"allowed"`
+}
+
+// The user-facing refusal, including the platform remedy and the documentation link.
+// Experimental: SandboxGetUnsupportedMessageResult is part of an experimental API and may
+// change or be removed.
+type SandboxGetUnsupportedMessageResult string
+
+// The user-facing notice that a saved sandbox setting is inert for this session.
+// Experimental: SandboxGetUnsupportedSettingDisabledNoticeResult is part of an experimental
+// API and may change or be removed.
+type SandboxGetUnsupportedSettingDisabledNoticeResult string
+
 // Request to accept the sandbox path grant offered on an active sandbox escalation
 // permission prompt.
 // Experimental: SandboxGrantPathForRequestRequest is part of an experimental API and may
@@ -13850,12 +16213,15 @@ type SandboxHostCapability struct {
 	// tooling for Bubblewrap's private network namespace, such as slirp4netns),
 	// `network_filtering` (host rules and the sandbox proxy; on Linux this needs the same
 	// tooling as `network`; on Windows it needs Process Security Environment 1.1 host-loopback
-	// support, and a policy that uses it must also set `network.allowLocalNetwork`),
-	// `denied_paths` (native enforcement of `filesystem.deniedPaths`), `shell` (shell commands
-	// inside the sandbox), and `filesystem_enumeration` (enumerate-only filesystem grants; on
-	// Windows this needs Process Security Environment 1.1 filesystem enumeration support, and
-	// without it sandboxed PowerShell still runs but cannot resolve its current location; other
-	// platforms always report it).
+	// support or MXC's PSEC 1.0-only proxy-loopback compatibility capability, and a policy that
+	// uses it must also set `network.allowLocalNetwork`; compatibility applies only to an
+	// explicit identity-less runtime proxy, not general host-loopback access, and other policy
+	// restrictions still apply), `denied_paths` (native enforcement of
+	// `filesystem.deniedPaths`), `shell` (shell commands inside the sandbox), and
+	// `filesystem_enumeration` (enumerate-only filesystem grants; on Windows this needs Process
+	// Security Environment 1.1 filesystem enumeration support, and without it sandboxed
+	// PowerShell still runs but cannot resolve its current location; other platforms always
+	// report it).
 	Name string `json:"name"`
 	// Human-readable reason and remedy when the feature is unsupported, such as a package to
 	// install or an OS update. Present only when `supported` is false.
@@ -13871,17 +16237,20 @@ type SandboxHostCapability struct {
 // Bubblewrap's private network namespace, such as slirp4netns. `network_filtering` — host
 // rules and the sandbox proxy (`network.allowedHosts`, `network.blockedHosts`,
 // `network.proxy`); on Linux this needs the same tooling as `network`; on Windows it needs
-// a version with Process Security Environment 1.1 host-loopback support, and a policy that
-// uses it must also set `network.allowLocalNetwork`, because Windows reaches the local
-// proxy only together with private-network access. `denied_paths` — native enforcement of
-// `filesystem.deniedPaths`; on Windows this needs a version whose sandbox contract reports
-// denied-path support. `shell` — shell commands inside the sandbox: bash on macOS and
-// Linux, PowerShell on Windows. `filesystem_enumeration` — enumerate-only filesystem
-// grants, which PowerShell's drive roots use on Windows; this needs a version with Process
-// Security Environment 1.1 filesystem enumeration support. Without it, sandboxed PowerShell
-// still runs, but `Get-Location` may report the drive root, `Set-Location` may fail, and
-// relative paths may resolve against the drive root; the session also receives a
-// `session.warning` with `warningType` `sandbox`. Other platforms always report it.
+// Process Security Environment 1.1 host-loopback support or MXC's PSEC 1.0-only
+// proxy-loopback compatibility capability, and a policy that uses it must also set
+// `network.allowLocalNetwork`, because Windows reaches the local proxy only together with
+// private-network access. Compatibility applies only to an explicit identity-less runtime
+// proxy, not general host-loopback access, and other policy restrictions still apply.
+// `denied_paths` — native enforcement of `filesystem.deniedPaths`; on Windows this needs a
+// version whose sandbox contract reports denied-path support. `shell` — shell commands
+// inside the sandbox: bash on macOS and Linux, PowerShell on Windows.
+// `filesystem_enumeration` — enumerate-only filesystem grants, which PowerShell's drive
+// roots use on Windows; this needs a version with Process Security Environment 1.1
+// filesystem enumeration support. Without it, sandboxed PowerShell still runs, but
+// `Get-Location` may report the drive root, `Set-Location` may fail, and relative paths may
+// resolve against the drive root; the session also receives a `session.warning` with
+// `warningType` `sandbox`. Other platforms always report it.
 // Experimental: SandboxHostCapabilityName is part of an experimental API and may change or
 // be removed.
 type SandboxHostCapabilityName string
@@ -13914,6 +16283,56 @@ type SandboxMaskedEnvVar struct {
 	InjectHosts []string `json:"injectHosts"`
 }
 
+// One file-picker suggestion offered up for the sandbox filesystem check.
+// Experimental: SandboxPickerCandidate is part of an experimental API and may change or be
+// removed.
+// Internal: SandboxPickerCandidate is an internal SDK API and is not part of the public
+// surface.
+type SandboxPickerCandidate struct {
+	// Whether the suggestion is a directory. A directory the policy does not itself allow may
+	// still be needed as a waypoint to an allowed subtree.
+	IsDirectory bool `json:"isDirectory"`
+	// Absolute path the suggestion would attach.
+	Path string `json:"path"`
+}
+
+// The working directory and sandbox settings to build a file-picker policy from.
+// Experimental: SandboxPreparePickerPolicyParams is part of an experimental API and may
+// change or be removed.
+// Internal: SandboxPreparePickerPolicyParams is an internal SDK API and is not part of the
+// public surface.
+type SandboxPreparePickerPolicyParams struct {
+	// The session's working directory. Git discovery and grant canonicalization are resolved
+	// against it.
+	Cwd string `json:"cwd"`
+	// The session's resolved `sandbox` slice. Omitted, or disabled, yields no policy and every
+	// candidate is kept.
+	Sandbox any `json:"sandbox,omitempty"`
+}
+
+// The prepared file-picker policy, or none when the sandbox is disabled.
+// Experimental: SandboxPreparePickerPolicyResult is part of an experimental API and may
+// change or be removed.
+// Internal: SandboxPreparePickerPolicyResult is an internal SDK API and is not part of the
+// public surface.
+type SandboxPreparePickerPolicyResult struct {
+	// The prepared policy to pass back to `sandbox.filterPickerCandidates`. Absent when the
+	// sandbox is disabled or absent, in which case filtering keeps every candidate.
+	SandboxJSON any `json:"sandboxJson,omitempty"`
+}
+
+// True when this process can offer installing the sandbox credential-proxy certificate
+// authority into OS trust.
+// Experimental: SandboxProxyCaCheckInstallationSupportResult is part of an experimental API
+// and may change or be removed.
+type SandboxProxyCaCheckInstallationSupportResult bool
+
+// True when the sandbox configuration uses the credential proxy and can need
+// certificate-authority setup.
+// Experimental: SandboxProxyCaCheckRelevanceResult is part of an experimental API and may
+// change or be removed.
+type SandboxProxyCaCheckRelevanceResult bool
+
 // Result of creating the persistent certificate authority of the sandbox credential proxy.
 // Experimental: SandboxProxyCaCreateResult is part of an experimental API and may change or
 // be removed.
@@ -13949,6 +16368,108 @@ type SandboxProxyCaStatus struct {
 	State SandboxProxyCaState `json:"state"`
 }
 
+// Experimental: SandboxProxySecretDeleteResult is part of an experimental API and may
+// change or be removed.
+type SandboxProxySecretDeleteResult struct {
+}
+
+// The stored sandbox proxy password, if one is present.
+// Experimental: SandboxProxySecretGetResult is part of an experimental API and may change
+// or be removed.
+type SandboxProxySecretGetResult struct {
+	// The stored password. Absent when no entry exists in either the keychain or the on-disk
+	// fallback store.
+	Value *string `json:"value,omitempty"`
+}
+
+// Where this runtime keeps the sandbox proxy password.
+// Experimental: SandboxProxySecretLocation is part of an experimental API and may change or
+// be removed.
+type SandboxProxySecretLocation struct {
+	// Absolute path of the credential store holding the sandbox proxy password. The proxy
+	// password belongs to no MCP server, so it is kept in its own directory rather than in the
+	// MCP secret store.
+	ConfigDir string `json:"configDir"`
+	// Identifier of the proxy password entry within that store. Derived from the configuration
+	// directory, so two Copilot homes on one machine never share an entry. Use it to recognize
+	// a `${secret:…}` reference in stored settings as this runtime's own proxy password.
+	SecretID string `json:"secretId"`
+}
+
+// The sandbox proxy password to store.
+// Experimental: SandboxProxySecretSaveRequest is part of an experimental API and may change
+// or be removed.
+type SandboxProxySecretSaveRequest struct {
+	// The password to store for the sandbox proxy.
+	Value string `json:"value"`
+}
+
+// Where the sandbox proxy password was stored.
+// Experimental: SandboxProxySecretSaveResult is part of an experimental API and may change
+// or be removed.
+type SandboxProxySecretSaveResult struct {
+	// Whether the OS keychain accepted the value. False means it was written to the on-disk
+	// fallback store instead, which is still readable by `sandbox.proxySecret.get`.
+	StoredInKeychain bool `json:"storedInKeychain"`
+}
+
+// The user's sandbox settings and the managed sandbox floor to raise them to.
+// Experimental: SandboxResolveFlooredConfigParams is part of an experimental API and may
+// change or be removed.
+// Internal: SandboxResolveFlooredConfigParams is an internal SDK API and is not part of the
+// public surface.
+type SandboxResolveFlooredConfigParams struct {
+	// The effective managed `sandbox` slice acting as a floor. Omitted when no administrator
+	// policy applies, in which case the user's own settings stand unchanged.
+	ManagedSandbox any `json:"managedSandbox,omitempty"`
+	// The user's own `sandbox` settings slice. Omitted when the user has configured none, which
+	// still yields the managed floor rather than a disabled sandbox.
+	UserSandbox any `json:"userSandbox,omitempty"`
+}
+
+// The user's sandbox settings raised to the managed floor.
+// Experimental: SandboxResolveFlooredConfigResult is part of an experimental API and may
+// change or be removed.
+type SandboxResolveFlooredConfigResult struct {
+	// The floored sandbox config, normalized through the declared sandbox shape so only
+	// declared fields in a fixed order are present.
+	SandboxJSON any `json:"sandboxJson"`
+}
+
+// The effective sandbox settings, with every unset value resolved to its default.
+// Experimental: SandboxSettingsApplyDefaultsResult is part of an experimental API and may
+// change or be removed.
+type SandboxSettingsApplyDefaultsResult map[string]any
+
+// The managed sandbox policy in force, which selects which remedy the notice offers.
+// Experimental: SandboxUnsupportedStartupNoticeParams is part of an experimental API and
+// may change or be removed.
+// Internal: SandboxUnsupportedStartupNoticeParams is an internal SDK API and is not part of
+// the public surface.
+type SandboxUnsupportedStartupNoticeParams struct {
+	// True when the sandbox stayed on only because the managed policy could not be determined.
+	// Distinguishes a policy that positively enforces the sandbox from one that merely failed
+	// to resolve, which is the difference between telling the user to contact an administrator
+	// and telling them to wait. Defaults to false.
+	EnabledByUndeterminedPolicy *bool `json:"enabledByUndeterminedPolicy,omitempty"`
+	// The managed `sandbox` slice, when a policy supplies one. The notice treats the sandbox as
+	// enforced only when this both enables it and sets `failIfUnavailable`, because a managed
+	// sandbox that tolerates being unavailable still leaves the user able to turn it off.
+	ManagedSandbox any `json:"managedSandbox,omitempty"`
+}
+
+// The startup warning, absent when the machine can run a sandbox.
+// Experimental: SandboxUnsupportedStartupNoticeResult is part of an experimental API and
+// may change or be removed.
+// Internal: SandboxUnsupportedStartupNoticeResult is an internal SDK API and is not part of
+// the public surface.
+type SandboxUnsupportedStartupNoticeResult struct {
+	// The user-facing warning, carrying the platform remedy and the recovery the policy in
+	// force actually allows. Absent when this machine supports a sandbox, so a host can call
+	// unconditionally and print only what it gets.
+	Notice *string `json:"notice,omitempty"`
+}
+
 // Register an absolute-time scheduled prompt.
 // Experimental: ScheduleAddAtRequest is part of an experimental API and may change or be
 // removed.
@@ -14475,6 +16996,16 @@ type SessionCompletionItem struct {
 	RangeStart *int64 `json:"rangeStart,omitempty"`
 }
 
+// The IDE a host is connected to, as reported to the session.
+// Experimental: SessionConnectedIdeInfo is part of an experimental API and may change or be
+// removed.
+type SessionConnectedIdeInfo struct {
+	// Display name of the connected IDE, for example `VS Code`.
+	IdeName string `json:"ideName"`
+	// Absolute path of the workspace folder the IDE has open.
+	WorkspaceFolder string `json:"workspaceFolder"`
+}
+
 // Pre-resolved working-directory context for session startup.
 // Experimental: SessionContext is part of an experimental API and may change or be removed.
 type SessionContext struct {
@@ -14495,7 +17026,8 @@ 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
+	// Output reservation overlapping the displayed prompt allowance plus the tokens past the
+	// effective input budget's buffer-exhaustion blocking threshold. Mirrors
 	// `SessionContextInfo.bufferTokens`.
 	BufferTokens int64 `json:"bufferTokens"`
 	// The six normalized `/context` header buckets, computed from the same tokenization as
@@ -14511,9 +17043,9 @@ type SessionContextAttribution struct {
 	// 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`.
+	// Advertised prompt allowance for the selected context tier: the denominator for
+	// context-usage displays and capacity for `categories.freeSpace` and `categories.buffer`.
+	// 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
@@ -14524,8 +17056,8 @@ type SessionContextAttribution struct {
 	// `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`.
+	// Effective input budget after reserving requested output against the combined context
+	// ceiling. 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
@@ -14538,7 +17070,7 @@ type SessionContextAttribution struct {
 // 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.
+	// Overlapping output reservation plus post-blocking-threshold buffer.
 	Buffer int64 `json:"buffer"`
 	// Custom-instructions tokens (0 when none are configured).
 	CustomInstructions int64 `json:"customInstructions"`
@@ -14588,22 +17120,32 @@ type SessionContextAttributionEntriesItem struct {
 // Experimental: SessionContextInfo is part of an experimental API and may change or be
 // removed.
 type SessionContextInfo struct {
-	// Output reserve plus tokens after the buffer-exhaustion blocking threshold (default 95%)
+	// Output reservation overlapping the displayed prompt allowance plus tokens after the
+	// effective input budget's buffer-exhaustion blocking threshold (default 95%).
 	BufferTokens int64 `json:"bufferTokens"`
 	// Token count at which background compaction starts (configurable percentage of
 	// promptTokenLimit)
 	CompactionThreshold int64 `json:"compactionThreshold"`
 	// Tokens consumed by user/assistant/tool messages
 	ConversationTokens int64 `json:"conversationTokens"`
-	// Prompt token limit plus the model's full output token limit.
+	// Provider-owned model display label, or the Auto routing label. Presentation only;
+	// modelName remains the tokenization identity.
+	DisplayModelName *string `json:"displayModelName,omitempty"`
+	// Advertised prompt allowance for the selected context tier, without adding output tokens.
+	// The denominator for context-usage displays.
 	Limit int64 `json:"limit"`
 	// Tokens consumed by MCP tool definitions (subset of toolDefinitionsTokens, excludes
 	// deferred tools)
 	MCPToolsTokens int64 `json:"mcpToolsTokens"`
 	// The model used for token counting
 	ModelName string `json:"modelName"`
-	// Maximum prompt tokens allowed by the model (or DEFAULT_TOKEN_LIMIT if unspecified)
+	// Effective input budget: the selected tier's prompt allowance bounded by the combined
+	// context ceiling minus the requested output allowance. Uses DEFAULT_TOKEN_LIMIT when
+	// limits are unspecified.
 	PromptTokenLimit int64 `json:"promptTokenLimit"`
+	// Provider whose catalog supplies this context window. Omitted when provider identity is
+	// unavailable.
+	Provider *ModelProviderRef `json:"provider,omitempty"`
 	// Tokens consumed by the system prompt
 	SystemTokens int64 `json:"systemTokens"`
 	// Tokens consumed by tool definitions sent to the model (excludes deferred tools)
@@ -15356,12 +17898,21 @@ type SessionManagedPermissions struct {
 	Ask []string `json:"ask,omitzero"`
 	// Permission rules that block matching operations. Deny has highest precedence.
 	Deny []string `json:"deny,omitzero"`
+	// When true, prevents Assisted Permissions from being activated. An actively Assisted
+	// session falls back to Manual Approval while the policy is in force. Omit the key or set
+	// it to false to impose no restriction.
+	DisableAssistedPermissionsMode *bool `json:"disableAssistedPermissionsMode,omitempty"`
 	// When set to `disable`, prevents bypass/allow-all permission modes. Advisory auto-approval
 	// remains available because normal prompt paths stay active. 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"`
+	// Closed-world host boundary expressed as `Domain(hostname)`, `Domain(IP)`, or
+	// `Domain(*.example.com)` rules. Schemes, ports, paths, queries, and fragments are rejected
+	// because every network request must be enforceable at host-level egress. Multiple managed
+	// sources intersect their lists; an empty list denies all hosts.
+	LimitTo []string `json:"limitTo,omitzero"`
 }
 
 // Managed settings an SDK host may inject at session startup. Only permissions are accepted
@@ -15465,6 +18016,20 @@ type SessionMCPReloadResult struct {
 type SessionMCPRestartServerResult struct {
 }
 
+// Records which IDE the host is connected to, or clears it.
+// Experimental: SessionMCPSetConnectedIdeInfoParams is part of an experimental API and may
+// change or be removed.
+type SessionMCPSetConnectedIdeInfoParams struct {
+	// The connected IDE. Null or omitted clears the recorded IDE, which is how a host reports
+	// that it is disconnected.
+	Ide *SessionConnectedIdeInfo `json:"ide,omitempty"`
+}
+
+// Experimental: SessionMCPSetConnectedIdeInfoResult is part of an experimental API and may
+// change or be removed.
+type SessionMCPSetConnectedIdeInfoResult struct {
+}
+
 // Experimental: SessionMCPStartServerResult is part of an experimental API and may change
 // or be removed.
 type SessionMCPStartServerResult struct {
@@ -15530,10 +18095,30 @@ type SessionMetadataSnapshot struct {
 	WorkspacePath *string `json:"workspacePath"`
 }
 
+// Experimental: SessionModelClearStartupSeedRequest is part of an experimental API and may
+// change or be removed.
+// Internal: SessionModelClearStartupSeedRequest is an internal SDK API and is not part of
+// the public surface.
+type SessionModelClearStartupSeedRequest struct {
+	ExpectedModel string `json:"expectedModel"`
+	// Provider captured with the startup seed; omission matches only an unqualified seed.
+	ExpectedProviderID *string `json:"expectedProviderId,omitempty"`
+}
+
+// Experimental: SessionModelClearStartupSeedResult is part of an experimental API and may
+// change or be removed.
+// Internal: SessionModelClearStartupSeedResult is an internal SDK API and is not part of
+// the public surface.
+type SessionModelClearStartupSeedResult struct {
+	Cleared bool `json:"cleared"`
+}
+
 // The list of models available to this session.
 // Experimental: SessionModelList is part of an experimental API and may change or be
 // removed.
 type SessionModelList struct {
+	// Ordered Auto routing preferences discovered for this session's account.
+	Auto *AutoTierMetadata `json:"auto,omitempty"`
 	// 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`).
@@ -15595,6 +18180,12 @@ type SessionOpenOptions struct {
 	AdditionalDirectories []string `json:"additionalDirectories,omitzero"`
 	// Runtime context discriminator for agent filtering.
 	AgentContext *string `json:"agentContext,omitempty"`
+	// Explicit discovery-only agent roots, separate from customAgents and filesystem grants.
+	// Available without enableConfigDiscovery, subject to managed/source disables. Relative SDK
+	// paths resolve once when supplied against the request's effective workingDirectory;
+	// retained roots do not move on cwd changes. Null and omission are equivalent; [] clears
+	// only the explicit SDK contribution.
+	AgentDirectories []string `json:"agentDirectories,omitzero"`
 	// Whether to include instructions from every MCP server in the system prompt instead of
 	// only allowlisted servers.
 	AllowAllMCPServerInstructions *bool `json:"allowAllMcpServerInstructions,omitempty"`
@@ -15604,6 +18195,12 @@ type SessionOpenOptions struct {
 	AuthClientIDMetadataURL *string `json:"authClientIdMetadataUrl,omitempty"`
 	// Initial authentication info for the session.
 	AuthInfo AuthInfo `json:"authInfo,omitempty"`
+	// Whether a CLI host explicitly requested the initial Auto preference. False preserves a
+	// settings-derived preference without validating availability during creation; execution
+	// still validates it. Defaults to true and is ignored for non-CLI callers.
+	// Internal: AutoTierIsExplicit is part of the SDK's internal API surface and is not
+	// intended for external use.
+	AutoTierIsExplicit *bool `json:"autoTierIsExplicit,omitempty"`
 	// Allowlist of available tool names.
 	AvailableTools []string `json:"availableTools,omitzero"`
 	// Options scoped to the built-in CAPI (Copilot API) provider.
@@ -15666,11 +18263,15 @@ type SessionOpenOptions struct {
 	EnableOnDemandInstructionDiscovery *bool `json:"enableOnDemandInstructionDiscovery,omitempty"`
 	// Whether shell-script safety heuristics are enabled.
 	EnableScriptSafety *bool `json:"enableScriptSafety,omitempty"`
-	// Whether skill loading is enabled. When omitted, an SDK skill provider enables skills by
-	// default.
+	// Whether skill loading is enabled. When omitted, explicit SDK skill roots or an SDK skill
+	// provider enable skills independently of enableConfigDiscovery.
 	EnableSkills *bool `json:"enableSkills,omitempty"`
 	// Whether model responses stream as delta events.
 	EnableStreaming *bool `json:"enableStreaming,omitempty"`
+	// Opt in to enforcing non-overridable managed model controls on session model, Auto-tier,
+	// reasoning-effort, and context-tier changes. Managed defaults still apply when omitted;
+	// this option only turns conflicting changes into errors.
+	EnforceManagedModelDefaults *bool `json:"enforceManagedModelDefaults,omitempty"`
 	// How MCP server environment values are interpreted.
 	EnvValueMode *SessionOpenOptionsEnvValueMode `json:"envValueMode,omitempty"`
 	// Override directory for session event logs.
@@ -15702,6 +18303,13 @@ type SessionOpenOptions struct {
 	// Internal: HasSkillProvider is part of the SDK's internal API surface and is not intended
 	// for external use.
 	HasSkillProvider *bool `json:"hasSkillProvider,omitempty"`
+	// Explicit discovery-only file-hook roots, separate from callback hooks and filesystem
+	// grants. Available without enableConfigDiscovery or enableFileHooks, which controls
+	// repository-origin hooks only; hook/managed disables still apply. Relative SDK paths
+	// resolve once when supplied against the request's effective workingDirectory; retained
+	// roots do not move on cwd changes. Null and omission are equivalent; [] clears only the
+	// explicit SDK contribution.
+	HookDirectories []string `json:"hookDirectories,omitzero"`
 	// Skill scan directories and descendants excluded from discovery. Supports `~`-relative
 	// paths.
 	IgnoredSkillsLocations []string `json:"ignoredSkillsLocations,omitzero"`
@@ -15715,6 +18323,12 @@ type SessionOpenOptions struct {
 	IncludedBuiltinSkills []string `json:"includedBuiltinSkills,omitzero"`
 	// Installed plugins visible to the session.
 	InstalledPlugins []InstalledPlugin `json:"installedPlugins,omitzero"`
+	// Explicit discovery-only instruction roots using existing SDK instruction formats, not
+	// filesystem grants. Available without enableConfigDiscovery, subject to
+	// instruction/managed disables. Relative SDK paths resolve once when supplied against the
+	// request's effective workingDirectory; retained roots do not move on cwd changes. Null and
+	// omission are equivalent; [] clears only the explicit SDK contribution.
+	InstructionDirectories []string `json:"instructionDirectories,omitzero"`
 	// Stable integration identifier for analytics.
 	IntegrationID *string `json:"integrationId,omitempty"`
 	// Whether experimental behavior is enabled.
@@ -15792,7 +18406,11 @@ type SessionOpenOptions struct {
 	ShellInitProfile *string `json:"shellInitProfile,omitempty"`
 	// PowerShell process flags applied to built-in and user-requested shell commands.
 	ShellProcessFlags []string `json:"shellProcessFlags,omitzero"`
-	// Additional directories to search for skills.
+	// Explicit discovery-only skill roots, not filesystem grants. Available without
+	// enableConfigDiscovery, subject to skill/managed disables. Relative SDK paths resolve once
+	// when supplied against the request's effective workingDirectory; retained roots do not
+	// move on cwd changes. Null and omission are equivalent; [] clears only the explicit SDK
+	// contribution.
 	SkillDirectories []string `json:"skillDirectories,omitzero"`
 	// Whether to skip custom instruction sources.
 	SkipCustomInstructions *bool `json:"skipCustomInstructions,omitempty"`
@@ -16112,6 +18730,23 @@ type SessionPluginsReloadRequest struct {
 type SessionPluginsReloadResult struct {
 }
 
+// Experimental: SessionPluginsRetryManagedRequest is part of an experimental API and may
+// change or be removed.
+type SessionPluginsRetryManagedRequest struct {
+	// "plugin@marketplace" specs to retry. Omit to retry every plugin the session's managed
+	// settings require.
+	Plugins []string `json:"plugins,omitzero"`
+}
+
+// Per-plugin outcomes of retrying the plugins required by the session's managed settings.
+// Experimental: SessionPluginsRetryManagedResult is part of an experimental API and may
+// change or be removed.
+type SessionPluginsRetryManagedResult struct {
+	// One entry per requested plugin, in request order. When no plugins were requested, one
+	// entry per plugin the managed settings require.
+	Plugins []ManagedPluginRetryEntry `json:"plugins"`
+}
+
 // Experimental: SessionPluginsUninstallResult is part of an experimental API and may change
 // or be removed.
 type SessionPluginsUninstallResult struct {
@@ -16162,6 +18797,147 @@ type SessionQueueProcessResult struct {
 type SessionQueueSetDrainPausedResult struct {
 }
 
+// Existing delegation guidance for an account without delegation access.
+// Experimental: SessionQuotaDelegateWarning is part of an experimental API and may change
+// or be removed.
+type SessionQuotaDelegateWarning struct {
+	// User-facing guidance.
+	Text string `json:"text"`
+	// Link to upgrade the account.
+	URL string `json:"url"`
+}
+
+// The incumbent session-owned quota and account projection.
+// Experimental: SessionQuotaGetResult is part of an experimental API and may change or be
+// removed.
+type SessionQuotaGetResult struct {
+	// Whether the account can sign up for Copilot Free.
+	CanSignupForCopilotFree bool `json:"canSignupForCopilotFree"`
+	// Whether the account can delegate tasks to GitHub.
+	DelegateAvailable bool `json:"delegateAvailable"`
+	// Existing delegation warning for a free account.
+	DelegateWarning *SessionQuotaDelegateWarning `json:"delegateWarning,omitempty"`
+	// Whether dynamic workflows are enabled for the active account.
+	DynamicWorkflowsEnabled bool `json:"dynamicWorkflowsEnabled"`
+	// Whether dynamic workflows are visible under the session's feature flags.
+	DynamicWorkflowsUIVisible bool `json:"dynamicWorkflowsUiVisible"`
+	// Whether the account uses the free limited Copilot plan.
+	IsFreeUser bool `json:"isFreeUser"`
+	// Whether the account uses token-based billing.
+	IsTbbUser bool `json:"isTbbUser"`
+	// Whether model cost columns should be shown.
+	ModelCostColumnVisible bool `json:"modelCostColumnVisible"`
+	// Resolved Copilot plan tier.
+	PlanTier SessionQuotaPlanTier `json:"planTier"`
+	// Whether premium-request costs are billable.
+	PremiumRequestsBillable bool `json:"premiumRequestsBillable"`
+	// Provider-owned account quota state, including snapshots without numeric balances.
+	ProviderQuotas []ProviderQuotaState `json:"providerQuotas,omitzero"`
+	// Known quota snapshots, keyed by the provider's quota type.
+	Snapshots map[string]SessionQuotaSnapshot `json:"snapshots"`
+	// Upgrade link for a free account.
+	UpgradeURL *string `json:"upgradeUrl,omitempty"`
+}
+
+// The incumbent session-owned quota and account projection.
+// Experimental: SessionQuotaProjection is part of an experimental API and may change or be
+// removed.
+type SessionQuotaProjection struct {
+	// Whether the account can sign up for Copilot Free.
+	CanSignupForCopilotFree bool `json:"canSignupForCopilotFree"`
+	// Whether the account can delegate tasks to GitHub.
+	DelegateAvailable bool `json:"delegateAvailable"`
+	// Existing delegation warning for a free account.
+	DelegateWarning *SessionQuotaDelegateWarning `json:"delegateWarning,omitempty"`
+	// Whether dynamic workflows are enabled for the active account.
+	DynamicWorkflowsEnabled bool `json:"dynamicWorkflowsEnabled"`
+	// Whether dynamic workflows are visible under the session's feature flags.
+	DynamicWorkflowsUIVisible bool `json:"dynamicWorkflowsUiVisible"`
+	// Whether the account uses the free limited Copilot plan.
+	IsFreeUser bool `json:"isFreeUser"`
+	// Whether the account uses token-based billing.
+	IsTbbUser bool `json:"isTbbUser"`
+	// Whether model cost columns should be shown.
+	ModelCostColumnVisible bool `json:"modelCostColumnVisible"`
+	// Resolved Copilot plan tier.
+	PlanTier SessionQuotaPlanTier `json:"planTier"`
+	// Whether premium-request costs are billable.
+	PremiumRequestsBillable bool `json:"premiumRequestsBillable"`
+	// Provider-owned account quota state, including snapshots without numeric balances.
+	ProviderQuotas []ProviderQuotaState `json:"providerQuotas,omitzero"`
+	// Known quota snapshots, keyed by the provider's quota type.
+	Snapshots map[string]SessionQuotaSnapshot `json:"snapshots"`
+	// Upgrade link for a free account.
+	UpgradeURL *string `json:"upgradeUrl,omitempty"`
+}
+
+// The incumbent session-owned quota and account projection.
+// Experimental: SessionQuotaRefreshResult is part of an experimental API and may change or
+// be removed.
+type SessionQuotaRefreshResult struct {
+	// Whether the account can sign up for Copilot Free.
+	CanSignupForCopilotFree bool `json:"canSignupForCopilotFree"`
+	// Whether the account can delegate tasks to GitHub.
+	DelegateAvailable bool `json:"delegateAvailable"`
+	// Existing delegation warning for a free account.
+	DelegateWarning *SessionQuotaDelegateWarning `json:"delegateWarning,omitempty"`
+	// Whether dynamic workflows are enabled for the active account.
+	DynamicWorkflowsEnabled bool `json:"dynamicWorkflowsEnabled"`
+	// Whether dynamic workflows are visible under the session's feature flags.
+	DynamicWorkflowsUIVisible bool `json:"dynamicWorkflowsUiVisible"`
+	// Whether the account uses the free limited Copilot plan.
+	IsFreeUser bool `json:"isFreeUser"`
+	// Whether the account uses token-based billing.
+	IsTbbUser bool `json:"isTbbUser"`
+	// Whether model cost columns should be shown.
+	ModelCostColumnVisible bool `json:"modelCostColumnVisible"`
+	// Resolved Copilot plan tier.
+	PlanTier SessionQuotaPlanTier `json:"planTier"`
+	// Whether premium-request costs are billable.
+	PremiumRequestsBillable bool `json:"premiumRequestsBillable"`
+	// Provider-owned account quota state, including snapshots without numeric balances.
+	ProviderQuotas []ProviderQuotaState `json:"providerQuotas,omitzero"`
+	// Known quota snapshots, keyed by the provider's quota type.
+	Snapshots map[string]SessionQuotaSnapshot `json:"snapshots"`
+	// Upgrade link for a free account.
+	UpgradeURL *string `json:"upgradeUrl,omitempty"`
+}
+
+// Session quota snapshot, preserving the incumbent numeric units and reset metadata.
+// Experimental: SessionQuotaSnapshot is part of an experimental API and may change or be
+// removed.
+type SessionQuotaSnapshot struct {
+	// Entitled quantity in this quota's units.
+	EntitlementRequests float64 `json:"entitlementRequests"`
+	// Whether the provider reports available quota.
+	HasQuota *bool `json:"hasQuota,omitempty"`
+	// Whether the entitlement is unlimited.
+	IsUnlimitedEntitlement bool `json:"isUnlimitedEntitlement"`
+	// Additional usage in this quota's units.
+	Overage float64 `json:"overage"`
+	// Whether additional usage is allowed after quota exhaustion.
+	OverageAllowedWithExhaustedQuota bool `json:"overageAllowedWithExhaustedQuota"`
+	// Additional-usage budget cap, when provided.
+	OverageEntitlement *float64 `json:"overageEntitlement,omitempty"`
+	// Percentage of the entitlement remaining.
+	RemainingPercentage float64 `json:"remainingPercentage"`
+	// Quota reset time in milliseconds since the Unix epoch, when known.
+	ResetDateEpochMs *float64 `json:"resetDateEpochMs,omitempty"`
+	// Whether the reset time is estimated.
+	ResetDateEstimated *bool `json:"resetDateEstimated,omitempty"`
+	// Whether this quota uses token-based billing.
+	TokenBasedBilling *bool `json:"tokenBasedBilling,omitempty"`
+	// Whether usage is allowed after quota exhaustion.
+	UsageAllowedWithExhaustedQuota bool `json:"usageAllowedWithExhaustedQuota"`
+	// Consumed quantity in this quota's units.
+	UsedRequests float64 `json:"usedRequests"`
+}
+
+// Pending warnings returned and cleared by session.quota.takeWarnings.
+// Experimental: SessionQuotaTakeWarningsResult is part of an experimental API and may
+// change or be removed.
+type SessionQuotaTakeWarningsResult []QuotaWarningProjection
+
 // Experimental: SessionRemoteDisableResult is part of an experimental API and may change or
 // be removed.
 type SessionRemoteDisableResult struct {
@@ -16293,6 +19069,35 @@ type SessionsCloseResult struct {
 type SessionsConfigureSessionExtensionsResult struct {
 }
 
+// Identity, state location and starting context for a workspace record.
+// Experimental: SessionsCreateWorkspaceRequest is part of an experimental API and may
+// change or be removed.
+type SessionsCreateWorkspaceRequest struct {
+	// Starting working-directory context. The record keeps `cwd`, `gitRoot`, `repository`,
+	// `hostType`, `branch`, and `clientName`. Other fields, including `repositoryHost`,
+	// `headCommit`, and `baseCommit`, are ignored. `hostType` must be `github` or `ado`.
+	Context *SessionWorkingDirectoryContextWithClient `json:"context,omitempty"`
+	// `windows` (any letter case) selects Windows path rules. Any other value selects POSIX
+	// path rules.
+	Convention string `json:"convention"`
+	// User-supplied display name for the workspace
+	Name *string `json:"name,omitempty"`
+	// Session ID the workspace record belongs to
+	SessionID string `json:"sessionId"`
+	// Directory the session's state is written under when no session filesystem provider is
+	// configured. Ignored when a provider is configured; the provider's session state path is
+	// used instead.
+	SessionStatePath string `json:"sessionStatePath"`
+}
+
+// The workspace record that was written.
+// Experimental: SessionsCreateWorkspaceResult is part of an experimental API and may change
+// or be removed.
+type SessionsCreateWorkspaceResult struct {
+	// The created workspace record, as JSON
+	WorkspaceJSON string `json:"workspaceJson"`
+}
+
 // Session ID to delete from disk.
 // Experimental: SessionsDeleteRequest is part of an experimental API and may change or be
 // removed.
@@ -16729,6 +19534,25 @@ type SessionsLoadDeferredRepoHooksRequest struct {
 	SessionID string `json:"sessionId"`
 }
 
+// Where the session's state lives, as a root directory and the session ID under it.
+// Experimental: SessionsLoadWorkspaceRequest is part of an experimental API and may change
+// or be removed.
+type SessionsLoadWorkspaceRequest struct {
+	// Session ID naming the state directory under the sessions home. Rejected when it is
+	// absolute or contains a parent component, so it cannot escape the sessions home.
+	SessionID string `json:"sessionId"`
+	// Root directory every session's state directory sits under
+	SessionsHome string `json:"sessionsHome"`
+}
+
+// The workspace record on disk, omitted when the session has none.
+// Experimental: SessionsLoadWorkspaceResult is part of an experimental API and may change
+// or be removed.
+type SessionsLoadWorkspaceResult struct {
+	// The workspace record, as JSON. Omitted when the record does not exist.
+	WorkspaceJSON *string `json:"workspaceJson,omitempty"`
+}
+
 // `sessions.open` handoff progress update with step, status, and optional message.
 // Experimental: SessionsOpenProgress is part of an experimental API and may change or be
 // removed.
@@ -16884,6 +19708,30 @@ type SessionsTransferRemoteControlRequest struct {
 	ToSessionID string `json:"toSessionId"`
 }
 
+// Where the session's state lives, plus workspace-schema fields to merge into its workspace
+// record. Stored keys outside the schema are not preserved, and a stored `fork_count` is
+// never replaced.
+// Experimental: SessionsUpdateWorkspaceFieldsRequest is part of an experimental API and may
+// change or be removed.
+type SessionsUpdateWorkspaceFieldsRequest struct {
+	// Workspace-schema fields to merge into the record, as a JSON object. Fields the object
+	// omits keep their stored values, except stored keys outside the schema are not preserved
+	// and a stored `fork_count` is never replaced.
+	FieldsJSON string `json:"fieldsJson"`
+	// Session ID naming the state directory under the sessions home. Rejected when it is
+	// absolute or contains a parent component, so it cannot escape the sessions home.
+	SessionID string `json:"sessionId"`
+	// Root directory every session's state directory sits under
+	SessionsHome string `json:"sessionsHome"`
+}
+
+// The merge completed. The record carries the supplied workspace-schema fields, but a
+// stored `fork_count` stays.
+// Experimental: SessionsUpdateWorkspaceFieldsResult is part of an experimental API and may
+// change or be removed.
+type SessionsUpdateWorkspaceFieldsResult struct {
+}
+
 // Experimental: SessionSuspendResult is part of an experimental API and may change or be
 // removed.
 type SessionSuspendResult struct {
@@ -16912,6 +19760,12 @@ type SessionUpdateOptionsParams struct {
 	AdditionalContentExclusionPolicies []OptionsUpdateAdditionalContentExclusionPolicy `json:"additionalContentExclusionPolicies,omitzero"`
 	// Runtime context discriminator (e.g., `cli`, `actions`).
 	AgentContext *string `json:"agentContext,omitempty"`
+	// Explicit discovery-only agent roots, separate from customAgents and filesystem grants.
+	// Available without enableConfigDiscovery, subject to managed/source disables. Relative SDK
+	// paths resolve once when supplied against the request's effective workingDirectory;
+	// retained roots do not move on cwd changes. Null and omission are equivalent; [] clears
+	// only the explicit SDK contribution.
+	AgentDirectories []string `json:"agentDirectories,omitzero"`
 	// Whether to include instructions from every MCP server in the system prompt instead of
 	// only allowlisted servers.
 	AllowAllMCPServerInstructions *bool `json:"allowAllMcpServerInstructions,omitempty"`
@@ -16939,8 +19793,9 @@ type SessionUpdateOptionsParams struct {
 	DisabledInstructionSources []string `json:"disabledInstructionSources,omitzero"`
 	// Skill IDs that should be excluded from this session.
 	DisabledSkills []string `json:"disabledSkills,omitzero"`
-	// Whether to enable loading of `.github/hooks/` filesystem hooks. Separate from the SDK
-	// callback hook mechanism.
+	// Whether to enable repository-origin file hooks from `.github/hooks/` and trusted
+	// repository-configured roots. Does not control explicit hookDirectories or SDK callback
+	// hooks.
 	EnableFileHooks *bool `json:"enableFileHooks,omitempty"`
 	// Whether to enable host git operations (context resolution, child repo scanning, git info
 	// in system prompt).
@@ -16955,9 +19810,10 @@ type SessionUpdateOptionsParams struct {
 	EnableScriptSafety *bool `json:"enableScriptSafety,omitempty"`
 	// Whether to enable cross-session store writes and reads.
 	EnableSessionStore *bool `json:"enableSessionStore,omitempty"`
-	// Whether skill loading is enabled. Explicit false disables every source, including a bound
-	// SDK provider; changing the value invalidates the loaded skill snapshot. When omitted,
-	// creation falls back to enableConfigDiscovery unless an SDK skill provider is registered.
+	// Whether skill loading is enabled. Explicit false disables every source, including
+	// explicit SDK roots and a bound SDK provider; changing the value invalidates the loaded
+	// skill snapshot. When omitted, creation falls back to enableConfigDiscovery unless
+	// explicit SDK skill roots or an SDK skill provider are supplied.
 	EnableSkills *bool `json:"enableSkills,omitempty"`
 	// Whether to stream model responses.
 	EnableStreaming *bool `json:"enableStreaming,omitempty"`
@@ -16977,6 +19833,13 @@ type SessionUpdateOptionsParams struct {
 	ExcludedTools []string `json:"excludedTools,omitzero"`
 	// Map of feature-flag IDs to their boolean enabled state.
 	FeatureFlags map[string]bool `json:"featureFlags,omitzero"`
+	// Explicit discovery-only file-hook roots, separate from callback hooks and filesystem
+	// grants. Available without enableConfigDiscovery or enableFileHooks, which controls
+	// repository-origin hooks only; hook/managed disables still apply. Relative SDK paths
+	// resolve once when supplied against the request's effective workingDirectory; retained
+	// roots do not move on cwd changes. Null and omission are equivalent; [] clears only the
+	// explicit SDK contribution.
+	HookDirectories []string `json:"hookDirectories,omitzero"`
 	// Skill scan directories and descendants excluded from discovery. Supports `~`-relative
 	// paths.
 	IgnoredSkillsLocations []string `json:"ignoredSkillsLocations,omitzero"`
@@ -16991,6 +19854,12 @@ type SessionUpdateOptionsParams struct {
 	// 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"`
+	// Explicit discovery-only instruction roots using existing SDK instruction formats, not
+	// filesystem grants. Available without enableConfigDiscovery, subject to
+	// instruction/managed disables. Relative SDK paths resolve once when supplied against the
+	// request's effective workingDirectory; retained roots do not move on cwd changes. Null and
+	// omission are equivalent; [] clears only the explicit SDK contribution.
+	InstructionDirectories []string `json:"instructionDirectories,omitzero"`
 	// Stable integration identifier used for analytics and rate-limit attribution.
 	IntegrationID *string `json:"integrationId,omitempty"`
 	// Whether experimental capabilities are enabled.
@@ -17046,7 +19915,11 @@ type SessionUpdateOptionsParams struct {
 	ShellInitProfile *string `json:"shellInitProfile,omitempty"`
 	// PowerShell process flags applied to built-in and user-requested shell commands.
 	ShellProcessFlags []string `json:"shellProcessFlags,omitzero"`
-	// Additional directories to search for skills.
+	// Explicit discovery-only skill roots, not filesystem grants. Available without
+	// enableConfigDiscovery, subject to skill/managed disables. Relative SDK paths resolve once
+	// when supplied against the request's effective workingDirectory; retained roots do not
+	// move on cwd changes. Null and omission are equivalent; [] clears only the explicit SDK
+	// contribution.
 	SkillDirectories []string `json:"skillDirectories,omitzero"`
 	// Whether to skip loading custom instruction sources.
 	SkipCustomInstructions *bool `json:"skipCustomInstructions,omitempty"`
@@ -17077,6 +19950,25 @@ type SessionUpdateOptionsResult struct {
 	Success bool `json:"success"`
 }
 
+// Internal absolute code-change totals reported by the owning host.
+// Experimental: SessionUsageSetCodeChangesRequest is part of an experimental API and may
+// change or be removed.
+// Internal: SessionUsageSetCodeChangesRequest is an internal SDK API and is not part of the
+// public surface.
+type SessionUsageSetCodeChangesRequest struct {
+	// Absolute changed-file count; omission preserves the previous count.
+	FilesCount *float64 `json:"filesCount,omitempty"`
+	// Absolute added-line total, replacing the previous reading.
+	LinesAdded float64 `json:"linesAdded"`
+	// Absolute removed-line total, replacing the previous reading.
+	LinesRemoved float64 `json:"linesRemoved"`
+}
+
+// Experimental: SessionUsageSetCodeChangesResult is part of an experimental API and may
+// change or be removed.
+type SessionUsageSetCodeChangesResult struct {
+}
+
 // Experimental: SessionWorkflowPauseAtCheckpointResult is part of an experimental API and
 // may change or be removed.
 type SessionWorkflowPauseAtCheckpointResult struct {
@@ -17108,6 +20000,30 @@ type SessionWorkingDirectoryContext struct {
 	RepositoryHost *string `json:"repositoryHost,omitempty"`
 }
 
+// A working-directory context together with the client that produced it.
+// Experimental: SessionWorkingDirectoryContextWithClient is part of an experimental API and
+// may change or be removed.
+type SessionWorkingDirectoryContextWithClient struct {
+	// Merge-base commit SHA
+	BaseCommit *string `json:"baseCommit,omitempty"`
+	// Current git branch name
+	Branch *string `json:"branch,omitempty"`
+	// Name of the client that created the session
+	ClientName *string `json:"clientName,omitempty"`
+	// Current working directory path
+	Cwd string `json:"cwd"`
+	// Root directory of the git repository
+	GitRoot *string `json:"gitRoot,omitempty"`
+	// Head commit of the current git branch
+	HeadCommit *string `json:"headCommit,omitempty"`
+	// Hosting platform type of the repository
+	HostType *string `json:"hostType,omitempty"`
+	// Repository identifier derived from the git remote URL
+	Repository *string `json:"repository,omitempty"`
+	// Raw host string from the git remote URL
+	RepositoryHost *string `json:"repositoryHost,omitempty"`
+}
+
 // Experimental: SessionWorkspacesCreateDirectoryResult is part of an experimental API and
 // may change or be removed.
 type SessionWorkspacesCreateDirectoryResult struct {
@@ -17146,6 +20062,10 @@ func (RawSettableAuthInfoData) settableAuthInfo() {}
 func (r RawSettableAuthInfoData) settableAuthInfoType() SettableAuthInfoType {
 	return r.Discriminator
 }
+func (AccountAuthInfo) settableAuthInfo() {}
+func (AccountAuthInfo) settableAuthInfoType() SettableAuthInfoType {
+	return SettableAuthInfoTypeAccount
+}
 func (APIKeyAuthInfo) settableAuthInfo() {}
 func (APIKeyAuthInfo) settableAuthInfoType() SettableAuthInfoType {
 	return SettableAuthInfoTypeAPIKey
@@ -17190,6 +20110,18 @@ func (UserAuthInfo) settableAuthInfoType() SettableAuthInfoType {
 	return SettableAuthInfoTypeUser
 }
 
+// Outcome of an atomic user or repository settings edit.
+// Experimental: SettingsEditResult is part of an experimental API and may change or be
+// removed.
+// Internal: SettingsEditResult is an internal SDK API and is not part of the public surface.
+type SettingsEditResult struct {
+	// Changed, unchanged or invalid existing file. Rejected input, validation failures and I/O
+	// errors remain RPC errors.
+	// Internal: Status is part of the SDK's internal API surface and is not intended for
+	// external use.
+	Status SettingsEditStatus `json:"status"`
+}
+
 // User-requested shell execution cancellation handle.
 // Experimental: ShellCancelUserRequestedRequest is part of an experimental API and may
 // change or be removed.
@@ -18032,8 +20964,8 @@ type SkillPlanUninstallRequest struct {
 	PolicySessionID string `json:"policySessionId"`
 }
 
-// Catalog-only metadata for one SDK-provided skill. The complete SKILL.md is fetched
-// separately and lazily.
+// Authoritative catalog metadata for one SDK-provided skill. The skill's SKILL.md text is
+// fetched separately and lazily.
 // Experimental: SkillProviderDescriptor is part of an experimental API and may change or be
 // removed.
 type SkillProviderDescriptor struct {
@@ -18081,15 +21013,18 @@ type SkillProviderReadRequest struct {
 	SessionID string `json:"sessionId"`
 }
 
-// Complete text-only SKILL.md content returned by an SDK session's skill provider. Related
-// files and assets are not supported.
+// Text-only SKILL.md content returned by an SDK session's skill provider. YAML frontmatter
+// is optional: fields it omits come from the catalog descriptor, fields it declares must
+// match the descriptor, and `allowed-tools` is read only from frontmatter. Related files
+// and assets are not supported.
 // Experimental: SkillProviderReadResult is part of an experimental API and may change or be
 // removed.
 // Internal: SkillProviderReadResult is an internal SDK API and is not part of the public
 // surface.
 type SkillProviderReadResult struct {
-	// Complete SKILL.md text. The runtime enforces a 1 MiB UTF-8 byte limit.
-	Markdown string `json:"markdown"`
+	// SKILL.md text, with or without YAML frontmatter, or null when the provider has no skill
+	// with the requested name. The runtime enforces a 1 MiB UTF-8 byte limit.
+	Markdown *string `json:"markdown"`
 }
 
 // Skill names to mark as disabled in global configuration, replacing any previous list.
@@ -18140,7 +21075,10 @@ type SkillsDiscoverRequest struct {
 	IgnoredSkillsLocations []string `json:"ignoredSkillsLocations,omitzero"`
 	// Optional list of project directory paths to scan for project-scoped skills
 	ProjectPaths []string `json:"projectPaths,omitzero"`
-	// Optional list of additional skill directory paths to include
+	// Explicit discovery-only skill roots, not filesystem grants. Available without ambient
+	// discovery, subject to skill/managed disables. Relative paths resolve against the
+	// request's effective working directory when supplied. Null and omission are equivalent; an
+	// empty array contributes no explicit roots.
 	SkillDirectories []string `json:"skillDirectories,omitzero"`
 }
 
@@ -18178,6 +21116,11 @@ type SkillsGetDiscoveryPathsRequest struct {
 	// Optional list of project directory paths. When omitted or empty, only personal and custom
 	// directories are returned.
 	ProjectPaths []string `json:"projectPaths,omitzero"`
+	// Explicit discovery-only skill roots to enumerate, including configured missing
+	// directories. Relative paths resolve against the request's effective working directory
+	// when supplied. These are not filesystem grants or preferred creation targets. Null and
+	// omission are equivalent.
+	SkillDirectories []string `json:"skillDirectories,omitzero"`
 }
 
 // Skills invoked during this session, ordered by invocation time (most recent last).
@@ -19309,6 +22252,13 @@ type ToolsGetCurrentMetadataResult struct {
 type ToolsInitializeAndValidateResult struct {
 }
 
+// No parameters; returns the external tool calls of the session and its sub-agents that are
+// still waiting for a result.
+// Experimental: ToolsListPendingRequestsRequest is part of an experimental API and may
+// change or be removed.
+type ToolsListPendingRequestsRequest struct {
+}
+
 // Optional model identifier whose tool overrides should be applied to the listing.
 // Experimental: ToolsListRequest is part of an experimental API and may change or be
 // removed.
@@ -19859,6 +22809,9 @@ 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"`
+	// Completeness of totalNanoAiu. Numeric totals remain the reported subtotal; zero is not a
+	// claim of free usage when unavailable.
+	AiCreditsStatus *AiCreditsStatus `json:"aiCreditsStatus,omitempty"`
 	// Aggregated code change metrics
 	CodeChanges UsageMetricsCodeChanges `json:"codeChanges"`
 	// Currently active model identifier
@@ -19869,6 +22822,9 @@ type UsageGetMetricsResult struct {
 	LastCallOutputTokens int64 `json:"lastCallOutputTokens"`
 	// Per-model token and request metrics, keyed by model identifier
 	ModelMetrics map[string]UsageMetricsModelMetric `json:"modelMetrics"`
+	// Provider-attributed model metrics, ordered by first observed provider and model.
+	// Null attribution preserves historical usage whose provider or model was not recorded.
+	ProviderModelMetrics []UsageMetricsProviderModelMetric `json:"providerModelMetrics,omitzero"`
 	// ISO 8601 timestamp when the session started
 	SessionStartTime time.Time `json:"sessionStartTime"`
 	// Session-wide per-token-type accumulated token counts
@@ -19923,6 +22879,9 @@ type UsageMetricsCodeChanges struct {
 // Experimental: UsageMetricsModelMetric is part of an experimental API and may change or be
 // removed.
 type UsageMetricsModelMetric struct {
+	// Completeness of this model's reported AI-credit subtotal. Explicitly reported zero is
+	// complete, not unavailable.
+	AiCreditsStatus *AiCreditsStatus `json:"aiCreditsStatus,omitempty"`
 	// Latest known prompt-cache expiration for this model. A timestamp in the past indicates
 	// that the observed cache has expired.
 	CacheExpiresAt *time.Time `json:"cacheExpiresAt,omitempty"`
@@ -19970,6 +22929,22 @@ type UsageMetricsModelMetricUsage struct {
 	ReasoningTokens *int64 `json:"reasoningTokens,omitempty"`
 }
 
+// Usage for one recorded provider and model, without merging identical model IDs across
+// providers.
+// Experimental: UsageMetricsProviderModelMetric is part of an experimental API and may
+// change or be removed.
+type UsageMetricsProviderModelMetric struct {
+	// Request, token, and cost totals for this provider/model.
+	Metrics UsageMetricsModelMetric `json:"metrics"`
+	// Model display name captured at call time, when known.
+	ModelDisplayName *string `json:"modelDisplayName,omitempty"`
+	// Model identity, or null for legacy aggregate-only usage.
+	ModelID *string `json:"modelId"`
+	// Provider identity and product label captured when the call was dispatched; null when
+	// unknown.
+	Provider *ModelProviderRef `json:"provider"`
+}
+
 // Session-wide token-detail entry containing the accumulated token count for one token type.
 // Experimental: UsageMetricsTokenDetail is part of an experimental API and may change or be
 // removed.
@@ -19978,6 +22953,20 @@ type UsageMetricsTokenDetail struct {
 	TokenCount int64 `json:"tokenCount"`
 }
 
+// Internal absolute code-change totals reported by the owning host.
+// Experimental: UsageSetCodeChangesRequest is part of an experimental API and may change or
+// be removed.
+// Internal: UsageSetCodeChangesRequest is an internal SDK API and is not part of the public
+// surface.
+type UsageSetCodeChangesRequest struct {
+	// Absolute changed-file count; omission preserves the previous count.
+	FilesCount *float64 `json:"filesCount,omitempty"`
+	// Absolute added-line total, replacing the previous reading.
+	LinesAdded float64 `json:"linesAdded"`
+	// Absolute removed-line total, replacing the previous reading.
+	LinesRemoved float64 `json:"linesRemoved"`
+}
+
 // Result of a user-requested shell command.
 // Experimental: UserRequestedShellCommandResult is part of an experimental API and may
 // change or be removed.
@@ -20010,9 +22999,115 @@ type UserSettingMetadata struct {
 	Value any `json:"value"`
 }
 
-// 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.
+// A single top-level setting subtree to validate and write.
+// Experimental: UserSettingsApplyTopKeyRequest is part of an experimental API and may
+// change or be removed.
+type UserSettingsApplyTopKeyRequest struct {
+	// Canonical path of the setting the caller is editing. Currently informational only.
+	CanonicalPath []string `json:"canonicalPath"`
+	// Records that the user chose an update channel explicitly, so the one-time staff channel
+	// migration stops reapplying. Honored only for the `autoUpdatesChannel` key.
+	CompleteStaffUpdateChannelMigration *bool `json:"completeStaffUpdateChannelMigration,omitempty"`
+	// True to remove the top-level key instead of writing it.
+	Delete *bool `json:"delete,omitempty"`
+	// Top-level setting name to write.
+	TopKey string `json:"topKey"`
+	// Value to write for the whole top-level key. Omitted when `delete` is true. Explicit null
+	// is preserved and validated as null.
+	Value *any `json:"value,omitempty"`
+}
+
+// Outcome of validating and writing one top-level setting subtree.
+// Experimental: UserSettingsApplyTopKeyResult is part of an experimental API and may change
+// or be removed.
+type UserSettingsApplyTopKeyResult struct {
+	// Why the write failed, present only when `status` is `write-error`.
+	Error *string `json:"error,omitempty"`
+	// Problems found, present only when `status` is `validation-error`.
+	Issues []UserSettingsValidationIssue `json:"issues,omitzero"`
+	// `ok` when the value was written, `validation-error` when it was rejected before any
+	// write, `write-error` when validation passed but the write failed.
+	Status string `json:"status"`
+}
+
+// The overrides and host context to resolve effective runtime settings from.
+// Experimental: UserSettingsBuildRuntimeRequest is part of an experimental API and may
+// change or be removed.
+// Internal: UserSettingsBuildRuntimeRequest is an internal SDK API and is not part of the
+// public surface.
+type UserSettingsBuildRuntimeRequest struct {
+	// The environment to read settings-bearing variables from. Passed explicitly rather than
+	// read from the server process so a host can resolve settings for an environment it is
+	// about to create rather than the one it runs in.
+	Environment map[string]string `json:"environment"`
+	// Settings that take precedence over every document and environment layer, such as the
+	// values a host derived from its own command line. Keyed by setting name, with each value
+	// carried verbatim, so a host may pass keys this runtime does not recognize. Absent when
+	// the host contributes no overrides of its own.
+	Overrides map[string]any `json:"overrides,omitzero"`
+	// The platform to apply platform-specific defaults for, in the same spelling the host's own
+	// runtime reports.
+	Platform string `json:"platform"`
+	// The directory the settings are being resolved for. This selects the repository-scoped
+	// document, so a host resolving settings for a directory other than its own process working
+	// directory must pass that directory here.
+	WorkingDirectory string `json:"workingDirectory"`
+}
+
+// The effective runtime settings, keyed by setting name. Keys this runtime does not
+// recognize are preserved rather than dropped, so a caller reading a document written by a
+// newer runtime keeps every value.
+// Experimental: UserSettingsBuildRuntimeResult is part of an experimental API and may
+// change or be removed.
+type UserSettingsBuildRuntimeResult map[string]any
+
+// One atomic edit of a canonical setting in settings.json.
+// Experimental: UserSettingsEditRequest is part of an experimental API and may change or be
+// removed.
+// Internal: UserSettingsEditRequest is an internal SDK API and is not part of the public
+// surface.
+type UserSettingsEditRequest struct {
+	// Nonempty canonical path segments of the setting to edit, starting with its top-level key.
+	CanonicalPath []string `json:"canonicalPath"`
+	// Configuration directory to edit. Omitted or empty resolves the server's own home, as in
+	// `user.settings.loadForConfigDir`.
+	ConfigDir *string `json:"configDir,omitempty"`
+	// Set a scalar, add or remove a string list item, or remove the setting. The handler
+	// rejects a missing or incompatible value.
+	// Internal: Operation is part of the SDK's internal API surface and is not intended for
+	// external use.
+	Operation SettingsEditOperation `json:"operation"`
+	// Required boolean, string or number for set, required string for add-item and remove-item,
+	// and forbidden for remove. The runtime rejects all other JSON values.
+	Value any `json:"value,omitempty"`
+}
+
+// Selects which settings file paths to resolve.
+// Experimental: UserSettingsGetPathsRequest is part of an experimental API and may change
+// or be removed.
+type UserSettingsGetPathsRequest struct {
+	// Absolute path of a repository root. Supply it to also resolve that repository's two
+	// settings file paths; omit it to resolve only the user path.
+	RepoRoot *string `json:"repoRoot,omitempty"`
+}
+
+// On-disk locations of the settings files this runtime reads. A path is reported whether or
+// not the file exists.
+// Experimental: UserSettingsGetPathsResult is part of an experimental API and may change or
+// be removed.
+type UserSettingsGetPathsResult struct {
+	// The repository's local, untracked settings file, or null when no repository root was
+	// supplied.
+	RepoLocalSettings *string `json:"repoLocalSettings,omitempty"`
+	// The repository's checked-in settings file, or null when no repository root was supplied.
+	RepoSettings *string `json:"repoSettings,omitempty"`
+	// The user settings file: `settings.json` under the resolved Copilot home. This is the file
+	// `user.settings.get`, `user.settings.load`, and `user.settings.set` read and write.
+	UserSettings string `json:"userSettings"`
+}
+
+// Per-key metadata for every known user setting in settings.json, including settings left
+// at their default. Excludes repository- and enterprise-managed overrides.
 // Experimental: UserSettingsGetResult is part of an experimental API and may change or be
 // removed.
 type UserSettingsGetResult struct {
@@ -20021,9 +23116,416 @@ type UserSettingsGetResult struct {
 	Settings map[string]UserSettingMetadata `json:"settings"`
 }
 
-// Experimental: UserSettingsReloadResult is part of an experimental API and may change or
+// Top-level user-setting keys grouped by who may govern them.
+// Experimental: UserSettingsGovernanceKeysResult is part of an experimental API and may
+// change or be removed.
+type UserSettingsGovernanceKeysResult struct {
+	// Top-level keys a repository may override through a Claude-compatible repository config.
+	ClaudeRepo []string `json:"claudeRepo"`
+	// Top-level keys an enterprise policy may fix through managed settings.
+	Managed []string `json:"managed"`
+	// Top-level keys a repository may override through `.github/copilot/settings.json` or
+	// `.github/copilot/settings.local.json`.
+	Repo []string `json:"repo"`
+}
+
+// The filesystem and environment facts a user-settings file is resolved from. Passed
+// explicitly rather than read from the runtime's own process, so a host whose configuration
+// directory differs from its process environment resolves the file it means.
+// Experimental: UserSettingsHostContext is part of an experimental API and may change or be
+// removed.
+type UserSettingsHostContext struct {
+	// The Copilot configuration directory, when the host set one. Takes precedence over
+	// `COPILOT_HOME` and the home directory.
+	ConfigDir *string `json:"configDir,omitempty"`
+	// The host's environment variables. `COPILOT_HOME` is read from here, as are the variables
+	// a settings hook may expand.
+	Environment any `json:"environment"`
+	// The user's home directory, used when neither a configuration directory nor `COPILOT_HOME`
+	// is set.
+	HomeDirectory string `json:"homeDirectory"`
+}
+
+// A repository to read settings from, and the user layer they are merged over.
+// Experimental: UserSettingsLoadAndMergeRepoRequest is part of an experimental API and may
+// change or be removed.
+// Internal: UserSettingsLoadAndMergeRepoRequest is an internal SDK API and is not part of
+// the public surface.
+type UserSettingsLoadAndMergeRepoRequest struct {
+	// Absolute path of the repository root whose settings to read. When this is the user's home
+	// directory, the Claude-compatible configuration is skipped, so a home-directory session
+	// does not inherit a personal config as if it were repository policy.
+	RepoRoot string `json:"repoRoot"`
+	// The user's own settings, keyed by setting name. The repository layer is merged over this;
+	// a repository may only add to the collection settings it is allowed to influence, so a
+	// user setting it does not name survives unchanged.
+	UserSettings map[string]any `json:"userSettings"`
+}
+
+// The settings a consumer should act on inside a repository, together with any diagnostic
+// raised while reading the repository layer.
+// Experimental: UserSettingsLoadAndMergeRepoResult is part of an experimental API and may
+// change or be removed.
+// Internal: UserSettingsLoadAndMergeRepoResult is an internal SDK API and is not part of
+// the public surface.
+type UserSettingsLoadAndMergeRepoResult struct {
+	// The merged settings document, keyed by setting name. Equals the supplied user layer when
+	// the repository declares no settings.
+	Settings map[string]any `json:"settings"`
+	// Why part of the repository document was ignored, as a single human-readable string
+	// joining every diagnostic with `; `. Null when it loaded cleanly. The settings that did
+	// load are still merged, so a consumer should surface this and continue rather than treat
+	// it as a failure.
+	Warning *string `json:"warning,omitempty"`
+}
+
+// Selects the configuration directory whose user settings to read.
+// Experimental: UserSettingsLoadForConfigDirRequest is part of an experimental API and may
+// change or be removed.
+// Internal: UserSettingsLoadForConfigDirRequest is an internal SDK API and is not part of
+// the public surface.
+type UserSettingsLoadForConfigDirRequest struct {
+	// Copilot configuration directory to read the settings document from, taking precedence
+	// over the server's own `COPILOT_HOME` and default home. Omit it, or pass an empty string,
+	// to read the directory the server resolved for itself.
+	ConfigDir *string `json:"configDir,omitempty"`
+}
+
+// The stored user settings document, keyed by setting name.
+// Experimental: UserSettingsLoadForConfigDirResult is part of an experimental API and may
+// change or be removed.
+type UserSettingsLoadForConfigDirResult map[string]any
+
+// Contents of settings.json as stored, for a caller about to rewrite it.
+// Experimental: UserSettingsLoadForEditResult is part of an experimental API and may change
+// or be removed.
+type UserSettingsLoadForEditResult struct {
+	// Parsed contents, present only when `status` is `ok`.
+	Settings any `json:"settings,omitempty"`
+	// `ok` when the file parsed, `missing` when there is no file yet, `invalid` when the file
+	// exists but will not parse.
+	Status string `json:"status"`
+}
+
+// Selects the repository whose checked-in settings to read.
+// Experimental: UserSettingsLoadRepoRequest is part of an experimental API and may change
+// or be removed.
+type UserSettingsLoadRepoRequest struct {
+	// Absolute path of the repository root whose settings to read. When this is the user's home
+	// directory, the Claude-compatible configuration is skipped, so a home-directory session
+	// does not inherit a personal config as if it were repository policy.
+	RepoRoot string `json:"repoRoot"`
+}
+
+// A repository's settings as stored, together with any diagnostic raised while reading them.
+// Experimental: UserSettingsLoadRepoResult is part of an experimental API and may change or
 // be removed.
-type UserSettingsReloadResult struct {
+type UserSettingsLoadRepoResult struct {
+	// The repository's settings document, keyed by setting name, with each value carried
+	// verbatim. Null when the repository declares no settings.
+	Settings map[string]any `json:"settings,omitzero"`
+	// Why part of the document was ignored, as a single human-readable string joining every
+	// diagnostic with `; `. Null when the document loaded cleanly. The settings that did load
+	// are still reported, so a consumer should surface this and continue rather than treat it
+	// as a failure.
+	Warning *string `json:"warning,omitempty"`
+}
+
+// The user's stored settings, together with any diagnostic raised while reading them.
+// Experimental: UserSettingsLoadWithWarningResult is part of an experimental API and may
+// change or be removed.
+type UserSettingsLoadWithWarningResult struct {
+	// The stored user settings document, keyed by setting name, with each value carried
+	// verbatim. Empty when the file could not be read at all.
+	Settings map[string]any `json:"settings"`
+	// Why part of the document was ignored, phrased for display to the user. Null when the
+	// document loaded cleanly. The settings that did load are still reported, so a consumer may
+	// surface this and continue rather than treat it as a failure.
+	Warning *string `json:"warning,omitempty"`
+}
+
+// The managed (enterprise policy) layer and the user layer to fold together. The field
+// names carry the layer identity: nothing about a settings object identifies which layer
+// produced it, so a generic base/override pair would let a caller transpose them and
+// silently resolve the governance keys in the user's favour.
+// Experimental: UserSettingsMergeManagedAndUserParams is part of an experimental API and
+// may change or be removed.
+// Internal: UserSettingsMergeManagedAndUserParams is an internal SDK API and is not part of
+// the public surface.
+type UserSettingsMergeManagedAndUserParams struct {
+	// The managed layer. Its governance keys win, and the per-entry `enabledPlugins` and
+	// `extraKnownMarketplaces` control maps are stamped back from it after the union. Omitted
+	// when the host is unmanaged.
+	Managed any `json:"managed,omitempty"`
+	// The user's own settings layer. Wins on every key the managed layer does not govern.
+	// Omitted when the user has no settings yet.
+	User any `json:"user,omitempty"`
+}
+
+// The user layer folded over the managed layer.
+// Experimental: UserSettingsMergeManagedAndUserResult is part of an experimental API and
+// may change or be removed.
+type UserSettingsMergeManagedAndUserResult struct {
+	// The merged settings. An empty object when neither layer was supplied, so an unmanaged
+	// host with no user settings governs nothing.
+	SettingsJSON any `json:"settingsJson"`
+}
+
+// The user layer and the repository layer to fold together.
+// Experimental: UserSettingsMergeRepoValueParams is part of an experimental API and may
+// change or be removed.
+// Internal: UserSettingsMergeRepoValueParams is an internal SDK API and is not part of the
+// public surface.
+type UserSettingsMergeRepoValueParams struct {
+	// The repository's checked-in settings layer.
+	RepoSettings any `json:"repoSettings"`
+	// The user's settings, already resolved against any managed layer.
+	UserSettings any `json:"userSettings"`
+}
+
+// The repository layer folded into the user layer.
+// Experimental: UserSettingsMergeRepoValueResult is part of an experimental API and may
+// change or be removed.
+type UserSettingsMergeRepoValueResult struct {
+	// The merged settings, with the per-entry managed control maps re-stamped from the
+	// runtime's ambient managed policy.
+	SettingsJSON any `json:"settingsJson"`
+}
+
+// Selects the configuration directory whose settings document to clean.
+// Experimental: UserSettingsMigrateObsoleteOnDiskRequest is part of an experimental API and
+// may change or be removed.
+// Internal: UserSettingsMigrateObsoleteOnDiskRequest is an internal SDK API and is not part
+// of the public surface.
+type UserSettingsMigrateObsoleteOnDiskRequest struct {
+	// The configuration directory holding the settings document to clean. A host that scopes a
+	// session to its own Copilot home passes that directory here; omit it to clean the document
+	// under the home the server resolved for itself. The home directory and environment are
+	// deliberately not caller-supplied: they decide only the settings path root and the two
+	// hook-parsing flags, and those describe the process doing the reading rather than the
+	// caller.
+	ConfigDir *string `json:"configDir,omitempty"`
+}
+
+// The outcome of the one-time obsolete-settings cleanup.
+// Experimental: UserSettingsMigrateObsoleteOnDiskResult is part of an experimental API and
+// may change or be removed.
+// Internal: UserSettingsMigrateObsoleteOnDiskResult is an internal SDK API and is not part
+// of the public surface.
+type UserSettingsMigrateObsoleteOnDiskResult struct {
+	// What the cleanup did. Only `changed` rewrote the document. The cleaned settings are not
+	// returned here: the document is written before this replies, so `user.settings.load` reads
+	// it authoritatively.
+	// Internal: Status is part of the SDK's internal API surface and is not intended for
+	// external use.
+	Status UserSettingsMigrateObsoleteOnDiskStatus `json:"status"`
+}
+
+// Selects the configuration directory to run the one-time staff log-level migration
+// against, and supplies the caller's record of whether it has already run.
+// Experimental: UserSettingsMigrateStaffLogLevelOnceRequest is part of an experimental API
+// and may change or be removed.
+// Internal: UserSettingsMigrateStaffLogLevelOnceRequest is an internal SDK API and is not
+// part of the public surface.
+type UserSettingsMigrateStaffLogLevelOnceRequest struct {
+	// When the caller last recorded this migration, as an ISO-8601 timestamp. Supplying it lets
+	// the runtime answer `current` without re-running the evaluation.
+	CachedCompletedAt *string `json:"cachedCompletedAt,omitempty"`
+	// The configuration directory, home directory and environment to resolve the settings and
+	// global-state documents from. A host that scopes a session to its own Copilot home must
+	// pass that directory here, or the migration is evaluated against the server's own home
+	// instead.
+	Context UserSettingsHostContext `json:"context"`
+}
+
+// The outcome of the one-time staff log-level migration.
+// Experimental: UserSettingsMigrateStaffLogLevelOnceResult is part of an experimental API
+// and may change or be removed.
+// Internal: UserSettingsMigrateStaffLogLevelOnceResult is an internal SDK API and is not
+// part of the public surface.
+type UserSettingsMigrateStaffLogLevelOnceResult struct {
+	// When the migration was recorded as done, as an ISO-8601 timestamp. Absent only for
+	// `ineligible`, which records nothing.
+	CompletedAt *string `json:"completedAt,omitempty"`
+	// The settings document as it stands after the migration, keyed by setting name. Present
+	// only for `refreshed`, and only when the document could be re-read cleanly.
+	Settings any `json:"settings,omitempty"`
+	// What the migration did. Only `refreshed` can have changed the persisted settings.
+	Status StaffLogLevelMigrationStatus `json:"status"`
+}
+
+// The outcome of the one-time staff update-channel migration.
+// Experimental: UserSettingsMigrateStaffUpdateChannelOnceResult is part of an experimental
+// API and may change or be removed.
+// Internal: UserSettingsMigrateStaffUpdateChannelOnceResult is an internal SDK API and is
+// not part of the public surface.
+type UserSettingsMigrateStaffUpdateChannelOnceResult struct {
+	// When the migration was recorded as done, as an ISO-8601 timestamp. Absent only for
+	// `ineligible`, which records nothing.
+	CompletedAt *string `json:"completedAt,omitempty"`
+	// What the migration did. Only `migrated` means the persisted settings changed.
+	Status StaffUpdateChannelMigrationStatus `json:"status"`
+}
+
+// Settings object whose key names should be canonicalized.
+// Experimental: UserSettingsNormalizeRequest is part of an experimental API and may change
+// or be removed.
+type UserSettingsNormalizeRequest struct {
+	// Free-form settings object, possibly using legacy or snake_case key names.
+	Settings any `json:"settings"`
+}
+
+// Settings object with canonical key names.
+// Experimental: UserSettingsNormalizeResult is part of an experimental API and may change
+// or be removed.
+type UserSettingsNormalizeResult struct {
+	// The same settings with every legacy or snake_case key renamed to its canonical spelling.
+	Settings any `json:"settings"`
+}
+
+// The on-disk location of the user's settings document.
+// Experimental: UserSettingsPathResult is part of an experimental API and may change or be
+// removed.
+type UserSettingsPathResult struct {
+	// Absolute path to the settings file this runtime reads and writes. Normally
+	// `settings.json` under the Copilot configuration directory; an extensionless legacy
+	// `settings` file is reported instead when it exists and `settings.json` does not.
+	Path string `json:"path"`
+}
+
+// One setting that will not take effect, and why.
+// Experimental: UserSettingsProblem is part of an experimental API and may change or be
+// removed.
+type UserSettingsProblem struct {
+	// Coarse grouping for the problem, for a caller that presents problems in sections.
+	Category string `json:"category"`
+	// Why the setting will not take effect. Never contains the setting's value, which may be a
+	// token or another secret.
+	Explanation string `json:"explanation"`
+	// Stable identifier for this problem within the reported set, so a caller can track a
+	// selection across refreshes.
+	ID string `json:"id"`
+	// What is wrong in machine-readable form, for a caller that wants to branch rather than
+	// display.
+	Kind string `json:"kind"`
+	// The offending key as written in the file, when the problem is attributable to a single
+	// key. Absent when the whole file is at fault.
+	RawKey *string `json:"rawKey,omitempty"`
+	// The settings layer the problem was found in.
+	Source UserSettingsProblemLocation `json:"source"`
+}
+
+// The settings layer a problem was found in.
+// Experimental: UserSettingsProblemLocation is part of an experimental API and may change
+// or be removed.
+type UserSettingsProblemLocation struct {
+	// Absolute path of the file backing this layer.
+	FilePath string `json:"filePath"`
+	// Which layer this is: `user`, `repo`, or `local`.
+	Kind string `json:"kind"`
+	// The caller-supplied display label for the layer.
+	Label string `json:"label"`
+}
+
+// One already-loaded settings layer to diagnose.
+// Experimental: UserSettingsProblemSource is part of an experimental API and may change or
+// be removed.
+type UserSettingsProblemSource struct {
+	// The layer's settings exactly as loaded, unnormalized. Empty when the file is missing or
+	// failed to parse.
+	Config map[string]any `json:"config,omitzero"`
+	// Absolute path of the file backing this layer.
+	FilePath string `json:"filePath"`
+	// True when the file itself failed to parse, so its keys could not be read at all.
+	Invalid *bool `json:"invalid,omitempty"`
+	// Which layer this is: `user`, `repo`, or `local`.
+	Kind string `json:"kind"`
+	// Caller-chosen display label for the layer, echoed back on each problem so a caller can
+	// group by layer without re-deriving its own naming.
+	Label string `json:"label"`
+}
+
+// The settings layers to diagnose.
+// Experimental: UserSettingsProblemsRequest is part of an experimental API and may change
+// or be removed.
+type UserSettingsProblemsRequest struct {
+	// Layers to diagnose, in the precedence order the caller applies them.
+	Sources []UserSettingsProblemSource `json:"sources,omitzero"`
+}
+
+// The settings that will not take effect across the given layers.
+// Experimental: UserSettingsProblemsResult is part of an experimental API and may change or
+// be removed.
+type UserSettingsProblemsResult struct {
+	// Each setting that will not take effect, and why. Empty when every layer is healthy.
+	Problems []UserSettingsProblem `json:"problems,omitzero"`
+}
+
+// Selects the configuration directory to run the one-time staff model-selection reset
+// against, and supplies the caller's record of whether it has already run.
+// Experimental: UserSettingsResetStaffModelSelectionOnceRequest is part of an experimental
+// API and may change or be removed.
+// Internal: UserSettingsResetStaffModelSelectionOnceRequest is an internal SDK API and is
+// not part of the public surface.
+type UserSettingsResetStaffModelSelectionOnceRequest struct {
+	// The configuration directory, home directory and environment to resolve the settings and
+	// global-state documents from. A host that scopes a session to its own Copilot home must
+	// pass that directory here, or the reset is evaluated against the server's own home instead.
+	Context UserSettingsHostContext `json:"context"`
+	// Whether the signed-in account is a staff account. The reset applies only to staff, so
+	// anything other than `true` returns `didReset: false` without touching the settings
+	// document.
+	Staff *bool `json:"staff,omitempty"`
+	// When the caller last recorded this reset, as an ISO-8601 timestamp. A timestamp at or
+	// after the cutoff means the reset already ran and is returned unchanged.
+	StaffModelResetAt *string `json:"staffModelResetAt,omitempty"`
+}
+
+// The outcome of the one-time staff model-selection reset.
+// Experimental: UserSettingsResetStaffModelSelectionOnceResult is part of an experimental
+// API and may change or be removed.
+// Internal: UserSettingsResetStaffModelSelectionOnceResult is an internal SDK API and is
+// not part of the public surface.
+type UserSettingsResetStaffModelSelectionOnceResult struct {
+	// The cutoff this reset is gated on, as an ISO-8601 timestamp. A recorded timestamp at or
+	// after it means the reset is already done.
+	Cutoff string `json:"cutoff"`
+	// Whether the persisted model selection was cleared. Only `true` means the settings
+	// document changed and the host should adopt the returned settings.
+	DidReset bool `json:"didReset"`
+	// The timestamp the host should now record, as an ISO-8601 timestamp. Carries the caller's
+	// own value back unchanged when nothing was reset.
+	ResetAt *string `json:"resetAt,omitempty"`
+	// The settings document as it stands after the reset, keyed by setting name. Present only
+	// when `didReset` is true.
+	Settings any `json:"settings,omitempty"`
+}
+
+// One hook to disable or re-enable.
+// Experimental: UserSettingsSetHookDisabledRequest is part of an experimental API and may
+// change or be removed.
+// Internal: UserSettingsSetHookDisabledRequest is an internal SDK API and is not part of
+// the public surface.
+type UserSettingsSetHookDisabledRequest struct {
+	// True adds the key to `disabledHooks`, false removes it.
+	Disabled bool `json:"disabled"`
+	// Durable content-hash key of the hook, as `hooks.loadResources` reports it.
+	DisableKey string `json:"disableKey"`
+	// Path of the settings.json to rewrite.
+	SettingsPath string `json:"settingsPath"`
+}
+
+// Outcome of rewriting the `disabledHooks` setting.
+// Experimental: UserSettingsSetHookDisabledResult is part of an experimental API and may
+// change or be removed.
+// Internal: UserSettingsSetHookDisabledResult is an internal SDK API and is not part of the
+// public surface.
+type UserSettingsSetHookDisabledResult struct {
+	// Why the write failed. Absent when the status is `ok`.
+	ErrorMessage *string `json:"errorMessage,omitempty"`
+	// `ok` when the setting was written, `invalid` when settings.json could not be parsed and
+	// was left alone, `error` when the write itself failed.
+	Status string `json:"status"`
 }
 
 // Partial user settings to write to settings.json. Each top-level key is written
@@ -20035,14 +23537,116 @@ type UserSettingsSetRequest struct {
 	Settings any `json:"settings"`
 }
 
-// Outcome of writing user settings.
 // Experimental: UserSettingsSetResult is part of an experimental API and may change or be
 // removed.
 type UserSettingsSetResult struct {
-	// 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.
-	ShadowedKeys []string `json:"shadowedKeys"`
+}
+
+// Selects the configuration directory whose user settings document should be inspected for
+// unrecognized top-level keys.
+// Experimental: UserSettingsUnknownKeysWarningRequest is part of an experimental API and
+// may change or be removed.
+// Internal: UserSettingsUnknownKeysWarningRequest is an internal SDK API and is not part of
+// the public surface.
+type UserSettingsUnknownKeysWarningRequest struct {
+	// The configuration directory, home directory and environment to resolve the settings
+	// document from. A host that scopes a session to its own Copilot home must pass that
+	// directory here, or the server's own home is inspected instead.
+	Context UserSettingsHostContext `json:"context"`
+}
+
+// The unrecognized top-level keys found in the user settings document, already phrased for
+// display.
+// Experimental: UserSettingsUnknownKeysWarningResult is part of an experimental API and may
+// change or be removed.
+// Internal: UserSettingsUnknownKeysWarningResult is an internal SDK API and is not part of
+// the public surface.
+type UserSettingsUnknownKeysWarningResult struct {
+	// The warning to show the user, naming the unrecognized keys and the file they were found
+	// in. Absent when every top-level key is recognized, and also when the document is missing
+	// or could not be read, because an unknown-key list taken from a document the runtime could
+	// not load would name keys that may not be there.
+	Warning *string `json:"warning,omitempty"`
+}
+
+// Names the user setting to merge into, and the partial object to merge.
+// Experimental: UserSettingsUpdateRequest is part of an experimental API and may change or
+// be removed.
+// Internal: UserSettingsUpdateRequest is an internal SDK API and is not part of the public
+// surface.
+type UserSettingsUpdateRequest struct {
+	// Copilot configuration directory to write the settings document in, taking precedence over
+	// the server's own `COPILOT_HOME` and default home. Omit it, or pass an empty string, to
+	// use the directory the server resolved for itself.
+	ConfigDir *string `json:"configDir,omitempty"`
+	// Top-level user-setting key to merge into, such as `extensions`.
+	Key string `json:"key"`
+	// Single-component name for the settings document at `<configDir>/settings/<subDir>.json`;
+	// path separators, `.` and `..` are rejected. Omit it, or pass an empty string, to use the
+	// main settings document.
+	SubDir *string `json:"subDir,omitempty"`
+	// Value to store for `key`. When both the stored value and this value are objects, their
+	// fields are shallow-merged and fields this object does not name are preserved. Otherwise
+	// this value replaces the stored value.
+	Value any `json:"value"`
+}
+
+// The stored value of the user setting after the merge.
+// Experimental: UserSettingsUpdateResult is part of an experimental API and may change or
+// be removed.
+// Internal: UserSettingsUpdateResult is an internal SDK API and is not part of the public
+// surface.
+type UserSettingsUpdateResult struct {
+	// The key's stored value after the write: the merged object when both the stored value and
+	// the supplied value are objects, otherwise the supplied value.
+	Value any `json:"value"`
+}
+
+// A single top-level setting subtree to validate.
+// Experimental: UserSettingsValidateRequest is part of an experimental API and may change
+// or be removed.
+type UserSettingsValidateRequest struct {
+	// True to validate a removal of this key. The current settings file is not read.
+	Delete *bool `json:"delete,omitempty"`
+	// Top-level setting name to validate.
+	TopKey string `json:"topKey"`
+	// Value to validate. Omitted when `delete` is true.
+	Value any `json:"value,omitempty"`
+}
+
+// Outcome of validating one top-level setting subtree.
+// Experimental: UserSettingsValidateResult is part of an experimental API and may change or
+// be removed.
+type UserSettingsValidateResult struct {
+	// Problems found, empty when `ok` is true.
+	Issues []UserSettingsValidationIssue `json:"issues,omitzero"`
+	// True when the subtree is valid.
+	Ok bool `json:"ok"`
+}
+
+// One problem found while validating a setting value.
+// Experimental: UserSettingsValidationIssue is part of an experimental API and may change
+// or be removed.
+type UserSettingsValidationIssue struct {
+	// Human-readable description of the problem.
+	Message string `json:"message"`
+	// Where in the settings tree the problem sits, as object keys and array indices. The first
+	// element is the top-level key; a whole-value problem is reported as that single key.
+	Path []any `json:"path"`
+}
+
+// The whole content to store in the user settings file.
+// Experimental: UserSettingsWriteAllRequest is part of an experimental API and may change
+// or be removed.
+type UserSettingsWriteAllRequest struct {
+	// The settings object to store. It replaces the file's entire content, so a key absent here
+	// is removed.
+	Settings any `json:"settings"`
+}
+
+// Experimental: UserSettingsWriteAllResult is part of an experimental API and may change or
+// be removed.
+type UserSettingsWriteAllResult struct {
 }
 
 // The approval to add as a session-scoped rule
@@ -20975,12 +24579,29 @@ type WorkflowToolRunRequest struct {
 	ToolCallID *string `json:"toolCallId,omitempty"`
 }
 
+// Complete text used to generate one session diff. These are display contents, with the
+// same text decoding as the patch, not a file-restore contract.
+// Experimental: WorkspaceDiffContents is part of an experimental API and may change or be
+// removed.
+type WorkspaceDiffContents struct {
+	// Complete current text read when computing the diff. Omitted for a deleted file; an empty
+	// string represents an existing empty file.
+	After *string `json:"after,omitempty"`
+	// Complete text before the session first changed the file. Omitted when the file did not
+	// exist; an empty string represents an existing empty file.
+	Before *string `json:"before,omitempty"`
+}
+
 // A single changed file and its unified diff.
 // Experimental: WorkspaceDiffFileChange is part of an experimental API and may change or be
 // removed.
 type WorkspaceDiffFileChange struct {
 	// Type of change represented by this file diff.
 	ChangeType WorkspaceDiffFileChangeType `json:"changeType"`
+	// Full text used for this patch, only when includeContents was requested for session mode.
+	// Omitted for binary, oversized or unavailable contents, and for fallback results. Read
+	// isFallback and isTruncated before treating an absent value as a missing file.
+	Contents *WorkspaceDiffContents `json:"contents,omitempty"`
 	// Unified diff content for the file. Empty when the diff was truncated.
 	Diff string `json:"diff"`
 	// Whether the diff content was omitted because it exceeded the per-file size limit.
@@ -21093,6 +24714,11 @@ type WorkspacesDeleteAutopilotObjectiveResult struct {
 type WorkspacesDiffRequest struct {
 	// When true, ignore whitespace-only changes (git `--ignore-all-space`). Defaults to false.
 	IgnoreWhitespace *bool `json:"ignoreWhitespace,omitempty"`
+	// Include the full before/after text used to compute each session diff. Defaults to false;
+	// true is accepted only for session mode. Existing capture/read limits still apply, and
+	// binary or unavailable contents are not returned. This can substantially increase response
+	// size.
+	IncludeContents *bool `json:"includeContents,omitempty"`
 	// Diff mode requested by the client.
 	Mode WorkspaceDiffMode `json:"mode"`
 }
@@ -21576,6 +25202,21 @@ const (
 	AgentRegistrySpawnValidationErrorReasonYoloNotAllowed AgentRegistrySpawnValidationErrorReason = "yolo-not-allowed"
 )
 
+// Whether the accumulated numeric AI-credit subtotal covers the observed calls.
+// Experimental: AiCreditsStatus is part of an experimental API and may change or be removed.
+type AiCreditsStatus string
+
+const (
+	// Every observed call supplied an AI-credit amount, including an explicit zero.
+	AiCreditsStatusComplete AiCreditsStatus = "complete"
+	// Some calls supplied amounts and some did not; the numeric value is only a reported
+	// subtotal.
+	AiCreditsStatusPartial AiCreditsStatus = "partial"
+	// No AI-credit amount was reported for the observed calls. Numeric zero is not a zero-cost
+	// claim.
+	AiCreditsStatusUnavailable AiCreditsStatus = "unavailable"
+)
+
 // Type of GitHub reference
 // Experimental: AttachmentGitHubReferenceType is part of an experimental API and may change
 // or be removed.
@@ -21636,6 +25277,7 @@ const (
 type AuthInfoType string
 
 const (
+	AuthInfoTypeAccount         AuthInfoType = "account"
 	AuthInfoTypeAPIKey          AuthInfoType = "api-key"
 	AuthInfoTypeCopilotAPIToken AuthInfoType = "copilot-api-token"
 	AuthInfoTypeEnv             AuthInfoType = "env"
@@ -21646,16 +25288,19 @@ const (
 	AuthInfoTypeUser            AuthInfoType = "user"
 )
 
-// Terminal disposition of a login persistence attempt.
+// Disposition of a login attempt, including pending user decisions.
 // Experimental: AuthLoginResultStatus is part of an experimental API and may change or be
 // removed.
 type AuthLoginResultStatus string
 
 const (
-	// The credential was persisted and the account is signed in.
+	// The credential was persisted and the selected account is signed in.
 	AuthLoginResultStatusCompleted AuthLoginResultStatus = "completed"
 	// The user declined plaintext persistence.
 	AuthLoginResultStatusDeclined AuthLoginResultStatus = "declined"
+	// Credentials are saved; select an account using a returned selectionId as advance input to
+	// complete sign-in.
+	AuthLoginResultStatusNeedsAccountSelection AuthLoginResultStatus = "needs-account-selection"
 	// Persistence needs explicit consent to store the token in plaintext.
 	AuthLoginResultStatusNeedsPlaintextConsent AuthLoginResultStatus = "needs-plaintext-consent"
 )
@@ -21720,8 +25365,8 @@ const (
 	AutopilotObjectiveStatusPaused AutopilotObjectiveStatus = "paused"
 )
 
-// Routing preference used when the session model is `auto`. `fast` is an integrator-only
-// latency preset and is not a first-party GitHub Copilot product preference.
+// Extensible routing preference for the virtual `auto` model. New identifiers must be
+// advertised and enabled by the provider. `fast` is an integrator-only latency preset.
 // Experimental: AutoTier is part of an experimental API and may change or be removed.
 type AutoTier string
 
@@ -22468,6 +26113,20 @@ const (
 	ConnectorConnectResultKindPending         ConnectorConnectResultKind = "pending"
 )
 
+// Availability.
+// Experimental: ConnectorDiscoveryAvailability is part of an experimental API and may
+// change or be removed.
+type ConnectorDiscoveryAvailability string
+
+const (
+	// Disabled.
+	ConnectorDiscoveryAvailabilityDisabled ConnectorDiscoveryAvailability = "disabled"
+	// Enabled.
+	ConnectorDiscoveryAvailabilityEnabled ConnectorDiscoveryAvailability = "enabled"
+	// Unavailable.
+	ConnectorDiscoveryAvailabilityUnavailable ConnectorDiscoveryAvailability = "unavailable"
+)
+
 // Live MCP status of one Connector-owned runtime server.
 // Experimental: ConnectorMCPStatus is part of an experimental API and may change or be
 // removed.
@@ -22876,6 +26535,32 @@ const (
 	ExternalToolTextResultForLlmContentTypeText         ExternalToolTextResultForLlmContentType = "text"
 )
 
+// The population a feature flag is declared for, before overrides.
+// Experimental: FeatureFlagAvailability is part of an experimental API and may change or be
+// removed.
+type FeatureFlagAvailability string
+
+const (
+	// Enabled only for accounts that opted into experimental features.
+	FeatureFlagAvailabilityExperimental FeatureFlagAvailability = "experimental"
+	// Disabled for everyone, before any override.
+	FeatureFlagAvailabilityOff FeatureFlagAvailability = "off"
+	// Enabled for everyone, before any override.
+	FeatureFlagAvailabilityOn FeatureFlagAvailability = "on"
+	// Enabled for any staff account, GitHub or Microsoft.
+	FeatureFlagAvailabilityStaff FeatureFlagAvailability = "staff"
+	// Enabled only for staff accounts that have also opted into experimental features.
+	FeatureFlagAvailabilityStaffAndExperimental FeatureFlagAvailability = "staff-and-experimental"
+	// Enabled for GitHub staff accounts only.
+	FeatureFlagAvailabilityStaffGitHub FeatureFlagAvailability = "staff-github"
+	// Enabled for Microsoft staff accounts only.
+	FeatureFlagAvailabilityStaffMicrosoft FeatureFlagAvailability = "staff-microsoft"
+	// Enabled for staff accounts and for accounts that opted into experimental features.
+	FeatureFlagAvailabilityStaffOrExperimental FeatureFlagAvailability = "staff-or-experimental"
+	// Enabled only for accounts on the owning team.
+	FeatureFlagAvailabilityTeam FeatureFlagAvailability = "team"
+)
+
 // Why the runtime is requesting a GitHub credential.
 // Experimental: GitHubTokenAcquireReason is part of an experimental API and may change or
 // be removed.
@@ -23243,6 +26928,87 @@ const (
 	LoginProviderKindProxima LoginProviderKind = "proxima"
 )
 
+// Operation to evaluate. Currently only url is supported.
+type ManagedPermissionOperationKind string
+
+const (
+	ManagedPermissionOperationKindURL ManagedPermissionOperationKind = "url"
+)
+
+// Managed-policy verdict only: deny blocks the URL, ask requires approval, allow approves
+// under managed policy, and unmanaged leaves the normal consumer permission flow in effect.
+// No verdict bypasses other security controls.
+// Experimental: ManagedPermissionVerdict is part of an experimental API and may change or
+// be removed.
+type ManagedPermissionVerdict string
+
+const (
+	// Managed policy allows the operation, subject to other security controls.
+	ManagedPermissionVerdictAllow ManagedPermissionVerdict = "allow"
+	// Managed policy requires the consumer to obtain approval.
+	ManagedPermissionVerdictAsk ManagedPermissionVerdict = "ask"
+	// Managed policy prohibits the operation; do not offer approval.
+	ManagedPermissionVerdictDeny ManagedPermissionVerdict = "deny"
+	// Managed policy does not decide the operation; use the consumer's normal permission flow.
+	ManagedPermissionVerdictUnmanaged ManagedPermissionVerdict = "unmanaged"
+)
+
+// What retrying did for one plugin required by managed settings.
+// Experimental: ManagedPluginRetryStatus is part of an experimental API and may change or
+// be removed.
+type ManagedPluginRetryStatus string
+
+const (
+	// The plugin was already installed and current, so nothing was done.
+	ManagedPluginRetryStatusAlreadyPresent ManagedPluginRetryStatus = "already_present"
+	// The plugin was not prepared because another session was changing plugins or the managed
+	// settings changed during the retry. It is prepared again before a later message.
+	ManagedPluginRetryStatusDeferred ManagedPluginRetryStatus = "deferred"
+	// Checking, installing, or updating the plugin failed. See `error`.
+	ManagedPluginRetryStatusFailed ManagedPluginRetryStatus = "failed"
+	// The plugin was missing and is now installed.
+	ManagedPluginRetryStatusInstalled ManagedPluginRetryStatus = "installed"
+	// The session's managed settings do not require this plugin, so nothing was done.
+	ManagedPluginRetryStatusNotRequired ManagedPluginRetryStatus = "not_required"
+	// An update was available and is now installed.
+	ManagedPluginRetryStatusUpdated ManagedPluginRetryStatus = "updated"
+)
+
+// Which layer disabled bypass-permissions mode. The layer matters because only a
+// server-delivered disable is pinned to an account and can later be lifted by signing in
+// elsewhere.
+// Experimental: ManagedSettingsBypassDisableSource is part of an experimental API and may
+// change or be removed.
+type ManagedSettingsBypassDisableSource string
+
+const (
+	// The account's server-delivered org policy disabled it. Pinned to the account named by
+	// `currentManagedIdentity`.
+	ManagedSettingsBypassDisableSourceManaged ManagedSettingsBypassDisableSource = "managed"
+	// The device/MDM layer disabled it. Outranks the account, so no server answer lifts it.
+	ManagedSettingsBypassDisableSourceMdm ManagedSettingsBypassDisableSource = "mdm"
+	// The user turned bypass mode off themselves.
+	ManagedSettingsBypassDisableSourceUser ManagedSettingsBypassDisableSource = "user"
+)
+
+// What the managed-policy resolution said about bypass-permissions mode. `unknown` is a
+// third answer rather than a missing one, and the caller must send it explicitly when it
+// has no verdict.
+// Experimental: ManagedSettingsBypassPolicyResolution is part of an experimental API and
+// may change or be removed.
+type ManagedSettingsBypassPolicyResolution string
+
+const (
+	// The policy resolved and does not disable bypass mode.
+	ManagedSettingsBypassPolicyResolutionAllowed ManagedSettingsBypassPolicyResolution = "allowed"
+	// The policy resolved and disables bypass mode.
+	ManagedSettingsBypassPolicyResolutionDisabled ManagedSettingsBypassPolicyResolution = "disabled"
+	// No verdict: the fetch failed, or the service declared a policy this build may not
+	// enforce. Whatever is in force is preserved, because reverting to permissive on an
+	// unreadable policy would widen access.
+	ManagedSettingsBypassPolicyResolutionUnknown ManagedSettingsBypassPolicyResolution = "unknown"
+)
+
 // A channel accepted by managedSettings.compose.
 // Experimental: ManagedSettingsChannel is part of an experimental API and may change or be
 // removed.
@@ -23269,6 +27035,46 @@ const (
 	ManagedSettingsDiagnosticSeverityWarning ManagedSettingsDiagnosticSeverity = "warning"
 )
 
+// Severity of a diagnostic emitted while ingesting managed settings.
+// Experimental: ManagedSettingsLogLevel is part of an experimental API and may change or be
+// removed.
+type ManagedSettingsLogLevel string
+
+const (
+	// Detail useful only when diagnosing an ingestion.
+	ManagedSettingsLogLevelDebug ManagedSettingsLogLevel = "debug"
+	// A failure that changed the outcome of the ingestion.
+	ManagedSettingsLogLevelError ManagedSettingsLogLevel = "error"
+	// Ordinary progress worth surfacing under a verbose flag.
+	ManagedSettingsLogLevelInfo ManagedSettingsLogLevel = "info"
+	// A condition the operator should see but which did not stop the ingestion.
+	ManagedSettingsLogLevelWarning ManagedSettingsLogLevel = "warning"
+)
+
+// Which channel registered the policy helper that produced a helper layer.
+// Experimental: ManagedSettingsPolicyHelperAuthority is part of an experimental API and may
+// change or be removed.
+type ManagedSettingsPolicyHelperAuthority string
+
+const (
+	// The helper was registered by the device (MDM or managed file) layer.
+	ManagedSettingsPolicyHelperAuthorityDevice ManagedSettingsPolicyHelperAuthority = "device"
+	// The helper was registered by the account's server-delivered policy.
+	ManagedSettingsPolicyHelperAuthorityServer ManagedSettingsPolicyHelperAuthority = "server"
+)
+
+// The operation that requires a policy-helper response.
+// Experimental: ManagedSettingsPolicyHelperReason is part of an experimental API and may
+// change or be removed.
+type ManagedSettingsPolicyHelperReason string
+
+const (
+	// Resolve policy before plugin activation.
+	ManagedSettingsPolicyHelperReasonPluginActivation ManagedSettingsPolicyHelperReason = "pluginActivation"
+	// Resolve policy for session startup.
+	ManagedSettingsPolicyHelperReasonSessionStart ManagedSettingsPolicyHelperReason = "sessionStart"
+)
+
 // Summary of which managed-settings channels contributed to the effective session policy.
 // Use the per-channel booleans for exact provenance.
 // Experimental: ManagedSettingsResolvedSource is part of an experimental API and may change
@@ -23292,6 +27098,44 @@ const (
 	ManagedSettingsResolvedSourceServer ManagedSettingsResolvedSource = "server"
 )
 
+// How an ingestion may use the on-disk server-policy cache.
+// Experimental: ManagedSettingsServerPolicyCacheMode is part of an experimental API and may
+// change or be removed.
+type ManagedSettingsServerPolicyCacheMode string
+
+const (
+	// Read cached policy without a network request.
+	ManagedSettingsServerPolicyCacheModeCacheOnly ManagedSettingsServerPolicyCacheMode = "cacheOnly"
+	// Ignore the cache entirely and rely on the live fetch alone.
+	ManagedSettingsServerPolicyCacheModeDisabled ManagedSettingsServerPolicyCacheMode = "disabled"
+	// Serve a cached entry only as a fallback after a failed live fetch.
+	ManagedSettingsServerPolicyCacheModeFallbackOnly ManagedSettingsServerPolicyCacheMode = "fallbackOnly"
+	// Serve a recent cache entry before a live fetch.
+	ManagedSettingsServerPolicyCacheModePreferFresh ManagedSettingsServerPolicyCacheMode = "preferFresh"
+)
+
+// How the server layer of an ingestion was resolved.
+// Experimental: ManagedSettingsServerPolicyResolution is part of an experimental API and
+// may change or be removed.
+type ManagedSettingsServerPolicyResolution string
+
+const (
+	// No cached policy or confirmed no-policy result exists.
+	ManagedSettingsServerPolicyResolutionCacheMiss ManagedSettingsServerPolicyResolution = "cacheMiss"
+	// No policy could be resolved and the host applies the fail-closed gates.
+	ManagedSettingsServerPolicyResolutionFailClosed ManagedSettingsServerPolicyResolution = "failClosed"
+	// No policy could be resolved and the host proceeds unmanaged.
+	ManagedSettingsServerPolicyResolutionFailOpen ManagedSettingsServerPolicyResolution = "failOpen"
+	// A live fetch failed and a cached entry was served in its place.
+	ManagedSettingsServerPolicyResolutionFallbackCache ManagedSettingsServerPolicyResolution = "fallbackCache"
+	// A recent cached entry was served without a live fetch.
+	ManagedSettingsServerPolicyResolutionFreshCache ManagedSettingsServerPolicyResolution = "freshCache"
+	// A live fetch succeeded.
+	ManagedSettingsServerPolicyResolutionLive ManagedSettingsServerPolicyResolution = "live"
+	// No fetch was attempted because no usable token was available.
+	ManagedSettingsServerPolicyResolutionSkippedNoToken ManagedSettingsServerPolicyResolution = "skippedNoToken"
+)
+
 // Allowed values for the `McpAppsHostContextDetailsAvailableDisplayMode` enumeration.
 // Experimental: MCPAppsHostContextDetailsAvailableDisplayMode is part of an experimental
 // API and may change or be removed.
@@ -24005,11 +27849,13 @@ const (
 	MCPServerConfigStdioTypeStdio MCPServerConfigStdioType = "stdio"
 )
 
-// Configuration source: user, workspace, plugin, builtin, or managed
+// Configuration source: user, workspace, plugin, builtin, managed, or account
 // Experimental: MCPServerSource is part of an experimental API and may change or be removed.
 type MCPServerSource string
 
 const (
+	// Server contributed by a signed-in account; enablement and organization policy still apply.
+	MCPServerSourceAccount MCPServerSource = "account"
 	// Server bundled with the runtime.
 	MCPServerSourceBuiltin MCPServerSource = "builtin"
 	// Server supplied by a trusted host-managed catalog.
@@ -24893,6 +28739,137 @@ const (
 	ProviderEndpointWireAPIResponses ProviderEndpointWireAPI = "responses"
 )
 
+// Identity scope of a monthly usage reading.
+// Experimental: ProviderMonthlyUsageScope is part of an experimental API and may change or
+// be removed.
+type ProviderMonthlyUsageScope string
+
+const (
+	// The service did not establish a recognized usage scope.
+	ProviderMonthlyUsageScopeUnknown ProviderMonthlyUsageScope = "unknown"
+	// Consumption of the authenticated user within the parent observation's service and
+	// returned cycle.
+	ProviderMonthlyUsageScopeUser ProviderMonthlyUsageScope = "user"
+)
+
+// Availability of a service's monthly consumption reading.
+// Experimental: ProviderMonthlyUsageState is part of an experimental API and may change or
+// be removed.
+type ProviderMonthlyUsageState string
+
+const (
+	// The service reported a usable consumption reading, including an explicit zero.
+	ProviderMonthlyUsageStateAvailable ProviderMonthlyUsageState = "available"
+	// The service found no usage policy; no consumption amount is known.
+	ProviderMonthlyUsageStateNoPolicy ProviderMonthlyUsageState = "no_policy"
+	// The read failed or its data could not be used; consumption is unknown.
+	ProviderMonthlyUsageStateUnavailable ProviderMonthlyUsageState = "unavailable"
+	// The service reported an unrecognized usage state.
+	ProviderMonthlyUsageStateUnknown ProviderMonthlyUsageState = "unknown"
+)
+
+// Access policy reported by the quota service.
+// Experimental: ProviderQuotaAccessState is part of an experimental API and may change or
+// be removed.
+type ProviderQuotaAccessState string
+
+const (
+	// Access is allowed.
+	ProviderQuotaAccessStateAllowed ProviderQuotaAccessState = "allowed"
+	// Access is denied.
+	ProviderQuotaAccessStateDenied ProviderQuotaAccessState = "denied"
+	// Quota is not required for this access.
+	ProviderQuotaAccessStateNotRequired ProviderQuotaAccessState = "not_required"
+	// Client-only compatibility placeholder when acquisitionStatus is unavailable or failed;
+	// not an observed service verdict.
+	ProviderQuotaAccessStateUnavailable ProviderQuotaAccessState = "unavailable"
+	// The service did not supply a recognized access state.
+	ProviderQuotaAccessStateUnknown ProviderQuotaAccessState = "unknown"
+)
+
+// Acquisition state, independent of the service's business access/capacity verdict.
+// Experimental: ProviderQuotaAcquisitionStatus is part of an experimental API and may
+// change or be removed.
+type ProviderQuotaAcquisitionStatus string
+
+const (
+	// Acquisition failed; inspect httpStatus/acquisitionError without inferring a business
+	// verdict.
+	ProviderQuotaAcquisitionStatusFailed ProviderQuotaAcquisitionStatus = "failed"
+	// A service quota observation was received.
+	ProviderQuotaAcquisitionStatusSucceeded ProviderQuotaAcquisitionStatus = "succeeded"
+	// No service snapshot is available for this caller or surface.
+	ProviderQuotaAcquisitionStatusUnavailable ProviderQuotaAcquisitionStatus = "unavailable"
+)
+
+// Capacity is independent of whether a numeric balance was supplied.
+// Experimental: ProviderQuotaCapacityState is part of an experimental API and may change or
+// be removed.
+type ProviderQuotaCapacityState string
+
+const (
+	// Capacity is available.
+	ProviderQuotaCapacityStateAvailable ProviderQuotaCapacityState = "available"
+	// The service explicitly reports exhaustion.
+	ProviderQuotaCapacityStateExhausted ProviderQuotaCapacityState = "exhausted"
+	// The service reports that capacity is not applicable.
+	ProviderQuotaCapacityStateNotApplicable ProviderQuotaCapacityState = "not_applicable"
+	// No billable quota is required.
+	ProviderQuotaCapacityStateNotRequired ProviderQuotaCapacityState = "not_required"
+	// Client-only compatibility placeholder when acquisitionStatus is unavailable or failed;
+	// not an observed service verdict.
+	ProviderQuotaCapacityStateUnavailable ProviderQuotaCapacityState = "unavailable"
+	// No recognized capacity state was supplied.
+	ProviderQuotaCapacityStateUnknown ProviderQuotaCapacityState = "unknown"
+	// The reported entitlement is unlimited.
+	ProviderQuotaCapacityStateUnlimited ProviderQuotaCapacityState = "unlimited"
+)
+
+// Timing and purpose of a provider quota observation.
+// Experimental: ProviderQuotaObservationKind is part of an experimental API and may change
+// or be removed.
+type ProviderQuotaObservationKind string
+
+const (
+	// An explicit account read; consumption may still be subject to service aggregation delay.
+	ProviderQuotaObservationKindAccountSnapshot ProviderQuotaObservationKind = "account_snapshot"
+	// A verdict attached before an inference response. May be cached; never a post-charge
+	// balance.
+	ProviderQuotaObservationKindAdmissionState ProviderQuotaObservationKind = "admission_state"
+)
+
+// Interpretation permitted for independently reported quantities.
+// Experimental: ProviderQuotaQuantityKind is part of an experimental API and may change or
+// be removed.
+type ProviderQuotaQuantityKind string
+
+const (
+	// Raw advisory quantities; do not infer permission, usage percentage, reset cadence, or
+	// post-charge balance.
+	ProviderQuotaQuantityKindAdvisoryBalance ProviderQuotaQuantityKind = "advisory_balance"
+	// Quantities form an authoritative available-of-entitled budget suitable for percentage
+	// presentation.
+	ProviderQuotaQuantityKindAuthoritativeBudget ProviderQuotaQuantityKind = "authoritative_budget"
+	// No quantity measurement, as with admission-only response headers.
+	ProviderQuotaQuantityKindNone ProviderQuotaQuantityKind = "none"
+)
+
+// Units explicitly reported by a quota provider.
+// Experimental: ProviderQuotaUnit is part of an experimental API and may change or be
+// removed.
+type ProviderQuotaUnit string
+
+const (
+	// AI credits, not tokens or currency.
+	ProviderQuotaUnitAiCredits ProviderQuotaUnit = "ai_credits"
+	// Requests charged against an entitlement.
+	ProviderQuotaUnitRequests ProviderQuotaUnit = "requests"
+	// Model tokens.
+	ProviderQuotaUnitTokens ProviderQuotaUnit = "tokens"
+	// The observation does not establish a quantity unit.
+	ProviderQuotaUnitUnknown ProviderQuotaUnit = "unknown"
+)
+
 // Type of GitHub reference
 // Experimental: PushAttachmentGitHubReferenceType is part of an experimental API and may
 // change or be removed.
@@ -24969,6 +28946,8 @@ const (
 	// Review or widen the sandbox policy. The blocked path or host is named by the accompanying
 	// message or by the tool result the action arrived with.
 	RemediationActionReviewSandboxPolicy RemediationAction = "review_sandbox_policy"
+	// Discard conversation history back through the blocked request before continuing.
+	RemediationActionRewindConversation RemediationAction = "rewind_conversation"
 	// Inspect which account is currently authenticated before deciding what to change.
 	RemediationActionShowAccount RemediationAction = "show_account"
 	// Authenticate again with the Copilot backend. The current credential is absent, expired,
@@ -25036,6 +29015,18 @@ const (
 	RemoteSessionModeOn RemoteSessionMode = "on"
 )
 
+// Which repository settings file to edit.
+// Experimental: RepoSettingsEditScope is part of an experimental API and may change or be
+// removed.
+type RepoSettingsEditScope string
+
+const (
+	// The local repository settings file.
+	RepoSettingsEditScopeLocal RepoSettingsEditScope = "local"
+	// The shared repository settings file.
+	RepoSettingsEditScopeRepo RepoSettingsEditScope = "repo"
+)
+
 // Output format discriminator. Currently only json_schema is supported.
 type ResponseFormatType string
 
@@ -25409,6 +29400,30 @@ const (
 	SessionOpenParamsKindResumeLast SessionOpenParamsKind = "resumeLast"
 )
 
+// Copilot plan tier used by the session quota projection.
+// Experimental: SessionQuotaPlanTier is part of an experimental API and may change or be
+// removed.
+type SessionQuotaPlanTier string
+
+const (
+	// Copilot Business.
+	SessionQuotaPlanTierBusiness SessionQuotaPlanTier = "business"
+	// Copilot education entitlement.
+	SessionQuotaPlanTierEdu SessionQuotaPlanTier = "edu"
+	// Copilot Enterprise.
+	SessionQuotaPlanTierEnterprise SessionQuotaPlanTier = "enterprise"
+	// Copilot Free.
+	SessionQuotaPlanTierFree SessionQuotaPlanTier = "free"
+	// Copilot Max.
+	SessionQuotaPlanTierMax SessionQuotaPlanTier = "max"
+	// Copilot Pro.
+	SessionQuotaPlanTierPro SessionQuotaPlanTier = "pro"
+	// Copilot Pro+.
+	SessionQuotaPlanTierProPlus SessionQuotaPlanTier = "pro_plus"
+	// The account's plan tier is not known.
+	SessionQuotaPlanTierUnknown SessionQuotaPlanTier = "unknown"
+)
+
 // Status discriminator for SessionsClientMetadataEntry.
 type SessionsClientMetadataEntryStatus string
 
@@ -25572,6 +29587,7 @@ const (
 type SettableAuthInfoType string
 
 const (
+	SettableAuthInfoTypeAccount         SettableAuthInfoType = "account"
 	SettableAuthInfoTypeAPIKey          SettableAuthInfoType = "api-key"
 	SettableAuthInfoTypeCopilotAPIToken SettableAuthInfoType = "copilot-api-token"
 	SettableAuthInfoTypeEnv             SettableAuthInfoType = "env"
@@ -25581,6 +29597,36 @@ const (
 	SettableAuthInfoTypeUser            SettableAuthInfoType = "user"
 )
 
+// One atomic settings mutation.
+// Experimental: SettingsEditOperation is part of an experimental API and may change or be
+// removed.
+type SettingsEditOperation string
+
+const (
+	// Add one string to a list, unless present.
+	SettingsEditOperationAddItem SettingsEditOperation = "add-item"
+	// Remove the setting without supplying a value.
+	SettingsEditOperationRemove SettingsEditOperation = "remove"
+	// Remove one string from a list, unless absent.
+	SettingsEditOperationRemoveItem SettingsEditOperation = "remove-item"
+	// Set one scalar value.
+	SettingsEditOperationSet SettingsEditOperation = "set"
+)
+
+// Whether one atomic settings edit changed a file.
+// Experimental: SettingsEditStatus is part of an experimental API and may change or be
+// removed.
+type SettingsEditStatus string
+
+const (
+	// The edit changed the setting and was stored.
+	SettingsEditStatusChanged SettingsEditStatus = "changed"
+	// The existing settings file could not be edited safely; nothing was written.
+	SettingsEditStatusInvalid SettingsEditStatus = "invalid"
+	// The setting already had the requested state.
+	SettingsEditStatusUnchanged SettingsEditStatus = "unchanged"
+)
+
 // 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
@@ -25890,6 +29936,45 @@ const (
 	SlashCommandModelPickerDialogKindModelPicker SlashCommandModelPickerDialogKind = "model-picker"
 )
 
+// What the one-time staff log-level migration did.
+// Experimental: StaffLogLevelMigrationStatus is part of an experimental API and may change
+// or be removed.
+type StaffLogLevelMigrationStatus string
+
+const (
+	// The migration already ran; the stored completion timestamp is returned unchanged.
+	StaffLogLevelMigrationStatusCurrent StaffLogLevelMigrationStatus = "current"
+	// The account is not a staff account, so the migration does not apply and nothing was
+	// recorded.
+	StaffLogLevelMigrationStatusIneligible StaffLogLevelMigrationStatus = "ineligible"
+	// The migration ran now. The persisted settings may have changed, so the host should adopt
+	// the returned settings when they are present.
+	StaffLogLevelMigrationStatusRefreshed StaffLogLevelMigrationStatus = "refreshed"
+)
+
+// What the one-time staff update-channel migration did.
+// Experimental: StaffUpdateChannelMigrationStatus is part of an experimental API and may
+// change or be removed.
+type StaffUpdateChannelMigrationStatus string
+
+const (
+	// The persisted channel was already stable, so nothing changed, but the migration is now
+	// recorded as done.
+	StaffUpdateChannelMigrationStatusCompleted StaffUpdateChannelMigrationStatus = "completed"
+	// The migration already ran within the cutoff window; the stored completion timestamp is
+	// returned unchanged.
+	StaffUpdateChannelMigrationStatusCurrent StaffUpdateChannelMigrationStatus = "current"
+	// The account is on the experimental channel, which the migration deliberately leaves
+	// alone, and the migration is recorded as done.
+	StaffUpdateChannelMigrationStatusExcludedExperimental StaffUpdateChannelMigrationStatus = "excluded-experimental"
+	// The account is not a staff account, so the migration does not apply and nothing was
+	// recorded.
+	StaffUpdateChannelMigrationStatusIneligible StaffUpdateChannelMigrationStatus = "ineligible"
+	// The persisted update channel was changed to stable. Only this outcome requires the host
+	// to reload its configuration.
+	StaffUpdateChannelMigrationStatusMigrated StaffUpdateChannelMigrationStatus = "migrated"
+)
+
 // Context tier override for matching subagents
 // Experimental: SubagentSettingsEntryContextTier is part of an experimental API and may
 // change or be removed.
@@ -26216,6 +30301,23 @@ const (
 	UISessionLimitsExhaustedResponseActionUnset UISessionLimitsExhaustedResponseAction = "unset"
 )
 
+// What the one-time obsolete-settings cleanup did to the document.
+// Experimental: UserSettingsMigrateObsoleteOnDiskStatus is part of an experimental API and
+// may change or be removed.
+type UserSettingsMigrateObsoleteOnDiskStatus string
+
+const (
+	// Obsolete keys were removed and the document was rewritten.
+	UserSettingsMigrateObsoleteOnDiskStatusChanged UserSettingsMigrateObsoleteOnDiskStatus = "changed"
+	// The document could not be parsed, so it was left untouched rather than rewritten from a
+	// partial read.
+	UserSettingsMigrateObsoleteOnDiskStatusInvalid UserSettingsMigrateObsoleteOnDiskStatus = "invalid"
+	// No settings document exists, so there was nothing to clean.
+	UserSettingsMigrateObsoleteOnDiskStatusMissing UserSettingsMigrateObsoleteOnDiskStatus = "missing"
+	// The document parsed and held nothing obsolete, so nothing was written.
+	UserSettingsMigrateObsoleteOnDiskStatusUnchanged UserSettingsMigrateObsoleteOnDiskStatus = "unchanged"
+)
+
 // Kind discriminator for UserToolSessionApproval.
 type UserToolSessionApprovalKind string
 
@@ -26681,6 +30783,82 @@ func (a *ServerCommandsAPI) List(ctx context.Context) (*CommandList, error) {
 	return &result, nil
 }
 
+// Experimental: ServerConnectorsAPI contains experimental APIs that may change or be
+// removed.
+type ServerConnectorsAPI serverAPI
+
+// GetAccounts returns eligible accounts.
+//
+// RPC method: connectors.getAccounts.
+//
+// Returns: Eligible accounts.
+func (a *ServerConnectorsAPI) GetAccounts(ctx context.Context) (*ConnectorDiscoveryAccountList, error) {
+	raw, err := a.client.Request(ctx, "connectors.getAccounts", nil)
+	if err != nil {
+		return nil, err
+	}
+	var result ConnectorDiscoveryAccountList
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// GetCapabilities returns feature availability.
+//
+// RPC method: connectors.getCapabilities.
+//
+// Returns: Feature availability.
+func (a *ServerConnectorsAPI) GetCapabilities(ctx context.Context) (*ConnectorDiscoveryCapabilities, error) {
+	raw, err := a.client.Request(ctx, "connectors.getCapabilities", nil)
+	if err != nil {
+		return nil, err
+	}
+	var result ConnectorDiscoveryCapabilities
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// Lists entries for the selected account.
+//
+// RPC method: connectors.list.
+//
+// Parameters: Selected account.
+//
+// Returns: Entries for the selected account.
+func (a *ServerConnectorsAPI) List(ctx context.Context, params *ConnectorDiscoveryAccountRequest) (*ConnectorDiscoveryCatalogResult, error) {
+	raw, err := a.client.Request(ctx, "connectors.list", params)
+	if err != nil {
+		return nil, err
+	}
+	var result ConnectorDiscoveryCatalogResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// Refreshes entries for the selected account.
+//
+// RPC method: connectors.refresh.
+//
+// Parameters: Selected account.
+//
+// Returns: Entries for the selected account.
+func (a *ServerConnectorsAPI) Refresh(ctx context.Context, params *ConnectorDiscoveryAccountRequest) (*ConnectorDiscoveryCatalogResult, error) {
+	raw, err := a.client.Request(ctx, "connectors.refresh", params)
+	if err != nil {
+		return nil, err
+	}
+	var result ConnectorDiscoveryCatalogResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
 // Experimental: ServerEnvironmentsAPI contains experimental APIs that may change or be
 // removed.
 type ServerEnvironmentsAPI serverAPI
@@ -26856,6 +31034,28 @@ func (a *ServerHostAPI) Dispose(ctx context.Context, params *HostDisposeRequest)
 	return &result, nil
 }
 
+// ListSessions reads the complete advertised live and dormant session catalog of an
+// existing host owned by this connection. Does not start hosting, subscribe to sessions, or
+// guarantee resumability.
+//
+// RPC method: host.listSessions.
+//
+// Parameters: Reads a running host's catalog or the runtime's saved default catalog.
+//
+// Returns: The complete live and dormant advertised catalog, without subscribing to
+// sessions.
+func (a *ServerHostAPI) ListSessions(ctx context.Context, params *HostListSessionsRequest) (*HostListSessionsResult, error) {
+	raw, err := a.client.Request(ctx, "host.listSessions", params)
+	if err != nil {
+		return nil, err
+	}
+	var result HostListSessionsResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
 // PublishSession publishes an attached resident session for this listener's lifetime
 // without copying it.
 //
@@ -27160,6 +31360,42 @@ func (a *ServerManagedSettingsAPI) Validate(ctx context.Context, params *Managed
 	return &result, nil
 }
 
+// Experimental: ServerManagedSettingsPermissionsAPI contains experimental APIs that may
+// change or be removed.
+type ServerManagedSettingsPermissionsAPI serverAPI
+
+// Evaluate pure, sessionless evaluation of operations against a supplied
+// permissionsContext. Performs no policy discovery, I/O, prompting, navigation, permission
+// grants, or sandbox changes. Obtain the context from managedSettings.resolve or
+// session.managedSettings.get, or reuse an in-memory context. Results preserve input order
+// and duplicates. Consumers must block deny, obtain approval for ask, and use their normal
+// permission flow for unmanaged. Unknown policy returns failClosed with every operation
+// denied. This is not a substitute for user permissions or other security controls.
+//
+// RPC method: managedSettings.permissions.evaluate.
+//
+// Parameters: Managed policy context and ordered operations for pure, sessionless
+// evaluation.
+//
+// Returns: Ordered managed permission verdicts and the supplied policy's fail-closed
+// posture.
+func (a *ServerManagedSettingsPermissionsAPI) Evaluate(ctx context.Context, params *ManagedPermissionsEvaluateRequest) (*ManagedSettingsPermissionsEvaluateResult, error) {
+	raw, err := a.client.Request(ctx, "managedSettings.permissions.evaluate", params)
+	if err != nil {
+		return nil, err
+	}
+	var result ManagedSettingsPermissionsEvaluateResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// Experimental: Permissions returns experimental APIs that may change or be removed.
+func (s *ServerManagedSettingsAPI) Permissions() *ServerManagedSettingsPermissionsAPI {
+	return (*ServerManagedSettingsPermissionsAPI)(s)
+}
+
 // Experimental: ServerMCPAPI contains experimental APIs that may change or be removed.
 type ServerMCPAPI serverAPI
 
@@ -27875,6 +32111,48 @@ func (a *ServerSandboxAPI) GetHostSupport(ctx context.Context) (*SandboxHostSupp
 // removed.
 type ServerSandboxProxyCaAPI serverAPI
 
+// CheckInstallationSupport reports whether this runtime process can offer installing the
+// sandbox credential-proxy certificate authority into OS trust.
+//
+// RPC method: sandbox.proxyCa.checkInstallationSupport.
+//
+// Returns: True when this process can offer installing the sandbox credential-proxy
+// certificate authority into OS trust.
+func (a *ServerSandboxProxyCaAPI) CheckInstallationSupport(ctx context.Context) (*SandboxProxyCaCheckInstallationSupportResult, error) {
+	raw, err := a.client.Request(ctx, "sandbox.proxyCa.checkInstallationSupport", nil)
+	if err != nil {
+		return nil, err
+	}
+	var result SandboxProxyCaCheckInstallationSupportResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// CheckRelevance reports whether this sandbox configuration uses the credential proxy and
+// can need certificate-authority setup.
+//
+// RPC method: sandbox.proxyCa.checkRelevance.
+//
+// Parameters: Identifies the credential hosts that the persistent certificate authority of
+// the sandbox credential proxy must cover. The runtime always adds the hosts from the saved
+// user settings.
+//
+// Returns: True when the sandbox configuration uses the credential proxy and can need
+// certificate-authority setup.
+func (a *ServerSandboxProxyCaAPI) CheckRelevance(ctx context.Context, params *SandboxProxyCaRequest) (*SandboxProxyCaCheckRelevanceResult, error) {
+	raw, err := a.client.Request(ctx, "sandbox.proxyCa.checkRelevance", params)
+	if err != nil {
+		return nil, err
+	}
+	var result SandboxProxyCaCheckRelevanceResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
 // Creates the persistent certificate authority of the sandbox credential proxy if none is
 // stored, without changing OS trust, and returns the path of its public certificate. Keeps
 // an existing certificate authority, even one that must be rotated. Fails where OS trust is
@@ -28820,564 +33098,3171 @@ func (a *ServerSkillsInstallationsAPI) List(ctx context.Context, params *SkillIn
 	return result, nil
 }
 
-// Recover reconciles interrupted owned Skill installation work for the selected existing
-// session, then inspects owned inventory. Recovery is never gated by the Skill-install
-// feature flag.
+// Recover reconciles interrupted owned Skill installation work for the selected existing
+// session, then inspects owned inventory. Recovery is never gated by the Skill-install
+// feature flag.
+//
+// RPC method: skills.installations.recover.
+//
+// Parameters: Inventory request under an explicitly selected existing session.
+//
+// Returns: Skill installation management result with the honoured contract, or a typed
+// refusal.
+func (a *ServerSkillsInstallationsAPI) Recover(ctx context.Context, params *SkillInstallationsRequest) (SkillInstallationManagementResult, error) {
+	raw, err := a.client.Request(ctx, "skills.installations.recover", params)
+	if err != nil {
+		return nil, err
+	}
+	result, err := unmarshalSkillInstallationManagementResult(raw)
+	if err != nil {
+		return nil, err
+	}
+	return result, nil
+}
+
+// SetEnabled atomically persists enablement for one owned Agent Finder Skill and reconciles
+// the selected bound session. Enablement is installation-scoped by receipt identity and is
+// never gated by the Skill-install feature flag.
+//
+// RPC method: skills.installations.setEnabled.
+//
+// Parameters: Persisted enablement update for one owned Skill installation.
+//
+// Returns: Skill installation management result with the honoured contract, or a typed
+// refusal.
+func (a *ServerSkillsInstallationsAPI) SetEnabled(ctx context.Context, params *SkillSetEnabledRequest) (SkillInstallationManagementResult, error) {
+	raw, err := a.client.Request(ctx, "skills.installations.setEnabled", params)
+	if err != nil {
+		return nil, err
+	}
+	result, err := unmarshalSkillInstallationManagementResult(raw)
+	if err != nil {
+		return nil, err
+	}
+	return result, nil
+}
+
+// Status inspects a known Skill installation operation on its original runtime connection.
+// Status is never gated by the Skill-install feature flag.
+//
+// RPC method: skills.installations.status.
+//
+// Parameters: Existing-operation control. A new session selector is deliberately not
+// accepted.
+//
+// Returns: Skill installation management result with the honoured contract, or a typed
+// refusal.
+func (a *ServerSkillsInstallationsAPI) Status(ctx context.Context, params *SkillInstallationOperationRequest) (SkillInstallationManagementResult, error) {
+	raw, err := a.client.Request(ctx, "skills.installations.status", params)
+	if err != nil {
+		return nil, err
+	}
+	result, err := unmarshalSkillInstallationManagementResult(raw)
+	if err != nil {
+		return nil, err
+	}
+	return result, nil
+}
+
+// Experimental: Installations returns experimental APIs that may change or be removed.
+func (s *ServerSkillsAPI) Installations() *ServerSkillsInstallationsAPI {
+	return (*ServerSkillsInstallationsAPI)(s)
+}
+
+// Experimental: ServerToolsAPI contains experimental APIs that may change or be removed.
+type ServerToolsAPI serverAPI
+
+// Lists built-in tools available for a model.
+//
+// RPC method: tools.list.
+//
+// Parameters: Optional model identifier whose tool overrides should be applied to the
+// listing.
+//
+// Returns: Built-in tools available for the requested model, with their parameters and
+// instructions.
+func (a *ServerToolsAPI) List(ctx context.Context, params *ToolsListRequest) (*ToolList, error) {
+	raw, err := a.client.Request(ctx, "tools.list", params)
+	if err != nil {
+		return nil, err
+	}
+	var result ToolList
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// Experimental: ServerUserAPI contains experimental APIs that may change or be removed.
+type ServerUserAPI serverAPI
+
+// Experimental: ServerUserSettingsAPI contains experimental APIs that may change or be
+// removed.
+type ServerUserSettingsAPI serverAPI
+
+// Get lists every known user setting from settings.json, each with its effective value, its
+// default, and whether it is at the default — so settings the user has never set still
+// appear with their default value. Does not include repository- or enterprise-managed
+// overrides that the runtime layers on top at session time.
+//
+// RPC method: user.settings.get.
+//
+// Returns: Per-key metadata for every known user setting in settings.json, including
+// settings left at their default. Excludes repository- and enterprise-managed overrides.
+func (a *ServerUserSettingsAPI) Get(ctx context.Context) (*UserSettingsGetResult, error) {
+	raw, err := a.client.Request(ctx, "user.settings.get", nil)
+	if err != nil {
+		return nil, err
+	}
+	var result UserSettingsGetResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// Set writes one or more user settings to settings.json, replacing each provided top-level
+// key. A key whose value is null is removed.
+//
+// RPC method: user.settings.set.
+//
+// Parameters: 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.
+func (a *ServerUserSettingsAPI) Set(ctx context.Context, params *UserSettingsSetRequest) (*UserSettingsSetResult, error) {
+	raw, err := a.client.Request(ctx, "user.settings.set", params)
+	if err != nil {
+		return nil, err
+	}
+	var result UserSettingsSetResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// Experimental: Settings returns experimental APIs that may change or be removed.
+func (s *ServerUserAPI) Settings() *ServerUserSettingsAPI {
+	return (*ServerUserSettingsAPI)(s)
+}
+
+// ServerRPC provides typed server-scoped RPC methods.
+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
+	Catalog         *ServerCatalogAPI
+	Commands        *ServerCommandsAPI
+	Connectors      *ServerConnectorsAPI
+	Environments    *ServerEnvironmentsAPI
+	Extensions      *ServerExtensionsAPI
+	Hooks           *ServerHooksAPI
+	Host            *ServerHostAPI
+	Instructions    *ServerInstructionsAPI
+	LlmInference    *ServerLlmInferenceAPI
+	ManagedSettings *ServerManagedSettingsAPI
+	MCP             *ServerMCPAPI
+	Models          *ServerModelsAPI
+	Plugins         *ServerPluginsAPI
+	Runtime         *ServerRuntimeAPI
+	Sandbox         *ServerSandboxAPI
+	Secrets         *ServerSecretsAPI
+	SessionFS       *ServerSessionFSAPI
+	Sessions        *ServerSessionsAPI
+	Skills          *ServerSkillsAPI
+	Tools           *ServerToolsAPI
+	User            *ServerUserAPI
+}
+
+// Ping checks server responsiveness and returns protocol information.
+//
+// RPC method: ping.
+//
+// Parameters: Optional message to echo back to the caller.
+//
+// Returns: Server liveness response, including the echoed message, current server
+// timestamp, and protocol version.
+// Experimental: Ping is an experimental API and may change or be removed in future versions.
+func (a *ServerRPC) Ping(ctx context.Context, params *PingRequest) (*PingResult, error) {
+	raw, err := a.common.client.Request(ctx, "ping", params)
+	if err != nil {
+		return nil, err
+	}
+	var result PingResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	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
+// uses its built-in extension launcher.
+//
+// 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.Connectors = (*ServerConnectorsAPI)(&r.common)
+	r.Environments = (*ServerEnvironmentsAPI)(&r.common)
+	r.Extensions = (*ServerExtensionsAPI)(&r.common)
+	r.Hooks = (*ServerHooksAPI)(&r.common)
+	r.Host = (*ServerHostAPI)(&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)
+	r.Runtime = (*ServerRuntimeAPI)(&r.common)
+	r.Sandbox = (*ServerSandboxAPI)(&r.common)
+	r.Secrets = (*ServerSecretsAPI)(&r.common)
+	r.SessionFS = (*ServerSessionFSAPI)(&r.common)
+	r.Sessions = (*ServerSessionsAPI)(&r.common)
+	r.Skills = (*ServerSkillsAPI)(&r.common)
+	r.Tools = (*ServerToolsAPI)(&r.common)
+	r.User = (*ServerUserAPI)(&r.common)
+	return r
+}
+
+type internalServerAPI struct {
+	client *jsonrpc2.Client
+}
+
+// Experimental: InternalServerAccountAPI contains experimental APIs that may change or be
+// removed.
+type InternalServerAccountAPI internalServerAPI
+
+// DescribeAuthInfo renders the sign-in banner and the one-line account description the
+// runtime uses for an authentication identity. The runtime words these in several places
+// for its own callers, so a host that announces a sign-in or an account switch should
+// render them from here rather than composing its own, which would let the two spellings
+// drift apart.
+//
+// RPC method: account.describeAuthInfo.
+//
+// Parameters: The authentication identity whose shared wording should be rendered.
+//
+// Returns: The wording the runtime uses for an authentication identity.
+// Internal: DescribeAuthInfo is part of the SDK's internal handshake/plumbing; external
+// callers should not use it.
+func (a *InternalServerAccountAPI) DescribeAuthInfo(ctx context.Context, params *AccountDescribeAuthInfoRequest) (*AccountDescribeAuthInfoResult, error) {
+	raw, err := a.client.Request(ctx, "account.describeAuthInfo", params)
+	if err != nil {
+		return nil, err
+	}
+	var result AccountDescribeAuthInfoResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// GetGistSupport reports whether the supplied identity can create gists. Gists are
+// unavailable on GitHub Enterprise Cloud with data residency, and to Enterprise Managed
+// Users on github.com, so a host that offers gist actions should hide or disable them when
+// this reports no support.
+//
+// RPC method: account.getGistSupport.
+//
+// Parameters: The authentication identity whose gist support should be reported.
+//
+// Returns: Whether the identity can create gists, and why not when it cannot.
+// Internal: GetGistSupport is part of the SDK's internal handshake/plumbing; external
+// callers should not use it.
+func (a *InternalServerAccountAPI) GetGistSupport(ctx context.Context, params *AccountGetGistSupportRequest) (*AccountGetGistSupportResult, error) {
+	raw, err := a.client.Request(ctx, "account.getGistSupport", params)
+	if err != nil {
+		return nil, err
+	}
+	var result AccountGetGistSupportResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// GetTokenEnvVar names the environment variable supplying a classic personal access token,
+// if one is set. A classic token cannot be upgraded in place, so a host that finds one
+// should tell the user which variable to unset rather than starting an interactive sign-in
+// that the variable would override.
+//
+// RPC method: account.getTokenEnvVar.
+//
+// Returns: The environment variable supplying a classic personal access token, when one is
+// set.
+// Internal: GetTokenEnvVar is part of the SDK's internal handshake/plumbing; external
+// callers should not use it.
+func (a *InternalServerAccountAPI) GetTokenEnvVar(ctx context.Context) (*AccountGetTokenEnvVarResult, error) {
+	raw, err := a.client.Request(ctx, "account.getTokenEnvVar", nil)
+	if err != nil {
+		return nil, err
+	}
+	var result AccountGetTokenEnvVarResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// GetWebUrl resolves a path on the identity's GitHub host into an absolute URL, so a host
+// can link to settings or documentation on the enterprise instance the user is signed in to
+// rather than to github.com. Falls back to the public host when no identity is supplied.
+//
+// RPC method: account.getWebUrl.
+//
+// Parameters: A path to resolve against the GitHub host an identity is signed in to.
+//
+// Returns: An absolute URL on the identity's GitHub host.
+// Internal: GetWebUrl is part of the SDK's internal handshake/plumbing; external callers
+// should not use it.
+func (a *InternalServerAccountAPI) GetWebUrl(ctx context.Context, params *AccountGetWebURLRequest) (*AccountGetWebURLResult, error) {
+	raw, err := a.client.Request(ctx, "account.getWebUrl", params)
+	if err != nil {
+		return nil, err
+	}
+	var result AccountGetWebURLResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// Experimental: InternalServerAgentsAPI contains experimental APIs that may change or be
+// removed.
+type InternalServerAgentsAPI internalServerAPI
+
+// CustomAgentInitialModelDecision resolves the model a custom agent asks for against the
+// models actually available, and answers both the model to switch to and the warning a user
+// should see when the agent's preference cannot be met. A custom agent may name several
+// acceptable models in preference order, so the decision is a match rather than a lookup,
+// and an agent whose preference is unavailable is a normal outcome that produces a warning
+// rather than an error. A host must call this rather than pick the first available name
+// itself, because the preference order and the wording of the warning are what keep one
+// installation's agent selection the same as another's.
+//
+// RPC method: agents.customAgentInitialModelDecision.
+//
+// Parameters: The models a custom agent asks for, and the models actually available.
+//
+// Returns: The model to switch to, and the warning to show when the agent's preference
+// could not be met.
+// Internal: CustomAgentInitialModelDecision is part of the SDK's internal
+// handshake/plumbing; external callers should not use it.
+func (a *InternalServerAgentsAPI) CustomAgentInitialModelDecision(ctx context.Context, params *AgentsCustomAgentInitialModelDecisionParams) (*AgentsCustomAgentInitialModelDecisionResult, error) {
+	raw, err := a.client.Request(ctx, "agents.customAgentInitialModelDecision", params)
+	if err != nil {
+		return nil, err
+	}
+	var result AgentsCustomAgentInitialModelDecisionResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// GetAvailableBuiltins lists the shipped agents a client should offer right now, filtered
+// by the feature flags it passes. `getBuiltins` names every agent the runtime knows about;
+// some of those are gated, so a client rendering a picker wants this narrower list together
+// with the description to show beside each name.
+//
+// RPC method: agents.getAvailableBuiltins.
+//
+// Parameters: The feature flags to evaluate shipped agents against.
+//
+// Returns: The shipped agents available under the requested flags.
+// Internal: GetAvailableBuiltins is part of the SDK's internal handshake/plumbing; external
+// callers should not use it.
+func (a *InternalServerAgentsAPI) GetAvailableBuiltins(ctx context.Context, params *AgentsGetAvailableBuiltinsRequest) (*AgentsGetAvailableBuiltinsResult, error) {
+	raw, err := a.client.Request(ctx, "agents.getAvailableBuiltins", params)
+	if err != nil {
+		return nil, err
+	}
+	var result AgentsGetAvailableBuiltinsResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// GetBuiltinDefinition loads one shipped agent's YAML definition, for a client that needs
+// what the agent declares rather than only its name. `getBuiltins` reports which names have
+// a definition to load: a name outside its `yamlBasedNames` is special-cased in code and
+// has none. The definition crosses as its own JSON rather than as contract-typed fields,
+// because the runtime parses it with the agent schema's tolerant shape and re-typing it
+// here would drop the keys that shape accepts and this one does not. The projected
+// `__nativeCustomAgent` view the runtime derives is included, so a caller reading the
+// declared model and a caller rendering the agent see the same definition.
+//
+// RPC method: agents.getBuiltinDefinition.
+//
+// Parameters: The shipped agent whose definition to load.
+//
+// Returns: One shipped agent's definition.
+// Internal: GetBuiltinDefinition is part of the SDK's internal handshake/plumbing; external
+// callers should not use it.
+func (a *InternalServerAgentsAPI) GetBuiltinDefinition(ctx context.Context, params *AgentsGetBuiltinDefinitionRequest) (*AgentsGetBuiltinDefinitionResult, error) {
+	raw, err := a.client.Request(ctx, "agents.getBuiltinDefinition", params)
+	if err != nil {
+		return nil, err
+	}
+	var result AgentsGetBuiltinDefinitionResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// GetBuiltinListingDefinition projects one shipped agent the way a picker lists it, reading
+// only the metadata at the head of the definition file and stopping before the prompt body.
+// `getBuiltinDefinition` answers the whole definition instead, so a client listing every
+// shipped agent should prefer this one: the cost of a listing grows with the number of
+// agents, and the prompt body is the part a listing never shows. The two also differ in
+// shape. This returns the projected custom agent on its own, whereas `getBuiltinDefinition`
+// returns the authored definition with that projection nested under `__nativeCustomAgent`.
+//
+// RPC method: agents.getBuiltinListingDefinition.
+//
+// Parameters: The shipped agent whose listing entry to load.
+//
+// Returns: One shipped agent, projected for a listing.
+// Internal: GetBuiltinListingDefinition is part of the SDK's internal handshake/plumbing;
+// external callers should not use it.
+func (a *InternalServerAgentsAPI) GetBuiltinListingDefinition(ctx context.Context, params *AgentsGetBuiltinListingDefinitionRequest) (*AgentsGetBuiltinListingDefinitionResult, error) {
+	raw, err := a.client.Request(ctx, "agents.getBuiltinListingDefinition", params)
+	if err != nil {
+		return nil, err
+	}
+	var result AgentsGetBuiltinListingDefinitionResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// GetBuiltins lists the agents this runtime ships, by name. A consumer separating shipped
+// agents from ones the user or a plugin authored should compare against these names rather
+// than against `AgentInfo.source`: an authored agent may carry the `builtin` source while
+// not being one of these, and the runtime treats the two as separate questions.
+// `disableableNames` is the subset a user may turn off, which a client needs to decide
+// whether to offer a toggle. `yamlBasedNames` is the subset backed by a shipped YAML
+// definition, which a client needs before asking the runtime to load one.
+//
+// RPC method: agents.getBuiltins.
+//
+// Returns: The agents this runtime ships, named so a consumer can tell them apart from
+// authored ones.
+// Internal: GetBuiltins is part of the SDK's internal handshake/plumbing; external callers
+// should not use it.
+func (a *InternalServerAgentsAPI) GetBuiltins(ctx context.Context) (*AgentsGetBuiltinsResult, error) {
+	raw, err := a.client.Request(ctx, "agents.getBuiltins", nil)
+	if err != nil {
+		return nil, err
+	}
+	var result AgentsGetBuiltinsResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// Experimental: InternalServerFeatureFlagsAPI contains experimental APIs that may change or
+// be removed.
+type InternalServerFeatureFlagsAPI internalServerAPI
+
+// ListMetadata lists every feature flag this runtime declares, with the population each one
+// is declared for, its experimental description, and the online-experiment flag it maps to.
+// This is the static catalog: it describes how each flag is defined, not whether it is on
+// for anyone. Use `featureFlags.resolve` for static values with caller overrides, not
+// active runtime values or experiment assignments.
+//
+// RPC method: featureFlags.listMetadata.
+//
+// Returns: Every feature flag this runtime declares, with the shape each one was declared
+// with.
+// Internal: ListMetadata is part of the SDK's internal handshake/plumbing; external callers
+// should not use it.
+func (a *InternalServerFeatureFlagsAPI) ListMetadata(ctx context.Context) (*FeatureFlagsMetadataResult, error) {
+	raw, err := a.client.Request(ctx, "featureFlags.listMetadata", nil)
+	if err != nil {
+		return nil, err
+	}
+	var result FeatureFlagsMetadataResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// Resolve computes static feature flags from the supplied population and overrides without
+// changing runtime state or verifying audience membership. Starts from declared
+// availability, then applies direct feature-flag environment values, user settings, and
+// explicit `flagOverrides`. It does not apply `COPILOT_EXP_*` experiment assignments,
+// authenticated startup gates, or active runtime state. Settings include
+// `enabledFeatureFlags`, the legacy `feature_flags.enabled` list, and supported convenience
+// settings. Supply `baseFlags` to use an existing flag set instead of declared
+// availability. Omit `isStaffGitHub` or `isStaffMicrosoft` when membership was never
+// recorded: a legacy staff account then counts as both populations.
+//
+// RPC method: featureFlags.resolve.
+//
+// Parameters: Caller population and overrides for static feature-flag resolution,
+// independent of experiment assignments and active runtime state.
+//
+// Returns: The resolved feature flags, keyed by flag name.
+// Internal: Resolve is part of the SDK's internal handshake/plumbing; external callers
+// should not use it.
+func (a *InternalServerFeatureFlagsAPI) Resolve(ctx context.Context, params *FeatureFlagsResolveRequest) (*FeatureFlagsResolveResult, error) {
+	raw, err := a.client.Request(ctx, "featureFlags.resolve", params)
+	if err != nil {
+		return nil, err
+	}
+	var result FeatureFlagsResolveResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// ResolveStartupGates resolves named gates against this installation's cached
+// online-experiment assignment, for the account the runtime is already authenticated as.
+// Unlike `featureFlags.resolve`, which layers static availability with the populations
+// supplied, this reads the experiment assignment the runtime cached for its own current
+// authentication, so a launch can honor a rollout before any session exists. The account is
+// never taken from the request: naming one would read another account's cached assignments.
+// The cached assignment answers immediately and any network refresh happens behind it, so
+// this call does not wait on the network. Not available to an extension, which cannot carry
+// the user's consent to read their assignment.
+//
+// RPC method: featureFlags.resolveStartupGates.
+//
+// Parameters: Caller population and startup inputs to resolve named online-experiment gates
+// for. Carries no account: the runtime resolves the assignment for the authentication it
+// already holds.
+//
+// Returns: The resolved gates, keyed by flag name.
+// Internal: ResolveStartupGates is part of the SDK's internal handshake/plumbing; external
+// callers should not use it.
+func (a *InternalServerFeatureFlagsAPI) ResolveStartupGates(ctx context.Context, params *FeatureFlagsResolveStartupGatesRequest) (*FeatureFlagsResolveStartupGatesResult, error) {
+	raw, err := a.client.Request(ctx, "featureFlags.resolveStartupGates", params)
+	if err != nil {
+		return nil, err
+	}
+	var result FeatureFlagsResolveStartupGatesResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// Experimental: InternalServerGitAPI contains experimental APIs that may change or be
+// removed.
+type InternalServerGitAPI internalServerAPI
+
+// CurrentBranchRemote reads the remote that the branch checked out in a working tree
+// tracks, as `branch.<name>.remote` configures it. Reports `origin` rather than failing
+// whenever there is no tracking configuration to read — on a detached HEAD, on a branch
+// with no upstream, or when git itself fails — because a caller asking which remote to talk
+// to needs an answer it can act on, not an error. Marked internal because it exists to
+// carry a CLI call site off the napi boundary onto the SDK contract; it is migration
+// plumbing, not a surface consumers are meant to depend on.
+//
+// RPC method: git.currentBranchRemote.
+//
+// Parameters: Working-tree path a git query applies to.
+//
+// Returns: The remote the checked-out branch tracks.
+// Internal: CurrentBranchRemote is part of the SDK's internal handshake/plumbing; external
+// callers should not use it.
+func (a *InternalServerGitAPI) CurrentBranchRemote(ctx context.Context, params *GitCwdRequest) (*GitCurrentBranchRemoteResult, error) {
+	raw, err := a.client.Request(ctx, "git.currentBranchRemote", params)
+	if err != nil {
+		return nil, err
+	}
+	var result GitCurrentBranchRemoteResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// ReposFromRemotes lists the GitHub repositories a working tree's remotes point at, one
+// entry per distinct repository, so a caller can resolve a base and head repository without
+// parsing remote URLs itself. When several remotes name the same repository, only the first
+// is listed, and the entry keeps that remote name. Remotes pointing at no GitHub host are
+// left out, so an empty list means the tree reaches GitHub through no remote. Failing to
+// read the remotes is reported as an error rather than as an empty list, because the two
+// mean different things to a caller. Marked internal because it exists to carry a CLI call
+// site off the napi boundary onto the SDK contract; it is migration plumbing, not a surface
+// consumers are meant to depend on.
+//
+// RPC method: git.reposFromRemotes.
+//
+// Parameters: Git working tree whose GitHub remotes should be listed.
+//
+// Returns: The GitHub repositories a working tree's remotes point at.
+// Internal: ReposFromRemotes is part of the SDK's internal handshake/plumbing; external
+// callers should not use it.
+func (a *InternalServerGitAPI) ReposFromRemotes(ctx context.Context, params *GitReposFromRemotesRequest) (*GitReposFromRemotesResult, error) {
+	raw, err := a.client.Request(ctx, "git.reposFromRemotes", params)
+	if err != nil {
+		return nil, err
+	}
+	var result GitReposFromRemotesResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// WorkingDirectoryContext collects the repository context of a working directory in one
+// call: working tree root, repository identifier and host, current branch, and the HEAD and
+// base commits. Every repository field is omitted when the path is not inside a git working
+// tree, and the requested path is echoed back as `cwd`. The answer is the same
+// `SessionWorkingDirectoryContext` that `session.metadata.recordContextChange` accepts, so
+// a caller polling for a context change can forward the result unchanged. Marked internal
+// because it exists to carry a CLI call site off the napi boundary onto the SDK contract;
+// it is migration plumbing, not a surface consumers are meant to depend on. It can become
+// public once an SDK consumer needs to derive session context from a directory itself.
+//
+// RPC method: git.workingDirectoryContext.
+//
+// Parameters: Working-tree path a git query applies to.
+//
+// Returns: Updated working directory and git context. Emitted as the new payload of
+// `session.context_changed`.
+// Internal: WorkingDirectoryContext is part of the SDK's internal handshake/plumbing;
+// external callers should not use it.
+func (a *InternalServerGitAPI) WorkingDirectoryContext(ctx context.Context, params *GitCwdRequest) (*SessionWorkingDirectoryContext, error) {
+	raw, err := a.client.Request(ctx, "git.workingDirectoryContext", params)
+	if err != nil {
+		return nil, err
+	}
+	var result SessionWorkingDirectoryContext
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// Experimental: InternalServerGitHubOwnersAPI contains experimental APIs that may change or
+// be removed.
+type InternalServerGitHubOwnersAPI internalServerAPI
+
+// Cancel abandons an owner listing started with the given request id. Answers `canceled:
+// true` while a listing with that id is running. Answers `canceled: false` when the id was
+// never registered, was registered but not used, was released after being abandoned, or its
+// listing has ended. Canceling an unused id releases it, and a later `list` with that id is
+// refused. The cancel acts only on owner listings and never reaches another request of the
+// host.
+//
+// RPC method: gitHubOwners.cancel.
+//
+// Parameters: The owner listing to abandon.
+//
+// Returns: Whether the id named a running owner listing.
+// Internal: Cancel is part of the SDK's internal handshake/plumbing; external callers
+// should not use it.
+func (a *InternalServerGitHubOwnersAPI) Cancel(ctx context.Context, params *GitHubOwnersCancelRequest) (*GitHubOwnersCancelResult, error) {
+	raw, err := a.client.Request(ctx, "gitHubOwners.cancel", params)
+	if err != nil {
+		return nil, err
+	}
+	var result GitHubOwnersCancelResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// Lists the logins the authenticated user may act as — their own account first, then the
+// organizations they belong to — by asking the GitHub API under the supplied credential. No
+// credential travels in the request: `authInfo` selects one the runtime already holds, and
+// the runtime resolves the token and the GitHub host from it. A failure the caller should
+// render arrives as `message`; one it should raise arrives as `throwError`.
+//
+// RPC method: gitHubOwners.list.
+//
+// Parameters: Credential to list owners under, and the request id that makes the listing
+// cancellable.
+//
+// Returns: Outcome of an owner listing. Exactly one of `owners` and `message` is present,
+// except that `throwError` reports a failure the caller is expected to raise rather than
+// render.
+// Internal: List is part of the SDK's internal handshake/plumbing; external callers should
+// not use it.
+func (a *InternalServerGitHubOwnersAPI) List(ctx context.Context, params *GitHubOwnersListRequest) (*GitHubOwnersListResult, error) {
+	raw, err := a.client.Request(ctx, "gitHubOwners.list", params)
+	if err != nil {
+		return nil, err
+	}
+	var result GitHubOwnersListResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// NextRequestId registers a cancellable owner listing and returns its request id. Separate
+// from `gitHubOwners.list` so the id exists before the listing starts: a caller that
+// abandons the listing the moment it begins would otherwise have nothing to name in
+// `gitHubOwners.cancel`. The id serves one listing only. Long-abandoned unused ids can be
+// released by later allocations.
+//
+// RPC method: gitHubOwners.nextRequestId.
+//
+// Returns: A freshly registered request id. Registering it before the listing starts is
+// what lets a cancel that races the request still find the owner listing slot. The id
+// serves one listing only. Long-abandoned unused ids can be released by later allocations.
+// Internal: NextRequestId is part of the SDK's internal handshake/plumbing; external
+// callers should not use it.
+func (a *InternalServerGitHubOwnersAPI) NextRequestId(ctx context.Context) (*GitHubOwnersRequestIDResult, error) {
+	raw, err := a.client.Request(ctx, "gitHubOwners.nextRequestId", nil)
+	if err != nil {
+		return nil, err
+	}
+	var result GitHubOwnersRequestIDResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// Experimental: InternalServerGitHubRepositoryAPI contains experimental APIs that may
+// change or be removed.
+type InternalServerGitHubRepositoryAPI internalServerAPI
+
+// AtPath resolves the GitHub repository that owns a working-tree path by reading the
+// selected git remote configured for it, preferring `origin`. Returns a null `repository`
+// when the path is inside a git working tree but that selected remote does not resolve to a
+// GitHub host. Fails when the path is not inside a git working tree at all, so a caller can
+// tell 'not a repository' apart from 'a repository with no GitHub remote'.
+//
+// RPC method: gitHubRepository.atPath.
+//
+// Parameters: Working-tree path whose owning GitHub repository should be resolved.
+//
+// Returns: The GitHub repository that owns the requested path, when the selected remote
+// (`origin`, else the first) is on a GitHub host.
+// Internal: AtPath is part of the SDK's internal handshake/plumbing; external callers
+// should not use it.
+func (a *InternalServerGitHubRepositoryAPI) AtPath(ctx context.Context, params *GitHubRepositoryAtPathRequest) (*GitHubRepositoryAtPathResult, error) {
+	raw, err := a.client.Request(ctx, "gitHubRepository.atPath", params)
+	if err != nil {
+		return nil, err
+	}
+	var result GitHubRepositoryAtPathResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// Experimental: InternalServerGlobalStateAPI contains experimental APIs that may change or
+// be removed.
+type InternalServerGlobalStateAPI internalServerAPI
+
+// Load reads the host's machine-wide state: which plugins are installed and the one-off
+// flags and timestamps that record what the user has already been shown or migrated. This
+// is the state that outlives a single session and a single workspace, so a host reads it to
+// decide whether to run a first-launch step, offer an onboarding prompt, or skip one it has
+// already completed. The stored credentials are deliberately not part of this result; a
+// caller that needs an authenticated identity asks the account methods for it instead.
+// Reading is non-destructive and every field is optional, because a fresh install has
+// recorded nothing yet.
+//
+// RPC method: globalState.load.
+//
+// Returns: The host's machine-wide state. Every field is optional because a fresh install
+// has recorded nothing yet, so a reader must treat an absent field as `not yet`, never as a
+// negative answer. Stored credentials are deliberately absent from this shape.
+// Internal: Load is part of the SDK's internal handshake/plumbing; external callers should
+// not use it.
+func (a *InternalServerGlobalStateAPI) Load(ctx context.Context) (*GlobalStateLoadResult, error) {
+	raw, err := a.client.Request(ctx, "globalState.load", nil)
+	if err != nil {
+		return nil, err
+	}
+	var result GlobalStateLoadResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// LoadForConfigDir reads the host's machine-wide state exactly as `globalState.load` does,
+// but from a caller-supplied configuration directory instead of the one the server resolved
+// for itself. Use this when a consumer scopes a session to its own Copilot home — the SDK's
+// per-session `configDir` override — so the state read matches the directory that session
+// actually uses. An absent or empty `configDir` resolves the server's own home, making this
+// identical to `globalState.load`. The stored credentials are omitted here for the same
+// reason they are omitted from `globalState.load`: a caller that needs an authenticated
+// identity asks the account methods instead, so pointing this at another directory cannot
+// be used to read the credentials kept in it.
+//
+// RPC method: globalState.loadForConfigDir.
+//
+// Parameters: Selects the configuration directory whose machine-wide state to read.
+//
+// Returns: The host's machine-wide state. Every field is optional because a fresh install
+// has recorded nothing yet, so a reader must treat an absent field as `not yet`, never as a
+// negative answer. Stored credentials are deliberately absent from this shape.
+// Internal: LoadForConfigDir is part of the SDK's internal handshake/plumbing; external
+// callers should not use it.
+func (a *InternalServerGlobalStateAPI) LoadForConfigDir(ctx context.Context, params *GlobalStateLoadForConfigDirRequest) (*GlobalStateLoadResult, error) {
+	raw, err := a.client.Request(ctx, "globalState.loadForConfigDir", params)
+	if err != nil {
+		return nil, err
+	}
+	var result GlobalStateLoadResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// WriteKey records one top-level key in the host's machine-wide state, the counterpart to
+// `globalState.load`. A host calls this to remember that it has shown an onboarding step,
+// asked a one-off question, or completed a migration, so the next run can skip it. Only the
+// named key is replaced and the rest of the document is preserved, which lets two writers
+// record different flags without overwriting each other; passing no value removes the key
+// instead. Only the keys a host records itself are writable: `appTipShown`,
+// `askedSetupTerminals`, `autoFeedbackLastPromptedAt`, `firstLaunchAt`, `recentModelIds`,
+// `sandboxCredentialProxyCaDeclined` and `sandboxOnboardingShown`. Every other key is
+// refused, including `installedPlugins`, the stored credentials, `trustedFolders`, the
+// staff flags and the signed-in accounts. Plugin enablement must use the plugin APIs, which
+// apply repository and managed-policy checks.
+//
+// RPC method: globalState.writeKey.
+//
+// Parameters: A single top-level key to record in the host's machine-wide state. The write
+// replaces only that key and leaves the rest of the document untouched, so two writers
+// recording different one-off flags do not overwrite each other. The stored credential keys
+// cannot be written through this method.
+// Internal: WriteKey is part of the SDK's internal handshake/plumbing; external callers
+// should not use it.
+func (a *InternalServerGlobalStateAPI) WriteKey(ctx context.Context, params *GlobalStateWriteKeyRequest) (*GlobalStateWriteKeyResult, error) {
+	raw, err := a.client.Request(ctx, "globalState.writeKey", params)
+	if err != nil {
+		return nil, err
+	}
+	var result GlobalStateWriteKeyResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// Experimental: InternalServerHostAPI contains experimental APIs that may change or be
+// removed.
+type InternalServerHostAPI internalServerAPI
+
+// CreateSession requests app-owned materialization over the owning SDK participant.
+//
+// RPC method: host.createSession.
+//
+// Parameters: One application-owned session handoff, requested by the supervised hosting
+// participant.
+//
+// Returns: The resident session the application has materialized on its own connection.
+// Internal: CreateSession is part of the SDK's internal handshake/plumbing; external
+// callers should not use it.
+func (a *InternalServerHostAPI) CreateSession(ctx context.Context, params *HostSessionCreateRequest) (*HostCreateSessionResult, error) {
+	raw, err := a.client.Request(ctx, "host.createSession", params)
+	if err != nil {
+		return nil, err
+	}
+	var result HostCreateSessionResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// GetConfiguration returns listener settings only to the supervised hosting participant
+// over its SDK connection.
+//
+// RPC method: host.getConfiguration.
+//
+// Returns: Normalized listener settings delivered only to the supervised hosting
+// participant.
+// Internal: GetConfiguration is part of the SDK's internal handshake/plumbing; external
+// callers should not use it.
+func (a *InternalServerHostAPI) GetConfiguration(ctx context.Context) (*HostGetConfigurationResult, error) {
+	raw, err := a.client.Request(ctx, "host.getConfiguration", nil)
+	if err != nil {
+		return nil, err
+	}
+	var result HostGetConfigurationResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// GetEnvironmentCredentials resolves current authenticated credentials and remote-control
+// policy only for the runtime-owned Mission Control hosting participant.
+//
+// RPC method: host.getEnvironmentCredentials.
+//
+// Returns: Private credentials delivered only to a runtime-owned Mission Control hosting
+// participant.
+// Internal: GetEnvironmentCredentials is part of the SDK's internal handshake/plumbing;
+// external callers should not use it.
+func (a *InternalServerHostAPI) GetEnvironmentCredentials(ctx context.Context) (*HostGetEnvironmentCredentialsResult, error) {
+	raw, err := a.client.Request(ctx, "host.getEnvironmentCredentials", nil)
+	if err != nil {
+		return nil, err
+	}
+	var result HostGetEnvironmentCredentialsResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// Ready reports a supervised hosting participant's bound AHP endpoint after its SDK
+// handshake.
+//
+// RPC method: host.ready.
+//
+// Parameters: Readiness reported by the supervised hosting participant on its own SDK
+// connection.
+//
+// Returns: Empty acknowledgement for a completed host lifecycle operation.
+// Internal: Ready is part of the SDK's internal handshake/plumbing; external callers should
+// not use it.
+func (a *InternalServerHostAPI) Ready(ctx context.Context, params *HostReadyRequest) (*HostReadyResult, error) {
+	raw, err := a.client.Request(ctx, "host.ready", params)
+	if err != nil {
+		return nil, err
+	}
+	var result HostReadyResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// ReleaseSession releases app ownership retention after AHP detaches.
+//
+// RPC method: host.releaseSession.
+//
+// Parameters: Ends one participation, not the application's session lifetime.
+//
+// Returns: Empty acknowledgement for a completed host lifecycle operation.
+// Internal: ReleaseSession is part of the SDK's internal handshake/plumbing; external
+// callers should not use it.
+func (a *InternalServerHostAPI) ReleaseSession(ctx context.Context, params *HostSessionReleaseRequest) (*HostReleaseSessionResult, error) {
+	raw, err := a.client.Request(ctx, "host.releaseSession", params)
+	if err != nil {
+		return nil, err
+	}
+	var result HostReleaseSessionResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// Experimental: InternalServerInstructionsAPI contains experimental APIs that may change or
+// be removed.
+type InternalServerInstructionsAPI internalServerAPI
+
+// ClearCache drops the runtime's in-memory cache of discovered custom instructions so the
+// next discovery reads them from disk again. A host calls this after it changes instruction
+// files, or after it trusts a folder whose instructions an earlier discovery skipped, so
+// that a session started afterwards sees the current files instead of a cached earlier
+// answer. The call performs no I/O of its own and removes nothing from disk; it only
+// invalidates, so the cost lands on the next discovery.         Returns once the cache is
+// clear, which is what lets a caller order a session start after it. Marked internal
+// because it exists to carry a CLI call site off the napi boundary onto the SDK contract;
+// it is migration plumbing, not a surface consumers are meant to depend on.
+//
+// RPC method: instructions.clearCache.
+// Internal: ClearCache is part of the SDK's internal handshake/plumbing; external callers
+// should not use it.
+func (a *InternalServerInstructionsAPI) ClearCache(ctx context.Context) (*InstructionsClearCacheResult, error) {
+	raw, err := a.client.Request(ctx, "instructions.clearCache", nil)
+	if err != nil {
+		return nil, err
+	}
+	var result InstructionsClearCacheResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// DiscoverRepoSources discovers the instruction sources for one caller-named location and
+// returns them in the order the runtime applies them. `discover` answers for a set of
+// project paths and derives the rest of its scope itself; this one instead takes every
+// argument from the caller — the extra directories to scan and whether to descend into
+// nested instruction files — and honors them as given. It also includes instruction
+// directories from trusted repository settings, matching native repository discovery. Use
+// it when the caller knows its own scope and no session exists to derive that scope from,
+// such as a host reporting how many instruction files a directory contributes before any
+// session starts. Marked internal because it exists to carry a CLI call site off the napi
+// boundary onto the SDK contract; it is migration plumbing, not a surface consumers are
+// meant to depend on.
+//
+// RPC method: instructions.discoverRepoSources.
+//
+// Parameters: Explicit discovery arguments for one location, supplied by the caller rather
+// than derived from a session.
+//
+// Returns: Instruction sources discovered across user, repository, and plugin sources.
+// Internal: DiscoverRepoSources is part of the SDK's internal handshake/plumbing; external
+// callers should not use it.
+func (a *InternalServerInstructionsAPI) DiscoverRepoSources(ctx context.Context, params *InstructionsDiscoverRepoSourcesRequest) (*ServerInstructionSourceList, error) {
+	raw, err := a.client.Request(ctx, "instructions.discoverRepoSources", params)
+	if err != nil {
+		return nil, err
+	}
+	var result ServerInstructionSourceList
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// GetInitPrompt returns the prompt the `init` command runs to author repository
+// instructions. A host offering its own initialize action sends this text so the
+// instructions it produces match the ones the CLI produces. The text is fixed for a build
+// and depends on no configuration, session or repository.
+//
+// RPC method: instructions.getInitPrompt.
+//
+// Returns: The prompt the init command runs.
+// Internal: GetInitPrompt is part of the SDK's internal handshake/plumbing; external
+// callers should not use it.
+func (a *InternalServerInstructionsAPI) GetInitPrompt(ctx context.Context) (*InstructionsInitPromptResult, error) {
+	raw, err := a.client.Request(ctx, "instructions.getInitPrompt", nil)
+	if err != nil {
+		return nil, err
+	}
+	var result InstructionsInitPromptResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// Experimental: InternalServerManagedSettingsAPI contains experimental APIs that may change
+// or be removed.
+type InternalServerManagedSettingsAPI internalServerAPI
+
+// ApplyControls stamps an effective managed policy's individually-controlled entries onto a
+// user settings document, returning the settings a host should actually act on. The managed
+// layer wins on every plugin spec and marketplace name it names, and leaves everything it
+// does not name as the user wrote it. Hosts use this rather than merging the two documents
+// themselves, because the merge is per entry rather than per document and a whole-document
+// overlay would either discard the user's unmanaged entries or let a user entry outrank a
+// managed one. Omitting the managed layer returns the settings unchanged, which is what an
+// unmanaged host wants. Rejects when either document is present but is not a JSON object
+// rather than treating it as absent, since silently dropping a malformed policy hands the
+// user's layer the win on exactly the entries the policy exists to control.
+//
+// RPC method: managedSettings.applyControls.
+//
+// Parameters: A user settings document and the effective managed policy whose controlled
+// entries should be stamped onto it.
+//
+// Returns: The user settings with the managed layer's controlled entries stamped on.
+// Internal: ApplyControls is part of the SDK's internal handshake/plumbing; external
+// callers should not use it.
+func (a *InternalServerManagedSettingsAPI) ApplyControls(ctx context.Context, params *ManagedSettingsApplyControlsParams) (*ManagedSettingsApplyControlsResult, error) {
+	raw, err := a.client.Request(ctx, "managedSettings.applyControls", params)
+	if err != nil {
+		return nil, err
+	}
+	var result ManagedSettingsApplyControlsResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// Ingest resolves managed (enterprise policy) settings for a host from every layer at once:
+// the account's server-delivered policy, the device/MDM layer, and a platform policy
+// helper. Hosts use this instead of fetching and composing the layers themselves, because
+// the per-layer precedence and the fail-closed rules that apply when a layer cannot be
+// confirmed are the runtime's own and must match the policy a session will later enforce.
+// It does not retain or apply anything to process-global policy state, so a host may call
+// it before any session exists — which is the point, since plugin activation and one-shot
+// commands resolve policy before a session is available to carry it. The returned per-layer
+// outcome flags are load-bearing rather than diagnostic: a host must distinguish an
+// unmanaged device from a managed device whose policy could not be confirmed, and apply its
+// fail-closed gates in the second case. Reports its diagnostics in `logMessages` rather
+// than logging them, so a host that runs before a log sink exists still sees them.
+//
+// RPC method: managedSettings.ingest.
+//
+// Parameters: Inputs describing the host and account an ingestion should resolve managed
+// policy for.
+//
+// Returns: The managed policy layers an ingestion resolved, together with the per-layer
+// outcome flags a host needs to decide how much to trust the result. The flags are reported
+// rather than folded into the settings because a host must be able to distinguish an
+// unmanaged device from a managed device whose policy could not be confirmed, and apply its
+// fail-closed gates in the second case.
+// Internal: Ingest is part of the SDK's internal handshake/plumbing; external callers
+// should not use it.
+func (a *InternalServerManagedSettingsAPI) Ingest(ctx context.Context, params *ManagedSettingsIngestParams) (*ManagedSettingsIngestResult, error) {
+	raw, err := a.client.Request(ctx, "managedSettings.ingest", params)
+	if err != nil {
+		return nil, err
+	}
+	var result ManagedSettingsIngestResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// LoadRemoteControl resolves the managed `remoteControl` policy for an account on its own,
+// for a host deciding whether a remote-control session may start. Composes the same layers
+// as `managedSettings.ingest` and returns only that one key, so a host does not have to
+// know which layer won. An absent policy means the account is unmanaged for this capability
+// and the host may proceed; that default is safe only while absence really does mean "no
+// policy", so a service refusal that says an account policy exists which this client is too
+// old to enforce resolves to an explicit disabled policy instead of to absence. A
+// resolution that cannot be completed is rejected rather than answered as absence, for the
+// same reason.
+//
+// RPC method: managedSettings.loadRemoteControl.
+//
+// Parameters: Inputs describing the host and account whose managed remote-control policy
+// should be resolved. Mirrors `managedSettings.ingest`, and deliberately carries no
+// retention decision: reading this gate never becomes this runtime process's startup policy.
+//
+// Returns: The managed remote-control policy in force for an account, if any. An absent
+// policy means the account is unmanaged for this capability, which a host reads as allowed
+// — so absence here is a positive statement that no policy applies, never a stand-in for a
+// resolution that failed. A resolution that cannot be completed is rejected instead.
+// Internal: LoadRemoteControl is part of the SDK's internal handshake/plumbing; external
+// callers should not use it.
+func (a *InternalServerManagedSettingsAPI) LoadRemoteControl(ctx context.Context, params *ManagedSettingsLoadRemoteControlParams) (*ManagedSettingsLoadRemoteControlResult, error) {
+	raw, err := a.client.Request(ctx, "managedSettings.loadRemoteControl", params)
+	if err != nil {
+		return nil, err
+	}
+	var result ManagedSettingsLoadRemoteControlResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// ParseClientValue validates the managed settings a client is supplying for a session it is
+// about to open, and returns them reduced to the keys a client is allowed to set. A
+// client-supplied policy is not the same thing as an administrator's: it may only narrow
+// permissions, so this accepts `permissions` and rejects every other key outright rather
+// than ignoring it. Rejecting is the point — a host that silently dropped an unsupported
+// key would report a policy as applied while running without it. Hosts call this before
+// opening the session rather than letting the open fail, so a malformed policy is reported
+// against the request that carried it. The runtime applies the same rule again when the
+// session starts, so this cannot be used to smuggle a wider document past it. An accepted
+// document that sets nothing comes back as an empty object, which is distinct from
+// supplying nothing at all.
+//
+// RPC method: managedSettings.parseClientValue.
+//
+// Parameters: The client-supplied managed settings to validate and normalize. Omitting them
+// is valid and yields no policy.
+//
+// Returns: The accepted managed settings, reduced to the keys a client is allowed to set.
+// Internal: ParseClientValue is part of the SDK's internal handshake/plumbing; external
+// callers should not use it.
+func (a *InternalServerManagedSettingsAPI) ParseClientValue(ctx context.Context, params *ManagedSettingsParseClientValueParams) (*ManagedSettingsParseClientValueResult, error) {
+	raw, err := a.client.Request(ctx, "managedSettings.parseClientValue", params)
+	if err != nil {
+		return nil, err
+	}
+	var result ManagedSettingsParseClientValueResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// ReadDevice discovers device-managed settings the way the runtime's own device layer does,
+// and reports the sandbox floor and the load outcome alongside the validated document. This
+// differs from `managedSettings.read` in three ways a policy-enforcing host depends on: a
+// document that validates to an empty object is reported as absent rather than as an empty
+// policy, a discovery error does not suppress a document that still validates, and a
+// failure is reported as a flag rather than only as error text. Hosts that compose the
+// device layer into an effective policy use this, because `managedSettings.read` cannot
+// distinguish "no device policy" from "device policy could not be read" and would silently
+// hand the user's own layer the win.
+//
+// RPC method: managedSettings.readDevice.
+//
+// Returns: The device-managed settings layer, with the sandbox floor and the load outcome a
+// host needs to compose it into an effective policy.
+// Internal: ReadDevice is part of the SDK's internal handshake/plumbing; external callers
+// should not use it.
+func (a *InternalServerManagedSettingsAPI) ReadDevice(ctx context.Context) (*ManagedSettingsReadDeviceResult, error) {
+	raw, err := a.client.Request(ctx, "managedSettings.readDevice", nil)
+	if err != nil {
+		return nil, err
+	}
+	var result ManagedSettingsReadDeviceResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// ResolveBypassDisableTransition decides what a host must do to its bypass-permissions
+// state after a managed-policy resolution lands, given the state already in force and the
+// account now signed in. A host holds two pieces of state — which layer disabled bypass
+// mode, and for a server-delivered disable, the account it was pinned to — and cannot
+// decide the next step from the new policy alone. Three rules make that so, and each one is
+// a control rather than a preference. A device/MDM disable outranks the account, so a later
+// server answer never lifts it. An unknown policy, which is what a failed fetch or a
+// refusal this build cannot enforce yields, preserves whatever is in force instead of
+// reverting to permissive. And a server disable is lifted only when the account it was
+// pinned to is no longer the signed-in one, which is what makes signing in to an
+// unrestricted account recover without a restart while a reconnect on the same restricted
+// account does not. Hosts call this rather than reimplementing it because getting the
+// pinning backwards either strands a disable on an account that never carried one or drops
+// one that still applies. `setDisabledState` is omitted when the host must leave its stored
+// flag untouched, which is distinct from being told to set it to false.
+//
+// RPC method: managedSettings.resolveBypassDisableTransition.
+//
+// Parameters: The bypass-permissions state a host holds today, the account now signed in,
+// and what the managed-policy resolution said.
+//
+// Returns: The bypass-permissions state a host should hold after the resolution, and what
+// it must do to get there.
+// Internal: ResolveBypassDisableTransition is part of the SDK's internal
+// handshake/plumbing; external callers should not use it.
+func (a *InternalServerManagedSettingsAPI) ResolveBypassDisableTransition(ctx context.Context, params *ManagedSettingsResolveBypassDisableTransitionParams) (*ManagedSettingsResolveBypassDisableTransitionResult, error) {
+	raw, err := a.client.Request(ctx, "managedSettings.resolveBypassDisableTransition", params)
+	if err != nil {
+		return nil, err
+	}
+	var result ManagedSettingsResolveBypassDisableTransitionResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// ResolveDeviceForceLoginOrgsGate evaluates the device-channel enterprise sign-in pin (MDM
+// plist, registry, or managed-settings file) against a credential, without resolving any
+// server-delivered policy. This is the gate an entry point runs before it branches, and the
+// only one that can refuse a developer's first sign-in: it is local, needs no credential,
+// and a server-delivered pin only ever reaches accounts already inside the organization. It
+// fails closed by construction — a discovery that cannot determine whether a pin exists
+// refuses rather than allows, because a control that fails open under a triggerable
+// condition is not a control. Hosts that also want the server channel should call
+// `managedSettings.resolveStartupPolicy`, which folds both channels into one verdict.
+//
+// RPC method: managedSettings.resolveDeviceForceLoginOrgsGate.
+//
+// Parameters: The credential and environment to evaluate the device-channel sign-in pin
+// against.
+//
+// Returns: The verdict of the `forceLoginOrgs` enterprise sign-in pin for one credential. A
+// managed device may pin Copilot to an approved set of GitHub organizations so a developer
+// cannot sign in with a personal — or another enterprise's — account and escape every
+// control that keys off the signed-in identity. A host must refuse to proceed when
+// `allowed` is false; the remaining fields explain the refusal rather than qualifying it.
+// Internal: ResolveDeviceForceLoginOrgsGate is part of the SDK's internal
+// handshake/plumbing; external callers should not use it.
+func (a *InternalServerManagedSettingsAPI) ResolveDeviceForceLoginOrgsGate(ctx context.Context, params *ManagedSettingsResolveDeviceForceLoginOrgsGateParams) (*ForceLoginOrgsDecision, error) {
+	raw, err := a.client.Request(ctx, "managedSettings.resolveDeviceForceLoginOrgsGate", params)
+	if err != nil {
+		return nil, err
+	}
+	var result ForceLoginOrgsDecision
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// ResolveEffectiveValue composes the supplied server, device/MDM, device sandbox floor and
+// policy-helper layers into the single effective managed policy a host should enforce,
+// resolving each key across the layers by the runtime's own precedence rules. Hosts that
+// assemble managed layers themselves use this so their precedence matches the runtime's
+// exactly instead of reimplementing it. The composition is not a pure function of its
+// inputs: an advisory sandbox force-on that arrived over the server channel is declined
+// when this host cannot run a sandbox, so the result reflects the runtime host's
+// capabilities, and the returned settings carry `sandboxAdvisoryFloorDeclined: true` when
+// that happened. Enforced channels (device/MDM and policy helper) are never declined, and a
+// server force-on carrying `failIfUnavailable` is preserved so the session fails loudly
+// instead of quietly running unsandboxed. Rejects when a supplied layer is present but is
+// not a JSON object, rather than treating it as unmanaged, because silently dropping a
+// malformed policy would hand the user's own layer the win on exactly the keys the policy
+// exists to control.
+//
+// RPC method: managedSettings.resolveEffectiveValue.
+//
+// Parameters: The managed-settings layers to compose into an effective policy. Every layer
+// is optional; omitting all of them yields no effective policy.
+//
+// Returns: The effective managed policy composed from the supplied layers.
+// Internal: ResolveEffectiveValue is part of the SDK's internal handshake/plumbing;
+// external callers should not use it.
+func (a *InternalServerManagedSettingsAPI) ResolveEffectiveValue(ctx context.Context, params *ManagedSettingsResolveEffectiveValueParams) (*ManagedSettingsResolveEffectiveValueResult, error) {
+	raw, err := a.client.Request(ctx, "managedSettings.resolveEffectiveValue", params)
+	if err != nil {
+		return nil, err
+	}
+	var result ManagedSettingsResolveEffectiveValueResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// ResolveStartupPolicy resolves the managed (enterprise policy) settings a host must
+// enforce from startup, and judges the account against the enterprise sign-in pin in the
+// same pass. This composes the layers the way `managedSettings.ingest` does and then
+// answers the two questions a host cannot answer for itself: which fail-closed floors apply
+// when a layer could not be confirmed, and whether this credential is allowed to sign in at
+// all. The sign-in verdict is the reason a host must not assemble this itself from
+// `managedSettings.ingest` — a pinned organization is an access control, and a host that
+// composed the layers but skipped the pin would let a developer sign in with a personal or
+// another enterprise's account and escape every control that keys off the signed-in
+// identity. The verdict is computed on every resolution, including one that is not
+// retained, so declining to apply policy never widens access. Set `retainAndApply` to keep
+// the resolved policy as this runtime process's startup policy; leave it false to resolve
+// without side effects.
+//
+// RPC method: managedSettings.resolveStartupPolicy.
+//
+// Parameters: Inputs describing the host and account a startup policy resolution should run
+// for. Mirrors `managedSettings.ingest`, and adds the decision of whether the resolved
+// policy is retained for this runtime process.
+//
+// Returns: The startup policy a resolution composed, the per-layer outcome flags a host
+// needs to decide how much to trust it, and the enterprise sign-in verdict for the
+// credential it ran against. The flags are reported rather than folded into the settings
+// because a host must distinguish an unmanaged device from a managed device whose policy
+// could not be confirmed, and apply its fail-closed gates in the second case.
+// Internal: ResolveStartupPolicy is part of the SDK's internal handshake/plumbing; external
+// callers should not use it.
+func (a *InternalServerManagedSettingsAPI) ResolveStartupPolicy(ctx context.Context, params *ManagedSettingsResolveStartupPolicyParams) (*ManagedSettingsResolveStartupPolicyResult, error) {
+	raw, err := a.client.Request(ctx, "managedSettings.resolveStartupPolicy", params)
+	if err != nil {
+		return nil, err
+	}
+	var result ManagedSettingsResolveStartupPolicyResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// RetainPolicy retains the supplied managed layers as this runtime process's startup policy
+// and re-applies the result to every live session. Hosts that own their own short-lived
+// process policy use this, so a guarded mutation is checked against the policy the host
+// actually fetched. Retaining is a whole-process replacement rather than a merge, so a host
+// that already resolved a good policy must not retain a partial one over it. The failure
+// flags are honest inputs rather than assumptions: reporting a fetch or load that failed
+// keeps the layers already retained, and the interim fail-closed state, instead of clearing
+// them.
+//
+// RPC method: managedSettings.retainPolicy.
+//
+// Parameters: The managed layers to retain as this process's startup policy, with the
+// outcome of fetching each one.
+// Internal: RetainPolicy is part of the SDK's internal handshake/plumbing; external callers
+// should not use it.
+func (a *InternalServerManagedSettingsAPI) RetainPolicy(ctx context.Context, params *ManagedSettingsRetainPolicyParams) (*ManagedSettingsRetainPolicyResult, error) {
+	raw, err := a.client.Request(ctx, "managedSettings.retainPolicy", params)
+	if err != nil {
+		return nil, err
+	}
+	var result ManagedSettingsRetainPolicyResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// Experimental: InternalServerMCPAPI contains experimental APIs that may change or be
+// removed.
+type InternalServerMCPAPI internalServerAPI
+
+// ListBuiltinServerNames lists the MCP servers the runtime supplies itself, so a host that
+// disables the built-ins wholesale suppresses exactly the set the runtime would otherwise
+// add. The names are fixed for a build and depend on no configuration, session or account.
+//
+// RPC method: mcp.listBuiltinServerNames.
+//
+// Returns: Names of the MCP servers the runtime supplies itself.
+// Internal: ListBuiltinServerNames is part of the SDK's internal handshake/plumbing;
+// external callers should not use it.
+func (a *InternalServerMCPAPI) ListBuiltinServerNames(ctx context.Context) (*MCPListBuiltinServerNamesResult, error) {
+	raw, err := a.client.Request(ctx, "mcp.listBuiltinServerNames", nil)
+	if err != nil {
+		return nil, err
+	}
+	var result MCPListBuiltinServerNamesResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// ShouldExcludeGitHubTools reports whether the gh-replaceable GitHub MCP tools may be
+// clipped for a session, which a host feeds back as the `excludeGhReplaceableTools` build
+// option. The tools are redundant only when the session can reach a shell *and* the host
+// has the `gh` that would replace them, so both halves are decided here. The shell half
+// runs the platform shell tool through the runtime's own tool-filter matcher, so entry
+// forms like `builtin:bash` and `builtin:*` behave exactly as they do when a session builds
+// its tool catalog. The host half probes for `gh`, and is skipped entirely when the filters
+// already rule the shell out. Host presence alone is not enough: a session restricted to,
+// say, `view` would otherwise lose the built-in issue-read fallback while having no shell
+// to replace it with. The answer describes the host the runtime runs on, so it is never
+// forwarded to a remote engine.
+//
+// RPC method: mcp.shouldExcludeGitHubTools.
+//
+// Parameters: The session tool filters that decide whether the session still has a shell to
+// run `gh` with.
+//
+// Returns: Whether the gh-replaceable GitHub MCP tools may be clipped for the session
+// described by the request.
+// Internal: ShouldExcludeGitHubTools is part of the SDK's internal handshake/plumbing;
+// external callers should not use it.
+func (a *InternalServerMCPAPI) ShouldExcludeGitHubTools(ctx context.Context, params *MCPShouldExcludeGitHubToolsRequest) (*MCPShouldExcludeGitHubToolsResult, error) {
+	raw, err := a.client.Request(ctx, "mcp.shouldExcludeGitHubTools", params)
+	if err != nil {
+		return nil, err
+	}
+	var result MCPShouldExcludeGitHubToolsResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// Experimental: InternalServerMCPRegistryAPI contains experimental APIs that may change or
+// be removed.
+type InternalServerMCPRegistryAPI internalServerAPI
+
+// AllocateRequestId allocates an ID for one cancellable MCP registry search. The ID exists
+// before the search starts, so callers can cancel before it starts. The networking stack
+// supplies the cancellation namespace. The runtime retains at most 1,024 unused IDs. At
+// capacity, another allocation can reclaim an unused ID. Active searches retain their IDs
+// until they finish.
+//
+// RPC method: mcp.registry.allocateRequestId.
+//
+// Returns: Request id naming a cancellable registry search.
+// Internal: AllocateRequestId is part of the SDK's internal handshake/plumbing; external
+// callers should not use it.
+func (a *InternalServerMCPRegistryAPI) AllocateRequestId(ctx context.Context) (*MCPRegistryRequestIDResult, error) {
+	raw, err := a.client.Request(ctx, "mcp.registry.allocateRequestId", nil)
+	if err != nil {
+		return nil, err
+	}
+	var result MCPRegistryRequestIDResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// Cancel abandons the registry search that uses the given request ID. It acts only on IDs
+// from `mcp.registry.allocateRequestId`, so it never cancels another component's request.
+// Answers `canceled: true` when it stops a running search. Answers `canceled: false` for
+// unknown or reclaimed IDs, completed or canceled searches, and unused reservations. It
+// releases an unused reservation, so a later search with that ID is refused.
+//
+// RPC method: mcp.registry.cancel.
+//
+// Parameters: Registry search to abandon.
+//
+// Returns: Whether the cancel reached a live search.
+// Internal: Cancel is part of the SDK's internal handshake/plumbing; external callers
+// should not use it.
+func (a *InternalServerMCPRegistryAPI) Cancel(ctx context.Context, params *MCPRegistryCancelRequest) (*MCPRegistryCancelResult, error) {
+	raw, err := a.client.Request(ctx, "mcp.registry.cancel", params)
+	if err != nil {
+		return nil, err
+	}
+	var result MCPRegistryCancelResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// Searches the MCP registry the supplied credential may read, resolving the registry
+// endpoint from policy first. Hosts usually send credential-free `AuthIdentity`; a `token`
+// identity can be resolved only when it embeds a token, while `env` and `gh-cli` identities
+// can use a token embedded in the request first. The runtime follows registry pages, keeps
+// the newest entry per server name, cuts the list to `limit`, and sorts an empty-query
+// result by GitHub stars. Each server object is carried opaquely.
+//
+// RPC method: mcp.registry.search.
+//
+// Parameters: Registry search terms, the credential to search under, and the request id
+// that makes the search cancellable.
+//
+// Returns: Servers selected from the registry response.
+// Internal: Search is part of the SDK's internal handshake/plumbing; external callers
+// should not use it.
+func (a *InternalServerMCPRegistryAPI) Search(ctx context.Context, params *MCPRegistrySearchRequest) (*MCPRegistrySearchResult, error) {
+	raw, err := a.client.Request(ctx, "mcp.registry.search", params)
+	if err != nil {
+		return nil, err
+	}
+	var result MCPRegistrySearchResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// Experimental: Registry returns experimental APIs that may change or be removed.
+func (s *InternalServerMCPAPI) Registry() *InternalServerMCPRegistryAPI {
+	return (*InternalServerMCPRegistryAPI)(s)
+}
+
+// Experimental: InternalServerPermissionsAPI contains experimental APIs that may change or
+// be removed.
+type InternalServerPermissionsAPI internalServerAPI
+
+// EvaluateManagedPolicy interprets a verbatim managed `permissions` slice into the three
+// policy questions a host asks before granting elevated permissions: whether
+// bypass-permissions mode is forbidden, whether a policy exists that this build could not
+// determine, and whether the layer supplies permission rules the session must enforce. An
+// absent or empty slice means no managed policy applies. The runtime and its permission
+// service share one policy type, so a new managed permission setting is interpreted in
+// exactly one place; a host that reimplements the reading would silently diverge the first
+// time that set grows. Hosts must fail closed on an undetermined policy rather than
+// treating it as permission granted.
+//
+// RPC method: permissions.evaluateManagedPolicy.
+//
+// Parameters: The verbatim managed `permissions` slice to interpret.
+//
+// Returns: The policy questions a host asks before granting elevated permissions.
+// Internal: EvaluateManagedPolicy is part of the SDK's internal handshake/plumbing;
+// external callers should not use it.
+func (a *InternalServerPermissionsAPI) EvaluateManagedPolicy(ctx context.Context, params *PermissionsEvaluateManagedPolicyParams) (*PermissionsEvaluateManagedPolicyResult, error) {
+	raw, err := a.client.Request(ctx, "permissions.evaluateManagedPolicy", params)
+	if err != nil {
+		return nil, err
+	}
+	var result PermissionsEvaluateManagedPolicyResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// Experimental: InternalServerPermissionsFolderTrustAPI contains experimental APIs that may
+// change or be removed.
+type InternalServerPermissionsFolderTrustAPI internalServerAPI
+
+// CheckTrust reports whether a folder is trusted, reading the persisted trusted-folders
+// list directly rather than through a session. Use this from a host that has no session
+// yet, such as a one-shot command deciding whether to honor a checkout's own settings. It
+// differs from the session-scoped check in two ways that matter: it takes the configuration
+// directory to read the list from, instead of inheriting the session's, and it answers only
+// from the persisted list, so trust a user granted for the lifetime of one session is not
+// visible here. A host that has a session should prefer the session-scoped check, which
+// also covers session-only trust.
+//
+// RPC method: permissions.folderTrust.checkTrust.
+//
+// Parameters: A folder to check against a persisted trusted-folders list, and the
+// configuration directory holding that list.
+//
+// Returns: Folder trust check result.
+// Internal: CheckTrust is part of the SDK's internal handshake/plumbing; external callers
+// should not use it.
+func (a *InternalServerPermissionsFolderTrustAPI) CheckTrust(ctx context.Context, params *FolderTrustIsTrustedParams) (*FolderTrustCheckResult, error) {
+	raw, err := a.client.Request(ctx, "permissions.folderTrust.checkTrust", params)
+	if err != nil {
+		return nil, err
+	}
+	var result FolderTrustCheckResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// Experimental: FolderTrust returns experimental APIs that may change or be removed.
+func (s *InternalServerPermissionsAPI) FolderTrust() *InternalServerPermissionsFolderTrustAPI {
+	return (*InternalServerPermissionsFolderTrustAPI)(s)
+}
+
+// Experimental: InternalServerPermissionsLocationsAPI contains experimental APIs that may
+// change or be removed.
+type InternalServerPermissionsLocationsAPI internalServerAPI
+
+// CleanupOrphaned drops stored per-location permission grants whose directory no longer
+// exists, and reports which location keys were removed. Runs against the permission store
+// under the runtime's own Copilot home, the same store
+// `session.permissions.locations.resolve` reads. Marked internal because it exists to carry
+// a CLI call site off the napi boundary onto the SDK contract; it is migration plumbing,
+// not a surface consumers are meant to depend on. It can become public once an SDK consumer
+// needs to prune its own permission store.
+//
+// RPC method: permissions.locations.cleanupOrphaned.
+//
+// Returns: Which stored location permissions were dropped because their directory is gone.
+// Internal: CleanupOrphaned is part of the SDK's internal handshake/plumbing; external
+// callers should not use it.
+func (a *InternalServerPermissionsLocationsAPI) CleanupOrphaned(ctx context.Context) (*LocationPermissionsCleanupResult, error) {
+	raw, err := a.client.Request(ctx, "permissions.locations.cleanupOrphaned", nil)
+	if err != nil {
+		return nil, err
+	}
+	var result LocationPermissionsCleanupResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// Experimental: Locations returns experimental APIs that may change or be removed.
+func (s *InternalServerPermissionsAPI) Locations() *InternalServerPermissionsLocationsAPI {
+	return (*InternalServerPermissionsLocationsAPI)(s)
+}
+
+// Experimental: InternalServerPersistenceAPI contains experimental APIs that may change or
+// be removed.
+type InternalServerPersistenceAPI internalServerAPI
+
+// WriteRawJsonLocked atomically replaces a JSON file's entire contents while holding the
+// runtime's per-path lock. The lock lives in the runtime process, so a host that writes
+// these files itself takes no part in it and can tear a concurrent runtime write; route the
+// write here instead. Unlike a merging write this never reads or parses the existing file,
+// so a previously corrupted snapshot is replaced wholesale rather than failing every later
+// write. Use it only for callers that always persist a complete snapshot.
+//
+// RPC method: persistence.writeRawJsonLocked.
+//
+// Parameters: A complete JSON snapshot to write under the runtime's per-path file lock.
+//
+// Returns: The outcome of a locked snapshot write.
+// Internal: WriteRawJsonLocked is part of the SDK's internal handshake/plumbing; external
+// callers should not use it.
+func (a *InternalServerPersistenceAPI) WriteRawJsonLocked(ctx context.Context, params *PersistenceWriteRawJSONLockedRequest) (*PersistenceWriteRawJSONLockedResult, error) {
+	raw, err := a.client.Request(ctx, "persistence.writeRawJsonLocked", params)
+	if err != nil {
+		return nil, err
+	}
+	var result PersistenceWriteRawJSONLockedResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// Experimental: InternalServerRepoAPI contains experimental APIs that may change or be
+// removed.
+type InternalServerRepoAPI internalServerAPI
+
+// Experimental: InternalServerRepoSettingsAPI contains experimental APIs that may change or
+// be removed.
+type InternalServerRepoSettingsAPI internalServerAPI
+
+// Edit atomically edits one allowed top-level repository setting. Reads the raw file,
+// preserves unrelated keys, applies one scalar or list edit, validates the result and
+// writes under one file lock, so concurrent sibling or list edits are not lost. A malformed
+// or unsafe existing file returns `invalid` without a write; rejected keys, invalid values
+// and I/O errors reject the call.
+//
+// RPC method: repo.settings.edit.
+//
+// Parameters: One atomic edit of an allowed top-level repository setting.
+//
+// Returns: Outcome of an atomic user or repository settings edit.
+// Internal: Edit is part of the SDK's internal handshake/plumbing; external callers should
+// not use it.
+func (a *InternalServerRepoSettingsAPI) Edit(ctx context.Context, params *RepoSettingsEditRequest) (*SettingsEditResult, error) {
+	raw, err := a.client.Request(ctx, "repo.settings.edit", params)
+	if err != nil {
+		return nil, err
+	}
+	var result SettingsEditResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// ReadRaw reads one repository settings file without settings normalization or layering.
+// The existing JSONC parser accepts comments and trailing commas and applies its
+// prototype-safety rules. Missing or blank files return an empty valid config. Invalid
+// files return an empty config with invalid=true; other read failures reject.
+//
+// RPC method: repo.settings.readRaw.
+//
+// Parameters: Which repository settings file to read.
+//
+// Returns: Parsed repository settings without normalization or layering.
+// Internal: ReadRaw is part of the SDK's internal handshake/plumbing; external callers
+// should not use it.
+func (a *InternalServerRepoSettingsAPI) ReadRaw(ctx context.Context, params *RepoSettingsReadRawRequest) (*RepoSettingsReadRawResult, error) {
+	raw, err := a.client.Request(ctx, "repo.settings.readRaw", params)
+	if err != nil {
+		return nil, err
+	}
+	var result RepoSettingsReadRawResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// WriteAll replaces the repository-overridable settings in one locked write. Allowed keys
+// present in settings are validated and written; allowed keys absent from settings are
+// removed. Other input keys are ignored, and unknown keys already stored in the file remain
+// unchanged. Invalid values or an invalid existing file reject without a partial write.
+//
+// RPC method: repo.settings.writeAll.
+//
+// Parameters: The complete set of repository-overridable settings to store.
+// Internal: WriteAll is part of the SDK's internal handshake/plumbing; external callers
+// should not use it.
+func (a *InternalServerRepoSettingsAPI) WriteAll(ctx context.Context, params *RepoSettingsWriteAllRequest) (*RepoSettingsWriteAllResult, error) {
+	raw, err := a.client.Request(ctx, "repo.settings.writeAll", params)
+	if err != nil {
+		return nil, err
+	}
+	var result RepoSettingsWriteAllResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// WriteKey writes or removes one allowed top-level repository setting through the existing
+// validator and file lock. Preserves unrelated stored keys. Invalid keys, values, existing
+// documents, and I/O errors reject without replacing the file. Deletion requires
+// delete=true; otherwise value must be present.
+//
+// RPC method: repo.settings.writeKey.
+//
+// Parameters: One key to write or remove in a repository settings file.
+// Internal: WriteKey is part of the SDK's internal handshake/plumbing; external callers
+// should not use it.
+func (a *InternalServerRepoSettingsAPI) WriteKey(ctx context.Context, params *RepoSettingsWriteKeyRequest) (*RepoSettingsWriteKeyResult, error) {
+	raw, err := a.client.Request(ctx, "repo.settings.writeKey", params)
+	if err != nil {
+		return nil, err
+	}
+	var result RepoSettingsWriteKeyResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// Experimental: Settings returns experimental APIs that may change or be removed.
+func (s *InternalServerRepoAPI) Settings() *InternalServerRepoSettingsAPI {
+	return (*InternalServerRepoSettingsAPI)(s)
+}
+
+// Experimental: InternalServerSandboxAPI contains experimental APIs that may change or be
+// removed.
+type InternalServerSandboxAPI internalServerAPI
+
+// CheckEnforcementCommand whether one slash command stays reachable while sandbox
+// enforcement is unavailable and the session is otherwise blocked. The permitted set is
+// deliberately narrow — commands that only report state, and the few that let the user
+// repair or leave the situation — and it is keyed on the arguments as well as the name, so
+// `/sandbox status` is admitted where `/sandbox enable` is not. A host must ask rather than
+// keep its own list: a command this returns false for is one the runtime would refuse
+// anyway, and a divergent list either strands the user with no way out or admits a command
+// that acts on an unenforced session.
+//
+// RPC method: sandbox.checkEnforcementCommand.
+//
+// Parameters: One slash command, as typed, to test against the enforcement-block allowlist.
+//
+// Returns: True when the command stays available while enforcement is blocked.
+// Internal: CheckEnforcementCommand is part of the SDK's internal handshake/plumbing;
+// external callers should not use it.
+func (a *InternalServerSandboxAPI) CheckEnforcementCommand(ctx context.Context, params *SandboxEnforcementCommandAllowedParams) (*SandboxCheckEnforcementCommandResult, error) {
+	raw, err := a.client.Request(ctx, "sandbox.checkEnforcementCommand", params)
+	if err != nil {
+		return nil, err
+	}
+	var result SandboxCheckEnforcementCommandResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// CheckPlatformSupport reports whether this machine can run an OS-level command sandbox at
+// all. A host must ask before it offers sandboxing, because the answer is a property of the
+// machine rather than of any setting: on Linux it depends on bubblewrap being installed,
+// and on Windows on the OS build supporting BaseContainer. Probing it requires spawning a
+// process the first time, so the answer is cached for the life of the runtime. A host that
+// assumes support and enables the sandbox anyway produces a session in which every shell
+// command fails.
+//
+// RPC method: sandbox.checkPlatformSupport.
+//
+// Returns: True when an OS-level sandbox can run on this host.
+// Internal: CheckPlatformSupport is part of the SDK's internal handshake/plumbing; external
+// callers should not use it.
+func (a *InternalServerSandboxAPI) CheckPlatformSupport(ctx context.Context) (*SandboxCheckPlatformSupportResult, error) {
+	raw, err := a.client.Request(ctx, "sandbox.checkPlatformSupport", nil)
+	if err != nil {
+		return nil, err
+	}
+	var result SandboxCheckPlatformSupportResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// CheckWindowsHostLoopbackSupport reports whether this Windows host's BaseContainer
+// implementation can reach the host's loopback interface directly, which is what a
+// local-network policy needs to avoid routing through the egress proxy. Like
+// `sandbox.checkPlatformSupport`, the answer is a property of the machine's OS build rather
+// than of any setting, and resolving it the first time spawns a platform probe. A host that
+// offers the direct local-network option on a machine that lacks the capability produces a
+// session whose sandboxed commands cannot reach local services. Always false off Windows.
+//
+// RPC method: sandbox.checkWindowsHostLoopbackSupport.
+//
+// Returns: True when the sandbox on this host can reach host loopback directly.
+// Internal: CheckWindowsHostLoopbackSupport is part of the SDK's internal
+// handshake/plumbing; external callers should not use it.
+func (a *InternalServerSandboxAPI) CheckWindowsHostLoopbackSupport(ctx context.Context) (*SandboxCheckWindowsHostLoopbackSupportResult, error) {
+	raw, err := a.client.Request(ctx, "sandbox.checkWindowsHostLoopbackSupport", nil)
+	if err != nil {
+		return nil, err
+	}
+	var result SandboxCheckWindowsHostLoopbackSupportResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// FilterPickerCandidates checks a batch of `@`-file picker suggestions against a policy
+// prepared by `sandbox.preparePickerPolicy` and returns one allow decision per candidate,
+// positionally aligned with the request. Batched deliberately: each check canonicalizes a
+// path component-by-component through the real filesystem, so one call amortizes that over
+// a single hop rather than dozens while the user types. A directory the policy does not
+// itself allow can still be kept as a waypoint to an allowed subtree. An absent policy
+// keeps every candidate.
+//
+// RPC method: sandbox.filterPickerCandidates.
+//
+// Parameters: A batch of file-picker candidates to check against a prepared policy.
+//
+// Returns: Per-candidate allow decisions, positionally aligned with the request.
+// Internal: FilterPickerCandidates is part of the SDK's internal handshake/plumbing;
+// external callers should not use it.
+func (a *InternalServerSandboxAPI) FilterPickerCandidates(ctx context.Context, params *SandboxFilterPickerCandidatesParams) (*SandboxFilterPickerCandidatesResult, error) {
+	raw, err := a.client.Request(ctx, "sandbox.filterPickerCandidates", params)
+	if err != nil {
+		return nil, err
+	}
+	var result SandboxFilterPickerCandidatesResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// GetDocsUrl returns the documentation URL a host should point a user at when it declines
+// or downgrades a sandbox setting. The runtime owns the address so every surface cites the
+// same page and a host does not hard-code a link that later moves.
+//
+// RPC method: sandbox.getDocsUrl.
+//
+// Returns: The documentation URL a host cites when it declines or downgrades a sandbox
+// setting.
+// Internal: GetDocsUrl is part of the SDK's internal handshake/plumbing; external callers
+// should not use it.
+func (a *InternalServerSandboxAPI) GetDocsUrl(ctx context.Context) (*SandboxDocsURLResult, error) {
+	raw, err := a.client.Request(ctx, "sandbox.getDocsUrl", nil)
+	if err != nil {
+		return nil, err
+	}
+	var result SandboxDocsURLResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// GetUnsupportedMessage the explanation a host shows when it refuses an explicit request to
+// turn the sandbox on for a machine that cannot run one. Carries the platform-specific
+// remedy — install bubblewrap, update Windows — and the documentation link, so a host that
+// got `false` from `sandbox.checkPlatformSupport` does not have to compose its own reason
+// and cannot describe the same machine differently from the runtime's own spawn path.
+//
+// RPC method: sandbox.getUnsupportedMessage.
+//
+// Returns: The user-facing refusal, including the platform remedy and the documentation
+// link.
+// Internal: GetUnsupportedMessage is part of the SDK's internal handshake/plumbing;
+// external callers should not use it.
+func (a *InternalServerSandboxAPI) GetUnsupportedMessage(ctx context.Context) (*SandboxGetUnsupportedMessageResult, error) {
+	raw, err := a.client.Request(ctx, "sandbox.getUnsupportedMessage", nil)
+	if err != nil {
+		return nil, err
+	}
+	var result SandboxGetUnsupportedMessageResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// GetUnsupportedSettingDisabledNotice the notice a host shows when a stored `sandbox`
+// setting is being ignored for this session because the machine cannot enforce it. Distinct
+// from `sandbox.getUnsupportedMessage`, which refuses an explicit request: this one reports
+// that a setting the user already saved is inert, states that commands will run
+// unsandboxed, and confirms the stored setting itself is left alone. A host that stays
+// silent here leaves the user believing a sandbox is active.
+//
+// RPC method: sandbox.getUnsupportedSettingDisabledNotice.
+//
+// Returns: The user-facing notice that a saved sandbox setting is inert for this session.
+// Internal: GetUnsupportedSettingDisabledNotice is part of the SDK's internal
+// handshake/plumbing; external callers should not use it.
+func (a *InternalServerSandboxAPI) GetUnsupportedSettingDisabledNotice(ctx context.Context) (*SandboxGetUnsupportedSettingDisabledNoticeResult, error) {
+	raw, err := a.client.Request(ctx, "sandbox.getUnsupportedSettingDisabledNotice", nil)
+	if err != nil {
+		return nil, err
+	}
+	var result SandboxGetUnsupportedSettingDisabledNoticeResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// GetUnsupportedStartupNotice the warning a host prints at startup when a session asked for
+// a sandbox on a machine that cannot run one. The third of the unsupported notices, and the
+// only one that depends on the policy in force: it names the remedy the reader can actually
+// act on, which is the stored setting for an unmanaged host, an administrator for a managed
+// one, and waiting for the policy to resolve when the sandbox stayed on only because the
+// policy could not be determined. Returns no notice when the machine does support a
+// sandbox, so a host can call it unconditionally on the startup path. A host that composes
+// its own warning tells a managed user to change a setting their policy will overwrite.
+//
+// RPC method: sandbox.getUnsupportedStartupNotice.
+//
+// Parameters: The managed sandbox policy in force, which selects which remedy the notice
+// offers.
+//
+// Returns: The startup warning, absent when the machine can run a sandbox.
+// Internal: GetUnsupportedStartupNotice is part of the SDK's internal handshake/plumbing;
+// external callers should not use it.
+func (a *InternalServerSandboxAPI) GetUnsupportedStartupNotice(ctx context.Context, params *SandboxUnsupportedStartupNoticeParams) (*SandboxUnsupportedStartupNoticeResult, error) {
+	raw, err := a.client.Request(ctx, "sandbox.getUnsupportedStartupNotice", params)
+	if err != nil {
+		return nil, err
+	}
+	var result SandboxUnsupportedStartupNoticeResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// PreparePickerPolicy builds the effective filesystem policy one `@`-file picker checks its
+// suggestions against, so Git discovery and grant canonicalization run once for the
+// picker's lifetime instead of on every debounced keystroke. Returns no policy when the
+// sandbox is absent or disabled, which the paired filter reads as "keep every candidate". A
+// host must pair this with `sandbox.filterPickerCandidates` rather than resolve a grant
+// list itself, because the picker's grants are narrower than a file tool's — the same path
+// a built-in tool may read can be one the picker must not offer.
+//
+// RPC method: sandbox.preparePickerPolicy.
+//
+// Parameters: The working directory and sandbox settings to build a file-picker policy from.
+//
+// Returns: The prepared file-picker policy, or none when the sandbox is disabled.
+// Internal: PreparePickerPolicy is part of the SDK's internal handshake/plumbing; external
+// callers should not use it.
+func (a *InternalServerSandboxAPI) PreparePickerPolicy(ctx context.Context, params *SandboxPreparePickerPolicyParams) (*SandboxPreparePickerPolicyResult, error) {
+	raw, err := a.client.Request(ctx, "sandbox.preparePickerPolicy", params)
+	if err != nil {
+		return nil, err
+	}
+	var result SandboxPreparePickerPolicyResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// ResolveFlooredConfig raises a user's sandbox settings to an administrator's managed
+// sandbox floor and returns the result a session should actually run under. The floor can
+// only tighten: an enterprise force-on is reflected even when the user's own `enabled` is
+// false, and a user cannot lower a setting the floor raised. The result is normalized
+// through the declared sandbox shape, so a key reorder or an undeclared passthrough key is
+// not mistaken for a policy change by callers that diff two results. A host must call this
+// rather than merge the two layers itself, because reimplementing the direction of the fold
+// is what turns an administrator's floor into a suggestion.
+//
+// RPC method: sandbox.resolveFlooredConfig.
+//
+// Parameters: The user's sandbox settings and the managed sandbox floor to raise them to.
+//
+// Returns: The user's sandbox settings raised to the managed floor.
+// Internal: ResolveFlooredConfig is part of the SDK's internal handshake/plumbing; external
+// callers should not use it.
+func (a *InternalServerSandboxAPI) ResolveFlooredConfig(ctx context.Context, params *SandboxResolveFlooredConfigParams) (*SandboxResolveFlooredConfigResult, error) {
+	raw, err := a.client.Request(ctx, "sandbox.resolveFlooredConfig", params)
+	if err != nil {
+		return nil, err
+	}
+	var result SandboxResolveFlooredConfigResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// ResolveForOptional the sandbox a single named feature actually launches under, which is
+// not the same as the session's sandbox. A feature is routed out of the sandbox by its own
+// flag — `sandboxMcpServers`, `sandboxLspServers` — so an enabled session can still start
+// one server confined and another free. Returns a disabled sandbox rather than an error
+// when the host has no sandbox slice at all, so an absent config and an opted-out feature
+// read alike at the launch site. A host must ask per feature rather than reuse the session
+// config, because reading only `enabled` confines a server the user opted out of, or
+// reports as sandboxed one that is not.
+//
+// RPC method: sandbox.resolveForOptional.
+//
+// Parameters: A sandbox config and the per-feature routing flag to resolve it for.
+//
+// Returns: The sandbox a named feature actually launches under.
+// Internal: ResolveForOptional is part of the SDK's internal handshake/plumbing; external
+// callers should not use it.
+func (a *InternalServerSandboxAPI) ResolveForOptional(ctx context.Context, params *SandboxEffectiveForOptionalParams) (*SandboxEffectiveForOptionalResult, error) {
+	raw, err := a.client.Request(ctx, "sandbox.resolveForOptional", params)
+	if err != nil {
+		return nil, err
+	}
+	var result SandboxEffectiveForOptionalResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// Experimental: InternalServerSandboxProxySecretAPI contains experimental APIs that may
+// change or be removed.
+type InternalServerSandboxProxySecretAPI internalServerAPI
+
+// Delete removes the stored sandbox proxy password from the credential store
+// `sandbox.proxySecret.getLocation` names. Succeeds when no entry exists, so it is safe to
+// call while clearing a proxy password whose origin is unknown. Marked internal because it
+// exists to carry a CLI call site off the napi boundary onto the SDK contract.
+//
+// RPC method: sandbox.proxySecret.delete.
+// Internal: Delete is part of the SDK's internal handshake/plumbing; external callers
+// should not use it.
+func (a *InternalServerSandboxProxySecretAPI) Delete(ctx context.Context) (*SandboxProxySecretDeleteResult, error) {
+	raw, err := a.client.Request(ctx, "sandbox.proxySecret.delete", nil)
+	if err != nil {
+		return nil, err
+	}
+	var result SandboxProxySecretDeleteResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// Get reads the stored sandbox proxy password from the credential store
+// `sandbox.proxySecret.getLocation` names, preferring the OS keychain and falling back to
+// the on-disk store. Reports an absent value rather than failing when no entry exists.
+// Marked internal because it exists to carry a CLI call site off the napi boundary onto the
+// SDK contract.
+//
+// RPC method: sandbox.proxySecret.get.
+//
+// Returns: The stored sandbox proxy password, if one is present.
+// Internal: Get is part of the SDK's internal handshake/plumbing; external callers should
+// not use it.
+func (a *InternalServerSandboxProxySecretAPI) Get(ctx context.Context) (*SandboxProxySecretGetResult, error) {
+	raw, err := a.client.Request(ctx, "sandbox.proxySecret.get", nil)
+	if err != nil {
+		return nil, err
+	}
+	var result SandboxProxySecretGetResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// GetLocation reports where this runtime keeps the sandbox proxy password: the credential
+// store directory and the entry identifier within it. Both are derived from the
+// configuration directory this runtime was started with, so a host does not resolve them
+// itself. Read this to recognize a `${secret:…}` value in stored sandbox settings as this
+// runtime's own proxy password rather than a reference the user wrote by hand. Marked
+// internal because it exists to carry a CLI call site off the napi boundary onto the SDK
+// contract.
+//
+// RPC method: sandbox.proxySecret.getLocation.
+//
+// Returns: Where this runtime keeps the sandbox proxy password.
+// Internal: GetLocation is part of the SDK's internal handshake/plumbing; external callers
+// should not use it.
+func (a *InternalServerSandboxProxySecretAPI) GetLocation(ctx context.Context) (*SandboxProxySecretLocation, error) {
+	raw, err := a.client.Request(ctx, "sandbox.proxySecret.getLocation", nil)
+	if err != nil {
+		return nil, err
+	}
+	var result SandboxProxySecretLocation
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// Save stores the sandbox proxy password in the credential store
+// `sandbox.proxySecret.getLocation` names, replacing any existing entry. Reports whether
+// the OS keychain accepted it or it fell back to the on-disk store. Marked internal because
+// it exists to carry a CLI call site off the napi boundary onto the SDK contract.
+//
+// RPC method: sandbox.proxySecret.save.
+//
+// Parameters: The sandbox proxy password to store.
+//
+// Returns: Where the sandbox proxy password was stored.
+// Internal: Save is part of the SDK's internal handshake/plumbing; external callers should
+// not use it.
+func (a *InternalServerSandboxProxySecretAPI) Save(ctx context.Context, params *SandboxProxySecretSaveRequest) (*SandboxProxySecretSaveResult, error) {
+	raw, err := a.client.Request(ctx, "sandbox.proxySecret.save", params)
+	if err != nil {
+		return nil, err
+	}
+	var result SandboxProxySecretSaveResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// Experimental: ProxySecret returns experimental APIs that may change or be removed.
+func (s *InternalServerSandboxAPI) ProxySecret() *InternalServerSandboxProxySecretAPI {
+	return (*InternalServerSandboxProxySecretAPI)(s)
+}
+
+// Experimental: InternalServerSandboxSettingsAPI contains experimental APIs that may change
+// or be removed.
+type InternalServerSandboxSettingsAPI internalServerAPI
+
+// ApplyDefaults resolves a stored sandbox settings object into the effective one, filling
+// every value the user left unset with its default. Read this to render or reason about the
+// sandbox configuration a session would actually run under, rather than the sparse document
+// the user wrote.
+//
+// RPC method: sandbox.settings.applyDefaults.
+//
+// Parameters: The stored sandbox settings to resolve against the defaults.
+//
+// Returns: The effective sandbox settings, with every unset value resolved to its default.
+// Internal: ApplyDefaults is part of the SDK's internal handshake/plumbing; external
+// callers should not use it.
+func (a *InternalServerSandboxSettingsAPI) ApplyDefaults(ctx context.Context, params *SandboxApplyDefaultsRequest) (*SandboxSettingsApplyDefaultsResult, error) {
+	raw, err := a.client.Request(ctx, "sandbox.settings.applyDefaults", params)
+	if err != nil {
+		return nil, err
+	}
+	var result SandboxSettingsApplyDefaultsResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// Experimental: Settings returns experimental APIs that may change or be removed.
+func (s *InternalServerSandboxAPI) Settings() *InternalServerSandboxSettingsAPI {
+	return (*InternalServerSandboxSettingsAPI)(s)
+}
+
+// Experimental: InternalServerSessionsAPI contains experimental APIs that may change or be
+// removed.
+type InternalServerSessionsAPI internalServerAPI
+
+// ConfigureSessionExtensions attaches (or detaches) an in-process ExtensionController
+// delegate for the given session in a local host adapter. Pass `controller: undefined` to
+// detach. Internal because the controller cannot cross the JSON-RPC boundary; the runtime
+// manages its own session extension service.
+//
+// RPC method: sessions.configureSessionExtensions.
+//
+// Parameters: Params to attach or detach an in-process ExtensionController delegate.
+// Internal: ConfigureSessionExtensions is part of the SDK's internal handshake/plumbing;
+// external callers should not use it.
+func (a *InternalServerSessionsAPI) ConfigureSessionExtensions(ctx context.Context, params *ConfigureSessionExtensionsParams) (*SessionsConfigureSessionExtensionsResult, error) {
+	raw, err := a.client.Request(ctx, "sessions.configureSessionExtensions", params)
+	if err != nil {
+		return nil, err
+	}
+	var result SessionsConfigureSessionExtensionsResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// CreateWorkspace creates the workspace record for a session that has not been opened yet.
+// A host that hands a session off to another application — writing the record and then
+// launching that application against the session ID — needs the record on disk before any
+// session exists to carry it, which the session-scoped workspace methods cannot do.
+// Replaces any existing record and resets the checkpoint index. When writing to the local
+// filesystem, a stored `fork_count` survives on disk. Returns the record it built, so a
+// surviving stored `fork_count` can differ from the answer.
+//
+// RPC method: sessions.createWorkspace.
+//
+// Parameters: Identity, state location and starting context for a workspace record.
+//
+// Returns: The workspace record that was written.
+// Internal: CreateWorkspace is part of the SDK's internal handshake/plumbing; external
+// callers should not use it.
+func (a *InternalServerSessionsAPI) CreateWorkspace(ctx context.Context, params *SessionsCreateWorkspaceRequest) (*SessionsCreateWorkspaceResult, error) {
+	raw, err := a.client.Request(ctx, "sessions.createWorkspace", params)
+	if err != nil {
+		return nil, err
+	}
+	var result SessionsCreateWorkspaceResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// Deletes one local session from disk after running the same lifecycle hooks as the session
+// manager.
+//
+// RPC method: sessions.delete.
+//
+// Parameters: Session ID to delete from disk.
+// Internal: Delete is part of the SDK's internal handshake/plumbing; external callers
+// should not use it.
+func (a *InternalServerSessionsAPI) Delete(ctx context.Context, params *SessionsDeleteRequest) (*SessionsDeleteResult, error) {
+	raw, err := a.client.Request(ctx, "sessions.delete", params)
+	if err != nil {
+		return nil, err
+	}
+	var result SessionsDeleteResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// GetBoardEntryCount gets the dynamic-context board entry count associated with a session,
+// when available. Internal: this exists solely so CLI telemetry events (`rem_spawn_gate`,
+// `rem_consolidation_complete`) can pair START / END board counts around the detached
+// rem-agent spawn. "Dynamic context board" is a runtime-internal concept that is not part
+// of the public SDK contract; the long-term plan is to relocate the telemetry emission into
+// the runtime so this method can be deleted entirely.
+//
+// RPC method: sessions.getBoardEntryCount.
+//
+// Parameters: Session ID whose board entry count should be returned.
+//
+// Returns: Dynamic-context board entry count, when available.
+// Internal: GetBoardEntryCount is part of the SDK's internal handshake/plumbing; external
+// callers should not use it.
+func (a *InternalServerSessionsAPI) GetBoardEntryCount(ctx context.Context, params *SessionsGetBoardEntryCountRequest) (*SessionsGetBoardEntryCountResult, error) {
+	raw, err := a.client.Request(ctx, "sessions.getBoardEntryCount", params)
+	if err != nil {
+		return nil, err
+	}
+	var result SessionsGetBoardEntryCountResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// GetEventFilePath computes the absolute path to a session's persisted events.jsonl file.
+// Internal: filesystem paths are only meaningful in-process (CLI and runtime share a
+// filesystem). Currently used by the CLI's contribution-graph feature to read historical
+// events directly. Remote SDK consumers must not depend on this; a proper event-query API
+// would replace it if the contribution graph ever needed to work over the wire.
+//
+// RPC method: sessions.getEventFilePath.
+//
+// Parameters: Session ID whose event-log file path to compute.
+//
+// Returns: Absolute path to the session's events.jsonl file on disk.
+// Internal: GetEventFilePath is part of the SDK's internal handshake/plumbing; external
+// callers should not use it.
+func (a *InternalServerSessionsAPI) GetEventFilePath(ctx context.Context, params *SessionsGetEventFilePathRequest) (*SessionsGetEventFilePathResult, error) {
+	raw, err := a.client.Request(ctx, "sessions.getEventFilePath", params)
+	if err != nil {
+		return nil, err
+	}
+	var result SessionsGetEventFilePathResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// GetMetadata reads lightweight persisted metadata for one local session without opening it.
+//
+// RPC method: sessions.getMetadata.
+//
+// Parameters: Session ID whose persisted metadata should be read.
+//
+// Returns: Persisted local session metadata when the session exists.
+// Internal: GetMetadata is part of the SDK's internal handshake/plumbing; external callers
+// should not use it.
+func (a *InternalServerSessionsAPI) GetMetadata(ctx context.Context, params *SessionsGetMetadataRequest) (*SessionsGetMetadataResult, error) {
+	raw, err := a.client.Request(ctx, "sessions.getMetadata", params)
+	if err != nil {
+		return nil, err
+	}
+	var result SessionsGetMetadataResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// GetPersistedRemoteSteerable returns a session's persisted remote-steerable flag, if any
+// has been recorded. Internal: this is CLI-specific book-keeping used by `--continue` /
+// `--resume` to inherit the prior session's remote-steerable preference. SDK consumers that
+// want similar behavior should manage their own persistence around start/stop calls rather
+// than relying on this runtime-side flag.
+//
+// RPC method: sessions.getPersistedRemoteSteerable.
+//
+// Parameters: Session ID to look up the persisted remote-steerable flag for.
+//
+// Returns: The session's persisted remote-steerable flag, or omitted when no value has been
+// persisted.
+// Internal: GetPersistedRemoteSteerable is part of the SDK's internal handshake/plumbing;
+// external callers should not use it.
+func (a *InternalServerSessionsAPI) GetPersistedRemoteSteerable(ctx context.Context, params *SessionsGetPersistedRemoteSteerableRequest) (*SessionsGetPersistedRemoteSteerableResult, error) {
+	raw, err := a.client.Request(ctx, "sessions.getPersistedRemoteSteerable", params)
+	if err != nil {
+		return nil, err
+	}
+	var result SessionsGetPersistedRemoteSteerableResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// ListNonEmptySessionIds lists recent local session IDs that contain user-visible history,
+// omitting housekeeping-only sessions.
+//
+// RPC method: sessions.listNonEmptySessionIds.
+//
+// Parameters: Limit for non-empty local session IDs.
+//
+// Returns: Recent local session IDs that contain user-visible history.
+// Internal: ListNonEmptySessionIds is part of the SDK's internal handshake/plumbing;
+// external callers should not use it.
+func (a *InternalServerSessionsAPI) ListNonEmptySessionIds(ctx context.Context, params *SessionsListNonEmptySessionIDsRequest) (*SessionsListNonEmptySessionIDsResult, error) {
+	raw, err := a.client.Request(ctx, "sessions.listNonEmptySessionIds", params)
+	if err != nil {
+		return nil, err
+	}
+	var result SessionsListNonEmptySessionIDsResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// LoadWorkspace reads a session's workspace record straight from disk, without opening the
+// session. Resuming by session ID has to know where the session lives before it can
+// connect, so the lookup cannot come from the session-scoped workspace methods, which
+// resolve their location from a live session's context. Returns no record when the file is
+// absent.
+//
+// RPC method: sessions.loadWorkspace.
+//
+// Parameters: Where the session's state lives, as a root directory and the session ID under
+// it.
+//
+// Returns: The workspace record on disk, omitted when the session has none.
+// Internal: LoadWorkspace is part of the SDK's internal handshake/plumbing; external
+// callers should not use it.
+func (a *InternalServerSessionsAPI) LoadWorkspace(ctx context.Context, params *SessionsLoadWorkspaceRequest) (*SessionsLoadWorkspaceResult, error) {
+	raw, err := a.client.Request(ctx, "sessions.loadWorkspace", params)
+	if err != nil {
+		return nil, err
+	}
+	var result SessionsLoadWorkspaceResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// UpdateWorkspaceFields merges fields into a session's workspace record on disk, creating
+// the record when it is absent. The counterpart to `sessions.loadWorkspace`, for the same
+// before-the-session-exists case. It preserves stored workspace-schema fields the request
+// does not supply, does not preserve stored keys outside the workspace schema, and never
+// replaces a stored `fork_count`.
+//
+// RPC method: sessions.updateWorkspaceFields.
+//
+// Parameters: Where the session's state lives, plus workspace-schema fields to merge into
+// its workspace record. Stored keys outside the schema are not preserved, and a stored
+// `fork_count` is never replaced.
+//
+// Returns: The merge completed. The record carries the supplied workspace-schema fields,
+// but a stored `fork_count` stays.
+// Internal: UpdateWorkspaceFields is part of the SDK's internal handshake/plumbing;
+// external callers should not use it.
+func (a *InternalServerSessionsAPI) UpdateWorkspaceFields(ctx context.Context, params *SessionsUpdateWorkspaceFieldsRequest) (*SessionsUpdateWorkspaceFieldsResult, error) {
+	raw, err := a.client.Request(ctx, "sessions.updateWorkspaceFields", params)
+	if err != nil {
+		return nil, err
+	}
+	var result SessionsUpdateWorkspaceFieldsResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// Experimental: InternalServerUserAPI contains experimental APIs that may change or be
+// removed.
+type InternalServerUserAPI internalServerAPI
+
+// Experimental: InternalServerUserSettingsAPI contains experimental APIs that may change or
+// be removed.
+type InternalServerUserSettingsAPI internalServerAPI
+
+// ApplyTopKey validates one top-level setting subtree and writes just that key to
+// settings.json as a single step. Doing both here closes the race a caller cannot close
+// itself: between a separate preflight read and the write, the file may change. Rewriting
+// only the touched key keeps legacy siblings out of settings.json. Answers a status rather
+// than failing, so a validation problem and a write problem stay distinguishable.
+//
+// RPC method: user.settings.applyTopKey.
+//
+// Parameters: A single top-level setting subtree to validate and write.
+//
+// Returns: Outcome of validating and writing one top-level setting subtree.
+// Internal: ApplyTopKey is part of the SDK's internal handshake/plumbing; external callers
+// should not use it.
+func (a *InternalServerUserSettingsAPI) ApplyTopKey(ctx context.Context, params *UserSettingsApplyTopKeyRequest) (*UserSettingsApplyTopKeyResult, error) {
+	raw, err := a.client.Request(ctx, "user.settings.applyTopKey", params)
+	if err != nil {
+		return nil, err
+	}
+	var result UserSettingsApplyTopKeyResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// BuildRuntime resolves the effective runtime settings for a host that is about to start a
+// session, layering the given overrides over the settings documents, the environment and
+// the platform defaults. A host cannot assemble this itself: the precedence between a user
+// document, a repository document, the managed layers and the environment is the runtime's
+// own rule, and a host that re-implements it drifts from the server it is configuring. The
+// working directory, environment and platform are taken as arguments rather than read from
+// the server process, so a host resolving settings for a directory other than its own gets
+// that directory's answer. Nothing is written; this only computes.
+//
+// RPC method: user.settings.buildRuntime.
+//
+// Parameters: The overrides and host context to resolve effective runtime settings from.
+//
+// Returns: The effective runtime settings, keyed by setting name. Keys this runtime does
+// not recognize are preserved rather than dropped, so a caller reading a document written
+// by a newer runtime keeps every value.
+// Internal: BuildRuntime is part of the SDK's internal handshake/plumbing; external callers
+// should not use it.
+func (a *InternalServerUserSettingsAPI) BuildRuntime(ctx context.Context, params *UserSettingsBuildRuntimeRequest) (*UserSettingsBuildRuntimeResult, error) {
+	raw, err := a.client.Request(ctx, "user.settings.buildRuntime", params)
+	if err != nil {
+		return nil, err
+	}
+	var result UserSettingsBuildRuntimeResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// DiagnoseProblems diagnoses a set of already-loaded settings layers, reporting each key
+// that will not take effect and why. Settings load tolerantly so that one bad key does not
+// stop a session from starting; this method surfaces what was dropped so a caller can
+// report it instead of silently ignoring the user's intent. Takes the layers as given
+// rather than reading them, so a caller can diagnose exactly the content it is showing,
+// including unsaved edits. Never echoes a setting's value, because a value may be a token
+// or another secret. Marked internal because it exists to carry a CLI call site off the
+// native addon, not to serve a consumer-facing need; it becomes public once an SDK consumer
+// needs to inspect settings health itself.
+//
+// RPC method: user.settings.diagnoseProblems.
+//
+// Parameters: The settings layers to diagnose.
+//
+// Returns: The settings that will not take effect across the given layers.
+// Internal: DiagnoseProblems is part of the SDK's internal handshake/plumbing; external
+// callers should not use it.
+func (a *InternalServerUserSettingsAPI) DiagnoseProblems(ctx context.Context, params *UserSettingsProblemsRequest) (*UserSettingsProblemsResult, error) {
+	raw, err := a.client.Request(ctx, "user.settings.diagnoseProblems", params)
+	if err != nil {
+		return nil, err
+	}
+	var result UserSettingsProblemsResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// Edit atomically edits one canonical user setting inside its settings-file lock. Reads,
+// canonicalizes touched aliases, applies the edit, validates the resulting top-level
+// setting and writes before releasing the lock. An explicit autoUpdatesChannel set
+// completes the staff migration in the same transaction. Only a malformed existing file
+// returns `invalid`; refused keys, invalid values and I/O errors reject the call.
 //
-// RPC method: skills.installations.recover.
+// RPC method: user.settings.edit.
 //
-// Parameters: Inventory request under an explicitly selected existing session.
+// Parameters: One atomic edit of a canonical setting in settings.json.
 //
-// Returns: Skill installation management result with the honoured contract, or a typed
-// refusal.
-func (a *ServerSkillsInstallationsAPI) Recover(ctx context.Context, params *SkillInstallationsRequest) (SkillInstallationManagementResult, error) {
-	raw, err := a.client.Request(ctx, "skills.installations.recover", params)
+// Returns: Outcome of an atomic user or repository settings edit.
+// Internal: Edit is part of the SDK's internal handshake/plumbing; external callers should
+// not use it.
+func (a *InternalServerUserSettingsAPI) Edit(ctx context.Context, params *UserSettingsEditRequest) (*SettingsEditResult, error) {
+	req := map[string]any{}
+	if params != nil {
+		req["canonicalPath"] = params.CanonicalPath
+		if params.ConfigDir != nil {
+			req["configDir"] = *params.ConfigDir
+		}
+		req["operation"] = params.Operation
+		if params.Value != nil {
+			req["value"] = params.Value
+		}
+		if params.Operation != SettingsEditOperationRemove {
+			if _, ok := req["value"]; !ok {
+				req["value"] = nil
+			}
+		}
+	}
+	raw, err := a.client.Request(ctx, "user.settings.edit", req)
 	if err != nil {
 		return nil, err
 	}
-	result, err := unmarshalSkillInstallationManagementResult(raw)
-	if err != nil {
+	var result SettingsEditResult
+	if err := json.Unmarshal(raw, &result); err != nil {
 		return nil, err
 	}
-	return result, nil
+	return &result, nil
 }
 
-// SetEnabled atomically persists enablement for one owned Agent Finder Skill and reconciles
-// the selected bound session. Enablement is installation-scoped by receipt identity and is
-// never gated by the Skill-install feature flag.
-//
-// RPC method: skills.installations.setEnabled.
+// GetPath reports the on-disk path of the settings document `user.settings.load` and
+// `user.settings.set` read and write. Resolved the same way those methods resolve it, so a
+// host that shows or opens the settings file names the file the runtime actually uses,
+// including the extensionless legacy `settings` file when that is what is present.
 //
-// Parameters: Persisted enablement update for one owned Skill installation.
+// RPC method: user.settings.getPath.
 //
-// Returns: Skill installation management result with the honoured contract, or a typed
-// refusal.
-func (a *ServerSkillsInstallationsAPI) SetEnabled(ctx context.Context, params *SkillSetEnabledRequest) (SkillInstallationManagementResult, error) {
-	raw, err := a.client.Request(ctx, "skills.installations.setEnabled", params)
+// Returns: The on-disk location of the user's settings document.
+// Internal: GetPath is part of the SDK's internal handshake/plumbing; external callers
+// should not use it.
+func (a *InternalServerUserSettingsAPI) GetPath(ctx context.Context) (*UserSettingsPathResult, error) {
+	raw, err := a.client.Request(ctx, "user.settings.getPath", nil)
 	if err != nil {
 		return nil, err
 	}
-	result, err := unmarshalSkillInstallationManagementResult(raw)
-	if err != nil {
+	var result UserSettingsPathResult
+	if err := json.Unmarshal(raw, &result); err != nil {
 		return nil, err
 	}
-	return result, nil
+	return &result, nil
 }
 
-// Status inspects a known Skill installation operation on its original runtime connection.
-// Status is never gated by the Skill-install feature flag.
+// GetPaths resolves the on-disk locations of the settings files this runtime reads, so a
+// consumer can show or open them. The user path is the same file `user.settings.get`,
+// `user.settings.load`, and `user.settings.set` operate on. Supply `repoRoot` to also
+// resolve that repository's checked-in and local settings paths. A path is reported whether
+// or not the file exists.
 //
-// RPC method: skills.installations.status.
+// RPC method: user.settings.getPaths.
 //
-// Parameters: Existing-operation control. A new session selector is deliberately not
-// accepted.
+// Parameters: Selects which settings file paths to resolve.
 //
-// Returns: Skill installation management result with the honoured contract, or a typed
-// refusal.
-func (a *ServerSkillsInstallationsAPI) Status(ctx context.Context, params *SkillInstallationOperationRequest) (SkillInstallationManagementResult, error) {
-	raw, err := a.client.Request(ctx, "skills.installations.status", params)
+// Returns: On-disk locations of the settings files this runtime reads. A path is reported
+// whether or not the file exists.
+// Internal: GetPaths is part of the SDK's internal handshake/plumbing; external callers
+// should not use it.
+func (a *InternalServerUserSettingsAPI) GetPaths(ctx context.Context, params *UserSettingsGetPathsRequest) (*UserSettingsGetPathsResult, error) {
+	raw, err := a.client.Request(ctx, "user.settings.getPaths", params)
 	if err != nil {
 		return nil, err
 	}
-	result, err := unmarshalSkillInstallationManagementResult(raw)
-	if err != nil {
+	var result UserSettingsGetPathsResult
+	if err := json.Unmarshal(raw, &result); err != nil {
 		return nil, err
 	}
-	return result, nil
-}
-
-// Experimental: Installations returns experimental APIs that may change or be removed.
-func (s *ServerSkillsAPI) Installations() *ServerSkillsInstallationsAPI {
-	return (*ServerSkillsInstallationsAPI)(s)
+	return &result, nil
 }
 
-// Experimental: ServerToolsAPI contains experimental APIs that may change or be removed.
-type ServerToolsAPI serverAPI
-
-// Lists built-in tools available for a model.
+// GetUnknownKeysWarning reports the top-level keys in the user settings document that the
+// runtime does not recognize, phrased for display to the user. This is a separate question
+// from the warning `user.settings.loadWithWarning` returns: that one describes parts of the
+// document the loader had to ignore to load the rest, whereas an unknown key parses cleanly
+// and is simply not a setting, so a host that surfaces only the load warning silently
+// accepts a misspelled key that will never take effect. Nothing is reported when the
+// document is absent, unreadable, or failed to load, because an unknown-key list derived
+// from a document the runtime could not read would be misleading rather than helpful.
+// Inspection never modifies the document.
 //
-// RPC method: tools.list.
+// RPC method: user.settings.getUnknownKeysWarning.
 //
-// Parameters: Optional model identifier whose tool overrides should be applied to the
-// listing.
+// Parameters: Selects the configuration directory whose user settings document should be
+// inspected for unrecognized top-level keys.
 //
-// Returns: Built-in tools available for the requested model, with their parameters and
-// instructions.
-func (a *ServerToolsAPI) List(ctx context.Context, params *ToolsListRequest) (*ToolList, error) {
-	raw, err := a.client.Request(ctx, "tools.list", params)
+// Returns: The unrecognized top-level keys found in the user settings document, already
+// phrased for display.
+// Internal: GetUnknownKeysWarning is part of the SDK's internal handshake/plumbing;
+// external callers should not use it.
+func (a *InternalServerUserSettingsAPI) GetUnknownKeysWarning(ctx context.Context, params *UserSettingsUnknownKeysWarningRequest) (*UserSettingsUnknownKeysWarningResult, error) {
+	raw, err := a.client.Request(ctx, "user.settings.getUnknownKeysWarning", params)
 	if err != nil {
 		return nil, err
 	}
-	var result ToolList
+	var result UserSettingsUnknownKeysWarningResult
 	if err := json.Unmarshal(raw, &result); err != nil {
 		return nil, err
 	}
 	return &result, nil
 }
 
-// Experimental: ServerUserAPI contains experimental APIs that may change or be removed.
-type ServerUserAPI serverAPI
-
-// Experimental: ServerUserSettingsAPI contains experimental APIs that may change or be
-// removed.
-type ServerUserSettingsAPI serverAPI
-
-// Get lists every known user setting (settings.json overlaid with the legacy config.json,
-// config.json wins), each with its effective value, its default, and whether it is at the
-// default — so settings the user has never set still appear with their default value. Does
-// not include repository- or enterprise-managed overrides that the runtime layers on top at
-// session time.
+// ListGovernanceKeys lists the top-level user-setting keys by who is allowed to govern
+// them: `repo` keys a repository may override through `.github/copilot/settings.json`,
+// `claudeRepo` keys a repository may override through a Claude-compatible config, and
+// `managed` keys an enterprise policy may fix. The lists are static for a given runtime
+// build and fail closed: a key absent from a list cannot be governed that way.
 //
-// RPC method: user.settings.get.
+// RPC method: user.settings.listGovernanceKeys.
 //
-// Returns: 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.
-func (a *ServerUserSettingsAPI) Get(ctx context.Context) (*UserSettingsGetResult, error) {
-	raw, err := a.client.Request(ctx, "user.settings.get", nil)
+// Returns: Top-level user-setting keys grouped by who may govern them.
+// Internal: ListGovernanceKeys is part of the SDK's internal handshake/plumbing; external
+// callers should not use it.
+func (a *InternalServerUserSettingsAPI) ListGovernanceKeys(ctx context.Context) (*UserSettingsGovernanceKeysResult, error) {
+	raw, err := a.client.Request(ctx, "user.settings.listGovernanceKeys", nil)
 	if err != nil {
 		return nil, err
 	}
-	var result UserSettingsGetResult
+	var result UserSettingsGovernanceKeysResult
 	if err := json.Unmarshal(raw, &result); err != nil {
 		return nil, err
 	}
 	return &result, nil
 }
 
-// Reload drops this runtime process's in-memory user settings cache so the next settings
-// read observes disk.
+// LoadAndMergeRepo reads a repository's settings and merges them over a supplied user layer
+// in one step, returning the settings a consumer should act on inside that repository. Use
+// this rather than reading the two layers separately: the merge is per setting and
+// collection-aware, so a repository adds to the collections it is allowed to influence
+// without replacing the user's own entries, and a whole-document overlay would get that
+// wrong. Any diagnostic raised while reading the repository layer is returned rather than
+// printed, so the consumer decides how to surface it; the settings that did load are merged
+// regardless.
+//
+// RPC method: user.settings.loadAndMergeRepo.
 //
-// RPC method: user.settings.reload.
-func (a *ServerUserSettingsAPI) Reload(ctx context.Context) (*UserSettingsReloadResult, error) {
-	raw, err := a.client.Request(ctx, "user.settings.reload", nil)
+// Parameters: A repository to read settings from, and the user layer they are merged over.
+//
+// Returns: The settings a consumer should act on inside a repository, together with any
+// diagnostic raised while reading the repository layer.
+// Internal: LoadAndMergeRepo is part of the SDK's internal handshake/plumbing; external
+// callers should not use it.
+func (a *InternalServerUserSettingsAPI) LoadAndMergeRepo(ctx context.Context, params *UserSettingsLoadAndMergeRepoRequest) (*UserSettingsLoadAndMergeRepoResult, error) {
+	raw, err := a.client.Request(ctx, "user.settings.loadAndMergeRepo", params)
 	if err != nil {
 		return nil, err
 	}
-	var result UserSettingsReloadResult
+	var result UserSettingsLoadAndMergeRepoResult
 	if err := json.Unmarshal(raw, &result); err != nil {
 		return nil, err
 	}
 	return &result, nil
 }
 
-// Set writes one or more user settings to settings.json, replacing each provided top-level
-// key. A key whose value is null is removed. Returns the keys whose new value is shadowed
-// by a legacy config.json entry (config.json wins on read), which the runtime leaves in
-// place — such writes do not take effect until the legacy value is removed.
+// LoadForConfigDir reads the user's settings document exactly as `user.settings.load` does,
+// but from a caller-supplied configuration directory instead of the one the server resolved
+// for itself. Use this when a consumer scopes a session to its own Copilot home — the SDK's
+// per-session `configDir` override — so the settings read match the directory that session
+// actually uses. An absent or empty `configDir` resolves the server's own home, making this
+// identical to `user.settings.load`. Hook-validation relaxations are deliberately not
+// caller-supplied: they continue to come from the server's environment, so a consumer
+// cannot widen the host's hook policy through this method.
 //
-// RPC method: user.settings.set.
+// RPC method: user.settings.loadForConfigDir.
 //
-// Parameters: 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.
+// Parameters: Selects the configuration directory whose user settings to read.
 //
-// Returns: Outcome of writing user settings.
-func (a *ServerUserSettingsAPI) Set(ctx context.Context, params *UserSettingsSetRequest) (*UserSettingsSetResult, error) {
-	raw, err := a.client.Request(ctx, "user.settings.set", params)
+// Returns: The stored user settings document, keyed by setting name.
+// Internal: LoadForConfigDir is part of the SDK's internal handshake/plumbing; external
+// callers should not use it.
+func (a *InternalServerUserSettingsAPI) LoadForConfigDir(ctx context.Context, params *UserSettingsLoadForConfigDirRequest) (*UserSettingsLoadForConfigDirResult, error) {
+	raw, err := a.client.Request(ctx, "user.settings.loadForConfigDir", params)
 	if err != nil {
 		return nil, err
 	}
-	var result UserSettingsSetResult
+	var result UserSettingsLoadForConfigDirResult
 	if err := json.Unmarshal(raw, &result); err != nil {
 		return nil, err
 	}
 	return &result, nil
 }
 
-// Experimental: Settings returns experimental APIs that may change or be removed.
-func (s *ServerUserAPI) Settings() *ServerUserSettingsAPI {
-	return (*ServerUserSettingsAPI)(s)
-}
-
-// ServerRPC provides typed server-scoped RPC methods.
-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
-	Catalog         *ServerCatalogAPI
-	Commands        *ServerCommandsAPI
-	Environments    *ServerEnvironmentsAPI
-	Extensions      *ServerExtensionsAPI
-	Hooks           *ServerHooksAPI
-	Host            *ServerHostAPI
-	Instructions    *ServerInstructionsAPI
-	LlmInference    *ServerLlmInferenceAPI
-	ManagedSettings *ServerManagedSettingsAPI
-	MCP             *ServerMCPAPI
-	Models          *ServerModelsAPI
-	Plugins         *ServerPluginsAPI
-	Runtime         *ServerRuntimeAPI
-	Sandbox         *ServerSandboxAPI
-	Secrets         *ServerSecretsAPI
-	SessionFS       *ServerSessionFSAPI
-	Sessions        *ServerSessionsAPI
-	Skills          *ServerSkillsAPI
-	Tools           *ServerToolsAPI
-	User            *ServerUserAPI
-}
-
-// Ping checks server responsiveness and returns protocol information.
+// LoadForEdit reads settings.json as stored for a caller that is about to edit it. Unlike
+// `user.settings.get`, this returns file values rather than per-key metadata and defaults.
+// Reports `missing` for an absent file and `invalid` when the existing file will not parse.
+// Retired config.json and extensionless files are not read.
 //
-// RPC method: ping.
-//
-// Parameters: Optional message to echo back to the caller.
+// RPC method: user.settings.loadForEdit.
 //
-// Returns: Server liveness response, including the echoed message, current server
-// timestamp, and protocol version.
-// Experimental: Ping is an experimental API and may change or be removed in future versions.
-func (a *ServerRPC) Ping(ctx context.Context, params *PingRequest) (*PingResult, error) {
-	raw, err := a.common.client.Request(ctx, "ping", params)
+// Returns: Contents of settings.json as stored, for a caller about to rewrite it.
+// Internal: LoadForEdit is part of the SDK's internal handshake/plumbing; external callers
+// should not use it.
+func (a *InternalServerUserSettingsAPI) LoadForEdit(ctx context.Context) (*UserSettingsLoadForEditResult, error) {
+	raw, err := a.client.Request(ctx, "user.settings.loadForEdit", nil)
 	if err != nil {
 		return nil, err
 	}
-	var result PingResult
+	var result UserSettingsLoadForEditResult
 	if err := json.Unmarshal(raw, &result); err != nil {
 		return nil, err
 	}
 	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
-// uses its built-in extension launcher.
+// LoadRepo reads a repository's checked-in settings document as stored, normalized,
+// together with any diagnostic raised while reading it. This is the repository half of the
+// layering `user.settings.get` reports: `user.settings.load` reads the user's own document,
+// and this reads the one a repository checks in to govern the keys
+// `user.settings.governanceKeys` lists as repo-governable. A document that fails to parse,
+// or that sets a key a repository may not govern, is reported through `warning` while the
+// settings that did load are still returned, so a consumer surfaces the diagnostic and
+// continues rather than failing the session. When `repoRoot` is the user's home directory
+// the Claude-compatible configuration is skipped, so a home-directory session does not
+// inherit a personal config as repository policy.
 //
-// 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)
+// RPC method: user.settings.loadRepo.
+//
+// Parameters: Selects the repository whose checked-in settings to read.
+//
+// Returns: A repository's settings as stored, together with any diagnostic raised while
+// reading them.
+// Internal: LoadRepo is part of the SDK's internal handshake/plumbing; external callers
+// should not use it.
+func (a *InternalServerUserSettingsAPI) LoadRepo(ctx context.Context, params *UserSettingsLoadRepoRequest) (*UserSettingsLoadRepoResult, error) {
+	raw, err := a.client.Request(ctx, "user.settings.loadRepo", params)
 	if err != nil {
 		return nil, err
 	}
-	var result RegisterExtensionLaunchProviderResult
+	var result UserSettingsLoadRepoResult
 	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.Environments = (*ServerEnvironmentsAPI)(&r.common)
-	r.Extensions = (*ServerExtensionsAPI)(&r.common)
-	r.Hooks = (*ServerHooksAPI)(&r.common)
-	r.Host = (*ServerHostAPI)(&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)
-	r.Runtime = (*ServerRuntimeAPI)(&r.common)
-	r.Sandbox = (*ServerSandboxAPI)(&r.common)
-	r.Secrets = (*ServerSecretsAPI)(&r.common)
-	r.SessionFS = (*ServerSessionFSAPI)(&r.common)
-	r.Sessions = (*ServerSessionsAPI)(&r.common)
-	r.Skills = (*ServerSkillsAPI)(&r.common)
-	r.Tools = (*ServerToolsAPI)(&r.common)
-	r.User = (*ServerUserAPI)(&r.common)
-	return r
-}
-
-type internalServerAPI struct {
-	client *jsonrpc2.Client
-}
-
-// Experimental: InternalServerHostAPI contains experimental APIs that may change or be
-// removed.
-type InternalServerHostAPI internalServerAPI
-
-// CreateSession requests app-owned materialization over the owning SDK participant.
+// LoadWithWarning reads the user's stored settings together with the diagnostic raised
+// while reading them. This is `user.settings.load` plus the reason part of the document was
+// ignored: that one answers the document alone, so a caller cannot tell a clean read from a
+// salvaged one. Read this when the caller is about to write the file back, where accepting
+// a partial parse would discard every value the loader could not read. The settings that
+// did load are still reported alongside the warning, so a consumer may surface it and
+// continue instead of failing.
 //
-// RPC method: host.createSession.
-//
-// Parameters: One application-owned session handoff, requested by the supervised hosting
-// participant.
+// RPC method: user.settings.loadWithWarning.
 //
-// Returns: The resident session the application has materialized on its own connection.
-// Internal: CreateSession is part of the SDK's internal handshake/plumbing; external
+// Returns: The user's stored settings, together with any diagnostic raised while reading
+// them.
+// Internal: LoadWithWarning is part of the SDK's internal handshake/plumbing; external
 // callers should not use it.
-func (a *InternalServerHostAPI) CreateSession(ctx context.Context, params *HostSessionCreateRequest) (*HostCreateSessionResult, error) {
-	raw, err := a.client.Request(ctx, "host.createSession", params)
+func (a *InternalServerUserSettingsAPI) LoadWithWarning(ctx context.Context) (*UserSettingsLoadWithWarningResult, error) {
+	raw, err := a.client.Request(ctx, "user.settings.loadWithWarning", nil)
 	if err != nil {
 		return nil, err
 	}
-	var result HostCreateSessionResult
+	var result UserSettingsLoadWithWarningResult
 	if err := json.Unmarshal(raw, &result); err != nil {
 		return nil, err
 	}
 	return &result, nil
 }
 
-// GetConfiguration returns listener settings only to the supervised hosting participant
-// over its SDK connection.
+// MergeManagedAndUser folds a user settings layer over a managed (enterprise policy) layer
+// and returns the merged settings. The managed layer's governance keys win, `autoTier`
+// resolves through its overridable form, and the two per-entry control maps
+// (`enabledPlugins`, `extraKnownMarketplaces`) union across the layers and are then stamped
+// back from the managed layer, so each entry an administrator declares wins while the user
+// keeps control of the rest. The parameters are named for their layers rather than being a
+// generic base/override pair: nothing about a settings object identifies which layer
+// produced it, so the runtime cannot detect a transposed call, and transposing one resolves
+// the governance keys in the user's favour instead of the administrator's. Supplying only
+// one layer returns it unchanged, and supplying neither returns an empty object. Rejects a
+// managed `autoTier` that is neither a user-configurable tier nor a single-key overridable
+// form, rather than silently dropping it.
 //
-// RPC method: host.getConfiguration.
+// RPC method: user.settings.mergeManagedAndUser.
 //
-// Returns: Normalized listener settings delivered only to the supervised hosting
-// participant.
-// Internal: GetConfiguration is part of the SDK's internal handshake/plumbing; external
+// Parameters: The managed (enterprise policy) layer and the user layer to fold together.
+// The field names carry the layer identity: nothing about a settings object identifies
+// which layer produced it, so a generic base/override pair would let a caller transpose
+// them and silently resolve the governance keys in the user's favour.
+//
+// Returns: The user layer folded over the managed layer.
+// Internal: MergeManagedAndUser is part of the SDK's internal handshake/plumbing; external
 // callers should not use it.
-func (a *InternalServerHostAPI) GetConfiguration(ctx context.Context) (*HostGetConfigurationResult, error) {
-	raw, err := a.client.Request(ctx, "host.getConfiguration", nil)
+func (a *InternalServerUserSettingsAPI) MergeManagedAndUser(ctx context.Context, params *UserSettingsMergeManagedAndUserParams) (*UserSettingsMergeManagedAndUserResult, error) {
+	raw, err := a.client.Request(ctx, "user.settings.mergeManagedAndUser", params)
 	if err != nil {
 		return nil, err
 	}
-	var result HostGetConfigurationResult
+	var result UserSettingsMergeManagedAndUserResult
 	if err := json.Unmarshal(raw, &result); err != nil {
 		return nil, err
 	}
 	return &result, nil
 }
 
-// GetEnvironmentCredentials resolves current authenticated credentials and remote-control
-// policy only for the runtime-owned Mission Control hosting participant.
+// MergeRepoValue folds a repository's settings layer into the user layer. Each
+// repo-overridable key carries a directional policy chosen so a repository can only add
+// restrictions and never relax the user's own. The two per-entry managed control maps are
+// the exception those directional rules cannot express — a repository may legitimately
+// enable plugins and declare marketplaces — so they are re-stamped afterwards from the
+// runtime's ambient managed policy. That makes the result depend on the runtime process's
+// managed state and not on the arguments alone: a host must call this rather than
+// reimplement the fold, or a repository could relax a restriction the administrator
+// imposed. Rejects when either layer is not a JSON object.
 //
-// RPC method: host.getEnvironmentCredentials.
+// RPC method: user.settings.mergeRepoValue.
 //
-// Returns: Private credentials delivered only to a runtime-owned Mission Control hosting
-// participant.
-// Internal: GetEnvironmentCredentials is part of the SDK's internal handshake/plumbing;
-// external callers should not use it.
-func (a *InternalServerHostAPI) GetEnvironmentCredentials(ctx context.Context) (*HostGetEnvironmentCredentialsResult, error) {
-	raw, err := a.client.Request(ctx, "host.getEnvironmentCredentials", nil)
+// Parameters: The user layer and the repository layer to fold together.
+//
+// Returns: The repository layer folded into the user layer.
+// Internal: MergeRepoValue is part of the SDK's internal handshake/plumbing; external
+// callers should not use it.
+func (a *InternalServerUserSettingsAPI) MergeRepoValue(ctx context.Context, params *UserSettingsMergeRepoValueParams) (*UserSettingsMergeRepoValueResult, error) {
+	raw, err := a.client.Request(ctx, "user.settings.mergeRepoValue", params)
 	if err != nil {
 		return nil, err
 	}
-	var result HostGetEnvironmentCredentialsResult
+	var result UserSettingsMergeRepoValueResult
 	if err := json.Unmarshal(raw, &result); err != nil {
 		return nil, err
 	}
 	return &result, nil
 }
 
-// Ready reports a supervised hosting participant's bound AHP endpoint after its SDK
-// handshake.
+// MigrateObsoleteOnDisk runs the one-time cleanup that removes obsolete CLI-owned settings
+// and legacy rubber-duck keys from the user's settings document, and reports what it did.
+// Idempotent and safe to call on every startup: with nothing obsolete left it reports
+// `unchanged` and writes nothing. The cleanup preserves every key it does not recognize, so
+// a setting written by a newer host is never dropped by an older one, and a document that
+// fails to parse is reported `invalid` and left untouched rather than rewritten from a
+// partial read. The cleaned document is not returned: it is written before this replies, so
+// `user.settings.load` reads it authoritatively. A host that surfaces unrecognized keys
+// through `user.settings.unknownKeys` wants this first, because the keys this retires would
+// otherwise be shown to the user as if they were misspelled settings.
 //
-// RPC method: host.ready.
+// RPC method: user.settings.migrateObsoleteOnDisk.
 //
-// Parameters: Readiness reported by the supervised hosting participant on its own SDK
-// connection.
+// Parameters: Selects the configuration directory whose settings document to clean.
 //
-// Returns: Empty acknowledgement for a completed host lifecycle operation.
-// Internal: Ready is part of the SDK's internal handshake/plumbing; external callers should
-// not use it.
-func (a *InternalServerHostAPI) Ready(ctx context.Context, params *HostReadyRequest) (*HostReadyResult, error) {
-	raw, err := a.client.Request(ctx, "host.ready", params)
+// Returns: The outcome of the one-time obsolete-settings cleanup.
+// Internal: MigrateObsoleteOnDisk is part of the SDK's internal handshake/plumbing;
+// external callers should not use it.
+func (a *InternalServerUserSettingsAPI) MigrateObsoleteOnDisk(ctx context.Context, params *UserSettingsMigrateObsoleteOnDiskRequest) (*UserSettingsMigrateObsoleteOnDiskResult, error) {
+	raw, err := a.client.Request(ctx, "user.settings.migrateObsoleteOnDisk", params)
 	if err != nil {
 		return nil, err
 	}
-	var result HostReadyResult
+	var result UserSettingsMigrateObsoleteOnDiskResult
 	if err := json.Unmarshal(raw, &result); err != nil {
 		return nil, err
 	}
 	return &result, nil
 }
 
-// ReleaseSession releases app ownership retention after AHP detaches.
+// MigrateStaffLogLevelOnce runs the one-time migration that moves a staff account's log
+// level to the current default, and records that it ran. Idempotent and self-gating: it
+// takes a lock over the global-state file and re-reads the completion stamp inside it, so
+// two hosts racing at startup cannot both migrate. Only `refreshed` can have changed the
+// persisted settings, and the settings it returns are the document re-read after the write,
+// so a host should adopt them rather than reloading separately and racing the next writer.
 //
-// RPC method: host.releaseSession.
+// RPC method: user.settings.migrateStaffLogLevelOnce.
 //
-// Parameters: Ends one participation, not the application's session lifetime.
+// Parameters: Selects the configuration directory to run the one-time staff log-level
+// migration against, and supplies the caller's record of whether it has already run.
 //
-// Returns: Empty acknowledgement for a completed host lifecycle operation.
-// Internal: ReleaseSession is part of the SDK's internal handshake/plumbing; external
-// callers should not use it.
-func (a *InternalServerHostAPI) ReleaseSession(ctx context.Context, params *HostSessionReleaseRequest) (*HostReleaseSessionResult, error) {
-	raw, err := a.client.Request(ctx, "host.releaseSession", params)
+// Returns: The outcome of the one-time staff log-level migration.
+// Internal: MigrateStaffLogLevelOnce is part of the SDK's internal handshake/plumbing;
+// external callers should not use it.
+func (a *InternalServerUserSettingsAPI) MigrateStaffLogLevelOnce(ctx context.Context, params *UserSettingsMigrateStaffLogLevelOnceRequest) (*UserSettingsMigrateStaffLogLevelOnceResult, error) {
+	raw, err := a.client.Request(ctx, "user.settings.migrateStaffLogLevelOnce", params)
 	if err != nil {
 		return nil, err
 	}
-	var result HostReleaseSessionResult
+	var result UserSettingsMigrateStaffLogLevelOnceResult
 	if err := json.Unmarshal(raw, &result); err != nil {
 		return nil, err
 	}
 	return &result, nil
 }
 
-// Experimental: InternalServerSessionsAPI contains experimental APIs that may change or be
-// removed.
-type InternalServerSessionsAPI internalServerAPI
-
-// ConfigureSessionExtensions attaches (or detaches) an in-process ExtensionController
-// delegate for the given session in a local host adapter. Pass `controller: undefined` to
-// detach. Internal because the controller cannot cross the JSON-RPC boundary; the runtime
-// manages its own session extension service.
+// MigrateStaffUpdateChannelOnce runs the one-time migration that moves a staff account's
+// update channel to stable, and records that it ran. Idempotent and self-gating: it takes a
+// lock over the global-state file, re-reads the completion stamp inside it, and returns
+// `current` rather than migrating twice, so two hosts racing at startup cannot both
+// migrate. Only a `migrated` status means the persisted settings changed and the caller
+// should reload them. An account on the experimental channel is deliberately left alone and
+// reported as `excluded-experimental`.
 //
-// RPC method: sessions.configureSessionExtensions.
+// RPC method: user.settings.migrateStaffUpdateChannelOnce.
 //
-// Parameters: Params to attach or detach an in-process ExtensionController delegate.
-// Internal: ConfigureSessionExtensions is part of the SDK's internal handshake/plumbing;
+// Parameters: The filesystem and environment facts a user-settings file is resolved from.
+// Passed explicitly rather than read from the runtime's own process, so a host whose
+// configuration directory differs from its process environment resolves the file it means.
+//
+// Returns: The outcome of the one-time staff update-channel migration.
+// Internal: MigrateStaffUpdateChannelOnce is part of the SDK's internal handshake/plumbing;
 // external callers should not use it.
-func (a *InternalServerSessionsAPI) ConfigureSessionExtensions(ctx context.Context, params *ConfigureSessionExtensionsParams) (*SessionsConfigureSessionExtensionsResult, error) {
-	raw, err := a.client.Request(ctx, "sessions.configureSessionExtensions", params)
+func (a *InternalServerUserSettingsAPI) MigrateStaffUpdateChannelOnce(ctx context.Context, params *UserSettingsHostContext) (*UserSettingsMigrateStaffUpdateChannelOnceResult, error) {
+	raw, err := a.client.Request(ctx, "user.settings.migrateStaffUpdateChannelOnce", params)
 	if err != nil {
 		return nil, err
 	}
-	var result SessionsConfigureSessionExtensionsResult
+	var result UserSettingsMigrateStaffUpdateChannelOnceResult
 	if err := json.Unmarshal(raw, &result); err != nil {
 		return nil, err
 	}
 	return &result, nil
 }
 
-// Deletes one local session from disk after running the same lifecycle hooks as the session
-// manager.
+// Normalize rewrites legacy and snake_case setting names in a settings object to their
+// canonical spelling. A caller editing settings.json must normalize before writing: a
+// legacy key left in place survives the write, is re-normalized on the next load, and
+// silently shadows the canonical value the write just stored.
 //
-// RPC method: sessions.delete.
+// RPC method: user.settings.normalize.
 //
-// Parameters: Session ID to delete from disk.
-// Internal: Delete is part of the SDK's internal handshake/plumbing; external callers
+// Parameters: Settings object whose key names should be canonicalized.
+//
+// Returns: Settings object with canonical key names.
+// Internal: Normalize is part of the SDK's internal handshake/plumbing; external callers
 // should not use it.
-func (a *InternalServerSessionsAPI) Delete(ctx context.Context, params *SessionsDeleteRequest) (*SessionsDeleteResult, error) {
-	raw, err := a.client.Request(ctx, "sessions.delete", params)
+func (a *InternalServerUserSettingsAPI) Normalize(ctx context.Context, params *UserSettingsNormalizeRequest) (*UserSettingsNormalizeResult, error) {
+	raw, err := a.client.Request(ctx, "user.settings.normalize", params)
 	if err != nil {
 		return nil, err
 	}
-	var result SessionsDeleteResult
+	var result UserSettingsNormalizeResult
 	if err := json.Unmarshal(raw, &result); err != nil {
 		return nil, err
 	}
 	return &result, nil
 }
 
-// GetBoardEntryCount gets the dynamic-context board entry count associated with a session,
-// when available. Internal: this exists solely so CLI telemetry events (`rem_spawn_gate`,
-// `rem_consolidation_complete`) can pair START / END board counts around the detached
-// rem-agent spawn. "Dynamic context board" is a runtime-internal concept that is not part
-// of the public SDK contract; the long-term plan is to relocate the telemetry emission into
-// the runtime so this method can be deleted entirely.
+// ResetStaffModelSelectionOnce runs the one-time reset that clears a staff account's pinned
+// model selection, and reports the timestamp the host should record. Idempotent and
+// self-gating: the reset is gated on a fixed cutoff, so a caller that passes back the
+// timestamp it recorded gets `didReset: false` rather than a second reset. It applies to
+// staff accounts only; any other account is reported as not reset without the settings
+// document being opened. Only `didReset: true` means the persisted settings changed, and
+// only then are the updated settings returned for the host to adopt.
 //
-// RPC method: sessions.getBoardEntryCount.
+// RPC method: user.settings.resetStaffModelSelectionOnce.
 //
-// Parameters: Session ID whose board entry count should be returned.
+// Parameters: Selects the configuration directory to run the one-time staff model-selection
+// reset against, and supplies the caller's record of whether it has already run.
 //
-// Returns: Dynamic-context board entry count, when available.
-// Internal: GetBoardEntryCount is part of the SDK's internal handshake/plumbing; external
-// callers should not use it.
-func (a *InternalServerSessionsAPI) GetBoardEntryCount(ctx context.Context, params *SessionsGetBoardEntryCountRequest) (*SessionsGetBoardEntryCountResult, error) {
-	raw, err := a.client.Request(ctx, "sessions.getBoardEntryCount", params)
+// Returns: The outcome of the one-time staff model-selection reset.
+// Internal: ResetStaffModelSelectionOnce is part of the SDK's internal handshake/plumbing;
+// external callers should not use it.
+func (a *InternalServerUserSettingsAPI) ResetStaffModelSelectionOnce(ctx context.Context, params *UserSettingsResetStaffModelSelectionOnceRequest) (*UserSettingsResetStaffModelSelectionOnceResult, error) {
+	raw, err := a.client.Request(ctx, "user.settings.resetStaffModelSelectionOnce", params)
 	if err != nil {
 		return nil, err
 	}
-	var result SessionsGetBoardEntryCountResult
+	var result UserSettingsResetStaffModelSelectionOnceResult
 	if err := json.Unmarshal(raw, &result); err != nil {
 		return nil, err
 	}
 	return &result, nil
 }
 
-// GetEventFilePath computes the absolute path to a session's persisted events.jsonl file.
-// Internal: filesystem paths are only meaningful in-process (CLI and runtime share a
-// filesystem). Currently used by the CLI's contribution-graph feature to read historical
-// events directly. Remote SDK consumers must not depend on this; a proper event-query API
-// would replace it if the contribution graph ever needed to work over the wire.
+// SetHookDisabled adds or removes one hook key in the user `disabledHooks` setting,
+// rewriting settings.json in place and leaving every other setting untouched. Reports a
+// typed outcome rather than failing the call, so a host can tell an unparseable settings
+// file apart from a write that could not complete.
 //
-// RPC method: sessions.getEventFilePath.
+// RPC method: user.settings.setHookDisabled.
 //
-// Parameters: Session ID whose event-log file path to compute.
+// Parameters: One hook to disable or re-enable.
 //
-// Returns: Absolute path to the session's events.jsonl file on disk.
-// Internal: GetEventFilePath is part of the SDK's internal handshake/plumbing; external
+// Returns: Outcome of rewriting the `disabledHooks` setting.
+// Internal: SetHookDisabled is part of the SDK's internal handshake/plumbing; external
 // callers should not use it.
-func (a *InternalServerSessionsAPI) GetEventFilePath(ctx context.Context, params *SessionsGetEventFilePathRequest) (*SessionsGetEventFilePathResult, error) {
-	raw, err := a.client.Request(ctx, "sessions.getEventFilePath", params)
+func (a *InternalServerUserSettingsAPI) SetHookDisabled(ctx context.Context, params *UserSettingsSetHookDisabledRequest) (*UserSettingsSetHookDisabledResult, error) {
+	raw, err := a.client.Request(ctx, "user.settings.setHookDisabled", params)
 	if err != nil {
 		return nil, err
 	}
-	var result SessionsGetEventFilePathResult
+	var result UserSettingsSetHookDisabledResult
 	if err := json.Unmarshal(raw, &result); err != nil {
 		return nil, err
 	}
 	return &result, nil
 }
 
-// GetMetadata reads lightweight persisted metadata for one local session without opening it.
+// Update merges a partial object into one top-level user setting, re-reading the stored
+// value inside this runtime process's settings.json write lock so that concurrent writers
+// in this process to different sub-fields of the same key do not clobber each other. Unlike
+// `user.settings.set`, which replaces a key's whole value with what the caller last read,
+// this keeps sub-fields the caller did not name when both the stored value and supplied
+// value are objects; otherwise the supplied value replaces the stored value. Use it
+// whenever two independent surfaces own different sub-fields of one setting. Returns the
+// key's stored value after the write, in `value`.
 //
-// RPC method: sessions.getMetadata.
+// RPC method: user.settings.update.
 //
-// Parameters: Session ID whose persisted metadata should be read.
+// Parameters: Names the user setting to merge into, and the partial object to merge.
 //
-// Returns: Persisted local session metadata when the session exists.
-// Internal: GetMetadata is part of the SDK's internal handshake/plumbing; external callers
+// Returns: The stored value of the user setting after the merge.
+// Internal: Update is part of the SDK's internal handshake/plumbing; external callers
 // should not use it.
-func (a *InternalServerSessionsAPI) GetMetadata(ctx context.Context, params *SessionsGetMetadataRequest) (*SessionsGetMetadataResult, error) {
-	raw, err := a.client.Request(ctx, "sessions.getMetadata", params)
+func (a *InternalServerUserSettingsAPI) Update(ctx context.Context, params *UserSettingsUpdateRequest) (*UserSettingsUpdateResult, error) {
+	raw, err := a.client.Request(ctx, "user.settings.update", params)
 	if err != nil {
 		return nil, err
 	}
-	var result SessionsGetMetadataResult
+	var result UserSettingsUpdateResult
 	if err := json.Unmarshal(raw, &result); err != nil {
 		return nil, err
 	}
 	return &result, nil
 }
 
-// GetPersistedRemoteSteerable returns a session's persisted remote-steerable flag, if any
-// has been recorded. Internal: this is CLI-specific book-keeping used by `--continue` /
-// `--resume` to inherit the prior session's remote-steerable preference. SDK consumers that
-// want similar behavior should manage their own persistence around start/stop calls rather
-// than relying on this runtime-side flag.
+// Validates one top-level setting subtree without writing it, reporting each problem with
+// the path it applies to. Scoped to a single top-level key on purpose: validating the whole
+// file would reject an edit whenever an unrelated pre-existing field is malformed, locking
+// the user out of the very tool that could fix it.
 //
-// RPC method: sessions.getPersistedRemoteSteerable.
+// RPC method: user.settings.validate.
 //
-// Parameters: Session ID to look up the persisted remote-steerable flag for.
+// Parameters: A single top-level setting subtree to validate.
 //
-// Returns: The session's persisted remote-steerable flag, or omitted when no value has been
-// persisted.
-// Internal: GetPersistedRemoteSteerable is part of the SDK's internal handshake/plumbing;
-// external callers should not use it.
-func (a *InternalServerSessionsAPI) GetPersistedRemoteSteerable(ctx context.Context, params *SessionsGetPersistedRemoteSteerableRequest) (*SessionsGetPersistedRemoteSteerableResult, error) {
-	raw, err := a.client.Request(ctx, "sessions.getPersistedRemoteSteerable", params)
+// Returns: Outcome of validating one top-level setting subtree.
+// Internal: Validate is part of the SDK's internal handshake/plumbing; external callers
+// should not use it.
+func (a *InternalServerUserSettingsAPI) Validate(ctx context.Context, params *UserSettingsValidateRequest) (*UserSettingsValidateResult, error) {
+	raw, err := a.client.Request(ctx, "user.settings.validate", params)
 	if err != nil {
 		return nil, err
 	}
-	var result SessionsGetPersistedRemoteSteerableResult
+	var result UserSettingsValidateResult
 	if err := json.Unmarshal(raw, &result); err != nil {
 		return nil, err
 	}
 	return &result, nil
 }
 
-// ListNonEmptySessionIds lists recent local session IDs that contain user-visible history,
-// omitting housekeeping-only sessions.
-//
-// RPC method: sessions.listNonEmptySessionIds.
+// WriteAll replaces the user settings file's entire content in one write. A key absent from
+// `settings` is removed, which is what distinguishes this from `user.settings.set`: that
+// one merges, so it can never clear a key the caller has dropped. For a caller saving the
+// result of a raw edit, a merge would silently resurrect every key the user deleted.
+// Records the same one-time mutation marks a per-key write records, so a setting the user
+// has now chosen explicitly stops being migrated for them.
 //
-// Parameters: Limit for non-empty local session IDs.
+// RPC method: user.settings.writeAll.
 //
-// Returns: Recent local session IDs that contain user-visible history.
-// Internal: ListNonEmptySessionIds is part of the SDK's internal handshake/plumbing;
-// external callers should not use it.
-func (a *InternalServerSessionsAPI) ListNonEmptySessionIds(ctx context.Context, params *SessionsListNonEmptySessionIDsRequest) (*SessionsListNonEmptySessionIDsResult, error) {
-	raw, err := a.client.Request(ctx, "sessions.listNonEmptySessionIds", params)
+// Parameters: The whole content to store in the user settings file.
+// Internal: WriteAll is part of the SDK's internal handshake/plumbing; external callers
+// should not use it.
+func (a *InternalServerUserSettingsAPI) WriteAll(ctx context.Context, params *UserSettingsWriteAllRequest) (*UserSettingsWriteAllResult, error) {
+	raw, err := a.client.Request(ctx, "user.settings.writeAll", params)
 	if err != nil {
 		return nil, err
 	}
-	var result SessionsListNonEmptySessionIDsResult
+	var result UserSettingsWriteAllResult
 	if err := json.Unmarshal(raw, &result); err != nil {
 		return nil, err
 	}
 	return &result, nil
 }
 
+// Experimental: Settings returns experimental APIs that may change or be removed.
+func (s *InternalServerUserAPI) Settings() *InternalServerUserSettingsAPI {
+	return (*InternalServerUserSettingsAPI)(s)
+}
+
 // InternalServerRPC provides internal SDK server-scoped RPC methods (handshake helpers
 // etc.). Not part of the public API.
 type InternalServerRPC struct {
 	// Reuse a single struct instead of allocating one for each service on the heap.
 	common internalServerAPI
 
-	Host     *InternalServerHostAPI
-	Sessions *InternalServerSessionsAPI
+	Account          *InternalServerAccountAPI
+	Agents           *InternalServerAgentsAPI
+	FeatureFlags     *InternalServerFeatureFlagsAPI
+	Git              *InternalServerGitAPI
+	GitHubOwners     *InternalServerGitHubOwnersAPI
+	GitHubRepository *InternalServerGitHubRepositoryAPI
+	GlobalState      *InternalServerGlobalStateAPI
+	Host             *InternalServerHostAPI
+	Instructions     *InternalServerInstructionsAPI
+	ManagedSettings  *InternalServerManagedSettingsAPI
+	MCP              *InternalServerMCPAPI
+	Permissions      *InternalServerPermissionsAPI
+	Persistence      *InternalServerPersistenceAPI
+	Repo             *InternalServerRepoAPI
+	Sandbox          *InternalServerSandboxAPI
+	Sessions         *InternalServerSessionsAPI
+	User             *InternalServerUserAPI
 }
 
 // Connect performs the SDK server connection handshake and validates the optional
@@ -29412,8 +36297,23 @@ func (a *InternalServerRPC) Connect(ctx context.Context, params *ConnectRequest)
 func NewInternalServerRPC(client *jsonrpc2.Client) *InternalServerRPC {
 	r := &InternalServerRPC{}
 	r.common = internalServerAPI{client: client}
+	r.Account = (*InternalServerAccountAPI)(&r.common)
+	r.Agents = (*InternalServerAgentsAPI)(&r.common)
+	r.FeatureFlags = (*InternalServerFeatureFlagsAPI)(&r.common)
+	r.Git = (*InternalServerGitAPI)(&r.common)
+	r.GitHubOwners = (*InternalServerGitHubOwnersAPI)(&r.common)
+	r.GitHubRepository = (*InternalServerGitHubRepositoryAPI)(&r.common)
+	r.GlobalState = (*InternalServerGlobalStateAPI)(&r.common)
 	r.Host = (*InternalServerHostAPI)(&r.common)
+	r.Instructions = (*InternalServerInstructionsAPI)(&r.common)
+	r.ManagedSettings = (*InternalServerManagedSettingsAPI)(&r.common)
+	r.MCP = (*InternalServerMCPAPI)(&r.common)
+	r.Permissions = (*InternalServerPermissionsAPI)(&r.common)
+	r.Persistence = (*InternalServerPersistenceAPI)(&r.common)
+	r.Repo = (*InternalServerRepoAPI)(&r.common)
+	r.Sandbox = (*InternalServerSandboxAPI)(&r.common)
 	r.Sessions = (*InternalServerSessionsAPI)(&r.common)
+	r.User = (*InternalServerUserAPI)(&r.common)
 	return r
 }
 
@@ -30615,7 +37515,9 @@ func (a *EventLogAPI) Tail(ctx context.Context) (*EventLogTailResult, error) {
 // Experimental: ExtensionsAPI contains experimental APIs that may change or be removed.
 type ExtensionsAPI sessionAPI
 
-// Disables an extension for the session.
+// Disables an extension for the session and persists the preference when the session has a
+// settings store. Hosts synchronizing effective membership should use extensions.reconcile
+// instead.
 //
 // RPC method: session.extensions.disable.
 //
@@ -30636,7 +37538,9 @@ func (a *ExtensionsAPI) Disable(ctx context.Context, params *ExtensionsDisableRe
 	return &result, nil
 }
 
-// Enables an extension for the session.
+// Enables an extension for the session and persists the preference when the session has a
+// settings store. Hosts synchronizing effective membership should use extensions.reconcile
+// instead.
 //
 // RPC method: session.extensions.enable.
 //
@@ -30675,6 +37579,38 @@ func (a *ExtensionsAPI) List(ctx context.Context) (*ExtensionList, error) {
 	return &result, nil
 }
 
+// Reconcile host-only reconciliation of authoritative session-effective extension
+// membership and enablement. Refreshes runtime-owned discovery and preferences without
+// persisting settings, installing plugins, or restarting unchanged activations. Returns
+// ExtensionList only after required starts and process/contribution cleanup settle. Takes
+// no caller inventory or overrides. Missing controllers, unready/incomplete discovery,
+// unavailable workspaces, superseded inputs, and lifecycle failures are errors, not empty
+// membership. Independently proven revocations may be applied before an error; retry
+// converges without restarting healthy activations. Error data contains
+// lifecycleChangesApplied and code: extension_reconciliation_host_required,
+// extension_reconciliation_unavailable, extension_reconciliation_not_ready,
+// extension_reconciliation_discovery_failed,
+// extension_reconciliation_workspace_unavailable, extension_reconciliation_superseded, or
+// extension_reconciliation_lifecycle_failed. Mark host reconciliation state applied only on
+// success. On older runtimes, method-not-found must not fall back to global discovery and
+// persistent extension disables.
+//
+// RPC method: session.extensions.reconcile.
+//
+// Returns: Extensions discovered for the session, with their current status.
+func (a *ExtensionsAPI) Reconcile(ctx context.Context) (*ExtensionList, error) {
+	req := map[string]any{"sessionId": a.sessionID}
+	raw, err := a.client.Request(ctx, "session.extensions.reconcile", req)
+	if err != nil {
+		return nil, err
+	}
+	var result ExtensionList
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
 // Reloads extension definitions and processes for the session.
 //
 // RPC method: session.extensions.reload.
@@ -31295,10 +38231,8 @@ func (a *MCPAPI) IsServerRunning(ctx context.Context, params *MCPIsServerRunning
 	return &result, nil
 }
 
-// Lists MCP servers configured for the session, their connection status, and host-level
-// state. The host-level state (disabled/filtered servers, failed/needs-auth/pending
-// connections, mcp3p policy, full config) is empty/zero when no MCP host has been
-// initialized for the session.
+// Lists materialized MCP servers and their connection status. Cache misses may start and
+// wait for MCP servers.
 //
 // RPC method: session.mcp.list.
 //
@@ -31317,6 +38251,27 @@ func (a *MCPAPI) List(ctx context.Context) (*MCPServerList, error) {
 	return &result, nil
 }
 
+// ListConfigured lists effective MCP configuration without starting, restarting,
+// authenticating, or waiting for servers. An optional live observation is from an already
+// materialized matching server; this is not a readiness guarantee.
+//
+// RPC method: session.mcp.listConfigured.
+//
+// Returns: Effective MCP configuration with optional live observations from matching
+// already materialized servers.
+func (a *MCPAPI) ListConfigured(ctx context.Context) (*MCPConfiguredServerList, error) {
+	req := map[string]any{"sessionId": a.sessionID}
+	raw, err := a.client.Request(ctx, "session.mcp.listConfigured", req)
+	if err != nil {
+		return nil, err
+	}
+	var result MCPConfiguredServerList
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
 // ListTools lists the tools exposed by a connected MCP server on this session's host. This
 // performs a live `tools/list` request. Tool UI metadata is returned independently of
 // whether MCP Apps rendering is enabled for the session.
@@ -32148,6 +39103,9 @@ func (a *MetadataAPI) ContextInfo(ctx context.Context, params *MetadataContextIn
 	if params != nil {
 		req["outputTokenLimit"] = params.OutputTokenLimit
 		req["promptTokenLimit"] = params.PromptTokenLimit
+		if params.ProviderID != nil {
+			req["providerId"] = *params.ProviderID
+		}
 		if params.SelectedModel != nil {
 			req["selectedModel"] = *params.SelectedModel
 		}
@@ -32475,6 +39433,9 @@ func (a *ModeAPI) Set(ctx context.Context, params *ModeSetRequest) (*ModeSetResu
 		if params.PlanModelConfigured != nil {
 			req["planModelConfigured"] = *params.PlanModelConfigured
 		}
+		if params.PlanModelProviderID != nil {
+			req["planModelProviderId"] = *params.PlanModelProviderID
+		}
 		if params.PlanReasoningEffort != nil {
 			req["planReasoningEffort"] = *params.PlanReasoningEffort
 		}
@@ -32518,6 +39479,43 @@ func (a *ModelAPI) GetCurrent(ctx context.Context) (*CurrentModel, error) {
 	return &result, nil
 }
 
+// GetReasoningSummaries computes whether the session's current model shows reasoning
+// summaries and how a host should present them: the default Ctrl+T visibility, reasoning
+// headers, the hidden-summaries hint, and whether a persisted `showReasoning` setting is
+// redundant. The runtime folds in the session's model catalog, selection and
+// reasoning-summaries experiment assignment; the host supplies only its own persisted
+// setting and current visibility. This method reads the session's resolved model catalog
+// rather than resolving it, so call `session.model.list` first on a session that has not
+// listed models or run a turn; until then the result is `ready: false`. A session that
+// resolves models without a Copilot catalog, that is a BYOK registry or an alternate
+// provider, never caches one and stays `ready: false`.
+//
+// RPC method: session.model.getReasoningSummaries.
+//
+// Parameters: Host presentation state the reasoning-summaries policy depends on.
+//
+// Returns: Reasoning-summaries presentation policy for the session's current model.
+func (a *ModelAPI) GetReasoningSummaries(ctx context.Context, params *ModelGetReasoningSummariesRequest) (*ModelGetReasoningSummariesResult, error) {
+	req := map[string]any{"sessionId": a.sessionID}
+	if params != nil {
+		if params.PersistedShowReasoning != nil {
+			req["persistedShowReasoning"] = *params.PersistedShowReasoning
+		}
+		if params.SummariesVisible != nil {
+			req["summariesVisible"] = *params.SummariesVisible
+		}
+	}
+	raw, err := a.client.Request(ctx, "session.model.getReasoningSummaries", req)
+	if err != nil {
+		return nil, err
+	}
+	var result ModelGetReasoningSummariesResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
 // Lists models available to this session using its own auth and integration context.
 // Connected hosts (CLI TUI, GitHub App) should call this through the session client so
 // remote sessions return the remote CLI's available models rather than the caller's.
@@ -32675,6 +39673,9 @@ func (a *ModelAPI) SwitchTo(ctx context.Context, params *ModelSwitchToRequest) (
 		if params.PickerPersistence != nil {
 			req["pickerPersistence"] = *params.PickerPersistence
 		}
+		if params.ProviderID != nil {
+			req["providerId"] = *params.ProviderID
+		}
 		if params.ReasoningEffort != nil {
 			req["reasoningEffort"] = *params.ReasoningEffort
 		}
@@ -32794,6 +39795,9 @@ func (a *OptionsAPI) Update(ctx context.Context, params *SessionUpdateOptionsPar
 		if params.AgentContext != nil {
 			req["agentContext"] = *params.AgentContext
 		}
+		if params.AgentDirectories != nil {
+			req["agentDirectories"] = params.AgentDirectories
+		}
 		if params.AllowAllMCPServerInstructions != nil {
 			req["allowAllMcpServerInstructions"] = *params.AllowAllMCPServerInstructions
 		}
@@ -32872,6 +39876,9 @@ func (a *OptionsAPI) Update(ctx context.Context, params *SessionUpdateOptionsPar
 		if params.FeatureFlags != nil {
 			req["featureFlags"] = params.FeatureFlags
 		}
+		if params.HookDirectories != nil {
+			req["hookDirectories"] = params.HookDirectories
+		}
 		if params.IgnoredSkillsLocations != nil {
 			req["ignoredSkillsLocations"] = params.IgnoredSkillsLocations
 		}
@@ -32884,6 +39891,9 @@ func (a *OptionsAPI) Update(ctx context.Context, params *SessionUpdateOptionsPar
 		if params.InstalledPlugins != nil {
 			req["installedPlugins"] = params.InstalledPlugins
 		}
+		if params.InstructionDirectories != nil {
+			req["instructionDirectories"] = params.InstructionDirectories
+		}
 		if params.IntegrationID != nil {
 			req["integrationId"] = *params.IntegrationID
 		}
@@ -33785,6 +40795,40 @@ func (a *PluginsAPI) Reload(ctx context.Context, params ...*SessionPluginsReload
 	return &result, nil
 }
 
+// RetryManaged installs or updates the plugins the session's managed settings require now,
+// without waiting for the next automatic attempt after a failure, then reloads plugins.
+// Reports progress and failures with the same `session.info` and `session.warning` events
+// as automatic preparation. Fails when the runtime does not prepare managed plugins for the
+// session.
+//
+// RPC method: session.plugins.retryManaged.
+//
+// Parameters: Plugins required by the session's managed settings to install or update again.
+//
+// Returns: Per-plugin outcomes of retrying the plugins required by the session's managed
+// settings.
+func (a *PluginsAPI) RetryManaged(ctx context.Context, params ...*SessionPluginsRetryManagedRequest) (*SessionPluginsRetryManagedResult, error) {
+	var requestParams *SessionPluginsRetryManagedRequest
+	if len(params) > 0 {
+		requestParams = params[0]
+	}
+	req := map[string]any{"sessionId": a.sessionID}
+	if requestParams != nil {
+		if requestParams.Plugins != nil {
+			req["plugins"] = requestParams.Plugins
+		}
+	}
+	raw, err := a.client.Request(ctx, "session.plugins.retryManaged", req)
+	if err != nil {
+		return nil, err
+	}
+	var result SessionPluginsRetryManagedResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
 // Uninstalls a plugin when permitted by the live session's retained managed policy.
 //
 // RPC method: session.plugins.uninstall.
@@ -34528,6 +41572,66 @@ func (a *QueueAPI) WithdrawMessage(ctx context.Context, params *QueueWithdrawMes
 	return &result, nil
 }
 
+// Experimental: QuotaAPI contains experimental APIs that may change or be removed.
+type QuotaAPI sessionAPI
+
+// Gets the session's current quota and account projection without making a network request.
+//
+// RPC method: session.quota.get.
+//
+// Returns: The incumbent session-owned quota and account projection.
+func (a *QuotaAPI) Get(ctx context.Context) (*SessionQuotaGetResult, error) {
+	req := map[string]any{"sessionId": a.sessionID}
+	raw, err := a.client.Request(ctx, "session.quota.get", req)
+	if err != nil {
+		return nil, err
+	}
+	var result SessionQuotaGetResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// Refreshes the session's provider model catalog bypassing its cache, folds quota snapshots
+// into session state, and returns the updated projection. Failures leave the last known
+// quota intact.
+//
+// RPC method: session.quota.refresh.
+//
+// Returns: The incumbent session-owned quota and account projection.
+func (a *QuotaAPI) Refresh(ctx context.Context) (*SessionQuotaRefreshResult, error) {
+	req := map[string]any{"sessionId": a.sessionID}
+	raw, err := a.client.Request(ctx, "session.quota.refresh", req)
+	if err != nil {
+		return nil, err
+	}
+	var result SessionQuotaRefreshResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// TakeWarnings returns and clears the session's pending quota warnings. Reading or
+// refreshing quota does not drain warnings.
+//
+// RPC method: session.quota.takeWarnings.
+//
+// Returns: Pending warnings returned and cleared by session.quota.takeWarnings.
+func (a *QuotaAPI) TakeWarnings(ctx context.Context) (*SessionQuotaTakeWarningsResult, error) {
+	req := map[string]any{"sessionId": a.sessionID}
+	raw, err := a.client.Request(ctx, "session.quota.takeWarnings", req)
+	if err != nil {
+		return nil, err
+	}
+	var result SessionQuotaTakeWarningsResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
 // Experimental: RemoteAPI contains experimental APIs that may change or be removed.
 type RemoteAPI sessionAPI
 
@@ -34634,6 +41738,29 @@ func (a *SandboxAPI) DisableForSession(ctx context.Context, params *SandboxDisab
 	return &result, nil
 }
 
+// GetCredentialSuggestions lists possible secret-bearing environment variables available to
+// new sandboxed shells that are not already covered by credential masking. Uses local name
+// rules and known-provider host suggestions, never returns secret values, and changes no
+// settings or network permissions. Returns no suggestions while the session is not
+// sandboxed.
+//
+// RPC method: session.sandbox.getCredentialSuggestions.
+//
+// Returns: Possible unconfigured secrets in the sandbox shell environment, sorted by
+// variable name, with no secret values.
+func (a *SandboxAPI) GetCredentialSuggestions(ctx context.Context) (*SandboxCredentialSuggestionsResult, error) {
+	req := map[string]any{"sessionId": a.sessionID}
+	raw, err := a.client.Request(ctx, "session.sandbox.getCredentialSuggestions", req)
+	if err != nil {
+		return nil, err
+	}
+	var result SandboxCredentialSuggestionsResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
 // GetEnforcementStatus returns whether managed policy requires sandbox enforcement and
 // whether an enforcement failure has permanently blocked the session.
 //
@@ -35472,6 +42599,25 @@ func (a *ToolsAPI) InitializeAndValidate(ctx context.Context) (*ToolsInitializeA
 	return &result, nil
 }
 
+// ListPendingRequests lists the external tool calls of the session and its sub-agents that
+// are still waiting for session.tools.handlePendingToolCall.
+//
+// RPC method: session.tools.listPendingRequests.
+//
+// Returns: External tool calls still waiting for a result.
+func (a *ToolsAPI) ListPendingRequests(ctx context.Context) (*PendingExternalToolRequestList, error) {
+	req := map[string]any{"sessionId": a.sessionID}
+	raw, err := a.client.Request(ctx, "session.tools.listPendingRequests", req)
+	if err != nil {
+		return nil, err
+	}
+	var result PendingExternalToolRequestList
+	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.
@@ -36353,6 +43499,9 @@ func (a *WorkspacesAPI) Diff(ctx context.Context, params *WorkspacesDiffRequest)
 		if params.IgnoreWhitespace != nil {
 			req["ignoreWhitespace"] = *params.IgnoreWhitespace
 		}
+		if params.IncludeContents != nil {
+			req["includeContents"] = *params.IncludeContents
+		}
 		req["mode"] = params.Mode
 	}
 	raw, err := a.client.Request(ctx, "session.workspaces.diff", req)
@@ -36726,6 +43875,7 @@ type SessionRPC struct {
 	Provider           *ProviderAPI
 	Providers          *ProvidersAPI
 	Queue              *QueueAPI
+	Quota              *QuotaAPI
 	Remote             *RemoteAPI
 	Sandbox            *SandboxAPI
 	Schedule           *ScheduleAPI
@@ -37064,6 +44214,7 @@ func NewSessionRPC(client *jsonrpc2.Client, sessionID string) *SessionRPC {
 	r.Provider = (*ProviderAPI)(&r.common)
 	r.Providers = (*ProvidersAPI)(&r.common)
 	r.Queue = (*QueueAPI)(&r.common)
+	r.Quota = (*QuotaAPI)(&r.common)
 	r.Remote = (*RemoteAPI)(&r.common)
 	r.Sandbox = (*SandboxAPI)(&r.common)
 	r.Schedule = (*ScheduleAPI)(&r.common)
@@ -37505,6 +44656,35 @@ func (a *InternalMCPAPI) ReloadWithConfig(ctx context.Context, params *MCPReload
 	return &result, nil
 }
 
+// SetConnectedIdeInfo records the IDE the host is connected to, so the agent's system
+// prompt can name it and its workspace folder. Null or an omitted `ide` clears the recorded
+// value, which is how a host reports that it is disconnected; there is no separate clear
+// method. Both `ideName` and `workspaceFolder` are required together, because half a state
+// cannot be attributed to a project.
+//
+// RPC method: session.mcp.setConnectedIdeInfo.
+//
+// Parameters: Records which IDE the host is connected to, or clears it.
+// Internal: SetConnectedIdeInfo is part of the SDK's internal handshake/plumbing; external
+// callers should not use it.
+func (a *InternalMCPAPI) SetConnectedIdeInfo(ctx context.Context, params *SessionMCPSetConnectedIdeInfoParams) (*SessionMCPSetConnectedIdeInfoResult, error) {
+	req := map[string]any{"sessionId": a.sessionID}
+	if params != nil {
+		if params.Ide != nil {
+			req["ide"] = *params.Ide
+		}
+	}
+	raw, err := a.client.Request(ctx, "session.mcp.setConnectedIdeInfo", req)
+	if err != nil {
+		return nil, err
+	}
+	var result SessionMCPSetConnectedIdeInfoResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
 // UnregisterExternalClient unregisters a previously registered external MCP client by
 // server name. Marked internal as the paired companion of `registerExternalClient`: only
 // in-process callers that registered a client this way can meaningfully unregister it.
@@ -37580,6 +44760,9 @@ func (a *InternalModelAPI) ApplyStartupOverlay(ctx context.Context, params *Mode
 		if params.RepoModel != nil {
 			req["repoModel"] = *params.RepoModel
 		}
+		if params.RepoModelProviderID != nil {
+			req["repoModelProviderId"] = *params.RepoModelProviderID
+		}
 		if params.RepoReasoningEffort != nil {
 			req["repoReasoningEffort"] = *params.RepoReasoningEffort
 		}
@@ -37598,6 +44781,31 @@ func (a *InternalModelAPI) ApplyStartupOverlay(ctx context.Context, params *Mode
 	return &result, nil
 }
 
+// ClearStartupSeed clears an unchanged startup model/provider seed before default-model
+// resolution. Never clears a resumed or user-selected model.
+//
+// RPC method: session.model.clearStartupSeed.
+// Internal: ClearStartupSeed is part of the SDK's internal handshake/plumbing; external
+// callers should not use it.
+func (a *InternalModelAPI) ClearStartupSeed(ctx context.Context, params *SessionModelClearStartupSeedRequest) (*SessionModelClearStartupSeedResult, error) {
+	req := map[string]any{"sessionId": a.sessionID}
+	if params != nil {
+		req["expectedModel"] = params.ExpectedModel
+		if params.ExpectedProviderID != nil {
+			req["expectedProviderId"] = *params.ExpectedProviderID
+		}
+	}
+	raw, err := a.client.Request(ctx, "session.model.clearStartupSeed", req)
+	if err != nil {
+		return nil, err
+	}
+	var result SessionModelClearStartupSeedResult
+	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
 
@@ -38125,6 +45333,37 @@ func (a *InternalUIAPI) HandleHumanUserInput(ctx context.Context, params *UIHand
 	return &result, nil
 }
 
+// Experimental: InternalUsageAPI contains experimental APIs that may change or be removed.
+type InternalUsageAPI internalSessionAPI
+
+// SetCodeChanges internal host-only replacement of absolute code-change totals reported by
+// a relay host.
+//
+// RPC method: session.usage.setCodeChanges.
+//
+// Parameters: Internal absolute code-change totals reported by the owning host.
+// Internal: SetCodeChanges is part of the SDK's internal handshake/plumbing; external
+// callers should not use it.
+func (a *InternalUsageAPI) SetCodeChanges(ctx context.Context, params *SessionUsageSetCodeChangesRequest) (*SessionUsageSetCodeChangesResult, error) {
+	req := map[string]any{"sessionId": a.sessionID}
+	if params != nil {
+		if params.FilesCount != nil {
+			req["filesCount"] = *params.FilesCount
+		}
+		req["linesAdded"] = params.LinesAdded
+		req["linesRemoved"] = params.LinesRemoved
+	}
+	raw, err := a.client.Request(ctx, "session.usage.setCodeChanges", req)
+	if err != nil {
+		return nil, err
+	}
+	var result SessionUsageSetCodeChangesResult
+	if err := json.Unmarshal(raw, &result); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
 // Experimental: InternalWorkflowAPI contains experimental APIs that may change or be
 // removed.
 type InternalWorkflowAPI internalSessionAPI
@@ -38234,6 +45473,7 @@ type InternalSessionRPC struct {
 	Schedule   *InternalScheduleAPI
 	Settings   *InternalSettingsAPI
 	UI         *InternalUIAPI
+	Usage      *InternalUsageAPI
 	Workflow   *InternalWorkflowAPI
 }
 
@@ -38282,6 +45522,7 @@ func NewInternalSessionRPC(client *jsonrpc2.Client, sessionID string) *InternalS
 	r.Schedule = (*InternalScheduleAPI)(&r.common)
 	r.Settings = (*InternalSettingsAPI)(&r.common)
 	r.UI = (*InternalUIAPI)(&r.common)
+	r.Usage = (*InternalUsageAPI)(&r.common)
 	r.Workflow = (*InternalWorkflowAPI)(&r.common)
 	return r
 }
diff --git a/go/rpc/zrpc_encoding.go b/go/rpc/zrpc_encoding.go
index 739081b803..fdddf41f89 100644
--- a/go/rpc/zrpc_encoding.go
+++ b/go/rpc/zrpc_encoding.go
@@ -21,6 +21,12 @@ func unmarshalAuthInfo(data []byte) (AuthInfo, error) {
 	}
 
 	switch raw.Type {
+	case AuthInfoTypeAccount:
+		var d AccountAuthInfo
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
 	case AuthInfoTypeAPIKey:
 		var d APIKeyAuthInfo
 		if err := json.Unmarshal(data, &d); err != nil {
@@ -85,6 +91,17 @@ func (r RawAuthInfoData) MarshalJSON() ([]byte, error) {
 	})
 }
 
+func (r AccountAuthInfo) MarshalJSON() ([]byte, error) {
+	type alias AccountAuthInfo
+	return json.Marshal(struct {
+		Type AuthInfoType `json:"type"`
+		alias
+	}{
+		Type:  r.Type(),
+		alias: alias(r),
+	})
+}
+
 func (r APIKeyAuthInfo) MarshalJSON() ([]byte, error) {
 	type alias APIKeyAuthInfo
 	return json.Marshal(struct {
@@ -2990,6 +3007,58 @@ func (r GitHubTokenAcquireResultToken) MarshalJSON() ([]byte, error) {
 	})
 }
 
+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 (r *HandlePendingToolCallRequest) UnmarshalJSON(data []byte) error {
 	type rawHandlePendingToolCallRequest struct {
 		Error     *string         `json:"error,omitempty"`
@@ -3543,58 +3612,6 @@ func (r *InstallationConfirmationRequest) UnmarshalJSON(data []byte) error {
 	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"`
@@ -7704,10 +7721,12 @@ func (r *SessionOpenOptions) UnmarshalJSON(data []byte) error {
 		AdditionalContentExclusionPolicies     []SessionOpenOptionsAdditionalContentExclusionPolicy `json:"additionalContentExclusionPolicies,omitzero"`
 		AdditionalDirectories                  []string                                             `json:"additionalDirectories,omitzero"`
 		AgentContext                           *string                                              `json:"agentContext,omitempty"`
+		AgentDirectories                       []string                                             `json:"agentDirectories,omitzero"`
 		AllowAllMCPServerInstructions          *bool                                                `json:"allowAllMcpServerInstructions,omitempty"`
 		AskUserDisabled                        *bool                                                `json:"askUserDisabled,omitempty"`
 		AuthClientIDMetadataURL                *string                                              `json:"authClientIdMetadataUrl,omitempty"`
 		AuthInfo                               json.RawMessage                                      `json:"authInfo,omitempty"`
+		AutoTierIsExplicit                     *bool                                                `json:"autoTierIsExplicit,omitempty"`
 		AvailableTools                         []string                                             `json:"availableTools,omitzero"`
 		Capi                                   *CapiSessionOptions                                  `json:"capi,omitempty"`
 		ClientKind                             *string                                              `json:"clientKind,omitempty"`
@@ -7729,6 +7748,7 @@ func (r *SessionOpenOptions) UnmarshalJSON(data []byte) error {
 		EnableScriptSafety                     *bool                                                `json:"enableScriptSafety,omitempty"`
 		EnableSkills                           *bool                                                `json:"enableSkills,omitempty"`
 		EnableStreaming                        *bool                                                `json:"enableStreaming,omitempty"`
+		EnforceManagedModelDefaults            *bool                                                `json:"enforceManagedModelDefaults,omitempty"`
 		EnvValueMode                           *SessionOpenOptionsEnvValueMode                      `json:"envValueMode,omitempty"`
 		EventsLogDirectory                     *string                                              `json:"eventsLogDirectory,omitempty"`
 		EventsLogIncludesSubagents             *bool                                                `json:"eventsLogIncludesSubagents,omitempty"`
@@ -7737,10 +7757,12 @@ func (r *SessionOpenOptions) UnmarshalJSON(data []byte) error {
 		ExpAssignments                         any                                                  `json:"expAssignments,omitempty"`
 		FeatureFlags                           map[string]bool                                      `json:"featureFlags,omitzero"`
 		HasSkillProvider                       *bool                                                `json:"hasSkillProvider,omitempty"`
+		HookDirectories                        []string                                             `json:"hookDirectories,omitzero"`
 		IgnoredSkillsLocations                 []string                                             `json:"ignoredSkillsLocations,omitzero"`
 		IncludedBuiltinAgents                  []string                                             `json:"includedBuiltinAgents,omitzero"`
 		IncludedBuiltinSkills                  []string                                             `json:"includedBuiltinSkills,omitzero"`
 		InstalledPlugins                       []InstalledPlugin                                    `json:"installedPlugins,omitzero"`
+		InstructionDirectories                 []string                                             `json:"instructionDirectories,omitzero"`
 		IntegrationID                          *string                                              `json:"integrationId,omitempty"`
 		IsExperimentalMode                     *bool                                                `json:"isExperimentalMode,omitempty"`
 		LogInteractiveShells                   *bool                                                `json:"logInteractiveShells,omitempty"`
@@ -7784,6 +7806,7 @@ func (r *SessionOpenOptions) UnmarshalJSON(data []byte) error {
 	r.AdditionalContentExclusionPolicies = raw.AdditionalContentExclusionPolicies
 	r.AdditionalDirectories = raw.AdditionalDirectories
 	r.AgentContext = raw.AgentContext
+	r.AgentDirectories = raw.AgentDirectories
 	r.AllowAllMCPServerInstructions = raw.AllowAllMCPServerInstructions
 	r.AskUserDisabled = raw.AskUserDisabled
 	r.AuthClientIDMetadataURL = raw.AuthClientIDMetadataURL
@@ -7794,6 +7817,7 @@ func (r *SessionOpenOptions) UnmarshalJSON(data []byte) error {
 		}
 		r.AuthInfo = value
 	}
+	r.AutoTierIsExplicit = raw.AutoTierIsExplicit
 	r.AvailableTools = raw.AvailableTools
 	r.Capi = raw.Capi
 	r.ClientKind = raw.ClientKind
@@ -7815,6 +7839,7 @@ func (r *SessionOpenOptions) UnmarshalJSON(data []byte) error {
 	r.EnableScriptSafety = raw.EnableScriptSafety
 	r.EnableSkills = raw.EnableSkills
 	r.EnableStreaming = raw.EnableStreaming
+	r.EnforceManagedModelDefaults = raw.EnforceManagedModelDefaults
 	r.EnvValueMode = raw.EnvValueMode
 	r.EventsLogDirectory = raw.EventsLogDirectory
 	r.EventsLogIncludesSubagents = raw.EventsLogIncludesSubagents
@@ -7823,10 +7848,12 @@ func (r *SessionOpenOptions) UnmarshalJSON(data []byte) error {
 	r.ExpAssignments = raw.ExpAssignments
 	r.FeatureFlags = raw.FeatureFlags
 	r.HasSkillProvider = raw.HasSkillProvider
+	r.HookDirectories = raw.HookDirectories
 	r.IgnoredSkillsLocations = raw.IgnoredSkillsLocations
 	r.IncludedBuiltinAgents = raw.IncludedBuiltinAgents
 	r.IncludedBuiltinSkills = raw.IncludedBuiltinSkills
 	r.InstalledPlugins = raw.InstalledPlugins
+	r.InstructionDirectories = raw.InstructionDirectories
 	r.IntegrationID = raw.IntegrationID
 	r.IsExperimentalMode = raw.IsExperimentalMode
 	r.LogInteractiveShells = raw.LogInteractiveShells
@@ -8140,6 +8167,12 @@ func unmarshalSettableAuthInfo(data []byte) (SettableAuthInfo, error) {
 	}
 
 	switch raw.Type {
+	case SettableAuthInfoTypeAccount:
+		var d AccountAuthInfo
+		if err := json.Unmarshal(data, &d); err != nil {
+			return nil, err
+		}
+		return &d, nil
 	case SettableAuthInfoTypeAPIKey:
 		var d APIKeyAuthInfo
 		if err := json.Unmarshal(data, &d); err != nil {
diff --git a/go/rpc/zsession_encoding.go b/go/rpc/zsession_encoding.go
index fa44772dab..89810fdf9b 100644
--- a/go/rpc/zsession_encoding.go
+++ b/go/rpc/zsession_encoding.go
@@ -599,6 +599,12 @@ func (e *SessionEvent) UnmarshalJSON(data []byte) error {
 			return err
 		}
 		e.Data = &d
+	case SessionEventTypeSessionManagedPluginProgress:
+		var d SessionManagedPluginProgressData
+		if err := json.Unmarshal(raw.Data, &d); err != nil {
+			return err
+		}
+		e.Data = &d
 	case SessionEventTypeSessionManagedSettingsEnforced:
 		var d SessionManagedSettingsEnforcedData
 		if err := json.Unmarshal(raw.Data, &d); err != nil {
@@ -677,6 +683,12 @@ func (e *SessionEvent) UnmarshalJSON(data []byte) error {
 			return err
 		}
 		e.Data = &d
+	case SessionEventTypeSessionQuotaObservation:
+		var d SessionQuotaObservationData
+		if err := json.Unmarshal(raw.Data, &d); err != nil {
+			return err
+		}
+		e.Data = &d
 	case SessionEventTypeSessionRemoteSteerableChanged:
 		var d SessionRemoteSteerableChangedData
 		if err := json.Unmarshal(raw.Data, &d); err != nil {
@@ -2351,6 +2363,8 @@ func (r PermissionPromptRequestWrite) MarshalJSON() ([]byte, error) {
 func (r *PermissionRequestedData) UnmarshalJSON(data []byte) error {
 	type rawPermissionRequestedData struct {
 		AgentMode         *SessionMode    `json:"agentMode,omitempty"`
+		OwnerAgentID      *string         `json:"ownerAgentId,omitempty"`
+		OwnerSessionID    *string         `json:"ownerSessionId,omitempty"`
 		PermissionMode    *PermissionMode `json:"permissionMode,omitempty"`
 		PermissionRequest json.RawMessage `json:"permissionRequest"`
 		PromptRequest     json.RawMessage `json:"promptRequest,omitempty"`
@@ -2364,6 +2378,8 @@ func (r *PermissionRequestedData) UnmarshalJSON(data []byte) error {
 		return err
 	}
 	r.AgentMode = raw.AgentMode
+	r.OwnerAgentID = raw.OwnerAgentID
+	r.OwnerSessionID = raw.OwnerSessionID
 	r.PermissionMode = raw.PermissionMode
 	if raw.PermissionRequest != nil {
 		value, err := unmarshalPermissionRequest(raw.PermissionRequest)
diff --git a/go/rpc/zsession_events.go b/go/rpc/zsession_events.go
index b301571f68..cde63686ae 100644
--- a/go/rpc/zsession_events.go
+++ b/go/rpc/zsession_events.go
@@ -195,6 +195,9 @@ const (
 	SessionEventTypeSessionInfo                     SessionEventType = "session.info"
 	SessionEventTypeSessionLimitsExhaustedCompleted SessionEventType = "session_limits_exhausted.completed"
 	SessionEventTypeSessionLimitsExhaustedRequested SessionEventType = "session_limits_exhausted.requested"
+	// Experimental: SessionEventTypeSessionManagedPluginProgress identifies an experimental
+	// event that may change or be removed.
+	SessionEventTypeSessionManagedPluginProgress SessionEventType = "session.managed_plugin_progress"
 	// Experimental: SessionEventTypeSessionManagedSettingsEnforced identifies an experimental
 	// event that may change or be removed.
 	SessionEventTypeSessionManagedSettingsEnforced SessionEventType = "session.managed_settings_enforced"
@@ -212,8 +215,11 @@ const (
 	SessionEventTypeSessionPermissionRecovery      SessionEventType = "session.permission_recovery"
 	// Experimental: SessionEventTypeSessionPermissionsChanged identifies an experimental event
 	// that may change or be removed.
-	SessionEventTypeSessionPermissionsChanged     SessionEventType = "session.permissions_changed"
-	SessionEventTypeSessionPlanChanged            SessionEventType = "session.plan_changed"
+	SessionEventTypeSessionPermissionsChanged SessionEventType = "session.permissions_changed"
+	SessionEventTypeSessionPlanChanged        SessionEventType = "session.plan_changed"
+	// Experimental: SessionEventTypeSessionQuotaObservation identifies an experimental event
+	// that may change or be removed.
+	SessionEventTypeSessionQuotaObservation       SessionEventType = "session.quota_observation"
 	SessionEventTypeSessionRemoteSteerableChanged SessionEventType = "session.remote_steerable_changed"
 	SessionEventTypeSessionResume                 SessionEventType = "session.resume"
 	SessionEventTypeSessionScheduleCancelled      SessionEventType = "session.schedule_cancelled"
@@ -349,6 +355,18 @@ type PromptCacheBreakData struct {
 func (*PromptCacheBreakData) sessionEventData()      {}
 func (*PromptCacheBreakData) Type() SessionEventType { return SessionEventTypePromptCacheBreak }
 
+// A provider-owned quota observation, distinct from per-call usage and charge accounting.
+// Experimental: SessionQuotaObservationData is part of an experimental API and may change or be removed.
+type SessionQuotaObservationData struct {
+	// The admitted provider's state observation. Admission balances and percentages remain absent; separate monthly usage may report its own amount and cycle.
+	Observation ProviderQuotaState `json:"observation"`
+}
+
+func (*SessionQuotaObservationData) sessionEventData() {}
+func (*SessionQuotaObservationData) Type() SessionEventType {
+	return SessionEventTypeSessionQuotaObservation
+}
+
 // A transient Auto preference failure emitted when the runtime cannot mint or accept a usable model and token pair. The previously effective preference remains active, so SDK clients can surface a non-blocking failure without changing their committed-tier state. This event is ephemeral and is not persisted or replayed on resume.
 type SessionAutoTierSwitchFailedData struct {
 	// Auto preference that remains effective after the failed request.
@@ -432,6 +450,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"`
+	// Opaque origin provider identity captured at dispatch. Only an exact match with the target provider permits replay of reasoningOpaque, encryptedContent, reasoningBlocks, serverTools, and provider response/item identifiers. Matching model ids or wire protocols is insufficient. Omitted for legacy or unattributed messages; the runtime excludes unproven opaque state when projecting to a known provider. Text content and client tool requests/results remain portable semantic history.
+	ProviderID *string `json:"providerId,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.
@@ -467,6 +487,10 @@ type SessionPermissionRecoveryData struct {
 	MaxAttempts int64 `json:"maxAttempts"`
 	// Policy selected from the current client's response capability; mode or client changes may update it during recovery
 	OnBlocked PermissionRecoveryOnBlocked `json:"onBlocked"`
+	// Subagent identifier that owns this recovery episode when the request was delegated through a parent permission service
+	OwnerAgentID *string `json:"ownerAgentId,omitempty"`
+	// Root or child execution-session identifier that owns this recovery episode; omitted for legacy snapshots
+	OwnerSessionID *string `json:"ownerSessionId,omitempty"`
 	// Controlled reason for the latest episode transition
 	Reason PermissionRecoveryReason `json:"reason"`
 	// Current lifecycle state of the recovery episode
@@ -830,17 +854,24 @@ func (*HumanResponseRecordedData) Type() SessionEventType {
 
 // Durable session usage checkpoint for reconstructing aggregate accounting on resume
 type SessionUsageCheckpointData struct {
+	// Complete accounting state captured atomically with the receipt watermarks.
+	// Internal: AccountingSnapshot is part of the SDK's internal API surface and is not intended for external use.
+	AccountingSnapshot *UsageGetMetricsResult `json:"accountingSnapshot,omitempty"`
 	// 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"`
+	// Provider/model accounting snapshot that subsumes preceding usage receipts.
+	ProviderModelMetrics []UsageMetricsProviderModelMetric `json:"providerModelMetrics,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
 	// Internal: TotalPremiumRequests is part of the SDK's internal API surface and is not intended for external use.
 	TotalPremiumRequests *float64 `json:"totalPremiumRequests,omitempty"`
+	// Highest accounted sequence per source session; no per-call deduplication history is retained.
+	UsageAccountingWatermarks map[string]int64 `json:"usageAccountingWatermarks,omitzero"`
 }
 
 func (*SessionUsageCheckpointData) sessionEventData() {}
@@ -868,18 +899,20 @@ func (*MCPHeadersRefreshRequiredData) Type() SessionEventType {
 // Effective enterprise managed settings and contributing channels. Session events report applied policy; sessionless resolve reports an account/device snapshot, and compose reports a non-applying preview of candidate documents. Device values take precedence over server values, then the policy helper, per ordinary key, while permissions compose restrictively. Session-local SDK-client policy is included only in session results. 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.
+	// Whether an explicit enterprise policy restriction disables bypass-permissions ("yolo") mode for this session. Deny-wins across layers; an unresolved policy does not force this on by itself.
 	BypassPermissionsDisabled bool `json:"bypassPermissionsDisabled"`
 	// 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.
+	// Whether managed policy could not be determined (e.g. a failed server fetch) and unresolved-policy safeguards remain active. This does not by itself disable bypass-permissions; `bypassPermissionsDisabled` reports only an explicit policy restriction.
 	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 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"`
+	// Reusable retained managed permission policy for managedSettings.permissions.evaluate, including source composition and session-local injection. Provided by live session snapshots; absent in older events. Refresh the context when managed policy changes.
+	PermissionsContext *ManagedPermissionsContext `json:"permissionsContext,omitempty"`
 	// Whether the policy-helper managed-settings layer was present. The policy helper is the weakest channel: it fills keys no enterprise source set and can never replace one.
 	PolicyHelperManaged *bool `json:"policyHelperManaged,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.
@@ -1019,12 +1052,16 @@ type SessionErrorData struct {
 	EligibleForAutoSwitch *bool `json:"eligibleForAutoSwitch,omitempty"`
 	// Fine-grained error code from the upstream provider, when available. For `errorType: "rate_limit"`, this is one of the `RateLimitErrorCode` values (e.g., `"user_weekly_rate_limited"`, `"user_global_rate_limited"`, `"rate_limited"`, `"user_model_rate_limited"`, `"integration_rate_limited"`). For `errorType: "quota"`, this is the CAPI quota error code (e.g., `"quota_exceeded"`, `"session_quota_exceeded"`, `"billing_not_configured"`).
 	ErrorCode *string `json:"errorCode,omitempty"`
-	// Category of error (e.g., "authentication", "authorization", "quota", "rate_limit", "context_limit", "query")
+	// Category of error (e.g., "authentication", "authorization", "policy", "quota", "rate_limit", "context_limit", "query")
 	ErrorType string `json:"errorType"`
 	// Human-readable error message
 	Message string `json:"message"`
 	// GitHub request tracing ID (x-github-request-id header) for correlating with server-side logs
 	ProviderCallID *string `json:"providerCallId,omitempty"`
+	// Sanitized provider-defined error parameter preserved from a structured upstream error envelope, when available.
+	ProviderErrorParam *string `json:"providerErrorParam,omitempty"`
+	// Provider-defined error type preserved from a structured upstream error envelope, when available (for example, `invalid_request_error`).
+	ProviderErrorType *string `json:"providerErrorType,omitempty"`
 	// What the user must do to recover, when the runtime knows of an action. The `message` never names a client affordance, so a client that offers one — a slash command, a settings pane, a link — renders it from this value.
 	Remediation *RemediationAction `json:"remediation,omitempty"`
 	// Copilot service request ID (x-copilot-service-request-id header) for CAPI log correlation
@@ -1326,6 +1363,20 @@ func (*AssistantFusionPhaseStartedData) Type() SessionEventType {
 	return SessionEventTypeAssistantFusionPhaseStarted
 }
 
+// Experimental transient presentation-neutral progress for organization-required plugin preparation. Clients should localize the phase copy and display plugin specs without translating them.
+// Experimental: SessionManagedPluginProgressData is part of an experimental API and may change or be removed.
+type SessionManagedPluginProgressData struct {
+	// Current preparation phase.
+	Phase ManagedPluginProgressPhase `json:"phase"`
+	// Ordered plugin install specs affected by this phase. Empty while managed settings initialize and when preparation completes.
+	PluginSpecs []string `json:"pluginSpecs"`
+}
+
+func (*SessionManagedPluginProgressData) sessionEventData() {}
+func (*SessionManagedPluginProgressData) Type() SessionEventType {
+	return SessionEventTypeSessionManagedPluginProgress
+}
+
 // Experimental transient signal that HydraFusion routing has started for an eligible turn.
 // Experimental: SessionFusionRouteStartedData is part of an experimental API and may change or be removed.
 type SessionFusionRouteStartedData struct {
@@ -1430,8 +1481,16 @@ type ModelCallFailureData struct {
 	QuotaSnapshots map[string]AssistantUsageQuotaSnapshot `json:"quotaSnapshots,omitzero"`
 	// Reasoning effort level used for the failed model call, if applicable
 	ReasoningEffort *string `json:"reasoningEffort,omitempty"`
+	// Serialized (uncompressed) byte length of the failed request body, before any Content-Encoding. A content-free size signal.
+	RequestBodyBytes *int64 `json:"requestBodyBytes,omitempty"`
+	// Content-Encoding applied to the failed request body; identity when uncompressed
+	RequestBodyEncoding *ModelCallRequestBodyEncoding `json:"requestBodyEncoding,omitempty"`
+	// Byte length of the failed request body actually sent on the wire, after any Content-Encoding. Equals requestBodyBytes when the body was not compressed.
+	RequestBodyWireBytes *int64 `json:"requestBodyWireBytes,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"`
+	// Zero-based orchestrator retry index of the failed attempt
+	RetryAttempt *int64 `json:"retryAttempt,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
@@ -1442,6 +1501,20 @@ type ModelCallFailureData struct {
 	StatusCode *int32 `json:"statusCode,omitempty"`
 	// Transport used for the failed model call (http or websocket)
 	Transport *ModelCallFailureTransport `json:"transport,omitempty"`
+	// Milliseconds spent on the WebSocket attempt before falling back to HTTP
+	WebsocketFallbackAfterMs *int64 `json:"websocketFallbackAfterMs,omitempty"`
+	// WebSocket close code received before the HTTP fallback
+	WebsocketFallbackCloseCode *int32 `json:"websocketFallbackCloseCode,omitempty"`
+	// Normalized cause of the WebSocket failure that triggered the HTTP fallback; absent when no fallback occurred or the cause is unknown
+	WebsocketFallbackErrorKind *ModelCallWebSocketFallbackErrorKind `json:"websocketFallbackErrorKind,omitempty"`
+	// Why the failed call was carried by the HTTP fallback of a WebSocket-capable dispatcher; absent when no fallback occurred
+	WebsocketFallbackReason *ModelCallWebSocketFallbackReason `json:"websocketFallbackReason,omitempty"`
+	// Whether a WebSocket reconnect was attempted before falling back to HTTP
+	WebsocketFallbackReconnectAttempted *bool `json:"websocketFallbackReconnectAttempted,omitempty"`
+	// Whether the HTTP fallback started during this model call, rather than being inherited from an earlier call
+	WebsocketFallbackStartedThisCall *bool `json:"websocketFallbackStartedThisCall,omitempty"`
+	// HTTP status of the WebSocket upgrade rejection or WebSocket API error that triggered the HTTP fallback
+	WebsocketFallbackStatusCode *int32 `json:"websocketFallbackStatusCode,omitempty"`
 }
 
 func (*ModelCallFailureData) sessionEventData()      {}
@@ -1716,6 +1789,10 @@ func (*ModelCallFinalResultData) Type() SessionEventType { return SessionEventTy
 type AssistantUsageData struct {
 	// Number of accepted speculative prediction tokens
 	AcceptedPredictionTokens *int64 `json:"acceptedPredictionTokens,omitempty"`
+	// Runtime-owned identity shared with the durable accounting receipt.
+	Accounting *UsageAccountingIdentity `json:"accounting,omitempty"`
+	// Availability of this call's reported AI-credit amount. Missing billing is unavailable, not a zero charge.
+	AiCreditsStatus *AiCreditsStatus `json:"aiCreditsStatus,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
@@ -1772,6 +1849,8 @@ type AssistantUsageData struct {
 	MaxPromptTokens *int64 `json:"maxPromptTokens,omitempty"`
 	// Model identifier used for this API call
 	Model string `json:"model"`
+	// Model display name captured for this call, not derived from the current selection.
+	ModelDisplayName *string `json:"modelDisplayName,omitempty"`
 	// Fixed-set provider family serving the bring-your-own-key model (for example "openai", "anthropic", "azure_openai", "ollama", "llama_cpp", or "other"). Never the caller-supplied provider name. Absent for Copilot-served models.
 	ModelProvider *string `json:"modelProvider,omitempty"`
 	// Number of tool calls returned by the model
@@ -1784,6 +1863,8 @@ type AssistantUsageData struct {
 	// Parent tool call ID when this usage originates from a sub-agent
 	// Deprecated: ParentToolCallID is deprecated.
 	ParentToolCallID *string `json:"parentToolCallId,omitempty"`
+	// Provider identity and product label captured by the actual call's dispatch path.
+	Provider *ModelProviderRef `json:"provider,omitempty"`
 	// GitHub request tracing ID (x-github-request-id header) for server-side log correlation
 	ProviderCallID *string `json:"providerCallId,omitempty"`
 	// Per-quota resource usage snapshots, keyed by quota identifier
@@ -1797,6 +1878,12 @@ type AssistantUsageData struct {
 	ReasoningTokens *int64 `json:"reasoningTokens,omitempty"`
 	// Number of rejected speculative prediction tokens
 	RejectedPredictionTokens *int64 `json:"rejectedPredictionTokens,omitempty"`
+	// Serialized (uncompressed) byte length of the request body, before any Content-Encoding. A content-free size signal.
+	RequestBodyBytes *int64 `json:"requestBodyBytes,omitempty"`
+	// Content-Encoding applied to the request body of the attempt that produced this outcome; identity when uncompressed
+	RequestBodyEncoding *ModelCallRequestBodyEncoding `json:"requestBodyEncoding,omitempty"`
+	// Byte length of the request body actually sent on the wire for the attempt that produced this outcome, after any Content-Encoding. Equals requestBodyBytes when the body was not compressed.
+	RequestBodyWireBytes *int64 `json:"requestBodyWireBytes,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
@@ -1817,6 +1904,20 @@ type AssistantUsageData struct {
 	ToolTokenCount *int64 `json:"toolTokenCount,omitempty"`
 	// Transport used for this model call (http or websocket)
 	Transport *AssistantUsageTransport `json:"transport,omitempty"`
+	// Milliseconds spent on the WebSocket attempt before falling back to HTTP
+	WebsocketFallbackAfterMs *int64 `json:"websocketFallbackAfterMs,omitempty"`
+	// WebSocket close code received before the HTTP fallback
+	WebsocketFallbackCloseCode *int32 `json:"websocketFallbackCloseCode,omitempty"`
+	// Normalized cause of the WebSocket failure that triggered the HTTP fallback; absent when no fallback occurred or the cause is unknown
+	WebsocketFallbackErrorKind *ModelCallWebSocketFallbackErrorKind `json:"websocketFallbackErrorKind,omitempty"`
+	// Why the call was carried by the HTTP fallback of a WebSocket-capable dispatcher; absent when no fallback occurred
+	WebsocketFallbackReason *ModelCallWebSocketFallbackReason `json:"websocketFallbackReason,omitempty"`
+	// Whether a WebSocket reconnect was attempted before falling back to HTTP
+	WebsocketFallbackReconnectAttempted *bool `json:"websocketFallbackReconnectAttempted,omitempty"`
+	// Whether the HTTP fallback started during this model call, rather than being inherited from an earlier call
+	WebsocketFallbackStartedThisCall *bool `json:"websocketFallbackStartedThisCall,omitempty"`
+	// HTTP status of the WebSocket upgrade rejection or WebSocket API error that triggered the HTTP fallback
+	WebsocketFallbackStatusCode *int32 `json:"websocketFallbackStatusCode,omitempty"`
 }
 
 func (*AssistantUsageData) sessionEventData()      {}
@@ -1982,24 +2083,34 @@ func (*ModelCallStartData) Type() SessionEventType { return SessionEventTypeMode
 type SessionModelChangeData struct {
 	// Committed Auto preference after the model configuration change, when applicable.
 	AutoTier *AutoTier `json:"autoTier,omitempty"`
+	// True when autoTier is a managed-policy default. Omitted for user-authored and legacy values.
+	AutoTierManaged *bool `json:"autoTierManaged,omitempty"`
 	// 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.
 	Cause *string `json:"cause,omitempty"`
 	// Context tier after the model change; null explicitly clears a previously selected tier
 	ContextTier *ContextTier `json:"contextTier,omitempty"`
+	// True when contextTier is a managed-policy default. Omitted for user-authored and legacy values.
+	ContextTierManaged *bool `json:"contextTierManaged,omitempty"`
 	// Newly selected model identifier
 	NewModel string `json:"newModel"`
 	// Previously committed Auto preference, when one was explicitly selected.
 	PreviousAutoTier *AutoTier `json:"previousAutoTier,omitempty"`
 	// Model that was previously selected, if any
 	PreviousModel *string `json:"previousModel,omitempty"`
+	// Provider of previousModel, when known. A provider-only change is a model selection change even when the model identifiers are equal.
+	PreviousProviderID *string `json:"previousProviderId,omitempty"`
 	// Reasoning effort level before the model change, if applicable
 	PreviousReasoningEffort *string `json:"previousReasoningEffort,omitempty"`
 	// Reasoning summary mode before the model change, if applicable
 	PreviousReasoningSummary *ReasoningSummary `json:"previousReasoningSummary,omitempty"`
 	// Output verbosity level before the model change, if applicable
 	PreviousVerbosity *Verbosity `json:"previousVerbosity,omitempty"`
+	// Provider selected for newModel. Omitted for legacy or unattributed selections; never inferred from a later selection.
+	ProviderID *string `json:"providerId,omitempty"`
 	// Reasoning effort level after the model change, if applicable
 	ReasoningEffort *string `json:"reasoningEffort,omitempty"`
+	// True when the reasoning effort is a managed-policy default bound to reasoningEffortModel. Omitted for agent-authored, user-authored, independent, and legacy effort.
+	ReasoningEffortManaged *bool `json:"reasoningEffortManaged,omitempty"`
 	// Model that owns effort embedded in an authored model selection. Omitted for independent reasoning-effort overrides and legacy events.
 	ReasoningEffortModel *string `json:"reasoningEffortModel,omitempty"`
 	// Reasoning summary mode after the model change, if applicable
@@ -2362,6 +2473,10 @@ func (*PermissionCompletedData) Type() SessionEventType { return SessionEventTyp
 type PermissionRequestedData struct {
 	// Agent mode captured from the owning turn when permission evaluation began.
 	AgentMode *SessionMode `json:"agentMode,omitempty"`
+	// Delegated agent that owns permission recovery when the owner session multiplexes remote agents. Absent otherwise.
+	OwnerAgentID *string `json:"ownerAgentId,omitempty"`
+	// Execution session that owns permission recovery for this request. Absent on historical events.
+	OwnerSessionID *string `json:"ownerSessionId,omitempty"`
 	// Permission mode captured when evaluation began. Absent on historical events.
 	PermissionMode *PermissionMode `json:"permissionMode,omitempty"`
 	// Details of the permission being requested
@@ -2523,18 +2638,18 @@ type SubagentConfiguredData struct {
 func (*SubagentConfiguredData) sessionEventData()      {}
 func (*SubagentConfiguredData) Type() SessionEventType { return SessionEventTypeSubagentConfigured }
 
-// Runtime enforcement of enterprise managed settings: fires when the session blocks or caps a runtime action because enterprise policy governs it, so SDK clients can explain *why* an action was governed. Unlike `session.managed_settings_resolved` (which reports *what* is managed), this reports a concrete governed action — e.g. a user or host tried to turn on a bypass-permissions escalation while policy disables it. Emitted live (not persisted to the session event log) on user/host-initiated attempts only, never for silent policy application. Marked experimental while the managed-settings surface stabilizes.
+// Runtime enforcement of enterprise managed settings: fires when the session blocks or caps a runtime action because enterprise policy governs it, so SDK clients can explain *why* an action was governed. Unlike `session.managed_settings_resolved` (which reports *what* is managed), this reports a concrete governed action — e.g. a user or host tried to turn on bypass permissions or Assisted Permissions while the corresponding policy disables it. Emitted live (not persisted to the session event log) on user/host-initiated attempts only, never for silent policy application. Marked experimental while the managed-settings surface stabilizes.
 // Experimental: SessionManagedSettingsEnforcedData is part of an experimental API and may change or be removed.
 type SessionManagedSettingsEnforcedData struct {
 	// The category of runtime action that managed policy governed.
 	Action ManagedSettingsEnforcedAction `json:"action"`
-	// For a `bypass_permissions_blocked` action, which permission-escalation primitive was refused. Absent for actions without a specific escalation primitive.
+	// For a `bypass_permissions_blocked` action, which permission-mode or escalation primitive was refused. Absent for actions without a specific primitive.
 	Escalation *ManagedSettingsEnforcedEscalation `json:"escalation,omitempty"`
 	// Whether the enforcement was forced by fail-closed handling (managed policy could not be determined) rather than an explicit managed setting. When true, `setting` still names the restriction that was applied.
 	FailClosed bool `json:"failClosed"`
 	// A human-readable explanation of why the action was governed, suitable for surfacing to the user.
 	Message string `json:"message"`
-	// The managed setting key responsible for the enforcement (e.g. `permissions.disableBypassPermissionsMode`).
+	// The managed setting key responsible for the enforcement (for example `permissions.disableBypassPermissionsMode` or `permissions.disableAssistedPermissionsMode`).
 	Setting string `json:"setting"`
 }
 
@@ -2663,10 +2778,14 @@ type SessionStartData struct {
 	AlreadyInUse *bool `json:"alreadyInUse,omitempty"`
 	// Auto routing preference selected at session creation time
 	AutoTier *AutoTier `json:"autoTier,omitempty"`
+	// True when autoTier is a managed-policy default. Omitted for user-authored and legacy values.
+	AutoTierManaged *bool `json:"autoTierManaged,omitempty"`
 	// Working directory and git context at session start
 	Context *WorkingDirectoryContext `json:"context,omitempty"`
 	// Context tier selected at session creation time for models with tiered context pricing; null when no tier is selected (e.g., non-tiered model)
 	ContextTier *ContextTier `json:"contextTier,omitempty"`
+	// True when contextTier is a managed-policy default. Omitted for user-authored and legacy values.
+	ContextTierManaged *bool `json:"contextTierManaged,omitempty"`
 	// Version string of the Copilot application
 	CopilotVersion string `json:"copilotVersion"`
 	// When set, identifies a parent session whose context this session continues — e.g., a detached headless rem-agent run launched on the parent's interactive shutdown. Telemetry from this session is reported under the parent's session_id.
@@ -2675,8 +2794,12 @@ type SessionStartData struct {
 	GitHubMCPToolConfig *GitHubMCPToolConfig `json:"githubMcpToolConfig,omitempty"`
 	// Identifier of the software producing the events (e.g., "copilot-agent")
 	Producer string `json:"producer"`
+	// Provider of selectedModel at creation time, when explicitly selected.
+	ProviderID *string `json:"providerId,omitempty"`
 	// Reasoning effort level used for model calls, if applicable (e.g. "none", "low", "medium", "high", "xhigh", "max")
 	ReasoningEffort *string `json:"reasoningEffort,omitempty"`
+	// True when the reasoning effort is a managed-policy default bound to reasoningEffortModel. Omitted for agent-authored, user-authored, independent, and legacy effort.
+	ReasoningEffortManaged *bool `json:"reasoningEffortManaged,omitempty"`
 	// Model that owns effort embedded in an authored model selection. Omitted for independent reasoning-effort overrides and legacy events.
 	ReasoningEffortModel *string `json:"reasoningEffortModel,omitempty"`
 	// Reasoning summary mode used for model calls, if applicable (e.g. "none", "concise", "detailed")
@@ -2745,18 +2868,26 @@ type SessionResumeData struct {
 	AlreadyInUse *bool `json:"alreadyInUse,omitempty"`
 	// Auto routing preference active at resume time
 	AutoTier *AutoTier `json:"autoTier,omitempty"`
+	// True when autoTier is a managed-policy default. Omitted for user-authored and legacy values.
+	AutoTierManaged *bool `json:"autoTierManaged,omitempty"`
 	// Updated working directory and git context at resume time
 	Context *WorkingDirectoryContext `json:"context,omitempty"`
 	// Context tier currently selected at resume time; null when no tier is active
 	ContextTier *ContextTier `json:"contextTier,omitempty"`
+	// True when contextTier is a managed-policy default. Omitted for user-authored and legacy values.
+	ContextTierManaged *bool `json:"contextTierManaged,omitempty"`
 	// When true, tool calls and permission requests left in flight by the previous session lifetime remain pending after resume and the agentic loop awaits their results. User sends are queued behind the pending work until all such requests reach a terminal state. When false or omitted, pending work is normally marked as interrupted unless the resume passively joined live work owned by another client; sessionWasActive distinguishes that case.
 	ContinuePendingWork *bool `json:"continuePendingWork,omitempty"`
 	// Total number of persisted events in the session at the time of resume
 	EventCount int64 `json:"eventCount"`
 	// On-disk byte size of the session's persisted events.jsonl file at resume time; omitted when the file does not exist or cannot be stat'd
 	EventsFileSizeBytes *int64 `json:"eventsFileSizeBytes,omitempty"`
+	// Provider of selectedModel at resume time, when explicitly selected.
+	ProviderID *string `json:"providerId,omitempty"`
 	// Reasoning effort level used for model calls, if applicable (e.g. "none", "low", "medium", "high", "xhigh", "max")
 	ReasoningEffort *string `json:"reasoningEffort,omitempty"`
+	// True when the reasoning effort is a managed-policy default bound to reasoningEffortModel. Omitted for agent-authored, user-authored, independent, and legacy effort.
+	ReasoningEffortManaged *bool `json:"reasoningEffortManaged,omitempty"`
 	// Model that owns effort embedded in an authored model selection. Omitted for independent reasoning-effort overrides and legacy events.
 	ReasoningEffortModel *string `json:"reasoningEffortModel,omitempty"`
 	// Reasoning summary mode used for model calls, if applicable (e.g. "none", "concise", "detailed")
@@ -2795,6 +2926,9 @@ func (*SessionSnapshotRewindData) Type() SessionEventType {
 
 // Session termination metrics including usage statistics, code changes, and shutdown reason
 type SessionShutdownData struct {
+	// Complete accounting state captured atomically with receipt watermarks.
+	// Internal: AccountingSnapshot is part of the SDK's internal API surface and is not intended for external use.
+	AccountingSnapshot *UsageGetMetricsResult `json:"accountingSnapshot,omitempty"`
 	// 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
@@ -2811,6 +2945,8 @@ type SessionShutdownData struct {
 	EventsFileSizeBytes *int64 `json:"eventsFileSizeBytes,omitempty"`
 	// Per-model usage breakdown, keyed by model identifier
 	ModelMetrics map[string]ShutdownModelMetric `json:"modelMetrics"`
+	// Provider/model accounting preserved for replay without consulting current provider selection.
+	ProviderModelMetrics []UsageMetricsProviderModelMetric `json:"providerModelMetrics,omitzero"`
 	// Unix timestamp (milliseconds) when the session started
 	SessionStartTime int64 `json:"sessionStartTime"`
 	// Whether the session ended normally ("routine") or due to a crash/fatal error ("error")
@@ -2829,6 +2965,8 @@ type SessionShutdownData struct {
 	// Total number of premium API requests used during the session
 	// Internal: TotalPremiumRequests is part of the SDK's internal API surface and is not intended for external use.
 	TotalPremiumRequests *float64 `json:"totalPremiumRequests,omitempty"`
+	// Per-source accounting sequence watermarks subsuming preceding usage receipts.
+	UsageAccountingWatermarks map[string]int64 `json:"usageAccountingWatermarks,omitzero"`
 }
 
 func (*SessionShutdownData) sessionEventData()      {}
@@ -3679,6 +3817,8 @@ type CommandsChangedCommand struct {
 
 // Token usage breakdown for the compaction LLM call (aligned with assistant.usage format)
 type CompactionCompleteCompactionTokensUsed struct {
+	// Whether the compaction's credit amount was reported for all, some, or none of its calls.
+	AiCreditsStatus *AiCreditsStatus `json:"aiCreditsStatus,omitempty"`
 	// Cached input tokens reused in the compaction LLM call
 	CacheReadTokens *int64 `json:"cacheReadTokens,omitempty"`
 	// Tokens written to prompt cache in the compaction LLM call
@@ -3692,8 +3832,14 @@ type CompactionCompleteCompactionTokensUsed struct {
 	InputTokens *int64 `json:"inputTokens,omitempty"`
 	// Model identifier used for the compaction LLM call
 	Model *string `json:"model,omitempty"`
+	// Model display name captured for the compaction call.
+	ModelDisplayName *string `json:"modelDisplayName,omitempty"`
 	// Output tokens produced by the compaction LLM call
 	OutputTokens *int64 `json:"outputTokens,omitempty"`
+	// Provider captured for the compaction call; absent when attribution is unknown.
+	Provider *ModelProviderRef `json:"provider,omitempty"`
+	// Number of model requests represented by this aggregated compaction usage
+	RequestCount *int64 `json:"requestCount,omitempty"`
 }
 
 // Per-request cost and usage data from the CAPI copilot_usage response field
@@ -4086,6 +4232,10 @@ type MCPServersLoadedServer struct {
 
 // Content-free structural summary of the failing request for diagnosing malformed 4xx calls
 type ModelCallFailureRequestFingerprint struct {
+	// Summed byte length of opaque or encrypted reasoning payloads
+	EncryptedContentBytes *int64 `json:"encryptedContentBytes,omitempty"`
+	// Summed byte length of inline image payloads (data URLs and base64 sources)
+	ImageBytes *int64 `json:"imageBytes,omitempty"`
 	// Total number of image content parts
 	ImagePartCount int64 `json:"imagePartCount"`
 	// Image parts whose media type cannot be determined (rejected by strict providers)
@@ -4096,6 +4246,8 @@ type ModelCallFailureRequestFingerprint struct {
 	MessageCount int64 `json:"messageCount"`
 	// Tool calls whose name is missing or empty (rejected by strict providers)
 	NamelessToolCallCount int64 `json:"namelessToolCallCount"`
+	// Number of messages carrying opaque or encrypted reasoning
+	ReasoningItemCount *int64 `json:"reasoningItemCount,omitempty"`
 	// Total number of tool calls across assistant messages
 	ToolCallCount int64 `json:"toolCallCount"`
 	// Number of "tool" result messages in the request
@@ -4450,6 +4602,8 @@ type PermissionPromptRequestWrite struct {
 	CanOfferSessionApproval bool `json:"canOfferSessionApproval"`
 	// Unified diff showing the proposed changes
 	Diff string `json:"diff"`
+	// Complete before/after text previews captured while planning this request. Omitted when a complete preview is unavailable, including pre-read sandbox requests and non-UTF-8 files. Missing sides mean creation or deletion, not unavailable content.
+	FileEdits []PermissionWriteFileEdit `json:"fileEdits,omitzero"`
 	// Path of the file being written to
 	FileName string `json:"fileName"`
 	// Human-readable description of the intended file change
@@ -4779,6 +4933,8 @@ type PermissionRequestWrite struct {
 	CanOfferSessionApproval bool `json:"canOfferSessionApproval"`
 	// Unified diff showing the proposed changes
 	Diff string `json:"diff"`
+	// Complete before/after text previews captured while planning this request. Omitted when a complete preview is unavailable, including pre-read sandbox requests and non-UTF-8 files. Missing sides mean creation or deletion, not unavailable content.
+	FileEdits []PermissionWriteFileEdit `json:"fileEdits,omitzero"`
 	// Path of the file being written to
 	FileName string `json:"fileName"`
 	// Human-readable description of the intended file change
@@ -4977,6 +5133,22 @@ type PermissionSandboxPathGrant struct {
 	RemovedReadonlyPaths []string `json:"removedReadonlyPaths,omitzero"`
 }
 
+// A named, complete UTF-8 text snapshot for a pending file operation.
+type PermissionWriteFileContent struct {
+	// Complete file contents, including an empty string for an empty file.
+	Content string `json:"content"`
+	// Absolute path in the session filesystem namespace.
+	Path string `json:"path"`
+}
+
+// Complete text snapshots for one proposed file change. At least one side is present. Different before and after paths describe a move.
+type PermissionWriteFileEdit struct {
+	// Complete file content the operation plans to write. Absent only when the file is being deleted.
+	After *PermissionWriteFileContent `json:"after,omitempty"`
+	// File content read while planning the operation. Absent only when the file is being created.
+	Before *PermissionWriteFileContent `json:"before,omitempty"`
+}
+
 // A model-facing binary result as persisted: full inline data, a size-omitted marker, or a deduplicated asset reference
 // Experimental: PersistedBinaryResult is part of an experimental API and may change or be removed.
 type PersistedBinaryResult interface {
@@ -5705,6 +5877,16 @@ type ToolExecutionStartToolDescriptionMetaUI struct {
 	Visibility []ToolExecutionStartToolDescriptionMetaUIVisibility `json:"visibility,omitzero"`
 }
 
+// Ordered accounting identity assigned under the source session's emission lock.
+type UsageAccountingIdentity struct {
+	// Monotonically increasing sequence within the source session.
+	Sequence int64 `json:"sequence"`
+	// Session that assigned this accounting sequence.
+	SourceSessionID string `json:"sourceSessionId"`
+	// Existing API call identifier, or a runtime-generated identity when none was supplied.
+	UsageID string `json:"usageId"`
+}
+
 // Internal prompt-cache expiration state for one model
 // Internal: UsageCheckpointModelCacheState is an internal SDK API and is not part of the public surface.
 type UsageCheckpointModelCacheState struct {
@@ -6203,15 +6385,30 @@ const (
 	HumanResponseRecordedResponseResponseKindUserInput    HumanResponseRecordedResponseResponseKind = "user_input"
 )
 
+// Current phase of organization-required plugin preparation.
+// Experimental: ManagedPluginProgressPhase is part of an experimental API and may change or be removed.
+type ManagedPluginProgressPhase string
+
+const (
+	// Managed plugin preparation has completed.
+	ManagedPluginProgressPhaseComplete ManagedPluginProgressPhase = "complete"
+	// Managed settings are still resolving before plugin preparation can be planned.
+	ManagedPluginProgressPhaseInitializing ManagedPluginProgressPhase = "initializing"
+	// Required plugin content is being installed.
+	ManagedPluginProgressPhaseInstalling ManagedPluginProgressPhase = "installing"
+	// Installed required plugin content is being updated.
+	ManagedPluginProgressPhaseUpdating ManagedPluginProgressPhase = "updating"
+)
+
 // The category of runtime action that enterprise managed settings governed (blocked or capped)
 type ManagedSettingsEnforcedAction string
 
 const (
-	// An attempt to turn on a bypass-permissions ("yolo") escalation was refused or capped because policy disables bypass-permissions mode.
+	// An attempt to enter a permission mode governed by managed policy was refused or capped. The `setting` and `escalation` fields identify whether this was bypass permissions or Assisted Permissions.
 	ManagedSettingsEnforcedActionBypassPermissionsBlocked ManagedSettingsEnforcedAction = "bypass_permissions_blocked"
 )
 
-// For a `bypass_permissions_blocked` action, which permission-escalation primitive was refused
+// For a `bypass_permissions_blocked` action, which permission-mode or escalation primitive was refused
 type ManagedSettingsEnforcedEscalation string
 
 const (
@@ -6219,7 +6416,7 @@ const (
 	ManagedSettingsEnforcedEscalationAllowAll ManagedSettingsEnforcedEscalation = "allow_all"
 	// Automatic approval of all tool permission requests.
 	ManagedSettingsEnforcedEscalationApproveAll ManagedSettingsEnforcedEscalation = "approve_all"
-	// Assisted mode — keeps normal prompt paths and adds an LLM recommendation, distinct from allow-all.
+	// Assisted Permissions — uses an LLM review to reduce prompts, distinct from allow-all and not a hard security boundary.
 	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"
@@ -6378,6 +6575,64 @@ const (
 	ModelCallFinishedOutcomeSuccess ModelCallFinishedOutcome = "success"
 )
 
+// Content-Encoding applied to the request body sent on the wire
+type ModelCallRequestBodyEncoding string
+
+const (
+	// The request body was sent gzip-compressed.
+	ModelCallRequestBodyEncodingGzip ModelCallRequestBodyEncoding = "gzip"
+	// The request body was sent uncompressed (including every WebSocket request).
+	ModelCallRequestBodyEncodingIdentity ModelCallRequestBodyEncoding = "identity"
+	// The request body was sent zstd-compressed.
+	ModelCallRequestBodyEncodingZstd ModelCallRequestBodyEncoding = "zstd"
+)
+
+// Normalized cause of the WebSocket failure that triggered the HTTP fallback
+type ModelCallWebSocketFallbackErrorKind string
+
+const (
+	// The peer closed the WebSocket.
+	ModelCallWebSocketFallbackErrorKindClosedByPeer ModelCallWebSocketFallbackErrorKind = "closed_by_peer"
+	// The runtime closed the WebSocket itself.
+	ModelCallWebSocketFallbackErrorKindClosedLocally ModelCallWebSocketFallbackErrorKind = "closed_locally"
+	// The WebSocket request could not be built.
+	ModelCallWebSocketFallbackErrorKindConfiguration ModelCallWebSocketFallbackErrorKind = "configuration"
+	// The peer refused the TCP connection.
+	ModelCallWebSocketFallbackErrorKindConnectionRefused ModelCallWebSocketFallbackErrorKind = "connection_refused"
+	// The connection was reset, aborted, or ended mid-stream without a close.
+	ModelCallWebSocketFallbackErrorKindConnectionReset ModelCallWebSocketFallbackErrorKind = "connection_reset"
+	// DNS resolution of the WebSocket host failed.
+	ModelCallWebSocketFallbackErrorKindDns ModelCallWebSocketFallbackErrorKind = "dns"
+	// The upgrade or request was rejected with an HTTP status.
+	ModelCallWebSocketFallbackErrorKindHTTPStatus ModelCallWebSocketFallbackErrorKind = "http_status"
+	// The socket was already closed before it was used.
+	ModelCallWebSocketFallbackErrorKindNotConnected ModelCallWebSocketFallbackErrorKind = "not_connected"
+	// A failure that maps onto none of the other kinds.
+	ModelCallWebSocketFallbackErrorKindOther ModelCallWebSocketFallbackErrorKind = "other"
+	// A WebSocket protocol violation or an undecodable frame.
+	ModelCallWebSocketFallbackErrorKindProtocol ModelCallWebSocketFallbackErrorKind = "protocol"
+	// A WebSocket connect or read timed out.
+	ModelCallWebSocketFallbackErrorKindTimeout ModelCallWebSocketFallbackErrorKind = "timeout"
+	// The TLS handshake or a TLS record failed.
+	ModelCallWebSocketFallbackErrorKindTls ModelCallWebSocketFallbackErrorKind = "tls"
+)
+
+// Why a WebSocket-capable model call was carried by the HTTP fallback
+type ModelCallWebSocketFallbackReason string
+
+const (
+	// The WebSocket returned a retryable API error.
+	ModelCallWebSocketFallbackReasonAPIError ModelCallWebSocketFallbackReason = "api_error"
+	// The WebSocket connection could not be established.
+	ModelCallWebSocketFallbackReasonConnectFailed ModelCallWebSocketFallbackReason = "connect_failed"
+	// No usable WebSocket connection was available for the request.
+	ModelCallWebSocketFallbackReasonConnectionUnavailable ModelCallWebSocketFallbackReason = "connection_unavailable"
+	// Sending the request over the WebSocket failed.
+	ModelCallWebSocketFallbackReasonSendFailed ModelCallWebSocketFallbackReason = "send_failed"
+	// The WebSocket transport failed before any output reached the consumer.
+	ModelCallWebSocketFallbackReasonTransportFailed ModelCallWebSocketFallbackReason = "transport_failed"
+)
+
 // Why the session no longer has an explicitly selected model.
 type ModelDeselectedReason string
 
@@ -6440,6 +6695,14 @@ const (
 	PermissionApprovalEvaluationReasonCodeArgumentBindingUnreviewable PermissionApprovalEvaluationReasonCode = "argument-binding-unreviewable"
 	// The judge was skipped because authorization extraction could not safely establish a complete recent history.
 	PermissionApprovalEvaluationReasonCodeAuthorizationHistoryIncomplete PermissionApprovalEvaluationReasonCode = "authorization-history-incomplete"
+	// A code source was excluded from review by content exclusion policy.
+	PermissionApprovalEvaluationReasonCodeContentExcluded PermissionApprovalEvaluationReasonCode = "content-excluded"
+	// The shell command used a code source computed at run time.
+	PermissionApprovalEvaluationReasonCodeDynamicSource PermissionApprovalEvaluationReasonCode = "dynamic-source"
+	// A code-bearing executable exceeded the binding size limit.
+	PermissionApprovalEvaluationReasonCodeExecutableTooLarge PermissionApprovalEvaluationReasonCode = "executable-too-large"
+	// A code-bearing executable could not be inspected.
+	PermissionApprovalEvaluationReasonCodeExecutableUnavailable PermissionApprovalEvaluationReasonCode = "executable-unavailable"
 	// Assisted approval was inactive for this request.
 	PermissionApprovalEvaluationReasonCodeInactive PermissionApprovalEvaluationReasonCode = "inactive"
 	// The request inherited an outcome from another decision.
@@ -6476,6 +6739,8 @@ const (
 	PermissionApprovalEvaluationReasonCodeShellEnvironmentUnreviewable PermissionApprovalEvaluationReasonCode = "shell-environment-unreviewable"
 	// The script snapshot exceeded the size limit.
 	PermissionApprovalEvaluationReasonCodeTooLarge PermissionApprovalEvaluationReasonCode = "too-large"
+	// The shell command referenced more code sources than can be reviewed.
+	PermissionApprovalEvaluationReasonCodeTooManySources PermissionApprovalEvaluationReasonCode = "too-many-sources"
 	// Script review was unavailable.
 	PermissionApprovalEvaluationReasonCodeUnavailable PermissionApprovalEvaluationReasonCode = "unavailable"
 	// Attribution is missing or outside the supported vocabulary.
@@ -6486,6 +6751,10 @@ const (
 	PermissionApprovalEvaluationReasonCodeUnrepresentablePath PermissionApprovalEvaluationReasonCode = "unrepresentable-path"
 	// The script invocation could not be reviewed.
 	PermissionApprovalEvaluationReasonCodeUnreviewableScriptInvocation PermissionApprovalEvaluationReasonCode = "unreviewable-script-invocation"
+	// The shell command could not be analyzed for execution evidence.
+	PermissionApprovalEvaluationReasonCodeUnsupportedCommandShape PermissionApprovalEvaluationReasonCode = "unsupported-command-shape"
+	// The shell command used a code source that cannot be bound for review.
+	PermissionApprovalEvaluationReasonCodeUnsupportedSource PermissionApprovalEvaluationReasonCode = "unsupported-source"
 )
 
 // Direction stored in a historical extractor claim. Current runtimes do not apply it.
@@ -6644,7 +6913,7 @@ const (
 	PlanChangedOperationUpdate PlanChangedOperation = "update"
 )
 
-// Auto preferences that Copilot API can recommend.
+// Enabled Auto preferences that Copilot API can recommend.
 type RecommendedAutoTier string
 
 const (
diff --git a/go/session.go b/go/session.go
index 45113a59ac..870b3f836f 100644
--- a/go/session.go
+++ b/go/session.go
@@ -62,9 +62,10 @@ type Session struct {
 	transcriptRecovery          *TranscriptRecoveryReport
 	client                      *jsonrpc2.Client
 	clientSessionAPIs           *rpc.ClientSessionAPIHandlers
-	handlers                    []sessionHandler
+	handlers                    []*sessionHandler
 	nextHandlerID               uint64
 	handlerMutex                sync.RWMutex
+	gracefulRetirement          bool
 	toolHandlers                map[string]ToolHandler
 	toolHandlersM               sync.RWMutex
 	setToolsOnce                sync.Once
@@ -93,6 +94,8 @@ type Session struct {
 	elicitationMu               sync.RWMutex
 	canvasHandler               CanvasHandler
 	canvasMu                    sync.RWMutex
+	skillProvider               SkillProvider
+	skillProviderMu             sync.RWMutex
 	bearerTokenProviders        map[string]BearerTokenProvider
 	bearerTokenMu               sync.RWMutex
 	releaseGitHubTokenProvider  func()
@@ -221,6 +224,24 @@ func (s *Session) getCanvasHandler() CanvasHandler {
 	return s.canvasHandler
 }
 
+func (s *Session) registerSkillProvider(provider SkillProvider) {
+	s.skillProviderMu.Lock()
+	defer s.skillProviderMu.Unlock()
+	s.skillProvider = provider
+}
+
+func (s *Session) getSkillProvider() SkillProvider {
+	s.skillProviderMu.RLock()
+	defer s.skillProviderMu.RUnlock()
+	return s.skillProvider
+}
+
+func (s *Session) clearSkillProvider() {
+	s.skillProviderMu.Lock()
+	s.skillProvider = nil
+	s.skillProviderMu.Unlock()
+}
+
 // registerBearerTokenProviders installs per-provider [BearerTokenProvider] callbacks
 // for BYOK providers configured with managed-identity / on-demand bearer-token
 // auth, keyed by provider name.
@@ -406,7 +427,7 @@ func newSession(
 		managedSettings:   managedSettings,
 		client:            client,
 		clientSessionAPIs: &rpc.ClientSessionAPIHandlers{},
-		handlers:          make([]sessionHandler, 0),
+		handlers:          make([]*sessionHandler, 0),
 		toolHandlers:      make(map[string]ToolHandler),
 		commandHandlers:   make(map[string]CommandHandler),
 		eventCh:           make(chan SessionEvent, 128),
@@ -493,7 +514,7 @@ func (s *Session) SendPrompt(ctx context.Context, prompt string) (string, error)
 //
 // Events are still delivered to handlers registered via [Session.On] while waiting.
 // Synchronous handlers registered before this call finish processing the completing
-// root session.idle event before it returns successfully.
+// root session.idle event before it returns successfully, unless the session retires.
 // This does not wait for asynchronous work started by a handler.
 // Sub-agent events with a non-empty AgentID do not complete the wait or supply its reply.
 //
@@ -503,7 +524,7 @@ func (s *Session) SendPrompt(ctx context.Context, prompt string) (string, error)
 //     Controls how long to wait; does not abort in-flight agent work.
 //
 // Returns the final assistant message event, or nil if none was received.
-// Returns an error if the timeout is reached or the connection fails.
+// Returns an error if the timeout is reached, the session is closed, or the connection fails.
 //
 // Example:
 //
@@ -528,34 +549,56 @@ func (s *Session) SendAndWait(ctx context.Context, options MessageOptions) (*Ses
 		defer cancel()
 	}
 
-	idleCh := make(chan struct{}, 1)
-	errCh := make(chan error, 1)
+	type outcome struct {
+		event *SessionEvent
+		err   error
+	}
+	terminalCh := make(chan outcome, 1)
+	dispatchedCh := make(chan struct{}, 1)
 	var lastAssistantMessage *SessionEvent
-	var mu sync.Mutex
+	completed := false
+	finish := func(result outcome) {
+		if !completed {
+			completed = true
+			terminalCh <- result
+		}
+	}
 
-	unsubscribe := s.On(func(event SessionEvent) {
-		if event.AgentID != nil && *event.AgentID != "" {
+	// Observe the result before user callbacks can retire the current dispatch.
+	unobserve := s.on(func(event SessionEvent) {
+		if completed || (event.AgentID != nil && *event.AgentID != "") {
 			return
 		}
 		switch d := event.Data.(type) {
 		case *AssistantMessageData:
-			mu.Lock()
 			eventCopy := event
 			lastAssistantMessage = &eventCopy
-			mu.Unlock()
 		case *SessionIdleData:
 			if d.Mode != nil && *d.Mode == SessionModeAutopilot {
 				break
 			}
-			select {
-			case idleCh <- struct{}{}:
-			default:
-			}
+			finish(outcome{event: lastAssistantMessage})
 		case *SessionErrorData:
-			select {
-			case errCh <- fmt.Errorf("session error: %s", d.Message):
-			default:
+			finish(outcome{err: fmt.Errorf("session error: %s", d.Message)})
+		}
+	}, true)
+	defer unobserve()
+	unsubscribe := s.On(func(event SessionEvent) {
+		if event.AgentID != nil && *event.AgentID != "" {
+			return
+		}
+		switch data := event.Data.(type) {
+		case *SessionIdleData:
+			if data.Mode != nil && *data.Mode == SessionModeAutopilot {
+				return
 			}
+		case *SessionErrorData:
+		default:
+			return
+		}
+		select {
+		case dispatchedCh <- struct{}{}:
+		default:
 		}
 	})
 	defer unsubscribe()
@@ -566,16 +609,27 @@ func (s *Session) SendAndWait(ctx context.Context, options MessageOptions) (*Ses
 	}
 
 	select {
-	case <-idleCh:
-		mu.Lock()
-		result := lastAssistantMessage
-		mu.Unlock()
-		return result, nil
-	case err := <-errCh:
-		return nil, err
+	case <-dispatchedCh:
+	case <-s.eventDone:
+		s.handlerMutex.RLock()
+		graceful := s.gracefulRetirement
+		s.handlerMutex.RUnlock()
+		if !graceful {
+			select {
+			case <-dispatchedCh:
+			default:
+				return nil, errors.New("session closed before response completed")
+			}
+		}
 	case <-ctx.Done():
 		return nil, fmt.Errorf("waiting for session.idle: %w", ctx.Err())
 	}
+	select {
+	case result := <-terminalCh:
+		return result.event, result.err
+	default:
+		return nil, errors.New("session closed before response completed")
+	}
 }
 
 // SendPromptAndWait is a convenience wrapper for [Session.SendAndWait] that
@@ -595,6 +649,8 @@ func (s *Session) SendPromptAndWait(ctx context.Context, prompt string) (*Sessio
 //
 // The returned function can be called to unsubscribe the handler. It is safe
 // to call the unsubscribe function multiple times.
+// Unsubscribing also removes an entry from dispatch snapshots if it has not started.
+// Registration after the session closes is logged and returns a no-op unsubscribe.
 //
 // Example:
 //
@@ -610,12 +666,28 @@ func (s *Session) SendPromptAndWait(ctx context.Context, prompt string) (*Sessio
 //	// Later, to stop receiving events:
 //	unsubscribe()
 func (s *Session) On(handler SessionEventHandler) func() {
+	return s.on(handler, false)
+}
+
+func (s *Session) on(handler SessionEventHandler, prepend bool) func() {
 	s.handlerMutex.Lock()
 	defer s.handlerMutex.Unlock()
 
+	select {
+	case <-s.eventDone:
+		log.Printf("Cannot register an event handler on closed session %s", s.SessionID)
+		return func() {}
+	default:
+	}
+
 	id := s.nextHandlerID
 	s.nextHandlerID++
-	s.handlers = append(s.handlers, sessionHandler{id: id, fn: handler})
+	entry := &sessionHandler{id: id, fn: handler}
+	if prepend {
+		s.handlers = append([]*sessionHandler{entry}, s.handlers...)
+	} else {
+		s.handlers = append(s.handlers, entry)
+	}
 
 	// Return unsubscribe function
 	return func() {
@@ -624,6 +696,7 @@ func (s *Session) On(handler SessionEventHandler) func() {
 
 		for i, h := range s.handlers {
 			if h.id == id {
+				h.fn = nil
 				s.handlers = append(s.handlers[:i], s.handlers[i+1:]...)
 				break
 			}
@@ -638,7 +711,9 @@ func (s *Session) On(handler SessionEventHandler) func() {
 //
 // This method is internal and typically called when creating a session with tools.
 func (s *Session) registerTools(tools []Tool) {
-	s.replaceToolHandlers(buildToolHandlerMap(tools))
+	if err := s.replaceToolHandlers(buildToolHandlerMap(tools)); err != nil {
+		log.Printf("Cannot register tools on session %s: %v", s.SessionID, err)
+	}
 }
 
 func buildToolHandlerMap(tools []Tool) map[string]ToolHandler {
@@ -652,10 +727,16 @@ func buildToolHandlerMap(tools []Tool) map[string]ToolHandler {
 	return handlers
 }
 
-func (s *Session) replaceToolHandlers(handlers map[string]ToolHandler) {
+func (s *Session) replaceToolHandlers(handlers map[string]ToolHandler) error {
 	s.toolHandlersM.Lock()
 	defer s.toolHandlersM.Unlock()
+	select {
+	case <-s.eventDone:
+		return errors.New("session closed before tool handlers could be installed")
+	default:
+	}
 	s.toolHandlers = handlers
+	return nil
 }
 
 // getToolHandler retrieves a registered tool handler by name.
@@ -727,14 +808,16 @@ func (s *Session) registerExitPlanModeHandler(handler ExitPlanModeRequestHandler
 	s.exitPlanModeHandler = handler
 }
 
-func (s *Session) getExitPlanModeHandler() ExitPlanModeRequestHandler {
-	s.exitPlanModeMu.RLock()
-	defer s.exitPlanModeMu.RUnlock()
-	return s.exitPlanModeHandler
-}
-
 func (s *Session) handleExitPlanModeRequest(request ExitPlanModeRequest) (ExitPlanModeResult, error) {
-	handler := s.getExitPlanModeHandler()
+	s.exitPlanModeMu.RLock()
+	select {
+	case <-s.eventDone:
+		s.exitPlanModeMu.RUnlock()
+		return ExitPlanModeResult{}, errors.New("session closed before exit-plan-mode request")
+	default:
+	}
+	handler := s.exitPlanModeHandler
+	s.exitPlanModeMu.RUnlock()
 	if handler == nil {
 		return ExitPlanModeResult{Approved: true}, nil
 	}
@@ -748,14 +831,16 @@ func (s *Session) registerAutoModeSwitchHandler(handler AutoModeSwitchRequestHan
 	s.autoModeSwitchHandler = handler
 }
 
-func (s *Session) getAutoModeSwitchHandler() AutoModeSwitchRequestHandler {
-	s.autoModeSwitchMu.RLock()
-	defer s.autoModeSwitchMu.RUnlock()
-	return s.autoModeSwitchHandler
-}
-
 func (s *Session) handleAutoModeSwitchRequest(request AutoModeSwitchRequest) (AutoModeSwitchResponse, error) {
-	handler := s.getAutoModeSwitchHandler()
+	s.autoModeSwitchMu.RLock()
+	select {
+	case <-s.eventDone:
+		s.autoModeSwitchMu.RUnlock()
+		return "", errors.New("session closed before auto-mode-switch request")
+	default:
+	}
+	handler := s.autoModeSwitchHandler
+	s.autoModeSwitchMu.RUnlock()
 	if handler == nil {
 		return AutoModeSwitchResponseNo, nil
 	}
@@ -775,17 +860,18 @@ func (s *Session) registerHooks(hooks *SessionHooks) {
 	s.hooks = hooks
 }
 
-// getHooks returns the currently registered hooks, or nil.
-func (s *Session) getHooks() *SessionHooks {
-	s.hooksMux.RLock()
-	defer s.hooksMux.RUnlock()
-	return s.hooks
-}
-
 // handleHooksInvoke handles a hook invocation from the Copilot CLI.
 // This is an internal method called by the SDK when the CLI invokes a hook.
 func (s *Session) handleHooksInvoke(hookType string, rawInput json.RawMessage) (any, error) {
-	hooks := s.getHooks()
+	s.hooksMux.RLock()
+	select {
+	case <-s.eventDone:
+		s.hooksMux.RUnlock()
+		return nil, errors.New("session closed before hook invocation")
+	default:
+	}
+	hooks := s.hooks
+	s.hooksMux.RUnlock()
 
 	if hooks == nil {
 		return nil, nil
@@ -948,6 +1034,12 @@ type systemMessageTransformResponse struct {
 // This is an internal method called by the SDK when the CLI requests section transforms.
 func (s *Session) handleSystemMessageTransform(sections map[string]systemMessageTransformSection) (systemMessageTransformResponse, error) {
 	s.transformMu.Lock()
+	select {
+	case <-s.eventDone:
+		s.transformMu.Unlock()
+		return systemMessageTransformResponse{}, errors.New("session closed before system message transform")
+	default:
+	}
 	callbacks := s.transformCallbacks
 	s.transformMu.Unlock()
 
@@ -1467,7 +1559,11 @@ func (s *Session) dispatchEvent(event SessionEvent) {
 	broadcastHandled := false
 	switch data := event.Data.(type) {
 	case *ExternalToolRequestedData:
-		s.startExternalTool(data)
+		var agentID string
+		if event.AgentID != nil {
+			agentID = *event.AgentID
+		}
+		s.startExternalTool(data, agentID)
 		broadcastHandled = true
 	case *ExternalToolCompletedData:
 		s.cancelExternalTool(data.RequestID)
@@ -1489,6 +1585,12 @@ func (s *Session) dispatchEvent(event SessionEvent) {
 // others from receiving the event.
 func (s *Session) processEvents() {
 	for {
+		select {
+		case <-s.eventDone:
+			return
+		default:
+		}
+
 		var event SessionEvent
 		select {
 		case event = <-s.eventCh:
@@ -1497,13 +1599,23 @@ func (s *Session) processEvents() {
 		}
 
 		s.handlerMutex.RLock()
-		handlers := make([]SessionEventHandler, 0, len(s.handlers))
-		for _, h := range s.handlers {
-			handlers = append(handlers, h.fn)
-		}
+		handlers := append([]*sessionHandler(nil), s.handlers...)
 		s.handlerMutex.RUnlock()
 
-		for _, handler := range handlers {
+		for _, entry := range handlers {
+			s.handlerMutex.RLock()
+			select {
+			case <-s.eventDone:
+				s.handlerMutex.RUnlock()
+				return
+			default:
+			}
+			handler := entry.fn
+			s.handlerMutex.RUnlock()
+			if handler == nil {
+				continue
+			}
+
 			func() {
 				defer func() {
 					if r := recover(); r != nil {
@@ -1516,11 +1628,77 @@ func (s *Session) processEvents() {
 	}
 }
 
-// stopEventProcessing stops the session event consumer without making an RPC.
+// stopEventProcessing signals the consumer to stop without making an RPC or
+// waiting for a user handler that may itself be stopping the client.
+// It releases registered callbacks, including unadmitted event snapshot entries.
 // CreateSession/ResumeSession use this when a locally registered session fails
 // before it can be returned to the caller.
 func (s *Session) stopEventProcessing() {
-	s.closeOnce.Do(func() { close(s.eventDone) })
+	s.retireEventProcessing(false)
+}
+
+func (s *Session) retireEventProcessing(graceful bool) {
+	s.closeOnce.Do(func() {
+		s.handlerMutex.Lock()
+		s.gracefulRetirement = graceful
+		close(s.eventDone)
+		for _, handler := range s.handlers {
+			handler.fn = nil
+		}
+		s.handlers = nil
+		s.handlerMutex.Unlock()
+
+		s.clearSkillProvider()
+		s.releaseGitHubTokenProviderRegistration()
+
+		s.toolHandlersM.Lock()
+		s.toolHandlers = nil
+		s.toolHandlersM.Unlock()
+
+		s.permissionMux.Lock()
+		s.permissionHandler = nil
+		s.permissionMux.Unlock()
+
+		s.mcpAuthMu.Lock()
+		s.mcpAuthHandler = nil
+		s.mcpAuthMu.Unlock()
+
+		s.userInputMux.Lock()
+		s.userInputHandler = nil
+		s.userInputMux.Unlock()
+
+		s.exitPlanModeMu.Lock()
+		s.exitPlanModeHandler = nil
+		s.exitPlanModeMu.Unlock()
+
+		s.autoModeSwitchMu.Lock()
+		s.autoModeSwitchHandler = nil
+		s.autoModeSwitchMu.Unlock()
+
+		s.hooksMux.Lock()
+		s.hooks = nil
+		s.hooksMux.Unlock()
+
+		s.transformMu.Lock()
+		s.transformCallbacks = nil
+		s.transformMu.Unlock()
+
+		s.commandHandlersMu.Lock()
+		s.commandHandlers = nil
+		s.commandHandlersMu.Unlock()
+
+		s.elicitationMu.Lock()
+		s.elicitationHandler = nil
+		s.elicitationMu.Unlock()
+
+		s.canvasMu.Lock()
+		s.canvasHandler = nil
+		s.canvasMu.Unlock()
+
+		s.bearerTokenMu.Lock()
+		s.bearerTokenProviders = nil
+		s.bearerTokenMu.Unlock()
+	})
 }
 
 // handleBroadcastEvent handles broadcast request events by executing local handlers
@@ -1615,7 +1793,7 @@ func (s *Session) handleBroadcastEvent(event SessionEvent) {
 	}
 }
 
-func (s *Session) startExternalTool(data *ExternalToolRequestedData) {
+func (s *Session) startExternalTool(data *ExternalToolRequestedData, agentID string) {
 	handler, ok := s.getToolHandler(data.ToolName)
 	if !ok {
 		return
@@ -1649,7 +1827,7 @@ func (s *Session) startExternalTool(data *ExternalToolRequestedData) {
 	s.pendingExternalTools[data.RequestID] = pending
 	s.pendingExternalToolsM.Unlock()
 
-	go s.executeToolAndRespond(data.RequestID, data.ToolName, data.ToolCallID, data.Arguments, handler, pending)
+	go s.executeToolAndRespond(data.RequestID, data.ToolName, data.ToolCallID, agentID, data.Arguments, handler, pending)
 }
 
 func (s *Session) cancelExternalTool(requestID string) {
@@ -1684,7 +1862,7 @@ func (s *Session) claimExternalTool(requestID string, pending *pendingExternalTo
 }
 
 // executeToolAndRespond executes a tool handler and sends the result back via RPC.
-func (s *Session) executeToolAndRespond(requestID, toolName, toolCallID string, arguments any, handler ToolHandler, pending *pendingExternalTool) {
+func (s *Session) executeToolAndRespond(requestID, toolName, toolCallID, agentID string, arguments any, handler ToolHandler, pending *pendingExternalTool) {
 	ctx := pending.ctx
 	defer func() {
 		s.pendingExternalToolsM.Lock()
@@ -1713,6 +1891,8 @@ func (s *Session) executeToolAndRespond(requestID, toolName, toolCallID string,
 		ToolName:     toolName,
 		Arguments:    arguments,
 		TraceContext: ctx,
+		AgentID:      agentID,
+		RequestID:    requestID,
 	}
 
 	// The built-in tool-search tool receives a snapshot of the session's
@@ -1895,6 +2075,7 @@ func (s *Session) GetEvents(ctx context.Context) ([]SessionEvent, error) {
 //	    log.Printf("Failed to disconnect session: %v", err)
 //	}
 func (s *Session) Disconnect() error {
+	s.clearSkillProvider()
 	s.cancelPendingExternalTools()
 	result, err := s.client.Request(context.Background(), "session.detach", sessionDetachRequest{SessionID: s.SessionID})
 	if err == nil {
@@ -1912,29 +2093,7 @@ func (s *Session) Disconnect() error {
 	// Local cleanup always runs, even if the detach RPC failed, so callers
 	// don't leak in-memory resources (event goroutines, registered
 	// providers/handlers) just because the runtime couldn't be reached.
-	s.stopEventProcessing()
-	s.releaseGitHubTokenProviderRegistration()
-
-	// Clear handlers
-	s.handlerMutex.Lock()
-	s.handlers = nil
-	s.handlerMutex.Unlock()
-
-	s.toolHandlersM.Lock()
-	s.toolHandlers = nil
-	s.toolHandlersM.Unlock()
-
-	s.permissionMux.Lock()
-	s.permissionHandler = nil
-	s.permissionMux.Unlock()
-
-	s.commandHandlersMu.Lock()
-	s.commandHandlers = nil
-	s.commandHandlersMu.Unlock()
-
-	s.elicitationMu.Lock()
-	s.elicitationHandler = nil
-	s.elicitationMu.Unlock()
+	s.retireEventProcessing(true)
 
 	if err != nil {
 		return fmt.Errorf("failed to disconnect session: %w", err)
@@ -2123,7 +2282,7 @@ func toolDefinitionsForSetTools(tools []Tool) []rpc.ProtocolExternalToolDefiniti
 // not block later calls. If ctx is done before the request is sent, for example
 // while an earlier SetTools call is still in flight, nothing is sent. Once the
 // request is sent, ctx only bounds the wait: an accepted replacement still
-// installs its handlers.
+// installs its handlers unless the session has since closed.
 //
 // The agent sees the new tools from its next model request, which can fall
 // within a turn in progress. A model request already in flight was made with the
@@ -2161,8 +2320,7 @@ func (s *Session) SetTools(ctx context.Context, tools []Tool) error {
 			done <- fmt.Errorf("failed to set tools: %w", err)
 			return
 		}
-		s.replaceToolHandlers(handlers)
-		done <- nil
+		done <- s.replaceToolHandlers(handlers)
 	}()
 
 	select {
diff --git a/go/session_retirement_test.go b/go/session_retirement_test.go
new file mode 100644
index 0000000000..44c646d261
--- /dev/null
+++ b/go/session_retirement_test.go
@@ -0,0 +1,364 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+
+package copilot
+
+import (
+	"context"
+	"fmt"
+	"strings"
+	"testing"
+	"time"
+)
+
+func TestSession_RetirementClearsCallbackRoots(t *testing.T) {
+	session, cleanup := newTestSession()
+	t.Cleanup(cleanup)
+	session.On(func(SessionEvent) {})
+	entry := session.handlers[0]
+	session.registerTools([]Tool{{Name: "tool", Handler: func(ToolInvocation) (ToolResult, error) { return ToolResult{}, nil }}})
+	session.registerPermissionHandler(PermissionHandler.ApproveAll)
+	session.registerMCPAuthHandler(func(MCPAuthRequest, MCPAuthInvocation) (*MCPAuthResult, error) { return nil, nil })
+	session.registerUserInputHandler(func(UserInputRequest, UserInputInvocation) (UserInputResponse, error) {
+		return UserInputResponse{}, nil
+	})
+	session.registerExitPlanModeHandler(func(ExitPlanModeRequest, ExitPlanModeInvocation) (ExitPlanModeResult, error) {
+		return ExitPlanModeResult{}, nil
+	})
+	session.registerAutoModeSwitchHandler(func(AutoModeSwitchRequest, AutoModeSwitchInvocation) (AutoModeSwitchResponse, error) {
+		return AutoModeSwitchResponseNo, nil
+	})
+	hooks := &SessionHooks{OnSessionEnd: func(SessionEndHookInput, HookInvocation) (*SessionEndHookOutput, error) {
+		return nil, nil
+	}}
+	session.registerHooks(hooks)
+	transforms := map[string]SectionTransformFn{"instructions": func(value string) (string, error) { return value, nil }}
+	session.registerTransformCallbacks(transforms)
+	session.registerCommands([]CommandDefinition{{Name: "command", Handler: func(CommandContext) error { return nil }}})
+	session.registerElicitationHandler(func(ElicitationContext) (ElicitationResult, error) { return ElicitationResult{}, nil })
+	session.registerCanvasHandler(&recordingCanvasHandler{})
+	session.registerBearerTokenProviders(map[string]BearerTokenProvider{
+		"provider": func(ProviderTokenArgs) (string, error) { return "token", nil },
+	})
+	releases := 0
+	session.setGitHubTokenProviderRegistrationRelease(func() { releases++ })
+
+	session.stopEventProcessing()
+	session.stopEventProcessing()
+
+	for name, retained := range map[string]bool{
+		"event registrations":  len(session.handlers) != 0,
+		"retained event entry": entry.fn != nil,
+		"tools":                session.toolHandlers != nil,
+		"permissions":          session.permissionHandler != nil,
+		"MCP auth":             session.mcpAuthHandler != nil,
+		"user input":           session.userInputHandler != nil,
+		"exit plan mode":       session.exitPlanModeHandler != nil,
+		"auto mode switch":     session.autoModeSwitchHandler != nil,
+		"hooks":                session.hooks != nil,
+		"transforms":           session.transformCallbacks != nil,
+		"commands":             session.commandHandlers != nil,
+		"elicitation":          session.elicitationHandler != nil,
+		"canvas":               session.canvasHandler != nil,
+		"bearer token":         session.bearerTokenProviders != nil,
+		"provider release":     session.releaseGitHubTokenProvider != nil,
+	} {
+		if retained {
+			t.Errorf("retired session retained %s", name)
+		}
+	}
+	if releases != 1 {
+		t.Errorf("provider releases = %d, want exactly one", releases)
+	}
+	if hooks.OnSessionEnd == nil || transforms["instructions"] == nil {
+		t.Fatal("retirement mutated caller-owned hook or transform configuration")
+	}
+}
+
+func TestSession_RetirementRejectsCallbackRebinding(t *testing.T) {
+	session, cleanup := newTestSession()
+	t.Cleanup(cleanup)
+	session.stopEventProcessing()
+	unsubscribe := session.On(func(SessionEvent) {})
+	if len(session.handlers) != 0 {
+		t.Fatal("retired session accepted a late event registration")
+	}
+	unsubscribe()
+	unsubscribe()
+	session.registerTools([]Tool{{Name: "late", Handler: func(ToolInvocation) (ToolResult, error) { return ToolResult{}, nil }}})
+	if session.toolHandlers != nil {
+		t.Fatal("retired session retained late tool handlers")
+	}
+}
+
+func TestSession_RetirementRejectsEmptyCallbackSuccess(t *testing.T) {
+	t.Run("hooks", func(t *testing.T) {
+		session, cleanup := newTestSession()
+		t.Cleanup(cleanup)
+		session.SessionID = "retirement-session"
+		client := &Client{sessions: map[string]*Session{session.SessionID: session}}
+		request := hooksInvokeRequest{SessionID: session.SessionID, Type: "preToolUse", Input: []byte("{}")}
+		if _, err := client.handleHooksInvoke(request); err != nil {
+			t.Fatalf("live session without hooks returned an error: %v", err)
+		}
+		session.stopEventProcessing()
+		_, err := client.handleHooksInvoke(request)
+		if err == nil || err.Code != -32603 || !strings.Contains(err.Message, "session closed") {
+			t.Fatalf("retired hook request error = %+v, want closed-session RPC error", err)
+		}
+	})
+	t.Run("system message transforms", func(t *testing.T) {
+		session, cleanup := newTestSession()
+		t.Cleanup(cleanup)
+		sections := map[string]systemMessageTransformSection{"instructions": {Content: "keep this policy"}}
+		response, err := session.handleSystemMessageTransform(sections)
+		if err != nil || response.Sections["instructions"].Content != "keep this policy" {
+			t.Fatalf("live session without transforms changed content: %+v, %v", response, err)
+		}
+		session.stopEventProcessing()
+		response, err = session.handleSystemMessageTransform(sections)
+		if err == nil || !strings.Contains(err.Error(), "session closed") {
+			t.Fatalf("retired transform response = %+v, %v; want closed error", response, err)
+		}
+	})
+}
+
+func TestSession_RetirementRejectsModeRequestDefaults(t *testing.T) {
+	t.Run("exit plan mode", func(t *testing.T) {
+		session, cleanup := newTestSession()
+		t.Cleanup(cleanup)
+		session.stopEventProcessing()
+		response, err := session.handleExitPlanModeRequest(ExitPlanModeRequest{})
+		if err == nil || !strings.Contains(err.Error(), "session closed") || response.Approved {
+			t.Fatalf("retired exit-plan-mode response = %+v, %v; want closed error without approval", response, err)
+		}
+	})
+	t.Run("auto mode switch", func(t *testing.T) {
+		session, cleanup := newTestSession()
+		t.Cleanup(cleanup)
+		session.stopEventProcessing()
+		response, err := session.handleAutoModeSwitchRequest(AutoModeSwitchRequest{})
+		if err == nil || !strings.Contains(err.Error(), "session closed") {
+			t.Fatalf("retired auto-mode-switch response = %+v, %v; want closed error", response, err)
+		}
+	})
+}
+
+func TestSession_SetToolsAcceptedAfterRetirementDoesNotRebind(t *testing.T) {
+	session, server := newSetToolsTestSession(t)
+	session.eventDone = make(chan struct{})
+	session.eventCh = make(chan SessionEvent, 2)
+	processingDone := make(chan struct{})
+	go func() {
+		defer close(processingDone)
+		session.processEvents()
+	}()
+	t.Cleanup(func() {
+		session.stopEventProcessing()
+		select {
+		case <-processingDone:
+		case <-time.After(2 * time.Second):
+			t.Error("event processing did not stop after retirement")
+		}
+	})
+	result := make(chan error, 1)
+	go func() {
+		result <- session.SetTools(context.Background(), []Tool{{
+			Name: "late", Handler: func(ToolInvocation) (ToolResult, error) { return ToolResult{}, nil },
+		}})
+	}()
+	request := server.expectRequest(t, "session.tools.set")
+	// Keep the transport alive so an accepted late ACK cannot mask local retirement.
+	session.stopEventProcessing()
+	server.respond(t, request.ID, map[string]any{})
+	err := awaitSetTools(t, result)
+	if err == nil || !strings.Contains(err.Error(), "session closed") {
+		t.Fatalf("SetTools error = %v, want session closed", err)
+	}
+
+	if _, ok := session.getToolHandler("late"); ok {
+		t.Fatal("accepted late replacement resurrected retired tool handlers")
+	}
+}
+
+func TestSession_SendAndWaitPreservesTerminalResultBeforeRetirement(t *testing.T) {
+	for _, terminal := range []string{"idle", "error", "missing", "error-then-idle", "idle-then-error"} {
+		for iteration := range 32 {
+			t.Run(fmt.Sprintf("%s-%d", terminal, iteration), func(t *testing.T) {
+				session, server := newSetToolsTestSession(t)
+				session.eventDone = make(chan struct{})
+				session.eventCh = make(chan SessionEvent, 2)
+				processingDone := make(chan struct{})
+				go func() {
+					defer close(processingDone)
+					session.processEvents()
+				}()
+				t.Cleanup(func() {
+					session.stopEventProcessing()
+					select {
+					case <-processingDone:
+					case <-time.After(2 * time.Second):
+						t.Error("event processing did not stop after retirement")
+					}
+				})
+				type response struct {
+					event *SessionEvent
+					err   error
+				}
+				result := make(chan response, 1)
+				go func() {
+					event, err := session.SendAndWait(context.Background(), MessageOptions{Prompt: "finish"})
+					result <- response{event: event, err: err}
+				}()
+				request := server.expectRequest(t, "session.send")
+				terminalObserved := make(chan struct{}, 2)
+				unsubscribe := session.On(func(event SessionEvent) {
+					switch event.Data.(type) {
+					case *SessionIdleData, *SessionErrorData:
+						terminalObserved <- struct{}{}
+					}
+				})
+				defer unsubscribe()
+				switch terminal {
+				case "idle", "idle-then-error":
+					session.dispatchEvent(SessionEvent{Data: &AssistantMessageData{Content: "finished"}})
+					session.dispatchEvent(SessionEvent{Data: &SessionIdleData{}})
+					if terminal == "idle-then-error" {
+						session.dispatchEvent(SessionEvent{Data: &SessionErrorData{Message: "later provider failure"}})
+					}
+				case "error", "error-then-idle":
+					session.dispatchEvent(SessionEvent{Data: &SessionErrorData{Message: "provider failed"}})
+					if terminal == "error-then-idle" {
+						session.dispatchEvent(SessionEvent{Data: &SessionIdleData{}})
+					}
+				}
+				if terminal != "missing" {
+					count := 1
+					if terminal == "error-then-idle" || terminal == "idle-then-error" {
+						count = 2
+					}
+					for range count {
+						select {
+						case <-terminalObserved:
+						case <-time.After(2 * time.Second):
+							t.Fatal("the wait did not receive its terminal event before retirement")
+						}
+					}
+				}
+				// Publish retirement before the send ACK so it can race the terminal result.
+				session.stopEventProcessing()
+				server.respond(t, request.ID, map[string]any{"messageId": "message-1"})
+				select {
+				case response := <-result:
+					switch terminal {
+					case "idle", "idle-then-error":
+						if response.err != nil || response.event == nil {
+							t.Fatalf("completed response = %+v, %v; want assistant message", response.event, response.err)
+						}
+						message, ok := response.event.Data.(*AssistantMessageData)
+						if !ok || message.Content != "finished" {
+							t.Fatalf("assistant response = %+v, want finished", response.event.Data)
+						}
+					case "error", "error-then-idle":
+						if response.err == nil || response.err.Error() != "session error: provider failed" {
+							t.Fatalf("terminal error = %v, want provider failure", response.err)
+						}
+					case "missing":
+						if response.err == nil || response.err.Error() != "session closed before response completed" {
+							t.Fatalf("incomplete response error = %v, want session closure", response.err)
+						}
+					}
+				case <-time.After(2 * time.Second):
+					t.Fatal("SendAndWait did not observe the acknowledged send and retirement")
+				}
+			})
+		}
+	}
+}
+
+func TestSession_SendAndWaitPreservesTerminalResultWhenHandlerDisconnects(t *testing.T) {
+	for _, terminal := range []string{"idle", "error"} {
+		t.Run(terminal, func(t *testing.T) {
+			t.Parallel()
+			session, server := newSetToolsTestSession(t)
+			session.eventDone = make(chan struct{})
+			session.eventCh = make(chan SessionEvent, 2)
+			processingDone := make(chan struct{})
+			go func() {
+				defer close(processingDone)
+				session.processEvents()
+			}()
+			t.Cleanup(func() {
+				session.stopEventProcessing()
+				select {
+				case <-processingDone:
+				case <-time.After(2 * time.Second):
+					t.Error("event processing did not stop after retirement")
+				}
+			})
+
+			disconnected := make(chan error, 1)
+			session.On(func(event SessionEvent) {
+				switch event.Data.(type) {
+				case *SessionIdleData, *SessionErrorData:
+					disconnected <- session.Disconnect()
+				}
+			})
+			lateCallback := make(chan struct{}, 1)
+			session.On(func(event SessionEvent) {
+				switch event.Data.(type) {
+				case *SessionIdleData, *SessionErrorData:
+					lateCallback <- struct{}{}
+				}
+			})
+			type response struct {
+				event *SessionEvent
+				err   error
+			}
+			result := make(chan response, 1)
+			ctx, cancel := context.WithTimeout(t.Context(), 5*time.Second)
+			defer cancel()
+			go func() {
+				event, err := session.SendAndWait(ctx, MessageOptions{Prompt: "finish"})
+				result <- response{event: event, err: err}
+			}()
+			send := server.expectRequest(t, "session.send")
+			session.dispatchEvent(SessionEvent{Data: &AssistantMessageData{Content: "finished"}})
+			if terminal == "idle" {
+				session.dispatchEvent(SessionEvent{Data: &SessionIdleData{}})
+			} else {
+				session.dispatchEvent(SessionEvent{Data: &SessionErrorData{Message: "provider failed"}})
+			}
+			detach := server.expectRequest(t, "session.detach")
+			server.respond(t, detach.ID, map[string]any{"success": true})
+			select {
+			case err := <-disconnected:
+				if err != nil {
+					t.Fatal("disconnect:", err)
+				}
+			case <-ctx.Done():
+				t.Fatal("terminal handler did not disconnect")
+			}
+			select {
+			case <-lateCallback:
+				t.Fatal("retirement admitted a later user callback from the same event snapshot")
+			default:
+			}
+			// Acknowledge only after the earlier handler has retired the session.
+			server.respond(t, send.ID, map[string]any{"messageId": "message-1"})
+			select {
+			case response := <-result:
+				if terminal == "error" {
+					if response.err == nil || response.err.Error() != "session error: provider failed" {
+						t.Fatalf("terminal error = %v, want provider failure", response.err)
+					}
+				} else if response.err != nil || response.event == nil {
+					t.Fatalf("completed response = %+v, %v; want assistant message", response.event, response.err)
+				} else if message, ok := response.event.Data.(*AssistantMessageData); !ok || message.Content != "finished" {
+					t.Fatalf("assistant response = %+v, want finished", response.event.Data)
+				}
+			case <-ctx.Done():
+				t.Fatal("SendAndWait did not preserve the terminal result")
+			}
+		})
+	}
+}
diff --git a/go/session_test.go b/go/session_test.go
index b66643544b..38a365fbd6 100644
--- a/go/session_test.go
+++ b/go/session_test.go
@@ -22,7 +22,7 @@ import (
 // Returns a cleanup function that stops the consumer.
 func newTestSession() (*Session, func()) {
 	s := &Session{
-		handlers:        make([]sessionHandler, 0),
+		handlers:        make([]*sessionHandler, 0),
 		commandHandlers: make(map[string]CommandHandler),
 		eventCh:         make(chan SessionEvent, 128),
 		eventDone:       make(chan struct{}),
@@ -71,6 +71,68 @@ func TestExternalToolCompletedCancelsBlockedHandler(t *testing.T) {
 	}
 }
 
+func TestToolInvocationNamesTheSubAgentAndRequestBehindTheCall(t *testing.T) {
+	session, cleanup := newTestSession()
+	defer cleanup()
+
+	invocations := make(chan ToolInvocation, 3)
+	session.registerTools([]Tool{{
+		Name: "calc",
+		Handler: func(invocation ToolInvocation) (ToolResult, error) {
+			invocations <- invocation
+			<-invocation.TraceContext.Done()
+			return ToolResult{}, invocation.TraceContext.Err()
+		},
+	}})
+
+	session.dispatchEvent(SessionEvent{
+		AgentID: ptr("task-agent-1"),
+		Data: &ExternalToolRequestedData{
+			RequestID:  "req-sub-agent",
+			SessionID:  "session-1",
+			ToolCallID: "tc-sub-agent",
+			ToolName:   "calc",
+		},
+	})
+	defer session.dispatchEvent(SessionEvent{Data: &ExternalToolCompletedData{RequestID: "req-sub-agent"}})
+	session.dispatchEvent(SessionEvent{Data: &ExternalToolRequestedData{
+		RequestID:  "req-root",
+		SessionID:  "session-1",
+		ToolCallID: "tc-root",
+		ToolName:   "calc",
+	}})
+	defer session.dispatchEvent(SessionEvent{Data: &ExternalToolCompletedData{RequestID: "req-root"}})
+	session.dispatchEvent(SessionEvent{
+		AgentID: ptr(""),
+		Data: &ExternalToolRequestedData{
+			RequestID:  "req-blank-agent",
+			SessionID:  "session-1",
+			ToolCallID: "tc-blank-agent",
+			ToolName:   "calc",
+		},
+	})
+	defer session.dispatchEvent(SessionEvent{Data: &ExternalToolCompletedData{RequestID: "req-blank-agent"}})
+
+	got := make(map[string]ToolInvocation)
+	for range 3 {
+		select {
+		case invocation := <-invocations:
+			got[invocation.ToolCallID] = invocation
+		case <-time.After(time.Second):
+			t.Fatal("tool handler did not start")
+		}
+	}
+	if sub := got["tc-sub-agent"]; sub.AgentID != "task-agent-1" || sub.RequestID != "req-sub-agent" {
+		t.Fatalf("sub-agent call: got AgentID %q RequestID %q", sub.AgentID, sub.RequestID)
+	}
+	if root := got["tc-root"]; root.AgentID != "" || root.RequestID != "req-root" {
+		t.Fatalf("root call: got AgentID %q RequestID %q", root.AgentID, root.RequestID)
+	}
+	if blank := got["tc-blank-agent"]; blank.AgentID != "" || blank.RequestID != "req-blank-agent" {
+		t.Fatalf("blank-agent call: got AgentID %q RequestID %q", blank.AgentID, blank.RequestID)
+	}
+}
+
 func TestDispatchEventReturnsAfterEventProcessingStops(t *testing.T) {
 	session := &Session{
 		eventCh:   make(chan SessionEvent),
@@ -314,7 +376,7 @@ func TestSession_SetToolsRunningCallsFinishOnOriginalHandler(t *testing.T) {
 		SessionID:  "session-1",
 		ToolCallID: "tool-call-1",
 		ToolName:   "lookup",
-	})
+	}, "")
 	select {
 	case <-started:
 	case <-time.After(2 * time.Second):
@@ -1064,7 +1126,7 @@ func checkSendAndWaitSkipsSubagentAndAutopilotContinuationIdle(t *testing.T, roo
 		SessionID: "session-1",
 		client:    client,
 		RPC:       rpc.NewSessionRPC(client, "session-1"),
-		handlers:  make([]sessionHandler, 0),
+		handlers:  make([]*sessionHandler, 0),
 		eventCh:   make(chan SessionEvent, 8),
 		eventDone: make(chan struct{}),
 	}
diff --git a/go/skill_provider_test.go b/go/skill_provider_test.go
new file mode 100644
index 0000000000..957b99aa8f
--- /dev/null
+++ b/go/skill_provider_test.go
@@ -0,0 +1,700 @@
+package copilot
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"log"
+	"strings"
+	"sync"
+	"testing"
+
+	"github.com/github/copilot-sdk/go/internal/jsonrpc2"
+	"github.com/github/copilot-sdk/go/rpc"
+)
+
+type testSkillProvider struct {
+	mu       sync.Mutex
+	skills   []rpc.SkillProviderDescriptor
+	markdown map[string]string
+	listErr  error
+	readErr  error
+	calls    []string
+}
+
+func (p *testSkillProvider) ListSkills(context.Context) ([]rpc.SkillProviderDescriptor, error) {
+	p.mu.Lock()
+	defer p.mu.Unlock()
+	p.calls = append(p.calls, "list")
+	if p.listErr != nil {
+		return nil, p.listErr
+	}
+	return p.skills, nil
+}
+
+func (p *testSkillProvider) ReadSkill(_ context.Context, name string) (string, error) {
+	p.mu.Lock()
+	defer p.mu.Unlock()
+	p.calls = append(p.calls, "read:"+name)
+	if p.readErr != nil {
+		return "", p.readErr
+	}
+	markdown, ok := p.markdown[name]
+	if !ok {
+		return "", ErrSkillNotFound
+	}
+	return markdown, nil
+}
+
+func (p *testSkillProvider) snapshotCalls() []string {
+	p.mu.Lock()
+	defer p.mu.Unlock()
+	return append([]string(nil), p.calls...)
+}
+
+var reviewSkillDescriptor = rpc.SkillProviderDescriptor{
+	Name:        "review",
+	Description: "Reviews code",
+}
+
+func newTestSkillProvider() *testSkillProvider {
+	return &testSkillProvider{
+		skills:   []rpc.SkillProviderDescriptor{reviewSkillDescriptor},
+		markdown: map[string]string{"review": "Review carefully."},
+	}
+}
+
+func TestSkillProviderSessionPayloads(t *testing.T) {
+	t.Run("omits flag without provider and sends flag with provider", func(t *testing.T) {
+		rpcClient, server, _ := newRuntimeShutdownRpcPair(t)
+		t.Cleanup(server.Stop)
+		client := &Client{
+			client:   rpcClient,
+			RPC:      rpc.NewServerRPC(rpcClient),
+			sessions: make(map[string]*Session),
+		}
+
+		createParams := make(chan json.RawMessage, 2)
+		resumeParams := make(chan json.RawMessage, 2)
+		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.resume", func(params json.RawMessage) (json.RawMessage, *jsonrpc2.Error) {
+			resumeParams <- append(json.RawMessage(nil), params...)
+			sessionID := sessionIDFromParams(t, params)
+			return []byte(`{"sessionId":"` + sessionID + `","workspacePath":"/workspace"}`), nil
+		})
+
+		if _, err := client.CreateSession(t.Context(), &SessionConfig{}); err != nil {
+			t.Fatalf("CreateSession without provider failed: %v", err)
+		}
+		if _, err := client.ResumeSession(t.Context(), "resume-without-provider", &ResumeSessionConfig{}); err != nil {
+			t.Fatalf("ResumeSession without provider failed: %v", err)
+		}
+		provider := newTestSkillProvider()
+		if _, err := client.CreateSession(t.Context(), &SessionConfig{SkillProvider: provider}); err != nil {
+			t.Fatalf("CreateSession with provider failed: %v", err)
+		}
+		if _, err := client.ResumeSession(t.Context(), "resume-with-provider", &ResumeSessionConfig{SkillProvider: provider}); err != nil {
+			t.Fatalf("ResumeSession with provider failed: %v", err)
+		}
+
+		assertSkillProviderFlag(t, <-createParams, false)
+		assertSkillProviderFlag(t, <-resumeParams, false)
+		assertSkillProviderFlag(t, <-createParams, true)
+		assertSkillProviderFlag(t, <-resumeParams, true)
+		if got := provider.snapshotCalls(); len(got) != 0 {
+			t.Fatalf("provider was called during open: %v", got)
+		}
+	})
+
+	t.Run("keeps empty mode enableSkills default with provider", func(t *testing.T) {
+		rpcClient, server, _ := newRuntimeShutdownRpcPair(t)
+		t.Cleanup(server.Stop)
+		client := &Client{
+			client:   rpcClient,
+			RPC:      rpc.NewServerRPC(rpcClient),
+			sessions: make(map[string]*Session),
+			options:  ClientOptions{Mode: ModeEmpty},
+		}
+
+		createParams := make(chan json.RawMessage, 1)
+		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 + `"}`), nil
+		})
+		server.SetRequestHandler("session.options.update", func(json.RawMessage) (json.RawMessage, *jsonrpc2.Error) {
+			return []byte(`{}`), nil
+		})
+
+		if _, err := client.CreateSession(t.Context(), &SessionConfig{
+			AvailableTools: []string{},
+			SkillProvider:  newTestSkillProvider(),
+		}); err != nil {
+			t.Fatalf("CreateSession failed: %v", err)
+		}
+		var payload map[string]any
+		if err := json.Unmarshal(<-createParams, &payload); err != nil {
+			t.Fatal(err)
+		}
+		if payload["enableSkills"] != false {
+			t.Fatalf("enableSkills = %v, want false", payload["enableSkills"])
+		}
+		if payload["hasSkillProvider"] != true {
+			t.Fatalf("hasSkillProvider = %v, want true", payload["hasSkillProvider"])
+		}
+	})
+}
+
+func TestSkillProviderServesEarlyCallbacksDuringOpen(t *testing.T) {
+	for _, method := range []string{"session.create", "session.resume"} {
+		t.Run(method, func(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()
+
+			earlyResult := make(chan rpc.SkillProviderListResult, 1)
+			server.SetRequestHandler(method, func(params json.RawMessage) (json.RawMessage, *jsonrpc2.Error) {
+				sessionID := sessionIDFromParams(t, params)
+				raw, err := server.Request(t.Context(), "skillProvider.list", map[string]any{"sessionId": sessionID})
+				if err != nil {
+					if rpcErr, ok := err.(*jsonrpc2.Error); ok {
+						return nil, rpcErr
+					}
+					return nil, &jsonrpc2.Error{Code: -32603, Message: err.Error()}
+				}
+				var result rpc.SkillProviderListResult
+				if err := json.Unmarshal(raw, &result); err != nil {
+					return nil, &jsonrpc2.Error{Code: -32603, Message: err.Error()}
+				}
+				earlyResult <- result
+				return []byte(`{"sessionId":"` + sessionID + `"}`), nil
+			})
+
+			provider := newTestSkillProvider()
+			if method == "session.create" {
+				if _, err := client.CreateSession(t.Context(), &SessionConfig{SkillProvider: provider}); err != nil {
+					t.Fatalf("CreateSession failed: %v", err)
+				}
+			} else if _, err := client.ResumeSession(t.Context(), "early-resume", &ResumeSessionConfig{SkillProvider: provider}); err != nil {
+				t.Fatalf("ResumeSession failed: %v", err)
+			}
+
+			got := <-earlyResult
+			if len(got.Skills) != 1 || got.Skills[0].Name != "review" {
+				t.Fatalf("early list result = %+v", got)
+			}
+		})
+	}
+}
+
+func TestSkillProviderRejectsCloudBeforeConnect(t *testing.T) {
+	provider := newTestSkillProvider()
+	client := &Client{}
+
+	_, err := client.CreateSession(t.Context(), &SessionConfig{
+		Cloud:         &CloudSessionOptions{},
+		SkillProvider: provider,
+	})
+
+	if err == nil || err.Error() != "Skill providers are not supported for cloud sessions." {
+		t.Fatalf("CreateSession error = %v", err)
+	}
+	if client.client != nil {
+		t.Fatal("client connected before rejecting cloud skill provider")
+	}
+	if got := provider.snapshotCalls(); len(got) != 0 {
+		t.Fatalf("provider was called: %v", got)
+	}
+}
+
+func TestSkillProviderDispatch(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()
+
+	provider := &testSkillProvider{
+		skills: []rpc.SkillProviderDescriptor{
+			reviewSkillDescriptor,
+			{
+				Name:                   "deploy",
+				Description:            "Deploys the service",
+				UserInvocable:          Bool(false),
+				DisableModelInvocation: Bool(true),
+				ArgumentHint:           String("[environment]"),
+			},
+		},
+		markdown: map[string]string{"deploy": "# deploy"},
+	}
+	session := newSession("dispatch-session", rpcClient, "", false)
+	session.registerSkillProvider(provider)
+	client.sessions[session.SessionID] = session
+
+	listRaw, rpcErr := server.Request(t.Context(), "skillProvider.list", map[string]any{"sessionId": session.SessionID})
+	if rpcErr != nil {
+		t.Fatalf("skillProvider.list failed: %v", rpcErr)
+	}
+	var listResult rpc.SkillProviderListResult
+	if err := json.Unmarshal(listRaw, &listResult); err != nil {
+		t.Fatal(err)
+	}
+	if len(listResult.Skills) != 2 || listResult.Skills[1].Name != "deploy" {
+		t.Fatalf("list result = %+v", listResult)
+	}
+
+	readRaw, rpcErr := server.Request(t.Context(), "skillProvider.read", map[string]any{
+		"sessionId": session.SessionID,
+		"name":      "deploy",
+	})
+	if rpcErr != nil {
+		t.Fatalf("skillProvider.read failed: %v", rpcErr)
+	}
+	var readResult rpc.SkillProviderReadResult
+	if err := json.Unmarshal(readRaw, &readResult); err != nil {
+		t.Fatal(err)
+	}
+	if readResult.Markdown == nil {
+		t.Fatal("markdown = nil, want # deploy")
+	}
+	if *readResult.Markdown != "# deploy" {
+		t.Fatalf("markdown = %q, want # deploy", *readResult.Markdown)
+	}
+	if got := provider.snapshotCalls(); strings.Join(got, ",") != "list,read:deploy" {
+		t.Fatalf("provider calls = %v", got)
+	}
+}
+
+func TestSkillProviderOmitsUnsetOptionalDescriptorFields(t *testing.T) {
+	data, err := json.Marshal(rpc.SkillProviderListResult{
+		Skills: []rpc.SkillProviderDescriptor{{Name: "review", Description: "Reviews code"}},
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+	var decoded map[string][]map[string]any
+	if err := json.Unmarshal(data, &decoded); err != nil {
+		t.Fatal(err)
+	}
+	skill := decoded["skills"][0]
+	for _, key := range []string{"argumentHint", "userInvocable", "disableModelInvocation"} {
+		if _, ok := skill[key]; ok {
+			t.Fatalf("%s should be omitted when unset: %s", key, data)
+		}
+	}
+}
+
+func TestSkillProviderEmptyListBecomesEmptyArray(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()
+	session := newSession("empty-list-session", rpcClient, "", false)
+	session.registerSkillProvider(&testSkillProvider{})
+	client.sessions[session.SessionID] = session
+
+	raw, rpcErr := server.Request(t.Context(), "skillProvider.list", map[string]any{"sessionId": session.SessionID})
+	if rpcErr != nil {
+		t.Fatalf("skillProvider.list failed: %v", rpcErr)
+	}
+	if string(raw) != `{"skills":[]}` {
+		t.Fatalf("list response = %s, want empty skills array", raw)
+	}
+}
+
+func TestSkillProviderErrorEnvelopes(t *testing.T) {
+	t.Run("read not found returns null markdown", func(t *testing.T) {
+		_, server, sessionID := skillProviderErrorHarness(t, newTestSkillProvider())
+		raw, rpcErr := server.Request(t.Context(), "skillProvider.read", map[string]any{
+			"sessionId": sessionID,
+			"name":      "missing",
+		})
+		if rpcErr != nil {
+			t.Fatalf("skillProvider.read failed: %v", rpcErr)
+		}
+		if string(raw) != `{"markdown":null}` {
+			t.Fatalf("read response = %s, want null markdown", raw)
+		}
+		var result rpc.SkillProviderReadResult
+		if err := json.Unmarshal(raw, &result); err != nil {
+			t.Fatal(err)
+		}
+		if result.Markdown != nil {
+			t.Fatalf("markdown = %q, want nil", *result.Markdown)
+		}
+	})
+
+	for _, method := range []string{"skillProvider.list", "skillProvider.read"} {
+		t.Run(method+" provider failure", func(t *testing.T) {
+			output := captureSkillProviderLog(t)
+			secret := errors.New("db-password-in-error")
+			provider := newTestSkillProvider()
+			operation := "listSkills"
+			if method == "skillProvider.list" {
+				provider.listErr = secret
+			} else {
+				provider.readErr = secret
+				operation = "readSkill"
+			}
+			_, server, sessionID := skillProviderErrorHarness(t, provider)
+			params := map[string]any{"sessionId": sessionID}
+			wantMessage := "Skill provider " + operation + " failed"
+			if method == "skillProvider.read" {
+				params["name"] = "review"
+			}
+
+			rpcErr := requestSkillProviderError(t, server, method, params)
+			if rpcErr.Code != -32603 || rpcErr.Message != wantMessage {
+				t.Fatalf("error = %+v, want generic message %q", rpcErr, wantMessage)
+			}
+			if rpcErr.Data != nil {
+				t.Fatalf("generic provider error data = %s, want omitted", rpcErr.Data)
+			}
+			if strings.Contains(rpcErr.Message, secret.Error()) {
+				t.Fatalf("provider error leaked secret: %q", rpcErr.Message)
+			}
+			wantLog := "skill provider " + operation + " failed: session_id=" + sessionID + " error=" + secret.Error()
+			if got := output.text(); !strings.Contains(got, wantLog) {
+				t.Fatalf("log = %q, want it to contain %q", got, wantLog)
+			}
+		})
+	}
+
+	t.Run("not-found classification panic", func(t *testing.T) {
+		captureSkillProviderLog(t)
+		provider := newTestSkillProvider()
+		provider.readErr = panickyIsError{}
+		_, server, sessionID := skillProviderErrorHarness(t, provider)
+
+		rpcErr := requestSkillProviderError(t, server, "skillProvider.read", map[string]any{
+			"sessionId": sessionID,
+			"name":      "review",
+		})
+		if rpcErr.Code != -32603 || rpcErr.Message != "Skill provider readSkill failed" || rpcErr.Data != nil {
+			t.Fatalf("error = %+v, want generic readSkill failure", rpcErr)
+		}
+	})
+
+	t.Run("unknown session", func(t *testing.T) {
+		_, server, _ := skillProviderErrorHarness(t, newTestSkillProvider())
+		rpcErr := requestSkillProviderError(t, server, "skillProvider.list", map[string]any{"sessionId": "missing"})
+		assertSkillProviderError(t, rpcErr, "No skill provider for session: missing")
+	})
+
+	for _, method := range []string{"skillProvider.list", "skillProvider.read"} {
+		t.Run(method+" provider panic", func(t *testing.T) {
+			output := captureSkillProviderLog(t)
+			_, server, sessionID := skillProviderErrorHarness(t, panickingSkillProvider{})
+			params := map[string]any{"sessionId": sessionID}
+			wantMessage := "Skill provider listSkills failed"
+			if method == "skillProvider.read" {
+				params["name"] = "review"
+				wantMessage = "Skill provider readSkill failed"
+			}
+
+			rpcErr := requestSkillProviderError(t, server, method, params)
+			if rpcErr.Code != -32603 || rpcErr.Message != wantMessage || rpcErr.Data != nil {
+				t.Fatalf("error = %+v, want generic message %q without data", rpcErr, wantMessage)
+			}
+			if got := output.text(); !strings.Contains(got, "panic=db-password-in-panic") {
+				t.Fatalf("log = %q, want the recovered panic value", got)
+			}
+		})
+	}
+
+	t.Run("no provider", func(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()
+		session := newSession("no-provider-session", rpcClient, "", false)
+		client.sessions[session.SessionID] = session
+
+		rpcErr := requestSkillProviderError(t, server, "skillProvider.read", map[string]any{
+			"sessionId": session.SessionID,
+			"name":      "review",
+		})
+		assertSkillProviderError(t, rpcErr, "No skill provider for session: no-provider-session")
+	})
+}
+
+func TestSkillProviderTeardown(t *testing.T) {
+	t.Run("disconnect clears provider", func(t *testing.T) {
+		client, server, provider, session := newSkillProviderOpenSession(t, "disconnect-session")
+
+		if err := session.Disconnect(); err != nil {
+			t.Fatalf("Disconnect failed: %v", err)
+		}
+		rpcErr := requestSkillProviderError(t, server, "skillProvider.list", map[string]any{"sessionId": session.SessionID})
+		assertSkillProviderError(t, rpcErr, "No skill provider for session: disconnect-session")
+		if got := provider.snapshotCalls(); len(got) != 0 {
+			t.Fatalf("provider was called after disconnect: %v", got)
+		}
+		_ = client
+	})
+
+	t.Run("delete clears provider", func(t *testing.T) {
+		client, server, provider, session := newSkillProviderOpenSession(t, "delete-session")
+		server.SetRequestHandler("session.delete", func(json.RawMessage) (json.RawMessage, *jsonrpc2.Error) {
+			return []byte(`{"success":true}`), nil
+		})
+
+		if err := client.DeleteSession(t.Context(), session.SessionID); err != nil {
+			t.Fatalf("DeleteSession failed: %v", err)
+		}
+		rpcErr := requestSkillProviderError(t, server, "skillProvider.list", map[string]any{"sessionId": session.SessionID})
+		assertSkillProviderError(t, rpcErr, "No skill provider for session: delete-session")
+		if got := provider.snapshotCalls(); len(got) != 0 {
+			t.Fatalf("provider was called after delete: %v", got)
+		}
+	})
+
+	t.Run("connection loss clears provider", func(t *testing.T) {
+		client, server, provider, session := newSkillProviderOpenSession(t, "closed-session")
+
+		client.handleConnectionClose()
+		rpcErr := requestSkillProviderError(t, server, "skillProvider.list", map[string]any{"sessionId": session.SessionID})
+		assertSkillProviderError(t, rpcErr, "No skill provider for session: closed-session")
+		if got := provider.snapshotCalls(); len(got) != 0 {
+			t.Fatalf("provider was called after connection loss: %v", got)
+		}
+	})
+
+	t.Run("failed create cleanup", func(t *testing.T) {
+		provider := newTestSkillProvider()
+		var sessionID string
+		client, server := newSkillProviderClient(t)
+		server.SetRequestHandler("session.create", func(params json.RawMessage) (json.RawMessage, *jsonrpc2.Error) {
+			sessionID = sessionIDFromParams(t, params)
+			return nil, &jsonrpc2.Error{Code: -32000, Message: "create failed"}
+		})
+
+		if _, err := client.CreateSession(t.Context(), &SessionConfig{SkillProvider: provider}); err == nil {
+			t.Fatal("CreateSession succeeded unexpectedly")
+		}
+		rpcErr := requestSkillProviderError(t, server, "skillProvider.list", map[string]any{"sessionId": sessionID})
+		assertSkillProviderError(t, rpcErr, "No skill provider for session: "+sessionID)
+		if got := provider.snapshotCalls(); len(got) != 0 {
+			t.Fatalf("provider was called after failed create: %v", got)
+		}
+	})
+
+	t.Run("failed resume cleanup", func(t *testing.T) {
+		provider := newTestSkillProvider()
+		client, server := newSkillProviderClient(t)
+		server.SetRequestHandler("session.resume", func(json.RawMessage) (json.RawMessage, *jsonrpc2.Error) {
+			return nil, &jsonrpc2.Error{Code: -32000, Message: "resume failed"}
+		})
+
+		if _, err := client.ResumeSession(t.Context(), "failed-resume", &ResumeSessionConfig{SkillProvider: provider}); err == nil {
+			t.Fatal("ResumeSession succeeded unexpectedly")
+		}
+		rpcErr := requestSkillProviderError(t, server, "skillProvider.list", map[string]any{"sessionId": "failed-resume"})
+		assertSkillProviderError(t, rpcErr, "No skill provider for session: failed-resume")
+		if got := provider.snapshotCalls(); len(got) != 0 {
+			t.Fatalf("provider was called after failed resume: %v", got)
+		}
+	})
+}
+
+func TestSkillProviderResumeRebinding(t *testing.T) {
+	t.Run("serves replacement provider", func(t *testing.T) {
+		client, server := newSkillProviderClient(t)
+		server.SetRequestHandler("session.create", func(params json.RawMessage) (json.RawMessage, *jsonrpc2.Error) {
+			sessionID := sessionIDFromParams(t, params)
+			return []byte(`{"sessionId":"` + sessionID + `"}`), nil
+		})
+		server.SetRequestHandler("session.resume", func(params json.RawMessage) (json.RawMessage, *jsonrpc2.Error) {
+			sessionID := sessionIDFromParams(t, params)
+			return []byte(`{"sessionId":"` + sessionID + `"}`), nil
+		})
+		original := newTestSkillProvider()
+		replacement := newTestSkillProvider()
+		replacement.markdown = map[string]string{"review": "replacement"}
+
+		session, err := client.CreateSession(t.Context(), &SessionConfig{
+			SessionID:     "rebind-session",
+			SkillProvider: original,
+		})
+		if err != nil {
+			t.Fatalf("CreateSession failed: %v", err)
+		}
+		if _, err := client.ResumeSession(t.Context(), session.SessionID, &ResumeSessionConfig{SkillProvider: replacement}); err != nil {
+			t.Fatalf("ResumeSession failed: %v", err)
+		}
+		raw, rpcErr := server.Request(t.Context(), "skillProvider.read", map[string]any{
+			"sessionId": session.SessionID,
+			"name":      "review",
+		})
+		if rpcErr != nil {
+			t.Fatalf("skillProvider.read failed: %v", rpcErr)
+		}
+		var result rpc.SkillProviderReadResult
+		if err := json.Unmarshal(raw, &result); err != nil {
+			t.Fatal(err)
+		}
+		if result.Markdown == nil {
+			t.Fatal("markdown = nil, want replacement")
+		}
+		if *result.Markdown != "replacement" {
+			t.Fatalf("markdown = %q, want replacement", *result.Markdown)
+		}
+		if got := original.snapshotCalls(); len(got) != 0 {
+			t.Fatalf("original provider was called after resume: %v", got)
+		}
+		if got := replacement.snapshotCalls(); strings.Join(got, ",") != "read:review" {
+			t.Fatalf("replacement provider calls = %v", got)
+		}
+	})
+
+	t.Run("resume without provider unbinds previous provider", func(t *testing.T) {
+		client, server, original, session := newSkillProviderOpenSession(t, "unbind-session")
+		server.SetRequestHandler("session.resume", func(params json.RawMessage) (json.RawMessage, *jsonrpc2.Error) {
+			sessionID := sessionIDFromParams(t, params)
+			return []byte(`{"sessionId":"` + sessionID + `"}`), nil
+		})
+
+		if _, err := client.ResumeSession(t.Context(), session.SessionID, &ResumeSessionConfig{}); err != nil {
+			t.Fatalf("ResumeSession failed: %v", err)
+		}
+		rpcErr := requestSkillProviderError(t, server, "skillProvider.list", map[string]any{"sessionId": session.SessionID})
+		assertSkillProviderError(t, rpcErr, "No skill provider for session: unbind-session")
+		if got := original.snapshotCalls(); len(got) != 0 {
+			t.Fatalf("original provider was called after unbound resume: %v", got)
+		}
+	})
+}
+
+type panickingSkillProvider struct{}
+
+func (panickingSkillProvider) ListSkills(context.Context) ([]rpc.SkillProviderDescriptor, error) {
+	panic("db-password-in-panic")
+}
+
+func (panickingSkillProvider) ReadSkill(context.Context, string) (string, error) {
+	panic("db-password-in-panic")
+}
+
+// panickyIsError panics when errors.Is asks whether it matches a target.
+type panickyIsError struct{}
+
+func (panickyIsError) Error() string { return "panicky" }
+
+func (panickyIsError) Is(error) bool { panic("classification panicked") }
+
+func captureSkillProviderLog(t *testing.T) *ahpTestLog {
+	t.Helper()
+	output := new(ahpTestLog)
+	previous := log.Writer()
+	log.SetOutput(output)
+	t.Cleanup(func() { log.SetOutput(previous) })
+	return output
+}
+
+func newSkillProviderClient(t *testing.T) (*Client, *jsonrpc2.Client) {
+	t.Helper()
+	rpcClient, server, _ := newRuntimeShutdownRpcPair(t)
+	t.Cleanup(server.Stop)
+	client := &Client{
+		client:   rpcClient,
+		RPC:      rpc.NewServerRPC(rpcClient),
+		sessions: make(map[string]*Session),
+	}
+	client.setupNotificationHandler()
+	return client, server
+}
+
+func newSkillProviderOpenSession(t *testing.T, sessionID string) (*Client, *jsonrpc2.Client, *testSkillProvider, *Session) {
+	t.Helper()
+	client, server := newSkillProviderClient(t)
+	provider := newTestSkillProvider()
+	server.SetRequestHandler("session.create", func(params json.RawMessage) (json.RawMessage, *jsonrpc2.Error) {
+		gotSessionID := sessionIDFromParams(t, params)
+		return []byte(`{"sessionId":"` + gotSessionID + `"}`), nil
+	})
+	server.SetRequestHandler("session.detach", func(json.RawMessage) (json.RawMessage, *jsonrpc2.Error) {
+		return []byte(`{"success":true}`), nil
+	})
+
+	session, err := client.CreateSession(t.Context(), &SessionConfig{
+		SessionID:     sessionID,
+		SkillProvider: provider,
+	})
+	if err != nil {
+		t.Fatalf("CreateSession failed: %v", err)
+	}
+	return client, server, provider, session
+}
+
+func skillProviderErrorHarness(t *testing.T, provider SkillProvider) (*Client, *jsonrpc2.Client, string) {
+	t.Helper()
+	client, server := newSkillProviderClient(t)
+	session := newSession("error-session", client.client, "", false)
+	session.registerSkillProvider(provider)
+	client.sessions[session.SessionID] = session
+	return client, server, session.SessionID
+}
+
+func requestSkillProviderError(t *testing.T, server *jsonrpc2.Client, method string, params map[string]any) *jsonrpc2.Error {
+	t.Helper()
+	_, err := server.Request(t.Context(), method, params)
+	if err == nil {
+		t.Fatalf("%s succeeded unexpectedly", method)
+	}
+	rpcErr, ok := err.(*jsonrpc2.Error)
+	if !ok {
+		t.Fatalf("%s error = %T %v, want *jsonrpc2.Error", method, err, err)
+	}
+	return rpcErr
+}
+
+func assertSkillProviderError(t *testing.T, rpcErr *jsonrpc2.Error, wantMessage string) {
+	t.Helper()
+	if rpcErr.Code != -32603 || rpcErr.Message != wantMessage {
+		t.Fatalf("error = %+v, want code -32603 message %q", rpcErr, wantMessage)
+	}
+	if rpcErr.Data != nil {
+		t.Fatalf("error data = %s, want omitted", rpcErr.Data)
+	}
+}
+
+func assertSkillProviderFlag(t *testing.T, params json.RawMessage, wantPresent bool) {
+	t.Helper()
+	var payload map[string]any
+	if err := json.Unmarshal(params, &payload); err != nil {
+		t.Fatalf("failed to decode request params: %v", err)
+	}
+	got, present := payload["hasSkillProvider"]
+	if !wantPresent {
+		if present {
+			t.Fatalf("hasSkillProvider = %v, want omitted", got)
+		}
+		return
+	}
+	if got != true {
+		t.Fatalf("hasSkillProvider = %v, want true", got)
+	}
+	if _, present := payload["skillProvider"]; present {
+		t.Fatalf("skillProvider callback was serialized: %v", payload["skillProvider"])
+	}
+}
diff --git a/go/types.go b/go/types.go
index af4fd783fb..6bf2eb3b5b 100644
--- a/go/types.go
+++ b/go/types.go
@@ -3,6 +3,7 @@ package copilot
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"time"
 
 	"github.com/github/copilot-sdk/go/rpc"
@@ -1251,6 +1252,8 @@ func (c MCPHTTPServerConfig) MarshalJSON() ([]byte, error) {
 
 // CustomAgentConfig configures a custom agent.
 type CustomAgentConfig struct {
+	// Hooks contains declarative actions keyed by event name, active only for this agent.
+	Hooks map[string][]map[string]any `json:"hooks,omitempty"`
 	// Name is the unique name of the custom agent
 	Name string `json:"name"`
 	// DisplayName is the display name for UI purposes
@@ -1322,6 +1325,16 @@ type LargeToolOutputConfig struct {
 	OutputDirectory string `json:"outputDir,omitempty"`
 }
 
+// ImageGenerationConfig opts in to an authorized Copilot image model.
+// Experimental: this API may change or be removed in a future release.
+// Omission disables on create/cold resume and preserves resident resume state.
+// Not persisted: re-supply after runtime restart. Policy, permissions, offline
+// mode, and tool filters still apply. BYOK image generation is not supported.
+type ImageGenerationConfig struct {
+	// Enabled opts in when true and disables image generation when false.
+	Enabled *bool `json:"enabled,omitempty"`
+}
+
 // ToolSearchConfig allows to configure tool search behavior.
 // Tool search defers tools to keep the model's active tool set small.
 // To override the tool-search tool's implementation, register a
@@ -1444,10 +1457,35 @@ const (
 	AskUserVariantElicitation AskUserVariant = "elicitation"
 )
 
+// ErrSkillNotFound is returned by [SkillProvider.ReadSkill] when a listed skill
+// is no longer available. It can be wrapped; the SDK checks it with [errors.Is].
+var ErrSkillNotFound = errors.New("skill not found")
+
+// SkillProvider supplies session-scoped skills from the SDK host.
+//
+// Experimental: this API may change or be removed in future SDK or CLI
+// releases. Implementations must be safe for concurrent calls.
+type SkillProvider interface {
+	// ListSkills returns catalog metadata for skills provided by this session.
+	// Return nil, nil to publish an empty catalog.
+	ListSkills(ctx context.Context) ([]rpc.SkillProviderDescriptor, error)
+	// ReadSkill returns the SKILL.md markdown for name. Return an error wrapping
+	// [ErrSkillNotFound] when the skill no longer exists. The markdown is
+	// ignored whenever a non-nil error is returned.
+	ReadSkill(ctx context.Context, name string) (string, error)
+}
+
 // SessionConfig configures a new session
 type SessionConfig struct {
 	// SessionID is an optional custom session ID
 	SessionID string
+	// Name names the session at creation, as session.name.set would, and is
+	// validated the same way: non-empty, no leading or trailing whitespace, at
+	// most 100 UTF-16 units, no control characters, and no double quotes. A name
+	// also makes the session persist from the start, so it can be listed and
+	// resumed without ever running a turn. Local sessions only: cloud creation
+	// rejects it.
+	Name string
 	// ClientName identifies the application using the SDK.
 	// Included in the User-Agent header for API requests.
 	ClientName string
@@ -1486,9 +1524,9 @@ type SessionConfig struct {
 	// of instruction files (AGENTS.md, .github/copilot-instructions.md, etc.) after
 	// successful file views.
 	EnableOnDemandInstructionDiscovery *bool
-	// EnableFileHooks, when non-nil, controls loading of file-based hooks from
-	// .github/hooks/. This is separate from the Hooks callback parameter which
-	// gates SDK hook event registration.
+	// EnableFileHooks, when non-nil, controls repository-origin file hooks from
+	// .github/hooks/ and trusted repository-configured roots. It does not control
+	// explicit HookDirectories or Hooks callbacks.
 	EnableFileHooks *bool
 	// EnableHostGitOperations, when non-nil, controls git operations on the host
 	// filesystem (branch detection, file status, commit history). When false, no
@@ -1641,15 +1679,41 @@ type SessionConfig struct {
 	// Agent is the name of the custom agent to activate when the session starts.
 	// Must match the Name of one of the agents in CustomAgents.
 	Agent string
-	// SkillDirectories is a list of directories to load skills from
+	// SkillDirectories contains explicit discovery-only skill roots, not filesystem grants.
+	// Available without EnableConfigDiscovery, subject to skill/managed disables.
+	// Relative paths resolve once when supplied against the request's effective WorkingDirectory;
+	// retained roots do not move on cwd changes. Nil and omission are equivalent;
+	// an empty non-nil list clears only the explicit SDK contribution.
 	SkillDirectories []string
+	// SkillProvider supplies ephemeral SDK-hosted skills for this session. The
+	// provider is never serialized or persisted; re-supply it when resuming.
+	//
+	// Experimental: this API may change or be removed in future SDK or CLI
+	// releases. Implementations must be safe for concurrent calls.
+	SkillProvider SkillProvider `json:"-"`
+	// AgentDirectories contains explicit discovery-only agent roots, separate from CustomAgents.
+	// No filesystem grant. Available without EnableConfigDiscovery, subject to source/managed
+	// disables. Relative paths resolve once when supplied against the request's effective
+	// WorkingDirectory; retained roots do not move. Nil and omission are equivalent;
+	// an empty non-nil list clears only the explicit SDK contribution.
+	AgentDirectories []string
+	// HookDirectories contains explicit discovery-only file-hook roots, separate from Hooks callbacks.
+	// No filesystem grant. Available without EnableConfigDiscovery or EnableFileHooks
+	// (repository-origin hooks only), subject to hook/managed disables. Relative paths resolve
+	// once when supplied against the request's effective WorkingDirectory; retained roots do not
+	// move. Nil and omission are equivalent; an empty non-nil list clears only the explicit SDK contribution.
+	HookDirectories []string
 	// PluginDirectories is a list of local filesystem paths to Open Plugins-format
 	// directories (https://open-plugins.com/) to load for this session.
 	// Relative paths resolve against WorkingDirectory (or the runtime cwd if unset).
 	// Treated as an explicit opt-in: plugin agents and rules load even when
 	// EnableConfigDiscovery is false.
 	PluginDirectories []string
-	// InstructionDirectories is a list of additional directories to search for custom instruction files
+	// InstructionDirectories contains explicit discovery-only instruction roots using existing SDK formats.
+	// No filesystem grant. Available without EnableConfigDiscovery, subject to instruction/managed
+	// disables. Relative paths resolve once when supplied against the request's effective
+	// WorkingDirectory; retained roots do not move. Nil and omission are equivalent;
+	// an empty non-nil list clears only the explicit SDK contribution.
 	InstructionDirectories []string
 	// DisabledSkills is a list of skill names to disable
 	DisabledSkills []string
@@ -1668,6 +1732,9 @@ type SessionConfig struct {
 	// defers rarely used tools behind a searchable index. When nil, the runtime
 	// default applies.
 	ToolSearch *ToolSearchConfig
+	// ImageGeneration is the non-persisted image generation opt-in.
+	// Experimental: this API may change or be removed in a future release.
+	ImageGeneration *ImageGenerationConfig
 	// Memory configures the memory feature for the session. When omitted, the
 	// runtime default applies.
 	Memory *MemoryConfiguration
@@ -1778,6 +1845,10 @@ type SessionConfig struct {
 	// be set; if omitted, the runtime is expected to reject session creation
 	// (fail-closed). Unset behaves exactly as before.
 	EnableManagedSettings *bool
+	// EnforceManagedModelDefaults, when true, enforces locked managed model
+	// controls for this session. Conflicting changes are rejected; overridable
+	// managed defaults remain mutable.
+	EnforceManagedModelDefaults *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
@@ -1821,6 +1892,9 @@ type ManagedSettingsPermissions struct {
 	// session. See the DisableBypassPermissionsMode constants for known values.
 	// Newer values are forwarded unchanged so runtime policies remain fail-closed.
 	DisableBypassPermissionsMode DisableBypassPermissionsMode `json:"disableBypassPermissionsMode,omitempty"`
+	// DisableAssistedPermissionsMode prevents Assisted Permissions from being
+	// activated when true. Nil or false imposes no restriction.
+	DisableAssistedPermissionsMode *bool `json:"disableAssistedPermissionsMode,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.
@@ -1828,6 +1902,11 @@ type ManagedSettingsPermissions struct {
 	// 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"`
+	// LimitTo is a closed-world host boundary expressed as Domain(hostname),
+	// Domain(IP), or Domain(*.example.com) rules. Schemes, ports, paths,
+	// queries, and fragments are rejected. Multiple managed layers intersect
+	// their lists. A present empty list denies all hosts.
+	LimitTo []string `json:"limitTo,omitzero"`
 }
 
 // ToolDefer controls whether a tool may be deferred (loaded lazily via tool
@@ -1887,6 +1966,22 @@ type ToolInvocation struct {
 	// disconnects, so background work must derive its own lifetime if it should
 	// outlive the invocation.
 	TraceContext context.Context
+
+	// AgentID is the sub-agent instance that issued this call (the AgentID of
+	// its session events). It is empty for a root-agent call, and for every
+	// call when the runtime does not attribute sub-agent tool calls.
+	//
+	// Experimental: this field may change or be removed.
+	AgentID string
+
+	// RequestID is the runtime request id of this call: the key
+	// session.tools.handlePendingToolCall and session.tools.listPendingRequests use.
+	// A root-agent call stays answerable after the session is resumed with
+	// pending work continued; a sub-agent's call can be answered only while that
+	// sub-agent is still running.
+	//
+	// Experimental: this field may change or be removed.
+	RequestID string
 }
 
 // ToolHandler executes a tool invocation.
@@ -2164,9 +2259,9 @@ type ResumeSessionConfig struct {
 	// EnableOnDemandInstructionDiscovery, when non-nil, controls on-demand discovery
 	// of instruction files after successful file views.
 	EnableOnDemandInstructionDiscovery *bool
-	// EnableFileHooks, when non-nil, controls loading of file-based hooks from
-	// .github/hooks/. This is separate from the Hooks callback parameter which
-	// gates SDK hook event registration.
+	// EnableFileHooks, when non-nil, controls repository-origin file hooks from
+	// .github/hooks/ and trusted repository-configured roots. It does not control
+	// explicit HookDirectories or Hooks callbacks.
 	EnableFileHooks *bool
 	// EnableHostGitOperations, when non-nil, controls git operations on the host
 	// filesystem.
@@ -2206,15 +2301,42 @@ type ResumeSessionConfig struct {
 	// Agent is the name of the custom agent to activate when the session starts.
 	// Must match the Name of one of the agents in CustomAgents.
 	Agent string
-	// SkillDirectories is a list of directories to load skills from
+	// SkillDirectories contains explicit discovery-only skill roots, not filesystem grants.
+	// Available without EnableConfigDiscovery, subject to skill/managed disables.
+	// Relative paths resolve once when supplied against the request's effective WorkingDirectory;
+	// retained roots do not move on cwd changes. Nil and omission are equivalent;
+	// an empty non-nil list clears only the explicit SDK contribution.
 	SkillDirectories []string
+	// SkillProvider supplies ephemeral SDK-hosted skills for this resumed
+	// session. Re-supply it on every resume; omitting it unbinds any previous
+	// provider.
+	//
+	// Experimental: this API may change or be removed in future SDK or CLI
+	// releases. Implementations must be safe for concurrent calls.
+	SkillProvider SkillProvider `json:"-"`
+	// AgentDirectories contains explicit discovery-only agent roots, separate from CustomAgents.
+	// No filesystem grant. Available without EnableConfigDiscovery, subject to source/managed
+	// disables. Relative paths resolve once when supplied against the request's effective
+	// WorkingDirectory; retained roots do not move. Nil and omission are equivalent;
+	// an empty non-nil list clears only the explicit SDK contribution.
+	AgentDirectories []string
+	// HookDirectories contains explicit discovery-only file-hook roots, separate from Hooks callbacks.
+	// No filesystem grant. Available without EnableConfigDiscovery or EnableFileHooks
+	// (repository-origin hooks only), subject to hook/managed disables. Relative paths resolve
+	// once when supplied against the request's effective WorkingDirectory; retained roots do not
+	// move. Nil and omission are equivalent; an empty non-nil list clears only the explicit SDK contribution.
+	HookDirectories []string
 	// PluginDirectories is a list of local filesystem paths to Open Plugins-format
 	// directories (https://open-plugins.com/) to load for this session.
 	// Relative paths resolve against WorkingDirectory (or the runtime cwd if unset).
 	// Treated as an explicit opt-in: plugin agents and rules load even when
 	// EnableConfigDiscovery is false.
 	PluginDirectories []string
-	// InstructionDirectories is a list of additional directories to search for custom instruction files
+	// InstructionDirectories contains explicit discovery-only instruction roots using existing SDK formats.
+	// No filesystem grant. Available without EnableConfigDiscovery, subject to instruction/managed
+	// disables. Relative paths resolve once when supplied against the request's effective
+	// WorkingDirectory; retained roots do not move. Nil and omission are equivalent;
+	// an empty non-nil list clears only the explicit SDK contribution.
 	InstructionDirectories []string
 	// DisabledSkills is a list of skill names to disable
 	DisabledSkills []string
@@ -2232,6 +2354,9 @@ type ResumeSessionConfig struct {
 	// defers rarely used tools behind a searchable index. When nil, the runtime
 	// default applies.
 	ToolSearch *ToolSearchConfig
+	// ImageGeneration is the non-persisted image generation opt-in.
+	// Experimental: this API may change or be removed in a future release.
+	ImageGeneration *ImageGenerationConfig
 	// Memory configures the memory feature for the session. When omitted, the
 	// runtime default applies.
 	Memory *MemoryConfiguration
@@ -2323,6 +2448,9 @@ 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
+	// EnforceManagedModelDefaults re-applies managed model lock enforcement on
+	// resume. See SessionConfig.EnforceManagedModelDefaults.
+	EnforceManagedModelDefaults *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
@@ -2453,6 +2581,8 @@ const (
 	AutoTierBalance = rpc.AutoTierBalance
 	// AutoTierIntelligence selects the intelligence routing tier.
 	AutoTierIntelligence = rpc.AutoTierIntelligence
+	// AutoTierFast selects the integrator-only latency preset.
+	AutoTierFast = rpc.AutoTierFast
 )
 
 // CapiSessionOptions configures provider-scoped Copilot API (CAPI) session behavior.
@@ -2772,6 +2902,7 @@ type SessionLifecycleHandler func(event SessionLifecycleEvent)
 type createSessionRequest struct {
 	Model                              string                                 `json:"model,omitempty"`
 	SessionID                          string                                 `json:"sessionId,omitempty"`
+	Name                               string                                 `json:"name,omitempty"`
 	ClientName                         string                                 `json:"clientName,omitempty"`
 	ReasoningEffort                    string                                 `json:"reasoningEffort,omitempty"`
 	ReasoningSummary                   ReasoningSummary                       `json:"reasoningSummary,omitempty"`
@@ -2826,14 +2957,18 @@ type createSessionRequest struct {
 	EnableHostGitOperations            *bool                                  `json:"enableHostGitOperations,omitempty"`
 	EnableSessionStore                 *bool                                  `json:"enableSessionStore,omitempty"`
 	EnableSkills                       *bool                                  `json:"enableSkills,omitempty"`
-	SkillDirectories                   []string                               `json:"skillDirectories,omitempty"`
+	HasSkillProvider                   *bool                                  `json:"hasSkillProvider,omitempty"`
+	SkillDirectories                   []string                               `json:"skillDirectories,omitzero"`
+	AgentDirectories                   []string                               `json:"agentDirectories,omitzero"`
+	HookDirectories                    []string                               `json:"hookDirectories,omitzero"`
 	PluginDirectories                  []string                               `json:"pluginDirectories,omitempty"`
-	InstructionDirectories             []string                               `json:"instructionDirectories,omitempty"`
+	InstructionDirectories             []string                               `json:"instructionDirectories,omitzero"`
 	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"`
+	ImageGeneration                    *ImageGenerationConfig                 `json:"imageGeneration,omitempty"`
 	Memory                             *MemoryConfiguration                   `json:"memory,omitempty"`
 	Commands                           []wireCommand                          `json:"commands,omitempty"`
 	RequestElicitation                 *bool                                  `json:"requestElicitation,omitempty"`
@@ -2852,6 +2987,7 @@ type createSessionRequest struct {
 	ExpAssignments                     *CopilotExpAssignmentResponse          `json:"expAssignments,omitempty"`
 	FeatureFlags                       *map[string]bool                       `json:"featureFlags,omitempty"`
 	EnableManagedSettings              *bool                                  `json:"enableManagedSettings,omitempty"`
+	EnforceManagedModelDefaults        *bool                                  `json:"enforceManagedModelDefaults,omitempty"`
 	ManagedSettings                    *ManagedSettings                       `json:"managedSettings,omitempty"`
 	Traceparent                        string                                 `json:"traceparent,omitempty"`
 	Tracestate                         string                                 `json:"tracestate,omitempty"`
@@ -2916,6 +3052,7 @@ type resumeSessionRequest struct {
 	EnableHostGitOperations            *bool                                  `json:"enableHostGitOperations,omitempty"`
 	EnableSessionStore                 *bool                                  `json:"enableSessionStore,omitempty"`
 	EnableSkills                       *bool                                  `json:"enableSkills,omitempty"`
+	HasSkillProvider                   *bool                                  `json:"hasSkillProvider,omitempty"`
 	DisableResume                      *bool                                  `json:"disableResume,omitempty"`
 	ContinuePendingWork                *bool                                  `json:"continuePendingWork,omitempty"`
 	AllowTranscriptRecovery            *bool                                  `json:"allowTranscriptRecovery,omitempty"`
@@ -2930,14 +3067,17 @@ type resumeSessionRequest struct {
 	CustomAgents                       []CustomAgentConfig                    `json:"customAgents,omitempty"`
 	DefaultAgent                       *DefaultAgentConfig                    `json:"defaultAgent,omitempty"`
 	Agent                              string                                 `json:"agent,omitempty"`
-	SkillDirectories                   []string                               `json:"skillDirectories,omitempty"`
+	SkillDirectories                   []string                               `json:"skillDirectories,omitzero"`
+	AgentDirectories                   []string                               `json:"agentDirectories,omitzero"`
+	HookDirectories                    []string                               `json:"hookDirectories,omitzero"`
 	PluginDirectories                  []string                               `json:"pluginDirectories,omitempty"`
-	InstructionDirectories             []string                               `json:"instructionDirectories,omitempty"`
+	InstructionDirectories             []string                               `json:"instructionDirectories,omitzero"`
 	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"`
+	ImageGeneration                    *ImageGenerationConfig                 `json:"imageGeneration,omitempty"`
 	Memory                             *MemoryConfiguration                   `json:"memory,omitempty"`
 	Commands                           []wireCommand                          `json:"commands,omitempty"`
 	RequestElicitation                 *bool                                  `json:"requestElicitation,omitempty"`
@@ -2956,6 +3096,7 @@ type resumeSessionRequest struct {
 	ExpAssignments                     *CopilotExpAssignmentResponse          `json:"expAssignments,omitempty"`
 	FeatureFlags                       *map[string]bool                       `json:"featureFlags,omitempty"`
 	EnableManagedSettings              *bool                                  `json:"enableManagedSettings,omitempty"`
+	EnforceManagedModelDefaults        *bool                                  `json:"enforceManagedModelDefaults,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 794a765fa8..81bb0f2c25 100644
--- a/go/zsession_events.go
+++ b/go/zsession_events.go
@@ -13,6 +13,7 @@ type (
 	AgentInterruptedCancelPhase                                    = rpc.AgentInterruptedCancelPhase
 	AgentInterruptedData                                           = rpc.AgentInterruptedData
 	AgentModelPolicy                                               = rpc.AgentModelPolicy
+	AiCreditsStatus                                                = rpc.AiCreditsStatus
 	AssistantFusionPhaseActivityData                               = rpc.AssistantFusionPhaseActivityData
 	AssistantFusionPhaseCompletedData                              = rpc.AssistantFusionPhaseCompletedData
 	AssistantFusionPhaseFailedData                                 = rpc.AssistantFusionPhaseFailedData
@@ -151,6 +152,8 @@ type (
 	HumanResponseRecordedResponseResponseKind                      = rpc.HumanResponseRecordedResponseResponseKind
 	HumanResponseRecordedResponseUserInput                         = rpc.HumanResponseRecordedResponseUserInput
 	IndexedSearchState                                             = rpc.IndexedSearchState
+	ManagedPermissionsContext                                      = rpc.ManagedPermissionsContext
+	ManagedPluginProgressPhase                                     = rpc.ManagedPluginProgressPhase
 	ManagedSettingsEnforcedAction                                  = rpc.ManagedSettingsEnforcedAction
 	ManagedSettingsEnforcedEscalation                              = rpc.ManagedSettingsEnforcedEscalation
 	ManagedSettingsResolvedData                                    = rpc.ManagedSettingsResolvedData
@@ -189,9 +192,14 @@ type (
 	ModelCallFinalResultData                                       = rpc.ModelCallFinalResultData
 	ModelCallFinishedData                                          = rpc.ModelCallFinishedData
 	ModelCallFinishedOutcome                                       = rpc.ModelCallFinishedOutcome
+	ModelCallRequestBodyEncoding                                   = rpc.ModelCallRequestBodyEncoding
 	ModelCallStartData                                             = rpc.ModelCallStartData
+	ModelCallWebSocketFallbackErrorKind                            = rpc.ModelCallWebSocketFallbackErrorKind
+	ModelCallWebSocketFallbackReason                               = rpc.ModelCallWebSocketFallbackReason
 	ModelChangeSource                                              = rpc.ModelChangeSource
 	ModelDeselectedReason                                          = rpc.ModelDeselectedReason
+	ModelProviderKind                                              = rpc.ModelProviderKind
+	ModelProviderRef                                               = rpc.ModelProviderRef
 	OmittedBinaryOmittedReason                                     = rpc.OmittedBinaryOmittedReason
 	OmittedBinaryResult                                            = rpc.OmittedBinaryResult
 	OmittedBinaryType                                              = rpc.OmittedBinaryType
@@ -272,6 +280,8 @@ type (
 	PermissionRule                                                 = rpc.PermissionRule
 	PermissionSandboxPathGrant                                     = rpc.PermissionSandboxPathGrant
 	PermissionSandboxPathGrantAccess                               = rpc.PermissionSandboxPathGrantAccess
+	PermissionWriteFileContent                                     = rpc.PermissionWriteFileContent
+	PermissionWriteFileEdit                                        = rpc.PermissionWriteFileEdit
 	PersistedBinaryImage                                           = rpc.PersistedBinaryImage
 	PersistedBinaryImageType                                       = rpc.PersistedBinaryImageType
 	PersistedBinaryResult                                          = rpc.PersistedBinaryResult
@@ -279,6 +289,17 @@ type (
 	PlanChangedOperation                                           = rpc.PlanChangedOperation
 	PossibleURL                                                    = rpc.PossibleURL
 	PromptCacheBreakData                                           = rpc.PromptCacheBreakData
+	ProviderMonthlyUsage                                           = rpc.ProviderMonthlyUsage
+	ProviderMonthlyUsageScope                                      = rpc.ProviderMonthlyUsageScope
+	ProviderMonthlyUsageState                                      = rpc.ProviderMonthlyUsageState
+	ProviderQuotaAccessState                                       = rpc.ProviderQuotaAccessState
+	ProviderQuotaAcquisitionStatus                                 = rpc.ProviderQuotaAcquisitionStatus
+	ProviderQuotaBudgetMetadata                                    = rpc.ProviderQuotaBudgetMetadata
+	ProviderQuotaCapacityState                                     = rpc.ProviderQuotaCapacityState
+	ProviderQuotaObservationKind                                   = rpc.ProviderQuotaObservationKind
+	ProviderQuotaQuantityKind                                      = rpc.ProviderQuotaQuantityKind
+	ProviderQuotaState                                             = rpc.ProviderQuotaState
+	ProviderQuotaUnit                                              = rpc.ProviderQuotaUnit
 	RawCitationLocation                                            = rpc.RawCitationLocation
 	RawHumanResponseRecordedResponse                               = rpc.RawHumanResponseRecordedResponse
 	RawPermissionPromptRequest                                     = rpc.RawPermissionPromptRequest
@@ -335,6 +356,7 @@ type (
 	SessionLimitsExhaustedRequestedData                            = rpc.SessionLimitsExhaustedRequestedData
 	SessionLimitsExhaustedResponse                                 = rpc.SessionLimitsExhaustedResponse
 	SessionLimitsExhaustedResponseAction                           = rpc.SessionLimitsExhaustedResponseAction
+	SessionManagedPluginProgressData                               = rpc.SessionManagedPluginProgressData
 	SessionManagedSettingsEnforcedData                             = rpc.SessionManagedSettingsEnforcedData
 	SessionManagedSettingsResolvedData                             = rpc.SessionManagedSettingsResolvedData
 	SessionMCPServerNeedsReconnectData                             = rpc.SessionMCPServerNeedsReconnectData
@@ -349,6 +371,7 @@ type (
 	SessionPermissionRecoveryData                                  = rpc.SessionPermissionRecoveryData
 	SessionPermissionsChangedData                                  = rpc.SessionPermissionsChangedData
 	SessionPlanChangedData                                         = rpc.SessionPlanChangedData
+	SessionQuotaObservationData                                    = rpc.SessionQuotaObservationData
 	SessionRemoteSteerableChangedData                              = rpc.SessionRemoteSteerableChangedData
 	SessionResumeData                                              = rpc.SessionResumeData
 	SessionScheduleCancelledData                                   = rpc.SessionScheduleCancelledData
@@ -462,6 +485,16 @@ type (
 	ToolUserRequestedData                             = rpc.ToolUserRequestedData
 	UIEphemeralQueryData                              = rpc.UIEphemeralQueryData
 	UIEphemeralQueryPhase                             = rpc.UIEphemeralQueryPhase
+	UsageAccountingIdentity                           = rpc.UsageAccountingIdentity
+	UsageGetMetricsResult                             = rpc.UsageGetMetricsResult
+	UsageMetricsAgentMetric                           = rpc.UsageMetricsAgentMetric
+	UsageMetricsCodeChanges                           = rpc.UsageMetricsCodeChanges
+	UsageMetricsModelMetric                           = rpc.UsageMetricsModelMetric
+	UsageMetricsModelMetricRequests                   = rpc.UsageMetricsModelMetricRequests
+	UsageMetricsModelMetricTokenDetail                = rpc.UsageMetricsModelMetricTokenDetail
+	UsageMetricsModelMetricUsage                      = rpc.UsageMetricsModelMetricUsage
+	UsageMetricsProviderModelMetric                   = rpc.UsageMetricsProviderModelMetric
+	UsageMetricsTokenDetail                           = rpc.UsageMetricsTokenDetail
 	UserInputCompletedData                            = rpc.UserInputCompletedData
 	UserInputRequestedData                            = rpc.UserInputRequestedData
 	UserMessageAgentMode                              = rpc.UserMessageAgentMode
@@ -505,6 +538,9 @@ const (
 	AgentInterruptedCancelPhasePreFirstToken                             = rpc.AgentInterruptedCancelPhasePreFirstToken
 	AgentModelPolicyPreferred                                            = rpc.AgentModelPolicyPreferred
 	AgentModelPolicyRequired                                             = rpc.AgentModelPolicyRequired
+	AiCreditsStatusComplete                                              = rpc.AiCreditsStatusComplete
+	AiCreditsStatusPartial                                               = rpc.AiCreditsStatusPartial
+	AiCreditsStatusUnavailable                                           = rpc.AiCreditsStatusUnavailable
 	AssistantMessageToolRequestCallerTypeProgram                         = rpc.AssistantMessageToolRequestCallerTypeProgram
 	AssistantMessageToolRequestTypeCustom                                = rpc.AssistantMessageToolRequestTypeCustom
 	AssistantMessageToolRequestTypeFunction                              = rpc.AssistantMessageToolRequestTypeFunction
@@ -554,7 +590,6 @@ const (
 	AutopilotObjectiveChangedStatusCapReached                            = rpc.AutopilotObjectiveChangedStatusCapReached
 	AutopilotObjectiveChangedStatusCompleted                             = rpc.AutopilotObjectiveChangedStatusCompleted
 	AutopilotObjectiveChangedStatusPaused                                = rpc.AutopilotObjectiveChangedStatusPaused
-	AutoTierFast                                                         = rpc.AutoTierFast
 	AutoTierSwitchFailureReasonPolicyRejected                            = rpc.AutoTierSwitchFailureReasonPolicyRejected
 	AutoTierSwitchFailureReasonRequestFailed                             = rpc.AutoTierSwitchFailureReasonRequestFailed
 	AutoTierSwitchFailureReasonSetupFailed                               = rpc.AutoTierSwitchFailureReasonSetupFailed
@@ -640,6 +675,10 @@ const (
 	IndexedSearchStateFailed                                             = rpc.IndexedSearchStateFailed
 	IndexedSearchStateReady                                              = rpc.IndexedSearchStateReady
 	IndexedSearchStateStarting                                           = rpc.IndexedSearchStateStarting
+	ManagedPluginProgressPhaseComplete                                   = rpc.ManagedPluginProgressPhaseComplete
+	ManagedPluginProgressPhaseInitializing                               = rpc.ManagedPluginProgressPhaseInitializing
+	ManagedPluginProgressPhaseInstalling                                 = rpc.ManagedPluginProgressPhaseInstalling
+	ManagedPluginProgressPhaseUpdating                                   = rpc.ManagedPluginProgressPhaseUpdating
 	ManagedSettingsEnforcedActionBypassPermissionsBlocked                = rpc.ManagedSettingsEnforcedActionBypassPermissionsBlocked
 	ManagedSettingsEnforcedEscalationAllowAll                            = rpc.ManagedSettingsEnforcedEscalationAllowAll
 	ManagedSettingsEnforcedEscalationApproveAll                          = rpc.ManagedSettingsEnforcedEscalationApproveAll
@@ -667,6 +706,7 @@ const (
 	MCPOauthRequestReasonRefresh                                         = rpc.MCPOauthRequestReasonRefresh
 	MCPOauthRequestReasonUpscope                                         = rpc.MCPOauthRequestReasonUpscope
 	MCPOauthRequiredStaticClientConfigGrantTypeClientCredentials         = rpc.MCPOauthRequiredStaticClientConfigGrantTypeClientCredentials
+	MCPServerSourceAccount                                               = rpc.MCPServerSourceAccount
 	MCPServerSourceBuiltin                                               = rpc.MCPServerSourceBuiltin
 	MCPServerSourceManaged                                               = rpc.MCPServerSourceManaged
 	MCPServerSourcePlugin                                                = rpc.MCPServerSourcePlugin
@@ -704,6 +744,26 @@ const (
 	ModelCallFinishedOutcomeError                                        = rpc.ModelCallFinishedOutcomeError
 	ModelCallFinishedOutcomeRejected                                     = rpc.ModelCallFinishedOutcomeRejected
 	ModelCallFinishedOutcomeSuccess                                      = rpc.ModelCallFinishedOutcomeSuccess
+	ModelCallRequestBodyEncodingGzip                                     = rpc.ModelCallRequestBodyEncodingGzip
+	ModelCallRequestBodyEncodingIdentity                                 = rpc.ModelCallRequestBodyEncodingIdentity
+	ModelCallRequestBodyEncodingZstd                                     = rpc.ModelCallRequestBodyEncodingZstd
+	ModelCallWebSocketFallbackErrorKindClosedByPeer                      = rpc.ModelCallWebSocketFallbackErrorKindClosedByPeer
+	ModelCallWebSocketFallbackErrorKindClosedLocally                     = rpc.ModelCallWebSocketFallbackErrorKindClosedLocally
+	ModelCallWebSocketFallbackErrorKindConfiguration                     = rpc.ModelCallWebSocketFallbackErrorKindConfiguration
+	ModelCallWebSocketFallbackErrorKindConnectionRefused                 = rpc.ModelCallWebSocketFallbackErrorKindConnectionRefused
+	ModelCallWebSocketFallbackErrorKindConnectionReset                   = rpc.ModelCallWebSocketFallbackErrorKindConnectionReset
+	ModelCallWebSocketFallbackErrorKindDns                               = rpc.ModelCallWebSocketFallbackErrorKindDns
+	ModelCallWebSocketFallbackErrorKindHTTPStatus                        = rpc.ModelCallWebSocketFallbackErrorKindHTTPStatus
+	ModelCallWebSocketFallbackErrorKindNotConnected                      = rpc.ModelCallWebSocketFallbackErrorKindNotConnected
+	ModelCallWebSocketFallbackErrorKindOther                             = rpc.ModelCallWebSocketFallbackErrorKindOther
+	ModelCallWebSocketFallbackErrorKindProtocol                          = rpc.ModelCallWebSocketFallbackErrorKindProtocol
+	ModelCallWebSocketFallbackErrorKindTimeout                           = rpc.ModelCallWebSocketFallbackErrorKindTimeout
+	ModelCallWebSocketFallbackErrorKindTls                               = rpc.ModelCallWebSocketFallbackErrorKindTls
+	ModelCallWebSocketFallbackReasonAPIError                             = rpc.ModelCallWebSocketFallbackReasonAPIError
+	ModelCallWebSocketFallbackReasonConnectFailed                        = rpc.ModelCallWebSocketFallbackReasonConnectFailed
+	ModelCallWebSocketFallbackReasonConnectionUnavailable                = rpc.ModelCallWebSocketFallbackReasonConnectionUnavailable
+	ModelCallWebSocketFallbackReasonSendFailed                           = rpc.ModelCallWebSocketFallbackReasonSendFailed
+	ModelCallWebSocketFallbackReasonTransportFailed                      = rpc.ModelCallWebSocketFallbackReasonTransportFailed
 	ModelChangeSourceAgent                                               = rpc.ModelChangeSourceAgent
 	ModelChangeSourceAutomatic                                           = rpc.ModelChangeSourceAutomatic
 	ModelChangeSourceAutoTierRecommendation                              = rpc.ModelChangeSourceAutoTierRecommendation
@@ -718,6 +778,8 @@ const (
 	ModelChangeSourceSettingsCommand                                     = rpc.ModelChangeSourceSettingsCommand
 	ModelChangeSourceStartup                                             = rpc.ModelChangeSourceStartup
 	ModelDeselectedReasonProviderWithdrawn                               = rpc.ModelDeselectedReasonProviderWithdrawn
+	ModelProviderKindCopilot                                             = rpc.ModelProviderKindCopilot
+	ModelProviderKindLoki                                                = rpc.ModelProviderKindLoki
 	OmittedBinaryOmittedReasonAssetUnavailable                           = rpc.OmittedBinaryOmittedReasonAssetUnavailable
 	OmittedBinaryOmittedReasonTooLarge                                   = rpc.OmittedBinaryOmittedReasonTooLarge
 	OmittedBinaryTypeImage                                               = rpc.OmittedBinaryTypeImage
@@ -736,6 +798,10 @@ const (
 	PermissionApprovalEvaluationReasonCodeActionTooLong                  = rpc.PermissionApprovalEvaluationReasonCodeActionTooLong
 	PermissionApprovalEvaluationReasonCodeArgumentBindingUnreviewable    = rpc.PermissionApprovalEvaluationReasonCodeArgumentBindingUnreviewable
 	PermissionApprovalEvaluationReasonCodeAuthorizationHistoryIncomplete = rpc.PermissionApprovalEvaluationReasonCodeAuthorizationHistoryIncomplete
+	PermissionApprovalEvaluationReasonCodeContentExcluded                = rpc.PermissionApprovalEvaluationReasonCodeContentExcluded
+	PermissionApprovalEvaluationReasonCodeDynamicSource                  = rpc.PermissionApprovalEvaluationReasonCodeDynamicSource
+	PermissionApprovalEvaluationReasonCodeExecutableTooLarge             = rpc.PermissionApprovalEvaluationReasonCodeExecutableTooLarge
+	PermissionApprovalEvaluationReasonCodeExecutableUnavailable          = rpc.PermissionApprovalEvaluationReasonCodeExecutableUnavailable
 	PermissionApprovalEvaluationReasonCodeInactive                       = rpc.PermissionApprovalEvaluationReasonCodeInactive
 	PermissionApprovalEvaluationReasonCodeInherited                      = rpc.PermissionApprovalEvaluationReasonCodeInherited
 	PermissionApprovalEvaluationReasonCodeInterpreterTooLarge            = rpc.PermissionApprovalEvaluationReasonCodeInterpreterTooLarge
@@ -754,11 +820,14 @@ const (
 	PermissionApprovalEvaluationReasonCodeSandboxBypass                  = rpc.PermissionApprovalEvaluationReasonCodeSandboxBypass
 	PermissionApprovalEvaluationReasonCodeShellEnvironmentUnreviewable   = rpc.PermissionApprovalEvaluationReasonCodeShellEnvironmentUnreviewable
 	PermissionApprovalEvaluationReasonCodeTooLarge                       = rpc.PermissionApprovalEvaluationReasonCodeTooLarge
+	PermissionApprovalEvaluationReasonCodeTooManySources                 = rpc.PermissionApprovalEvaluationReasonCodeTooManySources
 	PermissionApprovalEvaluationReasonCodeUnavailable                    = rpc.PermissionApprovalEvaluationReasonCodeUnavailable
 	PermissionApprovalEvaluationReasonCodeUnknown                        = rpc.PermissionApprovalEvaluationReasonCodeUnknown
 	PermissionApprovalEvaluationReasonCodeUnreadable                     = rpc.PermissionApprovalEvaluationReasonCodeUnreadable
 	PermissionApprovalEvaluationReasonCodeUnrepresentablePath            = rpc.PermissionApprovalEvaluationReasonCodeUnrepresentablePath
 	PermissionApprovalEvaluationReasonCodeUnreviewableScriptInvocation   = rpc.PermissionApprovalEvaluationReasonCodeUnreviewableScriptInvocation
+	PermissionApprovalEvaluationReasonCodeUnsupportedCommandShape        = rpc.PermissionApprovalEvaluationReasonCodeUnsupportedCommandShape
+	PermissionApprovalEvaluationReasonCodeUnsupportedSource              = rpc.PermissionApprovalEvaluationReasonCodeUnsupportedSource
 	PermissionDecisionSourceAuthorizationCarryForward                    = rpc.PermissionDecisionSourceAuthorizationCarryForward
 	PermissionMessageAuthorizationPolarityDenial                         = rpc.PermissionMessageAuthorizationPolarityDenial
 	PermissionMessageAuthorizationPolarityGrant                          = rpc.PermissionMessageAuthorizationPolarityGrant
@@ -848,6 +917,36 @@ const (
 	PlanChangedOperationCreate                                           = rpc.PlanChangedOperationCreate
 	PlanChangedOperationDelete                                           = rpc.PlanChangedOperationDelete
 	PlanChangedOperationUpdate                                           = rpc.PlanChangedOperationUpdate
+	ProviderMonthlyUsageScopeUnknown                                     = rpc.ProviderMonthlyUsageScopeUnknown
+	ProviderMonthlyUsageScopeUser                                        = rpc.ProviderMonthlyUsageScopeUser
+	ProviderMonthlyUsageStateAvailable                                   = rpc.ProviderMonthlyUsageStateAvailable
+	ProviderMonthlyUsageStateNoPolicy                                    = rpc.ProviderMonthlyUsageStateNoPolicy
+	ProviderMonthlyUsageStateUnavailable                                 = rpc.ProviderMonthlyUsageStateUnavailable
+	ProviderMonthlyUsageStateUnknown                                     = rpc.ProviderMonthlyUsageStateUnknown
+	ProviderQuotaAccessStateAllowed                                      = rpc.ProviderQuotaAccessStateAllowed
+	ProviderQuotaAccessStateDenied                                       = rpc.ProviderQuotaAccessStateDenied
+	ProviderQuotaAccessStateNotRequired                                  = rpc.ProviderQuotaAccessStateNotRequired
+	ProviderQuotaAccessStateUnavailable                                  = rpc.ProviderQuotaAccessStateUnavailable
+	ProviderQuotaAccessStateUnknown                                      = rpc.ProviderQuotaAccessStateUnknown
+	ProviderQuotaAcquisitionStatusFailed                                 = rpc.ProviderQuotaAcquisitionStatusFailed
+	ProviderQuotaAcquisitionStatusSucceeded                              = rpc.ProviderQuotaAcquisitionStatusSucceeded
+	ProviderQuotaAcquisitionStatusUnavailable                            = rpc.ProviderQuotaAcquisitionStatusUnavailable
+	ProviderQuotaCapacityStateAvailable                                  = rpc.ProviderQuotaCapacityStateAvailable
+	ProviderQuotaCapacityStateExhausted                                  = rpc.ProviderQuotaCapacityStateExhausted
+	ProviderQuotaCapacityStateNotApplicable                              = rpc.ProviderQuotaCapacityStateNotApplicable
+	ProviderQuotaCapacityStateNotRequired                                = rpc.ProviderQuotaCapacityStateNotRequired
+	ProviderQuotaCapacityStateUnavailable                                = rpc.ProviderQuotaCapacityStateUnavailable
+	ProviderQuotaCapacityStateUnknown                                    = rpc.ProviderQuotaCapacityStateUnknown
+	ProviderQuotaCapacityStateUnlimited                                  = rpc.ProviderQuotaCapacityStateUnlimited
+	ProviderQuotaObservationKindAccountSnapshot                          = rpc.ProviderQuotaObservationKindAccountSnapshot
+	ProviderQuotaObservationKindAdmissionState                           = rpc.ProviderQuotaObservationKindAdmissionState
+	ProviderQuotaQuantityKindAdvisoryBalance                             = rpc.ProviderQuotaQuantityKindAdvisoryBalance
+	ProviderQuotaQuantityKindAuthoritativeBudget                         = rpc.ProviderQuotaQuantityKindAuthoritativeBudget
+	ProviderQuotaQuantityKindNone                                        = rpc.ProviderQuotaQuantityKindNone
+	ProviderQuotaUnitAiCredits                                           = rpc.ProviderQuotaUnitAiCredits
+	ProviderQuotaUnitRequests                                            = rpc.ProviderQuotaUnitRequests
+	ProviderQuotaUnitTokens                                              = rpc.ProviderQuotaUnitTokens
+	ProviderQuotaUnitUnknown                                             = rpc.ProviderQuotaUnitUnknown
 	ReasoningSummaryConcise                                              = rpc.ReasoningSummaryConcise
 	ReasoningSummaryDetailed                                             = rpc.ReasoningSummaryDetailed
 	ReasoningSummaryNone                                                 = rpc.ReasoningSummaryNone
@@ -856,6 +955,7 @@ const (
 	RecommendedAutoTierIntelligence                                      = rpc.RecommendedAutoTierIntelligence
 	RemediationActionAllowSandboxOutbound                                = rpc.RemediationActionAllowSandboxOutbound
 	RemediationActionReviewSandboxPolicy                                 = rpc.RemediationActionReviewSandboxPolicy
+	RemediationActionRewindConversation                                  = rpc.RemediationActionRewindConversation
 	RemediationActionShowAccount                                         = rpc.RemediationActionShowAccount
 	RemediationActionSignIn                                              = rpc.RemediationActionSignIn
 	RemediationActionSwitchAccount                                       = rpc.RemediationActionSwitchAccount
@@ -955,6 +1055,7 @@ const (
 	SessionEventTypeSessionInfo                                          = rpc.SessionEventTypeSessionInfo
 	SessionEventTypeSessionLimitsExhaustedCompleted                      = rpc.SessionEventTypeSessionLimitsExhaustedCompleted
 	SessionEventTypeSessionLimitsExhaustedRequested                      = rpc.SessionEventTypeSessionLimitsExhaustedRequested
+	SessionEventTypeSessionManagedPluginProgress                         = rpc.SessionEventTypeSessionManagedPluginProgress
 	SessionEventTypeSessionManagedSettingsEnforced                       = rpc.SessionEventTypeSessionManagedSettingsEnforced
 	SessionEventTypeSessionManagedSettingsResolved                       = rpc.SessionEventTypeSessionManagedSettingsResolved
 	SessionEventTypeSessionMCPServerNeedsReconnect                       = rpc.SessionEventTypeSessionMCPServerNeedsReconnect
@@ -968,6 +1069,7 @@ const (
 	SessionEventTypeSessionPermissionRecovery                            = rpc.SessionEventTypeSessionPermissionRecovery
 	SessionEventTypeSessionPermissionsChanged                            = rpc.SessionEventTypeSessionPermissionsChanged
 	SessionEventTypeSessionPlanChanged                                   = rpc.SessionEventTypeSessionPlanChanged
+	SessionEventTypeSessionQuotaObservation                              = rpc.SessionEventTypeSessionQuotaObservation
 	SessionEventTypeSessionRemoteSteerableChanged                        = rpc.SessionEventTypeSessionRemoteSteerableChanged
 	SessionEventTypeSessionResume                                        = rpc.SessionEventTypeSessionResume
 	SessionEventTypeSessionScheduleCancelled                             = rpc.SessionEventTypeSessionScheduleCancelled
diff --git a/java/README.md b/java/README.md
index cc2c5cf3a4..cb4b2d9c12 100644
--- a/java/README.md
+++ b/java/README.md
@@ -76,7 +76,7 @@ implementation 'com.github:copilot-sdk-java:1.0.15-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), **linuxmusl-x64**, **win32-x64**, **win32-arm64**, **darwin-x64**, and **darwin-arm64**.
+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), **linuxmusl-x64**, **linuxmusl-arm64**, **win32-x64**, **win32-arm64**, **darwin-x64**, and **darwin-arm64**.
 
 Because in-process mode is experimental, see the [Using experimental APIs](#using-experimental-apis) section for how to opt in.
 
@@ -99,7 +99,7 @@ Add both the SDK and the platform-specific native runtime to your project:
         <version>${copilot.version}</version>
         <classifier>linux-x64</classifier>
     </dependency>
-    <!-- Use linux-arm64, linuxmusl-x64, win32-x64, win32-arm64, darwin-x64, or darwin-arm64 on those target platforms -->
+    <!-- Use linux-arm64, linuxmusl-x64, linuxmusl-arm64, win32-x64, win32-arm64, darwin-x64, or darwin-arm64 on those target platforms -->
     <!-- JNA (required for in-process mode) -->
     <dependency>
         <groupId>net.java.dev.jna</groupId>
@@ -131,7 +131,12 @@ instead, or configure both transports. GitHub environment name and compute ID ar
 required; there is no implicit local listener. The host's `getUrl()`, `getToken()`,
 and `getPid()` may return `null`; `getEnvironmentId()` returns the GitHub environment
 ID when configured. Environment list/get/delete operations are available only
-through the generated RPC API.
+through the generated RPC API. Call `host.listSessions()` to read the complete
+advertised catalog of live and dormant sessions.
+Use `AhpHostOptions.setComputeId(...)` to reuse the durable catalog across local
+and Mission Control hosting; it must agree with the GitHub environment's compute
+ID when both are supplied. The runtime persists an omitted local-only identity.
+Publication survives host shutdown; dormant application sessions require your resume callback.
 See [runtime-supervised AHP hosting](../docs/runtime-supervised-host.md) for creation
 and resume callbacks, resident-session publication, ownership, and shared-snapshot E2Es.
 
@@ -183,6 +188,24 @@ public class CopilotSDK {
 }
 ```
 
+`client.forceStop()` retires tracked sessions locally without `session.detach`
+RPCs. Retained session objects reject new work and subscriptions, unused handler
+captures are released, and pending plain and structured response waits fail.
+Already-admitted event handlers and response continuations are not joined.
+Forced retirement also drops callbacks when a graceful `session.close()` is
+already awaiting detach. Graceful close fails pending response waits without
+joining their continuations; ordinary callbacks remain active until detach completes.
+Plain response waits preserve terminal results and errors already received before
+retirement, even when a blocked continuation delays forwarding them to the caller.
+Graceful owned-process shutdown over stdio waits for the runtime transport and
+launcher to exit. Over TCP, it closes the connection and terminates the owned
+process after the shutdown acknowledgment, without waiting for peer EOF.
+Both preserve intentionally detached services; failed or forced shutdown retains
+process-tree cleanup.
+For a custom TCP launcher that spawns the runtime as a child, graceful cleanup
+terminates only the launcher. The launcher must supervise and reap its runtime
+child; a shutdown acknowledgment alone does not prove that child exited.
+
 When targeting MCP tools configured through `setMcpServers(...)`, remember the
 runtime tool name is `<server-key>-<tool-name>`. For `setAvailableTools(...)`
 and `setExcludedTools(...)`, prefer the source-qualified filter form
@@ -198,6 +221,7 @@ Register `setOnSubagentStart` and `setOnSubagentStop` on `SessionHooks` to inspe
 the parent session and subagent metadata around each child run:
 
 ```java
+import com.github.copilot.rpc.PermissionHandler;
 import com.github.copilot.rpc.SessionConfig;
 import com.github.copilot.rpc.SessionHooks;
 import com.github.copilot.rpc.SubagentStartHookOutput;
@@ -211,7 +235,7 @@ var hooks = new SessionHooks()
     .setOnSubagentStop((input, invocation) ->
         CompletableFuture.completedFuture(
             new SubagentStopHookOutput(null, null, input.response())));
-var config = new SessionConfig().setHooks(hooks);
+var config = new SessionConfig().setOnPermissionRequest(PermissionHandler.APPROVE_ALL).setHooks(hooks);
 ```
 
 `SubagentStartHookInput` includes the parent `sessionId`, `timestamp`, `cwd`,
@@ -286,6 +310,51 @@ 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.
 
+### Skill providers (experimental)
+
+`SessionConfig.setSkillProvider(...)` registers session-scoped skills that the
+runtime can list and read on demand. The API is experimental; see
+[Using experimental APIs](#using-experimental-apis) before compiling code that
+references it.
+
+```java
+import com.github.copilot.SkillProvider;
+import com.github.copilot.SkillProviderDescriptor;
+
+SkillProvider provider = new SkillProvider() {
+    @Override
+    public CompletableFuture<List<SkillProviderDescriptor>> listSkills() {
+        return CompletableFuture.completedFuture(List.of(
+            new SkillProviderDescriptor("team-plan", "Team planning guidance", true, false, null)));
+    }
+
+    @Override
+    public CompletableFuture<String> readSkill(String name) {
+        if (!name.equals("team-plan")) {
+            return CompletableFuture.completedFuture(null); // not found
+        }
+        return CompletableFuture.completedFuture("# Team plan\nWrite a concise monthly team plan.");
+    }
+};
+
+var config = new SessionConfig()
+    .setOnPermissionRequest(PermissionHandler.APPROVE_ALL)
+    .setEnableSkills(true)
+    .setSkillProvider(provider);
+```
+
+Provider callbacks may be invoked concurrently, so implementations should be
+thread-safe. When the runtime cancels a call, for example after its 30-second
+limit or when the session disconnects, the SDK calls `cancel(true)` on the
+returned future; check `isCancelled()` or attach a completion callback to stop
+early. The provider is not persisted with the session; pass it again via
+`ResumeSessionConfig.setSkillProvider(...)` on every resume. Resuming without a
+provider unbinds any provider the session had. In
+`CopilotClientMode.EMPTY`, explicitly set `setEnableSkills(true)` if the
+assistant should use skills, because empty mode disables skill loading by
+default. Skill providers are local-session only and are rejected for cloud
+sessions.
+
 ### Typed MCP installation and removal payloads (breaking change)
 
 Three payloads in the experimental MCP installation and removal workflow are now sealed
@@ -613,6 +682,19 @@ session.setAutoTier(null).get();
 
 `setModel(SetModelOptions)` accepts the same preference through `SetModelOptions.setAutoTier(...)`, which stages the tier atomically with selecting `auto`. Call `setResetAutoTier(true)` instead to return to provider-default routing; the two options are mutually exclusive.
 
+## Reasoning-summary presentation (experimental)
+
+Read the current model's reasoning-summary policy through `session.getRpc().model.getReasoningSummaries(...)`. Load the model catalog with `session.getRpc().model.list().get()` first, or accept a result with `ready() == false`.
+
+```java
+import com.github.copilot.generated.rpc.SessionModelGetReasoningSummariesParams;
+
+var presentation = new SessionModelGetReasoningSummariesParams(null, false);
+var policy = session.getRpc().model.getReasoningSummaries(presentation).get();
+```
+
+The two constructor arguments are the persisted visibility setting (`null` when unset) and whether the host currently shows summaries (`null` defaults to false). The session wrapper supplies the session ID; callers do not need a placeholder ID. The original three-argument constructor remains available. `visibility()` can be `null` while experiment assignment is pending, and `clearRedundantSetting()` tells the host when its persisted setting matches the model default.
+
 ## Session Store
 
 `enableSessionStore` on `SessionConfig` enables the cross-session store for search and retrieval across sessions. When unset in the default `CopilotClientMode.COPILOT_CLI` mode, the runtime default applies (enabled). In `CopilotClientMode.EMPTY` mode, defaults to disabled.
@@ -875,7 +957,7 @@ CI enforces both checks. Spotless runs explicitly in CI; `mvn verify` alone does
 
 Run native-runtime Maven commands from the `java` directory. Native packaging requires Node.js in addition to JDK 25 and Maven. In a standalone SDK checkout, `copilot-native/scripts/fetch-native.mjs` retrieves the pinned runtime package from the corresponding GitHub release. When the SDK is nested in `copilot-agent-runtime`, it instead stages the same-checkout artifacts from `dist-cli`; run `pnpm run build:cli` from the runtime repository first.
 
-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 a Linux musl x64 host, Maven activates `native-linuxmusl-x64` when `copilot.native.libc=musl` is set. On Windows x64, Windows ARM64, Intel macOS, and Apple Silicon macOS, Maven activates `native-win32-x64`, `native-win32-arm64`, `native-darwin-x64`, or `native-darwin-arm64` automatically. The matching profile validates the host, runs the native script tests, stages the platform package during `generate-resources`, packages the classifier JAR during `package`, and verifies its native contents.
+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 a Linux musl host, Maven activates `native-linuxmusl-x64` or `native-linuxmusl-arm64` for the matching architecture when `copilot.native.libc=musl` is set. On Windows x64, Windows ARM64, Intel macOS, and Apple Silicon macOS, Maven activates `native-win32-x64`, `native-win32-arm64`, `native-darwin-x64`, or `native-darwin-arm64` automatically. The matching profile validates the host, runs the native script tests, stages the platform package during `generate-resources`, packages the classifier JAR during `package`, and verifies its native contents.
 
 Before opting in, validate that Node.js reports glibc for the build host:
 
@@ -910,14 +992,14 @@ node copilot-native/scripts/validate-native-host.mjs linux-arm64
 mvn -Pinprocess clean verify -Dcopilot.native.libc=glibc
 ```
 
-The same command validates in-process mode on Linux musl x64:
+The same command validates in-process mode on Linux musl x64 or ARM64:
 
 ```bash
-node copilot-native/scripts/validate-native-host.mjs linuxmusl-x64
+node copilot-native/scripts/validate-native-host.mjs linuxmusl-x64 # Use linuxmusl-arm64 on ARM64
 mvn -Pinprocess clean verify -Dcopilot.native.libc=musl
 ```
 
-On Linux musl ARM64 and other unsupported hosts, do not set `copilot.native.libc`. 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.
+On unsupported hosts, do not set `copilot.native.libc`. 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:
 
diff --git a/java/copilot-native/pom.xml b/java/copilot-native/pom.xml
index 2c750e4e47..41af2dd6cb 100644
--- a/java/copilot-native/pom.xml
+++ b/java/copilot-native/pom.xml
@@ -467,6 +467,64 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>native-linuxmusl-arm64</id>
+            <activation>
+                <os>
+                    <name>Linux</name>
+                    <arch>aarch64</arch>
+                </os>
+                <property>
+                    <name>copilot.native.libc</name>
+                    <value>musl</value>
+                </property>
+            </activation>
+            <properties>
+                <copilot.native.classifier>linuxmusl-arm64</copilot.native.classifier>
+            </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>
@@ -809,6 +867,68 @@
                 </plugins>
             </build>
         </profile>
+        <!--
+            The Linux musl ARM64 classifier is assembled in an ARM64 Alpine
+            container and passed to the sole Ubuntu x64 publisher.
+        -->
+        <profile>
+            <id>attach-external-linuxmusl-arm64-classifier</id>
+            <activation>
+                <property>
+                    <name>copilot.native.external.linuxmusl.arm64.classifier.path</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>validate-external-linuxmusl-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>linuxmusl-arm64</argument>
+                                        <argument>${copilot.native.external.linuxmusl.arm64.classifier.path}</argument>
+                                        <argument>${project.build.finalName}-linuxmusl-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-linuxmusl-arm64-classifier</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>attach-artifact</goal>
+                                </goals>
+                                <configuration>
+                                    <artifacts>
+                                        <artifact>
+                                            <file>${copilot.native.external.linuxmusl.arm64.classifier.path}</file>
+                                            <type>jar</type>
+                                            <classifier>linuxmusl-arm64</classifier>
+                                        </artifact>
+                                    </artifacts>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
         <!--
             The Windows x64 classifier is assembled on windows-latest and passed
             to the sole Ubuntu publisher. Validate it before attaching so deploy
diff --git a/java/copilot-native/scripts/fetch-native.test.mjs b/java/copilot-native/scripts/fetch-native.test.mjs
index e8ee4f704d..5a9a070b1f 100644
--- a/java/copilot-native/scripts/fetch-native.test.mjs
+++ b/java/copilot-native/scripts/fetch-native.test.mjs
@@ -54,7 +54,16 @@ test('stages verified unstable runtime assets downloaded from the SDK release',
     `classifier=linux-x64\nversion=${unstableVersion}\n`);
 });
 
-for (const classifier of ['linux-x64', 'linux-arm64', 'linuxmusl-x64', 'win32-x64', 'win32-arm64', 'darwin-x64', 'darwin-arm64']) {
+for (const classifier of [
+  'linux-x64',
+  'linux-arm64',
+  'linuxmusl-x64',
+  'linuxmusl-arm64',
+  'win32-x64',
+  'win32-arm64',
+  'darwin-x64',
+  'darwin-arm64',
+]) {
   test(`${classifier}: complete hostless artifacts use incremental fast path without a CLI`, (t) => {
     const fixture = createFixture(t, classifier);
 
diff --git a/java/copilot-native/scripts/validate-local-publication.mjs b/java/copilot-native/scripts/validate-local-publication.mjs
index c06da24f7d..15ab2552d8 100644
--- a/java/copilot-native/scripts/validate-local-publication.mjs
+++ b/java/copilot-native/scripts/validate-local-publication.mjs
@@ -30,6 +30,7 @@ export function validateLocalPublication({
           "linux-x64",
           "linux-arm64",
           "linuxmusl-x64",
+          "linuxmusl-arm64",
           "win32-x64",
           "win32-arm64",
           "darwin-x64",
diff --git a/java/copilot-native/scripts/validate-native-artifact.test.mjs b/java/copilot-native/scripts/validate-native-artifact.test.mjs
index 4f3f31a069..d1e5aa4846 100644
--- a/java/copilot-native/scripts/validate-native-artifact.test.mjs
+++ b/java/copilot-native/scripts/validate-native-artifact.test.mjs
@@ -516,6 +516,7 @@ function createPublicationFixture(
       "linux-x64",
       "linux-arm64",
       "linuxmusl-x64",
+      "linuxmusl-arm64",
       "win32-x64",
       "win32-arm64",
       "darwin-x64",
diff --git a/java/copilot-native/scripts/validate-native-host.mjs b/java/copilot-native/scripts/validate-native-host.mjs
index 20b261f4b1..032430cbd6 100644
--- a/java/copilot-native/scripts/validate-native-host.mjs
+++ b/java/copilot-native/scripts/validate-native-host.mjs
@@ -32,6 +32,7 @@ const MUSL_ARCHITECTURES = {
 
 const MUSL_CLASSIFIERS = {
   "linuxmusl-x64": MUSL_ARCHITECTURES.x64,
+  "linuxmusl-arm64": MUSL_ARCHITECTURES.arm64,
 };
 
 function readSafeInteger(buffer, offset, label) {
diff --git a/java/copilot-native/scripts/validate-native-host.test.mjs b/java/copilot-native/scripts/validate-native-host.test.mjs
index 89f68734e2..836bbd5201 100644
--- a/java/copilot-native/scripts/validate-native-host.test.mjs
+++ b/java/copilot-native/scripts/validate-native-host.test.mjs
@@ -138,6 +138,19 @@ test("accepts Linux musl x64", () => {
   );
 });
 
+test("accepts Linux musl ARM64", () => {
+  assert.equal(
+    validateNativeHost("linuxmusl-arm64", {
+      platform: "linux",
+      arch: "arm64",
+      glibcVersionRuntime: undefined,
+      elfMachine: 183,
+      elfInterpreter: "/lib/ld-musl-aarch64.so.1",
+    }),
+    "Validated native build host: linuxmusl-arm64 (musl)",
+  );
+});
+
 test("accepts Windows x64 without a libc requirement", () => {
   assert.equal(
     validateNativeHost("win32-x64", {
@@ -398,12 +411,10 @@ test("rejects macOS ARM64 for the macOS x64 classifier", () => {
 test("rejects an unimplemented classifier", () => {
   assert.throws(
     () =>
-      validateNativeHost("linuxmusl-arm64", {
+      validateNativeHost("linux-riscv64", {
         platform: "linux",
-        arch: "arm64",
+        arch: "riscv64",
         glibcVersionRuntime: undefined,
-        elfMachine: 183,
-        elfInterpreter: "/lib/ld-musl-aarch64.so.1",
       }),
     /Unsupported native build classifier/,
   );
diff --git a/java/docs/adr/adr-007-native-bundling-strategy.md b/java/docs/adr/adr-007-native-bundling-strategy.md
index 1187a4ae1b..0e75564578 100644
--- a/java/docs/adr/adr-007-native-bundling-strategy.md
+++ b/java/docs/adr/adr-007-native-bundling-strategy.md
@@ -208,9 +208,9 @@ If none succeeds, startup fails. The PATH fallback does not claim to support eve
 
 ### 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, Windows ARM64, Intel macOS, and Apple Silicon macOS hosts package `win32-x64`, `win32-arm64`, `darwin-x64`, or `darwin-arm64` automatically. The `inprocess` test profile selects the matching implemented classifier automatically on all six 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.
+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 hosts can opt in with `copilot.native.libc=glibc` or `copilot.native.libc=musl`, while Windows x64, Windows ARM64, Intel macOS, and Apple Silicon macOS hosts package `win32-x64`, `win32-arm64`, `darwin-x64`, or `darwin-arm64` automatically. The `inprocess` test profile selects the matching implemented classifier automatically on all eight supported OS, architecture, and libc combinations. Every path validates the host before downloading or packaging native files. 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 x64, Windows ARM64, Intel macOS, and Apple Silicon macOS jobs each upload only their verified classifier and checksum manifest. The Ubuntu x64 job verifies and attaches all five, builds `linux-x64` with the glibc opt-in, and performs the only Maven deployment. Release signing therefore covers the neutral artifacts and all six classifiers in one deployment.
+Maven Central release and snapshot workflows build each classifier in its matching native environment from the same immutable source. The Linux ARM64, Linux musl x64, Linux musl ARM64, Windows x64, Windows ARM64, Intel macOS, and Apple Silicon macOS jobs each upload only their verified classifier and checksum manifest. The Ubuntu x64 job verifies and attaches all seven, builds `linux-x64` with the glibc opt-in, and performs the only Maven deployment. Release signing therefore covers the neutral artifacts and all eight classifiers in one deployment.
 
 ## Binding technology: JNA over Panama FFM
 
@@ -362,7 +362,7 @@ The pattern follows DJL's `LibUtils.loadLibrary()` approach: detect the platform
   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.
 * A validated supported-host profile fetches the matching platform tarball from the pinned `github/copilot-cli` release, verifies its release SHA-256, and packages the version-matched runtime files.
-* The current release work publishes the `linux-x64`, `linux-arm64`, `linuxmusl-x64`, `win32-x64`, `win32-arm64`, `darwin-x64`, and `darwin-arm64` classifiers. The planned classifier set expands to the other detected platforms.
+* The current release work publishes the `linux-x64`, `linux-arm64`, `linuxmusl-x64`, `linuxmusl-arm64`, `win32-x64`, `win32-arm64`, `darwin-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.
 
diff --git a/java/scripts/codegen/java.test.ts b/java/scripts/codegen/java.test.ts
index e489eef017..1a795e94d6 100644
--- a/java/scripts/codegen/java.test.ts
+++ b/java/scripts/codegen/java.test.ts
@@ -10,6 +10,7 @@ import test from "node:test";
 import type { JSONSchema7 } from "json-schema";
 
 import {
+    buildNamespaceTree,
     collectDirectDiscriminatedUnionTypeNames,
     collectNestedDiscriminatedUnionTypeNames,
     generateApiMethod,
@@ -23,6 +24,102 @@ import {
 } from "./java.js";
 import { RPC_VARIANT_OWNERS } from "./rpc-variant-owners.js";
 
+test("managed permission contexts share the session-event model in RPC inputs and outputs", () => {
+    const generated = "../../sdk/src/generated/java/com/github/copilot/generated/";
+    for (const name of ["ManagedSettingsResolveResult", "ManagedSettingsPermissionsEvaluateParams"]) {
+        const source = fs.readFileSync(new URL(`${generated}rpc/${name}.java`, import.meta.url), "utf8");
+        assert.match(source, /import com\.github\.copilot\.generated\.ManagedPermissionsContext;/);
+        assert.match(source, /ManagedPermissionsContext (?:context|permissionsContext)/);
+    }
+    assert.equal(fs.existsSync(new URL(`${generated}rpc/ManagedPermissionsContext.java`, import.meta.url)), false);
+    const event = fs.readFileSync(new URL(`${generated}SessionManagedSettingsResolvedEvent.java`, import.meta.url), "utf8");
+    assert.match(event, /ManagedPermissionsContext permissionsContext/);
+});
+
+test("managed permission requests and results reuse one named operation and kind", async () => {
+    const files = await renderRpcTypes({
+        definitions: {
+            ManagedPermissionOperation: {
+                anyOf: [{
+                    type: "object",
+                    properties: { kind: { type: "string", const: "url" }, url: { type: "string" } },
+                    required: ["kind", "url"],
+                }],
+            },
+            ManagedPermissionEvaluation: {
+                type: "object",
+                properties: { operation: { $ref: "#/definitions/ManagedPermissionOperation" } },
+                required: ["operation"],
+            },
+        },
+        server: {
+            managedSettings: {
+                permissions: {
+                    evaluate: {
+                        rpcMethod: "managedSettings.permissions.evaluate",
+                        params: {
+                            type: "object",
+                            properties: { operations: { type: "array", items: { $ref: "#/definitions/ManagedPermissionOperation" } } },
+                            required: ["operations"],
+                        },
+                        result: {
+                            type: "object",
+                            properties: { results: { type: "array", items: { $ref: "#/definitions/ManagedPermissionEvaluation" } } },
+                            required: ["results"],
+                        },
+                    },
+                },
+            },
+        },
+    }, {});
+    const operation = generatedFile(files, "ManagedPermissionOperation");
+    assert.ok(operation);
+    assert.match(operation, /record ManagedPermissionOperation\(/);
+    assert.match(operation, /ManagedPermissionOperationKind kind/);
+    assert.match(operation, /enum ManagedPermissionOperationKind/);
+    assert.match(operation, /URL\("url"\)/);
+    assert.match(generatedFile(files, "ManagedSettingsPermissionsEvaluateParams")!, /List<ManagedPermissionOperation> operations/);
+    assert.match(generatedFile(files, "ManagedPermissionEvaluation")!, /ManagedPermissionOperation operation/);
+});
+
+test("wrapper Javadoc preserves the operation contract ahead of parameter documentation", () => {
+    const tree = buildNamespaceTree({
+        reconcile: {
+            rpcMethod: "session.extensions.reconcile",
+            description: "Host-only reconciliation; method-not-found must not fall back to persistent disables.",
+            params: {
+                type: "object",
+                description: "Identifies the target session.",
+                properties: { sessionId: { type: "string" } },
+                required: ["sessionId"],
+            },
+            result: { type: "object", properties: { extensions: { type: "array", items: { type: "string" } } } },
+        },
+    });
+    const method = tree.methods.get("reconcile");
+    assert.ok(method);
+    const source = generateApiMethod("reconcile", method, true, "sessionId").lines.join("\n");
+    assert.match(source, /Host-only reconciliation; method-not-found must not fall back to persistent disables/);
+    assert.doesNotMatch(source, /Identifies the target session/);
+});
+
+test("host environment options preserve the legacy two-argument constructor", () => {
+    const source = generateRpcClass("HostGitHubEnvironmentOptions", {
+        type: "object",
+        properties: {
+            name: { type: "string" },
+            computeId: { type: "string" },
+            requireConnectionBinding: { type: ["boolean", "null"] },
+        },
+        required: ["name", "computeId"],
+    }).code;
+    assert.match(source, /@JsonProperty\("requireConnectionBinding"\) Boolean requireConnectionBinding/);
+    assert.match(
+        source,
+        /public HostGitHubEnvironmentOptions\(\s*String name,\s*String computeId\s*\) \{\s*this\(name, computeId, null\);/s,
+    );
+});
+
 test("arbitrary handoff maps accept scalar and structured JSON values", () => {
     const result = schemaTypeToJava(
         { type: "object", additionalProperties: true },
@@ -32,6 +129,34 @@ test("arbitrary handoff maps accept scalar and structured JSON values", () => {
     assert.ok(result.imports.has("java.util.Map"));
 });
 
+test("host session summaries retain their experimental schema designation", async () => {
+    const summary: JSONSchema7 & { stability: string } = {
+        type: "object",
+        stability: "experimental",
+        properties: { resource: { type: "string" } },
+        required: ["resource"],
+    };
+    const files = await renderRpcTypes({
+        definitions: { HostSessionSummary: summary },
+        server: {
+            listSessions: {
+                rpcMethod: "host.listSessions",
+                stability: "experimental",
+                params: null,
+                result: {
+                    type: "object",
+                    properties: { sessions: { type: "array", items: { $ref: "#/definitions/HostSessionSummary" } } },
+                },
+            },
+        },
+    }, {});
+    const source = [...files].find(([file]) => file.endsWith("/HostSessionSummary.java"))?.[1];
+    assert.ok(source, "missing HostSessionSummary.java");
+    assert.match(source, /import com\.github\.copilot\.CopilotExperimental;/);
+    assert.match(source, /@apiNote This type is experimental and may change in a future version\./);
+    assert.match(source, /@CopilotExperimental/);
+});
+
 test("preserves whole-event deprecation through a referenced event envelope", () => {
     const schema: JSONSchema7 = {
         definitions: {
@@ -53,6 +178,35 @@ test("preserves whole-event deprecation through a referenced event envelope", ()
     assert.match(renderEventVariantClass(variants[0], "com.github.copilot.generated"), /@Deprecated/);
 });
 
+test("preserves whole-event experimental stability through a referenced event envelope", () => {
+    const schema: JSONSchema7 = {
+        definitions: {
+            SessionEvent: { anyOf: [{ $ref: "#/definitions/ExperimentalEvent" }] },
+            ExperimentalEvent: {
+                type: "object",
+                stability: "experimental",
+                properties: {
+                    type: { const: "session.experimental" },
+                    data: { $ref: "#/definitions/ExperimentalData" },
+                },
+            } as JSONSchema7,
+            ExperimentalData: { type: "object", properties: { phase: { type: "string" } } },
+        },
+    };
+    const variants = extractEventVariants(schema);
+    assert.equal(variants.length, 1);
+    assert.equal(variants[0].stability, "experimental");
+    const source = renderEventVariantClass(variants[0], "com.github.copilot.generated");
+    assert.match(
+        source,
+        /@CopilotExperimental\n(?:@[^\n]*\n)*public final class SessionExperimentalEvent\b/,
+    );
+    assert.match(
+        source,
+        /    @CopilotExperimental\n(?:    @[^\n]*\n)*    public record SessionExperimentalEventData\b/,
+    );
+});
+
 for (const referencedData of [false, true]) {
     for (const eventDeprecated of [false, true]) {
         for (const dataDeprecated of [false, true]) {
@@ -266,6 +420,23 @@ test("ordinary and empty root objects retain their existing records", () => {
     assert.doesNotMatch(empty, /JsonNode|DELEGATING|JsonValue/);
 });
 
+test("session event records preserve constructors declared by x-legacy-parameters", () => {
+    const source = renderPayload({
+        type: "object",
+        properties: {
+            before: { type: "string" },
+            added: { type: ["string", "null"] },
+            after: { type: "string" },
+        },
+        "x-legacy-parameters": ["before", "after"],
+    } as JSONSchema7);
+
+    assert.match(
+        source,
+        /public ExampleNotificationEventData\(\s*String before,\s*String after\s*\) \{\s*this\(before, null, after\);/,
+    );
+});
+
 test("session event fields promote directly referenced discriminated response unions", () => {
     const definitions: Record<string, JSONSchema7> = {
         TypedResponse: {
@@ -735,6 +906,7 @@ test("static OAuth config preserves the legacy four-argument constructor", () =>
 test("nullable referenced RPC results retain their object DTO and typed wrapper", async () => {
     const method = {
         rpcMethod: "session.accounts.getCurrent",
+        description: null,
         stability: "experimental",
         params: {
             type: "object",
@@ -1069,6 +1241,44 @@ test("x-legacy-parameters response records keep every component and add the prev
     assert.deepEqual(legacyConstructors(twice), ["String name, String status, String error => name, status, null, error, null"]);
 });
 
+test("managed settings params keep their previous positional constructor", async () => {
+    const fixture = {
+        server: {
+            managedSettings: {
+                resolve: {
+                    rpcMethod: "managedSettings.resolve",
+                    params: { $ref: "#/definitions/ManagedSettingsResolveRequest" },
+                    result: null,
+                },
+            },
+        },
+        definitions: {
+            ManagedSettingsResolveRequest: {
+                anyOf: [
+                    { not: {} },
+                    {
+                        type: "object",
+                        properties: {
+                            selectionId: { type: "string" },
+                            gitHubToken: { type: "string" },
+                            clientName: { type: "string" },
+                            workingDirectory: { type: "string" },
+                        },
+                        additionalProperties: false,
+                    },
+                ],
+            },
+        },
+    } as Parameters<typeof renderRpcTypes>[0];
+
+    const files = await renderRpcTypes(fixture, {});
+    const params = generatedFile(files, "ManagedSettingsResolveParams")!;
+    assert.match(
+        params,
+        /public ManagedSettingsResolveParams\(\s*String selectionId,\s*String gitHubToken,\s*String clientName\s*\) \{\s*this\(selectionId, gitHubToken, clientName, null\);\s*\}/
+    );
+});
+
 test("x-legacy-parameters response records reject metadata a positional constructor cannot preserve", () => {
     assert.throws(
         () => recordSource(legacyRecordSchema(["traceId"], ["status", "name", "error"])),
diff --git a/java/scripts/codegen/java.ts b/java/scripts/codegen/java.ts
index 076ea61848..9f932aef75 100644
--- a/java/scripts/codegen/java.ts
+++ b/java/scripts/codegen/java.ts
@@ -14,6 +14,7 @@ import path from "path";
 import { fileURLToPath } from "url";
 import { RPC_VARIANT_OWNERS } from "./rpc-variant-owners.js";
 import { hasLegacyParameters, isOmittableRequest, LEGACY_PARAMETERS_KEY, readLegacyParameters, type LegacyParameters } from "../../../scripts/codegen/legacy-parameters.js";
+import { extensibleEnumValues } from "../../../scripts/codegen/extensible-enums.js";
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -88,6 +89,8 @@ function normalizeBrandCasingNode(node: unknown): void {
     }
     if (node === null || typeof node !== "object") return;
     const obj = node as Record<string, unknown>;
+    const knownValues = extensibleEnumValues(obj);
+    if (knownValues) obj.enum = knownValues;
 
     if (obj.title === "ProviderModelConfig" && obj.properties && typeof obj.properties === "object") {
         const tokenFields = new Set([
@@ -1340,7 +1343,34 @@ export function schemaTypeToJava(
         const name = schema.$ref.replace(/^#\/definitions\//, "");
         const resolved = resolution.definitions[name];
         if (resolved) {
+            if (
+                name === "ManagedPermissionsContext"
+                && generatedSessionEventTypeNames.has(name)
+                && crossSchemaDefinitions.get("session-events.schema.json")?.[name]
+            ) {
+                imports.add(`com.github.copilot.generated.${name}`);
+                return { javaType: name, imports };
+            }
             const directUnion = unionVariants(resolved);
+            if (name === "ManagedPermissionOperation" && directUnion) {
+                const variants = resolveAnyOfVariants(directUnion, resolution.definitions);
+                const [variant] = variants;
+                if (variants.length === 1 && variant?.properties) {
+                    const kind = variant.properties.kind;
+                    if (!kind || typeof kind !== "object" || typeof kind.const !== "string") {
+                        throw new Error("Expected a string discriminator for ManagedPermissionOperation.kind");
+                    }
+                    resolution.standaloneTypes.set(name, {
+                        ...resolved,
+                        ...variant,
+                        properties: {
+                            ...variant.properties,
+                            kind: { ...kind, enum: [kind.const] },
+                        },
+                    });
+                    return { javaType: name, imports };
+                }
+            }
             if (directUnion && ["InstallationReview", "McpInstallationReview", "SkillInstallationReview"].includes(name)) {
                 const variants = resolveAnyOfVariants(directUnion, resolution.definitions);
                 if (variants.length > 1 && findDiscriminator(variants)) {
@@ -1409,6 +1439,7 @@ export function schemaTypeToJava(
                 name: enumName,
                 values: schema.enum as string[],
                 description: schema.description,
+                schema,
             });
             return { javaType: enumName, imports };
         }
@@ -1541,7 +1572,8 @@ export function extractEventVariants(schema: JSONSchema7): EventVariant[] {
                 className: `${baseName}Event`,
                 dataSchema: dataSchema ?? null,
                 description: resolved.description,
-                stability: (variant as unknown as Record<string, unknown>).stability as string | undefined,
+                stability: ((resolved as unknown as Record<string, unknown>).stability
+                    ?? (variant as unknown as Record<string, unknown>).stability) as string | undefined,
                 deprecated: (resolved as unknown as Record<string, unknown>).deprecated === true,
                 dataDeprecated: dataSchema !== undefined && "deprecated" in dataSchema && dataSchema.deprecated === true,
             };
@@ -1750,16 +1782,19 @@ function renderNestedType(nested: JavaClassDef, indentLevel: number, nestedTypes
             lines.push(...renderOpenEnumClass(nested.name, nested.values || [], ind, true));
             return lines;
         }
-        lines.push(`${ind}public enum ${nested.name} {`);
+        const open = extensibleEnumValues(nested.schema ?? {}) !== undefined;
+        lines.push(open ? `${ind}public static final class ${nested.name} {` : `${ind}public enum ${nested.name} {`);
         for (let i = 0; i < (nested.values || []).length; i++) {
             const v = nested.values![i];
             const comma = i < nested.values!.length - 1 ? "," : ";";
             lines.push(`${ind}    /** The {@code ${v}} variant. */`);
-            lines.push(`${ind}    ${toEnumConstant(v)}("${v}")${comma}`);
+            lines.push(open
+                ? `${ind}    public static final ${nested.name} ${toEnumConstant(v)} = new ${nested.name}("${v}");`
+                : `${ind}    ${toEnumConstant(v)}("${v}")${comma}`);
         }
         lines.push("");
         lines.push(`${ind}    private final String value;`);
-        lines.push(`${ind}    ${nested.name}(String value) { this.value = value; }`);
+        lines.push(`${ind}    ${open ? "private " : ""}${nested.name}(String value) { this.value = value; }`);
         lines.push(`${ind}    @com.fasterxml.jackson.annotation.JsonValue`);
         lines.push(`${ind}    public String getValue() { return value; }`);
         lines.push(`${ind}    @com.fasterxml.jackson.annotation.JsonCreator`);
@@ -1767,8 +1802,16 @@ function renderNestedType(nested: JavaClassDef, indentLevel: number, nestedTypes
         lines.push(`${ind}        for (${nested.name} v : values()) {`);
         lines.push(`${ind}            if (v.value.equals(value)) return v;`);
         lines.push(`${ind}        }`);
-        lines.push(`${ind}        throw new IllegalArgumentException("Unknown ${nested.name} value: " + value);`);
+        lines.push(open
+            ? `${ind}        return new ${nested.name}(java.util.Objects.requireNonNull(value));`
+            : `${ind}        throw new IllegalArgumentException("Unknown ${nested.name} value: " + value);`);
         lines.push(`${ind}    }`);
+        if (open) {
+            lines.push(`${ind}    /** Returns the known values. @return known values */`);
+            lines.push(`${ind}    public static ${nested.name}[] values() { return new ${nested.name}[] { ${(nested.values ?? []).map(toEnumConstant).join(", ")} }; }`);
+            lines.push(`${ind}    @Override public boolean equals(Object other) { return other instanceof ${nested.name} v && value.equals(v.value); }`);
+            lines.push(`${ind}    @Override public int hashCode() { return value.hashCode(); }`);
+        }
         lines.push(`${ind}}`);
     } else if (nested.kind === "class" && nested.schema?.properties) {
         const localNestedTypes = new Map<string, JavaClassDef>();
@@ -1902,7 +1945,7 @@ export function renderEventVariantClass(variant: EventVariant, packageName: stri
     }
     if (variant.stability === "experimental") {
         lines.push(` *`);
-        lines.push(` * @apiNote This method is experimental and may change in a future version.`);
+        lines.push(` * @apiNote This event type is experimental and may change in a future version.`);
     }
     lines.push(` * @since 1.0.0`);
     lines.push(` */`);
@@ -1936,6 +1979,10 @@ export function renderEventVariantClass(variant: EventVariant, packageName: stri
         if (variant.dataDeprecated) {
             lines.push(`    @Deprecated`);
         }
+        if (variant.stability === "experimental" || isSchemaExperimental(variant.dataSchema)) {
+            allImports.add("com.github.copilot.CopilotExperimental");
+            lines.push(`    @CopilotExperimental`);
+        }
         lines.push(`    @JsonIgnoreProperties(ignoreUnknown = true)`);
         lines.push(`    @JsonInclude(JsonInclude.Include.NON_NULL)`);
         if (hasUnionData) {
@@ -1967,6 +2014,28 @@ export function renderEventVariantClass(variant: EventVariant, packageName: stri
                 lines.push(`        @JsonProperty("${field.jsonName}") ${field.javaType} ${field.javaName}${comma}`);
             }
             lines.push(`    ) {`);
+            const legacy = readLegacyParameters(variant.dataSchema, `${variant.className}Data`, {
+                ordered: true,
+            });
+            if (legacy) {
+                const legacyNames = new Set(legacy.legacy);
+                const legacyFields = dataFields.filter((field) => legacyNames.has(field.jsonName));
+                lines.push("");
+                lines.push(`        /**`);
+                lines.push(`         * Creates event data with the components it had before later optional fields were added.`);
+                lines.push(`         */`);
+                lines.push(`        public ${variant.className}Data(`);
+                for (let i = 0; i < legacyFields.length; i++) {
+                    const field = legacyFields[i];
+                    const comma = i < legacyFields.length - 1 ? "," : "";
+                    lines.push(`            ${field.javaType} ${field.javaName}${comma}`);
+                }
+                lines.push(`        ) {`);
+                lines.push(`            this(${dataFields
+                    .map((field) => legacyNames.has(field.jsonName) ? field.javaName : "null")
+                    .join(", ")});`);
+                lines.push(`        }`);
+            }
         }
         // Render nested types inside Data record
         for (const [, nested] of nestedTypes) {
@@ -2155,28 +2224,47 @@ async function generateStandaloneEnum(
     }
     if (allowUnknown) {
         lines.push(...renderOpenEnumClass(name, values, "", false, visibility));
-    } else {
-        lines.push(`${visModifier}enum ${name} {`);
-        for (let i = 0; i < values.length; i++) {
-            const v = values[i];
-            const comma = i < values.length - 1 ? "," : ";";
-            lines.push(`    /** The {@code ${v}} variant. */`);
-            lines.push(`    ${toEnumConstant(v)}("${v}")${comma}`);
-        }
         lines.push("");
-        lines.push(`    private final String value;`);
-        lines.push(`    ${name}(String value) { this.value = value; }`);
-        lines.push(`    @com.fasterxml.jackson.annotation.JsonValue`);
-        lines.push(`    public String getValue() { return value; }`);
-        lines.push(`    @com.fasterxml.jackson.annotation.JsonCreator`);
-        lines.push(`    public static ${name} fromValue(String value) {`);
-        lines.push(`        for (${name} v : values()) {`);
-        lines.push(`            if (v.value.equals(value)) return v;`);
-        lines.push(`        }`);
-        lines.push(`        throw new IllegalArgumentException("Unknown ${name} value: " + value);`);
-        lines.push(`    }`);
-        lines.push(`}`);
+        await writeGeneratedFile(`${packageDir}/${name}.java`, lines.join("\n"));
+        return;
+    }
+    const open = extensibleEnumValues(schema) !== undefined;
+    lines.push(open ? `${visModifier}final class ${name} {` : `${visModifier}enum ${name} {`);
+    for (let i = 0; i < values.length; i++) {
+        const v = values[i];
+        const comma = i < values.length - 1 ? "," : ";";
+        lines.push(`    /** The {@code ${v}} variant. */`);
+        lines.push(open
+            ? `    public static final ${name} ${toEnumConstant(v)} = new ${name}("${v}");`
+            : `    ${toEnumConstant(v)}("${v}")${comma}`);
+    }
+    lines.push("");
+    lines.push(`    private final String value;`);
+    lines.push(`    ${open ? "private " : ""}${name}(String value) { this.value = value; }`);
+    lines.push(`    @com.fasterxml.jackson.annotation.JsonValue`);
+    lines.push(`    public String getValue() { return value; }`);
+    lines.push(`    @com.fasterxml.jackson.annotation.JsonCreator`);
+    lines.push(`    public static ${name} fromValue(String value) {`);
+    if (open) {
+        lines.push(`        if (value == null) return null;`);
+        lines.push(`        if (value.isEmpty() || value.codePoints().anyMatch(c -> Character.isWhitespace(c) || Character.isISOControl(c)))`);
+        lines.push(`            throw new IllegalArgumentException("${name} requires a routing identifier");`);
+    }
+    lines.push(`        for (${name} v : values()) {`);
+    lines.push(`            if (v.value.equals(value)) return v;`);
+    lines.push(`        }`);
+    lines.push(open
+        ? `        return new ${name}(value);`
+        : `        throw new IllegalArgumentException("Unknown ${name} value: " + value);`);
+    lines.push(`    }`);
+    if (open) {
+        lines.push(`    /** Returns the known routing preferences. @return known values */`);
+        lines.push(`    public static ${name}[] values() { return new ${name}[] { ${values.map(toEnumConstant).join(", ")} }; }`);
+        lines.push(`    @Override public boolean equals(Object other) { return other instanceof ${name} v && value.equals(v.value); }`);
+        lines.push(`    @Override public int hashCode() { return value.hashCode(); }`);
+        lines.push(`    @Override public String toString() { return value; }`);
     }
+    lines.push(`}`);
     lines.push("");
 
     await writeGeneratedFile(`${packageDir}/${name}.java`, lines.join("\n"));
@@ -2310,6 +2398,9 @@ function validateSharedResultOwners(sections: Record<string, unknown>[]): void {
 }
 
 function schemaAllowsNull(schema: JSONSchema7): boolean {
+    if ((schema as Record<string, unknown>)["x-opaque-json"] === true && schema.type === undefined) {
+        return true;
+    }
     if (schema.type === "null" || (Array.isArray(schema.type) && schema.type.includes("null"))) {
         return true;
     }
@@ -2379,13 +2470,46 @@ export function generateRpcClass(
     }
 
     if (localNestedTypes.size > 0 && lines[lines.length - 1] === "") lines.pop();
-    const legacyFieldNames =
+    if (className === "SessionModelGetReasoningSummariesParams") {
+        lines.push(``);
+        lines.push(`    /**`);
+        lines.push(`     * Creates host presentation state; the session-scoped wrapper supplies the session ID.`);
+        lines.push(`     *`);
+        lines.push(`     * @param persistedShowReasoning the persisted visibility setting, or null when unset`);
+        lines.push(`     * @param summariesVisible whether summaries are visible, or null for the default`);
+        lines.push(`     */`);
+        lines.push(`    public ${className}(Boolean persistedShowReasoning, Boolean summariesVisible) {`);
+        lines.push(`        this(null, persistedShowReasoning, summariesVisible);`);
+        lines.push(`    }`);
+    }
+    const legacyConstructor =
         className === "McpOauthRequiredStaticClientConfig"
-            ? ["clientId", "clientSecret", "publicClient", "grantType"]
+            ? {
+                fieldNames: ["clientId", "clientSecret", "publicClient", "grantType"],
+                omittedField: "scope",
+                description: "Creates a static OAuth client configuration without an explicit scope.",
+            }
+            : className === "ManagedSettingsResolveParams"
+              ? {
+                  fieldNames: ["selectionId", "gitHubToken", "clientName"],
+                  omittedField: "workingDirectory",
+                  description: "Creates managed-settings resolution parameters without a working directory.",
+              }
             : className === "SessionFsSetProviderCapabilities"
-              ? ["sqlite"]
-            : undefined;
-    if (legacyFieldNames) {
+              ? {
+                  fieldNames: ["sqlite"],
+                  omittedField: "binary",
+                  description: "Creates provider capabilities without binary reads.",
+              }
+              : className === "HostGitHubEnvironmentOptions"
+                ? {
+                    fieldNames: ["name", "computeId"],
+                    omittedField: "requireConnectionBinding",
+                    description: "Creates environment options using the default connection-binding policy.",
+                }
+                : undefined;
+    if (legacyConstructor) {
+        const legacyFieldNames = legacyConstructor.fieldNames;
         const legacyFields = legacyFieldNames.map((fieldName) => {
             const field = fields.find((candidate) => candidate.javaName === fieldName);
             if (!field) {
@@ -2394,14 +2518,13 @@ export function generateRpcClass(
             return field;
         });
         const omittedFields = fields.filter((field) => !legacyFieldNames.includes(field.javaName));
-        const expectedAddedField = className === "SessionFsSetProviderCapabilities" ? "binary" : "scope";
-        if (omittedFields.length !== 1 || omittedFields[0].javaName !== expectedAddedField) {
+        if (omittedFields.length !== 1 || omittedFields[0].javaName !== legacyConstructor.omittedField) {
             throw new Error(`Unexpected compatibility fields for ${className}`);
         }
 
         lines.push(``);
         lines.push(`    /**`);
-        lines.push(`     * Creates ${className === "SessionFsSetProviderCapabilities" ? "provider capabilities without binary reads" : "a static OAuth client configuration without an explicit scope"}.`);
+        lines.push(`     * ${legacyConstructor.description}`);
         lines.push(`     *`);
         for (const field of legacyFields) {
             const description = (field.description || field.propName)
@@ -2424,7 +2547,7 @@ export function generateRpcClass(
         ? readLegacyParameters(schema, className, { ordered: true })
         : undefined;
     if (recordLegacy) {
-        if (legacyFieldNames) {
+        if (legacyConstructor) {
             throw new Error(`Conflicting compatibility constructors for ${className}`);
         }
         const legacyNames = new Set(recordLegacy.legacy);
@@ -2942,6 +3065,7 @@ async function generateRpcDataClass(
 /** A single RPC method node parsed from the schema */
 interface RpcMethodNode {
     rpcMethod: string;
+    description: string | null;
     visibility: string;
     stability: string;
     deprecated: boolean;
@@ -2956,7 +3080,7 @@ interface NamespaceTree {
 }
 
 /** Build a namespace tree by recursively walking a schema section object */
-function buildNamespaceTree(node: Record<string, unknown>): NamespaceTree {
+export function buildNamespaceTree(node: Record<string, unknown>): NamespaceTree {
     const tree: NamespaceTree = { methods: new Map(), subspaces: new Map() };
     for (const [key, value] of Object.entries(node)) {
         if (typeof value !== "object" || value === null) continue;
@@ -2964,6 +3088,7 @@ function buildNamespaceTree(node: Record<string, unknown>): NamespaceTree {
         if ("rpcMethod" in obj) {
             tree.methods.set(key, {
                 rpcMethod: String(obj.rpcMethod),
+                description: typeof obj.description === "string" ? obj.description : null,
                 visibility: String(obj.visibility ?? "public"),
                 stability: String(obj.stability ?? "stable"),
                 deprecated: obj.deprecated === true,
@@ -3048,6 +3173,10 @@ function wrapperResultClassName(method: RpcMethodNode): string {
     // Inline result schema with properties
     let result = originalResult;
     if (result.$ref) result = resolveRef(result) as JSONSchema7;
+    if (result.type === "boolean" || result.type === "integer" || result.type === "number"
+        || (result.type === "string" && !result.enum)) {
+        return schemaTypeToJava(result, false, rpcResultClassName(method.rpcMethod), "value", new Map()).javaType;
+    }
     if (
         result &&
         typeof result === "object" &&
@@ -3062,7 +3191,7 @@ function wrapperResultClassName(method: RpcMethodNode): string {
         return javaResult.javaType;
     }
 
-    // Free-form object with additionalProperties (e.g., x-opaque-json) → JsonNode
+    // Boolean maps have a typed value contract; free-form JSON remains a JsonNode.
     if (
         result &&
         typeof result === "object" &&
@@ -3070,6 +3199,9 @@ function wrapperResultClassName(method: RpcMethodNode): string {
         result.additionalProperties &&
         !result.properties
     ) {
+        if (typeof result.additionalProperties === "object" && result.additionalProperties.type === "boolean") {
+            return "Map<String, Boolean>";
+        }
         return "JsonNode";
     }
 
@@ -3077,6 +3209,9 @@ function wrapperResultClassName(method: RpcMethodNode): string {
 }
 
 function wrapperResultTypeExpression(resultType: string): string {
+    if (resultType === "Map<String, Boolean>") {
+        return "RpcMapper.INSTANCE.getTypeFactory().constructMapType(Map.class, String.class, Boolean.class)";
+    }
     const listMatch = resultType.match(/^List<([^<>]+)>$/);
     if (listMatch) {
         return `RpcMapper.INSTANCE.getTypeFactory().constructCollectionType(List.class, ${javaClassLiteral(listMatch[1])})`;
@@ -3099,11 +3234,19 @@ function addWrapperResultImports(resultType: string, allImports: Set<string>, pa
         return;
     }
 
+    if (resultType === "UUID" || resultType === "OffsetDateTime") {
+        allImports.add(resultType === "UUID" ? "java.util.UUID" : "java.time.OffsetDateTime");
+        return;
+    }
+
     if (resultType.startsWith("List<")) {
         allImports.add("java.util.List");
     }
+    if (resultType.startsWith("Map<")) {
+        allImports.add("java.util.Map");
+    }
 
-    const builtInTypes = new Set(["Boolean", "Double", "Long", "List", "Object", "String", "Void"]);
+    const builtInTypes = new Set(["Boolean", "Double", "Long", "List", "Map", "Object", "String", "Void"]);
     for (const typeName of resultType.match(/\b[A-Z][A-Za-z0-9_]*\b/g) ?? []) {
         if (!builtInTypes.has(typeName)) {
             allImports.add(`${packageName}.${typeName}`);
@@ -3162,12 +3305,13 @@ export function generateApiMethod(
     const lines: string[] = [];
 
     // Javadoc
-    const description = (method.params as JSONSchema7 | null)?.description
+    const description = method.description
+        ?? (method.params as JSONSchema7 | null)?.description
         ?? (method.result as JSONSchema7 | null)?.description
         ?? `Invokes {@code ${method.rpcMethod}}.`;
     const pushJavadoc = (extraLines: string[] = [], includeSessionIdNote = true): void => {
         lines.push(`    /**`);
-        lines.push(`     * ${description}`);
+        lines.push(...description.split(/\r?\n/).map((line) => `     * ${line}`));
         if (includeSessionIdNote && isSession && hasExtraParams && hasSessionId) {
             lines.push(`     * <p>`);
             lines.push(`     * Note: the {@code sessionId} field in the params record is overridden`);
diff --git a/java/sdk/pom.xml b/java/sdk/pom.xml
index 85c8becbad..bbcaf41d13 100644
--- a/java/sdk/pom.xml
+++ b/java/sdk/pom.xml
@@ -77,7 +77,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.22.2</version>
+            <version>2.22.3</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -87,7 +87,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-jsr310</artifactId>
-            <version>2.22.2</version>
+            <version>2.22.3</version>
         </dependency>
 
         <!-- SpotBugs annotations for suppressing warnings -->
@@ -230,6 +230,27 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>3.6.1</version>
+                <executions>
+                    <execution>
+                        <id>packaged-consumer-dependencies</id>
+                        <phase>generate-test-resources</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <skip>${maven.test.skip}</skip>
+                            <includeScope>runtime</includeScope>
+                            <!-- Default consumers do not receive optional JNA. -->
+                            <excludeArtifactIds>jna</excludeArtifactIds>
+                            <outputDirectory>${project.build.directory}/consumer-dependencies</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <!--
                 Failsafe runs integration tests against the actually packaged
                 JAR (after the package phase). Used to validate multi-release
@@ -273,15 +294,7 @@
                     <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>
+                    <rerunFailingTestsCount>0</rerunFailingTestsCount>
                     <systemPropertyVariables>
                         <copilot.tests.dir>${copilot.tests.dir}</copilot.tests.dir>
                         <copilot.sdk.dir>${copilot.sdk.root}</copilot.sdk.dir>
@@ -719,6 +732,22 @@ did not produce the multi-release output. Re-build on JDK 25+ and verify the
                 <copilot.native.classifier>linuxmusl-x64</copilot.native.classifier>
             </properties>
         </profile>
+        <profile>
+            <id>native-linuxmusl-arm64</id>
+            <activation>
+                <os>
+                    <name>Linux</name>
+                    <arch>aarch64</arch>
+                </os>
+                <property>
+                    <name>copilot.native.libc</name>
+                    <value>musl</value>
+                </property>
+            </activation>
+            <properties>
+                <copilot.native.classifier>linuxmusl-arm64</copilot.native.classifier>
+            </properties>
+        </profile>
         <profile>
             <id>native-win32-x64</id>
             <activation>
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/AiCreditsStatus.java b/java/sdk/src/generated/java/com/github/copilot/generated/AiCreditsStatus.java
new file mode 100644
index 0000000000..f6f95a97a2
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/AiCreditsStatus.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;
+
+/**
+ * Whether the accumulated numeric AI-credit subtotal covers the observed calls.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum AiCreditsStatus {
+    /** The {@code complete} variant. */
+    COMPLETE("complete"),
+    /** The {@code partial} variant. */
+    PARTIAL("partial"),
+    /** The {@code unavailable} variant. */
+    UNAVAILABLE("unavailable");
+
+    private final String value;
+    AiCreditsStatus(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static AiCreditsStatus fromValue(String value) {
+        for (AiCreditsStatus v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown AiCreditsStatus value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/AssistantFusionPhaseActivityEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/AssistantFusionPhaseActivityEvent.java
index 64d8d58283..832abb6e3d 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/AssistantFusionPhaseActivityEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/AssistantFusionPhaseActivityEvent.java
@@ -10,12 +10,16 @@
 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;
 
 /**
  * Session event "assistant.fusion_phase_activity". Experimental content-safe activity signal for a running HydraFusion phase.
+ *
+ * @apiNote This event type is experimental and may change in a future version.
  * @since 1.0.0
  */
+@CopilotExperimental
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @javax.annotation.processing.Generated("copilot-sdk-codegen")
@@ -31,6 +35,7 @@ public final class AssistantFusionPhaseActivityEvent extends SessionEvent {
     public void setData(AssistantFusionPhaseActivityEventData data) { this.data = data; }
 
     /** Data payload for {@link AssistantFusionPhaseActivityEvent}. */
+    @CopilotExperimental
     @JsonIgnoreProperties(ignoreUnknown = true)
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public record AssistantFusionPhaseActivityEventData(
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/AssistantFusionPhaseCompletedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/AssistantFusionPhaseCompletedEvent.java
index 27b144b281..e5d6804b5f 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/AssistantFusionPhaseCompletedEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/AssistantFusionPhaseCompletedEvent.java
@@ -15,8 +15,11 @@
 
 /**
  * Session event "assistant.fusion_phase_completed". Experimental durable HydraFusion phase output and lossless replay checkpoint.
+ *
+ * @apiNote This event type is experimental and may change in a future version.
  * @since 1.0.0
  */
+@CopilotExperimental
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @javax.annotation.processing.Generated("copilot-sdk-codegen")
@@ -32,6 +35,7 @@ public final class AssistantFusionPhaseCompletedEvent extends SessionEvent {
     public void setData(AssistantFusionPhaseCompletedEventData data) { this.data = data; }
 
     /** Data payload for {@link AssistantFusionPhaseCompletedEvent}. */
+    @CopilotExperimental
     @JsonIgnoreProperties(ignoreUnknown = true)
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public record AssistantFusionPhaseCompletedEventData(
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/AssistantFusionPhaseFailedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/AssistantFusionPhaseFailedEvent.java
index e248d0a9fe..45b850040c 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/AssistantFusionPhaseFailedEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/AssistantFusionPhaseFailedEvent.java
@@ -15,8 +15,11 @@
 
 /**
  * Session event "assistant.fusion_phase_failed". Experimental durable typed HydraFusion phase failure and degradation transition.
+ *
+ * @apiNote This event type is experimental and may change in a future version.
  * @since 1.0.0
  */
+@CopilotExperimental
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @javax.annotation.processing.Generated("copilot-sdk-codegen")
@@ -32,6 +35,7 @@ public final class AssistantFusionPhaseFailedEvent extends SessionEvent {
     public void setData(AssistantFusionPhaseFailedEventData data) { this.data = data; }
 
     /** Data payload for {@link AssistantFusionPhaseFailedEvent}. */
+    @CopilotExperimental
     @JsonIgnoreProperties(ignoreUnknown = true)
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public record AssistantFusionPhaseFailedEventData(
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/AssistantFusionPhaseStartedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/AssistantFusionPhaseStartedEvent.java
index 28ed76f283..a7efa03b82 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/AssistantFusionPhaseStartedEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/AssistantFusionPhaseStartedEvent.java
@@ -15,8 +15,11 @@
 
 /**
  * Session event "assistant.fusion_phase_started". Experimental transient HydraFusion phase/model/role signal.
+ *
+ * @apiNote This event type is experimental and may change in a future version.
  * @since 1.0.0
  */
+@CopilotExperimental
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @javax.annotation.processing.Generated("copilot-sdk-codegen")
@@ -32,6 +35,7 @@ public final class AssistantFusionPhaseStartedEvent extends SessionEvent {
     public void setData(AssistantFusionPhaseStartedEventData data) { this.data = data; }
 
     /** Data payload for {@link AssistantFusionPhaseStartedEvent}. */
+    @CopilotExperimental
     @JsonIgnoreProperties(ignoreUnknown = true)
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public record AssistantFusionPhaseStartedEventData(
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/AssistantMessageEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/AssistantMessageEvent.java
index 365b945965..87d0e6f29a 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/AssistantMessageEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/AssistantMessageEvent.java
@@ -42,6 +42,8 @@ public record AssistantMessageEventData(
         @JsonProperty("originatingMessageId") String originatingMessageId,
         /** Model that produced this assistant message, if known */
         @JsonProperty("model") String model,
+        /** Opaque origin provider identity captured at dispatch. Only an exact match with the target provider permits replay of reasoningOpaque, encryptedContent, reasoningBlocks, serverTools, and provider response/item identifiers. Matching model ids or wire protocols is insufficient. Omitted for legacy or unattributed messages; the runtime excludes unproven opaque state when projecting to a known provider. Text content and client tool requests/results remain portable semantic history. */
+        @JsonProperty("providerId") String providerId,
         /** The assistant's text response content */
         @JsonProperty("content") String content,
         /** Tool invocations requested by the assistant in this message */
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/AssistantUsageEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/AssistantUsageEvent.java
index 0c02f5d15a..a392f290be 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/AssistantUsageEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/AssistantUsageEvent.java
@@ -38,8 +38,16 @@ public final class AssistantUsageEvent extends SessionEvent {
     @JsonIgnoreProperties(ignoreUnknown = true)
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public record AssistantUsageEventData(
+        /** Availability of this call's reported AI-credit amount. Missing billing is unavailable, not a zero charge. */
+        @JsonProperty("aiCreditsStatus") AiCreditsStatus aiCreditsStatus,
         /** Model identifier used for this API call */
         @JsonProperty("model") String model,
+        /** Provider identity and product label captured by the actual call's dispatch path. */
+        @JsonProperty("provider") ModelProviderRef provider,
+        /** Model display name captured for this call, not derived from the current selection. */
+        @JsonProperty("modelDisplayName") String modelDisplayName,
+        /** Runtime-owned identity shared with the durable accounting receipt. */
+        @JsonProperty("accounting") UsageAccountingIdentity accounting,
         /** Number of input tokens consumed */
         @JsonProperty("inputTokens") Long inputTokens,
         /** Number of output tokens produced */
@@ -89,6 +97,26 @@ public record AssistantUsageEventData(
         @JsonProperty("rejectedPredictionTokens") Long rejectedPredictionTokens,
         /** Transport used for this model call (http or websocket) */
         @JsonProperty("transport") AssistantUsageTransport transport,
+        /** Serialized (uncompressed) byte length of the request body, before any Content-Encoding. A content-free size signal. */
+        @JsonProperty("requestBodyBytes") Long requestBodyBytes,
+        /** Byte length of the request body actually sent on the wire for the attempt that produced this outcome, after any Content-Encoding. Equals requestBodyBytes when the body was not compressed. */
+        @JsonProperty("requestBodyWireBytes") Long requestBodyWireBytes,
+        /** Content-Encoding applied to the request body of the attempt that produced this outcome; identity when uncompressed */
+        @JsonProperty("requestBodyEncoding") ModelCallRequestBodyEncoding requestBodyEncoding,
+        /** Why the call was carried by the HTTP fallback of a WebSocket-capable dispatcher; absent when no fallback occurred */
+        @JsonProperty("websocketFallbackReason") ModelCallWebSocketFallbackReason websocketFallbackReason,
+        /** Milliseconds spent on the WebSocket attempt before falling back to HTTP */
+        @JsonProperty("websocketFallbackAfterMs") Long websocketFallbackAfterMs,
+        /** Normalized cause of the WebSocket failure that triggered the HTTP fallback; absent when no fallback occurred or the cause is unknown */
+        @JsonProperty("websocketFallbackErrorKind") ModelCallWebSocketFallbackErrorKind websocketFallbackErrorKind,
+        /** HTTP status of the WebSocket upgrade rejection or WebSocket API error that triggered the HTTP fallback */
+        @JsonProperty("websocketFallbackStatusCode") Long websocketFallbackStatusCode,
+        /** WebSocket close code received before the HTTP fallback */
+        @JsonProperty("websocketFallbackCloseCode") Long websocketFallbackCloseCode,
+        /** Whether a WebSocket reconnect was attempted before falling back to HTTP */
+        @JsonProperty("websocketFallbackReconnectAttempted") Boolean websocketFallbackReconnectAttempted,
+        /** Whether the HTTP fallback started during this model call, rather than being inherited from an earlier call */
+        @JsonProperty("websocketFallbackStartedThisCall") Boolean websocketFallbackStartedThisCall,
         /** 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 */
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/AutoTier.java b/java/sdk/src/generated/java/com/github/copilot/generated/AutoTier.java
index 1c9d81b8ed..b3669208d7 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/AutoTier.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/AutoTier.java
@@ -10,30 +10,38 @@
 import javax.annotation.processing.Generated;
 
 /**
- * Routing preference used when the session model is `auto`. `fast` is an integrator-only latency preset and is not a first-party GitHub Copilot product preference.
+ * Extensible routing preference for the virtual `auto` model. New identifiers must be advertised and enabled by the provider. `fast` is an integrator-only latency preset.
  *
  * @since 1.0.0
  */
 @javax.annotation.processing.Generated("copilot-sdk-codegen")
-public enum AutoTier {
+public final class AutoTier {
     /** The {@code efficiency} variant. */
-    EFFICIENCY("efficiency"),
+    public static final AutoTier EFFICIENCY = new AutoTier("efficiency");
     /** The {@code balance} variant. */
-    BALANCE("balance"),
+    public static final AutoTier BALANCE = new AutoTier("balance");
     /** The {@code intelligence} variant. */
-    INTELLIGENCE("intelligence"),
+    public static final AutoTier INTELLIGENCE = new AutoTier("intelligence");
     /** The {@code fast} variant. */
-    FAST("fast");
+    public static final AutoTier FAST = new AutoTier("fast");
 
     private final String value;
-    AutoTier(String value) { this.value = value; }
+    private AutoTier(String value) { this.value = value; }
     @com.fasterxml.jackson.annotation.JsonValue
     public String getValue() { return value; }
     @com.fasterxml.jackson.annotation.JsonCreator
     public static AutoTier fromValue(String value) {
+        if (value == null) return null;
+        if (value.isEmpty() || value.codePoints().anyMatch(c -> Character.isWhitespace(c) || Character.isISOControl(c)))
+            throw new IllegalArgumentException("AutoTier requires a routing identifier");
         for (AutoTier v : values()) {
             if (v.value.equals(value)) return v;
         }
-        throw new IllegalArgumentException("Unknown AutoTier value: " + value);
+        return new AutoTier(value);
     }
+    /** Returns the known routing preferences. @return known values */
+    public static AutoTier[] values() { return new AutoTier[] { EFFICIENCY, BALANCE, INTELLIGENCE, FAST }; }
+    @Override public boolean equals(Object other) { return other instanceof AutoTier v && value.equals(v.value); }
+    @Override public int hashCode() { return value.hashCode(); }
+    @Override public String toString() { return value; }
 }
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/CompactionCompleteCompactionTokensUsed.java b/java/sdk/src/generated/java/com/github/copilot/generated/CompactionCompleteCompactionTokensUsed.java
index ed454deafd..cd6f610465 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/CompactionCompleteCompactionTokensUsed.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/CompactionCompleteCompactionTokensUsed.java
@@ -21,6 +21,14 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record CompactionCompleteCompactionTokensUsed(
+    /** Number of model requests represented by this aggregated compaction usage */
+    @JsonProperty("requestCount") Long requestCount,
+    /** Whether the compaction's credit amount was reported for all, some, or none of its calls. */
+    @JsonProperty("aiCreditsStatus") AiCreditsStatus aiCreditsStatus,
+    /** Provider captured for the compaction call; absent when attribution is unknown. */
+    @JsonProperty("provider") ModelProviderRef provider,
+    /** Model display name captured for the compaction call. */
+    @JsonProperty("modelDisplayName") String modelDisplayName,
     /** Input tokens consumed by the compaction LLM call */
     @JsonProperty("inputTokens") Long inputTokens,
     /** Output tokens produced by the compaction LLM call */
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/ManagedPermissionsContext.java b/java/sdk/src/generated/java/com/github/copilot/generated/ManagedPermissionsContext.java
new file mode 100644
index 0000000000..990ae9ace0
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/ManagedPermissionsContext.java
@@ -0,0 +1,29 @@
+/*---------------------------------------------------------------------------------------------
+ *  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;
+
+/**
+ * Reusable managed permission evaluation context. Treat permissions as runtime-owned policy data and retain it verbatim; it includes source-aware composition metadata. This is a snapshot, not a capability or approval token; only use contexts obtained from trusted policy sources.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record ManagedPermissionsContext(
+    /** Runtime-owned composed permissions object. Absent when no permission policy is configured. */
+    @JsonProperty("permissions") Object permissions,
+    /** Policy could not be determined; evaluation must deny every operation. */
+    @JsonProperty("failClosed") Boolean failClosed
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/ManagedPluginProgressPhase.java b/java/sdk/src/generated/java/com/github/copilot/generated/ManagedPluginProgressPhase.java
new file mode 100644
index 0000000000..a1b2f401b5
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/ManagedPluginProgressPhase.java
@@ -0,0 +1,43 @@
+/*---------------------------------------------------------------------------------------------
+ *  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.github.copilot.CopilotExperimental;
+import javax.annotation.processing.Generated;
+
+/**
+ * Current phase of organization-required plugin preparation.
+ *
+ * @apiNote This type is experimental and may change in a future version.
+ *
+ * @since 1.0.0
+ */
+@CopilotExperimental
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum ManagedPluginProgressPhase {
+    /** The {@code initializing} variant. */
+    INITIALIZING("initializing"),
+    /** The {@code installing} variant. */
+    INSTALLING("installing"),
+    /** The {@code updating} variant. */
+    UPDATING("updating"),
+    /** The {@code complete} variant. */
+    COMPLETE("complete");
+
+    private final String value;
+    ManagedPluginProgressPhase(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static ManagedPluginProgressPhase fromValue(String value) {
+        for (ManagedPluginProgressPhase v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown ManagedPluginProgressPhase value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/ManagedSettingsEnforcedEscalation.java b/java/sdk/src/generated/java/com/github/copilot/generated/ManagedSettingsEnforcedEscalation.java
index 619fb326e1..ff4f36d055 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/ManagedSettingsEnforcedEscalation.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/ManagedSettingsEnforcedEscalation.java
@@ -10,7 +10,7 @@
 import javax.annotation.processing.Generated;
 
 /**
- * For a `bypass_permissions_blocked` action, which permission-escalation primitive was refused
+ * For a `bypass_permissions_blocked` action, which permission-mode or escalation primitive was refused
  *
  * @since 1.0.0
  */
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/McpServerSource.java b/java/sdk/src/generated/java/com/github/copilot/generated/McpServerSource.java
index 5ea2c39f51..2354c95750 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/McpServerSource.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/McpServerSource.java
@@ -10,7 +10,7 @@
 import javax.annotation.processing.Generated;
 
 /**
- * Configuration source: user, workspace, plugin, builtin, or managed
+ * Configuration source: user, workspace, plugin, builtin, managed, or account
  *
  * @since 1.0.0
  */
@@ -25,7 +25,9 @@ public enum McpServerSource {
     /** The {@code builtin} variant. */
     BUILTIN("builtin"),
     /** The {@code managed} variant. */
-    MANAGED("managed");
+    MANAGED("managed"),
+    /** The {@code account} variant. */
+    ACCOUNT("account");
 
     private final String value;
     McpServerSource(String value) { this.value = value; }
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/ModelCallFailureEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/ModelCallFailureEvent.java
index 05e8a8371f..9bfa1cc686 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/ModelCallFailureEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/ModelCallFailureEvent.java
@@ -60,6 +60,28 @@ public record ModelCallFailureEventData(
         @JsonProperty("transport") ModelCallFailureTransport transport,
         /** Whether the failure originated from an API response or the request transport */
         @JsonProperty("failureKind") ModelCallFailureKind failureKind,
+        /** Serialized (uncompressed) byte length of the failed request body, before any Content-Encoding. A content-free size signal. */
+        @JsonProperty("requestBodyBytes") Long requestBodyBytes,
+        /** Byte length of the failed request body actually sent on the wire, after any Content-Encoding. Equals requestBodyBytes when the body was not compressed. */
+        @JsonProperty("requestBodyWireBytes") Long requestBodyWireBytes,
+        /** Content-Encoding applied to the failed request body; identity when uncompressed */
+        @JsonProperty("requestBodyEncoding") ModelCallRequestBodyEncoding requestBodyEncoding,
+        /** Zero-based orchestrator retry index of the failed attempt */
+        @JsonProperty("retryAttempt") Long retryAttempt,
+        /** Why the failed call was carried by the HTTP fallback of a WebSocket-capable dispatcher; absent when no fallback occurred */
+        @JsonProperty("websocketFallbackReason") ModelCallWebSocketFallbackReason websocketFallbackReason,
+        /** Milliseconds spent on the WebSocket attempt before falling back to HTTP */
+        @JsonProperty("websocketFallbackAfterMs") Long websocketFallbackAfterMs,
+        /** Normalized cause of the WebSocket failure that triggered the HTTP fallback; absent when no fallback occurred or the cause is unknown */
+        @JsonProperty("websocketFallbackErrorKind") ModelCallWebSocketFallbackErrorKind websocketFallbackErrorKind,
+        /** HTTP status of the WebSocket upgrade rejection or WebSocket API error that triggered the HTTP fallback */
+        @JsonProperty("websocketFallbackStatusCode") Long websocketFallbackStatusCode,
+        /** WebSocket close code received before the HTTP fallback */
+        @JsonProperty("websocketFallbackCloseCode") Long websocketFallbackCloseCode,
+        /** Whether a WebSocket reconnect was attempted before falling back to HTTP */
+        @JsonProperty("websocketFallbackReconnectAttempted") Boolean websocketFallbackReconnectAttempted,
+        /** Whether the HTTP fallback started during this model call, rather than being inherited from an earlier call */
+        @JsonProperty("websocketFallbackStartedThisCall") Boolean websocketFallbackStartedThisCall,
         /** Effective maximum prompt-token limit for the failed call */
         @JsonProperty("maxPromptTokens") Long maxPromptTokens,
         /** Effective maximum output-token limit for the failed call */
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/ModelCallFailureRequestFingerprint.java b/java/sdk/src/generated/java/com/github/copilot/generated/ModelCallFailureRequestFingerprint.java
index b8d0622b6e..6e83338e11 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/ModelCallFailureRequestFingerprint.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/ModelCallFailureRequestFingerprint.java
@@ -33,6 +33,12 @@ public record ModelCallFailureRequestFingerprint(
     @JsonProperty("imagePartCount") Long imagePartCount,
     /** Image parts whose media type cannot be determined (rejected by strict providers) */
     @JsonProperty("imagePartsMissingMediaType") Long imagePartsMissingMediaType,
+    /** Summed byte length of inline image payloads (data URLs and base64 sources) */
+    @JsonProperty("imageBytes") Long imageBytes,
+    /** Number of messages carrying opaque or encrypted reasoning */
+    @JsonProperty("reasoningItemCount") Long reasoningItemCount,
+    /** Summed byte length of opaque or encrypted reasoning payloads */
+    @JsonProperty("encryptedContentBytes") Long encryptedContentBytes,
     /** Role of the final message in the request */
     @JsonProperty("lastMessageRole") String lastMessageRole
 ) {
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/ModelCallRequestBodyEncoding.java b/java/sdk/src/generated/java/com/github/copilot/generated/ModelCallRequestBodyEncoding.java
new file mode 100644
index 0000000000..ad1b96ad9d
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/ModelCallRequestBodyEncoding.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;
+
+/**
+ * Content-Encoding applied to the request body sent on the wire
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum ModelCallRequestBodyEncoding {
+    /** The {@code identity} variant. */
+    IDENTITY("identity"),
+    /** The {@code gzip} variant. */
+    GZIP("gzip"),
+    /** The {@code zstd} variant. */
+    ZSTD("zstd");
+
+    private final String value;
+    ModelCallRequestBodyEncoding(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static ModelCallRequestBodyEncoding fromValue(String value) {
+        for (ModelCallRequestBodyEncoding v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown ModelCallRequestBodyEncoding value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/ModelCallWebSocketFallbackErrorKind.java b/java/sdk/src/generated/java/com/github/copilot/generated/ModelCallWebSocketFallbackErrorKind.java
new file mode 100644
index 0000000000..cb429a7d6d
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/ModelCallWebSocketFallbackErrorKind.java
@@ -0,0 +1,55 @@
+/*---------------------------------------------------------------------------------------------
+ *  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;
+
+/**
+ * Normalized cause of the WebSocket failure that triggered the HTTP fallback
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum ModelCallWebSocketFallbackErrorKind {
+    /** The {@code dns} variant. */
+    DNS("dns"),
+    /** The {@code tls} variant. */
+    TLS("tls"),
+    /** The {@code timeout} variant. */
+    TIMEOUT("timeout"),
+    /** The {@code connection_refused} variant. */
+    CONNECTION_REFUSED("connection_refused"),
+    /** The {@code connection_reset} variant. */
+    CONNECTION_RESET("connection_reset"),
+    /** The {@code closed_by_peer} variant. */
+    CLOSED_BY_PEER("closed_by_peer"),
+    /** The {@code closed_locally} variant. */
+    CLOSED_LOCALLY("closed_locally"),
+    /** The {@code not_connected} variant. */
+    NOT_CONNECTED("not_connected"),
+    /** The {@code http_status} variant. */
+    HTTP_STATUS("http_status"),
+    /** The {@code protocol} variant. */
+    PROTOCOL("protocol"),
+    /** The {@code configuration} variant. */
+    CONFIGURATION("configuration"),
+    /** The {@code other} variant. */
+    OTHER("other");
+
+    private final String value;
+    ModelCallWebSocketFallbackErrorKind(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static ModelCallWebSocketFallbackErrorKind fromValue(String value) {
+        for (ModelCallWebSocketFallbackErrorKind v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown ModelCallWebSocketFallbackErrorKind value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/ModelCallWebSocketFallbackReason.java b/java/sdk/src/generated/java/com/github/copilot/generated/ModelCallWebSocketFallbackReason.java
new file mode 100644
index 0000000000..fc891ae508
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/ModelCallWebSocketFallbackReason.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;
+
+/**
+ * Why a WebSocket-capable model call was carried by the HTTP fallback
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum ModelCallWebSocketFallbackReason {
+    /** The {@code connect_failed} variant. */
+    CONNECT_FAILED("connect_failed"),
+    /** The {@code connection_unavailable} variant. */
+    CONNECTION_UNAVAILABLE("connection_unavailable"),
+    /** The {@code send_failed} variant. */
+    SEND_FAILED("send_failed"),
+    /** The {@code api_error} variant. */
+    API_ERROR("api_error"),
+    /** The {@code transport_failed} variant. */
+    TRANSPORT_FAILED("transport_failed");
+
+    private final String value;
+    ModelCallWebSocketFallbackReason(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static ModelCallWebSocketFallbackReason fromValue(String value) {
+        for (ModelCallWebSocketFallbackReason v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown ModelCallWebSocketFallbackReason value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/ModelProviderKind.java b/java/sdk/src/generated/java/com/github/copilot/generated/ModelProviderKind.java
new file mode 100644
index 0000000000..cbef223e2b
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/ModelProviderKind.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 com.github.copilot.CopilotExperimental;
+import javax.annotation.processing.Generated;
+
+/**
+ * The neutral kind of a model provider — the model analog of `AccountKind`. A model provider is the live, entitled source a model came from; central code never branches on this beyond a single dispatch.
+ *
+ * @apiNote This type is experimental and may change in a future version.
+ *
+ * @since 1.0.0
+ */
+@CopilotExperimental
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum ModelProviderKind {
+    /** The {@code copilot} variant. */
+    COPILOT("copilot"),
+    /** The {@code loki} variant. */
+    LOKI("loki");
+
+    private final String value;
+    ModelProviderKind(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static ModelProviderKind fromValue(String value) {
+        for (ModelProviderKind v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown ModelProviderKind value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/ModelProviderRef.java b/java/sdk/src/generated/java/com/github/copilot/generated/ModelProviderRef.java
new file mode 100644
index 0000000000..84a0fa8954
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/ModelProviderRef.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 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 neutral reference to the model provider that produced a model: an opaque id, a human-readable label, and the provider kind. Carried on each enumerated Model so consumers can group by provider without reaching into a provider-shaped internal type.
+ *
+ * @apiNote This type 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 ModelProviderRef(
+    /** Opaque, stable id of the provider that produced this model. Matches the enumerated `ModelProviderDescriptor.id`. */
+    @JsonProperty("id") String id,
+    /** Human-readable provider label, owned by the runtime so every consumer renders identical text. */
+    @JsonProperty("label") String label,
+    /** The provider kind. */
+    @JsonProperty("kind") ModelProviderKind kind
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/PermissionAssentDetectedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/PermissionAssentDetectedEvent.java
index 84ccf7473e..cd1b9c8c38 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/PermissionAssentDetectedEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/PermissionAssentDetectedEvent.java
@@ -15,8 +15,11 @@
 
 /**
  * Session event "permission.assentDetected". Historical decode-only contextual-assent marker. Current runtimes do not project it into the conversation or permission flow.
+ *
+ * @apiNote This event type is experimental and may change in a future version.
  * @since 1.0.0
  */
+@CopilotExperimental
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @javax.annotation.processing.Generated("copilot-sdk-codegen")
@@ -32,6 +35,7 @@ public final class PermissionAssentDetectedEvent extends SessionEvent {
     public void setData(PermissionAssentDetectedEventData data) { this.data = data; }
 
     /** Data payload for {@link PermissionAssentDetectedEvent}. */
+    @CopilotExperimental
     @JsonIgnoreProperties(ignoreUnknown = true)
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public record PermissionAssentDetectedEventData(
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/PermissionCarriedForwardEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/PermissionCarriedForwardEvent.java
index e9126e2308..49061d7f4b 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/PermissionCarriedForwardEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/PermissionCarriedForwardEvent.java
@@ -15,8 +15,11 @@
 
 /**
  * Session event "permission.carriedForward". Historical decode-only receipt from the retired Assisted Permissions authorization extractor. Current runtimes ignore it for permission decisions.
+ *
+ * @apiNote This event type is experimental and may change in a future version.
  * @since 1.0.0
  */
+@CopilotExperimental
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @javax.annotation.processing.Generated("copilot-sdk-codegen")
@@ -32,6 +35,7 @@ public final class PermissionCarriedForwardEvent extends SessionEvent {
     public void setData(PermissionCarriedForwardEventData data) { this.data = data; }
 
     /** Data payload for {@link PermissionCarriedForwardEvent}. */
+    @CopilotExperimental
     @JsonIgnoreProperties(ignoreUnknown = true)
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public record PermissionCarriedForwardEventData(
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/PermissionContextualAuthorizationEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/PermissionContextualAuthorizationEvent.java
index 80bc8cd24e..b7eea2dae2 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/PermissionContextualAuthorizationEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/PermissionContextualAuthorizationEvent.java
@@ -15,8 +15,11 @@
 
 /**
  * Session event "permission.contextualAuthorization". Historical decode-only contextual authorization claim. Current runtimes preserve the payload but do not establish authority from it.
+ *
+ * @apiNote This event type is experimental and may change in a future version.
  * @since 1.0.0
  */
+@CopilotExperimental
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @javax.annotation.processing.Generated("copilot-sdk-codegen")
@@ -32,6 +35,7 @@ public final class PermissionContextualAuthorizationEvent extends SessionEvent {
     public void setData(PermissionContextualAuthorizationEventData data) { this.data = data; }
 
     /** Data payload for {@link PermissionContextualAuthorizationEvent}. */
+    @CopilotExperimental
     @JsonIgnoreProperties(ignoreUnknown = true)
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public record PermissionContextualAuthorizationEventData(
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/PermissionMessageAuthorizationDegradedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/PermissionMessageAuthorizationDegradedEvent.java
index dc49be3971..f793de8ad2 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/PermissionMessageAuthorizationDegradedEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/PermissionMessageAuthorizationDegradedEvent.java
@@ -15,8 +15,11 @@
 
 /**
  * Session event "permission.messageAuthorizationDegraded". Historical decode-only degradation marker from the retired extractor. Current runtimes ignore it for permission decisions.
+ *
+ * @apiNote This event type is experimental and may change in a future version.
  * @since 1.0.0
  */
+@CopilotExperimental
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @javax.annotation.processing.Generated("copilot-sdk-codegen")
@@ -32,6 +35,7 @@ public final class PermissionMessageAuthorizationDegradedEvent extends SessionEv
     public void setData(PermissionMessageAuthorizationDegradedEventData data) { this.data = data; }
 
     /** Data payload for {@link PermissionMessageAuthorizationDegradedEvent}. */
+    @CopilotExperimental
     @JsonIgnoreProperties(ignoreUnknown = true)
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public record PermissionMessageAuthorizationDegradedEventData(
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/PermissionMessageAuthorizationEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/PermissionMessageAuthorizationEvent.java
index 88ff87b9dd..57254afaad 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/PermissionMessageAuthorizationEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/PermissionMessageAuthorizationEvent.java
@@ -16,8 +16,11 @@
 
 /**
  * Session event "permission.messageAuthorization". Historical decode-only claim from the retired Assisted Permissions authorization extractor. Current runtimes preserve the payload but do not establish authority from it.
+ *
+ * @apiNote This event type is experimental and may change in a future version.
  * @since 1.0.0
  */
+@CopilotExperimental
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @javax.annotation.processing.Generated("copilot-sdk-codegen")
@@ -33,6 +36,7 @@ public final class PermissionMessageAuthorizationEvent extends SessionEvent {
     public void setData(PermissionMessageAuthorizationEventData data) { this.data = data; }
 
     /** Data payload for {@link PermissionMessageAuthorizationEvent}. */
+    @CopilotExperimental
     @JsonIgnoreProperties(ignoreUnknown = true)
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public record PermissionMessageAuthorizationEventData(
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/PermissionMessageAuthorizationReadEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/PermissionMessageAuthorizationReadEvent.java
index b6fb8626bf..9415ee6d0d 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/PermissionMessageAuthorizationReadEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/PermissionMessageAuthorizationReadEvent.java
@@ -15,8 +15,11 @@
 
 /**
  * Session event "permission.messageAuthorizationRead". Historical decode-only extractor progress marker. Current runtimes do not run or resume extraction from it.
+ *
+ * @apiNote This event type is experimental and may change in a future version.
  * @since 1.0.0
  */
+@CopilotExperimental
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @javax.annotation.processing.Generated("copilot-sdk-codegen")
@@ -32,6 +35,7 @@ public final class PermissionMessageAuthorizationReadEvent extends SessionEvent
     public void setData(PermissionMessageAuthorizationReadEventData data) { this.data = data; }
 
     /** Data payload for {@link PermissionMessageAuthorizationReadEvent}. */
+    @CopilotExperimental
     @JsonIgnoreProperties(ignoreUnknown = true)
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public record PermissionMessageAuthorizationReadEventData(
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/PermissionRecoveryData.java b/java/sdk/src/generated/java/com/github/copilot/generated/PermissionRecoveryData.java
index ed38c3c168..796da04191 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/PermissionRecoveryData.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/PermissionRecoveryData.java
@@ -24,6 +24,10 @@
 public record PermissionRecoveryData(
     /** Stable identifier shared by every transition in this recovery episode */
     @JsonProperty("episodeId") String episodeId,
+    /** Root or child execution-session identifier that owns this recovery episode; omitted for legacy snapshots */
+    @JsonProperty("ownerSessionId") String ownerSessionId,
+    /** Subagent identifier that owns this recovery episode when the request was delegated through a parent permission service */
+    @JsonProperty("ownerAgentId") String ownerAgentId,
     /** Current lifecycle state of the recovery episode */
     @JsonProperty("status") PermissionRecoveryStatus status,
     /** Policy selected from the current client's response capability; mode or client changes may update it during recovery */
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/PermissionRequestedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/PermissionRequestedEvent.java
index dd18d2af2e..5dbb6300af 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/PermissionRequestedEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/PermissionRequestedEvent.java
@@ -44,6 +44,10 @@ public record PermissionRequestedEventData(
         @JsonProperty("permissionMode") PermissionMode permissionMode,
         /** Agent mode captured from the owning turn when permission evaluation began. */
         @JsonProperty("agentMode") SessionMode agentMode,
+        /** Execution session that owns permission recovery for this request. Absent on historical events. */
+        @JsonProperty("ownerSessionId") String ownerSessionId,
+        /** Delegated agent that owns permission recovery when the owner session multiplexes remote agents. Absent otherwise. */
+        @JsonProperty("ownerAgentId") String ownerAgentId,
         /** Neutral risk metadata supplied by the tool host. Consumers may display this value but must not use it to bypass the permission decision. */
         @JsonProperty("riskAssessment") Object riskAssessment,
         /** When true, this permission was already resolved by a permissionRequest hook and requires no client action */
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/ProviderMonthlyUsage.java b/java/sdk/src/generated/java/com/github/copilot/generated/ProviderMonthlyUsage.java
new file mode 100644
index 0000000000..b0c3fdf5b6
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/ProviderMonthlyUsage.java
@@ -0,0 +1,43 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 com.github.copilot.CopilotExperimental;
+import javax.annotation.processing.Generated;
+
+/**
+ * An authoritative monthly usage reading for the observation's provider, account, and service.
+ *
+ * @apiNote This type 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 ProviderMonthlyUsage(
+    /** Availability of monthly consumption. Missing or unavailable usage must never be interpreted as zero. */
+    @JsonProperty("state") ProviderMonthlyUsageState state,
+    /** Unit of consumedQuantity; independent of the parent observation's balance unit. */
+    @JsonProperty("unit") ProviderQuotaUnit unit,
+    /** Identity scope of the reading within its provider and service. */
+    @JsonProperty("scope") ProviderMonthlyUsageScope scope,
+    /** Nonnegative finite consumption reported by the service, preserving zero and fractions. Present only when state is available; never computed from tokens or balance differences. */
+    @JsonProperty("consumedQuantity") Double consumedQuantity,
+    /** Service read time in UTC RFC 3339, not a ledger reconciliation watermark or confirmation of the latest inference charge. */
+    @JsonProperty("queriedAt") String queriedAt,
+    /** Start of the service-reported monthly billing cycle, in UTC RFC 3339. */
+    @JsonProperty("cycleStart") String cycleStart,
+    /** End of the service-reported monthly billing cycle, in UTC RFC 3339. */
+    @JsonProperty("resetOn") String resetOn
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/ProviderMonthlyUsageScope.java b/java/sdk/src/generated/java/com/github/copilot/generated/ProviderMonthlyUsageScope.java
new file mode 100644
index 0000000000..fb61e9283e
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/ProviderMonthlyUsageScope.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;
+
+/**
+ * Identity scope of a monthly usage reading.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum ProviderMonthlyUsageScope {
+    /** The {@code user} variant. */
+    USER("user"),
+    /** The {@code unknown} variant. */
+    UNKNOWN("unknown");
+
+    private final String value;
+    ProviderMonthlyUsageScope(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static ProviderMonthlyUsageScope fromValue(String value) {
+        for (ProviderMonthlyUsageScope v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown ProviderMonthlyUsageScope value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/ProviderMonthlyUsageState.java b/java/sdk/src/generated/java/com/github/copilot/generated/ProviderMonthlyUsageState.java
new file mode 100644
index 0000000000..27df08fdb1
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/ProviderMonthlyUsageState.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;
+
+/**
+ * Availability of a service's monthly consumption reading.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum ProviderMonthlyUsageState {
+    /** The {@code available} variant. */
+    AVAILABLE("available"),
+    /** The {@code no_policy} variant. */
+    NO_POLICY("no_policy"),
+    /** The {@code unavailable} variant. */
+    UNAVAILABLE("unavailable"),
+    /** The {@code unknown} variant. */
+    UNKNOWN("unknown");
+
+    private final String value;
+    ProviderMonthlyUsageState(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static ProviderMonthlyUsageState fromValue(String value) {
+        for (ProviderMonthlyUsageState v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown ProviderMonthlyUsageState value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/ProviderQuotaAccessState.java b/java/sdk/src/generated/java/com/github/copilot/generated/ProviderQuotaAccessState.java
new file mode 100644
index 0000000000..e9d9ef966e
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/ProviderQuotaAccessState.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;
+
+/**
+ * Access policy reported by the quota service.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum ProviderQuotaAccessState {
+    /** The {@code allowed} variant. */
+    ALLOWED("allowed"),
+    /** The {@code denied} variant. */
+    DENIED("denied"),
+    /** The {@code not_required} variant. */
+    NOT_REQUIRED("not_required"),
+    /** The {@code unknown} variant. */
+    UNKNOWN("unknown"),
+    /** The {@code unavailable} variant. */
+    UNAVAILABLE("unavailable");
+
+    private final String value;
+    ProviderQuotaAccessState(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static ProviderQuotaAccessState fromValue(String value) {
+        for (ProviderQuotaAccessState v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown ProviderQuotaAccessState value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/ProviderQuotaAcquisitionStatus.java b/java/sdk/src/generated/java/com/github/copilot/generated/ProviderQuotaAcquisitionStatus.java
new file mode 100644
index 0000000000..0b2c8aaa51
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/ProviderQuotaAcquisitionStatus.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;
+
+/**
+ * Acquisition state, independent of the service's business access/capacity verdict.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum ProviderQuotaAcquisitionStatus {
+    /** The {@code succeeded} variant. */
+    SUCCEEDED("succeeded"),
+    /** The {@code unavailable} variant. */
+    UNAVAILABLE("unavailable"),
+    /** The {@code failed} variant. */
+    FAILED("failed");
+
+    private final String value;
+    ProviderQuotaAcquisitionStatus(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static ProviderQuotaAcquisitionStatus fromValue(String value) {
+        for (ProviderQuotaAcquisitionStatus v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown ProviderQuotaAcquisitionStatus value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/ProviderQuotaBudgetMetadata.java b/java/sdk/src/generated/java/com/github/copilot/generated/ProviderQuotaBudgetMetadata.java
new file mode 100644
index 0000000000..c32d10903d
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/ProviderQuotaBudgetMetadata.java
@@ -0,0 +1,47 @@
+/*---------------------------------------------------------------------------------------------
+ *  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;
+
+/**
+ * Authoritative budget measurements and policy metadata, independent of provider.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record ProviderQuotaBudgetMetadata(
+    /** Whether the budget has unlimited entitlement. */
+    @JsonProperty("unlimited") Boolean unlimited,
+    /** Exact budget entitlement, retaining incumbent fractional-unit compatibility. */
+    @JsonProperty("entitlement") Double entitlement,
+    /** Exact measured consumption in the budget's unit. */
+    @JsonProperty("consumed") Double consumed,
+    /** Service-reported remaining percentage for authoritative budget presentation. */
+    @JsonProperty("remainingPercentage") Double remainingPercentage,
+    /** Whether service policy allows continued usage after exhaustion. */
+    @JsonProperty("usageAllowedWhenExhausted") Boolean usageAllowedWhenExhausted,
+    /** Usage beyond entitlement, in the budget's unit. */
+    @JsonProperty("overage") Double overage,
+    /** Whether additional usage is allowed when the budget is exhausted. */
+    @JsonProperty("overageAllowedWhenExhausted") Boolean overageAllowedWhenExhausted,
+    /** Reset instant in epoch milliseconds when this budget actually defines a window. */
+    @JsonProperty("resetAtEpochMs") Double resetAtEpochMs,
+    /** Whether the reset instant is an estimate. */
+    @JsonProperty("resetEstimated") Boolean resetEstimated,
+    /** Whether this budget uses token-based billing. */
+    @JsonProperty("tokenBasedBilling") Boolean tokenBasedBilling,
+    /** Optional additional-usage budget cap. */
+    @JsonProperty("overageLimit") Double overageLimit
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/ProviderQuotaCapacityState.java b/java/sdk/src/generated/java/com/github/copilot/generated/ProviderQuotaCapacityState.java
new file mode 100644
index 0000000000..590168d881
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/ProviderQuotaCapacityState.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 javax.annotation.processing.Generated;
+
+/**
+ * Capacity is independent of whether a numeric balance was supplied.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum ProviderQuotaCapacityState {
+    /** The {@code available} variant. */
+    AVAILABLE("available"),
+    /** The {@code exhausted} variant. */
+    EXHAUSTED("exhausted"),
+    /** The {@code unlimited} variant. */
+    UNLIMITED("unlimited"),
+    /** The {@code not_required} variant. */
+    NOT_REQUIRED("not_required"),
+    /** The {@code not_applicable} variant. */
+    NOT_APPLICABLE("not_applicable"),
+    /** The {@code unknown} variant. */
+    UNKNOWN("unknown"),
+    /** The {@code unavailable} variant. */
+    UNAVAILABLE("unavailable");
+
+    private final String value;
+    ProviderQuotaCapacityState(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static ProviderQuotaCapacityState fromValue(String value) {
+        for (ProviderQuotaCapacityState v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown ProviderQuotaCapacityState value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/ProviderQuotaObservationKind.java b/java/sdk/src/generated/java/com/github/copilot/generated/ProviderQuotaObservationKind.java
new file mode 100644
index 0000000000..adc6826ebe
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/ProviderQuotaObservationKind.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;
+
+/**
+ * Timing and purpose of a provider quota observation.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum ProviderQuotaObservationKind {
+    /** The {@code account_snapshot} variant. */
+    ACCOUNT_SNAPSHOT("account_snapshot"),
+    /** The {@code admission_state} variant. */
+    ADMISSION_STATE("admission_state");
+
+    private final String value;
+    ProviderQuotaObservationKind(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static ProviderQuotaObservationKind fromValue(String value) {
+        for (ProviderQuotaObservationKind v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown ProviderQuotaObservationKind value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/ProviderQuotaQuantityKind.java b/java/sdk/src/generated/java/com/github/copilot/generated/ProviderQuotaQuantityKind.java
new file mode 100644
index 0000000000..44f2509f0c
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/ProviderQuotaQuantityKind.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;
+
+/**
+ * Interpretation permitted for independently reported quantities.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum ProviderQuotaQuantityKind {
+    /** The {@code authoritative_budget} variant. */
+    AUTHORITATIVE_BUDGET("authoritative_budget"),
+    /** The {@code advisory_balance} variant. */
+    ADVISORY_BALANCE("advisory_balance"),
+    /** The {@code none} variant. */
+    NONE("none");
+
+    private final String value;
+    ProviderQuotaQuantityKind(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static ProviderQuotaQuantityKind fromValue(String value) {
+        for (ProviderQuotaQuantityKind v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown ProviderQuotaQuantityKind value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/ProviderQuotaState.java b/java/sdk/src/generated/java/com/github/copilot/generated/ProviderQuotaState.java
new file mode 100644
index 0000000000..6beeefee69
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/ProviderQuotaState.java
@@ -0,0 +1,69 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 com.github.copilot.CopilotExperimental;
+import javax.annotation.processing.Generated;
+
+/**
+ * An account quota reading. Absence of a quantity is unknown, never zero.
+ *
+ * @apiNote This type 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 ProviderQuotaState(
+    /** Provider/account whose service reported this state. */
+    @JsonProperty("provider") ModelProviderRef provider,
+    /** Service-owned quota identifier within this provider. */
+    @JsonProperty("quotaId") String quotaId,
+    /** Unit of entitledQuantity and availableQuantity. */
+    @JsonProperty("unit") ProviderQuotaUnit unit,
+    /** Whether the service permits access, independently of balance. */
+    @JsonProperty("accessState") ProviderQuotaAccessState accessState,
+    /** Service capacity state; missing quantities do not imply exhaustion. */
+    @JsonProperty("capacityState") ProviderQuotaCapacityState capacityState,
+    /** Whether this is a GET account reading or a pre-response admission observation. Observations are never merged across kinds. */
+    @JsonProperty("observationKind") ProviderQuotaObservationKind observationKind,
+    /** Whether quantities are authoritative budget measurements, advisory balances, or absent. Only authoritative budgets support percentage presentation. */
+    @JsonProperty("quantityKind") ProviderQuotaQuantityKind quantityKind,
+    /** Acquisition outcome. Unavailable/failed readings have no service verdict; access/capacity unavailable are compatibility placeholders only. */
+    @JsonProperty("acquisitionStatus") ProviderQuotaAcquisitionStatus acquisitionStatus,
+    /** When the runtime observed this reading, not a charge timestamp or guarantee that consumption has settled. */
+    @JsonProperty("observedAt") String observedAt,
+    /** HTTP status from acquisition, when available. */
+    @JsonProperty("httpStatus") Long httpStatus,
+    /** Service error code or client acquisition category, separate from the business-state reason. */
+    @JsonProperty("acquisitionError") String acquisitionError,
+    /** Optional metadata for an authoritative budget. Advisory balances and admission-only observations do not populate this. */
+    @JsonProperty("budgetMetadata") ProviderQuotaBudgetMetadata budgetMetadata,
+    /** Service-reported monthly consumption, independent of quota balances and per-call or session cost. Omitted when the service does not report monthly usage. */
+    @JsonProperty("monthlyUsage") ProviderMonthlyUsage monthlyUsage,
+    /** Key for the backwards-compatible snapshots projection, when the authoritative budget supports that contract. */
+    @JsonProperty("compatibilityKey") String compatibilityKey,
+    /** Explicit service admission flag, when reported. */
+    @JsonProperty("hasQuota") Boolean hasQuota,
+    /** Independently reported signed 64-bit entitlement. -1 is an unlimited sentinel, not a capacity-state rewrite; omission and null are preserved. */
+    @JsonProperty("entitledQuantity") Long entitledQuantity,
+    /** Independently reported signed 64-bit available quantity. Zero does not override the service access/capacity verdict; omission and null are preserved. */
+    @JsonProperty("availableQuantity") Long availableQuantity,
+    /** Service-reported explanation for the state. */
+    @JsonProperty("reason") String reason,
+    /** Service-reported quota source. */
+    @JsonProperty("source") String source,
+    /** Service name owning this reading. */
+    @JsonProperty("service") String service
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/ProviderQuotaUnit.java b/java/sdk/src/generated/java/com/github/copilot/generated/ProviderQuotaUnit.java
new file mode 100644
index 0000000000..d8dc0048d7
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/ProviderQuotaUnit.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;
+
+/**
+ * Units explicitly reported by a quota provider.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum ProviderQuotaUnit {
+    /** The {@code ai_credits} variant. */
+    AI_CREDITS("ai_credits"),
+    /** The {@code requests} variant. */
+    REQUESTS("requests"),
+    /** The {@code tokens} variant. */
+    TOKENS("tokens"),
+    /** The {@code unknown} variant. */
+    UNKNOWN("unknown");
+
+    private final String value;
+    ProviderQuotaUnit(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static ProviderQuotaUnit fromValue(String value) {
+        for (ProviderQuotaUnit v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown ProviderQuotaUnit value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/RecommendedAutoTier.java b/java/sdk/src/generated/java/com/github/copilot/generated/RecommendedAutoTier.java
index acccaf5c8e..748395b847 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/RecommendedAutoTier.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/RecommendedAutoTier.java
@@ -10,28 +10,36 @@
 import javax.annotation.processing.Generated;
 
 /**
- * Auto preferences that Copilot API can recommend.
+ * Enabled Auto preferences that Copilot API can recommend.
  *
  * @since 1.0.0
  */
 @javax.annotation.processing.Generated("copilot-sdk-codegen")
-public enum RecommendedAutoTier {
+public final class RecommendedAutoTier {
     /** The {@code efficiency} variant. */
-    EFFICIENCY("efficiency"),
+    public static final RecommendedAutoTier EFFICIENCY = new RecommendedAutoTier("efficiency");
     /** The {@code balance} variant. */
-    BALANCE("balance"),
+    public static final RecommendedAutoTier BALANCE = new RecommendedAutoTier("balance");
     /** The {@code intelligence} variant. */
-    INTELLIGENCE("intelligence");
+    public static final RecommendedAutoTier INTELLIGENCE = new RecommendedAutoTier("intelligence");
 
     private final String value;
-    RecommendedAutoTier(String value) { this.value = value; }
+    private RecommendedAutoTier(String value) { this.value = value; }
     @com.fasterxml.jackson.annotation.JsonValue
     public String getValue() { return value; }
     @com.fasterxml.jackson.annotation.JsonCreator
     public static RecommendedAutoTier fromValue(String value) {
+        if (value == null) return null;
+        if (value.isEmpty() || value.codePoints().anyMatch(c -> Character.isWhitespace(c) || Character.isISOControl(c)))
+            throw new IllegalArgumentException("RecommendedAutoTier requires a routing identifier");
         for (RecommendedAutoTier v : values()) {
             if (v.value.equals(value)) return v;
         }
-        throw new IllegalArgumentException("Unknown RecommendedAutoTier value: " + value);
+        return new RecommendedAutoTier(value);
     }
+    /** Returns the known routing preferences. @return known values */
+    public static RecommendedAutoTier[] values() { return new RecommendedAutoTier[] { EFFICIENCY, BALANCE, INTELLIGENCE }; }
+    @Override public boolean equals(Object other) { return other instanceof RecommendedAutoTier v && value.equals(v.value); }
+    @Override public int hashCode() { return value.hashCode(); }
+    @Override public String toString() { return value; }
 }
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/RemediationAction.java b/java/sdk/src/generated/java/com/github/copilot/generated/RemediationAction.java
index 5fba9dfc33..f009f516f1 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/RemediationAction.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/RemediationAction.java
@@ -25,7 +25,9 @@ public enum RemediationAction {
     /** The {@code review_sandbox_policy} variant. */
     REVIEW_SANDBOX_POLICY("review_sandbox_policy"),
     /** The {@code allow_sandbox_outbound} variant. */
-    ALLOW_SANDBOX_OUTBOUND("allow_sandbox_outbound");
+    ALLOW_SANDBOX_OUTBOUND("allow_sandbox_outbound"),
+    /** The {@code rewind_conversation} variant. */
+    REWIND_CONVERSATION("rewind_conversation");
 
     private final String value;
     RemediationAction(String value) { this.value = value; }
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/SessionAutoModeResolvedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionAutoModeResolvedEvent.java
index ba26c98c2e..f2d8a33293 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/SessionAutoModeResolvedEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/SessionAutoModeResolvedEvent.java
@@ -10,14 +10,18 @@
 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 java.util.Map;
 import javax.annotation.processing.Generated;
 
 /**
  * Session event "session.auto_mode_resolved". Auto Intent resolution: the concrete model the session settled on for the first prompt of an auto-mode session, and why. Lets SDK clients render the chosen model and the full reason it was picked. The core selection fields (chosenModel/reasoningBucket/categoryScores) are stable; the routing-analytics fields (predictedLabel/confidence/candidateModels) mirror the upstream intent service and may evolve, hence the event's experimental stability.
+ *
+ * @apiNote This event type is experimental and may change in a future version.
  * @since 1.0.0
  */
+@CopilotExperimental
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @javax.annotation.processing.Generated("copilot-sdk-codegen")
@@ -33,6 +37,7 @@ public final class SessionAutoModeResolvedEvent extends SessionEvent {
     public void setData(SessionAutoModeResolvedEventData data) { this.data = data; }
 
     /** Data payload for {@link SessionAutoModeResolvedEvent}. */
+    @CopilotExperimental
     @JsonIgnoreProperties(ignoreUnknown = true)
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public record SessionAutoModeResolvedEventData(
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/SessionAutoTierRecommendationEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionAutoTierRecommendationEvent.java
index 9dd00a4586..5846359232 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/SessionAutoTierRecommendationEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/SessionAutoTierRecommendationEvent.java
@@ -10,12 +10,16 @@
 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;
 
 /**
  * Session event "session.auto_tier_recommendation". Live-only Auto preference recommendation from Copilot API after a successful Auto model call.
+ *
+ * @apiNote This event type is experimental and may change in a future version.
  * @since 1.0.0
  */
+@CopilotExperimental
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @javax.annotation.processing.Generated("copilot-sdk-codegen")
@@ -31,6 +35,7 @@ public final class SessionAutoTierRecommendationEvent extends SessionEvent {
     public void setData(SessionAutoTierRecommendationEventData data) { this.data = data; }
 
     /** Data payload for {@link SessionAutoTierRecommendationEvent}. */
+    @CopilotExperimental
     @JsonIgnoreProperties(ignoreUnknown = true)
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public record SessionAutoTierRecommendationEventData(
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/SessionBinaryAssetEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionBinaryAssetEvent.java
index e925f2320a..d5e7a3f13f 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/SessionBinaryAssetEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/SessionBinaryAssetEvent.java
@@ -10,13 +10,17 @@
 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;
 
 /**
  * Session event "session.binary_asset". Canonical bytes for a content-addressed binary asset shared by reference across events
+ *
+ * @apiNote This event type is experimental and may change in a future version.
  * @since 1.0.0
  */
+@CopilotExperimental
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @javax.annotation.processing.Generated("copilot-sdk-codegen")
@@ -32,6 +36,7 @@ public final class SessionBinaryAssetEvent extends SessionEvent {
     public void setData(SessionBinaryAssetEventData data) { this.data = data; }
 
     /** Data payload for {@link SessionBinaryAssetEvent}. */
+    @CopilotExperimental
     @JsonIgnoreProperties(ignoreUnknown = true)
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public record SessionBinaryAssetEventData(
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/SessionCanvasClosedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionCanvasClosedEvent.java
index b660c0be66..b21bed7393 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/SessionCanvasClosedEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/SessionCanvasClosedEvent.java
@@ -10,12 +10,16 @@
 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;
 
 /**
  * Session event "session.canvas.closed". Payload of `session.canvas.closed` with the closed canvas instance ID, provider ID, and canvas ID.
+ *
+ * @apiNote This event type is experimental and may change in a future version.
  * @since 1.0.0
  */
+@CopilotExperimental
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @javax.annotation.processing.Generated("copilot-sdk-codegen")
@@ -31,6 +35,7 @@ public final class SessionCanvasClosedEvent extends SessionEvent {
     public void setData(SessionCanvasClosedEventData data) { this.data = data; }
 
     /** Data payload for {@link SessionCanvasClosedEvent}. */
+    @CopilotExperimental
     @JsonIgnoreProperties(ignoreUnknown = true)
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public record SessionCanvasClosedEventData(
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/SessionCanvasOpenedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionCanvasOpenedEvent.java
index 018e6a234d..fc371c2c59 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/SessionCanvasOpenedEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/SessionCanvasOpenedEvent.java
@@ -10,12 +10,16 @@
 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;
 
 /**
  * Session event "session.canvas.opened". Payload of `session.canvas.opened` with canvas instance and provider IDs plus optional icon, title, status, URL, and input.
+ *
+ * @apiNote This event type is experimental and may change in a future version.
  * @since 1.0.0
  */
+@CopilotExperimental
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @javax.annotation.processing.Generated("copilot-sdk-codegen")
@@ -31,6 +35,7 @@ public final class SessionCanvasOpenedEvent extends SessionEvent {
     public void setData(SessionCanvasOpenedEventData data) { this.data = data; }
 
     /** Data payload for {@link SessionCanvasOpenedEvent}. */
+    @CopilotExperimental
     @JsonIgnoreProperties(ignoreUnknown = true)
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public record SessionCanvasOpenedEventData(
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/SessionCanvasRecordedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionCanvasRecordedEvent.java
index 6f2fb42594..a2bcb80ce4 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/SessionCanvasRecordedEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/SessionCanvasRecordedEvent.java
@@ -10,12 +10,16 @@
 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;
 
 /**
  * Session event "session.canvas.recorded". Durable record that a canvas instance is open, used to restore open canvases on cold session resume. Intentionally omits the transient url and availability.
+ *
+ * @apiNote This event type is experimental and may change in a future version.
  * @since 1.0.0
  */
+@CopilotExperimental
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @javax.annotation.processing.Generated("copilot-sdk-codegen")
@@ -31,6 +35,7 @@ public final class SessionCanvasRecordedEvent extends SessionEvent {
     public void setData(SessionCanvasRecordedEventData data) { this.data = data; }
 
     /** Data payload for {@link SessionCanvasRecordedEvent}. */
+    @CopilotExperimental
     @JsonIgnoreProperties(ignoreUnknown = true)
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public record SessionCanvasRecordedEventData(
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/SessionCanvasRegistryChangedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionCanvasRegistryChangedEvent.java
index 0a6a9b62de..d97ef0ad95 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/SessionCanvasRegistryChangedEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/SessionCanvasRegistryChangedEvent.java
@@ -10,13 +10,17 @@
 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;
 
 /**
  * Session event "session.canvas.registry_changed". Payload of `session.canvas.registry_changed` listing the canvas declarations currently available.
+ *
+ * @apiNote This event type is experimental and may change in a future version.
  * @since 1.0.0
  */
+@CopilotExperimental
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @javax.annotation.processing.Generated("copilot-sdk-codegen")
@@ -32,6 +36,7 @@ public final class SessionCanvasRegistryChangedEvent extends SessionEvent {
     public void setData(SessionCanvasRegistryChangedEventData data) { this.data = data; }
 
     /** Data payload for {@link SessionCanvasRegistryChangedEvent}. */
+    @CopilotExperimental
     @JsonIgnoreProperties(ignoreUnknown = true)
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public record SessionCanvasRegistryChangedEventData(
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/SessionCanvasRemovedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionCanvasRemovedEvent.java
index cea7ab09af..30181c1f13 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/SessionCanvasRemovedEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/SessionCanvasRemovedEvent.java
@@ -10,12 +10,16 @@
 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;
 
 /**
  * Session event "session.canvas.removed". Durable record that a canvas instance was closed, superseding a prior instance_recorded during resume replay.
+ *
+ * @apiNote This event type is experimental and may change in a future version.
  * @since 1.0.0
  */
+@CopilotExperimental
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @javax.annotation.processing.Generated("copilot-sdk-codegen")
@@ -31,6 +35,7 @@ public final class SessionCanvasRemovedEvent extends SessionEvent {
     public void setData(SessionCanvasRemovedEventData data) { this.data = data; }
 
     /** Data payload for {@link SessionCanvasRemovedEvent}. */
+    @CopilotExperimental
     @JsonIgnoreProperties(ignoreUnknown = true)
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public record SessionCanvasRemovedEventData(
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/SessionCanvasUnavailableEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionCanvasUnavailableEvent.java
index 4e4397ecb6..5ff62e59b7 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/SessionCanvasUnavailableEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/SessionCanvasUnavailableEvent.java
@@ -10,12 +10,16 @@
 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;
 
 /**
  * Session event "session.canvas.unavailable". Transient signal that an open canvas instance's provider has dropped (for example the extension is reloading mid-session). The host should keep the panel mounted and surface a reconnecting affordance rather than tearing it down; a subsequent `session.canvas.opened` for the same instanceId clears the affordance once the provider reconnects with a fresh url. Ephemeral and never persisted, so it is never replayed on cold resume.
+ *
+ * @apiNote This event type is experimental and may change in a future version.
  * @since 1.0.0
  */
+@CopilotExperimental
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @javax.annotation.processing.Generated("copilot-sdk-codegen")
@@ -31,6 +35,7 @@ public final class SessionCanvasUnavailableEvent extends SessionEvent {
     public void setData(SessionCanvasUnavailableEventData data) { this.data = data; }
 
     /** Data payload for {@link SessionCanvasUnavailableEvent}. */
+    @CopilotExperimental
     @JsonIgnoreProperties(ignoreUnknown = true)
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public record SessionCanvasUnavailableEventData(
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/SessionCompletionReceiptEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionCompletionReceiptEvent.java
index 15670c992a..ef6ad4eef1 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/SessionCompletionReceiptEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/SessionCompletionReceiptEvent.java
@@ -10,12 +10,16 @@
 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;
 
 /**
  * Session event "session.completion_receipt". Behavior-neutral record of structured runtime facts present when an agent completion decision is accepted.
+ *
+ * @apiNote This event type is experimental and may change in a future version.
  * @since 1.0.0
  */
+@CopilotExperimental
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @javax.annotation.processing.Generated("copilot-sdk-codegen")
@@ -31,6 +35,7 @@ public final class SessionCompletionReceiptEvent extends SessionEvent {
     public void setData(SessionCompletionReceiptEventData data) { this.data = data; }
 
     /** Data payload for {@link SessionCompletionReceiptEvent}. */
+    @CopilotExperimental
     @JsonIgnoreProperties(ignoreUnknown = true)
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public record SessionCompletionReceiptEventData(
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/SessionErrorEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionErrorEvent.java
index 3ef32dfd13..9c6af84ab2 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/SessionErrorEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/SessionErrorEvent.java
@@ -34,10 +34,14 @@ public final class SessionErrorEvent extends SessionEvent {
     @JsonIgnoreProperties(ignoreUnknown = true)
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public record SessionErrorEventData(
-        /** Category of error (e.g., "authentication", "authorization", "quota", "rate_limit", "context_limit", "query") */
+        /** Category of error (e.g., "authentication", "authorization", "policy", "quota", "rate_limit", "context_limit", "query") */
         @JsonProperty("errorType") String errorType,
         /** Fine-grained error code from the upstream provider, when available. For `errorType: "rate_limit"`, this is one of the `RateLimitErrorCode` values (e.g., `"user_weekly_rate_limited"`, `"user_global_rate_limited"`, `"rate_limited"`, `"user_model_rate_limited"`, `"integration_rate_limited"`). For `errorType: "quota"`, this is the CAPI quota error code (e.g., `"quota_exceeded"`, `"session_quota_exceeded"`, `"billing_not_configured"`). */
         @JsonProperty("errorCode") String errorCode,
+        /** Provider-defined error type preserved from a structured upstream error envelope, when available (for example, `invalid_request_error`). */
+        @JsonProperty("providerErrorType") String providerErrorType,
+        /** Sanitized provider-defined error parameter preserved from a structured upstream error envelope, when available. */
+        @JsonProperty("providerErrorParam") String providerErrorParam,
         /** 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. */
         @JsonProperty("eligibleForAutoSwitch") Boolean eligibleForAutoSwitch,
         /** Human-readable error message */
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/SessionEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionEvent.java
index 726dd21975..563b8c6e6b 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/SessionEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/SessionEvent.java
@@ -54,6 +54,7 @@
     @JsonSubTypes.Type(value = SessionSnapshotRewindEvent.class, name = "session.snapshot_rewind"),
     @JsonSubTypes.Type(value = SessionShutdownEvent.class, name = "session.shutdown"),
     @JsonSubTypes.Type(value = SessionUsageCheckpointEvent.class, name = "session.usage_checkpoint"),
+    @JsonSubTypes.Type(value = SessionQuotaObservationEvent.class, name = "session.quota_observation"),
     @JsonSubTypes.Type(value = SessionContextChangedEvent.class, name = "session.context_changed"),
     @JsonSubTypes.Type(value = SessionUsageInfoEvent.class, name = "session.usage_info"),
     @JsonSubTypes.Type(value = SessionContextClearedEvent.class, name = "session.context_cleared"),
@@ -147,6 +148,7 @@
     @JsonSubTypes.Type(value = SessionLimitsExhaustedRequestedEvent.class, name = "session_limits_exhausted.requested"),
     @JsonSubTypes.Type(value = SessionLimitsExhaustedCompletedEvent.class, name = "session_limits_exhausted.completed"),
     @JsonSubTypes.Type(value = SessionAutoModeResolvedEvent.class, name = "session.auto_mode_resolved"),
+    @JsonSubTypes.Type(value = SessionManagedPluginProgressEvent.class, name = "session.managed_plugin_progress"),
     @JsonSubTypes.Type(value = SessionManagedSettingsResolvedEvent.class, name = "session.managed_settings_resolved"),
     @JsonSubTypes.Type(value = SessionManagedSettingsEnforcedEvent.class, name = "session.managed_settings_enforced"),
     @JsonSubTypes.Type(value = CommandsChangedEvent.class, name = "commands.changed"),
@@ -209,6 +211,7 @@ public abstract sealed class SessionEvent permits
         SessionSnapshotRewindEvent,
         SessionShutdownEvent,
         SessionUsageCheckpointEvent,
+        SessionQuotaObservationEvent,
         SessionContextChangedEvent,
         SessionUsageInfoEvent,
         SessionContextClearedEvent,
@@ -302,6 +305,7 @@ public abstract sealed class SessionEvent permits
         SessionLimitsExhaustedRequestedEvent,
         SessionLimitsExhaustedCompletedEvent,
         SessionAutoModeResolvedEvent,
+        SessionManagedPluginProgressEvent,
         SessionManagedSettingsResolvedEvent,
         SessionManagedSettingsEnforcedEvent,
         CommandsChangedEvent,
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/SessionFusionCompletedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionFusionCompletedEvent.java
index 6742cdc3e3..3adc227a1c 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/SessionFusionCompletedEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/SessionFusionCompletedEvent.java
@@ -10,12 +10,16 @@
 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;
 
 /**
  * Session event "session.fusion_completed". Experimental durable aggregate outcome of a HydraFusion turn.
+ *
+ * @apiNote This event type is experimental and may change in a future version.
  * @since 1.0.0
  */
+@CopilotExperimental
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @javax.annotation.processing.Generated("copilot-sdk-codegen")
@@ -31,6 +35,7 @@ public final class SessionFusionCompletedEvent extends SessionEvent {
     public void setData(SessionFusionCompletedEventData data) { this.data = data; }
 
     /** Data payload for {@link SessionFusionCompletedEvent}. */
+    @CopilotExperimental
     @JsonIgnoreProperties(ignoreUnknown = true)
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public record SessionFusionCompletedEventData(
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/SessionFusionResolvedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionFusionResolvedEvent.java
index 44ef8be4ab..20ef8aad9f 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/SessionFusionResolvedEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/SessionFusionResolvedEvent.java
@@ -16,8 +16,11 @@
 
 /**
  * Session event "session.fusion_resolved". Experimental durable validated HydraFusion route and turn policy.
+ *
+ * @apiNote This event type is experimental and may change in a future version.
  * @since 1.0.0
  */
+@CopilotExperimental
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @javax.annotation.processing.Generated("copilot-sdk-codegen")
@@ -33,6 +36,7 @@ public final class SessionFusionResolvedEvent extends SessionEvent {
     public void setData(SessionFusionResolvedEventData data) { this.data = data; }
 
     /** Data payload for {@link SessionFusionResolvedEvent}. */
+    @CopilotExperimental
     @JsonIgnoreProperties(ignoreUnknown = true)
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public record SessionFusionResolvedEventData(
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/SessionFusionRouteFailedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionFusionRouteFailedEvent.java
index 25698b336b..eac6892f56 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/SessionFusionRouteFailedEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/SessionFusionRouteFailedEvent.java
@@ -10,12 +10,16 @@
 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;
 
 /**
  * Session event "session.fusion_route_failed". Experimental durable HydraFusion routing failure and the deterministic concrete fallback selected for the turn.
+ *
+ * @apiNote This event type is experimental and may change in a future version.
  * @since 1.0.0
  */
+@CopilotExperimental
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @javax.annotation.processing.Generated("copilot-sdk-codegen")
@@ -31,6 +35,7 @@ public final class SessionFusionRouteFailedEvent extends SessionEvent {
     public void setData(SessionFusionRouteFailedEventData data) { this.data = data; }
 
     /** Data payload for {@link SessionFusionRouteFailedEvent}. */
+    @CopilotExperimental
     @JsonIgnoreProperties(ignoreUnknown = true)
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public record SessionFusionRouteFailedEventData(
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/SessionFusionRouteStartedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionFusionRouteStartedEvent.java
index 139cb4f011..f8d350535e 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/SessionFusionRouteStartedEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/SessionFusionRouteStartedEvent.java
@@ -10,12 +10,16 @@
 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;
 
 /**
  * Session event "session.fusion_route_started". Experimental transient signal that HydraFusion routing has started for an eligible turn.
+ *
+ * @apiNote This event type is experimental and may change in a future version.
  * @since 1.0.0
  */
+@CopilotExperimental
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @javax.annotation.processing.Generated("copilot-sdk-codegen")
@@ -31,6 +35,7 @@ public final class SessionFusionRouteStartedEvent extends SessionEvent {
     public void setData(SessionFusionRouteStartedEventData data) { this.data = data; }
 
     /** Data payload for {@link SessionFusionRouteStartedEvent}. */
+    @CopilotExperimental
     @JsonIgnoreProperties(ignoreUnknown = true)
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public record SessionFusionRouteStartedEventData(
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/SessionManagedPluginProgressEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionManagedPluginProgressEvent.java
new file mode 100644
index 0000000000..f812f0fdcd
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/SessionManagedPluginProgressEvent.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 com.github.copilot.CopilotExperimental;
+import java.util.List;
+import javax.annotation.processing.Generated;
+
+/**
+ * Session event "session.managed_plugin_progress". Experimental transient presentation-neutral progress for organization-required plugin preparation. Clients should localize the phase copy and display plugin specs without translating them.
+ *
+ * @apiNote This event type is experimental and may change in a future version.
+ * @since 1.0.0
+ */
+@CopilotExperimental
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public final class SessionManagedPluginProgressEvent extends SessionEvent {
+
+    @Override
+    public String getType() { return "session.managed_plugin_progress"; }
+
+    @JsonProperty("data")
+    private SessionManagedPluginProgressEventData data;
+
+    public SessionManagedPluginProgressEventData getData() { return data; }
+    public void setData(SessionManagedPluginProgressEventData data) { this.data = data; }
+
+    /** Data payload for {@link SessionManagedPluginProgressEvent}. */
+    @CopilotExperimental
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    public record SessionManagedPluginProgressEventData(
+        /** Current preparation phase. */
+        @JsonProperty("phase") ManagedPluginProgressPhase phase,
+        /** Ordered plugin install specs affected by this phase. Empty while managed settings initialize and when preparation completes. */
+        @JsonProperty("pluginSpecs") List<String> pluginSpecs
+    ) {
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/SessionManagedSettingsEnforcedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionManagedSettingsEnforcedEvent.java
index c712a220a9..2017f32e84 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/SessionManagedSettingsEnforcedEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/SessionManagedSettingsEnforcedEvent.java
@@ -10,12 +10,16 @@
 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;
 
 /**
- * Session event "session.managed_settings_enforced". Runtime enforcement of enterprise managed settings: fires when the session blocks or caps a runtime action because enterprise policy governs it, so SDK clients can explain *why* an action was governed. Unlike `session.managed_settings_resolved` (which reports *what* is managed), this reports a concrete governed action — e.g. a user or host tried to turn on a bypass-permissions escalation while policy disables it. Emitted live (not persisted to the session event log) on user/host-initiated attempts only, never for silent policy application. Marked experimental while the managed-settings surface stabilizes.
+ * Session event "session.managed_settings_enforced". Runtime enforcement of enterprise managed settings: fires when the session blocks or caps a runtime action because enterprise policy governs it, so SDK clients can explain *why* an action was governed. Unlike `session.managed_settings_resolved` (which reports *what* is managed), this reports a concrete governed action — e.g. a user or host tried to turn on bypass permissions or Assisted Permissions while the corresponding policy disables it. Emitted live (not persisted to the session event log) on user/host-initiated attempts only, never for silent policy application. Marked experimental while the managed-settings surface stabilizes.
+ *
+ * @apiNote This event type is experimental and may change in a future version.
  * @since 1.0.0
  */
+@CopilotExperimental
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @javax.annotation.processing.Generated("copilot-sdk-codegen")
@@ -31,14 +35,15 @@ public final class SessionManagedSettingsEnforcedEvent extends SessionEvent {
     public void setData(SessionManagedSettingsEnforcedEventData data) { this.data = data; }
 
     /** Data payload for {@link SessionManagedSettingsEnforcedEvent}. */
+    @CopilotExperimental
     @JsonIgnoreProperties(ignoreUnknown = true)
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public record SessionManagedSettingsEnforcedEventData(
         /** The category of runtime action that managed policy governed. */
         @JsonProperty("action") ManagedSettingsEnforcedAction action,
-        /** For a `bypass_permissions_blocked` action, which permission-escalation primitive was refused. Absent for actions without a specific escalation primitive. */
+        /** For a `bypass_permissions_blocked` action, which permission-mode or escalation primitive was refused. Absent for actions without a specific primitive. */
         @JsonProperty("escalation") ManagedSettingsEnforcedEscalation escalation,
-        /** The managed setting key responsible for the enforcement (e.g. `permissions.disableBypassPermissionsMode`). */
+        /** The managed setting key responsible for the enforcement (for example `permissions.disableBypassPermissionsMode` or `permissions.disableAssistedPermissionsMode`). */
         @JsonProperty("setting") String setting,
         /** Whether the enforcement was forced by fail-closed handling (managed policy could not be determined) rather than an explicit managed setting. When true, `setting` still names the restriction that was applied. */
         @JsonProperty("failClosed") Boolean failClosed,
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/SessionManagedSettingsResolvedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionManagedSettingsResolvedEvent.java
index d495ec8cf6..007e911ef8 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/SessionManagedSettingsResolvedEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/SessionManagedSettingsResolvedEvent.java
@@ -10,13 +10,17 @@
 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;
 
 /**
  * Session event "session.managed_settings_resolved". Effective enterprise managed settings applied to the session and their contributing channels. Emitted whenever managed policy is applied or reapplied, including session start, resume, and account switch. This ephemeral live snapshot is delivered to subscribers but not persisted to the session event log; initial resolution occurs before session.start.
+ *
+ * @apiNote This event type is experimental and may change in a future version.
  * @since 1.0.0
  */
+@CopilotExperimental
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @javax.annotation.processing.Generated("copilot-sdk-codegen")
@@ -32,9 +36,12 @@ public final class SessionManagedSettingsResolvedEvent extends SessionEvent {
     public void setData(SessionManagedSettingsResolvedEventData data) { this.data = data; }
 
     /** Data payload for {@link SessionManagedSettingsResolvedEvent}. */
+    @CopilotExperimental
     @JsonIgnoreProperties(ignoreUnknown = true)
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public record SessionManagedSettingsResolvedEventData(
+        /** Reusable retained managed permission policy for managedSettings.permissions.evaluate, including source composition and session-local injection. Provided by live session snapshots; absent in older events. Refresh the context when managed policy changes. */
+        @JsonProperty("permissionsContext") ManagedPermissionsContext permissionsContext,
         /** Channel summary: `server`, `device`, `client`, or `policyHelper` 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 */
@@ -45,11 +52,11 @@ public record SessionManagedSettingsResolvedEventData(
         @JsonProperty("clientManaged") Boolean clientManaged,
         /** Whether the policy-helper managed-settings layer was present. The policy helper is the weakest channel: it fills keys no enterprise source set and can never replace one. */
         @JsonProperty("policyHelperManaged") Boolean policyHelperManaged,
-        /** 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. */
+        /** Whether managed policy could not be determined (e.g. a failed server fetch) and unresolved-policy safeguards remain active. This does not by itself disable bypass-permissions; `bypassPermissionsDisabled` reports only an explicit policy restriction. */
         @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. */
+        /** Whether an explicit enterprise policy restriction disables bypass-permissions ("yolo") mode for this session. Deny-wins across layers; an unresolved policy does not force this on by itself. */
         @JsonProperty("bypassPermissionsDisabled") Boolean bypassPermissionsDisabled,
         /** 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,
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/SessionModelChangeEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionModelChangeEvent.java
index 09e39c584d..c6de1f0246 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/SessionModelChangeEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/SessionModelChangeEvent.java
@@ -38,12 +38,18 @@ public record SessionModelChangeEventData(
         @JsonProperty("previousModel") String previousModel,
         /** Newly selected model identifier */
         @JsonProperty("newModel") String newModel,
+        /** Provider selected for newModel. Omitted for legacy or unattributed selections; never inferred from a later selection. */
+        @JsonProperty("providerId") String providerId,
+        /** Provider of previousModel, when known. A provider-only change is a model selection change even when the model identifiers are equal. */
+        @JsonProperty("previousProviderId") String previousProviderId,
         /** Reasoning effort level before the model change, if applicable */
         @JsonProperty("previousReasoningEffort") String previousReasoningEffort,
         /** Reasoning effort level after the model change, if applicable */
         @JsonProperty("reasoningEffort") String reasoningEffort,
         /** Model that owns effort embedded in an authored model selection. Omitted for independent reasoning-effort overrides and legacy events. */
         @JsonProperty("reasoningEffortModel") String reasoningEffortModel,
+        /** True when the reasoning effort is a managed-policy default bound to reasoningEffortModel. Omitted for agent-authored, user-authored, independent, and legacy effort. */
+        @JsonProperty("reasoningEffortManaged") Boolean reasoningEffortManaged,
         /** Reasoning summary mode before the model change, if applicable */
         @JsonProperty("previousReasoningSummary") ReasoningSummary previousReasoningSummary,
         /** Reasoning summary mode after the model change, if applicable */
@@ -54,6 +60,8 @@ public record SessionModelChangeEventData(
         @JsonProperty("verbosity") Verbosity verbosity,
         /** Context tier after the model change; null explicitly clears a previously selected tier */
         @JsonProperty("contextTier") ContextTier contextTier,
+        /** True when contextTier is a managed-policy default. Omitted for user-authored and legacy values. */
+        @JsonProperty("contextTierManaged") Boolean contextTierManaged,
         /** 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,
         /** Origin of the effective model change, when known. */
@@ -61,7 +69,31 @@ public record SessionModelChangeEventData(
         /** Previously committed Auto preference, when one was explicitly selected. */
         @JsonProperty("previousAutoTier") AutoTier previousAutoTier,
         /** Committed Auto preference after the model configuration change, when applicable. */
-        @JsonProperty("autoTier") AutoTier autoTier
+        @JsonProperty("autoTier") AutoTier autoTier,
+        /** True when autoTier is a managed-policy default. Omitted for user-authored and legacy values. */
+        @JsonProperty("autoTierManaged") Boolean autoTierManaged
     ) {
+
+        /**
+         * Creates event data with the components it had before later optional fields were added.
+         */
+        public SessionModelChangeEventData(
+            String previousModel,
+            String newModel,
+            String previousReasoningEffort,
+            String reasoningEffort,
+            String reasoningEffortModel,
+            ReasoningSummary previousReasoningSummary,
+            ReasoningSummary reasoningSummary,
+            Verbosity previousVerbosity,
+            Verbosity verbosity,
+            ContextTier contextTier,
+            String cause,
+            ModelChangeSource source,
+            AutoTier previousAutoTier,
+            AutoTier autoTier
+        ) {
+            this(previousModel, newModel, null, null, previousReasoningEffort, reasoningEffort, reasoningEffortModel, null, previousReasoningSummary, reasoningSummary, previousVerbosity, verbosity, contextTier, null, cause, source, previousAutoTier, autoTier, null);
+        }
     }
 }
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/SessionPermissionRecoveryEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionPermissionRecoveryEvent.java
index 56d08f53b4..262bf4578d 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/SessionPermissionRecoveryEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/SessionPermissionRecoveryEvent.java
@@ -37,6 +37,10 @@ public final class SessionPermissionRecoveryEvent extends SessionEvent {
     public record SessionPermissionRecoveryEventData(
         /** Stable identifier shared by every transition in this recovery episode */
         @JsonProperty("episodeId") String episodeId,
+        /** Root or child execution-session identifier that owns this recovery episode; omitted for legacy snapshots */
+        @JsonProperty("ownerSessionId") String ownerSessionId,
+        /** Subagent identifier that owns this recovery episode when the request was delegated through a parent permission service */
+        @JsonProperty("ownerAgentId") String ownerAgentId,
         /** Current lifecycle state of the recovery episode */
         @JsonProperty("status") PermissionRecoveryStatus status,
         /** Policy selected from the current client's response capability; mode or client changes may update it during recovery */
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/SessionPermissionsChangedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionPermissionsChangedEvent.java
index 5d45858942..818efd8527 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/SessionPermissionsChangedEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/SessionPermissionsChangedEvent.java
@@ -15,8 +15,11 @@
 
 /**
  * Session event "session.permissions_changed". Permission-mode transition details.
+ *
+ * @apiNote This event type is experimental and may change in a future version.
  * @since 1.0.0
  */
+@CopilotExperimental
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @javax.annotation.processing.Generated("copilot-sdk-codegen")
@@ -32,6 +35,7 @@ public final class SessionPermissionsChangedEvent extends SessionEvent {
     public void setData(SessionPermissionsChangedEventData data) { this.data = data; }
 
     /** Data payload for {@link SessionPermissionsChangedEvent}. */
+    @CopilotExperimental
     @JsonIgnoreProperties(ignoreUnknown = true)
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public record SessionPermissionsChangedEventData(
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/SessionQuotaObservationEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionQuotaObservationEvent.java
new file mode 100644
index 0000000000..00f710af94
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/SessionQuotaObservationEvent.java
@@ -0,0 +1,46 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 com.github.copilot.CopilotExperimental;
+import javax.annotation.processing.Generated;
+
+/**
+ * Session event "session.quota_observation". A provider-owned quota observation, distinct from per-call usage and charge accounting.
+ *
+ * @apiNote This event type is experimental and may change in a future version.
+ * @since 1.0.0
+ */
+@CopilotExperimental
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public final class SessionQuotaObservationEvent extends SessionEvent {
+
+    @Override
+    public String getType() { return "session.quota_observation"; }
+
+    @JsonProperty("data")
+    private SessionQuotaObservationEventData data;
+
+    public SessionQuotaObservationEventData getData() { return data; }
+    public void setData(SessionQuotaObservationEventData data) { this.data = data; }
+
+    /** Data payload for {@link SessionQuotaObservationEvent}. */
+    @CopilotExperimental
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    public record SessionQuotaObservationEventData(
+        /** The admitted provider's state observation. Admission balances and percentages remain absent; separate monthly usage may report its own amount and cycle. */
+        @JsonProperty("observation") ProviderQuotaState observation
+    ) {
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/SessionResumeEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionResumeEvent.java
index 4120d9e7c8..1020ae8195 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/SessionResumeEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/SessionResumeEvent.java
@@ -43,18 +43,26 @@ public record SessionResumeEventData(
         @JsonProperty("eventsFileSizeBytes") Long eventsFileSizeBytes,
         /** Model currently selected at resume time */
         @JsonProperty("selectedModel") String selectedModel,
+        /** Provider of selectedModel at resume time, when explicitly selected. */
+        @JsonProperty("providerId") String providerId,
         /** Reasoning effort level used for model calls, if applicable (e.g. "none", "low", "medium", "high", "xhigh", "max") */
         @JsonProperty("reasoningEffort") String reasoningEffort,
         /** Model that owns effort embedded in an authored model selection. Omitted for independent reasoning-effort overrides and legacy events. */
         @JsonProperty("reasoningEffortModel") String reasoningEffortModel,
+        /** True when the reasoning effort is a managed-policy default bound to reasoningEffortModel. Omitted for agent-authored, user-authored, independent, and legacy effort. */
+        @JsonProperty("reasoningEffortManaged") Boolean reasoningEffortManaged,
         /** Reasoning summary mode used for model calls, if applicable (e.g. "none", "concise", "detailed") */
         @JsonProperty("reasoningSummary") ReasoningSummary reasoningSummary,
         /** Output verbosity level used for model calls, if applicable (e.g. "low", "medium", "high") */
         @JsonProperty("verbosity") Verbosity verbosity,
         /** Context tier currently selected at resume time; null when no tier is active */
         @JsonProperty("contextTier") ContextTier contextTier,
+        /** True when contextTier is a managed-policy default. Omitted for user-authored and legacy values. */
+        @JsonProperty("contextTierManaged") Boolean contextTierManaged,
         /** Auto routing preference active at resume time */
         @JsonProperty("autoTier") AutoTier autoTier,
+        /** True when autoTier is a managed-policy default. Omitted for user-authored and legacy values. */
+        @JsonProperty("autoTierManaged") Boolean autoTierManaged,
         /** Session limits currently configured at resume time; null when no limits are active */
         @JsonProperty("sessionLimits") SessionLimitsConfig sessionLimits,
         /** Updated working directory and git context at resume time */
@@ -68,5 +76,29 @@ public record SessionResumeEventData(
         /** When true, tool calls and permission requests left in flight by the previous session lifetime remain pending after resume and the agentic loop awaits their results. User sends are queued behind the pending work until all such requests reach a terminal state. When false or omitted, pending work is normally marked as interrupted unless the resume passively joined live work owned by another client; sessionWasActive distinguishes that case. */
         @JsonProperty("continuePendingWork") Boolean continuePendingWork
     ) {
+
+        /**
+         * Creates event data with the components it had before later optional fields were added.
+         */
+        public SessionResumeEventData(
+            OffsetDateTime resumeTime,
+            Long eventCount,
+            Long eventsFileSizeBytes,
+            String selectedModel,
+            String reasoningEffort,
+            String reasoningEffortModel,
+            ReasoningSummary reasoningSummary,
+            Verbosity verbosity,
+            ContextTier contextTier,
+            AutoTier autoTier,
+            SessionLimitsConfig sessionLimits,
+            WorkingDirectoryContext context,
+            Boolean alreadyInUse,
+            Boolean sessionWasActive,
+            Boolean remoteSteerable,
+            Boolean continuePendingWork
+        ) {
+            this(resumeTime, eventCount, eventsFileSizeBytes, selectedModel, null, reasoningEffort, reasoningEffortModel, null, reasoningSummary, verbosity, contextTier, null, autoTier, null, sessionLimits, context, alreadyInUse, sessionWasActive, remoteSteerable, continuePendingWork);
+        }
     }
 }
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/SessionShutdownEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionShutdownEvent.java
index ab97f6b192..59f09bc9c2 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/SessionShutdownEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/SessionShutdownEvent.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 java.util.Map;
 import javax.annotation.processing.Generated;
 
@@ -36,6 +37,12 @@ public final class SessionShutdownEvent extends SessionEvent {
     @JsonIgnoreProperties(ignoreUnknown = true)
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public record SessionShutdownEventData(
+        /** Complete accounting state captured atomically with receipt watermarks. */
+        @JsonProperty("accountingSnapshot") UsageGetMetricsResult accountingSnapshot,
+        /** Provider/model accounting preserved for replay without consulting current provider selection. */
+        @JsonProperty("providerModelMetrics") List<UsageMetricsProviderModelMetric> providerModelMetrics,
+        /** Per-source accounting sequence watermarks subsuming preceding usage receipts. */
+        @JsonProperty("usageAccountingWatermarks") Map<String, Long> usageAccountingWatermarks,
         /** Whether the session ended normally ("routine") or due to a crash/fatal error ("error") */
         @JsonProperty("shutdownType") ShutdownType shutdownType,
         /** Error description when shutdownType is "error" */
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/SessionStartEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionStartEvent.java
index db7336ce68..e3ea9d31e6 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/SessionStartEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/SessionStartEvent.java
@@ -47,18 +47,26 @@ public record SessionStartEventData(
         @JsonProperty("startTime") OffsetDateTime startTime,
         /** Model selected at session creation time, if any */
         @JsonProperty("selectedModel") String selectedModel,
+        /** Provider of selectedModel at creation time, when explicitly selected. */
+        @JsonProperty("providerId") String providerId,
         /** Reasoning effort level used for model calls, if applicable (e.g. "none", "low", "medium", "high", "xhigh", "max") */
         @JsonProperty("reasoningEffort") String reasoningEffort,
         /** Model that owns effort embedded in an authored model selection. Omitted for independent reasoning-effort overrides and legacy events. */
         @JsonProperty("reasoningEffortModel") String reasoningEffortModel,
+        /** True when the reasoning effort is a managed-policy default bound to reasoningEffortModel. Omitted for agent-authored, user-authored, independent, and legacy effort. */
+        @JsonProperty("reasoningEffortManaged") Boolean reasoningEffortManaged,
         /** Reasoning summary mode used for model calls, if applicable (e.g. "none", "concise", "detailed") */
         @JsonProperty("reasoningSummary") ReasoningSummary reasoningSummary,
         /** Output verbosity level used for model calls, if applicable (e.g. "low", "medium", "high") */
         @JsonProperty("verbosity") Verbosity verbosity,
         /** Context tier selected at session creation time for models with tiered context pricing; null when no tier is selected (e.g., non-tiered model) */
         @JsonProperty("contextTier") ContextTier contextTier,
+        /** True when contextTier is a managed-policy default. Omitted for user-authored and legacy values. */
+        @JsonProperty("contextTierManaged") Boolean contextTierManaged,
         /** Auto routing preference selected at session creation time */
         @JsonProperty("autoTier") AutoTier autoTier,
+        /** True when autoTier is a managed-policy default. Omitted for user-authored and legacy values. */
+        @JsonProperty("autoTierManaged") Boolean autoTierManaged,
         /** Session limits configured at session creation time, if any */
         @JsonProperty("sessionLimits") SessionLimitsConfig sessionLimits,
         /** Working directory and git context at session start */
@@ -72,5 +80,31 @@ public record SessionStartEventData(
         /** When set, identifies a parent session whose context this session continues — e.g., a detached headless rem-agent run launched on the parent's interactive shutdown. Telemetry from this session is reported under the parent's session_id. */
         @JsonProperty("detachedFromSpawningParentSessionId") String detachedFromSpawningParentSessionId
     ) {
+
+        /**
+         * Creates event data with the components it had before later optional fields were added.
+         */
+        public SessionStartEventData(
+            String sessionId,
+            Long version,
+            String producer,
+            String copilotVersion,
+            OffsetDateTime startTime,
+            String selectedModel,
+            String reasoningEffort,
+            String reasoningEffortModel,
+            ReasoningSummary reasoningSummary,
+            Verbosity verbosity,
+            ContextTier contextTier,
+            AutoTier autoTier,
+            SessionLimitsConfig sessionLimits,
+            WorkingDirectoryContext context,
+            GitHubMcpToolConfig gitHubMcpToolConfig,
+            Boolean alreadyInUse,
+            Boolean remoteSteerable,
+            String detachedFromSpawningParentSessionId
+        ) {
+            this(sessionId, version, producer, copilotVersion, startTime, selectedModel, null, reasoningEffort, reasoningEffortModel, null, reasoningSummary, verbosity, contextTier, null, autoTier, null, sessionLimits, context, gitHubMcpToolConfig, alreadyInUse, remoteSteerable, detachedFromSpawningParentSessionId);
+        }
     }
 }
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/SessionUsageCheckpointEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SessionUsageCheckpointEvent.java
index bdbc1add95..e0fd312afc 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/SessionUsageCheckpointEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/SessionUsageCheckpointEvent.java
@@ -11,6 +11,7 @@
 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;
 
 /**
@@ -37,6 +38,12 @@ public final class SessionUsageCheckpointEvent extends SessionEvent {
     public record SessionUsageCheckpointEventData(
         /** Session-wide accumulated nano-AI units cost at checkpoint time */
         @JsonProperty("totalNanoAiu") Double totalNanoAiu,
+        /** Complete accounting state captured atomically with the receipt watermarks. */
+        @JsonProperty("accountingSnapshot") UsageGetMetricsResult accountingSnapshot,
+        /** Provider/model accounting snapshot that subsumes preceding usage receipts. */
+        @JsonProperty("providerModelMetrics") List<UsageMetricsProviderModelMetric> providerModelMetrics,
+        /** Highest accounted sequence per source session; no per-call deduplication history is retained. */
+        @JsonProperty("usageAccountingWatermarks") Map<String, Long> usageAccountingWatermarks,
         /** 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 */
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/SkillContextDeliveredEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SkillContextDeliveredEvent.java
index a1f218d26e..c40c6dd6e3 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/SkillContextDeliveredEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/SkillContextDeliveredEvent.java
@@ -10,12 +10,16 @@
 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;
 
 /**
  * Session event "skill.context_delivered". Exact skill context delivered to the model during a tool phase. This is not a user submission or another skill invocation.
+ *
+ * @apiNote This event type is experimental and may change in a future version.
  * @since 1.0.0
  */
+@CopilotExperimental
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @javax.annotation.processing.Generated("copilot-sdk-codegen")
@@ -31,6 +35,7 @@ public final class SkillContextDeliveredEvent extends SessionEvent {
     public void setData(SkillContextDeliveredEventData data) { this.data = data; }
 
     /** Data payload for {@link SkillContextDeliveredEvent}. */
+    @CopilotExperimental
     @JsonIgnoreProperties(ignoreUnknown = true)
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public record SkillContextDeliveredEventData(
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/SkillContextDeliveredRefEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SkillContextDeliveredRefEvent.java
index b0468b3be0..a6eec3e548 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/SkillContextDeliveredRefEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/SkillContextDeliveredRefEvent.java
@@ -10,12 +10,16 @@
 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;
 
 /**
  * Session event "skill.context_delivered_ref". Internal durable receipt that reconstructs exact model-visible skill context from earlier session content.
+ *
+ * @apiNote This event type is experimental and may change in a future version.
  * @since 1.0.0
  */
+@CopilotExperimental
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @javax.annotation.processing.Generated("copilot-sdk-codegen")
@@ -31,6 +35,7 @@ public final class SkillContextDeliveredRefEvent extends SessionEvent {
     public void setData(SkillContextDeliveredRefEventData data) { this.data = data; }
 
     /** Data payload for {@link SkillContextDeliveredRefEvent}. */
+    @CopilotExperimental
     @JsonIgnoreProperties(ignoreUnknown = true)
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public record SkillContextDeliveredRefEventData(
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/SkillInvokedRefEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/SkillInvokedRefEvent.java
index 5dc09939e9..c05ab65c3d 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/SkillInvokedRefEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/SkillInvokedRefEvent.java
@@ -10,13 +10,17 @@
 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;
 
 /**
  * Session event "skill.invoked_ref". Internal durable skill invocation receipt whose content resolves from an earlier inline skill event in the same session.
+ *
+ * @apiNote This event type is experimental and may change in a future version.
  * @since 1.0.0
  */
+@CopilotExperimental
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @javax.annotation.processing.Generated("copilot-sdk-codegen")
@@ -32,6 +36,7 @@ public final class SkillInvokedRefEvent extends SessionEvent {
     public void setData(SkillInvokedRefEventData data) { this.data = data; }
 
     /** Data payload for {@link SkillInvokedRefEvent}. */
+    @CopilotExperimental
     @JsonIgnoreProperties(ignoreUnknown = true)
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public record SkillInvokedRefEventData(
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
index b2f390e823..2c5620b443 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/UiEphemeralQueryEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/UiEphemeralQueryEvent.java
@@ -10,12 +10,16 @@
 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;
 
 /**
  * Session event "ui.ephemeral_query". Ordered output and terminal state for a transient query that does not modify conversation history.
+ *
+ * @apiNote This event type is experimental and may change in a future version.
  * @since 1.0.0
  */
+@CopilotExperimental
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @javax.annotation.processing.Generated("copilot-sdk-codegen")
@@ -31,6 +35,7 @@ public final class UiEphemeralQueryEvent extends SessionEvent {
     public void setData(UiEphemeralQueryEventData data) { this.data = data; }
 
     /** Data payload for {@link UiEphemeralQueryEvent}. */
+    @CopilotExperimental
     @JsonIgnoreProperties(ignoreUnknown = true)
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public record UiEphemeralQueryEventData(
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/UsageAccountingIdentity.java b/java/sdk/src/generated/java/com/github/copilot/generated/UsageAccountingIdentity.java
new file mode 100644
index 0000000000..317aefc28c
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/UsageAccountingIdentity.java
@@ -0,0 +1,31 @@
+/*---------------------------------------------------------------------------------------------
+ *  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;
+
+/**
+ * Ordered accounting identity assigned under the source session's emission lock.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record UsageAccountingIdentity(
+    /** Session that assigned this accounting sequence. */
+    @JsonProperty("sourceSessionId") String sourceSessionId,
+    /** Monotonically increasing sequence within the source session. */
+    @JsonProperty("sequence") Long sequence,
+    /** Existing API call identifier, or a runtime-generated identity when none was supplied. */
+    @JsonProperty("usageId") String usageId
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/UsageGetMetricsResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/UsageGetMetricsResult.java
new file mode 100644
index 0000000000..9142a777e9
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/UsageGetMetricsResult.java
@@ -0,0 +1,57 @@
+/*---------------------------------------------------------------------------------------------
+ *  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.time.OffsetDateTime;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.processing.Generated;
+
+/**
+ * Accumulated session usage metrics, including premium request cost, token counts, model breakdown, and code-change totals.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record UsageGetMetricsResult(
+    /** Completeness of totalNanoAiu. Numeric totals remain the reported subtotal; zero is not a claim of free usage when unavailable. */
+    @JsonProperty("aiCreditsStatus") AiCreditsStatus aiCreditsStatus,
+    /** Total user-initiated premium request cost across all models (may be fractional due to multipliers) */
+    @JsonProperty("totalPremiumRequestCost") Double totalPremiumRequestCost,
+    /** Raw count of user-initiated API requests */
+    @JsonProperty("totalUserRequests") Long totalUserRequests,
+    /** Session-wide accumulated nano-AI units cost */
+    @JsonProperty("totalNanoAiu") Double totalNanoAiu,
+    /** Session-wide per-token-type accumulated token counts */
+    @JsonProperty("tokenDetails") Map<String, UsageMetricsTokenDetail> tokenDetails,
+    /** Total time spent in model API calls (milliseconds) */
+    @JsonProperty("totalApiDurationMs") Long totalApiDurationMs,
+    /** ISO 8601 timestamp when the session started */
+    @JsonProperty("sessionStartTime") OffsetDateTime sessionStartTime,
+    /** Aggregated code change metrics */
+    @JsonProperty("codeChanges") UsageMetricsCodeChanges codeChanges,
+    /** Per-model token and request metrics, keyed by model identifier */
+    @JsonProperty("modelMetrics") Map<String, UsageMetricsModelMetric> modelMetrics,
+    /** Provider-attributed model metrics, ordered by first observed provider and model.
+Null attribution preserves historical usage whose provider or model was not recorded. */
+    @JsonProperty("providerModelMetrics") List<UsageMetricsProviderModelMetric> providerModelMetrics,
+    /** 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 */
+    @JsonProperty("lastCallInputTokens") Long lastCallInputTokens,
+    /** Output tokens from the most recent main-agent API call */
+    @JsonProperty("lastCallOutputTokens") Long lastCallOutputTokens
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/UsageMetricsAgentMetric.java b/java/sdk/src/generated/java/com/github/copilot/generated/UsageMetricsAgentMetric.java
new file mode 100644
index 0000000000..a0e9f07d60
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/UsageMetricsAgentMetric.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, 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/sdk/src/generated/java/com/github/copilot/generated/UsageMetricsCodeChanges.java b/java/sdk/src/generated/java/com/github/copilot/generated/UsageMetricsCodeChanges.java
new file mode 100644
index 0000000000..92f117b26b
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/UsageMetricsCodeChanges.java
@@ -0,0 +1,34 @@
+/*---------------------------------------------------------------------------------------------
+ *  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;
+
+/**
+ * Aggregated code change metrics
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record UsageMetricsCodeChanges(
+    /** Total lines of code added */
+    @JsonProperty("linesAdded") Long linesAdded,
+    /** Total lines of code removed */
+    @JsonProperty("linesRemoved") Long linesRemoved,
+    /** Number of distinct files modified */
+    @JsonProperty("filesModifiedCount") Long filesModifiedCount,
+    /** Distinct file paths modified during the session */
+    @JsonProperty("filesModified") List<String> filesModified
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/UsageMetricsModelMetric.java b/java/sdk/src/generated/java/com/github/copilot/generated/UsageMetricsModelMetric.java
new file mode 100644
index 0000000000..e55b06e3e9
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/UsageMetricsModelMetric.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 com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.time.OffsetDateTime;
+import java.util.Map;
+import javax.annotation.processing.Generated;
+
+/**
+ * Per-model usage metrics, including request counts/costs, token usage, nano-AI units, and per-token-type details.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record UsageMetricsModelMetric(
+    /** Completeness of this model's reported AI-credit subtotal. Explicitly reported zero is complete, not unavailable. */
+    @JsonProperty("aiCreditsStatus") AiCreditsStatus aiCreditsStatus,
+    /** Request count and cost metrics for this model */
+    @JsonProperty("requests") UsageMetricsModelMetricRequests requests,
+    /** Token usage metrics for this model */
+    @JsonProperty("usage") UsageMetricsModelMetricUsage usage,
+    /** Latest known prompt-cache expiration for this model. A timestamp in the past indicates that the observed cache has expired. */
+    @JsonProperty("cacheExpiresAt") OffsetDateTime cacheExpiresAt,
+    /** Accumulated nano-AI units cost for this model */
+    @JsonProperty("totalNanoAiu") Double totalNanoAiu,
+    /** Token count details per type */
+    @JsonProperty("tokenDetails") Map<String, UsageMetricsModelMetricTokenDetail> tokenDetails
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/UsageMetricsModelMetricRequests.java b/java/sdk/src/generated/java/com/github/copilot/generated/UsageMetricsModelMetricRequests.java
new file mode 100644
index 0000000000..56951bf8ee
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/UsageMetricsModelMetricRequests.java
@@ -0,0 +1,29 @@
+/*---------------------------------------------------------------------------------------------
+ *  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;
+
+/**
+ * Request count and cost metrics for this model
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record UsageMetricsModelMetricRequests(
+    /** Number of API requests made with this model */
+    @JsonProperty("count") Long count,
+    /** User-initiated premium request cost (with multiplier applied) */
+    @JsonProperty("cost") Double cost
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/UsageMetricsModelMetricTokenDetail.java b/java/sdk/src/generated/java/com/github/copilot/generated/UsageMetricsModelMetricTokenDetail.java
new file mode 100644
index 0000000000..64bdc0c797
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/UsageMetricsModelMetricTokenDetail.java
@@ -0,0 +1,27 @@
+/*---------------------------------------------------------------------------------------------
+ *  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;
+
+/**
+ * Per-model token-detail entry containing the accumulated token count for one token type.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record UsageMetricsModelMetricTokenDetail(
+    /** Accumulated token count for this token type */
+    @JsonProperty("tokenCount") Long tokenCount
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/UsageMetricsModelMetricUsage.java b/java/sdk/src/generated/java/com/github/copilot/generated/UsageMetricsModelMetricUsage.java
new file mode 100644
index 0000000000..e984a1b823
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/UsageMetricsModelMetricUsage.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 com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * Token usage metrics for this model
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record UsageMetricsModelMetricUsage(
+    /** Total input tokens consumed */
+    @JsonProperty("inputTokens") Long inputTokens,
+    /** Total output tokens produced */
+    @JsonProperty("outputTokens") Long outputTokens,
+    /** Total tokens read from prompt cache */
+    @JsonProperty("cacheReadTokens") Long cacheReadTokens,
+    /** Total tokens written to prompt cache */
+    @JsonProperty("cacheWriteTokens") Long cacheWriteTokens,
+    /** Total output tokens used for reasoning */
+    @JsonProperty("reasoningTokens") Long reasoningTokens
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/UsageMetricsProviderModelMetric.java b/java/sdk/src/generated/java/com/github/copilot/generated/UsageMetricsProviderModelMetric.java
new file mode 100644
index 0000000000..27e17e6ba6
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/UsageMetricsProviderModelMetric.java
@@ -0,0 +1,33 @@
+/*---------------------------------------------------------------------------------------------
+ *  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;
+
+/**
+ * Usage for one recorded provider and model, without merging identical model IDs across providers.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record UsageMetricsProviderModelMetric(
+    /** Provider identity and product label captured when the call was dispatched; null when unknown. */
+    @JsonProperty("provider") ModelProviderRef provider,
+    /** Model identity, or null for legacy aggregate-only usage. */
+    @JsonProperty("modelId") String modelId,
+    /** Model display name captured at call time, when known. */
+    @JsonProperty("modelDisplayName") String modelDisplayName,
+    /** Request, token, and cost totals for this provider/model. */
+    @JsonProperty("metrics") UsageMetricsModelMetric metrics
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/UsageMetricsTokenDetail.java b/java/sdk/src/generated/java/com/github/copilot/generated/UsageMetricsTokenDetail.java
new file mode 100644
index 0000000000..2e30d0bf90
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/UsageMetricsTokenDetail.java
@@ -0,0 +1,27 @@
+/*---------------------------------------------------------------------------------------------
+ *  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-wide token-detail entry containing the accumulated token count for one token type.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record UsageMetricsTokenDetail(
+    /** Accumulated token count for this token type */
+    @JsonProperty("tokenCount") Long tokenCount
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/WorkflowRunSettledEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/WorkflowRunSettledEvent.java
index 7cfef0df02..944dacd0df 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/WorkflowRunSettledEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/WorkflowRunSettledEvent.java
@@ -10,12 +10,16 @@
 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;
 
 /**
  * Session event "workflow.run_settled". Ephemeral signal that a workflow run reached a terminal status.
+ *
+ * @apiNote This event type is experimental and may change in a future version.
  * @since 1.0.0
  */
+@CopilotExperimental
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @javax.annotation.processing.Generated("copilot-sdk-codegen")
@@ -31,6 +35,7 @@ public final class WorkflowRunSettledEvent extends SessionEvent {
     public void setData(WorkflowRunSettledEventData data) { this.data = data; }
 
     /** Data payload for {@link WorkflowRunSettledEvent}. */
+    @CopilotExperimental
     @JsonIgnoreProperties(ignoreUnknown = true)
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public record WorkflowRunSettledEventData(
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/WorkflowRunStartedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/WorkflowRunStartedEvent.java
index 656b51f596..fa12ead80a 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/WorkflowRunStartedEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/WorkflowRunStartedEvent.java
@@ -10,12 +10,16 @@
 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;
 
 /**
  * Session event "workflow.run_started". Ephemeral signal that a workflow run attempt began executing.
+ *
+ * @apiNote This event type is experimental and may change in a future version.
  * @since 1.0.0
  */
+@CopilotExperimental
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @javax.annotation.processing.Generated("copilot-sdk-codegen")
@@ -31,6 +35,7 @@ public final class WorkflowRunStartedEvent extends SessionEvent {
     public void setData(WorkflowRunStartedEventData data) { this.data = data; }
 
     /** Data payload for {@link WorkflowRunStartedEvent}. */
+    @CopilotExperimental
     @JsonIgnoreProperties(ignoreUnknown = true)
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public record WorkflowRunStartedEventData(
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/WorkflowRunUpdatedEvent.java b/java/sdk/src/generated/java/com/github/copilot/generated/WorkflowRunUpdatedEvent.java
index 6a51db49f6..1a9350e018 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/WorkflowRunUpdatedEvent.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/WorkflowRunUpdatedEvent.java
@@ -10,12 +10,16 @@
 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;
 
 /**
  * Session event "workflow.run_updated". Ephemeral invalidation signal for a changed workflow run.
+ *
+ * @apiNote This event type is experimental and may change in a future version.
  * @since 1.0.0
  */
+@CopilotExperimental
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @javax.annotation.processing.Generated("copilot-sdk-codegen")
@@ -31,6 +35,7 @@ public final class WorkflowRunUpdatedEvent extends SessionEvent {
     public void setData(WorkflowRunUpdatedEventData data) { this.data = data; }
 
     /** Data payload for {@link WorkflowRunUpdatedEvent}. */
+    @CopilotExperimental
     @JsonIgnoreProperties(ignoreUnknown = true)
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public record WorkflowRunUpdatedEventData(
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AccountAuthInfo.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AccountAuthInfo.java
new file mode 100644
index 0000000000..b6a93fb206
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AccountAuthInfo.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 interactive account whose model provider owns its credentials. It carries no GitHub credential.
+ *
+ * @since 1.0.0
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public final class AccountAuthInfo extends AuthInfo {
+
+    @JsonProperty("type")
+    private final String type = "account";
+
+    @Override
+    public String getType() { return type; }
+
+    /** Host coordinate owned by the account's model provider. */
+    @JsonProperty("host")
+    private String host;
+
+    /** Login identifying the provider-owned account. */
+    @JsonProperty("login")
+    private String login;
+
+    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; }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AccountDescribeAuthInfoParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AccountDescribeAuthInfoParams.java
new file mode 100644
index 0000000000..83a49d849a
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AccountDescribeAuthInfoParams.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 authentication identity whose shared wording should be rendered.
+ *
+ * @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)
+record AccountDescribeAuthInfoParams(
+    /** Identity to describe. */
+    @JsonProperty("identity") AuthIdentity identity
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AccountDescribeAuthInfoResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AccountDescribeAuthInfoResult.java
new file mode 100644
index 0000000000..8fcc083bbb
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AccountDescribeAuthInfoResult.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;
+
+/**
+ * The wording the runtime uses for an authentication identity.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record AccountDescribeAuthInfoResult(
+    /** Sign-in banner announcing the authenticated user. */
+    @JsonProperty("message") String message,
+    /** One-line description of the identity, suitable after a verb such as "Switched to". */
+    @JsonProperty("description") String description
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AccountGetGistSupportParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AccountGetGistSupportParams.java
new file mode 100644
index 0000000000..76c1a53037
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AccountGetGistSupportParams.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 authentication identity whose gist support should be reported.
+ *
+ * @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)
+record AccountGetGistSupportParams(
+    /** Identity to evaluate. */
+    @JsonProperty("identity") AuthIdentity identity
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AccountGetGistSupportResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AccountGetGistSupportResult.java
new file mode 100644
index 0000000000..03862487a0
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AccountGetGistSupportResult.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;
+
+/**
+ * Whether the identity can create gists, and why not when it cannot.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record AccountGetGistSupportResult(
+    /** True when the identity can create gists. */
+    @JsonProperty("supported") Boolean supported,
+    /** Machine-readable reason category when unsupported. */
+    @JsonProperty("kind") String kind,
+    /** Human-readable explanation to show where the gist action would have been. */
+    @JsonProperty("reason") String reason
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AccountGetTokenEnvVarResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AccountGetTokenEnvVarResult.java
new file mode 100644
index 0000000000..5e7c2aacf5
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AccountGetTokenEnvVarResult.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;
+
+/**
+ * The environment variable supplying a classic personal access token, when one is set.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record AccountGetTokenEnvVarResult(
+    /** Variable name, for example `GH_TOKEN`. Absent when no classic token is present in the environment. */
+    @JsonProperty("name") String name
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AccountGetWebUrlParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AccountGetWebUrlParams.java
new file mode 100644
index 0000000000..7b4c7686c4
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AccountGetWebUrlParams.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;
+
+/**
+ * A path to resolve against the GitHub host an identity is signed in to.
+ *
+ * @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)
+record AccountGetWebUrlParams(
+    /** Host-relative path, without a leading slash, for example `settings/copilot/features`. */
+    @JsonProperty("path") String path,
+    /** Identity whose host the path resolves against. Omit to resolve against the public github.com host. */
+    @JsonProperty("identity") AuthIdentity identity
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AccountGetWebUrlResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AccountGetWebUrlResult.java
new file mode 100644
index 0000000000..5aa680cacd
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AccountGetWebUrlResult.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;
+
+/**
+ * An absolute URL on the identity's GitHub host.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record AccountGetWebUrlResult(
+    /** Absolute URL for the requested path. */
+    @JsonProperty("url") String url
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AccountStatus.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AccountStatus.java
index cb0868ce74..7cdebb3d29 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AccountStatus.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AccountStatus.java
@@ -31,6 +31,8 @@ public record AccountStatus(
     @JsonProperty("login") String login,
     /** The provider kind of this account. */
     @JsonProperty("kind") AccountKind kind,
+    /** Human-readable credential source used to authenticate this account, such as `gh` or `GITHUB_TOKEN`. */
+    @JsonProperty("authSource") String authSource,
     /** Opaque id of the account this one was derived from (e.g. an EMU account's base Entra identity); absent for a root account. Matches the base identity account's selectionId, forming the derivation edge. */
     @JsonProperty("derivedFrom") String derivedFrom,
     /** Whether this is the active account. */
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentInfo.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentInfo.java
index 27fd56a428..17debc1a4c 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentInfo.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentInfo.java
@@ -54,6 +54,8 @@ public record AgentInfo(
     /** Skill names preloaded into this agent's context. Omitted means none. */
     @JsonProperty("skills") List<String> skills,
     /** 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. */
-    @JsonProperty("prompt") String prompt
+    @JsonProperty("prompt") String prompt,
+    /** Declarative hook actions keyed by event name, executed only while this agent is active. */
+    @JsonProperty("hooks") Map<String, List<Object>> hooks
 ) {
 }
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentsCustomAgentInitialModelDecisionParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentsCustomAgentInitialModelDecisionParams.java
new file mode 100644
index 0000000000..1555b36663
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentsCustomAgentInitialModelDecisionParams.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;
+
+/**
+ * The models a custom agent asks for, and the models actually available.
+ *
+ * @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)
+record AgentsCustomAgentInitialModelDecisionParams(
+    /** The agent's declared `model:` entry, serialized. A single name or an ordered list of acceptable names. */
+    @JsonProperty("agentModelsJson") String agentModelsJson,
+    /** The models available to this session, serialized in the shape the model list carries. */
+    @JsonProperty("availableModelsJson") String availableModelsJson
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentsCustomAgentInitialModelDecisionResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentsCustomAgentInitialModelDecisionResult.java
new file mode 100644
index 0000000000..afd26e66af
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentsCustomAgentInitialModelDecisionResult.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;
+
+/**
+ * The model to switch to, and the warning to show when the agent's preference could not be met.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record AgentsCustomAgentInitialModelDecisionResult(
+    /** The first available model that matches the agent's preferences. Absent when none of the requested models is available. */
+    @JsonProperty("targetModel") String targetModel,
+    /** The reasoning effort attached to the selected model preference. Absent when that preference does not specify an effort. */
+    @JsonProperty("reasoningEffort") String reasoningEffort,
+    /** What to tell the user about an unmet preference. Absent when the preference was met. A warning with no `targetModel` means the agent's models are all unavailable. */
+    @JsonProperty("warning") String warning
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentsDiscoverRequest.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentsDiscoverRequest.java
new file mode 100644
index 0000000000..26ead3977a
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentsDiscoverRequest.java
@@ -0,0 +1,107 @@
+/*---------------------------------------------------------------------------------------------
+ *  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.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.copilot.CopilotExperimental;
+import java.util.List;
+import java.util.Objects;
+import javax.annotation.processing.Generated;
+
+/**
+ * Optional project paths to include in agent discovery.
+ * <p>
+ * Required inputs are constructor arguments. Optional inputs have fluent setters.
+ *
+ * @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)
+public final class AgentsDiscoverRequest {
+
+    /** 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). */
+    @JsonProperty("projectPaths")
+    private List<String> projectPaths;
+
+    /** 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. */
+    @JsonProperty("excludeHostAgents")
+    private Boolean excludeHostAgents;
+
+    /** Explicit discovery-only agent roots, separate from customAgents and filesystem grants. Available without ambient discovery, subject to managed/source disables. Relative paths resolve against the request's effective working directory when supplied. Null and omission are equivalent; an empty array contributes no explicit roots. */
+    @JsonProperty("agentDirectories")
+    private List<String> agentDirectories;
+
+    /**
+     * Creates a request with its required inputs.
+     */
+    public AgentsDiscoverRequest() {
+    }
+
+    /**
+     * Returns the {@code projectPaths} property.
+     *
+     * @return 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).
+     */
+    public List<String> getProjectPaths() {
+        return projectPaths;
+    }
+
+    /**
+     * Returns the {@code excludeHostAgents} property.
+     *
+     * @return 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.
+     */
+    public Boolean getExcludeHostAgents() {
+        return excludeHostAgents;
+    }
+
+    /**
+     * Returns the {@code agentDirectories} property.
+     *
+     * @return Explicit discovery-only agent roots, separate from customAgents and filesystem grants. Available without ambient discovery, subject to managed/source disables. Relative paths resolve against the request's effective working directory when supplied. Null and omission are equivalent; an empty array contributes no explicit roots.
+     */
+    public List<String> getAgentDirectories() {
+        return agentDirectories;
+    }
+
+    /**
+     * Sets the {@code projectPaths} property.
+     *
+     * @param value 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).
+     * @return this request
+     */
+    public AgentsDiscoverRequest setProjectPaths(List<String> value) {
+        this.projectPaths = value;
+        return this;
+    }
+
+    /**
+     * Sets the {@code excludeHostAgents} property.
+     *
+     * @param value 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.
+     * @return this request
+     */
+    public AgentsDiscoverRequest setExcludeHostAgents(Boolean value) {
+        this.excludeHostAgents = value;
+        return this;
+    }
+
+    /**
+     * Sets the {@code agentDirectories} property.
+     *
+     * @param value Explicit discovery-only agent roots, separate from customAgents and filesystem grants. Available without ambient discovery, subject to managed/source disables. Relative paths resolve against the request's effective working directory when supplied. Null and omission are equivalent; an empty array contributes no explicit roots.
+     * @return this request
+     */
+    public AgentsDiscoverRequest setAgentDirectories(List<String> value) {
+        this.agentDirectories = value;
+        return this;
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentsGetAvailableBuiltinsParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentsGetAvailableBuiltinsParams.java
new file mode 100644
index 0000000000..fee8d13df9
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentsGetAvailableBuiltinsParams.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 feature flags to evaluate shipped agents against.
+ *
+ * @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)
+record AgentsGetAvailableBuiltinsParams(
+    /** Feature flag values keyed by name, evaluated with the runtime's truthiness rules. Omit or pass null for no flags. */
+    @JsonProperty("featureFlags") Map<String, Object> featureFlags,
+    /** Flag overrides keyed by name. A null entry uses the corresponding base flag; false explicitly disables it. Omit or pass null for no overrides. */
+    @JsonProperty("overrides") Map<String, Object> overrides,
+    /** The surface asking, which gates agents that only apply to one client. Omit or pass null to apply no client filter. */
+    @JsonProperty("context") String context
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentsGetAvailableBuiltinsResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentsGetAvailableBuiltinsResult.java
new file mode 100644
index 0000000000..14667e1269
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentsGetAvailableBuiltinsResult.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 java.util.List;
+import javax.annotation.processing.Generated;
+
+/**
+ * The shipped agents available under the requested flags.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record AgentsGetAvailableBuiltinsResult(
+    /** Available shipped agents, in the runtime's own order. */
+    @JsonProperty("agents") List<BuiltinAgentSummary> agents
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentsGetBuiltinDefinitionParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentsGetBuiltinDefinitionParams.java
new file mode 100644
index 0000000000..cc69529078
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentsGetBuiltinDefinitionParams.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 shipped agent whose definition to load.
+ *
+ * @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)
+record AgentsGetBuiltinDefinitionParams(
+    /** The agent name, which must be one of `getBuiltins`'s `yamlBasedNames`. A name outside that list is special-cased in code and has no definition, and is reported as an error rather than as an empty definition. */
+    @JsonProperty("name") String name
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentsGetBuiltinDefinitionResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentsGetBuiltinDefinitionResult.java
new file mode 100644
index 0000000000..2fd4d55fa3
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentsGetBuiltinDefinitionResult.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;
+
+/**
+ * One shipped agent's definition.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record AgentsGetBuiltinDefinitionResult(
+    /** The agent's definition, serialized as JSON. It carries the authored keys plus the runtime's projected `__nativeCustomAgent` view of the same agent. It is a string rather than an object because the runtime parses it with the agent schema's tolerant shape, which accepts keys this contract does not name. */
+    @JsonProperty("definitionJson") String definitionJson
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentsGetBuiltinListingDefinitionParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentsGetBuiltinListingDefinitionParams.java
new file mode 100644
index 0000000000..9258f87d1b
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentsGetBuiltinListingDefinitionParams.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 shipped agent whose listing entry to load.
+ *
+ * @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)
+record AgentsGetBuiltinListingDefinitionParams(
+    /** The agent name, taken from `getAvailableBuiltins`. Unlike `getBuiltinDefinition`, the agent that `getBuiltins` reports as special-cased rather than YAML-based is answered here too, from its in-code definition. */
+    @JsonProperty("name") String name
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentsGetBuiltinListingDefinitionResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentsGetBuiltinListingDefinitionResult.java
new file mode 100644
index 0000000000..f49d37d53b
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentsGetBuiltinListingDefinitionResult.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;
+
+/**
+ * One shipped agent, projected for a listing.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record AgentsGetBuiltinListingDefinitionResult(
+    /** The agent projected as a custom agent, serialized as JSON. It is a string rather than an object for the same reason as `getBuiltinDefinition`: the runtime parses the underlying definition with the agent schema's tolerant shape, which accepts keys this contract does not name. */
+    @JsonProperty("definitionJson") String definitionJson
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentsGetBuiltinsResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentsGetBuiltinsResult.java
new file mode 100644
index 0000000000..d0148ac6d7
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentsGetBuiltinsResult.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.List;
+import javax.annotation.processing.Generated;
+
+/**
+ * The agents this runtime ships, named so a consumer can tell them apart from authored ones.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record AgentsGetBuiltinsResult(
+    /** Every agent name this runtime ships. */
+    @JsonProperty("names") List<String> names,
+    /** The subset of `names` a user is allowed to turn off. A shipped agent outside this list is always active and a client should not offer a toggle for it. */
+    @JsonProperty("disableableNames") List<String> disableableNames,
+    /** The subset of `names` defined by a shipped YAML definition. The remainder are special-cased in code and have no definition to load. */
+    @JsonProperty("yamlBasedNames") List<String> yamlBasedNames
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentsGetDiscoveryPathsRequest.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentsGetDiscoveryPathsRequest.java
new file mode 100644
index 0000000000..fe9123f9ba
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AgentsGetDiscoveryPathsRequest.java
@@ -0,0 +1,107 @@
+/*---------------------------------------------------------------------------------------------
+ *  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.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.copilot.CopilotExperimental;
+import java.util.List;
+import java.util.Objects;
+import javax.annotation.processing.Generated;
+
+/**
+ * Optional project paths to include when enumerating agent discovery directories.
+ * <p>
+ * Required inputs are constructor arguments. Optional inputs have fluent setters.
+ *
+ * @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)
+public final class AgentsGetDiscoveryPathsRequest {
+
+    /** Optional list of project directory paths. When omitted or empty, only the user-level directory is returned. */
+    @JsonProperty("projectPaths")
+    private List<String> projectPaths;
+
+    /** When true, omit the host's user-level agent directory, leaving only project directories. For multitenant deployments (mirrors `discover`'s `excludeHostAgents`). */
+    @JsonProperty("excludeHostAgents")
+    private Boolean excludeHostAgents;
+
+    /** Explicit discovery-only agent roots to enumerate, including configured missing directories. Relative paths resolve against the request's effective working directory when supplied. These are not filesystem grants or preferred creation targets. Null and omission are equivalent. */
+    @JsonProperty("agentDirectories")
+    private List<String> agentDirectories;
+
+    /**
+     * Creates a request with its required inputs.
+     */
+    public AgentsGetDiscoveryPathsRequest() {
+    }
+
+    /**
+     * Returns the {@code projectPaths} property.
+     *
+     * @return Optional list of project directory paths. When omitted or empty, only the user-level directory is returned.
+     */
+    public List<String> getProjectPaths() {
+        return projectPaths;
+    }
+
+    /**
+     * Returns the {@code excludeHostAgents} property.
+     *
+     * @return When true, omit the host's user-level agent directory, leaving only project directories. For multitenant deployments (mirrors `discover`'s `excludeHostAgents`).
+     */
+    public Boolean getExcludeHostAgents() {
+        return excludeHostAgents;
+    }
+
+    /**
+     * Returns the {@code agentDirectories} property.
+     *
+     * @return Explicit discovery-only agent roots to enumerate, including configured missing directories. Relative paths resolve against the request's effective working directory when supplied. These are not filesystem grants or preferred creation targets. Null and omission are equivalent.
+     */
+    public List<String> getAgentDirectories() {
+        return agentDirectories;
+    }
+
+    /**
+     * Sets the {@code projectPaths} property.
+     *
+     * @param value Optional list of project directory paths. When omitted or empty, only the user-level directory is returned.
+     * @return this request
+     */
+    public AgentsGetDiscoveryPathsRequest setProjectPaths(List<String> value) {
+        this.projectPaths = value;
+        return this;
+    }
+
+    /**
+     * Sets the {@code excludeHostAgents} property.
+     *
+     * @param value When true, omit the host's user-level agent directory, leaving only project directories. For multitenant deployments (mirrors `discover`'s `excludeHostAgents`).
+     * @return this request
+     */
+    public AgentsGetDiscoveryPathsRequest setExcludeHostAgents(Boolean value) {
+        this.excludeHostAgents = value;
+        return this;
+    }
+
+    /**
+     * Sets the {@code agentDirectories} property.
+     *
+     * @param value Explicit discovery-only agent roots to enumerate, including configured missing directories. Relative paths resolve against the request's effective working directory when supplied. These are not filesystem grants or preferred creation targets. Null and omission are equivalent.
+     * @return this request
+     */
+    public AgentsGetDiscoveryPathsRequest setAgentDirectories(List<String> value) {
+        this.agentDirectories = value;
+        return this;
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AiCreditsStatus.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AiCreditsStatus.java
new file mode 100644
index 0000000000..cc13ac67a4
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AiCreditsStatus.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;
+
+/**
+ * Whether the accumulated numeric AI-credit subtotal covers the observed calls.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum AiCreditsStatus {
+    /** The {@code complete} variant. */
+    COMPLETE("complete"),
+    /** The {@code partial} variant. */
+    PARTIAL("partial"),
+    /** The {@code unavailable} variant. */
+    UNAVAILABLE("unavailable");
+
+    private final String value;
+    AiCreditsStatus(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static AiCreditsStatus fromValue(String value) {
+        for (AiCreditsStatus v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown AiCreditsStatus value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AuthIdentity.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AuthIdentity.java
index dfeb3c023a..7768741926 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AuthIdentity.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AuthIdentity.java
@@ -20,7 +20,7 @@
 @javax.annotation.processing.Generated("copilot-sdk-codegen")
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
-record AuthIdentity(
+public record AuthIdentity(
     /** Authentication type */
     @JsonProperty("type") AuthInfoType type,
     /** Authentication host */
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
index 5d82a47f85..7b03a6a29a 100644
--- 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
@@ -25,6 +25,7 @@
     @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 = AccountAuthInfo.class, name = "account"),
     @JsonSubTypes.Type(value = GhCliAuthInfo.class, name = "gh-cli"),
     @JsonSubTypes.Type(value = ApiKeyAuthInfo.class, name = "api-key")
 })
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AuthInfoType.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AuthInfoType.java
index 5f81c8cf84..1be60446c1 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AuthInfoType.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AuthInfoType.java
@@ -22,6 +22,8 @@ public enum AuthInfoType {
     ENV("env"),
     /** The {@code user} variant. */
     USER("user"),
+    /** The {@code account} variant. */
+    ACCOUNT("account"),
     /** The {@code gh-cli} variant. */
     GH_CLI("gh-cli"),
     /** The {@code api-key} variant. */
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AuthLoginAccount.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AuthLoginAccount.java
new file mode 100644
index 0000000000..87405999ed
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AuthLoginAccount.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 javax.annotation.processing.Generated;
+
+/**
+ * A credential-free account choice after sign-in.
+ *
+ * @apiNote This type 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 AuthLoginAccount(
+    /** Opaque identifier supplied to the next login step to select this account. */
+    @JsonProperty("selectionId") String selectionId,
+    /** Host coordinate owned by the selected account's provider. */
+    @JsonProperty("host") String host,
+    /** Human-readable login for the account choice. */
+    @JsonProperty("login") String login,
+    /** Provider kind that owns this account choice. */
+    @JsonProperty("kind") AccountKind kind
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AuthLoginResultDto.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AuthLoginResultDto.java
index cbcffb6e54..ecbb106f12 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AuthLoginResultDto.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AuthLoginResultDto.java
@@ -11,10 +11,11 @@
 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;
 
 /**
- * Terminal result of an interactive login flow.
+ * Result of an interactive login flow. Pending consent or account selection is not terminal.
  *
  * @apiNote This type is experimental and may change in a future version.
  *
@@ -25,11 +26,13 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record AuthLoginResultDto(
-    /** Terminal disposition of the login. */
+    /** Current disposition of the login, including pending user decisions. */
     @JsonProperty("status") AuthLoginResultStatus status,
     /** Host that was signed in, when completed. */
     @JsonProperty("host") String host,
     /** Login that was signed in, when completed. */
-    @JsonProperty("login") String login
+    @JsonProperty("login") String login,
+    /** Available accounts when sign-in is awaiting account selection, ordered with Microsoft 365 first. */
+    @JsonProperty("accounts") List<AuthLoginAccount> accounts
 ) {
 }
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AuthLoginResultStatus.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AuthLoginResultStatus.java
index 9e36ad0027..07becf2fb9 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AuthLoginResultStatus.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AuthLoginResultStatus.java
@@ -11,7 +11,7 @@
 import javax.annotation.processing.Generated;
 
 /**
- * Terminal disposition of a login persistence attempt.
+ * Disposition of a login attempt, including pending user decisions.
  *
  * @apiNote This type is experimental and may change in a future version.
  *
@@ -24,6 +24,8 @@ public enum AuthLoginResultStatus {
     COMPLETED("completed"),
     /** The {@code needs-plaintext-consent} variant. */
     NEEDS_PLAINTEXT_CONSENT("needs-plaintext-consent"),
+    /** The {@code needs-account-selection} variant. */
+    NEEDS_ACCOUNT_SELECTION("needs-account-selection"),
     /** The {@code declined} variant. */
     DECLINED("declined");
 
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AuthLoginStepCompleted.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AuthLoginStepCompleted.java
index b1fb524643..a8ea53e123 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AuthLoginStepCompleted.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AuthLoginStepCompleted.java
@@ -32,7 +32,7 @@ public final class AuthLoginStepCompleted extends AuthLoginStep {
     @Override
     public String getKind() { return kind; }
 
-    /** The terminal login result. */
+    /** Login result. When status is needs-plaintext-consent or needs-account-selection, advance with the user's decision to continue. */
     @JsonProperty("result")
     private AuthLoginResultDto result;
 
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AuthReadValueActiveAccount.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AuthReadValueActiveAccount.java
index 8ee2fb9416..e10579d0e6 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AuthReadValueActiveAccount.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AuthReadValueActiveAccount.java
@@ -36,6 +36,13 @@ public final class AuthReadValueActiveAccount extends AuthReadValue {
     @JsonProperty("account")
     private AccountStatus account;
 
+    /** Credential-free identity metadata for the active account, including resolved Copilot user information when available. */
+    @JsonProperty("authInfo")
+    private AuthIdentity authInfo;
+
     public AccountStatus getAccount() { return account; }
     public void setAccount(AccountStatus account) { this.account = account; }
+
+    public AuthIdentity getAuthInfo() { return authInfo; }
+    public void setAuthInfo(AuthIdentity authInfo) { this.authInfo = authInfo; }
 }
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AutoTier.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AutoTier.java
index 00b18bcc94..cc568096a9 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AutoTier.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AutoTier.java
@@ -10,30 +10,38 @@
 import javax.annotation.processing.Generated;
 
 /**
- * Routing preference used when the session model is `auto`. `fast` is an integrator-only latency preset and is not a first-party GitHub Copilot product preference.
+ * Extensible routing preference for the virtual `auto` model. New identifiers must be advertised and enabled by the provider. `fast` is an integrator-only latency preset.
  *
  * @since 1.0.0
  */
 @javax.annotation.processing.Generated("copilot-sdk-codegen")
-public enum AutoTier {
+public final class AutoTier {
     /** The {@code efficiency} variant. */
-    EFFICIENCY("efficiency"),
+    public static final AutoTier EFFICIENCY = new AutoTier("efficiency");
     /** The {@code balance} variant. */
-    BALANCE("balance"),
+    public static final AutoTier BALANCE = new AutoTier("balance");
     /** The {@code intelligence} variant. */
-    INTELLIGENCE("intelligence"),
+    public static final AutoTier INTELLIGENCE = new AutoTier("intelligence");
     /** The {@code fast} variant. */
-    FAST("fast");
+    public static final AutoTier FAST = new AutoTier("fast");
 
     private final String value;
-    AutoTier(String value) { this.value = value; }
+    private AutoTier(String value) { this.value = value; }
     @com.fasterxml.jackson.annotation.JsonValue
     public String getValue() { return value; }
     @com.fasterxml.jackson.annotation.JsonCreator
     public static AutoTier fromValue(String value) {
+        if (value == null) return null;
+        if (value.isEmpty() || value.codePoints().anyMatch(c -> Character.isWhitespace(c) || Character.isISOControl(c)))
+            throw new IllegalArgumentException("AutoTier requires a routing identifier");
         for (AutoTier v : values()) {
             if (v.value.equals(value)) return v;
         }
-        throw new IllegalArgumentException("Unknown AutoTier value: " + value);
+        return new AutoTier(value);
     }
+    /** Returns the known routing preferences. @return known values */
+    public static AutoTier[] values() { return new AutoTier[] { EFFICIENCY, BALANCE, INTELLIGENCE, FAST }; }
+    @Override public boolean equals(Object other) { return other instanceof AutoTier v && value.equals(v.value); }
+    @Override public int hashCode() { return value.hashCode(); }
+    @Override public String toString() { return value; }
 }
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AutoTierDescriptor.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AutoTierDescriptor.java
new file mode 100644
index 0000000000..49616a82a6
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AutoTierDescriptor.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;
+
+/**
+ * A server-advertised routing preference. Identifiers and execution types are extensible.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record AutoTierDescriptor(
+    /** Opaque routing identifier transmitted unchanged to the provider. */
+    @JsonProperty("id") String id,
+    /** Human-readable label, not a routing identifier. */
+    @JsonProperty("displayName") String displayName,
+    /** Description displayed beside the preference. */
+    @JsonProperty("description") String description,
+    /** Execution kind; this client supports `auto` preferences on the Auto model. */
+    @JsonProperty("type") String type,
+    /** Current account-specific availability. */
+    @JsonProperty("status") AutoTierStatus status
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AutoTierMetadata.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AutoTierMetadata.java
new file mode 100644
index 0000000000..347bf55666
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AutoTierMetadata.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.List;
+import javax.annotation.processing.Generated;
+
+/**
+ * Account-bound discovery metadata for the virtual `auto` model.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record AutoTierMetadata(
+    /** Provider-default preference, used only when no explicit preference exists. */
+    @JsonProperty("defaultTier") String defaultTier,
+    /** Routing preferences in the server's presentation order. */
+    @JsonProperty("tiers") List<AutoTierDescriptor> tiers,
+    /** Provider that supplied this metadata, when the catalog is provider-attributed. */
+    @JsonProperty("providerId") String providerId
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AutoTierStatus.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AutoTierStatus.java
new file mode 100644
index 0000000000..8bf78312b6
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/AutoTierStatus.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;
+
+/**
+ * Availability of a server-advertised routing preference.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record AutoTierStatus(
+    /** Whether the provider permits selecting this preference. */
+    @JsonProperty("enabled") Boolean enabled,
+    /** Extensible machine-readable unavailability reason. */
+    @JsonProperty("reason") String reason,
+    /** Human-readable explanation of availability. */
+    @JsonProperty("message") String message
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/BuiltinAgentSummary.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/BuiltinAgentSummary.java
new file mode 100644
index 0000000000..65e75ff6f7
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/BuiltinAgentSummary.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 shipped agent, named and described.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record BuiltinAgentSummary(
+    /** The agent name, as it appears in `getBuiltins`. */
+    @JsonProperty("name") String name,
+    /** One-line description of what the agent does. */
+    @JsonProperty("description") String description
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ConnectorDiscoveryAccount.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ConnectorDiscoveryAccount.java
new file mode 100644
index 0000000000..f41fd3dd79
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ConnectorDiscoveryAccount.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 javax.annotation.processing.Generated;
+
+/**
+ * Eligible account.
+ *
+ * @apiNote This type 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 ConnectorDiscoveryAccount(
+    /** Opaque account ID. */
+    @JsonProperty("accountId") String accountId,
+    /** Account metadata. */
+    @JsonProperty("authInfo") ConnectorDiscoveryAuthInfo authInfo
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ConnectorDiscoveryAuthInfo.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ConnectorDiscoveryAuthInfo.java
new file mode 100644
index 0000000000..3857e88ff1
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ConnectorDiscoveryAuthInfo.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 javax.annotation.processing.Generated;
+
+/**
+ * Account metadata.
+ *
+ * @apiNote This type 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 ConnectorDiscoveryAuthInfo(
+    /** Authentication type. */
+    @JsonProperty("type") AuthInfoType type,
+    /** Host. */
+    @JsonProperty("host") String host,
+    /** Login. */
+    @JsonProperty("login") String login
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ConnectorDiscoveryAvailability.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ConnectorDiscoveryAvailability.java
new file mode 100644
index 0000000000..00162fc078
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ConnectorDiscoveryAvailability.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.github.copilot.CopilotExperimental;
+import javax.annotation.processing.Generated;
+
+/**
+ * Availability.
+ *
+ * @apiNote This type is experimental and may change in a future version.
+ *
+ * @since 1.0.0
+ */
+@CopilotExperimental
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum ConnectorDiscoveryAvailability {
+    /** The {@code enabled} variant. */
+    ENABLED("enabled"),
+    /** The {@code disabled} variant. */
+    DISABLED("disabled"),
+    /** The {@code unavailable} variant. */
+    UNAVAILABLE("unavailable");
+
+    private final String value;
+    ConnectorDiscoveryAvailability(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static ConnectorDiscoveryAvailability fromValue(String value) {
+        for (ConnectorDiscoveryAvailability v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown ConnectorDiscoveryAvailability value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ConnectorDiscoveryCatalogEntry.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ConnectorDiscoveryCatalogEntry.java
new file mode 100644
index 0000000000..76c137c5e2
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ConnectorDiscoveryCatalogEntry.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 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;
+
+/**
+ * Entry.
+ *
+ * @apiNote This type 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 ConnectorDiscoveryCatalogEntry(
+    /** Name. */
+    @JsonProperty("name") String name,
+    /** Display name. */
+    @JsonProperty("displayName") String displayName,
+    /** Description. */
+    @JsonProperty("description") String description,
+    /** Logo. */
+    @JsonProperty("logo") String logo,
+    /** Tier. */
+    @JsonProperty("tier") String tier,
+    /** Release tag. */
+    @JsonProperty("releaseTag") String releaseTag,
+    /** Status. */
+    @JsonProperty("status") ConnectorCatalogStatus status
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsSetResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ConnectorsGetAccountsResult.java
similarity index 72%
rename from java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsSetResult.java
rename to java/sdk/src/generated/java/com/github/copilot/generated/rpc/ConnectorsGetAccountsResult.java
index c5ab98621a..1334b673fa 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsSetResult.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ConnectorsGetAccountsResult.java
@@ -15,7 +15,7 @@
 import javax.annotation.processing.Generated;
 
 /**
- * Outcome of writing user settings.
+ * Eligible accounts.
  *
  * @apiNote This method is experimental and may change in a future version.
  * @since 1.0.0
@@ -24,8 +24,10 @@
 @javax.annotation.processing.Generated("copilot-sdk-codegen")
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public record 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. */
-    @JsonProperty("shadowedKeys") List<String> shadowedKeys
+public record ConnectorsGetAccountsResult(
+    /** Availability. */
+    @JsonProperty("availability") ConnectorDiscoveryAvailability availability,
+    /** Eligible accounts. */
+    @JsonProperty("accounts") List<ConnectorDiscoveryAccount> accounts
 ) {
 }
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ConnectorsGetCapabilitiesResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ConnectorsGetCapabilitiesResult.java
new file mode 100644
index 0000000000..dc1b256e27
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ConnectorsGetCapabilitiesResult.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;
+
+/**
+ * Feature availability.
+ *
+ * @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 ConnectorsGetCapabilitiesResult(
+    /** API version. */
+    @JsonProperty("apiVersion") Long apiVersion,
+    /** Availability. */
+    @JsonProperty("availability") ConnectorDiscoveryAvailability availability,
+    /** Whether accounts are selected by opaque ID. */
+    @JsonProperty("opaqueAccountSelection") Boolean opaqueAccountSelection,
+    /** Whether results are cached. */
+    @JsonProperty("conditionalCache") Boolean conditionalCache
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ConnectorsListParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ConnectorsListParams.java
new file mode 100644
index 0000000000..39a2c4a966
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ConnectorsListParams.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;
+
+/**
+ * Selected account.
+ *
+ * @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 ConnectorsListParams(
+    /** Opaque account ID. */
+    @JsonProperty("accountId") String accountId
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ConnectorsListResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ConnectorsListResult.java
new file mode 100644
index 0000000000..ccba6073d4
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ConnectorsListResult.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;
+
+/**
+ * Entries for the selected account.
+ *
+ * @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 ConnectorsListResult(
+    /** Opaque account ID. */
+    @JsonProperty("accountId") String accountId,
+    /** Revision. */
+    @JsonProperty("revision") Long revision,
+    /** Refresh time in Unix epoch milliseconds. */
+    @JsonProperty("refreshedAtMs") Long refreshedAtMs,
+    /** Entries. */
+    @JsonProperty("connectors") List<ConnectorDiscoveryCatalogEntry> connectors
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ConnectorsRefreshParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ConnectorsRefreshParams.java
new file mode 100644
index 0000000000..e5384ba3f2
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ConnectorsRefreshParams.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;
+
+/**
+ * Selected account.
+ *
+ * @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 ConnectorsRefreshParams(
+    /** Opaque account ID. */
+    @JsonProperty("accountId") String accountId
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ConnectorsRefreshResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ConnectorsRefreshResult.java
new file mode 100644
index 0000000000..a14c50fd28
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ConnectorsRefreshResult.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;
+
+/**
+ * Entries for the selected account.
+ *
+ * @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 ConnectorsRefreshResult(
+    /** Opaque account ID. */
+    @JsonProperty("accountId") String accountId,
+    /** Revision. */
+    @JsonProperty("revision") Long revision,
+    /** Refresh time in Unix epoch milliseconds. */
+    @JsonProperty("refreshedAtMs") Long refreshedAtMs,
+    /** Entries. */
+    @JsonProperty("connectors") List<ConnectorDiscoveryCatalogEntry> connectors
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CurrentModel.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CurrentModel.java
index 3088672b69..6fa6843944 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CurrentModel.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/CurrentModel.java
@@ -23,8 +23,12 @@
 public record CurrentModel(
     /** Currently active model identifier */
     @JsonProperty("modelId") String modelId,
+    /** Provider selected for this model. Together with modelId, identifies a catalog entry even when providers serve the same model. Omitted for unattributed legacy selections. */
+    @JsonProperty("providerId") String providerId,
     /** Captured base model to restore when leaving plan mode. Omitted outside plan mode or when no plan override has captured a base model. Persistent agent model requirements apply to this model rather than the temporary plan model. */
     @JsonProperty("planBaseModelId") String planBaseModelId,
+    /** Provider of planBaseModelId, when that saved selection is provider-qualified. */
+    @JsonProperty("planBaseProviderId") String planBaseProviderId,
     /** 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. */
     @JsonProperty("reasoningEffort") String reasoningEffort,
     /** Context tier for models that support multiple context-window sizes. */
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/EnvironmentCapabilities.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/EnvironmentCapabilities.java
index f261c345db..3bbe3e31a0 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/EnvironmentCapabilities.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/EnvironmentCapabilities.java
@@ -10,14 +10,18 @@
 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;
 
 /**
  * Hosting capabilities and session capacity advertised by an environment.
  *
+ * @apiNote This type 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)
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/EnvironmentKind.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/EnvironmentKind.java
index d7ae216cce..f3d45cafc1 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/EnvironmentKind.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/EnvironmentKind.java
@@ -7,13 +7,17 @@
 
 package com.github.copilot.generated.rpc;
 
+import com.github.copilot.CopilotExperimental;
 import javax.annotation.processing.Generated;
 
 /**
  * GitHub Mission Control compute kind.
  *
+ * @apiNote This type is experimental and may change in a future version.
+ *
  * @since 1.0.0
  */
+@CopilotExperimental
 @javax.annotation.processing.Generated("copilot-sdk-codegen")
 public enum EnvironmentKind {
     /** The {@code user-local} variant. */
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/FeatureFlagAvailability.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/FeatureFlagAvailability.java
new file mode 100644
index 0000000000..953a52226c
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/FeatureFlagAvailability.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 javax.annotation.processing.Generated;
+
+/**
+ * The population a feature flag is declared for, before overrides.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+enum FeatureFlagAvailability {
+    /** The {@code on} variant. */
+    ON("on"),
+    /** The {@code team} variant. */
+    TEAM("team"),
+    /** The {@code staff-and-experimental} variant. */
+    STAFF_AND_EXPERIMENTAL("staff-and-experimental"),
+    /** The {@code staff-or-experimental} variant. */
+    STAFF_OR_EXPERIMENTAL("staff-or-experimental"),
+    /** The {@code staff} variant. */
+    STAFF("staff"),
+    /** The {@code staff-github} variant. */
+    STAFF_GITHUB("staff-github"),
+    /** The {@code staff-microsoft} variant. */
+    STAFF_MICROSOFT("staff-microsoft"),
+    /** The {@code experimental} variant. */
+    EXPERIMENTAL("experimental"),
+    /** The {@code off} variant. */
+    OFF("off");
+
+    private final String value;
+    FeatureFlagAvailability(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static FeatureFlagAvailability fromValue(String value) {
+        for (FeatureFlagAvailability v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown FeatureFlagAvailability value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/FeatureFlagMetadata.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/FeatureFlagMetadata.java
new file mode 100644
index 0000000000..49ac33f82f
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/FeatureFlagMetadata.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;
+
+/**
+ * The declared shape of one feature flag, independent of any caller population.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record FeatureFlagMetadata(
+    /** The flag's name, matching the key it is listed under. */
+    @JsonProperty("name") String name,
+    /** The population the flag is declared for before any environment or user-settings override is applied. */
+    @JsonProperty("availability") FeatureFlagAvailability availability,
+    /** Whether the flag participates in the CAPI sanity suite. */
+    @JsonProperty("capiSanity") Boolean capiSanity,
+    /** Text shown to a user choosing whether to turn the flag on in experimental mode. Absent when the flag is not user-facing. */
+    @JsonProperty("experimentalDescription") String experimentalDescription,
+    /** The online-experiment (ExP) flag this maps to, when the flag is assigned by an experiment rather than declared statically. */
+    @JsonProperty("expFlag") String expFlag,
+    /** Environment variable that overrides this flag's experiment assignment locally in the experiment service, not in `featureFlags.resolve`. Present exactly when `expFlag` is, and derived from it, so a caller reads a local override without reproducing the naming rule. */
+    @JsonProperty("expFlagEnvVar") String expFlagEnvVar
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/FeatureFlagsMetadataResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/FeatureFlagsMetadataResult.java
new file mode 100644
index 0000000000..01e738c670
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/FeatureFlagsMetadataResult.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 java.util.Map;
+import javax.annotation.processing.Generated;
+
+/**
+ * Every feature flag this runtime declares, with the shape each one was declared with.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record FeatureFlagsMetadataResult(
+    /** Declared feature flags keyed by flag name. */
+    @JsonProperty("flags") Map<String, FeatureFlagMetadata> flags
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/FeatureFlagsResolveParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/FeatureFlagsResolveParams.java
new file mode 100644
index 0000000000..bf459ff033
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/FeatureFlagsResolveParams.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 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;
+
+/**
+ * Caller population and overrides for static feature-flag resolution, independent of experiment assignments and active runtime state.
+ *
+ * @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)
+record FeatureFlagsResolveParams(
+    /** Whether the caller is GitHub or Microsoft staff. */
+    @JsonProperty("isStaff") Boolean isStaff,
+    /** Whether the caller is in an experimental population. */
+    @JsonProperty("isExperimental") Boolean isExperimental,
+    /** Whether the caller belongs to the team population used by feature availability. */
+    @JsonProperty("isTeam") Boolean isTeam,
+    /** GitHub-staff membership. Omit when it was never recorded: a legacy staff account then counts as both staff populations and keeps every staff feature. */
+    @JsonProperty("isStaffGithub") Boolean isStaffGitHub,
+    /** Microsoft-staff membership. Omitted the same way as `isStaffGitHub`. */
+    @JsonProperty("isStaffMicrosoft") Boolean isStaffMicrosoft,
+    /** Resolve against this already-computed flag set rather than each flag's declared availability. Keyed by flag name. */
+    @JsonProperty("baseFlags") Map<String, Boolean> baseFlags,
+    /** Environment for direct feature-flag overrides and `COPILOT_CLI_ENABLED_FEATURE_FLAGS`. Does not apply `COPILOT_EXP_*` experiment assignments. Defaults to this runtime process's own environment. */
+    @JsonProperty("environment") Map<String, String> environment,
+    /** User settings to apply, including `enabledFeatureFlags`, legacy `feature_flags.enabled`, and supported convenience settings. */
+    @JsonProperty("config") Object config,
+    /** Flags forced to a value after every other layer, keyed by flag name. */
+    @JsonProperty("flagOverrides") Map<String, Boolean> flagOverrides
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/FeatureFlagsResolveStartupGatesParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/FeatureFlagsResolveStartupGatesParams.java
new file mode 100644
index 0000000000..3a08c2e5b8
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/FeatureFlagsResolveStartupGatesParams.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 java.util.List;
+import java.util.Map;
+import javax.annotation.processing.Generated;
+
+/**
+ * Caller population and startup inputs to resolve named online-experiment gates for. Carries no account: the runtime resolves the assignment for the authentication it already holds.
+ *
+ * @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)
+record FeatureFlagsResolveStartupGatesParams(
+    /** The feature flags to resolve. A name this runtime does not declare is reported as an error rather than as a disabled flag. */
+    @JsonProperty("flags") List<String> flags,
+    /** Whether the caller is GitHub or Microsoft staff. */
+    @JsonProperty("isStaff") Boolean isStaff,
+    /** Whether the caller is in an experimental population. */
+    @JsonProperty("isExperimental") Boolean isExperimental,
+    /** Whether the caller belongs to a team plan. */
+    @JsonProperty("isTeam") Boolean isTeam,
+    /** GitHub-staff membership. Omit when it was never recorded: a legacy staff account then counts as both staff populations and keeps every staff feature. */
+    @JsonProperty("isStaffGithub") Boolean isStaffGitHub,
+    /** Microsoft-staff membership. Omitted the same way as `isStaffGitHub`. */
+    @JsonProperty("isStaffMicrosoft") Boolean isStaffMicrosoft,
+    /** Environment to read flag overrides from. Defaults to this runtime process's own environment. */
+    @JsonProperty("environment") Map<String, String> environment,
+    /** User settings document whose `featureFlags` block is layered on top of the resolved set. */
+    @JsonProperty("config") Object config,
+    /** Whether streamer mode is on, which withholds the populations an experiment would otherwise segment on. */
+    @JsonProperty("streamerMode") Boolean streamerMode,
+    /** When this installation first launched, in milliseconds since the Unix epoch. Experiments that segment on installation age read it. Omit when the first launch was never recorded. */
+    @JsonProperty("firstLaunchAtMillis") Double firstLaunchAtMillis,
+    /** Whether the runtime may refresh the cached assignment over the network without an active session. The refresh never blocks this call: the answer comes from the cache either way, so a refresh only affects a later launch. */
+    @JsonProperty("refreshWithoutSession") Boolean refreshWithoutSession
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/FolderTrustCheckResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/FolderTrustCheckResult.java
new file mode 100644
index 0000000000..746ad554f5
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/FolderTrustCheckResult.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;
+
+/**
+ * Folder trust check result.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record FolderTrustCheckResult(
+    /** Whether the folder is trusted */
+    @JsonProperty("trusted") Boolean trusted
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ForceLoginOrgsDecision.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ForceLoginOrgsDecision.java
new file mode 100644
index 0000000000..24218c69e5
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ForceLoginOrgsDecision.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;
+
+/**
+ * The verdict of the `forceLoginOrgs` enterprise sign-in pin for one credential. A managed device may pin Copilot to an approved set of GitHub organizations so a developer cannot sign in with a personal — or another enterprise's — account and escape every control that keys off the signed-in identity. A host must refuse to proceed when `allowed` is false; the remaining fields explain the refusal rather than qualifying it.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record ForceLoginOrgsDecision(
+    /** Whether the client may proceed. True whenever no pin is in force, so an unmanaged host is never blocked. */
+    @JsonProperty("allowed") Boolean allowed,
+    /** Whether a pin applies at all. Distinguishes "allowed because unmanaged" from "allowed because the account is approved", which a diagnostics surface needs and which also decides whether a bring-your-own-key provider may serve inference. */
+    @JsonProperty("enforced") Boolean enforced,
+    /** The approved organization logins, as configured. Enterprise configuration rather than user data, so it is safe to name in a message or a log line. */
+    @JsonProperty("requiredOrgs") List<String> requiredOrgs,
+    /** The approved organization the account matched, when allowed under a pin. */
+    @JsonProperty("matchedOrg") String matchedOrg,
+    /** A stable kebab-case reason code when refused: `org-not-approved`, `unverifiable-credential`, `policy-undetermined`, `policy-invalid`, `not-signed-in`, or `membership-unknown`. Omitted when allowed. Treat an unrecognized code as a refusal rather than mapping it to an allow: a code this host has not been taught about still denied the credential. */
+    @JsonProperty("denial") String denial,
+    /** A developer-facing explanation of the refusal. Omitted when allowed. */
+    @JsonProperty("message") String message,
+    /** Error-level detail from managed-policy discovery — which file failed to load, which field failed validation. Carried on the decision rather than left to the log because a refusal can exit the process before a log sink exists, which would discard the only actionable diagnostic a misconfigured managed device produces. */
+    @JsonProperty("policyDiagnostics") List<String> policyDiagnostics
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitCurrentBranchRemoteParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitCurrentBranchRemoteParams.java
new file mode 100644
index 0000000000..67f7b64880
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitCurrentBranchRemoteParams.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;
+
+/**
+ * Working-tree path a git query applies to.
+ *
+ * @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)
+record GitCurrentBranchRemoteParams(
+    /** Absolute path to a directory inside the git working tree to query. */
+    @JsonProperty("cwd") String cwd
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitCurrentBranchRemoteResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitCurrentBranchRemoteResult.java
new file mode 100644
index 0000000000..faa7e52b3d
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitCurrentBranchRemoteResult.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;
+
+/**
+ * The remote the checked-out branch tracks.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record GitCurrentBranchRemoteResult(
+    /** Name of the tracked remote. Reports `origin` whenever the working tree has no tracking configuration to read, including on a detached HEAD, so this is never null and never empty. */
+    @JsonProperty("remote") String remote
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitHubEnvironment.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitHubEnvironment.java
index fffed71974..c17b2c9778 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitHubEnvironment.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitHubEnvironment.java
@@ -10,14 +10,18 @@
 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;
 
 /**
  * Safe discovery information. Host-side relay bootstrap credentials are never included.
  *
+ * @apiNote This type 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)
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitHubOwnerOption.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitHubOwnerOption.java
new file mode 100644
index 0000000000..43e3d2d01d
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitHubOwnerOption.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 GitHub login the authenticated user may act as: their own account, or an organization they belong to.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record GitHubOwnerOption(
+    /** The owner's GitHub login. */
+    @JsonProperty("login") String login,
+    /** Which kind of owner this is. The authenticated user's own account is always reported as `user`. */
+    @JsonProperty("type") String type
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitHubOwnersCancelParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitHubOwnersCancelParams.java
new file mode 100644
index 0000000000..1ea9251095
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitHubOwnersCancelParams.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 owner listing to abandon.
+ *
+ * @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)
+record GitHubOwnersCancelParams(
+    /** Request id the listing was started with. */
+    @JsonProperty("requestId") Long requestId
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitHubOwnersCancelResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitHubOwnersCancelResult.java
new file mode 100644
index 0000000000..d70a718261
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitHubOwnersCancelResult.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 javax.annotation.processing.Generated;
+
+/**
+ * Whether the id named a running owner listing.
+ *
+ * @apiNote This type 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)
+record GitHubOwnersCancelResult(
+    /** True when a listing with the id was running and the cancel stopped it. False when the id was never registered, was registered but unused, was released after being abandoned, or its listing had ended. An unused id is released and cannot start a later listing. */
+    @JsonProperty("canceled") Boolean canceled
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitHubOwnersListParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitHubOwnersListParams.java
new file mode 100644
index 0000000000..fd1489b805
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitHubOwnersListParams.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 javax.annotation.processing.Generated;
+
+/**
+ * Credential to list owners under, and the request id that makes the listing cancellable.
+ *
+ * @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)
+record GitHubOwnersListParams(
+    /** Request id from `gitHubOwners.nextRequestId`. An id that was never registered, canceled before use, released after being abandoned, or already used is refused rather than silently running uncancellable. */
+    @JsonProperty("requestId") Long requestId,
+    /** The credential the listing runs under, carried opaquely because its shape is the host's own and the runtime only resolves a token and a GitHub host from it. No credential travels: this selects one the runtime already holds. */
+    @JsonInclude(JsonInclude.Include.ALWAYS)
+    @JsonProperty("authInfo") Object authInfo
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitHubOwnersListResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitHubOwnersListResult.java
new file mode 100644
index 0000000000..02f844bced
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitHubOwnersListResult.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 java.util.List;
+import javax.annotation.processing.Generated;
+
+/**
+ * Outcome of an owner listing. Exactly one of `owners` and `message` is present, except that `throwError` reports a failure the caller is expected to raise rather than render.
+ *
+ * @apiNote This type 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)
+record GitHubOwnersListResult(
+    /** The owners, on success: the authenticated user first, then the organizations they belong to. */
+    @JsonProperty("owners") List<GitHubOwnerOption> owners,
+    /** Why no owners could be listed, phrased for a user. Present when the listing failed in a way the caller should render rather than raise. */
+    @JsonProperty("message") String message,
+    /** A line the caller should log. Present only alongside `message`, and only for failures worth recording. */
+    @JsonProperty("warning") String warning,
+    /** A malformed request or an unreadable credential, which the caller raises instead of rendering. Kept a field rather than a dispatch error so it stays distinct from `message`, which the caller renders. */
+    @JsonProperty("throwError") String throwError
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitHubOwnersRequestIdResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitHubOwnersRequestIdResult.java
new file mode 100644
index 0000000000..8b5d180b05
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitHubOwnersRequestIdResult.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 javax.annotation.processing.Generated;
+
+/**
+ * A freshly registered request id. Registering it before the listing starts is what lets a cancel that races the request still find the owner listing slot. The id serves one listing only. Long-abandoned unused ids can be released by later allocations.
+ *
+ * @apiNote This type 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)
+record GitHubOwnersRequestIdResult(
+    /** Request id to pass to `gitHubOwners.list` and, to abandon it, `gitHubOwners.cancel`. */
+    @JsonProperty("requestId") Long requestId
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitHubRepositoryAtPathParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitHubRepositoryAtPathParams.java
new file mode 100644
index 0000000000..6a896bff33
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitHubRepositoryAtPathParams.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;
+
+/**
+ * Working-tree path whose owning GitHub repository should be resolved.
+ *
+ * @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)
+record GitHubRepositoryAtPathParams(
+    /** Absolute path to a directory inside the git working tree to resolve. */
+    @JsonProperty("path") String path
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitHubRepositoryAtPathResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitHubRepositoryAtPathResult.java
new file mode 100644
index 0000000000..f32a3eafc0
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitHubRepositoryAtPathResult.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;
+
+/**
+ * The GitHub repository that owns the requested path, when the selected remote (`origin`, else the first) is on a GitHub host.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record GitHubRepositoryAtPathResult(
+    /** Resolved repository identity, or null when the selected remote resolves to no GitHub host. */
+    @JsonProperty("repository") GitHubRepositoryIdentity repository
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitHubRepositoryIdentity.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitHubRepositoryIdentity.java
new file mode 100644
index 0000000000..a1d8c3acc3
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitHubRepositoryIdentity.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;
+
+/**
+ * Owner, name, and host of a GitHub repository, as resolved from a git remote URL.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record GitHubRepositoryIdentity(
+    /** Repository owner login (user or organization). */
+    @JsonProperty("owner") String owner,
+    /** Repository name, without the owner prefix or the `.git` suffix. */
+    @JsonProperty("name") String name,
+    /** Host the remote points at, for example `github.com` or a GitHub Enterprise hostname. */
+    @JsonProperty("host") String host
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitRemoteRepository.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitRemoteRepository.java
new file mode 100644
index 0000000000..936e0f8159
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitRemoteRepository.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 GitHub repository one of a working tree's remotes points at.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record GitRemoteRepository(
+    /** Account or organization owning the repository. */
+    @JsonProperty("owner") String owner,
+    /** Repository name, without the owner. */
+    @JsonProperty("name") String name,
+    /** GitHub host serving the repository, which is not `github.com` for a GitHub Enterprise remote. */
+    @JsonProperty("host") String host,
+    /** Name of the first remote that produced this distinct repository entry, such as `origin` or `upstream`. */
+    @JsonProperty("remoteName") String remoteName
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitReposFromRemotesParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitReposFromRemotesParams.java
new file mode 100644
index 0000000000..f9c351550f
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitReposFromRemotesParams.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;
+
+/**
+ * Git working tree whose GitHub remotes should be listed.
+ *
+ * @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)
+record GitReposFromRemotesParams(
+    /** Absolute path to the root of the git working tree. */
+    @JsonProperty("gitRoot") String gitRoot
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitReposFromRemotesResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitReposFromRemotesResult.java
new file mode 100644
index 0000000000..cc62acf984
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitReposFromRemotesResult.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 java.util.List;
+import javax.annotation.processing.Generated;
+
+/**
+ * The GitHub repositories a working tree's remotes point at.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record GitReposFromRemotesResult(
+    /** One entry per distinct GitHub repository, in the order git reports the first remote for each repository. Empty when no remote points at a GitHub host, which a caller should read as `not connected to GitHub`. Failing to read the remotes is an error, not an empty list. */
+    @JsonProperty("repositories") List<GitRemoteRepository> repositories
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitWorkingDirectoryContextParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitWorkingDirectoryContextParams.java
new file mode 100644
index 0000000000..17acdb64c3
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GitWorkingDirectoryContextParams.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;
+
+/**
+ * Working-tree path a git query applies to.
+ *
+ * @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)
+record GitWorkingDirectoryContextParams(
+    /** Absolute path to a directory inside the git working tree to query. */
+    @JsonProperty("cwd") String cwd
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GlobalStateLoadForConfigDirParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GlobalStateLoadForConfigDirParams.java
new file mode 100644
index 0000000000..a056698c92
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GlobalStateLoadForConfigDirParams.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;
+
+/**
+ * Selects the configuration directory whose machine-wide state to read.
+ *
+ * @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)
+record GlobalStateLoadForConfigDirParams(
+    /** Copilot configuration directory to read the state document from, taking precedence over the server's own `COPILOT_HOME` and default home. Omit it, or pass an empty string, to read the directory the server resolved for itself. */
+    @JsonProperty("configDir") String configDir
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GlobalStateLoadResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GlobalStateLoadResult.java
new file mode 100644
index 0000000000..9db799b57e
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GlobalStateLoadResult.java
@@ -0,0 +1,64 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 host's machine-wide state. Every field is optional because a fresh install has recorded nothing yet, so a reader must treat an absent field as `not yet`, never as a negative answer. Stored credentials are deliberately absent from this shape.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record GlobalStateLoadResult(
+    /** Plugins installed on this machine. */
+    @JsonProperty("installedPlugins") List<InstalledPlugin> installedPlugins,
+    /** Models the user selected recently, most recent first. */
+    @JsonProperty("recentModelIds") List<String> recentModelIds,
+    /** When the host first ran on this machine. */
+    @JsonProperty("firstLaunchAt") String firstLaunchAt,
+    /** Terminals the user has already been asked to set up, so the host does not ask twice. */
+    @JsonProperty("askedSetupTerminals") List<String> askedSetupTerminals,
+    /** Folders where the user declined the init prompt, so it stays hidden there. */
+    @JsonProperty("suppressInitFolders") List<String> suppressInitFolders,
+    /** Whether the sandbox onboarding has been shown. */
+    @JsonProperty("sandboxOnboardingShown") Boolean sandboxOnboardingShown,
+    /** Whether the user declined to trust the sandbox credential proxy CA. */
+    @JsonProperty("sandboxCredentialProxyCaDeclined") Boolean sandboxCredentialProxyCaDeclined,
+    /** Whether the app tip has been shown. */
+    @JsonProperty("appTipShown") Boolean appTipShown,
+    /** Whether the one-off cleanup of stored reasoning summaries has run. */
+    @JsonProperty("reasoningSummariesCleanupDone") Boolean reasoningSummariesCleanupDone,
+    /** Account used for the most recent sign-in. */
+    @JsonProperty("lastLoggedInUser") LoggedInUser lastLoggedInUser,
+    /** Every account the host has signed in to on this machine. */
+    @JsonProperty("loggedInUsers") List<LoggedInUser> loggedInUsers,
+    /** Whether the user is a GitHub or Microsoft staff member, which unlocks internal-only behavior. */
+    @JsonProperty("staff") Boolean staff,
+    /** Whether the user was recognized as GitHub staff. */
+    @JsonProperty("staffGithub") Boolean staffGitHub,
+    /** Whether the user was recognized as Microsoft staff. */
+    @JsonProperty("staffMicrosoft") Boolean staffMicrosoft,
+    /** When the staff-only model reset last ran. */
+    @JsonProperty("staffModelResetAt") String staffModelResetAt,
+    /** When the staff-only log level migration last ran. */
+    @JsonProperty("staffLogLevelMigrationAt") String staffLogLevelMigrationAt,
+    /** When the staff-only update channel migration last ran. */
+    @JsonProperty("staffUpdateChannelMigrationAt") String staffUpdateChannelMigrationAt,
+    /** Folders the user has marked as trusted. */
+    @JsonProperty("trustedFolders") List<String> trustedFolders,
+    /** When the Auto-feedback hint was last shown, as an ISO 8601 timestamp. It enforces the once-per-day cap for non-staff users across restarts. */
+    @JsonProperty("autoFeedbackLastPromptedAt") String autoFeedbackLastPromptedAt
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GlobalStateWriteKeyParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GlobalStateWriteKeyParams.java
new file mode 100644
index 0000000000..f6ee53a57b
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/GlobalStateWriteKeyParams.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 single top-level key to record in the host's machine-wide state. The write replaces only that key and leaves the rest of the document untouched, so two writers recording different one-off flags do not overwrite each other. The stored credential keys cannot be written through this method.
+ *
+ * @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)
+record GlobalStateWriteKeyParams(
+    /** Copilot configuration directory to write the state document in, taking precedence over the server's own `COPILOT_HOME` and default home. Omit it, or pass an empty string, to write the directory the server resolved for itself. Mirrors `globalState.loadForConfigDir`, so a caller can read and write the same directory. */
+    @JsonProperty("configDir") String configDir,
+    /** Top-level key to write, named as it appears in the result of `globalState.load`. It must be one of the writable keys that `globalState.writeKey` lists. */
+    @JsonProperty("key") String key,
+    /** Value to store for the key. Omit it, or pass null, to remove the key instead. */
+    @JsonProperty("value") Object value
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HooksDiscoverRequest.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HooksDiscoverRequest.java
new file mode 100644
index 0000000000..5d76a6d222
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HooksDiscoverRequest.java
@@ -0,0 +1,107 @@
+/*---------------------------------------------------------------------------------------------
+ *  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.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.copilot.CopilotExperimental;
+import java.util.List;
+import java.util.Objects;
+import javax.annotation.processing.Generated;
+
+/**
+ * Optional project paths and host-exclusion behavior for server-scoped hook discovery.
+ * <p>
+ * Required inputs are constructor arguments. Optional inputs have fluent setters.
+ *
+ * @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)
+public final class HooksDiscoverRequest {
+
+    /** Optional project directory paths whose trusted repository and project-expanded plugin hooks should be discovered. When omitted or empty, user, managed-policy, and globally enabled installed or explicit plugin hooks are returned without project expansion. */
+    @JsonProperty("projectPaths")
+    private List<String> projectPaths;
+
+    /** When true, omit host-owned user and plugin hook rows and their diagnostics. Managed-policy hooks and trusted repository hooks remain visible, and host disabledHooks still contribute to each remaining row's effective enabled state. This filters sources rather than simulating a host with no settings. */
+    @JsonProperty("excludeHostHooks")
+    private Boolean excludeHostHooks;
+
+    /** Explicit discovery-only file-hook roots, separate from callback hooks and filesystem grants. Available without ambient discovery or repository file-hook enablement, subject to managed/hook disables. Relative paths resolve against the request's effective working directory when supplied. Null and omission are equivalent; an empty array contributes no explicit roots. */
+    @JsonProperty("hookDirectories")
+    private List<String> hookDirectories;
+
+    /**
+     * Creates a request with its required inputs.
+     */
+    public HooksDiscoverRequest() {
+    }
+
+    /**
+     * Returns the {@code projectPaths} property.
+     *
+     * @return Optional project directory paths whose trusted repository and project-expanded plugin hooks should be discovered. When omitted or empty, user, managed-policy, and globally enabled installed or explicit plugin hooks are returned without project expansion.
+     */
+    public List<String> getProjectPaths() {
+        return projectPaths;
+    }
+
+    /**
+     * Returns the {@code excludeHostHooks} property.
+     *
+     * @return When true, omit host-owned user and plugin hook rows and their diagnostics. Managed-policy hooks and trusted repository hooks remain visible, and host disabledHooks still contribute to each remaining row's effective enabled state. This filters sources rather than simulating a host with no settings.
+     */
+    public Boolean getExcludeHostHooks() {
+        return excludeHostHooks;
+    }
+
+    /**
+     * Returns the {@code hookDirectories} property.
+     *
+     * @return Explicit discovery-only file-hook roots, separate from callback hooks and filesystem grants. Available without ambient discovery or repository file-hook enablement, subject to managed/hook disables. Relative paths resolve against the request's effective working directory when supplied. Null and omission are equivalent; an empty array contributes no explicit roots.
+     */
+    public List<String> getHookDirectories() {
+        return hookDirectories;
+    }
+
+    /**
+     * Sets the {@code projectPaths} property.
+     *
+     * @param value Optional project directory paths whose trusted repository and project-expanded plugin hooks should be discovered. When omitted or empty, user, managed-policy, and globally enabled installed or explicit plugin hooks are returned without project expansion.
+     * @return this request
+     */
+    public HooksDiscoverRequest setProjectPaths(List<String> value) {
+        this.projectPaths = value;
+        return this;
+    }
+
+    /**
+     * Sets the {@code excludeHostHooks} property.
+     *
+     * @param value When true, omit host-owned user and plugin hook rows and their diagnostics. Managed-policy hooks and trusted repository hooks remain visible, and host disabledHooks still contribute to each remaining row's effective enabled state. This filters sources rather than simulating a host with no settings.
+     * @return this request
+     */
+    public HooksDiscoverRequest setExcludeHostHooks(Boolean value) {
+        this.excludeHostHooks = value;
+        return this;
+    }
+
+    /**
+     * Sets the {@code hookDirectories} property.
+     *
+     * @param value Explicit discovery-only file-hook roots, separate from callback hooks and filesystem grants. Available without ambient discovery or repository file-hook enablement, subject to managed/hook disables. Relative paths resolve against the request's effective working directory when supplied. Null and omission are equivalent; an empty array contributes no explicit roots.
+     * @return this request
+     */
+    public HooksDiscoverRequest setHookDirectories(List<String> value) {
+        this.hookDirectories = value;
+        return this;
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostConfiguration.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostConfiguration.java
index a9b392a8d1..15187b8763 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostConfiguration.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostConfiguration.java
@@ -10,13 +10,17 @@
 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;
 
 /**
  * Normalized listener settings delivered only to the supervised hosting participant.
  *
+ * @apiNote This type 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)
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostCreateSessionParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostCreateSessionParams.java
index 6c2233be78..348774f645 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostCreateSessionParams.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostCreateSessionParams.java
@@ -29,6 +29,9 @@ record HostCreateSessionParams(
     @JsonProperty("handoffId") String handoffId,
     /** Resume an app-owned durable session instead of creating a new session. */
     @JsonProperty("resume") Boolean resume,
+    /** For an explicit publication, borrow an existing owning-connection resident
+instead of invoking the resume factory. Cold sessions still use the factory. */
+    @JsonProperty("preferResident") Boolean preferResident,
     /** Host-selected SDK creation or resume settings, without executable callbacks or tools. */
     @JsonProperty("config") Map<String, Object> config
 ) {
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostEmptyResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostEmptyResult.java
index 658f68f3b2..8c15b12414 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostEmptyResult.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostEmptyResult.java
@@ -10,13 +10,17 @@
 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;
 
 /**
  * Empty acknowledgement for a completed host lifecycle operation.
  *
+ * @apiNote This type 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)
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostEnvironmentCredentials.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostEnvironmentCredentials.java
index 51ad33c23b..607fc9db6c 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostEnvironmentCredentials.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostEnvironmentCredentials.java
@@ -10,13 +10,17 @@
 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;
 
 /**
  * Private credentials delivered only to a runtime-owned Mission Control hosting participant.
  *
+ * @apiNote This type 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)
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostExitReason.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostExitReason.java
index 28a5391b27..929ed09af7 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostExitReason.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostExitReason.java
@@ -7,8 +7,17 @@
 
 package com.github.copilot.generated.rpc;
 
+import com.github.copilot.CopilotExperimental;
 import javax.annotation.processing.Generated;
 
+/**
+ * Values for {@code HostExitReason}.
+ *
+ * @apiNote This type is experimental and may change in a future version.
+ *
+ * @since 1.0.0
+ */
+@CopilotExperimental
 @javax.annotation.processing.Generated("copilot-sdk-codegen")
 public enum HostExitReason {
     /** The {@code disposed} variant. */
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostExitedNotification.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostExitedNotification.java
index aa930eefe1..6c39e744c8 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostExitedNotification.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostExitedNotification.java
@@ -10,13 +10,17 @@
 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;
 
 /**
  * Reports a supervised listener's hosting-task termination and cleanup outcome.
  *
+ * @apiNote This type 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)
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostGitHubEnvironmentOptions.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostGitHubEnvironmentOptions.java
index 065a9f9328..5a7f72d855 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostGitHubEnvironmentOptions.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostGitHubEnvironmentOptions.java
@@ -10,13 +10,17 @@
 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;
 
 /**
  * GitHub Mission Control registration options. The compute ID is application-owned and stable.
  *
+ * @apiNote This type 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)
@@ -24,6 +28,21 @@ public record HostGitHubEnvironmentOptions(
     /** Human-readable environment display name. */
     @JsonProperty("name") String name,
     /** Stable application installation identity, reused across host restarts. */
-    @JsonProperty("computeId") String computeId
+    @JsonProperty("computeId") String computeId,
+    /** Require sealed, connection-bound authentication (default true), independent of listener address. False permits unsealed direct credentials and unbound sealed relay credentials; use only when the caller fully controls and trusts the direct transport. Relay token encryption remains mandatory. */
+    @JsonProperty("requireConnectionBinding") Boolean requireConnectionBinding
 ) {
+
+    /**
+     * Creates environment options using the default connection-binding policy.
+     *
+     * @param name Human-readable environment display name.
+     * @param computeId Stable application installation identity, reused across host restarts.
+     */
+    public HostGitHubEnvironmentOptions(
+        String name,
+        String computeId
+    ) {
+        this(name, computeId, null);
+    }
 }
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostListSessionsParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostListSessionsParams.java
new file mode 100644
index 0000000000..0e0c2472d0
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostListSessionsParams.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 javax.annotation.processing.Generated;
+
+/**
+ * Reads a running host's catalog or the runtime's saved default catalog.
+ *
+ * @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 HostListSessionsParams(
+    /** Listener UUID returned by host.start; the caller must own it. Omit to read
+the saved default compute-identity catalog without starting a listener. */
+    @JsonProperty("hostId") String hostId
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostListSessionsResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostListSessionsResult.java
new file mode 100644
index 0000000000..e430b96c29
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostListSessionsResult.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;
+
+/**
+ * The complete live and dormant advertised catalog, without subscribing to sessions.
+ *
+ * @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 HostListSessionsResult(
+    /** Complete advertised session summaries, in the host's catalog order. */
+    @JsonProperty("sessions") List<HostSessionSummary> sessions
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostLocalServerConfiguration.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostLocalServerConfiguration.java
index 86f544e4ff..af868879ea 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostLocalServerConfiguration.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostLocalServerConfiguration.java
@@ -10,13 +10,17 @@
 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;
 
 /**
  * Normalized local WebSocket listener settings.
  *
+ * @apiNote This type 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)
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostLocalServerOptions.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostLocalServerOptions.java
index b85fe85722..7b3aae19e2 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostLocalServerOptions.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostLocalServerOptions.java
@@ -10,13 +10,17 @@
 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;
 
 /**
  * Local WebSocket transport options.
  *
+ * @apiNote This type 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)
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostPublishSessionResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostPublishSessionResult.java
index 3bad91e955..29c0600843 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostPublishSessionResult.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostPublishSessionResult.java
@@ -10,13 +10,17 @@
 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 existing runtime identity and its resource on the listener.
  *
+ * @apiNote This type 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)
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostRegisterSessionRequest.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostRegisterSessionRequest.java
index f431893e28..1346edb7b5 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostRegisterSessionRequest.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostRegisterSessionRequest.java
@@ -10,14 +10,18 @@
 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;
 
 /**
  * Listener-scoped registration, not a copy or durable adoption of a session.
  *
+ * @apiNote This type 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)
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostSessionCreateCallback.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostSessionCreateCallback.java
index f35ea3d1a6..d609d096dc 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostSessionCreateCallback.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostSessionCreateCallback.java
@@ -10,14 +10,18 @@
 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;
 
 /**
  * Application callback routed over its existing SDK connection.
  *
+ * @apiNote This type 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)
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostSessionCreateResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostSessionCreateResult.java
index 96f0c87ec4..caf4f3e785 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostSessionCreateResult.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostSessionCreateResult.java
@@ -10,13 +10,17 @@
 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 resident session the application has materialized on its own connection.
  *
+ * @apiNote This type 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)
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostSessionReleasedNotification.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostSessionReleasedNotification.java
index 6d06c6b9a6..a9266987c1 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostSessionReleasedNotification.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostSessionReleasedNotification.java
@@ -10,13 +10,17 @@
 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;
 
 /**
  * Releases the original application session object retained for one handoff.
  *
+ * @apiNote This type 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)
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostSessionSummary.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostSessionSummary.java
new file mode 100644
index 0000000000..e644a70e56
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostSessionSummary.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.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.copilot.CopilotExperimental;
+import javax.annotation.processing.Generated;
+
+/**
+ * Metadata advertised by the AHP host, not a guarantee that history can be resumed.
+ *
+ * @apiNote This type 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 HostSessionSummary(
+    /** Stable AHP resource URI identifying the session on this host. */
+    @JsonProperty("resource") String resource,
+    /** Authoritative title advertised by the host. */
+    @JsonProperty("title") String title,
+    /** Session creation time as an ISO 8601 timestamp. */
+    @JsonProperty("createdAt") String createdAt,
+    /** Last modification time as an ISO 8601 timestamp. */
+    @JsonProperty("modifiedAt") String modifiedAt,
+    /** Unsigned 32-bit AHP session status bitset (0..=4294967295); unknown bits must be preserved. */
+    @JsonProperty("status") Long status,
+    /** Optional activity description advertised by the host. */
+    @JsonProperty("activity") String activity
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostStartRequest.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostStartRequest.java
new file mode 100644
index 0000000000..b6d4fc3b98
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/HostStartRequest.java
@@ -0,0 +1,170 @@
+/*---------------------------------------------------------------------------------------------
+ *  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.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.copilot.CopilotExperimental;
+import java.util.Objects;
+import javax.annotation.processing.Generated;
+
+/**
+ * Starts a supervised AHP host with at least one explicitly selected transport.
+ * <p>
+ * Required inputs are constructor arguments. Optional inputs have fluent setters.
+ *
+ * @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)
+public final class HostStartRequest {
+
+    /** Caller-generated UUID identifying this connection-owned listener. */
+    @JsonProperty("hostId")
+    private final String hostId;
+
+    /** Enables a local WebSocket listener. */
+    @JsonProperty("localServer")
+    private HostLocalServerOptions localServer;
+
+    /** Registers a GitHub Mission Control environment and enables its relay transport. */
+    @JsonProperty("githubEnvironment")
+    private HostGitHubEnvironmentOptions gitHubEnvironment;
+
+    /** Ask the owning SDK application to materialize AHP sessions. */
+    @JsonProperty("sessionFactory")
+    private Boolean sessionFactory;
+
+    /** Ask the owning application to resume its durable AHP sessions. */
+    @JsonProperty("resumeFactory")
+    private Boolean resumeFactory;
+
+    /** Stable application identity selecting its durable host catalog. Defaults to the persisted runtime compute GUID; must agree with githubEnvironment.computeId when both are supplied. */
+    @JsonProperty("computeId")
+    private String computeId;
+
+    /**
+     * Creates a request with its required inputs.
+     *
+     * @param hostId Caller-generated UUID identifying this connection-owned listener.
+     */
+    public HostStartRequest(String hostId) {
+        this.hostId = Objects.requireNonNull(hostId, "hostId");
+    }
+
+    /**
+     * Returns the {@code hostId} property.
+     *
+     * @return Caller-generated UUID identifying this connection-owned listener.
+     */
+    public String getHostId() {
+        return hostId;
+    }
+
+    /**
+     * Returns the {@code localServer} property.
+     *
+     * @return Enables a local WebSocket listener.
+     */
+    public HostLocalServerOptions getLocalServer() {
+        return localServer;
+    }
+
+    /**
+     * Returns the {@code githubEnvironment} property.
+     *
+     * @return Registers a GitHub Mission Control environment and enables its relay transport.
+     */
+    public HostGitHubEnvironmentOptions getGitHubEnvironment() {
+        return gitHubEnvironment;
+    }
+
+    /**
+     * Returns the {@code sessionFactory} property.
+     *
+     * @return Ask the owning SDK application to materialize AHP sessions.
+     */
+    public Boolean getSessionFactory() {
+        return sessionFactory;
+    }
+
+    /**
+     * Returns the {@code resumeFactory} property.
+     *
+     * @return Ask the owning application to resume its durable AHP sessions.
+     */
+    public Boolean getResumeFactory() {
+        return resumeFactory;
+    }
+
+    /**
+     * Returns the {@code computeId} property.
+     *
+     * @return Stable application identity selecting its durable host catalog. Defaults to the persisted runtime compute GUID; must agree with githubEnvironment.computeId when both are supplied.
+     */
+    public String getComputeId() {
+        return computeId;
+    }
+
+    /**
+     * Sets the {@code localServer} property.
+     *
+     * @param value Enables a local WebSocket listener.
+     * @return this request
+     */
+    public HostStartRequest setLocalServer(HostLocalServerOptions value) {
+        this.localServer = value;
+        return this;
+    }
+
+    /**
+     * Sets the {@code githubEnvironment} property.
+     *
+     * @param value Registers a GitHub Mission Control environment and enables its relay transport.
+     * @return this request
+     */
+    public HostStartRequest setGitHubEnvironment(HostGitHubEnvironmentOptions value) {
+        this.gitHubEnvironment = value;
+        return this;
+    }
+
+    /**
+     * Sets the {@code sessionFactory} property.
+     *
+     * @param value Ask the owning SDK application to materialize AHP sessions.
+     * @return this request
+     */
+    public HostStartRequest setSessionFactory(Boolean value) {
+        this.sessionFactory = value;
+        return this;
+    }
+
+    /**
+     * Sets the {@code resumeFactory} property.
+     *
+     * @param value Ask the owning application to resume its durable AHP sessions.
+     * @return this request
+     */
+    public HostStartRequest setResumeFactory(Boolean value) {
+        this.resumeFactory = value;
+        return this;
+    }
+
+    /**
+     * Sets the {@code computeId} property.
+     *
+     * @param value Stable application identity selecting its durable host catalog. Defaults to the persisted runtime compute GUID; must agree with githubEnvironment.computeId when both are supplied.
+     * @return this request
+     */
+    public HostStartRequest setComputeId(String value) {
+        this.computeId = value;
+        return this;
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/InstructionsDiscoverRepoSourcesParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/InstructionsDiscoverRepoSourcesParams.java
new file mode 100644
index 0000000000..5aee113bf8
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/InstructionsDiscoverRepoSourcesParams.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.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.copilot.CopilotExperimental;
+import java.util.List;
+import javax.annotation.processing.Generated;
+
+/**
+ * Explicit discovery arguments for one location, supplied by the caller rather than derived from a 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)
+record InstructionsDiscoverRepoSourcesParams(
+    /** Repository location to discover. An empty string selects no repository scope; cwdPath can still supply working-directory sources. */
+    @JsonProperty("location") String location,
+    /** When true, include the sources a command-line host reads. Hosts that are not the CLI omit it. */
+    @JsonProperty("isCli") Boolean isCli,
+    /** Working directory whose instruction sources should also be included. Omission adds no separate working-directory scope. */
+    @JsonProperty("cwdPath") String cwdPath,
+    /** Copilot configuration directory for user-level sources. An omitted or empty value uses the server's configuration home. */
+    @JsonProperty("configDir") String configDir,
+    /** Extra directories to scan alongside instruction directories configured in the runtime environment. */
+    @JsonProperty("additionalDirs") List<String> additionalDirs,
+    /** When true, also discover instruction files nested below the location. */
+    @JsonProperty("enableChildInstructions") Boolean enableChildInstructions
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/InstructionsDiscoverRequest.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/InstructionsDiscoverRequest.java
new file mode 100644
index 0000000000..34175da41b
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/InstructionsDiscoverRequest.java
@@ -0,0 +1,107 @@
+/*---------------------------------------------------------------------------------------------
+ *  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.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.copilot.CopilotExperimental;
+import java.util.List;
+import java.util.Objects;
+import javax.annotation.processing.Generated;
+
+/**
+ * Optional project paths to include in instruction discovery.
+ * <p>
+ * Required inputs are constructor arguments. Optional inputs have fluent setters.
+ *
+ * @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)
+public final class InstructionsDiscoverRequest {
+
+    /** 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). */
+    @JsonProperty("projectPaths")
+    private List<String> projectPaths;
+
+    /** 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. */
+    @JsonProperty("excludeHostInstructions")
+    private Boolean excludeHostInstructions;
+
+    /** Explicit discovery-only instruction roots using existing SDK instruction formats, not filesystem grants. Available without ambient discovery, subject to instruction/managed disables. Relative paths resolve against the request's effective working directory when supplied. Null and omission are equivalent; an empty array contributes no explicit roots. */
+    @JsonProperty("instructionDirectories")
+    private List<String> instructionDirectories;
+
+    /**
+     * Creates a request with its required inputs.
+     */
+    public InstructionsDiscoverRequest() {
+    }
+
+    /**
+     * Returns the {@code projectPaths} property.
+     *
+     * @return 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).
+     */
+    public List<String> getProjectPaths() {
+        return projectPaths;
+    }
+
+    /**
+     * Returns the {@code excludeHostInstructions} property.
+     *
+     * @return 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.
+     */
+    public Boolean getExcludeHostInstructions() {
+        return excludeHostInstructions;
+    }
+
+    /**
+     * Returns the {@code instructionDirectories} property.
+     *
+     * @return Explicit discovery-only instruction roots using existing SDK instruction formats, not filesystem grants. Available without ambient discovery, subject to instruction/managed disables. Relative paths resolve against the request's effective working directory when supplied. Null and omission are equivalent; an empty array contributes no explicit roots.
+     */
+    public List<String> getInstructionDirectories() {
+        return instructionDirectories;
+    }
+
+    /**
+     * Sets the {@code projectPaths} property.
+     *
+     * @param value 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).
+     * @return this request
+     */
+    public InstructionsDiscoverRequest setProjectPaths(List<String> value) {
+        this.projectPaths = value;
+        return this;
+    }
+
+    /**
+     * Sets the {@code excludeHostInstructions} property.
+     *
+     * @param value 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.
+     * @return this request
+     */
+    public InstructionsDiscoverRequest setExcludeHostInstructions(Boolean value) {
+        this.excludeHostInstructions = value;
+        return this;
+    }
+
+    /**
+     * Sets the {@code instructionDirectories} property.
+     *
+     * @param value Explicit discovery-only instruction roots using existing SDK instruction formats, not filesystem grants. Available without ambient discovery, subject to instruction/managed disables. Relative paths resolve against the request's effective working directory when supplied. Null and omission are equivalent; an empty array contributes no explicit roots.
+     * @return this request
+     */
+    public InstructionsDiscoverRequest setInstructionDirectories(List<String> value) {
+        this.instructionDirectories = value;
+        return this;
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/InstructionsGetDiscoveryPathsRequest.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/InstructionsGetDiscoveryPathsRequest.java
new file mode 100644
index 0000000000..fc328be97e
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/InstructionsGetDiscoveryPathsRequest.java
@@ -0,0 +1,107 @@
+/*---------------------------------------------------------------------------------------------
+ *  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.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.copilot.CopilotExperimental;
+import java.util.List;
+import java.util.Objects;
+import javax.annotation.processing.Generated;
+
+/**
+ * Optional project paths to include when enumerating instruction discovery targets.
+ * <p>
+ * Required inputs are constructor arguments. Optional inputs have fluent setters.
+ *
+ * @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)
+public final class InstructionsGetDiscoveryPathsRequest {
+
+    /** Optional list of project directory paths. When omitted or empty, only the user-level targets are returned. */
+    @JsonProperty("projectPaths")
+    private List<String> projectPaths;
+
+    /** When true, omit the host's user-level instruction targets, leaving only repository targets. For multitenant deployments (mirrors `discover`'s `excludeHostInstructions`). */
+    @JsonProperty("excludeHostInstructions")
+    private Boolean excludeHostInstructions;
+
+    /** Explicit discovery-only instruction roots to enumerate, including configured missing directories. Relative paths resolve against the request's effective working directory when supplied. These are not filesystem grants or preferred creation targets. Null and omission are equivalent. */
+    @JsonProperty("instructionDirectories")
+    private List<String> instructionDirectories;
+
+    /**
+     * Creates a request with its required inputs.
+     */
+    public InstructionsGetDiscoveryPathsRequest() {
+    }
+
+    /**
+     * Returns the {@code projectPaths} property.
+     *
+     * @return Optional list of project directory paths. When omitted or empty, only the user-level targets are returned.
+     */
+    public List<String> getProjectPaths() {
+        return projectPaths;
+    }
+
+    /**
+     * Returns the {@code excludeHostInstructions} property.
+     *
+     * @return When true, omit the host's user-level instruction targets, leaving only repository targets. For multitenant deployments (mirrors `discover`'s `excludeHostInstructions`).
+     */
+    public Boolean getExcludeHostInstructions() {
+        return excludeHostInstructions;
+    }
+
+    /**
+     * Returns the {@code instructionDirectories} property.
+     *
+     * @return Explicit discovery-only instruction roots to enumerate, including configured missing directories. Relative paths resolve against the request's effective working directory when supplied. These are not filesystem grants or preferred creation targets. Null and omission are equivalent.
+     */
+    public List<String> getInstructionDirectories() {
+        return instructionDirectories;
+    }
+
+    /**
+     * Sets the {@code projectPaths} property.
+     *
+     * @param value Optional list of project directory paths. When omitted or empty, only the user-level targets are returned.
+     * @return this request
+     */
+    public InstructionsGetDiscoveryPathsRequest setProjectPaths(List<String> value) {
+        this.projectPaths = value;
+        return this;
+    }
+
+    /**
+     * Sets the {@code excludeHostInstructions} property.
+     *
+     * @param value When true, omit the host's user-level instruction targets, leaving only repository targets. For multitenant deployments (mirrors `discover`'s `excludeHostInstructions`).
+     * @return this request
+     */
+    public InstructionsGetDiscoveryPathsRequest setExcludeHostInstructions(Boolean value) {
+        this.excludeHostInstructions = value;
+        return this;
+    }
+
+    /**
+     * Sets the {@code instructionDirectories} property.
+     *
+     * @param value Explicit discovery-only instruction roots to enumerate, including configured missing directories. Relative paths resolve against the request's effective working directory when supplied. These are not filesystem grants or preferred creation targets. Null and omission are equivalent.
+     * @return this request
+     */
+    public InstructionsGetDiscoveryPathsRequest setInstructionDirectories(List<String> value) {
+        this.instructionDirectories = value;
+        return this;
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/InstructionsInitPromptResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/InstructionsInitPromptResult.java
new file mode 100644
index 0000000000..20eb197498
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/InstructionsInitPromptResult.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;
+
+/**
+ * The prompt the init command runs.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record InstructionsInitPromptResult(
+    /** Prompt text authoring repository instructions. */
+    @JsonProperty("prompt") String prompt
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/LocationPermissionsCleanupResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/LocationPermissionsCleanupResult.java
new file mode 100644
index 0000000000..ea8b72d7aa
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/LocationPermissionsCleanupResult.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 java.util.List;
+import javax.annotation.processing.Generated;
+
+/**
+ * Which stored location permissions were dropped because their directory is gone.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record LocationPermissionsCleanupResult(
+    /** Location keys whose grants were removed. Empty when every stored location still exists. */
+    @JsonProperty("removedLocationKeys") List<String> removedLocationKeys
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/LoggedInUser.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/LoggedInUser.java
new file mode 100644
index 0000000000..ebd6526dc4
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/LoggedInUser.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;
+
+/**
+ * An account the host has signed in to, identified by the server it lives on and the login it uses there. The same person can appear more than once when they use both github.com and an Enterprise server.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record LoggedInUser(
+    /** Host the account belongs to, such as `github.com` or an Enterprise server. */
+    @JsonProperty("host") String host,
+    /** Account login on that host. */
+    @JsonProperty("login") String login,
+    /** Account kind, when the host recorded one. Consumers must tolerate new strings. */
+    @JsonProperty("kind") String kind,
+    /** Source account this account was derived from, when one was recorded. */
+    @JsonProperty("derivedFrom") String derivedFrom
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedPermissionEvaluation.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedPermissionEvaluation.java
new file mode 100644
index 0000000000..40f74da843
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedPermissionEvaluation.java
@@ -0,0 +1,24 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 ManagedPermissionEvaluation(
+    /** Original input operation associated with this verdict. */
+    @JsonProperty("operation") ManagedPermissionOperation operation,
+    /** Managed-policy decision only; never bypasses user permissions or other security controls. */
+    @JsonProperty("verdict") ManagedPermissionVerdict verdict
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedPermissionOperation.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedPermissionOperation.java
new file mode 100644
index 0000000000..ba60365d3c
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedPermissionOperation.java
@@ -0,0 +1,42 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 ManagedPermissionOperation(
+    /** Absolute HTTP(S) URL with a host. Invalid URLs reject the entire evaluation batch. */
+    @JsonProperty("url") String url,
+    /** Operation to evaluate. Currently only url is supported. */
+    @JsonProperty("kind") ManagedPermissionOperationKind kind
+) {
+
+    /** Operation to evaluate. Currently only url is supported. */
+    public enum ManagedPermissionOperationKind {
+        /** The {@code url} variant. */
+        URL("url");
+
+        private final String value;
+        ManagedPermissionOperationKind(String value) { this.value = value; }
+        @com.fasterxml.jackson.annotation.JsonValue
+        public String getValue() { return value; }
+        @com.fasterxml.jackson.annotation.JsonCreator
+        public static ManagedPermissionOperationKind fromValue(String value) {
+            for (ManagedPermissionOperationKind v : values()) {
+                if (v.value.equals(value)) return v;
+            }
+            throw new IllegalArgumentException("Unknown ManagedPermissionOperationKind value: " + value);
+        }
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedPermissionVerdict.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedPermissionVerdict.java
new file mode 100644
index 0000000000..1254c36718
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedPermissionVerdict.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;
+
+/**
+ * Managed-policy verdict only: deny blocks the URL, ask requires approval, allow approves under managed policy, and unmanaged leaves the normal consumer permission flow in effect. No verdict bypasses other security controls.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum ManagedPermissionVerdict {
+    /** The {@code deny} variant. */
+    DENY("deny"),
+    /** The {@code ask} variant. */
+    ASK("ask"),
+    /** The {@code allow} variant. */
+    ALLOW("allow"),
+    /** The {@code unmanaged} variant. */
+    UNMANAGED("unmanaged");
+
+    private final String value;
+    ManagedPermissionVerdict(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static ManagedPermissionVerdict fromValue(String value) {
+        for (ManagedPermissionVerdict v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown ManagedPermissionVerdict value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedPluginRetryEntry.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedPluginRetryEntry.java
new file mode 100644
index 0000000000..9fb16e5a55
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedPluginRetryEntry.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 javax.annotation.processing.Generated;
+
+/**
+ * Retry outcome for one plugin required by managed settings.
+ *
+ * @apiNote This type 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 ManagedPluginRetryEntry(
+    /** Plugin spec in "plugin@marketplace" form. */
+    @JsonProperty("spec") String spec,
+    /** What the retry did for this plugin. */
+    @JsonProperty("status") ManagedPluginRetryStatus status,
+    /** Why the plugin was not prepared. Present when `status` is `failed` or `deferred`. */
+    @JsonProperty("error") String error
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedPluginRetryStatus.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedPluginRetryStatus.java
new file mode 100644
index 0000000000..43a46d2625
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedPluginRetryStatus.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 com.github.copilot.CopilotExperimental;
+import javax.annotation.processing.Generated;
+
+/**
+ * What retrying did for one plugin required by managed settings.
+ *
+ * @apiNote This type is experimental and may change in a future version.
+ *
+ * @since 1.0.0
+ */
+@CopilotExperimental
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum ManagedPluginRetryStatus {
+    /** The {@code installed} variant. */
+    INSTALLED("installed"),
+    /** The {@code updated} variant. */
+    UPDATED("updated"),
+    /** The {@code already_present} variant. */
+    ALREADY_PRESENT("already_present"),
+    /** The {@code failed} variant. */
+    FAILED("failed"),
+    /** The {@code deferred} variant. */
+    DEFERRED("deferred"),
+    /** The {@code not_required} variant. */
+    NOT_REQUIRED("not_required");
+
+    private final String value;
+    ManagedPluginRetryStatus(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static ManagedPluginRetryStatus fromValue(String value) {
+        for (ManagedPluginRetryStatus v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown ManagedPluginRetryStatus value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingMeta.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingMeta.java
index 46967ea441..3a2bf1fd0b 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingMeta.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingMeta.java
@@ -28,6 +28,8 @@ public record ManagedSettingMeta(
     /** Whether users and repositories may choose a different value. `false` means policy locks the value. */
     @JsonProperty("overridable") Boolean overridable,
     /** Channel that supplied this scalar value, matching a `layers[].source`: `device`, `server`, or `policyHelper`. These scalar defaults select one winning channel, not a mixed source. Treat unknown values as additional channels; more may be added. */
-    @JsonProperty("source") String source
+    @JsonProperty("source") String source,
+    /** Original managed value when the runtime adjusted it to a supported effective value. Omitted when no adjustment was needed. */
+    @JsonProperty("requested") String requested
 ) {
 }
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsApplyControlsParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsApplyControlsParams.java
new file mode 100644
index 0000000000..fa5802b6f7
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsApplyControlsParams.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 javax.annotation.processing.Generated;
+
+/**
+ * A user settings document and the effective managed policy whose controlled entries should be stamped onto 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)
+record ManagedSettingsApplyControlsParams(
+    /** The user settings document to stamp. Entries the managed layer does not name are returned exactly as supplied. */
+    @JsonInclude(JsonInclude.Include.ALWAYS)
+    @JsonProperty("settings") Object settings,
+    /** The effective managed policy, as composed by `managedSettings.resolveEffectiveValue`. Omit it on an unmanaged host: the settings then come back unchanged. */
+    @JsonProperty("managed") Object managed
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsApplyControlsResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsApplyControlsResult.java
new file mode 100644
index 0000000000..c5a85c72bb
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsApplyControlsResult.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;
+
+/**
+ * The user settings with the managed layer's controlled entries stamped on.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record ManagedSettingsApplyControlsResult(
+    /** The resulting settings document. */
+    @JsonProperty("settingsJson") Object settingsJson
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsBypassDisableSource.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsBypassDisableSource.java
new file mode 100644
index 0000000000..f2f64e075f
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsBypassDisableSource.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;
+
+/**
+ * Which layer disabled bypass-permissions mode. The layer matters because only a server-delivered disable is pinned to an account and can later be lifted by signing in elsewhere.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+enum ManagedSettingsBypassDisableSource {
+    /** The {@code user} variant. */
+    USER("user"),
+    /** The {@code managed} variant. */
+    MANAGED("managed"),
+    /** The {@code mdm} variant. */
+    MDM("mdm");
+
+    private final String value;
+    ManagedSettingsBypassDisableSource(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static ManagedSettingsBypassDisableSource fromValue(String value) {
+        for (ManagedSettingsBypassDisableSource v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown ManagedSettingsBypassDisableSource value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsBypassPolicyResolution.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsBypassPolicyResolution.java
new file mode 100644
index 0000000000..3101cf80fd
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsBypassPolicyResolution.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 the managed-policy resolution said about bypass-permissions mode. `unknown` is a third answer rather than a missing one, and the caller must send it explicitly when it has no verdict.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+enum ManagedSettingsBypassPolicyResolution {
+    /** The {@code allowed} variant. */
+    ALLOWED("allowed"),
+    /** The {@code disabled} variant. */
+    DISABLED("disabled"),
+    /** The {@code unknown} variant. */
+    UNKNOWN("unknown");
+
+    private final String value;
+    ManagedSettingsBypassPolicyResolution(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static ManagedSettingsBypassPolicyResolution fromValue(String value) {
+        for (ManagedSettingsBypassPolicyResolution v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown ManagedSettingsBypassPolicyResolution value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsIngestParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsIngestParams.java
new file mode 100644
index 0000000000..78e71c35cf
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsIngestParams.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 com.github.copilot.CopilotExperimental;
+import javax.annotation.processing.Generated;
+
+/**
+ * Inputs describing the host and account an ingestion should resolve managed policy for.
+ *
+ * @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)
+record ManagedSettingsIngestParams(
+    /** The policy-helper invocation reason. Defaults to sessionStart. */
+    @JsonProperty("policyHelperReason") ManagedSettingsPolicyHelperReason policyHelperReason,
+    /** Whether to run ingestion. Omit or set false to return an empty result without discovering or fetching policy. */
+    @JsonProperty("selfFetch") Boolean selfFetch,
+    /** The authenticated identity to resolve policy for. Omitted before sign-in, in which case no server layer is fetched. */
+    @JsonProperty("authInfo") Object authInfo,
+    /** The session whose credential store and working directory the policy helper should use. Omit it when no session exists yet and the process-wide store applies. */
+    @JsonProperty("sessionId") String sessionId,
+    /** A device layer supplied by the host instead of discovered from the machine. Pair it with `hasDeviceResponse` so an explicit absence is distinguishable from an omitted override. */
+    @JsonProperty("deviceResponse") Object deviceResponse,
+    /** Whether `deviceResponse` is an override at all. True with a null `deviceResponse` asserts the device layer is empty; false discovers it from the machine. */
+    @JsonProperty("hasDeviceResponse") Boolean hasDeviceResponse,
+    /** Whether to ignore a cached server policy when reading, forcing the resolution to come from a live fetch. */
+    @JsonProperty("bypassCacheRead") Boolean bypassCacheRead,
+    /** How this ingestion may use the on-disk server-policy cache. Defaults to the runtime's own policy when omitted. */
+    @JsonProperty("serverPolicyCacheMode") ManagedSettingsServerPolicyCacheMode serverPolicyCacheMode,
+    /** Whether a configured platform policy helper may be run to produce an enforced helper layer. */
+    @JsonProperty("policyHelperEnabled") Boolean policyHelperEnabled,
+    /** Directory the policy helper runs in when this ingestion is not owned by a registered session. A host resolving policy before its session exists must pass this, or a directory-sensitive helper judges the wrong repository. */
+    @JsonProperty("policyHelperWorkingDirectory") String policyHelperWorkingDirectory,
+    /** User agent to send with the policy fetch. */
+    @JsonProperty("userAgent") String userAgent,
+    /** Name of the embedding client, reported to the managed-settings service as `client_id` so it can refuse to deliver a policy this client is too old to enforce. Omit it and the runtime reports a generic identity; the runtime version sent alongside is the gate that actually matters. */
+    @JsonProperty("clientName") String clientName,
+    /** The host's environment variables, read for cache location and policy overrides. Supplied by the host rather than read from the runtime process so a command that selected its own configuration home is honored. */
+    @JsonInclude(JsonInclude.Include.ALWAYS)
+    @JsonProperty("environment") Object environment,
+    /** The host's platform, in Node's `process.platform` spelling, used to locate platform-specific cache and policy paths. */
+    @JsonProperty("platform") String platform,
+    /** The host's home directory, used to resolve cache and managed-file locations. */
+    @JsonProperty("homeDirectory") String homeDirectory
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsIngestResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsIngestResult.java
new file mode 100644
index 0000000000..d5372cf860
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsIngestResult.java
@@ -0,0 +1,78 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 managed policy layers an ingestion resolved, together with the per-layer outcome flags a host needs to decide how much to trust the result. The flags are reported rather than folded into the settings because a host must be able to distinguish an unmanaged device from a managed device whose policy could not be confirmed, and apply its fail-closed gates in the second case.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record ManagedSettingsIngestResult(
+    /** The effective managed settings composed from every resolved layer. Omitted when no layer set anything, so an unmanaged host locks nothing. */
+    @JsonProperty("settings") Object settings,
+    /** The effective managed permissions layer, when the resolved policy carries one. */
+    @JsonProperty("permissions") Object permissions,
+    /** The server fetch failed and no cached entry stood in for it, so the server layer is unconfirmed and fail-closed gates apply. */
+    @JsonProperty("serverFetchFailed") Boolean serverFetchFailed,
+    /** No usable token was available, so no server fetch was attempted. */
+    @JsonProperty("serverTokenUnavailable") Boolean serverTokenUnavailable,
+    /** The error that made the server fetch fail, when one did. */
+    @JsonProperty("serverFetchError") String serverFetchError,
+    /** How the server layer was resolved. */
+    @JsonProperty("serverResolution") ManagedSettingsServerPolicyResolution serverResolution,
+    /** The server fetch failed in a way a later retry could succeed at, as opposed to a refusal that no retry will change. */
+    @JsonProperty("serverRetryableFailure") Boolean serverRetryableFailure,
+    /** A live fetch failed but a recent cached entry was served in its place, so `serverFetchFailed` stays false. Lets a consumer distinguish a clean fetch from a cache-backed fallback. */
+    @JsonProperty("serverCacheFallback") Boolean serverCacheFallback,
+    /** A server-managed policy is known to exist even though `serverResponse` is intentionally unset. Consumers should OR this with the presence of `serverResponse` when deciding whether the device is managed, so a fresh start during an outage still applies the fail-closed gates instead of treating the device as unmanaged. */
+    @JsonProperty("serverSourceFound") Boolean serverSourceFound,
+    /** The account's server-delivered policy, when one was resolved. */
+    @JsonProperty("serverResponse") Object serverResponse,
+    /** The sandbox object from a cached server policy that a forced refresh declined to serve in full. Folded back into the effective sandbox layer so an outage during a forced refresh still synthesizes the fail-closed sandbox floor from the administrator's known intent. */
+    @JsonProperty("serverSandboxFloor") Object serverSandboxFloor,
+    /** The server fetch failed while a policy demanded a fresh confirmation, which is the strict posture an enterprise opted into rather than an ordinary transient failure. */
+    @JsonProperty("serverForcedRefreshFailure") Boolean serverForcedRefreshFailure,
+    /** The server refused to deliver a policy because this client is too old to enforce it, carrying the user-facing sentence describing the refusal. No retry will help; the remedy is a client update. Gates that exist only because of managed policy should deny on this rather than falling back to their unmanaged default. */
+    @JsonProperty("serverClientUpdateRequired") String serverClientUpdateRequired,
+    /** Minimum client version requested by a successful response. Advisory only; the delivered policy remains active. */
+    @JsonProperty("serverClientUpdateRequested") String serverClientUpdateRequested,
+    /** The synthesized fail-closed permissions layer applied in place of a policy a refused client may not enforce. */
+    @JsonProperty("serverPermissionsFloor") Object serverPermissionsFloor,
+    /** The device layer discovered from the machine, when one exists. */
+    @JsonProperty("deviceResponse") Object deviceResponse,
+    /** The device layer could not be read, so it is unconfirmed rather than known-absent. */
+    @JsonProperty("deviceLoadFailed") Boolean deviceLoadFailed,
+    /** The sandbox floor contributed by the device layer. */
+    @JsonProperty("deviceSandboxFloor") Object deviceSandboxFloor,
+    /** A device-managed policy is known to exist. */
+    @JsonProperty("deviceSourceFound") Boolean deviceSourceFound,
+    /** Whether the device layer's sandbox intent could not be determined, so a consumer must not read its absence as permission to run unsandboxed. */
+    @JsonProperty("deviceSandboxUndetermined") Boolean deviceSandboxUndetermined,
+    /** The layer produced by the platform policy helper, when one ran. */
+    @JsonProperty("policyHelperResponse") Object policyHelperResponse,
+    /** Which channel registered the policy helper that produced the helper layer. */
+    @JsonProperty("policyHelperAuthority") ManagedSettingsPolicyHelperAuthority policyHelperAuthority,
+    /** The policy helper was configured but could not be run or its output could not be read. */
+    @JsonProperty("policyHelperLoadFailed") Boolean policyHelperLoadFailed,
+    /** A policy helper is configured for this host. */
+    @JsonProperty("policyHelperConfigured") Boolean policyHelperConfigured,
+    /** The policy helper's failure must be treated as fail-closed rather than ignored. */
+    @JsonProperty("policyHelperFailClosed") Boolean policyHelperFailClosed,
+    /** Diagnostics emitted while resolving the layers, in the order they occurred. */
+    @JsonProperty("logMessages") List<ManagedSettingsLogMessage> logMessages
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsLoadRemoteControlParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsLoadRemoteControlParams.java
new file mode 100644
index 0000000000..ff434c10ae
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsLoadRemoteControlParams.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 com.github.copilot.CopilotExperimental;
+import javax.annotation.processing.Generated;
+
+/**
+ * Inputs describing the host and account whose managed remote-control policy should be resolved. Mirrors `managedSettings.ingest`, and deliberately carries no retention decision: reading this gate never becomes this runtime process's startup policy.
+ *
+ * @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)
+record ManagedSettingsLoadRemoteControlParams(
+    /** The policy-helper invocation reason. Defaults to sessionStart. */
+    @JsonProperty("policyHelperReason") ManagedSettingsPolicyHelperReason policyHelperReason,
+    /** Whether to run ingestion. Omit or set false to return an empty result without discovering or fetching policy. */
+    @JsonProperty("selfFetch") Boolean selfFetch,
+    /** The authenticated identity to resolve policy for. Omitted before sign-in, in which case no server layer is fetched. */
+    @JsonProperty("authInfo") Object authInfo,
+    /** A device layer supplied by the host instead of discovered from the machine. Pair it with `hasDeviceResponse` so an explicit absence is distinguishable from an omitted override. */
+    @JsonProperty("deviceResponse") Object deviceResponse,
+    /** Whether `deviceResponse` is an override at all. True with a null `deviceResponse` asserts the device layer is empty; false discovers it from the machine. */
+    @JsonProperty("hasDeviceResponse") Boolean hasDeviceResponse,
+    /** Whether a configured platform policy helper may be run to produce an enforced helper layer. */
+    @JsonProperty("policyHelperEnabled") Boolean policyHelperEnabled,
+    /** User agent to send with the policy fetch. */
+    @JsonProperty("userAgent") String userAgent,
+    /** Name of the embedding client, reported to the managed-settings service as `client_id` so it can refuse to deliver a policy this client is too old to enforce. That refusal is exactly what turns into an explicit `disabled` below, so a host that omits this field forfeits the protection. */
+    @JsonProperty("clientName") String clientName,
+    /** The host's environment variables, read for cache location and policy overrides. */
+    @JsonInclude(JsonInclude.Include.ALWAYS)
+    @JsonProperty("environment") Object environment,
+    /** The host's platform, in Node's `process.platform` spelling, used to locate platform-specific cache and policy paths. */
+    @JsonProperty("platform") String platform,
+    /** The host's home directory, used to resolve cache and managed-file locations. */
+    @JsonProperty("homeDirectory") String homeDirectory
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsLoadRemoteControlResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsLoadRemoteControlResult.java
new file mode 100644
index 0000000000..2acf5180c5
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsLoadRemoteControlResult.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;
+
+/**
+ * The managed remote-control policy in force for an account, if any. An absent policy means the account is unmanaged for this capability, which a host reads as allowed — so absence here is a positive statement that no policy applies, never a stand-in for a resolution that failed. A resolution that cannot be completed is rejected instead.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record ManagedSettingsLoadRemoteControlResult(
+    /** The account's `remoteControl` policy document. Absent when no managed policy governs remote control for this account. Reported as an explicit disabled policy, rather than as absence, when the service refused to deliver a policy this client is too old to enforce. */
+    @JsonProperty("remoteControl") Object remoteControl
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsLogLevel.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsLogLevel.java
new file mode 100644
index 0000000000..1775a5db19
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsLogLevel.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;
+
+/**
+ * Severity of a diagnostic emitted while ingesting managed settings.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+enum ManagedSettingsLogLevel {
+    /** The {@code debug} variant. */
+    DEBUG("debug"),
+    /** The {@code info} variant. */
+    INFO("info"),
+    /** The {@code warning} variant. */
+    WARNING("warning"),
+    /** The {@code error} variant. */
+    ERROR("error");
+
+    private final String value;
+    ManagedSettingsLogLevel(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static ManagedSettingsLogLevel fromValue(String value) {
+        for (ManagedSettingsLogLevel v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown ManagedSettingsLogLevel value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsLogMessage.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsLogMessage.java
new file mode 100644
index 0000000000..be859afde3
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsLogMessage.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;
+
+/**
+ * One diagnostic emitted while ingesting managed settings. Returned rather than logged by the runtime so the host decides where ingestion diagnostics go, which matters because an ingestion runs before a session exists to carry a log sink.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record ManagedSettingsLogMessage(
+    /** Severity of this diagnostic. */
+    @JsonProperty("level") ManagedSettingsLogLevel level,
+    /** Human-readable diagnostic text. */
+    @JsonProperty("message") String message
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsMeta.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsMeta.java
index 7348141749..d98d081e63 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsMeta.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsMeta.java
@@ -28,6 +28,10 @@ public record ManagedSettingsMeta(
     /** Lock state and provenance of `values.model`. */
     @JsonProperty("model") ManagedSettingMeta model,
     /** Lock state and provenance of `values.autoTier`. */
-    @JsonProperty("autoTier") ManagedSettingMeta autoTier
+    @JsonProperty("autoTier") ManagedSettingMeta autoTier,
+    /** Lock state and provenance of `values.effortLevel`. */
+    @JsonProperty("effortLevel") ManagedSettingMeta effortLevel,
+    /** Lock state and provenance of `values.contextTier`. */
+    @JsonProperty("contextTier") ManagedSettingMeta contextTier
 ) {
 }
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsParseClientValueParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsParseClientValueParams.java
new file mode 100644
index 0000000000..27effeabae
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsParseClientValueParams.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 client-supplied managed settings to validate and normalize. Omitting them is valid and yields no policy.
+ *
+ * @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)
+record ManagedSettingsParseClientValueParams(
+    /** The managed settings a client is supplying for a session it is about to open. Omit them when the client is imposing no policy of its own. */
+    @JsonProperty("settings") Object settings
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsParseClientValueResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsParseClientValueResult.java
new file mode 100644
index 0000000000..695248ea4a
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsParseClientValueResult.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;
+
+/**
+ * The accepted managed settings, reduced to the keys a client is allowed to set.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record ManagedSettingsParseClientValueResult(
+    /** The normalized settings. Omitted when the client supplied none. An accepted document that sets nothing comes back as an empty object, which is distinct from omission. */
+    @JsonProperty("settingsJson") Object settingsJson
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsPermissionsEvaluateParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsPermissionsEvaluateParams.java
new file mode 100644
index 0000000000..0a5d0c53ab
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsPermissionsEvaluateParams.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 com.github.copilot.generated.ManagedPermissionsContext;
+import java.util.List;
+import javax.annotation.processing.Generated;
+
+/**
+ * Managed policy context and ordered operations for pure, sessionless evaluation.
+ *
+ * @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 ManagedSettingsPermissionsEvaluateParams(
+    /** Trusted, reusable managed permission policy snapshot; no policy is discovered during evaluation. */
+    @JsonProperty("context") ManagedPermissionsContext context,
+    /** Operations to evaluate, preserving input order and duplicates. An empty batch is valid. */
+    @JsonProperty("operations") List<ManagedPermissionOperation> operations
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsPermissionsEvaluateResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsPermissionsEvaluateResult.java
new file mode 100644
index 0000000000..099a216b48
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsPermissionsEvaluateResult.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;
+
+/**
+ * Ordered managed permission verdicts and the supplied policy's fail-closed posture.
+ *
+ * @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 ManagedSettingsPermissionsEvaluateResult(
+    /** One verdict per input operation, in the same order, including duplicates. */
+    @JsonProperty("results") List<ManagedPermissionEvaluation> results,
+    /** Managed permission policy could not be determined; every operation is denied. */
+    @JsonProperty("failClosed") Boolean failClosed
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsPolicyHelperAuthority.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsPolicyHelperAuthority.java
new file mode 100644
index 0000000000..34b33ad56f
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsPolicyHelperAuthority.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 channel registered the policy helper that produced a helper layer.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+enum ManagedSettingsPolicyHelperAuthority {
+    /** The {@code device} variant. */
+    DEVICE("device"),
+    /** The {@code server} variant. */
+    SERVER("server");
+
+    private final String value;
+    ManagedSettingsPolicyHelperAuthority(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static ManagedSettingsPolicyHelperAuthority fromValue(String value) {
+        for (ManagedSettingsPolicyHelperAuthority v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown ManagedSettingsPolicyHelperAuthority value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsPolicyHelperReason.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsPolicyHelperReason.java
new file mode 100644
index 0000000000..509e98f5e7
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsPolicyHelperReason.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;
+
+/**
+ * The operation that requires a policy-helper response.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+enum ManagedSettingsPolicyHelperReason {
+    /** The {@code sessionStart} variant. */
+    SESSIONSTART("sessionStart"),
+    /** The {@code pluginActivation} variant. */
+    PLUGINACTIVATION("pluginActivation");
+
+    private final String value;
+    ManagedSettingsPolicyHelperReason(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static ManagedSettingsPolicyHelperReason fromValue(String value) {
+        for (ManagedSettingsPolicyHelperReason v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown ManagedSettingsPolicyHelperReason value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsReadDeviceResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsReadDeviceResult.java
new file mode 100644
index 0000000000..880044dc83
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsReadDeviceResult.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;
+
+/**
+ * The device-managed settings layer, with the sandbox floor and the load outcome a host needs to compose it into an effective policy.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record ManagedSettingsReadDeviceResult(
+    /** Validated, canonical device-managed settings. Omitted when no device policy was discovered, when the discovered document failed validation, or when it validated to an empty object — an empty document carries no policy, and reporting it as present would outrank layers that do. */
+    @JsonProperty("settings") Object settings,
+    /** Sandbox floor read from the discovered document before validation, so a document that is otherwise rejected can still raise the floor it declared. */
+    @JsonProperty("sandboxFloor") Object sandboxFloor,
+    /** Whether discovery or validation failed. A host must treat this as "policy unknown" rather than "no policy": absent settings with this set false mean the device genuinely has none. */
+    @JsonProperty("loadFailed") Boolean loadFailed
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsResolveBypassDisableTransitionParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsResolveBypassDisableTransitionParams.java
new file mode 100644
index 0000000000..3b56f24c92
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsResolveBypassDisableTransitionParams.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;
+
+/**
+ * The bypass-permissions state a host holds today, the account now signed in, and what the managed-policy resolution said.
+ *
+ * @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)
+record ManagedSettingsResolveBypassDisableTransitionParams(
+    /** Which layer currently disables bypass mode. Omit it when nothing does. */
+    @JsonProperty("currentSource") ManagedSettingsBypassDisableSource currentSource,
+    /** The account a `managed` disable is pinned to. Omit it when the current source is not `managed`; it is ignored for the other sources. */
+    @JsonProperty("currentManagedIdentity") String currentManagedIdentity,
+    /** The account signed in now. A `managed` disable pinned to a different account is lifted. */
+    @JsonProperty("activeIdentity") String activeIdentity,
+    /** What the resolution said about bypass mode. Send `unknown` rather than omitting the field when there is no verdict. */
+    @JsonProperty("policy") ManagedSettingsBypassPolicyResolution policy
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsResolveBypassDisableTransitionResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsResolveBypassDisableTransitionResult.java
new file mode 100644
index 0000000000..2557cd5cb3
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsResolveBypassDisableTransitionResult.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;
+
+/**
+ * The bypass-permissions state a host should hold after the resolution, and what it must do to get there.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record ManagedSettingsResolveBypassDisableTransitionResult(
+    /** Which layer disables bypass mode after this resolution. Omitted when none does, which is what a lifted disable looks like. */
+    @JsonProperty("source") ManagedSettingsBypassDisableSource source,
+    /** The account the returned `managed` source is pinned to. Store it alongside `source`; the next call needs it to decide whether an account switch lifts the disable. */
+    @JsonProperty("managedIdentity") String managedIdentity,
+    /** The value to store in the host's own bypass-disabled flag. Omitted means leave it exactly as it is, which is not the same as being told to store `false`. */
+    @JsonProperty("setDisabledState") Boolean setDisabledState,
+    /** Whether a bypass-permissions session already running must be turned off. True only when this resolution newly disables bypass mode, so a host that is already compliant is not interrupted. */
+    @JsonProperty("suppressRuntimeAllowAll") Boolean suppressRuntimeAllowAll
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsResolveDeviceForceLoginOrgsGateParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsResolveDeviceForceLoginOrgsGateParams.java
new file mode 100644
index 0000000000..75b89cb8bd
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsResolveDeviceForceLoginOrgsGateParams.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 javax.annotation.processing.Generated;
+
+/**
+ * The credential and environment to evaluate the device-channel sign-in pin against.
+ *
+ * @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)
+record ManagedSettingsResolveDeviceForceLoginOrgsGateParams(
+    /** The authenticated identity to judge. Omitted when signed out, which is the case the device channel exists to serve: it can refuse a first sign-in before any credential exists. */
+    @JsonProperty("authInfo") Object authInfo,
+    /** The host's environment variables. Read for the variables that would make an identity's membership snapshot forgeable, so a credential whose provenance cannot be trusted is refused rather than accepted. */
+    @JsonInclude(JsonInclude.Include.ALWAYS)
+    @JsonProperty("environment") Object environment
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsResolveEffectiveValueParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsResolveEffectiveValueParams.java
new file mode 100644
index 0000000000..7e82bf0b3c
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsResolveEffectiveValueParams.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;
+
+/**
+ * The managed-settings layers to compose into an effective policy. Every layer is optional; omitting all of them yields no effective policy.
+ *
+ * @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)
+record ManagedSettingsResolveEffectiveValueParams(
+    /** The account's server-delivered org policy, as returned by a managed-settings fetch. Omitted before sign-in or when the fetch has not landed. */
+    @JsonProperty("server") Object server,
+    /** The device layer: native MDM and managed-file settings describing the machine rather than the account. */
+    @JsonProperty("mdm") Object mdm,
+    /** The device sandbox floor, folded into the device layer under `sandbox` before composition. */
+    @JsonProperty("deviceSandboxFloor") Object deviceSandboxFloor,
+    /** The policy-helper layer, an enforced channel sourced from a platform policy helper process. */
+    @JsonProperty("policyHelper") Object policyHelper
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsResolveEffectiveValueResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsResolveEffectiveValueResult.java
new file mode 100644
index 0000000000..441bb9039f
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsResolveEffectiveValueResult.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;
+
+/**
+ * The effective managed policy composed from the supplied layers.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record ManagedSettingsResolveEffectiveValueResult(
+    /** The composed effective managed settings. Omitted when no layer sets anything, so an unmanaged host locks nothing. Carries `sandboxAdvisoryFloorDeclined: true` when an advisory server force-on was dropped because this host cannot run the sandbox. */
+    @JsonProperty("settingsJson") Object settingsJson
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsResolveParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsResolveParams.java
index ffb5af2b18..1ecc14a56c 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsResolveParams.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsResolveParams.java
@@ -29,6 +29,23 @@ public record ManagedSettingsResolveParams(
     /** GitHub token to resolve instead of the current account. The call fails when the token cannot be resolved. */
     @JsonProperty("gitHubToken") String gitHubToken,
     /** Embedding client identity for server policy requests, as in session creation. Omit for the CLI identity. */
-    @JsonProperty("clientName") String clientName
+    @JsonProperty("clientName") String clientName,
+    /** Working directory used to run an organization policy helper. When omitted, sessionless resolution does not run the helper. */
+    @JsonProperty("workingDirectory") String workingDirectory
 ) {
+
+    /**
+     * Creates managed-settings resolution parameters without a working directory.
+     *
+     * @param selectionId Opaque account identifier returned by `account.getAllUsers`. When omitted, the current account is used, or device policy only when no account is signed in.
+     * @param gitHubToken GitHub token to resolve instead of the current account. The call fails when the token cannot be resolved.
+     * @param clientName Embedding client identity for server policy requests, as in session creation. Omit for the CLI identity.
+     */
+    public ManagedSettingsResolveParams(
+        String selectionId,
+        String gitHubToken,
+        String clientName
+    ) {
+        this(selectionId, gitHubToken, clientName, null);
+    }
 }
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsResolveResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsResolveResult.java
index 6d9941f4a9..d13b9a555b 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsResolveResult.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsResolveResult.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.ManagedPermissionsContext;
 import java.util.List;
 import javax.annotation.processing.Generated;
 
@@ -25,6 +26,8 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record ManagedSettingsResolveResult(
+    /** Reusable source-composed permission policy for managedSettings.permissions.evaluate. Unlike resolved.settings.permissions, this retains every source's allowlist and default-prompt semantics. Refresh through resolve when account/device policy changes. Absent on runtimes that do not support permission evaluation. */
+    @JsonProperty("permissionsContext") ManagedPermissionsContext permissionsContext,
     /** Printable opaque identity of the account the settings were resolved for, suitable for comparison and storage, not an account selectionId. Absent when no account was available, in which case only device policy is reported. */
     @JsonProperty("account") String account,
     /** Effective managed settings from the device and account (server) channels, in the same shape as `session.managedSettings.get`, excluding session-local injection. */
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsResolveStartupPolicyParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsResolveStartupPolicyParams.java
new file mode 100644
index 0000000000..e0074bb8bc
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsResolveStartupPolicyParams.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 com.github.copilot.CopilotExperimental;
+import javax.annotation.processing.Generated;
+
+/**
+ * Inputs describing the host and account a startup policy resolution should run for. Mirrors `managedSettings.ingest`, and adds the decision of whether the resolved policy is retained 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)
+record ManagedSettingsResolveStartupPolicyParams(
+    /** The policy-helper invocation reason. Defaults to sessionStart. */
+    @JsonProperty("policyHelperReason") ManagedSettingsPolicyHelperReason policyHelperReason,
+    /** Whether to run ingestion. Omit or set false to return an empty result without discovering or fetching policy. */
+    @JsonProperty("selfFetch") Boolean selfFetch,
+    /** The authenticated identity to resolve policy for. Omitted before sign-in, in which case no server layer is fetched and the sign-in pin is evaluated against no credential. */
+    @JsonProperty("authInfo") Object authInfo,
+    /** The session whose credential store, working directory and client kind the resolution should use. Omit it when no session exists yet and the process-wide store applies. A resolution whose session names a credential other than `authInfo` is returned but not retained, so a stale sign-in cannot apply policy for an account that has already been switched away from. */
+    @JsonProperty("sessionId") String sessionId,
+    /** A device layer supplied by the host instead of discovered from the machine. Pair it with `hasDeviceResponse` so an explicit absence is distinguishable from an omitted override. */
+    @JsonProperty("deviceResponse") Object deviceResponse,
+    /** Whether `deviceResponse` is an override at all. True with a null `deviceResponse` asserts the device layer is empty; false discovers it from the machine. */
+    @JsonProperty("hasDeviceResponse") Boolean hasDeviceResponse,
+    /** Whether to ignore a cached server policy when reading, forcing the resolution to come from a live fetch. */
+    @JsonProperty("bypassCacheRead") Boolean bypassCacheRead,
+    /** How this resolution may use the on-disk server-policy cache. Defaults to the runtime's own policy when omitted. Rejected when combined with `bypassCacheRead`, because the two express the same decision and accepting both would leave the caller unsure which one the runtime honored. */
+    @JsonProperty("serverPolicyCacheMode") ManagedSettingsServerPolicyCacheMode serverPolicyCacheMode,
+    /** Whether a configured platform policy helper may be run to produce an enforced helper layer. */
+    @JsonProperty("policyHelperEnabled") Boolean policyHelperEnabled,
+    /** Directory the policy helper runs in when this resolution is not owned by a registered session. A host resolving policy before its session exists must pass this, or a directory-sensitive helper judges the wrong repository. */
+    @JsonProperty("policyHelperWorkingDirectory") String policyHelperWorkingDirectory,
+    /** User agent to send with the policy fetch. */
+    @JsonProperty("userAgent") String userAgent,
+    /** Name of the embedding client, reported to the managed-settings service as `client_id` so it can refuse to deliver a policy this client is too old to enforce. */
+    @JsonProperty("clientName") String clientName,
+    /** The host's environment variables, read for cache location, policy overrides, and the variables that would make a membership snapshot forgeable. */
+    @JsonInclude(JsonInclude.Include.ALWAYS)
+    @JsonProperty("environment") Object environment,
+    /** The host's platform, in Node's `process.platform` spelling, used to locate platform-specific cache and policy paths. */
+    @JsonProperty("platform") String platform,
+    /** The host's home directory, used to resolve cache and managed-file locations. */
+    @JsonProperty("homeDirectory") String homeDirectory,
+    /** Whether to retain the resolved policy as this runtime process's startup policy, so later work in the process enforces it. Set false to resolve without side effects, which is what a protocol host wants before session creation: its sessions apply the complete policy through the normal lifecycle, and retaining here would let a readiness credential affect unrelated sessions. The returned verdict is identical either way — this decides only whether the process keeps it. */
+    @JsonProperty("retainAndApply") Boolean retainAndApply
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsResolveStartupPolicyResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsResolveStartupPolicyResult.java
new file mode 100644
index 0000000000..69def35f89
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsResolveStartupPolicyResult.java
@@ -0,0 +1,62 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 startup policy a resolution composed, the per-layer outcome flags a host needs to decide how much to trust it, and the enterprise sign-in verdict for the credential it ran against. The flags are reported rather than folded into the settings because a host must distinguish an unmanaged device from a managed device whose policy could not be confirmed, and apply its fail-closed gates in the second case.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record ManagedSettingsResolveStartupPolicyResult(
+    /** How the current runtime resolved the server layer. */
+    @JsonProperty("serverResolution") ManagedSettingsServerPolicyResolution serverResolution,
+    /** Advisory minimum client version from a successful server response. */
+    @JsonProperty("clientUpdateRequested") String clientUpdateRequested,
+    /** The account's server-delivered policy, when one was resolved. */
+    @JsonProperty("serverResponse") Object serverResponse,
+    /** The device layer discovered from the machine, when one exists. */
+    @JsonProperty("deviceResponse") Object deviceResponse,
+    /** The sandbox floor contributed by the device layer. */
+    @JsonProperty("deviceSandboxFloor") Object deviceSandboxFloor,
+    /** The layer produced by the platform policy helper, when one ran. */
+    @JsonProperty("policyHelperResponse") Object policyHelperResponse,
+    /** The server fetch failed and no cached entry stood in for it, so the server layer is unconfirmed and fail-closed gates apply. */
+    @JsonProperty("serverFetchFailed") Boolean serverFetchFailed,
+    /** The device layer could not be read, so it is unconfirmed rather than known-absent. */
+    @JsonProperty("deviceLoadFailed") Boolean deviceLoadFailed,
+    /** The policy helper was configured but could not be run, or its output could not be read. */
+    @JsonProperty("policyHelperLoadFailed") Boolean policyHelperLoadFailed,
+    /** Telemetry describing which layers answered and how, for the host to report alongside its own startup events. */
+    @JsonProperty("telemetry") Object telemetry,
+    /** The effective sandbox floor composed across every layer, which a host must apply rather than its own default. */
+    @JsonProperty("sandboxFloor") Object sandboxFloor,
+    /** Some layer of the policy could not be confirmed, so its absence must not be read as permission. Folds in a failed server fetch as well as an unreadable device layer. */
+    @JsonProperty("policyUndetermined") Boolean policyUndetermined,
+    /** The permissions layer specifically could not be confirmed, so permission gates apply their fail-closed posture. */
+    @JsonProperty("permissionPolicyUndetermined") Boolean permissionPolicyUndetermined,
+    /** A managed policy is known to apply to this host, from a discovered source or a resolved document. */
+    @JsonProperty("managedPolicyPresent") Boolean managedPolicyPresent,
+    /** The sandbox was enabled because policy could not be confirmed rather than because an administrator asked for it. Lets a host explain a sandbox the user did not configure. */
+    @JsonProperty("sandboxEnabledByUndeterminedPolicy") Boolean sandboxEnabledByUndeterminedPolicy,
+    /** The enterprise sign-in verdict for the credential this resolution ran against, evaluated over the effective policy so a server-delivered pin is honored alongside a device one. Computed on every resolution, including one that was not retained, so a host that declines to apply policy still cannot proceed past a pin. */
+    @JsonProperty("forceLoginOrgs") ForceLoginOrgsDecision forceLoginOrgs,
+    /** The server refused to deliver a policy because this client is too old to enforce it, carrying the user-facing sentence describing the refusal. No retry will help; the remedy is a client update. */
+    @JsonProperty("clientUpdateRequired") String clientUpdateRequired,
+    /** Warnings raised while resolving, in the order they occurred. */
+    @JsonProperty("warnings") List<String> warnings
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsResolvedData.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsResolvedData.java
index 2020e9d434..aaef086d58 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsResolvedData.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsResolvedData.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.ManagedPermissionsContext;
 import java.util.List;
 import javax.annotation.processing.Generated;
 
@@ -26,6 +27,8 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record ManagedSettingsResolvedData(
+    /** Reusable retained managed permission policy for managedSettings.permissions.evaluate, including source composition and session-local injection. Provided by live session snapshots; absent in older events. Refresh the context when managed policy changes. */
+    @JsonProperty("permissionsContext") ManagedPermissionsContext permissionsContext,
     /** Channel summary: `server`, `device`, `client`, or `policyHelper` 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 */
@@ -36,11 +39,11 @@ public record ManagedSettingsResolvedData(
     @JsonProperty("clientManaged") Boolean clientManaged,
     /** Whether the policy-helper managed-settings layer was present. The policy helper is the weakest channel: it fills keys no enterprise source set and can never replace one. */
     @JsonProperty("policyHelperManaged") Boolean policyHelperManaged,
-    /** 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. */
+    /** Whether managed policy could not be determined (e.g. a failed server fetch) and unresolved-policy safeguards remain active. This does not by itself disable bypass-permissions; `bypassPermissionsDisabled` reports only an explicit policy restriction. */
     @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. */
+    /** Whether an explicit enterprise policy restriction disables bypass-permissions ("yolo") mode for this session. Deny-wins across layers; an unresolved policy does not force this on by itself. */
     @JsonProperty("bypassPermissionsDisabled") Boolean bypassPermissionsDisabled,
     /** 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,
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsRetainPolicyParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsRetainPolicyParams.java
new file mode 100644
index 0000000000..5ea352e817
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsRetainPolicyParams.java
@@ -0,0 +1,60 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 managed layers to retain as this process's startup policy, with the outcome of fetching each one.
+ *
+ * @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)
+record ManagedSettingsRetainPolicyParams(
+    /** The resolved server policy. A known source can lack a response after a forced-refresh failure. */
+    @JsonProperty("serverResponse") Object serverResponse,
+    /** The device/MDM policy layer. */
+    @JsonProperty("deviceResponse") Object deviceResponse,
+    /** Sandbox floor declared by the device layer, carried separately so a document that failed validation can still raise the floor. */
+    @JsonProperty("deviceSandboxFloor") Object deviceSandboxFloor,
+    /** Whether a device policy source demonstrably exists. This, not a read error, is the evidence a device is managed, so a fail-closed policy gates on it. */
+    @JsonProperty("deviceSourceFound") Boolean deviceSourceFound,
+    /** Whether any managed policy source exists, independently of fetch failures. */
+    @JsonProperty("managedPolicyPresent") Boolean managedPolicyPresent,
+    /** Whether the server policy source exists, even when its response is unavailable. */
+    @JsonProperty("serverSourceFound") Boolean serverSourceFound,
+    /** Whether a required fresh server-policy confirmation failed. */
+    @JsonProperty("serverForcedRefreshFailure") Boolean serverForcedRefreshFailure,
+    /** Preserve the retained server layer during a device-only resolution. */
+    @JsonProperty("preserveServerState") Boolean preserveServerState,
+    /** Whether the device sandbox intent is unreadable independently of its other settings. */
+    @JsonProperty("deviceSandboxUndetermined") Boolean deviceSandboxUndetermined,
+    /** Whether the shared sandbox policy is undetermined. Diagnostic errors alone do not imply this flag. */
+    @JsonProperty("sandboxFloorUndetermined") Boolean sandboxFloorUndetermined,
+    /** Whether permission policy is undetermined. Sandbox-only uncertainty does not imply this flag. */
+    @JsonProperty("permissionPolicyUndetermined") Boolean permissionPolicyUndetermined,
+    /** Whether uncertainty alone enabled the shared sandbox floor. */
+    @JsonProperty("sandboxEnabledByUndeterminedPolicy") Boolean sandboxEnabledByUndeterminedPolicy,
+    /** Shared server/device sandbox floor, excluding session-local helper policy. */
+    @JsonProperty("sharedSandboxFloor") Object sharedSandboxFloor,
+    /** Whether the server fetch failed. Report it honestly: true keeps the already-retained server layer rather than replacing it with an absent one. */
+    @JsonProperty("serverFetchFailed") Boolean serverFetchFailed,
+    /** Whether the device load failed. Report it honestly, for the same reason as `serverFetchFailed`. */
+    @JsonProperty("deviceLoadFailed") Boolean deviceLoadFailed,
+    /** The policy helper's response: the third managed layer that a process owning its startup policy resolves. It is retained with the other two so that every ambient read in this process, including the mutation guards and the governed marketplace allowlist that the `plugins.*` handlers derive, sees the whole policy the process fetched. A session-owning process omits it, because it resolves a helper per session against that session's working directory. */
+    @JsonProperty("policyHelperResponse") Object policyHelperResponse
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsServerPolicyCacheMode.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsServerPolicyCacheMode.java
new file mode 100644
index 0000000000..7258e376b5
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsServerPolicyCacheMode.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;
+
+/**
+ * How an ingestion may use the on-disk server-policy cache.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+enum ManagedSettingsServerPolicyCacheMode {
+    /** The {@code preferFresh} variant. */
+    PREFERFRESH("preferFresh"),
+    /** The {@code cacheOnly} variant. */
+    CACHEONLY("cacheOnly"),
+    /** The {@code fallbackOnly} variant. */
+    FALLBACKONLY("fallbackOnly"),
+    /** The {@code disabled} variant. */
+    DISABLED("disabled");
+
+    private final String value;
+    ManagedSettingsServerPolicyCacheMode(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static ManagedSettingsServerPolicyCacheMode fromValue(String value) {
+        for (ManagedSettingsServerPolicyCacheMode v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown ManagedSettingsServerPolicyCacheMode value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsServerPolicyResolution.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsServerPolicyResolution.java
new file mode 100644
index 0000000000..8315739063
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsServerPolicyResolution.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;
+
+/**
+ * How the server layer of an ingestion was resolved.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+enum ManagedSettingsServerPolicyResolution {
+    /** The {@code live} variant. */
+    LIVE("live"),
+    /** The {@code freshCache} variant. */
+    FRESHCACHE("freshCache"),
+    /** The {@code cacheMiss} variant. */
+    CACHEMISS("cacheMiss"),
+    /** The {@code fallbackCache} variant. */
+    FALLBACKCACHE("fallbackCache"),
+    /** The {@code failOpen} variant. */
+    FAILOPEN("failOpen"),
+    /** The {@code failClosed} variant. */
+    FAILCLOSED("failClosed"),
+    /** The {@code skippedNoToken} variant. */
+    SKIPPEDNOTOKEN("skippedNoToken");
+
+    private final String value;
+    ManagedSettingsServerPolicyResolution(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static ManagedSettingsServerPolicyResolution fromValue(String value) {
+        for (ManagedSettingsServerPolicyResolution v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown ManagedSettingsServerPolicyResolution value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsValidateParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsValidateParams.java
index 32879f689c..40a4e02992 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsValidateParams.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsValidateParams.java
@@ -25,6 +25,7 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record ManagedSettingsValidateParams(
     /** The document to validate: a JSON object, or a string containing the document's JSON text. Preview documents are limited to 1 MiB and 64 levels of nesting, a stricter resource limit than delivered-policy parsing; violations are returned as diagnostics. */
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     @JsonProperty("content") Object content,
     /** Channel the document is meant for (`device`, `server`, or `policyHelper`). Some keys are only honored in some channels; for example, a `policyHelper` registration is ignored in policy-helper output. When omitted, no channel-specific checks run. */
     @JsonProperty("layer") String layer
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsValues.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsValues.java
index 931294b19c..a9094de7ca 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsValues.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ManagedSettingsValues.java
@@ -25,9 +25,13 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record ManagedSettingsValues(
-    /** Managed default model identifier, as configured. New sessions start with it; it can name a model the account cannot use, so hosts match it against the listed models. */
+    /** Managed default model identifier. When model availability was resolved, aliases and family names are projected to a concrete available model ID; otherwise the configured value is returned. */
     @JsonProperty("model") String model,
     /** Managed Auto routing preference, used when the selected model is `auto`. */
-    @JsonProperty("autoTier") AutoTier autoTier
+    @JsonProperty("autoTier") AutoTier autoTier,
+    /** Managed reasoning-effort default for the managed concrete model. The runtime clamps it to an entitled effort when model availability is known. */
+    @JsonProperty("effortLevel") String effortLevel,
+    /** Managed context-tier default for the managed concrete model. */
+    @JsonProperty("contextTier") ContextTier contextTier
 ) {
 }
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpConfiguredServer.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpConfiguredServer.java
new file mode 100644
index 0000000000..4e37d915f8
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpConfiguredServer.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 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;
+
+/**
+ * Effective MCP configuration entry. Configuration enablement is distinct from the optional live observation.
+ *
+ * @apiNote This type 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 McpConfiguredServer(
+    /** Server name (config key) */
+    @JsonProperty("name") String name,
+    /** Whether this configured server is enabled after session configuration and policy filtering. */
+    @JsonProperty("enabled") Boolean enabled,
+    /** Configuration provenance: user, workspace, plugin, builtin, or managed. */
+    @JsonProperty("source") McpServerSource source,
+    /** Plugin name that provided this server, when source is plugin. */
+    @JsonProperty("sourcePlugin") String sourcePlugin,
+    /** Plugin version that provided this server, when source is plugin. */
+    @JsonProperty("sourcePluginVersion") String sourcePluginVersion,
+    /** Human-readable display name supplied by configuration. */
+    @JsonProperty("displayName") String displayName,
+    /** Observed state from an already materialized matching server. Omitted when no live graph has this configured server; it never determines configuration enablement. */
+    @JsonProperty("live") McpConfiguredServerState live
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpConfiguredServerState.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpConfiguredServerState.java
new file mode 100644
index 0000000000..0087f2546b
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpConfiguredServerState.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 javax.annotation.processing.Generated;
+
+/**
+ * Observational state for a matching already materialized MCP server.
+ *
+ * @apiNote This type 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 McpConfiguredServerState(
+    /** Observed connection status. This is not a configuration or readiness guarantee. */
+    @JsonProperty("status") McpServerStatus status,
+    /** Observed connection error, when the materialized server failed. */
+    @JsonProperty("error") String error
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpListBuiltinServerNamesResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpListBuiltinServerNamesResult.java
new file mode 100644
index 0000000000..2a65a679d9
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpListBuiltinServerNamesResult.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 java.util.List;
+import javax.annotation.processing.Generated;
+
+/**
+ * Names of the MCP servers the runtime supplies itself.
+ *
+ * @apiNote This type 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)
+record McpListBuiltinServerNamesResult(
+    /** Every built-in server name. A host disabling the built-ins wholesale suppresses exactly this set. */
+    @JsonProperty("names") List<String> names
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpRegistryCancelParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpRegistryCancelParams.java
new file mode 100644
index 0000000000..0a12a5c26b
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpRegistryCancelParams.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;
+
+/**
+ * Registry search to abandon.
+ *
+ * @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)
+record McpRegistryCancelParams(
+    /** Request ID from `mcp.registry.allocateRequestId` that the search uses. */
+    @JsonProperty("requestId") Long requestId
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpRegistryCancelResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpRegistryCancelResult.java
new file mode 100644
index 0000000000..c7f581f4cc
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpRegistryCancelResult.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 javax.annotation.processing.Generated;
+
+/**
+ * Whether the cancel reached a live search.
+ *
+ * @apiNote This type 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)
+record McpRegistryCancelResult(
+    /** True when the cancel stopped a running search. False for unknown or reclaimed IDs, completed or canceled searches, and unused reservations. The cancel releases an unused reservation. */
+    @JsonProperty("canceled") Boolean canceled
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpRegistryRequestIdResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpRegistryRequestIdResult.java
new file mode 100644
index 0000000000..53234b3598
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpRegistryRequestIdResult.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 javax.annotation.processing.Generated;
+
+/**
+ * Request id naming a cancellable registry search.
+ *
+ * @apiNote This type 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)
+record McpRegistryRequestIdResult(
+    /** Request ID for `mcp.registry.search` and `mcp.registry.cancel`. It serves one search. Allocation can reclaim unused IDs at the 1,024-ID reservation limit. */
+    @JsonProperty("requestId") Long requestId
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpRegistrySearchParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpRegistrySearchParams.java
new file mode 100644
index 0000000000..11a06de374
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpRegistrySearchParams.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 javax.annotation.processing.Generated;
+
+/**
+ * Registry search terms, the credential to search under, and the request id that makes the search cancellable.
+ *
+ * @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)
+record McpRegistrySearchParams(
+    /** Request ID from `mcp.registry.allocateRequestId`. The search refuses unknown, reclaimed, or canceled IDs and IDs that another search or request already uses. */
+    @JsonProperty("requestId") Long requestId,
+    /** The credential the search runs under, carried opaquely. Hosts usually send credential-free `AuthIdentity`; a `token` identity can be resolved only when it embeds a token, while `env` and `gh-cli` identities can use a token embedded in the request first. */
+    @JsonInclude(JsonInclude.Include.ALWAYS)
+    @JsonProperty("authInfo") Object authInfo,
+    /** Free-text query. Omitted or empty asks the registry for its top servers rather than searching. A value that is not a string is refused. */
+    @JsonProperty("query") String query,
+    /** Repository used for the policy lookup, as `owner/name`. The policy selects the registry URL and whether the user token goes to the registry. The registry receives this repository only when the policy entry lists it as required context. A value that is not a string is refused. */
+    @JsonProperty("repository") String repository,
+    /** Maximum number of servers to return. */
+    @JsonProperty("limit") Long limit
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpRegistrySearchResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpRegistrySearchResult.java
new file mode 100644
index 0000000000..2682402d76
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpRegistrySearchResult.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 javax.annotation.processing.Generated;
+
+/**
+ * Servers selected from the registry response.
+ *
+ * @apiNote This type 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)
+record McpRegistrySearchResult(
+    /** The server objects, carried opaquely. The runtime follows pages, keeps the newest entry per server name, cuts the list to `limit`, and sorts an empty-query result by GitHub stars. Each server object remains unchanged because the registry owns that shape. */
+    @JsonProperty("servers") Object servers
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpServer.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpServer.java
index f2917ced22..9b93d39830 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpServer.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpServer.java
@@ -27,6 +27,8 @@ public record McpServer(
     @JsonProperty("status") McpServerStatus status,
     /** Configuration source: user, workspace, plugin, builtin, or managed */
     @JsonProperty("source") McpServerSource source,
+    /** Configured URL for an HTTP/SSE server, regardless of configuration source. Omitted for local and in-memory servers. */
+    @JsonProperty("url") String url,
     /** Plugin name that provided this server, when source is plugin. */
     @JsonProperty("sourcePlugin") String sourcePlugin,
     /** Plugin version that provided this server, when source is plugin. */
@@ -63,6 +65,6 @@ public McpServer(
         String error,
         McpServerMetadata serverMetadata
     ) {
-        this(name, status, source, sourcePlugin, sourcePluginVersion, displayName, error, serverMetadata, null);
+        this(name, status, source, null, sourcePlugin, sourcePluginVersion, displayName, error, serverMetadata, null);
     }
 }
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpServerSource.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpServerSource.java
index 72b1503d59..0902ef8812 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpServerSource.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpServerSource.java
@@ -10,7 +10,7 @@
 import javax.annotation.processing.Generated;
 
 /**
- * Configuration source: user, workspace, plugin, builtin, or managed
+ * Configuration source: user, workspace, plugin, builtin, managed, or account
  *
  * @since 1.0.0
  */
@@ -25,7 +25,9 @@ public enum McpServerSource {
     /** The {@code builtin} variant. */
     BUILTIN("builtin"),
     /** The {@code managed} variant. */
-    MANAGED("managed");
+    MANAGED("managed"),
+    /** The {@code account} variant. */
+    ACCOUNT("account");
 
     private final String value;
     McpServerSource(String value) { this.value = value; }
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpShouldExcludeGitHubToolsParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpShouldExcludeGitHubToolsParams.java
new file mode 100644
index 0000000000..bb435663bf
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpShouldExcludeGitHubToolsParams.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.List;
+import javax.annotation.processing.Generated;
+
+/**
+ * The session tool filters that decide whether the session still has a shell to run `gh` with.
+ *
+ * @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)
+record McpShouldExcludeGitHubToolsParams(
+    /** The session's tool allowlist, when it set one. Omitted means the session constrains nothing this way. */
+    @JsonProperty("availableTools") List<String> availableTools,
+    /** The session's tool denylist, when it set one. Omitted means the session constrains nothing this way. */
+    @JsonProperty("excludedTools") List<String> excludedTools,
+    /** How the allowlist and denylist combine when both are set. Omitted means the default every session gets, so a caller that never chose a precedence is answered as its sessions behave. */
+    @JsonProperty("toolFilterPrecedence") OptionsUpdateToolFilterPrecedence toolFilterPrecedence
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpShouldExcludeGitHubToolsResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpShouldExcludeGitHubToolsResult.java
new file mode 100644
index 0000000000..05f92ab309
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/McpShouldExcludeGitHubToolsResult.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 javax.annotation.processing.Generated;
+
+/**
+ * Whether the gh-replaceable GitHub MCP tools may be clipped for the session described by the request.
+ *
+ * @apiNote This type 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)
+record McpShouldExcludeGitHubToolsResult(
+    /** True only when both halves hold: the session's filters still reach the platform shell tool, and the host actually has the `gh` those tools would be replaced by. Feed it straight back as the `excludeGhReplaceableTools` build option. */
+    @JsonProperty("excludeGhReplaceableTools") Boolean excludeGhReplaceableTools
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/Model.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/Model.java
index 81ffc46a36..63fbd2937a 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/Model.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/Model.java
@@ -31,6 +31,8 @@ public record Model(
     @JsonProperty("capabilities") ModelCapabilities capabilities,
     /** Provider-supplied model metadata. Keys and JSON-compatible values are preserved unchanged. This is factual metadata published by the model provider; it carries no picker or UX semantics. */
     @JsonProperty("metadata") Map<String, Object> metadata,
+    /** Model vendor as the Copilot API reports it, for example "Anthropic" or "Azure OpenAI". Open vocabulary, passed through unchanged. It can name the vendor that serves the model instead of the one that built it, or a label that is not a vendor, such as "Experimental". Absent when the Copilot API reports no vendor. */
+    @JsonProperty("vendor") String vendor,
     /** Policy state (if applicable) */
     @JsonProperty("policy") ModelPolicy policy,
     /** Billing information */
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelClearStartupSeedResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelClearStartupSeedResult.java
new file mode 100644
index 0000000000..d905811186
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ModelClearStartupSeedResult.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;
+
+/**
+ * Data type {@code ModelClearStartupSeedResult}.
+ *
+ * @apiNote This type 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)
+record ModelClearStartupSeedResult(
+    @JsonProperty("cleared") Boolean cleared
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PendingExternalToolRequest.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PendingExternalToolRequest.java
new file mode 100644
index 0000000000..6529827e05
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PendingExternalToolRequest.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;
+
+/**
+ * External tool call of the session or one of its sub-agents that is still waiting for session.tools.handlePendingToolCall.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record PendingExternalToolRequest(
+    /** Request ID to pass to session.tools.handlePendingToolCall */
+    @JsonProperty("requestId") String requestId,
+    /** Tool call ID assigned to this external tool invocation */
+    @JsonProperty("toolCallId") String toolCallId,
+    /** Name of the external tool to invoke */
+    @JsonProperty("toolName") String toolName,
+    /** Arguments to pass to the external tool */
+    @JsonProperty("arguments") Object arguments,
+    /** Stable identity of the provider that offered the tool, for hosts that route extension-owned tools by provider */
+    @JsonProperty("providerId") String providerId,
+    /** Sub-agent instance identifier (the envelope agentId of its events) of the agent that issued the call; absent for calls issued by the root agent */
+    @JsonProperty("agentId") String agentId
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionRecoveryData.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionRecoveryData.java
index e4c502116d..990349ebaf 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionRecoveryData.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionRecoveryData.java
@@ -24,6 +24,10 @@
 public record PermissionRecoveryData(
     /** Stable identifier shared by every transition in this recovery episode */
     @JsonProperty("episodeId") String episodeId,
+    /** Root or child execution-session identifier that owns this recovery episode; omitted for legacy snapshots */
+    @JsonProperty("ownerSessionId") String ownerSessionId,
+    /** Subagent identifier that owns this recovery episode when the request was delegated through a parent permission service */
+    @JsonProperty("ownerAgentId") String ownerAgentId,
     /** Current lifecycle state of the recovery episode */
     @JsonProperty("status") PermissionRecoveryStatus status,
     /** Policy selected from the current client's response capability; mode or client changes may update it during recovery */
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionsEvaluateManagedPolicyParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionsEvaluateManagedPolicyParams.java
new file mode 100644
index 0000000000..65a15a044e
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionsEvaluateManagedPolicyParams.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 verbatim managed `permissions` slice to interpret.
+ *
+ * @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)
+record PermissionsEvaluateManagedPolicyParams(
+    /** The `permissions` object from a managed settings layer, for example `{"disableBypassPermissionsMode":"disable"}`. Omitted or null means no managed policy applies. */
+    @JsonProperty("permissions") Object permissions
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionsEvaluateManagedPolicyResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionsEvaluateManagedPolicyResult.java
new file mode 100644
index 0000000000..2690dad76f
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionsEvaluateManagedPolicyResult.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;
+
+/**
+ * The policy questions a host asks before granting elevated permissions.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record PermissionsEvaluateManagedPolicyResult(
+    /** True when managed policy forbids bypass-permissions mode, so allow-all style flags must not take effect. */
+    @JsonProperty("bypassPermissionsDisabled") Boolean bypassPermissionsDisabled,
+    /** True when a managed policy exists but this build could not determine its meaning. Hosts fail closed on it rather than assuming permission was granted. */
+    @JsonProperty("policyUndetermined") Boolean policyUndetermined,
+    /** True when the managed layer supplies permission rules that the session must enforce. */
+    @JsonProperty("permissionRulesActive") Boolean permissionRulesActive
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionsFolderTrustCheckTrustParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionsFolderTrustCheckTrustParams.java
new file mode 100644
index 0000000000..5fadba2eec
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PermissionsFolderTrustCheckTrustParams.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;
+
+/**
+ * A folder to check against a persisted trusted-folders list, and the configuration directory holding that list.
+ *
+ * @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)
+record PermissionsFolderTrustCheckTrustParams(
+    /** Folder to check. A folder counts as trusted when it is itself listed, when an ancestor is listed, or when its git root is listed. */
+    @JsonProperty("path") String path,
+    /** Configuration directory to read the trusted-folders list from. Omit it to read the default location; supply it when the host has redirected its configuration, or the check answers from a list the host is not using. */
+    @JsonProperty("configDir") String configDir
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PersistenceWriteRawJsonLockedParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PersistenceWriteRawJsonLockedParams.java
new file mode 100644
index 0000000000..eff9c61d51
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PersistenceWriteRawJsonLockedParams.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 complete JSON snapshot to write under the runtime's per-path file lock.
+ *
+ * @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)
+record PersistenceWriteRawJsonLockedParams(
+    /** Absolute path of the file to replace. Parent directories are created when missing. */
+    @JsonProperty("path") String path,
+    /** The serialized JSON document to write. It replaces the file's contents entirely; nothing is merged. */
+    @JsonProperty("dataJson") String dataJson,
+    /** Comment lines to emit above the document, for a format that tolerates them. Omit for strict JSON. */
+    @JsonProperty("fileHeader") String fileHeader
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PersistenceWriteRawJsonLockedResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PersistenceWriteRawJsonLockedResult.java
new file mode 100644
index 0000000000..5f8616d042
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/PersistenceWriteRawJsonLockedResult.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;
+
+/**
+ * The outcome of a locked snapshot write.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record PersistenceWriteRawJsonLockedResult(
+    /** Whether the file now holds the requested contents. */
+    @JsonProperty("success") Boolean success,
+    /** Why the write failed. Absent when `success` is true. A lock the runtime could not acquire in time reports here rather than raising. */
+    @JsonProperty("error") String error
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderMonthlyUsage.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderMonthlyUsage.java
new file mode 100644
index 0000000000..355f7e38f0
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderMonthlyUsage.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 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;
+
+/**
+ * An authoritative monthly usage reading for the observation's provider, account, and service.
+ *
+ * @apiNote This type 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 ProviderMonthlyUsage(
+    /** Availability of monthly consumption. Missing or unavailable usage must never be interpreted as zero. */
+    @JsonProperty("state") ProviderMonthlyUsageState state,
+    /** Unit of consumedQuantity; independent of the parent observation's balance unit. */
+    @JsonProperty("unit") ProviderQuotaUnit unit,
+    /** Identity scope of the reading within its provider and service. */
+    @JsonProperty("scope") ProviderMonthlyUsageScope scope,
+    /** Nonnegative finite consumption reported by the service, preserving zero and fractions. Present only when state is available; never computed from tokens or balance differences. */
+    @JsonProperty("consumedQuantity") Double consumedQuantity,
+    /** Service read time in UTC RFC 3339, not a ledger reconciliation watermark or confirmation of the latest inference charge. */
+    @JsonProperty("queriedAt") String queriedAt,
+    /** Start of the service-reported monthly billing cycle, in UTC RFC 3339. */
+    @JsonProperty("cycleStart") String cycleStart,
+    /** End of the service-reported monthly billing cycle, in UTC RFC 3339. */
+    @JsonProperty("resetOn") String resetOn
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderMonthlyUsageScope.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderMonthlyUsageScope.java
new file mode 100644
index 0000000000..56d9b4dd38
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderMonthlyUsageScope.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;
+
+/**
+ * Identity scope of a monthly usage reading.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum ProviderMonthlyUsageScope {
+    /** The {@code user} variant. */
+    USER("user"),
+    /** The {@code unknown} variant. */
+    UNKNOWN("unknown");
+
+    private final String value;
+    ProviderMonthlyUsageScope(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static ProviderMonthlyUsageScope fromValue(String value) {
+        for (ProviderMonthlyUsageScope v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown ProviderMonthlyUsageScope value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderMonthlyUsageState.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderMonthlyUsageState.java
new file mode 100644
index 0000000000..7788fbc219
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderMonthlyUsageState.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;
+
+/**
+ * Availability of a service's monthly consumption reading.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum ProviderMonthlyUsageState {
+    /** The {@code available} variant. */
+    AVAILABLE("available"),
+    /** The {@code no_policy} variant. */
+    NO_POLICY("no_policy"),
+    /** The {@code unavailable} variant. */
+    UNAVAILABLE("unavailable"),
+    /** The {@code unknown} variant. */
+    UNKNOWN("unknown");
+
+    private final String value;
+    ProviderMonthlyUsageState(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static ProviderMonthlyUsageState fromValue(String value) {
+        for (ProviderMonthlyUsageState v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown ProviderMonthlyUsageState value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderQuotaAccessState.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderQuotaAccessState.java
new file mode 100644
index 0000000000..d567cb75b3
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderQuotaAccessState.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;
+
+/**
+ * Access policy reported by the quota service.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum ProviderQuotaAccessState {
+    /** The {@code allowed} variant. */
+    ALLOWED("allowed"),
+    /** The {@code denied} variant. */
+    DENIED("denied"),
+    /** The {@code not_required} variant. */
+    NOT_REQUIRED("not_required"),
+    /** The {@code unknown} variant. */
+    UNKNOWN("unknown"),
+    /** The {@code unavailable} variant. */
+    UNAVAILABLE("unavailable");
+
+    private final String value;
+    ProviderQuotaAccessState(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static ProviderQuotaAccessState fromValue(String value) {
+        for (ProviderQuotaAccessState v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown ProviderQuotaAccessState value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderQuotaAcquisitionStatus.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderQuotaAcquisitionStatus.java
new file mode 100644
index 0000000000..575227472b
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderQuotaAcquisitionStatus.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;
+
+/**
+ * Acquisition state, independent of the service's business access/capacity verdict.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum ProviderQuotaAcquisitionStatus {
+    /** The {@code succeeded} variant. */
+    SUCCEEDED("succeeded"),
+    /** The {@code unavailable} variant. */
+    UNAVAILABLE("unavailable"),
+    /** The {@code failed} variant. */
+    FAILED("failed");
+
+    private final String value;
+    ProviderQuotaAcquisitionStatus(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static ProviderQuotaAcquisitionStatus fromValue(String value) {
+        for (ProviderQuotaAcquisitionStatus v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown ProviderQuotaAcquisitionStatus value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderQuotaBudgetMetadata.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderQuotaBudgetMetadata.java
new file mode 100644
index 0000000000..2697dbdf48
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderQuotaBudgetMetadata.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 com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * Authoritative budget measurements and policy metadata, independent of provider.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record ProviderQuotaBudgetMetadata(
+    /** Whether the budget has unlimited entitlement. */
+    @JsonProperty("unlimited") Boolean unlimited,
+    /** Exact budget entitlement, retaining incumbent fractional-unit compatibility. */
+    @JsonProperty("entitlement") Double entitlement,
+    /** Exact measured consumption in the budget's unit. */
+    @JsonProperty("consumed") Double consumed,
+    /** Service-reported remaining percentage for authoritative budget presentation. */
+    @JsonProperty("remainingPercentage") Double remainingPercentage,
+    /** Whether service policy allows continued usage after exhaustion. */
+    @JsonProperty("usageAllowedWhenExhausted") Boolean usageAllowedWhenExhausted,
+    /** Usage beyond entitlement, in the budget's unit. */
+    @JsonProperty("overage") Double overage,
+    /** Whether additional usage is allowed when the budget is exhausted. */
+    @JsonProperty("overageAllowedWhenExhausted") Boolean overageAllowedWhenExhausted,
+    /** Reset instant in epoch milliseconds when this budget actually defines a window. */
+    @JsonProperty("resetAtEpochMs") Double resetAtEpochMs,
+    /** Whether the reset instant is an estimate. */
+    @JsonProperty("resetEstimated") Boolean resetEstimated,
+    /** Whether this budget uses token-based billing. */
+    @JsonProperty("tokenBasedBilling") Boolean tokenBasedBilling,
+    /** Optional additional-usage budget cap. */
+    @JsonProperty("overageLimit") Double overageLimit
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderQuotaCapacityState.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderQuotaCapacityState.java
new file mode 100644
index 0000000000..45e9bf6a98
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderQuotaCapacityState.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;
+
+/**
+ * Capacity is independent of whether a numeric balance was supplied.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum ProviderQuotaCapacityState {
+    /** The {@code available} variant. */
+    AVAILABLE("available"),
+    /** The {@code exhausted} variant. */
+    EXHAUSTED("exhausted"),
+    /** The {@code unlimited} variant. */
+    UNLIMITED("unlimited"),
+    /** The {@code not_required} variant. */
+    NOT_REQUIRED("not_required"),
+    /** The {@code not_applicable} variant. */
+    NOT_APPLICABLE("not_applicable"),
+    /** The {@code unknown} variant. */
+    UNKNOWN("unknown"),
+    /** The {@code unavailable} variant. */
+    UNAVAILABLE("unavailable");
+
+    private final String value;
+    ProviderQuotaCapacityState(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static ProviderQuotaCapacityState fromValue(String value) {
+        for (ProviderQuotaCapacityState v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown ProviderQuotaCapacityState value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderQuotaObservationKind.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderQuotaObservationKind.java
new file mode 100644
index 0000000000..ca1406ed70
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderQuotaObservationKind.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;
+
+/**
+ * Timing and purpose of a provider quota observation.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum ProviderQuotaObservationKind {
+    /** The {@code account_snapshot} variant. */
+    ACCOUNT_SNAPSHOT("account_snapshot"),
+    /** The {@code admission_state} variant. */
+    ADMISSION_STATE("admission_state");
+
+    private final String value;
+    ProviderQuotaObservationKind(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static ProviderQuotaObservationKind fromValue(String value) {
+        for (ProviderQuotaObservationKind v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown ProviderQuotaObservationKind value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderQuotaQuantityKind.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderQuotaQuantityKind.java
new file mode 100644
index 0000000000..1282854ba8
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderQuotaQuantityKind.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;
+
+/**
+ * Interpretation permitted for independently reported quantities.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum ProviderQuotaQuantityKind {
+    /** The {@code authoritative_budget} variant. */
+    AUTHORITATIVE_BUDGET("authoritative_budget"),
+    /** The {@code advisory_balance} variant. */
+    ADVISORY_BALANCE("advisory_balance"),
+    /** The {@code none} variant. */
+    NONE("none");
+
+    private final String value;
+    ProviderQuotaQuantityKind(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static ProviderQuotaQuantityKind fromValue(String value) {
+        for (ProviderQuotaQuantityKind v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown ProviderQuotaQuantityKind value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderQuotaState.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderQuotaState.java
new file mode 100644
index 0000000000..5473712f9c
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderQuotaState.java
@@ -0,0 +1,69 @@
+/*---------------------------------------------------------------------------------------------
+ *  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;
+
+/**
+ * An account quota reading. Absence of a quantity is unknown, never zero.
+ *
+ * @apiNote This type 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 ProviderQuotaState(
+    /** Provider/account whose service reported this state. */
+    @JsonProperty("provider") ModelProviderRef provider,
+    /** Service-owned quota identifier within this provider. */
+    @JsonProperty("quotaId") String quotaId,
+    /** Unit of entitledQuantity and availableQuantity. */
+    @JsonProperty("unit") ProviderQuotaUnit unit,
+    /** Whether the service permits access, independently of balance. */
+    @JsonProperty("accessState") ProviderQuotaAccessState accessState,
+    /** Service capacity state; missing quantities do not imply exhaustion. */
+    @JsonProperty("capacityState") ProviderQuotaCapacityState capacityState,
+    /** Whether this is a GET account reading or a pre-response admission observation. Observations are never merged across kinds. */
+    @JsonProperty("observationKind") ProviderQuotaObservationKind observationKind,
+    /** Whether quantities are authoritative budget measurements, advisory balances, or absent. Only authoritative budgets support percentage presentation. */
+    @JsonProperty("quantityKind") ProviderQuotaQuantityKind quantityKind,
+    /** Acquisition outcome. Unavailable/failed readings have no service verdict; access/capacity unavailable are compatibility placeholders only. */
+    @JsonProperty("acquisitionStatus") ProviderQuotaAcquisitionStatus acquisitionStatus,
+    /** When the runtime observed this reading, not a charge timestamp or guarantee that consumption has settled. */
+    @JsonProperty("observedAt") String observedAt,
+    /** HTTP status from acquisition, when available. */
+    @JsonProperty("httpStatus") Long httpStatus,
+    /** Service error code or client acquisition category, separate from the business-state reason. */
+    @JsonProperty("acquisitionError") String acquisitionError,
+    /** Optional metadata for an authoritative budget. Advisory balances and admission-only observations do not populate this. */
+    @JsonProperty("budgetMetadata") ProviderQuotaBudgetMetadata budgetMetadata,
+    /** Service-reported monthly consumption, independent of quota balances and per-call or session cost. Omitted when the service does not report monthly usage. */
+    @JsonProperty("monthlyUsage") ProviderMonthlyUsage monthlyUsage,
+    /** Key for the backwards-compatible snapshots projection, when the authoritative budget supports that contract. */
+    @JsonProperty("compatibilityKey") String compatibilityKey,
+    /** Explicit service admission flag, when reported. */
+    @JsonProperty("hasQuota") Boolean hasQuota,
+    /** Independently reported signed 64-bit entitlement. -1 is an unlimited sentinel, not a capacity-state rewrite; omission and null are preserved. */
+    @JsonProperty("entitledQuantity") Long entitledQuantity,
+    /** Independently reported signed 64-bit available quantity. Zero does not override the service access/capacity verdict; omission and null are preserved. */
+    @JsonProperty("availableQuantity") Long availableQuantity,
+    /** Service-reported explanation for the state. */
+    @JsonProperty("reason") String reason,
+    /** Service-reported quota source. */
+    @JsonProperty("source") String source,
+    /** Service name owning this reading. */
+    @JsonProperty("service") String service
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderQuotaUnit.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderQuotaUnit.java
new file mode 100644
index 0000000000..9c9e7f3d3e
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ProviderQuotaUnit.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;
+
+/**
+ * Units explicitly reported by a quota provider.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum ProviderQuotaUnit {
+    /** The {@code ai_credits} variant. */
+    AI_CREDITS("ai_credits"),
+    /** The {@code requests} variant. */
+    REQUESTS("requests"),
+    /** The {@code tokens} variant. */
+    TOKENS("tokens"),
+    /** The {@code unknown} variant. */
+    UNKNOWN("unknown");
+
+    private final String value;
+    ProviderQuotaUnit(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static ProviderQuotaUnit fromValue(String value) {
+        for (ProviderQuotaUnit v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown ProviderQuotaUnit value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/QuotaWarningProjection.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/QuotaWarningProjection.java
new file mode 100644
index 0000000000..dad4961084
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/QuotaWarningProjection.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;
+
+/**
+ * A pending session quota warning, consumed once by takeWarnings.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record QuotaWarningProjection(
+    /** Existing warning category. */
+    @JsonProperty("warningType") String warningType,
+    /** User-facing warning text. */
+    @JsonProperty("message") String message,
+    /** Related account or upgrade link. */
+    @JsonProperty("url") String url
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/RemediationAction.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/RemediationAction.java
index 50f6256352..2da0b13624 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/RemediationAction.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/RemediationAction.java
@@ -25,7 +25,9 @@ public enum RemediationAction {
     /** The {@code review_sandbox_policy} variant. */
     REVIEW_SANDBOX_POLICY("review_sandbox_policy"),
     /** The {@code allow_sandbox_outbound} variant. */
-    ALLOW_SANDBOX_OUTBOUND("allow_sandbox_outbound");
+    ALLOW_SANDBOX_OUTBOUND("allow_sandbox_outbound"),
+    /** The {@code rewind_conversation} variant. */
+    REWIND_CONVERSATION("rewind_conversation");
 
     private final String value;
     RemediationAction(String value) { this.value = value; }
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/RepoSettingsEditParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/RepoSettingsEditParams.java
new file mode 100644
index 0000000000..c871a3aed7
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/RepoSettingsEditParams.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;
+
+/**
+ * One atomic edit of an allowed top-level repository setting.
+ *
+ * @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)
+record RepoSettingsEditParams(
+    /** Absolute path of the repository root. */
+    @JsonProperty("repoRoot") String repoRoot,
+    /** Shared or local repository settings file. */
+    @JsonProperty("scope") RepoSettingsEditScope scope,
+    /** One canonical top-level repository setting that the allowlist permits. */
+    @JsonProperty("key") String key,
+    /** Set a scalar, add or remove a string list item, or remove the setting. The handler rejects a missing or incompatible value. */
+    @JsonProperty("operation") SettingsEditOperation operation,
+    /** Required boolean, string or number for set, required string for add-item and remove-item, and forbidden for remove. The runtime rejects all other JSON values. */
+    @JsonProperty("value") Object value
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/RepoSettingsEditScope.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/RepoSettingsEditScope.java
new file mode 100644
index 0000000000..43b64573d5
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/RepoSettingsEditScope.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.github.copilot.CopilotExperimental;
+import javax.annotation.processing.Generated;
+
+/**
+ * Which repository settings file to edit.
+ *
+ * @apiNote This type is experimental and may change in a future version.
+ *
+ * @since 1.0.0
+ */
+@CopilotExperimental
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+enum RepoSettingsEditScope {
+    /** The {@code repo} variant. */
+    REPO("repo"),
+    /** The {@code local} variant. */
+    LOCAL("local");
+
+    private final String value;
+    RepoSettingsEditScope(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static RepoSettingsEditScope fromValue(String value) {
+        for (RepoSettingsEditScope v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown RepoSettingsEditScope value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/RepoSettingsReadRawParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/RepoSettingsReadRawParams.java
new file mode 100644
index 0000000000..40d25ea68c
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/RepoSettingsReadRawParams.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;
+
+/**
+ * Which repository settings file to read.
+ *
+ * @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)
+record RepoSettingsReadRawParams(
+    /** Absolute path of the repository root. */
+    @JsonProperty("repoRoot") String repoRoot,
+    /** Use repo for shared settings or local for settings.local.json. Other scopes are rejected. */
+    @JsonProperty("scope") String scope
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/RepoSettingsReadRawResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/RepoSettingsReadRawResult.java
new file mode 100644
index 0000000000..65d5884033
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/RepoSettingsReadRawResult.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;
+
+/**
+ * Parsed repository settings without normalization or layering.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record RepoSettingsReadRawResult(
+    /** Stored JSON values after the existing JSONC parser and prototype-safety checks. Empty when the file is missing, blank, or invalid. */
+    @JsonProperty("config") Object config,
+    /** True when the file exists but did not parse, so `config` is empty for that reason rather than because nothing is set. */
+    @JsonProperty("invalid") Boolean invalid
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/RepoSettingsWriteAllParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/RepoSettingsWriteAllParams.java
new file mode 100644
index 0000000000..8b94ff9be4
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/RepoSettingsWriteAllParams.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 javax.annotation.processing.Generated;
+
+/**
+ * The complete set of repository-overridable settings to store.
+ *
+ * @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)
+record RepoSettingsWriteAllParams(
+    /** Absolute path of the repository root. */
+    @JsonProperty("repoRoot") String repoRoot,
+    /** Use repo for shared settings or local for settings.local.json. Other scopes are rejected. */
+    @JsonProperty("scope") String scope,
+    /** Object of allowed settings to store. Missing allowlisted keys are removed. Other input keys are ignored, while unknown stored keys are preserved. */
+    @JsonInclude(JsonInclude.Include.ALWAYS)
+    @JsonProperty("settings") Object settings
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/RepoSettingsWriteKeyParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/RepoSettingsWriteKeyParams.java
new file mode 100644
index 0000000000..24bc205bc3
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/RepoSettingsWriteKeyParams.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;
+
+/**
+ * One key to write or remove in a repository settings file.
+ *
+ * @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)
+record RepoSettingsWriteKeyParams(
+    /** Absolute path of the repository root. */
+    @JsonProperty("repoRoot") String repoRoot,
+    /** Use repo for shared settings or local for settings.local.json. Other scopes are rejected. */
+    @JsonProperty("scope") String scope,
+    /** Canonical top-level key permitted by the repository settings allowlist. */
+    @JsonProperty("key") String key,
+    /** Value to validate and write. Required unless delete is true; a null value is validated, not treated as deletion. */
+    @JsonProperty("value") Object value,
+    /** True to remove the key instead of writing it. */
+    @JsonProperty("delete") Boolean delete
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxCheckEnforcementCommandParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxCheckEnforcementCommandParams.java
new file mode 100644
index 0000000000..b7401231f7
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxCheckEnforcementCommandParams.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;
+
+/**
+ * One slash command, as typed, to test against the enforcement-block allowlist.
+ *
+ * @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)
+record SandboxCheckEnforcementCommandParams(
+    /** The command name as the user typed it, with or without its leading slash. */
+    @JsonProperty("commandName") String commandName,
+    /** The command's arguments, in order. Pass an empty array for a bare command: several entries in the allowlist admit the bare form and refuse every argument. */
+    @JsonProperty("args") List<String> args
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxCredentialSuggestion.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxCredentialSuggestion.java
new file mode 100644
index 0000000000..927dcdf5e9
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxCredentialSuggestion.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 java.util.List;
+import javax.annotation.processing.Generated;
+
+/**
+ * A possible secret-bearing environment variable and optional locally suggested HTTPS injection hosts. This is a draft for user review, not an active grant.
+ *
+ * @apiNote This type 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 SandboxCredentialSuggestion(
+    /** Environment variable name. The secret value is never returned. */
+    @JsonProperty("name") String name,
+    /** HTTPS hostnames suggested by a local known-provider mapping. An empty list requires the user to supply injection hosts before adding a masking entry. These suggestions do not allow network access. */
+    @JsonProperty("suggestedInjectHosts") List<String> suggestedInjectHosts
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxDocsUrlResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxDocsUrlResult.java
new file mode 100644
index 0000000000..bb2ed5c1a2
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxDocsUrlResult.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;
+
+/**
+ * The documentation URL a host cites when it declines or downgrades a sandbox setting.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record SandboxDocsUrlResult(
+    /** Documentation URL describing the sandbox and the settings that control it. */
+    @JsonProperty("url") String url
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxEffectiveForOptionalResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxEffectiveForOptionalResult.java
new file mode 100644
index 0000000000..2336d4f195
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxEffectiveForOptionalResult.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;
+
+/**
+ * The sandbox a named feature actually launches under.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record SandboxEffectiveForOptionalResult(
+    /** The effective sandbox config for the requested feature, or a disabled sandbox when the feature is routed out of it. */
+    @JsonProperty("sandboxJson") Object sandboxJson
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxFilterPickerCandidatesParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxFilterPickerCandidatesParams.java
new file mode 100644
index 0000000000..663040c87e
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxFilterPickerCandidatesParams.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.List;
+import javax.annotation.processing.Generated;
+
+/**
+ * A batch of file-picker candidates to check against a prepared policy.
+ *
+ * @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)
+record SandboxFilterPickerCandidatesParams(
+    /** The candidates to check, in the order the answers are returned. */
+    @JsonProperty("candidates") List<SandboxPickerCandidate> candidates,
+    /** The session's working directory, matching the one the policy was prepared from. */
+    @JsonProperty("cwd") String cwd,
+    /** The policy returned by `sandbox.preparePickerPolicy`. Omitted keeps every candidate. */
+    @JsonProperty("sandbox") Object sandbox
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxFilterPickerCandidatesResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxFilterPickerCandidatesResult.java
new file mode 100644
index 0000000000..cbf29a25f3
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxFilterPickerCandidatesResult.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 java.util.List;
+import javax.annotation.processing.Generated;
+
+/**
+ * Per-candidate allow decisions, positionally aligned with the request.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record SandboxFilterPickerCandidatesResult(
+    /** One decision per candidate, in the same order. Always the same length as the request's `candidates`. */
+    @JsonProperty("allowed") List<Boolean> allowed
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxGetUnsupportedStartupNoticeParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxGetUnsupportedStartupNoticeParams.java
new file mode 100644
index 0000000000..c082b52e7d
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxGetUnsupportedStartupNoticeParams.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;
+
+/**
+ * The managed sandbox policy in force, which selects which remedy the notice offers.
+ *
+ * @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)
+record SandboxGetUnsupportedStartupNoticeParams(
+    /** The managed `sandbox` slice, when a policy supplies one. The notice treats the sandbox as enforced only when this both enables it and sets `failIfUnavailable`, because a managed sandbox that tolerates being unavailable still leaves the user able to turn it off. */
+    @JsonProperty("managedSandbox") Object managedSandbox,
+    /** True when the sandbox stayed on only because the managed policy could not be determined. Distinguishes a policy that positively enforces the sandbox from one that merely failed to resolve, which is the difference between telling the user to contact an administrator and telling them to wait. Defaults to false. */
+    @JsonProperty("enabledByUndeterminedPolicy") Boolean enabledByUndeterminedPolicy
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxHostCapability.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxHostCapability.java
index e3efc94513..2c4925f402 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxHostCapability.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxHostCapability.java
@@ -21,7 +21,7 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record SandboxHostCapability(
-    /** The policy feature, as an extensible string: ignore names you do not recognize. Known values: `network` (sandboxed commands can reach the network; on Linux this needs the tooling for Bubblewrap's private network namespace, such as slirp4netns), `network_filtering` (host rules and the sandbox proxy; on Linux this needs the same tooling as `network`; on Windows it needs Process Security Environment 1.1 host-loopback support, and a policy that uses it must also set `network.allowLocalNetwork`), `denied_paths` (native enforcement of `filesystem.deniedPaths`), `shell` (shell commands inside the sandbox), and `filesystem_enumeration` (enumerate-only filesystem grants; on Windows this needs Process Security Environment 1.1 filesystem enumeration support, and without it sandboxed PowerShell still runs but cannot resolve its current location; other platforms always report it). */
+    /** The policy feature, as an extensible string: ignore names you do not recognize. Known values: `network` (sandboxed commands can reach the network; on Linux this needs the tooling for Bubblewrap's private network namespace, such as slirp4netns), `network_filtering` (host rules and the sandbox proxy; on Linux this needs the same tooling as `network`; on Windows it needs Process Security Environment 1.1 host-loopback support or MXC's PSEC 1.0-only proxy-loopback compatibility capability, and a policy that uses it must also set `network.allowLocalNetwork`; compatibility applies only to an explicit identity-less runtime proxy, not general host-loopback access, and other policy restrictions still apply), `denied_paths` (native enforcement of `filesystem.deniedPaths`), `shell` (shell commands inside the sandbox), and `filesystem_enumeration` (enumerate-only filesystem grants; on Windows this needs Process Security Environment 1.1 filesystem enumeration support, and without it sandboxed PowerShell still runs but cannot resolve its current location; other platforms always report it). */
     @JsonProperty("name") String name,
     /** Whether this host can run the feature. */
     @JsonProperty("supported") Boolean supported,
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxPickerCandidate.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxPickerCandidate.java
new file mode 100644
index 0000000000..f3c7712a82
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxPickerCandidate.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;
+
+/**
+ * One file-picker suggestion offered up for the sandbox filesystem check.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record SandboxPickerCandidate(
+    /** Absolute path the suggestion would attach. */
+    @JsonProperty("path") String path,
+    /** Whether the suggestion is a directory. A directory the policy does not itself allow may still be needed as a waypoint to an allowed subtree. */
+    @JsonProperty("isDirectory") Boolean isDirectory
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxPreparePickerPolicyParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxPreparePickerPolicyParams.java
new file mode 100644
index 0000000000..2895a57e73
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxPreparePickerPolicyParams.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;
+
+/**
+ * The working directory and sandbox settings to build a file-picker policy from.
+ *
+ * @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)
+record SandboxPreparePickerPolicyParams(
+    /** The session's working directory. Git discovery and grant canonicalization are resolved against it. */
+    @JsonProperty("cwd") String cwd,
+    /** The session's resolved `sandbox` slice. Omitted, or disabled, yields no policy and every candidate is kept. */
+    @JsonProperty("sandbox") Object sandbox
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxPreparePickerPolicyResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxPreparePickerPolicyResult.java
new file mode 100644
index 0000000000..07cae03587
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxPreparePickerPolicyResult.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;
+
+/**
+ * The prepared file-picker policy, or none when the sandbox is disabled.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record SandboxPreparePickerPolicyResult(
+    /** The prepared policy to pass back to `sandbox.filterPickerCandidates`. Absent when the sandbox is disabled or absent, in which case filtering keeps every candidate. */
+    @JsonProperty("sandboxJson") Object sandboxJson
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxProxyCaCheckRelevanceParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxProxyCaCheckRelevanceParams.java
new file mode 100644
index 0000000000..6d66db0a30
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxProxyCaCheckRelevanceParams.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 credential hosts that the persistent certificate authority of the sandbox credential proxy must cover. The runtime always adds the hosts from the saved user settings.
+ *
+ * @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 SandboxProxyCaCheckRelevanceParams(
+    /** The sandbox configuration that the host gives its sessions. The runtime reads the credential hosts from `auth` and `credentials`; it ignores `enabled` and the other fields. */
+    @JsonProperty("sandboxConfig") SandboxConfig sandboxConfig
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxProxySecretGetResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxProxySecretGetResult.java
new file mode 100644
index 0000000000..5afa3f89d3
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxProxySecretGetResult.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;
+
+/**
+ * The stored sandbox proxy password, if one is present.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record SandboxProxySecretGetResult(
+    /** The stored password. Absent when no entry exists in either the keychain or the on-disk fallback store. */
+    @JsonProperty("value") String value
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxProxySecretLocation.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxProxySecretLocation.java
new file mode 100644
index 0000000000..d72162ee2e
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxProxySecretLocation.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 this runtime keeps the sandbox proxy password.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record SandboxProxySecretLocation(
+    /** Absolute path of the credential store holding the sandbox proxy password. The proxy password belongs to no MCP server, so it is kept in its own directory rather than in the MCP secret store. */
+    @JsonProperty("configDir") String configDir,
+    /** Identifier of the proxy password entry within that store. Derived from the configuration directory, so two Copilot homes on one machine never share an entry. Use it to recognize a `${secret:…}` reference in stored settings as this runtime's own proxy password. */
+    @JsonProperty("secretId") String secretId
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxProxySecretSaveParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxProxySecretSaveParams.java
new file mode 100644
index 0000000000..610fb09681
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxProxySecretSaveParams.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 sandbox proxy password to store.
+ *
+ * @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)
+record SandboxProxySecretSaveParams(
+    /** The password to store for the sandbox proxy. */
+    @JsonProperty("value") String value
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxProxySecretSaveResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxProxySecretSaveResult.java
new file mode 100644
index 0000000000..543b38083f
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxProxySecretSaveResult.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;
+
+/**
+ * Where the sandbox proxy password was stored.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record SandboxProxySecretSaveResult(
+    /** Whether the OS keychain accepted the value. False means it was written to the on-disk fallback store instead, which is still readable by `sandbox.proxySecret.get`. */
+    @JsonProperty("storedInKeychain") Boolean storedInKeychain
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxResolveFlooredConfigParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxResolveFlooredConfigParams.java
new file mode 100644
index 0000000000..738642fa05
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxResolveFlooredConfigParams.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;
+
+/**
+ * The user's sandbox settings and the managed sandbox floor to raise them to.
+ *
+ * @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)
+record SandboxResolveFlooredConfigParams(
+    /** The user's own `sandbox` settings slice. Omitted when the user has configured none, which still yields the managed floor rather than a disabled sandbox. */
+    @JsonProperty("userSandbox") Object userSandbox,
+    /** The effective managed `sandbox` slice acting as a floor. Omitted when no administrator policy applies, in which case the user's own settings stand unchanged. */
+    @JsonProperty("managedSandbox") Object managedSandbox
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxResolveFlooredConfigResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxResolveFlooredConfigResult.java
new file mode 100644
index 0000000000..043eaaead9
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxResolveFlooredConfigResult.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;
+
+/**
+ * The user's sandbox settings raised to the managed floor.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record SandboxResolveFlooredConfigResult(
+    /** The floored sandbox config, normalized through the declared sandbox shape so only declared fields in a fixed order are present. */
+    @JsonProperty("sandboxJson") Object sandboxJson
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxResolveForOptionalParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxResolveForOptionalParams.java
new file mode 100644
index 0000000000..9a523b274e
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxResolveForOptionalParams.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;
+
+/**
+ * A sandbox config and the per-feature routing flag to resolve it for.
+ *
+ * @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)
+record SandboxResolveForOptionalParams(
+    /** The session's resolved `sandbox` slice. Omitted when the host has none, which yields a disabled sandbox rather than an error. */
+    @JsonProperty("sandbox") Object sandbox,
+    /** The routing flag naming the feature being launched, such as `sandboxMcpServers` or `sandboxLspServers`. */
+    @JsonProperty("routingFlag") String routingFlag
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxSettingsApplyDefaultsParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxSettingsApplyDefaultsParams.java
new file mode 100644
index 0000000000..4b129d0d41
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxSettingsApplyDefaultsParams.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 javax.annotation.processing.Generated;
+
+/**
+ * The stored sandbox settings to resolve against the defaults.
+ *
+ * @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)
+record SandboxSettingsApplyDefaultsParams(
+    /** The sandbox settings as stored in the settings file. An empty object resolves to the defaults alone. */
+    @JsonInclude(JsonInclude.Include.ALWAYS)
+    @JsonProperty("stored") Object stored
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxUnsupportedStartupNoticeResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxUnsupportedStartupNoticeResult.java
new file mode 100644
index 0000000000..2d31660a33
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SandboxUnsupportedStartupNoticeResult.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;
+
+/**
+ * The startup warning, absent when the machine can run a sandbox.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record SandboxUnsupportedStartupNoticeResult(
+    /** The user-facing warning, carrying the platform remedy and the recovery the policy in force actually allows. Absent when this machine supports a sandbox, so a host can call unconditionally and print only what it gets. */
+    @JsonProperty("notice") String notice
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerAccountApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerAccountApi.java
index 0adbf18092..8c25672e33 100644
--- a/java/sdk/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 opaque account selection or compatibility GitHub token used to look up quota.
+     * Gets Copilot quota usage for the current or opaquely selected authenticated user.
      * <p>
      * Invokes the method with no params, applying the runtime defaults.
      *
@@ -41,7 +41,7 @@ public CompletableFuture<AccountGetQuotaResult> getQuota() {
     }
 
     /**
-     * Optional opaque account selection or compatibility GitHub token used to look up quota.
+     * Gets Copilot quota usage for the current or opaquely selected authenticated user.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -52,7 +52,7 @@ public CompletableFuture<AccountGetQuotaResult> getQuota(AccountGetQuotaParams p
     }
 
     /**
-     * Current authentication state
+     * Gets the currently active authentication credentials from the global auth manager.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -63,7 +63,7 @@ public CompletableFuture<AccountGetCurrentAuthResult> getCurrentAuth() {
     }
 
     /**
-     * List of all authenticated users
+     * Gets all authenticated users available for account switching.
      *
      * @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 validate and store. Omit login to resolve the authenticated user from the token.
+     * Validates and stores authentication credentials. When login is omitted, resolves the authenticated user from the token before persistence.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -85,7 +85,7 @@ public CompletableFuture<AccountLoginResult> login(AccountLoginParams params) {
     }
 
     /**
-     * User to log out
+     * Removes user authentication from keychain and persisted state.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -95,4 +95,48 @@ public CompletableFuture<AccountLogoutResult> logout(AccountLogoutParams params)
         return caller.invoke("account.logout", params, AccountLogoutResult.class);
     }
 
+    /**
+     * Renders the sign-in banner and the one-line account description the runtime uses for an authentication identity. The runtime words these in several places for its own callers, so a host that announces a sign-in or an account switch should render them from here rather than composing its own, which would let the two spellings drift apart.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<AccountDescribeAuthInfoResult> describeAuthInfo(AccountDescribeAuthInfoParams params) {
+        return caller.invoke("account.describeAuthInfo", params, AccountDescribeAuthInfoResult.class);
+    }
+
+    /**
+     * Reports whether the supplied identity can create gists. Gists are unavailable on GitHub Enterprise Cloud with data residency, and to Enterprise Managed Users on github.com, so a host that offers gist actions should hide or disable them when this reports no support.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<AccountGetGistSupportResult> getGistSupport(AccountGetGistSupportParams params) {
+        return caller.invoke("account.getGistSupport", params, AccountGetGistSupportResult.class);
+    }
+
+    /**
+     * Resolves a path on the identity's GitHub host into an absolute URL, so a host can link to settings or documentation on the enterprise instance the user is signed in to rather than to github.com. Falls back to the public host when no identity is supplied.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<AccountGetWebUrlResult> getWebUrl(AccountGetWebUrlParams params) {
+        return caller.invoke("account.getWebUrl", params, AccountGetWebUrlResult.class);
+    }
+
+    /**
+     * Names the environment variable supplying a classic personal access token, if one is set. A classic token cannot be upgraded in place, so a host that finds one should tell the user which variable to unset rather than starting an interactive sign-in that the variable would override.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<AccountGetTokenEnvVarResult> getTokenEnvVar() {
+        return caller.invoke("account.getTokenEnvVar", java.util.Map.of(), AccountGetTokenEnvVarResult.class);
+    }
+
 }
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerAgentRegistryApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerAgentRegistryApi.java
index f398fb2dcb..a96ce680d7 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerAgentRegistryApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerAgentRegistryApi.java
@@ -27,7 +27,7 @@ public final class ServerAgentRegistryApi {
     }
 
     /**
-     * Inputs to spawn a managed-server child via the controller's spawn delegate.
+     * Spawns a managed-server child with the supplied configuration and returns a discriminated-union result. The caller (typically the CLI controller) is responsible for attaching to the spawned child and sending any follow-up prompt. When the controller-local spawn gate is closed the server returns JSON-RPC MethodNotFound.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerAgentsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerAgentsApi.java
index 0c621a3624..287c099c93 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerAgentsApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerAgentsApi.java
@@ -8,6 +8,7 @@
 package com.github.copilot.generated.rpc;
 
 import com.github.copilot.CopilotExperimental;
+import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 import javax.annotation.processing.Generated;
 
@@ -27,7 +28,7 @@ public final class ServerAgentsApi {
     }
 
     /**
-     * Optional project paths to include in agent discovery.
+     * Discovers custom agents across user, project, plugin, and remote sources.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -38,7 +39,20 @@ public CompletableFuture<AgentsDiscoverResult> discover(AgentsDiscoverParams par
     }
 
     /**
-     * Optional project paths to include when enumerating agent discovery directories.
+     * Discovers custom agents across user, project, plugin, and remote sources.
+     * <p>
+     * Accepts the extensible request, including inputs added after the params record.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    public CompletableFuture<AgentsDiscoverResult> discover(AgentsDiscoverRequest request) {
+        return caller.invoke("agents.discover", Objects.requireNonNull(request, "request"), AgentsDiscoverResult.class);
+    }
+
+    /**
+     * Returns the canonical directories where a client may create custom agents that the runtime will recognize, including ones that do not exist yet. Project directories become active once created.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -48,4 +62,72 @@ public CompletableFuture<AgentsGetDiscoveryPathsResult> getDiscoveryPaths(Agents
         return caller.invoke("agents.getDiscoveryPaths", params, AgentsGetDiscoveryPathsResult.class);
     }
 
+    /**
+     * Returns the canonical directories where a client may create custom agents that the runtime will recognize, including ones that do not exist yet. Project directories become active once created.
+     * <p>
+     * Accepts the extensible request, including inputs added after the params record.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    public CompletableFuture<AgentsGetDiscoveryPathsResult> getDiscoveryPaths(AgentsGetDiscoveryPathsRequest request) {
+        return caller.invoke("agents.getDiscoveryPaths", Objects.requireNonNull(request, "request"), AgentsGetDiscoveryPathsResult.class);
+    }
+
+    /**
+     * Lists the agents this runtime ships, by name. A consumer separating shipped agents from ones the user or a plugin authored should compare against these names rather than against `AgentInfo.source`: an authored agent may carry the `builtin` source while not being one of these, and the runtime treats the two as separate questions. `disableableNames` is the subset a user may turn off, which a client needs to decide whether to offer a toggle. `yamlBasedNames` is the subset backed by a shipped YAML definition, which a client needs before asking the runtime to load one.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<AgentsGetBuiltinsResult> getBuiltins() {
+        return caller.invoke("agents.getBuiltins", java.util.Map.of(), AgentsGetBuiltinsResult.class);
+    }
+
+    /**
+     * Lists the shipped agents a client should offer right now, filtered by the feature flags it passes. `getBuiltins` names every agent the runtime knows about; some of those are gated, so a client rendering a picker wants this narrower list together with the description to show beside each name.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<AgentsGetAvailableBuiltinsResult> getAvailableBuiltins(AgentsGetAvailableBuiltinsParams params) {
+        return caller.invoke("agents.getAvailableBuiltins", params, AgentsGetAvailableBuiltinsResult.class);
+    }
+
+    /**
+     * Loads one shipped agent's YAML definition, for a client that needs what the agent declares rather than only its name. `getBuiltins` reports which names have a definition to load: a name outside its `yamlBasedNames` is special-cased in code and has none. The definition crosses as its own JSON rather than as contract-typed fields, because the runtime parses it with the agent schema's tolerant shape and re-typing it here would drop the keys that shape accepts and this one does not. The projected `__nativeCustomAgent` view the runtime derives is included, so a caller reading the declared model and a caller rendering the agent see the same definition.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<AgentsGetBuiltinDefinitionResult> getBuiltinDefinition(AgentsGetBuiltinDefinitionParams params) {
+        return caller.invoke("agents.getBuiltinDefinition", params, AgentsGetBuiltinDefinitionResult.class);
+    }
+
+    /**
+     * Projects one shipped agent the way a picker lists it, reading only the metadata at the head of the definition file and stopping before the prompt body. `getBuiltinDefinition` answers the whole definition instead, so a client listing every shipped agent should prefer this one: the cost of a listing grows with the number of agents, and the prompt body is the part a listing never shows. The two also differ in shape. This returns the projected custom agent on its own, whereas `getBuiltinDefinition` returns the authored definition with that projection nested under `__nativeCustomAgent`.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<AgentsGetBuiltinListingDefinitionResult> getBuiltinListingDefinition(AgentsGetBuiltinListingDefinitionParams params) {
+        return caller.invoke("agents.getBuiltinListingDefinition", params, AgentsGetBuiltinListingDefinitionResult.class);
+    }
+
+    /**
+     * Resolves the model a custom agent asks for against the models actually available, and answers both the model to switch to and the warning a user should see when the agent's preference cannot be met. A custom agent may name several acceptable models in preference order, so the decision is a match rather than a lookup, and an agent whose preference is unavailable is a normal outcome that produces a warning rather than an error. A host must call this rather than pick the first available name itself, because the preference order and the wording of the warning are what keep one installation's agent selection the same as another's.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<AgentsCustomAgentInitialModelDecisionResult> customAgentInitialModelDecision(AgentsCustomAgentInitialModelDecisionParams params) {
+        return caller.invoke("agents.customAgentInitialModelDecision", params, AgentsCustomAgentInitialModelDecisionResult.class);
+    }
+
 }
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
index 32e7963e35..f7d7c2fe1b 100644
--- 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
@@ -28,7 +28,7 @@ public final class ServerCatalogApi {
     }
 
     /**
-     * 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.
+     * 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.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -39,7 +39,7 @@ public CompletableFuture<CatalogSearchResult> search(CatalogSearchParams 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.
+     * 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.
      * <p>
      * Accepts the extensible request, including inputs added after the params record.
      *
@@ -52,7 +52,7 @@ public CompletableFuture<CatalogSearchResult> search(CatalogSearchRequest reques
     }
 
     /**
-     * Terminates one retained catalog selection group through an opaque reference previously returned by the model-safe search projection.
+     * Terminates one retained catalog selection group. A selected outcome returns the native host a fresh single-use candidate handle plus the original searchId for a later explicit mcp.planInstall call; non-selected outcomes release the group without producing a planning input. Candidate state, cards, URLs, credentials and private identifiers remain inside the runtime. The model-facing catalog_select tool projects the result separately and never exposes the candidate handle or searchId.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerCommandsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerCommandsApi.java
index efa5317ea4..82c5fad8c4 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerCommandsApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerCommandsApi.java
@@ -27,7 +27,7 @@ public final class ServerCommandsApi {
     }
 
     /**
-     * Slash commands available in the session, after applying any include/exclude filters.
+     * Lists the well-known built-in slash commands that work as the first message in a new session (e.g. /plan, /env), without requiring an active session. Commands that depend on session state, authentication, or a synced session are omitted.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerConnectorsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerConnectorsApi.java
new file mode 100644
index 0000000000..5b74d83721
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerConnectorsApi.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.github.copilot.CopilotExperimental;
+import java.util.concurrent.CompletableFuture;
+import javax.annotation.processing.Generated;
+
+/**
+ * API methods for the {@code connectors} namespace.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public final class ServerConnectorsApi {
+
+    private final RpcCaller caller;
+
+    /** @param caller the RPC transport function */
+    ServerConnectorsApi(RpcCaller caller) {
+        this.caller = caller;
+    }
+
+    /**
+     * Returns feature availability.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    public CompletableFuture<ConnectorsGetCapabilitiesResult> getCapabilities() {
+        return caller.invoke("connectors.getCapabilities", java.util.Map.of(), ConnectorsGetCapabilitiesResult.class);
+    }
+
+    /**
+     * Returns eligible accounts.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    public CompletableFuture<ConnectorsGetAccountsResult> getAccounts() {
+        return caller.invoke("connectors.getAccounts", java.util.Map.of(), ConnectorsGetAccountsResult.class);
+    }
+
+    /**
+     * Lists entries for the selected account.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    public CompletableFuture<ConnectorsListResult> list(ConnectorsListParams params) {
+        return caller.invoke("connectors.list", params, ConnectorsListResult.class);
+    }
+
+    /**
+     * Refreshes entries for the selected account.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    public CompletableFuture<ConnectorsRefreshResult> refresh(ConnectorsRefreshParams params) {
+        return caller.invoke("connectors.refresh", params, ConnectorsRefreshResult.class);
+    }
+
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerEnvironmentsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerEnvironmentsApi.java
index 9d52f2f1ea..a8220ef6fc 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerEnvironmentsApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerEnvironmentsApi.java
@@ -27,7 +27,7 @@ public final class ServerEnvironmentsApi {
     }
 
     /**
-     * Optional discovery filters supported by GitHub Mission Control.
+     * Lists GitHub Mission Control environments visible to the authenticated identity. Does not require a running host and excludes host relay credentials.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -38,7 +38,7 @@ public CompletableFuture<EnvironmentsListResult> list(EnvironmentsListParams par
     }
 
     /**
-     * Identify a Mission Control environment to retrieve.
+     * Gets safe discovery information for a GitHub Mission Control environment without requiring a running host.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -49,7 +49,7 @@ public CompletableFuture<EnvironmentsGetResult> get(EnvironmentsGetParams params
     }
 
     /**
-     * Identify a user-managed Mission Control environment to delete.
+     * Deletes a user-managed GitHub Mission Control environment. GitHub-managed environments cannot be deleted. Does not stop a running host, which may register again.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerExtensionsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerExtensionsApi.java
index 7bc74b441f..385fc3bbc2 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerExtensionsApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerExtensionsApi.java
@@ -27,7 +27,7 @@ public final class ServerExtensionsApi {
     }
 
     /**
-     * Extensions discovered from persisted Copilot home state and their effective loading mode. Launch-scoped additional plugins are not included.
+     * Discovers user and enabled installed-plugin extensions from persisted Copilot home state, including enablement preferences. Launch-scoped additional plugins are not included.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -38,7 +38,7 @@ public CompletableFuture<ExtensionsDiscoverResult> discover() {
     }
 
     /**
-     * Source-qualified extension identifiers to persistently enable for future sessions.
+     * Persistently enables extension IDs for future sessions. Active sessions are unchanged; use session.extensions.enable to update them.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -49,7 +49,7 @@ public CompletableFuture<Void> enable(ExtensionsEnableParams params) {
     }
 
     /**
-     * Source-qualified extension identifiers to persistently disable for future sessions.
+     * Persistently disables extension IDs for future sessions. Active sessions are unchanged; use session.extensions.disable to update them.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerFeatureFlagsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerFeatureFlagsApi.java
new file mode 100644
index 0000000000..b2f3444b0a
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerFeatureFlagsApi.java
@@ -0,0 +1,63 @@
+/*---------------------------------------------------------------------------------------------
+ *  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.Map;
+import java.util.concurrent.CompletableFuture;
+import javax.annotation.processing.Generated;
+
+/**
+ * API methods for the {@code featureFlags} namespace.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+final class ServerFeatureFlagsApi {
+
+    private final RpcCaller caller;
+
+    /** @param caller the RPC transport function */
+    ServerFeatureFlagsApi(RpcCaller caller) {
+        this.caller = caller;
+    }
+
+    /**
+     * Resolves named gates against this installation's cached online-experiment assignment, for the account the runtime is already authenticated as. Unlike `featureFlags.resolve`, which layers static availability with the populations supplied, this reads the experiment assignment the runtime cached for its own current authentication, so a launch can honor a rollout before any session exists. The account is never taken from the request: naming one would read another account's cached assignments. The cached assignment answers immediately and any network refresh happens behind it, so this call does not wait on the network. Not available to an extension, which cannot carry the user's consent to read their assignment.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<Map<String, Boolean>> resolveStartupGates(FeatureFlagsResolveStartupGatesParams params) {
+        return caller.invoke("featureFlags.resolveStartupGates", params, RpcMapper.INSTANCE.getTypeFactory().constructMapType(Map.class, String.class, Boolean.class));
+    }
+
+    /**
+     * Lists every feature flag this runtime declares, with the population each one is declared for, its experimental description, and the online-experiment flag it maps to. This is the static catalog: it describes how each flag is defined, not whether it is on for anyone. Use `featureFlags.resolve` for static values with caller overrides, not active runtime values or experiment assignments.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<FeatureFlagsMetadataResult> listMetadata() {
+        return caller.invoke("featureFlags.listMetadata", java.util.Map.of(), FeatureFlagsMetadataResult.class);
+    }
+
+    /**
+     * Computes static feature flags from the supplied population and overrides without changing runtime state or verifying audience membership. Starts from declared availability, then applies direct feature-flag environment values, user settings, and explicit `flagOverrides`. It does not apply `COPILOT_EXP_*` experiment assignments, authenticated startup gates, or active runtime state. Settings include `enabledFeatureFlags`, the legacy `feature_flags.enabled` list, and supported convenience settings. Supply `baseFlags` to use an existing flag set instead of declared availability. Omit `isStaffGitHub` or `isStaffMicrosoft` when membership was never recorded: a legacy staff account then counts as both populations.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<Map<String, Boolean>> resolve(FeatureFlagsResolveParams params) {
+        return caller.invoke("featureFlags.resolve", params, RpcMapper.INSTANCE.getTypeFactory().constructMapType(Map.class, String.class, Boolean.class));
+    }
+
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerGitApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerGitApi.java
new file mode 100644
index 0000000000..da512566d0
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerGitApi.java
@@ -0,0 +1,62 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 git} namespace.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+final class ServerGitApi {
+
+    private final RpcCaller caller;
+
+    /** @param caller the RPC transport function */
+    ServerGitApi(RpcCaller caller) {
+        this.caller = caller;
+    }
+
+    /**
+     * Reads the remote that the branch checked out in a working tree tracks, as `branch.<name>.remote` configures it. Reports `origin` rather than failing whenever there is no tracking configuration to read — on a detached HEAD, on a branch with no upstream, or when git itself fails — because a caller asking which remote to talk to needs an answer it can act on, not an error. Marked internal because it exists to carry a CLI call site off the napi boundary onto the SDK contract; it is migration plumbing, not a surface consumers are meant to depend on.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<GitCurrentBranchRemoteResult> currentBranchRemote(GitCurrentBranchRemoteParams params) {
+        return caller.invoke("git.currentBranchRemote", params, GitCurrentBranchRemoteResult.class);
+    }
+
+    /**
+     * Collects the repository context of a working directory in one call: working tree root, repository identifier and host, current branch, and the HEAD and base commits. Every repository field is omitted when the path is not inside a git working tree, and the requested path is echoed back as `cwd`. The answer is the same `SessionWorkingDirectoryContext` that `session.metadata.recordContextChange` accepts, so a caller polling for a context change can forward the result unchanged. Marked internal because it exists to carry a CLI call site off the napi boundary onto the SDK contract; it is migration plumbing, not a surface consumers are meant to depend on. It can become public once an SDK consumer needs to derive session context from a directory itself.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<SessionWorkingDirectoryContext> workingDirectoryContext(GitWorkingDirectoryContextParams params) {
+        return caller.invoke("git.workingDirectoryContext", params, SessionWorkingDirectoryContext.class);
+    }
+
+    /**
+     * Lists the GitHub repositories a working tree's remotes point at, one entry per distinct repository, so a caller can resolve a base and head repository without parsing remote URLs itself. When several remotes name the same repository, only the first is listed, and the entry keeps that remote name. Remotes pointing at no GitHub host are left out, so an empty list means the tree reaches GitHub through no remote. Failing to read the remotes is reported as an error rather than as an empty list, because the two mean different things to a caller. Marked internal because it exists to carry a CLI call site off the napi boundary onto the SDK contract; it is migration plumbing, not a surface consumers are meant to depend on.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<GitReposFromRemotesResult> reposFromRemotes(GitReposFromRemotesParams params) {
+        return caller.invoke("git.reposFromRemotes", params, GitReposFromRemotesResult.class);
+    }
+
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerGitHubOwnersApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerGitHubOwnersApi.java
new file mode 100644
index 0000000000..175c41400a
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerGitHubOwnersApi.java
@@ -0,0 +1,62 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 gitHubOwners} namespace.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+final class ServerGitHubOwnersApi {
+
+    private final RpcCaller caller;
+
+    /** @param caller the RPC transport function */
+    ServerGitHubOwnersApi(RpcCaller caller) {
+        this.caller = caller;
+    }
+
+    /**
+     * Registers a cancellable owner listing and returns its request id. Separate from `gitHubOwners.list` so the id exists before the listing starts: a caller that abandons the listing the moment it begins would otherwise have nothing to name in `gitHubOwners.cancel`. The id serves one listing only. Long-abandoned unused ids can be released by later allocations.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<GitHubOwnersRequestIdResult> nextRequestId() {
+        return caller.invoke("gitHubOwners.nextRequestId", java.util.Map.of(), GitHubOwnersRequestIdResult.class);
+    }
+
+    /**
+     * Lists the logins the authenticated user may act as — their own account first, then the organizations they belong to — by asking the GitHub API under the supplied credential. No credential travels in the request: `authInfo` selects one the runtime already holds, and the runtime resolves the token and the GitHub host from it. A failure the caller should render arrives as `message`; one it should raise arrives as `throwError`.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<GitHubOwnersListResult> list(GitHubOwnersListParams params) {
+        return caller.invoke("gitHubOwners.list", params, GitHubOwnersListResult.class);
+    }
+
+    /**
+     * Abandons an owner listing started with the given request id. Answers `canceled: true` while a listing with that id is running. Answers `canceled: false` when the id was never registered, was registered but not used, was released after being abandoned, or its listing has ended. Canceling an unused id releases it, and a later `list` with that id is refused. The cancel acts only on owner listings and never reaches another request of the host.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<GitHubOwnersCancelResult> cancel(GitHubOwnersCancelParams params) {
+        return caller.invoke("gitHubOwners.cancel", params, GitHubOwnersCancelResult.class);
+    }
+
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerGitHubRepositoryApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerGitHubRepositoryApi.java
new file mode 100644
index 0000000000..d3eb8f0bd0
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerGitHubRepositoryApi.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 gitHubRepository} namespace.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+final class ServerGitHubRepositoryApi {
+
+    private final RpcCaller caller;
+
+    /** @param caller the RPC transport function */
+    ServerGitHubRepositoryApi(RpcCaller caller) {
+        this.caller = caller;
+    }
+
+    /**
+     * Resolves the GitHub repository that owns a working-tree path by reading the selected git remote configured for it, preferring `origin`. Returns a null `repository` when the path is inside a git working tree but that selected remote does not resolve to a GitHub host. Fails when the path is not inside a git working tree at all, so a caller can tell 'not a repository' apart from 'a repository with no GitHub remote'.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<GitHubRepositoryAtPathResult> atPath(GitHubRepositoryAtPathParams params) {
+        return caller.invoke("gitHubRepository.atPath", params, GitHubRepositoryAtPathResult.class);
+    }
+
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerGlobalStateApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerGlobalStateApi.java
new file mode 100644
index 0000000000..2d41182ae0
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerGlobalStateApi.java
@@ -0,0 +1,62 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 globalState} namespace.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+final class ServerGlobalStateApi {
+
+    private final RpcCaller caller;
+
+    /** @param caller the RPC transport function */
+    ServerGlobalStateApi(RpcCaller caller) {
+        this.caller = caller;
+    }
+
+    /**
+     * Reads the host's machine-wide state: which plugins are installed and the one-off flags and timestamps that record what the user has already been shown or migrated. This is the state that outlives a single session and a single workspace, so a host reads it to decide whether to run a first-launch step, offer an onboarding prompt, or skip one it has already completed. The stored credentials are deliberately not part of this result; a caller that needs an authenticated identity asks the account methods for it instead. Reading is non-destructive and every field is optional, because a fresh install has recorded nothing yet.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<GlobalStateLoadResult> load() {
+        return caller.invoke("globalState.load", java.util.Map.of(), GlobalStateLoadResult.class);
+    }
+
+    /**
+     * Reads the host's machine-wide state exactly as `globalState.load` does, but from a caller-supplied configuration directory instead of the one the server resolved for itself. Use this when a consumer scopes a session to its own Copilot home — the SDK's per-session `configDir` override — so the state read matches the directory that session actually uses. An absent or empty `configDir` resolves the server's own home, making this identical to `globalState.load`. The stored credentials are omitted here for the same reason they are omitted from `globalState.load`: a caller that needs an authenticated identity asks the account methods instead, so pointing this at another directory cannot be used to read the credentials kept in it.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<GlobalStateLoadResult> loadForConfigDir(GlobalStateLoadForConfigDirParams params) {
+        return caller.invoke("globalState.loadForConfigDir", params, GlobalStateLoadResult.class);
+    }
+
+    /**
+     * Records one top-level key in the host's machine-wide state, the counterpart to `globalState.load`. A host calls this to remember that it has shown an onboarding step, asked a one-off question, or completed a migration, so the next run can skip it. Only the named key is replaced and the rest of the document is preserved, which lets two writers record different flags without overwriting each other; passing no value removes the key instead. Only the keys a host records itself are writable: `appTipShown`, `askedSetupTerminals`, `autoFeedbackLastPromptedAt`, `firstLaunchAt`, `recentModelIds`, `sandboxCredentialProxyCaDeclined` and `sandboxOnboardingShown`. Every other key is refused, including `installedPlugins`, the stored credentials, `trustedFolders`, the staff flags and the signed-in accounts. Plugin enablement must use the plugin APIs, which apply repository and managed-policy checks.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<Void> writeKey(GlobalStateWriteKeyParams params) {
+        return caller.invoke("globalState.writeKey", params, Void.class);
+    }
+
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerHooksApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerHooksApi.java
index b6f69bf7dc..0997c6588f 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerHooksApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerHooksApi.java
@@ -8,6 +8,7 @@
 package com.github.copilot.generated.rpc;
 
 import com.github.copilot.CopilotExperimental;
+import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 import javax.annotation.processing.Generated;
 
@@ -27,7 +28,7 @@ public final class ServerHooksApi {
     }
 
     /**
-     * Optional project paths and host-exclusion behavior for server-scoped hook discovery.
+     * Discovers hook actions enabled under server-side discovery settings from user, repository, plugin, and managed-policy sources.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -37,4 +38,17 @@ public CompletableFuture<HooksDiscoverResult> discover(HooksDiscoverParams param
         return caller.invoke("hooks.discover", params, HooksDiscoverResult.class);
     }
 
+    /**
+     * Discovers hook actions enabled under server-side discovery settings from user, repository, plugin, and managed-policy sources.
+     * <p>
+     * Accepts the extensible request, including inputs added after the params record.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    public CompletableFuture<HooksDiscoverResult> discover(HooksDiscoverRequest request) {
+        return caller.invoke("hooks.discover", Objects.requireNonNull(request, "request"), HooksDiscoverResult.class);
+    }
+
 }
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerHostApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerHostApi.java
index 2cb0c99c37..613fc1a318 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerHostApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerHostApi.java
@@ -8,6 +8,7 @@
 package com.github.copilot.generated.rpc;
 
 import com.github.copilot.CopilotExperimental;
+import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 import javax.annotation.processing.Generated;
 
@@ -27,7 +28,7 @@ public final class ServerHostApi {
     }
 
     /**
-     * Publishes a resident session attached to the listener's owning connection.
+     * Publishes an attached resident session for this listener's lifetime without copying it.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -38,7 +39,18 @@ public CompletableFuture<HostPublishSessionResult> publishSession(HostPublishSes
     }
 
     /**
-     * One application-owned session handoff, requested by the supervised hosting participant.
+     * Reads the complete advertised live and dormant session catalog of an existing host owned by this connection. Does not start hosting, subscribe to sessions, or guarantee resumability.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    public CompletableFuture<HostListSessionsResult> listSessions(HostListSessionsParams params) {
+        return caller.invoke("host.listSessions", params, HostListSessionsResult.class);
+    }
+
+    /**
+     * Requests app-owned materialization over the owning SDK participant.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -49,7 +61,7 @@ CompletableFuture<HostSessionCreateResult> createSession(HostCreateSessionParams
     }
 
     /**
-     * Ends one participation, not the application's session lifetime.
+     * Releases app ownership retention after AHP detaches.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -60,7 +72,7 @@ CompletableFuture<Void> releaseSession(HostReleaseSessionParams params) {
     }
 
     /**
-     * Starts a supervised AHP host with at least one explicitly selected transport.
+     * Starts a connection-owned AHP host with explicit localServer and/or githubEnvironment transports as a supervised SDK participant.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -71,7 +83,20 @@ public CompletableFuture<HostStartResult> start(HostStartParams params) {
     }
 
     /**
-     * Stops a connection-owned listener and joins its teardown.
+     * Starts a connection-owned AHP host with explicit localServer and/or githubEnvironment transports as a supervised SDK participant.
+     * <p>
+     * Accepts the extensible request, including inputs added after the params record.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    public CompletableFuture<HostStartResult> start(HostStartRequest request) {
+        return caller.invoke("host.start", Objects.requireNonNull(request, "request"), HostStartResult.class);
+    }
+
+    /**
+     * Stops a listener owned by this SDK connection and joins its cleanup without deleting sessions.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -82,7 +107,7 @@ public CompletableFuture<Void> dispose(HostDisposeParams params) {
     }
 
     /**
-     * Empty acknowledgement for a completed host lifecycle operation.
+     * Resolves current authenticated credentials and remote-control policy only for the runtime-owned Mission Control hosting participant.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -93,7 +118,7 @@ CompletableFuture<HostEnvironmentCredentials> getEnvironmentCredentials() {
     }
 
     /**
-     * Empty acknowledgement for a completed host lifecycle operation.
+     * Returns listener settings only to the supervised hosting participant over its SDK connection.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -104,7 +129,7 @@ CompletableFuture<HostConfiguration> getConfiguration() {
     }
 
     /**
-     * Readiness reported by the supervised hosting participant on its own SDK connection.
+     * Reports a supervised hosting participant's bound AHP endpoint after its SDK handshake.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerInstructionSourceList.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerInstructionSourceList.java
new file mode 100644
index 0000000000..cddf0f9f88
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerInstructionSourceList.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 java.util.List;
+import javax.annotation.processing.Generated;
+
+/**
+ * Instruction sources discovered across user, repository, and plugin sources.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record ServerInstructionSourceList(
+    /** All discovered instruction sources */
+    @JsonProperty("sources") List<InstructionSource> sources
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerInstructionsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerInstructionsApi.java
index 70eb5b0211..55298f8c4a 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerInstructionsApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerInstructionsApi.java
@@ -8,6 +8,7 @@
 package com.github.copilot.generated.rpc;
 
 import com.github.copilot.CopilotExperimental;
+import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 import javax.annotation.processing.Generated;
 
@@ -27,7 +28,18 @@ public final class ServerInstructionsApi {
     }
 
     /**
-     * Optional project paths to include in instruction discovery.
+     * Returns the prompt the `init` command runs to author repository instructions. A host offering its own initialize action sends this text so the instructions it produces match the ones the CLI produces. The text is fixed for a build and depends on no configuration, session or repository.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<InstructionsInitPromptResult> getInitPrompt() {
+        return caller.invoke("instructions.getInitPrompt", java.util.Map.of(), InstructionsInitPromptResult.class);
+    }
+
+    /**
+     * Discovers instruction sources across user, repository, and plugin sources.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -38,7 +50,31 @@ public CompletableFuture<InstructionsDiscoverResult> discover(InstructionsDiscov
     }
 
     /**
-     * Optional project paths to include when enumerating instruction discovery targets.
+     * Discovers instruction sources across user, repository, and plugin sources.
+     * <p>
+     * Accepts the extensible request, including inputs added after the params record.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    public CompletableFuture<InstructionsDiscoverResult> discover(InstructionsDiscoverRequest request) {
+        return caller.invoke("instructions.discover", Objects.requireNonNull(request, "request"), InstructionsDiscoverResult.class);
+    }
+
+    /**
+     * Discovers the instruction sources for one caller-named location and returns them in the order the runtime applies them. `discover` answers for a set of project paths and derives the rest of its scope itself; this one instead takes every argument from the caller — the extra directories to scan and whether to descend into nested instruction files — and honors them as given. It also includes instruction directories from trusted repository settings, matching native repository discovery. Use it when the caller knows its own scope and no session exists to derive that scope from, such as a host reporting how many instruction files a directory contributes before any session starts. Marked internal because it exists to carry a CLI call site off the napi boundary onto the SDK contract; it is migration plumbing, not a surface consumers are meant to depend on.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<ServerInstructionSourceList> discoverRepoSources(InstructionsDiscoverRepoSourcesParams params) {
+        return caller.invoke("instructions.discoverRepoSources", params, ServerInstructionSourceList.class);
+    }
+
+    /**
+     * Returns the canonical files and directories where a client may create custom instructions that the runtime will recognize, including ones that do not exist yet. Repository targets become active once created.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -48,4 +84,28 @@ public CompletableFuture<InstructionsGetDiscoveryPathsResult> getDiscoveryPaths(
         return caller.invoke("instructions.getDiscoveryPaths", params, InstructionsGetDiscoveryPathsResult.class);
     }
 
+    /**
+     * Returns the canonical files and directories where a client may create custom instructions that the runtime will recognize, including ones that do not exist yet. Repository targets become active once created.
+     * <p>
+     * Accepts the extensible request, including inputs added after the params record.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    public CompletableFuture<InstructionsGetDiscoveryPathsResult> getDiscoveryPaths(InstructionsGetDiscoveryPathsRequest request) {
+        return caller.invoke("instructions.getDiscoveryPaths", Objects.requireNonNull(request, "request"), InstructionsGetDiscoveryPathsResult.class);
+    }
+
+    /**
+     * Drops the runtime's in-memory cache of discovered custom instructions so the next discovery reads them from disk again. A host calls this after it changes instruction files, or after it trusts a folder whose instructions an earlier discovery skipped, so that a session started afterwards sees the current files instead of a cached earlier answer. The call performs no I/O of its own and removes nothing from disk; it only invalidates, so the cost lands on the next discovery.         Returns once the cache is clear, which is what lets a caller order a session start after it. Marked internal because it exists to carry a CLI call site off the napi boundary onto the SDK contract; it is migration plumbing, not a surface consumers are meant to depend on.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<Void> clearCache() {
+        return caller.invoke("instructions.clearCache", java.util.Map.of(), Void.class);
+    }
+
 }
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerLlmInferenceApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerLlmInferenceApi.java
index 4b7663f1f3..753eccb9f3 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerLlmInferenceApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerLlmInferenceApi.java
@@ -27,7 +27,7 @@ public final class ServerLlmInferenceApi {
     }
 
     /**
-     * Indicates whether the calling client was registered as the LLM inference provider.
+     * Registers an SDK client as the LLM inference callback provider.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -38,7 +38,7 @@ public CompletableFuture<LlmInferenceSetProviderResult> setProvider() {
     }
 
     /**
-     * Response head.
+     * 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.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -49,7 +49,7 @@ public CompletableFuture<LlmInferenceHttpResponseStartResult> httpResponseStart(
     }
 
     /**
-     * A response body chunk or terminal error.
+     * Delivers a body byte range (or a terminal transport error) for an in-flight response, correlated by requestId. Set `end` true on the last chunk. When `error` is set the response terminates with a transport-level failure and the runtime raises an APIConnectionError.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
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
index 4f9cd612bf..666a1052e0 100644
--- 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
@@ -21,13 +21,127 @@ public final class ServerManagedSettingsApi {
 
     private final RpcCaller caller;
 
+    /** API methods for the {@code managedSettings.permissions} sub-namespace. */
+    public final ServerManagedSettingsPermissionsApi permissions;
+
     /** @param caller the RPC transport function */
     ServerManagedSettingsApi(RpcCaller caller) {
         this.caller = caller;
+        this.permissions = new ServerManagedSettingsPermissionsApi(caller);
+    }
+
+    /**
+     * Discovers device-managed settings the way the runtime's own device layer does, and reports the sandbox floor and the load outcome alongside the validated document. This differs from `managedSettings.read` in three ways a policy-enforcing host depends on: a document that validates to an empty object is reported as absent rather than as an empty policy, a discovery error does not suppress a document that still validates, and a failure is reported as a flag rather than only as error text. Hosts that compose the device layer into an effective policy use this, because `managedSettings.read` cannot distinguish "no device policy" from "device policy could not be read" and would silently hand the user's own layer the win.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<ManagedSettingsReadDeviceResult> readDevice() {
+        return caller.invoke("managedSettings.readDevice", java.util.Map.of(), ManagedSettingsReadDeviceResult.class);
+    }
+
+    /**
+     * Retains the supplied managed layers as this runtime process's startup policy and re-applies the result to every live session. Hosts that own their own short-lived process policy use this, so a guarded mutation is checked against the policy the host actually fetched. Retaining is a whole-process replacement rather than a merge, so a host that already resolved a good policy must not retain a partial one over it. The failure flags are honest inputs rather than assumptions: reporting a fetch or load that failed keeps the layers already retained, and the interim fail-closed state, instead of clearing them.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<Void> retainPolicy(ManagedSettingsRetainPolicyParams params) {
+        return caller.invoke("managedSettings.retainPolicy", params, Void.class);
+    }
+
+    /**
+     * Stamps an effective managed policy's individually-controlled entries onto a user settings document, returning the settings a host should actually act on. The managed layer wins on every plugin spec and marketplace name it names, and leaves everything it does not name as the user wrote it. Hosts use this rather than merging the two documents themselves, because the merge is per entry rather than per document and a whole-document overlay would either discard the user's unmanaged entries or let a user entry outrank a managed one. Omitting the managed layer returns the settings unchanged, which is what an unmanaged host wants. Rejects when either document is present but is not a JSON object rather than treating it as absent, since silently dropping a malformed policy hands the user's layer the win on exactly the entries the policy exists to control.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<ManagedSettingsApplyControlsResult> applyControls(ManagedSettingsApplyControlsParams params) {
+        return caller.invoke("managedSettings.applyControls", params, ManagedSettingsApplyControlsResult.class);
+    }
+
+    /**
+     * Validates the managed settings a client is supplying for a session it is about to open, and returns them reduced to the keys a client is allowed to set. A client-supplied policy is not the same thing as an administrator's: it may only narrow permissions, so this accepts `permissions` and rejects every other key outright rather than ignoring it. Rejecting is the point — a host that silently dropped an unsupported key would report a policy as applied while running without it. Hosts call this before opening the session rather than letting the open fail, so a malformed policy is reported against the request that carried it. The runtime applies the same rule again when the session starts, so this cannot be used to smuggle a wider document past it. An accepted document that sets nothing comes back as an empty object, which is distinct from supplying nothing at all.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<ManagedSettingsParseClientValueResult> parseClientValue(ManagedSettingsParseClientValueParams params) {
+        return caller.invoke("managedSettings.parseClientValue", params, ManagedSettingsParseClientValueResult.class);
+    }
+
+    /**
+     * Composes the supplied server, device/MDM, device sandbox floor and policy-helper layers into the single effective managed policy a host should enforce, resolving each key across the layers by the runtime's own precedence rules. Hosts that assemble managed layers themselves use this so their precedence matches the runtime's exactly instead of reimplementing it. The composition is not a pure function of its inputs: an advisory sandbox force-on that arrived over the server channel is declined when this host cannot run a sandbox, so the result reflects the runtime host's capabilities, and the returned settings carry `sandboxAdvisoryFloorDeclined: true` when that happened. Enforced channels (device/MDM and policy helper) are never declined, and a server force-on carrying `failIfUnavailable` is preserved so the session fails loudly instead of quietly running unsandboxed. Rejects when a supplied layer is present but is not a JSON object, rather than treating it as unmanaged, because silently dropping a malformed policy would hand the user's own layer the win on exactly the keys the policy exists to control.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<ManagedSettingsResolveEffectiveValueResult> resolveEffectiveValue(ManagedSettingsResolveEffectiveValueParams params) {
+        return caller.invoke("managedSettings.resolveEffectiveValue", params, ManagedSettingsResolveEffectiveValueResult.class);
+    }
+
+    /**
+     * Decides what a host must do to its bypass-permissions state after a managed-policy resolution lands, given the state already in force and the account now signed in. A host holds two pieces of state — which layer disabled bypass mode, and for a server-delivered disable, the account it was pinned to — and cannot decide the next step from the new policy alone. Three rules make that so, and each one is a control rather than a preference. A device/MDM disable outranks the account, so a later server answer never lifts it. An unknown policy, which is what a failed fetch or a refusal this build cannot enforce yields, preserves whatever is in force instead of reverting to permissive. And a server disable is lifted only when the account it was pinned to is no longer the signed-in one, which is what makes signing in to an unrestricted account recover without a restart while a reconnect on the same restricted account does not. Hosts call this rather than reimplementing it because getting the pinning backwards either strands a disable on an account that never carried one or drops one that still applies. `setDisabledState` is omitted when the host must leave its stored flag untouched, which is distinct from being told to set it to false.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<ManagedSettingsResolveBypassDisableTransitionResult> resolveBypassDisableTransition(ManagedSettingsResolveBypassDisableTransitionParams params) {
+        return caller.invoke("managedSettings.resolveBypassDisableTransition", params, ManagedSettingsResolveBypassDisableTransitionResult.class);
+    }
+
+    /**
+     * Resolves managed (enterprise policy) settings for a host from every layer at once: the account's server-delivered policy, the device/MDM layer, and a platform policy helper. Hosts use this instead of fetching and composing the layers themselves, because the per-layer precedence and the fail-closed rules that apply when a layer cannot be confirmed are the runtime's own and must match the policy a session will later enforce. It does not retain or apply anything to process-global policy state, so a host may call it before any session exists — which is the point, since plugin activation and one-shot commands resolve policy before a session is available to carry it. The returned per-layer outcome flags are load-bearing rather than diagnostic: a host must distinguish an unmanaged device from a managed device whose policy could not be confirmed, and apply its fail-closed gates in the second case. Reports its diagnostics in `logMessages` rather than logging them, so a host that runs before a log sink exists still sees them.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<ManagedSettingsIngestResult> ingest(ManagedSettingsIngestParams params) {
+        return caller.invoke("managedSettings.ingest", params, ManagedSettingsIngestResult.class);
+    }
+
+    /**
+     * Resolves the managed (enterprise policy) settings a host must enforce from startup, and judges the account against the enterprise sign-in pin in the same pass. This composes the layers the way `managedSettings.ingest` does and then answers the two questions a host cannot answer for itself: which fail-closed floors apply when a layer could not be confirmed, and whether this credential is allowed to sign in at all. The sign-in verdict is the reason a host must not assemble this itself from `managedSettings.ingest` — a pinned organization is an access control, and a host that composed the layers but skipped the pin would let a developer sign in with a personal or another enterprise's account and escape every control that keys off the signed-in identity. The verdict is computed on every resolution, including one that is not retained, so declining to apply policy never widens access. Set `retainAndApply` to keep the resolved policy as this runtime process's startup policy; leave it false to resolve without side effects.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<ManagedSettingsResolveStartupPolicyResult> resolveStartupPolicy(ManagedSettingsResolveStartupPolicyParams params) {
+        return caller.invoke("managedSettings.resolveStartupPolicy", params, ManagedSettingsResolveStartupPolicyResult.class);
+    }
+
+    /**
+     * Resolves the managed `remoteControl` policy for an account on its own, for a host deciding whether a remote-control session may start. Composes the same layers as `managedSettings.ingest` and returns only that one key, so a host does not have to know which layer won. An absent policy means the account is unmanaged for this capability and the host may proceed; that default is safe only while absence really does mean "no policy", so a service refusal that says an account policy exists which this client is too old to enforce resolves to an explicit disabled policy instead of to absence. A resolution that cannot be completed is rejected rather than answered as absence, for the same reason.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<ManagedSettingsLoadRemoteControlResult> loadRemoteControl(ManagedSettingsLoadRemoteControlParams params) {
+        return caller.invoke("managedSettings.loadRemoteControl", params, ManagedSettingsLoadRemoteControlResult.class);
+    }
+
+    /**
+     * Evaluates the device-channel enterprise sign-in pin (MDM plist, registry, or managed-settings file) against a credential, without resolving any server-delivered policy. This is the gate an entry point runs before it branches, and the only one that can refuse a developer's first sign-in: it is local, needs no credential, and a server-delivered pin only ever reaches accounts already inside the organization. It fails closed by construction — a discovery that cannot determine whether a pin exists refuses rather than allows, because a control that fails open under a triggerable condition is not a control. Hosts that also want the server channel should call `managedSettings.resolveStartupPolicy`, which folds both channels into one verdict.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<ForceLoginOrgsDecision> resolveDeviceForceLoginOrgsGate(ManagedSettingsResolveDeviceForceLoginOrgsGateParams params) {
+        return caller.invoke("managedSettings.resolveDeviceForceLoginOrgsGate", params, ForceLoginOrgsDecision.class);
     }
 
     /**
-     * Validated device-managed settings discovered before a session exists.
+     * 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. `managedSettings.resolve` returns the same device settings together with the account's server policy.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -38,7 +152,7 @@ public CompletableFuture<ManagedSettingsReadResult> read() {
     }
 
     /**
-     * Invokes {@code managedSettings.clearCache}.
+     * Force-refreshes enterprise managed settings for every account: wipes the persistent server-policy cache (the whole `<cacheHome>/managed-settings` directory) and drops this runtime process's in-memory retained server policy. It does not itself fetch policy — the effect is that the next time a session resolves managed settings for an account, that resolution re-fetches the account's org policy from the network instead of serving a cached response. Note that `managedSettings.read` returns only device/MDM settings and never triggers the account server-policy fetch, so a host implementing "sync account policy" should call `managedSettings.resolve` or start a fresh session resolution rather than treat a subsequent `managedSettings.read` as the refreshed org policy. Mirrors the invalidation a sign-out performs, broadened from the one signing-out account to all of them; device/MDM layers describe the machine, not the account, and are left untouched. Rejects if the on-disk cache cannot be removed.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -49,7 +163,7 @@ public CompletableFuture<Void> clearCache() {
     }
 
     /**
-     * Optional opaque account selection or GitHub token whose managed settings are resolved.
+     * Resolves the effective enterprise managed settings without a session, from the device channel and, when an account is available, the account's server policy through the same per-account cache sessions use. A cached server policy less than an hour old is used without a fetch; otherwise the policy is fetched, and when the fetch fails a cached policy up to 24 hours old is used instead, unless `forceRemoteSettingsRefresh` requires a live fetch. With no account requested or signed in, it reports device policy only; signing out removes the account's cached policy. It can fetch server policy over the network when the cache is stale, so call it off latency-critical paths such as startup rather than before listing models. The policy helper is not run. `layers` lists each channel's document before merging, and `values` and `meta` carry typed effective values and their lock state for the keys typed so far.
      * <p>
      * Invokes the method with no params, applying the runtime defaults.
      *
@@ -62,7 +176,7 @@ public CompletableFuture<ManagedSettingsResolveResult> resolve() {
     }
 
     /**
-     * Optional opaque account selection or GitHub token whose managed settings are resolved.
+     * Resolves the effective enterprise managed settings without a session, from the device channel and, when an account is available, the account's server policy through the same per-account cache sessions use. A cached server policy less than an hour old is used without a fetch; otherwise the policy is fetched, and when the fetch fails a cached policy up to 24 hours old is used instead, unless `forceRemoteSettingsRefresh` requires a live fetch. With no account requested or signed in, it reports device policy only; signing out removes the account's cached policy. It can fetch server policy over the network when the cache is stale, so call it off latency-critical paths such as startup rather than before listing models. The policy helper is not run. `layers` lists each channel's document before merging, and `values` and `meta` carry typed effective values and their lock state for the keys typed so far.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -73,7 +187,7 @@ public CompletableFuture<ManagedSettingsResolveResult> resolve(ManagedSettingsRe
     }
 
     /**
-     * The authoring JSON schema for managed settings recognized by this runtime.
+     * Returns the managed-settings authoring JSON schema with descriptive `x-composition` annotations aligned with the shared settings-engine vocabulary. These annotations are not a complete runtime composition contract: model, effortLevel, and contextTier remain coupled. Use `managedSettings.compose` for the runtime's effective result. Performs no I/O.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -84,7 +198,7 @@ public CompletableFuture<ManagedSettingsSchemaResult> schema() {
     }
 
     /**
-     * A candidate managed-settings document to validate without applying it.
+     * Validates a candidate managed-settings document the way the runtime validates delivered policy, without applying it. Reports errors that would reject the document, warnings for content the runtime ignores, and the canonical document it would apply. Document text nested more than 64 levels deep is rejected. Performs no I/O.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -95,7 +209,7 @@ public CompletableFuture<ManagedSettingsValidateResult> validate(ManagedSettings
     }
 
     /**
-     * Candidate managed-settings documents to merge without applying them.
+     * Merges candidate managed-settings documents for the device, server, and policy-helper channels into the effective settings the runtime would enforce on this host, using the same precedence and composition rules as live resolution, without applying them. Like live resolution, a server's advisory sandbox force-enable is declined on a host that cannot run the sandbox. Does not fetch policy or read policy files, but may perform blocking OS or subprocess probes for sandbox support. Preview documents are limited to 1 MiB and 64 levels of nesting.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerManagedSettingsPermissionsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerManagedSettingsPermissionsApi.java
new file mode 100644
index 0000000000..11526bde65
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerManagedSettingsPermissionsApi.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.permissions} namespace.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public final class ServerManagedSettingsPermissionsApi {
+
+    private final RpcCaller caller;
+
+    /** @param caller the RPC transport function */
+    ServerManagedSettingsPermissionsApi(RpcCaller caller) {
+        this.caller = caller;
+    }
+
+    /**
+     * Pure, sessionless evaluation of operations against a supplied permissionsContext. Performs no policy discovery, I/O, prompting, navigation, permission grants, or sandbox changes. Obtain the context from managedSettings.resolve or session.managedSettings.get, or reuse an in-memory context. Results preserve input order and duplicates. Consumers must block deny, obtain approval for ask, and use their normal permission flow for unmanaged. Unknown policy returns failClosed with every operation denied. This is not a substitute for user permissions or other security controls.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    public CompletableFuture<ManagedSettingsPermissionsEvaluateResult> evaluate(ManagedSettingsPermissionsEvaluateParams params) {
+        return caller.invoke("managedSettings.permissions.evaluate", params, ManagedSettingsPermissionsEvaluateResult.class);
+    }
+
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerMcpApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerMcpApi.java
index 9557a2f4ac..c35de551fc 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerMcpApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerMcpApi.java
@@ -24,6 +24,8 @@ public final class ServerMcpApi {
 
     /** API methods for the {@code mcp.config} sub-namespace. */
     public final ServerMcpConfigApi config;
+    /** API methods for the {@code mcp.registry} sub-namespace. */
+    final ServerMcpRegistryApi registry;
     /** API methods for the {@code mcp.installations} sub-namespace. */
     public final ServerMcpInstallationsApi installations;
 
@@ -31,11 +33,12 @@ public final class ServerMcpApi {
     ServerMcpApi(RpcCaller caller) {
         this.caller = caller;
         this.config = new ServerMcpConfigApi(caller);
+        this.registry = new ServerMcpRegistryApi(caller);
         this.installations = new ServerMcpInstallationsApi(caller);
     }
 
     /**
-     * Optional working directory used as context for MCP server discovery.
+     * Discovers MCP servers from user, workspace, plugin, and builtin sources.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -46,7 +49,29 @@ public CompletableFuture<McpDiscoverResult> discover(McpDiscoverParams params) {
     }
 
     /**
-     * A side-effect-free request for an MCP install plan. Computing a plan never writes configuration, stores a secret, or reloads MCP servers.
+     * Lists the MCP servers the runtime supplies itself, so a host that disables the built-ins wholesale suppresses exactly the set the runtime would otherwise add. The names are fixed for a build and depend on no configuration, session or account.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<McpListBuiltinServerNamesResult> listBuiltinServerNames() {
+        return caller.invoke("mcp.listBuiltinServerNames", java.util.Map.of(), McpListBuiltinServerNamesResult.class);
+    }
+
+    /**
+     * Reports whether the gh-replaceable GitHub MCP tools may be clipped for a session, which a host feeds back as the `excludeGhReplaceableTools` build option. The tools are redundant only when the session can reach a shell *and* the host has the `gh` that would replace them, so both halves are decided here. The shell half runs the platform shell tool through the runtime's own tool-filter matcher, so entry forms like `builtin:bash` and `builtin:*` behave exactly as they do when a session builds its tool catalog. The host half probes for `gh`, and is skipped entirely when the filters already rule the shell out. Host presence alone is not enough: a session restricted to, say, `view` would otherwise lose the built-in issue-read fallback while having no shell to replace it with. The answer describes the host the runtime runs on, so it is never forwarded to a remote engine.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<McpShouldExcludeGitHubToolsResult> shouldExcludeGitHubTools(McpShouldExcludeGitHubToolsParams params) {
+        return caller.invoke("mcp.shouldExcludeGitHubTools", params, McpShouldExcludeGitHubToolsResult.class);
+    }
+
+    /**
+     * 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.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -57,7 +82,7 @@ public CompletableFuture<McpPlanInstallResult> planInstall(McpPlanInstallParams
     }
 
     /**
-     * A side-effect-free request for an MCP install plan. Computing a plan never writes configuration, stores a secret, or reloads MCP servers.
+     * 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.
      * <p>
      * Accepts the extensible request, including inputs added after the params record.
      *
@@ -70,7 +95,7 @@ public CompletableFuture<McpPlanInstallResult> planInstall(McpPlanInstallRequest
     }
 
     /**
-     * Side-effect-free preparation of one original bound remote MCP choice.
+     * Consumes a bound catalogue plan and retains one exact fully resolved personal remote MCP operation requiring no supplied values or configured secrets. Returns its runtime operation ID and original expiry before any confirmation, activation, writer initialisation or installation effect. Register the original connection, operation and selected-session binding before calling applyInstall. Missing lower owned admission is unavailable, never a raw-config fallback.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -81,7 +106,7 @@ public CompletableFuture<McpInstallationManagementResult> prepareInstall(McpPrep
     }
 
     /**
-     * Applies exactly one previously prepared operation on its original connection.
+     * Consumes a retained prepared MCP operation once, revalidates its original authority, requests explicit human consent through installations.confirm on the original connection, then revalidates source and applies the sealed transaction. An uncertain result requires original-operation inspection or recovery, never replay.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -92,7 +117,7 @@ public CompletableFuture<McpInstallationResult> applyInstall(McpApplyInstallPara
     }
 
     /**
-     * Read-only preparation of one owned removal under fresh selected-session authority.
+     * Prepares a read-only removal plan for an exact owned receipt under the selected existing session. Returns the original operation ID before confirmation; neither planning nor abandonment changes configuration or shared OAuth credentials.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -103,7 +128,7 @@ public CompletableFuture<McpInstallationManagementResult> planUninstall(McpPlanU
     }
 
     /**
-     * One-use application of the exact retained removal plan.
+     * Consumes the original owned-removal plan once and requests fresh exact human confirmation on its original connection. Drift is refused; unrelated manual configuration and shared OAuth credentials are preserved.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerMcpConfigApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerMcpConfigApi.java
index 6d3510f515..7271e94e29 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerMcpConfigApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerMcpConfigApi.java
@@ -27,7 +27,7 @@ public final class ServerMcpConfigApi {
     }
 
     /**
-     * User-configured MCP servers, keyed by server name.
+     * Lists MCP servers from user configuration.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -38,7 +38,7 @@ public CompletableFuture<McpConfigListResult> list() {
     }
 
     /**
-     * MCP server name and configuration to add to user configuration.
+     * Adds an MCP server to user configuration.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -49,7 +49,7 @@ public CompletableFuture<Void> add(McpConfigAddParams params) {
     }
 
     /**
-     * MCP server name and replacement configuration to write to user configuration.
+     * Updates an MCP server in user configuration.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -60,7 +60,7 @@ public CompletableFuture<Void> update(McpConfigUpdateParams params) {
     }
 
     /**
-     * MCP server name to remove from user configuration.
+     * Removes an MCP server from user configuration.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -71,7 +71,7 @@ public CompletableFuture<Void> remove(McpConfigRemoveParams params) {
     }
 
     /**
-     * MCP server names to enable for new sessions.
+     * Enables MCP servers in user configuration for new sessions.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -82,7 +82,7 @@ public CompletableFuture<Void> enable(McpConfigEnableParams params) {
     }
 
     /**
-     * MCP server names to disable for new sessions.
+     * Disables MCP servers in user configuration for new sessions.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -93,7 +93,7 @@ public CompletableFuture<Void> disable(McpConfigDisableParams params) {
     }
 
     /**
-     * Invokes {@code mcp.config.reload}.
+     * Drops this runtime process's in-memory MCP server-definition cache so the next MCP config read observes disk.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerMcpInstallationsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerMcpInstallationsApi.java
index ec99b766e9..6055d0fd3f 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerMcpInstallationsApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerMcpInstallationsApi.java
@@ -27,7 +27,7 @@ public final class ServerMcpInstallationsApi {
     }
 
     /**
-     * New-work inventory or recovery request under an explicitly selected existing session.
+     * Reads receipt-owned MCP inventory for the selected account and host without activating servers or reconstructing missing ownership. Configuration ownership does not prove session-specific usability.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -38,7 +38,7 @@ public CompletableFuture<McpInstallationManagementResult> list(McpInstallationsL
     }
 
     /**
-     * New-work inventory or recovery request under an explicitly selected existing session.
+     * Reconciles already-confirmed durable MCP transactions, then inspects owned inventory. Does not replay apply or reconstruct deleted ownership metadata; unresolved or unsafe evidence remains an explicit refusal.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -49,7 +49,7 @@ public CompletableFuture<McpInstallationManagementResult> recover(McpInstallatio
     }
 
     /**
-     * Existing-operation control. A new session selector is deliberately not accepted.
+     * Inspects a known operation only on its original connection. Remains available after account or selected-session loss; does not acquire new authority or rebind an operation.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -60,7 +60,7 @@ public CompletableFuture<McpInstallationManagementResult> status(McpInstallation
     }
 
     /**
-     * Existing-operation control. A new session selector is deliberately not accepted.
+     * Requests cancellation of a known operation on its original connection, including before apply or confirmation. Already-started effects retain their transaction lease and report an honest terminal or recovery outcome.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerMcpRegistryApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerMcpRegistryApi.java
new file mode 100644
index 0000000000..26b7b2cc7f
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerMcpRegistryApi.java
@@ -0,0 +1,62 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 mcp.registry} namespace.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+final class ServerMcpRegistryApi {
+
+    private final RpcCaller caller;
+
+    /** @param caller the RPC transport function */
+    ServerMcpRegistryApi(RpcCaller caller) {
+        this.caller = caller;
+    }
+
+    /**
+     * Allocates an ID for one cancellable MCP registry search. The ID exists before the search starts, so callers can cancel before it starts. The networking stack supplies the cancellation namespace. The runtime retains at most 1,024 unused IDs. At capacity, another allocation can reclaim an unused ID. Active searches retain their IDs until they finish.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<McpRegistryRequestIdResult> allocateRequestId() {
+        return caller.invoke("mcp.registry.allocateRequestId", java.util.Map.of(), McpRegistryRequestIdResult.class);
+    }
+
+    /**
+     * Searches the MCP registry the supplied credential may read, resolving the registry endpoint from policy first. Hosts usually send credential-free `AuthIdentity`; a `token` identity can be resolved only when it embeds a token, while `env` and `gh-cli` identities can use a token embedded in the request first. The runtime follows registry pages, keeps the newest entry per server name, cuts the list to `limit`, and sorts an empty-query result by GitHub stars. Each server object is carried opaquely.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<McpRegistrySearchResult> search(McpRegistrySearchParams params) {
+        return caller.invoke("mcp.registry.search", params, McpRegistrySearchResult.class);
+    }
+
+    /**
+     * Abandons the registry search that uses the given request ID. It acts only on IDs from `mcp.registry.allocateRequestId`, so it never cancels another component's request. Answers `canceled: true` when it stops a running search. Answers `canceled: false` for unknown or reclaimed IDs, completed or canceled searches, and unused reservations. It releases an unused reservation, so a later search with that ID is refused.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<McpRegistryCancelResult> cancel(McpRegistryCancelParams params) {
+        return caller.invoke("mcp.registry.cancel", params, McpRegistryCancelResult.class);
+    }
+
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerModelsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerModelsApi.java
index e4fd3cbc53..491340551d 100644
--- a/java/sdk/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 opaque account selection or compatibility GitHub token used to list models.
+     * Lists Copilot models available to the authenticated user.
      * <p>
      * Invokes the method with no params, applying the runtime defaults.
      *
@@ -40,7 +40,7 @@ public CompletableFuture<ModelsListResult> list() {
     }
 
     /**
-     * Optional opaque account selection or compatibility GitHub token used to list models.
+     * Lists Copilot models available to the authenticated user.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -51,7 +51,7 @@ public CompletableFuture<ModelsListResult> list(ModelsListParams params) {
     }
 
     /**
-     * The running runtime's complete catalog of well-known built-in model IDs, including supported models and additional IDs with built-in metadata.
+     * Returns the running runtime's complete catalog of well-known built-in model IDs without authentication or network access.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerPermissionsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerPermissionsApi.java
new file mode 100644
index 0000000000..7e1c94d468
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerPermissionsApi.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 com.github.copilot.CopilotExperimental;
+import java.util.concurrent.CompletableFuture;
+import javax.annotation.processing.Generated;
+
+/**
+ * API methods for the {@code permissions} namespace.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+final class ServerPermissionsApi {
+
+    private final RpcCaller caller;
+
+    /** API methods for the {@code permissions.locations} sub-namespace. */
+    final ServerPermissionsLocationsApi locations;
+    /** API methods for the {@code permissions.folderTrust} sub-namespace. */
+    final ServerPermissionsFolderTrustApi folderTrust;
+
+    /** @param caller the RPC transport function */
+    ServerPermissionsApi(RpcCaller caller) {
+        this.caller = caller;
+        this.locations = new ServerPermissionsLocationsApi(caller);
+        this.folderTrust = new ServerPermissionsFolderTrustApi(caller);
+    }
+
+    /**
+     * Interprets a verbatim managed `permissions` slice into the three policy questions a host asks before granting elevated permissions: whether bypass-permissions mode is forbidden, whether a policy exists that this build could not determine, and whether the layer supplies permission rules the session must enforce. An absent or empty slice means no managed policy applies. The runtime and its permission service share one policy type, so a new managed permission setting is interpreted in exactly one place; a host that reimplements the reading would silently diverge the first time that set grows. Hosts must fail closed on an undetermined policy rather than treating it as permission granted.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<PermissionsEvaluateManagedPolicyResult> evaluateManagedPolicy(PermissionsEvaluateManagedPolicyParams params) {
+        return caller.invoke("permissions.evaluateManagedPolicy", params, PermissionsEvaluateManagedPolicyResult.class);
+    }
+
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerPermissionsFolderTrustApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerPermissionsFolderTrustApi.java
new file mode 100644
index 0000000000..f27b5f0ed1
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerPermissionsFolderTrustApi.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 permissions.folderTrust} namespace.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+final class ServerPermissionsFolderTrustApi {
+
+    private final RpcCaller caller;
+
+    /** @param caller the RPC transport function */
+    ServerPermissionsFolderTrustApi(RpcCaller caller) {
+        this.caller = caller;
+    }
+
+    /**
+     * Reports whether a folder is trusted, reading the persisted trusted-folders list directly rather than through a session. Use this from a host that has no session yet, such as a one-shot command deciding whether to honor a checkout's own settings. It differs from the session-scoped check in two ways that matter: it takes the configuration directory to read the list from, instead of inheriting the session's, and it answers only from the persisted list, so trust a user granted for the lifetime of one session is not visible here. A host that has a session should prefer the session-scoped check, which also covers session-only trust.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<FolderTrustCheckResult> checkTrust(PermissionsFolderTrustCheckTrustParams params) {
+        return caller.invoke("permissions.folderTrust.checkTrust", params, FolderTrustCheckResult.class);
+    }
+
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerPermissionsLocationsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerPermissionsLocationsApi.java
new file mode 100644
index 0000000000..7b23a73b3f
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerPermissionsLocationsApi.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 permissions.locations} namespace.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+final class ServerPermissionsLocationsApi {
+
+    private final RpcCaller caller;
+
+    /** @param caller the RPC transport function */
+    ServerPermissionsLocationsApi(RpcCaller caller) {
+        this.caller = caller;
+    }
+
+    /**
+     * Drops stored per-location permission grants whose directory no longer exists, and reports which location keys were removed. Runs against the permission store under the runtime's own Copilot home, the same store `session.permissions.locations.resolve` reads. Marked internal because it exists to carry a CLI call site off the napi boundary onto the SDK contract; it is migration plumbing, not a surface consumers are meant to depend on. It can become public once an SDK consumer needs to prune its own permission store.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<LocationPermissionsCleanupResult> cleanupOrphaned() {
+        return caller.invoke("permissions.locations.cleanupOrphaned", java.util.Map.of(), LocationPermissionsCleanupResult.class);
+    }
+
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerPersistenceApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerPersistenceApi.java
new file mode 100644
index 0000000000..a98b036d8a
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerPersistenceApi.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 persistence} namespace.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+final class ServerPersistenceApi {
+
+    private final RpcCaller caller;
+
+    /** @param caller the RPC transport function */
+    ServerPersistenceApi(RpcCaller caller) {
+        this.caller = caller;
+    }
+
+    /**
+     * Atomically replaces a JSON file's entire contents while holding the runtime's per-path lock. The lock lives in the runtime process, so a host that writes these files itself takes no part in it and can tear a concurrent runtime write; route the write here instead. Unlike a merging write this never reads or parses the existing file, so a previously corrupted snapshot is replaced wholesale rather than failing every later write. Use it only for callers that always persist a complete snapshot.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<PersistenceWriteRawJsonLockedResult> writeRawJsonLocked(PersistenceWriteRawJsonLockedParams params) {
+        return caller.invoke("persistence.writeRawJsonLocked", params, PersistenceWriteRawJsonLockedResult.class);
+    }
+
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerPluginsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerPluginsApi.java
index da5ac6c0e8..4fd1a839b0 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerPluginsApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerPluginsApi.java
@@ -34,7 +34,7 @@ public final class ServerPluginsApi {
     }
 
     /**
-     * Plugins installed in user/global state.
+     * Lists plugins installed in user/global state.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -45,7 +45,7 @@ public CompletableFuture<PluginsListResult> list() {
     }
 
     /**
-     * Plugin source and optional working directory for relative-path resolution.
+     * Installs a plugin from a marketplace, GitHub repo, URL, or local path.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -56,7 +56,7 @@ public CompletableFuture<PluginsInstallResult> install(PluginsInstallParams para
     }
 
     /**
-     * Name (or spec) of the plugin to uninstall.
+     * Uninstalls an installed plugin.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -67,7 +67,7 @@ public CompletableFuture<Void> uninstall(PluginsUninstallParams params) {
     }
 
     /**
-     * Name (or spec) of the plugin to update.
+     * Updates an installed plugin to its latest published version.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -78,7 +78,7 @@ public CompletableFuture<PluginsUpdateResult> update(PluginsUpdateParams params)
     }
 
     /**
-     * Result of updating all installed plugins.
+     * Updates every installed plugin to its latest published version.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -89,7 +89,7 @@ public CompletableFuture<PluginsUpdateAllResult> updateAll() {
     }
 
     /**
-     * Plugin names (or specs) to enable, plus the optional working directory the repository-controlled guard is evaluated against.
+     * Enables installed plugins for new sessions.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -100,7 +100,7 @@ public CompletableFuture<Void> enable(PluginsEnableParams params) {
     }
 
     /**
-     * Plugin names (or specs) to disable, plus the optional working directory the repository-controlled guard is evaluated against.
+     * Disables installed plugins for new sessions.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
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
index 0610fcb28e..b35a77a817 100644
--- 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
@@ -27,7 +27,7 @@ public final class ServerPluginsBuiltinApi {
     }
 
     /**
-     * Trusted built-in plugin directories to use for this runtime process.
+     * Replaces this server's trusted built-in plugin directories while no sessions are active.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerPluginsMarketplacesApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerPluginsMarketplacesApi.java
index e01bbeeec7..93adce4997 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerPluginsMarketplacesApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerPluginsMarketplacesApi.java
@@ -27,7 +27,7 @@ public final class ServerPluginsMarketplacesApi {
     }
 
     /**
-     * All registered marketplaces, including built-in defaults.
+     * Lists all registered marketplaces (defaults + user-added).
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -38,7 +38,7 @@ public CompletableFuture<PluginsMarketplacesListResult> list() {
     }
 
     /**
-     * Marketplace source and optional working directory for relative-path resolution.
+     * Registers a new marketplace from a source (owner/repo, URL, or local path).
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -49,7 +49,7 @@ public CompletableFuture<PluginsMarketplacesAddResult> add(PluginsMarketplacesAd
     }
 
     /**
-     * Name of the marketplace to remove and an optional force flag.
+     * Removes a previously-registered marketplace. When the marketplace has dependent plugins and `force` is not set, the marketplace is left intact and the result lists the dependents so the caller can decide whether to retry with `force=true`.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -60,7 +60,7 @@ public CompletableFuture<PluginsMarketplacesRemoveResult> remove(PluginsMarketpl
     }
 
     /**
-     * Name of the marketplace whose plugin catalog to fetch.
+     * Lists plugins advertised by a registered marketplace.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -71,7 +71,7 @@ public CompletableFuture<PluginsMarketplacesBrowseResult> browse(PluginsMarketpl
     }
 
     /**
-     * Optional marketplace name; omit to refresh all.
+     * Re-fetches one or all registered marketplace catalogs.
      * <p>
      * Invokes the method with no params, applying the runtime defaults.
      *
@@ -84,7 +84,7 @@ public CompletableFuture<PluginsMarketplacesRefreshResult> refresh() {
     }
 
     /**
-     * Optional marketplace name; omit to refresh all.
+     * Re-fetches one or all registered marketplace catalogs.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerRepoApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerRepoApi.java
new file mode 100644
index 0000000000..3db04fe14a
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerRepoApi.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 java.util.concurrent.CompletableFuture;
+import javax.annotation.processing.Generated;
+
+/**
+ * API methods for the {@code repo} namespace.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+final class ServerRepoApi {
+
+    private final RpcCaller caller;
+
+    /** API methods for the {@code repo.settings} sub-namespace. */
+    final ServerRepoSettingsApi settings;
+
+    /** @param caller the RPC transport function */
+    ServerRepoApi(RpcCaller caller) {
+        this.caller = caller;
+        this.settings = new ServerRepoSettingsApi(caller);
+    }
+
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerRepoSettingsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerRepoSettingsApi.java
new file mode 100644
index 0000000000..247545adbc
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerRepoSettingsApi.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.github.copilot.CopilotExperimental;
+import java.util.concurrent.CompletableFuture;
+import javax.annotation.processing.Generated;
+
+/**
+ * API methods for the {@code repo.settings} namespace.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+final class ServerRepoSettingsApi {
+
+    private final RpcCaller caller;
+
+    /** @param caller the RPC transport function */
+    ServerRepoSettingsApi(RpcCaller caller) {
+        this.caller = caller;
+    }
+
+    /**
+     * Atomically edits one allowed top-level repository setting. Reads the raw file, preserves unrelated keys, applies one scalar or list edit, validates the result and writes under one file lock, so concurrent sibling or list edits are not lost. A malformed or unsafe existing file returns `invalid` without a write; rejected keys, invalid values and I/O errors reject the call.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<SettingsEditResult> edit(RepoSettingsEditParams params) {
+        return caller.invoke("repo.settings.edit", params, SettingsEditResult.class);
+    }
+
+    /**
+     * Reads one repository settings file without settings normalization or layering. The existing JSONC parser accepts comments and trailing commas and applies its prototype-safety rules. Missing or blank files return an empty valid config. Invalid files return an empty config with invalid=true; other read failures reject.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<RepoSettingsReadRawResult> readRaw(RepoSettingsReadRawParams params) {
+        return caller.invoke("repo.settings.readRaw", params, RepoSettingsReadRawResult.class);
+    }
+
+    /**
+     * Writes or removes one allowed top-level repository setting through the existing validator and file lock. Preserves unrelated stored keys. Invalid keys, values, existing documents, and I/O errors reject without replacing the file. Deletion requires delete=true; otherwise value must be present.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<Void> writeKey(RepoSettingsWriteKeyParams params) {
+        return caller.invoke("repo.settings.writeKey", params, Void.class);
+    }
+
+    /**
+     * Replaces the repository-overridable settings in one locked write. Allowed keys present in settings are validated and written; allowed keys absent from settings are removed. Other input keys are ignored, and unknown keys already stored in the file remain unchanged. Invalid values or an invalid existing file reject without a partial write.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<Void> writeAll(RepoSettingsWriteAllParams params) {
+        return caller.invoke("repo.settings.writeAll", params, Void.class);
+    }
+
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerRpc.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerRpc.java
index 7eb9aa0118..51b83f9864 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerRpc.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerRpc.java
@@ -25,6 +25,20 @@ public final class ServerRpc {
 
     private final RpcCaller caller;
 
+    /** API methods for the {@code sandbox} namespace. */
+    public final ServerSandboxApi sandbox;
+    /** API methods for the {@code persistence} namespace. */
+    final ServerPersistenceApi persistence;
+    /** API methods for the {@code user} namespace. */
+    public final ServerUserApi user;
+    /** API methods for the {@code repo} namespace. */
+    final ServerRepoApi repo;
+    /** API methods for the {@code featureFlags} namespace. */
+    final ServerFeatureFlagsApi featureFlags;
+    /** API methods for the {@code permissions} namespace. */
+    final ServerPermissionsApi permissions;
+    /** API methods for the {@code managedSettings} namespace. */
+    public final ServerManagedSettingsApi managedSettings;
     /** API methods for the {@code environments} namespace. */
     public final ServerEnvironmentsApi environments;
     /** API methods for the {@code host} namespace. */
@@ -33,8 +47,6 @@ public final class ServerRpc {
     public final ServerHooksApi hooks;
     /** API methods for the {@code models} namespace. */
     public final ServerModelsApi models;
-    /** API methods for the {@code sandbox} namespace. */
-    public final ServerSandboxApi sandbox;
     /** API methods for the {@code tools} namespace. */
     public final ServerToolsApi tools;
     /** API methods for the {@code account} namespace. */
@@ -45,6 +57,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 instructions} namespace. */
+    public final ServerInstructionsApi instructions;
     /** API methods for the {@code skills} namespace. */
     public final ServerSkillsApi skills;
     /** API methods for the {@code catalog} namespace. */
@@ -53,14 +67,16 @@ public final class ServerRpc {
     public final ServerPluginsApi plugins;
     /** API methods for the {@code agents} namespace. */
     public final ServerAgentsApi agents;
-    /** API methods for the {@code instructions} namespace. */
-    public final ServerInstructionsApi instructions;
+    /** API methods for the {@code globalState} namespace. */
+    final ServerGlobalStateApi globalState;
     /** API methods for the {@code commands} namespace. */
     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 gitHubRepository} namespace. */
+    final ServerGitHubRepositoryApi gitHubRepository;
+    /** API methods for the {@code gitHubOwners} namespace. */
+    final ServerGitHubOwnersApi gitHubOwners;
+    /** API methods for the {@code git} namespace. */
+    final ServerGitApi git;
     /** API methods for the {@code runtime} namespace. */
     public final ServerRuntimeApi runtime;
     /** API methods for the {@code sessionFs} namespace. */
@@ -71,6 +87,8 @@ public final class ServerRpc {
     public final ServerSessionsApi sessions;
     /** API methods for the {@code agentRegistry} namespace. */
     public final ServerAgentRegistryApi agentRegistry;
+    /** API methods for the {@code connectors} namespace. */
+    public final ServerConnectorsApi connectors;
 
     /**
      * Creates a new server RPC client.
@@ -79,33 +97,42 @@ public final class ServerRpc {
      */
     public ServerRpc(RpcCaller caller) {
         this.caller = caller;
+        this.sandbox = new ServerSandboxApi(caller);
+        this.persistence = new ServerPersistenceApi(caller);
+        this.user = new ServerUserApi(caller);
+        this.repo = new ServerRepoApi(caller);
+        this.featureFlags = new ServerFeatureFlagsApi(caller);
+        this.permissions = new ServerPermissionsApi(caller);
+        this.managedSettings = new ServerManagedSettingsApi(caller);
         this.environments = new ServerEnvironmentsApi(caller);
         this.host = new ServerHostApi(caller);
         this.hooks = new ServerHooksApi(caller);
         this.models = new ServerModelsApi(caller);
-        this.sandbox = new ServerSandboxApi(caller);
         this.tools = new ServerToolsApi(caller);
         this.account = new ServerAccountApi(caller);
         this.secrets = new ServerSecretsApi(caller);
         this.mcp = new ServerMcpApi(caller);
         this.extensions = new ServerExtensionsApi(caller);
+        this.instructions = new ServerInstructionsApi(caller);
         this.skills = new ServerSkillsApi(caller);
         this.catalog = new ServerCatalogApi(caller);
         this.plugins = new ServerPluginsApi(caller);
         this.agents = new ServerAgentsApi(caller);
-        this.instructions = new ServerInstructionsApi(caller);
+        this.globalState = new ServerGlobalStateApi(caller);
         this.commands = new ServerCommandsApi(caller);
-        this.user = new ServerUserApi(caller);
-        this.managedSettings = new ServerManagedSettingsApi(caller);
+        this.gitHubRepository = new ServerGitHubRepositoryApi(caller);
+        this.gitHubOwners = new ServerGitHubOwnersApi(caller);
+        this.git = new ServerGitApi(caller);
         this.runtime = new ServerRuntimeApi(caller);
         this.sessionFs = new ServerSessionFsApi(caller);
         this.llmInference = new ServerLlmInferenceApi(caller);
         this.sessions = new ServerSessionsApi(caller);
         this.agentRegistry = new ServerAgentRegistryApi(caller);
+        this.connectors = new ServerConnectorsApi(caller);
     }
 
     /**
-     * Optional message to echo back to the caller.
+     * Checks server responsiveness and returns protocol information.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -116,7 +143,7 @@ public CompletableFuture<PingResult> ping(PingParams params) {
     }
 
     /**
-     * Connection-level opt-ins for the `server.connect` handshake. Transport authentication is consumed by the native protocol boundary before dispatch.
+     * 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.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -127,7 +154,7 @@ CompletableFuture<ConnectResult> connect(ConnectParams params) {
     }
 
     /**
-     * Invokes {@code registerExtensionLaunchProvider}.
+     * Registers the calling SDK client as the per-entrypoint extension launch provider. Call before creating any sessions. When omitted, the runtime uses its built-in extension launcher.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerRuntimeApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerRuntimeApi.java
index e57db70946..d09f784d8d 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerRuntimeApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerRuntimeApi.java
@@ -27,7 +27,7 @@ public final class ServerRuntimeApi {
     }
 
     /**
-     * Invokes {@code runtime.shutdown}.
+     * Gracefully shuts down an SDK-owned runtime. The response is sent only after cleanup completes; callers may then terminate the owned runtime process.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerSandboxApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerSandboxApi.java
index 2634955e4a..2db9adfedd 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerSandboxApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerSandboxApi.java
@@ -23,15 +23,142 @@ public final class ServerSandboxApi {
 
     /** API methods for the {@code sandbox.proxyCa} sub-namespace. */
     public final ServerSandboxProxyCaApi proxyCa;
+    /** API methods for the {@code sandbox.proxySecret} sub-namespace. */
+    final ServerSandboxProxySecretApi proxySecret;
+    /** API methods for the {@code sandbox.settings} sub-namespace. */
+    final ServerSandboxSettingsApi settings;
 
     /** @param caller the RPC transport function */
     ServerSandboxApi(RpcCaller caller) {
         this.caller = caller;
         this.proxyCa = new ServerSandboxProxyCaApi(caller);
+        this.proxySecret = new ServerSandboxProxySecretApi(caller);
+        this.settings = new ServerSandboxSettingsApi(caller);
     }
 
     /**
-     * Whether the host running this runtime can run the command sandbox. The runtime checks `supported` once per process. A capability answer can change while the process runs, for example after the user installs a missing package.
+     * Raises a user's sandbox settings to an administrator's managed sandbox floor and returns the result a session should actually run under. The floor can only tighten: an enterprise force-on is reflected even when the user's own `enabled` is false, and a user cannot lower a setting the floor raised. The result is normalized through the declared sandbox shape, so a key reorder or an undeclared passthrough key is not mistaken for a policy change by callers that diff two results. A host must call this rather than merge the two layers itself, because reimplementing the direction of the fold is what turns an administrator's floor into a suggestion.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<SandboxResolveFlooredConfigResult> resolveFlooredConfig(SandboxResolveFlooredConfigParams params) {
+        return caller.invoke("sandbox.resolveFlooredConfig", params, SandboxResolveFlooredConfigResult.class);
+    }
+
+    /**
+     * Builds the effective filesystem policy one `@`-file picker checks its suggestions against, so Git discovery and grant canonicalization run once for the picker's lifetime instead of on every debounced keystroke. Returns no policy when the sandbox is absent or disabled, which the paired filter reads as "keep every candidate". A host must pair this with `sandbox.filterPickerCandidates` rather than resolve a grant list itself, because the picker's grants are narrower than a file tool's — the same path a built-in tool may read can be one the picker must not offer.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<SandboxPreparePickerPolicyResult> preparePickerPolicy(SandboxPreparePickerPolicyParams params) {
+        return caller.invoke("sandbox.preparePickerPolicy", params, SandboxPreparePickerPolicyResult.class);
+    }
+
+    /**
+     * Checks a batch of `@`-file picker suggestions against a policy prepared by `sandbox.preparePickerPolicy` and returns one allow decision per candidate, positionally aligned with the request. Batched deliberately: each check canonicalizes a path component-by-component through the real filesystem, so one call amortizes that over a single hop rather than dozens while the user types. A directory the policy does not itself allow can still be kept as a waypoint to an allowed subtree. An absent policy keeps every candidate.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<SandboxFilterPickerCandidatesResult> filterPickerCandidates(SandboxFilterPickerCandidatesParams params) {
+        return caller.invoke("sandbox.filterPickerCandidates", params, SandboxFilterPickerCandidatesResult.class);
+    }
+
+    /**
+     * The sandbox a single named feature actually launches under, which is not the same as the session's sandbox. A feature is routed out of the sandbox by its own flag — `sandboxMcpServers`, `sandboxLspServers` — so an enabled session can still start one server confined and another free. Returns a disabled sandbox rather than an error when the host has no sandbox slice at all, so an absent config and an opted-out feature read alike at the launch site. A host must ask per feature rather than reuse the session config, because reading only `enabled` confines a server the user opted out of, or reports as sandboxed one that is not.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<SandboxEffectiveForOptionalResult> resolveForOptional(SandboxResolveForOptionalParams params) {
+        return caller.invoke("sandbox.resolveForOptional", params, SandboxEffectiveForOptionalResult.class);
+    }
+
+    /**
+     * Reports whether this machine can run an OS-level command sandbox at all. A host must ask before it offers sandboxing, because the answer is a property of the machine rather than of any setting: on Linux it depends on bubblewrap being installed, and on Windows on the OS build supporting BaseContainer. Probing it requires spawning a process the first time, so the answer is cached for the life of the runtime. A host that assumes support and enables the sandbox anyway produces a session in which every shell command fails.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<Boolean> checkPlatformSupport() {
+        return caller.invoke("sandbox.checkPlatformSupport", java.util.Map.of(), Boolean.class);
+    }
+
+    /**
+     * Reports whether this Windows host's BaseContainer implementation can reach the host's loopback interface directly, which is what a local-network policy needs to avoid routing through the egress proxy. Like `sandbox.checkPlatformSupport`, the answer is a property of the machine's OS build rather than of any setting, and resolving it the first time spawns a platform probe. A host that offers the direct local-network option on a machine that lacks the capability produces a session whose sandboxed commands cannot reach local services. Always false off Windows.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<Boolean> checkWindowsHostLoopbackSupport() {
+        return caller.invoke("sandbox.checkWindowsHostLoopbackSupport", java.util.Map.of(), Boolean.class);
+    }
+
+    /**
+     * The explanation a host shows when it refuses an explicit request to turn the sandbox on for a machine that cannot run one. Carries the platform-specific remedy — install bubblewrap, update Windows — and the documentation link, so a host that got `false` from `sandbox.checkPlatformSupport` does not have to compose its own reason and cannot describe the same machine differently from the runtime's own spawn path.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<String> getUnsupportedMessage() {
+        return caller.invoke("sandbox.getUnsupportedMessage", java.util.Map.of(), String.class);
+    }
+
+    /**
+     * The notice a host shows when a stored `sandbox` setting is being ignored for this session because the machine cannot enforce it. Distinct from `sandbox.getUnsupportedMessage`, which refuses an explicit request: this one reports that a setting the user already saved is inert, states that commands will run unsandboxed, and confirms the stored setting itself is left alone. A host that stays silent here leaves the user believing a sandbox is active.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<String> getUnsupportedSettingDisabledNotice() {
+        return caller.invoke("sandbox.getUnsupportedSettingDisabledNotice", java.util.Map.of(), String.class);
+    }
+
+    /**
+     * The warning a host prints at startup when a session asked for a sandbox on a machine that cannot run one. The third of the unsupported notices, and the only one that depends on the policy in force: it names the remedy the reader can actually act on, which is the stored setting for an unmanaged host, an administrator for a managed one, and waiting for the policy to resolve when the sandbox stayed on only because the policy could not be determined. Returns no notice when the machine does support a sandbox, so a host can call it unconditionally on the startup path. A host that composes its own warning tells a managed user to change a setting their policy will overwrite.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<SandboxUnsupportedStartupNoticeResult> getUnsupportedStartupNotice(SandboxGetUnsupportedStartupNoticeParams params) {
+        return caller.invoke("sandbox.getUnsupportedStartupNotice", params, SandboxUnsupportedStartupNoticeResult.class);
+    }
+
+    /**
+     * Whether one slash command stays reachable while sandbox enforcement is unavailable and the session is otherwise blocked. The permitted set is deliberately narrow — commands that only report state, and the few that let the user repair or leave the situation — and it is keyed on the arguments as well as the name, so `/sandbox status` is admitted where `/sandbox enable` is not. A host must ask rather than keep its own list: a command this returns false for is one the runtime would refuse anyway, and a divergent list either strands the user with no way out or admits a command that acts on an unenforced session.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<Boolean> checkEnforcementCommand(SandboxCheckEnforcementCommandParams params) {
+        return caller.invoke("sandbox.checkEnforcementCommand", params, Boolean.class);
+    }
+
+    /**
+     * Returns the documentation URL a host should point a user at when it declines or downgrades a sandbox setting. The runtime owns the address so every surface cites the same page and a host does not hard-code a link that later moves.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<SandboxDocsUrlResult> getDocsUrl() {
+        return caller.invoke("sandbox.getDocsUrl", java.util.Map.of(), SandboxDocsUrlResult.class);
+    }
+
+    /**
+     * Reports whether the host running this runtime can run the command sandbox, without starting a session or spawning a sandboxed command.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerSandboxProxyCaApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerSandboxProxyCaApi.java
index 0ffe1733d5..5559a0dbcb 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerSandboxProxyCaApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerSandboxProxyCaApi.java
@@ -27,7 +27,29 @@ public final class ServerSandboxProxyCaApi {
     }
 
     /**
-     * Identifies the credential hosts that the persistent certificate authority of the sandbox credential proxy must cover. The runtime always adds the hosts from the saved user settings.
+     * Reports whether this runtime process can offer installing the sandbox credential-proxy certificate authority into OS trust.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    public CompletableFuture<Boolean> checkInstallationSupport() {
+        return caller.invoke("sandbox.proxyCa.checkInstallationSupport", java.util.Map.of(), Boolean.class);
+    }
+
+    /**
+     * Reports whether this sandbox configuration uses the credential proxy and can need certificate-authority setup.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    public CompletableFuture<Boolean> checkRelevance(SandboxProxyCaCheckRelevanceParams params) {
+        return caller.invoke("sandbox.proxyCa.checkRelevance", params, Boolean.class);
+    }
+
+    /**
+     * Reports whether the persistent certificate authority of the sandbox credential proxy exists, whether OS trust includes it, and whether it must be rotated. Changes nothing.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -38,7 +60,7 @@ public CompletableFuture<SandboxProxyCaGetStatusResult> getStatus(SandboxProxyCa
     }
 
     /**
-     * Identifies the credential hosts that the persistent certificate authority of the sandbox credential proxy must cover. The runtime always adds the hosts from the saved user settings.
+     * Creates the persistent certificate authority of the sandbox credential proxy if none is stored, without changing OS trust, and returns the path of its public certificate. Keeps an existing certificate authority, even one that must be rotated. Fails where OS trust is unsupported. Trust it with sandbox.proxyCa.trust: the CLI trusts only the hosts in the saved user settings, so it refuses a certificate authority that also covers hosts from sandboxConfig.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -49,7 +71,7 @@ public CompletableFuture<SandboxProxyCaCreateResult> create(SandboxProxyCaCreate
     }
 
     /**
-     * Identifies the credential hosts that the persistent certificate authority of the sandbox credential proxy must cover. The runtime always adds the hosts from the saved user settings.
+     * Replaces the persistent certificate authority of the sandbox credential proxy with a new one for the current credential hosts. If OS trust included the old one, removes it and trusts the new one, which can show an OS authentication prompt. Running sandboxed tools keep the old certificate authority until they restart.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -60,7 +82,7 @@ public CompletableFuture<SandboxProxyCaRotateResult> rotate(SandboxProxyCaRotate
     }
 
     /**
-     * Identifies the credential hosts that the persistent certificate authority of the sandbox credential proxy must cover. The runtime always adds the hosts from the saved user settings.
+     * Adds the persistent certificate authority of the sandbox credential proxy to OS trust, so sandboxed clients that read only OS trust accept the proxy. Call create first. Refuses a certificate authority that is not constrained to the current credential hosts. Can show an OS authentication prompt.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -71,7 +93,7 @@ public CompletableFuture<SandboxProxyCaTrustResult> trust(SandboxProxyCaTrustPar
     }
 
     /**
-     * Status of the persistent certificate authority of the sandbox credential proxy.
+     * Removes the persistent certificate authority of the sandbox credential proxy from OS trust. Keeps the stored certificate authority. Can show an OS authentication prompt. Sandboxed clients that read only OS trust then reject the proxy; clients that read the per-process certificate bundle continue to work.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerSandboxProxySecretApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerSandboxProxySecretApi.java
new file mode 100644
index 0000000000..1432755fac
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerSandboxProxySecretApi.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.github.copilot.CopilotExperimental;
+import java.util.concurrent.CompletableFuture;
+import javax.annotation.processing.Generated;
+
+/**
+ * API methods for the {@code sandbox.proxySecret} namespace.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+final class ServerSandboxProxySecretApi {
+
+    private final RpcCaller caller;
+
+    /** @param caller the RPC transport function */
+    ServerSandboxProxySecretApi(RpcCaller caller) {
+        this.caller = caller;
+    }
+
+    /**
+     * Reports where this runtime keeps the sandbox proxy password: the credential store directory and the entry identifier within it. Both are derived from the configuration directory this runtime was started with, so a host does not resolve them itself. Read this to recognize a `${secret:…}` value in stored sandbox settings as this runtime's own proxy password rather than a reference the user wrote by hand. Marked internal because it exists to carry a CLI call site off the napi boundary onto the SDK contract.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<SandboxProxySecretLocation> getLocation() {
+        return caller.invoke("sandbox.proxySecret.getLocation", java.util.Map.of(), SandboxProxySecretLocation.class);
+    }
+
+    /**
+     * Reads the stored sandbox proxy password from the credential store `sandbox.proxySecret.getLocation` names, preferring the OS keychain and falling back to the on-disk store. Reports an absent value rather than failing when no entry exists. Marked internal because it exists to carry a CLI call site off the napi boundary onto the SDK contract.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<SandboxProxySecretGetResult> get() {
+        return caller.invoke("sandbox.proxySecret.get", java.util.Map.of(), SandboxProxySecretGetResult.class);
+    }
+
+    /**
+     * Stores the sandbox proxy password in the credential store `sandbox.proxySecret.getLocation` names, replacing any existing entry. Reports whether the OS keychain accepted it or it fell back to the on-disk store. Marked internal because it exists to carry a CLI call site off the napi boundary onto the SDK contract.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<SandboxProxySecretSaveResult> save(SandboxProxySecretSaveParams params) {
+        return caller.invoke("sandbox.proxySecret.save", params, SandboxProxySecretSaveResult.class);
+    }
+
+    /**
+     * Removes the stored sandbox proxy password from the credential store `sandbox.proxySecret.getLocation` names. Succeeds when no entry exists, so it is safe to call while clearing a proxy password whose origin is unknown. Marked internal because it exists to carry a CLI call site off the napi boundary onto the SDK contract.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<Void> delete() {
+        return caller.invoke("sandbox.proxySecret.delete", java.util.Map.of(), Void.class);
+    }
+
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerSandboxSettingsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerSandboxSettingsApi.java
new file mode 100644
index 0000000000..4d323a03ac
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerSandboxSettingsApi.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.databind.JsonNode;
+import com.github.copilot.CopilotExperimental;
+import java.util.concurrent.CompletableFuture;
+import javax.annotation.processing.Generated;
+
+/**
+ * API methods for the {@code sandbox.settings} namespace.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+final class ServerSandboxSettingsApi {
+
+    private final RpcCaller caller;
+
+    /** @param caller the RPC transport function */
+    ServerSandboxSettingsApi(RpcCaller caller) {
+        this.caller = caller;
+    }
+
+    /**
+     * Resolves a stored sandbox settings object into the effective one, filling every value the user left unset with its default. Read this to render or reason about the sandbox configuration a session would actually run under, rather than the sparse document the user wrote.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<JsonNode> applyDefaults(SandboxSettingsApplyDefaultsParams params) {
+        return caller.invoke("sandbox.settings.applyDefaults", params, JsonNode.class);
+    }
+
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerSecretsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerSecretsApi.java
index 7f17687818..ebdcac5e9e 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerSecretsApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerSecretsApi.java
@@ -27,7 +27,7 @@ public final class ServerSecretsApi {
     }
 
     /**
-     * Secret values to add to the redaction filter.
+     * Registers secret values for redaction in session logs and exports. The SDK calls this to inject dynamically generated secret values (e.g., OIDC tokens).
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerSessionFsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerSessionFsApi.java
index 872702997a..ff48cdfb76 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerSessionFsApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerSessionFsApi.java
@@ -27,7 +27,7 @@ public final class ServerSessionFsApi {
     }
 
     /**
-     * Initial working directory, session-state path layout, and path conventions used to register the calling SDK client as the session filesystem provider. A registered provider is authoritative for path interpretation and filesystem facts used by workspace permission validation. Paths are interpreted lexically; home-relative paths (`~` and `~/...`) and Windows drive-relative paths such as `C:foo` are unsupported. Until provider-side canonicalization is supported, providers must not expose symlinks inside allowed roots that escape those roots.
+     * Registers an SDK client as the session filesystem provider.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerSessionsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerSessionsApi.java
index 0b7f099245..fd963c0cbd 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerSessionsApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerSessionsApi.java
@@ -28,7 +28,7 @@ public final class ServerSessionsApi {
     }
 
     /**
-     * Open a session by creating, resuming, attaching, connecting to a remote, or handing off.
+     * Creates or resumes a local session and returns the opened session ID.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -39,7 +39,7 @@ public CompletableFuture<SessionsOpenResult> open(SessionsOpenParams params) {
     }
 
     /**
-     * Source session identifier to fork from, optional event-ID boundary, and optional friendly name for the new session.
+     * Creates a new session by forking persisted history from an existing session.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -50,7 +50,7 @@ public CompletableFuture<SessionsForkResult> fork(SessionsForkParams params) {
     }
 
     /**
-     * Remote session connection parameters.
+     * Connects to an existing remote session and exposes it as an SDK session.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -61,7 +61,7 @@ public CompletableFuture<SessionsConnectResult> connect(SessionsConnectParams pa
     }
 
     /**
-     * Optional source filter, metadata-load limit, and context filter applied to the returned sessions.
+     * Lists sessions, optionally filtered by source and working-directory context. Returned entries are discriminated by `isRemote`: local entries carry only the lightweight `LocalSessionMetadataValue` shape; remote entries carry the full `RemoteSessionMetadataValue` shape (repository, PR number, taskType, etc.).
      * <p>
      * Invokes the method with no params, applying the runtime defaults.
      *
@@ -74,7 +74,7 @@ public CompletableFuture<SessionsListResult> list() {
     }
 
     /**
-     * Optional source filter, metadata-load limit, and context filter applied to the returned sessions.
+     * Lists sessions, optionally filtered by source and working-directory context. Returned entries are discriminated by `isRemote`: local entries carry only the lightweight `LocalSessionMetadataValue` shape; remote entries carry the full `RemoteSessionMetadataValue` shape (repository, PR number, taskType, etc.).
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -85,7 +85,7 @@ public CompletableFuture<SessionsListResult> list(SessionsListParams params) {
     }
 
     /**
-     * Session ID whose persisted metadata should be read.
+     * Reads lightweight persisted metadata for one local session without opening it.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -96,7 +96,7 @@ CompletableFuture<SessionsGetMetadataResult> getMetadata(SessionsGetMetadataPara
     }
 
     /**
-     * Bounded batch request for client-owned metadata from persisted local sessions.
+     * Reads client-owned metadata for multiple persisted local sessions without opening them. Results preserve request order and report missing, corrupt, unsupported, or temporarily unavailable sessions independently.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -107,7 +107,7 @@ public CompletableFuture<List<Object>> getClientMetadata(SessionsGetClientMetada
     }
 
     /**
-     * Pagination options for reading an inactive or active local session's persisted event journal.
+     * Reads a page of durable events directly from a local session's persisted journal without creating, resuming, or activating the session. The first read pins the currently opened journal generation and its byte-length boundary; opaque cursor continuations remain on that generation across runtime-owned compaction, truncation, and rewrite operations, which replace the live path atomically, and events appended after the boundary are excluded. For cold hydration, await the first successful page before activation and establish lossless live-event buffering before resume; merge subsequent live events by ID, preserving persisted order and letting live payloads win. Continuations are process-local, single-use capabilities bound to the originating session and storage context and must be paged sequentially; concurrent or repeated use of the same cursor expires that duplicate read rather than reading the generation twice. A complete snapshot has cursorStatus 'ok' and hasMore false. Snapshots expire after five idle minutes, with at most eight retained per process and idle-only eviction under pressure; completion and cancelled-worker exit release their handles. No transcript copy is created, but retained handles may keep replaced files' disk blocks alive until release. Pages have a soft 1 MiB serialized event-array budget including resolved binary assets; one oversized event is returned alone to guarantee progress. Working memory also includes a record/lookahead and asset resolution; resolving the first binary reference may scan the full pinned generation to build a bounded offset index. If the snapshot expires, is evicted, is cancelled before a continuation is established, or becomes unreadable after an observable unsupported in-place shortening, the continuation returns cursorStatus 'expired' with an empty terminal page and never falls back to a different generation. A missing or initially unreadable journal is an RPC error. Persisted history excludes ephemeral events and may omit payloads that are reconstructed only for an active session; use the active session event stream for post-resume live events.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -118,7 +118,7 @@ public CompletableFuture<SessionsReadPersistedEventsResult> readPersistedEvents(
     }
 
     /**
-     * Limit for non-empty local session IDs.
+     * Lists recent local session IDs that contain user-visible history, omitting housekeeping-only sessions.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -129,7 +129,7 @@ CompletableFuture<SessionsListNonEmptySessionIdsResult> listNonEmptySessionIds(S
     }
 
     /**
-     * GitHub task ID to look up.
+     * Finds the local session bound to a GitHub task ID, if any.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -140,7 +140,7 @@ public CompletableFuture<SessionsFindByTaskIdResult> findByTaskId(SessionsFindBy
     }
 
     /**
-     * UUID prefix to resolve to a unique session ID.
+     * Resolves a UUID prefix to a unique session ID, if exactly one session matches.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -151,7 +151,7 @@ public CompletableFuture<SessionsFindByPrefixResult> findByPrefix(SessionsFindBy
     }
 
     /**
-     * Optional working-directory context used to score session relevance.
+     * Returns the most-relevant prior session for a given working-directory context.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -162,7 +162,7 @@ public CompletableFuture<SessionsGetLastForContextResult> getLastForContext(Sess
     }
 
     /**
-     * Session ID whose event-log file path to compute.
+     * Computes the absolute path to a session's persisted events.jsonl file. Internal: filesystem paths are only meaningful in-process (CLI and runtime share a filesystem). Currently used by the CLI's contribution-graph feature to read historical events directly. Remote SDK consumers must not depend on this; a proper event-query API would replace it if the contribution graph ever needed to work over the wire.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -173,7 +173,7 @@ CompletableFuture<SessionsGetEventFilePathResult> getEventFilePath(SessionsGetEv
     }
 
     /**
-     * Map of sessionId -> on-disk size in bytes for each session's workspace directory.
+     * Returns the on-disk byte size of each session's workspace directory.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -184,7 +184,7 @@ public CompletableFuture<SessionsGetSizesResult> getSizes() {
     }
 
     /**
-     * Session IDs to test for live in-use locks.
+     * Returns the subset of the supplied session IDs that are currently held by another running process.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -195,7 +195,7 @@ public CompletableFuture<SessionsCheckInUseResult> checkInUse(SessionsCheckInUse
     }
 
     /**
-     * Session ID to look up the persisted remote-steerable flag for.
+     * Returns a session's persisted remote-steerable flag, if any has been recorded. Internal: this is CLI-specific book-keeping used by `--continue` / `--resume` to inherit the prior session's remote-steerable preference. SDK consumers that want similar behavior should manage their own persistence around start/stop calls rather than relying on this runtime-side flag.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -206,7 +206,7 @@ CompletableFuture<SessionsGetPersistedRemoteSteerableResult> getPersistedRemoteS
     }
 
     /**
-     * Session ID to close.
+     * Closes a session: emits shutdown, flushes pending events, releases the in-use lock, and disposes the active session.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -217,7 +217,7 @@ public CompletableFuture<Void> close(SessionsCloseParams params) {
     }
 
     /**
-     * Session IDs to close, deactivate, and delete from disk.
+     * Closes, deactivates, and deletes a set of sessions, returning the bytes freed per session.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -228,7 +228,7 @@ public CompletableFuture<SessionsBulkDeleteResult> bulkDelete(SessionsBulkDelete
     }
 
     /**
-     * Session ID to delete from disk.
+     * Deletes one local session from disk after running the same lifecycle hooks as the session manager.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -239,7 +239,7 @@ CompletableFuture<Void> delete(SessionsDeleteParams params) {
     }
 
     /**
-     * Age threshold and optional flags controlling which old sessions are pruned (or simulated when dryRun is true).
+     * Deletes sessions older than the given threshold, with optional dry-run and exclusion list.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -250,7 +250,7 @@ public CompletableFuture<SessionsPruneOldResult> pruneOld(SessionsPruneOldParams
     }
 
     /**
-     * Session ID whose pending events should be flushed to disk.
+     * Flushes a session's pending events to disk.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -261,7 +261,7 @@ public CompletableFuture<Void> save(SessionsSaveParams params) {
     }
 
     /**
-     * Session ID whose in-use lock should be released.
+     * Releases the in-use lock held by this process for a session.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -272,7 +272,7 @@ public CompletableFuture<Void> releaseLock(SessionsReleaseLockParams params) {
     }
 
     /**
-     * Session metadata records to enrich with summary and context information.
+     * Backfills missing summary and context fields on the supplied session metadata records.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -283,7 +283,40 @@ public CompletableFuture<SessionsEnrichMetadataResult> enrichMetadata(SessionsEn
     }
 
     /**
-     * Active session ID and an optional flag for deferring repo-level hooks until folder trust.
+     * Creates the workspace record for a session that has not been opened yet. A host that hands a session off to another application — writing the record and then launching that application against the session ID — needs the record on disk before any session exists to carry it, which the session-scoped workspace methods cannot do. Replaces any existing record and resets the checkpoint index. When writing to the local filesystem, a stored `fork_count` survives on disk. Returns the record it built, so a surviving stored `fork_count` can differ from the answer.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<SessionsCreateWorkspaceResult> createWorkspace(SessionsCreateWorkspaceParams params) {
+        return caller.invoke("sessions.createWorkspace", params, SessionsCreateWorkspaceResult.class);
+    }
+
+    /**
+     * Reads a session's workspace record straight from disk, without opening the session. Resuming by session ID has to know where the session lives before it can connect, so the lookup cannot come from the session-scoped workspace methods, which resolve their location from a live session's context. Returns no record when the file is absent.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<SessionsLoadWorkspaceResult> loadWorkspace(SessionsLoadWorkspaceParams params) {
+        return caller.invoke("sessions.loadWorkspace", params, SessionsLoadWorkspaceResult.class);
+    }
+
+    /**
+     * Merges fields into a session's workspace record on disk, creating the record when it is absent. The counterpart to `sessions.loadWorkspace`, for the same before-the-session-exists case. It preserves stored workspace-schema fields the request does not supply, does not preserve stored keys outside the workspace schema, and never replaces a stored `fork_count`.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<Void> updateWorkspaceFields(SessionsUpdateWorkspaceFieldsParams params) {
+        return caller.invoke("sessions.updateWorkspaceFields", params, Void.class);
+    }
+
+    /**
+     * Reloads user, plugin, and (optionally) repo hooks on the active session.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -294,7 +327,7 @@ public CompletableFuture<Void> reloadPluginHooks(SessionsReloadPluginHooksParams
     }
 
     /**
-     * Active session ID whose deferred repo-level hooks should be loaded.
+     * Loads previously-deferred repo-level hooks on the active session, returning queued startup prompts.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -305,7 +338,7 @@ public CompletableFuture<SessionsLoadDeferredRepoHooksResult> loadDeferredRepoHo
     }
 
     /**
-     * Manager-wide additional plugins to register; replaces any previously-configured set.
+     * Replaces the manager-wide additional plugins registered with the session manager.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -316,7 +349,7 @@ public CompletableFuture<Void> setAdditionalPlugins(SessionsSetAdditionalPlugins
     }
 
     /**
-     * Session ID whose board entry count should be returned.
+     * Gets the dynamic-context board entry count associated with a session, when available. Internal: this exists solely so CLI telemetry events (`rem_spawn_gate`, `rem_consolidation_complete`) can pair START / END board counts around the detached rem-agent spawn. "Dynamic context board" is a runtime-internal concept that is not part of the public SDK contract; the long-term plan is to relocate the telemetry emission into the runtime so this method can be deleted entirely.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -327,7 +360,7 @@ CompletableFuture<SessionsGetBoardEntryCountResult> getBoardEntryCount(SessionsG
     }
 
     /**
-     * Parameters for attaching the remote-control singleton to a session.
+     * Attaches the runtime-managed remote-control singleton to a session, awaiting initial setup. If remote control is already attached to a different session, the singleton is transferred (preserving the underlying Mission Control connection). Returns the final status.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -338,7 +371,7 @@ public CompletableFuture<SessionsStartRemoteControlResult> startRemoteControl(Se
     }
 
     /**
-     * Parameters for atomically rebinding the remote-control singleton.
+     * Atomically rebinds the remote-control singleton to a different session, preserving the underlying Mission Control connection. When `expectedFromSessionId` is provided and does not match the singleton's current `attachedSessionId`, the transfer is rejected with `transferred: false` and the current status is returned unchanged.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -349,7 +382,7 @@ public CompletableFuture<SessionsTransferRemoteControlResult> transferRemoteCont
     }
 
     /**
-     * Patch for the singleton's steering state.
+     * Patches the steering state of the active remote-control singleton. When remote control is off, this is a no-op and the off status is returned. Today only `enabled: true` is actionable on the underlying exporter; passing `false` is reserved for future use.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -360,7 +393,7 @@ public CompletableFuture<SessionsSetRemoteControlSteeringResult> setRemoteContro
     }
 
     /**
-     * Parameters for stopping the remote-control singleton.
+     * Stops the remote-control singleton. When `expectedSessionId` is provided and does not match the singleton's current `attachedSessionId`, the stop is rejected with `stopped: false` and the current status is returned unchanged (unless `force` is set, in which case the singleton is unconditionally torn down).
      * <p>
      * Invokes the method with no params, applying the runtime defaults.
      *
@@ -373,7 +406,7 @@ public CompletableFuture<SessionsStopRemoteControlResult> stopRemoteControl() {
     }
 
     /**
-     * Parameters for stopping the remote-control singleton.
+     * Stops the remote-control singleton. When `expectedSessionId` is provided and does not match the singleton's current `attachedSessionId`, the stop is rejected with `stopped: false` and the current status is returned unchanged (unless `force` is set, in which case the singleton is unconditionally torn down).
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -384,7 +417,7 @@ public CompletableFuture<SessionsStopRemoteControlResult> stopRemoteControl(Sess
     }
 
     /**
-     * Wrapper for the singleton's current status.
+     * Returns the current state of the remote-control singleton, including the attached session id and frontend URL when active.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -395,7 +428,7 @@ public CompletableFuture<SessionsGetRemoteControlStatusResult> getRemoteControlS
     }
 
     /**
-     * Params to attach or detach an in-process ExtensionController delegate.
+     * Attaches (or detaches) an in-process ExtensionController delegate for the given session in a local host adapter. Pass `controller: undefined` to detach. Internal because the controller cannot cross the JSON-RPC boundary; the runtime manages its own session extension service.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerSkillsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerSkillsApi.java
index 2f77e8da88..a3e7dc7c58 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerSkillsApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerSkillsApi.java
@@ -8,6 +8,7 @@
 package com.github.copilot.generated.rpc;
 
 import com.github.copilot.CopilotExperimental;
+import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 import javax.annotation.processing.Generated;
 
@@ -34,7 +35,7 @@ public final class ServerSkillsApi {
     }
 
     /**
-     * Side-effect-free planning of one verified Agent Finder Skill candidate.
+     * Plans installation of a verified Agent Finder Skill candidate without writing files. The returned review is safe to present to a user and installing always leaves the Skill disabled until separately enabled.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -45,7 +46,7 @@ public CompletableFuture<SkillInstallationManagementResult> planInstall(SkillsPl
     }
 
     /**
-     * Applies exactly one retained verified Skill installation plan.
+     * Consumes one verified Skill installation plan, requests explicit human consent through installations.confirm on the original connection, then revalidates and installs the Skill disabled.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -56,7 +57,7 @@ public CompletableFuture<SkillInstallationResult> applyInstall(SkillsApplyInstal
     }
 
     /**
-     * Read-only preparation of one owned Skill removal under fresh selected-session authority.
+     * Prepares a read-only removal plan for an owned verified Agent Finder Skill installation. Uninstall planning is never gated by the Skill-install feature flag.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -67,7 +68,7 @@ public CompletableFuture<SkillInstallationManagementResult> planUninstall(Skills
     }
 
     /**
-     * One-use application of the exact retained Skill removal plan.
+     * Consumes an owned Skill removal plan, requests explicit human consent through installations.confirm, refuses drift, and removes the exact owned files through quarantine.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -78,7 +79,7 @@ public CompletableFuture<SkillInstallationResult> applyUninstall(SkillsApplyUnin
     }
 
     /**
-     * Optional project paths and additional skill directories to include in discovery.
+     * Discovers skills across global and project sources.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -89,7 +90,7 @@ public CompletableFuture<SkillsDiscoverResult> discover(SkillsDiscoverParams par
     }
 
     /**
-     * Optional project paths to enumerate.
+     * Returns the canonical directories where a client may create skills that the runtime will recognize, including ones that do not exist yet. Project directories become active once created.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -99,4 +100,17 @@ public CompletableFuture<SkillsGetDiscoveryPathsResult> getDiscoveryPaths(Skills
         return caller.invoke("skills.getDiscoveryPaths", params, SkillsGetDiscoveryPathsResult.class);
     }
 
+    /**
+     * Returns the canonical directories where a client may create skills that the runtime will recognize, including ones that do not exist yet. Project directories become active once created.
+     * <p>
+     * Accepts the extensible request, including inputs added after the params record.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    public CompletableFuture<SkillsGetDiscoveryPathsResult> getDiscoveryPaths(SkillsGetDiscoveryPathsRequest request) {
+        return caller.invoke("skills.getDiscoveryPaths", Objects.requireNonNull(request, "request"), SkillsGetDiscoveryPathsResult.class);
+    }
+
 }
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerSkillsConfigApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerSkillsConfigApi.java
index c29770bf14..35cf2e2ef1 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerSkillsConfigApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerSkillsConfigApi.java
@@ -27,7 +27,7 @@ public final class ServerSkillsConfigApi {
     }
 
     /**
-     * Skill names to mark as disabled in global configuration, replacing any previous list.
+     * Replaces the global list of disabled skills.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -38,7 +38,7 @@ public CompletableFuture<Void> setDisabledSkills(SkillsConfigSetDisabledSkillsPa
     }
 
     /**
-     * Adds or removes a single skill from the global disabled list, leaving every other entry untouched.
+     * Atomically adds or removes one skill from the disabled list.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerSkillsInstallationsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerSkillsInstallationsApi.java
index e0d0afe72a..51029bc363 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerSkillsInstallationsApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerSkillsInstallationsApi.java
@@ -27,7 +27,7 @@ public final class ServerSkillsInstallationsApi {
     }
 
     /**
-     * Inventory request under an explicitly selected existing session.
+     * Lists owned verified Agent Finder Skill installations for the selected existing session. Listing is never gated by the Skill-install feature flag.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -38,7 +38,7 @@ public CompletableFuture<SkillInstallationManagementResult> list(SkillsInstallat
     }
 
     /**
-     * Inventory request under an explicitly selected existing session.
+     * Reconciles interrupted owned Skill installation work for the selected existing session, then inspects owned inventory. Recovery is never gated by the Skill-install feature flag.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -49,7 +49,7 @@ public CompletableFuture<SkillInstallationManagementResult> recover(SkillsInstal
     }
 
     /**
-     * Existing-operation control. A new session selector is deliberately not accepted.
+     * Inspects a known Skill installation operation on its original runtime connection. Status is never gated by the Skill-install feature flag.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -60,7 +60,7 @@ public CompletableFuture<SkillInstallationManagementResult> status(SkillsInstall
     }
 
     /**
-     * Existing-operation control. A new session selector is deliberately not accepted.
+     * Requests cancellation of a known Skill installation operation before commit. Already-started durable work requires recovery instead of silent replay.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -71,7 +71,7 @@ public CompletableFuture<SkillInstallationManagementResult> cancel(SkillsInstall
     }
 
     /**
-     * Persisted enablement update for one owned Skill installation.
+     * Atomically persists enablement for one owned Agent Finder Skill and reconciles the selected bound session. Enablement is installation-scoped by receipt identity and is never gated by the Skill-install feature flag.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerToolsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerToolsApi.java
index 2938010010..6f3b3b8759 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerToolsApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerToolsApi.java
@@ -27,7 +27,7 @@ public final class ServerToolsApi {
     }
 
     /**
-     * Optional model identifier whose tool overrides should be applied to the listing.
+     * Lists built-in tools available for a model.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerUserSettingsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerUserSettingsApi.java
index 665cfb107a..75c8e38934 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerUserSettingsApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/ServerUserSettingsApi.java
@@ -7,6 +7,7 @@
 
 package com.github.copilot.generated.rpc;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import com.github.copilot.CopilotExperimental;
 import java.util.concurrent.CompletableFuture;
 import javax.annotation.processing.Generated;
@@ -27,18 +28,161 @@ public final class ServerUserSettingsApi {
     }
 
     /**
-     * Invokes {@code user.settings.reload}.
+     * Adds or removes one hook key in the user `disabledHooks` setting, rewriting settings.json in place and leaving every other setting untouched. Reports a typed outcome rather than failing the call, so a host can tell an unparseable settings file apart from a write that could not complete.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
      */
     @CopilotExperimental
-    public CompletableFuture<Void> reload() {
-        return caller.invoke("user.settings.reload", java.util.Map.of(), Void.class);
+    CompletableFuture<UserSettingsSetHookDisabledResult> setHookDisabled(UserSettingsSetHookDisabledParams params) {
+        return caller.invoke("user.settings.setHookDisabled", params, UserSettingsSetHookDisabledResult.class);
     }
 
     /**
-     * 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.
+     * Reads the user's settings document exactly as `user.settings.load` does, but from a caller-supplied configuration directory instead of the one the server resolved for itself. Use this when a consumer scopes a session to its own Copilot home — the SDK's per-session `configDir` override — so the settings read match the directory that session actually uses. An absent or empty `configDir` resolves the server's own home, making this identical to `user.settings.load`. Hook-validation relaxations are deliberately not caller-supplied: they continue to come from the server's environment, so a consumer cannot widen the host's hook policy through this method.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<JsonNode> loadForConfigDir(UserSettingsLoadForConfigDirParams params) {
+        return caller.invoke("user.settings.loadForConfigDir", params, JsonNode.class);
+    }
+
+    /**
+     * Reads a repository's checked-in settings document as stored, normalized, together with any diagnostic raised while reading it. This is the repository half of the layering `user.settings.get` reports: `user.settings.load` reads the user's own document, and this reads the one a repository checks in to govern the keys `user.settings.governanceKeys` lists as repo-governable. A document that fails to parse, or that sets a key a repository may not govern, is reported through `warning` while the settings that did load are still returned, so a consumer surfaces the diagnostic and continues rather than failing the session. When `repoRoot` is the user's home directory the Claude-compatible configuration is skipped, so a home-directory session does not inherit a personal config as repository policy.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<UserSettingsLoadRepoResult> loadRepo(UserSettingsLoadRepoParams params) {
+        return caller.invoke("user.settings.loadRepo", params, UserSettingsLoadRepoResult.class);
+    }
+
+    /**
+     * Reads a repository's settings and merges them over a supplied user layer in one step, returning the settings a consumer should act on inside that repository. Use this rather than reading the two layers separately: the merge is per setting and collection-aware, so a repository adds to the collections it is allowed to influence without replacing the user's own entries, and a whole-document overlay would get that wrong. Any diagnostic raised while reading the repository layer is returned rather than printed, so the consumer decides how to surface it; the settings that did load are merged regardless.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<UserSettingsLoadAndMergeRepoResult> loadAndMergeRepo(UserSettingsLoadAndMergeRepoParams params) {
+        return caller.invoke("user.settings.loadAndMergeRepo", params, UserSettingsLoadAndMergeRepoResult.class);
+    }
+
+    /**
+     * Reports the on-disk path of the settings document `user.settings.load` and `user.settings.set` read and write. Resolved the same way those methods resolve it, so a host that shows or opens the settings file names the file the runtime actually uses, including the extensionless legacy `settings` file when that is what is present.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<UserSettingsPathResult> getPath() {
+        return caller.invoke("user.settings.getPath", java.util.Map.of(), UserSettingsPathResult.class);
+    }
+
+    /**
+     * Reads the user's stored settings together with the diagnostic raised while reading them. This is `user.settings.load` plus the reason part of the document was ignored: that one answers the document alone, so a caller cannot tell a clean read from a salvaged one. Read this when the caller is about to write the file back, where accepting a partial parse would discard every value the loader could not read. The settings that did load are still reported alongside the warning, so a consumer may surface it and continue instead of failing.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<UserSettingsLoadWithWarningResult> loadWithWarning() {
+        return caller.invoke("user.settings.loadWithWarning", java.util.Map.of(), UserSettingsLoadWithWarningResult.class);
+    }
+
+    /**
+     * Folds a user settings layer over a managed (enterprise policy) layer and returns the merged settings. The managed layer's governance keys win, `autoTier` resolves through its overridable form, and the two per-entry control maps (`enabledPlugins`, `extraKnownMarketplaces`) union across the layers and are then stamped back from the managed layer, so each entry an administrator declares wins while the user keeps control of the rest. The parameters are named for their layers rather than being a generic base/override pair: nothing about a settings object identifies which layer produced it, so the runtime cannot detect a transposed call, and transposing one resolves the governance keys in the user's favour instead of the administrator's. Supplying only one layer returns it unchanged, and supplying neither returns an empty object. Rejects a managed `autoTier` that is neither a user-configurable tier nor a single-key overridable form, rather than silently dropping it.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<UserSettingsMergeManagedAndUserResult> mergeManagedAndUser(UserSettingsMergeManagedAndUserParams params) {
+        return caller.invoke("user.settings.mergeManagedAndUser", params, UserSettingsMergeManagedAndUserResult.class);
+    }
+
+    /**
+     * Folds a repository's settings layer into the user layer. Each repo-overridable key carries a directional policy chosen so a repository can only add restrictions and never relax the user's own. The two per-entry managed control maps are the exception those directional rules cannot express — a repository may legitimately enable plugins and declare marketplaces — so they are re-stamped afterwards from the runtime's ambient managed policy. That makes the result depend on the runtime process's managed state and not on the arguments alone: a host must call this rather than reimplement the fold, or a repository could relax a restriction the administrator imposed. Rejects when either layer is not a JSON object.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<UserSettingsMergeRepoValueResult> mergeRepoValue(UserSettingsMergeRepoValueParams params) {
+        return caller.invoke("user.settings.mergeRepoValue", params, UserSettingsMergeRepoValueResult.class);
+    }
+
+    /**
+     * Runs the one-time migration that moves a staff account's update channel to stable, and records that it ran. Idempotent and self-gating: it takes a lock over the global-state file, re-reads the completion stamp inside it, and returns `current` rather than migrating twice, so two hosts racing at startup cannot both migrate. Only a `migrated` status means the persisted settings changed and the caller should reload them. An account on the experimental channel is deliberately left alone and reported as `excluded-experimental`.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<UserSettingsMigrateStaffUpdateChannelOnceResult> migrateStaffUpdateChannelOnce(UserSettingsMigrateStaffUpdateChannelOnceParams params) {
+        return caller.invoke("user.settings.migrateStaffUpdateChannelOnce", params, UserSettingsMigrateStaffUpdateChannelOnceResult.class);
+    }
+
+    /**
+     * Runs the one-time reset that clears a staff account's pinned model selection, and reports the timestamp the host should record. Idempotent and self-gating: the reset is gated on a fixed cutoff, so a caller that passes back the timestamp it recorded gets `didReset: false` rather than a second reset. It applies to staff accounts only; any other account is reported as not reset without the settings document being opened. Only `didReset: true` means the persisted settings changed, and only then are the updated settings returned for the host to adopt.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<UserSettingsResetStaffModelSelectionOnceResult> resetStaffModelSelectionOnce(UserSettingsResetStaffModelSelectionOnceParams params) {
+        return caller.invoke("user.settings.resetStaffModelSelectionOnce", params, UserSettingsResetStaffModelSelectionOnceResult.class);
+    }
+
+    /**
+     * Reports the top-level keys in the user settings document that the runtime does not recognize, phrased for display to the user. This is a separate question from the warning `user.settings.loadWithWarning` returns: that one describes parts of the document the loader had to ignore to load the rest, whereas an unknown key parses cleanly and is simply not a setting, so a host that surfaces only the load warning silently accepts a misspelled key that will never take effect. Nothing is reported when the document is absent, unreadable, or failed to load, because an unknown-key list derived from a document the runtime could not read would be misleading rather than helpful. Inspection never modifies the document.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<UserSettingsUnknownKeysWarningResult> getUnknownKeysWarning(UserSettingsGetUnknownKeysWarningParams params) {
+        return caller.invoke("user.settings.getUnknownKeysWarning", params, UserSettingsUnknownKeysWarningResult.class);
+    }
+
+    /**
+     * Resolves the effective runtime settings for a host that is about to start a session, layering the given overrides over the settings documents, the environment and the platform defaults. A host cannot assemble this itself: the precedence between a user document, a repository document, the managed layers and the environment is the runtime's own rule, and a host that re-implements it drifts from the server it is configuring. The working directory, environment and platform are taken as arguments rather than read from the server process, so a host resolving settings for a directory other than its own gets that directory's answer. Nothing is written; this only computes.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<JsonNode> buildRuntime(UserSettingsBuildRuntimeParams params) {
+        return caller.invoke("user.settings.buildRuntime", params, JsonNode.class);
+    }
+
+    /**
+     * Runs the one-time migration that moves a staff account's log level to the current default, and records that it ran. Idempotent and self-gating: it takes a lock over the global-state file and re-reads the completion stamp inside it, so two hosts racing at startup cannot both migrate. Only `refreshed` can have changed the persisted settings, and the settings it returns are the document re-read after the write, so a host should adopt them rather than reloading separately and racing the next writer.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<UserSettingsMigrateStaffLogLevelOnceResult> migrateStaffLogLevelOnce(UserSettingsMigrateStaffLogLevelOnceParams params) {
+        return caller.invoke("user.settings.migrateStaffLogLevelOnce", params, UserSettingsMigrateStaffLogLevelOnceResult.class);
+    }
+
+    /**
+     * Runs the one-time cleanup that removes obsolete CLI-owned settings and legacy rubber-duck keys from the user's settings document, and reports what it did. Idempotent and safe to call on every startup: with nothing obsolete left it reports `unchanged` and writes nothing. The cleanup preserves every key it does not recognize, so a setting written by a newer host is never dropped by an older one, and a document that fails to parse is reported `invalid` and left untouched rather than rewritten from a partial read. The cleaned document is not returned: it is written before this replies, so `user.settings.load` reads it authoritatively. A host that surfaces unrecognized keys through `user.settings.unknownKeys` wants this first, because the keys this retires would otherwise be shown to the user as if they were misspelled settings.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<UserSettingsMigrateObsoleteOnDiskResult> migrateObsoleteOnDisk(UserSettingsMigrateObsoleteOnDiskParams params) {
+        return caller.invoke("user.settings.migrateObsoleteOnDisk", params, UserSettingsMigrateObsoleteOnDiskResult.class);
+    }
+
+    /**
+     * Lists every known user setting from settings.json, each with its effective value, its default, and whether it is at the default — so settings the user has never set still appear with their default value. Does not include repository- or enterprise-managed overrides that the runtime layers on top at session time.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -49,14 +193,124 @@ public CompletableFuture<UserSettingsGetResult> get() {
     }
 
     /**
-     * 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.
+     * Resolves the on-disk locations of the settings files this runtime reads, so a consumer can show or open them. The user path is the same file `user.settings.get`, `user.settings.load`, and `user.settings.set` operate on. Supply `repoRoot` to also resolve that repository's checked-in and local settings paths. A path is reported whether or not the file exists.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<UserSettingsGetPathsResult> getPaths(UserSettingsGetPathsParams params) {
+        return caller.invoke("user.settings.getPaths", params, UserSettingsGetPathsResult.class);
+    }
+
+    /**
+     * Writes one or more user settings to settings.json, replacing each provided top-level key. A key whose value is null is removed.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    public CompletableFuture<Void> set(UserSettingsSetParams params) {
+        return caller.invoke("user.settings.set", params, Void.class);
+    }
+
+    /**
+     * Lists the top-level user-setting keys by who is allowed to govern them: `repo` keys a repository may override through `.github/copilot/settings.json`, `claudeRepo` keys a repository may override through a Claude-compatible config, and `managed` keys an enterprise policy may fix. The lists are static for a given runtime build and fail closed: a key absent from a list cannot be governed that way.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<UserSettingsGovernanceKeysResult> listGovernanceKeys() {
+        return caller.invoke("user.settings.listGovernanceKeys", java.util.Map.of(), UserSettingsGovernanceKeysResult.class);
+    }
+
+    /**
+     * Atomically edits one canonical user setting inside its settings-file lock. Reads, canonicalizes touched aliases, applies the edit, validates the resulting top-level setting and writes before releasing the lock. An explicit autoUpdatesChannel set completes the staff migration in the same transaction. Only a malformed existing file returns `invalid`; refused keys, invalid values and I/O errors reject the call.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<SettingsEditResult> edit(UserSettingsEditParams params) {
+        return caller.invoke("user.settings.edit", params, SettingsEditResult.class);
+    }
+
+    /**
+     * Rewrites legacy and snake_case setting names in a settings object to their canonical spelling. A caller editing settings.json must normalize before writing: a legacy key left in place survives the write, is re-normalized on the next load, and silently shadows the canonical value the write just stored.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<UserSettingsNormalizeResult> normalize(UserSettingsNormalizeParams params) {
+        return caller.invoke("user.settings.normalize", params, UserSettingsNormalizeResult.class);
+    }
+
+    /**
+     * Diagnoses a set of already-loaded settings layers, reporting each key that will not take effect and why. Settings load tolerantly so that one bad key does not stop a session from starting; this method surfaces what was dropped so a caller can report it instead of silently ignoring the user's intent. Takes the layers as given rather than reading them, so a caller can diagnose exactly the content it is showing, including unsaved edits. Never echoes a setting's value, because a value may be a token or another secret. Marked internal because it exists to carry a CLI call site off the native addon, not to serve a consumer-facing need; it becomes public once an SDK consumer needs to inspect settings health itself.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<UserSettingsProblemsResult> diagnoseProblems(UserSettingsDiagnoseProblemsParams params) {
+        return caller.invoke("user.settings.diagnoseProblems", params, UserSettingsProblemsResult.class);
+    }
+
+    /**
+     * Validates one top-level setting subtree and writes just that key to settings.json as a single step. Doing both here closes the race a caller cannot close itself: between a separate preflight read and the write, the file may change. Rewriting only the touched key keeps legacy siblings out of settings.json. Answers a status rather than failing, so a validation problem and a write problem stay distinguishable.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<UserSettingsApplyTopKeyResult> applyTopKey(UserSettingsApplyTopKeyParams params) {
+        return caller.invoke("user.settings.applyTopKey", params, UserSettingsApplyTopKeyResult.class);
+    }
+
+    /**
+     * Replaces the user settings file's entire content in one write. A key absent from `settings` is removed, which is what distinguishes this from `user.settings.set`: that one merges, so it can never clear a key the caller has dropped. For a caller saving the result of a raw edit, a merge would silently resurrect every key the user deleted. Records the same one-time mutation marks a per-key write records, so a setting the user has now chosen explicitly stops being migrated for them.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<Void> writeAll(UserSettingsWriteAllParams params) {
+        return caller.invoke("user.settings.writeAll", params, Void.class);
+    }
+
+    /**
+     * Merges a partial object into one top-level user setting, re-reading the stored value inside this runtime process's settings.json write lock so that concurrent writers in this process to different sub-fields of the same key do not clobber each other. Unlike `user.settings.set`, which replaces a key's whole value with what the caller last read, this keeps sub-fields the caller did not name when both the stored value and supplied value are objects; otherwise the supplied value replaces the stored value. Use it whenever two independent surfaces own different sub-fields of one setting. Returns the key's stored value after the write, in `value`.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<UserSettingsUpdateResult> update(UserSettingsUpdateParams params) {
+        return caller.invoke("user.settings.update", params, UserSettingsUpdateResult.class);
+    }
+
+    /**
+     * Reads settings.json as stored for a caller that is about to edit it. Unlike `user.settings.get`, this returns file values rather than per-key metadata and defaults. Reports `missing` for an absent file and `invalid` when the existing file will not parse. Retired config.json and extensionless files are not read.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    CompletableFuture<UserSettingsLoadForEditResult> loadForEdit() {
+        return caller.invoke("user.settings.loadForEdit", java.util.Map.of(), UserSettingsLoadForEditResult.class);
+    }
+
+    /**
+     * Validates one top-level setting subtree without writing it, reporting each problem with the path it applies to. Scoped to a single top-level key on purpose: validating the whole file would reject an edit whenever an unrelated pre-existing field is malformed, locking the user out of the very tool that could fix it.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
      */
     @CopilotExperimental
-    public CompletableFuture<UserSettingsSetResult> set(UserSettingsSetParams params) {
-        return caller.invoke("user.settings.set", params, UserSettingsSetResult.class);
+    CompletableFuture<UserSettingsValidateResult> validate(UserSettingsValidateParams params) {
+        return caller.invoke("user.settings.validate", params, UserSettingsValidateResult.class);
     }
 
 }
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionAccountsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionAccountsApi.java
index 76b3fdc7e0..2b4f752fdf 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionAccountsApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionAccountsApi.java
@@ -35,7 +35,7 @@ public final class SessionAccountsApi {
     }
 
     /**
-     * Enumerate request carrying the typed collection query.
+     * Enumerate a typed accounts collection: the signed-in accounts, or the providers offered for interactive login.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -51,7 +51,7 @@ public CompletableFuture<AuthEnumerateValue> enumerate(SessionAccountsEnumerateP
     }
 
     /**
-     * Read request carrying the typed datum query.
+     * Read one typed accounts datum: the active account, a neutral status summary, or the last authentication errors.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -67,7 +67,7 @@ public CompletableFuture<AuthReadValue> get(SessionAccountsGetParams params) {
     }
 
     /**
-     * Mutation request carrying the typed write command.
+     * Apply one non-interactive accounts mutation: switch the active account, log an account out, or set credentials from a token.
      * <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/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionAccountsLoginApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionAccountsLoginApi.java
index 5537a0dad2..24e3c6a642 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionAccountsLoginApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionAccountsLoginApi.java
@@ -31,7 +31,7 @@ public final class SessionAccountsLoginApi {
     }
 
     /**
-     * Begin an interactive login flow for a provider kind. Dispatch is kind-only.
+     * Begin an interactive login flow for a provider kind (dispatch is kind-only) and return its opaque flow id and first step.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -47,7 +47,7 @@ public CompletableFuture<SessionAccountsLoginBeginResult> begin(SessionAccountsL
     }
 
     /**
-     * Advance an in-flight login flow, optionally fulfilling an input-required step.
+     * Advance an in-flight login flow, optionally fulfilling an input-required step, and return the next step.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -63,7 +63,7 @@ public CompletableFuture<AuthLoginStep> advance(SessionAccountsLoginAdvanceParam
     }
 
     /**
-     * Cancel an in-flight login flow.
+     * Cancel an in-flight login flow and release its resources.
      * <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/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionAgentApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionAgentApi.java
index d2499fe3a5..0030c622d0 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionAgentApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionAgentApi.java
@@ -31,7 +31,7 @@ public final class SessionAgentApi {
     }
 
     /**
-     * Controls whether built-in agents and authored prompt text are included.
+     * Lists agents available to the session. Defaults to custom agents only; pass includeBuiltInAgents to include the effective built-in agents.
      * <p>
      * Invokes the method with no params, applying the runtime defaults.
      *
@@ -44,7 +44,7 @@ public CompletableFuture<SessionAgentListResult> list() {
     }
 
     /**
-     * Controls whether built-in agents and authored prompt text are included.
+     * Lists agents available to the session. Defaults to custom agents only; pass includeBuiltInAgents to include the effective built-in agents.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -60,7 +60,7 @@ public CompletableFuture<SessionAgentListResult> list(SessionAgentListParams par
     }
 
     /**
-     * An in-memory authored prompt override for an available agent.
+     * Sets an in-memory authored prompt override for an available agent. For built-in agents, this replaces only the static base prompt while preserving runtime-owned dynamic prompt composition and behavior. The special `general-purpose` agent is not overrideable. Overrides are not persisted; resumed and forked sessions start without them, so the host must re-apply them.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -76,7 +76,7 @@ public CompletableFuture<Void> setPrompt(SessionAgentSetPromptParams params) {
     }
 
     /**
-     * Identifies the target session.
+     * Gets the currently selected custom agent for the session.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -87,7 +87,7 @@ public CompletableFuture<SessionAgentGetCurrentResult> getCurrent() {
     }
 
     /**
-     * Name of the custom agent to select for subsequent turns.
+     * Selects a custom agent for subsequent turns in the session.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -103,7 +103,7 @@ public CompletableFuture<SessionAgentSelectResult> select(SessionAgentSelectPara
     }
 
     /**
-     * Identifies the target session.
+     * Clears the selected custom agent and returns the session to the default agent.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -114,7 +114,7 @@ public CompletableFuture<Void> deselect() {
     }
 
     /**
-     * Identifies the target session.
+     * Reloads custom agent definitions and returns the refreshed list.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionAutopilotObjectiveApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionAutopilotObjectiveApi.java
index ab4058e6b6..8edc125d7e 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionAutopilotObjectiveApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionAutopilotObjectiveApi.java
@@ -29,7 +29,7 @@ public final class SessionAutopilotObjectiveApi {
     }
 
     /**
-     * Identifies the target session.
+     * Reads the current canonical autopilot objective state for this session.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasActionApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasActionApi.java
index 8c6ce4b79e..3e41100db6 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasActionApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasActionApi.java
@@ -31,7 +31,7 @@ public final class SessionCanvasActionApi {
     }
 
     /**
-     * Canvas action invocation parameters.
+     * Invokes an action on an open canvas instance.
      * <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/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasApi.java
index 2fce433e5c..fdcee24883 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasApi.java
@@ -38,7 +38,7 @@ public final class SessionCanvasApi {
     }
 
     /**
-     * Identifies the target session.
+     * Lists canvases declared for the session.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -49,7 +49,7 @@ public CompletableFuture<SessionCanvasListResult> list() {
     }
 
     /**
-     * Identifies the target session.
+     * Lists currently open canvas instances for the live session.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -60,7 +60,7 @@ public CompletableFuture<SessionCanvasListOpenResult> listOpen() {
     }
 
     /**
-     * Canvas open parameters.
+     * Opens or focuses a canvas instance.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -76,7 +76,7 @@ public CompletableFuture<SessionCanvasOpenResult> open(SessionCanvasOpenParams p
     }
 
     /**
-     * Canvas close parameters.
+     * Closes an open canvas instance.
      * <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/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasProviderApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasProviderApi.java
index c68c050f75..90a80dfce0 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasProviderApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasProviderApi.java
@@ -31,7 +31,7 @@ final class SessionCanvasProviderApi {
     }
 
     /**
-     * Internal canvas provider registration parameters.
+     * Registers an internal canvas provider connection and its contributions.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -47,7 +47,7 @@ CompletableFuture<Void> register(SessionCanvasProviderRegisterParams params) {
     }
 
     /**
-     * Internal canvas provider unregistration parameters.
+     * Unregisters an internal canvas provider connection.
      * <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/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasProviderRegisterParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCanvasProviderRegisterParams.java
index a9213671aa..4843040c6e 100644
--- 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
@@ -30,6 +30,7 @@ record SessionCanvasProviderRegisterParams(
     /** Connection identifier for callback routing */
     @JsonProperty("connectionId") String connectionId,
     /** Provider metadata supplied by the host */
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     @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/SessionCommandsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsApi.java
index 6be3682233..55cd139ae5 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCommandsApi.java
@@ -31,7 +31,7 @@ public final class SessionCommandsApi {
     }
 
     /**
-     * Optional filters controlling which command sources to include in the listing.
+     * Lists slash commands available in the session.
      * <p>
      * Invokes the method with no params, applying the runtime defaults.
      *
@@ -44,7 +44,7 @@ public CompletableFuture<SessionCommandsListResult> list() {
     }
 
     /**
-     * Optional filters controlling which command sources to include in the listing.
+     * Lists slash commands available in the session.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -60,7 +60,7 @@ public CompletableFuture<SessionCommandsListResult> list(SessionCommandsListPara
     }
 
     /**
-     * Slash command name and optional raw input string to invoke.
+     * Invokes a slash command in the session.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -76,7 +76,7 @@ public CompletableFuture<SlashCommandInvocationResult> invoke(SessionCommandsInv
     }
 
     /**
-     * The pending slash-command invocation effect to finalize, plus whether the host applied or cancelled it.
+     * Finalizes persistence associated with a client-applied slash-command effect.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -92,7 +92,7 @@ CompletableFuture<CommandsFinalizeInvocationEffectResult> finalizeInvocationEffe
     }
 
     /**
-     * Pending command request ID and an optional error if the client handler failed.
+     * Reports completion of a pending client-handled slash command.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -108,7 +108,7 @@ public CompletableFuture<SessionCommandsHandlePendingCommandResult> handlePendin
     }
 
     /**
-     * Slash command name and argument string to execute synchronously.
+     * Executes a slash command synchronously and returns any error.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -124,7 +124,7 @@ public CompletableFuture<SessionCommandsExecuteResult> execute(SessionCommandsEx
     }
 
     /**
-     * Slash-prefixed command string to enqueue for FIFO processing.
+     * Enqueues a slash command for FIFO processing on the local session.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -140,7 +140,7 @@ public CompletableFuture<EnqueueCommandResult> enqueue(SessionCommandsEnqueuePar
     }
 
     /**
-     * Queued-command request ID and the result indicating whether the host executed it (and whether to stop processing further queued commands).
+     * Reports whether the host actually executed a queued command and whether to continue processing.
      * <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/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCompletionsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCompletionsApi.java
index 6b9d8aa252..f9fa5d1dae 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCompletionsApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCompletionsApi.java
@@ -31,7 +31,7 @@ public final class SessionCompletionsApi {
     }
 
     /**
-     * Identifies the target session.
+     * Gets the characters that should trigger host-driven completions for the session. Empty disables host-driven completions (e.g. local sessions, or a relay host that does not advertise them).
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -42,7 +42,7 @@ public CompletableFuture<SessionCompletionsGetTriggerCharactersResult> getTrigge
     }
 
     /**
-     * Request host-driven completions for the current composer input.
+     * Requests host-driven completion items for the current composer input. Returns an empty list when the host has no items or does not support completions.
      * <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/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionConnectedIdeInfo.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionConnectedIdeInfo.java
new file mode 100644
index 0000000000..9a2f0bce74
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionConnectedIdeInfo.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 javax.annotation.processing.Generated;
+
+/**
+ * The IDE a host is connected to, as reported to the session.
+ *
+ * @apiNote This type 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)
+record SessionConnectedIdeInfo(
+    /** Display name of the connected IDE, for example `VS Code`. */
+    @JsonProperty("ideName") String ideName,
+    /** Absolute path of the workspace folder the IDE has open. */
+    @JsonProperty("workspaceFolder") String workspaceFolder
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionConnectorsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionConnectorsApi.java
index e192274a87..e69fc59d23 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionConnectorsApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionConnectorsApi.java
@@ -32,7 +32,7 @@ public final class SessionConnectorsApi {
     }
 
     /**
-     * Identifies the target session.
+     * Returns feature availability and bounded polling limits for the EXPERIMENTAL session connector API. This method never performs a Connector service request.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -43,7 +43,7 @@ public CompletableFuture<SessionConnectorsGetCapabilitiesResult> getCapabilities
     }
 
     /**
-     * Identifies the target session.
+     * Returns the session account selection, or null.
      *
      * @return a future that completes with the {@code ConnectorSessionAccount} value,
      *     or {@code null} when the result is absent. Callers must handle the
@@ -58,7 +58,7 @@ public CompletableFuture<ConnectorSessionAccount> getAccount() {
     }
 
     /**
-     * Identifies the target session.
+     * Returns authoritative session Connector state from current availability, pinned account selection, cached catalog, and live MCP projection without performing a Connector service request.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -69,7 +69,7 @@ public CompletableFuture<SessionConnectorsGetStatusResult> getStatus() {
     }
 
     /**
-     * Pins a Connector operation to one host-owned GitHub account through its opaque selection ID. Provider tokens are never accepted.
+     * Returns the cached Connector catalog for the pinned opaque account selection, fetching it only when this session has no cached catalog.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -85,7 +85,7 @@ public CompletableFuture<SessionConnectorsListResult> list(SessionConnectorsList
     }
 
     /**
-     * Pins a Connector operation to one host-owned GitHub account through its opaque selection ID. Provider tokens are never accepted.
+     * Refreshes and validates the Connector catalog for the pinned opaque account selection.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -101,7 +101,7 @@ public CompletableFuture<SessionConnectorsRefreshResult> refresh(SessionConnecto
     }
 
     /**
-     * Selects one Connector and the pinned host-owned account used for its service and MCP authorization.
+     * Initiates an idempotent Connector connection request without opening a browser. Returns connected when the service is immediately authoritative, consent_required with a validated URL, or pending with an opaque continuation ID.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -117,7 +117,7 @@ public CompletableFuture<ConnectorConnectResult> connect(SessionConnectorsConnec
     }
 
     /**
-     * Selects one Connector and the pinned host-owned account used for its service and MCP authorization.
+     * Re-initiates an idempotent Connector connection request without browser or UI effects, with the same typed outcomes as connect.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -133,7 +133,7 @@ public CompletableFuture<ConnectorConnectResult> reconnect(SessionConnectorsReco
     }
 
     /**
-     * Explicitly bounded continuation of a pending Connector connection.
+     * Continues a pending Connector connection with caller-supplied attempt, interval, and deadline bounds. The runtime never opens the returned consent URL.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -149,7 +149,7 @@ public CompletableFuture<ConnectorConnectResult> continueConnection(SessionConne
     }
 
     /**
-     * Selects one Connector and the pinned host-owned account used for its service and MCP authorization.
+     * Disconnects one Connector for the pinned opaque account selection, refreshes the authoritative catalog, and removes its session-owned MCP projection.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -165,7 +165,7 @@ public CompletableFuture<SessionConnectorsDisconnectResult> disconnect(SessionCo
     }
 
     /**
-     * Requests authoritative Connector-to-MCP reconciliation for the pinned account.
+     * Reconciles the authoritative cached or freshly requested Connector catalog into the session Connector MCP projection and returns live status.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -181,7 +181,7 @@ public CompletableFuture<SessionConnectorsReconcileResult> reconcile(SessionConn
     }
 
     /**
-     * Requests authoritative Connector-to-MCP reconciliation for the pinned account.
+     * Reconciles the authoritative cached or freshly requested Connector catalog into the session Connector MCP projection and returns live status.
      * <p>
      * Accepts the extensible request, including inputs added after the params record.
      *
@@ -196,7 +196,7 @@ public CompletableFuture<SessionConnectorsReconcileResult> reconcile(SessionConn
     }
 
     /**
-     * Pins a Connector operation to one host-owned GitHub account through its opaque selection ID. Provider tokens are never accepted.
+     * Reconciles the authoritative Connector catalog into the session MCP projection during startup with a bounded deadline and fail-closed cleanup.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -212,7 +212,7 @@ CompletableFuture<ConnectorStatus> reconcileForStartup(SessionConnectorsReconcil
     }
 
     /**
-     * Identifies the target session.
+     * Removes the runtime-owned Connector MCP projection without changing service-side connections.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionContentExclusionApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionContentExclusionApi.java
index eb621e6b49..afddaed971 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionContentExclusionApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionContentExclusionApi.java
@@ -31,7 +31,7 @@ public final class SessionContentExclusionApi {
     }
 
     /**
-     * Local file system absolute paths within the session working directory to check against its content-exclusion policy.
+     * Checks local file system absolute paths within the session working directory against its content-exclusion policy. Results preserve input order. Unsupported paths/filesystems and unavailable policy evaluation return available false, and callers must treat every requested path as excluded.
      * <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/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCustomizationsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCustomizationsApi.java
index ee9134f803..b0183065b0 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCustomizationsApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionCustomizationsApi.java
@@ -29,7 +29,7 @@ public final class SessionCustomizationsApi {
     }
 
     /**
-     * Identifies the target session.
+     * For local sessions, reconciles repository context and discovered instructions, plugins, skills, agents, hooks, MCP servers, and extensions after files appear or change under the working directory. Independent component failures are returned in outcomes and errors; a rejected call can have partially applied earlier steps. Remote sessions must reload on their agent host instead. The model-facing context is rebuilt on the next turn.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionDebugApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionDebugApi.java
index b2cd030183..ed06730c49 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionDebugApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionDebugApi.java
@@ -31,7 +31,7 @@ public final class SessionDebugApi {
     }
 
     /**
-     * Options for collecting a session debug bundle with configurable redaction.
+     * Collects a session debug log bundle into a local archive or staging directory. Logs are redacted by default; redaction can be configured per caller-provided diagnostic entry. The runtime includes session-owned logs by default and accepts caller-provided diagnostic entries so host applications can add their own files without changing this API shape.
      * <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/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionDiagnosticsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionDiagnosticsApi.java
index af4c57837b..d263853aec 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionDiagnosticsApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionDiagnosticsApi.java
@@ -31,7 +31,7 @@ public final class SessionDiagnosticsApi {
     }
 
     /**
-     * Patch session diagnostic thresholds for explicitly supplied sources.
+     * Patches configured session diagnostic sources without restarting their producers. Setting a source level to off clears its retained diagnostics and invalidates cursors selecting that source.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -47,7 +47,7 @@ public CompletableFuture<SessionDiagnosticsConfigureResult> configure(SessionDia
     }
 
     /**
-     * Cursor-based request for session diagnostics. The default limit is 100 (maximum 500); the default waitMs is zero (maximum 30000).
+     * Reads a bounded batch of retained session diagnostics for the selected sources. Records are never consumed and each reader advances independently through its opaque cursor.
      * <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/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionEventLogApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionEventLogApi.java
index 8ad9b3b1f5..87ad200719 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionEventLogApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionEventLogApi.java
@@ -31,7 +31,7 @@ public final class SessionEventLogApi {
     }
 
     /**
-     * Cursor, batch size, and optional long-poll/filter parameters for reading session events.
+     * Reads a batch of session events from a cursor, optionally waiting for new events. Supports tail-first reads via `direction: backward`.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -47,7 +47,7 @@ public CompletableFuture<SessionEventLogReadResult> read(SessionEventLogReadPara
     }
 
     /**
-     * Identifies the target session.
+     * Returns a snapshot of the current tail cursor without consuming events.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -58,7 +58,7 @@ public CompletableFuture<SessionEventLogTailResult> tail() {
     }
 
     /**
-     * Event type to register consumer interest for, used by runtime gating logic.
+     * Registers consumer interest in an event type for runtime gating purposes.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -74,7 +74,7 @@ public CompletableFuture<SessionEventLogRegisterInterestResult> registerInterest
     }
 
     /**
-     * Opaque handle previously returned by `registerInterest` to release.
+     * Releases a consumer's previously-registered interest in an event type.
      * <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/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionExtensionsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionExtensionsApi.java
index e21c109684..d4d5837dcc 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionExtensionsApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionExtensionsApi.java
@@ -31,7 +31,7 @@ public final class SessionExtensionsApi {
     }
 
     /**
-     * Identifies the target session.
+     * Lists extensions discovered for the session and their current status.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -42,7 +42,7 @@ public CompletableFuture<SessionExtensionsListResult> list() {
     }
 
     /**
-     * Source-qualified extension identifier to enable for the session.
+     * Enables an extension for the session and persists the preference when the session has a settings store. Hosts synchronizing effective membership should use extensions.reconcile instead.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -58,7 +58,7 @@ public CompletableFuture<Void> enable(SessionExtensionsEnableParams params) {
     }
 
     /**
-     * Source-qualified extension identifier to disable for the session.
+     * Disables an extension for the session and persists the preference when the session has a settings store. Hosts synchronizing effective membership should use extensions.reconcile instead.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -74,7 +74,7 @@ public CompletableFuture<Void> disable(SessionExtensionsDisableParams params) {
     }
 
     /**
-     * Identifies the target session.
+     * Reloads extension definitions and processes for the session.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -85,7 +85,18 @@ public CompletableFuture<Void> reload() {
     }
 
     /**
-     * Parameters for session.extensions.sendAttachmentsToMessage.
+     * Host-only reconciliation of authoritative session-effective extension membership and enablement. Refreshes runtime-owned discovery and preferences without persisting settings, installing plugins, or restarting unchanged activations. Returns ExtensionList only after required starts and process/contribution cleanup settle. Takes no caller inventory or overrides. Missing controllers, unready/incomplete discovery, unavailable workspaces, superseded inputs, and lifecycle failures are errors, not empty membership. Independently proven revocations may be applied before an error; retry converges without restarting healthy activations. Error data contains lifecycleChangesApplied and code: extension_reconciliation_host_required, extension_reconciliation_unavailable, extension_reconciliation_not_ready, extension_reconciliation_discovery_failed, extension_reconciliation_workspace_unavailable, extension_reconciliation_superseded, or extension_reconciliation_lifecycle_failed. Mark host reconciliation state applied only on success. On older runtimes, method-not-found must not fall back to global discovery and persistent extension disables.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    public CompletableFuture<SessionExtensionsReconcileResult> reconcile() {
+        return caller.invoke("session.extensions.reconcile", java.util.Map.of("sessionId", this.sessionId), SessionExtensionsReconcileResult.class);
+    }
+
+    /**
+     * Push attachments into the next user-message turn from an extension. The host should surface them as composer pills and forward them via the next session.send call. Callable only by extension-owned connections.
      * <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/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionExtensionsReconcileParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionExtensionsReconcileParams.java
new file mode 100644
index 0000000000..5e6ac8ef1b
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionExtensionsReconcileParams.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 SessionExtensionsReconcileParams(
+    /** Target session identifier */
+    @JsonProperty("sessionId") String sessionId
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionExtensionsReconcileResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionExtensionsReconcileResult.java
new file mode 100644
index 0000000000..7d1472c947
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionExtensionsReconcileResult.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;
+
+/**
+ * Extensions discovered for the session, with their current status.
+ *
+ * @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 SessionExtensionsReconcileResult(
+    /** Discovered extensions and their current status */
+    @JsonProperty("extensions") List<Extension> extensions
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFleetApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFleetApi.java
index ca855b70a9..1c5730cd88 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFleetApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionFleetApi.java
@@ -31,7 +31,7 @@ public final class SessionFleetApi {
     }
 
     /**
-     * Parameters for starting fleet orchestration: an optional user prompt combined with the fleet instructions, plus the send options forwarded to the resulting turn.
+     * Starts fleet mode by submitting the fleet orchestration prompt to the session.
      * <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/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionGitHubAuthApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionGitHubAuthApi.java
index 94a3b8e6d0..f98aa7791d 100644
--- 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
@@ -32,7 +32,7 @@ public final class SessionGitHubAuthApi {
     }
 
     /**
-     * Identifies the target session.
+     * Gets authentication status and account metadata for the session.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -43,7 +43,7 @@ public CompletableFuture<SessionGitHubAuthGetStatusResult> getStatus() {
     }
 
     /**
-     * New auth credentials to install on the session. Omit to leave credentials unchanged.
+     * Updates the session's auth credentials used for outbound model and API requests.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -59,7 +59,7 @@ public CompletableFuture<SessionGitHubAuthSetCredentialsResult> setCredentials(S
     }
 
     /**
-     * Identifies the target session.
+     * Gets the current authentication information for internal session hosts.
      *
      * @return a future that completes with the {@code AuthIdentity} value,
      *     or {@code null} when the result is absent. Callers must handle the
@@ -74,7 +74,7 @@ CompletableFuture<AuthIdentity> getCurrentAuthInfo() {
     }
 
     /**
-     * Identifies the target session.
+     * Gets all authentication accounts available to the internal session host.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -85,7 +85,7 @@ CompletableFuture<List<SessionAuthStatus>> getAllAuthAvailable() {
     }
 
     /**
-     * Identifies the target session.
+     * Refreshes Copilot account metadata for the current authentication.
      *
      * @return a future that completes with the {@code AuthIdentity} value,
      *     or {@code null} when the result is absent. Callers must handle the
@@ -100,7 +100,7 @@ CompletableFuture<AuthIdentity> refreshCopilotUser() {
     }
 
     /**
-     * Internal GitHub login parameters.
+     * Logs in a GitHub user through the internal session host.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -116,7 +116,7 @@ CompletableFuture<AuthInfo> login(SessionGitHubAuthLoginParams params) {
     }
 
     /**
-     * Parameters for switching the session's active authentication.
+     * Switches the session to another available authentication.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -132,18 +132,18 @@ CompletableFuture<Void> switchToAuth(SessionGitHubAuthSwitchToAuthParams params)
     }
 
     /**
-     * Identifies the target session.
+     * Logs out the session's current GitHub authentication.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
      */
     @CopilotExperimental
-    CompletableFuture<Void> logout() {
-        return caller.invoke("session.gitHubAuth.logout", java.util.Map.of("sessionId", this.sessionId), Void.class);
+    CompletableFuture<Boolean> logout() {
+        return caller.invoke("session.gitHubAuth.logout", java.util.Map.of("sessionId", this.sessionId), Boolean.class);
     }
 
     /**
-     * Parameters identifying a GitHub authentication to log out.
+     * Logs out a specific GitHub authentication.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -152,14 +152,14 @@ CompletableFuture<Void> logout() {
      * @since 1.0.0
      */
     @CopilotExperimental
-    CompletableFuture<Void> logoutUser(SessionGitHubAuthLogoutUserParams params) {
+    CompletableFuture<Boolean> 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);
+        return caller.invoke("session.gitHubAuth.logoutUser", _p, Boolean.class);
     }
 
     /**
-     * Identifies the target session.
+     * Gets validation errors from the most recent authentication attempt.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryApi.java
index ad44d864de..ccfbfbd17f 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionHistoryApi.java
@@ -31,7 +31,7 @@ public final class SessionHistoryApi {
     }
 
     /**
-     * Optional compaction parameters.
+     * Compacts the session history to reduce context usage.
      * <p>
      * Invokes the method with no params, applying the runtime defaults.
      *
@@ -44,7 +44,7 @@ public CompletableFuture<SessionHistoryCompactResult> compact() {
     }
 
     /**
-     * Optional compaction parameters.
+     * Compacts the session history to reduce context usage.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -60,7 +60,7 @@ public CompletableFuture<SessionHistoryCompactResult> compact(SessionHistoryComp
     }
 
     /**
-     * Identifier of the event to truncate to; this event and all later events are removed.
+     * Truncates persisted session history to a specific event.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -76,7 +76,7 @@ public CompletableFuture<SessionHistoryTruncateResult> truncate(SessionHistoryTr
     }
 
     /**
-     * Identifies the target session.
+     * Lists the user turns that the session can rewind to. Never rejects for a busy session: rewind reads need the session's file-change captures to be settled, so a session that still holds active work answers with `unavailableReason: "session-busy"` and no points, which the caller can retry.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -87,7 +87,7 @@ public CompletableFuture<SessionHistoryListRewindPointsResult> listRewindPoints(
     }
 
     /**
-     * Event boundary to preview for conversation-and-files rewind.
+     * Previews the files that a conversation-and-files rewind would restore.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -103,7 +103,7 @@ public CompletableFuture<SessionHistoryPreviewRewindResult> previewRewind(Sessio
     }
 
     /**
-     * Boundary and mode for rewinding session history.
+     * Rewinds the session conversation, optionally restoring files changed by the discarded turns. Not crash-atomic: file restore and conversation truncation are separate stores, applied in that order, so a process crash between them can leave the workspace rewound while the conversation still contains the discarded turns. There is no recovery journal; re-running the same rewind is the recovery path for a crash before truncation lands, since file restore is idempotent (already-restored files are reported as skipped) and truncation is re-derived from the still-retained boundary event. After truncation lands that boundary no longer exists, so the same request is rejected; the only stage that can still be outstanding is snapshot pruning, whose failure leaves orphan snapshots the capture store tolerates. The reverse inconsistency cannot occur, because truncation is never applied before file restore succeeds.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -119,7 +119,7 @@ public CompletableFuture<SessionHistoryRewindResult> rewind(SessionHistoryRewind
     }
 
     /**
-     * Identifies the target session.
+     * Cancels any in-progress background compaction on a local session.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -130,7 +130,7 @@ public CompletableFuture<SessionHistoryCancelBackgroundCompactionResult> cancelB
     }
 
     /**
-     * Identifies the target session.
+     * Aborts any in-progress manual compaction on a local session.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -141,7 +141,7 @@ public CompletableFuture<SessionHistoryAbortManualCompactionResult> abortManualC
     }
 
     /**
-     * Identifies the target session.
+     * Produces a markdown summary of the session's conversation context for hand-off scenarios.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -152,7 +152,7 @@ public CompletableFuture<SessionHistorySummarizeForHandoffResult> summarizeForHa
     }
 
     /**
-     * Parameters for clearing the conversation and seeding the window that replaces it.
+     * Clears the session's conversation history, keeping only system and developer messages, and seeds the fresh context window with a first user message. Must be called from inside a tool handler: the clear has to drop the results of the tool calls its wipe orphans, and it rejects when no tool call is in flight.
      * <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/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionInstructionsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionInstructionsApi.java
index 0a1cf9ba21..1252fa8f59 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionInstructionsApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionInstructionsApi.java
@@ -29,7 +29,7 @@ public final class SessionInstructionsApi {
     }
 
     /**
-     * Identifies the target session.
+     * Gets instruction sources loaded for the session.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -40,7 +40,7 @@ public CompletableFuture<SessionInstructionsGetSourcesResult> getSources() {
     }
 
     /**
-     * Identifies the target session.
+     * For local sessions, invalidates instruction discovery and the model-facing prompt, then returns freshly discovered sources. The updated prompt takes effect on the next turn. Remote sessions must reload on their agent host instead.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionLimitPredictionApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionLimitPredictionApi.java
index a64f82afae..b28b54bd37 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionLimitPredictionApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionLimitPredictionApi.java
@@ -31,7 +31,7 @@ public final class SessionLimitPredictionApi {
     }
 
     /**
-     * Parameters for predicting an AI-credit session limit. Omitting `modelId` uses the session's currently selected model.
+     * Predicts an AI-credit session limit for the session's resolved model. Returns an unavailable result instead of falling back when the current model is unresolved auto.
      * <p>
      * Invokes the method with no params, applying the runtime defaults.
      *
@@ -44,7 +44,7 @@ public CompletableFuture<SessionLimitPredictionResult> predict() {
     }
 
     /**
-     * Parameters for predicting an AI-credit session limit. Omitting `modelId` uses the session's currently selected model.
+     * Predicts an AI-credit session limit for the session's resolved model. Returns an unavailable result instead of falling back when the current model is unresolved auto.
      * <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/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionLspApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionLspApi.java
index c965007d43..2b20bd44e3 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionLspApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionLspApi.java
@@ -31,7 +31,7 @@ public final class SessionLspApi {
     }
 
     /**
-     * Parameters for (re)loading the merged LSP configuration set.
+     * Loads the merged LSP configuration set for the session's working directory.
      * <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/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionManagedPermissions.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionManagedPermissions.java
index 6bf568c985..c8193260d1 100644
--- 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
@@ -24,11 +24,15 @@
 public record SessionManagedPermissions(
     /** When set to `disable`, prevents bypass/allow-all permission modes. Advisory auto-approval remains available because normal prompt paths stay active. 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,
+    /** When true, prevents Assisted Permissions from being activated. An actively Assisted session falls back to Manual Approval while the policy is in force. Omit the key or set it to false to impose no restriction. */
+    @JsonProperty("disableAssistedPermissionsMode") Boolean disableAssistedPermissionsMode,
     /** 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
+    @JsonProperty("allow") List<String> allow,
+    /** Closed-world host boundary expressed as `Domain(hostname)`, `Domain(IP)`, or `Domain(*.example.com)` rules. Schemes, ports, paths, queries, and fragments are rejected because every network request must be enforceable at host-level egress. Multiple managed sources intersect their lists; an empty list denies all hosts. */
+    @JsonProperty("limitTo") List<String> limitTo
 ) {
 }
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionManagedSettingsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionManagedSettingsApi.java
index adf8568aa2..e2e4a67fe3 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionManagedSettingsApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionManagedSettingsApi.java
@@ -29,7 +29,7 @@ public final class SessionManagedSettingsApi {
     }
 
     /**
-     * Identifies the target session.
+     * Waits for the live session's in-flight managed-settings application, then returns the retained effective snapshot used by runtime enforcement and by `session.managed_settings_resolved`. It does not perform another account, device, or server resolution, and rejects when resolution has not produced a snapshot.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionManagedSettingsGetResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionManagedSettingsGetResult.java
index faf08c57d6..cdd674ab24 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionManagedSettingsGetResult.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionManagedSettingsGetResult.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.ManagedPermissionsContext;
 import java.util.List;
 import javax.annotation.processing.Generated;
 
@@ -25,6 +26,8 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record SessionManagedSettingsGetResult(
+    /** Reusable retained managed permission policy for managedSettings.permissions.evaluate, including source composition and session-local injection. Provided by live session snapshots; absent in older events. Refresh the context when managed policy changes. */
+    @JsonProperty("permissionsContext") ManagedPermissionsContext permissionsContext,
     /** Channel summary: `server`, `device`, `client`, or `policyHelper` 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 */
@@ -35,11 +38,11 @@ public record SessionManagedSettingsGetResult(
     @JsonProperty("clientManaged") Boolean clientManaged,
     /** Whether the policy-helper managed-settings layer was present. The policy helper is the weakest channel: it fills keys no enterprise source set and can never replace one. */
     @JsonProperty("policyHelperManaged") Boolean policyHelperManaged,
-    /** 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. */
+    /** Whether managed policy could not be determined (e.g. a failed server fetch) and unresolved-policy safeguards remain active. This does not by itself disable bypass-permissions; `bypassPermissionsDisabled` reports only an explicit policy restriction. */
     @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. */
+    /** Whether an explicit enterprise policy restriction disables bypass-permissions ("yolo") mode for this session. Deny-wins across layers; an unresolved policy does not force this on by itself. */
     @JsonProperty("bypassPermissionsDisabled") Boolean bypassPermissionsDisabled,
     /** 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,
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpApi.java
index 4960d36f02..5f805354c4 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpApi.java
@@ -48,7 +48,23 @@ public final class SessionMcpApi {
     }
 
     /**
-     * Identifies the target session.
+     * Records the IDE the host is connected to, so the agent's system prompt can name it and its workspace folder. Null or an omitted `ide` clears the recorded value, which is how a host reports that it is disconnected; there is no separate clear method. Both `ideName` and `workspaceFolder` are required together, because half a state cannot be attributed to a project.
+     * <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
+    CompletableFuture<Void> setConnectedIdeInfo(SessionMcpSetConnectedIdeInfoParams params) {
+        com.fasterxml.jackson.databind.node.ObjectNode _p = MAPPER.valueToTree(params);
+        _p.put("sessionId", this.sessionId);
+        return caller.invoke("session.mcp.setConnectedIdeInfo", _p, Void.class);
+    }
+
+    /**
+     * Lists materialized MCP servers and their connection status. Cache misses may start and wait for MCP servers.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -59,7 +75,18 @@ public CompletableFuture<SessionMcpListResult> list() {
     }
 
     /**
-     * Server name whose tool list should be returned.
+     * Lists effective MCP configuration without starting, restarting, authenticating, or waiting for servers. An optional live observation is from an already materialized matching server; this is not a readiness guarantee.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    public CompletableFuture<SessionMcpListConfiguredResult> listConfigured() {
+        return caller.invoke("session.mcp.listConfigured", java.util.Map.of("sessionId", this.sessionId), SessionMcpListConfiguredResult.class);
+    }
+
+    /**
+     * Lists the tools exposed by a connected MCP server on this session's host. This performs a live `tools/list` request. Tool UI metadata is returned independently of whether MCP Apps rendering is enabled 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.
@@ -75,7 +102,7 @@ public CompletableFuture<SessionMcpListToolsResult> listTools(SessionMcpListTool
     }
 
     /**
-     * Name of the MCP server to enable for the session.
+     * Enables an MCP server 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.
@@ -91,7 +118,7 @@ public CompletableFuture<Void> enable(SessionMcpEnableParams params) {
     }
 
     /**
-     * Name of the MCP server to enable for the session.
+     * Enables an MCP server for the session.
      * <p>
      * Accepts the extensible request, including inputs added after the params record.
      *
@@ -106,7 +133,7 @@ public CompletableFuture<Void> enable(SessionMcpEnableRequest request) {
     }
 
     /**
-     * Name of the MCP server to disable for the session.
+     * Disables an MCP server 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.
@@ -122,7 +149,7 @@ public CompletableFuture<Void> disable(SessionMcpDisableParams params) {
     }
 
     /**
-     * Name of the MCP server to disable for the session.
+     * Disables an MCP server for the session.
      * <p>
      * Accepts the extensible request, including inputs added after the params record.
      *
@@ -137,7 +164,7 @@ public CompletableFuture<Void> disable(SessionMcpDisableRequest request) {
     }
 
     /**
-     * Identifies the target session.
+     * Reloads MCP server connections for the session.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -148,7 +175,7 @@ public CompletableFuture<Void> reload() {
     }
 
     /**
-     * Identifies the target session.
+     * 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.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -159,7 +186,7 @@ public CompletableFuture<SessionMcpMoveLoadingToBackgroundResult> moveLoadingToB
     }
 
     /**
-     * Opaque MCP reload configuration.
+     * Reloads MCP server connections for the session with an explicit host-provided configuration.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -175,7 +202,7 @@ CompletableFuture<McpStartServersResult> reloadWithConfig(SessionMcpReloadWithCo
     }
 
     /**
-     * Identifiers and raw MCP CreateMessageRequest params used to run a sampling inference.
+     * Runs an MCP sampling inference on behalf of an MCP server.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -191,7 +218,7 @@ public CompletableFuture<SessionMcpExecuteSamplingResult> executeSampling(Sessio
     }
 
     /**
-     * The requestId previously passed to executeSampling that should be cancelled.
+     * Cancels an in-flight MCP sampling execution by request ID.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -207,7 +234,7 @@ public CompletableFuture<SessionMcpCancelSamplingExecutionResult> cancelSampling
     }
 
     /**
-     * Mode controlling how MCP server env values are resolved (`direct` or `indirect`).
+     * Sets how environment-variable values supplied to MCP servers are resolved (direct or indirect).
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -223,7 +250,7 @@ public CompletableFuture<SessionMcpSetEnvValueModeResult> setEnvValueMode(Sessio
     }
 
     /**
-     * Identifies the target session.
+     * Removes the auto-managed `github` MCP server when present.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -234,7 +261,7 @@ public CompletableFuture<SessionMcpRemoveGitHubResult> removeGitHub() {
     }
 
     /**
-     * Credential-free authentication identity used to configure GitHub MCP.
+     * Configures the built-in GitHub MCP server for the session's current auth context.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -250,7 +277,7 @@ CompletableFuture<McpConfigureGitHubResult> configureGitHub(SessionMcpConfigureG
     }
 
     /**
-     * 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.
+     * Starts an individual MCP server on the live session. Omit `config` for a config-free start-by-name of an already-configured server (reuses the server's already-registered configuration); supply `config` to start from a caller-supplied configuration. Session-scoped and ephemeral: the server is added to this session's running set only and is reaped when the session ends. Does NOT modify persistent user configuration (`mcp.config.*`), so it does not affect future sessions. The server surfaces through `session.mcp.list` and the `session.mcp_servers_loaded` / `session.mcp_server_status_changed` events like any other server.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -266,7 +293,7 @@ public CompletableFuture<Void> startServer(SessionMcpStartServerParams params) {
     }
 
     /**
-     * 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.
+     * Starts an individual MCP server on the live session. Omit `config` for a config-free start-by-name of an already-configured server (reuses the server's already-registered configuration); supply `config` to start from a caller-supplied configuration. Session-scoped and ephemeral: the server is added to this session's running set only and is reaped when the session ends. Does NOT modify persistent user configuration (`mcp.config.*`), so it does not affect future sessions. The server surfaces through `session.mcp.list` and the `session.mcp_servers_loaded` / `session.mcp_server_status_changed` events like any other server.
      * <p>
      * Accepts the extensible request, including inputs added after the params record.
      *
@@ -281,7 +308,7 @@ public CompletableFuture<Void> startServer(SessionMcpStartServerRequest request)
     }
 
     /**
-     * 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.
+     * Restarts an individual MCP server on the live session (stops then starts). Omit `config` for a config-free restart-by-name of an already-configured server; supply `config` to restart with a replacement configuration. Session-scoped and ephemeral: does NOT modify persistent user configuration (`mcp.config.*`).
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -297,7 +324,7 @@ public CompletableFuture<Void> restartServer(SessionMcpRestartServerParams param
     }
 
     /**
-     * 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.
+     * Restarts an individual MCP server on the live session (stops then starts). Omit `config` for a config-free restart-by-name of an already-configured server; supply `config` to restart with a replacement configuration. Session-scoped and ephemeral: does NOT modify persistent user configuration (`mcp.config.*`).
      * <p>
      * Accepts the extensible request, including inputs added after the params record.
      *
@@ -312,7 +339,7 @@ public CompletableFuture<Void> restartServer(SessionMcpRestartServerRequest requ
     }
 
     /**
-     * Server name for an individual MCP server stop.
+     * Stops an individual MCP server on the session's host.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -328,7 +355,7 @@ public CompletableFuture<Void> stopServer(SessionMcpStopServerParams params) {
     }
 
     /**
-     * Server name for an individual MCP server stop.
+     * Stops an individual MCP server on the session's host.
      * <p>
      * Accepts the extensible request, including inputs added after the params record.
      *
@@ -343,7 +370,7 @@ public CompletableFuture<Void> stopServer(SessionMcpStopServerRequest request) {
     }
 
     /**
-     * Registration parameters for an external MCP client.
+     * 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.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -359,7 +386,7 @@ CompletableFuture<Void> registerExternalClient(SessionMcpRegisterExternalClientP
     }
 
     /**
-     * Server name identifying the external client to remove.
+     * Unregisters a previously registered external MCP client by server name. Marked internal as the paired companion of `registerExternalClient`: only in-process callers that registered a client this way can meaningfully unregister it. Disappears alongside `registerExternalClient`: once external clients are described to the runtime as config rather than handed in as instances, lifecycle (including deregistration) is owned entirely by the runtime.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -375,7 +402,7 @@ CompletableFuture<Void> unregisterExternalClient(SessionMcpUnregisterExternalCli
     }
 
     /**
-     * Server name to check running status for.
+     * Checks whether a named MCP server is currently running on the session's host.
      * <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/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpAppsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpAppsApi.java
index 6b932855b2..35cd4c57a3 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpAppsApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpAppsApi.java
@@ -32,7 +32,7 @@ public final class SessionMcpAppsApi {
     }
 
     /**
-     * MCP server and resource URI to fetch.
+     * Fetch an MCP resource (typically a `ui://` MCP App bundle, per SEP-1865) from a connected server. Requires the `mcp-apps` session capability.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -48,7 +48,7 @@ public CompletableFuture<SessionMcpAppsReadResourceResult> readResource(SessionM
     }
 
     /**
-     * MCP server to list app-callable tools for.
+     * List tools that an MCP App view is allowed to call (SEP-1865 visibility filter). Returns tools whose `_meta.ui.visibility` is unset (default `["model","app"]`) or includes `"app"`.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -64,7 +64,7 @@ public CompletableFuture<SessionMcpAppsListToolsResult> listTools(SessionMcpApps
     }
 
     /**
-     * MCP server, tool name, and arguments to invoke from an MCP App view.
+     * Call an MCP tool from an MCP App view (SEP-1865). Enforces the visibility check that prevents an app iframe from invoking model-only tools. Returns the standard MCP `CallToolResult`.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -80,7 +80,7 @@ public CompletableFuture<JsonNode> callTool(SessionMcpAppsCallToolParams params)
     }
 
     /**
-     * Host context to advertise to MCP App guests.
+     * Replace the host context returned to MCP App guests on `ui/initialize`. Hosts use this to advertise theme, locale, or other metadata to the guest UI.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -96,7 +96,7 @@ public CompletableFuture<Void> setHostContext(SessionMcpAppsSetHostContextParams
     }
 
     /**
-     * Identifies the target session.
+     * Read the current host context advertised to MCP App guests.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -107,7 +107,7 @@ public CompletableFuture<SessionMcpAppsGetHostContextResult> getHostContext() {
     }
 
     /**
-     * MCP server to diagnose MCP Apps wiring for.
+     * Diagnose MCP Apps wiring for a specific MCP server. Reports the session capability, feature-flag state, advertised extension, and how many tools have `_meta.ui` populated.
      * <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/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpExecuteSamplingParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpExecuteSamplingParams.java
index 54950ec4f4..7978c03553 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpExecuteSamplingParams.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpExecuteSamplingParams.java
@@ -31,6 +31,7 @@ public record SessionMcpExecuteSamplingParams(
     /** Name of the MCP server that initiated the sampling request */
     @JsonProperty("serverName") String serverName,
     /** 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). */
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     @JsonProperty("mcpRequestId") Object mcpRequestId,
     /** 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. */
     @JsonProperty("request") McpExecuteSamplingRequest request
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpHeadersApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpHeadersApi.java
index 45679f83a4..b6c940462e 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpHeadersApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpHeadersApi.java
@@ -31,7 +31,7 @@ public final class SessionMcpHeadersApi {
     }
 
     /**
-     * MCP headers refresh request id and the host response.
+     * Responds to a pending MCP dynamic headers refresh request. Hosts that subscribe to `mcp.headers_refresh_required` use this to provide short-lived per-server headers or to indicate that no dynamic headers are available for this refresh.
      * <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/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpListConfiguredParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpListConfiguredParams.java
new file mode 100644
index 0000000000..d4d886b5b0
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpListConfiguredParams.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 SessionMcpListConfiguredParams(
+    /** Target session identifier */
+    @JsonProperty("sessionId") String sessionId
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpListConfiguredResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpListConfiguredResult.java
new file mode 100644
index 0000000000..b54b5b238c
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpListConfiguredResult.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;
+
+/**
+ * Effective MCP configuration with optional live observations from matching already materialized 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 SessionMcpListConfiguredResult(
+    /** Effective configured MCP servers. */
+    @JsonProperty("servers") List<McpConfiguredServer> servers
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpOauthApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpOauthApi.java
index 8e90316975..3910d287eb 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpOauthApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpOauthApi.java
@@ -32,7 +32,7 @@ public final class SessionMcpOauthApi {
     }
 
     /**
-     * Pending MCP OAuth request ID and host-provided token or cancellation response.
+     * Resolves a pending MCP OAuth request with a host-provided token or cancellation. The pending request is emitted as mcp.oauth_required with the data necessary to authorize the request.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -48,7 +48,7 @@ public CompletableFuture<SessionMcpOauthHandlePendingRequestResult> handlePendin
     }
 
     /**
-     * Identifies the MCP server whose persisted OAuth credentials were updated.
+     * Notifies the session that MCP OAuth authentication succeeded and updated credentials were persisted, so cached tool definitions can be refreshed.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -64,7 +64,7 @@ public CompletableFuture<Void> authenticationStateChanged(SessionMcpOauthAuthent
     }
 
     /**
-     * Effect-free preparation bound to the existing local session, requester and installation, with frozen options.
+     * Prepares an inert, expiring owned OAuth login bound to the original session requester and exact installation. Does not activate, connect, read credentials or open a browser.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -80,7 +80,7 @@ public CompletableFuture<SessionMcpOauthPrepareLoginResult> prepareLogin(Session
     }
 
     /**
-     * Remote MCP server name and optional overrides controlling reauthentication, OAuth client display name, callback handling, and static OAuth client selection.
+     * Starts OAuth authentication for a remote MCP server. Owned servers require the original one-use prepareLogin handle and exact installation ID; manual servers retain the existing direct login behaviour.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -96,7 +96,7 @@ public CompletableFuture<SessionMcpOauthLoginResult> login(SessionMcpOauthLoginP
     }
 
     /**
-     * Remote MCP server name and optional overrides controlling reauthentication, OAuth client display name, callback handling, and static OAuth client selection.
+     * Starts OAuth authentication for a remote MCP server. Owned servers require the original one-use prepareLogin handle and exact installation ID; manual servers retain the existing direct login behaviour.
      * <p>
      * Accepts the extensible request, including inputs added after the params record.
      *
@@ -111,7 +111,7 @@ public CompletableFuture<SessionMcpOauthLoginResult> login(SessionMcpOauthLoginR
     }
 
     /**
-     * Host-delivered callback for a runtime-managed MCP OAuth login.
+     * Completes a runtime-managed MCP OAuth login after the authorization server redirects to a host-managed callback URL.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -127,7 +127,7 @@ public CompletableFuture<Void> complete(SessionMcpOauthCompleteParams params) {
     }
 
     /**
-     * Remote MCP server name for a passive OAuth status 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.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -143,7 +143,7 @@ public CompletableFuture<McpOauthProbeResult> probe(SessionMcpOauthProbeParams p
     }
 
     /**
-     * Remote MCP server name for a passive OAuth status 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.
      * <p>
      * Accepts the extensible request, including inputs added after the params record.
      *
@@ -158,7 +158,7 @@ public CompletableFuture<McpOauthProbeResult> probe(SessionMcpOauthProbeRequest
     }
 
     /**
-     * Targets only the original prepared/applying owned login on this exact session requester.
+     * Cancels the exact owned OAuth login issued to this original session requester, without clearing shared credentials.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -174,7 +174,7 @@ public CompletableFuture<SessionMcpOauthCancelLoginResult> cancelLogin(SessionMc
     }
 
     /**
-     * Pending MCP OAuth request id to respond to.
+     * Responds to a pending MCP OAuth authorization request by its request id.
      * <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/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpPromptsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpPromptsApi.java
index 7b47b74a21..ec60f552ca 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpPromptsApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpPromptsApi.java
@@ -31,7 +31,7 @@ public final class SessionMcpPromptsApi {
     }
 
     /**
-     * MCP server whose prompts to enumerate.
+     * Enumerate one page of prompts a connected MCP server exposes (proxies MCP `prompts/list`). Pass `cursor` to continue from a prior result's `nextCursor`.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -47,7 +47,7 @@ public CompletableFuture<SessionMcpPromptsListResult> list(SessionMcpPromptsList
     }
 
     /**
-     * MCP server, prompt name, and optional string-valued arguments.
+     * Get a prompt's messages from a connected MCP server (proxies MCP `prompts/get`). Content is preserved as opaque JSON. Does not send messages to the model, execute tools, or fetch referenced resources.
      * <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/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpResourcesApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpResourcesApi.java
index c1a30e135d..e81f50eb80 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpResourcesApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpResourcesApi.java
@@ -31,7 +31,7 @@ public final class SessionMcpResourcesApi {
     }
 
     /**
-     * MCP server and resource URI to fetch.
+     * Fetch an MCP resource from a connected server by URI (proxies MCP `resources/read`).
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -47,7 +47,7 @@ public CompletableFuture<SessionMcpResourcesReadResult> read(SessionMcpResources
     }
 
     /**
-     * MCP server whose resources to enumerate.
+     * Enumerate one page of resources a connected MCP server exposes (proxies MCP `resources/list`). Pass `cursor` to continue from a prior result's `nextCursor`.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -63,7 +63,7 @@ public CompletableFuture<SessionMcpResourcesListResult> list(SessionMcpResources
     }
 
     /**
-     * MCP server whose resource templates to enumerate.
+     * Enumerate one page of resource templates a connected MCP server exposes (proxies MCP `resources/templates/list`). Pass `cursor` to continue from a prior result's `nextCursor`.
      * <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/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpSetConnectedIdeInfoParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpSetConnectedIdeInfoParams.java
new file mode 100644
index 0000000000..38e53b55d6
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMcpSetConnectedIdeInfoParams.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;
+
+/**
+ * Records which IDE the host is connected to, or clears 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)
+record SessionMcpSetConnectedIdeInfoParams(
+    /** Target session identifier */
+    @JsonProperty("sessionId") String sessionId,
+    /** The connected IDE. Null or omitted clears the recorded IDE, which is how a host reports that it is disconnected. */
+    @JsonProperty("ide") SessionConnectedIdeInfo ide
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataApi.java
index 8d7f3dd753..bf97a0ec39 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataApi.java
@@ -31,7 +31,7 @@ public final class SessionMetadataApi {
     }
 
     /**
-     * Identifies the target session.
+     * Returns a snapshot of the session's identifying metadata, mode, agent, and remote info.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -42,7 +42,7 @@ public CompletableFuture<SessionMetadataSnapshotResult> snapshot() {
     }
 
     /**
-     * Identifies the target session.
+     * Returns the client-owned string metadata persisted with this local session. The metadata is not included in model context, events, telemetry, snapshots, or remote exports.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -53,7 +53,7 @@ public CompletableFuture<ClientMetadata> getClientMetadata() {
     }
 
     /**
-     * Atomic patch for client-owned session metadata. Operations apply in clear, remove, then set order. The resulting bag must satisfy the ClientMetadata entry and serialized-size limits. Local storage coordinates concurrent runtime processes; custom SessionFs providers must serialize writers that access the same session from multiple processes.
+     * Atomically patches the client-owned string metadata persisted with this local session and returns the committed bag.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -69,7 +69,7 @@ public CompletableFuture<ClientMetadata> updateClientMetadata(SessionMetadataUpd
     }
 
     /**
-     * Identifies the target session.
+     * Reports whether the local session is currently processing user/agent messages.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -80,7 +80,7 @@ public CompletableFuture<SessionMetadataIsProcessingResult> isProcessing() {
     }
 
     /**
-     * Identifies the target session.
+     * Returns a snapshot of activity flags for the session.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -91,7 +91,7 @@ public CompletableFuture<SessionMetadataActivityResult> activity() {
     }
 
     /**
-     * Model identifier and token limits used to compute the context-info breakdown.
+     * Returns the token breakdown for the session's current context window for a given model.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -107,7 +107,7 @@ public CompletableFuture<SessionMetadataContextInfoResult> contextInfo(SessionMe
     }
 
     /**
-     * Identifies the target session.
+     * Returns the experimental per-source attribution breakdown of the session's current context window as a flat list of entries (skills, subagents, MCP servers, built-in tools, plugin rollups, system/tool-definition costs, with nesting via parentId), plus the successful compaction count. The heaviest individual messages are available separately via `metadata.getContextHeaviestMessages`. Returns null until the session has initialized its system prompt and tool metadata.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -118,7 +118,7 @@ public CompletableFuture<SessionMetadataGetContextAttributionResult> getContextA
     }
 
     /**
-     * Parameters for the heaviest-messages query.
+     * Returns the largest individual messages currently in the session's context window, most-expensive first. Companion to `metadata.getContextAttribution`. Returns an empty list until the session has initialized.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -134,7 +134,7 @@ public CompletableFuture<SessionMetadataGetContextHeaviestMessagesResult> getCon
     }
 
     /**
-     * Updated working-directory/git context to record on the session.
+     * Records a working-directory/git context change and emits a `session.context_changed` event. 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): a local session's working directory is authoritative and is moved via `metadata.setWorkingDirectory` (or an SDK `session.resume` that supplies a `workingDirectory`), not by this method.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -150,7 +150,7 @@ public CompletableFuture<Void> recordContextChange(SessionMetadataRecordContextC
     }
 
     /**
-     * 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.
+     * Updates the session's working directory. For local sessions the target is validated first (an absolute path that exists on disk) and the permission primary directory is re-based; a rejected validation fails the call before any session state changes.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -166,7 +166,7 @@ public CompletableFuture<SessionMetadataSetWorkingDirectoryResult> setWorkingDir
     }
 
     /**
-     * Model identifier to use when re-tokenizing the session's existing messages.
+     * Re-tokenizes the session's existing messages against a model and returns aggregate token totals.
      * <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/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataContextInfoParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataContextInfoParams.java
index 0c5b909db7..a190c0d194 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataContextInfoParams.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataContextInfoParams.java
@@ -26,11 +26,13 @@
 public record SessionMetadataContextInfoParams(
     /** Target session identifier */
     @JsonProperty("sessionId") String sessionId,
-    /** Maximum prompt tokens allowed by the target model. Pass 0 to use the runtime default. */
+    /** Advertised prompt allowance. Pass 0 to resolve the selected model and context tier from the session. */
     @JsonProperty("promptTokenLimit") Long promptTokenLimit,
-    /** Maximum output tokens allowed by the target model. Pass 0 if unknown. */
+    /** Requested output allowance to reserve against the combined context ceiling. Pass 0 to resolve the session's request cap, falling back to the model's advertised output limit. */
     @JsonProperty("outputTokenLimit") Long outputTokenLimit,
     /** Model identifier used for tokenization. Omit to use the session default. Used both for token counting and to compute display values. */
-    @JsonProperty("selectedModel") String selectedModel
+    @JsonProperty("selectedModel") String selectedModel,
+    /** Provider owning selectedModel. Omit to use the current provider for the current model, or deterministic legacy lookup for a different model. */
+    @JsonProperty("providerId") String providerId
 ) {
 }
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataContextInfoResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataContextInfoResult.java
index 6472956026..4415e14096 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataContextInfoResult.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataContextInfoResult.java
@@ -34,6 +34,10 @@ public record SessionMetadataContextInfoResult(
     public record SessionMetadataContextInfoResultContextInfo(
         /** The model used for token counting */
         @JsonProperty("modelName") String modelName,
+        /** Provider whose catalog supplies this context window. Omitted when provider identity is unavailable. */
+        @JsonProperty("provider") ModelProviderRef provider,
+        /** Provider-owned model display label, or the Auto routing label. Presentation only; modelName remains the tokenization identity. */
+        @JsonProperty("displayModelName") String displayModelName,
         /** Tokens consumed by the system prompt */
         @JsonProperty("systemTokens") Long systemTokens,
         /** Tokens consumed by user/assistant/tool messages */
@@ -44,13 +48,13 @@ public record SessionMetadataContextInfoResultContextInfo(
         @JsonProperty("mcpToolsTokens") Long mcpToolsTokens,
         /** Sum of system, conversation and tool-definition tokens */
         @JsonProperty("totalTokens") Long totalTokens,
-        /** Maximum prompt tokens allowed by the model (or DEFAULT_TOKEN_LIMIT if unspecified) */
+        /** Effective input budget: the selected tier's prompt allowance bounded by the combined context ceiling minus the requested output allowance. Uses DEFAULT_TOKEN_LIMIT when limits are unspecified. */
         @JsonProperty("promptTokenLimit") Long promptTokenLimit,
         /** Token count at which background compaction starts (configurable percentage of promptTokenLimit) */
         @JsonProperty("compactionThreshold") Long compactionThreshold,
-        /** Prompt token limit plus the model's full output token limit. */
+        /** Advertised prompt allowance for the selected context tier, without adding output tokens. The denominator for context-usage displays. */
         @JsonProperty("limit") Long limit,
-        /** Output reserve plus tokens after the buffer-exhaustion blocking threshold (default 95%) */
+        /** Output reservation overlapping the displayed prompt allowance plus tokens after the effective input budget's buffer-exhaustion blocking threshold (default 95%). */
         @JsonProperty("bufferTokens") Long bufferTokens
     ) {
     }
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataGetContextAttributionResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataGetContextAttributionResult.java
index c27f37afb0..44713111cf 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataGetContextAttributionResult.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionMetadataGetContextAttributionResult.java
@@ -40,11 +40,11 @@ public record SessionMetadataGetContextAttributionResultContextAttribution(
         @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`. */
+        /** Effective input budget after reserving requested output against the combined context ceiling. 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`. */
+        /** Advertised prompt allowance for the selected context tier: the denominator for context-usage displays and capacity for `categories.freeSpace` and `categories.buffer`. Mirrors `SessionContextInfo.limit`. */
         @JsonProperty("limit") Long limit,
-        /** Output reserve plus the tokens past the buffer-exhaustion blocking threshold. Mirrors `SessionContextInfo.bufferTokens`. */
+        /** Output reservation overlapping the displayed prompt allowance plus the tokens past the effective input budget's 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,
@@ -72,7 +72,7 @@ public record SessionMetadataGetContextAttributionResultContextAttributionCatego
             @JsonProperty("messages") Long messages,
             /** Remaining unused window capacity (clamped at 0). */
             @JsonProperty("freeSpace") Long freeSpace,
-            /** Output reserve plus post-blocking-threshold buffer. */
+            /** Overlapping output reservation plus post-blocking-threshold buffer. */
             @JsonProperty("buffer") Long buffer
         ) {
         }
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModeApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModeApi.java
index 0f4989a920..8c2c2d66da 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModeApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModeApi.java
@@ -31,7 +31,7 @@ public final class SessionModeApi {
     }
 
     /**
-     * Identifies the target session.
+     * Gets the current agent interaction mode.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -42,7 +42,7 @@ public CompletableFuture<SessionMode> get() {
     }
 
     /**
-     * Agent interaction mode to apply to the session.
+     * Sets the current agent interaction mode.
      * <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/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModeSetParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModeSetParams.java
index 9a20862a13..9c11577700 100644
--- 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
@@ -36,6 +36,8 @@ public record SessionModeSetParams(
     @JsonProperty("planModelConfigured") Boolean planModelConfigured,
     /** Dedicated model to use in plan mode, when configured. */
     @JsonProperty("planModel") String planModel,
+    /** Provider owning planModel. Omit for legacy bare-model selection. */
+    @JsonProperty("planModelProviderId") String planModelProviderId,
     /** Reasoning effort to use with the dedicated plan model. */
     @JsonProperty("planReasoningEffort") String planReasoningEffort,
     /** Context tier to use with the dedicated plan model. */
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelApi.java
index 8d47c9c716..bfd5d8a89e 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelApi.java
@@ -8,6 +8,7 @@
 package com.github.copilot.generated.rpc;
 
 import com.github.copilot.CopilotExperimental;
+import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 import javax.annotation.processing.Generated;
 
@@ -31,7 +32,7 @@ public final class SessionModelApi {
     }
 
     /**
-     * Identifies the target session.
+     * Gets the session's authoritative model snapshot, including the committed Auto preference and any newer unclaimed Auto preference waiting for a future user turn.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -42,7 +43,7 @@ public CompletableFuture<SessionModelGetCurrentResult> getCurrent() {
     }
 
     /**
-     * Target model identifier and optional reasoning effort, summary, capability overrides, and context tier.
+     * Switches the session to a model and optional reasoning configuration.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -58,7 +59,22 @@ public CompletableFuture<SessionModelSwitchToResult> switchTo(SessionModelSwitch
     }
 
     /**
-     * An Auto preference request for the session. This updates Auto configuration only; it does not change the selected model to `auto`.
+     * Switches the session to a model and optional reasoning configuration.
+     * <p>
+     * Accepts the extensible request, including inputs added after the params record.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    public CompletableFuture<SessionModelSwitchToResult> switchTo(SessionModelSwitchToRequest request) {
+        com.fasterxml.jackson.databind.node.ObjectNode _p = MAPPER.valueToTree(Objects.requireNonNull(request, "request"));
+        _p.put("sessionId", this.sessionId);
+        return caller.invoke("session.model.switchTo", _p, SessionModelSwitchToResult.class);
+    }
+
+    /**
+     * Requests an Auto preference change without changing the session's selected model. The latest unclaimed request wins; the runtime commits it only after a later prompt using the `auto` model mints a usable model and token pair. A `pending` response confirms that the request was accepted, not that it committed. Observe eventual success through `session.model_change`, failure through the ephemeral `session.auto_tier_switch_failed` event, or current unclaimed state through `session.model.getCurrent`.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -74,7 +90,7 @@ public CompletableFuture<SessionModelSwitchAutoTierResult> switchAutoTier(Sessio
     }
 
     /**
-     * Managed, repository, and CLI model overrides to overlay onto the session at startup.
+     * Resolves and applies organization-managed and repository model overlays.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -90,7 +106,23 @@ CompletableFuture<ModelSwitchToResult> applyStartupOverlay(SessionModelApplyStar
     }
 
     /**
-     * Host-supplied exact model selection IDs to allow for this running session. CAPI IDs are intersected with repository `.github/allowed_models.txt` policy; provider-qualified IDs remain exempt from repository-only policy but are restricted by this host list. Omit or pass null to clear the host restriction; an explicit empty or disjoint list is rejected. Validation and pre-selection fallback failures preserve the previous restriction. Failures after a fallback selection commits retain the new restriction and selected model; callers should inspect current session state after such an error.
+     * Clears an unchanged startup model/provider seed before default-model resolution. Never clears a resumed or user-selected model.
+     * <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
+    CompletableFuture<ModelClearStartupSeedResult> clearStartupSeed(SessionModelClearStartupSeedParams params) {
+        com.fasterxml.jackson.databind.node.ObjectNode _p = MAPPER.valueToTree(params);
+        _p.put("sessionId", this.sessionId);
+        return caller.invoke("session.model.clearStartupSeed", _p, ModelClearStartupSeedResult.class);
+    }
+
+    /**
+     * Replaces or clears the host-supplied model allowlist for a running session.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -106,7 +138,7 @@ public CompletableFuture<SessionModelSetAllowedModelsResult> setAllowedModels(Se
     }
 
     /**
-     * Reasoning effort level to apply to the currently selected model.
+     * Updates the session's reasoning effort without changing the selected model.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -122,7 +154,23 @@ public CompletableFuture<SessionModelSetReasoningEffortResult> setReasoningEffor
     }
 
     /**
-     * Optional listing options.
+     * Computes whether the session's current model shows reasoning summaries and how a host should present them: the default Ctrl+T visibility, reasoning headers, the hidden-summaries hint, and whether a persisted `showReasoning` setting is redundant. The runtime folds in the session's model catalog, selection and reasoning-summaries experiment assignment; the host supplies only its own persisted setting and current visibility. This method reads the session's resolved model catalog rather than resolving it, so call `session.model.list` first on a session that has not listed models or run a turn; until then the result is `ready: false`. A session that resolves models without a Copilot catalog, that is a BYOK registry or an alternate provider, never caches one and stays `ready: false`.
+     * <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<SessionModelGetReasoningSummariesResult> getReasoningSummaries(SessionModelGetReasoningSummariesParams params) {
+        com.fasterxml.jackson.databind.node.ObjectNode _p = MAPPER.valueToTree(params);
+        _p.put("sessionId", this.sessionId);
+        return caller.invoke("session.model.getReasoningSummaries", _p, SessionModelGetReasoningSummariesResult.class);
+    }
+
+    /**
+     * Lists models available to this session using its own auth and integration context. Connected hosts (CLI TUI, GitHub App) should call this through the session client so remote sessions return the remote CLI's available models rather than the caller's.
      * <p>
      * Invokes the method with no params, applying the runtime defaults.
      *
@@ -135,7 +183,7 @@ public CompletableFuture<SessionModelListResult> list() {
     }
 
     /**
-     * Optional listing options.
+     * Lists models available to this session using its own auth and integration context. Connected hosts (CLI TUI, GitHub App) should call this through the session client so remote sessions return the remote CLI's available models rather than the caller's.
      * <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/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelApplyStartupOverlayParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelApplyStartupOverlayParams.java
index ad25a718a2..e4aadb58f1 100644
--- 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
@@ -36,6 +36,8 @@ record SessionModelApplyStartupOverlayParams(
     @JsonProperty("autoTier") AutoTier autoTier,
     /** Model selected by repository settings, when configured. */
     @JsonProperty("repoModel") String repoModel,
+    /** Provider owning the repository-selected model. Omitted repository provider identity retains legacy bare-model behavior. */
+    @JsonProperty("repoModelProviderId") String repoModelProviderId,
     /** Reasoning effort selected by repository settings, when configured. */
     @JsonProperty("repoReasoningEffort") String repoReasoningEffort,
     /** Context tier selected by repository settings, when configured. */
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelClearStartupSeedParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelClearStartupSeedParams.java
new file mode 100644
index 0000000000..d927c746ca
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelClearStartupSeedParams.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 javax.annotation.processing.Generated;
+
+/**
+ * Request parameters for the {@code session.model.clearStartupSeed} RPC method.
+ *
+ * @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)
+record SessionModelClearStartupSeedParams(
+    /** Target session identifier */
+    @JsonProperty("sessionId") String sessionId,
+    @JsonProperty("expectedModel") String expectedModel,
+    /** Provider captured with the startup seed; omission matches only an unqualified seed. */
+    @JsonProperty("expectedProviderId") String expectedProviderId
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelGetCurrentResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelGetCurrentResult.java
index 6d6e79a26a..28ef368715 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelGetCurrentResult.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelGetCurrentResult.java
@@ -26,8 +26,12 @@
 public record SessionModelGetCurrentResult(
     /** Currently active model identifier */
     @JsonProperty("modelId") String modelId,
+    /** Provider selected for this model. Together with modelId, identifies a catalog entry even when providers serve the same model. Omitted for unattributed legacy selections. */
+    @JsonProperty("providerId") String providerId,
     /** Captured base model to restore when leaving plan mode. Omitted outside plan mode or when no plan override has captured a base model. Persistent agent model requirements apply to this model rather than the temporary plan model. */
     @JsonProperty("planBaseModelId") String planBaseModelId,
+    /** Provider of planBaseModelId, when that saved selection is provider-qualified. */
+    @JsonProperty("planBaseProviderId") String planBaseProviderId,
     /** 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. */
     @JsonProperty("reasoningEffort") String reasoningEffort,
     /** Context tier for models that support multiple context-window sizes. */
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelGetReasoningSummariesParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelGetReasoningSummariesParams.java
new file mode 100644
index 0000000000..488fe67616
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelGetReasoningSummariesParams.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;
+
+/**
+ * Host presentation state the reasoning-summaries policy depends on.
+ *
+ * @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 SessionModelGetReasoningSummariesParams(
+    /** Target session identifier */
+    @JsonProperty("sessionId") String sessionId,
+    /** The host's persisted `showReasoning` user setting, omitted when unset. */
+    @JsonProperty("persistedShowReasoning") Boolean persistedShowReasoning,
+    /** Whether the host is currently showing reasoning summaries. Defaults to false. */
+    @JsonProperty("summariesVisible") Boolean summariesVisible
+) {
+
+    /**
+     * Creates host presentation state; the session-scoped wrapper supplies the session ID.
+     *
+     * @param persistedShowReasoning the persisted visibility setting, or null when unset
+     * @param summariesVisible whether summaries are visible, or null for the default
+     */
+    public SessionModelGetReasoningSummariesParams(Boolean persistedShowReasoning, Boolean summariesVisible) {
+        this(null, persistedShowReasoning, summariesVisible);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelGetReasoningSummariesResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelGetReasoningSummariesResult.java
new file mode 100644
index 0000000000..c23a1af9ea
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelGetReasoningSummariesResult.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;
+
+/**
+ * Reasoning-summaries presentation policy for the session's current model.
+ *
+ * @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 SessionModelGetReasoningSummariesResult(
+    /** False until the session has a model catalog and a selected model. This read never resolves the catalog itself, and the runtime emits no readiness notification, so repeating this call alone leaves `ready` false indefinitely on a session that has neither listed models nor run a turn. `session.model.list` is the prerequisite and the signal: it resolves and caches the catalog for the session, so a successful return means the next read is ready. The exception is a session that resolves models without a Copilot catalog, that is a BYOK registry or an alternate provider: `session.model.list` returns an empty list without caching a catalog, so `ready` stays false and this policy is unavailable there. While false, every model-policy field is false and `visibility` is omitted; `experimentSettled` is independent of readiness and still reports the assignment state. */
+    @JsonProperty("ready") Boolean ready,
+    /** Whether the session's reasoning-summaries experiment assignment has settled. False means this read does not wait for a pending assignment and reports the experiment-derived fields conservatively: `showHiddenHint` is false and `visibility` falls back to `persistedShowReasoning`, or is omitted when none was supplied. A host that wants the assigned answer re-reads until this is true. */
+    @JsonProperty("experimentSettled") Boolean experimentSettled,
+    /** Whether turns on this session produce reasoning summaries, honouring an explicit session reasoning-summary override. */
+    @JsonProperty("sessionShowsSummaries") Boolean sessionShowsSummaries,
+    /** Whether the selected model shows reasoning summaries by default. */
+    @JsonProperty("modelDefaultShowsSummaries") Boolean modelDefaultShowsSummaries,
+    /** Whether the selected model emits reasoning headers. */
+    @JsonProperty("showReasoningHeaders") Boolean showReasoningHeaders,
+    /** Default reasoning visibility, and only meaningful once `ready` is true: false when the session produces no summaries, else the persisted setting, else the experiment's default. While `ready` is true it is omitted only when all three are unavailable, that is when the session produces summaries, no `persistedShowReasoning` was supplied, and `experimentSettled` is false. While `ready` is false there is no model policy to report and this field is always omitted, so an absent value alone does not imply a pending experiment. */
+    @JsonProperty("visibility") Boolean visibility,
+    /** Whether to show the hint that reasoning summaries are hidden. Always false while `experimentSettled` is false. */
+    @JsonProperty("showHiddenHint") Boolean showHiddenHint,
+    /** Whether the supplied `persistedShowReasoning` setting only restates the model default. This reports a redundancy, not a standing instruction to delete the setting: it stays true for as long as the setting and the model default agree, including for a user who later chose that value deliberately. It exists for a one-time migration of a legacy setting written before the model default made it redundant, so a host that acts on it owns the cleanup and must gate it behind its own persisted `done` marker, delete only a setting whose value still matches the one it read, and never repeat the deletion on a later launch. Under an off-by-default reasoning-summaries experiment an explicit `showReasoning: true` opt-in also reads as redundant on a summary-producing model, so an ungated host would keep deleting that opt-in and hide summaries again on every launch. */
+    @JsonProperty("clearRedundantSetting") Boolean clearRedundantSetting
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelListResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelListResult.java
index 1c73b4b22f..3a18d77488 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelListResult.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelListResult.java
@@ -33,6 +33,8 @@ public record SessionModelListResult(
     /** 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. */
     @JsonProperty("modelPriceCategories") List<SessionModelPriceCategory> modelPriceCategories,
     /** Per-quota snapshots returned alongside the model list, keyed by quota type. */
-    @JsonProperty("quotaSnapshots") Map<String, Object> quotaSnapshots
+    @JsonProperty("quotaSnapshots") Map<String, Object> quotaSnapshots,
+    /** Ordered Auto routing preferences discovered for this session's account. */
+    @JsonProperty("auto") AutoTierMetadata auto
 ) {
 }
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelSwitchToParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelSwitchToParams.java
index a37eebd2f6..0f30a514ca 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelSwitchToParams.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelSwitchToParams.java
@@ -26,7 +26,7 @@
 public record SessionModelSwitchToParams(
     /** Target session identifier */
     @JsonProperty("sessionId") String sessionId,
-    /** 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. */
+    /** Model id to switch to, as returned by `list`. Include providerId to select an exact catalog entry when providers share the id. Without providerId, a bare id retains incumbent selection behavior; a registry-qualified id (`provider/id`, e.g. `acme/claude-sonnet`) targets a BYOK model. */
     @JsonProperty("modelId") String modelId,
     /** Optional Auto routing preference to stage atomically with selecting `auto`. Pass null to return to provider-default Auto routing. This field is rejected when `modelId` is not `auto`. */
     @JsonProperty("autoTier") AutoTier autoTier,
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelSwitchToRequest.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelSwitchToRequest.java
new file mode 100644
index 0000000000..09168fcb52
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionModelSwitchToRequest.java
@@ -0,0 +1,410 @@
+/*---------------------------------------------------------------------------------------------
+ *  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.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.copilot.CopilotExperimental;
+import java.util.Objects;
+import javax.annotation.processing.Generated;
+
+/**
+ * Target model identifier and optional reasoning effort, summary, capability overrides, and context tier.
+ * <p>
+ * Required inputs are constructor arguments. Optional inputs have fluent setters.
+ *
+ * @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)
+public final class SessionModelSwitchToRequest {
+
+    /** Model id to switch to, as returned by `list`. Include providerId to select an exact catalog entry when providers share the id. Without providerId, a bare id retains incumbent selection behavior; a registry-qualified id (`provider/id`, e.g. `acme/claude-sonnet`) targets a BYOK model. */
+    @JsonProperty("modelId")
+    private final String modelId;
+
+    /** Optional Auto routing preference to stage atomically with selecting `auto`. Pass null to return to provider-default Auto routing. This field is rejected when `modelId` is not `auto`. */
+    @JsonProperty("autoTier")
+    private AutoTier autoTier;
+
+    /** 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. Pass null to clear any session effort override and fall back to the model's default. When omitted, the session's current effort is kept. */
+    @JsonProperty("reasoningEffort")
+    private String reasoningEffort;
+
+    /** Reasoning summary mode to request for supported model clients */
+    @JsonProperty("reasoningSummary")
+    private ReasoningSummary reasoningSummary;
+
+    /** Output verbosity level to request for supported models */
+    @JsonProperty("verbosity")
+    private Verbosity verbosity;
+
+    /** Override individual model capabilities resolved by the runtime */
+    @JsonProperty("modelCapabilities")
+    private 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")
+    private ContextTier contextTier;
+
+    /** Origin to record on the effective `session.model_change` event for trusted in-process calls. Transport SDK calls are always recorded as `sdk`, regardless of this value. */
+    @JsonProperty("source")
+    private 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")
+    private Boolean deferIfModelChangeQueued;
+
+    /** Explicit response to a model-switch compaction preflight. Omit to request a confirmation projection when compaction is necessary. */
+    @JsonProperty("compactionDecision")
+    private String compactionDecision;
+
+    /** When true, evaluate context-window compaction policy before applying the switch. */
+    @JsonProperty("runCompactionPreflight")
+    private Boolean runCompactionPreflight;
+
+    /** Optional repository settings scope to persist after the switch commits. */
+    @JsonProperty("repoScope")
+    private String repoScope;
+
+    /** Settings scope used when persisting the selected model. */
+    @JsonProperty("modelChangeScope")
+    private String modelChangeScope;
+
+    /** Require the target to be currently available and enabled before applying the switch. */
+    @JsonProperty("requireAvailable")
+    private Boolean requireAvailable;
+
+    /** Optional settings context and explicit-override flags used to persist a picker selection. */
+    @JsonProperty("pickerPersistence")
+    private ModelPickerPersistenceRequest pickerPersistence;
+
+    /** Provider id from the selected list entry's provider reference. Selects this exact provider/model pair; an unavailable pair fails rather than using another provider. Omit for deterministic legacy bare-model selection. */
+    @JsonProperty("providerId")
+    private String providerId;
+
+    /**
+     * Creates a request with its required inputs.
+     *
+     * @param modelId Model id to switch to, as returned by `list`. Include providerId to select an exact catalog entry when providers share the id. Without providerId, a bare id retains incumbent selection behavior; a registry-qualified id (`provider/id`, e.g. `acme/claude-sonnet`) targets a BYOK model.
+     */
+    public SessionModelSwitchToRequest(String modelId) {
+        this.modelId = Objects.requireNonNull(modelId, "modelId");
+    }
+
+    /**
+     * Returns the {@code modelId} property.
+     *
+     * @return Model id to switch to, as returned by `list`. Include providerId to select an exact catalog entry when providers share the id. Without providerId, a bare id retains incumbent selection behavior; a registry-qualified id (`provider/id`, e.g. `acme/claude-sonnet`) targets a BYOK model.
+     */
+    public String getModelId() {
+        return modelId;
+    }
+
+    /**
+     * Returns the {@code autoTier} property.
+     *
+     * @return Optional Auto routing preference to stage atomically with selecting `auto`. Pass null to return to provider-default Auto routing. This field is rejected when `modelId` is not `auto`.
+     */
+    public AutoTier getAutoTier() {
+        return autoTier;
+    }
+
+    /**
+     * Returns the {@code reasoningEffort} property.
+     *
+     * @return 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. Pass null to clear any session effort override and fall back to the model's default. When omitted, the session's current effort is kept.
+     */
+    public String getReasoningEffort() {
+        return reasoningEffort;
+    }
+
+    /**
+     * Returns the {@code reasoningSummary} property.
+     *
+     * @return Reasoning summary mode to request for supported model clients
+     */
+    public ReasoningSummary getReasoningSummary() {
+        return reasoningSummary;
+    }
+
+    /**
+     * Returns the {@code verbosity} property.
+     *
+     * @return Output verbosity level to request for supported models
+     */
+    public Verbosity getVerbosity() {
+        return verbosity;
+    }
+
+    /**
+     * Returns the {@code modelCapabilities} property.
+     *
+     * @return Override individual model capabilities resolved by the runtime
+     */
+    public ModelCapabilitiesOverride getModelCapabilities() {
+        return modelCapabilities;
+    }
+
+    /**
+     * Returns the {@code contextTier} property.
+     *
+     * @return 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.
+     */
+    public ContextTier getContextTier() {
+        return contextTier;
+    }
+
+    /**
+     * Returns the {@code source} property.
+     *
+     * @return Origin to record on the effective `session.model_change` event for trusted in-process calls. Transport SDK calls are always recorded as `sdk`, regardless of this value.
+     */
+    public ModelChangeSource getSource() {
+        return source;
+    }
+
+    /**
+     * Returns the {@code deferIfModelChangeQueued} property.
+     *
+     * @return 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).
+     */
+    public Boolean getDeferIfModelChangeQueued() {
+        return deferIfModelChangeQueued;
+    }
+
+    /**
+     * Returns the {@code compactionDecision} property.
+     *
+     * @return Explicit response to a model-switch compaction preflight. Omit to request a confirmation projection when compaction is necessary.
+     */
+    public String getCompactionDecision() {
+        return compactionDecision;
+    }
+
+    /**
+     * Returns the {@code runCompactionPreflight} property.
+     *
+     * @return When true, evaluate context-window compaction policy before applying the switch.
+     */
+    public Boolean getRunCompactionPreflight() {
+        return runCompactionPreflight;
+    }
+
+    /**
+     * Returns the {@code repoScope} property.
+     *
+     * @return Optional repository settings scope to persist after the switch commits.
+     */
+    public String getRepoScope() {
+        return repoScope;
+    }
+
+    /**
+     * Returns the {@code modelChangeScope} property.
+     *
+     * @return Settings scope used when persisting the selected model.
+     */
+    public String getModelChangeScope() {
+        return modelChangeScope;
+    }
+
+    /**
+     * Returns the {@code requireAvailable} property.
+     *
+     * @return Require the target to be currently available and enabled before applying the switch.
+     */
+    public Boolean getRequireAvailable() {
+        return requireAvailable;
+    }
+
+    /**
+     * Returns the {@code pickerPersistence} property.
+     *
+     * @return Optional settings context and explicit-override flags used to persist a picker selection.
+     */
+    public ModelPickerPersistenceRequest getPickerPersistence() {
+        return pickerPersistence;
+    }
+
+    /**
+     * Returns the {@code providerId} property.
+     *
+     * @return Provider id from the selected list entry's provider reference. Selects this exact provider/model pair; an unavailable pair fails rather than using another provider. Omit for deterministic legacy bare-model selection.
+     */
+    public String getProviderId() {
+        return providerId;
+    }
+
+    /**
+     * Sets the {@code autoTier} property.
+     *
+     * @param value Optional Auto routing preference to stage atomically with selecting `auto`. Pass null to return to provider-default Auto routing. This field is rejected when `modelId` is not `auto`.
+     * @return this request
+     */
+    public SessionModelSwitchToRequest setAutoTier(AutoTier value) {
+        this.autoTier = value;
+        return this;
+    }
+
+    /**
+     * Sets the {@code reasoningEffort} property.
+     *
+     * @param value 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. Pass null to clear any session effort override and fall back to the model's default. When omitted, the session's current effort is kept.
+     * @return this request
+     */
+    public SessionModelSwitchToRequest setReasoningEffort(String value) {
+        this.reasoningEffort = value;
+        return this;
+    }
+
+    /**
+     * Sets the {@code reasoningSummary} property.
+     *
+     * @param value Reasoning summary mode to request for supported model clients
+     * @return this request
+     */
+    public SessionModelSwitchToRequest setReasoningSummary(ReasoningSummary value) {
+        this.reasoningSummary = value;
+        return this;
+    }
+
+    /**
+     * Sets the {@code verbosity} property.
+     *
+     * @param value Output verbosity level to request for supported models
+     * @return this request
+     */
+    public SessionModelSwitchToRequest setVerbosity(Verbosity value) {
+        this.verbosity = value;
+        return this;
+    }
+
+    /**
+     * Sets the {@code modelCapabilities} property.
+     *
+     * @param value Override individual model capabilities resolved by the runtime
+     * @return this request
+     */
+    public SessionModelSwitchToRequest setModelCapabilities(ModelCapabilitiesOverride value) {
+        this.modelCapabilities = value;
+        return this;
+    }
+
+    /**
+     * Sets the {@code contextTier} property.
+     *
+     * @param value 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.
+     * @return this request
+     */
+    public SessionModelSwitchToRequest setContextTier(ContextTier value) {
+        this.contextTier = value;
+        return this;
+    }
+
+    /**
+     * Sets the {@code source} property.
+     *
+     * @param value Origin to record on the effective `session.model_change` event for trusted in-process calls. Transport SDK calls are always recorded as `sdk`, regardless of this value.
+     * @return this request
+     */
+    public SessionModelSwitchToRequest setSource(ModelChangeSource value) {
+        this.source = value;
+        return this;
+    }
+
+    /**
+     * Sets the {@code deferIfModelChangeQueued} property.
+     *
+     * @param value 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).
+     * @return this request
+     */
+    public SessionModelSwitchToRequest setDeferIfModelChangeQueued(Boolean value) {
+        this.deferIfModelChangeQueued = value;
+        return this;
+    }
+
+    /**
+     * Sets the {@code compactionDecision} property.
+     *
+     * @param value Explicit response to a model-switch compaction preflight. Omit to request a confirmation projection when compaction is necessary.
+     * @return this request
+     */
+    public SessionModelSwitchToRequest setCompactionDecision(String value) {
+        this.compactionDecision = value;
+        return this;
+    }
+
+    /**
+     * Sets the {@code runCompactionPreflight} property.
+     *
+     * @param value When true, evaluate context-window compaction policy before applying the switch.
+     * @return this request
+     */
+    public SessionModelSwitchToRequest setRunCompactionPreflight(Boolean value) {
+        this.runCompactionPreflight = value;
+        return this;
+    }
+
+    /**
+     * Sets the {@code repoScope} property.
+     *
+     * @param value Optional repository settings scope to persist after the switch commits.
+     * @return this request
+     */
+    public SessionModelSwitchToRequest setRepoScope(String value) {
+        this.repoScope = value;
+        return this;
+    }
+
+    /**
+     * Sets the {@code modelChangeScope} property.
+     *
+     * @param value Settings scope used when persisting the selected model.
+     * @return this request
+     */
+    public SessionModelSwitchToRequest setModelChangeScope(String value) {
+        this.modelChangeScope = value;
+        return this;
+    }
+
+    /**
+     * Sets the {@code requireAvailable} property.
+     *
+     * @param value Require the target to be currently available and enabled before applying the switch.
+     * @return this request
+     */
+    public SessionModelSwitchToRequest setRequireAvailable(Boolean value) {
+        this.requireAvailable = value;
+        return this;
+    }
+
+    /**
+     * Sets the {@code pickerPersistence} property.
+     *
+     * @param value Optional settings context and explicit-override flags used to persist a picker selection.
+     * @return this request
+     */
+    public SessionModelSwitchToRequest setPickerPersistence(ModelPickerPersistenceRequest value) {
+        this.pickerPersistence = value;
+        return this;
+    }
+
+    /**
+     * Sets the {@code providerId} property.
+     *
+     * @param value Provider id from the selected list entry's provider reference. Selects this exact provider/model pair; an unavailable pair fails rather than using another provider. Omit for deterministic legacy bare-model selection.
+     * @return this request
+     */
+    public SessionModelSwitchToRequest setProviderId(String value) {
+        this.providerId = value;
+        return this;
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionNameApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionNameApi.java
index 9bfc5bea59..aeefa0df31 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionNameApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionNameApi.java
@@ -31,7 +31,7 @@ public final class SessionNameApi {
     }
 
     /**
-     * Identifies the target session.
+     * Gets the session's friendly name.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -42,7 +42,7 @@ public CompletableFuture<SessionNameGetResult> get() {
     }
 
     /**
-     * New friendly name to apply to the session.
+     * Sets the session's friendly name.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -58,7 +58,7 @@ public CompletableFuture<Void> set(SessionNameSetParams params) {
     }
 
     /**
-     * Auto-generated session summary to apply as the session's name when no user-set name exists.
+     * Persists an auto-generated session summary as the session's name when no user-set name exists.
      * <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/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionOpenOptions.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionOpenOptions.java
index dbb3080cdb..2ac3d57c97 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionOpenOptions.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionOpenOptions.java
@@ -49,6 +49,8 @@ public record SessionOpenOptions(
     @JsonProperty("expAssignments") Object expAssignments,
     /** Opt-in: self-fetch and enforce enterprise managed settings, including managed hook policies, at session bootstrap. */
     @JsonProperty("enableManagedSettings") Boolean enableManagedSettings,
+    /** Opt in to enforcing non-overridable managed model controls on session model, Auto-tier, reasoning-effort, and context-tier changes. Managed defaults still apply when omitted; this option only turns conflicting changes into errors. */
+    @JsonProperty("enforceManagedModelDefaults") Boolean enforceManagedModelDefaults,
     /** 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. */
@@ -63,6 +65,8 @@ public record SessionOpenOptions(
     @JsonProperty("provider") ProviderConfig provider,
     /** Options scoped to the built-in CAPI (Copilot API) provider. */
     @JsonProperty("capi") CapiSessionOptions capi,
+    /** Whether a CLI host explicitly requested the initial Auto preference. False preserves a settings-derived preference without validating availability during creation; execution still validates it. Defaults to true and is ignored for non-CLI callers. */
+    @JsonProperty("autoTierIsExplicit") Boolean autoTierIsExplicit,
     /** Named BYOK provider connections, additive to CAPI auth. Combining with `provider` is rejected. */
     @JsonProperty("providers") List<NamedProviderConfig> providers,
     /** BYOK model definitions added to the selectable model list, each referencing a provider name. */
@@ -113,11 +117,17 @@ public record SessionOpenOptions(
     @JsonProperty("managedMcpServers") Map<String, ManagedMcpServerConfig> managedMcpServers,
     /** 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. */
+    /** Explicit discovery-only skill roots, not filesystem grants. Available without enableConfigDiscovery, subject to skill/managed disables. Relative SDK paths resolve once when supplied against the request's effective workingDirectory; retained roots do not move on cwd changes. Null and omission are equivalent; [] clears only the explicit SDK contribution. */
     @JsonProperty("skillDirectories") List<String> skillDirectories,
+    /** Explicit discovery-only agent roots, separate from customAgents and filesystem grants. Available without enableConfigDiscovery, subject to managed/source disables. Relative SDK paths resolve once when supplied against the request's effective workingDirectory; retained roots do not move on cwd changes. Null and omission are equivalent; [] clears only the explicit SDK contribution. */
+    @JsonProperty("agentDirectories") List<String> agentDirectories,
+    /** Explicit discovery-only instruction roots using existing SDK instruction formats, not filesystem grants. Available without enableConfigDiscovery, subject to instruction/managed disables. Relative SDK paths resolve once when supplied against the request's effective workingDirectory; retained roots do not move on cwd changes. Null and omission are equivalent; [] clears only the explicit SDK contribution. */
+    @JsonProperty("instructionDirectories") List<String> instructionDirectories,
+    /** Explicit discovery-only file-hook roots, separate from callback hooks and filesystem grants. Available without enableConfigDiscovery or enableFileHooks, which controls repository-origin hooks only; hook/managed disables still apply. Relative SDK paths resolve once when supplied against the request's effective workingDirectory; retained roots do not move on cwd changes. Null and omission are equivalent; [] clears only the explicit SDK contribution. */
+    @JsonProperty("hookDirectories") List<String> hookDirectories,
     /** Skill scan directories and descendants excluded from discovery. Supports `~`-relative paths. */
     @JsonProperty("ignoredSkillsLocations") List<String> ignoredSkillsLocations,
-    /** Whether skill loading is enabled. When omitted, an SDK skill provider enables skills by default. */
+    /** Whether skill loading is enabled. When omitted, explicit SDK skill roots or an SDK skill provider enable skills independently of enableConfigDiscovery. */
     @JsonProperty("enableSkills") Boolean enableSkills,
     /** Whether the requesting SDK session has a skill provider. The provider remains ephemeral and is never persisted in session options or history. When enableSkills is false, it remains bound but dormant and receives no callbacks. Cloud, relay, handoff, and raw sessions.open flows reject it because they cannot safely pre-register the callback handler. */
     @JsonProperty("hasSkillProvider") Boolean hasSkillProvider,
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionOptionsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionOptionsApi.java
index 32d4b76908..06986da2ff 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionOptionsApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionOptionsApi.java
@@ -31,7 +31,7 @@ public final class SessionOptionsApi {
     }
 
     /**
-     * Patch of mutable session options to apply to the running session.
+     * Patches the genuinely-mutable subset of session options.
      * <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/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionOptionsUpdateParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionOptionsUpdateParams.java
index 3a30a13527..a5862263ae 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionOptionsUpdateParams.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionOptionsUpdateParams.java
@@ -82,8 +82,14 @@ public record SessionOptionsUpdateParams(
     @JsonProperty("envValueMode") OptionsUpdateEnvValueMode envValueMode,
     /** 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. */
+    /** Explicit discovery-only skill roots, not filesystem grants. Available without enableConfigDiscovery, subject to skill/managed disables. Relative SDK paths resolve once when supplied against the request's effective workingDirectory; retained roots do not move on cwd changes. Null and omission are equivalent; [] clears only the explicit SDK contribution. */
     @JsonProperty("skillDirectories") List<String> skillDirectories,
+    /** Explicit discovery-only agent roots, separate from customAgents and filesystem grants. Available without enableConfigDiscovery, subject to managed/source disables. Relative SDK paths resolve once when supplied against the request's effective workingDirectory; retained roots do not move on cwd changes. Null and omission are equivalent; [] clears only the explicit SDK contribution. */
+    @JsonProperty("agentDirectories") List<String> agentDirectories,
+    /** Explicit discovery-only instruction roots using existing SDK instruction formats, not filesystem grants. Available without enableConfigDiscovery, subject to instruction/managed disables. Relative SDK paths resolve once when supplied against the request's effective workingDirectory; retained roots do not move on cwd changes. Null and omission are equivalent; [] clears only the explicit SDK contribution. */
+    @JsonProperty("instructionDirectories") List<String> instructionDirectories,
+    /** Explicit discovery-only file-hook roots, separate from callback hooks and filesystem grants. Available without enableConfigDiscovery or enableFileHooks, which controls repository-origin hooks only; hook/managed disables still apply. Relative SDK paths resolve once when supplied against the request's effective workingDirectory; retained roots do not move on cwd changes. Null and omission are equivalent; [] clears only the explicit SDK contribution. */
+    @JsonProperty("hookDirectories") List<String> hookDirectories,
     /** Skill scan directories and descendants excluded from discovery. Supports `~`-relative paths. */
     @JsonProperty("ignoredSkillsLocations") List<String> ignoredSkillsLocations,
     /** 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. */
@@ -136,13 +142,13 @@ public record SessionOptionsUpdateParams(
     @JsonProperty("skipEmbeddingRetrieval") Boolean skipEmbeddingRetrieval,
     /** Organization-level custom instructions to inject into the system prompt. */
     @JsonProperty("organizationCustomInstructions") String organizationCustomInstructions,
-    /** Whether to enable loading of `.github/hooks/` filesystem hooks. Separate from the SDK callback hook mechanism. */
+    /** Whether to enable repository-origin file hooks from `.github/hooks/` and trusted repository-configured roots. Does not control explicit hookDirectories or SDK callback hooks. */
     @JsonProperty("enableFileHooks") Boolean enableFileHooks,
     /** Whether to enable host git operations (context resolution, child repo scanning, git info in system prompt). */
     @JsonProperty("enableHostGitOperations") Boolean enableHostGitOperations,
     /** Whether to enable cross-session store writes and reads. */
     @JsonProperty("enableSessionStore") Boolean enableSessionStore,
-    /** Whether skill loading is enabled. Explicit false disables every source, including a bound SDK provider; changing the value invalidates the loaded skill snapshot. When omitted, creation falls back to enableConfigDiscovery unless an SDK skill provider is registered. */
+    /** Whether skill loading is enabled. Explicit false disables every source, including explicit SDK roots and a bound SDK provider; changing the value invalidates the loaded skill snapshot. When omitted, creation falls back to enableConfigDiscovery unless explicit SDK skill roots or an SDK skill provider are supplied. */
     @JsonProperty("enableSkills") Boolean enableSkills,
     /** 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. */
     @JsonProperty("contextTier") OptionsUpdateContextTier contextTier,
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsApi.java
index aed2de53fb..eb4cc591e8 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsApi.java
@@ -44,7 +44,7 @@ public final class SessionPermissionsApi {
     }
 
     /**
-     * Patch of permission policy fields to apply (omit a field to leave it unchanged).
+     * Replaces selected permission policy fields (rules, paths, URLs, exclusions, allow-all flags) on the session.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -60,7 +60,7 @@ public CompletableFuture<SessionPermissionsConfigureResult> configure(SessionPer
     }
 
     /**
-     * Pending permission request ID and the decision to apply (approve/reject and scope).
+     * Provides a decision for a pending tool permission request.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -76,7 +76,7 @@ public CompletableFuture<SessionPermissionsHandlePendingPermissionRequestResult>
     }
 
     /**
-     * No parameters; returns currently-pending permission requests for the session.
+     * Reconstructs the set of pending tool permission requests from the session's event history.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -87,7 +87,7 @@ public CompletableFuture<SessionPermissionsPendingRequestsResult> pendingRequest
     }
 
     /**
-     * Allow-all toggle for tool permission requests, with an optional telemetry source.
+     * Enables or disables automatic approval of tool permission requests 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.
@@ -103,7 +103,7 @@ public CompletableFuture<SessionPermissionsSetApproveAllResult> setApproveAll(Se
     }
 
     /**
-     * Permission mode to apply for the session.
+     * 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.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -119,7 +119,7 @@ public CompletableFuture<SessionPermissionsSetModeResult> setMode(SessionPermiss
     }
 
     /**
-     * No parameters.
+     * Returns the current permission mode for the session.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -130,7 +130,7 @@ public CompletableFuture<SessionPermissionsGetModeResult> getMode() {
     }
 
     /**
-     * Scope and add/remove instructions for modifying session- or location-scoped permission rules.
+     * Adds or removes session-scoped or location-scoped permission rules.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -146,7 +146,7 @@ public CompletableFuture<SessionPermissionsModifyRulesResult> modifyRules(Sessio
     }
 
     /**
-     * Toggles whether permission prompts should be bridged into session events for this client.
+     * Sets whether the client wants permission prompts bridged into session events.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -162,7 +162,7 @@ public CompletableFuture<SessionPermissionsSetRequiredResult> setRequired(Sessio
     }
 
     /**
-     * Clears session-scoped tool approvals and optionally clears location-scoped approvals and exact session-approved paths.
+     * Clears session-scoped tool approvals and, for full resets, exact session-approved paths.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -178,7 +178,7 @@ public CompletableFuture<SessionPermissionsResetSessionApprovalsResult> resetSes
     }
 
     /**
-     * Notification payload describing the permission prompt that the client just rendered.
+     * Notifies the runtime that a permission prompt UI has been shown to the user.
      * <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/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsFolderTrustApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsFolderTrustApi.java
index 55bac08941..741e4ed737 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsFolderTrustApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsFolderTrustApi.java
@@ -31,7 +31,7 @@ public final class SessionPermissionsFolderTrustApi {
     }
 
     /**
-     * Folder path to check for trust.
+     * Reports whether a folder is trusted according to the user's folder trust state.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -47,7 +47,7 @@ public CompletableFuture<SessionPermissionsFolderTrustIsTrustedResult> isTrusted
     }
 
     /**
-     * Folder path to add to trusted folders.
+     * Adds a folder to the user's trusted folders list.
      * <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/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsLocationsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsLocationsApi.java
index 46ce8ef4d3..37f16bf40c 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsLocationsApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsLocationsApi.java
@@ -31,7 +31,7 @@ public final class SessionPermissionsLocationsApi {
     }
 
     /**
-     * Working directory to resolve into a location-permissions key.
+     * Resolves the permission location key and type for a working directory.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -47,7 +47,7 @@ public CompletableFuture<SessionPermissionsLocationsResolveResult> resolve(Sessi
     }
 
     /**
-     * Working directory to load persisted location permissions for.
+     * Applies persisted location-scoped tool approvals and allowed directories for a working directory to this session's permission service.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -63,7 +63,7 @@ public CompletableFuture<SessionPermissionsLocationsApplyResult> apply(SessionPe
     }
 
     /**
-     * Location-scoped tool approval to persist.
+     * Persists a tool approval for a permission location and applies its rules to this session's live permission service.
      * <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/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPathsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPathsApi.java
index ecf9d81b52..62ae0a193b 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPathsApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsPathsApi.java
@@ -31,7 +31,7 @@ public final class SessionPermissionsPathsApi {
     }
 
     /**
-     * No parameters; returns the session's recursive directory grants and exact session-approved paths.
+     * Returns the session's recursive directory grants, exact session-approved paths, and primary working directory.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -42,7 +42,7 @@ public CompletableFuture<SessionPermissionsPathsListResult> list() {
     }
 
     /**
-     * Directory path to add to the session's allowed directories.
+     * Adds a directory to the session's allow-list and activates conventional skill and agent definitions under it.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -58,7 +58,7 @@ public CompletableFuture<SessionPermissionsPathsAddResult> add(SessionPermission
     }
 
     /**
-     * Directory path to set as the session's new primary working directory.
+     * Updates the session's primary working directory used by the permission policy.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -74,7 +74,7 @@ public CompletableFuture<SessionPermissionsPathsUpdatePrimaryResult> updatePrima
     }
 
     /**
-     * Path to evaluate against the session's allowed directories.
+     * Reports whether a path falls within any of the session's allowed directories.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -90,7 +90,7 @@ public CompletableFuture<SessionPermissionsPathsIsPathWithinAllowedDirectoriesRe
     }
 
     /**
-     * Path to evaluate against the session's workspace (primary) directory.
+     * Reports whether a path falls within the session's workspace (primary) directory.
      * <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/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsUrlsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsUrlsApi.java
index 5ca15960d2..3261b07033 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsUrlsApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPermissionsUrlsApi.java
@@ -31,7 +31,7 @@ public final class SessionPermissionsUrlsApi {
     }
 
     /**
-     * Whether the URL-permission policy should run in unrestricted mode.
+     * Toggles the runtime's URL-permission policy between unrestricted and restricted modes.
      * <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/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPlanApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPlanApi.java
index 7805183ddf..daf85af7db 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPlanApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPlanApi.java
@@ -31,7 +31,7 @@ public final class SessionPlanApi {
     }
 
     /**
-     * Identifies the target session.
+     * Reads the session plan file from the workspace.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -42,7 +42,7 @@ public CompletableFuture<SessionPlanReadResult> read() {
     }
 
     /**
-     * Replacement contents to write to the session plan file.
+     * Writes new content to the session plan file.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -58,7 +58,7 @@ public CompletableFuture<Void> update(SessionPlanUpdateParams params) {
     }
 
     /**
-     * Identifies the target session.
+     * Deletes the session plan file from the workspace.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -69,7 +69,7 @@ public CompletableFuture<Void> delete() {
     }
 
     /**
-     * Identifies the target session.
+     * Reads todo rows from the session SQL database for plan rendering.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -80,7 +80,7 @@ public CompletableFuture<SessionPlanReadSqlTodosResult> readSqlTodos() {
     }
 
     /**
-     * Identifies the target session.
+     * Reads todo rows AND dependency edges from the session SQL database for structured progress UI. Same defensive behavior as readSqlTodos — returns empty arrays when the database, tables, or columns aren't available. Clients should call this on session start and after every `session.todos_changed` event to refresh structured-UI rendering.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPluginsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPluginsApi.java
index 6a49785b30..3235108161 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPluginsApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPluginsApi.java
@@ -35,7 +35,7 @@ public final class SessionPluginsApi {
     }
 
     /**
-     * Identifies the target session.
+     * Lists globally installed, live, built-in, and enterprise-managed desired plugins using the live session's authoritative account, working directory, and retained managed policy.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -46,7 +46,7 @@ public CompletableFuture<SessionPluginsListResult> list() {
     }
 
     /**
-     * Plugin source resolved relative to the session's authoritative working directory.
+     * Installs a plugin using the live session's authoritative account, working directory, and retained managed policy.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -62,7 +62,7 @@ public CompletableFuture<SessionPluginsInstallResult> install(SessionPluginsInst
     }
 
     /**
-     * Name (or spec) of the plugin to uninstall.
+     * Uninstalls a plugin when permitted by the live session's retained managed policy.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -78,7 +78,7 @@ public CompletableFuture<Void> uninstall(SessionPluginsUninstallParams params) {
     }
 
     /**
-     * Name (or spec) of the plugin to update.
+     * Updates an installed plugin using the live session's authoritative account, working directory, and retained managed policy.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -94,7 +94,7 @@ public CompletableFuture<SessionPluginsUpdateResult> update(SessionPluginsUpdate
     }
 
     /**
-     * Plugin names (or specs) to enable in the session's authoritative working directory.
+     * Enables installed plugins when permitted by the live session's retained managed policy.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -110,7 +110,7 @@ public CompletableFuture<Void> enable(SessionPluginsEnableParams params) {
     }
 
     /**
-     * Plugin names (or specs) to disable in the session's authoritative working directory.
+     * Disables installed plugins when permitted by the live session's retained managed policy.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -126,7 +126,7 @@ public CompletableFuture<Void> disable(SessionPluginsDisableParams params) {
     }
 
     /**
-     * Optional flags controlling which side effects the reload performs.
+     * Reloads the session's plugin set, refreshing MCP servers, custom agents, hooks, and skills cache so SDK-driven changes via `server.plugins.*` take effect immediately.
      * <p>
      * Invokes the method with no params, applying the runtime defaults.
      *
@@ -139,7 +139,7 @@ public CompletableFuture<Void> reload() {
     }
 
     /**
-     * Optional flags controlling which side effects the reload performs.
+     * Reloads the session's plugin set, refreshing MCP servers, custom agents, hooks, and skills cache so SDK-driven changes via `server.plugins.*` take effect immediately.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -154,4 +154,33 @@ public CompletableFuture<Void> reload(SessionPluginsReloadParams params) {
         return caller.invoke("session.plugins.reload", _p, Void.class);
     }
 
+    /**
+     * Installs or updates the plugins the session's managed settings require now, without waiting for the next automatic attempt after a failure, then reloads plugins. Reports progress and failures with the same `session.info` and `session.warning` events as automatic preparation. Fails when the runtime does not prepare managed plugins for the session.
+     * <p>
+     * Invokes the method with no params, applying the runtime defaults.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    public CompletableFuture<SessionPluginsRetryManagedResult> retryManaged() {
+        return retryManaged(null);
+    }
+
+    /**
+     * Installs or updates the plugins the session's managed settings require now, without waiting for the next automatic attempt after a failure, then reloads plugins. Reports progress and failures with the same `session.info` and `session.warning` events as automatic preparation. Fails when the runtime does not prepare managed plugins 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.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    public CompletableFuture<SessionPluginsRetryManagedResult> retryManaged(SessionPluginsRetryManagedParams params) {
+        com.fasterxml.jackson.databind.node.ObjectNode _p = params == null ? MAPPER.createObjectNode() : MAPPER.valueToTree(params);
+        _p.put("sessionId", this.sessionId);
+        return caller.invoke("session.plugins.retryManaged", _p, SessionPluginsRetryManagedResult.class);
+    }
+
 }
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPluginsMarketplacesApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPluginsMarketplacesApi.java
index 3ec14c5cf7..c9682c21f8 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPluginsMarketplacesApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPluginsMarketplacesApi.java
@@ -31,7 +31,7 @@ public final class SessionPluginsMarketplacesApi {
     }
 
     /**
-     * Identifies the target session.
+     * Lists registered and enterprise-managed desired marketplaces using the live session's retained policy.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -42,7 +42,7 @@ public CompletableFuture<SessionPluginsMarketplacesListResult> list() {
     }
 
     /**
-     * Marketplace source and optional working directory for relative-path resolution.
+     * Adds a marketplace when permitted by the live session's retained managed policy.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -58,7 +58,7 @@ public CompletableFuture<SessionPluginsMarketplacesAddResult> add(SessionPlugins
     }
 
     /**
-     * Name of the marketplace to remove and an optional force flag.
+     * Removes a marketplace when permitted by the live session's retained managed policy.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -74,7 +74,7 @@ public CompletableFuture<SessionPluginsMarketplacesRemoveResult> remove(SessionP
     }
 
     /**
-     * Name of the marketplace whose plugin catalog to fetch.
+     * Browses a marketplace resolved through the live session's working directory and retained managed policy.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -90,7 +90,7 @@ public CompletableFuture<SessionPluginsMarketplacesBrowseResult> browse(SessionP
     }
 
     /**
-     * Optional marketplace name; omit to refresh all.
+     * Refreshes marketplaces resolved through the live session's working directory and retained managed policy.
      * <p>
      * Invokes the method with no params, applying the runtime defaults.
      *
@@ -103,7 +103,7 @@ public CompletableFuture<SessionPluginsMarketplacesRefreshResult> refresh() {
     }
 
     /**
-     * Optional marketplace name; omit to refresh all.
+     * Refreshes marketplaces resolved through the live session's working directory and retained managed policy.
      * <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/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPluginsRetryManagedParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPluginsRetryManagedParams.java
new file mode 100644
index 0000000000..24b687ca75
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPluginsRetryManagedParams.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;
+
+/**
+ * Request parameters for the {@code session.plugins.retryManaged} RPC method.
+ *
+ * @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 SessionPluginsRetryManagedParams(
+    /** Target session identifier */
+    @JsonProperty("sessionId") String sessionId,
+    /** "plugin@marketplace" specs to retry. Omit to retry every plugin the session's managed settings require. */
+    @JsonProperty("plugins") List<String> plugins
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPluginsRetryManagedResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPluginsRetryManagedResult.java
new file mode 100644
index 0000000000..f2fc9b73cb
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionPluginsRetryManagedResult.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;
+
+/**
+ * Per-plugin outcomes of retrying the plugins required by the session's managed settings.
+ *
+ * @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 SessionPluginsRetryManagedResult(
+    /** One entry per requested plugin, in request order. When no plugins were requested, one entry per plugin the managed settings require. */
+    @JsonProperty("plugins") List<ManagedPluginRetryEntry> plugins
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionProviderApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionProviderApi.java
index 26ebee8489..8d3b283405 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionProviderApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionProviderApi.java
@@ -31,7 +31,7 @@ public final class SessionProviderApi {
     }
 
     /**
-     * Optional model identifier to scope the endpoint snapshot to.
+     * Returns the provider endpoint and credentials the session is currently configured to talk to, so the caller can make inference calls directly against the same backend the session uses.
      * <p>
      * Invokes the method with no params, applying the runtime defaults.
      *
@@ -44,7 +44,7 @@ public CompletableFuture<SessionProviderGetEndpointResult> getEndpoint() {
     }
 
     /**
-     * Optional model identifier to scope the endpoint snapshot to.
+     * Returns the provider endpoint and credentials the session is currently configured to talk to, so the caller can make inference calls directly against the same backend the session uses.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -60,7 +60,7 @@ public CompletableFuture<SessionProviderGetEndpointResult> getEndpoint(SessionPr
     }
 
     /**
-     * BYOK providers and/or models to add to the session's registry at runtime. Both fields are optional; provide providers, models, or both.
+     * Adds BYOK providers and/or models to the session's registry at runtime, extending the additive registry built from the session's `providers`/`models` options. Both fields are optional, so a call may add providers only, models only, or both. Within a single call providers are registered before models, so a model may reference a provider added in the same call; across calls a model may reference any provider already registered (from session creation or a prior add). A model whose referenced provider is not registered by the end of the call is rejected. Newly added models become selectable via `model.list` / `model.switchTo` and are inherited by sub-agents spawned afterwards.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -76,7 +76,7 @@ public CompletableFuture<SessionProviderAddResult> add(SessionProviderAddParams
     }
 
     /**
-     * Authoritative BYOK provider and model registry snapshot to apply atomically to the session.
+     * Atomically updates the session's BYOK provider and model registry by applying the supplied snapshot, replacing existing entries, updating models, or removing entries absent from the snapshot.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -92,7 +92,7 @@ public CompletableFuture<SessionProviderSyncResult> sync(SessionProviderSyncPara
     }
 
     /**
-     * Host-managed model selection ids to withdraw from the session's BYOK registry.
+     * Withdraws named host-managed models from the session's BYOK registry, leaving every other entry untouched. The scoped counterpart to `provider.sync`: a snapshot can only describe entries the caller knows about, so using it to remove one model silently withdraws rows registered by another source, such as a plugin calling `provider.add` at runtime. Naming what to remove leaves unrelated entries alone. Selection ids that are not registered are ignored, so withdrawal is idempotent. A provider is removed only when one of the withdrawn models was the last entry referencing it; a provider that simply has no models, which is the normal state while its rows are supplied by catalog discovery, is left in place.
      * <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/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionProvidersApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionProvidersApi.java
index 6f6dc8b5e5..f7dde45999 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionProvidersApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionProvidersApi.java
@@ -35,7 +35,7 @@ public final class SessionProvidersApi {
     }
 
     /**
-     * Identifies the target session.
+     * Returns adapter definitions and supported operations in this session's effective provider catalog, without running discovery. Does not list provider instances or select inference models.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -46,7 +46,7 @@ public CompletableFuture<SessionProvidersGetCatalogResult> getCatalog() {
     }
 
     /**
-     * Provider discovery parameters.
+     * Discovers reachable instances using an adapter from this session's effective provider catalog and provider-specific discovery input.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -62,7 +62,7 @@ public CompletableFuture<SessionProvidersDiscoverResult> discover(SessionProvide
     }
 
     /**
-     * Provider status request parameters.
+     * Gets current health and version information for a discovered model-provider instance.
      * <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/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionProvidersModelsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionProvidersModelsApi.java
index b309fc7c12..3f5855d9a8 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionProvidersModelsApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionProvidersModelsApi.java
@@ -31,7 +31,7 @@ public final class SessionProvidersModelsApi {
     }
 
     /**
-     * Provider model inventory request parameters.
+     * Lists models installed or otherwise available from a discovered model-provider instance.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -47,7 +47,7 @@ public CompletableFuture<SessionProvidersModelsListResult> list(SessionProviders
     }
 
     /**
-     * A discovered instance and one of its models to translate into provider configuration. Pass back the instance and model as returned by `session.providers.discover` and `session.providers.models.list`.
+     * Translates a discovered model into the provider and model configuration needed to use it, and reports whether each is already registered in this session. Prepares only: it registers nothing, writes nothing, and performs no provider requests.
      * <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/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueApi.java
index 101d1726f2..e38110708f 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueApi.java
@@ -31,7 +31,7 @@ public final class SessionQueueApi {
     }
 
     /**
-     * Identifies the target session.
+     * Returns the local session's pending user-facing queued items and steering messages.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -42,7 +42,7 @@ public CompletableFuture<SessionQueuePendingItemsResult> pendingItems() {
     }
 
     /**
-     * Identifies the target session.
+     * Returns the internal native queue snapshot for in-process session orchestration.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -53,7 +53,7 @@ CompletableFuture<QueueSnapshotResult> snapshot() {
     }
 
     /**
-     * Parameters for moving a queued item by stable id.
+     * Moves an addressable queued item to a public visible position.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -69,7 +69,7 @@ public CompletableFuture<SessionQueueMoveItemResult> moveItem(SessionQueueMoveIt
     }
 
     /**
-     * Parameters for inserting a queued message at a public visible position.
+     * Inserts a new queued message at a public visible position.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -85,7 +85,7 @@ public CompletableFuture<SessionQueueInsertAtResult> insertAt(SessionQueueInsert
     }
 
     /**
-     * Parameters for removing a queued item by stable id.
+     * Removes an addressable queued item by its stable id.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -101,7 +101,7 @@ public CompletableFuture<SessionQueueRemoveAtResult> removeAt(SessionQueueRemove
     }
 
     /**
-     * Parameters for editing a single queued message.
+     * Updates the text of an addressable single-message queue item.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -117,7 +117,7 @@ public CompletableFuture<SessionQueueUpdateTextResult> updateText(SessionQueueUp
     }
 
     /**
-     * Conditional withdrawal of a single user message, from its queue or from the running turn it started.
+     * Atomically withdraws an unchanged user message of a local session: from the queued or steering lane while unconsumed, or from the running turn it started while the model has not answered it and nothing the user sent after it is pending. Withdrawing from the running turn interrupts that turn and removes its events from history. A client retaining the original draft may restore it only when removed is true.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -133,7 +133,7 @@ public CompletableFuture<SessionQueueWithdrawMessageResult> withdrawMessage(Sess
     }
 
     /**
-     * Append to one pending steering message without changing its identity or delivery position.
+     * Atomically appends text and attachments to an unchanged, unconsumed local steering message. Returns updated=false if delivery or withdrawal already claimed the message.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -149,7 +149,7 @@ public CompletableFuture<SessionQueueAppendSteeringResult> appendSteering(Sessio
     }
 
     /**
-     * Parameters for duplicating a queued item.
+     * Duplicates an addressable queued item immediately after its source.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -165,7 +165,7 @@ public CompletableFuture<SessionQueueDuplicateAtResult> duplicateAt(SessionQueue
     }
 
     /**
-     * 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.
+     * Acquires or releases the queued-lane drain pause.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -181,7 +181,7 @@ public CompletableFuture<Void> setDrainPaused(SessionQueueSetDrainPausedParams p
     }
 
     /**
-     * Parameters for steering a queued message into a live turn.
+     * Moves an addressable queued message into the live turn's steering lane.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -197,7 +197,7 @@ public CompletableFuture<SessionQueueSendNowResult> sendNow(SessionQueueSendNowP
     }
 
     /**
-     * Identifies the target session.
+     * Reports whether the local session has native queued work pending.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -208,7 +208,7 @@ CompletableFuture<QueueHasPendingResult> hasPending() {
     }
 
     /**
-     * Inputs for starting a deferred-idle drain.
+     * Begins a native deferred-idle drain when background work has quiesced.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -224,7 +224,7 @@ CompletableFuture<QueueBeginDeferredIdleDrainResult> beginDeferredIdleDrain(Sess
     }
 
     /**
-     * Inputs for completing a deferred-idle drain.
+     * Finishes a native deferred-idle drain and reports whether to drain queue work or emit idle.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -240,7 +240,7 @@ CompletableFuture<QueueFinishDeferredIdleDrainResult> finishDeferredIdleDrain(Se
     }
 
     /**
-     * Inputs for marking session.idle deferred in native state.
+     * Marks session.idle as deferred by native background work state.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -256,7 +256,7 @@ CompletableFuture<Void> deferSessionIdle(SessionQueueDeferSessionIdleParams para
     }
 
     /**
-     * Identifies the target session.
+     * Removes the most recently queued user-facing item (LIFO).
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -267,7 +267,7 @@ public CompletableFuture<SessionQueueRemoveMostRecentResult> removeMostRecent()
     }
 
     /**
-     * Identifies the target session.
+     * Clears all pending queued items on the local session.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -278,7 +278,7 @@ public CompletableFuture<Void> clear() {
     }
 
     /**
-     * Internal filter for consuming queued system notifications.
+     * Consumes queued native system notifications matching an internal filter.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -294,7 +294,7 @@ CompletableFuture<QueueRemoveMostRecentResult> consumeSystemNotifications(Sessio
     }
 
     /**
-     * Identifies the target session.
+     * Enqueues the internal resume-pending wake item when orphan handling needs a follow-up turn.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -305,7 +305,7 @@ CompletableFuture<QueueEnqueueResumePendingResult> enqueueResumePending() {
     }
 
     /**
-     * Identifies the target session.
+     * Drains the native local-session work queue for in-process session orchestration.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueConsumeSystemNotificationsParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueConsumeSystemNotificationsParams.java
index 3b1d844881..850afce76e 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueConsumeSystemNotificationsParams.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQueueConsumeSystemNotificationsParams.java
@@ -27,6 +27,7 @@ record SessionQueueConsumeSystemNotificationsParams(
     /** Target session identifier */
     @JsonProperty("sessionId") String sessionId,
     /** Opaque runtime-owned filter object. */
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     @JsonProperty("filter") Object filter
 ) {
 }
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQuotaApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQuotaApi.java
new file mode 100644
index 0000000000..15ecde4f84
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQuotaApi.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.github.copilot.CopilotExperimental;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import javax.annotation.processing.Generated;
+
+/**
+ * API methods for the {@code quota} namespace.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public final class SessionQuotaApi {
+
+    private final RpcCaller caller;
+    private final String sessionId;
+
+    /** @param caller the RPC transport function */
+    SessionQuotaApi(RpcCaller caller, String sessionId) {
+        this.caller = caller;
+        this.sessionId = sessionId;
+    }
+
+    /**
+     * Gets the session's current quota and account projection without making a network request.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    public CompletableFuture<SessionQuotaGetResult> get() {
+        return caller.invoke("session.quota.get", java.util.Map.of("sessionId", this.sessionId), SessionQuotaGetResult.class);
+    }
+
+    /**
+     * Refreshes the session's provider model catalog bypassing its cache, folds quota snapshots into session state, and returns the updated projection. Failures leave the last known quota intact.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    public CompletableFuture<SessionQuotaRefreshResult> refresh() {
+        return caller.invoke("session.quota.refresh", java.util.Map.of("sessionId", this.sessionId), SessionQuotaRefreshResult.class);
+    }
+
+    /**
+     * Returns and clears the session's pending quota warnings. Reading or refreshing quota does not drain warnings.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    public CompletableFuture<List<QuotaWarningProjection>> takeWarnings() {
+        return caller.invoke("session.quota.takeWarnings", java.util.Map.of("sessionId", this.sessionId), RpcMapper.INSTANCE.getTypeFactory().constructCollectionType(List.class, QuotaWarningProjection.class));
+    }
+
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQuotaDelegateWarning.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQuotaDelegateWarning.java
new file mode 100644
index 0000000000..ed6331a96f
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQuotaDelegateWarning.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;
+
+/**
+ * Existing delegation guidance for an account without delegation access.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record SessionQuotaDelegateWarning(
+    /** User-facing guidance. */
+    @JsonProperty("text") String text,
+    /** Link to upgrade the account. */
+    @JsonProperty("url") String url
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQuotaGetParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQuotaGetParams.java
new file mode 100644
index 0000000000..1c66851a3d
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQuotaGetParams.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 SessionQuotaGetParams(
+    /** Target session identifier */
+    @JsonProperty("sessionId") String sessionId
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQuotaGetResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQuotaGetResult.java
new file mode 100644
index 0000000000..cc92c0199f
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQuotaGetResult.java
@@ -0,0 +1,56 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 java.util.Map;
+import javax.annotation.processing.Generated;
+
+/**
+ * The incumbent session-owned quota and account projection.
+ *
+ * @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 SessionQuotaGetResult(
+    /** Known quota snapshots, keyed by the provider's quota type. */
+    @JsonProperty("snapshots") Map<String, SessionQuotaSnapshot> snapshots,
+    /** Provider-owned account quota state, including snapshots without numeric balances. */
+    @JsonProperty("providerQuotas") List<ProviderQuotaState> providerQuotas,
+    /** Whether the account uses the free limited Copilot plan. */
+    @JsonProperty("isFreeUser") Boolean isFreeUser,
+    /** Whether the account uses token-based billing. */
+    @JsonProperty("isTbbUser") Boolean isTbbUser,
+    /** Resolved Copilot plan tier. */
+    @JsonProperty("planTier") SessionQuotaPlanTier planTier,
+    /** Whether premium-request costs are billable. */
+    @JsonProperty("premiumRequestsBillable") Boolean premiumRequestsBillable,
+    /** Whether model cost columns should be shown. */
+    @JsonProperty("modelCostColumnVisible") Boolean modelCostColumnVisible,
+    /** Whether the account can delegate tasks to GitHub. */
+    @JsonProperty("delegateAvailable") Boolean delegateAvailable,
+    /** Whether the account can sign up for Copilot Free. */
+    @JsonProperty("canSignupForCopilotFree") Boolean canSignupForCopilotFree,
+    /** Whether dynamic workflows are enabled for the active account. */
+    @JsonProperty("dynamicWorkflowsEnabled") Boolean dynamicWorkflowsEnabled,
+    /** Whether dynamic workflows are visible under the session's feature flags. */
+    @JsonProperty("dynamicWorkflowsUiVisible") Boolean dynamicWorkflowsUiVisible,
+    /** Upgrade link for a free account. */
+    @JsonProperty("upgradeUrl") String upgradeUrl,
+    /** Existing delegation warning for a free account. */
+    @JsonProperty("delegateWarning") SessionQuotaDelegateWarning delegateWarning
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQuotaPlanTier.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQuotaPlanTier.java
new file mode 100644
index 0000000000..fc2e5c53c9
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQuotaPlanTier.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;
+
+/**
+ * Copilot plan tier used by the session quota projection.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+public enum SessionQuotaPlanTier {
+    /** The {@code free} variant. */
+    FREE("free"),
+    /** The {@code edu} variant. */
+    EDU("edu"),
+    /** The {@code pro} variant. */
+    PRO("pro"),
+    /** The {@code pro_plus} variant. */
+    PRO_PLUS("pro_plus"),
+    /** The {@code business} variant. */
+    BUSINESS("business"),
+    /** The {@code enterprise} variant. */
+    ENTERPRISE("enterprise"),
+    /** The {@code max} variant. */
+    MAX("max"),
+    /** The {@code unknown} variant. */
+    UNKNOWN("unknown");
+
+    private final String value;
+    SessionQuotaPlanTier(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static SessionQuotaPlanTier fromValue(String value) {
+        for (SessionQuotaPlanTier v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown SessionQuotaPlanTier value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQuotaRefreshParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQuotaRefreshParams.java
new file mode 100644
index 0000000000..ac51e99123
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQuotaRefreshParams.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 SessionQuotaRefreshParams(
+    /** Target session identifier */
+    @JsonProperty("sessionId") String sessionId
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQuotaRefreshResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQuotaRefreshResult.java
new file mode 100644
index 0000000000..0f0892d284
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQuotaRefreshResult.java
@@ -0,0 +1,56 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 java.util.Map;
+import javax.annotation.processing.Generated;
+
+/**
+ * The incumbent session-owned quota and account projection.
+ *
+ * @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 SessionQuotaRefreshResult(
+    /** Known quota snapshots, keyed by the provider's quota type. */
+    @JsonProperty("snapshots") Map<String, SessionQuotaSnapshot> snapshots,
+    /** Provider-owned account quota state, including snapshots without numeric balances. */
+    @JsonProperty("providerQuotas") List<ProviderQuotaState> providerQuotas,
+    /** Whether the account uses the free limited Copilot plan. */
+    @JsonProperty("isFreeUser") Boolean isFreeUser,
+    /** Whether the account uses token-based billing. */
+    @JsonProperty("isTbbUser") Boolean isTbbUser,
+    /** Resolved Copilot plan tier. */
+    @JsonProperty("planTier") SessionQuotaPlanTier planTier,
+    /** Whether premium-request costs are billable. */
+    @JsonProperty("premiumRequestsBillable") Boolean premiumRequestsBillable,
+    /** Whether model cost columns should be shown. */
+    @JsonProperty("modelCostColumnVisible") Boolean modelCostColumnVisible,
+    /** Whether the account can delegate tasks to GitHub. */
+    @JsonProperty("delegateAvailable") Boolean delegateAvailable,
+    /** Whether the account can sign up for Copilot Free. */
+    @JsonProperty("canSignupForCopilotFree") Boolean canSignupForCopilotFree,
+    /** Whether dynamic workflows are enabled for the active account. */
+    @JsonProperty("dynamicWorkflowsEnabled") Boolean dynamicWorkflowsEnabled,
+    /** Whether dynamic workflows are visible under the session's feature flags. */
+    @JsonProperty("dynamicWorkflowsUiVisible") Boolean dynamicWorkflowsUiVisible,
+    /** Upgrade link for a free account. */
+    @JsonProperty("upgradeUrl") String upgradeUrl,
+    /** Existing delegation warning for a free account. */
+    @JsonProperty("delegateWarning") SessionQuotaDelegateWarning delegateWarning
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQuotaSnapshot.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQuotaSnapshot.java
new file mode 100644
index 0000000000..996bdf7227
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQuotaSnapshot.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;
+
+/**
+ * Session quota snapshot, preserving the incumbent numeric units and reset metadata.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record SessionQuotaSnapshot(
+    /** Whether the entitlement is unlimited. */
+    @JsonProperty("isUnlimitedEntitlement") Boolean isUnlimitedEntitlement,
+    /** Entitled quantity in this quota's units. */
+    @JsonProperty("entitlementRequests") Double entitlementRequests,
+    /** Consumed quantity in this quota's units. */
+    @JsonProperty("usedRequests") Double usedRequests,
+    /** Whether usage is allowed after quota exhaustion. */
+    @JsonProperty("usageAllowedWithExhaustedQuota") Boolean usageAllowedWithExhaustedQuota,
+    /** Additional usage in this quota's units. */
+    @JsonProperty("overage") Double overage,
+    /** Whether additional usage is allowed after quota exhaustion. */
+    @JsonProperty("overageAllowedWithExhaustedQuota") Boolean overageAllowedWithExhaustedQuota,
+    /** Percentage of the entitlement remaining. */
+    @JsonProperty("remainingPercentage") Double remainingPercentage,
+    /** Quota reset time in milliseconds since the Unix epoch, when known. */
+    @JsonProperty("resetDateEpochMs") Double resetDateEpochMs,
+    /** Whether the reset time is estimated. */
+    @JsonProperty("resetDateEstimated") Boolean resetDateEstimated,
+    /** Whether the provider reports available quota. */
+    @JsonProperty("hasQuota") Boolean hasQuota,
+    /** Whether this quota uses token-based billing. */
+    @JsonProperty("tokenBasedBilling") Boolean tokenBasedBilling,
+    /** Additional-usage budget cap, when provided. */
+    @JsonProperty("overageEntitlement") Double overageEntitlement
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQuotaTakeWarningsParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQuotaTakeWarningsParams.java
new file mode 100644
index 0000000000..2a96fdd5a2
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionQuotaTakeWarningsParams.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 SessionQuotaTakeWarningsParams(
+    /** Target session identifier */
+    @JsonProperty("sessionId") String sessionId
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionRemoteApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionRemoteApi.java
index bb1cfa0e25..015c69f830 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionRemoteApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionRemoteApi.java
@@ -31,7 +31,7 @@ public final class SessionRemoteApi {
     }
 
     /**
-     * Optional remote session mode ("off", "export", or "on"); defaults to enabling both export and remote steering.
+     * Enables remote session export or steering.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -47,7 +47,7 @@ public CompletableFuture<SessionRemoteEnableResult> enable(SessionRemoteEnablePa
     }
 
     /**
-     * Identifies the target session.
+     * Disables remote session export and steering.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -58,7 +58,7 @@ public CompletableFuture<Void> disable() {
     }
 
     /**
-     * New remote-steerability state to persist as a `session.remote_steerable_changed` event.
+     * Persists a remote-steerability change emitted by the host as a session event.
      * <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/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionRpc.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionRpc.java
index 9c235ef2e3..9a56863901 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionRpc.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionRpc.java
@@ -113,6 +113,8 @@ public final class SessionRpc {
     public final SessionEventLogApi eventLog;
     /** API methods for the {@code usage} namespace. */
     public final SessionUsageApi usage;
+    /** API methods for the {@code quota} namespace. */
+    public final SessionQuotaApi quota;
     /** API methods for the {@code limitPrediction} namespace. */
     public final SessionLimitPredictionApi limitPrediction;
     /** API methods for the {@code remote} namespace. */
@@ -173,6 +175,7 @@ public SessionRpc(RpcCaller caller, String sessionId) {
         this.queue = new SessionQueueApi(caller, sessionId);
         this.eventLog = new SessionEventLogApi(caller, sessionId);
         this.usage = new SessionUsageApi(caller, sessionId);
+        this.quota = new SessionQuotaApi(caller, sessionId);
         this.limitPrediction = new SessionLimitPredictionApi(caller, sessionId);
         this.remote = new SessionRemoteApi(caller, sessionId);
         this.visibility = new SessionVisibilityApi(caller, sessionId);
@@ -180,7 +183,7 @@ public SessionRpc(RpcCaller caller, String sessionId) {
     }
 
     /**
-     * Identifies the target session.
+     * Suspends the session while preserving persisted state for later resume.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -191,7 +194,7 @@ public CompletableFuture<Void> suspend() {
     }
 
     /**
-     * Parameters for sending a user message to the session
+     * Sends a user message to the session and returns its message ID.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -207,7 +210,7 @@ public CompletableFuture<SessionSendResult> send(SessionSendParams params) {
     }
 
     /**
-     * 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.
+     * Sends zero or more user messages to the session in a single turn and returns their message IDs. All provided messages are appended to the conversation in order, then exactly one agent turn runs over the resulting history. When the list is empty, one turn runs over the existing history with no new user message. Remote-backed (Mission Control) sessions do not support this method and will return an error.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -223,7 +226,7 @@ public CompletableFuture<SessionSendMessagesResult> sendMessages(SessionSendMess
     }
 
     /**
-     * Internal request for sending a system notification.
+     * Queues or sends an internal system notification to the session according to its passive policy.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -239,7 +242,7 @@ CompletableFuture<Void> sendSystemNotification(SessionSendSystemNotificationPara
     }
 
     /**
-     * Parameters for aborting the current turn
+     * Aborts the current agent turn.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -255,7 +258,7 @@ public CompletableFuture<SessionAbortResult> abort(SessionAbortParams params) {
     }
 
     /**
-     * Parameters for interrupting the main agent turn.
+     * Interrupts the current main agent turn while leaving running background work (subagents, sidekicks, and promoted attached shells) alive. No-op when the main loop is not processing.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -271,18 +274,18 @@ public CompletableFuture<SessionInterruptMainTurnResult> interruptMainTurn(Sessi
     }
 
     /**
-     * Identifies the target session.
+     * Cancels every running background agent (task-registry subagents plus sidekick agents) without interrupting the main agent loop. Promoted attached shells are left running.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
      */
     @CopilotExperimental
-    public CompletableFuture<Void> cancelAllBackgroundAgents() {
-        return caller.invoke("session.cancelAllBackgroundAgents", java.util.Map.of("sessionId", this.sessionId), Void.class);
+    public CompletableFuture<Long> cancelAllBackgroundAgents() {
+        return caller.invoke("session.cancelAllBackgroundAgents", java.util.Map.of("sessionId", this.sessionId), Long.class);
     }
 
     /**
-     * Parameters for shutting down the session
+     * Shuts down the session and persists its final state. Awaits any deferred sessionEnd hooks before resolving so user-supplied hook scripts complete before the runtime tears down.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -298,7 +301,7 @@ public CompletableFuture<Void> shutdown(SessionShutdownParams params) {
     }
 
     /**
-     * Message text, optional severity level, persistence flag, optional follow-up URL, and optional tip.
+     * Emits a user-visible session log event.
      * <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/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSandboxApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSandboxApi.java
index a13ef559ef..b780e59b38 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSandboxApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSandboxApi.java
@@ -31,7 +31,7 @@ public final class SessionSandboxApi {
     }
 
     /**
-     * Identifies the target session.
+     * Returns whether managed policy requires sandbox enforcement and whether an enforcement failure has permanently blocked the session.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -42,7 +42,18 @@ public CompletableFuture<SessionSandboxGetEnforcementStatusResult> getEnforcemen
     }
 
     /**
-     * Request to disable sandboxing for the current session while resolving an active sandbox-bypass permission prompt.
+     * Lists possible secret-bearing environment variables available to new sandboxed shells that are not already covered by credential masking. Uses local name rules and known-provider host suggestions, never returns secret values, and changes no settings or network permissions. Returns no suggestions while the session is not sandboxed.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    public CompletableFuture<SessionSandboxGetCredentialSuggestionsResult> getCredentialSuggestions() {
+        return caller.invoke("session.sandbox.getCredentialSuggestions", java.util.Map.of("sessionId", this.sessionId), SessionSandboxGetCredentialSuggestionsResult.class);
+    }
+
+    /**
+     * Disables sandboxing for the remainder of the current session and approves the referenced pending sandbox-bypass permission request. The request is rejected unless the exact request is still pending and the effective sandbox policy permits bypass.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -58,7 +69,7 @@ public CompletableFuture<SessionSandboxDisableForSessionResult> disableForSessio
     }
 
     /**
-     * Request to accept the sandbox path grant offered on an active sandbox escalation permission prompt.
+     * Adds the path offered by a pending sandbox escalation permission request's sandboxPathGrant to the session's sandbox policy and approves the request, so the blocked operation re-runs inside the sandbox rather than outside it. The request is rejected unless the exact request is still pending, carries a sandboxPathGrant, and the grant still takes effect under the current managed policy. Does not persist the path; hosts that store sandbox settings save it themselves.
      * <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/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSandboxGetCredentialSuggestionsParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSandboxGetCredentialSuggestionsParams.java
new file mode 100644
index 0000000000..c587908619
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSandboxGetCredentialSuggestionsParams.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 SessionSandboxGetCredentialSuggestionsParams(
+    /** Target session identifier */
+    @JsonProperty("sessionId") String sessionId
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSandboxGetCredentialSuggestionsResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSandboxGetCredentialSuggestionsResult.java
new file mode 100644
index 0000000000..2f883728f1
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSandboxGetCredentialSuggestionsResult.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;
+
+/**
+ * Possible unconfigured secrets in the sandbox shell environment, sorted by variable name, with no secret values.
+ *
+ * @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 SessionSandboxGetCredentialSuggestionsResult(
+    /** Candidates for user review. Empty when sandboxing is disabled or no unconfigured candidates are present. */
+    @JsonProperty("suggestions") List<SandboxCredentialSuggestion> suggestions
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleApi.java
index a6e8ad88d7..0b6a90aca9 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionScheduleApi.java
@@ -31,7 +31,7 @@ public final class SessionScheduleApi {
     }
 
     /**
-     * Identifies the target session.
+     * Lists the session's currently active scheduled prompts.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -42,7 +42,7 @@ public CompletableFuture<SessionScheduleListResult> list() {
     }
 
     /**
-     * Identifies the target session.
+     * Hydrates the native schedule registry from persisted session events.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -53,7 +53,7 @@ CompletableFuture<Void> hydrate() {
     }
 
     /**
-     * Identifies the target session.
+     * Reports whether the session has an active self-paced scheduled prompt.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -64,7 +64,7 @@ CompletableFuture<ScheduleHasSelfPacedResult> hasSelfPaced() {
     }
 
     /**
-     * Register a relative-interval scheduled prompt.
+     * Registers a relative-interval scheduled prompt.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -80,7 +80,7 @@ CompletableFuture<ScheduleAddResult> add(SessionScheduleAddParams params) {
     }
 
     /**
-     * Register a cron scheduled prompt.
+     * Registers a recurring cron scheduled prompt.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -96,7 +96,7 @@ CompletableFuture<ScheduleAddResult> addCron(SessionScheduleAddCronParams params
     }
 
     /**
-     * Register an absolute-time scheduled prompt.
+     * Registers an absolute-time scheduled prompt.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -112,7 +112,7 @@ CompletableFuture<ScheduleAddResult> addAt(SessionScheduleAddAtParams params) {
     }
 
     /**
-     * Register a self-paced scheduled prompt.
+     * Registers a self-paced scheduled prompt.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -128,7 +128,7 @@ CompletableFuture<ScheduleAddResult> addSelfPaced(SessionScheduleAddSelfPacedPar
     }
 
     /**
-     * Re-arm a self-paced scheduled prompt.
+     * Re-arms an active self-paced scheduled prompt.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -144,7 +144,7 @@ CompletableFuture<ScheduleAddResult> rearmSelfPaced(SessionScheduleRearmSelfPace
     }
 
     /**
-     * Identifier of the scheduled prompt to remove.
+     * Removes a scheduled prompt by id.
      * <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/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsApi.java
index 213b7de0a4..f07d028f93 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSettingsApi.java
@@ -31,7 +31,7 @@ final class SessionSettingsApi {
     }
 
     /**
-     * Identifies the target session.
+     * 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.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -42,7 +42,7 @@ CompletableFuture<SessionSettingsSnapshot> snapshot() {
     }
 
     /**
-     * Named Rust-owned settings predicate to evaluate for this session.
+     * Evaluates a named Rust-owned settings predicate without exposing raw feature flags. Internal: the raw feature-flag names and composition are runtime-internal, so this predicate-evaluation helper is kept out of the public SDK surface and is callable in-process only.
      * <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/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionShellApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionShellApi.java
index ebfd1a9c7d..6d3187ef75 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionShellApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionShellApi.java
@@ -31,7 +31,7 @@ public final class SessionShellApi {
     }
 
     /**
-     * Shell command to run, with optional working directory and timeout in milliseconds. Spawn failures return an RPC error.
+     * Starts a shell command, returning an RPC error if it cannot be spawned. The command runs as the leader of its own process group (POSIX) or in a dedicated job object (Windows), so a forced termination — via "shell.kill", the request timeout, or session disposal — signals that whole group/job rather than only the direct child. Two gaps are worth planning for: a command that exits on its own does not trigger that teardown, and on POSIX a descendant that moves itself into a new session or process group (for example via "setsid") leaves the signalled group, so either can leave a background process running.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -47,7 +47,7 @@ public CompletableFuture<SessionShellExecResult> exec(SessionShellExecParams par
     }
 
     /**
-     * Identifier of a process previously returned by "shell.exec" and the signal to send.
+     * Sends a signal to a shell process previously started via "shell.exec". The signal targets the command's whole process group (POSIX) or job object (Windows), so descendants still in that group are signalled too, not just the direct child. On POSIX a descendant that moved itself into a new session or process group (for example via "setsid") is no longer in the signalled group and survives.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -63,7 +63,7 @@ public CompletableFuture<SessionShellKillResult> kill(SessionShellKillParams par
     }
 
     /**
-     * User-requested shell command and cancellation handle.
+     * Executes a user-requested shell command through the session runtime.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -79,7 +79,7 @@ public CompletableFuture<SessionShellExecuteUserRequestedResult> executeUserRequ
     }
 
     /**
-     * User-requested shell execution cancellation handle.
+     * Cancels a user-requested shell command by request ID.
      * <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/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSkillsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSkillsApi.java
index f6cceb98b9..e21c294b31 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSkillsApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionSkillsApi.java
@@ -31,7 +31,7 @@ public final class SessionSkillsApi {
     }
 
     /**
-     * Identifies the target session.
+     * Lists skills available to the session.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -42,7 +42,7 @@ public CompletableFuture<SessionSkillsListResult> list() {
     }
 
     /**
-     * Identifies the target session.
+     * Returns the skills that have been invoked during this session.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -53,7 +53,7 @@ public CompletableFuture<SessionSkillsGetInvokedResult> getInvoked() {
     }
 
     /**
-     * Name of the skill to enable for the session.
+     * Enables a skill 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.
@@ -69,7 +69,7 @@ public CompletableFuture<Void> enable(SessionSkillsEnableParams params) {
     }
 
     /**
-     * Name of the skill to disable for the session.
+     * Disables a skill 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.
@@ -85,7 +85,7 @@ public CompletableFuture<Void> disable(SessionSkillsDisableParams params) {
     }
 
     /**
-     * Identifies the target session.
+     * Reloads skill definitions for the session.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -96,7 +96,7 @@ public CompletableFuture<SessionSkillsReloadResult> reload() {
     }
 
     /**
-     * Identifies the target session.
+     * Ensures the session's skill definitions have been loaded from disk.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTasksApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTasksApi.java
index c6ca1335de..9e78691586 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTasksApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTasksApi.java
@@ -31,7 +31,7 @@ public final class SessionTasksApi {
     }
 
     /**
-     * Agent type, prompt, name, and optional description and model override for the new task.
+     * Starts a background agent task in the session.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -47,7 +47,7 @@ public CompletableFuture<SessionTasksStartAgentResult> startAgent(SessionTasksSt
     }
 
     /**
-     * Identifies the target session.
+     * Lists background tasks tracked by the session.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -58,7 +58,7 @@ public CompletableFuture<SessionTasksListResult> list() {
     }
 
     /**
-     * Registers or reclaims a client-owned task.
+     * Registers a client-owned task, or reclaims an orphaned task belonging to the same extension principal.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -74,7 +74,7 @@ public CompletableFuture<SessionTasksRegisterResult> register(SessionTasksRegist
     }
 
     /**
-     * Updates a client-owned task.
+     * Publishes generic progress or a terminal outcome for a client-owned task.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -90,7 +90,7 @@ public CompletableFuture<SessionTasksUpdateResult> update(SessionTasksUpdatePara
     }
 
     /**
-     * Identifies the target session.
+     * Refreshes metadata for any detached background shells the runtime knows about.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -101,7 +101,7 @@ public CompletableFuture<Void> refresh() {
     }
 
     /**
-     * Identifies the target session.
+     * Waits for all in-flight background tasks and any follow-up turns to settle.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -112,7 +112,7 @@ public CompletableFuture<Void> waitForPending() {
     }
 
     /**
-     * Identifier of the background task to fetch progress for.
+     * Returns progress information for a background task by ID.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -128,7 +128,7 @@ public CompletableFuture<SessionTasksGetProgressResult> getProgress(SessionTasks
     }
 
     /**
-     * Identifies the target session.
+     * Returns the first sync-waiting task that can currently be promoted to background mode.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -139,7 +139,7 @@ public CompletableFuture<SessionTasksGetCurrentPromotableResult> getCurrentPromo
     }
 
     /**
-     * Identifier of the task to promote to background mode.
+     * Promotes an eligible synchronously-waited task so it continues running in the background.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -155,7 +155,7 @@ public CompletableFuture<SessionTasksPromoteToBackgroundResult> promoteToBackgro
     }
 
     /**
-     * Identifies the target session.
+     * Atomically promotes the first promotable sync-waiting task to background mode and returns it.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -166,7 +166,7 @@ public CompletableFuture<SessionTasksPromoteCurrentToBackgroundResult> promoteCu
     }
 
     /**
-     * Identifier of the background task to cancel.
+     * Cancels a background task.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -182,7 +182,7 @@ public CompletableFuture<SessionTasksCancelResult> cancel(SessionTasksCancelPara
     }
 
     /**
-     * Identifier of the completed or cancelled task to remove from tracking.
+     * Removes a completed or cancelled background task from tracking.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -198,7 +198,7 @@ public CompletableFuture<SessionTasksRemoveResult> remove(SessionTasksRemovePara
     }
 
     /**
-     * Identifier of the target agent task, message content, and optional sender agent ID.
+     * Sends a message to a background agent task.
      * <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/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTelemetryApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTelemetryApi.java
index 42589661ef..d74f8366da 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTelemetryApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionTelemetryApi.java
@@ -31,7 +31,7 @@ public final class SessionTelemetryApi {
     }
 
     /**
-     * Identifies the target session.
+     * Gets the telemetry engagement ID currently associated with the session, when available.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -42,7 +42,7 @@ public CompletableFuture<SessionTelemetryGetEngagementIdResult> getEngagementId(
     }
 
     /**
-     * Feature override key/value pairs to attach to subsequent telemetry events from this session.
+     * Sets feature override key/value pairs to attach to subsequent telemetry events 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.
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionToolsApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionToolsApi.java
index 62593a3588..250478499b 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionToolsApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionToolsApi.java
@@ -31,7 +31,7 @@ public final class SessionToolsApi {
     }
 
     /**
-     * A tool name and arguments to execute through the session's native invocation pipeline.
+     * Executes one tool from the session's currently offered tool set through the 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.
@@ -47,7 +47,7 @@ public CompletableFuture<Void> execute(SessionToolsExecuteParams params) {
     }
 
     /**
-     * Options controlling how Rust-owned built-in tool descriptors are materialized.
+     * Returns the Rust-owned built-in tool descriptors used to construct the session's offered tool set.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -63,7 +63,7 @@ public CompletableFuture<SessionToolsGetBuiltinDescriptorsResult> getBuiltinDesc
     }
 
     /**
-     * Task-completion tool arguments and final result used to build a label-safe session event payload.
+     * Projects a completed task_complete tool call into its 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.
@@ -79,7 +79,7 @@ public CompletableFuture<SessionToolsTaskCompleteEventDataResult> taskCompleteEv
     }
 
     /**
-     * Pending external tool call request ID, with the tool result or an error describing why it failed.
+     * Provides the result for a pending external tool call.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -95,7 +95,18 @@ public CompletableFuture<SessionToolsHandlePendingToolCallResult> handlePendingT
     }
 
     /**
-     * Identifies the target session.
+     * Lists the external tool calls of the session and its sub-agents that are still waiting for session.tools.handlePendingToolCall.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    public CompletableFuture<SessionToolsListPendingRequestsResult> listPendingRequests() {
+        return caller.invoke("session.tools.listPendingRequests", java.util.Map.of("sessionId", this.sessionId), SessionToolsListPendingRequestsResult.class);
+    }
+
+    /**
+     * Resolves, builds, and validates the runtime tool list for the session.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -106,7 +117,7 @@ public CompletableFuture<Void> initializeAndValidate() {
     }
 
     /**
-     * Identifies the target session.
+     * Returns lightweight metadata for the session's currently initialized tools.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -117,7 +128,7 @@ public CompletableFuture<SessionToolsGetCurrentMetadataResult> getCurrentMetadat
     }
 
     /**
-     * Complete externally implemented tool list for the calling connection. An empty list removes every tool previously supplied by that connection.
+     * 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.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -133,7 +144,7 @@ public CompletableFuture<Void> set(SessionToolsSetParams params) {
     }
 
     /**
-     * Subagent settings to apply to the current session
+     * Sets the current session's live subagent settings override, which takes precedence over persisted user settings until cleared. Persisted user settings remain the source of truth for future sessions.
      * <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/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionToolsExecuteParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionToolsExecuteParams.java
index e60023c3aa..0e118ff815 100644
--- 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
@@ -29,6 +29,7 @@ public record SessionToolsExecuteParams(
     /** Name of the currently offered tool to execute. */
     @JsonProperty("name") String name,
     /** Arguments supplied to the tool. */
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     @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/SessionToolsListPendingRequestsParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionToolsListPendingRequestsParams.java
new file mode 100644
index 0000000000..8a10167180
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionToolsListPendingRequestsParams.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;
+
+/**
+ * No parameters; returns the external tool calls of the session and its sub-agents that are still waiting for a result.
+ *
+ * @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 SessionToolsListPendingRequestsParams(
+    /** Target session identifier */
+    @JsonProperty("sessionId") String sessionId
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionToolsListPendingRequestsResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionToolsListPendingRequestsResult.java
new file mode 100644
index 0000000000..c7b17b4928
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionToolsListPendingRequestsResult.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;
+
+/**
+ * External tool calls still waiting for a result.
+ *
+ * @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 SessionToolsListPendingRequestsResult(
+    /** External tool calls of the session and its sub-agents that session.tools.handlePendingToolCall would still accept, in the order they were requested. Includes calls that were pending when the session was last suspended and resumed with pending work continued, so a host that did not observe the original external_tool.requested event can answer them. */
+    @JsonProperty("items") List<PendingExternalToolRequest> items
+) {
+}
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
index 9902fb8a99..56fbf48a11 100644
--- 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
@@ -27,6 +27,7 @@ public record SessionToolsTaskCompleteEventDataParams(
     /** Target session identifier */
     @JsonProperty("sessionId") String sessionId,
     /** Arguments supplied to the completed task_complete tool call. */
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     @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/SessionUiApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUiApi.java
index 7feccbd56a..5187b51774 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUiApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUiApi.java
@@ -31,7 +31,7 @@ public final class SessionUiApi {
     }
 
     /**
-     * Transient question to answer without adding it to conversation history.
+     * Runs a transient no-tools model query against the current conversation context.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -47,7 +47,7 @@ public CompletableFuture<SessionUiEphemeralQueryResult> ephemeralQuery(SessionUi
     }
 
     /**
-     * Prompt message and JSON schema describing the form fields to elicit from the user.
+     * Requests structured input from a UI-capable client.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -63,7 +63,7 @@ public CompletableFuture<SessionUiElicitationResult> elicitation(SessionUiElicit
     }
 
     /**
-     * Pending elicitation request ID and the user's response (accept/decline/cancel + form values).
+     * Provides the user response for a pending elicitation request.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -79,7 +79,7 @@ public CompletableFuture<SessionUiHandlePendingElicitationResult> handlePendingE
     }
 
     /**
-     * Pending elicitation request ID and the user's response (accept/decline/cancel + form values).
+     * Resolves a pending elicitation request after direct interaction in the trusted in-process client. Only an accepted response to the built-in ask_user tool can become trusted human evidence.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -95,7 +95,7 @@ CompletableFuture<UIElicitationResult> handleHumanAskUser(SessionUiHandleHumanAs
     }
 
     /**
-     * Request ID of a pending `user_input.requested` event and the user's response.
+     * Resolves a pending `user_input.requested` event with the user's response.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -111,7 +111,7 @@ public CompletableFuture<SessionUiHandlePendingUserInputResult> handlePendingUse
     }
 
     /**
-     * Request ID of a pending `user_input.requested` event and the user's response.
+     * Resolves a pending `user_input.requested` event after direct interaction in the trusted in-process client.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -127,7 +127,7 @@ CompletableFuture<UIHandlePendingResult> handleHumanUserInput(SessionUiHandleHum
     }
 
     /**
-     * Request ID of a pending `sampling.requested` event and an optional sampling result payload (omit to reject).
+     * Resolves a pending `sampling.requested` event with a sampling result, or rejects it.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -143,7 +143,7 @@ public CompletableFuture<SessionUiHandlePendingSamplingResult> handlePendingSamp
     }
 
     /**
-     * Request ID of a pending `auto_mode_switch.requested` event and the user's response.
+     * Resolves a pending `auto_mode_switch.requested` event with the user's accept/decline decision.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -159,7 +159,7 @@ public CompletableFuture<SessionUiHandlePendingAutoModeSwitchResult> handlePendi
     }
 
     /**
-     * Request ID of a pending `session_limits_exhausted.requested` event and the user's selected limit action.
+     * Resolves a pending `session_limits_exhausted.requested` event with the user's selected limit action.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -175,7 +175,7 @@ public CompletableFuture<SessionUiHandlePendingSessionLimitsExhaustedResult> han
     }
 
     /**
-     * Request ID of a pending `exit_plan_mode.requested` event and the user's response.
+     * Resolves a pending `exit_plan_mode.requested` event with the user's response.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -191,7 +191,7 @@ public CompletableFuture<SessionUiHandlePendingExitPlanModeResult> handlePending
     }
 
     /**
-     * Request ID of a pending `exit_plan_mode.requested` event and the user's response.
+     * Resolves a pending `exit_plan_mode.requested` event after direct interaction in the trusted in-process client.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -207,7 +207,7 @@ CompletableFuture<UIHandlePendingResult> handleHumanExitPlanMode(SessionUiHandle
     }
 
     /**
-     * Identifies the target session.
+     * Registers an in-process handler for auto-mode-switch requests so the server bridge skips dispatch.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -218,7 +218,7 @@ public CompletableFuture<SessionUiRegisterDirectAutoModeSwitchHandlerResult> reg
     }
 
     /**
-     * Opaque handle previously returned by `registerDirectAutoModeSwitchHandler` to release.
+     * Unregisters a previously-registered in-process auto-mode-switch handler by its opaque handle.
      * <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/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUsageApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUsageApi.java
index 16ded9d6b6..75a19eadb1 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUsageApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUsageApi.java
@@ -19,6 +19,8 @@
 @javax.annotation.processing.Generated("copilot-sdk-codegen")
 public final class SessionUsageApi {
 
+    private static final com.fasterxml.jackson.databind.ObjectMapper MAPPER = RpcMapper.INSTANCE;
+
     private final RpcCaller caller;
     private final String sessionId;
 
@@ -29,7 +31,7 @@ public final class SessionUsageApi {
     }
 
     /**
-     * Identifies the target session.
+     * Gets accumulated usage metrics for the session.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -39,4 +41,20 @@ public CompletableFuture<SessionUsageGetMetricsResult> getMetrics() {
         return caller.invoke("session.usage.getMetrics", java.util.Map.of("sessionId", this.sessionId), SessionUsageGetMetricsResult.class);
     }
 
+    /**
+     * Internal host-only replacement of absolute code-change totals reported by a relay host.
+     * <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
+    CompletableFuture<Void> setCodeChanges(SessionUsageSetCodeChangesParams params) {
+        com.fasterxml.jackson.databind.node.ObjectNode _p = MAPPER.valueToTree(params);
+        _p.put("sessionId", this.sessionId);
+        return caller.invoke("session.usage.setCodeChanges", _p, Void.class);
+    }
+
 }
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUsageGetMetricsResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUsageGetMetricsResult.java
index a38afd7042..1a771a239a 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUsageGetMetricsResult.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUsageGetMetricsResult.java
@@ -12,6 +12,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.copilot.CopilotExperimental;
 import java.time.OffsetDateTime;
+import java.util.List;
 import java.util.Map;
 import javax.annotation.processing.Generated;
 
@@ -26,6 +27,8 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record SessionUsageGetMetricsResult(
+    /** Completeness of totalNanoAiu. Numeric totals remain the reported subtotal; zero is not a claim of free usage when unavailable. */
+    @JsonProperty("aiCreditsStatus") AiCreditsStatus aiCreditsStatus,
     /** Total user-initiated premium request cost across all models (may be fractional due to multipliers) */
     @JsonProperty("totalPremiumRequestCost") Double totalPremiumRequestCost,
     /** Raw count of user-initiated API requests */
@@ -42,6 +45,9 @@ public record SessionUsageGetMetricsResult(
     @JsonProperty("codeChanges") UsageMetricsCodeChanges codeChanges,
     /** Per-model token and request metrics, keyed by model identifier */
     @JsonProperty("modelMetrics") Map<String, UsageMetricsModelMetric> modelMetrics,
+    /** Provider-attributed model metrics, ordered by first observed provider and model.
+Null attribution preserves historical usage whose provider or model was not recorded. */
+    @JsonProperty("providerModelMetrics") List<UsageMetricsProviderModelMetric> providerModelMetrics,
     /** 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 */
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUsageSetCodeChangesParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUsageSetCodeChangesParams.java
new file mode 100644
index 0000000000..d8a963a75a
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionUsageSetCodeChangesParams.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;
+
+/**
+ * Internal absolute code-change totals reported by the owning host.
+ *
+ * @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)
+record SessionUsageSetCodeChangesParams(
+    /** Target session identifier */
+    @JsonProperty("sessionId") String sessionId,
+    /** Absolute added-line total, replacing the previous reading. */
+    @JsonProperty("linesAdded") Double linesAdded,
+    /** Absolute removed-line total, replacing the previous reading. */
+    @JsonProperty("linesRemoved") Double linesRemoved,
+    /** Absolute changed-file count; omission preserves the previous count. */
+    @JsonProperty("filesCount") Double filesCount
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionVisibilityApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionVisibilityApi.java
index 54f38c2614..b942828e10 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionVisibilityApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionVisibilityApi.java
@@ -31,7 +31,7 @@ public final class SessionVisibilityApi {
     }
 
     /**
-     * Identifies the target session.
+     * Returns the session's current Mission Control sharing status and shareable GitHub URL. Reflects whether the synced session is visible to repository readers ("repo") or restricted to its creator and collaborators ("unshared").
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -42,7 +42,7 @@ public CompletableFuture<SessionVisibilityGetResult> get() {
     }
 
     /**
-     * Desired sharing status for the session.
+     * Sets the session's Mission Control sharing status, controlling whether the synced session is visible to repository readers. Returns the effective status and shareable GitHub URL after the change.
      * <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/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkflowApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkflowApi.java
index 2b9e81e42f..e746033b39 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkflowApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkflowApi.java
@@ -35,7 +35,7 @@ public final class SessionWorkflowApi {
     }
 
     /**
-     * Parameters for invoking a registered workflow.
+     * Runs a registered dynamic workflow by name at the top level.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -51,7 +51,7 @@ public CompletableFuture<SessionWorkflowRunResult> run(SessionWorkflowRunParams
     }
 
     /**
-     * Parameters for resuming a workflow run from its persisted identity.
+     * Resumes a dynamic workflow run using its persisted name, arguments, journal, and accounting.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -67,7 +67,7 @@ public CompletableFuture<SessionWorkflowResumeResult> resume(SessionWorkflowResu
     }
 
     /**
-     * Internal parameters for invoking a registered workflow from a tool.
+     * Internal tool-originated dynamic workflow invocation.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -83,7 +83,7 @@ CompletableFuture<WorkflowRunResult> runFromTool(SessionWorkflowRunFromToolParam
     }
 
     /**
-     * Internal parameters for resuming a workflow run from a tool.
+     * Internal tool-originated dynamic workflow resume.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -99,7 +99,7 @@ CompletableFuture<WorkflowResumeResult> resumeFromTool(SessionWorkflowResumeFrom
     }
 
     /**
-     * Parameters for retrieving a workflow run.
+     * Gets the current or settled envelope for a dynamic workflow run.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -115,7 +115,7 @@ public CompletableFuture<SessionWorkflowGetRunResult> getRun(SessionWorkflowGetR
     }
 
     /**
-     * Parameters for paging workflow runs.
+     * Lists durable dynamic workflow runs for this session in creation order.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -131,7 +131,7 @@ public CompletableFuture<SessionWorkflowListRunsResult> listRuns(SessionWorkflow
     }
 
     /**
-     * Parameters for retrieving a workflow run.
+     * Gets durable and live observability detail for one dynamic workflow run.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -147,7 +147,7 @@ public CompletableFuture<SessionWorkflowGetRunDetailResult> getRunDetail(Session
     }
 
     /**
-     * Parameters for paging workflow progress.
+     * Pages durable progress for one dynamic workflow run.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -163,7 +163,7 @@ public CompletableFuture<SessionWorkflowGetRunProgressResult> getRunProgress(Ses
     }
 
     /**
-     * Parameters for cancelling a workflow run.
+     * Requests cancellation of a dynamic workflow run and returns its run envelope.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -179,7 +179,7 @@ public CompletableFuture<SessionWorkflowCancelResult> cancel(SessionWorkflowCanc
     }
 
     /**
-     * Parameters for pausing a running workflow.
+     * Pauses a running dynamic workflow and returns its settled run envelope.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -195,7 +195,7 @@ public CompletableFuture<SessionWorkflowPauseResult> pause(SessionWorkflowPauseP
     }
 
     /**
-     * Parameters for an owned durable pause checkpoint.
+     * Atomically pauses an owned dynamic workflow attempt at a durable checkpoint.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -211,7 +211,7 @@ CompletableFuture<WorkflowPauseCheckpointResult> pauseAtCheckpoint(SessionWorkfl
     }
 
     /**
-     * Parameters for recording workflow progress.
+     * Records a batch of ordered dynamic workflow progress lines.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -227,7 +227,7 @@ public CompletableFuture<Void> log(SessionWorkflowLogParams params) {
     }
 
     /**
-     * Parameters for one workflow-scoped subagent call.
+     * Runs one dynamic-workflow-scoped subagent and returns its result.
      * <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/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkflowJournalApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkflowJournalApi.java
index 0909931439..70bc1b47e2 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkflowJournalApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkflowJournalApi.java
@@ -31,7 +31,7 @@ public final class SessionWorkflowJournalApi {
     }
 
     /**
-     * Parameters for reading a workflow journal entry.
+     * Reads a memoized dynamic workflow journal entry.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -47,7 +47,7 @@ public CompletableFuture<SessionWorkflowJournalGetResult> get(SessionWorkflowJou
     }
 
     /**
-     * Parameters for storing a workflow journal entry.
+     * Stores a memoized dynamic workflow journal entry.
      * <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/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkflowJournalPutParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkflowJournalPutParams.java
index 890c69647e..6cd69c5476 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkflowJournalPutParams.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkflowJournalPutParams.java
@@ -33,6 +33,7 @@ public record SessionWorkflowJournalPutParams(
     /** Namespaced journal key. */
     @JsonProperty("key") String key,
     /** JSON result to memoize. */
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     @JsonProperty("resultJson") Object resultJson
 ) {
 }
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkflowRunFromToolParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkflowRunFromToolParams.java
index d68976fb76..78b199562e 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkflowRunFromToolParams.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkflowRunFromToolParams.java
@@ -29,6 +29,7 @@ record SessionWorkflowRunFromToolParams(
     /** Registered workflow name. */
     @JsonProperty("name") String name,
     /** Workflow input value. */
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     @JsonProperty("args") Object args,
     /** Tool-originated workflow invocation options. */
     @JsonProperty("options") WorkflowToolRunOptions options,
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkflowRunParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkflowRunParams.java
index 642e2f7fcf..84883913ff 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkflowRunParams.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkflowRunParams.java
@@ -29,6 +29,7 @@ public record SessionWorkflowRunParams(
     /** Registered workflow name. */
     @JsonProperty("name") String name,
     /** Workflow input value. */
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     @JsonProperty("args") Object args,
     /** Workflow invocation options. */
     @JsonProperty("options") WorkflowRunOptions options
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkingDirectoryContextWithClient.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkingDirectoryContextWithClient.java
new file mode 100644
index 0000000000..d909895e2d
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkingDirectoryContextWithClient.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 com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.processing.Generated;
+
+/**
+ * A working-directory context together with the client that produced it.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record SessionWorkingDirectoryContextWithClient(
+    /** Current working directory path */
+    @JsonProperty("cwd") String cwd,
+    /** Root directory of the git repository */
+    @JsonProperty("gitRoot") String gitRoot,
+    /** Repository identifier derived from the git remote URL */
+    @JsonProperty("repository") String repository,
+    /** Hosting platform type of the repository */
+    @JsonProperty("hostType") String hostType,
+    /** Current git branch name */
+    @JsonProperty("branch") String branch,
+    /** Raw host string from the git remote URL */
+    @JsonProperty("repositoryHost") String repositoryHost,
+    /** Head commit of the current git branch */
+    @JsonProperty("headCommit") String headCommit,
+    /** Merge-base commit SHA */
+    @JsonProperty("baseCommit") String baseCommit,
+    /** Name of the client that created the session */
+    @JsonProperty("clientName") String clientName
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesApi.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesApi.java
index 71a3d1ea1b..c65bd3854d 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesApi.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesApi.java
@@ -8,6 +8,7 @@
 package com.github.copilot.generated.rpc;
 
 import com.github.copilot.CopilotExperimental;
+import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 import javax.annotation.processing.Generated;
 
@@ -31,7 +32,7 @@ public final class SessionWorkspacesApi {
     }
 
     /**
-     * Identifies the target session.
+     * Gets current workspace metadata for the session.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -42,7 +43,7 @@ public CompletableFuture<SessionWorkspacesGetWorkspaceResult> getWorkspace() {
     }
 
     /**
-     * Workspace metadata fields to update.
+     * Updates workspace metadata for a local session and returns the refreshed workspace.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -58,7 +59,7 @@ public CompletableFuture<SessionWorkspacesUpdateMetadataResult> updateMetadata(S
     }
 
     /**
-     * Optional session context used when creating a local workspace.
+     * Ensures a local session workspace exists and returns it.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -74,7 +75,7 @@ public CompletableFuture<SessionWorkspacesEnsureResult> ensure(SessionWorkspaces
     }
 
     /**
-     * Identifies the target session.
+     * Lists files stored in the session workspace files directory.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -85,7 +86,7 @@ public CompletableFuture<SessionWorkspacesListFilesResult> listFiles() {
     }
 
     /**
-     * Relative path of the workspace file to read.
+     * Reads a file from the session workspace files directory.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -101,7 +102,7 @@ public CompletableFuture<SessionWorkspacesReadFileResult> readFile(SessionWorksp
     }
 
     /**
-     * Relative path and UTF-8 content for the workspace file to create or overwrite.
+     * Creates or overwrites a file in the session workspace files directory.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -117,7 +118,7 @@ public CompletableFuture<Void> createFile(SessionWorkspacesCreateFileParams para
     }
 
     /**
-     * Relative path of the workspace file or directory to inspect.
+     * Returns metadata for a file or directory in the session workspace files directory.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -133,7 +134,7 @@ public CompletableFuture<SessionWorkspacesStatFileResult> statFile(SessionWorksp
     }
 
     /**
-     * Directory to create within the session workspace files directory.
+     * Creates a directory in the session workspace files directory.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -149,7 +150,7 @@ public CompletableFuture<Void> createDirectory(SessionWorkspacesCreateDirectoryP
     }
 
     /**
-     * File or directory to remove from the session workspace files directory.
+     * Removes a file or directory from the session workspace files directory.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -165,7 +166,7 @@ public CompletableFuture<Void> removePath(SessionWorkspacesRemovePathParams para
     }
 
     /**
-     * Source and destination paths for a rename within the session workspace files directory.
+     * Renames a file or directory within the session workspace files directory.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -181,7 +182,7 @@ public CompletableFuture<Void> renamePath(SessionWorkspacesRenamePathParams para
     }
 
     /**
-     * Identifies the target session.
+     * Lists workspace checkpoints in chronological order.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -192,7 +193,7 @@ public CompletableFuture<SessionWorkspacesListCheckpointsResult> listCheckpoints
     }
 
     /**
-     * Checkpoint number to read.
+     * Reads the content of a workspace checkpoint by number.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -208,7 +209,7 @@ public CompletableFuture<SessionWorkspacesReadCheckpointResult> readCheckpoint(S
     }
 
     /**
-     * Compaction summary checkpoint to persist.
+     * Adds a compaction summary checkpoint to the local session workspace.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -224,7 +225,7 @@ public CompletableFuture<SessionWorkspacesAddSummaryResult> addSummary(SessionWo
     }
 
     /**
-     * Rollback point for local workspace summaries.
+     * Truncates local workspace compaction summaries after a rollback.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -240,7 +241,7 @@ public CompletableFuture<SessionWorkspacesTruncateSummariesResult> truncateSumma
     }
 
     /**
-     * Identifies the target session.
+     * Reads the autopilot objective state file from the local session workspace.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -251,7 +252,7 @@ public CompletableFuture<SessionWorkspacesReadAutopilotObjectiveResult> readAuto
     }
 
     /**
-     * Autopilot objective file content to persist.
+     * Writes the autopilot objective state file in the local session workspace.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -267,7 +268,7 @@ public CompletableFuture<SessionWorkspacesWriteAutopilotObjectiveResult> writeAu
     }
 
     /**
-     * Identifies the target session.
+     * Deletes the autopilot objective state file from the local session workspace.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -278,7 +279,7 @@ public CompletableFuture<SessionWorkspacesDeleteAutopilotObjectiveResult> delete
     }
 
     /**
-     * Identifies the target session.
+     * Checks whether the local session workspace has an autopilot objective state file.
      *
      * @apiNote This method is experimental and may change in a future version.
      * @since 1.0.0
@@ -289,7 +290,7 @@ public CompletableFuture<SessionWorkspacesAutopilotObjectiveExistsResult> autopi
     }
 
     /**
-     * Pasted content to save as a UTF-8 file in the session workspace.
+     * Saves pasted content as a UTF-8 file in the session workspace.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -305,7 +306,7 @@ public CompletableFuture<SessionWorkspacesSaveLargePasteResult> saveLargePaste(S
     }
 
     /**
-     * Parameters for computing a workspace diff.
+     * Computes a diff for the session workspace. Never rejects for a busy session: a `session`-mode diff that cannot read the session's file-change captures falls back to an unstaged git diff with `isFallback: true` and reports why in `unavailableReason`.
      * <p>
      * Note: the {@code sessionId} field in the params record is overridden
      * by the session-scoped wrapper; any value provided is ignored.
@@ -320,4 +321,19 @@ public CompletableFuture<SessionWorkspacesDiffResult> diff(SessionWorkspacesDiff
         return caller.invoke("session.workspaces.diff", _p, SessionWorkspacesDiffResult.class);
     }
 
+    /**
+     * Computes a diff for the session workspace. Never rejects for a busy session: a `session`-mode diff that cannot read the session's file-change captures falls back to an unstaged git diff with `isFallback: true` and reports why in `unavailableReason`.
+     * <p>
+     * Accepts the extensible request, including inputs added after the params record.
+     *
+     * @apiNote This method is experimental and may change in a future version.
+     * @since 1.0.0
+     */
+    @CopilotExperimental
+    public CompletableFuture<SessionWorkspacesDiffResult> diff(SessionWorkspacesDiffRequest request) {
+        com.fasterxml.jackson.databind.node.ObjectNode _p = MAPPER.valueToTree(Objects.requireNonNull(request, "request"));
+        _p.put("sessionId", this.sessionId);
+        return caller.invoke("session.workspaces.diff", _p, SessionWorkspacesDiffResult.class);
+    }
+
 }
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesDiffRequest.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesDiffRequest.java
new file mode 100644
index 0000000000..cf12c01e63
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionWorkspacesDiffRequest.java
@@ -0,0 +1,98 @@
+/*---------------------------------------------------------------------------------------------
+ *  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.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.copilot.CopilotExperimental;
+import java.util.Objects;
+import javax.annotation.processing.Generated;
+
+/**
+ * Parameters for computing a workspace diff.
+ * <p>
+ * Required inputs are constructor arguments. Optional inputs have fluent setters.
+ *
+ * @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)
+public final class SessionWorkspacesDiffRequest {
+
+    /** Diff mode requested by the client. */
+    @JsonProperty("mode")
+    private final WorkspaceDiffMode mode;
+
+    /** When true, ignore whitespace-only changes (git `--ignore-all-space`). Defaults to false. */
+    @JsonProperty("ignoreWhitespace")
+    private Boolean ignoreWhitespace;
+
+    /** Include the full before/after text used to compute each session diff. Defaults to false; true is accepted only for session mode. Existing capture/read limits still apply, and binary or unavailable contents are not returned. This can substantially increase response size. */
+    @JsonProperty("includeContents")
+    private Boolean includeContents;
+
+    /**
+     * Creates a request with its required inputs.
+     *
+     * @param mode Diff mode requested by the client.
+     */
+    public SessionWorkspacesDiffRequest(WorkspaceDiffMode mode) {
+        this.mode = Objects.requireNonNull(mode, "mode");
+    }
+
+    /**
+     * Returns the {@code mode} property.
+     *
+     * @return Diff mode requested by the client.
+     */
+    public WorkspaceDiffMode getMode() {
+        return mode;
+    }
+
+    /**
+     * Returns the {@code ignoreWhitespace} property.
+     *
+     * @return When true, ignore whitespace-only changes (git `--ignore-all-space`). Defaults to false.
+     */
+    public Boolean getIgnoreWhitespace() {
+        return ignoreWhitespace;
+    }
+
+    /**
+     * Returns the {@code includeContents} property.
+     *
+     * @return Include the full before/after text used to compute each session diff. Defaults to false; true is accepted only for session mode. Existing capture/read limits still apply, and binary or unavailable contents are not returned. This can substantially increase response size.
+     */
+    public Boolean getIncludeContents() {
+        return includeContents;
+    }
+
+    /**
+     * Sets the {@code ignoreWhitespace} property.
+     *
+     * @param value When true, ignore whitespace-only changes (git `--ignore-all-space`). Defaults to false.
+     * @return this request
+     */
+    public SessionWorkspacesDiffRequest setIgnoreWhitespace(Boolean value) {
+        this.ignoreWhitespace = value;
+        return this;
+    }
+
+    /**
+     * Sets the {@code includeContents} property.
+     *
+     * @param value Include the full before/after text used to compute each session diff. Defaults to false; true is accepted only for session mode. Existing capture/read limits still apply, and binary or unavailable contents are not returned. This can substantially increase response size.
+     * @return this request
+     */
+    public SessionWorkspacesDiffRequest setIncludeContents(Boolean value) {
+        this.includeContents = value;
+        return this;
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsCreateWorkspaceParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsCreateWorkspaceParams.java
new file mode 100644
index 0000000000..04c54ddedb
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsCreateWorkspaceParams.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;
+
+/**
+ * Identity, state location and starting context for a workspace record.
+ *
+ * @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)
+record SessionsCreateWorkspaceParams(
+    /** Session ID the workspace record belongs to */
+    @JsonProperty("sessionId") String sessionId,
+    /** Directory the session's state is written under when no session filesystem provider is configured. Ignored when a provider is configured; the provider's session state path is used instead. */
+    @JsonProperty("sessionStatePath") String sessionStatePath,
+    /** `windows` (any letter case) selects Windows path rules. Any other value selects POSIX path rules. */
+    @JsonProperty("convention") String convention,
+    /** Starting working-directory context. The record keeps `cwd`, `gitRoot`, `repository`, `hostType`, `branch`, and `clientName`. Other fields, including `repositoryHost`, `headCommit`, and `baseCommit`, are ignored. `hostType` must be `github` or `ado`. */
+    @JsonProperty("context") SessionWorkingDirectoryContextWithClient context,
+    /** User-supplied display name for the workspace */
+    @JsonProperty("name") String name
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsCreateWorkspaceResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsCreateWorkspaceResult.java
new file mode 100644
index 0000000000..b2cbe17721
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsCreateWorkspaceResult.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;
+
+/**
+ * The workspace record that was written.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record SessionsCreateWorkspaceResult(
+    /** The created workspace record, as JSON */
+    @JsonProperty("workspaceJson") String workspaceJson
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsLoadWorkspaceParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsLoadWorkspaceParams.java
new file mode 100644
index 0000000000..bb4b83da26
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsLoadWorkspaceParams.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;
+
+/**
+ * Where the session's state lives, as a root directory and the session ID under 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)
+record SessionsLoadWorkspaceParams(
+    /** Root directory every session's state directory sits under */
+    @JsonProperty("sessionsHome") String sessionsHome,
+    /** Session ID naming the state directory under the sessions home. Rejected when it is absolute or contains a parent component, so it cannot escape the sessions home. */
+    @JsonProperty("sessionId") String sessionId
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsLoadWorkspaceResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsLoadWorkspaceResult.java
new file mode 100644
index 0000000000..f17c2c85d6
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsLoadWorkspaceResult.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;
+
+/**
+ * The workspace record on disk, omitted when the session has none.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record SessionsLoadWorkspaceResult(
+    /** The workspace record, as JSON. Omitted when the record does not exist. */
+    @JsonProperty("workspaceJson") String workspaceJson
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsUpdateWorkspaceFieldsParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsUpdateWorkspaceFieldsParams.java
new file mode 100644
index 0000000000..770e8269be
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SessionsUpdateWorkspaceFieldsParams.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;
+
+/**
+ * Where the session's state lives, plus workspace-schema fields to merge into its workspace record. Stored keys outside the schema are not preserved, and a stored `fork_count` is never replaced.
+ *
+ * @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)
+record SessionsUpdateWorkspaceFieldsParams(
+    /** Root directory every session's state directory sits under */
+    @JsonProperty("sessionsHome") String sessionsHome,
+    /** Session ID naming the state directory under the sessions home. Rejected when it is absolute or contains a parent component, so it cannot escape the sessions home. */
+    @JsonProperty("sessionId") String sessionId,
+    /** Workspace-schema fields to merge into the record, as a JSON object. Fields the object omits keep their stored values, except stored keys outside the schema are not preserved and a stored `fork_count` is never replaced. */
+    @JsonProperty("fieldsJson") String fieldsJson
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SettingsEditOperation.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SettingsEditOperation.java
new file mode 100644
index 0000000000..ff6d7a5c69
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SettingsEditOperation.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 com.github.copilot.CopilotExperimental;
+import javax.annotation.processing.Generated;
+
+/**
+ * One atomic settings mutation.
+ *
+ * @apiNote This type is experimental and may change in a future version.
+ *
+ * @since 1.0.0
+ */
+@CopilotExperimental
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+enum SettingsEditOperation {
+    /** The {@code set} variant. */
+    SET("set"),
+    /** The {@code add-item} variant. */
+    ADD_ITEM("add-item"),
+    /** The {@code remove-item} variant. */
+    REMOVE_ITEM("remove-item"),
+    /** The {@code remove} variant. */
+    REMOVE("remove");
+
+    private final String value;
+    SettingsEditOperation(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static SettingsEditOperation fromValue(String value) {
+        for (SettingsEditOperation v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown SettingsEditOperation value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SettingsEditResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SettingsEditResult.java
new file mode 100644
index 0000000000..ae05fb4237
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SettingsEditResult.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 javax.annotation.processing.Generated;
+
+/**
+ * Outcome of an atomic user or repository settings edit.
+ *
+ * @apiNote This type 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)
+record SettingsEditResult(
+    /** Changed, unchanged or invalid existing file. Rejected input, validation failures and I/O errors remain RPC errors. */
+    @JsonProperty("status") SettingsEditStatus status
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SettingsEditStatus.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SettingsEditStatus.java
new file mode 100644
index 0000000000..4bf228fc66
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SettingsEditStatus.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.github.copilot.CopilotExperimental;
+import javax.annotation.processing.Generated;
+
+/**
+ * Whether one atomic settings edit changed a file.
+ *
+ * @apiNote This type is experimental and may change in a future version.
+ *
+ * @since 1.0.0
+ */
+@CopilotExperimental
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+enum SettingsEditStatus {
+    /** The {@code changed} variant. */
+    CHANGED("changed"),
+    /** The {@code unchanged} variant. */
+    UNCHANGED("unchanged"),
+    /** The {@code invalid} variant. */
+    INVALID("invalid");
+
+    private final String value;
+    SettingsEditStatus(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static SettingsEditStatus fromValue(String value) {
+        for (SettingsEditStatus v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown SettingsEditStatus value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SkillProviderDescriptor.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SkillProviderDescriptor.java
index 659da543b3..64a287661b 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SkillProviderDescriptor.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SkillProviderDescriptor.java
@@ -13,7 +13,7 @@
 import javax.annotation.processing.Generated;
 
 /**
- * Catalog-only metadata for one SDK-provided skill. The complete SKILL.md is fetched separately and lazily.
+ * Authoritative catalog metadata for one SDK-provided skill. The skill's SKILL.md text is fetched separately and lazily.
  *
  * @since 1.0.0
  */
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SkillProviderReadResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SkillProviderReadResult.java
index 96bb95206b..056b65f811 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SkillProviderReadResult.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SkillProviderReadResult.java
@@ -13,7 +13,7 @@
 import javax.annotation.processing.Generated;
 
 /**
- * Complete text-only SKILL.md content returned by an SDK session's skill provider. Related files and assets are not supported.
+ * Text-only SKILL.md content returned by an SDK session's skill provider. YAML frontmatter is optional: fields it omits come from the catalog descriptor, fields it declares must match the descriptor, and `allowed-tools` is read only from frontmatter. Related files and assets are not supported.
  *
  * @since 1.0.0
  */
@@ -21,7 +21,7 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 record SkillProviderReadResult(
-    /** Complete SKILL.md text. The runtime enforces a 1 MiB UTF-8 byte limit. */
+    /** SKILL.md text, with or without YAML frontmatter, or null when the provider has no skill with the requested name. The runtime enforces a 1 MiB UTF-8 byte limit. */
     @JsonProperty("markdown") String markdown
 ) {
 }
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SkillsDiscoverParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SkillsDiscoverParams.java
index 03b9d85c1b..5dbde0dfd8 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SkillsDiscoverParams.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SkillsDiscoverParams.java
@@ -27,7 +27,7 @@
 public record SkillsDiscoverParams(
     /** Optional list of project directory paths to scan for project-scoped skills */
     @JsonProperty("projectPaths") List<String> projectPaths,
-    /** Optional list of additional skill directory paths to include */
+    /** Explicit discovery-only skill roots, not filesystem grants. Available without ambient discovery, subject to skill/managed disables. Relative paths resolve against the request's effective working directory when supplied. Null and omission are equivalent; an empty array contributes no explicit roots. */
     @JsonProperty("skillDirectories") List<String> skillDirectories,
     /** Optional skill scan paths to exclude from discovery. */
     @JsonProperty("ignoredSkillsLocations") List<String> ignoredSkillsLocations,
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SkillsGetDiscoveryPathsRequest.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SkillsGetDiscoveryPathsRequest.java
new file mode 100644
index 0000000000..9b58939685
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/SkillsGetDiscoveryPathsRequest.java
@@ -0,0 +1,131 @@
+/*---------------------------------------------------------------------------------------------
+ *  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.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.copilot.CopilotExperimental;
+import java.util.List;
+import java.util.Objects;
+import javax.annotation.processing.Generated;
+
+/**
+ * Optional project paths to enumerate.
+ * <p>
+ * Required inputs are constructor arguments. Optional inputs have fluent setters.
+ *
+ * @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)
+public final class SkillsGetDiscoveryPathsRequest {
+
+    /** Optional list of project directory paths. When omitted or empty, only personal and custom directories are returned. */
+    @JsonProperty("projectPaths")
+    private List<String> projectPaths;
+
+    /** Optional skill scan paths to exclude from discovery. */
+    @JsonProperty("ignoredSkillsLocations")
+    private List<String> ignoredSkillsLocations;
+
+    /** When true, omit the host's personal and custom skill directories, leaving only project directories. For multitenant deployments. */
+    @JsonProperty("excludeHostSkills")
+    private Boolean excludeHostSkills;
+
+    /** Explicit discovery-only skill roots to enumerate, including configured missing directories. Relative paths resolve against the request's effective working directory when supplied. These are not filesystem grants or preferred creation targets. Null and omission are equivalent. */
+    @JsonProperty("skillDirectories")
+    private List<String> skillDirectories;
+
+    /**
+     * Creates a request with its required inputs.
+     */
+    public SkillsGetDiscoveryPathsRequest() {
+    }
+
+    /**
+     * Returns the {@code projectPaths} property.
+     *
+     * @return Optional list of project directory paths. When omitted or empty, only personal and custom directories are returned.
+     */
+    public List<String> getProjectPaths() {
+        return projectPaths;
+    }
+
+    /**
+     * Returns the {@code ignoredSkillsLocations} property.
+     *
+     * @return Optional skill scan paths to exclude from discovery.
+     */
+    public List<String> getIgnoredSkillsLocations() {
+        return ignoredSkillsLocations;
+    }
+
+    /**
+     * Returns the {@code excludeHostSkills} property.
+     *
+     * @return When true, omit the host's personal and custom skill directories, leaving only project directories. For multitenant deployments.
+     */
+    public Boolean getExcludeHostSkills() {
+        return excludeHostSkills;
+    }
+
+    /**
+     * Returns the {@code skillDirectories} property.
+     *
+     * @return Explicit discovery-only skill roots to enumerate, including configured missing directories. Relative paths resolve against the request's effective working directory when supplied. These are not filesystem grants or preferred creation targets. Null and omission are equivalent.
+     */
+    public List<String> getSkillDirectories() {
+        return skillDirectories;
+    }
+
+    /**
+     * Sets the {@code projectPaths} property.
+     *
+     * @param value Optional list of project directory paths. When omitted or empty, only personal and custom directories are returned.
+     * @return this request
+     */
+    public SkillsGetDiscoveryPathsRequest setProjectPaths(List<String> value) {
+        this.projectPaths = value;
+        return this;
+    }
+
+    /**
+     * Sets the {@code ignoredSkillsLocations} property.
+     *
+     * @param value Optional skill scan paths to exclude from discovery.
+     * @return this request
+     */
+    public SkillsGetDiscoveryPathsRequest setIgnoredSkillsLocations(List<String> value) {
+        this.ignoredSkillsLocations = value;
+        return this;
+    }
+
+    /**
+     * Sets the {@code excludeHostSkills} property.
+     *
+     * @param value When true, omit the host's personal and custom skill directories, leaving only project directories. For multitenant deployments.
+     * @return this request
+     */
+    public SkillsGetDiscoveryPathsRequest setExcludeHostSkills(Boolean value) {
+        this.excludeHostSkills = value;
+        return this;
+    }
+
+    /**
+     * Sets the {@code skillDirectories} property.
+     *
+     * @param value Explicit discovery-only skill roots to enumerate, including configured missing directories. Relative paths resolve against the request's effective working directory when supplied. These are not filesystem grants or preferred creation targets. Null and omission are equivalent.
+     * @return this request
+     */
+    public SkillsGetDiscoveryPathsRequest setSkillDirectories(List<String> value) {
+        this.skillDirectories = value;
+        return this;
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/StaffLogLevelMigrationStatus.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/StaffLogLevelMigrationStatus.java
new file mode 100644
index 0000000000..1538068712
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/StaffLogLevelMigrationStatus.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 the one-time staff log-level migration did.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+enum StaffLogLevelMigrationStatus {
+    /** The {@code ineligible} variant. */
+    INELIGIBLE("ineligible"),
+    /** The {@code current} variant. */
+    CURRENT("current"),
+    /** The {@code refreshed} variant. */
+    REFRESHED("refreshed");
+
+    private final String value;
+    StaffLogLevelMigrationStatus(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static StaffLogLevelMigrationStatus fromValue(String value) {
+        for (StaffLogLevelMigrationStatus v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown StaffLogLevelMigrationStatus value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/StaffUpdateChannelMigrationStatus.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/StaffUpdateChannelMigrationStatus.java
new file mode 100644
index 0000000000..a3cb8f83d7
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/StaffUpdateChannelMigrationStatus.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;
+
+/**
+ * What the one-time staff update-channel migration did.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+enum StaffUpdateChannelMigrationStatus {
+    /** The {@code ineligible} variant. */
+    INELIGIBLE("ineligible"),
+    /** The {@code current} variant. */
+    CURRENT("current"),
+    /** The {@code migrated} variant. */
+    MIGRATED("migrated"),
+    /** The {@code completed} variant. */
+    COMPLETED("completed"),
+    /** The {@code excluded-experimental} variant. */
+    EXCLUDED_EXPERIMENTAL("excluded-experimental");
+
+    private final String value;
+    StaffUpdateChannelMigrationStatus(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static StaffUpdateChannelMigrationStatus fromValue(String value) {
+        for (StaffUpdateChannelMigrationStatus v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown StaffUpdateChannelMigrationStatus value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UsageMetricsModelMetric.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UsageMetricsModelMetric.java
index ed5f093054..879402975b 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UsageMetricsModelMetric.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UsageMetricsModelMetric.java
@@ -23,6 +23,8 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record UsageMetricsModelMetric(
+    /** Completeness of this model's reported AI-credit subtotal. Explicitly reported zero is complete, not unavailable. */
+    @JsonProperty("aiCreditsStatus") AiCreditsStatus aiCreditsStatus,
     /** Request count and cost metrics for this model */
     @JsonProperty("requests") UsageMetricsModelMetricRequests requests,
     /** Token usage metrics for this model */
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UsageMetricsProviderModelMetric.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UsageMetricsProviderModelMetric.java
new file mode 100644
index 0000000000..b4955e8c8d
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UsageMetricsProviderModelMetric.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;
+
+/**
+ * Usage for one recorded provider and model, without merging identical model IDs across providers.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record UsageMetricsProviderModelMetric(
+    /** Provider identity and product label captured when the call was dispatched; null when unknown. */
+    @JsonProperty("provider") ModelProviderRef provider,
+    /** Model identity, or null for legacy aggregate-only usage. */
+    @JsonProperty("modelId") String modelId,
+    /** Model display name captured at call time, when known. */
+    @JsonProperty("modelDisplayName") String modelDisplayName,
+    /** Request, token, and cost totals for this provider/model. */
+    @JsonProperty("metrics") UsageMetricsModelMetric metrics
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsApplyTopKeyParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsApplyTopKeyParams.java
new file mode 100644
index 0000000000..c81c4d218b
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsApplyTopKeyParams.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 single top-level setting subtree to validate and write.
+ *
+ * @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)
+record UserSettingsApplyTopKeyParams(
+    /** Canonical path of the setting the caller is editing. Currently informational only. */
+    @JsonProperty("canonicalPath") List<String> canonicalPath,
+    /** Top-level setting name to write. */
+    @JsonProperty("topKey") String topKey,
+    /** Value to write for the whole top-level key. Omitted when `delete` is true. Explicit null is preserved and validated as null. */
+    @JsonProperty("value") Object value,
+    /** True to remove the top-level key instead of writing it. */
+    @JsonProperty("delete") Boolean delete,
+    /** Records that the user chose an update channel explicitly, so the one-time staff channel migration stops reapplying. Honored only for the `autoUpdatesChannel` key. */
+    @JsonProperty("completeStaffUpdateChannelMigration") Boolean completeStaffUpdateChannelMigration
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsApplyTopKeyResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsApplyTopKeyResult.java
new file mode 100644
index 0000000000..85bdfd1d1a
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsApplyTopKeyResult.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.List;
+import javax.annotation.processing.Generated;
+
+/**
+ * Outcome of validating and writing one top-level setting subtree.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record UserSettingsApplyTopKeyResult(
+    /** `ok` when the value was written, `validation-error` when it was rejected before any write, `write-error` when validation passed but the write failed. */
+    @JsonProperty("status") String status,
+    /** Problems found, present only when `status` is `validation-error`. */
+    @JsonProperty("issues") List<UserSettingsValidationIssue> issues,
+    /** Why the write failed, present only when `status` is `write-error`. */
+    @JsonProperty("error") String error
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsBuildRuntimeParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsBuildRuntimeParams.java
new file mode 100644
index 0000000000..7b95e8df04
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsBuildRuntimeParams.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.Map;
+import javax.annotation.processing.Generated;
+
+/**
+ * The overrides and host context to resolve effective runtime settings from.
+ *
+ * @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)
+record UserSettingsBuildRuntimeParams(
+    /** Settings that take precedence over every document and environment layer, such as the values a host derived from its own command line. Keyed by setting name, with each value carried verbatim, so a host may pass keys this runtime does not recognize. Absent when the host contributes no overrides of its own. */
+    @JsonProperty("overrides") Map<String, Object> overrides,
+    /** The directory the settings are being resolved for. This selects the repository-scoped document, so a host resolving settings for a directory other than its own process working directory must pass that directory here. */
+    @JsonProperty("workingDirectory") String workingDirectory,
+    /** The environment to read settings-bearing variables from. Passed explicitly rather than read from the server process so a host can resolve settings for an environment it is about to create rather than the one it runs in. */
+    @JsonProperty("environment") Map<String, String> environment,
+    /** The platform to apply platform-specific defaults for, in the same spelling the host's own runtime reports. */
+    @JsonProperty("platform") String platform
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsDiagnoseProblemsParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsDiagnoseProblemsParams.java
new file mode 100644
index 0000000000..de7ccae6c7
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsDiagnoseProblemsParams.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;
+
+/**
+ * The settings layers to diagnose.
+ *
+ * @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)
+record UserSettingsDiagnoseProblemsParams(
+    /** Layers to diagnose, in the precedence order the caller applies them. */
+    @JsonProperty("sources") List<UserSettingsProblemSource> sources
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsEditParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsEditParams.java
new file mode 100644
index 0000000000..24f1cbd7f4
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsEditParams.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;
+
+/**
+ * One atomic edit of a canonical setting in settings.json.
+ *
+ * @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)
+record UserSettingsEditParams(
+    /** Configuration directory to edit. Omitted or empty resolves the server's own home, as in `user.settings.loadForConfigDir`. */
+    @JsonProperty("configDir") String configDir,
+    /** Nonempty canonical path segments of the setting to edit, starting with its top-level key. */
+    @JsonProperty("canonicalPath") List<String> canonicalPath,
+    /** Set a scalar, add or remove a string list item, or remove the setting. The handler rejects a missing or incompatible value. */
+    @JsonProperty("operation") SettingsEditOperation operation,
+    /** Required boolean, string or number for set, required string for add-item and remove-item, and forbidden for remove. The runtime rejects all other JSON values. */
+    @JsonProperty("value") Object value
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsGetPathsParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsGetPathsParams.java
new file mode 100644
index 0000000000..d9fca8e81a
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsGetPathsParams.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;
+
+/**
+ * Selects which settings file paths to resolve.
+ *
+ * @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)
+record UserSettingsGetPathsParams(
+    /** Absolute path of a repository root. Supply it to also resolve that repository's two settings file paths; omit it to resolve only the user path. */
+    @JsonProperty("repoRoot") String repoRoot
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsGetPathsResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsGetPathsResult.java
new file mode 100644
index 0000000000..2ed0ae2d5e
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsGetPathsResult.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;
+
+/**
+ * On-disk locations of the settings files this runtime reads. A path is reported whether or not the file exists.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record UserSettingsGetPathsResult(
+    /** The user settings file: `settings.json` under the resolved Copilot home. This is the file `user.settings.get`, `user.settings.load`, and `user.settings.set` read and write. */
+    @JsonProperty("userSettings") String userSettings,
+    /** The repository's checked-in settings file, or null when no repository root was supplied. */
+    @JsonProperty("repoSettings") String repoSettings,
+    /** The repository's local, untracked settings file, or null when no repository root was supplied. */
+    @JsonProperty("repoLocalSettings") String repoLocalSettings
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsGetResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsGetResult.java
index c94e90fcc6..ac7b3cf933 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsGetResult.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsGetResult.java
@@ -15,7 +15,7 @@
 import javax.annotation.processing.Generated;
 
 /**
- * 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.
+ * Per-key metadata for every known user setting in settings.json, including settings left at their default. Excludes repository- and enterprise-managed overrides.
  *
  * @apiNote This method is experimental and may change in a future version.
  * @since 1.0.0
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsGetUnknownKeysWarningParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsGetUnknownKeysWarningParams.java
new file mode 100644
index 0000000000..a90c4a6853
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsGetUnknownKeysWarningParams.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;
+
+/**
+ * Selects the configuration directory whose user settings document should be inspected for unrecognized top-level keys.
+ *
+ * @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)
+record UserSettingsGetUnknownKeysWarningParams(
+    /** The configuration directory, home directory and environment to resolve the settings document from. A host that scopes a session to its own Copilot home must pass that directory here, or the server's own home is inspected instead. */
+    @JsonProperty("context") UserSettingsHostContext context
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsGovernanceKeysResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsGovernanceKeysResult.java
new file mode 100644
index 0000000000..d4c0891e8f
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsGovernanceKeysResult.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.List;
+import javax.annotation.processing.Generated;
+
+/**
+ * Top-level user-setting keys grouped by who may govern them.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record UserSettingsGovernanceKeysResult(
+    /** Top-level keys a repository may override through `.github/copilot/settings.json` or `.github/copilot/settings.local.json`. */
+    @JsonProperty("repo") List<String> repo,
+    /** Top-level keys a repository may override through a Claude-compatible repository config. */
+    @JsonProperty("claudeRepo") List<String> claudeRepo,
+    /** Top-level keys an enterprise policy may fix through managed settings. */
+    @JsonProperty("managed") List<String> managed
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsHostContext.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsHostContext.java
new file mode 100644
index 0000000000..441023ed14
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsHostContext.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;
+
+/**
+ * The filesystem and environment facts a user-settings file is resolved from. Passed explicitly rather than read from the runtime's own process, so a host whose configuration directory differs from its process environment resolves the file it means.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record UserSettingsHostContext(
+    /** The Copilot configuration directory, when the host set one. Takes precedence over `COPILOT_HOME` and the home directory. */
+    @JsonProperty("configDir") String configDir,
+    /** The user's home directory, used when neither a configuration directory nor `COPILOT_HOME` is set. */
+    @JsonProperty("homeDirectory") String homeDirectory,
+    /** The host's environment variables. `COPILOT_HOME` is read from here, as are the variables a settings hook may expand. */
+    @JsonProperty("environment") Map<String, Object> environment
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsLoadAndMergeRepoParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsLoadAndMergeRepoParams.java
new file mode 100644
index 0000000000..56af230edf
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsLoadAndMergeRepoParams.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.Map;
+import javax.annotation.processing.Generated;
+
+/**
+ * A repository to read settings from, and the user layer they are merged over.
+ *
+ * @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)
+record UserSettingsLoadAndMergeRepoParams(
+    /** Absolute path of the repository root whose settings to read. When this is the user's home directory, the Claude-compatible configuration is skipped, so a home-directory session does not inherit a personal config as if it were repository policy. */
+    @JsonProperty("repoRoot") String repoRoot,
+    /** The user's own settings, keyed by setting name. The repository layer is merged over this; a repository may only add to the collection settings it is allowed to influence, so a user setting it does not name survives unchanged. */
+    @JsonProperty("userSettings") Map<String, Object> userSettings
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsLoadAndMergeRepoResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsLoadAndMergeRepoResult.java
new file mode 100644
index 0000000000..15b319f3d9
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsLoadAndMergeRepoResult.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.Map;
+import javax.annotation.processing.Generated;
+
+/**
+ * The settings a consumer should act on inside a repository, together with any diagnostic raised while reading the repository layer.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record UserSettingsLoadAndMergeRepoResult(
+    /** The merged settings document, keyed by setting name. Equals the supplied user layer when the repository declares no settings. */
+    @JsonProperty("settings") Map<String, Object> settings,
+    /** Why part of the repository document was ignored, as a single human-readable string joining every diagnostic with `; `. Null when it loaded cleanly. The settings that did load are still merged, so a consumer should surface this and continue rather than treat it as a failure. */
+    @JsonProperty("warning") String warning
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsLoadForConfigDirParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsLoadForConfigDirParams.java
new file mode 100644
index 0000000000..0f745e7002
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsLoadForConfigDirParams.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;
+
+/**
+ * Selects the configuration directory whose user settings to read.
+ *
+ * @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)
+record UserSettingsLoadForConfigDirParams(
+    /** Copilot configuration directory to read the settings document from, taking precedence over the server's own `COPILOT_HOME` and default home. Omit it, or pass an empty string, to read the directory the server resolved for itself. */
+    @JsonProperty("configDir") String configDir
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsLoadForEditResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsLoadForEditResult.java
new file mode 100644
index 0000000000..0a5b05d3c8
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsLoadForEditResult.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;
+
+/**
+ * Contents of settings.json as stored, for a caller about to rewrite it.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record UserSettingsLoadForEditResult(
+    /** `ok` when the file parsed, `missing` when there is no file yet, `invalid` when the file exists but will not parse. */
+    @JsonProperty("status") String status,
+    /** Parsed contents, present only when `status` is `ok`. */
+    @JsonProperty("settings") Object settings
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsLoadRepoParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsLoadRepoParams.java
new file mode 100644
index 0000000000..2f809ae5b6
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsLoadRepoParams.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;
+
+/**
+ * Selects the repository whose checked-in settings to read.
+ *
+ * @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)
+record UserSettingsLoadRepoParams(
+    /** Absolute path of the repository root whose settings to read. When this is the user's home directory, the Claude-compatible configuration is skipped, so a home-directory session does not inherit a personal config as if it were repository policy. */
+    @JsonProperty("repoRoot") String repoRoot
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsLoadRepoResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsLoadRepoResult.java
new file mode 100644
index 0000000000..eb3f16cb85
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsLoadRepoResult.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.Map;
+import javax.annotation.processing.Generated;
+
+/**
+ * A repository's settings as stored, together with any diagnostic raised while reading them.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record UserSettingsLoadRepoResult(
+    /** The repository's settings document, keyed by setting name, with each value carried verbatim. Null when the repository declares no settings. */
+    @JsonProperty("settings") Map<String, Object> settings,
+    /** Why part of the document was ignored, as a single human-readable string joining every diagnostic with `; `. Null when the document loaded cleanly. The settings that did load are still reported, so a consumer should surface this and continue rather than treat it as a failure. */
+    @JsonProperty("warning") String warning
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsLoadWithWarningResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsLoadWithWarningResult.java
new file mode 100644
index 0000000000..1f9ba38d07
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsLoadWithWarningResult.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.Map;
+import javax.annotation.processing.Generated;
+
+/**
+ * The user's stored settings, together with any diagnostic raised while reading them.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record UserSettingsLoadWithWarningResult(
+    /** The stored user settings document, keyed by setting name, with each value carried verbatim. Empty when the file could not be read at all. */
+    @JsonProperty("settings") Map<String, Object> settings,
+    /** Why part of the document was ignored, phrased for display to the user. Null when the document loaded cleanly. The settings that did load are still reported, so a consumer may surface this and continue rather than treat it as a failure. */
+    @JsonProperty("warning") String warning
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsMergeManagedAndUserParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsMergeManagedAndUserParams.java
new file mode 100644
index 0000000000..740de3bc35
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsMergeManagedAndUserParams.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;
+
+/**
+ * The managed (enterprise policy) layer and the user layer to fold together. The field names carry the layer identity: nothing about a settings object identifies which layer produced it, so a generic base/override pair would let a caller transpose them and silently resolve the governance keys in the user's favour.
+ *
+ * @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)
+record UserSettingsMergeManagedAndUserParams(
+    /** The managed layer. Its governance keys win, and the per-entry `enabledPlugins` and `extraKnownMarketplaces` control maps are stamped back from it after the union. Omitted when the host is unmanaged. */
+    @JsonProperty("managed") Object managed,
+    /** The user's own settings layer. Wins on every key the managed layer does not govern. Omitted when the user has no settings yet. */
+    @JsonProperty("user") Object user
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsMergeManagedAndUserResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsMergeManagedAndUserResult.java
new file mode 100644
index 0000000000..c28bbddba3
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsMergeManagedAndUserResult.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;
+
+/**
+ * The user layer folded over the managed layer.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record UserSettingsMergeManagedAndUserResult(
+    /** The merged settings. An empty object when neither layer was supplied, so an unmanaged host with no user settings governs nothing. */
+    @JsonProperty("settingsJson") Object settingsJson
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsMergeRepoValueParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsMergeRepoValueParams.java
new file mode 100644
index 0000000000..30c47590c4
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsMergeRepoValueParams.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;
+
+/**
+ * The user layer and the repository layer to fold together.
+ *
+ * @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)
+record UserSettingsMergeRepoValueParams(
+    /** The user's settings, already resolved against any managed layer. */
+    @JsonInclude(JsonInclude.Include.ALWAYS)
+    @JsonProperty("userSettings") Object userSettings,
+    /** The repository's checked-in settings layer. */
+    @JsonInclude(JsonInclude.Include.ALWAYS)
+    @JsonProperty("repoSettings") Object repoSettings
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsMergeRepoValueResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsMergeRepoValueResult.java
new file mode 100644
index 0000000000..136bf12f30
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsMergeRepoValueResult.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;
+
+/**
+ * The repository layer folded into the user layer.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record UserSettingsMergeRepoValueResult(
+    /** The merged settings, with the per-entry managed control maps re-stamped from the runtime's ambient managed policy. */
+    @JsonProperty("settingsJson") Object settingsJson
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsMigrateObsoleteOnDiskParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsMigrateObsoleteOnDiskParams.java
new file mode 100644
index 0000000000..8c7fce5dd4
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsMigrateObsoleteOnDiskParams.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;
+
+/**
+ * Selects the configuration directory whose settings document to clean.
+ *
+ * @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)
+record UserSettingsMigrateObsoleteOnDiskParams(
+    /** The configuration directory holding the settings document to clean. A host that scopes a session to its own Copilot home passes that directory here; omit it to clean the document under the home the server resolved for itself. The home directory and environment are deliberately not caller-supplied: they decide only the settings path root and the two hook-parsing flags, and those describe the process doing the reading rather than the caller. */
+    @JsonProperty("configDir") String configDir
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsMigrateObsoleteOnDiskResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsMigrateObsoleteOnDiskResult.java
new file mode 100644
index 0000000000..5e894430ed
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsMigrateObsoleteOnDiskResult.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;
+
+/**
+ * The outcome of the one-time obsolete-settings cleanup.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record UserSettingsMigrateObsoleteOnDiskResult(
+    /** What the cleanup did. Only `changed` rewrote the document. The cleaned settings are not returned here: the document is written before this replies, so `user.settings.load` reads it authoritatively. */
+    @JsonProperty("status") UserSettingsMigrateObsoleteOnDiskStatus status
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsMigrateObsoleteOnDiskStatus.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsMigrateObsoleteOnDiskStatus.java
new file mode 100644
index 0000000000..38ef9d9a42
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsMigrateObsoleteOnDiskStatus.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 the one-time obsolete-settings cleanup did to the document.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+enum UserSettingsMigrateObsoleteOnDiskStatus {
+    /** The {@code missing} variant. */
+    MISSING("missing"),
+    /** The {@code invalid} variant. */
+    INVALID("invalid"),
+    /** The {@code unchanged} variant. */
+    UNCHANGED("unchanged"),
+    /** The {@code changed} variant. */
+    CHANGED("changed");
+
+    private final String value;
+    UserSettingsMigrateObsoleteOnDiskStatus(String value) { this.value = value; }
+    @com.fasterxml.jackson.annotation.JsonValue
+    public String getValue() { return value; }
+    @com.fasterxml.jackson.annotation.JsonCreator
+    public static UserSettingsMigrateObsoleteOnDiskStatus fromValue(String value) {
+        for (UserSettingsMigrateObsoleteOnDiskStatus v : values()) {
+            if (v.value.equals(value)) return v;
+        }
+        throw new IllegalArgumentException("Unknown UserSettingsMigrateObsoleteOnDiskStatus value: " + value);
+    }
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsMigrateStaffLogLevelOnceParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsMigrateStaffLogLevelOnceParams.java
new file mode 100644
index 0000000000..24220b8882
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsMigrateStaffLogLevelOnceParams.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;
+
+/**
+ * Selects the configuration directory to run the one-time staff log-level migration against, and supplies the caller's record of whether it has already run.
+ *
+ * @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)
+record UserSettingsMigrateStaffLogLevelOnceParams(
+    /** The configuration directory, home directory and environment to resolve the settings and global-state documents from. A host that scopes a session to its own Copilot home must pass that directory here, or the migration is evaluated against the server's own home instead. */
+    @JsonProperty("context") UserSettingsHostContext context,
+    /** When the caller last recorded this migration, as an ISO-8601 timestamp. Supplying it lets the runtime answer `current` without re-running the evaluation. */
+    @JsonProperty("cachedCompletedAt") String cachedCompletedAt
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsMigrateStaffLogLevelOnceResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsMigrateStaffLogLevelOnceResult.java
new file mode 100644
index 0000000000..2ffc6ba552
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsMigrateStaffLogLevelOnceResult.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;
+
+/**
+ * The outcome of the one-time staff log-level migration.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record UserSettingsMigrateStaffLogLevelOnceResult(
+    /** What the migration did. Only `refreshed` can have changed the persisted settings. */
+    @JsonProperty("status") StaffLogLevelMigrationStatus status,
+    /** When the migration was recorded as done, as an ISO-8601 timestamp. Absent only for `ineligible`, which records nothing. */
+    @JsonProperty("completedAt") String completedAt,
+    /** The settings document as it stands after the migration, keyed by setting name. Present only for `refreshed`, and only when the document could be re-read cleanly. */
+    @JsonProperty("settings") Map<String, Object> settings
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsMigrateStaffUpdateChannelOnceParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsMigrateStaffUpdateChannelOnceParams.java
new file mode 100644
index 0000000000..77a3287abe
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsMigrateStaffUpdateChannelOnceParams.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 filesystem and environment facts a user-settings file is resolved from. Passed explicitly rather than read from the runtime's own process, so a host whose configuration directory differs from its process environment resolves the file it means.
+ *
+ * @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)
+record UserSettingsMigrateStaffUpdateChannelOnceParams(
+    /** The Copilot configuration directory, when the host set one. Takes precedence over `COPILOT_HOME` and the home directory. */
+    @JsonProperty("configDir") String configDir,
+    /** The user's home directory, used when neither a configuration directory nor `COPILOT_HOME` is set. */
+    @JsonProperty("homeDirectory") String homeDirectory,
+    /** The host's environment variables. `COPILOT_HOME` is read from here, as are the variables a settings hook may expand. */
+    @JsonProperty("environment") Map<String, Object> environment
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsMigrateStaffUpdateChannelOnceResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsMigrateStaffUpdateChannelOnceResult.java
new file mode 100644
index 0000000000..8d21eca4f1
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsMigrateStaffUpdateChannelOnceResult.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;
+
+/**
+ * The outcome of the one-time staff update-channel migration.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record UserSettingsMigrateStaffUpdateChannelOnceResult(
+    /** What the migration did. Only `migrated` means the persisted settings changed. */
+    @JsonProperty("status") StaffUpdateChannelMigrationStatus status,
+    /** When the migration was recorded as done, as an ISO-8601 timestamp. Absent only for `ineligible`, which records nothing. */
+    @JsonProperty("completedAt") String completedAt
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsNormalizeParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsNormalizeParams.java
new file mode 100644
index 0000000000..f43d774226
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsNormalizeParams.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 javax.annotation.processing.Generated;
+
+/**
+ * Settings object whose key names should be canonicalized.
+ *
+ * @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)
+record UserSettingsNormalizeParams(
+    /** Free-form settings object, possibly using legacy or snake_case key names. */
+    @JsonInclude(JsonInclude.Include.ALWAYS)
+    @JsonProperty("settings") Object settings
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsNormalizeResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsNormalizeResult.java
new file mode 100644
index 0000000000..badb433c2a
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsNormalizeResult.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;
+
+/**
+ * Settings object with canonical key names.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record UserSettingsNormalizeResult(
+    /** The same settings with every legacy or snake_case key renamed to its canonical spelling. */
+    @JsonProperty("settings") Object settings
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsPathResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsPathResult.java
new file mode 100644
index 0000000000..5c4ac0d88e
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsPathResult.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;
+
+/**
+ * The on-disk location of the user's settings document.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record UserSettingsPathResult(
+    /** Absolute path to the settings file this runtime reads and writes. Normally `settings.json` under the Copilot configuration directory; an extensionless legacy `settings` file is reported instead when it exists and `settings.json` does not. */
+    @JsonProperty("path") String path
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsProblem.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsProblem.java
new file mode 100644
index 0000000000..057a5ac6a5
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsProblem.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;
+
+/**
+ * One setting that will not take effect, and why.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record UserSettingsProblem(
+    /** Stable identifier for this problem within the reported set, so a caller can track a selection across refreshes. */
+    @JsonProperty("id") String id,
+    /** What is wrong in machine-readable form, for a caller that wants to branch rather than display. */
+    @JsonProperty("kind") String kind,
+    /** Coarse grouping for the problem, for a caller that presents problems in sections. */
+    @JsonProperty("category") String category,
+    /** The settings layer the problem was found in. */
+    @JsonProperty("source") UserSettingsProblemLocation source,
+    /** The offending key as written in the file, when the problem is attributable to a single key. Absent when the whole file is at fault. */
+    @JsonProperty("rawKey") String rawKey,
+    /** Why the setting will not take effect. Never contains the setting's value, which may be a token or another secret. */
+    @JsonProperty("explanation") String explanation
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsProblemLocation.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsProblemLocation.java
new file mode 100644
index 0000000000..454408eb8b
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsProblemLocation.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;
+
+/**
+ * The settings layer a problem was found in.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record UserSettingsProblemLocation(
+    /** Which layer this is: `user`, `repo`, or `local`. */
+    @JsonProperty("kind") String kind,
+    /** The caller-supplied display label for the layer. */
+    @JsonProperty("label") String label,
+    /** Absolute path of the file backing this layer. */
+    @JsonProperty("filePath") String filePath
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsProblemSource.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsProblemSource.java
new file mode 100644
index 0000000000..1c471916c5
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsProblemSource.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;
+
+/**
+ * One already-loaded settings layer to diagnose.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record UserSettingsProblemSource(
+    /** Which layer this is: `user`, `repo`, or `local`. */
+    @JsonProperty("kind") String kind,
+    /** Caller-chosen display label for the layer, echoed back on each problem so a caller can group by layer without re-deriving its own naming. */
+    @JsonProperty("label") String label,
+    /** Absolute path of the file backing this layer. */
+    @JsonProperty("filePath") String filePath,
+    /** The layer's settings exactly as loaded, unnormalized. Empty when the file is missing or failed to parse. */
+    @JsonProperty("config") Map<String, Object> config,
+    /** True when the file itself failed to parse, so its keys could not be read at all. */
+    @JsonProperty("invalid") Boolean invalid
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsProblemsResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsProblemsResult.java
new file mode 100644
index 0000000000..6a5dcf5728
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsProblemsResult.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 java.util.List;
+import javax.annotation.processing.Generated;
+
+/**
+ * The settings that will not take effect across the given layers.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record UserSettingsProblemsResult(
+    /** Each setting that will not take effect, and why. Empty when every layer is healthy. */
+    @JsonProperty("problems") List<UserSettingsProblem> problems
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsResetStaffModelSelectionOnceParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsResetStaffModelSelectionOnceParams.java
new file mode 100644
index 0000000000..98ec0b7fb3
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsResetStaffModelSelectionOnceParams.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;
+
+/**
+ * Selects the configuration directory to run the one-time staff model-selection reset against, and supplies the caller's record of whether it has already run.
+ *
+ * @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)
+record UserSettingsResetStaffModelSelectionOnceParams(
+    /** The configuration directory, home directory and environment to resolve the settings and global-state documents from. A host that scopes a session to its own Copilot home must pass that directory here, or the reset is evaluated against the server's own home instead. */
+    @JsonProperty("context") UserSettingsHostContext context,
+    /** Whether the signed-in account is a staff account. The reset applies only to staff, so anything other than `true` returns `didReset: false` without touching the settings document. */
+    @JsonProperty("staff") Boolean staff,
+    /** When the caller last recorded this reset, as an ISO-8601 timestamp. A timestamp at or after the cutoff means the reset already ran and is returned unchanged. */
+    @JsonProperty("staffModelResetAt") String staffModelResetAt
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsResetStaffModelSelectionOnceResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsResetStaffModelSelectionOnceResult.java
new file mode 100644
index 0000000000..90f9668f4f
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsResetStaffModelSelectionOnceResult.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.Map;
+import javax.annotation.processing.Generated;
+
+/**
+ * The outcome of the one-time staff model-selection reset.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record UserSettingsResetStaffModelSelectionOnceResult(
+    /** Whether the persisted model selection was cleared. Only `true` means the settings document changed and the host should adopt the returned settings. */
+    @JsonProperty("didReset") Boolean didReset,
+    /** The timestamp the host should now record, as an ISO-8601 timestamp. Carries the caller's own value back unchanged when nothing was reset. */
+    @JsonProperty("resetAt") String resetAt,
+    /** The cutoff this reset is gated on, as an ISO-8601 timestamp. A recorded timestamp at or after it means the reset is already done. */
+    @JsonProperty("cutoff") String cutoff,
+    /** The settings document as it stands after the reset, keyed by setting name. Present only when `didReset` is true. */
+    @JsonProperty("settings") Map<String, Object> settings
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsSetHookDisabledParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsSetHookDisabledParams.java
new file mode 100644
index 0000000000..e8541c2841
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsSetHookDisabledParams.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;
+
+/**
+ * One hook to disable or re-enable.
+ *
+ * @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)
+record UserSettingsSetHookDisabledParams(
+    /** Path of the settings.json to rewrite. */
+    @JsonProperty("settingsPath") String settingsPath,
+    /** Durable content-hash key of the hook, as `hooks.loadResources` reports it. */
+    @JsonProperty("disableKey") String disableKey,
+    /** True adds the key to `disabledHooks`, false removes it. */
+    @JsonProperty("disabled") Boolean disabled
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsSetHookDisabledResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsSetHookDisabledResult.java
new file mode 100644
index 0000000000..5548816405
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsSetHookDisabledResult.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 javax.annotation.processing.Generated;
+
+/**
+ * Outcome of rewriting the `disabledHooks` setting.
+ *
+ * @apiNote This type 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)
+record UserSettingsSetHookDisabledResult(
+    /** `ok` when the setting was written, `invalid` when settings.json could not be parsed and was left alone, `error` when the write itself failed. */
+    @JsonProperty("status") String status,
+    /** Why the write failed. Absent when the status is `ok`. */
+    @JsonProperty("errorMessage") String errorMessage
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsSetParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsSetParams.java
index ba19886c24..d56ecaa225 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsSetParams.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsSetParams.java
@@ -25,6 +25,7 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record UserSettingsSetParams(
     /** Partial user settings to write, as a free-form object keyed by setting name */
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     @JsonProperty("settings") Object settings
 ) {
 }
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsUnknownKeysWarningResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsUnknownKeysWarningResult.java
new file mode 100644
index 0000000000..404b8c57c0
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsUnknownKeysWarningResult.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;
+
+/**
+ * The unrecognized top-level keys found in the user settings document, already phrased for display.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record UserSettingsUnknownKeysWarningResult(
+    /** The warning to show the user, naming the unrecognized keys and the file they were found in. Absent when every top-level key is recognized, and also when the document is missing or could not be read, because an unknown-key list taken from a document the runtime could not load would name keys that may not be there. */
+    @JsonProperty("warning") String warning
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsUpdateParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsUpdateParams.java
new file mode 100644
index 0000000000..9aed7c14b3
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsUpdateParams.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 javax.annotation.processing.Generated;
+
+/**
+ * Names the user setting to merge into, and the partial object to merge.
+ *
+ * @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)
+record UserSettingsUpdateParams(
+    /** Top-level user-setting key to merge into, such as `extensions`. */
+    @JsonProperty("key") String key,
+    /** Value to store for `key`. When both the stored value and this value are objects, their fields are shallow-merged and fields this object does not name are preserved. Otherwise this value replaces the stored value. */
+    @JsonInclude(JsonInclude.Include.ALWAYS)
+    @JsonProperty("value") Object value,
+    /** Copilot configuration directory to write the settings document in, taking precedence over the server's own `COPILOT_HOME` and default home. Omit it, or pass an empty string, to use the directory the server resolved for itself. */
+    @JsonProperty("configDir") String configDir,
+    /** Single-component name for the settings document at `<configDir>/settings/<subDir>.json`; path separators, `.` and `..` are rejected. Omit it, or pass an empty string, to use the main settings document. */
+    @JsonProperty("subDir") String subDir
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsUpdateResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsUpdateResult.java
new file mode 100644
index 0000000000..2d13157a3b
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsUpdateResult.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;
+
+/**
+ * The stored value of the user setting after the merge.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record UserSettingsUpdateResult(
+    /** The key's stored value after the write: the merged object when both the stored value and the supplied value are objects, otherwise the supplied value. */
+    @JsonProperty("value") Object value
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsValidateParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsValidateParams.java
new file mode 100644
index 0000000000..3e69f4b138
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsValidateParams.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 single top-level setting subtree to validate.
+ *
+ * @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)
+record UserSettingsValidateParams(
+    /** Top-level setting name to validate. */
+    @JsonProperty("topKey") String topKey,
+    /** Value to validate. Omitted when `delete` is true. */
+    @JsonProperty("value") Object value,
+    /** True to validate a removal of this key. The current settings file is not read. */
+    @JsonProperty("delete") Boolean delete
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsValidateResult.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsValidateResult.java
new file mode 100644
index 0000000000..730fb00195
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsValidateResult.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;
+
+/**
+ * Outcome of validating one top-level setting subtree.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record UserSettingsValidateResult(
+    /** True when the subtree is valid. */
+    @JsonProperty("ok") Boolean ok,
+    /** Problems found, empty when `ok` is true. */
+    @JsonProperty("issues") List<UserSettingsValidationIssue> issues
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsValidationIssue.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsValidationIssue.java
new file mode 100644
index 0000000000..68404e53a7
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsValidationIssue.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;
+
+/**
+ * One problem found while validating a setting value.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+record UserSettingsValidationIssue(
+    /** Where in the settings tree the problem sits, as object keys and array indices. The first element is the top-level key; a whole-value problem is reported as that single key. */
+    @JsonProperty("path") List<Object> path,
+    /** Human-readable description of the problem. */
+    @JsonProperty("message") String message
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsWriteAllParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsWriteAllParams.java
new file mode 100644
index 0000000000..e5929a8289
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/UserSettingsWriteAllParams.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 javax.annotation.processing.Generated;
+
+/**
+ * The whole content to store in the user settings file.
+ *
+ * @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)
+record UserSettingsWriteAllParams(
+    /** The settings object to store. It replaces the file's entire content, so a key absent here is removed. */
+    @JsonInclude(JsonInclude.Include.ALWAYS)
+    @JsonProperty("settings") Object settings
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/WorkflowExecuteParams.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/WorkflowExecuteParams.java
index 5c53ad155f..e4001bb82e 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/WorkflowExecuteParams.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/WorkflowExecuteParams.java
@@ -33,6 +33,7 @@ public record WorkflowExecuteParams(
     /** Opaque token identifying this workflow execution attempt. */
     @JsonProperty("executionToken") String executionToken,
     /** Workflow input value. */
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     @JsonProperty("args") Object args
 ) {
 }
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/WorkspaceDiffContents.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/WorkspaceDiffContents.java
new file mode 100644
index 0000000000..7ffdaa1862
--- /dev/null
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/WorkspaceDiffContents.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;
+
+/**
+ * Complete text used to generate one session diff. These are display contents, with the same text decoding as the patch, not a file-restore contract.
+ *
+ * @since 1.0.0
+ */
+@javax.annotation.processing.Generated("copilot-sdk-codegen")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record WorkspaceDiffContents(
+    /** Complete text before the session first changed the file. Omitted when the file did not exist; an empty string represents an existing empty file. */
+    @JsonProperty("before") String before,
+    /** Complete current text read when computing the diff. Omitted for a deleted file; an empty string represents an existing empty file. */
+    @JsonProperty("after") String after
+) {
+}
diff --git a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/WorkspaceDiffFileChange.java b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/WorkspaceDiffFileChange.java
index e63b92b569..5ac0ec4efc 100644
--- a/java/sdk/src/generated/java/com/github/copilot/generated/rpc/WorkspaceDiffFileChange.java
+++ b/java/sdk/src/generated/java/com/github/copilot/generated/rpc/WorkspaceDiffFileChange.java
@@ -30,6 +30,27 @@ public record WorkspaceDiffFileChange(
     /** Original file path for renamed files. */
     @JsonProperty("oldPath") String oldPath,
     /** Whether the diff content was omitted because it exceeded the per-file size limit. */
-    @JsonProperty("isTruncated") Boolean isTruncated
+    @JsonProperty("isTruncated") Boolean isTruncated,
+    /** Full text used for this patch, only when includeContents was requested for session mode. Omitted for binary, oversized or unavailable contents, and for fallback results. Read isFallback and isTruncated before treating an absent value as a missing file. */
+    @JsonProperty("contents") WorkspaceDiffContents contents
 ) {
+
+    /**
+     * Creates a record with the components it had before later optional fields were added.
+     *
+     * @param path 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).
+     * @param diff Unified diff content for the file. Empty when the diff was truncated.
+     * @param changeType Type of change represented by this file diff.
+     * @param oldPath Original file path for renamed files.
+     * @param isTruncated Whether the diff content was omitted because it exceeded the per-file size limit.
+     */
+    public WorkspaceDiffFileChange(
+        String path,
+        String diff,
+        WorkspaceDiffFileChangeType changeType,
+        String oldPath,
+        Boolean isTruncated
+    ) {
+        this(path, diff, changeType, oldPath, isTruncated, null);
+    }
 }
diff --git a/java/sdk/src/main/java/com/github/copilot/AhpHost.java b/java/sdk/src/main/java/com/github/copilot/AhpHost.java
index 9258289c85..92b400a205 100644
--- a/java/sdk/src/main/java/com/github/copilot/AhpHost.java
+++ b/java/sdk/src/main/java/com/github/copilot/AhpHost.java
@@ -5,6 +5,8 @@
 package com.github.copilot;
 
 import com.github.copilot.generated.rpc.HostDisposeParams;
+import com.github.copilot.generated.rpc.HostListSessionsParams;
+import com.github.copilot.generated.rpc.HostListSessionsResult;
 import com.github.copilot.generated.rpc.HostPublishSessionParams;
 import com.github.copilot.generated.rpc.HostPublishSessionResult;
 import com.github.copilot.generated.rpc.HostStartResult;
@@ -83,8 +85,8 @@ public CompletableFuture<Void> dispose() {
     }
 
     /**
-     * Publishes an exact resident session attached to the owning client, without
-     * invoking a factory or transferring session ownership.
+     * Durably advertises an exact attached session in the compute-scoped catalog,
+     * without invoking a factory or transferring session ownership.
      *
      * @param sessionId
      *            resident session identity
@@ -94,6 +96,15 @@ public CompletableFuture<HostPublishSessionResult> publishSession(String session
         return rpc.publishSession(new HostPublishSessionParams(info.hostId(), sessionId));
     }
 
+    /**
+     * Lists all live and dormant catalog sessions advertised by this host.
+     *
+     * @return the advertised host sessions
+     */
+    public CompletableFuture<HostListSessionsResult> listSessions() {
+        return rpc.listSessions(new HostListSessionsParams(info.hostId()));
+    }
+
     /** Disposes the listener and waits for acknowledged cleanup. */
     @Override
     public void close() {
diff --git a/java/sdk/src/main/java/com/github/copilot/AhpHostManager.java b/java/sdk/src/main/java/com/github/copilot/AhpHostManager.java
index afd06e8f0e..7cefadcd5f 100644
--- a/java/sdk/src/main/java/com/github/copilot/AhpHostManager.java
+++ b/java/sdk/src/main/java/com/github/copilot/AhpHostManager.java
@@ -11,7 +11,7 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.github.copilot.generated.rpc.HostExitReason;
 import com.github.copilot.generated.rpc.HostExitedNotification;
-import com.github.copilot.generated.rpc.HostStartParams;
+import com.github.copilot.generated.rpc.HostStartRequest;
 import com.github.copilot.generated.rpc.ServerHostApi;
 import com.github.copilot.rpc.ResumeSessionConfig;
 import com.github.copilot.rpc.SessionConfig;
@@ -99,8 +99,10 @@ CompletableFuture<AhpHost> start(ServerHostApi rpc, AhpHostOptions options) {
         }
         var snapshot = host.options;
         return rpc
-                .start(new HostStartParams(host.id, snapshot.getLocalServer(), snapshot.getGithubEnvironment(),
-                        snapshot.getCreateSession() != null, snapshot.getResumeSession() != null))
+                .start(new HostStartRequest(host.id).setComputeId(snapshot.getComputeId())
+                        .setLocalServer(snapshot.getLocalServer()).setGitHubEnvironment(snapshot.getGithubEnvironment())
+                        .setSessionFactory(snapshot.getCreateSession() != null)
+                        .setResumeFactory(snapshot.getResumeSession() != null))
                 .thenApply(info -> new AhpHost(info, rpc)).whenComplete((result, error) -> {
                     if (error != null) {
                         endHost(host, null);
diff --git a/java/sdk/src/main/java/com/github/copilot/AhpHostOptions.java b/java/sdk/src/main/java/com/github/copilot/AhpHostOptions.java
index 2ee29adab0..5a4ba6b11c 100644
--- a/java/sdk/src/main/java/com/github/copilot/AhpHostOptions.java
+++ b/java/sdk/src/main/java/com/github/copilot/AhpHostOptions.java
@@ -18,6 +18,7 @@
  */
 @CopilotExperimental
 public final class AhpHostOptions {
+    private String computeId;
     private HostLocalServerOptions localServer;
     private HostGitHubEnvironmentOptions githubEnvironment;
     private Function<AhpSessionCreateRequest, CompletableFuture<CopilotSession>> createSession;
@@ -33,6 +34,7 @@ public AhpHostOptions() {
     }
 
     AhpHostOptions(AhpHostOptions options) {
+        computeId = options.computeId;
         localServer = options.localServer;
         githubEnvironment = options.githubEnvironment;
         createSession = options.createSession;
@@ -41,6 +43,28 @@ public AhpHostOptions() {
         onExit = options.onExit;
     }
 
+    /**
+     * Gets the durable catalog's compute identity.
+     *
+     * @return the stable compute identity, or {@code null} for the runtime default
+     */
+    public String getComputeId() {
+        return computeId;
+    }
+
+    /**
+     * Selects the same durable catalog for local and Mission Control hosting. Must
+     * agree with the GitHub environment's compute identity when both are supplied.
+     *
+     * @param computeId
+     *            stable identity, or {@code null} for the runtime default
+     * @return these options
+     */
+    public AhpHostOptions setComputeId(String computeId) {
+        this.computeId = computeId;
+        return this;
+    }
+
     /**
      * Gets the local WebSocket transport settings.
      *
diff --git a/java/sdk/src/main/java/com/github/copilot/CliServerManager.java b/java/sdk/src/main/java/com/github/copilot/CliServerManager.java
index e742b242e5..0ccd2995e8 100644
--- a/java/sdk/src/main/java/com/github/copilot/CliServerManager.java
+++ b/java/sdk/src/main/java/com/github/copilot/CliServerManager.java
@@ -11,10 +11,17 @@
 import java.net.Socket;
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.InvalidPathException;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Comparator;
 import java.util.List;
+import java.util.concurrent.CompletionException;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Matcher;
@@ -34,6 +41,7 @@ final class CliServerManager {
 
     private static final Logger LOG = Logger.getLogger(CliServerManager.class.getName());
     private static final int STDERR_READER_JOIN_TIMEOUT_MS = 5000;
+    static final int FORCE_KILL_TIMEOUT_SECONDS = 10;
 
     private final CopilotClientOptions options;
     private final StringBuilder stderrBuffer = new StringBuilder();
@@ -132,12 +140,20 @@ ProcessInfo startCliServer() throws IOException, InterruptedException {
         // Forward stderr to logger in background
         startStderrReader(process);
 
-        Integer detectedPort = null;
-        if (!options.isUseStdio()) {
-            detectedPort = waitForPortAnnouncement(process);
+        try {
+            Integer detectedPort = null;
+            if (!options.isUseStdio()) {
+                detectedPort = waitForPortAnnouncement(process);
+            }
+            return new ProcessInfo(process, detectedPort);
+        } catch (IOException | RuntimeException error) {
+            try {
+                cleanupCliProcess(process, captureDescendants(process), true);
+            } catch (RuntimeException cleanupError) {
+                error.addSuppressed(cleanupError);
+            }
+            throw error;
         }
-
-        return new ProcessInfo(process, detectedPort);
     }
 
     /**
@@ -206,11 +222,98 @@ private Integer waitForPortAnnouncement(Process process) throws IOException {
                 }
             }
 
-            process.destroyForcibly();
             throw new IOException("Timeout waiting for CLI to announce port");
         }
     }
 
+    static void cleanupCliProcess(Process process, List<ProcessHandle> descendants, boolean forceImmediately) {
+        if (!process.isAlive() && descendants.stream().noneMatch(ProcessHandle::isAlive)) {
+            return;
+        }
+        try {
+            if (terminateProcessTree(process, descendants, forceImmediately)) {
+                return;
+            }
+            if (!forceImmediately) {
+                if (terminateProcessTree(process, descendants, true)) {
+                    return;
+                }
+            }
+            throw new IllegalStateException("CLI process tree did not terminate after shutdown: " + process.pid());
+        } catch (InterruptedException error) {
+            Thread.currentThread().interrupt();
+            throw new CompletionException("Interrupted while terminating the CLI process tree", error);
+        } catch (ExecutionException error) {
+            throw new CompletionException("Failed to await CLI process tree termination", error.getCause());
+        }
+    }
+
+    static List<ProcessHandle> captureDescendants(Process process) {
+        return process.descendants().sorted(Comparator.comparingInt(CliServerManager::processDepth).reversed())
+                .toList();
+    }
+
+    private static int processDepth(ProcessHandle process) {
+        int depth = 0;
+        var parent = process.parent();
+        while (parent.isPresent()) {
+            depth++;
+            parent = parent.get().parent();
+        }
+        return depth;
+    }
+
+    private static boolean terminateProcessTree(Process process, List<ProcessHandle> descendants, boolean force)
+            throws InterruptedException, ExecutionException {
+        long deadline = System.nanoTime() + TimeUnit.SECONDS.toNanos(FORCE_KILL_TIMEOUT_SECONDS);
+        // Reap deepest children while their parents can still collect their exit.
+        // Killing the launcher first can orphan zombies in containers without an init.
+        for (var child : descendants) {
+            if (child.isAlive()) {
+                if (force) {
+                    child.destroyForcibly();
+                } else {
+                    child.destroy();
+                }
+                waitForProcessExit(child, deadline);
+            }
+        }
+        if (process.isAlive()) {
+            if (force) {
+                process.destroyForcibly();
+            } else {
+                process.destroy();
+            }
+        }
+        return waitForProcessTreeExit(process, descendants, deadline);
+    }
+
+    private static boolean waitForProcessTreeExit(Process process, List<ProcessHandle> descendants, long deadline)
+            throws InterruptedException, ExecutionException {
+        if (!process.waitFor(Math.max(0, deadline - System.nanoTime()), TimeUnit.NANOSECONDS)) {
+            return false;
+        }
+        for (var child : descendants) {
+            if (!waitForProcessExit(child, deadline)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private static boolean waitForProcessExit(ProcessHandle process, long deadline)
+            throws InterruptedException, ExecutionException {
+        if (!process.isAlive()) {
+            return true;
+        }
+        try {
+            process.onExit().get(Math.max(0, deadline - System.nanoTime()), TimeUnit.NANOSECONDS);
+            return true;
+        } catch (TimeoutException error) {
+            return false;
+        }
+    }
+
     String getStderrOutput() {
         synchronized (stderrBuffer) {
             return stderrBuffer.toString().trim();
@@ -252,9 +355,17 @@ private List<String> resolveCliCommand(String cliPath, List<String> args) {
             return result;
         }
 
-        // On Windows, use cmd /c to resolve the executable
+        // Own native executables directly so terminating the process cannot orphan
+        // a child behind cmd.exe. Batch shims still require the shell.
         String os = System.getProperty("os.name").toLowerCase();
         if (os.contains("win") && !new File(cliPath).isAbsolute()) {
+            String executable = resolveWindowsExecutable(cliPath);
+            if (executable != null) {
+                var result = new ArrayList<String>();
+                result.add(executable);
+                result.addAll(args);
+                return result;
+            }
             var result = new ArrayList<String>();
             result.add("cmd");
             result.add("/c");
@@ -269,6 +380,59 @@ private List<String> resolveCliCommand(String cliPath, List<String> args) {
         return result;
     }
 
+    private String resolveWindowsExecutable(String cliPath) {
+        Path cwd = Path.of(options.getCwd() != null ? options.getCwd() : System.getProperty("user.dir"))
+                .toAbsolutePath();
+        var directories = new ArrayList<String>();
+        var environment = options.getEnvironment() != null ? options.getEnvironment() : System.getenv();
+        boolean hasDirectory = cliPath.contains("\\") || cliPath.contains("/");
+        if (hasDirectory || environment.keySet().stream()
+                .noneMatch(key -> key.equalsIgnoreCase("NoDefaultCurrentDirectoryInExePath"))) {
+            directories.add(cwd.toString());
+        }
+        if (!hasDirectory) {
+            String pathValue = environment.entrySet().stream().filter(entry -> entry.getKey().equalsIgnoreCase("PATH"))
+                    .map(java.util.Map.Entry::getValue).findFirst().orElse("");
+            directories.addAll(Arrays.asList(pathValue.split(File.pathSeparator)));
+        }
+        String pathExtensions = environment.entrySet().stream()
+                .filter(entry -> entry.getKey().equalsIgnoreCase("PATHEXT")).map(java.util.Map.Entry::getValue)
+                .findFirst().orElse(".COM;.EXE;.BAT;.CMD");
+        String[] names = new File(cliPath).getName().contains(".")
+                ? new String[]{cliPath}
+                : Arrays.stream(pathExtensions.split(";")).map(extension -> cliPath + extension).toArray(String[]::new);
+        // Preserve invalid-command diagnostics even when implicit cwd search is
+        // disabled.
+        if (names.length > 0) {
+            Path.of(names[0]);
+        }
+        for (String directory : directories) {
+            if (directory.isBlank()) {
+                continue;
+            }
+            if (directory.startsWith("\"") && directory.endsWith("\"")) {
+                directory = directory.substring(1, directory.length() - 1);
+            }
+            Path searchDirectory;
+            try {
+                searchDirectory = cwd.resolve(directory);
+            } catch (InvalidPathException error) {
+                LOG.log(Level.FINE, "Skipping invalid PATH entry while resolving CLI executable", error);
+                continue;
+            }
+            for (String name : names) {
+                Path candidate = searchDirectory.resolve(name);
+                if (Files.isRegularFile(candidate)) {
+                    String lowerName = name.toLowerCase(java.util.Locale.ROOT);
+                    return lowerName.endsWith(".exe") || lowerName.endsWith(".com")
+                            ? candidate.toAbsolutePath().toString()
+                            : null;
+                }
+            }
+        }
+        return null;
+    }
+
     void configureProcessEnvironment(ProcessBuilder pb) {
         if (options.getEnvironment() != null) {
             pb.environment().clear();
diff --git a/java/sdk/src/main/java/com/github/copilot/CopilotClient.java b/java/sdk/src/main/java/com/github/copilot/CopilotClient.java
index 4a6d33c8ce..de6081b39d 100644
--- a/java/sdk/src/main/java/com/github/copilot/CopilotClient.java
+++ b/java/sdk/src/main/java/com/github/copilot/CopilotClient.java
@@ -99,7 +99,7 @@ public final class CopilotClient implements AutoCloseable {
     public static final int AUTOCLOSEABLE_TIMEOUT_SECONDS = 10;
     private static final int RUNTIME_SHUTDOWN_TIMEOUT_SECONDS = 10;
     private static final int PROCESS_EXIT_TIMEOUT_SECONDS = 10;
-    private static final int FORCE_KILL_TIMEOUT_SECONDS = 10;
+    private static final int FORCE_KILL_TIMEOUT_SECONDS = CliServerManager.FORCE_KILL_TIMEOUT_SECONDS;
 
     /**
      * One-shot dispatcher used to run the owned-executor shutdown off any caller
@@ -488,8 +488,10 @@ void setInProcessTransportFactory(InProcessTransportFactory factory) {
     private static InProcessTransport openInProcessTransport(CopilotClientOptions options) throws IOException {
         FfiRuntimeHost host = new FfiRuntimeHost();
         try {
-            Path explicitEntrypoint = NativeRuntimeLoader.resolveConfiguredEntrypoint();
-            host.start(explicitEntrypoint == null ? null : explicitEntrypoint.toString(), options);
+            String integrationId = System.getenv("GITHUB_COPILOT_INTEGRATION_ID");
+            integrationId = integrationId == null || integrationId.isBlank() ? null : integrationId.trim();
+            Path cliEntrypoint = NativeRuntimeLoader.resolveConfiguredEntrypoint();
+            host.start(cliEntrypoint == null ? null : cliEntrypoint.toString(), integrationId, options);
         } catch (RuntimeException | Error e) {
             host.close();
             throw e;
@@ -585,9 +587,21 @@ private Connection startCoreBody() {
                 installationConfirmationAdapter.registerHandlers(connectedRpc);
             }
             InstallationConfirmationAdapter connectedInstallationConfirmationAdapter = installationConfirmationAdapter;
+            // JsonRpcClient keeps one handler per method, so this one serves every request
+            // that honors cancellation.
+            connectedRpc.registerMethodHandler("$/cancelRequest", (rpcId, params) -> {
+                dispatcher.handleCancelRequest(params);
+                if (connectedInstallationConfirmationAdapter != null) {
+                    connectedInstallationConfirmationAdapter.handleCancel(connectedRpc, params);
+                }
+            });
             connectedRpc.setCloseHandler(() -> {
                 ahpHosts.disconnect(connection.serverRpc().host);
-                sessions.values().forEach(CopilotSession::cancelPendingExternalTools);
+                sessions.values().forEach(session -> {
+                    session.cancelPendingExternalTools();
+                    session.clearSkillProvider();
+                });
+                dispatcher.cancelSkillProviderCalls();
                 if (connectedLlmAdapter != null) {
                     connectedLlmAdapter.cancelPending();
                 }
@@ -652,7 +666,11 @@ private Connection startCoreBody() {
                 if (drainBeforeCleanup) {
                     serverManager.awaitStderrReader();
                 }
-                cleanupCliProcess(process, true);
+                try {
+                    CliServerManager.cleanupCliProcess(process, CliServerManager.captureDescendants(process), true);
+                } catch (RuntimeException cleanupError) {
+                    e.addSuppressed(cleanupError);
+                }
                 if (!drainBeforeCleanup) {
                     serverManager.awaitStderrReader();
                 }
@@ -753,7 +771,7 @@ private static boolean isUnsupportedConnectMethod(JsonRpcException ex) {
      * <li>Requests runtime shutdown for SDK-owned CLI processes</li>
      * <li>Closes stdin for an owned stdio process and waits for its host
      * cleanup</li>
-     * <li>Closes the JSON-RPC connection, terminating an owned process if
+     * <li>Closes the JSON-RPC connection, terminating an owned process tree if
      * needed</li>
      * </ol>
      * <p>
@@ -793,7 +811,8 @@ public CompletableFuture<Void> stop() {
     }
 
     /**
-     * Forces an immediate stop of the client without graceful cleanup.
+     * Immediately stops the client, retires sessions and pending waits, and drops
+     * unadmitted callbacks.
      *
      * @return A future that completes when the client is stopped
      */
@@ -801,8 +820,8 @@ public CompletableFuture<Void> forceStop() {
         ahpHosts.disconnect();
         disposed = true;
         var activeSessions = new ArrayList<>(sessions.values());
+        activeSessions.forEach(CopilotSession::forceStopLocally);
         sessions.clear();
-        activeSessions.forEach(CopilotSession::cancelPendingExternalTools);
         gitHubTokenProviders.clear();
         // Dispatch the blocking shutdownOwnedExecutor() on a dedicated thread:
         // cleanupConnection() is chained off async work running on the owned
@@ -830,6 +849,10 @@ private CompletableFuture<Void> cleanupConnection(boolean gracefulRuntimeShutdow
                 return CompletableFuture.<Void>completedFuture(null);
             }
 
+            // Retain children before EOF or shutdown can let their launcher exit.
+            List<ProcessHandle> descendants = connection.process == null
+                    ? List.of()
+                    : CliServerManager.captureDescendants(connection.process);
             CompletableFuture<Void> shutdownFuture = CompletableFuture.completedFuture(null);
             if (gracefulRuntimeShutdown && (connection.process != null || connection.runtimeHost != null)) {
                 long runtimeShutdownStartNanos = System.nanoTime();
@@ -849,8 +872,10 @@ private CompletableFuture<Void> cleanupConnection(boolean gracefulRuntimeShutdow
             }
 
             return shutdownFuture.handleAsync((ignored, error) -> {
+                boolean preserveDetachedServices = gracefulRuntimeShutdown && error == null && !options.isUseStdio();
                 if (gracefulRuntimeShutdown && connection.process != null && options.isUseStdio()) {
-                    awaitStdioProcessExit(connection.process);
+                    boolean exitObserved = awaitOwnedRuntimeExit(connection);
+                    preserveDetachedServices = exitObserved && error == null;
                 }
                 try {
                     connection.rpc.close();
@@ -859,7 +884,11 @@ private CompletableFuture<Void> cleanupConnection(boolean gracefulRuntimeShutdow
                 }
 
                 if (connection.process != null) {
-                    cleanupCliProcess(connection.process, !gracefulRuntimeShutdown || error != null);
+                    // Successful shutdown leaves intentionally detached services alive.
+                    // Keep the captured tree only for failed or forced shutdown.
+                    CliServerManager.cleanupCliProcess(connection.process,
+                            preserveDetachedServices ? List.of() : descendants,
+                            !gracefulRuntimeShutdown || error != null);
                 }
                 if (connection.runtimeHost != null) {
                     closeRuntimeHost(connection.runtimeHost);
@@ -869,54 +898,24 @@ private CompletableFuture<Void> cleanupConnection(boolean gracefulRuntimeShutdow
         }).thenCompose(result -> result);
     }
 
-    private static void awaitStdioProcessExit(Process process) {
+    private static boolean awaitOwnedRuntimeExit(Connection connection) {
+        long deadline = System.nanoTime() + TimeUnit.SECONDS.toNanos(PROCESS_EXIT_TIMEOUT_SECONDS);
         try {
-            // Host telemetry flushes after stdio EOF, not the shutdown RPC response.
-            // Keep the reader draining stdout until the child has finished.
-            process.getOutputStream().close();
-            if (!process.waitFor(PROCESS_EXIT_TIMEOUT_SECONDS, TimeUnit.SECONDS)) {
-                LOG.fine("Process did not exit after stdin EOF within graceful shutdown timeout; terminating");
-            }
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            LOG.log(Level.FINE, "Interrupted while waiting for process exit", e);
-        } catch (IOException e) {
-            LOG.log(Level.FINE, "Error closing process stdin", e);
-        }
-    }
-
-    /**
-     * Returns true only when the child had already exited and no streams were
-     * destroyed.
-     */
-    private static boolean cleanupCliProcess(Process process, boolean forceImmediately) {
-        try {
-            if (process.isAlive()) {
-                if (forceImmediately) {
-                    process.destroyForcibly();
-                    if (!process.waitFor(FORCE_KILL_TIMEOUT_SECONDS, TimeUnit.SECONDS)) {
-                        LOG.fine("Process did not terminate within force kill timeout");
-                    }
-                    return false;
-                }
-
-                process.destroy();
-                if (process.waitFor(FORCE_KILL_TIMEOUT_SECONDS, TimeUnit.SECONDS)) {
-                    return false;
-                }
-
-                process.destroyForcibly();
-                if (!process.waitFor(FORCE_KILL_TIMEOUT_SECONDS, TimeUnit.SECONDS)) {
-                    LOG.fine("Process did not terminate within force kill timeout");
-                }
+            // Host telemetry flushes after stdin EOF, not the shutdown response.
+            connection.process.getOutputStream().close();
+            if (!connection.rpc.awaitPeerEof(deadline - System.nanoTime(), TimeUnit.NANOSECONDS)) {
+                LOG.fine("Runtime transport did not reach EOF within graceful shutdown timeout; terminating tree");
                 return false;
             }
+            if (!connection.process.waitFor(Math.max(0, deadline - System.nanoTime()), TimeUnit.NANOSECONDS)) {
+                LOG.fine("Launcher did not exit after runtime EOF; terminating launcher");
+            }
             return true;
         } catch (InterruptedException e) {
             Thread.currentThread().interrupt();
-            LOG.log(Level.FINE, "Interrupted while killing process", e);
-        } catch (Exception e) {
-            LOG.log(Level.FINE, "Error killing process", e);
+            LOG.log(Level.FINE, "Interrupted while waiting for process exit", e);
+        } catch (IOException e) {
+            LOG.log(Level.FINE, "Error awaiting runtime exit after closing stdin", e);
         }
         return false;
     }
@@ -961,6 +960,10 @@ public CompletableFuture<CopilotSession> createSession(SessionConfig config) {
             return CompletableFuture.failedFuture(
                     new IllegalArgumentException("gitHubToken and gitHubTokenProvider are mutually exclusive"));
         }
+        if (config.getCloud() != null && config.getSkillProvider() != null) {
+            return CompletableFuture.failedFuture(
+                    new IllegalArgumentException("Skill providers are not supported for cloud sessions."));
+        }
         return ensureConnected().thenCompose(connection -> {
             long totalNanos = System.nanoTime();
             // For cloud sessions, let the CLI/server assign the session id
@@ -1029,7 +1032,7 @@ public CompletableFuture<CopilotSession> createSession(SessionConfig config) {
             if (options.getMode() == CopilotClientMode.EMPTY) {
                 if (config.getAvailableTools() == null) {
                     if (registeredIdHolder[0] != null) {
-                        sessions.remove(registeredIdHolder[0]);
+                        sessions.remove(registeredIdHolder[0], preRegisteredSessionHolder[0]);
                     }
                     throw new IllegalArgumentException(
                             "CopilotClient is in Mode = EMPTY but the session config did not specify "
@@ -1129,9 +1132,10 @@ public CompletableFuture<CopilotSession> createSession(SessionConfig config) {
                     }).exceptionally(ex -> {
                         if (preRegisteredSessionHolder[0] != null) {
                             preRegisteredSessionHolder[0].cancelPendingExternalTools();
+                            preRegisteredSessionHolder[0].clearSkillProvider();
                         }
                         if (registeredIdHolder[0] != null) {
-                            sessions.remove(registeredIdHolder[0]);
+                            sessions.remove(registeredIdHolder[0], preRegisteredSessionHolder[0]);
                         }
                         if (tokenRegistration != null) {
                             tokenRegistration.close();
@@ -1189,6 +1193,14 @@ public CompletableFuture<CopilotSession> resumeSession(String sessionId, ResumeS
         }
         return ensureConnected().thenCompose(connection -> {
             long totalNanos = System.nanoTime();
+            // Validate before registering so a rejected resume leaves any resident
+            // session and its skill provider in place.
+            if (options.getMode() == CopilotClientMode.EMPTY && config.getAvailableTools() == null) {
+                throw new IllegalArgumentException(
+                        "CopilotClient is in Mode = EMPTY but the resume session config did not specify "
+                                + "availableTools. Empty mode requires every session to explicitly opt into "
+                                + "the tools it wants — e.g. setAvailableTools(new ToolSet().addBuiltIn(BuiltInTools.ISOLATED)).");
+            }
             // Register the session before the RPC call to avoid missing early events.
             long setupNanos = System.nanoTime();
             CopilotSession replacedSession = sessions.get(sessionId);
@@ -1217,15 +1229,8 @@ public CompletableFuture<CopilotSession> resumeSession(String sessionId, ResumeS
                 request.setEnableGitHubTelemetryForwarding(true);
             }
 
-            // Empty mode: validate availableTools and set toolFilterPrecedence for resume
-            // path
+            // Empty mode: set toolFilterPrecedence and isolation defaults for resume path
             if (options.getMode() == CopilotClientMode.EMPTY) {
-                if (config.getAvailableTools() == null) {
-                    throw new IllegalArgumentException(
-                            "CopilotClient is in Mode = EMPTY but the resume session config did not specify "
-                                    + "availableTools. Empty mode requires every session to explicitly opt into "
-                                    + "the tools it wants — e.g. setAvailableTools(new ToolSet().addBuiltIn(BuiltInTools.ISOLATED)).");
-                }
                 request.setToolFilterPrecedence("excluded");
                 if (request.getSkipEmbeddingRetrieval() == null) {
                     request.setSkipEmbeddingRetrieval(true);
@@ -1290,7 +1295,7 @@ public CompletableFuture<CopilotSession> resumeSession(String sessionId, ResumeS
                         // re-key.
                         String returnedId = response.sessionId();
                         if (returnedId != null && !returnedId.equals(sessionId)) {
-                            sessions.remove(sessionId);
+                            sessions.remove(sessionId, session);
                             session.setActiveSessionId(returnedId);
                             sessions.put(returnedId, session);
                         }
@@ -1313,15 +1318,11 @@ public CompletableFuture<CopilotSession> resumeSession(String sessionId, ResumeS
                                 });
                     }).exceptionally(ex -> {
                         session.cancelPendingExternalTools();
-                        sessions.remove(sessionId);
-                        // Also remove the re-keyed entry if the server returned a different ID
-                        String activeId = session.getSessionId();
-                        if (!sessionId.equals(activeId)) {
-                            sessions.remove(activeId);
-                        }
-                        if (replacedSession != null) {
-                            sessions.putIfAbsent(sessionId, replacedSession);
-                        }
+                        session.clearSkillProvider();
+                        // A concurrent resume may own the ID now; undo only this attempt.
+                        sessions.compute(sessionId,
+                                (id, current) -> current == null || current == session ? replacedSession : current);
+                        sessions.remove(session.getSessionId(), session);
                         if (tokenRegistration != null) {
                             tokenRegistration.close();
                         }
@@ -1441,6 +1442,9 @@ CompletableFuture<Void> updateSessionOptionsForMode(CopilotSession session, Bool
                 null, // envValueMode
                 null, // allowAllMcpServerInstructions
                 null, // skillDirectories
+                null, // agentDirectories
+                null, // instructionDirectories
+                null, // hookDirectories
                 null, // ignoredSkillsLocations
                 patchSkills, // includedBuiltinSkills
                 null, // disabledSkills
@@ -1500,12 +1504,13 @@ CompletableFuture<Void> updateSessionOptionsForMode(CopilotSession session, Bool
      * @see ConnectionState
      */
     public ConnectionState getState() {
-        if (connectionFuture == null)
+        CompletableFuture<Connection> future = connectionFuture;
+        if (future == null)
             return ConnectionState.DISCONNECTED;
-        if (connectionFuture.isCompletedExceptionally())
-            return ConnectionState.ERROR;
-        if (!connectionFuture.isDone())
+        if (!future.isDone())
             return ConnectionState.CONNECTING;
+        if (future.isCompletedExceptionally())
+            return ConnectionState.ERROR;
         return ConnectionState.CONNECTED;
     }
 
@@ -1667,6 +1672,7 @@ public CompletableFuture<Void> deleteSession(String sessionId) {
                     }
                     CopilotSession session = sessions.remove(sessionId);
                     if (session != null) {
+                        session.clearSkillProvider();
                         session.releaseGitHubTokenProviderRegistration();
                     }
                 }));
diff --git a/java/sdk/src/main/java/com/github/copilot/CopilotSession.java b/java/sdk/src/main/java/com/github/copilot/CopilotSession.java
index ddd46aa262..497bce7983 100644
--- a/java/sdk/src/main/java/com/github/copilot/CopilotSession.java
+++ b/java/sdk/src/main/java/com/github/copilot/CopilotSession.java
@@ -16,6 +16,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArraySet;
 import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
 import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
@@ -172,6 +173,7 @@ public final class CopilotSession implements AutoCloseable {
     private static final Logger LOG = Logger.getLogger(CopilotSession.class.getName());
     private static final ObjectMapper MAPPER = JsonRpcClient.getObjectMapper();
     private final java.util.Set<CompletableFuture<?>> structuredWaits = ConcurrentHashMap.newKeySet();
+    private final Map<CompletableFuture<AssistantMessageEvent>, CompletableFuture<AssistantMessageEvent>> plainWaits = new ConcurrentHashMap<>();
 
     /**
      * Fixed name of the runtime's built-in tool-search tool. A client can replace
@@ -195,7 +197,7 @@ public final class CopilotSession implements AutoCloseable {
     private final SessionUiApi ui;
     private final JsonRpcClient rpc;
     private volatile SessionRpc sessionRpc;
-    private final Set<Consumer<SessionEvent>> eventHandlers = new CopyOnWriteArraySet<>();
+    private final Set<EventSubscription> eventHandlers = new CopyOnWriteArraySet<>();
     private final AtomicReference<Map<String, ToolDefinition>> toolHandlers = new AtomicReference<>(Map.of());
     private final Object setToolsLock = new Object();
     private CompletableFuture<Void> setToolsTail = CompletableFuture.completedFuture(null);
@@ -211,6 +213,7 @@ public final class CopilotSession implements AutoCloseable {
     private final AtomicReference<ExitPlanModeHandler> exitPlanModeHandler = new AtomicReference<>();
     private final AtomicReference<AutoModeSwitchHandler> autoModeSwitchHandler = new AtomicReference<>();
     private final AtomicReference<SessionHooks> hooksHandler = new AtomicReference<>();
+    private final AtomicReference<SkillProvider> skillProvider = new AtomicReference<>();
     private volatile EventErrorHandler eventErrorHandler;
     private volatile EventErrorPolicy eventErrorPolicy = EventErrorPolicy.PROPAGATE_AND_LOG_ERRORS;
     private volatile Map<String, java.util.function.Function<String, CompletableFuture<String>>> transformCallbacks;
@@ -218,8 +221,17 @@ public final class CopilotSession implements AutoCloseable {
     private volatile Executor executor;
     private volatile GitHubTokenProviderRegistry.Registration gitHubTokenProviderRegistration;
 
-    /** Tracks whether this session instance has been terminated via close(). */
+    /** Tracks whether this session instance has been closed or force-stopped. */
     private volatile boolean isTerminated = false;
+    private volatile boolean callbacksRetired = false;
+
+    private static final class EventSubscription {
+        private final AtomicReference<Consumer<SessionEvent>> handler;
+
+        EventSubscription(Consumer<SessionEvent> handler) {
+            this.handler = new AtomicReference<>(handler);
+        }
+    }
 
     private static final class PendingExternalTool {
         private static final int WAITING = 0;
@@ -660,19 +672,33 @@ public CompletableFuture<AssistantMessageEvent> sendAndWait(MessageOptions optio
             }
         };
 
-        Closeable subscription = on(handler);
+        var result = new CompletableFuture<AssistantMessageEvent>();
+        Closeable subscription;
+        synchronized (this) {
+            subscription = on(handler);
+            plainWaits.put(result, future);
+        }
+        result.whenComplete((value, error) -> plainWaits.remove(result));
 
-        send(options).exceptionally(ex -> {
+        try {
+            send(options).exceptionally(ex -> {
+                try {
+                    subscription.close();
+                } catch (IOException e) {
+                    LOG.log(Level.SEVERE, "Error closing subscription", e);
+                }
+                future.completeExceptionally(ex);
+                return null;
+            });
+        } catch (RuntimeException error) {
+            plainWaits.remove(result);
             try {
                 subscription.close();
-            } catch (Exception e) {
-                LOG.log(Level.SEVERE, "Error closing subscription", e);
+            } catch (IOException closeError) {
+                error.addSuppressed(closeError);
             }
-            future.completeExceptionally(ex);
-            return null;
-        });
-
-        var result = new CompletableFuture<AssistantMessageEvent>();
+            throw error;
+        }
 
         // Schedule timeout on the shared session-level scheduler.
         // Per Javadoc, timeoutMs <= 0 means "no timeout".
@@ -691,7 +717,10 @@ public CompletableFuture<AssistantMessageEvent> sendAndWait(MessageOptions optio
                 } catch (IOException closeEx) {
                     e.addSuppressed(closeEx);
                 }
-                result.completeExceptionally(e);
+                // Retirement owns completion when it has already shut down the scheduler.
+                if (!isTerminated) {
+                    result.completeExceptionally(e);
+                }
                 return result;
             }
         }
@@ -775,7 +804,9 @@ public CompletableFuture<AssistantMessageEvent> sendAndWait(MessageOptions optio
      * the returned future completes exceptionally. Concurrent replacements on the
      * same session are applied in call order. Cancelling the returned future while
      * an earlier replacement is still in flight sends nothing; once the request is
-     * sent, an accepted replacement still installs its handlers.
+     * sent, an accepted replacement still installs its handlers unless the session
+     * closes first. Closing the session rejects queued replacements and prevents
+     * late acknowledgements from restoring retired handlers.
      * <p>
      * The agent sees the new tools from its next model request, which can fall
      * within a turn in progress. A model request already in flight was made with
@@ -803,7 +834,13 @@ public CompletableFuture<Void> setTools(List<ToolDefinition> tools) {
                 if (result.isCancelled()) {
                     return CompletableFuture.<Void>completedFuture(null);
                 }
-                return getRpc().tools.set(params).thenRun(() -> toolHandlers.set(replacementHandlers));
+                ensureNotTerminated();
+                return getRpc().tools.set(params).thenRun(() -> {
+                    synchronized (CopilotSession.this) {
+                        ensureNotTerminated();
+                        toolHandlers.set(replacementHandlers);
+                    }
+                });
             });
             setToolsTail = operation.handle((ignored, error) -> null);
         }
@@ -936,14 +973,17 @@ synchronized void event(SessionEvent event) {
             }
         }
         var state = new State();
-        Closeable subscription = on(event -> {
-            if (event instanceof AssistantMessageEvent || event instanceof SessionIdleEvent
-                    || event instanceof SessionErrorEvent
-                    || event instanceof com.github.copilot.generated.UserMessageEvent) {
-                state.event(event);
-            }
-        });
-        structuredWaits.add(result);
+        Closeable subscription;
+        synchronized (this) {
+            subscription = on(event -> {
+                if (event instanceof AssistantMessageEvent || event instanceof SessionIdleEvent
+                        || event instanceof SessionErrorEvent
+                        || event instanceof com.github.copilot.generated.UserMessageEvent) {
+                    state.event(event);
+                }
+            });
+            structuredWaits.add(result);
+        }
         ScheduledFuture<?> timer;
         try {
             timer = timeoutMs > 0
@@ -1022,9 +1062,20 @@ synchronized void event(SessionEvent event) {
      * @see #setEventErrorPolicy(EventErrorPolicy)
      */
     public Closeable on(Consumer<SessionEvent> handler) {
-        ensureNotTerminated();
-        eventHandlers.add(handler);
-        return () -> eventHandlers.remove(handler);
+        java.util.Objects.requireNonNull(handler, "handler");
+        EventSubscription subscription;
+        synchronized (this) {
+            ensureNotTerminated();
+            subscription = eventHandlers.stream().filter(entry -> handler.equals(entry.handler.get())).findFirst()
+                    .orElseGet(() -> new EventSubscription(handler));
+            eventHandlers.add(subscription);
+        }
+        return () -> {
+            synchronized (this) {
+                subscription.handler.set(null);
+                eventHandlers.remove(subscription);
+            }
+        };
     }
 
     /**
@@ -1080,8 +1131,7 @@ public <T extends SessionEvent> Closeable on(Class<T> eventType, Consumer<T> han
                 handler.accept(eventType.cast(event));
             }
         };
-        eventHandlers.add(wrapper);
-        return () -> eventHandlers.remove(wrapper);
+        return on(wrapper);
     }
 
     /**
@@ -1108,12 +1158,25 @@ public <T extends SessionEvent> Closeable on(Class<T> eventType, Consumer<T> han
      * @see #setEventErrorPolicy(EventErrorPolicy)
      */
     void dispatchEvent(SessionEvent event) {
+        if (callbacksRetired) {
+            return;
+        }
         // Handle broadcast request events (protocol v3) and passive in-memory state
         // updates (capabilities, open-canvases snapshot) before dispatching to user
         // handlers. Fire-and-forget: any RPC response is sent asynchronously.
         handleBroadcastEventAsync(event);
 
-        for (Consumer<SessionEvent> handler : eventHandlers) {
+        for (EventSubscription subscription : eventHandlers) {
+            Consumer<SessionEvent> handler;
+            synchronized (this) {
+                if (callbacksRetired) {
+                    return;
+                }
+                handler = subscription.handler.get();
+            }
+            if (handler == null) {
+                continue;
+            }
             try {
                 handler.accept(event);
             } catch (Exception e) {
@@ -1163,7 +1226,9 @@ private void handleBroadcastEventAsync(SessionEvent event) {
             if (tool == null) {
                 return; // This client doesn't handle this tool; another client will
             }
-            executeToolAndRespondAsync(data.requestId(), data.toolName(), data.toolCallId(), data.arguments(), tool);
+            String agentId = toolEvent.getAgentId();
+            executeToolAndRespondAsync(data.requestId(), data.toolName(), data.toolCallId(), data.arguments(), tool,
+                    agentId == null || agentId.isEmpty() ? null : agentId);
 
         } else if (event instanceof ExternalToolCompletedEvent completedEvent) {
             var data = completedEvent.getData();
@@ -1270,7 +1335,7 @@ void populateToolSearchMetadata(String toolName, com.github.copilot.rpc.ToolInvo
      * {@code session.tools.handlePendingToolCall}.
      */
     private void executeToolAndRespondAsync(String requestId, String toolName, String toolCallId, Object arguments,
-            ToolDefinition tool) {
+            ToolDefinition tool, String agentId) {
         var pending = new PendingExternalTool();
         synchronized (this) {
             if (isTerminated || externalToolsClosed || pendingExternalTools.putIfAbsent(requestId, pending) != null) {
@@ -1284,6 +1349,7 @@ private void executeToolAndRespondAsync(String requestId, String toolName, Strin
                         : (arguments != null ? MAPPER.valueToTree(arguments) : null);
                 var invocation = new com.github.copilot.rpc.ToolInvocation().setSessionId(sessionId)
                         .setToolCallId(toolCallId).setToolName(toolName).setArguments(argumentsNode);
+                invocation.setAgentId(agentId).setRequestId(requestId);
 
                 if (TOOL_SEARCH_TOOL_NAME.equals(toolName)) {
                     try {
@@ -1774,6 +1840,18 @@ void registerMcpAuthHandler(McpAuthHandler handler) {
         mcpAuthHandler.set(handler);
     }
 
+    void registerSkillProvider(SkillProvider provider) {
+        skillProvider.set(provider);
+    }
+
+    SkillProvider getSkillProvider() {
+        return skillProvider.get();
+    }
+
+    void clearSkillProvider() {
+        skillProvider.set(null);
+    }
+
     /**
      * Handles a permission request from the Copilot CLI.
      * <p>
@@ -2802,23 +2880,16 @@ private void ensureNotTerminated() {
      * <p>
      * This destroys the session on the server, clears all event handlers, and
      * releases tool and permission handlers. After calling this method, the session
-     * cannot be used again. Subsequent calls to this method have no effect.
+     * cannot be used again. Subsequent calls to this method have no effect. Pending
+     * response waits fail when the session retires; ordinary callbacks remain
+     * active until the detach acknowledgement.
      */
     @Override
     public void close() {
-        synchronized (this) {
-            if (isTerminated) {
-                return; // Already terminated - no-op
-            }
-            isTerminated = true;
+        if (!retire(false)) {
+            return;
         }
 
-        structuredWaits.forEach(wait -> wait
-                .completeExceptionally(new IllegalStateException("Session closed before structured output completed")));
-        cancelPendingExternalTools();
-        timeoutScheduler.shutdownNow();
-        releaseGitHubTokenProviderRegistration();
-
         RuntimeException detachFailure = null;
         try {
             SessionDetachResponse response = rpc
@@ -2833,21 +2904,94 @@ public void close() {
                 Thread.currentThread().interrupt();
             }
             detachFailure = new IllegalStateException("Failed to detach session " + sessionId, e);
+        } finally {
+            retireCallbacks();
+        }
+
+        if (detachFailure != null) {
+            throw detachFailure;
         }
+    }
+
+    /**
+     * Retires a tracked session without an RPC or joining admitted user handlers.
+     */
+    void forceStopLocally() {
+        retire(true);
+    }
 
+    private boolean retire(boolean force) {
+        List<Runnable> waitCompletions = new ArrayList<>();
+        synchronized (this) {
+            if (isTerminated) {
+                if (force) {
+                    retireCallbacks();
+                }
+                return false;
+            }
+            isTerminated = true;
+            structuredWaits.forEach(wait -> waitCompletions.add(() -> wait
+                    .completeExceptionally(new IllegalStateException("Session closed before response completed"))));
+            plainWaits.forEach((result, terminal) -> {
+                if (terminal.isDone()) {
+                    // Preserve a received terminal outcome even if its scheduler handoff is queued.
+                    waitCompletions.add(() -> terminal.whenComplete((value, error) -> {
+                        if (error != null) {
+                            result.completeExceptionally(error);
+                        } else {
+                            result.complete(value);
+                        }
+                    }));
+                } else {
+                    waitCompletions.add(() -> result.completeExceptionally(
+                            new IllegalStateException("Session closed before response completed")));
+                }
+            });
+            structuredWaits.clear();
+            if (force) {
+                retireCallbacks();
+            }
+            plainWaits.clear();
+        }
+
+        cancelPendingExternalTools();
+        clearSkillProvider();
+        timeoutScheduler.shutdownNow();
+        releaseGitHubTokenProviderRegistration();
+        if (!waitCompletions.isEmpty()) {
+            // Completion can run blocking user continuations; don't borrow a shared or user
+            // executor.
+            var completions = Executors.newCachedThreadPool(task -> {
+                var thread = new Thread(task, "copilot-session-retirement");
+                thread.setDaemon(true);
+                return thread;
+            });
+            try {
+                waitCompletions.forEach(completions::execute);
+            } finally {
+                completions.shutdown();
+            }
+        }
+        return true;
+    }
+
+    private synchronized void retireCallbacks() {
+        callbacksRetired = true;
+        eventHandlers.forEach(subscription -> subscription.handler.set(null));
         eventHandlers.clear();
         toolHandlers.set(Map.of());
         commandHandlers.clear();
+        bearerTokenProviders.clear();
         permissionHandler.set(null);
+        mcpAuthHandler.set(null);
         userInputHandler.set(null);
         elicitationHandler.set(null);
         exitPlanModeHandler.set(null);
         autoModeSwitchHandler.set(null);
         hooksHandler.set(null);
-
-        if (detachFailure != null) {
-            throw detachFailure;
-        }
+        skillProvider.set(null);
+        eventErrorHandler = null;
+        transformCallbacks = null;
     }
 
     // ===== Internal response types for agent API =====
diff --git a/java/sdk/src/main/java/com/github/copilot/InstallationConfirmationAdapter.java b/java/sdk/src/main/java/com/github/copilot/InstallationConfirmationAdapter.java
index 57d5ab26fe..99eddbe545 100644
--- a/java/sdk/src/main/java/com/github/copilot/InstallationConfirmationAdapter.java
+++ b/java/sdk/src/main/java/com/github/copilot/InstallationConfirmationAdapter.java
@@ -47,7 +47,6 @@ final class InstallationConfirmationAdapter {
 
     void registerHandlers(JsonRpcClient rpc) {
         rpc.registerMethodHandler("installations.confirm", (rpcId, params) -> handleConfirm(rpc, rpcId, params));
-        rpc.registerMethodHandler("$/cancelRequest", (rpcId, params) -> handleCancel(rpc, params));
     }
 
     void closePending() {
@@ -80,7 +79,10 @@ private void handleConfirm(JsonRpcClient rpc, String rpcId, JsonNode params) {
         }
     }
 
-    private void handleCancel(JsonRpcClient rpc, JsonNode params) {
+    /**
+     * Cancels the confirmation named by a {@code $/cancelRequest} notification.
+     */
+    void handleCancel(JsonRpcClient rpc, JsonNode params) {
         if (params == null || !params.has("id") || !params.get("id").canConvertToLong()
                 || !params.get("id").isIntegralNumber()) {
             return;
diff --git a/java/sdk/src/main/java/com/github/copilot/JsonRpcClient.java b/java/sdk/src/main/java/com/github/copilot/JsonRpcClient.java
index fc10946829..310733aab8 100644
--- a/java/sdk/src/main/java/com/github/copilot/JsonRpcClient.java
+++ b/java/sdk/src/main/java/com/github/copilot/JsonRpcClient.java
@@ -14,8 +14,10 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
@@ -53,6 +55,8 @@ class JsonRpcClient implements AutoCloseable {
     private final Map<Long, CompletableFuture<JsonNode>> pendingRequests = new ConcurrentHashMap<>();
     private final Map<String, BiConsumer<String, JsonNode>> notificationHandlers = new ConcurrentHashMap<>();
     private final ExecutorService readerExecutor;
+    private final CountDownLatch readerExited = new CountDownLatch(1);
+    private boolean peerEof;
     private final Object closeHandlerLock = new Object();
     private volatile boolean running = true;
     private boolean closeNotified;
@@ -213,12 +217,20 @@ public void sendResponse(Object id, Object result) throws IOException {
      * Sends a JSON-RPC error response to a server request.
      */
     public void sendErrorResponse(Object id, int code, String message) throws IOException {
+        sendErrorResponse(id, code, message, null);
+    }
+
+    /**
+     * Sends a JSON-RPC error response to a server request with optional data.
+     */
+    public void sendErrorResponse(Object id, int code, String message, Object data) throws IOException {
         var response = new JsonRpcResponse();
         response.setJsonrpc("2.0");
         response.setId(id);
         var error = new JsonRpcError();
         error.setCode(code);
         error.setMessage(message);
+        error.setData(data);
         response.setError(error);
         sendMessage(response);
     }
@@ -284,6 +296,7 @@ private void startReader() {
                     while (inHeaders) {
                         int b = bis.read();
                         if (b == -1) {
+                            peerEof = true;
                             return;
                         }
 
@@ -319,6 +332,7 @@ private void startReader() {
                     while (read < contentLength) {
                         int result = bis.read(buffer, read, contentLength - read);
                         if (result == -1) {
+                            peerEof = true;
                             return;
                         }
                         read += result;
@@ -334,11 +348,19 @@ private void startReader() {
                     LOG.log(Level.SEVERE, "Error in JSON-RPC reader", e);
                 }
             } finally {
-                notifyClose();
+                try {
+                    notifyClose();
+                } finally {
+                    readerExited.countDown();
+                }
             }
         });
     }
 
+    boolean awaitPeerEof(long timeout, TimeUnit unit) throws InterruptedException {
+        return readerExited.await(Math.max(0, timeout), unit) && peerEof;
+    }
+
     void setCloseHandler(Runnable handler) {
         boolean runNow;
         synchronized (closeHandlerLock) {
diff --git a/java/sdk/src/main/java/com/github/copilot/RpcHandlerDispatcher.java b/java/sdk/src/main/java/com/github/copilot/RpcHandlerDispatcher.java
index 0dd8a5dc98..888ba538da 100644
--- a/java/sdk/src/main/java/com/github/copilot/RpcHandlerDispatcher.java
+++ b/java/sdk/src/main/java/com/github/copilot/RpcHandlerDispatcher.java
@@ -8,9 +8,14 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Map;
+import java.util.concurrent.CancellationException;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Executor;
 import java.util.concurrent.RejectedExecutionException;
+import java.util.function.BiFunction;
+import java.util.function.Function;
+import java.util.function.Supplier;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -48,6 +53,7 @@
  * <li>Lifecycle events</li>
  * </ul>
  */
+@AllowCopilotExperimental
 final class RpcHandlerDispatcher {
 
     private static final Logger LOG = Logger.getLogger(RpcHandlerDispatcher.class.getName());
@@ -57,6 +63,7 @@ final class RpcHandlerDispatcher {
     private final LifecycleEventDispatcher lifecycleDispatcher;
     private final Executor executor;
     private final GitHubTokenProviderRegistry gitHubTokenProviders;
+    private final Map<Long, CompletableFuture<Void>> skillProviderCancellations = new ConcurrentHashMap<>();
 
     /**
      * Creates a dispatcher with session registry and lifecycle dispatcher.
@@ -101,6 +108,144 @@ void registerHandlers(JsonRpcClient rpc) {
                 (requestId, params) -> handleProviderTokenGetToken(rpc, requestId, params));
         rpc.registerMethodHandler("gitHubToken.getToken",
                 (requestId, params) -> handleGitHubTokenGetToken(rpc, requestId, params));
+        rpc.registerMethodHandler("skillProvider.list",
+                (requestId, params) -> handleSkillProviderList(rpc, requestId, params));
+        rpc.registerMethodHandler("skillProvider.read",
+                (requestId, params) -> handleSkillProviderRead(rpc, requestId, params));
+    }
+
+    // The generated skillProvider.* records are package-private because the
+    // methods are internal, so these handlers read params as JSON.
+    private void handleSkillProviderList(JsonRpcClient rpc, String requestId, JsonNode params) {
+        handleSkillProviderRequest(rpc, requestId, params, "skillProvider.list", "listSkills",
+                (provider, request) -> provider.listSkills(),
+                skills -> Map.of("skills", skills != null ? skills : Collections.emptyList()));
+    }
+
+    private void handleSkillProviderRead(JsonRpcClient rpc, String requestId, JsonNode params) {
+        handleSkillProviderRequest(rpc, requestId, params, "skillProvider.read", "readSkill",
+                (provider, request) -> provider.readSkill(textParam(request, "name")), markdown -> {
+                    // Write an explicit null: the runtime requires the field and reads null as "not
+                    // found".
+                    var result = MAPPER.createObjectNode();
+                    if (markdown == null) {
+                        result.putNull("markdown");
+                    } else {
+                        result.put("markdown", markdown);
+                    }
+                    return result;
+                });
+    }
+
+    private static String textParam(JsonNode params, String field) {
+        JsonNode value = params != null ? params.get(field) : null;
+        return value != null && !value.isNull() ? value.asText() : null;
+    }
+
+    private <R> void handleSkillProviderRequest(JsonRpcClient rpc, String requestId, JsonNode params, String method,
+            String operation, BiFunction<SkillProvider, JsonNode, CompletableFuture<R>> call,
+            Function<R, Object> toResult) {
+        final long requestIdLong = parseRequestId(requestId, method);
+        if (requestIdLong == -1) {
+            return;
+        }
+        // Registered on the reader thread so a later $/cancelRequest always finds it.
+        var cancellation = new CompletableFuture<Void>();
+        skillProviderCancellations.put(requestIdLong, cancellation);
+        runAsync(() -> {
+            String failure = "Skill provider " + operation + " failed";
+            String sessionId = null;
+            try {
+                sessionId = textParam(params, "sessionId");
+                SkillProvider provider = findSkillProvider(sessionId);
+                if (provider == null) {
+                    skillProviderCancellations.remove(requestIdLong, cancellation);
+                    sendSkillProviderError(rpc, requestIdLong, "No skill provider for session: " + sessionId, sessionId,
+                            null);
+                    return;
+                }
+                CompletableFuture<R> future = cancellation.isDone()
+                        ? CompletableFuture.failedFuture(new CancellationException())
+                        : call.apply(provider, params);
+                if (future == null) {
+                    future = CompletableFuture
+                            .failedFuture(new IllegalStateException(operation + " returned a null future"));
+                }
+                final CompletableFuture<R> providerFuture = future;
+                final String callSessionId = sessionId;
+                cancellation.thenRun(() -> providerFuture.cancel(true));
+                providerFuture.whenComplete((value, error) -> {
+                    skillProviderCancellations.remove(requestIdLong, cancellation);
+                    if (cancellation.isDone()) {
+                        sendSkillProviderCancelled(rpc, requestIdLong);
+                    } else if (error != null) {
+                        sendSkillProviderError(rpc, requestIdLong, failure, callSessionId, error);
+                    } else {
+                        sendSkillProviderResult(rpc, requestIdLong, method, failure, callSessionId,
+                                () -> toResult.apply(value));
+                    }
+                });
+            } catch (Exception error) {
+                skillProviderCancellations.remove(requestIdLong, cancellation);
+                sendSkillProviderError(rpc, requestIdLong, failure, sessionId, error);
+            }
+        });
+    }
+
+    /**
+     * Cancels the skill provider call named by a {@code $/cancelRequest}
+     * notification, if it is still in flight.
+     */
+    void handleCancelRequest(JsonNode params) {
+        JsonNode id = params != null ? params.get("id") : null;
+        if (id == null || !id.isIntegralNumber() || !id.canConvertToLong()) {
+            return;
+        }
+        CompletableFuture<Void> cancellation = skillProviderCancellations.get(id.asLong());
+        if (cancellation != null) {
+            cancellation.complete(null);
+        }
+    }
+
+    /** Cancels every in-flight skill provider call when the connection closes. */
+    void cancelSkillProviderCalls() {
+        skillProviderCancellations.values().forEach(cancellation -> cancellation.complete(null));
+    }
+
+    private SkillProvider findSkillProvider(String sessionId) {
+        CopilotSession session = sessionId != null ? sessions.get(sessionId) : null;
+        return session != null ? session.getSkillProvider() : null;
+    }
+
+    private void sendSkillProviderResult(JsonRpcClient rpc, long requestId, String method, String failure,
+            String sessionId, Supplier<Object> result) {
+        try {
+            rpc.sendResponse(requestId, result.get());
+        } catch (IOException error) {
+            LOG.log(Level.SEVERE, "Error sending " + method + " response", error);
+        } catch (RuntimeException error) {
+            sendSkillProviderError(rpc, requestId, failure, sessionId, error);
+        }
+    }
+
+    private void sendSkillProviderCancelled(JsonRpcClient rpc, long requestId) {
+        try {
+            rpc.sendErrorResponse(requestId, -32800, "Request cancelled");
+        } catch (IOException error) {
+            LOG.log(Level.FINE, "Error sending skill provider cancellation", error);
+        }
+    }
+
+    private void sendSkillProviderError(JsonRpcClient rpc, long requestId, String message, String sessionId,
+            Throwable error) {
+        if (error != null) {
+            LOG.log(Level.WARNING, message + " (sessionId=" + sessionId + ")", error);
+        }
+        try {
+            rpc.sendErrorResponse(requestId, -32603, message);
+        } catch (IOException sendError) {
+            LOG.log(Level.SEVERE, "Error sending skill provider error", sendError);
+        }
     }
 
     private void handleGitHubTokenGetToken(JsonRpcClient rpc, String requestId, JsonNode params) {
diff --git a/java/sdk/src/main/java/com/github/copilot/SessionRequestBuilder.java b/java/sdk/src/main/java/com/github/copilot/SessionRequestBuilder.java
index 08101c1542..680ff0c160 100644
--- a/java/sdk/src/main/java/com/github/copilot/SessionRequestBuilder.java
+++ b/java/sdk/src/main/java/com/github/copilot/SessionRequestBuilder.java
@@ -153,6 +153,7 @@ static CreateSessionRequest buildCreateRequest(SessionConfig config, String sess
         }
 
         request.setModel(config.getModel());
+        request.setName(config.getName());
         request.setClientName(config.getClientName());
         request.setReasoningEffort(config.getReasoningEffort());
         request.setReasoningSummary(config.getReasoningSummary());
@@ -196,10 +197,13 @@ static CreateSessionRequest buildCreateRequest(SessionConfig config, String sess
         request.setAgent(config.getAgent());
         request.setInfiniteSessions(config.getInfiniteSessions());
         request.setSkillDirectories(config.getSkillDirectories());
+        request.setAgentDirectories(config.getAgentDirectories());
+        request.setHookDirectories(config.getHookDirectories());
         request.setInstructionDirectories(config.getInstructionDirectories());
         request.setPluginDirectories(config.getPluginDirectories());
         request.setLargeOutput(config.getLargeOutput());
         request.setToolSearch(config.getToolSearch());
+        request.setImageGeneration(config.getImageGeneration());
         request.setMemory(config.getMemory());
         request.setDisabledSkills(config.getDisabledSkills());
         request.setDisabledMcpServers(config.getDisabledMcpServers());
@@ -215,6 +219,9 @@ static CreateSessionRequest buildCreateRequest(SessionConfig config, String sess
         config.getEnableHostGitOperations().ifPresent(request::setEnableHostGitOperations);
         config.getEnableSessionStore().ifPresent(request::setEnableSessionStore);
         config.getEnableSkills().ifPresent(request::setEnableSkills);
+        if (config.getSkillProvider() != null) {
+            request.setHasSkillProvider(true);
+        }
         if (config.getEmbeddingCacheStorage() != null) {
             request.setEmbeddingCacheStorage(config.getEmbeddingCacheStorage());
         }
@@ -245,6 +252,7 @@ static CreateSessionRequest buildCreateRequest(SessionConfig config, String sess
         request.setFeatureFlags(config.getFeatureFlags());
         request.setExpAssignments(config.getExpAssignments());
         config.getEnableManagedSettings().ifPresent(request::setEnableManagedSettings);
+        config.getEnforceManagedModelDefaults().ifPresent(request::setEnforceManagedModelDefaults);
         request.setManagedSettings(config.getManagedSettings());
 
         return request;
@@ -335,6 +343,9 @@ static ResumeSessionRequest buildResumeRequest(String sessionId, ResumeSessionCo
         config.getEnableHostGitOperations().ifPresent(request::setEnableHostGitOperations);
         config.getEnableSessionStore().ifPresent(request::setEnableSessionStore);
         config.getEnableSkills().ifPresent(request::setEnableSkills);
+        if (config.getSkillProvider() != null) {
+            request.setHasSkillProvider(true);
+        }
         if (config.getEmbeddingCacheStorage() != null) {
             request.setEmbeddingCacheStorage(config.getEmbeddingCacheStorage());
         }
@@ -355,10 +366,13 @@ static ResumeSessionRequest buildResumeRequest(String sessionId, ResumeSessionCo
         request.setDefaultAgent(config.getDefaultAgent());
         request.setAgent(config.getAgent());
         request.setSkillDirectories(config.getSkillDirectories());
+        request.setAgentDirectories(config.getAgentDirectories());
+        request.setHookDirectories(config.getHookDirectories());
         request.setInstructionDirectories(config.getInstructionDirectories());
         request.setPluginDirectories(config.getPluginDirectories());
         request.setLargeOutput(config.getLargeOutput());
         request.setToolSearch(config.getToolSearch());
+        request.setImageGeneration(config.getImageGeneration());
         request.setMemory(config.getMemory());
         request.setDisabledSkills(config.getDisabledSkills());
         request.setDisabledMcpServers(config.getDisabledMcpServers());
@@ -389,6 +403,7 @@ static ResumeSessionRequest buildResumeRequest(String sessionId, ResumeSessionCo
         request.setFeatureFlags(config.getFeatureFlags());
         request.setExpAssignments(config.getExpAssignments());
         config.getEnableManagedSettings().ifPresent(request::setEnableManagedSettings);
+        config.getEnforceManagedModelDefaults().ifPresent(request::setEnforceManagedModelDefaults);
         request.setManagedSettings(config.getManagedSettings());
 
         return request;
@@ -435,6 +450,9 @@ static void configureSession(CopilotSession session, SessionConfig config) {
         if (config.getOnUserInputRequest() != null) {
             session.registerUserInputHandler(config.getOnUserInputRequest());
         }
+        if (config.getSkillProvider() != null) {
+            session.registerSkillProvider(config.getSkillProvider());
+        }
         if (config.getHooks() != null) {
             session.registerHooks(config.getHooks());
         }
@@ -487,6 +505,9 @@ static void configureSession(CopilotSession session, ResumeSessionConfig config)
         if (config.getOnUserInputRequest() != null) {
             session.registerUserInputHandler(config.getOnUserInputRequest());
         }
+        if (config.getSkillProvider() != null) {
+            session.registerSkillProvider(config.getSkillProvider());
+        }
         if (config.getHooks() != null) {
             session.registerHooks(config.getHooks());
         }
diff --git a/java/sdk/src/main/java/com/github/copilot/SkillProvider.java b/java/sdk/src/main/java/com/github/copilot/SkillProvider.java
new file mode 100644
index 0000000000..d2907113f2
--- /dev/null
+++ b/java/sdk/src/main/java/com/github/copilot/SkillProvider.java
@@ -0,0 +1,47 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+package com.github.copilot;
+
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
+/**
+ * Provides session-scoped skills to the Copilot runtime.
+ * <p>
+ * A skill provider is registered through {@code SessionConfig} or
+ * {@code ResumeSessionConfig}. The runtime may invoke provider callbacks
+ * concurrently, so implementations should be thread-safe and avoid relying on
+ * callback ordering.
+ * <p>
+ * When the runtime cancels a call, for example after its time limit or when the
+ * session disconnects, the SDK cancels the returned future with
+ * {@link CompletableFuture#cancel(boolean) cancel(true)} and the runtime
+ * ignores any later result. Cancellation does not interrupt running work;
+ * observe it with {@link CompletableFuture#isCancelled()} or a completion
+ * callback to stop early.
+ *
+ * @apiNote This API is experimental and may change in a future version.
+ * @since 1.0.0
+ */
+@CopilotExperimental
+public interface SkillProvider {
+
+    /**
+     * Lists the skills currently available for the session.
+     *
+     * @return a future resolving to the provider's skill descriptors
+     */
+    CompletableFuture<List<SkillProviderDescriptor>> listSkills();
+
+    /**
+     * Reads the Markdown content for one skill.
+     *
+     * @param name
+     *            the skill invocation name
+     * @return a future resolving to the skill Markdown, or {@code null} when the
+     *         skill is not found
+     */
+    CompletableFuture<String> readSkill(String name);
+}
diff --git a/java/sdk/src/main/java/com/github/copilot/SkillProviderDescriptor.java b/java/sdk/src/main/java/com/github/copilot/SkillProviderDescriptor.java
new file mode 100644
index 0000000000..04ac45845d
--- /dev/null
+++ b/java/sdk/src/main/java/com/github/copilot/SkillProviderDescriptor.java
@@ -0,0 +1,37 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+package com.github.copilot;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Catalog metadata for one skill supplied by a {@link SkillProvider}.
+ * <p>
+ * The runtime lists these descriptors without fetching skill content, then
+ * calls {@link SkillProvider#readSkill(String)} when the skill is used.
+ *
+ * @param name
+ *            the invocation and display name
+ * @param description
+ *            the description shown in skill catalogs
+ * @param userInvocable
+ *            whether users may invoke the skill directly, or {@code null} for
+ *            the default ({@code true})
+ * @param disableModelInvocation
+ *            whether model invocation is disabled, or {@code null} for the
+ *            default ({@code false})
+ * @param argumentHint
+ *            an optional freeform argument hint for slash-command catalogs
+ * @apiNote This API is experimental and may change in a future version.
+ * @since 1.0.0
+ */
+@CopilotExperimental
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public record SkillProviderDescriptor(@JsonProperty("name") String name,
+        @JsonProperty("description") String description, @JsonProperty("userInvocable") Boolean userInvocable,
+        @JsonProperty("disableModelInvocation") Boolean disableModelInvocation,
+        @JsonProperty("argumentHint") String argumentHint) {
+}
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
index e28a573bc8..825a44497a 100644
--- a/java/sdk/src/main/java/com/github/copilot/ffi/FfiRuntimeHost.java
+++ b/java/sdk/src/main/java/com/github/copilot/ffi/FfiRuntimeHost.java
@@ -98,6 +98,23 @@ private static Path resolveLibraryPath() throws IOException {
      *            {@code env_json}
      */
     public void start(String entrypointPath, CopilotClientOptions options) {
+        start(entrypointPath, null, options);
+    }
+
+    /**
+     * Starts the in-process runtime and opens a connection.
+     *
+     * @param entrypointPath
+     *            optional explicit legacy CLI entrypoint passed in
+     *            {@code argv_json}
+     * @param cliLoginSyncIntegrationId
+     *            optional integration identifier used to synchronize login state
+     *            with the Copilot CLI credential store
+     * @param options
+     *            client options used to construct {@code argv_json} and
+     *            {@code env_json}
+     */
+    public void start(String entrypointPath, String cliLoginSyncIntegrationId, CopilotClientOptions options) {
         Objects.requireNonNull(options, "options must not be null");
         if (disposed.get()) {
             throw new IllegalStateException("FfiRuntimeHost is already closed.");
@@ -106,7 +123,7 @@ public void start(String entrypointPath, CopilotClientOptions options) {
             throw new IllegalStateException("FfiRuntimeHost has already been started.");
         }
 
-        byte[] argvJson = buildArgvJson(entrypointPath, options);
+        byte[] argvJson = buildArgvJson(entrypointPath, cliLoginSyncIntegrationId, options);
         byte[] envJson = buildEnvJson(options);
         int hostHandle = runHostStartOnBlockingThread(argvJson, envJson);
         if (hostHandle == 0) {
@@ -275,7 +292,7 @@ private int runHostStartOnBlockingThread(byte[] argvJson, byte[] envJson) {
         }
     }
 
-    private static byte[] buildArgvJson(String entrypointPath, CopilotClientOptions options) {
+    static byte[] buildArgvJson(String entrypointPath, String cliLoginSyncIntegrationId, CopilotClientOptions options) {
         List<String> argv = new ArrayList<>();
         if (entrypointPath != null) {
             if (entrypointPath.toLowerCase().endsWith(".js")) {
@@ -312,6 +329,9 @@ private static byte[] buildArgvJson(String entrypointPath, CopilotClientOptions
         if (options.isRemote()) {
             argv.add("--remote");
         }
+        if (cliLoginSyncIntegrationId != null) {
+            argv.add("--cli-login-sync-integration-id=" + cliLoginSyncIntegrationId);
+        }
 
         String[] cliArgs = options.getCliArgs();
         if (cliArgs != null && cliArgs.length > 0) {
diff --git a/java/sdk/src/main/java/com/github/copilot/rpc/AgentInfo.java b/java/sdk/src/main/java/com/github/copilot/rpc/AgentInfo.java
index 1f6f1688fe..96820af0ef 100644
--- a/java/sdk/src/main/java/com/github/copilot/rpc/AgentInfo.java
+++ b/java/sdk/src/main/java/com/github/copilot/rpc/AgentInfo.java
@@ -4,6 +4,10 @@
 
 package com.github.copilot.rpc;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -27,6 +31,30 @@ public class AgentInfo {
     @JsonProperty("model")
     private String model;
 
+    @JsonProperty("hooks")
+    private Map<String, List<Map<String, Object>>> hooks;
+
+    /**
+     * Gets declarative hook actions executed only while this agent is active.
+     *
+     * @return actions keyed by event name, or {@code null} if unset
+     */
+    public Map<String, List<Map<String, Object>>> getHooks() {
+        return hooks == null ? null : Collections.unmodifiableMap(hooks);
+    }
+
+    /**
+     * Sets declarative hook actions scoped to this agent.
+     *
+     * @param hooks
+     *            actions keyed by event name
+     * @return this instance for chaining
+     */
+    public AgentInfo setHooks(Map<String, List<Map<String, Object>>> hooks) {
+        this.hooks = hooks;
+        return this;
+    }
+
     /**
      * Gets the unique identifier of the agent.
      *
diff --git a/java/sdk/src/main/java/com/github/copilot/rpc/AutoTier.java b/java/sdk/src/main/java/com/github/copilot/rpc/AutoTier.java
index 092dc73026..cfeda84458 100644
--- a/java/sdk/src/main/java/com/github/copilot/rpc/AutoTier.java
+++ b/java/sdk/src/main/java/com/github/copilot/rpc/AutoTier.java
@@ -12,26 +12,26 @@
  *
  * @see CapiSessionOptions#setAutoTier(AutoTier)
  */
-public enum AutoTier {
+public final class AutoTier {
 
     /** Prioritize efficiency. */
-    EFFICIENCY("efficiency"),
+    public static final AutoTier EFFICIENCY = new AutoTier("efficiency");
 
     /** Balance efficiency and intelligence. */
-    BALANCE("balance"),
+    public static final AutoTier BALANCE = new AutoTier("balance");
 
     /** Prioritize intelligence. */
-    INTELLIGENCE("intelligence"),
+    public static final AutoTier INTELLIGENCE = new AutoTier("intelligence");
 
     /**
      * Integrator-only preset that optimizes for latency. Not a first-party GitHub
      * Copilot product preference.
      */
-    FAST("fast");
+    public static final AutoTier FAST = new AutoTier("fast");
 
     private final String value;
 
-    AutoTier(String value) {
+    private AutoTier(String value) {
         this.value = value;
     }
 
@@ -52,7 +52,7 @@ public String getValue() {
      *            the JSON string value
      * @return the matching tier, or {@code null} if value is {@code null}
      * @throws IllegalArgumentException
-     *             if the value does not match a known routing tier
+     *             if the value is not a routing identifier
      */
     @JsonCreator
     public static AutoTier fromValue(String value) {
@@ -64,6 +64,26 @@ public static AutoTier fromValue(String value) {
                 return tier;
             }
         }
-        throw new IllegalArgumentException("Unknown AutoTier value: " + value);
+        return new AutoTier(com.github.copilot.generated.rpc.AutoTier.fromValue(value).getValue());
+    }
+
+    /** Returns the known convenience values. @return known routing tiers */
+    public static AutoTier[] values() {
+        return new AutoTier[]{EFFICIENCY, BALANCE, INTELLIGENCE, FAST};
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        return other instanceof AutoTier tier && value.equals(tier.value);
+    }
+
+    @Override
+    public int hashCode() {
+        return value.hashCode();
+    }
+
+    @Override
+    public String toString() {
+        return value;
     }
 }
diff --git a/java/sdk/src/main/java/com/github/copilot/rpc/CreateSessionRequest.java b/java/sdk/src/main/java/com/github/copilot/rpc/CreateSessionRequest.java
index d8ab62af95..69b2bcaf3d 100644
--- a/java/sdk/src/main/java/com/github/copilot/rpc/CreateSessionRequest.java
+++ b/java/sdk/src/main/java/com/github/copilot/rpc/CreateSessionRequest.java
@@ -34,6 +34,9 @@ public final class CreateSessionRequest {
     @JsonProperty("sessionId")
     private String sessionId;
 
+    @JsonProperty("name")
+    private String name;
+
     @JsonProperty("clientName")
     private String clientName;
 
@@ -147,6 +150,12 @@ public final class CreateSessionRequest {
     @JsonProperty("skillDirectories")
     private List<String> skillDirectories;
 
+    @JsonProperty("agentDirectories")
+    private List<String> agentDirectories;
+
+    @JsonProperty("hookDirectories")
+    private List<String> hookDirectories;
+
     @JsonProperty("instructionDirectories")
     private List<String> instructionDirectories;
 
@@ -159,6 +168,9 @@ public final class CreateSessionRequest {
     @JsonProperty("toolSearch")
     private ToolSearchConfig toolSearch;
 
+    @JsonProperty("imageGeneration")
+    private ImageGenerationConfig imageGeneration;
+
     @JsonProperty("memory")
     private MemoryConfiguration memory;
 
@@ -205,6 +217,10 @@ public final class CreateSessionRequest {
     @JsonInclude(JsonInclude.Include.NON_NULL)
     private Boolean enableSkills;
 
+    @JsonProperty("hasSkillProvider")
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private Boolean hasSkillProvider;
+
     @JsonProperty("embeddingCacheStorage")
     @JsonInclude(JsonInclude.Include.NON_NULL)
     private String embeddingCacheStorage;
@@ -256,6 +272,10 @@ public final class CreateSessionRequest {
     @JsonInclude(JsonInclude.Include.NON_NULL)
     private Boolean enableManagedSettings;
 
+    @JsonProperty("enforceManagedModelDefaults")
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private Boolean enforceManagedModelDefaults;
+
     @JsonProperty("managedSettings")
     @JsonInclude(JsonInclude.Include.NON_NULL)
     private ManagedSettings managedSettings;
@@ -280,6 +300,16 @@ public void setSessionId(String sessionId) {
         this.sessionId = sessionId;
     }
 
+    /** Gets the create-time session name. @return the session name */
+    public String getName() {
+        return name;
+    }
+
+    /** Sets the create-time session name. @param name the session name */
+    public void setName(String name) {
+        this.name = name;
+    }
+
     /** Gets the client name. @return the client name */
     public String getClientName() {
         return clientName;
@@ -712,6 +742,31 @@ public void setSkillDirectories(List<String> skillDirectories) {
         this.skillDirectories = skillDirectories;
     }
 
+    /** Gets explicit agent discovery roots. @return the directories */
+    public List<String> getAgentDirectories() {
+        return agentDirectories == null ? null : Collections.unmodifiableList(agentDirectories);
+    }
+
+    /**
+     * Sets explicit agent discovery roots. @param agentDirectories the directories
+     */
+    public void setAgentDirectories(List<String> agentDirectories) {
+        this.agentDirectories = agentDirectories;
+    }
+
+    /** Gets explicit file-hook discovery roots. @return the directories */
+    public List<String> getHookDirectories() {
+        return hookDirectories == null ? null : Collections.unmodifiableList(hookDirectories);
+    }
+
+    /**
+     * Sets explicit file-hook discovery roots. @param hookDirectories the
+     * directories
+     */
+    public void setHookDirectories(List<String> hookDirectories) {
+        this.hookDirectories = hookDirectories;
+    }
+
     /** Gets instruction directories. @return the instruction directories */
     public List<String> getInstructionDirectories() {
         return instructionDirectories == null ? null : Collections.unmodifiableList(instructionDirectories);
@@ -749,6 +804,19 @@ public ToolSearchConfig getToolSearch() {
         return toolSearch;
     }
 
+    /** Gets image generation config. @return the image generation config */
+    public ImageGenerationConfig getImageGeneration() {
+        return imageGeneration;
+    }
+
+    /**
+     * Sets image generation config. @param imageGeneration the image generation
+     * config
+     */
+    public void setImageGeneration(ImageGenerationConfig imageGeneration) {
+        this.imageGeneration = imageGeneration;
+    }
+
     /** Sets tool-search config. @param toolSearch the tool-search config */
     public void setToolSearch(ToolSearchConfig toolSearch) {
         this.toolSearch = toolSearch;
@@ -956,6 +1024,23 @@ public void clearEnableSkills() {
         this.enableSkills = null;
     }
 
+    /** Gets skill-provider availability flag. @return the flag */
+    public Boolean getHasSkillProvider() {
+        return hasSkillProvider;
+    }
+
+    /** Sets skill-provider availability flag. @param hasSkillProvider the flag */
+    public void setHasSkillProvider(boolean hasSkillProvider) {
+        this.hasSkillProvider = hasSkillProvider;
+    }
+
+    /**
+     * Clears the hasSkillProvider setting, reverting to the default behavior.
+     */
+    public void clearHasSkillProvider() {
+        this.hasSkillProvider = null;
+    }
+
     /** Gets embedding cache storage mode. @return the mode */
     public String getEmbeddingCacheStorage() {
         return embeddingCacheStorage;
@@ -1220,6 +1305,21 @@ public void clearEnableManagedSettings() {
         this.enableManagedSettings = null;
     }
 
+    /** Gets managed model lock enforcement. @return the flag, or {@code null} */
+    public Boolean getEnforceManagedModelDefaults() {
+        return enforceManagedModelDefaults;
+    }
+
+    /** Sets managed model lock enforcement. @param enforce whether to enforce */
+    public void setEnforceManagedModelDefaults(boolean enforce) {
+        this.enforceManagedModelDefaults = enforce;
+    }
+
+    /** Clears managed model lock enforcement. */
+    public void clearEnforceManagedModelDefaults() {
+        this.enforceManagedModelDefaults = null;
+    }
+
     /** @return host-injected managed settings, or {@code null} when unset */
     public ManagedSettings getManagedSettings() {
         return managedSettings;
diff --git a/java/sdk/src/main/java/com/github/copilot/rpc/CustomAgentConfig.java b/java/sdk/src/main/java/com/github/copilot/rpc/CustomAgentConfig.java
index 62de19b6a0..9f9c428ab4 100644
--- a/java/sdk/src/main/java/com/github/copilot/rpc/CustomAgentConfig.java
+++ b/java/sdk/src/main/java/com/github/copilot/rpc/CustomAgentConfig.java
@@ -36,6 +36,30 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class CustomAgentConfig {
 
+    @JsonProperty("hooks")
+    private Map<String, List<Map<String, Object>>> hooks;
+
+    /**
+     * Gets declarative hooks scoped to this agent.
+     *
+     * @return actions keyed by event name, or null when unset
+     */
+    public Map<String, List<Map<String, Object>>> getHooks() {
+        return hooks == null ? null : Collections.unmodifiableMap(hooks);
+    }
+
+    /**
+     * Sets declarative hooks scoped to this agent.
+     *
+     * @param hooks
+     *            actions keyed by event name
+     * @return this config for method chaining
+     */
+    public CustomAgentConfig setHooks(Map<String, List<Map<String, Object>>> hooks) {
+        this.hooks = hooks;
+        return this;
+    }
+
     @JsonProperty("name")
     private String name;
 
diff --git a/java/sdk/src/main/java/com/github/copilot/rpc/ImageGenerationConfig.java b/java/sdk/src/main/java/com/github/copilot/rpc/ImageGenerationConfig.java
new file mode 100644
index 0000000000..79b336b4da
--- /dev/null
+++ b/java/sdk/src/main/java/com/github/copilot/rpc/ImageGenerationConfig.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+package com.github.copilot.rpc;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.copilot.CopilotExperimental;
+
+/**
+ * <strong>Experimental.</strong> This API may change or be removed in a future
+ * release. Opt in to image generation through an authorized Copilot image
+ * model. Omission disables on create/cold resume and preserves resident resume
+ * state. Not persisted: re-supply after runtime restart. Policy, permissions,
+ * offline mode, and tool filters still apply. BYOK image generation is not
+ * supported.
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@CopilotExperimental
+public class ImageGenerationConfig {
+    @JsonProperty("enabled")
+    private Boolean enabled;
+
+    /**
+     * Gets the image generation opt-in.
+     *
+     * @return true to opt in, false to disable, or null when unset
+     */
+    public Boolean getEnabled() {
+        return enabled;
+    }
+
+    /**
+     * Enables or disables image generation.
+     *
+     * @param enabled
+     *            the opt-in, or null when unset
+     * @return this config for method chaining
+     */
+    public ImageGenerationConfig setEnabled(Boolean enabled) {
+        this.enabled = enabled;
+        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
index 6755d959b3..f79277c1a1 100644
--- a/java/sdk/src/main/java/com/github/copilot/rpc/ManagedSettingsPermissions.java
+++ b/java/sdk/src/main/java/com/github/copilot/rpc/ManagedSettingsPermissions.java
@@ -16,6 +16,9 @@ public final class ManagedSettingsPermissions {
     @JsonProperty("disableBypassPermissionsMode")
     private String disableBypassPermissionsMode;
 
+    @JsonProperty("disableAssistedPermissionsMode")
+    private Boolean disableAssistedPermissionsMode;
+
     @JsonProperty("deny")
     private List<String> deny;
 
@@ -25,6 +28,9 @@ public final class ManagedSettingsPermissions {
     @JsonProperty("allow")
     private List<String> allow;
 
+    @JsonProperty("limitTo")
+    private List<String> limitTo;
+
     /** @return the bypass-permissions policy, or {@code null} when unset */
     public String getDisableBypassPermissionsMode() {
         return disableBypassPermissionsMode;
@@ -44,6 +50,25 @@ public ManagedSettingsPermissions setDisableBypassPermissionsMode(String value)
         return this;
     }
 
+    /**
+     * @return whether Assisted Permissions are disabled, or {@code null} when unset
+     */
+    public Boolean getDisableAssistedPermissionsMode() {
+        return disableAssistedPermissionsMode;
+    }
+
+    /**
+     * Prevents Assisted Permissions from being activated when true.
+     *
+     * @param value
+     *            whether Assisted Permissions are disabled
+     * @return this policy
+     */
+    public ManagedSettingsPermissions setDisableAssistedPermissionsMode(Boolean value) {
+        this.disableAssistedPermissionsMode = value;
+        return this;
+    }
+
     /** @return rules that deny matching operations, or {@code null} when unset */
     public List<String> getDeny() {
         return deny;
@@ -88,4 +113,25 @@ public ManagedSettingsPermissions setAllow(List<String> rules) {
         this.allow = rules == null ? null : new ArrayList<>(rules);
         return this;
     }
+
+    /**
+     * @return the closed-world host boundary, or {@code null} when unset
+     */
+    public List<String> getLimitTo() {
+        return limitTo;
+    }
+
+    /**
+     * Every network request must match this list, and multiple managed layers
+     * intersect their lists. A present empty list denies all hosts.
+     *
+     * @param rules
+     *            host-only {@code Domain(hostname)}, {@code Domain(IP)}, or
+     *            {@code Domain(*.example.com)} boundary rules
+     * @return this policy
+     */
+    public ManagedSettingsPermissions setLimitTo(List<String> rules) {
+        this.limitTo = rules == null ? null : new ArrayList<>(rules);
+        return this;
+    }
 }
diff --git a/java/sdk/src/main/java/com/github/copilot/rpc/ResumeSessionConfig.java b/java/sdk/src/main/java/com/github/copilot/rpc/ResumeSessionConfig.java
index 4bc7de4803..adb7d7a9cd 100644
--- a/java/sdk/src/main/java/com/github/copilot/rpc/ResumeSessionConfig.java
+++ b/java/sdk/src/main/java/com/github/copilot/rpc/ResumeSessionConfig.java
@@ -15,6 +15,7 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
 import com.github.copilot.CopilotExperimental;
+import com.github.copilot.SkillProvider;
 import com.github.copilot.generated.SessionEvent;
 import com.github.copilot.generated.rpc.DiagnosticsConfiguration;
 import com.github.copilot.generated.rpc.SessionLimitsConfig;
@@ -83,6 +84,7 @@ public class ResumeSessionConfig {
     private Boolean enableHostGitOperations;
     private Boolean enableSessionStore;
     private Boolean enableSkills;
+    private SkillProvider skillProvider;
     private String embeddingCacheStorage;
     private boolean disableResume;
     private boolean streaming;
@@ -95,11 +97,14 @@ public class ResumeSessionConfig {
     private DefaultAgentConfig defaultAgent;
     private String agent;
     private List<String> skillDirectories;
+    private List<String> agentDirectories;
+    private List<String> hookDirectories;
     private List<String> includedBuiltinSkills;
     private List<String> instructionDirectories;
     private List<String> pluginDirectories;
     private LargeToolOutputConfig largeOutput;
     private ToolSearchConfig toolSearch;
+    private ImageGenerationConfig imageGeneration;
     private MemoryConfiguration memory;
     private List<String> disabledSkills;
     private List<String> disabledMcpServers;
@@ -117,6 +122,7 @@ public class ResumeSessionConfig {
     private String remoteSession;
     private CopilotExpAssignmentResponse expAssignments;
     private Boolean enableManagedSettings;
+    private Boolean enforceManagedModelDefaults;
     private Map<String, Boolean> featureFlags;
     private ManagedSettings managedSettings;
 
@@ -1173,7 +1179,9 @@ public ResumeSessionConfig clearEnableOnDemandInstructionDiscovery() {
     }
 
     /**
-     * Gets whether file-based hooks are enabled.
+     * Gets whether repository-origin file hooks from {@code .github/hooks/} and
+     * trusted repository-configured roots are enabled. Does not control explicit
+     * {@link #getHookDirectories()} or callback hooks.
      *
      * @return an {@link java.util.Optional} containing {@code true} to enable file
      *         hooks or {@code false} to disable them, or
@@ -1311,6 +1319,35 @@ public ResumeSessionConfig clearEnableSkills() {
         return this;
     }
 
+    /**
+     * Gets the session-scoped skill provider for the resumed session.
+     *
+     * @return the skill provider, or {@code null} when not configured
+     * @apiNote This API is experimental and may change in a future version.
+     */
+    @CopilotExperimental
+    @JsonIgnore
+    public SkillProvider getSkillProvider() {
+        return skillProvider;
+    }
+
+    /**
+     * Sets the session-scoped skill provider for the resumed session.
+     * <p>
+     * Skill provider registrations are not persisted; re-supply the provider when
+     * resuming.
+     *
+     * @param skillProvider
+     *            the skill provider to expose to the runtime
+     * @return this config for method chaining
+     * @apiNote This API is experimental and may change in a future version.
+     */
+    @CopilotExperimental
+    public ResumeSessionConfig setSkillProvider(SkillProvider skillProvider) {
+        this.skillProvider = skillProvider;
+        return this;
+    }
+
     /**
      * Gets the embedding cache storage mode.
      *
@@ -1627,7 +1664,11 @@ public ResumeSessionConfig setAgent(String agent) {
     }
 
     /**
-     * Gets the skill directories.
+     * Gets explicit discovery-only skill roots, not general filesystem grants.
+     * Available without configuration discovery, subject to skill/managed disables.
+     * Relative paths resolve once when supplied against the request's effective
+     * working directory; retained roots do not move when it changes. Null and
+     * omission are equivalent; an empty list clears only the SDK contribution.
      *
      * @return the list of skill directory paths
      */
@@ -1647,6 +1688,59 @@ public ResumeSessionConfig setSkillDirectories(List<String> skillDirectories) {
         return this;
     }
 
+    /**
+     * Gets explicit discovery-only agent roots, separate from custom agent objects.
+     * No general filesystem grant. Available without configuration discovery,
+     * subject to source/managed disables. Relative paths resolve once when supplied
+     * against the request's effective working directory; retained roots do not
+     * move. Null and omission are equivalent; an empty list clears only the SDK
+     * contribution.
+     *
+     * @return the agent directory paths
+     */
+    public List<String> getAgentDirectories() {
+        return agentDirectories == null ? null : Collections.unmodifiableList(agentDirectories);
+    }
+
+    /**
+     * Sets explicit discovery-only agent roots. See {@link #getAgentDirectories()}.
+     *
+     * @param agentDirectories
+     *            the agent directory paths
+     * @return this config for method chaining
+     */
+    public ResumeSessionConfig setAgentDirectories(List<String> agentDirectories) {
+        this.agentDirectories = agentDirectories == null ? null : new ArrayList<>(agentDirectories);
+        return this;
+    }
+
+    /**
+     * Gets explicit discovery-only file-hook roots, separate from callback hooks.
+     * No general filesystem grant. Available without configuration discovery or
+     * file-hook enablement (repository-origin hooks only), subject to hook/managed
+     * disables. Relative paths resolve once when supplied against the request's
+     * effective working directory; retained roots do not move. Null and omission
+     * are equivalent; an empty list clears only the SDK contribution.
+     *
+     * @return the file-hook directory paths
+     */
+    public List<String> getHookDirectories() {
+        return hookDirectories == null ? null : Collections.unmodifiableList(hookDirectories);
+    }
+
+    /**
+     * Sets explicit discovery-only file-hook roots. See
+     * {@link #getHookDirectories()}.
+     *
+     * @param hookDirectories
+     *            the file-hook directory paths
+     * @return this config for method chaining
+     */
+    public ResumeSessionConfig setHookDirectories(List<String> hookDirectories) {
+        this.hookDirectories = hookDirectories == null ? null : new ArrayList<>(hookDirectories);
+        return this;
+    }
+
     /**
      * Gets the runtime-bundled skill allowlist.
      *
@@ -1670,7 +1764,12 @@ public ResumeSessionConfig setIncludedBuiltinSkills(List<String> includedBuiltin
     }
 
     /**
-     * Gets the additional directories to search for custom instruction files.
+     * Gets explicit discovery-only instruction roots using existing SDK formats. No
+     * general filesystem grant. Available without configuration discovery, subject
+     * to instruction/managed disables. Relative paths resolve once when supplied
+     * against the request's effective working directory; retained roots do not
+     * move. Null and omission are equivalent; an empty list clears only the SDK
+     * contribution.
      *
      * @return the list of instruction directory paths
      */
@@ -1741,6 +1840,29 @@ public ToolSearchConfig getToolSearch() {
         return toolSearch;
     }
 
+    /**
+     * Gets the non-persisted image generation opt-in.
+     *
+     * @return the image generation config, or null when unset
+     */
+    @CopilotExperimental
+    public ImageGenerationConfig getImageGeneration() {
+        return imageGeneration;
+    }
+
+    /**
+     * Sets the image generation opt-in. Re-supply after runtime restart.
+     *
+     * @param imageGeneration
+     *            the image generation config
+     * @return this config for method chaining
+     */
+    @CopilotExperimental
+    public ResumeSessionConfig setImageGeneration(ImageGenerationConfig imageGeneration) {
+        this.imageGeneration = imageGeneration;
+        return this;
+    }
+
     /**
      * Sets the tool-search configuration.
      *
@@ -2171,6 +2293,28 @@ public ResumeSessionConfig setEnableManagedSettings(boolean enableManagedSetting
         return this;
     }
 
+    /**
+     * Gets whether locked managed model controls are enforced on resume.
+     *
+     * @return the explicit choice, or empty to use the runtime default
+     */
+    @JsonIgnore
+    public Optional<Boolean> getEnforceManagedModelDefaults() {
+        return Optional.ofNullable(enforceManagedModelDefaults);
+    }
+
+    /**
+     * Sets whether locked managed model controls are enforced after resume.
+     *
+     * @param enforceManagedModelDefaults
+     *            whether to enforce locked managed model controls
+     * @return this config for method chaining
+     */
+    public ResumeSessionConfig setEnforceManagedModelDefaults(boolean enforceManagedModelDefaults) {
+        this.enforceManagedModelDefaults = enforceManagedModelDefaults;
+        return this;
+    }
+
     /** @return host-injected managed settings, or {@code null} when unset */
     public ManagedSettings getManagedSettings() {
         return managedSettings;
@@ -2244,6 +2388,7 @@ public ResumeSessionConfig clone() {
         copy.enableHostGitOperations = this.enableHostGitOperations;
         copy.enableSessionStore = this.enableSessionStore;
         copy.enableSkills = this.enableSkills;
+        copy.skillProvider = this.skillProvider;
         copy.embeddingCacheStorage = this.embeddingCacheStorage;
         copy.disableResume = this.disableResume;
         copy.streaming = this.streaming;
@@ -2256,6 +2401,8 @@ public ResumeSessionConfig clone() {
         copy.defaultAgent = this.defaultAgent;
         copy.agent = this.agent;
         copy.skillDirectories = this.skillDirectories != null ? new ArrayList<>(this.skillDirectories) : null;
+        copy.agentDirectories = this.agentDirectories != null ? new ArrayList<>(this.agentDirectories) : null;
+        copy.hookDirectories = this.hookDirectories != null ? new ArrayList<>(this.hookDirectories) : null;
         copy.includedBuiltinSkills = this.includedBuiltinSkills != null
                 ? new ArrayList<>(this.includedBuiltinSkills)
                 : null;
@@ -2265,6 +2412,7 @@ public ResumeSessionConfig clone() {
         copy.pluginDirectories = this.pluginDirectories != null ? new ArrayList<>(this.pluginDirectories) : null;
         copy.largeOutput = this.largeOutput;
         copy.toolSearch = this.toolSearch;
+        copy.imageGeneration = this.imageGeneration;
         copy.memory = this.memory;
         copy.disabledSkills = this.disabledSkills != null ? new ArrayList<>(this.disabledSkills) : null;
         copy.disabledMcpServers = this.disabledMcpServers != null ? new ArrayList<>(this.disabledMcpServers) : null;
@@ -2283,6 +2431,7 @@ public ResumeSessionConfig clone() {
         copy.featureFlags = this.featureFlags != null ? new java.util.HashMap<>(this.featureFlags) : null;
         copy.expAssignments = this.expAssignments;
         copy.enableManagedSettings = this.enableManagedSettings;
+        copy.enforceManagedModelDefaults = this.enforceManagedModelDefaults;
         copy.managedSettings = this.managedSettings;
         return copy;
     }
diff --git a/java/sdk/src/main/java/com/github/copilot/rpc/ResumeSessionRequest.java b/java/sdk/src/main/java/com/github/copilot/rpc/ResumeSessionRequest.java
index d25893ff19..9ca488e407 100644
--- a/java/sdk/src/main/java/com/github/copilot/rpc/ResumeSessionRequest.java
+++ b/java/sdk/src/main/java/com/github/copilot/rpc/ResumeSessionRequest.java
@@ -147,6 +147,10 @@ public final class ResumeSessionRequest {
     @JsonInclude(JsonInclude.Include.NON_NULL)
     private Boolean enableSkills;
 
+    @JsonProperty("hasSkillProvider")
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private Boolean hasSkillProvider;
+
     @JsonProperty("embeddingCacheStorage")
     @JsonInclude(JsonInclude.Include.NON_NULL)
     private String embeddingCacheStorage;
@@ -193,6 +197,12 @@ public final class ResumeSessionRequest {
     @JsonProperty("skillDirectories")
     private List<String> skillDirectories;
 
+    @JsonProperty("agentDirectories")
+    private List<String> agentDirectories;
+
+    @JsonProperty("hookDirectories")
+    private List<String> hookDirectories;
+
     @JsonProperty("instructionDirectories")
     private List<String> instructionDirectories;
 
@@ -205,6 +215,9 @@ public final class ResumeSessionRequest {
     @JsonProperty("toolSearch")
     private ToolSearchConfig toolSearch;
 
+    @JsonProperty("imageGeneration")
+    private ImageGenerationConfig imageGeneration;
+
     @JsonProperty("memory")
     private MemoryConfiguration memory;
 
@@ -261,6 +274,10 @@ public final class ResumeSessionRequest {
     @JsonInclude(JsonInclude.Include.NON_NULL)
     private Boolean enableManagedSettings;
 
+    @JsonProperty("enforceManagedModelDefaults")
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private Boolean enforceManagedModelDefaults;
+
     @JsonProperty("managedSettings")
     @JsonInclude(JsonInclude.Include.NON_NULL)
     private ManagedSettings managedSettings;
@@ -764,6 +781,23 @@ public void clearEnableSkills() {
         this.enableSkills = null;
     }
 
+    /** Gets skill-provider availability flag. @return the flag */
+    public Boolean getHasSkillProvider() {
+        return hasSkillProvider;
+    }
+
+    /** Sets skill-provider availability flag. @param hasSkillProvider the flag */
+    public void setHasSkillProvider(boolean hasSkillProvider) {
+        this.hasSkillProvider = hasSkillProvider;
+    }
+
+    /**
+     * Clears the hasSkillProvider setting, reverting to the default behavior.
+     */
+    public void clearHasSkillProvider() {
+        this.hasSkillProvider = null;
+    }
+
     /** Gets embedding cache storage mode. @return the mode */
     public String getEmbeddingCacheStorage() {
         return embeddingCacheStorage;
@@ -968,6 +1002,31 @@ public void setSkillDirectories(List<String> skillDirectories) {
         this.skillDirectories = skillDirectories;
     }
 
+    /** Gets explicit agent discovery roots. @return the directories */
+    public List<String> getAgentDirectories() {
+        return agentDirectories == null ? null : Collections.unmodifiableList(agentDirectories);
+    }
+
+    /**
+     * Sets explicit agent discovery roots. @param agentDirectories the directories
+     */
+    public void setAgentDirectories(List<String> agentDirectories) {
+        this.agentDirectories = agentDirectories;
+    }
+
+    /** Gets explicit file-hook discovery roots. @return the directories */
+    public List<String> getHookDirectories() {
+        return hookDirectories == null ? null : Collections.unmodifiableList(hookDirectories);
+    }
+
+    /**
+     * Sets explicit file-hook discovery roots. @param hookDirectories the
+     * directories
+     */
+    public void setHookDirectories(List<String> hookDirectories) {
+        this.hookDirectories = hookDirectories;
+    }
+
     /** Gets instruction directories. @return the instruction directories */
     public List<String> getInstructionDirectories() {
         return instructionDirectories == null ? null : Collections.unmodifiableList(instructionDirectories);
@@ -1005,6 +1064,19 @@ public ToolSearchConfig getToolSearch() {
         return toolSearch;
     }
 
+    /** Gets image generation config. @return the image generation config */
+    public ImageGenerationConfig getImageGeneration() {
+        return imageGeneration;
+    }
+
+    /**
+     * Sets image generation config. @param imageGeneration the image generation
+     * config
+     */
+    public void setImageGeneration(ImageGenerationConfig imageGeneration) {
+        this.imageGeneration = imageGeneration;
+    }
+
     /** Sets tool-search config. @param toolSearch the tool-search config */
     public void setToolSearch(ToolSearchConfig toolSearch) {
         this.toolSearch = toolSearch;
@@ -1250,6 +1322,21 @@ public void clearEnableManagedSettings() {
         this.enableManagedSettings = null;
     }
 
+    /** Gets managed model lock enforcement. @return the flag, or {@code null} */
+    public Boolean getEnforceManagedModelDefaults() {
+        return enforceManagedModelDefaults;
+    }
+
+    /** Sets managed model lock enforcement. @param enforce whether to enforce */
+    public void setEnforceManagedModelDefaults(boolean enforce) {
+        this.enforceManagedModelDefaults = enforce;
+    }
+
+    /** Clears managed model lock enforcement. */
+    public void clearEnforceManagedModelDefaults() {
+        this.enforceManagedModelDefaults = null;
+    }
+
     /** @return host-injected managed settings, or {@code null} when unset */
     public ManagedSettings getManagedSettings() {
         return managedSettings;
diff --git a/java/sdk/src/main/java/com/github/copilot/rpc/SessionConfig.java b/java/sdk/src/main/java/com/github/copilot/rpc/SessionConfig.java
index 836b972ae2..a6828def9d 100644
--- a/java/sdk/src/main/java/com/github/copilot/rpc/SessionConfig.java
+++ b/java/sdk/src/main/java/com/github/copilot/rpc/SessionConfig.java
@@ -15,6 +15,7 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
 import com.github.copilot.CopilotExperimental;
+import com.github.copilot.SkillProvider;
 import com.github.copilot.generated.SessionEvent;
 import com.github.copilot.generated.rpc.DiagnosticsConfiguration;
 import com.github.copilot.generated.rpc.SessionLimitsConfig;
@@ -42,6 +43,7 @@
 public class SessionConfig {
 
     private String sessionId;
+    private String name;
     private String clientName;
     private String model;
     private String reasoningEffort;
@@ -83,11 +85,14 @@ public class SessionConfig {
     private String agent;
     private InfiniteSessionConfig infiniteSessions;
     private List<String> skillDirectories;
+    private List<String> agentDirectories;
+    private List<String> hookDirectories;
     private List<String> includedBuiltinSkills;
     private List<String> instructionDirectories;
     private List<String> pluginDirectories;
     private LargeToolOutputConfig largeOutput;
     private ToolSearchConfig toolSearch;
+    private ImageGenerationConfig imageGeneration;
     private MemoryConfiguration memory;
     private List<String> disabledSkills;
     private List<String> disabledMcpServers;
@@ -101,6 +106,7 @@ public class SessionConfig {
     private Boolean enableHostGitOperations;
     private Boolean enableSessionStore;
     private Boolean enableSkills;
+    private SkillProvider skillProvider;
     private String embeddingCacheStorage;
     private ModelCapabilitiesOverride modelCapabilities;
     private Consumer<SessionEvent> onEvent;
@@ -117,6 +123,7 @@ public class SessionConfig {
     private CloudSessionOptions cloud;
     private CopilotExpAssignmentResponse expAssignments;
     private Boolean enableManagedSettings;
+    private Boolean enforceManagedModelDefaults;
     private Map<String, Boolean> featureFlags;
     private ManagedSettings managedSettings;
 
@@ -143,6 +150,31 @@ public SessionConfig setSessionId(String sessionId) {
         return this;
     }
 
+    /**
+     * Gets the create-time session name.
+     *
+     * @return the session name, or {@code null} if the session is unnamed
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Names the session at creation, as {@code session.name.set} would, and is
+     * validated the same way: non-empty, no leading or trailing whitespace, at most
+     * 100 UTF-16 units, no control characters, and no double quotes. A name also
+     * makes the session persist from the start, so it can be listed and resumed
+     * without ever running a turn. Local sessions only: cloud creation rejects it.
+     *
+     * @param name
+     *            the session name
+     * @return this config instance for method chaining
+     */
+    public SessionConfig setName(String name) {
+        this.name = name;
+        return this;
+    }
+
     /**
      * Gets the client name used to identify the application using the SDK.
      *
@@ -1232,7 +1264,11 @@ public SessionConfig setInfiniteSessions(InfiniteSessionConfig infiniteSessions)
     }
 
     /**
-     * Gets the skill directories.
+     * Gets explicit discovery-only skill roots, not general filesystem grants.
+     * Available without configuration discovery, subject to skill/managed disables.
+     * Relative paths resolve once when supplied against the request's effective
+     * working directory; retained roots do not move when it changes. Null and
+     * omission are equivalent; an empty list clears only the SDK contribution.
      *
      * @return the list of skill directory paths
      */
@@ -1256,6 +1292,59 @@ public SessionConfig setSkillDirectories(List<String> skillDirectories) {
         return this;
     }
 
+    /**
+     * Gets explicit discovery-only agent roots, separate from custom agent objects.
+     * No general filesystem grant. Available without configuration discovery,
+     * subject to source/managed disables. Relative paths resolve once when supplied
+     * against the request's effective working directory; retained roots do not
+     * move. Null and omission are equivalent; an empty list clears only the SDK
+     * contribution.
+     *
+     * @return the agent directory paths
+     */
+    public List<String> getAgentDirectories() {
+        return agentDirectories == null ? null : Collections.unmodifiableList(agentDirectories);
+    }
+
+    /**
+     * Sets explicit discovery-only agent roots. See {@link #getAgentDirectories()}.
+     *
+     * @param agentDirectories
+     *            the agent directory paths
+     * @return this config for method chaining
+     */
+    public SessionConfig setAgentDirectories(List<String> agentDirectories) {
+        this.agentDirectories = agentDirectories == null ? null : new ArrayList<>(agentDirectories);
+        return this;
+    }
+
+    /**
+     * Gets explicit discovery-only file-hook roots, separate from callback hooks.
+     * No general filesystem grant. Available without configuration discovery or
+     * file-hook enablement (repository-origin hooks only), subject to hook/managed
+     * disables. Relative paths resolve once when supplied against the request's
+     * effective working directory; retained roots do not move. Null and omission
+     * are equivalent; an empty list clears only the SDK contribution.
+     *
+     * @return the file-hook directory paths
+     */
+    public List<String> getHookDirectories() {
+        return hookDirectories == null ? null : Collections.unmodifiableList(hookDirectories);
+    }
+
+    /**
+     * Sets explicit discovery-only file-hook roots. See
+     * {@link #getHookDirectories()}.
+     *
+     * @param hookDirectories
+     *            the file-hook directory paths
+     * @return this config for method chaining
+     */
+    public SessionConfig setHookDirectories(List<String> hookDirectories) {
+        this.hookDirectories = hookDirectories == null ? null : new ArrayList<>(hookDirectories);
+        return this;
+    }
+
     /**
      * Gets the runtime-bundled skill allowlist.
      *
@@ -1279,7 +1368,12 @@ public SessionConfig setIncludedBuiltinSkills(List<String> includedBuiltinSkills
     }
 
     /**
-     * Gets the additional directories to search for custom instruction files.
+     * Gets explicit discovery-only instruction roots using existing SDK formats. No
+     * general filesystem grant. Available without configuration discovery, subject
+     * to instruction/managed disables. Relative paths resolve once when supplied
+     * against the request's effective working directory; retained roots do not
+     * move. Null and omission are equivalent; an empty list clears only the SDK
+     * contribution.
      *
      * @return the list of instruction directory paths
      */
@@ -1350,6 +1444,29 @@ public ToolSearchConfig getToolSearch() {
         return toolSearch;
     }
 
+    /**
+     * Gets the non-persisted image generation opt-in.
+     *
+     * @return the image generation config, or null when unset
+     */
+    @CopilotExperimental
+    public ImageGenerationConfig getImageGeneration() {
+        return imageGeneration;
+    }
+
+    /**
+     * Sets the image generation opt-in. Re-supply after runtime restart.
+     *
+     * @param imageGeneration
+     *            the image generation config
+     * @return this config for method chaining
+     */
+    @CopilotExperimental
+    public SessionConfig setImageGeneration(ImageGenerationConfig imageGeneration) {
+        this.imageGeneration = imageGeneration;
+        return this;
+    }
+
     /**
      * Sets the tool-search override configuration. When {@code null}, the runtime
      * default tool-search behavior applies.
@@ -1621,7 +1738,9 @@ public SessionConfig clearRefreshCustomInstructions() {
     }
 
     /**
-     * Gets whether file-based hooks are enabled.
+     * Gets whether repository-origin file hooks from {@code .github/hooks/} and
+     * trusted repository-configured roots are enabled. Does not control explicit
+     * {@link #getHookDirectories()} or callback hooks.
      *
      * @return an {@link java.util.Optional} containing {@code true} to enable file
      *         hooks or {@code false} to disable them, or
@@ -1759,6 +1878,35 @@ public SessionConfig clearEnableSkills() {
         return this;
     }
 
+    /**
+     * Gets the session-scoped skill provider.
+     *
+     * @return the skill provider, or {@code null} when not configured
+     * @apiNote This API is experimental and may change in a future version.
+     */
+    @CopilotExperimental
+    @JsonIgnore
+    public SkillProvider getSkillProvider() {
+        return skillProvider;
+    }
+
+    /**
+     * Sets the session-scoped skill provider.
+     * <p>
+     * Re-supply this provider when resuming a session. Skill providers are not
+     * supported for cloud sessions.
+     *
+     * @param skillProvider
+     *            the skill provider to expose to the runtime
+     * @return this config instance for method chaining
+     * @apiNote This API is experimental and may change in a future version.
+     */
+    @CopilotExperimental
+    public SessionConfig setSkillProvider(SkillProvider skillProvider) {
+        this.skillProvider = skillProvider;
+        return this;
+    }
+
     /**
      * Gets the embedding cache storage mode.
      *
@@ -2262,6 +2410,29 @@ public SessionConfig setEnableManagedSettings(boolean enableManagedSettings) {
         return this;
     }
 
+    /**
+     * Gets whether locked managed model controls are enforced.
+     *
+     * @return the explicit choice, or empty to use the runtime default
+     */
+    @JsonIgnore
+    public Optional<Boolean> getEnforceManagedModelDefaults() {
+        return Optional.ofNullable(enforceManagedModelDefaults);
+    }
+
+    /**
+     * Sets whether locked managed model controls are enforced for this session.
+     * Conflicting model changes are rejected; overridable defaults remain mutable.
+     *
+     * @param enforceManagedModelDefaults
+     *            whether to enforce locked managed model controls
+     * @return this config instance for method chaining
+     */
+    public SessionConfig setEnforceManagedModelDefaults(boolean enforceManagedModelDefaults) {
+        this.enforceManagedModelDefaults = enforceManagedModelDefaults;
+        return this;
+    }
+
     /**
      * Gets host-injected managed settings for this session.
      *
@@ -2344,6 +2515,8 @@ public SessionConfig clone() {
         copy.agent = this.agent;
         copy.infiniteSessions = this.infiniteSessions;
         copy.skillDirectories = this.skillDirectories != null ? new ArrayList<>(this.skillDirectories) : null;
+        copy.agentDirectories = this.agentDirectories != null ? new ArrayList<>(this.agentDirectories) : null;
+        copy.hookDirectories = this.hookDirectories != null ? new ArrayList<>(this.hookDirectories) : null;
         copy.includedBuiltinSkills = this.includedBuiltinSkills != null
                 ? new ArrayList<>(this.includedBuiltinSkills)
                 : null;
@@ -2353,6 +2526,7 @@ public SessionConfig clone() {
         copy.pluginDirectories = this.pluginDirectories != null ? new ArrayList<>(this.pluginDirectories) : null;
         copy.largeOutput = this.largeOutput;
         copy.toolSearch = this.toolSearch;
+        copy.imageGeneration = this.imageGeneration;
         copy.memory = this.memory;
         copy.disabledSkills = this.disabledSkills != null ? new ArrayList<>(this.disabledSkills) : null;
         copy.disabledMcpServers = this.disabledMcpServers != null ? new ArrayList<>(this.disabledMcpServers) : null;
@@ -2366,6 +2540,7 @@ public SessionConfig clone() {
         copy.enableHostGitOperations = this.enableHostGitOperations;
         copy.enableSessionStore = this.enableSessionStore;
         copy.enableSkills = this.enableSkills;
+        copy.skillProvider = this.skillProvider;
         copy.embeddingCacheStorage = this.embeddingCacheStorage;
         copy.modelCapabilities = this.modelCapabilities;
         copy.onEvent = this.onEvent;
@@ -2383,6 +2558,7 @@ public SessionConfig clone() {
         copy.featureFlags = this.featureFlags != null ? new java.util.HashMap<>(this.featureFlags) : null;
         copy.expAssignments = this.expAssignments;
         copy.enableManagedSettings = this.enableManagedSettings;
+        copy.enforceManagedModelDefaults = this.enforceManagedModelDefaults;
         copy.managedSettings = this.managedSettings;
         return copy;
     }
diff --git a/java/sdk/src/main/java/com/github/copilot/rpc/ToolInvocation.java b/java/sdk/src/main/java/com/github/copilot/rpc/ToolInvocation.java
index efe24fd6ae..a0a004176a 100644
--- a/java/sdk/src/main/java/com/github/copilot/rpc/ToolInvocation.java
+++ b/java/sdk/src/main/java/com/github/copilot/rpc/ToolInvocation.java
@@ -12,6 +12,7 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.copilot.CopilotExperimental;
 import com.github.copilot.generated.rpc.CurrentToolMetadata;
 
 /**
@@ -43,6 +44,8 @@ public final class ToolInvocation {
     private String toolName;
     private JsonNode argumentsNode;
     private List<CurrentToolMetadata> availableTools;
+    private String agentId;
+    private String requestId;
 
     /**
      * Gets the session ID where the tool was invoked.
@@ -208,4 +211,71 @@ public ToolInvocation setAvailableTools(List<CurrentToolMetadata> availableTools
         this.availableTools = availableTools;
         return this;
     }
+
+    /**
+     * Gets the sub-agent instance that issued this call.
+     * <p>
+     * <strong>Experimental.</strong> This is the {@code agentId} of the sub-agent's
+     * session events. It is {@code null} for a root-agent call, for every call when
+     * the runtime does not attribute sub-agent tool calls, and for a call that did
+     * not arrive as an external tool request.
+     *
+     * @return the sub-agent instance id, or {@code null} when no sub-agent is named
+     * @since 1.0.15-preview.1
+     */
+    @CopilotExperimental
+    public String getAgentId() {
+        return agentId;
+    }
+
+    /**
+     * Sets the sub-agent instance that issued this call.
+     * <p>
+     * <strong>Note:</strong> This method is intended for internal SDK use. Users
+     * typically do not need to call this method directly.
+     *
+     * @param agentId
+     *            the sub-agent instance id, or {@code null} when no sub-agent is
+     *            named
+     * @return this invocation for method chaining
+     */
+    @CopilotExperimental
+    public ToolInvocation setAgentId(String agentId) {
+        this.agentId = agentId;
+        return this;
+    }
+
+    /**
+     * Gets the runtime request id of this call.
+     * <p>
+     * <strong>Experimental.</strong> This is the key
+     * {@code session.tools.handlePendingToolCall} and
+     * {@code session.tools.listPendingRequests} use. A root-agent call stays
+     * answerable after the session is resumed with pending work continued; a
+     * sub-agent's call can be answered only while that sub-agent is still running.
+     *
+     * @return the request id, or {@code null} if the call did not arrive as an
+     *         external tool request
+     * @since 1.0.15-preview.1
+     */
+    @CopilotExperimental
+    public String getRequestId() {
+        return requestId;
+    }
+
+    /**
+     * Sets the runtime request id of this call.
+     * <p>
+     * <strong>Note:</strong> This method is intended for internal SDK use. Users
+     * typically do not need to call this method directly.
+     *
+     * @param requestId
+     *            the request id
+     * @return this invocation for method chaining
+     */
+    @CopilotExperimental
+    public ToolInvocation setRequestId(String requestId) {
+        this.requestId = requestId;
+        return this;
+    }
 }
diff --git a/java/sdk/src/test/java/com/github/copilot/AgentInfoTest.java b/java/sdk/src/test/java/com/github/copilot/AgentInfoTest.java
index 40654292f8..f2735cae7d 100644
--- a/java/sdk/src/test/java/com/github/copilot/AgentInfoTest.java
+++ b/java/sdk/src/test/java/com/github/copilot/AgentInfoTest.java
@@ -6,6 +6,9 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 
+import java.util.List;
+import java.util.Map;
+
 import org.junit.jupiter.api.Test;
 
 import com.github.copilot.rpc.AgentInfo;
@@ -22,6 +25,7 @@ void defaultValuesAreNull() {
         assertNull(agent.getDisplayName());
         assertNull(agent.getDescription());
         assertNull(agent.getModel());
+        assertNull(agent.getHooks());
     }
 
     @Test
@@ -52,6 +56,21 @@ void modelGetterSetter() {
         assertEquals("alpha/sonnet", agent.getModel());
     }
 
+    @Test
+    void hooksGetterSetterAndJsonRoundTrip() throws Exception {
+        Map<String, List<Map<String, Object>>> hooks = Map.of("preToolUse",
+                List.of(Map.of("type", "command", "bash", "echo scoped-hook", "timeoutSec", 10)));
+        var agent = new AgentInfo().setName("coder").setHooks(hooks);
+        assertEquals(hooks, agent.getHooks());
+
+        var mapper = JsonRpcClient.getObjectMapper();
+        var json = mapper.valueToTree(agent);
+        assertEquals(mapper.valueToTree(hooks), json.get("hooks"));
+        var restored = mapper.treeToValue(json, AgentInfo.class);
+        assertEquals(hooks, restored.getHooks());
+        assertNull(mapper.readValue("{\"name\":\"plain-agent\"}", AgentInfo.class).getHooks());
+    }
+
     @Test
     void fluentChainingReturnsThis() {
         var agent = new AgentInfo().setName("coder").setDisplayName("Code Assistant")
@@ -70,5 +89,6 @@ void fluentChainingReturnsSameInstance() {
         assertSame(agent, agent.setDisplayName("Test"));
         assertSame(agent, agent.setDescription("A test agent"));
         assertSame(agent, agent.setModel("alpha/sonnet"));
+        assertSame(agent, agent.setHooks(Map.of()));
     }
 }
diff --git a/java/sdk/src/test/java/com/github/copilot/AhpHostTest.java b/java/sdk/src/test/java/com/github/copilot/AhpHostTest.java
index 2ffaf50442..136248cb0a 100644
--- a/java/sdk/src/test/java/com/github/copilot/AhpHostTest.java
+++ b/java/sdk/src/test/java/com/github/copilot/AhpHostTest.java
@@ -72,7 +72,7 @@ void forwardsEnvironmentFieldsForRuntimeValidation() throws Exception {
     @CsvSource({"true,false", "false,true", "true,true"})
     void forwardsExplicitTransportsAndOptionalReadiness(boolean local, boolean github) throws Exception {
         try (var server = new FakeRuntime(); var client = server.client()) {
-            var options = new AhpHostOptions();
+            var options = new AhpHostOptions().setComputeId("compute");
             if (local) {
                 options.setLocalServer(new HostLocalServerOptions("127.0.0.1", 0L, "test-token", true));
             }
@@ -81,6 +81,7 @@ void forwardsExplicitTransportsAndOptionalReadiness(boolean local, boolean githu
             }
             try (var host = await(client.startAhpHost(options))) {
                 var request = await(server.startRequest);
+                assertEquals("compute", request.path("computeId").asText());
                 assertEquals(local, request.hasNonNull("localServer"));
                 assertEquals(github, request.hasNonNull("githubEnvironment"));
                 for (String oldField : List.of("hostname", "port", "token", "requireConnectionToken")) {
@@ -106,29 +107,54 @@ void forwardsExplicitTransportsAndOptionalReadiness(boolean local, boolean githu
     void snapshotsOptionsBeforeConnecting() throws Exception {
         try (var server = new FakeRuntime(); var client = server.client()) {
             server.finishConnect = new CompletableFuture<>();
-            var options = localOptions().setGithubEnvironment(new HostGitHubEnvironmentOptions("original", "compute"));
+            var options = localOptions().setComputeId("compute")
+                    .setGithubEnvironment(new HostGitHubEnvironmentOptions("original", "compute"));
             var pending = client.startAhpHost(options);
             await(server.connectEntered);
             try {
-                options.setLocalServer(null).setGithubEnvironment(new HostGitHubEnvironmentOptions("", ""));
+                options.setComputeId("changed").setLocalServer(null)
+                        .setGithubEnvironment(new HostGitHubEnvironmentOptions("", ""));
             } finally {
                 server.finishConnect.complete(null);
             }
             try (var host = await(pending)) {
                 var request = await(server.startRequest);
                 assertTrue(request.hasNonNull("localServer"));
+                assertEquals("compute", request.path("computeId").asText());
                 assertEquals("original", request.path("githubEnvironment").path("name").asText());
                 assertEquals("compute", request.path("githubEnvironment").path("computeId").asText());
             }
         }
     }
 
+    @Test
+    void legacyEnvironmentOptionsOmitConnectionBinding() throws Exception {
+        try (var server = new FakeRuntime();
+                var client = server.client();
+                var host = await(client.startAhpHost(new AhpHostOptions()
+                        .setGithubEnvironment(new HostGitHubEnvironmentOptions("test host", "compute"))))) {
+            assertFalse(await(server.startRequest).path("githubEnvironment").has("requireConnectionBinding"));
+        }
+    }
+
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    void forwardsExplicitConnectionBinding(boolean required) throws Exception {
+        try (var server = new FakeRuntime();
+                var client = server.client();
+                var host = await(client.startAhpHost(new AhpHostOptions()
+                        .setGithubEnvironment(new HostGitHubEnvironmentOptions("test host", "compute", required))))) {
+            assertEquals(required,
+                    await(server.startRequest).path("githubEnvironment").path("requireConnectionBinding").asBoolean());
+        }
+    }
+
     @Test
     void publicHostApiExposesOnlyOwnerOperations() {
         var methods = Arrays.stream(ServerHostApi.class.getMethods())
                 .filter(method -> method.getDeclaringClass() == ServerHostApi.class).map(method -> method.getName())
                 .collect(Collectors.toSet());
-        assertEquals(Set.of("start", "dispose", "publishSession"), methods);
+        assertEquals(Set.of("start", "dispose", "publishSession", "listSessions"), methods);
     }
 
     @Test
@@ -330,6 +356,8 @@ void publishesDisposesRepeatedlyAndRetainsOriginalTransport() throws Exception {
             })));
             assertNull(host.getPid());
             assertEquals("ahp-session:/resident", await(host.publishSession("resident")).sessionUri());
+            assertTrue(await(host.listSessions()).sessions().isEmpty());
+            assertEquals(host.getHostId(), await(server.listSessionsRequest).path("hostId").asText());
             await(CompletableFuture.allOf(host.dispose(), host.dispose()));
             await(exited);
             assertEquals(2, server.disposals.get());
@@ -347,6 +375,7 @@ private static final class FakeRuntime implements AutoCloseable {
         final AtomicInteger disposals = new AtomicInteger();
         final CompletableFuture<String> startEntered = new CompletableFuture<>();
         final CompletableFuture<JsonNode> startRequest = new CompletableFuture<>();
+        final CompletableFuture<JsonNode> listSessionsRequest = new CompletableFuture<>();
         final CompletableFuture<String> disposedHost = new CompletableFuture<>();
         final CompletableFuture<Void> connectEntered = new CompletableFuture<>();
         volatile CompletableFuture<Void> finishConnect = CompletableFuture.completedFuture(null);
@@ -390,6 +419,10 @@ private static final class FakeRuntime implements AutoCloseable {
                                 (id, params) -> respond(transport, id,
                                         Map.of("sessionId", params.get("sessionId").asText(), "sessionUri",
                                                 "ahp-session:/" + params.get("sessionId").asText())));
+                        transport.registerMethodHandler("host.listSessions", (id, params) -> {
+                            listSessionsRequest.complete(params);
+                            respond(transport, id, Map.of("sessions", List.of()));
+                        });
                         transport.registerMethodHandler("host.dispose", (id, params) -> {
                             disposals.incrementAndGet();
                             try {
diff --git a/java/sdk/src/test/java/com/github/copilot/AutoTierIT.java b/java/sdk/src/test/java/com/github/copilot/AutoTierIT.java
index d93cbf995b..1ce94b4b19 100644
--- a/java/sdk/src/test/java/com/github/copilot/AutoTierIT.java
+++ b/java/sdk/src/test/java/com/github/copilot/AutoTierIT.java
@@ -5,6 +5,8 @@
 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.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -20,6 +22,7 @@
 import com.github.copilot.generated.rpc.SessionEventLogReadParams;
 import com.github.copilot.rpc.AutoTier;
 import com.github.copilot.rpc.CapiSessionOptions;
+import com.github.copilot.rpc.CopilotClientOptions;
 import com.github.copilot.rpc.MessageOptions;
 import com.github.copilot.rpc.PermissionHandler;
 import com.github.copilot.rpc.ResumeSessionConfig;
@@ -200,12 +203,19 @@ void shouldRestoreAndOverrideFastAutoTierOnColdResume() throws Exception {
     void shouldCommitFastAutoTierAfterSuccessfulTurn() throws Exception {
         ctx.configureForTest("auto_tier", "should_commit_fast_auto_tier_after_successful_turn");
 
-        try (CopilotClient client = ctx.createClient();
+        // Keep this invocation's detach trace outside the home removed by context
+        // teardown.
+        Path logDirectory = Files.createTempDirectory(Files.createDirectories(Path.of("target", "failsafe-reports")),
+                "auto-tier-detach-").toAbsolutePath();
+        try (CopilotClient client = ctx.createClient(new CopilotClientOptions().setLogLevel("debug")
+                .setCliArgs(new String[]{"--log-dir", logDirectory.toString()}));
                 CopilotSession session = client
                         .createSession(new SessionConfig().setModel(MODEL_ID)
                                 .setOnPermissionRequest(PermissionHandler.APPROVE_ALL).setCapi(new CapiSessionOptions()
                                         .setAutoTier(AutoTier.EFFICIENCY).setEnableWebSocketResponses(false)))
                         .get(30, TimeUnit.SECONDS)) {
+            System.err.println(
+                    "AutoTierIT detach diagnostics: session=" + session.getSessionId() + " logs=" + logDirectory);
             var modelChangedFuture = new CompletableFuture<SessionModelChangeEvent>();
             try (var subscription = session.on(SessionModelChangeEvent.class, event -> {
                 if (event.getData().autoTier() == com.github.copilot.generated.AutoTier.FAST) {
diff --git a/java/sdk/src/test/java/com/github/copilot/BuiltinPluginDirectoriesTest.java b/java/sdk/src/test/java/com/github/copilot/BuiltinPluginDirectoriesTest.java
index b5f89e5f9f..7a42c2c45e 100644
--- a/java/sdk/src/test/java/com/github/copilot/BuiltinPluginDirectoriesTest.java
+++ b/java/sdk/src/test/java/com/github/copilot/BuiltinPluginDirectoriesTest.java
@@ -90,15 +90,16 @@ JsonNode awaitBuiltinParams() throws Exception {
         private void acceptLoop() {
             try {
                 Socket socket = serverSocket.accept();
-                JsonRpcClient server = JsonRpcClient.fromSocket(socket);
-                server.registerMethodHandler("ping", (id, params) -> respond(server, id,
-                        Map.of("message", "pong", "timestamp", "2026-09-21T00:00:00Z", "protocolVersion", 3)));
-                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());
+                JsonRpcClient server = JsonRpcClient.fromSocket(socket, rpc -> {
+                    rpc.registerMethodHandler("ping", (id, params) -> respond(rpc, id,
+                            Map.of("message", "pong", "timestamp", "2026-09-21T00:00:00Z", "protocolVersion", 3)));
+                    rpc.registerMethodHandler("connect", (id, params) -> respond(rpc, id,
+                            Map.of("ok", true, "protocolVersion", 3, "version", "test")));
+                    rpc.registerMethodHandler("plugins.builtin.set", (id, params) -> {
+                        builtinSetCount.incrementAndGet();
+                        builtinParams.complete(params);
+                        respond(rpc, id, Map.of());
+                    });
                 });
                 ready.complete(server);
             } catch (IOException e) {
diff --git a/java/sdk/src/test/java/com/github/copilot/CapiSessionOptionsTest.java b/java/sdk/src/test/java/com/github/copilot/CapiSessionOptionsTest.java
index aeb4ffe0ad..cc4e2fde3f 100644
--- a/java/sdk/src/test/java/com/github/copilot/CapiSessionOptionsTest.java
+++ b/java/sdk/src/test/java/com/github/copilot/CapiSessionOptionsTest.java
@@ -14,7 +14,9 @@
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.CsvSource;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import java.util.stream.Stream;
 
 import com.fasterxml.jackson.databind.JsonNode;
 
@@ -68,7 +70,7 @@ void omitsUnsetEnableWebSocketResponses() {
     }
 
     @ParameterizedTest
-    @CsvSource({"EFFICIENCY,efficiency", "BALANCE,balance", "INTELLIGENCE,intelligence", "FAST,fast"})
+    @MethodSource("canonicalAutoTiers")
     void autoTierCanonicalValuesRoundTripAndForward(AutoTier tier, String value) throws Exception {
         var mapper = JsonRpcClient.getObjectMapper();
         var capi = new CapiSessionOptions().setAutoTier(tier);
@@ -90,13 +92,25 @@ void autoTierCanonicalValuesRoundTripAndForward(AutoTier tier, String value) thr
     }
 
     @Test
-    void autoTierRejectsNoncanonicalValues() {
+    void autoTierPreservesServerIdentifiersAndRejectsMalformedValues() throws Exception {
+        var mapper = JsonRpcClient.getObjectMapper();
         for (String value : new String[]{"balanced", "Balance", "unknown"}) {
+            var tier = AutoTier.fromValue(value);
+            assertEquals(value, tier.getValue());
+            assertEquals(value, mapper.valueToTree(tier).asText());
+            assertEquals(tier, mapper.readValue("\"" + value + "\"", AutoTier.class));
+        }
+        for (String value : new String[]{"", "two words", "\n"}) {
             assertThrows(IllegalArgumentException.class, () -> AutoTier.fromValue(value));
         }
         assertNull(AutoTier.fromValue(null));
     }
 
+    private static Stream<Arguments> canonicalAutoTiers() {
+        return Stream.of(Arguments.of(AutoTier.EFFICIENCY, "efficiency"), Arguments.of(AutoTier.BALANCE, "balance"),
+                Arguments.of(AutoTier.INTELLIGENCE, "intelligence"), Arguments.of(AutoTier.FAST, "fast"));
+    }
+
     @Test
     void clearingAutoTierOmitsIt() {
         var capi = new CapiSessionOptions().setAutoTier(AutoTier.BALANCE).setAutoTier(null);
diff --git a/java/sdk/src/test/java/com/github/copilot/CliServerManagerTest.java b/java/sdk/src/test/java/com/github/copilot/CliServerManagerTest.java
index 462fbc17cd..9dea8d8c2a 100644
--- a/java/sdk/src/test/java/com/github/copilot/CliServerManagerTest.java
+++ b/java/sdk/src/test/java/com/github/copilot/CliServerManagerTest.java
@@ -7,13 +7,22 @@
 import static org.junit.jupiter.api.Assertions.*;
 
 import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
 import java.net.ServerSocket;
 import java.net.URI;
+import java.nio.file.Files;
+import java.nio.file.InvalidPathException;
 import java.nio.file.Path;
+import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CompletionException;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledOnOs;
+import org.junit.jupiter.api.condition.OS;
 import org.junit.jupiter.api.io.TempDir;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 
 import com.github.copilot.ffi.NativeRuntimeLoader;
 import com.github.copilot.rpc.CopilotClientMode;
@@ -190,9 +199,167 @@ void processInfoWithNullPort() {
         assertNull(info.port());
     }
 
-    // ===== resolveCliCommand tests (via startCliServer) =====
-    // resolveCliCommand is private, so we test indirectly through startCliServer
-    // with specific cliPath values.
+    // ===== resolveCliCommand tests =====
+
+    @ParameterizedTest
+    @ValueSource(strings = {"NoDefaultCurrentDirectoryInExePath", "nodefaultcurrentdirectoryinexepath"})
+    @EnabledOnOs(OS.WINDOWS)
+    void bareWindowsCliPathHonorsCurrentDirectorySearchOptOut(String optOutKey) throws Exception {
+        Path bin = Files.createDirectory(tempDir.resolve("bin"));
+        Files.createFile(tempDir.resolve("copilot.EXE"));
+        Path executable = Files.createFile(bin.resolve("copilot.EXE"));
+        var options = new CopilotClientOptions().setCliPath("copilot").setCwd(tempDir.toString()).setUseStdio(true)
+                .setEnvironment(Map.of("Path", bin.toString(), "PATHEXT", ".EXE", optOutKey, ""));
+
+        assertClientAttemptsExecutable(options, executable);
+    }
+
+    @Test
+    @EnabledOnOs(OS.WINDOWS)
+    void bareWindowsCliPathSearchesCurrentDirectoryWithoutOptOut() throws Exception {
+        Path bin = Files.createDirectory(tempDir.resolve("bin"));
+        Path executable = Files.createFile(tempDir.resolve("copilot.EXE"));
+        Files.createFile(bin.resolve("copilot.EXE"));
+        var options = new CopilotClientOptions().setCliPath("copilot").setCwd(tempDir.toString()).setUseStdio(true)
+                .setEnvironment(Map.of("PATH", bin.toString(), "PATHEXT", ".EXE"));
+
+        assertClientAttemptsExecutable(options, executable);
+    }
+
+    @ParameterizedTest
+    @ValueSource(booleans = {false, true})
+    @EnabledOnOs(OS.WINDOWS)
+    void explicitWindowsCurrentDirectorySearchIsPreservedWithOptOut(boolean relativeCliPath) throws Exception {
+        Path executable = Files.createFile(tempDir.resolve(".").resolve("copilot.EXE"));
+        var options = new CopilotClientOptions().setCliPath(relativeCliPath ? ".\\copilot.EXE" : "copilot")
+                .setCwd(tempDir.toString()).setUseStdio(true).setEnvironment(Map.of("PATH", relativeCliPath ? "" : ".",
+                        "PATHEXT", ".EXE", "NoDefaultCurrentDirectoryInExePath", ""));
+
+        assertClientAttemptsExecutable(options, executable);
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = {"", "C:\\invalid|entry"})
+    @EnabledOnOs(OS.WINDOWS)
+    void invalidWindowsCommandIsNotPassedToShellWhenCurrentDirectorySearchIsDisabled(String path) {
+        var options = new CopilotClientOptions().setCliPath("copilot|invalid").setCwd(tempDir.toString())
+                .setUseStdio(true)
+                .setEnvironment(Map.of("PATH", path, "PATHEXT", ".EXE", "NoDefaultCurrentDirectoryInExePath", ""));
+
+        try (var client = new CopilotClient(options)) {
+            Throwable error = assertThrows(CompletionException.class, () -> client.start().join());
+            while (error.getCause() != null) {
+                error = error.getCause();
+            }
+            var invalidPath = assertInstanceOf(InvalidPathException.class, error);
+            assertEquals("copilot|invalid.EXE", invalidPath.getInput());
+        }
+    }
+
+    private static void assertClientAttemptsExecutable(CopilotClientOptions options, Path executable) {
+        // Empty executables expose the attempted OS launch path without running a
+        // child.
+        try (var client = new CopilotClient(options)) {
+            Throwable error = assertThrows(CompletionException.class, () -> client.start().join());
+            while (!(error instanceof IOException) && error.getCause() != null) {
+                error = error.getCause();
+            }
+            var launchError = assertInstanceOf(IOException.class, error);
+            assertTrue(launchError.getMessage().contains("\"" + executable + "\""), launchError::getMessage);
+        }
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = {"tools/copilot.exe", "tools\\copilot", ".\\tools\\copilot.EXE"})
+    @EnabledOnOs(OS.WINDOWS)
+    void relativeWindowsCliPathDoesNotSearchPathDirectories(String cliPath) throws Exception {
+        Path bin = Files.createDirectory(tempDir.resolve("bin"));
+        Path tools = Files.createDirectory(bin.resolve("tools"));
+        Path unrelated = Files.createFile(tools.resolve("copilot.EXE"));
+        var options = new CopilotClientOptions().setCliPath(cliPath).setCwd(tempDir.toString()).setUseStdio(false)
+                .setEnvironment(Map.of("PATH", bin.toString(), "PATHEXT", ".EXE"));
+
+        try (var client = new CopilotClient(options)) {
+            Throwable error = assertThrows(CompletionException.class, () -> client.start().join());
+            while (error.getCause() != null) {
+                error = error.getCause();
+            }
+            var launchError = assertInstanceOf(IOException.class, error);
+            assertTrue(launchError.getMessage().startsWith("CLI process exited unexpectedly."),
+                    launchError::getMessage);
+            assertFalse(launchError.getMessage().contains(unrelated.toString()), launchError::getMessage);
+        }
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = {" C:\\invalid", "C:\\invalid ", "C:\\invalid<entry", "C:\\invalid>entry",
+            "C:\\invalid|entry", "C:\\invalid?entry", "C:\\invalid*entry", "C:\\invalid\"entry"})
+    @EnabledOnOs(OS.WINDOWS)
+    void windowsNativeExecutableSkipsMalformedPathEntries(String malformedEntry) throws Exception {
+        Path bin = Files.createDirectory(tempDir.resolve("bin with spaces"));
+        Path executable = Files.createFile(bin.resolve("copilot.EXE"));
+        var options = new CopilotClientOptions().setCliPath("copilot").setCwd(tempDir.toString())
+                .setEnvironment(Map.of("Path", malformedEntry + ";\"" + bin + "\"", "PATHEXT", ".CMD;.EXE"));
+
+        assertEquals(List.of(executable.toString(), "--server"), resolveCliCommand(new CliServerManager(options)));
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = {".CMD", ".BAT"})
+    @EnabledOnOs(OS.WINDOWS)
+    void windowsCommandWrapperAfterMalformedPathEntryUsesShell(String extension) throws Exception {
+        Path bin = Files.createDirectory(tempDir.resolve("bin"));
+        Files.createFile(bin.resolve("copilot" + extension));
+        Files.createFile(bin.resolve("copilot.EXE"));
+        var options = new CopilotClientOptions().setCwd(tempDir.toString())
+                .setEnvironment(Map.of(NativeRuntimeLoader.COPILOT_CLI_PATH_ENV, "copilot", "PATH",
+                        "C:\\invalid|entry;" + bin, "PATHEXT", extension + ";.EXE"));
+
+        assertEquals(List.of("cmd", "/c", "copilot", "--server"), resolveCliCommand(new CliServerManager(options)));
+    }
+
+    @Test
+    @EnabledOnOs(OS.WINDOWS)
+    void windowsCommandFallsBackToShellWhenPathEntriesAreMalformed() throws Exception {
+        var options = new CopilotClientOptions().setCliPath("copilot").setCwd(tempDir.toString())
+                .setEnvironment(Map.of("PATH", " C:\\invalid;C:\\invalid|entry"));
+
+        assertEquals(List.of("cmd", "/c", "copilot", "--server"), resolveCliCommand(new CliServerManager(options)));
+    }
+
+    @ParameterizedTest
+    @ValueSource(booleans = {false, true})
+    @EnabledOnOs(OS.WINDOWS)
+    void explicitWindowsExecutablePathDoesNotDependOnPath(boolean absolute) throws Exception {
+        Path bin = Files.createDirectory(tempDir.resolve("bin"));
+        Path executable = Files.createFile(bin.resolve("copilot.exe"));
+        String cliPath = (absolute ? executable : tempDir.relativize(executable)).toString();
+        var options = new CopilotClientOptions().setCliPath(cliPath).setCwd(tempDir.toString())
+                .setEnvironment(Map.of("PATH", "C:\\invalid|entry"));
+
+        assertEquals(List.of(executable.toString(), "--server"), resolveCliCommand(new CliServerManager(options)));
+    }
+
+    @Test
+    @EnabledOnOs(OS.WINDOWS)
+    void malformedWindowsCliPathIsNotSkipped() {
+        var options = new CopilotClientOptions().setCliPath("copilot|invalid").setCwd(tempDir.toString())
+                .setEnvironment(Map.of("PATH", "C:\\invalid|entry", "PATHEXT", ".EXE"));
+
+        var error = assertThrows(InvocationTargetException.class,
+                () -> resolveCliCommand(new CliServerManager(options)));
+        var cause = assertInstanceOf(InvalidPathException.class, error.getCause());
+        assertEquals("copilot|invalid.EXE", cause.getInput());
+    }
+
+    @SuppressWarnings("unchecked")
+    private static List<String> resolveCliCommand(CliServerManager manager) throws Exception {
+        var resolve = CliServerManager.class.getDeclaredMethod("resolveCliCommand", String.class, List.class);
+        resolve.setAccessible(true);
+        return (List<String>) resolve.invoke(manager, manager.resolveCliLaunch().executable(), List.of("--server"));
+    }
+
+    // ===== startCliServer tests =====
 
     // On Windows, "/nonexistent/copilot" is not an absolute path (no drive letter),
     // so resolveCliCommand wraps it with "cmd /c" and ProcessBuilder.start()
diff --git a/java/sdk/src/test/java/com/github/copilot/ClientOptionsE2ETest.java b/java/sdk/src/test/java/com/github/copilot/ClientOptionsE2ETest.java
index 04afa58596..169c39fdcb 100644
--- a/java/sdk/src/test/java/com/github/copilot/ClientOptionsE2ETest.java
+++ b/java/sdk/src/test/java/com/github/copilot/ClientOptionsE2ETest.java
@@ -80,8 +80,8 @@ void testShouldForwardAdvancedSessionCreationOptionsToTheCli() throws Exception
 
             try (var client = fake.createClient()) {
                 var session = client.createSession(new SessionConfig().setSessionId("java-create-session")
-                        .setClientName("java-e2e-client").setModel("gpt-5-mini").setReasoningEffort("low")
-                        .setReasoningSummary("none").setContextTier("long_context")
+                        .setName("java named at create").setClientName("java-e2e-client").setModel("gpt-5-mini")
+                        .setReasoningEffort("low").setReasoningSummary("none").setContextTier("long_context")
                         .setAvailableTools(java.util.List.of("bash")).setExcludedTools(java.util.List.of("grep"))
                         .setExcludedBuiltInAgents(java.util.List.of("explore")).setEnableSessionTelemetry(true)
                         .setEnableCitations(true).setSessionLimits(new SessionLimitsConfig(42.0))
@@ -100,6 +100,7 @@ void testShouldForwardAdvancedSessionCreationOptionsToTheCli() throws Exception
 
             var create = fake.capturedRequest("session.create").path("params");
             assertEquals("java-create-session", create.path("sessionId").asText());
+            assertEquals("java named at create", create.path("name").asText());
             assertEquals("java-e2e-client", create.path("clientName").asText());
             assertEquals("gpt-5-mini", create.path("model").asText());
             assertEquals("low", create.path("reasoningEffort").asText());
diff --git a/java/sdk/src/test/java/com/github/copilot/ConfigCloneTest.java b/java/sdk/src/test/java/com/github/copilot/ConfigCloneTest.java
index 8f937fcb99..fba9a6413b 100644
--- a/java/sdk/src/test/java/com/github/copilot/ConfigCloneTest.java
+++ b/java/sdk/src/test/java/com/github/copilot/ConfigCloneTest.java
@@ -323,6 +323,17 @@ void sessionConfigGranularMultitenancyFieldsCopied() {
         assertFalse(cloned.getEnableSkills().orElse(true));
     }
 
+    @Test
+    @AllowCopilotExperimental
+    void sessionConfigSkillProviderCloned() {
+        SkillProvider provider = testSkillProvider();
+        SessionConfig original = new SessionConfig().setSkillProvider(provider);
+
+        SessionConfig cloned = original.clone();
+
+        assertSame(provider, cloned.getSkillProvider());
+    }
+
     @Test
     void resumeSessionConfigEnableSessionTelemetryCopied() {
         ResumeSessionConfig original = new ResumeSessionConfig();
@@ -362,6 +373,17 @@ void resumeSessionConfigGranularMultitenancyFieldsCopied() {
         assertTrue(cloned.getEnableSkills().orElse(false));
     }
 
+    @Test
+    @AllowCopilotExperimental
+    void resumeSessionConfigSkillProviderCloned() {
+        SkillProvider provider = testSkillProvider();
+        ResumeSessionConfig original = new ResumeSessionConfig().setSkillProvider(provider);
+
+        ResumeSessionConfig cloned = original.clone();
+
+        assertSame(provider, cloned.getSkillProvider());
+    }
+
     @Test
     void clonePreservesNullFields() {
         CopilotClientOptions opts = new CopilotClientOptions();
@@ -548,4 +570,19 @@ void resumeSessionConfigCloneCopiesModeSwitchHandlers() {
         assertSame(original.getOnExitPlanMode(), cloned.getOnExitPlanMode());
         assertSame(original.getOnAutoModeSwitch(), cloned.getOnAutoModeSwitch());
     }
+
+    @AllowCopilotExperimental
+    private static SkillProvider testSkillProvider() {
+        return new SkillProvider() {
+            @Override
+            public CompletableFuture<List<SkillProviderDescriptor>> listSkills() {
+                return CompletableFuture.completedFuture(List.of());
+            }
+
+            @Override
+            public CompletableFuture<String> readSkill(String name) {
+                return CompletableFuture.completedFuture(null);
+            }
+        };
+    }
 }
diff --git a/java/sdk/src/test/java/com/github/copilot/CopilotClientTest.java b/java/sdk/src/test/java/com/github/copilot/CopilotClientTest.java
index 9055cb19f7..7bc27fe321 100644
--- a/java/sdk/src/test/java/com/github/copilot/CopilotClientTest.java
+++ b/java/sdk/src/test/java/com/github/copilot/CopilotClientTest.java
@@ -9,11 +9,17 @@
 import org.junit.jupiter.api.io.TempDir;
 
 import com.github.copilot.generated.ExternalToolRequestedEvent;
+import com.github.copilot.rpc.CloudSessionOptions;
 import com.github.copilot.rpc.CopilotClientOptions;
+import com.github.copilot.rpc.CopilotClientMode;
+import com.github.copilot.rpc.CreateSessionRequest;
+import com.github.copilot.rpc.CreateSessionResponse;
 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.ResumeSessionConfig;
+import com.github.copilot.rpc.ResumeSessionResponse;
 import com.github.copilot.rpc.SessionConfig;
 import com.github.copilot.rpc.SessionLifecycleEvent;
 import com.github.copilot.rpc.SessionLifecycleEventTypes;
@@ -22,6 +28,7 @@
 import java.io.OutputStream;
 import java.lang.reflect.Field;
 import java.io.BufferedReader;
+import java.io.FilterOutputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
@@ -176,6 +183,137 @@ void testDeleteSessionReleasesGitHubTokenProvider() throws Exception {
         }
     }
 
+    @Test
+    @AllowCopilotExperimental
+    void cloudSessionWithSkillProviderIsRejectedBeforeConnectingOrCallingProvider() throws Exception {
+        var providerCalls = new AtomicInteger();
+        SkillProvider provider = new SkillProvider() {
+            @Override
+            public CompletableFuture<List<SkillProviderDescriptor>> listSkills() {
+                providerCalls.incrementAndGet();
+                return CompletableFuture.completedFuture(List.of());
+            }
+
+            @Override
+            public CompletableFuture<String> readSkill(String name) {
+                providerCalls.incrementAndGet();
+                return CompletableFuture.completedFuture(null);
+            }
+        };
+
+        try (var client = new CopilotClient(new CopilotClientOptions().setAutoStart(false))) {
+            var config = new SessionConfig().setOnPermissionRequest(PermissionHandler.APPROVE_ALL)
+                    .setCloud(new CloudSessionOptions()).setSkillProvider(provider);
+
+            ExecutionException error = assertThrows(ExecutionException.class, () -> client.createSession(config).get());
+            assertInstanceOf(IllegalArgumentException.class, error.getCause());
+            assertEquals("Skill providers are not supported for cloud sessions.", error.getCause().getMessage());
+            assertEquals(0, providerCalls.get());
+        }
+    }
+
+    @Test
+    @AllowCopilotExperimental
+    void emptyModeCreateWithSkillProviderSendsFlagsAndRegistersBeforeRpc() throws Exception {
+        var client = new CopilotClient(new CopilotClientOptions().setAutoStart(false).setMode(CopilotClientMode.EMPTY)
+                .setCopilotHome(System.getProperty("java.io.tmpdir")));
+        var rpc = mock(JsonRpcClient.class);
+        setConnectionFuture(client, rpc, null);
+        SkillProvider provider = testSkillProvider();
+        var createRequest = new AtomicReference<CreateSessionRequest>();
+
+        when(rpc.invoke(eq("session.create"), any(), eq(CreateSessionResponse.class))).thenAnswer(invocation -> {
+            CreateSessionRequest request = invocation.getArgument(1);
+            createRequest.set(request);
+            assertTrue(request.getHasSkillProvider());
+            assertFalse(request.getEnableSkills());
+            assertSame(provider, registeredSkillProvider(client, "skill-provider-session"));
+            return CompletableFuture
+                    .completedFuture(new CreateSessionResponse("skill-provider-session", null, null, null));
+        });
+        when(rpc.invoke(eq("session.options.update"), any(), eq(Void.class)))
+                .thenReturn(CompletableFuture.completedFuture(null));
+
+        try {
+            var config = new SessionConfig().setSessionId("skill-provider-session")
+                    .setOnPermissionRequest(PermissionHandler.APPROVE_ALL).setAvailableTools(List.of())
+                    .setSkillProvider(provider);
+
+            CopilotSession session = client.createSession(config).get();
+
+            assertSame(provider, session.getSkillProvider());
+            assertNotNull(createRequest.get());
+            assertTrue(createRequest.get().getHasSkillProvider());
+            assertFalse(createRequest.get().getEnableSkills());
+        } finally {
+            client.forceStop().get();
+        }
+    }
+
+    @Test
+    @AllowCopilotExperimental
+    void emptyModeResumeValidationFailureKeepsResidentSkillProvider() throws Exception {
+        var client = new CopilotClient(new CopilotClientOptions().setAutoStart(false).setMode(CopilotClientMode.EMPTY)
+                .setCopilotHome(System.getProperty("java.io.tmpdir")));
+        var rpc = mock(JsonRpcClient.class);
+        setConnectionFuture(client, rpc, null);
+        SkillProvider resident = testSkillProvider();
+        when(rpc.invoke(eq("session.create"), any(), eq(CreateSessionResponse.class))).thenReturn(
+                CompletableFuture.completedFuture(new CreateSessionResponse("resident-session", null, null, null)));
+        when(rpc.invoke(eq("session.options.update"), any(), eq(Void.class)))
+                .thenReturn(CompletableFuture.completedFuture(null));
+
+        try {
+            client.createSession(new SessionConfig().setSessionId("resident-session")
+                    .setOnPermissionRequest(PermissionHandler.APPROVE_ALL).setAvailableTools(List.of())
+                    .setSkillProvider(resident)).get();
+
+            var resumeConfig = new ResumeSessionConfig().setOnPermissionRequest(PermissionHandler.APPROVE_ALL)
+                    .setSkillProvider(testSkillProvider());
+            var error = assertThrows(ExecutionException.class,
+                    () -> client.resumeSession("resident-session", resumeConfig).get());
+
+            assertInstanceOf(IllegalArgumentException.class, error.getCause());
+            assertSame(resident, registeredSkillProvider(client, "resident-session"));
+            verify(rpc, never()).invoke(eq("session.resume"), any(), any());
+        } finally {
+            client.forceStop().get();
+        }
+    }
+
+    @Test
+    @AllowCopilotExperimental
+    void failedResumeDoesNotEvictAConcurrentResume() throws Exception {
+        var client = new CopilotClient(
+                new CopilotClientOptions().setAutoStart(false).setCopilotHome(System.getProperty("java.io.tmpdir")));
+        var rpc = mock(JsonRpcClient.class);
+        setConnectionFuture(client, rpc, null);
+        when(rpc.invoke(eq("session.create"), any(), eq(CreateSessionResponse.class))).thenReturn(
+                CompletableFuture.completedFuture(new CreateSessionResponse("shared-session", null, null, null)));
+        when(rpc.invoke(eq("session.options.update"), any(), eq(Void.class)))
+                .thenReturn(CompletableFuture.completedFuture(null));
+        var firstResume = new CompletableFuture<ResumeSessionResponse>();
+        when(rpc.invoke(eq("session.resume"), any(), eq(ResumeSessionResponse.class))).thenReturn(firstResume,
+                CompletableFuture.completedFuture(new ResumeSessionResponse("shared-session", null, null, null)));
+
+        try {
+            client.createSession(new SessionConfig().setSessionId("shared-session")
+                    .setOnPermissionRequest(PermissionHandler.APPROVE_ALL).setSkillProvider(testSkillProvider())).get();
+            var failing = client.resumeSession("shared-session", new ResumeSessionConfig()
+                    .setOnPermissionRequest(PermissionHandler.APPROVE_ALL).setSkillProvider(testSkillProvider()));
+            SkillProvider winner = testSkillProvider();
+            client.resumeSession("shared-session", new ResumeSessionConfig()
+                    .setOnPermissionRequest(PermissionHandler.APPROVE_ALL).setSkillProvider(winner)).get();
+
+            firstResume.completeExceptionally(new RuntimeException("resume failed"));
+
+            assertThrows(ExecutionException.class, failing::get);
+            assertSame(winner, registeredSkillProvider(client, "shared-session"));
+        } finally {
+            client.forceStop().get();
+        }
+    }
+
     @Test
     void testClientConstruction() {
         var client = new CopilotClient();
@@ -274,26 +412,64 @@ void testStartupWriteFailureDrainsStderrBeforeKillingChild(@TempDir Path tempDir
                         process.exit(1);
                     }
                 });
-                fs.closeSync(0);
                 process.stdout.write('started\\n');
                 """);
         var options = new CopilotClientOptions().setCliPath(script.toString()).setUseStdio(true);
         var manager = spy(new CliServerManager(options));
         var child = new AtomicReference<Process>();
+        var failedOutput = new AtomicReference<OutputStream>();
+        var writeFailure = new IOException("Controlled startup write failure");
+        doAnswer(invocation -> {
+            CliServerManager.ProcessInfo info = (CliServerManager.ProcessInfo) invocation.callRealMethod();
+            child.set(info.process());
+            // Closing fd 0 does not reliably fail the first parent write on Windows.
+            var output = new FilterOutputStream(info.process().getOutputStream()) {
+                @Override
+                public void write(int value) throws IOException {
+                    throw writeFailure;
+                }
+
+                @Override
+                public void write(byte[] bytes, int offset, int length) throws IOException {
+                    throw writeFailure;
+                }
+
+                @Override
+                public void close() throws IOException {
+                    // No write succeeds, so there is nothing to flush on this failed transport.
+                    out.close();
+                }
+            };
+            failedOutput.set(output);
+            var transportProcess = mock(Process.class, org.mockito.AdditionalAnswers.delegatesTo(info.process()));
+            doReturn(output).when(transportProcess).getOutputStream();
+            return new CliServerManager.ProcessInfo(transportProcess, info.port());
+        }).when(manager).startCliServer();
         doAnswer(invocation -> {
             Process process = invocation.getArgument(0);
-            child.set(process);
             var reader = new BufferedReader(new InputStreamReader(process.getInputStream(), StandardCharsets.UTF_8));
             assertEquals("started", reader.readLine());
             return invocation.callRealMethod();
         }).when(manager).connectToServer(any(Process.class), isNull(), isNull());
         doAnswer(invocation -> {
             // Release stderr only when startup drains it, while the child is still alive.
+            assertTrue(child.get().isAlive(), "Startup must drain stderr before killing the controlled child.");
             Files.createFile(tempDir.resolve("release-stderr"));
             return invocation.callRealMethod();
         }).when(manager).awaitStderrReader();
 
-        try (var client = new CopilotClient(options)) {
+        try (AutoCloseable childCleanup = () -> {
+            var process = child.get();
+            if (process != null && process.isAlive()) {
+                process.destroyForcibly();
+                assertTrue(process.waitFor(10, TimeUnit.SECONDS), "Could not reap the controlled child.");
+            }
+        }; var client = new CopilotClient(options); AutoCloseable outputCleanup = () -> {
+            var output = failedOutput.get();
+            if (output != null) {
+                output.close();
+            }
+        }) {
             Field managerField = CopilotClient.class.getDeclaredField("serverManager");
             managerField.setAccessible(true);
             managerField.set(client, manager);
@@ -307,14 +483,9 @@ void testStartupWriteFailureDrainsStderrBeforeKillingChild(@TempDir Path tempDir
             while (original.getCause() != null) {
                 original = original.getCause();
             }
-            assertInstanceOf(IOException.class, original);
+            assertSame(writeFailure, original, "Startup must preserve the actual failed transport write.");
             assertNotSame(cause, original, "The startup error must retain its original transport failure.");
             assertFalse(child.get().isAlive(), "Failed startup retained its child process.");
-        } finally {
-            if (child.get() != null && child.get().isAlive()) {
-                child.get().destroyForcibly();
-                assertTrue(child.get().waitFor(10, TimeUnit.SECONDS), "Could not reap the controlled child.");
-            }
         }
     }
 
@@ -579,6 +750,38 @@ void testOnLifecycleMultipleHandlers() throws Exception {
 
     // ===== getState() coverage =====
 
+    @Test
+    void testGetStateDoesNotReportConnectedWhenStartFailsDuringStateRead() throws Exception {
+        var failure = new IOException("Startup failed");
+        // Complete after the first status observation, whichever status getState reads
+        // first.
+        var future = new CompletableFuture<Object>() {
+            @Override
+            public boolean isDone() {
+                boolean done = super.isDone();
+                completeExceptionally(failure);
+                return done;
+            }
+
+            @Override
+            public boolean isCompletedExceptionally() {
+                boolean failed = super.isCompletedExceptionally();
+                completeExceptionally(failure);
+                return failed;
+            }
+        };
+
+        try (var client = new CopilotClient(new CopilotClientOptions().setAutoStart(false))) {
+            setConnectionFuture(client, future);
+
+            ConnectionState state = client.getState();
+            assertTrue(state == ConnectionState.CONNECTING || state == ConnectionState.ERROR,
+                    "Failed startup must not report CONNECTED, was: " + state);
+            assertTrue(future.isCompletedExceptionally());
+            assertEquals(ConnectionState.ERROR, client.getState());
+        }
+    }
+
     @Test
     void testGetStateErrorAfterFailedStart() throws Exception {
         // Use a non-existent CLI path to trigger a startup failure
@@ -793,8 +996,37 @@ private static void setConnectionFuture(CopilotClient client, JsonRpcClient rpc,
         constructor.setAccessible(true);
         var connection = constructor.newInstance(rpc, process, null, null);
 
+        setConnectionFuture(client, CompletableFuture.completedFuture(connection));
+    }
+
+    private static void setConnectionFuture(CopilotClient client, CompletableFuture<?> future) throws Exception {
         Field field = CopilotClient.class.getDeclaredField("connectionFuture");
         field.setAccessible(true);
-        field.set(client, CompletableFuture.completedFuture(connection));
+        field.set(client, future);
+    }
+
+    @AllowCopilotExperimental
+    private static SkillProvider testSkillProvider() {
+        return new SkillProvider() {
+            @Override
+            public CompletableFuture<List<SkillProviderDescriptor>> listSkills() {
+                return CompletableFuture.completedFuture(List.of());
+            }
+
+            @Override
+            public CompletableFuture<String> readSkill(String name) {
+                return CompletableFuture.completedFuture(null);
+            }
+        };
+    }
+
+    @AllowCopilotExperimental
+    @SuppressWarnings("unchecked")
+    private static SkillProvider registeredSkillProvider(CopilotClient client, String sessionId) throws Exception {
+        Field sessionsField = CopilotClient.class.getDeclaredField("sessions");
+        sessionsField.setAccessible(true);
+        Map<String, CopilotSession> sessions = (Map<String, CopilotSession>) sessionsField.get(client);
+        CopilotSession session = sessions.get(sessionId);
+        return session != null ? session.getSkillProvider() : null;
     }
 }
diff --git a/java/sdk/src/test/java/com/github/copilot/CopilotSessionTest.java b/java/sdk/src/test/java/com/github/copilot/CopilotSessionTest.java
index 94ccda7243..4b876f4bee 100644
--- a/java/sdk/src/test/java/com/github/copilot/CopilotSessionTest.java
+++ b/java/sdk/src/test/java/com/github/copilot/CopilotSessionTest.java
@@ -17,7 +17,6 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicReference;
 
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
@@ -178,53 +177,6 @@ void testShouldReceiveSessionEvents() throws Exception {
         }
     }
 
-    /**
-     * Verifies that send() returns immediately while events stream in background.
-     *
-     * @see Snapshot:
-     *      session/send_returns_immediately_while_events_stream_in_background
-     */
-    @Test
-    void testSendReturnsImmediatelyWhileEventsStreamInBackground() throws Exception {
-        ctx.configureForTest("session", "send_returns_immediately_while_events_stream_in_background");
-
-        try (CopilotClient client = ctx.createClient()) {
-            CopilotSession session = client
-                    .createSession(new SessionConfig().setOnPermissionRequest(PermissionHandler.APPROVE_ALL)).get();
-
-            var events = new ArrayList<String>();
-            var lastMessage = new AtomicReference<AssistantMessageEvent>();
-            var done = new CompletableFuture<Void>();
-
-            session.on(evt -> {
-                events.add(evt.getType());
-                if (evt instanceof AssistantMessageEvent msg) {
-                    lastMessage.set(msg);
-                } else if (evt instanceof SessionIdleEvent) {
-                    done.complete(null);
-                }
-            });
-
-            // Use a slow command so we can verify send() returns before completion
-            // Use String convenience overload (covers send(String) path)
-            session.send("Run 'sleep 2 && echo done'").get();
-
-            // At this point, we might not have received session.idle yet
-            // The event handling happens asynchronously
-
-            // Wait for completion
-            done.get(60, TimeUnit.SECONDS);
-
-            assertTrue(events.contains("session.idle"));
-            assertTrue(events.contains("assistant.message"));
-            assertNotNull(lastMessage.get());
-            assertTrue(lastMessage.get().getData().content().contains("done"),
-                    "Response should contain done: " + lastMessage.get().getData().content());
-
-            session.close();
-        }
-    }
-
     /**
      * Verifies that sendAndWait blocks until session is idle and returns the final
      * assistant message.
diff --git a/java/sdk/src/test/java/com/github/copilot/E2ETestContext.java b/java/sdk/src/test/java/com/github/copilot/E2ETestContext.java
index 8a0e335758..fa96957d26 100644
--- a/java/sdk/src/test/java/com/github/copilot/E2ETestContext.java
+++ b/java/sdk/src/test/java/com/github/copilot/E2ETestContext.java
@@ -121,7 +121,7 @@ public static E2ETestContext create() throws IOException, InterruptedException {
         defaultUser.put("login", "e2e-test-user");
         defaultUser.put("id", 12345);
         defaultUser.put("copilot_plan", "individual_pro");
-        defaultUser.put("endpoints", Map.of("api", proxyUrl, "telemetry", "https://localhost:1/telemetry"));
+        defaultUser.put("endpoints", Map.of("api", proxyUrl, "telemetry", proxyUrl));
         defaultUser.put("analytics_tracking_id", "e2e-test-tracking-id");
         proxy.setCopilotUserByToken(DEFAULT_GITHUB_TOKEN, defaultUser);
 
diff --git a/java/sdk/src/test/java/com/github/copilot/E2ETestContextTest.java b/java/sdk/src/test/java/com/github/copilot/E2ETestContextTest.java
index bf307f6547..6e99145ac4 100644
--- a/java/sdk/src/test/java/com/github/copilot/E2ETestContextTest.java
+++ b/java/sdk/src/test/java/com/github/copilot/E2ETestContextTest.java
@@ -6,12 +6,37 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
 import java.util.List;
 
 import org.junit.jupiter.api.Test;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 class E2ETestContextTest {
 
+    @Test
+    void defaultTelemetryEndpointUsesTheOwnedProxy() throws Exception {
+        try (E2ETestContext ctx = E2ETestContext.create()) {
+            var client = HttpClient.newHttpClient();
+            var userRequest = HttpRequest.newBuilder(URI.create(ctx.getProxyUrl() + "/copilot_internal/user"))
+                    .header("Authorization", "Bearer " + ctx.getEnvironment().get("GH_TOKEN")).build();
+            var userResponse = client.send(userRequest, HttpResponse.BodyHandlers.ofString());
+            assertEquals(200, userResponse.statusCode());
+            var telemetryEndpoint = new ObjectMapper().readTree(userResponse.body()).path("endpoints").path("telemetry")
+                    .asText();
+            assertEquals(ctx.getProxyUrl(), telemetryEndpoint);
+            var telemetryRequest = HttpRequest.newBuilder(URI.create(telemetryEndpoint + "/telemetry"))
+                    .POST(HttpRequest.BodyPublishers.ofString("{}\n")).build();
+            var telemetryResponse = client.send(telemetryRequest, HttpResponse.BodyHandlers.ofString());
+            assertEquals(204, telemetryResponse.statusCode());
+            assertEquals("", telemetryResponse.body());
+        }
+    }
+
     @Test
     void expectedUserPromptsParseFoldedBlockScalars() {
         String snapshot = """
diff --git a/java/sdk/src/test/java/com/github/copilot/EventFidelityTest.java b/java/sdk/src/test/java/com/github/copilot/EventFidelityTest.java
index cca63b4d67..ed63d60764 100644
--- a/java/sdk/src/test/java/com/github/copilot/EventFidelityTest.java
+++ b/java/sdk/src/test/java/com/github/copilot/EventFidelityTest.java
@@ -6,8 +6,8 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 
-import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.TimeUnit;
 
 import org.junit.jupiter.api.AfterAll;
@@ -60,7 +60,7 @@ void testShouldEmitAssistantUsageEventAfterModelCall() throws Exception {
             CopilotSession session = client
                     .createSession(new SessionConfig().setOnPermissionRequest(PermissionHandler.APPROVE_ALL)).get();
 
-            List<SessionEvent> events = new ArrayList<>();
+            List<SessionEvent> events = new CopyOnWriteArrayList<>();
             session.on(events::add);
 
             session.sendAndWait(new MessageOptions().setPrompt("What is 5+5? Reply with just the number.")).get(60,
@@ -94,7 +94,7 @@ void testShouldEmitSessionUsageInfoEventAfterModelCall() throws Exception {
             CopilotSession session = client
                     .createSession(new SessionConfig().setOnPermissionRequest(PermissionHandler.APPROVE_ALL)).get();
 
-            List<SessionEvent> events = new ArrayList<>();
+            List<SessionEvent> events = new CopyOnWriteArrayList<>();
             session.on(events::add);
 
             session.sendAndWait(new MessageOptions().setPrompt("What is 5+5? Reply with just the number.")).get(60,
diff --git a/java/sdk/src/test/java/com/github/copilot/ForceStopSessionTest.java b/java/sdk/src/test/java/com/github/copilot/ForceStopSessionTest.java
new file mode 100644
index 0000000000..1b51dce326
--- /dev/null
+++ b/java/sdk/src/test/java/com/github/copilot/ForceStopSessionTest.java
@@ -0,0 +1,482 @@
+/*---------------------------------------------------------------------------------------------
+ *  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.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.Assertions.fail;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.InetAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Consumer;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.copilot.generated.SessionEvent;
+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.SessionConfig;
+import com.github.copilot.rpc.SessionHooks;
+
+class ForceStopSessionTest {
+
+    @CopilotResponse
+    public record Answer(int value) {
+    }
+
+    @Test
+    void gracefulClosePreservesEventsAndSessionEndHooksUntilDetachCompletes() throws Exception {
+        var events = new AtomicInteger();
+        var hooks = new AtomicInteger();
+        try (var server = new Server(); var client = server.createClient()) {
+            server.emitDetachCallbacks = true;
+            var session = client.createSession(new SessionConfig().setOnPermissionRequest(PermissionHandler.APPROVE_ALL)
+                    .setHooks(new SessionHooks().setOnSessionEnd((input, invocation) -> {
+                        assertEquals("user_exit", input.reason());
+                        hooks.incrementAndGet();
+                        return CompletableFuture.completedFuture(null);
+                    }))).get(5, TimeUnit.SECONDS);
+            try (var subscription = session.on(event -> events.incrementAndGet())) {
+                session.close();
+                assertEquals(1, server.detaches.get());
+                assertEquals(1, hooks.get(), "Ordinary detach must still invoke the session-end hook");
+                assertEquals(1, events.get(), "Ordinary detach must deliver events before callback retirement");
+                server.emitIdle(session.getSessionId());
+                client.ping("retired detach callbacks barrier").get(5, TimeUnit.SECONDS);
+                assertEquals(1, events.get(), "Detach completion must retire subsequent callbacks");
+                assertThrows(IllegalStateException.class, () -> session.on(event -> fail("Retired handler")));
+                session.close();
+                assertEquals(1, server.detaches.get(), "Repeated close must not detach again");
+            }
+        }
+    }
+
+    @Test
+    void forceStopTerminatesRetainedSessionsWithoutDetachRpc() throws Exception {
+        try (var server = new Server(); var client = server.createClient()) {
+            var session = createSession(client);
+            client.forceStop().get(5, TimeUnit.SECONDS);
+
+            assertThrows(IllegalStateException.class, () -> session.on(event -> fail("Retired handler")));
+            assertThrows(IllegalStateException.class,
+                    () -> session.on(SessionIdleEvent.class, event -> fail("Retired typed handler")));
+            assertThrows(IllegalStateException.class, () -> session.send("after force stop"));
+            session.close();
+            assertEquals(0, server.detaches.get(), "Local retirement must not detach over RPC");
+        }
+    }
+
+    @Test
+    void forceStopDropsRemainingSnapshotHandlersWithoutJoiningAnAdmittedHandler() throws Exception {
+        var entered = new CountDownLatch(1);
+        var release = new CountDownLatch(1);
+        var dispatchThread = new AtomicReference<Thread>();
+        var laterCalls = new AtomicInteger();
+        try (var server = new Server(); var client = server.createClient()) {
+            var session = createSession(client);
+            try (var first = session.on(event -> {
+                dispatchThread.set(Thread.currentThread());
+                entered.countDown();
+                awaitRelease(release);
+            }); var second = session.on(event -> laterCalls.incrementAndGet())) {
+                try {
+                    server.emitIdle(session.getSessionId());
+                    assertTrue(entered.await(5, TimeUnit.SECONDS), "The first handler must be admitted");
+                    client.forceStop().get(5, TimeUnit.SECONDS);
+                    assertEquals(1, release.getCount(), "Force stop must not require releasing the user handler");
+                } finally {
+                    release.countDown();
+                    Thread thread = dispatchThread.get();
+                    if (thread != null) {
+                        thread.join(5000);
+                        assertFalse(thread.isAlive(), "The stopped event reader must finish after its handler");
+                    }
+                }
+                assertEquals(0, laterCalls.get(), "Retirement must discard the retained dispatch snapshot");
+            }
+        }
+    }
+
+    @Test
+    void forceStopRetiresErrorCallbacksWhileGracefulCloseAwaitsDetach() throws Exception {
+        var entered = new CountDownLatch(1);
+        var release = new CountDownLatch(1);
+        var dispatchThread = new AtomicReference<Thread>();
+        var errorCalls = new AtomicInteger();
+        try (var server = new Server(); var client = server.createClient()) {
+            server.holdDetachResponse = true;
+            var session = createSession(client);
+            session.setEventErrorHandler((event, error) -> errorCalls.incrementAndGet());
+            try (var first = session.on(event -> {
+                dispatchThread.set(Thread.currentThread());
+                entered.countDown();
+                awaitRelease(release);
+                throw new IllegalStateException("Admitted handler failed after forced retirement");
+            })) {
+                try {
+                    server.emitIdle(session.getSessionId());
+                    assertTrue(entered.await(5, TimeUnit.SECONDS), "The first snapshot handler must be admitted");
+                    var closing = CompletableFuture.runAsync(session::close);
+                    assertTrue(server.detachEntered.await(5, TimeUnit.SECONDS), "Graceful close must await detach");
+                    // Prevent graceful close's final retirement from masking force escalation.
+                    synchronized (session) {
+                        client.forceStop().get(5, TimeUnit.SECONDS);
+                        assertFalse(closing.isDone(), "Graceful close must still await its final retirement");
+                        release.countDown();
+                        Thread thread = dispatchThread.get();
+                        thread.join(5000);
+                        assertFalse(thread.isAlive(), "The stopped reader must finish its admitted handler");
+                        assertEquals(0, errorCalls.get(), "Force stop must discard the unadmitted error callback");
+                    }
+                    var detachError = assertThrows(ExecutionException.class, () -> closing.get(5, TimeUnit.SECONDS));
+                    assertInstanceOf(IllegalStateException.class, detachError.getCause());
+                } finally {
+                    release.countDown();
+                    Thread thread = dispatchThread.get();
+                    if (thread != null) {
+                        thread.join(5000);
+                        assertFalse(thread.isAlive(), "The event reader must finish after forced cleanup");
+                    }
+                }
+            }
+        }
+    }
+
+    @ParameterizedTest
+    @CsvSource({"false, false", "false, true", "true, false", "true, true"})
+    void retirementPreservesTerminalOutcomeWhileSchedulerHandoffIsBlocked(boolean terminalError, boolean force)
+            throws Exception {
+        var entered = new CountDownLatch(1);
+        var release = new CountDownLatch(1);
+        try (var server = new Server(); var client = server.createClient()) {
+            var session = createSession(client);
+            var occupying = session.sendAndWait(new MessageOptions().setPrompt("occupy scheduler"), 0);
+            var continuation = occupying.whenComplete((value, error) -> {
+                entered.countDown();
+                awaitRelease(release);
+            });
+            try (var gate = (AutoCloseable) release::countDown) {
+                client.ping("first send acknowledgment").get(5, TimeUnit.SECONDS);
+                server.emitIdle(session.getSessionId());
+                assertTrue(entered.await(5, TimeUnit.SECONDS), "A continuation must occupy the session scheduler");
+
+                var completed = session.sendAndWait(new MessageOptions().setPrompt("completed terminal"), 0);
+                client.ping("second send acknowledgment").get(5, TimeUnit.SECONDS);
+                if (terminalError) {
+                    server.emitEvent(session.getSessionId(), "session.error",
+                            Map.of("errorType", "query", "message", "original terminal failure"));
+                } else {
+                    server.emitEvent(session.getSessionId(), "assistant.message",
+                            Map.of("messageId", "terminal-message", "content", "completed before retirement"));
+                    server.emitIdle(session.getSessionId());
+                }
+                client.ping("terminal dispatch acknowledgment").get(5, TimeUnit.SECONDS);
+                assertFalse(completed.isDone(), "The received terminal outcome must still await scheduler handoff");
+
+                if (force) {
+                    client.forceStop().get(5, TimeUnit.SECONDS);
+                } else {
+                    CompletableFuture.runAsync(session::close).get(5, TimeUnit.SECONDS);
+                }
+                if (terminalError) {
+                    var error = assertThrows(ExecutionException.class, () -> completed.get(5, TimeUnit.SECONDS));
+                    assertEquals("Session error: original terminal failure", error.getCause().getMessage());
+                } else {
+                    assertEquals("completed before retirement", completed.get(5, TimeUnit.SECONDS).getData().content());
+                }
+                assertEquals(1, release.getCount(), "Retirement must not join the admitted continuation");
+            }
+            continuation.get(5, TimeUnit.SECONDS);
+        }
+    }
+
+    @Test
+    void forceStopFailsAcknowledgedPlainAndStructuredWaitsWithNoTimeout() throws Exception {
+        var entered = new CountDownLatch(2);
+        var release = new CountDownLatch(1);
+        try (var server = new Server(); var client = server.createClient()) {
+            var session = createSession(client);
+            var plain = session.sendAndWait(new MessageOptions().setPrompt("plain"), 0);
+            var structured = session.sendAndWait(new MessageOptions().setPrompt("structured"), Answer.class, 0);
+            client.ping("send acknowledgment barrier").get(5, TimeUnit.SECONDS);
+            assertFalse(plain.isDone());
+            assertFalse(structured.isDone());
+
+            var plainContinuation = plain.whenComplete((value, error) -> {
+                entered.countDown();
+                awaitRelease(release);
+            });
+            var structuredContinuation = structured.whenComplete((value, error) -> {
+                entered.countDown();
+                awaitRelease(release);
+            });
+            try (var gate = (AutoCloseable) release::countDown) {
+                client.forceStop().get(5, TimeUnit.SECONDS);
+                assertTrue(entered.await(5, TimeUnit.SECONDS),
+                        "Both waits must retire even while their application continuations are blocked");
+                var plainError = assertThrows(ExecutionException.class, () -> plain.get(5, TimeUnit.SECONDS));
+                var structuredError = assertThrows(ExecutionException.class, () -> structured.get(5, TimeUnit.SECONDS));
+                assertInstanceOf(IllegalStateException.class, plainError.getCause());
+                assertInstanceOf(IllegalStateException.class, structuredError.getCause());
+                assertTrue(plainError.getCause().getMessage().contains("closed"));
+                assertTrue(structuredError.getCause().getMessage().contains("closed"));
+            }
+            assertThrows(ExecutionException.class, () -> plainContinuation.get(5, TimeUnit.SECONDS));
+            assertThrows(ExecutionException.class, () -> structuredContinuation.get(5, TimeUnit.SECONDS));
+        }
+    }
+
+    @Test
+    void gracefulCloseFailsAcknowledgedWaitsWithoutJoiningTheirContinuations() throws Exception {
+        var entered = new CountDownLatch(2);
+        var release = new CountDownLatch(1);
+        try (var server = new Server(); var client = server.createClient()) {
+            var session = createSession(client);
+            var plain = session.sendAndWait(new MessageOptions().setPrompt("plain"), 0);
+            var structured = session.sendAndWait(new MessageOptions().setPrompt("structured"), Answer.class, 0);
+            client.ping("send acknowledgment barrier").get(5, TimeUnit.SECONDS);
+            assertFalse(plain.isDone());
+            assertFalse(structured.isDone());
+
+            var plainContinuation = plain.whenComplete((value, error) -> {
+                entered.countDown();
+                awaitRelease(release);
+            });
+            var structuredContinuation = structured.whenComplete((value, error) -> {
+                entered.countDown();
+                awaitRelease(release);
+            });
+            try (var gate = (AutoCloseable) release::countDown) {
+                CompletableFuture.runAsync(session::close).get(5, TimeUnit.SECONDS);
+                assertTrue(entered.await(5, TimeUnit.SECONDS), "Retirement must admit both blocked continuations");
+                var plainError = assertThrows(ExecutionException.class, () -> plain.get(5, TimeUnit.SECONDS));
+                var structuredError = assertThrows(ExecutionException.class, () -> structured.get(5, TimeUnit.SECONDS));
+                assertInstanceOf(IllegalStateException.class, plainError.getCause());
+                assertInstanceOf(IllegalStateException.class, structuredError.getCause());
+                assertEquals("Session closed before response completed", plainError.getCause().getMessage());
+                assertEquals("Session closed before response completed", structuredError.getCause().getMessage());
+                assertEquals(1, server.detaches.get(), "Graceful close must still acknowledge one detach");
+                session.close();
+                assertEquals(1, server.detaches.get(), "Repeated close must not detach again");
+            }
+            assertThrows(ExecutionException.class, () -> plainContinuation.get(5, TimeUnit.SECONDS));
+            assertThrows(ExecutionException.class, () -> structuredContinuation.get(5, TimeUnit.SECONDS));
+        }
+    }
+
+    @Test
+    void duplicateUntypedSubscriptionsStillDispatchOnceAndShareUnsubscription() throws Exception {
+        var calls = new AtomicInteger();
+        try (var server = new Server(); var client = server.createClient()) {
+            var session = createSession(client);
+            Consumer<SessionEvent> handler = event -> calls.incrementAndGet();
+            try (var first = session.on(handler); var second = session.on(handler)) {
+                server.emitIdle(session.getSessionId());
+                client.ping("first dispatch barrier").get(5, TimeUnit.SECONDS);
+                assertEquals(1, calls.get());
+
+                first.close();
+                server.emitIdle(session.getSessionId());
+                client.ping("unsubscription barrier").get(5, TimeUnit.SECONDS);
+                assertEquals(1, calls.get());
+                client.forceStop().get(5, TimeUnit.SECONDS);
+            }
+        }
+    }
+
+    private static CopilotSession createSession(CopilotClient client) throws Exception {
+        return client.createSession(new SessionConfig().setOnPermissionRequest(PermissionHandler.APPROVE_ALL)).get(5,
+                TimeUnit.SECONDS);
+    }
+
+    private static void awaitRelease(CountDownLatch release) {
+        boolean interrupted = false;
+        try {
+            while (true) {
+                try {
+                    release.await();
+                    return;
+                } catch (InterruptedException error) {
+                    interrupted = true;
+                }
+            }
+        } finally {
+            if (interrupted) {
+                Thread.currentThread().interrupt();
+            }
+        }
+    }
+
+    private static final class Server implements AutoCloseable {
+
+        private static final ObjectMapper MAPPER = new ObjectMapper();
+        private final ServerSocket listener;
+        private final Thread thread;
+        private final AtomicInteger detaches = new AtomicInteger();
+        private final CountDownLatch detachEntered = new CountDownLatch(1);
+        private volatile Socket socket;
+        private volatile boolean closed;
+        private volatile boolean emitDetachCallbacks;
+        private volatile boolean holdDetachResponse;
+        private volatile Exception failure;
+
+        Server() throws IOException {
+            listener = new ServerSocket(0, 1, InetAddress.getByName("127.0.0.1"));
+            thread = new Thread(this::serve, "force-stop-session-server");
+            thread.setDaemon(true);
+            thread.start();
+        }
+
+        CopilotClient createClient() {
+            return new CopilotClient(new CopilotClientOptions().setCliUrl("127.0.0.1:" + listener.getLocalPort()));
+        }
+
+        void emitIdle(String sessionId) throws IOException {
+            emitEvent(sessionId, "session.idle", Map.of());
+        }
+
+        void emitEvent(String sessionId, String type, Map<String, Object> data) throws IOException {
+            assertNotNull(socket, "Session creation must establish the connection before events");
+            writeMessage(Map.of("jsonrpc", "2.0", "method", "session.event", "params",
+                    Map.of("sessionId", sessionId, "event",
+                            Map.of("type", type, "id", "00000000-0000-0000-0000-000000000001", "timestamp",
+                                    "2026-10-05T00:00:00Z", "data", data))));
+        }
+
+        private void serve() {
+            try (Socket accepted = listener.accept()) {
+                socket = accepted;
+                JsonNode pendingDetachId = null;
+                while (!closed) {
+                    JsonNode request = readMessage(accepted.getInputStream());
+                    if (request == null) {
+                        return;
+                    }
+                    JsonNode params = request.path("params");
+                    if (holdDetachResponse && request.path("method").asText().equals("session.detach")) {
+                        detaches.incrementAndGet();
+                        detachEntered.countDown();
+                        continue;
+                    }
+                    if (!request.has("method") && request.path("id").asLong() == 9_000_000L) {
+                        if (pendingDetachId == null || request.has("error")) {
+                            throw new IOException("Unexpected detach hook response: " + request);
+                        }
+                        var response = MAPPER.createObjectNode().put("jsonrpc", "2.0");
+                        response.set("id", pendingDetachId);
+                        response.set("result", MAPPER.valueToTree(Map.of("success", true)));
+                        pendingDetachId = null;
+                        writeMessage(response);
+                        continue;
+                    }
+                    if (emitDetachCallbacks && request.path("method").asText().equals("session.detach")) {
+                        detaches.incrementAndGet();
+                        pendingDetachId = request.get("id");
+                        String sessionId = params.path("sessionId").asText();
+                        emitIdle(sessionId);
+                        var hookInput = Map.of("sessionId", sessionId, "timestamp", 0, "cwd", ".", "reason",
+                                "user_exit");
+                        writeMessage(Map.of("jsonrpc", "2.0", "id", 9_000_000L, "method", "hooks.invoke", "params",
+                                Map.of("sessionId", sessionId, "hookType", "sessionEnd", "input", hookInput)));
+                        continue;
+                    }
+                    Object result = switch (request.path("method").asText()) {
+                        case "connect" -> Map.of("protocolVersion", SdkProtocolVersion.get());
+                        case "session.create" -> Map.of("sessionId", params.path("sessionId").asText());
+                        case "session.send" -> Map.of("messageId", params.path("prompt").asText());
+                        case "session.detach" -> {
+                            detaches.incrementAndGet();
+                            yield Map.of("success", true);
+                        }
+                        case "ping" -> Map.of("message", params.path("message").asText(), "protocolVersion",
+                                SdkProtocolVersion.get());
+                        default -> throw new IOException("Unexpected RPC: " + request.path("method"));
+                    };
+                    var response = MAPPER.createObjectNode().put("jsonrpc", "2.0");
+                    response.set("id", request.get("id"));
+                    response.set("result", MAPPER.valueToTree(result));
+                    writeMessage(response);
+                }
+            } catch (Exception error) {
+                if (!closed) {
+                    failure = error;
+                }
+            }
+        }
+
+        private static JsonNode readMessage(InputStream input) throws IOException {
+            var header = new StringBuilder();
+            while (!header.toString().endsWith("\r\n\r\n")) {
+                int value = input.read();
+                if (value < 0) {
+                    if (header.isEmpty()) {
+                        return null;
+                    }
+                    throw new IOException("Truncated RPC header");
+                }
+                header.append((char) value);
+                if (header.length() > 8192) {
+                    throw new IOException("Oversized RPC header");
+                }
+            }
+            int length;
+            try {
+                length = Integer.parseInt(header.substring(header.indexOf(":") + 1).trim());
+            } catch (NumberFormatException error) {
+                throw new IOException("Invalid Content-Length", error);
+            }
+            if (length < 0 || length > 1_048_576) {
+                throw new IOException("Invalid Content-Length: " + length);
+            }
+            byte[] body = input.readNBytes(length);
+            if (body.length != length) {
+                throw new IOException("Truncated RPC body");
+            }
+            return MAPPER.readTree(body);
+        }
+
+        private synchronized void writeMessage(Object message) throws IOException {
+            byte[] body = MAPPER.writeValueAsBytes(message);
+            var output = socket.getOutputStream();
+            output.write(("Content-Length: " + body.length + "\r\n\r\n").getBytes(StandardCharsets.UTF_8));
+            output.write(body);
+            output.flush();
+        }
+
+        @Override
+        public void close() throws Exception {
+            closed = true;
+            listener.close();
+            if (socket != null) {
+                socket.close();
+            }
+            thread.join(5000);
+            assertFalse(thread.isAlive(), "The RPC fixture must stop");
+            assertNull(failure, "RPC fixture failure: " + failure);
+        }
+    }
+}
diff --git a/java/sdk/src/test/java/com/github/copilot/ImageGenerationConfigTest.java b/java/sdk/src/test/java/com/github/copilot/ImageGenerationConfigTest.java
new file mode 100644
index 0000000000..5acace1e7a
--- /dev/null
+++ b/java/sdk/src/test/java/com/github/copilot/ImageGenerationConfigTest.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+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.assertSame;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.github.copilot.rpc.ImageGenerationConfig;
+import com.github.copilot.rpc.ResumeSessionConfig;
+import com.github.copilot.rpc.SessionConfig;
+
+class ImageGenerationConfigTest {
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    void createAndResumeForwardExplicitOptIn(boolean enabled) {
+        var imageGeneration = new ImageGenerationConfig().setEnabled(enabled);
+        var createConfig = new SessionConfig().setImageGeneration(imageGeneration).clone();
+        var resumeConfig = new ResumeSessionConfig().setImageGeneration(imageGeneration).clone();
+        assertSame(imageGeneration, createConfig.getImageGeneration());
+        assertSame(imageGeneration, resumeConfig.getImageGeneration());
+        var create = SessionRequestBuilder.buildCreateRequest(createConfig, "image-test");
+        var resume = SessionRequestBuilder.buildResumeRequest("image-test", resumeConfig);
+        for (Object request : new Object[]{create, resume}) {
+            JsonNode json = JsonRpcClient.getObjectMapper().valueToTree(request);
+            assertEquals(enabled, json.get("imageGeneration").get("enabled").booleanValue());
+            assertEquals(1, json.get("imageGeneration").size());
+        }
+    }
+
+    @Test
+    void createAndResumeOmitUnsetOptIn() {
+        var create = SessionRequestBuilder.buildCreateRequest(new SessionConfig(), "image-test");
+        var resume = SessionRequestBuilder.buildResumeRequest("image-test", new ResumeSessionConfig());
+        for (Object request : new Object[]{create, resume}) {
+            JsonNode json = JsonRpcClient.getObjectMapper().valueToTree(request);
+            assertFalse(json.has("imageGeneration"));
+        }
+        JsonNode empty = JsonRpcClient.getObjectMapper().valueToTree(new ImageGenerationConfig());
+        assertEquals(0, empty.size());
+    }
+}
diff --git a/java/sdk/src/test/java/com/github/copilot/JsonRpcClientTest.java b/java/sdk/src/test/java/com/github/copilot/JsonRpcClientTest.java
index 8db208b53f..f296aba2e5 100644
--- a/java/sdk/src/test/java/com/github/copilot/JsonRpcClientTest.java
+++ b/java/sdk/src/test/java/com/github/copilot/JsonRpcClientTest.java
@@ -24,6 +24,8 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.copilot.generated.rpc.ServerRpc;
+import com.github.copilot.generated.rpc.SandboxProxyCaCheckRelevanceParams;
 
 class JsonRpcClientTest {
 
@@ -104,6 +106,26 @@ private String readRpcMessage(InputStream in) throws IOException {
 
     // ---- notify() ----
 
+    @Test
+    void testGeneratedProxyCaQueriesPreserveBooleanResponses() throws Exception {
+        try (var pair = createSocketPair()) {
+            var server = new ServerRpc(pair.client::invoke);
+            for (boolean expected : new boolean[]{true, false}) {
+                for (String method : new String[]{"sandbox.proxyCa.checkInstallationSupport",
+                        "sandbox.proxyCa.checkRelevance"}) {
+                    CompletableFuture<?> result = method.endsWith("checkInstallationSupport")
+                            ? server.sandbox.proxyCa.checkInstallationSupport()
+                            : server.sandbox.proxyCa.checkRelevance(new SandboxProxyCaCheckRelevanceParams(null));
+                    JsonNode request = MAPPER.readTree(readRpcMessage(pair.serverSide.getInputStream()));
+                    assertEquals(method, request.get("method").asText());
+                    writeRpcMessage(pair.serverSide.getOutputStream(),
+                            "{\"jsonrpc\":\"2.0\",\"id\":" + request.get("id") + ",\"result\":" + expected + "}");
+                    assertEquals(expected, result.get(5, TimeUnit.SECONDS));
+                }
+            }
+        }
+    }
+
     @Test
     void testNotify() throws Exception {
         try (var pair = createSocketPair()) {
diff --git a/java/sdk/src/test/java/com/github/copilot/ManagedSettingsTest.java b/java/sdk/src/test/java/com/github/copilot/ManagedSettingsTest.java
index d6341b26c5..7b1910753f 100644
--- a/java/sdk/src/test/java/com/github/copilot/ManagedSettingsTest.java
+++ b/java/sdk/src/test/java/com/github/copilot/ManagedSettingsTest.java
@@ -23,22 +23,29 @@ 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(**)"));
+                .setDisableBypassPermissionsMode(DisableBypassPermissionsModes.DISABLE)
+                .setDisableAssistedPermissionsMode(true).setDeny(List.of("Shell(rm *)"))
+                .setAsk(List.of("Domain(publish.example)")).setAllow(List.of("Read(**)"))
+                .setLimitTo(List.of("Domain(github.com)"));
         var managedSettings = new ManagedSettings().setPermissions(permissions);
 
-        var create = SessionRequestBuilder.buildCreateRequest(
-                new SessionConfig().setEnableManagedSettings(true).setManagedSettings(managedSettings),
-                "managed-create");
+        var create = SessionRequestBuilder.buildCreateRequest(new SessionConfig().setEnableManagedSettings(true)
+                .setEnforceManagedModelDefaults(true).setManagedSettings(managedSettings), "managed-create");
         var resume = SessionRequestBuilder.buildResumeRequest("managed-resume",
-                new ResumeSessionConfig().setEnableManagedSettings(true).setManagedSettings(managedSettings));
+                new ResumeSessionConfig().setEnableManagedSettings(true).setEnforceManagedModelDefaults(true)
+                        .setManagedSettings(managedSettings));
 
         assertEquals(managedSettings, create.getManagedSettings());
         assertEquals(managedSettings, resume.getManagedSettings());
+        assertTrue(create.getEnforceManagedModelDefaults());
+        assertTrue(resume.getEnforceManagedModelDefaults());
         var json = new ObjectMapper().writeValueAsString(create);
         assertTrue(json.contains("\"enableManagedSettings\":true"));
+        assertTrue(json.contains("\"enforceManagedModelDefaults\":true"));
         assertTrue(json.contains("\"managedSettings\":{\"permissions\""));
         assertTrue(json.contains("\"disableBypassPermissionsMode\":\"disable\""));
+        assertTrue(json.contains("\"limitTo\":[\"Domain(github.com)\"]"));
+        assertTrue(json.contains("\"disableAssistedPermissionsMode\":true"));
     }
 
     @Test
@@ -55,7 +62,8 @@ void preservesExplicitEmptyPermissionArrays() throws Exception {
         // 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 permissions = new ManagedSettingsPermissions().setDeny(List.of()).setAsk(List.of()).setAllow(List.of())
+                .setLimitTo(List.of());
         var managedSettings = new ManagedSettings().setPermissions(permissions);
         var create = SessionRequestBuilder.buildCreateRequest(new SessionConfig().setManagedSettings(managedSettings),
                 "managed-empty");
@@ -64,6 +72,7 @@ void preservesExplicitEmptyPermissionArrays() throws Exception {
         assertTrue(json.contains("\"deny\":[]"), json);
         assertTrue(json.contains("\"ask\":[]"), json);
         assertTrue(json.contains("\"allow\":[]"), json);
+        assertTrue(json.contains("\"limitTo\":[]"), json);
     }
 
     @Test
diff --git a/java/sdk/src/test/java/com/github/copilot/PackagedConsumerIT.java b/java/sdk/src/test/java/com/github/copilot/PackagedConsumerIT.java
new file mode 100644
index 0000000000..29cb03f487
--- /dev/null
+++ b/java/sdk/src/test/java/com/github/copilot/PackagedConsumerIT.java
@@ -0,0 +1,104 @@
+/*---------------------------------------------------------------------------------------------
+ *  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.assertTrue;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.concurrent.TimeUnit;
+import java.util.jar.Attributes;
+import java.util.jar.JarEntry;
+import java.util.jar.JarOutputStream;
+import java.util.jar.Manifest;
+
+import javax.tools.ToolProvider;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+class PackagedConsumerIT {
+
+    @Test
+    void runsStandaloneConsumerWithManifestClasspath(@TempDir Path directory) throws Exception {
+        Path build = Path.of(System.getProperty("project.build.directory"));
+        Path library = Files.createDirectory(directory.resolve("lib"));
+        var dependencies = new ArrayList<Path>();
+        dependencies.add(build.resolve(System.getProperty("project.build.finalName") + ".jar"));
+        try (var jars = Files.list(build.resolve("consumer-dependencies"))) {
+            dependencies.addAll(jars.filter(path -> path.toString().endsWith(".jar")).sorted().toList());
+        }
+        for (Path dependency : dependencies) {
+            Files.copy(dependency, library.resolve(dependency.getFileName()));
+        }
+
+        Path source = directory.resolve("Consumer.java");
+        Files.writeString(source, """
+                import com.github.copilot.CopilotClient;
+                import com.github.copilot.ConnectionState;
+                import com.github.copilot.rpc.MessageOptions;
+                import com.fasterxml.jackson.databind.ObjectMapper;
+                import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+
+                public class Consumer {
+                    public static void main(String[] args) throws Exception {
+                        try (var client = new CopilotClient()) {
+                            var mapper = new ObjectMapper().registerModule(new JavaTimeModule());
+                            var json = mapper.writeValueAsString(new MessageOptions().setPrompt("consumer"));
+                            if (!mapper.readTree(json).get("prompt").asText().equals("consumer")
+                                    || client.getState() != ConnectionState.DISCONNECTED) {
+                                throw new AssertionError("Packaged SDK consumer failed");
+                            }
+                        }
+                        System.out.println("consumer-ok");
+                    }
+                }
+                """);
+
+        String classpath = String.join(File.pathSeparator,
+                dependencies.stream().map(path -> library.resolve(path.getFileName()).toString()).toList());
+        var diagnostics = new ByteArrayOutputStream();
+        int compilation = ToolProvider.getSystemJavaCompiler().run(null, diagnostics, diagnostics, "--release", "17",
+                "-proc:none", "-classpath", classpath, source.toString());
+        assertEquals(0, compilation, diagnostics.toString(StandardCharsets.UTF_8));
+
+        var manifest = new Manifest();
+        manifest.getMainAttributes().put(Attributes.Name.MANIFEST_VERSION, "1.0");
+        manifest.getMainAttributes().put(Attributes.Name.MAIN_CLASS, "Consumer");
+        manifest.getMainAttributes().put(Attributes.Name.CLASS_PATH,
+                String.join(" ", dependencies.stream().map(path -> "lib/" + path.getFileName()).toList()));
+        Path consumerJar = directory.resolve("consumer.jar");
+        try (var jar = new JarOutputStream(Files.newOutputStream(consumerJar), manifest)) {
+            jar.putNextEntry(new JarEntry("Consumer.class"));
+            Files.copy(directory.resolve("Consumer.class"), jar);
+            jar.closeEntry();
+        }
+        Files.delete(directory.resolve("Consumer.class"));
+
+        Path java = Path.of(System.getProperty("java.home"), "bin",
+                System.getProperty("os.name").startsWith("Windows") ? "java.exe" : "java");
+        Path output = directory.resolve("output.log");
+        ProcessBuilder builder = new ProcessBuilder(java.toString(), "-jar", consumerJar.toString())
+                .directory(directory.toFile()).redirectErrorStream(true).redirectOutput(output.toFile());
+        builder.environment().remove("COPILOT_SDK_DEFAULT_CONNECTION");
+        Process process = builder.start();
+        try {
+            boolean exited = process.waitFor(30, TimeUnit.SECONDS);
+            String text = Files.readString(output);
+            assertTrue(exited, "Consumer JVM did not exit. Output:\n" + text);
+            assertEquals(0, process.exitValue(), text);
+            assertTrue(text.contains("consumer-ok"), text);
+        } finally {
+            if (process.isAlive()) {
+                process.destroyForcibly().waitFor(30, TimeUnit.SECONDS);
+            }
+        }
+    }
+}
diff --git a/java/sdk/src/test/java/com/github/copilot/RpcHandlerDispatcherTest.java b/java/sdk/src/test/java/com/github/copilot/RpcHandlerDispatcherTest.java
index 44bff36444..a610007f0e 100644
--- a/java/sdk/src/test/java/com/github/copilot/RpcHandlerDispatcherTest.java
+++ b/java/sdk/src/test/java/com/github/copilot/RpcHandlerDispatcherTest.java
@@ -16,8 +16,13 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.BiConsumer;
+import java.util.function.Function;
+import java.util.function.Supplier;
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -43,6 +48,7 @@
  * identified by JaCoCo: unknown sessions, missing fields, error paths, and edge
  * cases for each handler method.
  */
+@AllowCopilotExperimental
 class RpcHandlerDispatcherTest {
 
     private static final ObjectMapper MAPPER = JsonRpcClient.getObjectMapper();
@@ -509,6 +515,217 @@ void userInputRequestHandlerFails() throws Exception {
         assertEquals(-32603, response.get("error").get("code").asInt());
     }
 
+    // ===== skillProvider.* tests =====
+
+    @Test
+    void skillProviderListAndReadSuccess() throws Exception {
+        CopilotSession session = createSession("s1");
+        session.registerSkillProvider(skillProvider(
+                () -> CompletableFuture.completedFuture(
+                        List.of(new SkillProviderDescriptor("docs", "Documentation", null, null, "topic"))),
+                name -> CompletableFuture.completedFuture("# " + name)));
+
+        ObjectNode listParams = MAPPER.createObjectNode();
+        listParams.put("sessionId", "s1");
+        invokeHandler("skillProvider.list", "60", listParams);
+
+        JsonNode listResponse = readResponse();
+        JsonNode descriptor = listResponse.at("/result/skills/0");
+        assertEquals("docs", descriptor.path("name").asText());
+        assertEquals("Documentation", descriptor.path("description").asText());
+        assertEquals("topic", descriptor.path("argumentHint").asText());
+        assertFalse(descriptor.has("userInvocable"));
+        assertFalse(descriptor.has("disableModelInvocation"));
+
+        ObjectNode readParams = MAPPER.createObjectNode();
+        readParams.put("sessionId", "s1");
+        readParams.put("name", "docs");
+        invokeHandler("skillProvider.read", "61", readParams);
+
+        JsonNode readResponse = readResponse();
+        assertEquals("# docs", readResponse.at("/result/markdown").asText());
+    }
+
+    @Test
+    void skillProviderNullListReturnsEmptyList() throws Exception {
+        CopilotSession session = createSession("s1");
+        session.registerSkillProvider(skillProvider(() -> CompletableFuture.completedFuture(null),
+                name -> CompletableFuture.completedFuture("# " + name)));
+
+        ObjectNode params = MAPPER.createObjectNode();
+        params.put("sessionId", "s1");
+        invokeHandler("skillProvider.list", "62", params);
+
+        JsonNode response = readResponse();
+        assertTrue(response.at("/result/skills").isArray());
+        assertEquals(0, response.at("/result/skills").size());
+    }
+
+    @Test
+    void skillProviderReadNullReturnsNullMarkdown() throws Exception {
+        CopilotSession session = createSession("s1");
+        session.registerSkillProvider(skillProvider(() -> CompletableFuture.completedFuture(List.of()),
+                name -> CompletableFuture.completedFuture(null)));
+
+        ObjectNode params = MAPPER.createObjectNode();
+        params.put("sessionId", "s1");
+        params.put("name", "missing");
+        invokeHandler("skillProvider.read", "63", params);
+
+        JsonNode response = readResponse();
+        assertNull(response.get("error"));
+        assertTrue(response.at("/result").has("markdown"));
+        assertTrue(response.at("/result/markdown").isNull());
+    }
+
+    @Test
+    void skillProviderFailuresUseStableMessagesWithoutData() throws Exception {
+        // Keep dispatch and logging outside the socket-read timeout.
+        var immediateDispatcher = new RpcHandlerDispatcher(sessions, lifecycleEvents::add, Runnable::run,
+                gitHubTokenProviders);
+        immediateDispatcher.registerHandlers(rpc);
+        CopilotSession session = createSession("s1");
+        session.registerSkillProvider(skillProvider(
+                () -> CompletableFuture.failedFuture(new IllegalStateException("secret list failure")), name -> {
+                    throw new IllegalStateException("secret read failure");
+                }));
+
+        ObjectNode listParams = MAPPER.createObjectNode();
+        listParams.put("sessionId", "s1");
+        invokeHandler("skillProvider.list", "64", listParams);
+        JsonNode listResponse = readResponse();
+        assertEquals(-32603, listResponse.at("/error/code").asInt());
+        assertEquals("Skill provider listSkills failed", listResponse.at("/error/message").asText());
+        assertFalse(listResponse.path("error").has("data"));
+
+        ObjectNode readParams = MAPPER.createObjectNode();
+        readParams.put("sessionId", "s1");
+        readParams.put("name", "docs");
+        invokeHandler("skillProvider.read", "65", readParams);
+        JsonNode readResponse = readResponse();
+        assertEquals(-32603, readResponse.at("/error/code").asInt());
+        assertEquals("Skill provider readSkill failed", readResponse.at("/error/message").asText());
+        assertFalse(readResponse.path("error").has("data"));
+    }
+
+    @Test
+    void skillProviderErrorsForUnknownMissingOrClearedProviderHaveNoData() throws Exception {
+        ObjectNode unknownParams = MAPPER.createObjectNode();
+        unknownParams.put("sessionId", "missing-session");
+        invokeHandler("skillProvider.list", "66", unknownParams);
+        JsonNode unknownResponse = readResponse();
+        assertEquals(-32603, unknownResponse.at("/error/code").asInt());
+        assertEquals("No skill provider for session: missing-session", unknownResponse.at("/error/message").asText());
+        assertFalse(unknownResponse.path("error").has("data"));
+
+        createSession("s1");
+        ObjectNode noProviderParams = MAPPER.createObjectNode();
+        noProviderParams.put("sessionId", "s1");
+        noProviderParams.put("name", "docs");
+        invokeHandler("skillProvider.read", "67", noProviderParams);
+        JsonNode noProviderResponse = readResponse();
+        assertEquals(-32603, noProviderResponse.at("/error/code").asInt());
+        assertEquals("No skill provider for session: s1", noProviderResponse.at("/error/message").asText());
+        assertFalse(noProviderResponse.path("error").has("data"));
+
+        CopilotSession session = sessions.get("s1");
+        session.registerSkillProvider(skillProvider(() -> CompletableFuture.completedFuture(List.of()),
+                name -> CompletableFuture.completedFuture("# " + name)));
+        session.clearSkillProvider();
+        invokeHandler("skillProvider.list", "68", noProviderParams);
+        JsonNode clearedResponse = readResponse();
+        assertEquals(-32603, clearedResponse.at("/error/code").asInt());
+        assertEquals("No skill provider for session: s1", clearedResponse.at("/error/message").asText());
+        assertFalse(clearedResponse.path("error").has("data"));
+    }
+
+    @Test
+    void skillProviderCallIsCancelledByCancelRequest() throws Exception {
+        CopilotSession session = createSession("s1");
+        var entered = new CountDownLatch(1);
+        var pending = new CompletableFuture<List<SkillProviderDescriptor>>();
+        session.registerSkillProvider(skillProvider(() -> {
+            entered.countDown();
+            return pending;
+        }, name -> CompletableFuture.completedFuture(null)));
+
+        ObjectNode params = MAPPER.createObjectNode();
+        params.put("sessionId", "s1");
+        invokeHandler("skillProvider.list", "69", params);
+        assertTrue(entered.await(5, TimeUnit.SECONDS));
+        dispatcher.handleCancelRequest(MAPPER.createObjectNode().put("id", 69));
+
+        JsonNode response = readResponse();
+        assertEquals(69, response.path("id").asInt());
+        assertEquals(-32800, response.at("/error/code").asInt());
+        assertTrue(pending.isCancelled());
+    }
+
+    @Test
+    void skillProviderCallCancelledBeforeDispatchIsNotStarted() throws Exception {
+        CopilotSession session = createSession("s1");
+        var calls = new AtomicInteger();
+        session.registerSkillProvider(skillProvider(() -> {
+            calls.incrementAndGet();
+            return CompletableFuture.completedFuture(List.of());
+        }, name -> CompletableFuture.completedFuture(null)));
+        var blockedExecutor = new CompletableFuture<Void>();
+        var cancellingDispatcher = new RpcHandlerDispatcher(sessions, lifecycleEvents::add,
+                task -> blockedExecutor.thenRun(task), gitHubTokenProviders);
+        cancellingDispatcher.registerHandlers(rpc);
+
+        ObjectNode params = MAPPER.createObjectNode();
+        params.put("sessionId", "s1");
+        invokeHandler("skillProvider.list", "70", params);
+        cancellingDispatcher.handleCancelRequest(MAPPER.createObjectNode().put("id", 70));
+        blockedExecutor.complete(null);
+
+        assertEquals(-32800, readResponse().at("/error/code").asInt());
+        assertEquals(0, calls.get());
+    }
+
+    @Test
+    void skillProviderCallsAreCancelledWhenTheConnectionCloses() throws Exception {
+        CopilotSession session = createSession("s1");
+        var entered = new CountDownLatch(1);
+        var pending = new CompletableFuture<String>();
+        session.registerSkillProvider(skillProvider(() -> CompletableFuture.completedFuture(List.of()), name -> {
+            entered.countDown();
+            return pending;
+        }));
+
+        ObjectNode params = MAPPER.createObjectNode();
+        params.put("sessionId", "s1");
+        params.put("name", "docs");
+        invokeHandler("skillProvider.read", "71", params);
+        assertTrue(entered.await(5, TimeUnit.SECONDS));
+        dispatcher.cancelSkillProviderCalls();
+
+        assertEquals(-32800, readResponse().at("/error/code").asInt());
+        assertTrue(pending.isCancelled());
+    }
+
+    @Test
+    void cancelRequestForAnotherRequestLeavesSkillProviderCallRunning() throws Exception {
+        CopilotSession session = createSession("s1");
+        var entered = new CountDownLatch(1);
+        var pending = new CompletableFuture<String>();
+        session.registerSkillProvider(skillProvider(() -> CompletableFuture.completedFuture(List.of()), name -> {
+            entered.countDown();
+            return pending;
+        }));
+
+        ObjectNode params = MAPPER.createObjectNode();
+        params.put("sessionId", "s1");
+        params.put("name", "docs");
+        invokeHandler("skillProvider.read", "72", params);
+        assertTrue(entered.await(5, TimeUnit.SECONDS));
+        dispatcher.handleCancelRequest(MAPPER.createObjectNode().put("id", 73));
+        pending.complete("# docs");
+
+        assertEquals("# docs", readResponse().at("/result/markdown").asText());
+    }
+
     // ===== hooks.invoke tests =====
 
     @Test
@@ -649,4 +866,19 @@ void systemMessageTransformWithKnownSessionNoCallbacks() throws Exception {
         assertNotNull(resultSections);
         assertEquals("Original content", resultSections.get("identity").get("content").asText());
     }
+
+    private static SkillProvider skillProvider(Supplier<CompletableFuture<List<SkillProviderDescriptor>>> listSkills,
+            Function<String, CompletableFuture<String>> readSkill) {
+        return new SkillProvider() {
+            @Override
+            public CompletableFuture<List<SkillProviderDescriptor>> listSkills() {
+                return listSkills.get();
+            }
+
+            @Override
+            public CompletableFuture<String> readSkill(String name) {
+                return readSkill.apply(name);
+            }
+        };
+    }
 }
diff --git a/java/sdk/src/test/java/com/github/copilot/RpcWrappersTest.java b/java/sdk/src/test/java/com/github/copilot/RpcWrappersTest.java
index 774ae10164..c5309a20c0 100644
--- a/java/sdk/src/test/java/com/github/copilot/RpcWrappersTest.java
+++ b/java/sdk/src/test/java/com/github/copilot/RpcWrappersTest.java
@@ -49,8 +49,13 @@
 import com.github.copilot.generated.rpc.SessionConnectorsReconnectParams;
 import com.github.copilot.generated.rpc.SessionConnectorsRefreshParams;
 import com.github.copilot.generated.rpc.SessionConnectorsRefreshResult;
+import com.github.copilot.generated.rpc.SessionMcpListConfiguredResult;
+import com.github.copilot.generated.rpc.SessionModelGetReasoningSummariesParams;
+import com.github.copilot.generated.rpc.SessionModelGetReasoningSummariesResult;
 import com.github.copilot.generated.rpc.SessionModelSwitchToParams;
+import com.github.copilot.generated.rpc.SessionModelSwitchToRequest;
 import com.github.copilot.generated.rpc.SessionRpc;
+import com.github.copilot.rpc.AgentInfo;
 
 /**
  * Unit tests for the generated RPC wrapper classes ({@link ServerRpc} and
@@ -188,6 +193,60 @@ void serverRpc_mcp_discover_passes_params() {
 
     // ── SessionRpc tests ──────────────────────────────────────────────────────
 
+    @ParameterizedTest
+    @CsvSource({"true,false", "false,true", "null,null"})
+    void sessionRpc_reasoning_summaries_accepts_only_host_state(String persisted, String visible) {
+        var stub = new StubCaller();
+        var session = new SessionRpc(stub, "reasoning-session");
+        Boolean persistedShowReasoning = "null".equals(persisted) ? null : Boolean.valueOf(persisted);
+        Boolean summariesVisible = "null".equals(visible) ? null : Boolean.valueOf(visible);
+        var params = new SessionModelGetReasoningSummariesParams(persistedShowReasoning, summariesVisible);
+
+        assertNull(params.sessionId());
+        session.model.getReasoningSummaries(params).join();
+
+        assertEquals(1, stub.calls.size());
+        var call = stub.calls.get(0);
+        assertEquals("session.model.getReasoningSummaries", call.method());
+        assertEquals(SessionModelGetReasoningSummariesResult.class, call.resultType());
+        var payload = assertInstanceOf(JsonNode.class, call.params());
+        var expected = new ObjectMapper().createObjectNode().put("sessionId", "reasoning-session");
+        if (persistedShowReasoning != null) {
+            expected.put("persistedShowReasoning", persistedShowReasoning);
+        }
+        if (summariesVisible != null) {
+            expected.put("summariesVisible", summariesVisible);
+        }
+        assertEquals(expected, payload);
+    }
+
+    @Test
+    @AllowCopilotExperimental
+    void sessionRpc_mcp_listConfigured_preserves_runtime_lifecycle() throws Exception {
+        var stub = new StubCaller();
+        stub.nextResult = new ObjectMapper().readValue("""
+                {
+                  "servers": [
+                    {"name":"cold","enabled":true,"live":{"status":"not_configured"}},
+                    {"name":"old-connection","enabled":false,"live":{"status":"connected"}},
+                    {"name":"auth","enabled":true,"live":{"status":"needs-auth"}},
+                    {"name":"stopped","enabled":true,"live":{"status":"stopped"}},
+                    {"name":"failed","enabled":true,"live":{"status":"failed","error":"connection failed"}}
+                  ]
+                }
+                """, SessionMcpListConfiguredResult.class);
+        var session = new SessionRpc(stub, "session-mcp");
+
+        var inventory = session.mcp.listConfigured().get();
+
+        assertEquals(List.of("not_configured", "connected", "needs-auth", "stopped", "failed"),
+                inventory.servers().stream().map(server -> server.live().status().getValue()).toList());
+        assertFalse(inventory.servers().get(1).enabled());
+        assertEquals("connection failed", inventory.servers().get(4).live().error());
+        assertEquals(List.of(new StubCaller.Call("session.mcp.listConfigured", Map.of("sessionId", "session-mcp"),
+                SessionMcpListConfiguredResult.class)), stub.calls);
+    }
+
     @Test
     void sessionRpc_instantiates_with_all_namespace_fields() {
         var stub = new StubCaller();
@@ -445,8 +504,9 @@ void sessionRpc_model_switchTo_merges_sessionId_with_extra_params() {
         var switchParams = new SessionModelSwitchToParams(null, "gpt-5", null, null, null, null, null, null, null, null,
                 null, null, null, null, null, null);
         session.model.switchTo(switchParams);
+        session.model.switchTo(new SessionModelSwitchToRequest("gpt-5").setProviderId("catalog-provider"));
 
-        assertEquals(1, stub.calls.size());
+        assertEquals(2, stub.calls.size());
         assertEquals("session.model.switchTo", stub.calls.get(0).method());
 
         // Params should be a JsonNode containing both sessionId and modelId
@@ -454,7 +514,12 @@ void sessionRpc_model_switchTo_merges_sessionId_with_extra_params() {
         assertInstanceOf(com.fasterxml.jackson.databind.node.ObjectNode.class, params);
         var node = (com.fasterxml.jackson.databind.node.ObjectNode) params;
         assertEquals("sess-xyz", node.get("sessionId").asText());
+        assertFalse(node.has("providerId"));
         assertEquals("gpt-5", node.get("modelId").asText());
+        var providerRequest = (com.fasterxml.jackson.databind.node.ObjectNode) stub.calls.get(1).params();
+        assertEquals("sess-xyz", providerRequest.get("sessionId").asText());
+        assertEquals("catalog-provider", providerRequest.get("providerId").asText());
+        assertEquals("gpt-5", providerRequest.get("modelId").asText());
     }
 
     @Test
@@ -540,6 +605,56 @@ void serverRpc_account_getQuota_invokes_correct_method() {
     // RpcHandlerDispatcherTest) to construct a real CopilotSession and verify
     // that getRpc() returns a correctly wired SessionRpc.
 
+    @ParameterizedTest
+    @ValueSource(strings = {"list", "getCurrent", "select"})
+    void copilotSession_agent_methods_deserialize_scoped_hooks(String method) throws Exception {
+        var mapper = JsonRpcClient.getObjectMapper();
+        var agentJson = mapper.readTree("""
+                {
+                  "name": "hook-agent",
+                  "displayName": "Hook Agent",
+                  "description": "Agent with scoped hooks",
+                  "hooks": {
+                    "preToolUse": [{"type":"command","bash":"echo scoped-hook","timeoutSec":10}],
+                    "sessionStart": [{"type":"command","bash":"echo started"}]
+                  }
+                }
+                """);
+        try (var sockets = new SocketPair()) {
+            var stub = sockets.stubServer();
+            var session = new CopilotSession("sess-agent-hooks", sockets.client());
+            try {
+                CompletableFuture<List<AgentInfo>> future = switch (method) {
+                    case "list" -> session.listAgents();
+                    case "getCurrent" -> session.getCurrentAgent().thenApply(List::of);
+                    case "select" -> session.selectAgent("hook-agent").thenApply(List::of);
+                    default -> throw new IllegalArgumentException(method);
+                };
+                var request = stub.readOneMessage();
+                assertEquals("session.agent." + method, request.get("method").asText());
+                assertEquals("sess-agent-hooks", request.get("params").get("sessionId").asText());
+                if ("select".equals(method)) {
+                    assertEquals("hook-agent", request.get("params").get("name").asText());
+                }
+                var result = mapper.createObjectNode();
+                if ("list".equals(method)) {
+                    result.putArray("agents").add(agentJson);
+                } else {
+                    result.set("agent", agentJson);
+                }
+                stub.respond(request, result);
+
+                var agents = future.get(3, TimeUnit.SECONDS);
+                assertEquals(1, agents.size());
+                assertEquals("hook-agent", agents.get(0).getName());
+                assertNotNull(agents.get(0).getHooks());
+                assertEquals(agentJson.get("hooks"), mapper.valueToTree(agents.get(0).getHooks()));
+            } finally {
+                session.forceStopLocally();
+            }
+        }
+    }
+
     @Test
     void copilotSession_getRpc_returns_non_null_session_rpc() throws Exception {
         try (var sockets = new SocketPair()) {
diff --git a/java/sdk/src/test/java/com/github/copilot/RuntimeHostIT.java b/java/sdk/src/test/java/com/github/copilot/RuntimeHostIT.java
index 43b286da48..ab00b483c6 100644
--- a/java/sdk/src/test/java/com/github/copilot/RuntimeHostIT.java
+++ b/java/sdk/src/test/java/com/github/copilot/RuntimeHostIT.java
@@ -46,6 +46,8 @@ private static final class Application {
         final E2ETestContext context;
         final CopilotClient client;
         volatile CopilotSession session;
+        volatile String createSessionId;
+        volatile String resumeSessionId;
         final AtomicInteger creates = new AtomicInteger();
         final AtomicInteger resumes = new AtomicInteger();
         final AtomicInteger toolCalls = new AtomicInteger();
@@ -99,14 +101,24 @@ AhpHostOptions options() {
                         creates.incrementAndGet();
                         assertFalse(request.cancellation().toCompletableFuture().isDone());
                         assertEquals(context.getWorkDir().toString(), request.config().getWorkingDirectory());
-                        return client.createSession(configure(request.config())).thenApply(value -> session = value);
+                        createSessionId = request.config().getSessionId();
+                        assertNotNull(createSessionId);
+                        assertFalse(createSessionId.isEmpty());
+                        return client.createSession(configure(request.config())).thenApply(value -> {
+                            assertEquals(createSessionId, value.getSessionId());
+                            return session = value;
+                        });
                     }).setResumeSession(request -> {
                         resumes.incrementAndGet();
                         assertFalse(request.cancellation().toCompletableFuture().isDone());
                         assertEquals(false, request.config().getContinuePendingWork().orElseThrow());
                         assertEquals(context.getWorkDir().toString(), request.config().getWorkingDirectory());
+                        resumeSessionId = request.sessionId();
                         return client.resumeSession(request.sessionId(), configure(request.config()))
-                                .thenApply(value -> session = value);
+                                .thenApply(value -> {
+                                    assertEquals(resumeSessionId, value.getSessionId());
+                                    return session = value;
+                                });
                     }).setOnSessionReleased(value -> {
                         releases.add(value);
                         released.complete(null);
@@ -174,13 +186,14 @@ void createsOrPublishesExactApplicationSession(boolean publish) throws Exception
                     } else {
                         sessionId = ahp.request(Map.of("op", "create", "clientId", clientId, "workDir",
                                 context.getWorkDir().toString())).get("sessionId").asText();
-                        assertEquals(sessionId, app.session.getSessionId());
+                        assertEquals(app.createSessionId, app.session.getSessionId());
+                        assertNotEquals(sessionId, app.session.getSessionId());
                         assertEquals(1, app.creates.get());
                     }
                     var response = ahp.request(
                             Map.of("op", "turn", "clientId", clientId, "sessionId", sessionId, "prompt", TOOL_PROMPT));
                     assertTrue(response.get("text").asText().contains("MAGIC_hello_42"));
-                    app.assertCallbacks(sessionId);
+                    app.assertCallbacks(app.session.getSessionId());
                     await(CompletableFuture.allOf(host.dispose(), host.dispose()));
                     stopped(ahp, host, clientId);
                     if (publish) {
@@ -213,6 +226,9 @@ void resumesAfterRuntimeRestartAndComposesTools() throws Exception {
                     sessionId = ahp.request(Map.of("op", "create", "clientId", clientId, "workDir",
                             context.getWorkDir().toString(), "clientTools", true)).get("sessionId").asText();
                     original = app.session;
+                    assertEquals(1, app.creates.get());
+                    assertEquals(app.createSessionId, original.getSessionId());
+                    assertNotEquals(sessionId, original.getSessionId());
                     assertTrue(ahp.request(Map.of("op", "turn", "clientId", clientId, "sessionId", sessionId, "prompt",
                             "What is 2+2?")).get("text").asText().contains("4"));
                     await(host.dispose());
@@ -232,14 +248,15 @@ void resumesAfterRuntimeRestartAndComposesTools() throws Exception {
                     assertEquals("What is 2+2?", attached.get("history").get(0).get("message").get("text").asText());
                     assertEquals(0, app.creates.get());
                     assertEquals(1, app.resumes.get());
-                    assertEquals(sessionId, app.session.getSessionId());
+                    assertEquals(original.getSessionId(), app.resumeSessionId);
+                    assertEquals(original.getSessionId(), app.session.getSessionId());
                     assertNotSame(original, app.session);
                     var response = ahp.request(Map.of("op", "turn", "clientId", clientId, "sessionId", sessionId,
                             "prompt", COMPOSED_PROMPT, "clientTools", true));
                     assertTrue(response.get("text").asText().contains("MAGIC_hello_42"));
                     assertTrue(response.get("text").asText().contains("CLIENT_ECHO_ping"));
                     assertEquals(1, response.get("clientToolCalls").asInt());
-                    app.assertCallbacks(sessionId);
+                    app.assertCallbacks(original.getSessionId());
                     await(host.dispose());
                     stopped(ahp, host, clientId);
                     app.assertReleased();
diff --git a/java/sdk/src/test/java/com/github/copilot/SessionAutoTierEventTest.java b/java/sdk/src/test/java/com/github/copilot/SessionAutoTierEventTest.java
index 4378c105cd..ef7034c455 100644
--- a/java/sdk/src/test/java/com/github/copilot/SessionAutoTierEventTest.java
+++ b/java/sdk/src/test/java/com/github/copilot/SessionAutoTierEventTest.java
@@ -30,11 +30,11 @@ class SessionAutoTierEventTest {
     private static final ObjectMapper MAPPER = JsonRpcClient.getObjectMapper();
 
     @ParameterizedTest
-    @CsvSource({"session.start,EFFICIENCY,efficiency", "session.start,BALANCE,balance",
-            "session.start,INTELLIGENCE,intelligence", "session.start,FAST,fast",
-            "session.resume,EFFICIENCY,efficiency", "session.resume,BALANCE,balance",
-            "session.resume,INTELLIGENCE,intelligence", "session.resume,FAST,fast"})
-    void canonicalAutoTierRoundTrips(String type, AutoTier tier, String value) throws Exception {
+    @CsvSource({"session.start,efficiency", "session.start,balance", "session.start,intelligence", "session.start,fast",
+            "session.start,premium-v2", "session.resume,efficiency", "session.resume,balance",
+            "session.resume,intelligence", "session.resume,fast", "session.resume,premium-v2"})
+    void canonicalAutoTierRoundTrips(String type, String value) throws Exception {
+        AutoTier tier = AutoTier.fromValue(value);
         String json = """
                 {"type":"%s","data":{"selectedModel":"auto","autoTier":"%s"}}
                 """.formatted(type, value);
diff --git a/java/sdk/src/test/java/com/github/copilot/SessionAutoTierSwitchTest.java b/java/sdk/src/test/java/com/github/copilot/SessionAutoTierSwitchTest.java
index a1c5dd2f44..96b9bf0319 100644
--- a/java/sdk/src/test/java/com/github/copilot/SessionAutoTierSwitchTest.java
+++ b/java/sdk/src/test/java/com/github/copilot/SessionAutoTierSwitchTest.java
@@ -33,6 +33,45 @@
 @AllowCopilotExperimental
 class SessionAutoTierSwitchTest {
 
+    @Test
+    void customTierRoundTripsAcrossConvenienceAndGeneratedApis() throws Exception {
+        ObjectMapper mapper = JsonRpcClient.getObjectMapper();
+        AutoTier tier = AutoTier.fromValue("premium-v2");
+        assertEquals("\"premium-v2\"", mapper.writeValueAsString(tier));
+        assertEquals(tier, mapper.readValue("\"premium-v2\"", AutoTier.class));
+        var generated = mapper.readValue("\"premium-v2\"", com.github.copilot.generated.rpc.AutoTier.class);
+        assertEquals("premium-v2", generated.getValue());
+        assertEquals("\"premium-v2\"", mapper.writeValueAsString(generated));
+        assertEquals(AutoTier.BALANCE, AutoTier.fromValue("balance"));
+    }
+
+    @Test
+    void legacy_model_switch_preserves_reasoning_and_omits_provider() throws Exception {
+        try (var sockets = new SocketPair()) {
+            var session = new CopilotSession("sess-legacy", sockets.client());
+            session.setModel("gpt-5", "high");
+            var params = sockets.stubServer().readOneMessage().get("params");
+            assertEquals("gpt-5", params.get("modelId").asText());
+            assertEquals("high", params.get("reasoningEffort").asText());
+            assertFalse(params.has("providerId"));
+            assertFalse(params.has("autoTier"));
+        }
+    }
+
+    @Test
+    void model_switch_with_summary_preserves_its_wire_fields() throws Exception {
+        try (var sockets = new SocketPair()) {
+            var session = new CopilotSession("sess-summary", sockets.client());
+            session.setModel("gpt-5", "high", "concise", null);
+            var params = sockets.stubServer().readOneMessage().get("params");
+            assertEquals("gpt-5", params.get("modelId").asText());
+            assertEquals("high", params.get("reasoningEffort").asText());
+            assertEquals("concise", params.get("reasoningSummary").asText());
+            assertFalse(params.has("providerId"));
+            assertFalse(params.has("autoTier"));
+        }
+    }
+
     @Test
     void setModel_omits_autoTier_when_no_preference_is_requested() throws Exception {
         try (var sockets = new SocketPair()) {
diff --git a/java/sdk/src/test/java/com/github/copilot/SessionEventHandlingTest.java b/java/sdk/src/test/java/com/github/copilot/SessionEventHandlingTest.java
index 46b71d7d3f..64c32b4a74 100644
--- a/java/sdk/src/test/java/com/github/copilot/SessionEventHandlingTest.java
+++ b/java/sdk/src/test/java/com/github/copilot/SessionEventHandlingTest.java
@@ -35,6 +35,7 @@
 import com.github.copilot.generated.SessionIdleEvent;
 import com.github.copilot.generated.SessionErrorEvent;
 import com.github.copilot.generated.SessionMode;
+import com.github.copilot.generated.SessionResumeEvent;
 import com.github.copilot.generated.SessionStartEvent;
 import com.github.copilot.generated.rpc.SessionToolsGetCurrentMetadataResult;
 import com.github.copilot.rpc.MessageOptions;
@@ -230,6 +231,24 @@ void testTypedEventHandler() {
         assertEquals("Second message", receivedMessages.get(1).getData().content());
     }
 
+    @Test
+    void testSendReturnsAfterRpcAcceptanceWithoutWaitingForIdle() throws Exception {
+        var rpc = mock(JsonRpcClient.class);
+        when(rpc.invoke(eq("session.send"), any(), eq(SendMessageResponse.class)))
+                .thenReturn(CompletableFuture.completedFuture(new SendMessageResponse("message-1")));
+        session = createTestSession(rpc);
+        var events = new ArrayList<SessionEvent>();
+        session.on(events::add);
+
+        session.send("hello").get(1, TimeUnit.SECONDS);
+
+        verify(rpc).invoke(eq("session.send"), any(), eq(SendMessageResponse.class));
+        assertTrue(events.isEmpty());
+        dispatchEvent(createAssistantMessageEvent("done"));
+        dispatchEvent(createSessionIdleEvent());
+        assertEquals(List.of("assistant.message", "session.idle"), events.stream().map(SessionEvent::getType).toList());
+    }
+
     @Test
     void testSendAndWaitSkipsAutopilotContinuationIdle() throws Exception {
         var rpc = mock(JsonRpcClient.class);
@@ -276,8 +295,8 @@ void testSendAndWaitIgnoresChildEvents() throws Exception {
             dispatchEvent(childMessage);
             var childError = new SessionErrorEvent();
             childError.setAgentId("child-1");
-            childError.setData(new SessionErrorEvent.SessionErrorEventData("query", null, null, "child failed", null,
-                    null, null, null, null, null));
+            childError.setData(new SessionErrorEvent.SessionErrorEventData("query", null, null, null, null,
+                    "child failed", null, null, null, null, null, null));
             dispatchEvent(childError);
             var childIdle = createSessionIdleEvent();
             childIdle.setAgentId("child-1");
@@ -385,9 +404,7 @@ void testHandlerReceivesCorrectEventData() {
             capturedSessionId.set(start.getData().sessionId());
         });
 
-        SessionStartEvent startEvent = createSessionStartEvent();
-        startEvent.setData(new SessionStartEvent.SessionStartEventData("my-session-123", null, null, null, null, null,
-                null, null, null, null, null, null, null, null, null, null, null, null));
+        SessionStartEvent startEvent = createSessionStartEvent("my-session-123");
         dispatchEvent(startEvent);
 
         AssistantMessageEvent msgEvent = createAssistantMessageEvent("Test content");
@@ -397,6 +414,17 @@ void testHandlerReceivesCorrectEventData() {
         assertEquals("Test content", capturedContent.get());
     }
 
+    @Test
+    void testLegacyLifecycleEventConstructorsRemainAvailable() {
+        var start = new SessionStartEvent.SessionStartEventData("session", null, null, null, null, null, null, null,
+                null, null, null, null, null, null, null, null, null, null);
+        var resume = new SessionResumeEvent.SessionResumeEventData(null, 0L, null, null, null, null, null, null, null,
+                null, null, null, null, null, null, null);
+
+        assertEquals("session", start.sessionId());
+        assertEquals(0L, resume.eventCount());
+    }
+
     @Test
     void testHandlerExceptionDoesNotBreakOtherHandlers() {
         var handler2Events = new ArrayList<String>();
@@ -1071,9 +1099,9 @@ private SessionStartEvent createSessionStartEvent(String sessionId) {
 
     private AssistantMessageEvent createAssistantMessageEvent(String content) {
         var event = new AssistantMessageEvent();
-        var data = new AssistantMessageEvent.AssistantMessageEventData(null, null, null, content, null, null, null,
+        var data = new AssistantMessageEvent.AssistantMessageEventData(null, null, 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);
         event.setData(data);
         return event;
     }
diff --git a/java/sdk/src/test/java/com/github/copilot/SessionEventsE2ETest.java b/java/sdk/src/test/java/com/github/copilot/SessionEventsE2ETest.java
index 8c8fc154aa..40a23c5cf3 100644
--- a/java/sdk/src/test/java/com/github/copilot/SessionEventsE2ETest.java
+++ b/java/sdk/src/test/java/com/github/copilot/SessionEventsE2ETest.java
@@ -11,7 +11,7 @@
 
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.ArrayList;
+import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
@@ -67,7 +67,7 @@ void testShouldReceiveSessionEvents_assistantTurnEvents() throws Exception {
         // Use existing session snapshot that emits turn events
         ctx.configureForTest("session", "should_receive_session_events");
 
-        var allEvents = new ArrayList<SessionEvent>();
+        var allEvents = new CopyOnWriteArrayList<SessionEvent>();
 
         try (CopilotClient client = ctx.createClient()) {
             CopilotSession session = client
@@ -109,7 +109,7 @@ void testShouldReceiveSessionEvents_userMessageEvent() throws Exception {
         // Use existing session snapshot
         ctx.configureForTest("session", "should_receive_session_events");
 
-        var userMessages = new ArrayList<UserMessageEvent>();
+        var userMessages = new CopyOnWriteArrayList<UserMessageEvent>();
 
         try (CopilotClient client = ctx.createClient()) {
             CopilotSession session = client
@@ -135,8 +135,8 @@ void testInvokesBuiltInTools_toolExecutionCompleteEvent() throws Exception {
         // Use existing tools snapshot for built-in tool invocation
         ctx.configureForTest("tools", "invokes_built_in_tools");
 
-        var toolStarts = new ArrayList<ToolExecutionStartEvent>();
-        var toolCompletes = new ArrayList<ToolExecutionCompleteEvent>();
+        var toolStarts = new CopyOnWriteArrayList<ToolExecutionStartEvent>();
+        var toolCompletes = new CopyOnWriteArrayList<ToolExecutionCompleteEvent>();
 
         try (CopilotClient client = ctx.createClient()) {
             CopilotSession session = client
@@ -175,7 +175,7 @@ void testShouldReceiveSessionEvents_assistantUsageEvent() throws Exception {
         // Use existing session snapshot
         ctx.configureForTest("session", "should_receive_session_events");
 
-        var usageEvents = new ArrayList<AssistantUsageEvent>();
+        var usageEvents = new CopyOnWriteArrayList<AssistantUsageEvent>();
 
         try (CopilotClient client = ctx.createClient()) {
             CopilotSession session = client
@@ -206,7 +206,7 @@ void testShouldReceiveSessionEvents_sessionIdleAfterMessage() throws Exception {
         // Use existing session snapshot
         ctx.configureForTest("session", "should_receive_session_events");
 
-        var allEvents = new ArrayList<SessionEvent>();
+        var allEvents = new CopyOnWriteArrayList<SessionEvent>();
         var idleEntered = new CountDownLatch(1);
         var releaseIdle = new CountDownLatch(1);
         var idleCallbackCompleted = new AtomicBoolean();
@@ -274,7 +274,7 @@ void testInvokesBuiltInTools_eventOrderDuringToolExecution() throws Exception {
         // Use existing tools snapshot for built-in tool invocation
         ctx.configureForTest("tools", "invokes_built_in_tools");
 
-        var eventTypes = new ArrayList<String>();
+        var eventTypes = new CopyOnWriteArrayList<String>();
         // Track this listener's receipt of session.idle explicitly.
         var idleReceived = new java.util.concurrent.CompletableFuture<Void>();
 
diff --git a/java/sdk/src/test/java/com/github/copilot/SessionRequestBuilderTest.java b/java/sdk/src/test/java/com/github/copilot/SessionRequestBuilderTest.java
index c7cb1be6bc..09b036c6fc 100644
--- a/java/sdk/src/test/java/com/github/copilot/SessionRequestBuilderTest.java
+++ b/java/sdk/src/test/java/com/github/copilot/SessionRequestBuilderTest.java
@@ -6,6 +6,8 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
@@ -100,6 +102,71 @@ void clearingTranscriptRecoveryRestoresRuntimeDefaultInAllModes() throws Excepti
         }
     }
 
+    @Test
+    void customizationDirectoriesArePreservedOnCreateAndResume() throws Exception {
+        var mapper = JsonRpcClient.getObjectMapper();
+        for (int kind = 0; kind < 3; kind++) {
+            List<String> roots = kind == 0 ? null : kind == 1 ? List.of() : List.of("relative-root", "other-root");
+            var directories = new HashMap<String, List<String>>();
+            for (var type : List.of("skill", "agent", "instruction", "hook")) {
+                directories.put(type + "Directories",
+                        roots == null ? null : roots.stream().map(root -> root + "-" + type).toList());
+            }
+            var create = SessionRequestBuilder.buildCreateRequest(
+                    new SessionConfig().setWorkingDirectory("request-cwd").setEnableConfigDiscovery(false)
+                            .setEnableFileHooks(false).setSkillDirectories(directories.get("skillDirectories"))
+                            .setAgentDirectories(directories.get("agentDirectories"))
+                            .setInstructionDirectories(directories.get("instructionDirectories"))
+                            .setHookDirectories(directories.get("hookDirectories")),
+                    "created");
+            var resume = SessionRequestBuilder.buildResumeRequest("resumed",
+                    new ResumeSessionConfig().setWorkingDirectory("resume-cwd").setEnableConfigDiscovery(false)
+                            .setEnableFileHooks(false).setSkillDirectories(directories.get("skillDirectories"))
+                            .setAgentDirectories(directories.get("agentDirectories"))
+                            .setInstructionDirectories(directories.get("instructionDirectories"))
+                            .setHookDirectories(directories.get("hookDirectories")));
+            for (var request : List.of(create, resume)) {
+                var wire = mapper.readTree(mapper.writeValueAsBytes(request));
+                for (var entry : directories.entrySet()) {
+                    if (entry.getValue() == null) {
+                        assertFalse(wire.has(entry.getKey()), wire.toString());
+                    } else {
+                        assertEquals(mapper.valueToTree(entry.getValue()), wire.get(entry.getKey()));
+                    }
+                }
+                assertFalse(wire.path("enableConfigDiscovery").asBoolean(true));
+                assertFalse(wire.path("enableFileHooks").asBoolean(true));
+                assertFalse(wire.has("additionalDirectories"));
+                assertFalse(wire.has("customAgents"));
+                assertFalse(wire.path("hooks").asBoolean());
+            }
+        }
+    }
+
+    @Test
+    void customizationDirectoryClonesOwnTheirLists() {
+        var agents = new ArrayList<>(List.of("agents"));
+        var hooks = new ArrayList<>(List.of("hooks"));
+        var create = new SessionConfig().setAgentDirectories(agents).setHookDirectories(hooks);
+        var resume = new ResumeSessionConfig().setAgentDirectories(agents).setHookDirectories(hooks);
+        var createClone = create.clone();
+        var resumeClone = resume.clone();
+        agents.add("added-agents");
+        hooks.add("added-hooks");
+        assertEquals(List.of("agents"), create.getAgentDirectories());
+        assertEquals(List.of("hooks"), create.getHookDirectories());
+        assertEquals(List.of("agents"), resume.getAgentDirectories());
+        assertEquals(List.of("hooks"), resume.getHookDirectories());
+        assertEquals(List.of("agents"), createClone.getAgentDirectories());
+        assertEquals(List.of("hooks"), createClone.getHookDirectories());
+        assertEquals(List.of("agents"), resumeClone.getAgentDirectories());
+        assertEquals(List.of("hooks"), resumeClone.getHookDirectories());
+        assertThrows(UnsupportedOperationException.class, () -> createClone.getAgentDirectories().add("mutation"));
+        assertThrows(UnsupportedOperationException.class, () -> resumeClone.getHookDirectories().add("mutation"));
+        assertThrows(UnsupportedOperationException.class, () -> create.getAgentDirectories().add("mutation"));
+        assertThrows(UnsupportedOperationException.class, () -> resume.getHookDirectories().add("mutation"));
+    }
+
     // =========================================================================
     // buildCreateRequest
     // =========================================================================
@@ -111,6 +178,7 @@ void testBuildCreateRequestNullConfig() {
         assertNull(request.getModel());
         assertTrue(request.getRequestPermission(), "requestPermission should be true even for null config");
         assertEquals("direct", request.getEnvValueMode(), "envValueMode should be 'direct' even for null config");
+        assertNull(request.getHasSkillProvider());
     }
 
     @Test
@@ -162,6 +230,36 @@ void askUserVariantDefaultsToOmittedLegacyBehavior() throws Exception {
         assertFalse(mapper.readTree(mapper.writeValueAsBytes(resumeRequest)).has("askUserVariant"));
     }
 
+    @Test
+    @AllowCopilotExperimental
+    void skillProviderFlagIsForwardedAndSerializedForCreateAndResume() throws Exception {
+        SkillProvider provider = testSkillProvider();
+        var mapper = JsonRpcClient.getObjectMapper();
+
+        var createRequest = SessionRequestBuilder.buildCreateRequest(new SessionConfig().setSkillProvider(provider),
+                "skill-provider-create");
+        var resumeRequest = SessionRequestBuilder.buildResumeRequest("skill-provider-resume",
+                new ResumeSessionConfig().setSkillProvider(provider));
+
+        assertTrue(createRequest.getHasSkillProvider());
+        assertTrue(resumeRequest.getHasSkillProvider());
+        assertTrue(mapper.readTree(mapper.writeValueAsBytes(createRequest)).path("hasSkillProvider").asBoolean());
+        assertTrue(mapper.readTree(mapper.writeValueAsBytes(resumeRequest)).path("hasSkillProvider").asBoolean());
+    }
+
+    @Test
+    void skillProviderFlagIsOmittedWhenUnset() throws Exception {
+        var mapper = JsonRpcClient.getObjectMapper();
+        var createRequest = SessionRequestBuilder.buildCreateRequest(new SessionConfig(), "skill-provider-create");
+        var resumeRequest = SessionRequestBuilder.buildResumeRequest("skill-provider-resume",
+                new ResumeSessionConfig());
+
+        assertNull(createRequest.getHasSkillProvider());
+        assertNull(resumeRequest.getHasSkillProvider());
+        assertFalse(mapper.readTree(mapper.writeValueAsBytes(createRequest)).has("hasSkillProvider"));
+        assertFalse(mapper.readTree(mapper.writeValueAsBytes(resumeRequest)).has("hasSkillProvider"));
+    }
+
     @Test
     void diagnosticsAreForwardedAndOmittedForCreateAndColdResume() throws Exception {
         var mapper = JsonRpcClient.getObjectMapper();
@@ -399,6 +497,7 @@ void testBuildResumeRequestNullConfig() {
         assertNull(request.getContinuePendingWork());
         assertTrue(request.getRequestPermission(), "requestPermission should be true even for null config");
         assertEquals("direct", request.getEnvValueMode(), "envValueMode should be 'direct' even for null config");
+        assertNull(request.getHasSkillProvider());
     }
 
     @Test
@@ -850,6 +949,17 @@ void configureSessionWithNullConfig_returnsEarly() {
         assertDoesNotThrow(() -> SessionRequestBuilder.configureSession(session, (SessionConfig) null));
     }
 
+    @Test
+    @AllowCopilotExperimental
+    void configureSessionWithSkillProvider_registersProvider() {
+        CopilotSession session = new CopilotSession("session-1", null);
+        SkillProvider provider = testSkillProvider();
+
+        SessionRequestBuilder.configureSession(session, new SessionConfig().setSkillProvider(provider));
+
+        assertSame(provider, session.getSkillProvider());
+    }
+
     @Test
     void configureSessionWithCommands_registersCommands() {
         CopilotSession session = new CopilotSession("session-1", null);
@@ -922,6 +1032,17 @@ void configureResumedSessionWithOnEvent_registersEventHandler() {
         SessionRequestBuilder.configureSession(session, config);
     }
 
+    @Test
+    @AllowCopilotExperimental
+    void configureResumedSessionWithSkillProvider_registersProvider() {
+        CopilotSession session = new CopilotSession("session-1", null);
+        SkillProvider provider = testSkillProvider();
+
+        SessionRequestBuilder.configureSession(session, new ResumeSessionConfig().setSkillProvider(provider));
+
+        assertSame(provider, session.getSkillProvider());
+    }
+
     @Test
     void testBuildCreateRequestWithDefaultAgent() {
         var defaultAgent = new DefaultAgentConfig().setExcludedTools(List.of("secret_tool"));
@@ -1300,4 +1421,19 @@ void githubMcpToolConfigIsMappedAndSerializedForCreateAndResume() throws Excepti
                 mapper.writeValueAsString(SessionRequestBuilder.buildCreateRequest(new SessionConfig(), "session-2"))
                         .contains("\"githubMcpToolConfig\""));
     }
+
+    @AllowCopilotExperimental
+    private static SkillProvider testSkillProvider() {
+        return new SkillProvider() {
+            @Override
+            public CompletableFuture<List<SkillProviderDescriptor>> listSkills() {
+                return CompletableFuture.completedFuture(List.of());
+            }
+
+            @Override
+            public CompletableFuture<String> readSkill(String name) {
+                return CompletableFuture.completedFuture(null);
+            }
+        };
+    }
 }
diff --git a/java/sdk/src/test/java/com/github/copilot/SetToolsTest.java b/java/sdk/src/test/java/com/github/copilot/SetToolsTest.java
index 6f4723ce58..267d1375e4 100644
--- a/java/sdk/src/test/java/com/github/copilot/SetToolsTest.java
+++ b/java/sdk/src/test/java/com/github/copilot/SetToolsTest.java
@@ -173,6 +173,32 @@ void cancellingWhileQueuedSendsNothing() throws Exception {
         assertNull(session.getTool("queued"));
     }
 
+    @Test
+    void closeRejectsLateAcknowledgementsAndQueuedReplacements() throws Exception {
+        var accepted = new CompletableFuture<Void>();
+        var requests = captureSetToolsRequests(accepted);
+        when(rpc.invoke(eq("session.detach"), any(), eq(CopilotSession.SessionDetachResponse.class)))
+                .thenReturn(CompletableFuture.completedFuture(new CopilotSession.SessionDetachResponse(true, null)));
+
+        var pending = session.setTools(List.of(tool("pending", "Pending", "first", new CopyOnWriteArrayList<>())));
+        var queued = session.setTools(List.of(tool("queued", "Queued", "second", new CopyOnWriteArrayList<>())));
+        assertEquals(1, requests.size(), "Only the admitted replacement may reach the RPC boundary");
+        assertFalse(pending.isDone());
+        assertFalse(queued.isDone());
+
+        session.close();
+        assertTrue(accepted.complete(null), "Acknowledge the admitted replacement only after retirement");
+
+        var pendingError = assertThrows(ExecutionException.class, () -> pending.get(1, TimeUnit.SECONDS));
+        var queuedError = assertThrows(ExecutionException.class, () -> queued.get(1, TimeUnit.SECONDS));
+        assertInstanceOf(IllegalStateException.class, pendingError.getCause());
+        assertInstanceOf(IllegalStateException.class, queuedError.getCause());
+        assertEquals("Session is closed", pendingError.getCause().getMessage());
+        assertEquals("Session is closed", queuedError.getCause().getMessage());
+        assertEquals(1, requests.size(), "A replacement queued before retirement must not start afterwards");
+        assertThrows(IllegalStateException.class, () -> session.setTools(List.of()));
+    }
+
     private List<ObjectNode> captureSetToolsRequests(CompletableFuture<Void> result) {
         var requests = new ArrayList<ObjectNode>();
         when(rpc.invoke(eq("session.tools.set"), any(), eq(Void.class))).thenAnswer(invocation -> {
diff --git a/java/sdk/src/test/java/com/github/copilot/SkillProviderTest.java b/java/sdk/src/test/java/com/github/copilot/SkillProviderTest.java
new file mode 100644
index 0000000000..7a4e6f3329
--- /dev/null
+++ b/java/sdk/src/test/java/com/github/copilot/SkillProviderTest.java
@@ -0,0 +1,421 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+package com.github.copilot;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Locale;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import com.github.copilot.generated.AssistantMessageEvent;
+import com.github.copilot.generated.SessionEvent;
+import com.github.copilot.generated.ToolExecutionCompleteEvent;
+import com.github.copilot.generated.rpc.Skill;
+import com.github.copilot.generated.rpc.SkillSource;
+import com.github.copilot.rpc.CloudSessionOptions;
+import com.github.copilot.rpc.MessageOptions;
+import com.github.copilot.rpc.PermissionHandler;
+import com.github.copilot.rpc.ResumeSessionConfig;
+import com.github.copilot.rpc.SessionConfig;
+
+@AllowCopilotExperimental
+class SkillProviderTest {
+
+    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 should_load_provider_skill_lazily_through_skill_tool() throws Exception {
+        ctx.configureForTest("skill_provider", "should_load_provider_skill_lazily_through_skill_tool");
+
+        var provider = new TestSkillProvider(
+                List.of(skill("provider-lookup", "Reports the provider lookup verification word.",
+                        "# Provider lookup\n\nThe verification word is TANGERINE_QUARTZ_19. Reply with it.\n")));
+
+        try (CopilotClient client = ctx.createClient()) {
+            CopilotSession session = client.createSession(new SessionConfig()
+                    .setOnPermissionRequest(PermissionHandler.APPROVE_ALL).setSkillProvider(provider))
+                    .get(30, TimeUnit.SECONDS);
+
+            try {
+                Skill listed = session.getRpc().skills.list().get(30, TimeUnit.SECONDS).skills().stream()
+                        .filter(s -> "provider-lookup".equals(s.name())).findFirst().orElse(null);
+                assertNotNull(listed, "Expected provider-lookup to be listed");
+                assertEquals(SkillSource.SDK, listed.source());
+                assertTrue(listed.enabled());
+                assertEquals("", listed.path() == null ? "" : listed.path());
+                assertEquals(List.of(), provider.reads());
+
+                AssistantMessageEvent message = session.sendAndWait(new MessageOptions().setPrompt(
+                        "Use the skill tool to load the provider-lookup skill, then reply with its verification word."),
+                        60_000).get(90, TimeUnit.SECONDS);
+
+                assertEquals(List.of("provider-lookup"), provider.reads());
+                // Validate the final assistant response arrived (guards against truncated
+                // captures)
+                assertTrue(assistantText(message).contains("TANGERINE_QUARTZ_19"));
+            } finally {
+                session.close();
+            }
+        }
+    }
+
+    @Test
+    void should_load_provider_and_file_based_skills_together() throws Exception {
+        ctx.configureForTest("skill_provider", "should_load_provider_and_file_based_skills_together");
+
+        Path skillsDir = ctx.getWorkDir().resolve("file-skills");
+        Files.createDirectories(skillsDir.resolve("file-notes"));
+        Files.writeString(skillsDir.resolve("file-notes").resolve("SKILL.md"),
+                "---\nname: file-notes\ndescription: Reports the file notes verification word.\n---\n\nThe file notes verification word is MAPLE_FALCON_27.\n");
+
+        var provider = new TestSkillProvider(List.of(skill("provider-audit",
+                "Reports the provider audit verification word.",
+                "---\nname: provider-audit\nallowed-tools: view\n---\n\nThe provider audit verification word is COBALT_HERON_58.\n")));
+
+        try (CopilotClient client = ctx.createClient()) {
+            CopilotSession session = client
+                    .createSession(new SessionConfig().setOnPermissionRequest(PermissionHandler.APPROVE_ALL)
+                            .setSkillDirectories(List.of(skillsDir.toString())).setSkillProvider(provider))
+                    .get(30, TimeUnit.SECONDS);
+
+            try {
+                List<Skill> skills = session.getRpc().skills.list().get(30, TimeUnit.SECONDS).skills();
+                Skill fileSkill = findSkill(skills, "file-notes");
+                Skill providerSkill = findSkill(skills, "provider-audit");
+                assertNotNull(fileSkill, "Expected file-notes to be listed");
+                assertNotEquals(SkillSource.SDK, fileSkill.source());
+                assertNotNull(fileSkill.path());
+                assertNotNull(providerSkill, "Expected provider-audit to be listed");
+                assertEquals(SkillSource.SDK, providerSkill.source());
+
+                AssistantMessageEvent message = session.sendAndWait(new MessageOptions().setPrompt(
+                        "Use the skill tool to load the file-notes skill and the provider-audit skill, then reply with both verification words."),
+                        60_000).get(90, TimeUnit.SECONDS);
+
+                assertEquals(List.of("provider-audit"), provider.reads());
+                assertTrue(assistantText(message).contains("MAPLE_FALCON_27"));
+                // Validate the final assistant response arrived (guards against truncated
+                // captures)
+                assertTrue(assistantText(message).contains("COBALT_HERON_58"));
+            } finally {
+                session.close();
+            }
+        }
+    }
+
+    @Test
+    void should_rebind_skill_provider_on_resume() throws Exception {
+        ctx.configureForTest("skill_provider", "should_rebind_skill_provider_on_resume");
+
+        var original = new TestSkillProvider(List.of(skill("rebind-check", "Reports the rebind verification word.",
+                "The rebind verification word is AMBER_ALPHA_11.\n")));
+        var replacement = new TestSkillProvider(List.of(skill("rebind-check", "Reports the rebind verification word.",
+                "The rebind verification word is BRONZE_BETA_22.\n")));
+
+        try (CopilotClient client = ctx.createClient()) {
+            CopilotSession first = client.createSession(new SessionConfig()
+                    .setOnPermissionRequest(PermissionHandler.APPROVE_ALL).setSkillProvider(original))
+                    .get(30, TimeUnit.SECONDS);
+            String sessionId = first.getSessionId();
+            AssistantMessageEvent ready = first
+                    .sendAndWait(new MessageOptions()
+                            .setPrompt("Without using any tools or skills, reply with exactly REBIND_READY."), 60_000)
+                    .get(90, TimeUnit.SECONDS);
+            assertTrue(assistantText(ready).contains("REBIND_READY"));
+            first.close();
+            assertEquals(List.of(), original.reads());
+            int originalCallsBeforeResume = original.callCount();
+
+            CopilotSession session = client
+                    .resumeSession(sessionId, new ResumeSessionConfig()
+                            .setOnPermissionRequest(PermissionHandler.APPROVE_ALL).setSkillProvider(replacement))
+                    .get(30, TimeUnit.SECONDS);
+
+            try {
+                AssistantMessageEvent message = session.sendAndWait(new MessageOptions().setPrompt(
+                        "Use the skill tool to load the rebind-check skill, then reply with its verification word."),
+                        60_000).get(90, TimeUnit.SECONDS);
+
+                assertEquals(List.of("rebind-check"), replacement.reads());
+                assertEquals(originalCallsBeforeResume, original.callCount());
+                // Validate the final assistant response arrived (guards against truncated
+                // captures)
+                assertTrue(assistantText(message).contains("BRONZE_BETA_22"));
+                assertFalse(assistantText(message).contains("AMBER_ALPHA_11"));
+            } finally {
+                session.close();
+            }
+        }
+    }
+
+    @Test
+    void should_report_provider_read_failure_without_leaking_details() throws Exception {
+        ctx.configureForTest("skill_provider", "should_report_provider_read_failure_without_leaking_details");
+
+        String secret = "PROVIDER_SECRET_7F3A9C";
+        var provider = new TestSkillProvider(List.of(new ProvidedSkill(new SkillProviderDescriptor("broken-lookup",
+                "Reports the broken lookup verification word.", null, null, null), () -> {
+                    throw new IllegalStateException("database unavailable: " + secret);
+                })));
+        List<SessionEvent> events = new CopyOnWriteArrayList<>();
+
+        try (CopilotClient client = ctx.createClient()) {
+            CopilotSession session = client.createSession(new SessionConfig()
+                    .setOnPermissionRequest(PermissionHandler.APPROVE_ALL).setSkillProvider(provider))
+                    .get(30, TimeUnit.SECONDS);
+            session.on(events::add);
+
+            try {
+                AssistantMessageEvent message = session.sendAndWait(new MessageOptions().setPrompt(
+                        "Use the skill tool to load the broken-lookup skill. If loading fails, reply with exactly LOAD_FAILED."),
+                        60_000).get(90, TimeUnit.SECONDS);
+
+                assertTrue(provider.reads().contains("broken-lookup"));
+                List<ToolExecutionCompleteEvent> failures = failedToolExecutions(events);
+                assertEquals(1, failures.size());
+                assertFalse(JsonRpcClient.getObjectMapper().writeValueAsString(events).contains(secret));
+                // Validate the final assistant response arrived (guards against truncated
+                // captures)
+                assertTrue(assistantText(message).contains("LOAD_FAILED"));
+            } finally {
+                session.close();
+            }
+        }
+    }
+
+    @Test
+    void should_report_missing_provider_skill_as_not_found() throws Exception {
+        ctx.configureForTest("skill_provider", "should_report_missing_provider_skill_as_not_found");
+
+        var provider = new TestSkillProvider(List.of(new ProvidedSkill(new SkillProviderDescriptor("vanished-lookup",
+                "Reports the vanished lookup verification word.", null, null, null), () -> null)));
+        List<SessionEvent> events = new CopyOnWriteArrayList<>();
+
+        try (CopilotClient client = ctx.createClient()) {
+            CopilotSession session = client.createSession(new SessionConfig()
+                    .setOnPermissionRequest(PermissionHandler.APPROVE_ALL).setSkillProvider(provider))
+                    .get(30, TimeUnit.SECONDS);
+            session.on(events::add);
+
+            try {
+                AssistantMessageEvent message = session.sendAndWait(new MessageOptions().setPrompt(
+                        "Use the skill tool to load the vanished-lookup skill. If loading fails, reply with exactly LOAD_FAILED."),
+                        60_000).get(90, TimeUnit.SECONDS);
+
+                assertTrue(provider.reads().contains("vanished-lookup"));
+                List<ToolExecutionCompleteEvent> failures = failedToolExecutions(events);
+                assertEquals(1, failures.size());
+                String failureJson = JsonRpcClient.getObjectMapper().writeValueAsString(failures.get(0))
+                        .toLowerCase(Locale.ROOT);
+                assertTrue(failureJson.contains("not found"), "Expected not found failure, got: " + failureJson);
+                // Validate the final assistant response arrived (guards against truncated
+                // captures)
+                assertTrue(assistantText(message).contains("LOAD_FAILED"));
+            } finally {
+                session.close();
+            }
+        }
+    }
+
+    @Test
+    void should_keep_provider_dormant_when_skills_disabled() throws Exception {
+        ctx.initializeProxy();
+
+        var provider = new TestSkillProvider(List.of(skill("dormant-lookup", "Never listed.", "Never read.\n")));
+
+        try (CopilotClient client = ctx.createClient()) {
+            CopilotSession session = client
+                    .createSession(new SessionConfig().setOnPermissionRequest(PermissionHandler.APPROVE_ALL)
+                            .setEnableSkills(false).setSkillProvider(provider))
+                    .get(30, TimeUnit.SECONDS);
+
+            try {
+                session.getRpc().skills.ensureLoaded().get(30, TimeUnit.SECONDS);
+                List<Skill> skills = session.getRpc().skills.list().get(30, TimeUnit.SECONDS).skills();
+
+                assertEquals(List.of(), sdkSkills(skills));
+                assertEquals(List.of(), provider.calls());
+            } finally {
+                session.close();
+            }
+        }
+    }
+
+    @Test
+    void should_unbind_provider_when_resumed_without_one() throws Exception {
+        ctx.initializeProxy();
+
+        var provider = new TestSkillProvider(
+                List.of(skill("unbound-lookup", "Reports the unbound lookup word.", "Unbound.\n")));
+
+        try (CopilotClient client = ctx.createClient()) {
+            CopilotSession first = client.createSession(new SessionConfig()
+                    .setOnPermissionRequest(PermissionHandler.APPROVE_ALL).setSkillProvider(provider))
+                    .get(30, TimeUnit.SECONDS);
+            List<Skill> before = first.getRpc().skills.list().get(30, TimeUnit.SECONDS).skills();
+            assertTrue(before.stream().anyMatch(s -> "unbound-lookup".equals(s.name())));
+            int callsBeforeResume = provider.callCount();
+
+            CopilotSession session = client
+                    .resumeSession(first.getSessionId(),
+                            new ResumeSessionConfig().setOnPermissionRequest(PermissionHandler.APPROVE_ALL))
+                    .get(30, TimeUnit.SECONDS);
+
+            try {
+                session.getRpc().skills.reload().get(30, TimeUnit.SECONDS);
+                List<Skill> skills = session.getRpc().skills.list().get(30, TimeUnit.SECONDS).skills();
+
+                assertEquals(List.of(), sdkSkills(skills));
+                assertEquals(callsBeforeResume, provider.callCount());
+            } finally {
+                session.close();
+            }
+        }
+    }
+
+    @Test
+    void should_cancel_a_blocked_provider_call_when_the_session_disconnects() throws Exception {
+        ctx.initializeProxy();
+
+        var entered = new CountDownLatch(1);
+        var pending = new CompletableFuture<List<SkillProviderDescriptor>>();
+        var provider = new SkillProvider() {
+            @Override
+            public CompletableFuture<List<SkillProviderDescriptor>> listSkills() {
+                entered.countDown();
+                return pending;
+            }
+
+            @Override
+            public CompletableFuture<String> readSkill(String name) {
+                return CompletableFuture.completedFuture(null);
+            }
+        };
+
+        try (CopilotClient client = ctx.createClient()) {
+            CopilotSession session = client.createSession(new SessionConfig()
+                    .setOnPermissionRequest(PermissionHandler.APPROVE_ALL).setSkillProvider(provider))
+                    .get(30, TimeUnit.SECONDS);
+
+            // The list RPC fails once the binding is removed; only the provider's
+            // cancellation matters here.
+            session.getRpc().skills.list();
+            assertTrue(entered.await(30, TimeUnit.SECONDS), "provider listSkills was not called");
+
+            session.close();
+            assertThrows(CancellationException.class, () -> pending.get(10, TimeUnit.SECONDS));
+        }
+    }
+
+    @Test
+    void should_reject_skill_provider_for_cloud_sessions() throws Exception {
+        ctx.initializeProxy();
+
+        var provider = new TestSkillProvider(List.of(skill("cloud-lookup", "Never listed.", "Never read.\n")));
+
+        try (CopilotClient client = ctx.createClient()) {
+            var config = new SessionConfig().setOnPermissionRequest(PermissionHandler.APPROVE_ALL)
+                    .setCloud(new CloudSessionOptions()).setSkillProvider(provider);
+
+            ExecutionException error = assertThrows(ExecutionException.class,
+                    () -> client.createSession(config).get(30, TimeUnit.SECONDS));
+            assertInstanceOf(IllegalArgumentException.class, error.getCause());
+            assertEquals("Skill providers are not supported for cloud sessions.", error.getCause().getMessage());
+            assertEquals(List.of(), provider.calls());
+        }
+    }
+
+    private static ProvidedSkill skill(String name, String description, String markdown) {
+        return new ProvidedSkill(new SkillProviderDescriptor(name, description, null, null, null), () -> markdown);
+    }
+
+    private static Skill findSkill(List<Skill> skills, String name) {
+        return skills.stream().filter(s -> name.equals(s.name())).findFirst().orElse(null);
+    }
+
+    private static List<Skill> sdkSkills(List<Skill> skills) {
+        return skills.stream().filter(s -> s.source() == SkillSource.SDK).toList();
+    }
+
+    private static List<ToolExecutionCompleteEvent> failedToolExecutions(List<SessionEvent> events) {
+        return events.stream().filter(ToolExecutionCompleteEvent.class::isInstance)
+                .map(ToolExecutionCompleteEvent.class::cast)
+                .filter(event -> !Boolean.TRUE.equals(event.getData().success())).toList();
+    }
+
+    private static String assistantText(AssistantMessageEvent response) {
+        assertNotNull(response, "Expected a response from the assistant");
+        assertNotNull(response.getData(), "Expected assistant response data");
+        assertNotNull(response.getData().content(), "Expected assistant response content");
+        return response.getData().content();
+    }
+
+    private record ProvidedSkill(SkillProviderDescriptor descriptor, Supplier<String> reader) {
+        String read() {
+            return reader.get();
+        }
+    }
+
+    private static final class TestSkillProvider implements SkillProvider {
+        private final List<String> calls = new CopyOnWriteArrayList<>();
+        private final List<ProvidedSkill> skills;
+
+        private TestSkillProvider(List<ProvidedSkill> skills) {
+            this.skills = skills;
+        }
+
+        List<String> calls() {
+            return List.copyOf(calls);
+        }
+
+        int callCount() {
+            return calls.size();
+        }
+
+        List<String> reads() {
+            return calls.stream().filter(call -> call.startsWith("read:")).map(call -> call.substring("read:".length()))
+                    .toList();
+        }
+
+        @Override
+        public CompletableFuture<List<SkillProviderDescriptor>> listSkills() {
+            calls.add("list");
+            return CompletableFuture.completedFuture(skills.stream().map(ProvidedSkill::descriptor).toList());
+        }
+
+        @Override
+        public CompletableFuture<String> readSkill(String name) {
+            calls.add("read:" + name);
+            return CompletableFuture
+                    .completedFuture(skills.stream().filter(skill -> skill.descriptor().name().equals(name)).findFirst()
+                            .map(ProvidedSkill::read).orElse(null));
+        }
+    }
+}
diff --git a/java/sdk/src/test/java/com/github/copilot/StdioShutdownIT.java b/java/sdk/src/test/java/com/github/copilot/StdioShutdownIT.java
index ed3200e671..9bfb98c277 100644
--- a/java/sdk/src/test/java/com/github/copilot/StdioShutdownIT.java
+++ b/java/sdk/src/test/java/com/github/copilot/StdioShutdownIT.java
@@ -7,8 +7,15 @@
 import com.github.copilot.rpc.CopilotClientOptions;
 
 import java.nio.file.Files;
+import java.nio.file.FileSystems;
 import java.nio.file.Path;
+import java.nio.file.StandardWatchEventKinds;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
 import java.util.Comparator;
+import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
@@ -42,6 +49,72 @@ void closeWaitsForCleanupAfterStdinEof() throws Exception {
         }
     }
 
+    @Test
+    void failedShutdownStillWaitsForCleanupAfterStdinEof() throws Exception {
+        try (var fixture = new Fixture("shutdown-error"); var watcher = FileSystems.getDefault().newWatchService()) {
+            fixture.client.start().get(30, TimeUnit.SECONDS);
+            fixture.directory.register(watcher, StandardWatchEventKinds.ENTRY_CREATE);
+            Path eof = fixture.marker.resolveSibling(fixture.marker.getFileName() + ".eof");
+            Path release = fixture.marker.resolveSibling(fixture.marker.getFileName() + ".release");
+            var stopping = fixture.client.stop();
+            long deadline = System.nanoTime() + TimeUnit.SECONDS.toNanos(5);
+            while (!Files.isRegularFile(eof)) {
+                var key = watcher.poll(Math.max(0, deadline - System.nanoTime()), TimeUnit.NANOSECONDS);
+                assertNotNull(key, "Failed shutdown must still deliver stdin EOF before terminating the runtime");
+                key.pollEvents();
+                assertTrue(key.reset(), "The owned cleanup directory must remain available");
+            }
+            assertFalse(stopping.isDone(), "Shutdown must not return before EOF-driven cleanup completes");
+            Files.writeString(release, "");
+            stopping.get(60, TimeUnit.SECONDS);
+            fixture.assertCleanExit();
+        }
+    }
+
+    @Test
+    void stopPreservesDetachedServiceAfterLauncherAndRuntimeExit() throws Exception {
+        try (var fixture = new Fixture("stop", true, true)) {
+            fixture.client.start().get(30, TimeUnit.SECONDS);
+            fixture.assertServiceResponsive();
+            fixture.client.stop().get(60, TimeUnit.SECONDS);
+            fixture.assertCleanExit();
+            fixture.assertServiceResponsive();
+        }
+    }
+
+    @Test
+    void closePreservesDetachedServiceAfterLauncherAndRuntimeExit() throws Exception {
+        try (var fixture = new Fixture("dispose", true, true)) {
+            fixture.client.start().get(30, TimeUnit.SECONDS);
+            fixture.assertServiceResponsive();
+            fixture.client.close();
+            fixture.assertCleanExit();
+            fixture.assertServiceResponsive();
+        }
+    }
+
+    @Test
+    void stopPreservesDetachedTcpServiceWithoutPeerEof() throws Exception {
+        try (var fixture = new Fixture("stop", true, true, false)) {
+            fixture.client.start().get(30, TimeUnit.SECONDS);
+            fixture.assertServiceResponsive();
+            fixture.client.stop().get(60, TimeUnit.SECONDS);
+            fixture.assertCleanExit();
+            fixture.assertServiceResponsive();
+        }
+    }
+
+    @Test
+    void closePreservesDetachedTcpServiceWithoutPeerEof() throws Exception {
+        try (var fixture = new Fixture("dispose", true, true, false)) {
+            fixture.client.start().get(30, TimeUnit.SECONDS);
+            fixture.assertServiceResponsive();
+            fixture.client.close();
+            fixture.assertCleanExit();
+            fixture.assertServiceResponsive();
+        }
+    }
+
     @Test
     void forceStopDoesNotWaitForGracefulCleanup() throws Exception {
         try (var fixture = new Fixture("force")) {
@@ -76,6 +149,15 @@ void closeTerminatesChildThatDoesNotExitAfterEof() throws Exception {
         }
     }
 
+    @Test
+    void stopTerminatesLauncherAndItsChildAfterEof() throws Exception {
+        try (var fixture = new Fixture("fallback", true)) {
+            fixture.client.start().get(30, TimeUnit.SECONDS);
+            fixture.client.stop().get(60, TimeUnit.SECONDS);
+            fixture.assertCleanExit();
+        }
+    }
+
     @Test
     void failedStartupTerminatesChild() throws Exception {
         try (var fixture = new Fixture("start-failure")) {
@@ -89,16 +171,96 @@ private static final class Fixture implements AutoCloseable {
         private final Path directory;
         private final Path marker;
         private final Path pid;
+        private final Path launcherPid;
+        private final Path servicePid;
+        private final Path servicePort;
         private final CopilotClient client;
 
         private Fixture(String mode) throws Exception {
+            this(mode, false);
+        }
+
+        private Fixture(String mode, boolean useLauncher) throws Exception {
+            this(mode, useLauncher, false);
+        }
+
+        private Fixture(String mode, boolean useLauncher, boolean detachedService) throws Exception {
+            this(mode, useLauncher, detachedService, true);
+        }
+
+        private Fixture(String mode, boolean useLauncher, boolean detachedService, boolean useStdio) throws Exception {
             directory = Files.createDirectories(Path.of("target", "shutdown-" + UUID.randomUUID()).toAbsolutePath());
             marker = directory.resolve("cleanup.jsonl");
             pid = directory.resolve("pid");
+            launcherPid = useLauncher ? directory.resolve("launcher-pid") : null;
+            servicePid = detachedService ? directory.resolve("service-pid") : null;
+            servicePort = detachedService ? directory.resolve("service-port") : null;
             Path script = Path.of("..", "..", "test", "harness", "stdio-shutdown-runtime.cjs").toAbsolutePath();
             assertTrue(Files.isRegularFile(script), "Shared shutdown fixture must exist");
-            client = new CopilotClient(new CopilotClientOptions().setAutoStart(false).setCliPath("node")
-                    .setCliArgs(new String[]{script.toString(), marker.toString(), mode, pid.toString()}));
+            String nodePath = TestUtil.findExecutableInPath("node");
+            assertNotNull(nodePath, "Node.js was not found in PATH");
+            var args = new ArrayList<String>();
+            if (useLauncher) {
+                Path launcher = directory.resolve("launcher.cjs");
+                Files.writeString(launcher, """
+                        const { spawn } = require("node:child_process");
+                        require("node:fs").writeFileSync(process.argv[2], String(process.pid));
+                        const args = process.argv.slice(3);
+                        const fail = error => { console.error(error); process.exit(1); };
+                        const launch = () => {
+                            if (args[0] === "--in-process-runtime") {
+                                args.shift();
+                                const script = args.shift();
+                                process.argv = [process.execPath, script, ...args];
+                                require(script);
+                                return;
+                            }
+                            const child = spawn(process.execPath, args, { stdio: "inherit" });
+                            child.on("error", fail);
+                            child.on("exit", code => process.exit(code ?? 1));
+                        };
+                        if (args[0] === "--detached-service") {
+                            args.shift();
+                            const service = spawn(process.execPath, ["-e", `
+                                const fs = require("node:fs");
+                                const server = require("node:net").createServer(socket => {
+                                    socket.write(process.argv[3] + ":");
+                                    socket.pipe(socket);
+                                });
+                                server.listen(0, "127.0.0.1", () => {
+                                    fs.writeFileSync(process.argv[1], String(process.pid));
+                                    fs.writeFileSync(process.argv[2], String(server.address().port));
+                                    process.send("ready");
+                                    process.disconnect();
+                                });
+                            `, args.shift(), args.shift(), args.shift()],
+                                { detached: true, stdio: ["ignore", "ignore", "ignore", "ipc"] });
+                            service.on("error", fail);
+                            service.once("message", message => {
+                                if (message !== "ready") return fail(new Error("Unexpected service handshake"));
+                                service.unref();
+                                launch();
+                            });
+                        } else {
+                            launch();
+                        }
+                        """);
+                args.add(launcher.toString());
+                args.add(launcherPid.toString());
+                if (detachedService) {
+                    args.addAll(List.of("--detached-service", servicePid.toString(), servicePort.toString(),
+                            directory.getFileName().toString()));
+                }
+            }
+            if (useLauncher && !useStdio) {
+                args.add("--in-process-runtime");
+            }
+            args.addAll(List.of(script.toString(), marker.toString(), mode, pid.toString()));
+            if (!useStdio) {
+                args.add("--fixture-tcp");
+            }
+            client = new CopilotClient(new CopilotClientOptions().setAutoStart(false).setCliPath(nodePath)
+                    .setCliArgs(args.toArray(String[]::new)).setUseStdio(useStdio));
         }
 
         private void assertCleanExit() throws Exception {
@@ -106,7 +268,29 @@ private void assertCleanExit() throws Exception {
             assertExited();
         }
 
+        private void assertServiceResponsive() throws Exception {
+            assertTrue(Files.isRegularFile(servicePort), "The detached service must acknowledge readiness");
+            try (var socket = new Socket()) {
+                socket.connect(new InetSocketAddress("127.0.0.1", Integer.parseInt(Files.readString(servicePort))),
+                        5000);
+                socket.setSoTimeout(5000);
+                String nonce = UUID.randomUUID().toString();
+                byte[] expected = (directory.getFileName() + ":" + nonce).getBytes(StandardCharsets.UTF_8);
+                socket.getOutputStream().write(nonce.getBytes(StandardCharsets.UTF_8));
+                socket.getOutputStream().flush();
+                assertArrayEquals(expected, socket.getInputStream().readNBytes(expected.length),
+                        "The detached service must still serve requests, not merely retain a PID");
+            }
+        }
+
         private void assertExited() throws Exception {
+            assertExited(pid);
+            if (launcherPid != null) {
+                assertExited(launcherPid);
+            }
+        }
+
+        private static void assertExited(Path pid) throws Exception {
             assertTrue(Files.isRegularFile(pid), "Child must have started");
             assertFalse(
                     ProcessHandle.of(Long.parseLong(Files.readString(pid))).map(ProcessHandle::isAlive).orElse(false),
@@ -115,11 +299,21 @@ private void assertExited() throws Exception {
 
         @Override
         public void close() throws Exception {
-            if (Files.isRegularFile(pid)) {
-                var process = ProcessHandle.of(Long.parseLong(Files.readString(pid)));
-                if (process.isPresent() && process.get().isAlive()) {
-                    process.get().destroyForcibly();
-                    process.get().onExit().get(10, TimeUnit.SECONDS);
+            var ownedPids = new ArrayList<Path>();
+            if (servicePid != null) {
+                ownedPids.add(servicePid);
+            }
+            ownedPids.add(pid);
+            if (launcherPid != null) {
+                ownedPids.add(launcherPid);
+            }
+            for (var ownedPid : ownedPids) {
+                if (Files.isRegularFile(ownedPid)) {
+                    var process = ProcessHandle.of(Long.parseLong(Files.readString(ownedPid)));
+                    if (process.isPresent() && process.get().isAlive()) {
+                        process.get().destroyForcibly();
+                        process.get().onExit().get(10, TimeUnit.SECONDS);
+                    }
                 }
             }
             client.close();
diff --git a/java/sdk/src/test/java/com/github/copilot/StreamingFidelityTest.java b/java/sdk/src/test/java/com/github/copilot/StreamingFidelityTest.java
index 70fe06272d..903d18ae3d 100644
--- a/java/sdk/src/test/java/com/github/copilot/StreamingFidelityTest.java
+++ b/java/sdk/src/test/java/com/github/copilot/StreamingFidelityTest.java
@@ -8,7 +8,6 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.TimeUnit;
@@ -65,7 +64,7 @@ void testShouldProduceDeltaEventsWhenStreamingIsEnabled() throws Exception {
             CopilotSession session = client.createSession(
                     new SessionConfig().setOnPermissionRequest(PermissionHandler.APPROVE_ALL).setStreaming(true)).get();
 
-            List<SessionEvent> events = new ArrayList<>();
+            List<SessionEvent> events = new CopyOnWriteArrayList<>();
             session.on(events::add);
 
             session.sendAndWait(new MessageOptions().setPrompt("Count from 1 to 5, separated by commas.")).get(60,
@@ -112,7 +111,7 @@ void testShouldNotProduceDeltasWhenStreamingIsDisabled() throws Exception {
                     new SessionConfig().setOnPermissionRequest(PermissionHandler.APPROVE_ALL).setStreaming(false))
                     .get();
 
-            List<SessionEvent> events = new ArrayList<>();
+            List<SessionEvent> events = new CopyOnWriteArrayList<>();
             session.on(events::add);
 
             session.sendAndWait(new MessageOptions().setPrompt("Say 'hello world'.")).get(60, TimeUnit.SECONDS);
@@ -260,7 +259,7 @@ void testShouldEmitStreamingDeltasWithReasoningEffortConfigured() throws Excepti
                                 .setModel("gpt-5.4").setStreaming(true).setReasoningEffort("high"))
                         .get();
 
-                List<SessionEvent> events = new ArrayList<>();
+                List<SessionEvent> events = new CopyOnWriteArrayList<>();
                 session.on(events::add);
 
                 session.sendAndWait(new MessageOptions().setPrompt("What is 15 * 17?")).get(60, TimeUnit.SECONDS);
diff --git a/java/sdk/src/test/java/com/github/copilot/SubagentHooksE2ETest.java b/java/sdk/src/test/java/com/github/copilot/SubagentHooksE2ETest.java
index 536a33cb95..bc83502f87 100644
--- a/java/sdk/src/test/java/com/github/copilot/SubagentHooksE2ETest.java
+++ b/java/sdk/src/test/java/com/github/copilot/SubagentHooksE2ETest.java
@@ -157,8 +157,7 @@ void shouldApplySubagentLifecycleHookOutputs() throws Exception {
                         SubagentStartHookInput start = subagentStarts.element();
                         assertEquals(session.getSessionId(), start.sessionId());
                         assertTrue(start.timestamp() > 0);
-                        assertEquals(ctx.getWorkDir().toAbsolutePath().normalize(),
-                                Path.of(start.cwd()).toAbsolutePath().normalize());
+                        assertEquals(ctx.getWorkDir().toRealPath(), Path.of(start.cwd()).toRealPath());
                         assertNotNull(start.transcriptPath());
                         assertEquals("explore", start.agentName());
                         assertNull(start.agentDisplayName());
diff --git a/java/sdk/src/test/java/com/github/copilot/TestUtil.java b/java/sdk/src/test/java/com/github/copilot/TestUtil.java
index 8e90c2f48f..b8ac48748e 100644
--- a/java/sdk/src/test/java/com/github/copilot/TestUtil.java
+++ b/java/sdk/src/test/java/com/github/copilot/TestUtil.java
@@ -95,7 +95,7 @@ static String preparePinnedCli(Path repoRoot) throws Exception {
         return output;
     }
 
-    private static String findExecutableInPath(String name) {
+    static String findExecutableInPath(String name) {
         var pathValue = System.getenv("PATH");
         if (pathValue == null || pathValue.isEmpty()) {
             return null;
diff --git a/java/sdk/src/test/java/com/github/copilot/TimeoutEdgeCaseTest.java b/java/sdk/src/test/java/com/github/copilot/TimeoutEdgeCaseTest.java
index 01530bc25f..4eee8f5f97 100644
--- a/java/sdk/src/test/java/com/github/copilot/TimeoutEdgeCaseTest.java
+++ b/java/sdk/src/test/java/com/github/copilot/TimeoutEdgeCaseTest.java
@@ -4,7 +4,10 @@
 
 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;
@@ -16,6 +19,8 @@
 import java.net.Socket;
 import java.nio.charset.StandardCharsets;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
 
 import org.junit.jupiter.api.Test;
 
@@ -84,10 +89,7 @@ public synchronized void flush() throws IOException {
      * After {@code close()}, the future returned by {@code sendAndWait} must NOT be
      * completed by a stale timeout.
      * <p>
-     * Contract: {@code close()} shuts down the timeout scheduler before the
-     * blocking {@code session.detach} RPC call, so any pending timeout task is
-     * cancelled and the future remains incomplete (not exceptionally completed with
-     * {@code TimeoutException}).
+     * Closing fails the pending response with {@code IllegalStateException}.
      */
     @Test
     void testTimeoutDoesNotFireAfterSessionClose() throws Exception {
@@ -100,12 +102,12 @@ void testTimeoutDoesNotFireAfterSessionClose() throws Exception {
 
                 assertFalse(result.isDone(), "Future should be pending before timeout fires");
 
-                // close() blocks up to 5s on session.detach RPC. The 2s timeout
-                // fires during that window with the current per-call scheduler.
                 session.close();
 
-                assertFalse(result.isDone(), "Future should not be completed by a timeout after session is closed. "
-                        + "The per-call ScheduledExecutorService leaked a TimeoutException.");
+                ExecutionException error = assertThrows(ExecutionException.class,
+                        () -> result.get(5, TimeUnit.SECONDS));
+                IllegalStateException failure = assertInstanceOf(IllegalStateException.class, error.getCause());
+                assertEquals("Session closed before response completed", failure.getMessage());
             }
         } finally {
             rpc.close();
diff --git a/java/sdk/src/test/java/com/github/copilot/ToolInvocationIdentityTest.java b/java/sdk/src/test/java/com/github/copilot/ToolInvocationIdentityTest.java
new file mode 100644
index 0000000000..116aeeb2cd
--- /dev/null
+++ b/java/sdk/src/test/java/com/github/copilot/ToolInvocationIdentityTest.java
@@ -0,0 +1,78 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+package com.github.copilot;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.*;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
+
+import org.junit.jupiter.api.Test;
+
+import com.github.copilot.generated.ExternalToolRequestedEvent;
+import com.github.copilot.rpc.ToolDefinition;
+import com.github.copilot.rpc.ToolInvocation;
+
+/**
+ * Verifies that a tool handler learns which sub-agent and runtime request are
+ * behind an external tool call.
+ */
+public class ToolInvocationIdentityTest {
+
+    @Test
+    void namesTheSubAgentAndRequestBehindTheCall() throws Exception {
+        var rpc = mock(JsonRpcClient.class);
+        when(rpc.invoke(eq("session.detach"), any(), eq(CopilotSession.SessionDetachResponse.class)))
+                .thenReturn(CompletableFuture.completedFuture(new CopilotSession.SessionDetachResponse(true, null)));
+        var session = new CopilotSession("session-1", rpc);
+        var invocations = new LinkedBlockingQueue<ToolInvocation>();
+        session.registerTools(List.of(ToolDefinition.create("calc", "Calculates", Map.of(), invocation -> {
+            invocations.add(invocation);
+            return new CompletableFuture<Object>();
+        })));
+
+        try {
+            var subAgentCall = externalToolRequested("req-sub-agent", "tc-sub-agent");
+            subAgentCall.setAgentId("task-agent-1");
+            session.dispatchEvent(subAgentCall);
+            session.dispatchEvent(externalToolRequested("req-root", "tc-root"));
+            var blankAgentCall = externalToolRequested("req-blank-agent", "tc-blank-agent");
+            blankAgentCall.setAgentId("");
+            session.dispatchEvent(blankAgentCall);
+
+            var byToolCallId = new HashMap<String, ToolInvocation>();
+            for (int i = 0; i < 3; i++) {
+                var invocation = invocations.poll(1, TimeUnit.SECONDS);
+                assertNotNull(invocation, "tool handler did not start");
+                byToolCallId.put(invocation.getToolCallId(), invocation);
+            }
+
+            var subAgent = byToolCallId.get("tc-sub-agent");
+            assertEquals("task-agent-1", subAgent.getAgentId());
+            assertEquals("req-sub-agent", subAgent.getRequestId());
+            var root = byToolCallId.get("tc-root");
+            assertNull(root.getAgentId());
+            assertEquals("req-root", root.getRequestId());
+            var blankAgent = byToolCallId.get("tc-blank-agent");
+            assertNull(blankAgent.getAgentId());
+            assertEquals("req-blank-agent", blankAgent.getRequestId());
+        } finally {
+            session.close();
+        }
+    }
+
+    private static ExternalToolRequestedEvent externalToolRequested(String requestId, String toolCallId) {
+        var event = new ExternalToolRequestedEvent();
+        event.setData(new ExternalToolRequestedEvent.ExternalToolRequestedEventData(requestId, "session-1", toolCallId,
+                "calc", null, Map.of(), null, null, null));
+        return event;
+    }
+}
diff --git a/java/sdk/src/test/java/com/github/copilot/ToolResultsTest.java b/java/sdk/src/test/java/com/github/copilot/ToolResultsTest.java
index 8278fdf28f..cf3db2541f 100644
--- a/java/sdk/src/test/java/com/github/copilot/ToolResultsTest.java
+++ b/java/sdk/src/test/java/com/github/copilot/ToolResultsTest.java
@@ -6,10 +6,10 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.TimeUnit;
 
 import org.junit.jupiter.api.AfterAll;
@@ -75,7 +75,7 @@ void testShouldHandleToolResultWithRejectedResultType() throws Exception {
             CopilotSession session = client.createSession(new SessionConfig().setTools(List.of(deployTool))
                     .setOnPermissionRequest(PermissionHandler.APPROVE_ALL)).get();
 
-            List<SessionEvent> events = new ArrayList<>();
+            List<SessionEvent> events = new CopyOnWriteArrayList<>();
             session.on(events::add);
 
             session.sendAndWait(new MessageOptions().setPrompt(
@@ -123,7 +123,7 @@ void testShouldHandleToolResultWithDeniedResultType() throws Exception {
             CopilotSession session = client.createSession(new SessionConfig().setTools(List.of(accessTool))
                     .setOnPermissionRequest(PermissionHandler.APPROVE_ALL)).get();
 
-            List<SessionEvent> events = new ArrayList<>();
+            List<SessionEvent> events = new CopyOnWriteArrayList<>();
             session.on(events::add);
 
             session.sendAndWait(new MessageOptions().setPrompt(
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
index 19d9694ce2..3891a9d483 100644
--- a/java/sdk/src/test/java/com/github/copilot/ffi/FfiRuntimeHostTest.java
+++ b/java/sdk/src/test/java/com/github/copilot/ffi/FfiRuntimeHostTest.java
@@ -77,7 +77,7 @@ public boolean connectionClose(int connectionId) {
                 .setRemote(true).setMode(CopilotClientMode.EMPTY).setCliArgs(new String[]{"--extra-flag"});
 
         FfiRuntimeHost host = new FfiRuntimeHost(binding, "/tmp/runtime.node");
-        host.start("/tmp/entrypoint.js", options);
+        host.start("/tmp/entrypoint.js", "github/github-app", options);
 
         List<String> argv = MAPPER.readValue(binding.argv, new TypeReference<List<String>>() {
         });
@@ -92,6 +92,7 @@ public boolean connectionClose(int connectionId) {
         assertTrue(argv.contains("42"));
         assertTrue(argv.contains("--remote"));
         assertTrue(argv.contains("--extra-flag"));
+        assertTrue(argv.contains("--cli-login-sync-integration-id=github/github-app"));
 
         Map<String, String> env = MAPPER.readValue(binding.env, new TypeReference<Map<String, String>>() {
         });
@@ -133,7 +134,7 @@ public boolean connectionClose(int connectionId) {
         };
 
         try (FfiRuntimeHost host = new FfiRuntimeHost(binding, "/tmp/runtime.node")) {
-            host.start(null, new CopilotClientOptions().setLogLevel("debug"));
+            host.start(null, null, new CopilotClientOptions().setLogLevel("debug"));
         }
 
         List<String> argv = MAPPER.readValue(argvJson.get(), new TypeReference<List<String>>() {
@@ -184,7 +185,7 @@ void enqueue(byte[] bytes) {
         };
 
         FfiRuntimeHost host = new FfiRuntimeHost(binding, "test-lib", throwingStream);
-        assertDoesNotThrow(() -> host.start("/tmp/entrypoint", new CopilotClientOptions()));
+        assertDoesNotThrow(() -> host.start("/tmp/entrypoint", null, new CopilotClientOptions()));
         assertTrue(callbackReturned.get(), "callback should return normally even when enqueue throws");
     }
 
@@ -219,7 +220,7 @@ public boolean connectionClose(int connectionId) {
         };
 
         FfiRuntimeHost host = new FfiRuntimeHost(binding, "test-lib");
-        host.start("/tmp/entrypoint", new CopilotClientOptions());
+        host.start("/tmp/entrypoint", null, new CopilotClientOptions());
         assertDoesNotThrow(host::close);
     }
 
@@ -310,7 +311,7 @@ public boolean connectionClose(int connectionId) {
         };
 
         FfiRuntimeHost host = new FfiRuntimeHost(binding, "test-lib");
-        host.start("/tmp/entrypoint", new CopilotClientOptions());
+        host.start("/tmp/entrypoint", null, new CopilotClientOptions());
 
         CompletableFuture<Void> writer = CompletableFuture.runAsync(() -> {
             try {
@@ -389,7 +390,7 @@ void enqueue(byte[] bytes) {
         };
 
         FfiRuntimeHost host = new FfiRuntimeHost(binding, "test-lib", blockingStream);
-        host.start("/tmp/entrypoint", new CopilotClientOptions());
+        host.start("/tmp/entrypoint", null, new CopilotClientOptions());
         assertNotNull(callbackRef.get());
 
         ExecutorService executor = Executors.newFixedThreadPool(2);
diff --git a/java/sdk/src/test/java/com/github/copilot/generated/rpc/GeneratedRpcApiCoverageTest.java b/java/sdk/src/test/java/com/github/copilot/generated/rpc/GeneratedRpcApiCoverageTest.java
index 3eb27a9178..a7ede09723 100644
--- a/java/sdk/src/test/java/com/github/copilot/generated/rpc/GeneratedRpcApiCoverageTest.java
+++ b/java/sdk/src/test/java/com/github/copilot/generated/rpc/GeneratedRpcApiCoverageTest.java
@@ -63,164 +63,184 @@ void newRpcEndpoints_dispatch_expected_method_params_and_result_type(String expe
     }
 
     static Stream<Arguments> newRpcDispatches() {
-        return Stream.of(
-                dispatch("catalog.select", CatalogSelectionResult.class, """
-                        {"contract":{"protocolVersion":3,"requiredCapabilities":["catalog-selection"]},
-                         "sessionId":"catalog-session","selectionRef":"selection-1","outcome":"selected"}
-                        """,
-                        (server, session) -> server.catalog.select(
-                                new CatalogSelectParams(new CatalogClientContract(3L, List.of("catalog-selection")),
-                                        "catalog-session", "selection-1", CatalogSelectionDecision.SELECTED))),
-                dispatch("session.managedSettings.get", SessionManagedSettingsGetResult.class, """
+        return Stream
+                .of(dispatch("session.mcp.list", SessionMcpListResult.class, """
                         {"sessionId":"bound-session"}
-                        """, (server, session) -> session.managedSettings.get()),
-                dispatch("session.instructions.reload", SessionInstructionsGetSourcesResult.class, """
-                        {"sessionId":"bound-session"}
-                        """, (server, session) -> session.instructions.reload()),
-                dispatch("session.customizations.reload", CustomizationsReloadResult.class, """
-                        {"sessionId":"bound-session"}
-                        """, (server, session) -> session.customizations.reload()),
-                dispatch("session.plugins.install", SessionPluginsInstallResult.class, """
-                        {"sessionId":"bound-session","source":"plugin@market"}
-                        """,
-                        (server, session) -> session.plugins
-                                .install(new SessionPluginsInstallParams("foreign-session", "plugin@market"))),
-                dispatch("session.plugins.uninstall", Void.class, """
-                        {"sessionId":"bound-session","name":"plugin","directSourceId":"source-1"}
-                        """,
-                        (server, session) -> session.plugins
-                                .uninstall(new SessionPluginsUninstallParams("foreign-session", "plugin", "source-1"))),
-                dispatch("session.plugins.update", SessionPluginsUpdateResult.class, """
-                        {"sessionId":"bound-session","name":"plugin@market"}
-                        """,
-                        (server, session) -> session.plugins
-                                .update(new SessionPluginsUpdateParams("foreign-session", "plugin@market"))),
-                dispatch("session.plugins.enable", Void.class, """
-                        {"sessionId":"bound-session","names":["first@market","second@market"]}
-                        """,
-                        (server, session) -> session.plugins.enable(new SessionPluginsEnableParams("foreign-session",
-                                List.of("first@market", "second@market")))),
-                dispatch("session.plugins.disable", Void.class, """
-                        {"sessionId":"bound-session","names":["plugin@market"]}
-                        """,
-                        (server, session) -> session.plugins
-                                .disable(new SessionPluginsDisableParams("foreign-session", List.of("plugin@market")))),
-                dispatch("session.plugins.marketplaces.list", SessionPluginsMarketplacesListResult.class, """
-                        {"sessionId":"bound-session"}
-                        """, (server, session) -> session.plugins.marketplaces.list()),
-                dispatch("session.plugins.marketplaces.add", SessionPluginsMarketplacesAddResult.class, """
-                        {"sessionId":"bound-session","source":"./market","workingDirectory":"/workspace"}
-                        """,
-                        (server, session) -> session.plugins.marketplaces.add(
+                        """, (server, session) -> session.mcp.list()),
+                        dispatch("session.mcp.listConfigured", SessionMcpListConfiguredResult.class, """
+                                {"sessionId":"bound-session"}
+                                """, (server, session) -> session.mcp.listConfigured()),
+                        dispatch("catalog.select", CatalogSelectionResult.class, """
+                                {"contract":{"protocolVersion":3,"requiredCapabilities":["catalog-selection"]},
+                                 "sessionId":"catalog-session","selectionRef":"selection-1","outcome":"selected"}
+                                """,
+                                (server, session) -> server.catalog.select(new CatalogSelectParams(
+                                        new CatalogClientContract(3L, List.of("catalog-selection")), "catalog-session",
+                                        "selection-1", CatalogSelectionDecision.SELECTED))),
+                        dispatch("session.managedSettings.get", SessionManagedSettingsGetResult.class, """
+                                {"sessionId":"bound-session"}
+                                """, (server, session) -> session.managedSettings.get()),
+                        dispatch("session.instructions.reload", SessionInstructionsGetSourcesResult.class, """
+                                {"sessionId":"bound-session"}
+                                """, (server, session) -> session.instructions.reload()),
+                        dispatch("session.customizations.reload", CustomizationsReloadResult.class, """
+                                {"sessionId":"bound-session"}
+                                """, (server, session) -> session.customizations.reload()),
+                        dispatch("session.plugins.install", SessionPluginsInstallResult.class, """
+                                {"sessionId":"bound-session","source":"plugin@market"}
+                                """,
+                                (server, session) -> session.plugins
+                                        .install(new SessionPluginsInstallParams("foreign-session", "plugin@market"))),
+                        dispatch("session.plugins.uninstall", Void.class, """
+                                {"sessionId":"bound-session","name":"plugin","directSourceId":"source-1"}
+                                """,
+                                (server, session) -> session.plugins.uninstall(
+                                        new SessionPluginsUninstallParams("foreign-session", "plugin", "source-1"))),
+                        dispatch("session.plugins.update", SessionPluginsUpdateResult.class, """
+                                {"sessionId":"bound-session","name":"plugin@market"}
+                                """,
+                                (server, session) -> session.plugins
+                                        .update(new SessionPluginsUpdateParams("foreign-session", "plugin@market"))),
+                        dispatch("session.plugins.enable", Void.class, """
+                                {"sessionId":"bound-session","names":["first@market","second@market"]}
+                                """,
+                                (server, session) -> session.plugins.enable(new SessionPluginsEnableParams(
+                                        "foreign-session", List.of("first@market", "second@market")))),
+                        dispatch("session.plugins.disable", Void.class, """
+                                {"sessionId":"bound-session","names":["plugin@market"]}
+                                """,
+                                (server, session) -> session.plugins.disable(
+                                        new SessionPluginsDisableParams("foreign-session", List.of("plugin@market")))),
+                        dispatch("session.plugins.marketplaces.list", SessionPluginsMarketplacesListResult.class, """
+                                {"sessionId":"bound-session"}
+                                """, (server, session) -> session.plugins.marketplaces.list()),
+                        dispatch("session.plugins.marketplaces.add", SessionPluginsMarketplacesAddResult.class, """
+                                {"sessionId":"bound-session","source":"./market","workingDirectory":"/workspace"}
+                                """, (server, session) -> session.plugins.marketplaces.add(
                                 new SessionPluginsMarketplacesAddParams("foreign-session", "./market", "/workspace"))),
-                dispatch("session.plugins.marketplaces.remove", SessionPluginsMarketplacesRemoveResult.class, """
-                        {"sessionId":"bound-session","name":"market","force":true}
-                        """,
-                        (server, session) -> session.plugins.marketplaces
-                                .remove(new SessionPluginsMarketplacesRemoveParams("foreign-session", "market", true))),
-                dispatch("session.plugins.marketplaces.browse", SessionPluginsMarketplacesBrowseResult.class, """
-                        {"sessionId":"bound-session","name":"market"}
-                        """,
-                        (server, session) -> session.plugins.marketplaces
-                                .browse(new SessionPluginsMarketplacesBrowseParams("foreign-session", "market"))),
-                dispatch("session.plugins.marketplaces.refresh", SessionPluginsMarketplacesRefreshResult.class, """
-                        {"sessionId":"bound-session","name":"market"}
-                        """,
-                        (server, session) -> session.plugins.marketplaces
-                                .refresh(new SessionPluginsMarketplacesRefreshParams("foreign-session", "market"))),
-                dispatch("session.plugins.marketplaces.refresh", SessionPluginsMarketplacesRefreshResult.class, """
-                        {"sessionId":"bound-session"}
-                        """, (server, session) -> session.plugins.marketplaces.refresh(null)),
-                dispatch("session.queue.withdrawMessage", SessionQueueWithdrawMessageResult.class, """
-                        {"sessionId":"bound-session","messageId":"message-1","expectedPrompt":"original"}
-                        """,
-                        (server, session) -> session.queue.withdrawMessage(
-                                new SessionQueueWithdrawMessageParams("foreign-session", "message-1", "original"))),
-                dispatch("session.queue.appendSteering", SessionQueueAppendSteeringResult.class, """
-                        {"sessionId":"bound-session","messageId":"message-1","expectedPrompt":"original",
-                         "agentMode":"interactive","prompt":"more","displayPrompt":"preview","attachments":[]}
-                        """, (server,
-                        session) -> session.queue.appendSteering(new SessionQueueAppendSteeringParams("foreign-session",
-                                "message-1", "original", SendAgentMode.INTERACTIVE, "more", "preview", List.of()))),
-                dispatch("session.workflow.run", SessionWorkflowRunResult.class, """
-                        {"sessionId":"bound-session","name":"workflow-1","args":{"topic":"input"}}
-                        """,
-                        (server, session) -> session.workflow.run(new SessionWorkflowRunParams("foreign-session",
-                                "workflow-1", Map.of("topic", "input"), null))),
-                dispatch("session.workflow.resume", SessionWorkflowResumeResult.class, """
-                        {"sessionId":"bound-session","runId":"run-1","notifyOnComplete":true,"logPhaseNames":false}
-                        """,
-                        (server, session) -> session.workflow.resume(
-                                new SessionWorkflowResumeParams("foreign-session", "run-1", null, true, false))),
-                dispatch("session.workflow.runFromTool", WorkflowRunResult.class, """
-                        {"sessionId":"bound-session","name":"workflow-1","args":{"topic":"input"},"toolCallId":"tool-1"}
-                        """,
-                        (server, session) -> session.workflow.runFromTool(new SessionWorkflowRunFromToolParams(
-                                "foreign-session", "workflow-1", Map.of("topic", "input"), null, "tool-1"))),
-                dispatch("session.workflow.resumeFromTool", WorkflowResumeResult.class, """
-                        {"sessionId":"bound-session","runId":"run-1","toolCallId":"tool-1"}
-                        """,
-                        (server, session) -> session.workflow.resumeFromTool(
+                        dispatch("session.plugins.marketplaces.remove", SessionPluginsMarketplacesRemoveResult.class,
+                                """
+                                        {"sessionId":"bound-session","name":"market","force":true}
+                                        """,
+                                (server, session) -> session.plugins.marketplaces.remove(
+                                        new SessionPluginsMarketplacesRemoveParams("foreign-session", "market", true))),
+                        dispatch("session.plugins.marketplaces.browse", SessionPluginsMarketplacesBrowseResult.class,
+                                """
+                                        {"sessionId":"bound-session","name":"market"}
+                                        """,
+                                (server, session) -> session.plugins.marketplaces.browse(
+                                        new SessionPluginsMarketplacesBrowseParams("foreign-session", "market"))),
+                        dispatch("session.plugins.marketplaces.refresh", SessionPluginsMarketplacesRefreshResult.class,
+                                """
+                                        {"sessionId":"bound-session","name":"market"}
+                                        """,
+                                (server, session) -> session.plugins.marketplaces.refresh(
+                                        new SessionPluginsMarketplacesRefreshParams("foreign-session", "market"))),
+                        dispatch(
+                                "session.plugins.marketplaces.refresh", SessionPluginsMarketplacesRefreshResult.class,
+                                """
+                                        {"sessionId":"bound-session"}
+                                        """, (server, session) -> session.plugins.marketplaces.refresh(null)),
+                        dispatch("session.queue.withdrawMessage", SessionQueueWithdrawMessageResult.class, """
+                                {"sessionId":"bound-session","messageId":"message-1","expectedPrompt":"original"}
+                                """, (server,
+                                session) -> session.queue.withdrawMessage(new SessionQueueWithdrawMessageParams(
+                                        "foreign-session", "message-1", "original"))),
+                        dispatch("session.queue.appendSteering", SessionQueueAppendSteeringResult.class, """
+                                {"sessionId":"bound-session","messageId":"message-1","expectedPrompt":"original",
+                                 "agentMode":"interactive","prompt":"more","displayPrompt":"preview","attachments":[]}
+                                """,
+                                (server, session) -> session.queue.appendSteering(
+                                        new SessionQueueAppendSteeringParams("foreign-session", "message-1", "original",
+                                                SendAgentMode.INTERACTIVE, "more", "preview", List.of()))),
+                        dispatch("session.workflow.run", SessionWorkflowRunResult.class, """
+                                {"sessionId":"bound-session","name":"workflow-1","args":{"topic":"input"}}
+                                """,
+                                (server, session) -> session.workflow.run(new SessionWorkflowRunParams(
+                                        "foreign-session", "workflow-1", Map.of("topic", "input"), null))),
+                        dispatch(
+                                "session.workflow.resume", SessionWorkflowResumeResult.class,
+                                """
+                                        {"sessionId":"bound-session","runId":"run-1","notifyOnComplete":true,"logPhaseNames":false}
+                                        """,
+                                (server, session) -> session.workflow.resume(new SessionWorkflowResumeParams(
+                                        "foreign-session", "run-1", null, true, false))),
+                        dispatch(
+                                "session.workflow.runFromTool", WorkflowRunResult.class,
+                                """
+                                        {"sessionId":"bound-session","name":"workflow-1","args":{"topic":"input"},"toolCallId":"tool-1"}
+                                        """,
+                                (server, session) -> session.workflow.runFromTool(new SessionWorkflowRunFromToolParams(
+                                        "foreign-session", "workflow-1", Map.of("topic", "input"), null, "tool-1"))),
+                        dispatch("session.workflow.resumeFromTool", WorkflowResumeResult.class, """
+                                {"sessionId":"bound-session","runId":"run-1","toolCallId":"tool-1"}
+                                """, (server, session) -> session.workflow.resumeFromTool(
                                 new SessionWorkflowResumeFromToolParams("foreign-session", "run-1", null, "tool-1"))),
-                dispatch("session.workflow.getRun", SessionWorkflowGetRunResult.class, """
-                        {"sessionId":"bound-session","runId":"run-1"}
-                        """,
-                        (server, session) -> session.workflow
-                                .getRun(new SessionWorkflowGetRunParams("foreign-session", "run-1"))),
-                dispatch("session.workflow.listRuns", SessionWorkflowListRunsResult.class, """
-                        {"sessionId":"bound-session","afterSeq":2,"limit":5}
-                        """,
-                        (server, session) -> session.workflow
-                                .listRuns(new SessionWorkflowListRunsParams("foreign-session", 2L, null, 5L))),
-                dispatch("session.workflow.getRunDetail", SessionWorkflowGetRunDetailResult.class, """
-                        {"sessionId":"bound-session","runId":"run-1"}
-                        """,
-                        (server, session) -> session.workflow
-                                .getRunDetail(new SessionWorkflowGetRunDetailParams("foreign-session", "run-1"))),
-                dispatch("session.workflow.getRunProgress", SessionWorkflowGetRunProgressResult.class, """
-                        {"sessionId":"bound-session","runId":"run-1","phaseId":"phase-1","afterSeq":2,"limit":5}
-                        """,
-                        (server, session) -> session.workflow.getRunProgress(new SessionWorkflowGetRunProgressParams(
-                                "foreign-session", "run-1", "phase-1", 2L, null, 5L))),
-                dispatch("session.workflow.cancel", SessionWorkflowCancelResult.class, """
-                        {"sessionId":"bound-session","runId":"run-1"}
-                        """,
-                        (server, session) -> session.workflow
-                                .cancel(new SessionWorkflowCancelParams("foreign-session", "run-1"))),
-                dispatch("session.workflow.pause", SessionWorkflowPauseResult.class, """
-                        {"sessionId":"bound-session","runId":"run-1"}
-                        """,
-                        (server, session) -> session.workflow
-                                .pause(new SessionWorkflowPauseParams("foreign-session", "run-1"))),
-                dispatch("session.workflow.pauseAtCheckpoint", WorkflowPauseCheckpointResult.class,
-                        """
-                                {"sessionId":"bound-session","runId":"run-1","executionToken":"execution-1","key":"checkpoint-1"}
+                        dispatch("session.workflow.getRun", SessionWorkflowGetRunResult.class, """
+                                {"sessionId":"bound-session","runId":"run-1"}
+                                """,
+                                (server, session) -> session.workflow
+                                        .getRun(new SessionWorkflowGetRunParams("foreign-session", "run-1"))),
+                        dispatch("session.workflow.listRuns", SessionWorkflowListRunsResult.class, """
+                                {"sessionId":"bound-session","afterSeq":2,"limit":5}
+                                """,
+                                (server, session) -> session.workflow
+                                        .listRuns(new SessionWorkflowListRunsParams("foreign-session", 2L, null, 5L))),
+                        dispatch("session.workflow.getRunDetail", SessionWorkflowGetRunDetailResult.class, """
+                                {"sessionId":"bound-session","runId":"run-1"}
                                 """,
-                        (server, session) -> session.workflow
-                                .pauseAtCheckpoint(new SessionWorkflowPauseAtCheckpointParams("foreign-session",
-                                        "run-1", "execution-1", "checkpoint-1"))),
-                dispatch("session.workflow.log", Void.class, """
-                        {"sessionId":"bound-session","runId":"run-1","executionToken":"execution-1",
-                         "lines":[{"seq":1,"kind":"log","text":"progress"}]}
-                        """, (server,
-                        session) -> session.workflow.log(new SessionWorkflowLogParams("foreign-session", "run-1",
-                                "execution-1", List.of(new WorkflowLogLine(1L, WorkflowLogLineKind.LOG, "progress"))))),
-                dispatch("session.workflow.agent", SessionWorkflowAgentResult.class,
-                        """
-                                {"sessionId":"bound-session","workflowRunId":"run-1","executionToken":"execution-1","prompt":"inspect"}
+                                (server, session) -> session.workflow.getRunDetail(
+                                        new SessionWorkflowGetRunDetailParams("foreign-session", "run-1"))),
+                        dispatch("session.workflow.getRunProgress", SessionWorkflowGetRunProgressResult.class, """
+                                {"sessionId":"bound-session","runId":"run-1","phaseId":"phase-1","afterSeq":2,"limit":5}
+                                """, (server,
+                                session) -> session.workflow.getRunProgress(new SessionWorkflowGetRunProgressParams(
+                                        "foreign-session", "run-1", "phase-1", 2L, null, 5L))),
+                        dispatch("session.workflow.cancel", SessionWorkflowCancelResult.class, """
+                                {"sessionId":"bound-session","runId":"run-1"}
                                 """,
-                        (server, session) -> session.workflow.agent(new SessionWorkflowAgentParams("foreign-session",
-                                "run-1", "execution-1", "inspect", null))),
-                dispatch("session.workflow.journal.get", SessionWorkflowJournalGetResult.class, """
-                        {"sessionId":"bound-session","runId":"run-1","executionToken":"execution-1","key":"journal-1"}
-                        """,
-                        (server, session) -> session.workflow.journal.get(new SessionWorkflowJournalGetParams(
-                                "foreign-session", "run-1", "execution-1", "journal-1"))),
-                dispatch("session.workflow.journal.put", Void.class, """
-                        {"sessionId":"bound-session","runId":"run-1","executionToken":"execution-1","key":"journal-1",
-                         "resultJson":{"answer":42}}
-                        """, (server, session) -> session.workflow.journal.put(new SessionWorkflowJournalPutParams(
-                        "foreign-session", "run-1", "execution-1", "journal-1", Map.of("answer", 42)))));
+                                (server, session) -> session.workflow
+                                        .cancel(new SessionWorkflowCancelParams("foreign-session", "run-1"))),
+                        dispatch("session.workflow.pause", SessionWorkflowPauseResult.class, """
+                                {"sessionId":"bound-session","runId":"run-1"}
+                                """,
+                                (server, session) -> session.workflow
+                                        .pause(new SessionWorkflowPauseParams("foreign-session", "run-1"))),
+                        dispatch(
+                                "session.workflow.pauseAtCheckpoint", WorkflowPauseCheckpointResult.class,
+                                """
+                                        {"sessionId":"bound-session","runId":"run-1","executionToken":"execution-1","key":"checkpoint-1"}
+                                        """,
+                                (server, session) -> session.workflow
+                                        .pauseAtCheckpoint(new SessionWorkflowPauseAtCheckpointParams("foreign-session",
+                                                "run-1", "execution-1", "checkpoint-1"))),
+                        dispatch("session.workflow.log", Void.class, """
+                                {"sessionId":"bound-session","runId":"run-1","executionToken":"execution-1",
+                                 "lines":[{"seq":1,"kind":"log","text":"progress"}]}
+                                """,
+                                (server, session) -> session.workflow.log(new SessionWorkflowLogParams(
+                                        "foreign-session", "run-1", "execution-1",
+                                        List.of(new WorkflowLogLine(1L, WorkflowLogLineKind.LOG, "progress"))))),
+                        dispatch("session.workflow.agent", SessionWorkflowAgentResult.class,
+                                """
+                                        {"sessionId":"bound-session","workflowRunId":"run-1","executionToken":"execution-1","prompt":"inspect"}
+                                        """,
+                                (server, session) -> session.workflow.agent(new SessionWorkflowAgentParams(
+                                        "foreign-session", "run-1", "execution-1", "inspect", null))),
+                        dispatch("session.workflow.journal.get", SessionWorkflowJournalGetResult.class,
+                                """
+                                        {"sessionId":"bound-session","runId":"run-1","executionToken":"execution-1","key":"journal-1"}
+                                        """,
+                                (server, session) -> session.workflow.journal.get(new SessionWorkflowJournalGetParams(
+                                        "foreign-session", "run-1", "execution-1", "journal-1"))),
+                        dispatch("session.workflow.journal.put", Void.class,
+                                """
+                                        {"sessionId":"bound-session","runId":"run-1","executionToken":"execution-1","key":"journal-1",
+                                         "resultJson":{"answer":42}}
+                                        """,
+                                (server, session) -> session.workflow.journal
+                                        .put(new SessionWorkflowJournalPutParams("foreign-session", "run-1",
+                                                "execution-1", "journal-1", Map.of("answer", 42)))));
     }
 
     private static Arguments dispatch(String method, Class<?> resultType, String expectedParams,
@@ -371,7 +391,7 @@ void sessionRpc_mode_set_merges_sessionId() {
         var session = new SessionRpc(stub, "sess-mode-set");
 
         var modeParams = new SessionModeSetParams(null, null, null, null, null, null, null, null, null, null, null,
-                null, null);
+                null, null, null);
         session.mode.set(modeParams);
 
         assertEquals(1, stub.calls.size());
@@ -551,8 +571,9 @@ void sessionRpc_mcp_list_injects_sessionId() {
 
         assertEquals(1, stub.calls.size());
         assertEquals("session.mcp.list", stub.calls.get(0).method());
-        var params = (Map<?, ?>) stub.calls.get(0).params();
-        assertEquals("sess-mcp", params.get("sessionId"));
+        var mapper = new ObjectMapper();
+        assertEquals(mapper.valueToTree(Map.of("sessionId", "sess-mcp")),
+                mapper.valueToTree(stub.calls.get(0).params()));
     }
 
     @Test
diff --git a/java/sdk/src/test/java/com/github/copilot/generated/rpc/GeneratedRpcRecordsCoverageTest.java b/java/sdk/src/test/java/com/github/copilot/generated/rpc/GeneratedRpcRecordsCoverageTest.java
index dace015cff..ed47710539 100644
--- a/java/sdk/src/test/java/com/github/copilot/generated/rpc/GeneratedRpcRecordsCoverageTest.java
+++ b/java/sdk/src/test/java/com/github/copilot/generated/rpc/GeneratedRpcRecordsCoverageTest.java
@@ -21,6 +21,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.copilot.AllowCopilotExperimental;
 import com.github.copilot.TestUtil;
+import com.github.copilot.generated.SessionManagedSettingsResolvedEvent.SessionManagedSettingsResolvedEventData;
 
 /**
  * Tests for generated RPC param and result record types. Exercises
@@ -29,6 +30,27 @@
  */
 class GeneratedRpcRecordsCoverageTest {
 
+    @Test
+    @AllowCopilotExperimental
+    void managedPermissions_reuses_event_context_and_evaluated_operations() throws Exception {
+        var mapper = new ObjectMapper();
+        var eventJson = mapper.readTree("""
+                {"permissionsContext":{"permissions":{"_limitToLists":[["https://example.com"]]},"failClosed":false}}
+                """);
+        var eventData = mapper.treeToValue(eventJson, SessionManagedSettingsResolvedEventData.class);
+        var evaluation = mapper.readValue("""
+                {"operation":{"kind":"url","url":"https://example.com/a"},"verdict":"allow"}
+                """, ManagedPermissionEvaluation.class);
+        var params = new ManagedSettingsPermissionsEvaluateParams(eventData.permissionsContext(),
+                List.of(evaluation.operation()));
+        var paramsJson = mapper.valueToTree(params);
+        assertEquals(eventJson.get("permissionsContext"), paramsJson.get("context"));
+        assertEquals("url", paramsJson.get("operations").get(0).get("kind").asText());
+        assertEquals("https://example.com/a", paramsJson.get("operations").get(0).get("url").asText());
+        assertEquals(ManagedPermissionOperation.ManagedPermissionOperationKind.URL, evaluation.operation().kind());
+        assertEquals(params, mapper.treeToValue(paramsJson, ManagedSettingsPermissionsEvaluateParams.class));
+    }
+
     // ── Params records ─────────────────────────────────────────────────────
 
     @Test
@@ -334,12 +356,6 @@ void sessionMcpEnableParams_record() {
         assertEquals("mcp-server-2", params.serverName());
     }
 
-    @Test
-    void sessionMcpListParams_record() {
-        var params = new SessionMcpListParams("sess-27");
-        assertEquals("sess-27", params.sessionId());
-    }
-
     @Test
     void sessionMcpReloadParams_record() {
         var params = new SessionMcpReloadParams("sess-28");
@@ -355,7 +371,7 @@ void sessionModeGetParams_record() {
     @Test
     void sessionModeSetParams_record() {
         var params = new SessionModeSetParams("sess-30", SessionMode.PLAN, null, null, null, null, null, null, null,
-                null, null, null, null);
+                null, null, null, null, null);
         assertEquals("sess-30", params.sessionId());
         assertEquals(SessionMode.PLAN, params.mode());
     }
@@ -475,6 +491,7 @@ void sessionModelSwitchParams_distinguishRequiredNullFromOmittedOptionalValue()
         var switchTo = mapper.valueToTree(new SessionModelSwitchToParams("sess-32", "auto", null, null, null, null,
                 null, null, null, null, null, null, null, null, null, null));
         assertFalse(switchTo.has("autoTier"));
+        assertFalse(switchTo.has("providerId"));
     }
 
     @Test
@@ -706,7 +723,7 @@ void pingResult_fields() {
     @Test
     void sessionAgentListResult_with_items() {
         var item = new AgentInfo("name1", "Name One", "Desc 1", "/path/to/agent1", null, null, null, null, null, null,
-                null, null, null, null, null, null);
+                null, null, null, null, null, null, null);
         var result = new SessionAgentListResult(List.of(item));
         assertEquals(1, result.agents().size());
         assertEquals("name1", result.agents().get(0).name());
@@ -718,7 +735,7 @@ void sessionAgentListResult_with_items() {
     @Test
     void sessionAgentGetCurrentResult_nested() {
         var agent = new AgentInfo("agent-1", "Agent One", "Does things", null, null, null, null, null, null, null, null,
-                null, null, null, null, null);
+                null, null, null, null, null, null);
         var result = new SessionAgentGetCurrentResult(agent);
         assertEquals("agent-1", result.agent().name());
         assertEquals("Agent One", result.agent().displayName());
@@ -735,18 +752,25 @@ void sessionAgentGetCurrentResult_null_agent() {
     @Test
     void sessionAgentReloadResult_with_items() {
         var item = new AgentInfo("a", "A", "Desc", "/path/to/a", null, null, null, null, null, null, null, null, null,
-                null, null, null);
+                null, null, null, null);
         var result = new SessionAgentReloadResult(List.of(item));
         assertEquals(1, result.agents().size());
         assertEquals("a", result.agents().get(0).name());
     }
 
     @Test
-    void sessionAgentSelectResult_nested() {
+    void sessionAgentSelectResult_nested() throws Exception {
+        Map<String, List<Object>> hooks = Map.of("Stop",
+                List.of(Map.of("type", "command", "command", "echo scoped-stop")));
         var agent = new AgentInfo("selected", "Selected", "The selected agent", "/path/to/selected", null, null, null,
-                null, null, null, null, null, null, null, null, null);
+                null, null, null, null, null, null, null, null, null, hooks);
         var result = new SessionAgentSelectResult(agent);
         assertEquals("selected", result.agent().name());
+        var mapper = new ObjectMapper();
+        var json = mapper.writeValueAsString(result);
+        assertEquals("echo scoped-stop",
+                mapper.readTree(json).get("agent").get("hooks").get("Stop").get(0).get("command").asText());
+        assertEquals(hooks, mapper.readValue(json, SessionAgentSelectResult.class).agent().hooks());
     }
 
     @Test
@@ -897,8 +921,8 @@ void sessionMcpListResult_status_enum_all_values() {
 
     @Test
     void sessionModelGetCurrentResult_record() {
-        var result = new SessionModelGetCurrentResult("claude-sonnet-5", "claude-sonnet-4.5", null, null, null, null,
-                null);
+        var result = new SessionModelGetCurrentResult("claude-sonnet-5", null, "claude-sonnet-4.5", null, null, null,
+                null, null, null);
         assertEquals("claude-sonnet-5", result.modelId());
         assertEquals("claude-sonnet-4.5", result.planBaseModelId());
     }
@@ -1009,8 +1033,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, null, "gpt-5",
-                1000L, 500L);
+        var result = new SessionUsageGetMetricsResult(null, 0.5, 10L, null, null, 2000L, null, changes, null, null,
+                null, "gpt-5", 1000L, 500L);
         assertEquals(0.5, result.totalPremiumRequestCost());
         assertEquals(10L, result.totalUserRequests());
         assertNotNull(result.codeChanges());
@@ -1070,8 +1094,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", true);
         var billing = new ModelBilling(1.0, null, null, promo);
-        var modelItem = new Model("gpt-5", "GPT-5", capabilities, null, policy, billing, null, null, null, null, null,
-                null, null, null, null);
+        var modelItem = new Model("gpt-5", "GPT-5", capabilities, null, null, policy, billing, null, null, null, null,
+                null, null, null, null, null);
         var result = new ModelsListResult(List.of(modelItem));
 
         assertEquals(1, result.models().size());
diff --git a/java/sdk/src/test/prompts/PROMPT-smoke-test.md b/java/sdk/src/test/prompts/PROMPT-smoke-test.md
deleted file mode 100644
index 4013002aca..0000000000
--- a/java/sdk/src/test/prompts/PROMPT-smoke-test.md
+++ /dev/null
@@ -1,135 +0,0 @@
-# Prompt: Generate and Run the copilot-sdk-java Smoke Test
-
-## Objective
-
-Create a Maven project that acts as a smoke test for `copilot-sdk-java`. The project must compile, build, and run to completion with exit code 0 as the definition of success.
-
-## Step 1 — Read the source README
-
-Read the file `README.md` at the top level of this repository. You will need two sections from it:
-
-- **"Snapshot Builds"** — provides the Maven GAV (groupId, artifactId, version) and the Maven Central Snapshots repository configuration to use for the dependency under test.
-- **"Quick Start"** — provides the exact Java source code for the smoke test program. Use this code verbatim. Do not modify it, fix it, or improve it. If it does not compile or run correctly against the artifact under test, that is itself a smoke test failure and must be reported as such rather than silently corrected.
-
-## Step 2 — Create the Maven project
-
-Create the following file layout in a subdirectory named `smoke-test/` at the top level of this repository:
-
-```
-smoke-test/
-  pom.xml
-  src/main/java/(Class name taken from the code in the "Quick Start" section in the README).java   ← verbatim from README "Quick Start"
-```
-
-### `pom.xml` requirements
-
-- **groupId**: `com.github` (or any reasonable value)
-- **artifactId**: `copilot-sdk-smoketest`
-- **version**: `1.0-SNAPSHOT`
-- **packaging**: `jar`
-- **Java source/target**: (taken from the "Requirements" section in the README) (via `maven.compiler.source` and `maven.compiler.target` properties)
-- **`mainClass` property**: (taken from the "Quick Start" section in the README) (the class is in the default package)
-
-#### Snapshot repository
-
-Configure the Maven Central Snapshots repository exactly as specified in the "Snapshot Builds" section of `README.md`, and add `<updatePolicy>always</updatePolicy>` inside the `<snapshots>` block so that every build fetches the latest snapshot without requiring `-U`:
-
-```xml
-<repository>
-    <id>central-snapshots</id>
-    <url>https://central.sonatype.com/repository/maven-snapshots/</url>
-    <snapshots>
-        <enabled>true</enabled>
-        <updatePolicy>always</updatePolicy>
-    </snapshots>
-</repository>
-```
-
-#### Dependency
-
-Use the GAV from the "Snapshot Builds" section of `README.md` verbatim — do not substitute the release version from the "Maven" section.
-
-#### Plugins — REQUIRED configuration
-
-**Do not use `maven-shade-plugin`.** Use the `Class-Path` manifest approach instead:
-
-1. **`maven-jar-plugin`** (version **3.4.1** — pin explicitly to suppress Maven version warnings):
-
-   ```xml
-   <plugin>
-       <groupId>org.apache.maven.plugins</groupId>
-       <artifactId>maven-jar-plugin</artifactId>
-       <version>3.4.1</version>
-       <configuration>
-           <archive>
-               <manifest>
-                   <mainClass>${mainClass}</mainClass>
-                   <addClasspath>true</addClasspath>
-                   <classpathPrefix>lib/</classpathPrefix>
-                   <useUniqueVersions>false</useUniqueVersions>
-               </manifest>
-           </archive>
-       </configuration>
-   </plugin>
-   ```
-
-   **Critical**: `<useUniqueVersions>false</useUniqueVersions>` is mandatory. Without it, the manifest `Class-Path:` entry uses the timestamped SNAPSHOT filename (e.g. `copilot-sdk-java-0.1.33-20260312.125508-3.jar`) while `copy-dependencies` writes the base SNAPSHOT filename (`copilot-sdk-java-0.1.33-SNAPSHOT.jar`), causing `NoClassDefFoundError` at runtime.
-
-2. **`maven-dependency-plugin`** (version **3.6.1**):
-
-   ```xml
-   <plugin>
-       <groupId>org.apache.maven.plugins</groupId>
-       <artifactId>maven-dependency-plugin</artifactId>
-       <version>3.6.1</version>
-       <executions>
-           <execution>
-               <id>copy-dependencies</id>
-               <phase>package</phase>
-               <goals><goal>copy-dependencies</goal></goals>
-               <configuration>
-                   <outputDirectory>${project.build.directory}/lib</outputDirectory>
-               </configuration>
-           </execution>
-       </executions>
-   </plugin>
-   ```
-
-   This copies all runtime dependency JARs into `target/lib/`, which is where the manifest `Class-Path:` points.
-
-## Step 3 — Build
-
-```bash
-mvn -U clean package
-```
-
-The `-U` flag forces a fresh snapshot metadata check regardless of local cache. The `<updatePolicy>always</updatePolicy>` already handles this for normal invocations, but `-U` is the safest choice for CI.
-
-Build must succeed with `BUILD SUCCESS` before proceeding.
-
-## Step 4 — Run
-
-```bash
-java -jar ./target/copilot-sdk-smoketest-1.0-SNAPSHOT.jar
-```
-
-The JAR must be run from the `smoke-test/` directory so that the relative `lib/` path in the manifest resolves correctly. Do not use `-cp` or `-classpath` — the test specifically validates that `java -jar` works with the manifest `Class-Path:` approach.
-
-## Step 5 — Verify success
-
-The smoke test passes if and only if the process exits with code **0**.
-
-The "Quick Start" code in `README.md` already contains the exit-code logic: it captures the last assistant message and calls `System.exit(0)` if it contains `"4"` (the expected answer to "What is 2+2?"), or `System.exit(-1)` otherwise.
-
-Check the exit code:
-```bash
-echo "Exit code: $?"
-```
-
-Expected: `Exit code: 0`
-
-## Important API notes (do not apply these as fixes — they are here for diagnostic context only)
-
-If the build fails with compilation errors such as `cannot find symbol` on methods like `getContent()`, `getCurrentTokens()`, `getTokenLimit()`, or `getMessagesLength()`, this indicates a mismatch between the Quick Start code and the SDK implementation. **Do not silently fix the code.** Report the failure. The purpose of this smoke test is precisely to catch such regressions.
-
-For reference: the data classes in `copilot-sdk-java` are Java **records**. Record accessor methods have no `get` prefix — they are named `content()`, `currentTokens()`, `tokenLimit()`, and `messagesLength()`. If the README Quick Start uses `getContent()` etc., that is a bug in the README that must be surfaced, not silently corrected.
diff --git a/nodejs/README.md b/nodejs/README.md
index 1135d7ea08..2e86f7d603 100644
--- a/nodejs/README.md
+++ b/nodejs/README.md
@@ -74,6 +74,9 @@ without deleting underlying sessions. Reconnecting does not reclaim a host.
 The optional `onExit` callback reports exits at most once. If the owner connection
 is lost, it reports that loss rather than claiming that listener cleanup was
 acknowledged.
+Call `const { sessions } = await host.listSessions()` to read the complete catalog
+of live and dormant sessions advertised by the host. The method returns a
+`HostListSessionsResult` containing `sessions`, not a session array directly.
 
 `host.pid` is absent for in-process listeners. The optional field is retained
 for separate host process IDs returned by legacy runtimes, never the runtime PID.
@@ -104,6 +107,10 @@ The listener follows the owning client's lifetime. Call `await host.dispose()`
 only when you want to stop it earlier; `await using host` also supports a shorter
 scope. Each disposal call forwards to the runtime, which owns idempotent cleanup.
 The AHP transport remains owned by the host.
+Set top-level `computeId` to reuse the same durable catalog for local and Mission
+Control hosting; it must agree with `githubEnvironment.computeId` when both are
+supplied. Omitted local-only identities are persisted by the runtime, not generated
+by the SDK. Published sessions remain discoverable after hosting stops.
 
 ### Application-owned sessions
 
@@ -165,8 +172,9 @@ still matches the requested identity and workspace.
 Only catalog entries marked as application-owned invoke this callback.
 If the callback is missing, restoring such an entry fails instead of falling
 back to host-owned creation.
-Published resident sessions attach directly, without invoking it or replacing
-their current registrations. Resumed sessions follow the same original-object
+Currently resident published sessions attach directly, without invoking it or replacing
+their current registrations. Dormant published application sessions require this
+resume callback to restore their tools and handlers. Resumed sessions follow the same original-object
 retention, cancellation, late-result release, and `onSessionReleased` rules.
 
 The `copilotd-hosting` library runs inside the runtime provider.
@@ -345,6 +353,11 @@ This graceful-exit timeout is separate from the shutdown RPC and post-terminatio
 ##### `forceStop(): Promise<void>`
 
 Force stop the CLI server without graceful cleanup. Use when `stop()` takes too long.
+Retained sessions are disconnected locally, and pending `sendAndWait()` calls reject
+without waiting for `session.idle` or their response timeout.
+Retirement releases session-owned tool, hook, auth/input, provider, workflow, canvas,
+and transform registrations without changing caller-owned configuration. Late
+registration and callback dispatch are rejected; callbacks already admitted may finish.
 
 ##### `createSession(config?: SessionConfig): Promise<CopilotSession>`
 
@@ -369,6 +382,7 @@ Create a new conversation session.
 - `askUserVariant?: "legacy" | "elicitation"` - Selects the model-facing `ask_user` tool shape when creating or cold-resuming a session. Defaults to `"legacy"`; use `"elicitation"` with `onElicitationRequest`.
 - `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.
+- `skillProvider?: SkillProvider` - **Experimental.** Serves skills from host storage instead of skill directories. Not persisted; pass it again on resume. See [Skill providers](#skill-providers-experimental).
 
 ```typescript
 const session = await client.createSession({
@@ -657,6 +671,23 @@ if (result.status === "pending") {
 
 See [Auto tier persistence](../docs/features/session-persistence.md#auto-tier-persistence) for the full lifecycle rules.
 
+##### `rpc.model.getReasoningSummaries(params)` (experimental)
+
+Read the current model's reasoning-summary presentation policy without changing session state. Call `session.rpc.model.list()` first to load the model catalog; otherwise the result may have `ready: false`. The request and result types are exported from `@github/copilot-sdk`.
+
+```typescript
+import type {
+    ModelGetReasoningSummariesRequest,
+    ModelGetReasoningSummariesResult,
+} from "@github/copilot-sdk";
+
+const presentation: ModelGetReasoningSummariesRequest = { summariesVisible: false };
+const policy: ModelGetReasoningSummariesResult =
+    await session.rpc.model.getReasoningSummaries(presentation);
+```
+
+Omit `persistedShowReasoning` when no visibility setting is saved. `visibility` can remain unset while experiment assignment is pending; `clearRedundantSetting` tells the host when its persisted setting matches the model default.
+
 ##### `setTools(tools: Tool[]): Promise<void>`
 
 Replace the tools this client supplies to the session, together with the handlers that serve them (experimental). `tools` takes the same definitions as `createSession` and becomes this client's complete tool set; pass `[]` to remove all of this client's tools. Built-in, MCP, and plugin tools, and tools other connected clients supply, are unaffected.
@@ -1120,6 +1151,46 @@ const session = await client.createSession({
 });
 ```
 
+### Skill providers (experimental)
+
+A skill provider serves skills from your own storage, such as a database, instead of `SKILL.md`
+files on disk. Provider skills join the session's skill catalog and load on demand through the
+`skill` tool, just like file-based skills.
+
+```typescript
+import type { SkillProvider } from "@github/copilot-sdk";
+
+const skillProvider: SkillProvider = {
+    listSkills: async () => [
+        { name: "release-notes", description: "Writes release notes in the team's format." },
+    ],
+    readSkill: async (name, { signal }) => (await db.findSkill(name, { signal }))?.markdown ?? null,
+};
+
+const session = await client.createSession({
+    onPermissionRequest: approveAll,
+    skillProvider,
+});
+```
+
+- `listSkills()` returns the catalog metadata. `readSkill(name)` returns the skill's markdown, or
+  `null`/`undefined` if the skill no longer exists. The markdown may omit YAML frontmatter; when
+  frontmatter is present, its fields must agree with the listed metadata, and `allowed-tools` is
+  read only from frontmatter.
+- Each call receives `{ signal }`, an `AbortSignal` that fires when the runtime cancels the call,
+  for example after its 30-second limit or when the session disconnects. It doesn't fire when the
+  connection closes or the client is force-stopped; a running call then continues until it returns.
+- The provider is never persisted. Pass it again to `resumeSession`; resuming without it unbinds
+  the provider.
+- A provider enables skills unless you set `enableSkills: false`, which keeps it bound but unused.
+  In `mode: "empty"`, skills stay disabled until you set `enableSkills: true`.
+- Errors thrown by the provider are reported to the model as a generic load failure; their
+  messages are not forwarded.
+- The runtime may call the provider concurrently, so both methods must be safe for concurrent use.
+- Skill providers are not supported for cloud sessions.
+
+See [Custom skills](../docs/features/skills.md#skill-providers-experimental) for limits and details.
+
 ### Multiple Sessions
 
 ```typescript
@@ -1323,6 +1394,36 @@ const session = await client.createSession({
 });
 ```
 
+### Managed network policy for client-owned browsers
+
+Obtain a reusable `permissionsContext` from
+`client.rpc.managedSettings.resolve({ selectionId })` for account and device
+policy, or `session.rpc.managedSettings.get()` for the session's retained policy,
+including SDK injection and policy-helper rules. Omit `selectionId` for the current
+account, or device policy only when signed out. Resolution uses the managed-policy
+cache and can fetch server policy; keep it off latency-critical startup paths.
+Older runtimes may omit `permissionsContext`. Treat an absent context as unsupported
+evaluation, not unmanaged policy; do not navigate without a policy decision.
+
+Call `client.rpc.managedSettings.permissions.evaluate({ context: permissionsContext, operations: [{ kind: "url", url: "https://docs.example.com/guide" }] })`.
+This is pure, sessionless evaluation: it performs no policy discovery, I/O,
+prompting, or sandbox changes. Reuse an in-memory context for repeated checks and
+refresh it when managed policy changes. Retain the runtime-owned `permissions`
+object verbatim rather than rebuilding it from the flattened settings display.
+
+The result is `{ results: [{ operation, verdict }], failClosed }`, with one entry per
+input operation in the same order. `deny` blocks navigation, `ask` requires approval,
+`allow` approves under managed policy, and `unmanaged` leaves the consumer's normal
+permission flow in effect. A check never prompts or grants a saved approval.
+Invalid URLs reject the batch. Unknown policy rejects or returns `failClosed: true`
+with all URLs denied; do not navigate on an error.
+
+Check every navigation, redirect, and new-window destination before opening it.
+These APIs evaluate managed permission rules only: they do not replace browser
+security checks, user permissions, or sandbox policy. `permissions.limitTo` neither
+enables the sandbox nor changes `sandbox.userPolicy.network`; configure sandbox
+network restrictions explicitly.
+
 ### Permission Result Kinds
 
 The handler must return one of the `PermissionDecision` shapes (or `{ kind: "no-result" }`). Approval scopes are present-tense — they describe the decision to apply, not the outcome reported back on session events:
@@ -1551,6 +1652,26 @@ npm ci
 npm test
 ```
 
+### Internal feature-flag example
+
+[`examples/internal-feature-flags.ts`](examples/internal-feature-flags.ts) uses
+the generated internal RPC factory against a real runtime over stdio.
+It lists the catalog and shows environment, settings, and explicit-override
+precedence. It also checks that static resolution does not apply `COPILOT_EXP_*`
+experiment assignments. It creates no session and sends no model request.
+
+After you prepare matching runtime artifacts, run this from the runtime repository root:
+
+```bash
+COPILOT_RUNTIME_PROVIDER_LIB="$PWD/bazel-bin/src/native/runtime/runtime.node" \
+  src/sdk/nodejs/node_modules/.bin/tsx \
+  src/sdk/nodejs/examples/internal-feature-flags.ts \
+  "$PWD/bazel-bin/src/runtime-bin/copilot-runtime"
+```
+
+The JSON output includes `staticResolution` values of `false`, `true`, `false`,
+and `true`, in that order. These methods are internal, not public SDK APIs.
+
 ## License
 
 MIT
diff --git a/nodejs/docs/workflows.md b/nodejs/docs/workflows.md
index 872cbcb0fe..7f2985f614 100644
--- a/nodejs/docs/workflows.md
+++ b/nodejs/docs/workflows.md
@@ -186,7 +186,7 @@ session.workflow.resume(
 
 Set `notifyOnComplete` to `true` for workflows that are likely to be invoked by an agent, so the originating session is notified when the workflow completes. Set it to `false` for workflows intended to be invoked programmatically, where the caller awaits the result directly. Set `logPhaseNames` to emit workflow phase names to the session transcript. Both options apply to new and resumed runs.
 
-Both resolve with the run envelope (`WorkflowRunResult`) for **every** outcome—`completed`, `error`, `halted`, `paused`, and `cancelled` alike. Inspect `status` and read `result` only when the run completed; a limit breach carries a typed `failure`. A `paused` envelope means that the current attempt settled, not that the durable run is permanently finished. Resume the same run ID to start another attempt with its journal and accounting intact. SDK-initiated `run` and `resume` do not request permission, so they have no declined outcome. 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 `WorkflowResumeError`, whose `code` is one of `not_found`, `non_resumable`, `workflow_run_not_resumable`, `already_active`, `workflow_already_running`, `workflow_limits_invalid`, `workflow_session_disposed`, `workflow_storage_unavailable`, or `workflow_storage_corrupt`.
+Both resolve with the run envelope (`WorkflowRunResult`) for **every** outcome—`completed`, `error`, `halted`, `paused`, and `cancelled` alike. Inspect `status` and read `result` only when the run completed; a limit breach carries a typed `failure`. A `paused` envelope means that the current attempt settled, not that the durable run is permanently finished. Resume the same run ID to start another attempt with its journal and accounting intact. SDK-initiated `run` and `resume` do not request permission, so they have no declined outcome. They still enforce execution eligibility, input validation, and active-run limits. Recognized pre-execution resume failures throw `WorkflowResumeError`, whose `code` is one of `not_found`, `non_resumable`, `workflow_run_not_resumable`, `already_active`, `workflow_already_running`, `workflow_limits_invalid`, `workflow_session_disposed`, `workflow_storage_unavailable`, or `workflow_storage_corrupt`.
 
 Pause a running attempt from outside its workflow body:
 
@@ -206,7 +206,13 @@ The first attempt pauses at `"review-ready"` and ends through cooperative cancel
 
 ## Observe a run
 
-The calling session can inspect its own workflow runs:
+The calling session can inspect its own workflow runs independently of its current execution eligibility. An empty registry enumerates successfully; losing eligibility does not hide already-admitted runs or terminal history. Observation still requires a valid, non-disposed session, and validation, missing-run, and storage errors still propagate.
+
+Workflow storage requires SQLite support from a custom session filesystem. A provider without that capability reports `workflow_storage_unavailable`, not an empty registry or a local-storage fallback.
+
+Compaction waits at most five seconds for its optional active-workflow summary. If storage fails or times out, compaction logs a warning and continues without that summary; aborting compaction cancels the wait. This does not change the results or error handling of explicit workflow observation calls.
+
+Observation does not restore execution eligibility. Starting, resuming, pausing, or cancelling runs, and workflow-owned agent, log, and journal/checkpoint operations still require eligible credentials (token-based billing or trusted HMAC authentication). Ineligible execution requests fail with JSON-RPC `-32601` and `data.code: "dynamic_workflows_unavailable"`.
 
 ```ts
 const runs = await session.workflow.listRuns();
diff --git a/nodejs/examples/internal-feature-flags.ts b/nodejs/examples/internal-feature-flags.ts
new file mode 100644
index 0000000000..83824012fc
--- /dev/null
+++ b/nodejs/examples/internal-feature-flags.ts
@@ -0,0 +1,95 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from "node:assert/strict";
+import { spawn } from "node:child_process";
+import { once } from "node:events";
+import { mkdtemp, rm } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join, resolve } from "node:path";
+import { createMessageConnection } from "vscode-jsonrpc/node.js";
+import { createInternalServerRpc } from "../src/generated/rpc.js";
+
+async function showFeatureFlags(rpc: ReturnType<typeof createInternalServerRpc>) {
+    await rpc.connect({});
+    const { flags } = await rpc.featureFlags.listMetadata();
+    assert.equal(flags.TASK_ANALYTICS.name, "TASK_ANALYTICS");
+    assert.equal(flags.TASK_ANALYTICS.expFlagEnvVar, "COPILOT_EXP_COPILOT_CLI_TASK_ANALYTICS");
+
+    const population = { isStaff: false, isExperimental: false, isTeam: false };
+    const experimentOnly = await rpc.featureFlags.resolve({
+        ...population,
+        environment: { COPILOT_EXP_COPILOT_CLI_TASK_ANALYTICS: "true" },
+    });
+    assert.equal(experimentOnly.TASK_ANALYTICS, false);
+
+    const request = {
+        ...population,
+        baseFlags: { TASK_ANALYTICS: false },
+        environment: { TASK_ANALYTICS: "true" },
+    };
+    const environment = await rpc.featureFlags.resolve(request);
+    const config = { enabledFeatureFlags: { TASK_ANALYTICS: false } };
+    const settings = await rpc.featureFlags.resolve({ ...request, config });
+    const explicit = await rpc.featureFlags.resolve({
+        ...request,
+        config,
+        flagOverrides: { TASK_ANALYTICS: true },
+    });
+    assert.deepEqual(environment, { TASK_ANALYTICS: true });
+    assert.deepEqual(settings, { TASK_ANALYTICS: false });
+    assert.deepEqual(explicit, { TASK_ANALYTICS: true });
+
+    console.log(
+        JSON.stringify({
+            declaredFlags: Object.keys(flags).length,
+            metadata: flags.TASK_ANALYTICS,
+            staticResolution: {
+                experimentOnly: experimentOnly.TASK_ANALYTICS,
+                environment: environment.TASK_ANALYTICS,
+                settings: settings.TASK_ANALYTICS,
+                explicit: explicit.TASK_ANALYTICS,
+            },
+        })
+    );
+}
+
+const runtimePath = process.argv[2];
+if (!runtimePath) {
+    throw new Error("Usage: tsx examples/internal-feature-flags.ts <copilot-runtime-path>");
+}
+
+const home = await mkdtemp(join(tmpdir(), "copilot-feature-flags-"));
+const child = spawn(
+    resolve(runtimePath),
+    ["--server", "--stdio", "--no-auto-login", "--no-auto-update", "--no-remote"],
+    {
+        cwd: home,
+        env: { ...process.env, COPILOT_HOME: home, COPILOT_CONNECTION_TOKEN: "" },
+        stdio: ["pipe", "pipe", "inherit"],
+        windowsHide: true,
+    }
+);
+const closed = once(child, "close");
+const connection = createMessageConnection(child.stdout, child.stdin);
+connection.listen();
+try {
+    await Promise.race([
+        showFeatureFlags(createInternalServerRpc(connection)),
+        closed.then(([code, signal]) => {
+            throw new Error(
+                `Runtime exited before the example completed: code=${code}, signal=${signal}`
+            );
+        }),
+    ]);
+} finally {
+    connection.dispose();
+    child.stdin.end();
+    try {
+        const [code, signal] = await closed;
+        assert.equal(code, 0, `Runtime exit signal: ${signal}`);
+    } finally {
+        await rm(home, { recursive: true, force: true });
+    }
+}
diff --git a/nodejs/examples/internal-user-settings.ts b/nodejs/examples/internal-user-settings.ts
new file mode 100644
index 0000000000..8bc4641903
--- /dev/null
+++ b/nodejs/examples/internal-user-settings.ts
@@ -0,0 +1,29 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import type { createInternalServerRpc } from "../src/generated/rpc.js";
+
+// Internal host example; these methods are not part of the public SDK API.
+export async function editUserSettings(
+    settings: ReturnType<typeof createInternalServerRpc>["user"]["settings"],
+    configDir: string
+) {
+    const validation = await settings.validate({
+        topKey: "voice",
+        value: { enabled: true },
+    });
+    if (!validation.ok) {
+        throw new Error(JSON.stringify(validation.issues));
+    }
+    await settings.update({
+        key: "voice",
+        value: { enabled: true },
+        configDir,
+    });
+    return settings.update({
+        key: "voice",
+        value: { selectedModel: null },
+        configDir,
+    });
+}
diff --git a/nodejs/package-lock.json b/nodejs/package-lock.json
index 937a26efa1..fc233f8b94 100644
--- a/nodejs/package-lock.json
+++ b/nodejs/package-lock.json
@@ -24,16 +24,16 @@
                 "esbuild": "^0.28.1",
                 "eslint": "^9.0.0",
                 "glob": "^13.0.1",
+                "hpke-js": "^1.8.0",
                 "json-schema": "^0.4.0",
                 "json-schema-to-typescript": "^15.0.4",
                 "prettier": "^3.8.1",
-                "quicktype-core": "^23.2.6",
                 "rimraf": "^6.1.2",
                 "semver": "^7.7.3",
                 "tar": "^7.5.22",
                 "tsx": "^4.20.6",
                 "typescript": "^5.0.0",
-                "vitest": "^4.0.18",
+                "vitest": "^4.1.11",
                 "ws": "^8.21.0"
             },
             "engines": {
@@ -57,37 +57,6 @@
                 "url": "https://github.com/sponsors/philsturgeon"
             }
         },
-        "node_modules/@emnapi/core": {
-            "version": "1.10.0",
-            "integrity": "sha1-OAzMjyQS6iLR2XLff47iOjucdGc=",
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "dependencies": {
-                "@emnapi/wasi-threads": "1.2.1",
-                "tslib": "^2.4.0"
-            }
-        },
-        "node_modules/@emnapi/runtime": {
-            "version": "1.10.0",
-            "integrity": "sha1-SyYMDTU0IE6YxhELjbGph9JuyHw=",
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "dependencies": {
-                "tslib": "^2.4.0"
-            }
-        },
-        "node_modules/@emnapi/wasi-threads": {
-            "version": "1.2.1",
-            "integrity": "sha1-KP7SGhuhznl8RKBwq8lNQvOuhUg=",
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "dependencies": {
-                "tslib": "^2.4.0"
-            }
-        },
         "node_modules/@esbuild/aix-ppc64": {
             "version": "0.28.1",
             "integrity": "sha1-egGo0uwvuy2seK2tCbD6eB5Agr4=",
@@ -659,34 +628,98 @@
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
             }
         },
-        "node_modules/@glideapps/ts-necessities": {
-            "version": "2.2.3",
-            "integrity": "sha512-gXi0awOZLHk3TbW55GZLCPP6O+y/b5X1pBXKBVckFONSwF1z1E5ND2BGJsghQFah+pW7pkkyFb2VhUQI2qhL5w==",
+        "node_modules/@hpke/chacha20poly1305": {
+            "version": "1.8.0",
+            "integrity": "sha1-1NL248zgi0xVU5IOFbTlmMildy4=",
             "dev": true,
-            "license": "MIT"
+            "license": "MIT",
+            "dependencies": {
+                "@hpke/common": "^1.10.0"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@hpke/common": {
+            "version": "1.10.1",
+            "integrity": "sha1-EfIF5bok1VjBvUrGcVgNldSIrxg=",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@hpke/core": {
+            "version": "1.9.0",
+            "integrity": "sha1-Ts7QWXeH9R/bU61RXD1Ho6vJ/jo=",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@hpke/common": "^1.10.0"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@hpke/dhkem-x25519": {
+            "version": "1.8.0",
+            "integrity": "sha1-S3lerZNjhH6CiEuQDmUBgUPYuZo=",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@hpke/common": "^1.10.0"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@hpke/dhkem-x448": {
+            "version": "1.8.0",
+            "integrity": "sha1-6NVrT7sc8KPV5fFAJpBa0yhp618=",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@hpke/common": "^1.10.0"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
         },
         "node_modules/@humanfs/core": {
-            "version": "0.19.1",
-            "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==",
+            "version": "0.19.2",
+            "integrity": "sha512-UhXNm+CFMWcbChXywFwkmhqjs3PRCmcSa/hfBgLIb7oQ5HNb1wS0icWsGtSAUNgefHeI+eBrA8I1fxmbHsGdvA==",
             "dev": true,
             "license": "Apache-2.0",
+            "dependencies": {
+                "@humanfs/types": "^0.15.0"
+            },
             "engines": {
                 "node": ">=18.18.0"
             }
         },
         "node_modules/@humanfs/node": {
-            "version": "0.16.7",
-            "integrity": "sha512-/zUx+yOsIrG4Y43Eh2peDeKCxlRt/gET6aHfaKpuq267qXdYDFViVHfMaLyygZOnl0kGWxFIgsBy8QFuTLUXEQ==",
+            "version": "0.16.8",
+            "integrity": "sha512-gE1eQNZ3R++kTzFUpdGlpmy8kDZD/MLyHqDwqjkVQI0JMdI1D51sy1H958PNXYkM2rAac7e5/CnIKZrHtPh3BQ==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
-                "@humanfs/core": "^0.19.1",
+                "@humanfs/core": "^0.19.2",
+                "@humanfs/types": "^0.15.0",
                 "@humanwhocodes/retry": "^0.4.0"
             },
             "engines": {
                 "node": ">=18.18.0"
             }
         },
+        "node_modules/@humanfs/types": {
+            "version": "0.15.0",
+            "integrity": "sha512-ZZ1w0aoQkwuUuC7Yf+7sdeaNfqQiiLcSRbfI08oAxqLtpXQr9AIVX7Ay7HLDuiLYAaFPu8oBYNq/QIi9URHJ3Q==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "engines": {
+                "node": ">=18.18.0"
+            }
+        },
         "node_modules/@humanwhocodes/module-importer": {
             "version": "1.0.1",
             "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
@@ -726,8 +759,8 @@
             }
         },
         "node_modules/@jridgewell/sourcemap-codec": {
-            "version": "1.5.5",
-            "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
+            "version": "1.6.0",
+            "integrity": "sha512-T7jf+5zgsZHwNJ4lvQ7/aezbyk0nNX+zJVWpmHA7VYsEx7a7qr5Rg5IbtJFqkgze5Y2sruq1RUY8Q837Od7iFw==",
             "dev": true,
             "license": "MIT"
         },
@@ -1014,34 +1047,13 @@
             "dev": true,
             "license": "MIT"
         },
-        "node_modules/@napi-rs/wasm-runtime": {
-            "version": "1.2.3",
-            "integrity": "sha1-l+PUXXQk3F2h1OMvO/OykvbBtEw=",
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "dependencies": {
-                "@tybys/wasm-util": "^0.10.3"
-            },
-            "engines": {
-                "node": "^20.19.0 || ^22.13.0 || >=23.5.0"
-            },
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/Brooooooklyn"
-            },
-            "peerDependencies": {
-                "@emnapi/core": "^1.7.1 || ^2.0.0-alpha.4",
-                "@emnapi/runtime": "^1.7.1 || ^2.0.0-alpha.4"
-            }
-        },
         "node_modules/@oxc-project/types": {
-            "version": "0.133.0",
-            "integrity": "sha512-KzkdCd6Uxqnf6l3HOw1xfatAlUURA0g14cvBYFyJ5SaNOQbOUvBr9PKArcPcrNIeRsBdgcUzOGrhKveVpvOIGA==",
+            "version": "0.153.0",
+            "integrity": "sha512-jSNrRIyvPVLL5E1z/tS5zLAprosGz/FuI1PWwEOz59j3E4TTTzSpqKb/RDGqJhhW0QHYISGXxq582wGx6T11Tw==",
             "dev": true,
             "license": "MIT",
             "funding": {
-                "url": "https://github.com/sponsors/Boshen"
+                "url": "https://github.com/sponsors/oxc-project"
             }
         },
         "node_modules/@platformatic/vfs": {
@@ -1053,9 +1065,25 @@
                 "node": ">= 22"
             }
         },
+        "node_modules/@rolldown/binding-android-arm-eabi": {
+            "version": "1.2.13",
+            "integrity": "sha512-Vu/NICrgdRvUOeaJZIyB2FP63s6fO/4ud5l8dXmxDx9yDyn+mN0y+gsvsVviSli+T361Aqo0h46EuMoobrwawA==",
+            "cpu": [
+                "arm"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "android"
+            ],
+            "engines": {
+                "node": "^20.19.0 || >=22.12.0"
+            }
+        },
         "node_modules/@rolldown/binding-android-arm64": {
-            "version": "1.0.3",
-            "integrity": "sha1-VM6Pg4IhP0oxSgwve6g/gf/q5ZI=",
+            "version": "1.2.13",
+            "integrity": "sha512-6LEoIrGy5vvCd2boNnv2soPSUZj/PRvhp8R/t9KlX+mIZxThIE/ZqxrGXxmuNX0FuvQFvLdZr7S4HrYpYBVhEQ==",
             "cpu": [
                 "arm64"
             ],
@@ -1070,8 +1098,8 @@
             }
         },
         "node_modules/@rolldown/binding-darwin-arm64": {
-            "version": "1.0.3",
-            "integrity": "sha512-PcAhP+ynjURNyy8SKGl5DQP94aGuB/7JrXJb/t7P+hanXvQVMWzUvRRhBAcg/lNRadBhoUPqSoP4xw5tR/KBEA==",
+            "version": "1.2.13",
+            "integrity": "sha512-CaJSRzlQ6Q+zkDMVA9OkVxBjVoPRCDEE3v0FSJ9kIQBgRjFApA3Si4ijhbNVUji7ZJt+PfO0e46qy4nPInHUPA==",
             "cpu": [
                 "arm64"
             ],
@@ -1086,8 +1114,8 @@
             }
         },
         "node_modules/@rolldown/binding-darwin-x64": {
-            "version": "1.0.3",
-            "integrity": "sha1-U/V94fWZ7PHbE4I8/IjBj7gJVK0=",
+            "version": "1.2.13",
+            "integrity": "sha512-e4r340I5hxSzJkD3YJBxgzq/rJ3wwxwdLLb2FPt1Zpyem20nrQPT11DDEEkazwxaHumH8wpglsp/Ozgj/wT6mw==",
             "cpu": [
                 "x64"
             ],
@@ -1102,8 +1130,8 @@
             }
         },
         "node_modules/@rolldown/binding-freebsd-x64": {
-            "version": "1.0.3",
-            "integrity": "sha1-bz/dobeuqsnSaKUmgEtPuW5ONfE=",
+            "version": "1.2.13",
+            "integrity": "sha512-hoBWDZ4/K/mJKVMbsgUd1jfpA2DiOrJ54mpegObU9TBHBBrtX4FLIXJJQRDPZ/2Dn91GvPob+Z2hwKJzf4E5SQ==",
             "cpu": [
                 "x64"
             ],
@@ -1118,8 +1146,8 @@
             }
         },
         "node_modules/@rolldown/binding-linux-arm-gnueabihf": {
-            "version": "1.0.3",
-            "integrity": "sha1-2HpFS/WFzJZ2hJN36R1uN1KXMm8=",
+            "version": "1.2.13",
+            "integrity": "sha512-oF9fZu3vTWnTiVAkDFxU9PJLt1nh20K9RRpuHsR7ZnE2L7XookBbDBVLojCVSLGbvtSlxeUNnjAj6DbNsKyzbg==",
             "cpu": [
                 "arm"
             ],
@@ -1134,12 +1162,15 @@
             }
         },
         "node_modules/@rolldown/binding-linux-arm64-gnu": {
-            "version": "1.0.3",
-            "integrity": "sha1-QZ/Wv2Es80jxBSjLzZTrq5YH2NE=",
+            "version": "1.2.13",
+            "integrity": "sha512-DTpb/+jMiqWMPgphn4ksW1zW+XLJ6dJJ9FMvnIk9I291LhCctMPhMYJrP5t9p6C9qa3KXadDdUEZHBaPh3kNxQ==",
             "cpu": [
                 "arm64"
             ],
             "dev": true,
+            "libc": [
+                "glibc"
+            ],
             "license": "MIT",
             "optional": true,
             "os": [
@@ -1150,12 +1181,15 @@
             }
         },
         "node_modules/@rolldown/binding-linux-arm64-musl": {
-            "version": "1.0.3",
-            "integrity": "sha1-/MaRhpa7doRId+HkkwoY/Q03QGk=",
+            "version": "1.2.13",
+            "integrity": "sha512-xU+Kvv9N2A3SY35zFh1FWWNjxbadE/BKeqnkXe7vScU4GZsw757BlVmDLITZEq8DPpk6m7uoDYkK7P+x/uU5Ow==",
             "cpu": [
                 "arm64"
             ],
             "dev": true,
+            "libc": [
+                "musl"
+            ],
             "license": "MIT",
             "optional": true,
             "os": [
@@ -1166,12 +1200,15 @@
             }
         },
         "node_modules/@rolldown/binding-linux-ppc64-gnu": {
-            "version": "1.0.3",
-            "integrity": "sha1-Mq7LfI2uXU8qjN5XoFjshpkVQvg=",
+            "version": "1.2.13",
+            "integrity": "sha512-XMk/hnhh25oQ756Lclb1Q11h4ll0xC0Esa5w4Vzp+mAE2S3AGJgeM0SonrIgY8fHhjarb6hcoTuwoFG0VVP2ig==",
             "cpu": [
                 "ppc64"
             ],
             "dev": true,
+            "libc": [
+                "glibc"
+            ],
             "license": "MIT",
             "optional": true,
             "os": [
@@ -1182,12 +1219,15 @@
             }
         },
         "node_modules/@rolldown/binding-linux-s390x-gnu": {
-            "version": "1.0.3",
-            "integrity": "sha1-vtk0bqgea7i5PPEfXYi3fbiQt2M=",
+            "version": "1.2.13",
+            "integrity": "sha512-U1BoTHYmlywE2n3HUWjzZ+8EQsKr+OwpxYuDWaubx42tUL8QSL7nOqRz/NVHanibbFP3M1Rxuprz/wNcbMKjqw==",
             "cpu": [
                 "s390x"
             ],
             "dev": true,
+            "libc": [
+                "glibc"
+            ],
             "license": "MIT",
             "optional": true,
             "os": [
@@ -1198,12 +1238,15 @@
             }
         },
         "node_modules/@rolldown/binding-linux-x64-gnu": {
-            "version": "1.0.3",
-            "integrity": "sha1-ZMLSb3Xf/ZtaH5dVegCudyUMjLc=",
+            "version": "1.2.13",
+            "integrity": "sha512-J4cm80Pc6wEwV5AZ42o62sIQgDk+Y7R2s646jIwuvO+4V46QB58N4vVuMPWCBaNgursXLpmUWJV//WQAkPvHBQ==",
             "cpu": [
                 "x64"
             ],
             "dev": true,
+            "libc": [
+                "glibc"
+            ],
             "license": "MIT",
             "optional": true,
             "os": [
@@ -1214,12 +1257,15 @@
             }
         },
         "node_modules/@rolldown/binding-linux-x64-musl": {
-            "version": "1.0.3",
-            "integrity": "sha1-WkUTLopHZZ7qrztUDClUqXyGD/M=",
+            "version": "1.2.13",
+            "integrity": "sha512-W0euZS40U4V6JkmEnVCIX9mcsL6cbXQ4X8c2w+MMOIjFg68TXUW+u3RT+2e1t1pv9mg/EP3pDtK3POXdQ7Rxyw==",
             "cpu": [
                 "x64"
             ],
             "dev": true,
+            "libc": [
+                "musl"
+            ],
             "license": "MIT",
             "optional": true,
             "os": [
@@ -1230,8 +1276,8 @@
             }
         },
         "node_modules/@rolldown/binding-openharmony-arm64": {
-            "version": "1.0.3",
-            "integrity": "sha1-KQUTBoxV6EnchFejKv7h17Csswk=",
+            "version": "1.2.13",
+            "integrity": "sha512-do/AF/4n9MRshia3a5aXoy8xM2c6mgfT6D7H/dY6my5z+hfCIR4ab7mk4IRj++nsEQpKy39kd0DQnDq+r692tw==",
             "cpu": [
                 "arm64"
             ],
@@ -1245,27 +1291,9 @@
                 "node": "^20.19.0 || >=22.12.0"
             }
         },
-        "node_modules/@rolldown/binding-wasm32-wasi": {
-            "version": "1.0.3",
-            "integrity": "sha1-PZly2/GpU9PHr6pKDyDvKy458xs=",
-            "cpu": [
-                "wasm32"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "dependencies": {
-                "@emnapi/core": "1.10.0",
-                "@emnapi/runtime": "1.10.0",
-                "@napi-rs/wasm-runtime": "^1.1.4"
-            },
-            "engines": {
-                "node": "^20.19.0 || >=22.12.0"
-            }
-        },
         "node_modules/@rolldown/binding-win32-arm64-msvc": {
-            "version": "1.0.3",
-            "integrity": "sha1-oASrYHoW1vA7y1VXKP+IivdXc60=",
+            "version": "1.2.13",
+            "integrity": "sha512-6FtUf2cJZobutJdxnGYX8z0vtbgqU0b2v8vfBhkXb9wp2MppMFtkunE+IaOntyi01rkIQoPW2GHABtfzsC0BRQ==",
             "cpu": [
                 "arm64"
             ],
@@ -1280,8 +1308,8 @@
             }
         },
         "node_modules/@rolldown/binding-win32-x64-msvc": {
-            "version": "1.0.3",
-            "integrity": "sha1-4qJbNGkaHMihIJ195wkGMCbdDNs=",
+            "version": "1.2.13",
+            "integrity": "sha512-UKhFaZTeTcbKrb3iU82m17jVcPEAoqDkCN5MBqgPyZSwp/cQmib21crTS0DdH7T1B7wZRWEI89YQAOJMet5yhg==",
             "cpu": [
                 "x64"
             ],
@@ -1307,16 +1335,6 @@
             "dev": true,
             "license": "MIT"
         },
-        "node_modules/@tybys/wasm-util": {
-            "version": "0.10.3",
-            "integrity": "sha1-AVy6np3UfOFNA9KoxdVHv7FpZl0=",
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "dependencies": {
-                "tslib": "^2.4.0"
-            }
-        },
         "node_modules/@types/chai": {
             "version": "5.2.3",
             "integrity": "sha512-Mw558oeA9fFbv65/y4mHtXDs9bPnFMZAL/jxdPFUpOHHIXX91mcgEHbS5Lahr+pwZFR8A7GQleRWeI6cGFC2UA==",
@@ -1598,15 +1616,15 @@
             }
         },
         "node_modules/@vitest/expect": {
-            "version": "4.1.8",
-            "integrity": "sha512-h3nDO677RDLEGlBxyQ5CW8RlMThSKSRLUePLOx09gNIWRL40edgA1GCZSZgf1W55MFAG6/Sw14KeaAnqv0NKdQ==",
+            "version": "4.1.11",
+            "integrity": "sha512-VX2x5vNJXET47KAFzwERI+KRMtTTCSWTfSMKsW7JsUsXV4psq++e3DvZpuTDOpHcxytiDs6p2nhVb2tVDiiUYw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@standard-schema/spec": "^1.1.0",
                 "@types/chai": "^5.2.2",
-                "@vitest/spy": "4.1.8",
-                "@vitest/utils": "4.1.8",
+                "@vitest/spy": "4.1.11",
+                "@vitest/utils": "4.1.11",
                 "chai": "^6.2.2",
                 "tinyrainbow": "^3.1.0"
             },
@@ -1615,12 +1633,12 @@
             }
         },
         "node_modules/@vitest/mocker": {
-            "version": "4.1.8",
-            "integrity": "sha512-LEiN/xe4OSIbKe9HQIp5OC24agGD9J5CnmMgsLohVVoOPWL9a2sBoR6VBx43jQZb7Kr1l4RCuyCJzcAa0+dojw==",
+            "version": "4.1.11",
+            "integrity": "sha512-2XJVD55d1o5AZous5CCGKS74g/riOj9odEt2bQpCVZeblHyHdnMeFl4jl0XjU21stf4mbjUkew2eXQZt65g5CQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@vitest/spy": "4.1.8",
+                "@vitest/spy": "4.1.11",
                 "estree-walker": "^3.0.3",
                 "magic-string": "^0.30.21"
             },
@@ -1641,8 +1659,8 @@
             }
         },
         "node_modules/@vitest/pretty-format": {
-            "version": "4.1.8",
-            "integrity": "sha512-9GasEBxpZ1VYIpqHf/0+YGg121uSNwCKOJqIrTwWP/TB7DmFCiaBpNl3aPZzoLWfWkuqhbH8vJIVobZkvdo2cA==",
+            "version": "4.1.11",
+            "integrity": "sha512-yiZzPbGTS9Sr/JpFl8zHrcIkAofNbFV6k21vIgQN/cY/oxZeXhJv5sc/MBJ5jFKWmWs+oJHw0UXLZjmf931+Vw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -1653,12 +1671,12 @@
             }
         },
         "node_modules/@vitest/runner": {
-            "version": "4.1.8",
-            "integrity": "sha512-EmVxeBAfMJvycdjd6Hm+RbFBbA9fKvo0Kx37hNpBYoYeavH3RNsBXWDooR1mgD52dCrxIIuP7UotpfiwOikvcg==",
+            "version": "4.1.11",
+            "integrity": "sha512-LztvUgdwMNJMIkj3hQnnxiC2Xy1zNxq928W/xhjCLaNCzqTZOudjwbQf6v9IntZGPw132i2Lq2rgTRZHD3JHNw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@vitest/utils": "4.1.8",
+                "@vitest/utils": "4.1.11",
                 "pathe": "^2.0.3"
             },
             "funding": {
@@ -1666,13 +1684,13 @@
             }
         },
         "node_modules/@vitest/snapshot": {
-            "version": "4.1.8",
-            "integrity": "sha512-acfZboRmAIf05DEKcBQy33VXojFJjtUdLyo7oOmV9kebb2xdU01UknNiPuPZoJZQyO7DF0gZdTGTpeAzET9QPQ==",
+            "version": "4.1.11",
+            "integrity": "sha512-pN7ikn1ON7h8ee4gIAp4AzyK+zBtJPzVbqOgu5LCEh4VaJVbPQcgYQYJIMGQPXVeJJq1fnfazis7a5pFNPahog==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@vitest/pretty-format": "4.1.8",
-                "@vitest/utils": "4.1.8",
+                "@vitest/pretty-format": "4.1.11",
+                "@vitest/utils": "4.1.11",
                 "magic-string": "^0.30.21",
                 "pathe": "^2.0.3"
             },
@@ -1681,8 +1699,8 @@
             }
         },
         "node_modules/@vitest/spy": {
-            "version": "4.1.8",
-            "integrity": "sha512-6EevtBp6OZOPF7bmz36HrGMeP3txgVSrgebWxHOafDXGkhIzfXK14f8KF6MuFfgXXUeHxmpD3BQxkV00/3s5mA==",
+            "version": "4.1.11",
+            "integrity": "sha512-apNa/prQy2qCeywhnixOHPRCgGNhvg7T4Dapfl1GahLp/R+uhBm5cPyFoNVyqsNd2h1nJxL6BqqdIjiABL60YA==",
             "dev": true,
             "license": "MIT",
             "funding": {
@@ -1690,12 +1708,12 @@
             }
         },
         "node_modules/@vitest/utils": {
-            "version": "4.1.8",
-            "integrity": "sha512-uOJamYALNhfJ6iolExyQM40yIQwDqYnkKtQ5VCiSe17E33H0aQ/u+1GlRuz4LZBk6Mm3sg90G9hEbmEt37C1Zg==",
+            "version": "4.1.11",
+            "integrity": "sha512-zTCVGpyFsGWBhllOyKlTw/vnr6D9qxsfSDyfbyZmTyjHw5N/VuvzHpHoQjm2ZJzn4RJgx5w4r7V0er69CmLgPQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@vitest/pretty-format": "4.1.8",
+                "@vitest/pretty-format": "4.1.11",
                 "convert-source-map": "^2.0.0",
                 "tinyrainbow": "^3.1.0"
             },
@@ -1703,18 +1721,6 @@
                 "url": "https://opencollective.com/vitest"
             }
         },
-        "node_modules/abort-controller": {
-            "version": "3.0.0",
-            "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "event-target-shim": "^5.0.0"
-            },
-            "engines": {
-                "node": ">=6.5"
-            }
-        },
         "node_modules/acorn": {
             "version": "8.15.0",
             "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
@@ -1773,29 +1779,9 @@
             "dev": true,
             "license": "MIT"
         },
-        "node_modules/base64-js": {
-            "version": "1.5.1",
-            "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/feross"
-                },
-                {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/feross"
-                },
-                {
-                    "type": "consulting",
-                    "url": "https://feross.org/support"
-                }
-            ],
-            "license": "MIT"
-        },
         "node_modules/brace-expansion": {
-            "version": "1.1.16",
-            "integrity": "sha512-IDw48K2/2kRkg9LdJxurvq3lV3aBgq0REY89duEqFRthjlPdXHKMj7EnQOXVckxzgisinf3nHfrcE2FufFLXMw==",
+            "version": "1.1.21",
+            "integrity": "sha512-9zeA+KLZNNzglF2TPKRQEDyx6Yby7daAkuy8MiPzpXPsYDWi/DRM8jmwUDxokQjYqBpv5DgPiwD4h4ZZSy1Ujw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -1803,36 +1789,6 @@
                 "concat-map": "0.0.1"
             }
         },
-        "node_modules/browser-or-node": {
-            "version": "3.0.0",
-            "integrity": "sha512-iczIdVJzGEYhP5DqQxYM9Hh7Ztpqqi+CXZpSmX8ALFs9ecXkQIeqRyM6TfxEfMVpwhl3dSuDvxdzzo9sUOIVBQ==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/buffer": {
-            "version": "6.0.3",
-            "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/feross"
-                },
-                {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/feross"
-                },
-                {
-                    "type": "consulting",
-                    "url": "https://feross.org/support"
-                }
-            ],
-            "license": "MIT",
-            "dependencies": {
-                "base64-js": "^1.3.1",
-                "ieee754": "^1.2.1"
-            }
-        },
         "node_modules/callsites": {
             "version": "3.1.0",
             "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
@@ -1843,8 +1799,8 @@
             }
         },
         "node_modules/chai": {
-            "version": "6.2.2",
-            "integrity": "sha512-NUPRluOfOiTKBKvWPtSD4PhFvWCqOi0BGStNWs57X9js7XGTprSmFoz5F0tWhR4WPjNeR9jXqdC7/UpSJTnlRg==",
+            "version": "6.3.0",
+            "integrity": "sha512-XWAtwJ6OHO+tj0EKCs0Y2UamnyOxseZWltU4x2U2wh8g4AigdjwvtUjvLP2tqkA/avxHEtzxNaqGq/YGNwckKg==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -1891,12 +1847,6 @@
                 "node": ">=18"
             }
         },
-        "node_modules/collection-utils": {
-            "version": "1.0.1",
-            "integrity": "sha512-LA2YTIlR7biSpXkKYwwuzGjwL5rjWEZVOSnvdUc7gObvWe4WkjxOpfrdhoP7Hs09YWDVfg0Mal9BpAqLfVEzQg==",
-            "dev": true,
-            "license": "Apache-2.0"
-        },
         "node_modules/color-convert": {
             "version": "2.0.1",
             "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
@@ -1927,15 +1877,6 @@
             "dev": true,
             "license": "MIT"
         },
-        "node_modules/cross-fetch": {
-            "version": "4.1.0",
-            "integrity": "sha512-uKm5PU+MHTootlWEY+mZ4vvXoCn4fLQxT9dSc1sXVMSFkINTJVN8cAQROpwcKm8bJ/c7rgZVIBWzH5T78sNZZw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "node-fetch": "^2.7.0"
-            }
-        },
         "node_modules/cross-spawn": {
             "version": "7.0.6",
             "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
@@ -2241,24 +2182,6 @@
                 "node": ">=0.10.0"
             }
         },
-        "node_modules/event-target-shim": {
-            "version": "5.0.1",
-            "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/events": {
-            "version": "3.3.0",
-            "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=0.8.x"
-            }
-        },
         "node_modules/expect-type": {
             "version": "1.3.0",
             "integrity": "sha512-knvyeauYhqjOYvQ66MznSMs83wmHrCycNEN6Ao+2AeYEfxUIkuiVxdEa1qlGEPK+We3n0THiDciYSsCcgW/DoA==",
@@ -2414,25 +2337,21 @@
                 "node": ">=8"
             }
         },
-        "node_modules/ieee754": {
-            "version": "1.2.1",
-            "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+        "node_modules/hpke-js": {
+            "version": "1.8.0",
+            "integrity": "sha1-0Sx/4a7uI0/tveC56r8pBPWZhrQ=",
             "dev": true,
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/feross"
-                },
-                {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/feross"
-                },
-                {
-                    "type": "consulting",
-                    "url": "https://feross.org/support"
-                }
-            ],
-            "license": "BSD-3-Clause"
+            "license": "MIT",
+            "dependencies": {
+                "@hpke/chacha20poly1305": "^1.8.0",
+                "@hpke/common": "^1.10.0",
+                "@hpke/core": "^1.9.0",
+                "@hpke/dhkem-x25519": "^1.8.0",
+                "@hpke/dhkem-x448": "^1.8.0"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
         },
         "node_modules/ignore": {
             "version": "7.0.5",
@@ -2489,24 +2408,12 @@
                 "node": ">=0.10.0"
             }
         },
-        "node_modules/is-url": {
-            "version": "1.2.4",
-            "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==",
-            "dev": true,
-            "license": "MIT"
-        },
         "node_modules/isexe": {
             "version": "2.0.0",
             "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
             "dev": true,
             "license": "ISC"
         },
-        "node_modules/js-base64": {
-            "version": "3.7.8",
-            "integrity": "sha512-hNngCeKxIUQiEUN3GPJOkz4wF/YvdUdbNL9hsBcMQTkKzboD7T/q3OYOuuPZLUE6dBxSGpwhk5mwuDud7JVAow==",
-            "dev": true,
-            "license": "BSD-3-Clause"
-        },
         "node_modules/js-yaml": {
             "version": "4.3.2",
             "integrity": "sha512-SFNOvSJ+Dgf/9An904Yx+CgSlIPCkIpao4qo51lpee25TIRejdH3rhR4EZMGoNx3/TP3O+wzWuiTFl4sqbltzA==",
@@ -2628,8 +2535,8 @@
             }
         },
         "node_modules/lightningcss": {
-            "version": "1.32.0",
-            "integrity": "sha512-NXYBzinNrblfraPGyrbPoD19C1h9lfI/1mzgWYvXUTe414Gz/X1FD2XBZSZM7rRTrMA8JL3OtAaGifrIKhQ5yQ==",
+            "version": "1.33.0",
+            "integrity": "sha512-WkUDrojuJs0xkgGf2udWxa3yGBRxPtxUkB79i6aCZLRgc7PM8fZe9TosfPDcvEpQZbuFASnHYmRLBLUbmLOIIA==",
             "dev": true,
             "license": "MPL-2.0",
             "dependencies": {
@@ -2643,22 +2550,22 @@
                 "url": "https://opencollective.com/parcel"
             },
             "optionalDependencies": {
-                "lightningcss-android-arm64": "1.32.0",
-                "lightningcss-darwin-arm64": "1.32.0",
-                "lightningcss-darwin-x64": "1.32.0",
-                "lightningcss-freebsd-x64": "1.32.0",
-                "lightningcss-linux-arm-gnueabihf": "1.32.0",
-                "lightningcss-linux-arm64-gnu": "1.32.0",
-                "lightningcss-linux-arm64-musl": "1.32.0",
-                "lightningcss-linux-x64-gnu": "1.32.0",
-                "lightningcss-linux-x64-musl": "1.32.0",
-                "lightningcss-win32-arm64-msvc": "1.32.0",
-                "lightningcss-win32-x64-msvc": "1.32.0"
+                "lightningcss-android-arm64": "1.33.0",
+                "lightningcss-darwin-arm64": "1.33.0",
+                "lightningcss-darwin-x64": "1.33.0",
+                "lightningcss-freebsd-x64": "1.33.0",
+                "lightningcss-linux-arm-gnueabihf": "1.33.0",
+                "lightningcss-linux-arm64-gnu": "1.33.0",
+                "lightningcss-linux-arm64-musl": "1.33.0",
+                "lightningcss-linux-x64-gnu": "1.33.0",
+                "lightningcss-linux-x64-musl": "1.33.0",
+                "lightningcss-win32-arm64-msvc": "1.33.0",
+                "lightningcss-win32-x64-msvc": "1.33.0"
             }
         },
         "node_modules/lightningcss-android-arm64": {
-            "version": "1.32.0",
-            "integrity": "sha1-8DOIURbf79nG9UeHUj41FLYeGWg=",
+            "version": "1.33.0",
+            "integrity": "sha512-gEpRTalKdosp4Bb8qWtc2iOgE5SeIHlpS1up9bFq2wAyYhl1UdTObYiHe98zEM9SQvSoqQZ1IQD0JNpg3Ml5pg==",
             "cpu": [
                 "arm64"
             ],
@@ -2677,8 +2584,8 @@
             }
         },
         "node_modules/lightningcss-darwin-arm64": {
-            "version": "1.32.0",
-            "integrity": "sha512-RzeG9Ju5bag2Bv1/lwlVJvBE3q6TtXskdZLLCyfg5pt+HLz9BqlICO7LZM7VHNTTn/5PRhHFBSjk5lc4cmscPQ==",
+            "version": "1.33.0",
+            "integrity": "sha512-Sciaz8eenNTKn9b3t7+xr0ipTp9YxKQY4npwQ3mrRuL0BAVHBLyZxofhaKBAVtzmtRZ/zTyo0/to4B1uWG/Djg==",
             "cpu": [
                 "arm64"
             ],
@@ -2697,8 +2604,8 @@
             }
         },
         "node_modules/lightningcss-darwin-x64": {
-            "version": "1.32.0",
-            "integrity": "sha1-NfPpczLRMLnKGB4RtWje1q68bV4=",
+            "version": "1.33.0",
+            "integrity": "sha512-Z5UPAxzrjlWNNyGy6i65cJzzvgJ5D3T6wMvs+gWpY9d7qRhANrxqAp6LhxIgZhWEw18RfJTGcRxjuLIBr+m8XQ==",
             "cpu": [
                 "x64"
             ],
@@ -2717,8 +2624,8 @@
             }
         },
         "node_modules/lightningcss-freebsd-x64": {
-            "version": "1.32.0",
-            "integrity": "sha1-l3enZHK2Ttb/lDQq1kx7r9eUpXU=",
+            "version": "1.33.0",
+            "integrity": "sha512-QQM/Ti/hQajJwCY+RiWuCZ9sdtI/XQk7nDK5vC8kkdwixezOlDgvDx7+RT+QjK6FcFT4MpsuoBnHIo/O3StRRg==",
             "cpu": [
                 "x64"
             ],
@@ -2737,8 +2644,8 @@
             }
         },
         "node_modules/lightningcss-linux-arm-gnueabihf": {
-            "version": "1.32.0",
-            "integrity": "sha1-E65lLhq3O5E117faFy9mbEEK1T0=",
+            "version": "1.33.0",
+            "integrity": "sha512-N7FVBe6iS24MlM6R/4RBTxGhQheZGs7tiQ9U32UtF75NzP5Q7xWPRqLBCKxlRQRk3rY1jCIPLzx7WzOhuUIRLQ==",
             "cpu": [
                 "arm"
             ],
@@ -2757,12 +2664,15 @@
             }
         },
         "node_modules/lightningcss-linux-arm64-gnu": {
-            "version": "1.32.0",
-            "integrity": "sha1-QXhYeVqUWS9oASOhsfnaig4e8zU=",
+            "version": "1.33.0",
+            "integrity": "sha512-j2v/itmy4HlNxlc6voKXYgBqNi0Ng2LShg4z7GufpEgs05P+2suBVyi9I6YHq5uoVFx9ETin3eCEhLVyXGQnKg==",
             "cpu": [
                 "arm64"
             ],
             "dev": true,
+            "libc": [
+                "glibc"
+            ],
             "license": "MPL-2.0",
             "optional": true,
             "os": [
@@ -2777,12 +2687,15 @@
             }
         },
         "node_modules/lightningcss-linux-arm64-musl": {
-            "version": "1.32.0",
-            "integrity": "sha1-a+NmkugQtxgECAL9gJYjz/5zITM=",
+            "version": "1.33.0",
+            "integrity": "sha512-yiO5ROMuYQgXbC60yjZU5CYSFZGKXL0HFATXt9mHJn1+zW55oCtMI9NfcVhYLMFDL7gV7oBPon/EmMMGg2OvtQ==",
             "cpu": [
                 "arm64"
             ],
             "dev": true,
+            "libc": [
+                "musl"
+            ],
             "license": "MPL-2.0",
             "optional": true,
             "os": [
@@ -2797,12 +2710,15 @@
             }
         },
         "node_modules/lightningcss-linux-x64-gnu": {
-            "version": "1.32.0",
-            "integrity": "sha1-C3gDr06yHP043Tn+Kru1PH3QkfY=",
+            "version": "1.33.0",
+            "integrity": "sha512-ar+Ju7LmcN0Jo4FpL4hpFybwNG9/3A/Br5KW2n2jyODg3MEZXaDYADdemoNS+BDNfMgKvylJLj4S5tyRActuAg==",
             "cpu": [
                 "x64"
             ],
             "dev": true,
+            "libc": [
+                "glibc"
+            ],
             "license": "MPL-2.0",
             "optional": true,
             "os": [
@@ -2817,12 +2733,15 @@
             }
         },
         "node_modules/lightningcss-linux-x64-musl": {
-            "version": "1.32.0",
-            "integrity": "sha1-iNyLqGXd3bGsXvBLDxYYBEGMFjs=",
+            "version": "1.33.0",
+            "integrity": "sha512-RYiYbkokw0trfKqqzfF55lginwEPrD3OJDfTuJzFs1MK6iFnDenaz1fqLLtX4ITG3OktJQXOeTaw1awrBAlZPw==",
             "cpu": [
                 "x64"
             ],
             "dev": true,
+            "libc": [
+                "musl"
+            ],
             "license": "MPL-2.0",
             "optional": true,
             "os": [
@@ -2837,8 +2756,8 @@
             }
         },
         "node_modules/lightningcss-win32-arm64-msvc": {
-            "version": "1.32.0",
-            "integrity": "sha1-TzC6P6XpJfW3n5RejMDRdsOxqzg=",
+            "version": "1.33.0",
+            "integrity": "sha512-1K+MPfLSFVpphzpdbfkhlWk6wBrTObBzS2T6db10PNOZgR9GoVsAWzwNyuhUYYbTp23j+4RrncfujZ4uAzXvwA==",
             "cpu": [
                 "arm64"
             ],
@@ -2857,8 +2776,8 @@
             }
         },
         "node_modules/lightningcss-win32-x64-msvc": {
-            "version": "1.32.0",
-            "integrity": "sha1-FBqlYFZFBkkokCu0rwRfp9n0Igo=",
+            "version": "1.33.0",
+            "integrity": "sha512-OlEICDx/Xl0FqSp4bry8zFnCvGpig3Gl4gCquvYwHuqJKEC1+n9NgDniFvqHGmMv1ZkqDJrDqKKSykTDX+ehuA==",
             "cpu": [
                 "x64"
             ],
@@ -2946,8 +2865,8 @@
             }
         },
         "node_modules/minimatch/node_modules/brace-expansion": {
-            "version": "5.0.8",
-            "integrity": "sha512-JZyDyq3D4AUifKTPOB7DELf6XsB3WdPuNxCtob1vFXPsSXhdAiHBWJ/tJ8HAc9aH84BK+5JFZLNkJKx3G9kzQg==",
+            "version": "5.0.12",
+            "integrity": "sha512-YovQ3rzhaLMIrDjNDMkNS01tea93qhEhG5xy8f6+R0l+dw3Ki+5sCoIoI942iuLZTHWogWktgwVDhU09iNEimQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -2994,8 +2913,8 @@
             "license": "MIT"
         },
         "node_modules/nanoid": {
-            "version": "3.3.17",
-            "integrity": "sha512-xQLf0A3HOMlgHq0n247/LRuAOYmB7dXJ/DvAxGvsSBij45XtBSmQycu+F8ODbHwns/XyFZagyL1+J0Offw1E0g==",
+            "version": "3.3.20",
+            "integrity": "sha512-uKdg2G3GNCKQn9byYOpxbGqrT2fGO5KRt5J/8b3pok8rT6qxGWF6hxMyJiEYtAf+FVyYuD9hRaDqX5uPFYJ4ZQ==",
             "dev": true,
             "funding": [
                 {
@@ -3017,26 +2936,6 @@
             "dev": true,
             "license": "MIT"
         },
-        "node_modules/node-fetch": {
-            "version": "2.7.0",
-            "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "whatwg-url": "^5.0.0"
-            },
-            "engines": {
-                "node": "4.x || >=6.0.0"
-            },
-            "peerDependencies": {
-                "encoding": "^0.1.0"
-            },
-            "peerDependenciesMeta": {
-                "encoding": {
-                    "optional": true
-                }
-            }
-        },
         "node_modules/obug": {
             "version": "2.1.1",
             "integrity": "sha512-uTqF9MuPraAQ+IsnPf366RG4cP9RtUi7MLO1N3KEc+wb0a6yKpeL0lmk2IB1jY5KHPAlTc6T/JRdC/YqxHNwkQ==",
@@ -3100,12 +2999,6 @@
             "dev": true,
             "license": "BlueOak-1.0.0"
         },
-        "node_modules/pako": {
-            "version": "1.0.11",
-            "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
-            "dev": true,
-            "license": "(MIT AND Zlib)"
-        },
         "node_modules/parent-module": {
             "version": "1.0.1",
             "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
@@ -3165,8 +3058,8 @@
             "license": "ISC"
         },
         "node_modules/picomatch": {
-            "version": "4.0.4",
-            "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
+            "version": "4.0.7",
+            "integrity": "sha512-qcJu88Q2IWqJsDD529JKMdwGm/dvInW4HvQnRwiH9JtihJvzGOscDtHE3x1pBKeUOTysQ8kVmLnJ2kJu7yhcGA==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -3176,18 +3069,9 @@
                 "url": "https://github.com/sponsors/jonschlinkert"
             }
         },
-        "node_modules/pluralize": {
-            "version": "8.0.0",
-            "integrity": "sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=4"
-            }
-        },
         "node_modules/postcss": {
-            "version": "8.5.25",
-            "integrity": "sha512-DTPx3RWSSnWyzLxQnlH0rJP+EW5ekl16ZU4/psbIhA0e53kJfdgaN5vKM+xP7yJtXVu+nfdVFmlgFDEKAe4Pyw==",
+            "version": "8.5.29",
+            "integrity": "sha512-49cGhUbXj8Qenv0iTMxA1cFBzxXoctpC9Ujd77t1WcbJIr6nF/eI7g/8MgxrYldFRuAXvja7xQRwavoW7kgrxQ==",
             "dev": true,
             "funding": [
                 {
@@ -3205,9 +3089,9 @@
             ],
             "license": "MIT",
             "dependencies": {
-                "nanoid": "^3.3.16",
+                "nanoid": "^3.3.19",
                 "picocolors": "^1.1.1",
-                "source-map-js": "^1.2.1"
+                "source-map-js": "^1.2.2"
             },
             "engines": {
                 "node": "^10 || ^12 || >=14"
@@ -3237,15 +3121,6 @@
                 "url": "https://github.com/prettier/prettier?sponsor=1"
             }
         },
-        "node_modules/process": {
-            "version": "0.11.10",
-            "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">= 0.6.0"
-            }
-        },
         "node_modules/punycode": {
             "version": "2.3.1",
             "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
@@ -3255,44 +3130,6 @@
                 "node": ">=6"
             }
         },
-        "node_modules/quicktype-core": {
-            "version": "23.2.6",
-            "integrity": "sha512-asfeSv7BKBNVb9WiYhFRBvBZHcRutPRBwJMxW0pefluK4kkKu4lv0IvZBwFKvw2XygLcL1Rl90zxWDHYgkwCmA==",
-            "dev": true,
-            "license": "Apache-2.0",
-            "dependencies": {
-                "@glideapps/ts-necessities": "2.2.3",
-                "browser-or-node": "^3.0.0",
-                "collection-utils": "^1.0.1",
-                "cross-fetch": "^4.0.0",
-                "is-url": "^1.2.4",
-                "js-base64": "^3.7.7",
-                "lodash": "^4.17.21",
-                "pako": "^1.0.6",
-                "pluralize": "^8.0.0",
-                "readable-stream": "4.5.2",
-                "unicode-properties": "^1.4.1",
-                "urijs": "^1.19.1",
-                "wordwrap": "^1.0.0",
-                "yaml": "^2.4.1"
-            }
-        },
-        "node_modules/readable-stream": {
-            "version": "4.5.2",
-            "integrity": "sha512-yjavECdqeZ3GLXNgRXgeQEdz9fvDDkNKyHnbHRFtOr7/LcfgBcmct7t/ET+HaCTqfh06OzoAxrkN/IfjJBVe+g==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "abort-controller": "^3.0.0",
-                "buffer": "^6.0.3",
-                "events": "^3.3.0",
-                "process": "^0.11.10",
-                "string_decoder": "^1.3.0"
-            },
-            "engines": {
-                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-            }
-        },
         "node_modules/resolve-from": {
             "version": "4.0.0",
             "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
@@ -3322,12 +3159,12 @@
             }
         },
         "node_modules/rolldown": {
-            "version": "1.0.3",
-            "integrity": "sha512-i00lAJ2ks1BYr7rjNjKC7BcqAS7nVfiT3QX1SI5aY+AFHblCmaUf9OE9dbdzDvW6dJxbi2ZCZiy9v3CcwOiX3g==",
+            "version": "1.2.13",
+            "integrity": "sha512-/5apOkwWxtACcQtZ5WlrAsKS4JwXVThQPJZ3RqIruRY9UG9M8e0VlXN068xum/JRKA4aIUoJ13ghe/kGCvidiQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@oxc-project/types": "=0.133.0",
+                "@oxc-project/types": "=0.153.0",
                 "@rolldown/pluginutils": "^1.0.0"
             },
             "bin": {
@@ -3337,42 +3174,22 @@
                 "node": "^20.19.0 || >=22.12.0"
             },
             "optionalDependencies": {
-                "@rolldown/binding-android-arm64": "1.0.3",
-                "@rolldown/binding-darwin-arm64": "1.0.3",
-                "@rolldown/binding-darwin-x64": "1.0.3",
-                "@rolldown/binding-freebsd-x64": "1.0.3",
-                "@rolldown/binding-linux-arm-gnueabihf": "1.0.3",
-                "@rolldown/binding-linux-arm64-gnu": "1.0.3",
-                "@rolldown/binding-linux-arm64-musl": "1.0.3",
-                "@rolldown/binding-linux-ppc64-gnu": "1.0.3",
-                "@rolldown/binding-linux-s390x-gnu": "1.0.3",
-                "@rolldown/binding-linux-x64-gnu": "1.0.3",
-                "@rolldown/binding-linux-x64-musl": "1.0.3",
-                "@rolldown/binding-openharmony-arm64": "1.0.3",
-                "@rolldown/binding-wasm32-wasi": "1.0.3",
-                "@rolldown/binding-win32-arm64-msvc": "1.0.3",
-                "@rolldown/binding-win32-x64-msvc": "1.0.3"
-            }
-        },
-        "node_modules/safe-buffer": {
-            "version": "5.2.1",
-            "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/feross"
-                },
-                {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/feross"
-                },
-                {
-                    "type": "consulting",
-                    "url": "https://feross.org/support"
-                }
-            ],
-            "license": "MIT"
+                "@rolldown/binding-android-arm-eabi": "1.2.13",
+                "@rolldown/binding-android-arm64": "1.2.13",
+                "@rolldown/binding-darwin-arm64": "1.2.13",
+                "@rolldown/binding-darwin-x64": "1.2.13",
+                "@rolldown/binding-freebsd-x64": "1.2.13",
+                "@rolldown/binding-linux-arm-gnueabihf": "1.2.13",
+                "@rolldown/binding-linux-arm64-gnu": "1.2.13",
+                "@rolldown/binding-linux-arm64-musl": "1.2.13",
+                "@rolldown/binding-linux-ppc64-gnu": "1.2.13",
+                "@rolldown/binding-linux-s390x-gnu": "1.2.13",
+                "@rolldown/binding-linux-x64-gnu": "1.2.13",
+                "@rolldown/binding-linux-x64-musl": "1.2.13",
+                "@rolldown/binding-openharmony-arm64": "1.2.13",
+                "@rolldown/binding-win32-arm64-msvc": "1.2.13",
+                "@rolldown/binding-win32-x64-msvc": "1.2.13"
+            }
         },
         "node_modules/semver": {
             "version": "7.7.3",
@@ -3414,8 +3231,8 @@
             "license": "ISC"
         },
         "node_modules/source-map-js": {
-            "version": "1.2.1",
-            "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
+            "version": "1.2.2",
+            "integrity": "sha512-KGj/8Y43x35aZVDtt+J4mK1hoLGHULMYfSkODJNQjNDC3oW1PqPoxMwo0pLUsWM/UEGzON/NxeHywEfNXNP3Vw==",
             "dev": true,
             "license": "BSD-3-Clause",
             "engines": {
@@ -3434,15 +3251,6 @@
             "dev": true,
             "license": "MIT"
         },
-        "node_modules/string_decoder": {
-            "version": "1.3.0",
-            "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "safe-buffer": "~5.2.0"
-            }
-        },
         "node_modules/strip-json-comments": {
             "version": "3.1.1",
             "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
@@ -3483,12 +3291,6 @@
                 "node": ">=18"
             }
         },
-        "node_modules/tiny-inflate": {
-            "version": "1.0.3",
-            "integrity": "sha512-pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw==",
-            "dev": true,
-            "license": "MIT"
-        },
         "node_modules/tinybench": {
             "version": "2.9.0",
             "integrity": "sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==",
@@ -3521,20 +3323,14 @@
             }
         },
         "node_modules/tinyrainbow": {
-            "version": "3.1.0",
-            "integrity": "sha512-Bf+ILmBgretUrdJxzXM0SgXLZ3XfiaUuOj/IKQHuTXip+05Xn+uyEYdVg0kYDipTBcLrCVyUzAPz7QmArb0mmw==",
+            "version": "3.2.0",
+            "integrity": "sha512-LgO3D9yZJjApUiuUfl9iFAwrtaX4+lok3wJIqttGoKCHlWUqHqbQpnxCf82L8FjgKsh4iGo78hqJwgL8F6To2A==",
             "dev": true,
             "license": "MIT",
             "engines": {
                 "node": ">=14.0.0"
             }
         },
-        "node_modules/tr46": {
-            "version": "0.0.3",
-            "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
-            "dev": true,
-            "license": "MIT"
-        },
         "node_modules/ts-api-utils": {
             "version": "2.4.0",
             "integrity": "sha512-3TaVTaAv2gTiMB35i3FiGJaRfwb3Pyn/j3m/bfAvGe8FB7CF6u+LMYqYlDh7reQf7UNvoTvdfAqHGmPGOSsPmA==",
@@ -3547,13 +3343,6 @@
                 "typescript": ">=4.8.4"
             }
         },
-        "node_modules/tslib": {
-            "version": "2.8.1",
-            "integrity": "sha1-YS7+TtI11Wfoq6Xypfq3AoCt6D8=",
-            "dev": true,
-            "license": "0BSD",
-            "optional": true
-        },
         "node_modules/tsx": {
             "version": "4.22.4",
             "integrity": "sha512-X8EX+XV4QR5xCsrgxaED954zTDfY8KqlDtskKEL0cHhyS/P8b4IFOvGDQpsC9Q1XnLq915wEfwwY/zzskCtmhg==",
@@ -3603,32 +3392,6 @@
             "dev": true,
             "license": "MIT"
         },
-        "node_modules/unicode-properties": {
-            "version": "1.4.1",
-            "integrity": "sha512-CLjCCLQ6UuMxWnbIylkisbRj31qxHPAurvena/0iwSVbQ2G1VY5/HjV0IRabOEbDHlzZlRdCrD4NhB0JtU40Pg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "base64-js": "^1.3.0",
-                "unicode-trie": "^2.0.0"
-            }
-        },
-        "node_modules/unicode-trie": {
-            "version": "2.0.0",
-            "integrity": "sha512-x7bc76x0bm4prf1VLg79uhAzKw8DVboClSN5VxJuQ+LKDOVEW9CdH+VY7SP+vX7xCYQqzzgQpFqz15zeLvAtZQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "pako": "^0.2.5",
-                "tiny-inflate": "^1.0.0"
-            }
-        },
-        "node_modules/unicode-trie/node_modules/pako": {
-            "version": "0.2.9",
-            "integrity": "sha512-NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA==",
-            "dev": true,
-            "license": "MIT"
-        },
         "node_modules/uri-js": {
             "version": "4.4.1",
             "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
@@ -3638,22 +3401,16 @@
                 "punycode": "^2.1.0"
             }
         },
-        "node_modules/urijs": {
-            "version": "1.19.11",
-            "integrity": "sha512-HXgFDgDommxn5/bIv0cnQZsPhHDA90NPHD6+c/v21U5+Sx5hoP8+dP9IZXBU1gIfvdRfhG8cel9QNPeionfcCQ==",
-            "dev": true,
-            "license": "MIT"
-        },
         "node_modules/vite": {
-            "version": "8.0.16",
-            "integrity": "sha512-h9bXPmJichP5fLmVQo3PyaGSDE2n3aPuomeAlVRm0JLmt4rY6zmPKd59HYI4LNW8oTK7tlTsuC7l/m7awx9Jcw==",
+            "version": "8.3.4",
+            "integrity": "sha512-IftLE8phJhdNRIGNEV4JCCvfNScoZQVfcXaN8TQropWGJtOHcu+iAB9pHcuGvmEb/kddw0LBe/jS8ztdC6xdiQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "lightningcss": "^1.32.0",
-                "picomatch": "^4.0.4",
-                "postcss": "^8.5.15",
-                "rolldown": "1.0.3",
+                "lightningcss": "^1.33.0",
+                "picomatch": "^4.0.7",
+                "postcss": "^8.5.29",
+                "rolldown": "~1.2.12",
                 "tinyglobby": "^0.2.17"
             },
             "bin": {
@@ -3670,7 +3427,7 @@
             },
             "peerDependencies": {
                 "@types/node": "^20.19.0 || >=22.12.0",
-                "@vitejs/devtools": "^0.1.18",
+                "@vitejs/devtools": "^0.7.1",
                 "esbuild": "^0.27.0 || ^0.28.0",
                 "jiti": ">=1.21.0",
                 "less": "^4.0.0",
@@ -3722,18 +3479,18 @@
             }
         },
         "node_modules/vitest": {
-            "version": "4.1.8",
-            "integrity": "sha512-flY6ScbCIt9HThs+C5HS7jvGOB560DJtk/Z15IQROTA6zEy49Nh8T/dofWTQL+n3vswqn87sbJNiuqw1SDp5Ig==",
+            "version": "4.1.11",
+            "integrity": "sha512-fhACrNXUidIbGSBr5FlbuBkO7VWC1ZyLl0DO4CU2DrQoAPxX84Ysxs+HeGQpii5lZWV1Q4gBZTTu49mF+A6Edw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@vitest/expect": "4.1.8",
-                "@vitest/mocker": "4.1.8",
-                "@vitest/pretty-format": "4.1.8",
-                "@vitest/runner": "4.1.8",
-                "@vitest/snapshot": "4.1.8",
-                "@vitest/spy": "4.1.8",
-                "@vitest/utils": "4.1.8",
+                "@vitest/expect": "4.1.11",
+                "@vitest/mocker": "4.1.11",
+                "@vitest/pretty-format": "4.1.11",
+                "@vitest/runner": "4.1.11",
+                "@vitest/snapshot": "4.1.11",
+                "@vitest/spy": "4.1.11",
+                "@vitest/utils": "4.1.11",
                 "es-module-lexer": "^2.0.0",
                 "expect-type": "^1.3.0",
                 "magic-string": "^0.30.21",
@@ -3761,12 +3518,12 @@
                 "@edge-runtime/vm": "*",
                 "@opentelemetry/api": "^1.9.0",
                 "@types/node": "^20.0.0 || ^22.0.0 || >=24.0.0",
-                "@vitest/browser-playwright": "4.1.8",
-                "@vitest/browser-preview": "4.1.8",
-                "@vitest/browser-webdriverio": "4.1.8",
-                "@vitest/coverage-istanbul": "4.1.8",
-                "@vitest/coverage-v8": "4.1.8",
-                "@vitest/ui": "4.1.8",
+                "@vitest/browser-playwright": "4.1.11",
+                "@vitest/browser-preview": "4.1.11",
+                "@vitest/browser-webdriverio": "4.1.11",
+                "@vitest/coverage-istanbul": "4.1.11",
+                "@vitest/coverage-v8": "4.1.11",
+                "@vitest/ui": "4.1.11",
                 "happy-dom": "*",
                 "jsdom": "*",
                 "vite": "^6.0.0 || ^7.0.0 || ^8.0.0"
@@ -3818,22 +3575,6 @@
                 "node": ">=14.0.0"
             }
         },
-        "node_modules/webidl-conversions": {
-            "version": "3.0.1",
-            "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
-            "dev": true,
-            "license": "BSD-2-Clause"
-        },
-        "node_modules/whatwg-url": {
-            "version": "5.0.0",
-            "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "tr46": "~0.0.3",
-                "webidl-conversions": "^3.0.0"
-            }
-        },
         "node_modules/which": {
             "version": "2.0.2",
             "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
@@ -3874,12 +3615,6 @@
                 "node": ">=0.10.0"
             }
         },
-        "node_modules/wordwrap": {
-            "version": "1.0.0",
-            "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==",
-            "dev": true,
-            "license": "MIT"
-        },
         "node_modules/ws": {
             "version": "8.21.0",
             "integrity": "sha512-Vsp28b7DRcimFQvrqu2Wek3z1iYxDCWqHYB8Qsnk/S4RfaCQzPGPyBNuVjJV3cd6UiKtUtp6sNM77gWvzcCH+g==",
@@ -3910,21 +3645,6 @@
                 "node": ">=18"
             }
         },
-        "node_modules/yaml": {
-            "version": "2.9.0",
-            "integrity": "sha512-2AvhNX3mb8zd6Zy7INTtSpl1F15HW6Wnqj0srWlkKLcpYl/gMIMJiyuGq2KeI2YFxUPjdlB+3Lc10seMLtL4cA==",
-            "dev": true,
-            "license": "ISC",
-            "bin": {
-                "yaml": "bin.mjs"
-            },
-            "engines": {
-                "node": ">= 14.6"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/eemeli"
-            }
-        },
         "node_modules/yocto-queue": {
             "version": "0.1.0",
             "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
diff --git a/nodejs/package.json b/nodejs/package.json
index e6b1e9992c..d3b0dd5d52 100644
--- a/nodejs/package.json
+++ b/nodejs/package.json
@@ -5,7 +5,7 @@
         "url": "https://github.com/github/copilot-sdk.git"
     },
     "version": "0.0.0-dev",
-    "copilotCliVersion": "1.0.92-4",
+    "copilotCliVersion": "1.0.97-2",
     "description": "TypeScript SDK for programmatic control of GitHub Copilot CLI via JSON-RPC",
     "main": "./dist/cjs/index.js",
     "types": "./dist/index.d.ts",
@@ -80,16 +80,16 @@
         "esbuild": "^0.28.1",
         "eslint": "^9.0.0",
         "glob": "^13.0.1",
+        "hpke-js": "^1.8.0",
         "json-schema": "^0.4.0",
         "json-schema-to-typescript": "^15.0.4",
         "prettier": "^3.8.1",
-        "quicktype-core": "^23.2.6",
         "rimraf": "^6.1.2",
         "semver": "^7.7.3",
         "tar": "^7.5.22",
         "tsx": "^4.20.6",
         "typescript": "^5.0.0",
-        "vitest": "^4.0.18",
+        "vitest": "^4.1.11",
         "ws": "^8.21.0"
     },
     "engines": {
diff --git a/nodejs/samples/package-lock.json b/nodejs/samples/package-lock.json
index 3215d8b297..8b911dbef4 100644
--- a/nodejs/samples/package-lock.json
+++ b/nodejs/samples/package-lock.json
@@ -23,6 +23,7 @@
                 "zod": "4.3.6"
             },
             "devDependencies": {
+                "@microsoft/agent-host-protocol-v09": "npm:@microsoft/agent-host-protocol@0.9.0",
                 "@platformatic/vfs": "^0.3.0",
                 "@types/node": "^25.2.0",
                 "@types/semver": "7.8.0",
@@ -32,16 +33,16 @@
                 "esbuild": "^0.28.1",
                 "eslint": "^9.0.0",
                 "glob": "^13.0.1",
+                "hpke-js": "^1.8.0",
                 "json-schema": "^0.4.0",
                 "json-schema-to-typescript": "^15.0.4",
                 "prettier": "^3.8.1",
-                "quicktype-core": "^23.2.6",
                 "rimraf": "^6.1.2",
                 "semver": "^7.7.3",
                 "tar": "^7.5.22",
                 "tsx": "^4.20.6",
                 "typescript": "^5.0.0",
-                "vitest": "^4.0.18",
+                "vitest": "^4.1.11",
                 "ws": "^8.21.0"
             },
             "engines": {
@@ -222,31 +223,106 @@
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
             }
         },
-        "../node_modules/@glideapps/ts-necessities": {
-            "version": "2.2.3",
+        "../node_modules/@hpke/chacha20poly1305": {
+            "version": "1.8.0",
+            "resolved": "https://registry.npmjs.org/@hpke/chacha20poly1305/-/chacha20poly1305-1.8.0.tgz",
+            "integrity": "sha512-FcBfAQ+Y99vMNJP2yrZ9wpL8V0GOwp1+zMyzvc6alasrBygfFjFm1yeUtyADJCu/27C3Lm5mJzx6u7pwg+cX5w==",
             "dev": true,
-            "license": "MIT"
+            "license": "MIT",
+            "dependencies": {
+                "@hpke/common": "^1.10.0"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "../node_modules/@hpke/common": {
+            "version": "1.10.1",
+            "resolved": "https://registry.npmjs.org/@hpke/common/-/common-1.10.1.tgz",
+            "integrity": "sha512-moJwhmtLtuxiUzzNp1jpfBfx8yefKoO9D/RCR9dmwrnc7qjJqId1rEtQz+lSlU5cabX8daToMSx/7HayXOiaFw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "../node_modules/@hpke/core": {
+            "version": "1.9.0",
+            "resolved": "https://registry.npmjs.org/@hpke/core/-/core-1.9.0.tgz",
+            "integrity": "sha512-pFxWl1nNJeQCSUFs7+GAblHvXBCjn9EPN65vdKlYQil2aURaRxfGMO6vBKGqm1YHTKwiAxJQNEI70PbSowMP9Q==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@hpke/common": "^1.10.0"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "../node_modules/@hpke/dhkem-x25519": {
+            "version": "1.8.0",
+            "resolved": "https://registry.npmjs.org/@hpke/dhkem-x25519/-/dhkem-x25519-1.8.0.tgz",
+            "integrity": "sha512-S1MWWkAfu+TFxySgv5+2P3O4Mx/jk7BsoplzQaA1s3sfUJVJ2UsZsSzSsMc+FXJumLXncoJFlO6mK6mDGspfmA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@hpke/common": "^1.10.0"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "../node_modules/@hpke/dhkem-x448": {
+            "version": "1.8.0",
+            "resolved": "https://registry.npmjs.org/@hpke/dhkem-x448/-/dhkem-x448-1.8.0.tgz",
+            "integrity": "sha512-mFfnZfgp4OKkUIS/FKikfUgdnDKRy25ytCKBQiV+N+HbYy3I4v4ZCPBQ69QL+TYmKmCZJeUEnYeS5K+OBRP+Eg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@hpke/common": "^1.10.0"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
         },
         "../node_modules/@humanfs/core": {
-            "version": "0.19.1",
+            "version": "0.19.2",
+            "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.2.tgz",
+            "integrity": "sha512-UhXNm+CFMWcbChXywFwkmhqjs3PRCmcSa/hfBgLIb7oQ5HNb1wS0icWsGtSAUNgefHeI+eBrA8I1fxmbHsGdvA==",
             "dev": true,
             "license": "Apache-2.0",
+            "dependencies": {
+                "@humanfs/types": "^0.15.0"
+            },
             "engines": {
                 "node": ">=18.18.0"
             }
         },
         "../node_modules/@humanfs/node": {
-            "version": "0.16.7",
+            "version": "0.16.8",
+            "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.8.tgz",
+            "integrity": "sha512-gE1eQNZ3R++kTzFUpdGlpmy8kDZD/MLyHqDwqjkVQI0JMdI1D51sy1H958PNXYkM2rAac7e5/CnIKZrHtPh3BQ==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
-                "@humanfs/core": "^0.19.1",
+                "@humanfs/core": "^0.19.2",
+                "@humanfs/types": "^0.15.0",
                 "@humanwhocodes/retry": "^0.4.0"
             },
             "engines": {
                 "node": ">=18.18.0"
             }
         },
+        "../node_modules/@humanfs/types": {
+            "version": "0.15.0",
+            "resolved": "https://registry.npmjs.org/@humanfs/types/-/types-0.15.0.tgz",
+            "integrity": "sha512-ZZ1w0aoQkwuUuC7Yf+7sdeaNfqQiiLcSRbfI08oAxqLtpXQr9AIVX7Ay7HLDuiLYAaFPu8oBYNq/QIi9URHJ3Q==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "engines": {
+                "node": ">=18.18.0"
+            }
+        },
         "../node_modules/@humanwhocodes/module-importer": {
             "version": "1.0.1",
             "dev": true,
@@ -283,7 +359,9 @@
             }
         },
         "../node_modules/@jridgewell/sourcemap-codec": {
-            "version": "1.5.5",
+            "version": "1.6.0",
+            "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.6.0.tgz",
+            "integrity": "sha512-T7jf+5zgsZHwNJ4lvQ7/aezbyk0nNX+zJVWpmHA7VYsEx7a7qr5Rg5IbtJFqkgze5Y2sruq1RUY8Q837Od7iFw==",
             "dev": true,
             "license": "MIT"
         },
@@ -580,12 +658,22 @@
                 "url": "https://liberapay.com/Koromix"
             }
         },
+        "../node_modules/@microsoft/agent-host-protocol-v09": {
+            "name": "@microsoft/agent-host-protocol",
+            "version": "0.9.0",
+            "resolved": "https://registry.npmjs.org/@microsoft/agent-host-protocol/-/agent-host-protocol-0.9.0.tgz",
+            "integrity": "sha512-XY6zOqLSqlNianiWbEpZkzKRB2AKwcDPk9yAbp+afxyxhWzTfpJKy+03T5rIipJDnqf45rXiJ5JV/dzUA8JHLw==",
+            "dev": true,
+            "license": "MIT"
+        },
         "../node_modules/@oxc-project/types": {
-            "version": "0.133.0",
+            "version": "0.153.0",
+            "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.153.0.tgz",
+            "integrity": "sha512-jSNrRIyvPVLL5E1z/tS5zLAprosGz/FuI1PWwEOz59j3E4TTTzSpqKb/RDGqJhhW0QHYISGXxq582wGx6T11Tw==",
             "dev": true,
             "license": "MIT",
             "funding": {
-                "url": "https://github.com/sponsors/Boshen"
+                "url": "https://github.com/sponsors/oxc-project"
             }
         },
         "../node_modules/@platformatic/vfs": {
@@ -596,8 +684,44 @@
                 "node": ">= 22"
             }
         },
+        "../node_modules/@rolldown/binding-android-arm-eabi": {
+            "version": "1.2.13",
+            "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm-eabi/-/binding-android-arm-eabi-1.2.13.tgz",
+            "integrity": "sha512-Vu/NICrgdRvUOeaJZIyB2FP63s6fO/4ud5l8dXmxDx9yDyn+mN0y+gsvsVviSli+T361Aqo0h46EuMoobrwawA==",
+            "cpu": [
+                "arm"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "android"
+            ],
+            "engines": {
+                "node": "^20.19.0 || >=22.12.0"
+            }
+        },
+        "../node_modules/@rolldown/binding-android-arm64": {
+            "version": "1.2.13",
+            "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.2.13.tgz",
+            "integrity": "sha512-6LEoIrGy5vvCd2boNnv2soPSUZj/PRvhp8R/t9KlX+mIZxThIE/ZqxrGXxmuNX0FuvQFvLdZr7S4HrYpYBVhEQ==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "android"
+            ],
+            "engines": {
+                "node": "^20.19.0 || >=22.12.0"
+            }
+        },
         "../node_modules/@rolldown/binding-darwin-arm64": {
-            "version": "1.0.3",
+            "version": "1.2.13",
+            "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.2.13.tgz",
+            "integrity": "sha512-CaJSRzlQ6Q+zkDMVA9OkVxBjVoPRCDEE3v0FSJ9kIQBgRjFApA3Si4ijhbNVUji7ZJt+PfO0e46qy4nPInHUPA==",
             "cpu": [
                 "arm64"
             ],
@@ -611,18 +735,246 @@
                 "node": "^20.19.0 || >=22.12.0"
             }
         },
+        "../node_modules/@rolldown/binding-darwin-x64": {
+            "version": "1.2.13",
+            "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.2.13.tgz",
+            "integrity": "sha512-e4r340I5hxSzJkD3YJBxgzq/rJ3wwxwdLLb2FPt1Zpyem20nrQPT11DDEEkazwxaHumH8wpglsp/Ozgj/wT6mw==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": "^20.19.0 || >=22.12.0"
+            }
+        },
+        "../node_modules/@rolldown/binding-freebsd-x64": {
+            "version": "1.2.13",
+            "resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.2.13.tgz",
+            "integrity": "sha512-hoBWDZ4/K/mJKVMbsgUd1jfpA2DiOrJ54mpegObU9TBHBBrtX4FLIXJJQRDPZ/2Dn91GvPob+Z2hwKJzf4E5SQ==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "freebsd"
+            ],
+            "engines": {
+                "node": "^20.19.0 || >=22.12.0"
+            }
+        },
+        "../node_modules/@rolldown/binding-linux-arm-gnueabihf": {
+            "version": "1.2.13",
+            "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.2.13.tgz",
+            "integrity": "sha512-oF9fZu3vTWnTiVAkDFxU9PJLt1nh20K9RRpuHsR7ZnE2L7XookBbDBVLojCVSLGbvtSlxeUNnjAj6DbNsKyzbg==",
+            "cpu": [
+                "arm"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": "^20.19.0 || >=22.12.0"
+            }
+        },
+        "../node_modules/@rolldown/binding-linux-arm64-gnu": {
+            "version": "1.2.13",
+            "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.2.13.tgz",
+            "integrity": "sha512-DTpb/+jMiqWMPgphn4ksW1zW+XLJ6dJJ9FMvnIk9I291LhCctMPhMYJrP5t9p6C9qa3KXadDdUEZHBaPh3kNxQ==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "libc": [
+                "glibc"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": "^20.19.0 || >=22.12.0"
+            }
+        },
+        "../node_modules/@rolldown/binding-linux-arm64-musl": {
+            "version": "1.2.13",
+            "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.2.13.tgz",
+            "integrity": "sha512-xU+Kvv9N2A3SY35zFh1FWWNjxbadE/BKeqnkXe7vScU4GZsw757BlVmDLITZEq8DPpk6m7uoDYkK7P+x/uU5Ow==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "libc": [
+                "musl"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": "^20.19.0 || >=22.12.0"
+            }
+        },
+        "../node_modules/@rolldown/binding-linux-ppc64-gnu": {
+            "version": "1.2.13",
+            "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.2.13.tgz",
+            "integrity": "sha512-XMk/hnhh25oQ756Lclb1Q11h4ll0xC0Esa5w4Vzp+mAE2S3AGJgeM0SonrIgY8fHhjarb6hcoTuwoFG0VVP2ig==",
+            "cpu": [
+                "ppc64"
+            ],
+            "dev": true,
+            "libc": [
+                "glibc"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": "^20.19.0 || >=22.12.0"
+            }
+        },
+        "../node_modules/@rolldown/binding-linux-s390x-gnu": {
+            "version": "1.2.13",
+            "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.2.13.tgz",
+            "integrity": "sha512-U1BoTHYmlywE2n3HUWjzZ+8EQsKr+OwpxYuDWaubx42tUL8QSL7nOqRz/NVHanibbFP3M1Rxuprz/wNcbMKjqw==",
+            "cpu": [
+                "s390x"
+            ],
+            "dev": true,
+            "libc": [
+                "glibc"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": "^20.19.0 || >=22.12.0"
+            }
+        },
+        "../node_modules/@rolldown/binding-linux-x64-gnu": {
+            "version": "1.2.13",
+            "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.2.13.tgz",
+            "integrity": "sha512-J4cm80Pc6wEwV5AZ42o62sIQgDk+Y7R2s646jIwuvO+4V46QB58N4vVuMPWCBaNgursXLpmUWJV//WQAkPvHBQ==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "libc": [
+                "glibc"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": "^20.19.0 || >=22.12.0"
+            }
+        },
+        "../node_modules/@rolldown/binding-linux-x64-musl": {
+            "version": "1.2.13",
+            "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.2.13.tgz",
+            "integrity": "sha512-W0euZS40U4V6JkmEnVCIX9mcsL6cbXQ4X8c2w+MMOIjFg68TXUW+u3RT+2e1t1pv9mg/EP3pDtK3POXdQ7Rxyw==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "libc": [
+                "musl"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": "^20.19.0 || >=22.12.0"
+            }
+        },
+        "../node_modules/@rolldown/binding-openharmony-arm64": {
+            "version": "1.2.13",
+            "resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.2.13.tgz",
+            "integrity": "sha512-do/AF/4n9MRshia3a5aXoy8xM2c6mgfT6D7H/dY6my5z+hfCIR4ab7mk4IRj++nsEQpKy39kd0DQnDq+r692tw==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "openharmony"
+            ],
+            "engines": {
+                "node": "^20.19.0 || >=22.12.0"
+            }
+        },
+        "../node_modules/@rolldown/binding-win32-arm64-msvc": {
+            "version": "1.2.13",
+            "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.2.13.tgz",
+            "integrity": "sha512-6FtUf2cJZobutJdxnGYX8z0vtbgqU0b2v8vfBhkXb9wp2MppMFtkunE+IaOntyi01rkIQoPW2GHABtfzsC0BRQ==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": "^20.19.0 || >=22.12.0"
+            }
+        },
+        "../node_modules/@rolldown/binding-win32-x64-msvc": {
+            "version": "1.2.13",
+            "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.2.13.tgz",
+            "integrity": "sha512-UKhFaZTeTcbKrb3iU82m17jVcPEAoqDkCN5MBqgPyZSwp/cQmib21crTS0DdH7T1B7wZRWEI89YQAOJMet5yhg==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": "^20.19.0 || >=22.12.0"
+            }
+        },
         "../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/@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",
             "dependencies": {
@@ -632,6 +984,8 @@
         },
         "../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"
         },
@@ -658,6 +1012,13 @@
                 "undici-types": "~7.18.0"
             }
         },
+        "../node_modules/@types/semver": {
+            "version": "7.8.0",
+            "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.8.0.tgz",
+            "integrity": "sha512-1mAINjtQCXXeLkJ9ehXkwOcBpqtLxiVtKhpUf83DdRNdQKV0iXZpaHYqRr7nj+wvxuJzoAmAwXI+sCNMv1CzLQ==",
+            "dev": true,
+            "license": "MIT"
+        },
         "../node_modules/@types/ws": {
             "version": "8.18.1",
             "dev": true,
@@ -878,14 +1239,16 @@
             }
         },
         "../node_modules/@vitest/expect": {
-            "version": "4.1.8",
+            "version": "4.1.11",
+            "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-4.1.11.tgz",
+            "integrity": "sha512-VX2x5vNJXET47KAFzwERI+KRMtTTCSWTfSMKsW7JsUsXV4psq++e3DvZpuTDOpHcxytiDs6p2nhVb2tVDiiUYw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@standard-schema/spec": "^1.1.0",
                 "@types/chai": "^5.2.2",
-                "@vitest/spy": "4.1.8",
-                "@vitest/utils": "4.1.8",
+                "@vitest/spy": "4.1.11",
+                "@vitest/utils": "4.1.11",
                 "chai": "^6.2.2",
                 "tinyrainbow": "^3.1.0"
             },
@@ -894,11 +1257,13 @@
             }
         },
         "../node_modules/@vitest/mocker": {
-            "version": "4.1.8",
+            "version": "4.1.11",
+            "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-4.1.11.tgz",
+            "integrity": "sha512-2XJVD55d1o5AZous5CCGKS74g/riOj9odEt2bQpCVZeblHyHdnMeFl4jl0XjU21stf4mbjUkew2eXQZt65g5CQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@vitest/spy": "4.1.8",
+                "@vitest/spy": "4.1.11",
                 "estree-walker": "^3.0.3",
                 "magic-string": "^0.30.21"
             },
@@ -919,7 +1284,9 @@
             }
         },
         "../node_modules/@vitest/pretty-format": {
-            "version": "4.1.8",
+            "version": "4.1.11",
+            "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-4.1.11.tgz",
+            "integrity": "sha512-yiZzPbGTS9Sr/JpFl8zHrcIkAofNbFV6k21vIgQN/cY/oxZeXhJv5sc/MBJ5jFKWmWs+oJHw0UXLZjmf931+Vw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -930,11 +1297,13 @@
             }
         },
         "../node_modules/@vitest/runner": {
-            "version": "4.1.8",
+            "version": "4.1.11",
+            "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-4.1.11.tgz",
+            "integrity": "sha512-LztvUgdwMNJMIkj3hQnnxiC2Xy1zNxq928W/xhjCLaNCzqTZOudjwbQf6v9IntZGPw132i2Lq2rgTRZHD3JHNw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@vitest/utils": "4.1.8",
+                "@vitest/utils": "4.1.11",
                 "pathe": "^2.0.3"
             },
             "funding": {
@@ -942,12 +1311,14 @@
             }
         },
         "../node_modules/@vitest/snapshot": {
-            "version": "4.1.8",
+            "version": "4.1.11",
+            "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-4.1.11.tgz",
+            "integrity": "sha512-pN7ikn1ON7h8ee4gIAp4AzyK+zBtJPzVbqOgu5LCEh4VaJVbPQcgYQYJIMGQPXVeJJq1fnfazis7a5pFNPahog==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@vitest/pretty-format": "4.1.8",
-                "@vitest/utils": "4.1.8",
+                "@vitest/pretty-format": "4.1.11",
+                "@vitest/utils": "4.1.11",
                 "magic-string": "^0.30.21",
                 "pathe": "^2.0.3"
             },
@@ -956,7 +1327,9 @@
             }
         },
         "../node_modules/@vitest/spy": {
-            "version": "4.1.8",
+            "version": "4.1.11",
+            "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-4.1.11.tgz",
+            "integrity": "sha512-apNa/prQy2qCeywhnixOHPRCgGNhvg7T4Dapfl1GahLp/R+uhBm5cPyFoNVyqsNd2h1nJxL6BqqdIjiABL60YA==",
             "dev": true,
             "license": "MIT",
             "funding": {
@@ -964,11 +1337,13 @@
             }
         },
         "../node_modules/@vitest/utils": {
-            "version": "4.1.8",
+            "version": "4.1.11",
+            "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-4.1.11.tgz",
+            "integrity": "sha512-zTCVGpyFsGWBhllOyKlTw/vnr6D9qxsfSDyfbyZmTyjHw5N/VuvzHpHoQjm2ZJzn4RJgx5w4r7V0er69CmLgPQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@vitest/pretty-format": "4.1.8",
+                "@vitest/pretty-format": "4.1.11",
                 "convert-source-map": "^2.0.0",
                 "tinyrainbow": "^3.1.0"
             },
@@ -976,17 +1351,6 @@
                 "url": "https://opencollective.com/vitest"
             }
         },
-        "../node_modules/abort-controller": {
-            "version": "3.0.0",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "event-target-shim": "^5.0.0"
-            },
-            "engines": {
-                "node": ">=6.5"
-            }
-        },
         "../node_modules/acorn": {
             "version": "8.15.0",
             "dev": true,
@@ -1028,6 +1392,8 @@
         },
         "../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",
             "engines": {
@@ -1039,27 +1405,10 @@
             "dev": true,
             "license": "MIT"
         },
-        "../node_modules/base64-js": {
-            "version": "1.5.1",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/feross"
-                },
-                {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/feross"
-                },
-                {
-                    "type": "consulting",
-                    "url": "https://feross.org/support"
-                }
-            ],
-            "license": "MIT"
-        },
         "../node_modules/brace-expansion": {
-            "version": "1.1.16",
+            "version": "1.1.21",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.21.tgz",
+            "integrity": "sha512-9zeA+KLZNNzglF2TPKRQEDyx6Yby7daAkuy8MiPzpXPsYDWi/DRM8jmwUDxokQjYqBpv5DgPiwD4h4ZZSy1Ujw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -1067,34 +1416,6 @@
                 "concat-map": "0.0.1"
             }
         },
-        "../node_modules/browser-or-node": {
-            "version": "3.0.0",
-            "dev": true,
-            "license": "MIT"
-        },
-        "../node_modules/buffer": {
-            "version": "6.0.3",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/feross"
-                },
-                {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/feross"
-                },
-                {
-                    "type": "consulting",
-                    "url": "https://feross.org/support"
-                }
-            ],
-            "license": "MIT",
-            "dependencies": {
-                "base64-js": "^1.3.1",
-                "ieee754": "^1.2.1"
-            }
-        },
         "../node_modules/callsites": {
             "version": "3.1.0",
             "dev": true,
@@ -1104,7 +1425,9 @@
             }
         },
         "../node_modules/chai": {
-            "version": "6.2.2",
+            "version": "6.3.0",
+            "resolved": "https://registry.npmjs.org/chai/-/chai-6.3.0.tgz",
+            "integrity": "sha512-XWAtwJ6OHO+tj0EKCs0Y2UamnyOxseZWltU4x2U2wh8g4AigdjwvtUjvLP2tqkA/avxHEtzxNaqGq/YGNwckKg==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -1148,11 +1471,6 @@
                 "node": ">=18"
             }
         },
-        "../node_modules/collection-utils": {
-            "version": "1.0.1",
-            "dev": true,
-            "license": "Apache-2.0"
-        },
         "../node_modules/color-convert": {
             "version": "2.0.1",
             "dev": true,
@@ -1176,17 +1494,11 @@
         },
         "../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",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "node-fetch": "^2.7.0"
-            }
-        },
         "../node_modules/cross-spawn": {
             "version": "7.0.6",
             "dev": true,
@@ -1223,6 +1535,8 @@
         },
         "../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",
             "engines": {
@@ -1458,6 +1772,8 @@
         },
         "../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",
             "dependencies": {
@@ -1472,22 +1788,6 @@
                 "node": ">=0.10.0"
             }
         },
-        "../node_modules/event-target-shim": {
-            "version": "5.0.1",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "../node_modules/events": {
-            "version": "3.3.0",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=0.8.x"
-            }
-        },
         "../node_modules/expect-type": {
             "version": "1.3.0",
             "dev": true,
@@ -1628,24 +1928,22 @@
                 "node": ">=8"
             }
         },
-        "../node_modules/ieee754": {
-            "version": "1.2.1",
+        "../node_modules/hpke-js": {
+            "version": "1.8.0",
+            "resolved": "https://registry.npmjs.org/hpke-js/-/hpke-js-1.8.0.tgz",
+            "integrity": "sha512-N0PFQlUQsIPS9++nUNn2ZsxTPSv8pONyyrXIGZl0iiherRfS0XW1SvTd+RmepD0TN1S9zzTJkEutMIWWYt0/4w==",
             "dev": true,
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/feross"
-                },
-                {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/feross"
-                },
-                {
-                    "type": "consulting",
-                    "url": "https://feross.org/support"
-                }
-            ],
-            "license": "BSD-3-Clause"
+            "license": "MIT",
+            "dependencies": {
+                "@hpke/chacha20poly1305": "^1.8.0",
+                "@hpke/common": "^1.10.0",
+                "@hpke/core": "^1.9.0",
+                "@hpke/dhkem-x25519": "^1.8.0",
+                "@hpke/dhkem-x448": "^1.8.0"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
         },
         "../node_modules/ignore": {
             "version": "7.0.5",
@@ -1697,21 +1995,11 @@
                 "node": ">=0.10.0"
             }
         },
-        "../node_modules/is-url": {
-            "version": "1.2.4",
-            "dev": true,
-            "license": "MIT"
-        },
         "../node_modules/isexe": {
             "version": "2.0.0",
             "dev": true,
             "license": "ISC"
         },
-        "../node_modules/js-base64": {
-            "version": "3.7.8",
-            "dev": true,
-            "license": "BSD-3-Clause"
-        },
         "../node_modules/js-yaml": {
             "version": "4.3.2",
             "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.3.2.tgz",
@@ -1764,107 +2052,333 @@
                 "json2ts": "dist/src/cli.js"
             },
             "engines": {
-                "node": ">=16.0.0"
+                "node": ">=16.0.0"
+            }
+        },
+        "../node_modules/json-schema-traverse": {
+            "version": "0.4.1",
+            "dev": true,
+            "license": "MIT"
+        },
+        "../node_modules/json-stable-stringify-without-jsonify": {
+            "version": "1.0.1",
+            "dev": true,
+            "license": "MIT"
+        },
+        "../node_modules/keyv": {
+            "version": "4.5.4",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "json-buffer": "3.0.1"
+            }
+        },
+        "../node_modules/koffi": {
+            "version": "3.2.1",
+            "resolved": "https://registry.npmjs.org/koffi/-/koffi-3.2.1.tgz",
+            "integrity": "sha512-0qE3lZ8jllRqPN4Ob6Ajl7c2bJSJDhQWuKLGP5hIEpHLllJWv1ydHFMhHmHc5p/W9GticKVDbYzZd7TBoQ4CZg==",
+            "hasInstallScript": true,
+            "license": "MIT",
+            "funding": {
+                "url": "https://liberapay.com/Koromix"
+            },
+            "optionalDependencies": {
+                "@koromix/koffi-android-arm64": "3.2.1",
+                "@koromix/koffi-android-x64": "3.2.1",
+                "@koromix/koffi-darwin-arm64": "3.2.1",
+                "@koromix/koffi-darwin-x64": "3.2.1",
+                "@koromix/koffi-freebsd-arm64": "3.2.1",
+                "@koromix/koffi-freebsd-ia32": "3.2.1",
+                "@koromix/koffi-freebsd-x64": "3.2.1",
+                "@koromix/koffi-linux-arm": "3.2.1",
+                "@koromix/koffi-linux-arm64": "3.2.1",
+                "@koromix/koffi-linux-ia32": "3.2.1",
+                "@koromix/koffi-linux-loong64": "3.2.1",
+                "@koromix/koffi-linux-riscv64": "3.2.1",
+                "@koromix/koffi-linux-x64": "3.2.1",
+                "@koromix/koffi-openbsd-ia32": "3.2.1",
+                "@koromix/koffi-openbsd-x64": "3.2.1",
+                "@koromix/koffi-win32-arm64": "3.2.1",
+                "@koromix/koffi-win32-ia32": "3.2.1",
+                "@koromix/koffi-win32-x64": "3.2.1"
+            }
+        },
+        "../node_modules/levn": {
+            "version": "0.4.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "prelude-ls": "^1.2.1",
+                "type-check": "~0.4.0"
+            },
+            "engines": {
+                "node": ">= 0.8.0"
+            }
+        },
+        "../node_modules/lightningcss": {
+            "version": "1.33.0",
+            "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.33.0.tgz",
+            "integrity": "sha512-WkUDrojuJs0xkgGf2udWxa3yGBRxPtxUkB79i6aCZLRgc7PM8fZe9TosfPDcvEpQZbuFASnHYmRLBLUbmLOIIA==",
+            "dev": true,
+            "license": "MPL-2.0",
+            "dependencies": {
+                "detect-libc": "^2.0.3"
+            },
+            "engines": {
+                "node": ">= 12.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            },
+            "optionalDependencies": {
+                "lightningcss-android-arm64": "1.33.0",
+                "lightningcss-darwin-arm64": "1.33.0",
+                "lightningcss-darwin-x64": "1.33.0",
+                "lightningcss-freebsd-x64": "1.33.0",
+                "lightningcss-linux-arm-gnueabihf": "1.33.0",
+                "lightningcss-linux-arm64-gnu": "1.33.0",
+                "lightningcss-linux-arm64-musl": "1.33.0",
+                "lightningcss-linux-x64-gnu": "1.33.0",
+                "lightningcss-linux-x64-musl": "1.33.0",
+                "lightningcss-win32-arm64-msvc": "1.33.0",
+                "lightningcss-win32-x64-msvc": "1.33.0"
+            }
+        },
+        "../node_modules/lightningcss-android-arm64": {
+            "version": "1.33.0",
+            "resolved": "https://registry.npmjs.org/lightningcss-android-arm64/-/lightningcss-android-arm64-1.33.0.tgz",
+            "integrity": "sha512-gEpRTalKdosp4Bb8qWtc2iOgE5SeIHlpS1up9bFq2wAyYhl1UdTObYiHe98zEM9SQvSoqQZ1IQD0JNpg3Ml5pg==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MPL-2.0",
+            "optional": true,
+            "os": [
+                "android"
+            ],
+            "engines": {
+                "node": ">= 12.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
+        "../node_modules/lightningcss-darwin-arm64": {
+            "version": "1.33.0",
+            "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.33.0.tgz",
+            "integrity": "sha512-Sciaz8eenNTKn9b3t7+xr0ipTp9YxKQY4npwQ3mrRuL0BAVHBLyZxofhaKBAVtzmtRZ/zTyo0/to4B1uWG/Djg==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MPL-2.0",
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": ">= 12.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
+        "../node_modules/lightningcss-darwin-x64": {
+            "version": "1.33.0",
+            "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.33.0.tgz",
+            "integrity": "sha512-Z5UPAxzrjlWNNyGy6i65cJzzvgJ5D3T6wMvs+gWpY9d7qRhANrxqAp6LhxIgZhWEw18RfJTGcRxjuLIBr+m8XQ==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MPL-2.0",
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": ">= 12.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
+        "../node_modules/lightningcss-freebsd-x64": {
+            "version": "1.33.0",
+            "resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.33.0.tgz",
+            "integrity": "sha512-QQM/Ti/hQajJwCY+RiWuCZ9sdtI/XQk7nDK5vC8kkdwixezOlDgvDx7+RT+QjK6FcFT4MpsuoBnHIo/O3StRRg==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MPL-2.0",
+            "optional": true,
+            "os": [
+                "freebsd"
+            ],
+            "engines": {
+                "node": ">= 12.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
             }
         },
-        "../node_modules/json-schema-traverse": {
-            "version": "0.4.1",
+        "../node_modules/lightningcss-linux-arm-gnueabihf": {
+            "version": "1.33.0",
+            "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.33.0.tgz",
+            "integrity": "sha512-N7FVBe6iS24MlM6R/4RBTxGhQheZGs7tiQ9U32UtF75NzP5Q7xWPRqLBCKxlRQRk3rY1jCIPLzx7WzOhuUIRLQ==",
+            "cpu": [
+                "arm"
+            ],
             "dev": true,
-            "license": "MIT"
+            "license": "MPL-2.0",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 12.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
         },
-        "../node_modules/json-stable-stringify-without-jsonify": {
-            "version": "1.0.1",
+        "../node_modules/lightningcss-linux-arm64-gnu": {
+            "version": "1.33.0",
+            "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.33.0.tgz",
+            "integrity": "sha512-j2v/itmy4HlNxlc6voKXYgBqNi0Ng2LShg4z7GufpEgs05P+2suBVyi9I6YHq5uoVFx9ETin3eCEhLVyXGQnKg==",
+            "cpu": [
+                "arm64"
+            ],
             "dev": true,
-            "license": "MIT"
+            "libc": [
+                "glibc"
+            ],
+            "license": "MPL-2.0",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 12.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
         },
-        "../node_modules/keyv": {
-            "version": "4.5.4",
+        "../node_modules/lightningcss-linux-arm64-musl": {
+            "version": "1.33.0",
+            "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.33.0.tgz",
+            "integrity": "sha512-yiO5ROMuYQgXbC60yjZU5CYSFZGKXL0HFATXt9mHJn1+zW55oCtMI9NfcVhYLMFDL7gV7oBPon/EmMMGg2OvtQ==",
+            "cpu": [
+                "arm64"
+            ],
             "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "json-buffer": "3.0.1"
+            "libc": [
+                "musl"
+            ],
+            "license": "MPL-2.0",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 12.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
             }
         },
-        "../node_modules/koffi": {
-            "version": "3.2.1",
-            "resolved": "https://registry.npmjs.org/koffi/-/koffi-3.2.1.tgz",
-            "integrity": "sha512-0qE3lZ8jllRqPN4Ob6Ajl7c2bJSJDhQWuKLGP5hIEpHLllJWv1ydHFMhHmHc5p/W9GticKVDbYzZd7TBoQ4CZg==",
-            "hasInstallScript": true,
-            "license": "MIT",
-            "funding": {
-                "url": "https://liberapay.com/Koromix"
+        "../node_modules/lightningcss-linux-x64-gnu": {
+            "version": "1.33.0",
+            "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.33.0.tgz",
+            "integrity": "sha512-ar+Ju7LmcN0Jo4FpL4hpFybwNG9/3A/Br5KW2n2jyODg3MEZXaDYADdemoNS+BDNfMgKvylJLj4S5tyRActuAg==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "libc": [
+                "glibc"
+            ],
+            "license": "MPL-2.0",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 12.0.0"
             },
-            "optionalDependencies": {
-                "@koromix/koffi-android-arm64": "3.2.1",
-                "@koromix/koffi-android-x64": "3.2.1",
-                "@koromix/koffi-darwin-arm64": "3.2.1",
-                "@koromix/koffi-darwin-x64": "3.2.1",
-                "@koromix/koffi-freebsd-arm64": "3.2.1",
-                "@koromix/koffi-freebsd-ia32": "3.2.1",
-                "@koromix/koffi-freebsd-x64": "3.2.1",
-                "@koromix/koffi-linux-arm": "3.2.1",
-                "@koromix/koffi-linux-arm64": "3.2.1",
-                "@koromix/koffi-linux-ia32": "3.2.1",
-                "@koromix/koffi-linux-loong64": "3.2.1",
-                "@koromix/koffi-linux-riscv64": "3.2.1",
-                "@koromix/koffi-linux-x64": "3.2.1",
-                "@koromix/koffi-openbsd-ia32": "3.2.1",
-                "@koromix/koffi-openbsd-x64": "3.2.1",
-                "@koromix/koffi-win32-arm64": "3.2.1",
-                "@koromix/koffi-win32-ia32": "3.2.1",
-                "@koromix/koffi-win32-x64": "3.2.1"
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
             }
         },
-        "../node_modules/levn": {
-            "version": "0.4.1",
+        "../node_modules/lightningcss-linux-x64-musl": {
+            "version": "1.33.0",
+            "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.33.0.tgz",
+            "integrity": "sha512-RYiYbkokw0trfKqqzfF55lginwEPrD3OJDfTuJzFs1MK6iFnDenaz1fqLLtX4ITG3OktJQXOeTaw1awrBAlZPw==",
+            "cpu": [
+                "x64"
+            ],
             "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "prelude-ls": "^1.2.1",
-                "type-check": "~0.4.0"
-            },
+            "libc": [
+                "musl"
+            ],
+            "license": "MPL-2.0",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
             "engines": {
-                "node": ">= 0.8.0"
+                "node": ">= 12.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
             }
         },
-        "../node_modules/lightningcss": {
-            "version": "1.32.0",
+        "../node_modules/lightningcss-win32-arm64-msvc": {
+            "version": "1.33.0",
+            "resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.33.0.tgz",
+            "integrity": "sha512-1K+MPfLSFVpphzpdbfkhlWk6wBrTObBzS2T6db10PNOZgR9GoVsAWzwNyuhUYYbTp23j+4RrncfujZ4uAzXvwA==",
+            "cpu": [
+                "arm64"
+            ],
             "dev": true,
             "license": "MPL-2.0",
-            "dependencies": {
-                "detect-libc": "^2.0.3"
-            },
+            "optional": true,
+            "os": [
+                "win32"
+            ],
             "engines": {
                 "node": ">= 12.0.0"
             },
             "funding": {
                 "type": "opencollective",
                 "url": "https://opencollective.com/parcel"
-            },
-            "optionalDependencies": {
-                "lightningcss-android-arm64": "1.32.0",
-                "lightningcss-darwin-arm64": "1.32.0",
-                "lightningcss-darwin-x64": "1.32.0",
-                "lightningcss-freebsd-x64": "1.32.0",
-                "lightningcss-linux-arm-gnueabihf": "1.32.0",
-                "lightningcss-linux-arm64-gnu": "1.32.0",
-                "lightningcss-linux-arm64-musl": "1.32.0",
-                "lightningcss-linux-x64-gnu": "1.32.0",
-                "lightningcss-linux-x64-musl": "1.32.0",
-                "lightningcss-win32-arm64-msvc": "1.32.0",
-                "lightningcss-win32-x64-msvc": "1.32.0"
             }
         },
-        "../node_modules/lightningcss-darwin-arm64": {
-            "version": "1.32.0",
+        "../node_modules/lightningcss-win32-x64-msvc": {
+            "version": "1.33.0",
+            "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.33.0.tgz",
+            "integrity": "sha512-OlEICDx/Xl0FqSp4bry8zFnCvGpig3Gl4gCquvYwHuqJKEC1+n9NgDniFvqHGmMv1ZkqDJrDqKKSykTDX+ehuA==",
             "cpu": [
-                "arm64"
+                "x64"
             ],
             "dev": true,
             "license": "MPL-2.0",
             "optional": true,
             "os": [
-                "darwin"
+                "win32"
             ],
             "engines": {
                 "node": ">= 12.0.0"
@@ -1908,6 +2422,8 @@
         },
         "../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",
             "dependencies": {
@@ -1937,7 +2453,9 @@
             }
         },
         "../node_modules/minimatch/node_modules/brace-expansion": {
-            "version": "5.0.8",
+            "version": "5.0.12",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.12.tgz",
+            "integrity": "sha512-YovQ3rzhaLMIrDjNDMkNS01tea93qhEhG5xy8f6+R0l+dw3Ki+5sCoIoI942iuLZTHWogWktgwVDhU09iNEimQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -1980,7 +2498,9 @@
             "license": "MIT"
         },
         "../node_modules/nanoid": {
-            "version": "3.3.17",
+            "version": "3.3.20",
+            "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.20.tgz",
+            "integrity": "sha512-uKdg2G3GNCKQn9byYOpxbGqrT2fGO5KRt5J/8b3pok8rT6qxGWF6hxMyJiEYtAf+FVyYuD9hRaDqX5uPFYJ4ZQ==",
             "dev": true,
             "funding": [
                 {
@@ -2001,25 +2521,6 @@
             "dev": true,
             "license": "MIT"
         },
-        "../node_modules/node-fetch": {
-            "version": "2.7.0",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "whatwg-url": "^5.0.0"
-            },
-            "engines": {
-                "node": "4.x || >=6.0.0"
-            },
-            "peerDependencies": {
-                "encoding": "^0.1.0"
-            },
-            "peerDependenciesMeta": {
-                "encoding": {
-                    "optional": true
-                }
-            }
-        },
         "../node_modules/obug": {
             "version": "2.1.1",
             "dev": true,
@@ -2078,11 +2579,6 @@
             "dev": true,
             "license": "BlueOak-1.0.0"
         },
-        "../node_modules/pako": {
-            "version": "1.0.11",
-            "dev": true,
-            "license": "(MIT AND Zlib)"
-        },
         "../node_modules/parent-module": {
             "version": "1.0.1",
             "dev": true,
@@ -2127,16 +2623,22 @@
         },
         "../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",
+            "version": "4.0.7",
+            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.7.tgz",
+            "integrity": "sha512-qcJu88Q2IWqJsDD529JKMdwGm/dvInW4HvQnRwiH9JtihJvzGOscDtHE3x1pBKeUOTysQ8kVmLnJ2kJu7yhcGA==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -2146,16 +2648,10 @@
                 "url": "https://github.com/sponsors/jonschlinkert"
             }
         },
-        "../node_modules/pluralize": {
-            "version": "8.0.0",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=4"
-            }
-        },
         "../node_modules/postcss": {
-            "version": "8.5.25",
+            "version": "8.5.29",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.29.tgz",
+            "integrity": "sha512-49cGhUbXj8Qenv0iTMxA1cFBzxXoctpC9Ujd77t1WcbJIr6nF/eI7g/8MgxrYldFRuAXvja7xQRwavoW7kgrxQ==",
             "dev": true,
             "funding": [
                 {
@@ -2173,9 +2669,9 @@
             ],
             "license": "MIT",
             "dependencies": {
-                "nanoid": "^3.3.16",
+                "nanoid": "^3.3.19",
                 "picocolors": "^1.1.1",
-                "source-map-js": "^1.2.1"
+                "source-map-js": "^1.2.2"
             },
             "engines": {
                 "node": "^10 || ^12 || >=14"
@@ -2203,14 +2699,6 @@
                 "url": "https://github.com/prettier/prettier?sponsor=1"
             }
         },
-        "../node_modules/process": {
-            "version": "0.11.10",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">= 0.6.0"
-            }
-        },
         "../node_modules/punycode": {
             "version": "2.3.1",
             "dev": true,
@@ -2219,42 +2707,6 @@
                 "node": ">=6"
             }
         },
-        "../node_modules/quicktype-core": {
-            "version": "23.2.6",
-            "dev": true,
-            "license": "Apache-2.0",
-            "dependencies": {
-                "@glideapps/ts-necessities": "2.2.3",
-                "browser-or-node": "^3.0.0",
-                "collection-utils": "^1.0.1",
-                "cross-fetch": "^4.0.0",
-                "is-url": "^1.2.4",
-                "js-base64": "^3.7.7",
-                "lodash": "^4.17.21",
-                "pako": "^1.0.6",
-                "pluralize": "^8.0.0",
-                "readable-stream": "4.5.2",
-                "unicode-properties": "^1.4.1",
-                "urijs": "^1.19.1",
-                "wordwrap": "^1.0.0",
-                "yaml": "^2.4.1"
-            }
-        },
-        "../node_modules/readable-stream": {
-            "version": "4.5.2",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "abort-controller": "^3.0.0",
-                "buffer": "^6.0.3",
-                "events": "^3.3.0",
-                "process": "^0.11.10",
-                "string_decoder": "^1.3.0"
-            },
-            "engines": {
-                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-            }
-        },
         "../node_modules/resolve-from": {
             "version": "4.0.0",
             "dev": true,
@@ -2282,11 +2734,13 @@
             }
         },
         "../node_modules/rolldown": {
-            "version": "1.0.3",
+            "version": "1.2.13",
+            "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.2.13.tgz",
+            "integrity": "sha512-/5apOkwWxtACcQtZ5WlrAsKS4JwXVThQPJZ3RqIruRY9UG9M8e0VlXN068xum/JRKA4aIUoJ13ghe/kGCvidiQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@oxc-project/types": "=0.133.0",
+                "@oxc-project/types": "=0.153.0",
                 "@rolldown/pluginutils": "^1.0.0"
             },
             "bin": {
@@ -2296,41 +2750,22 @@
                 "node": "^20.19.0 || >=22.12.0"
             },
             "optionalDependencies": {
-                "@rolldown/binding-android-arm64": "1.0.3",
-                "@rolldown/binding-darwin-arm64": "1.0.3",
-                "@rolldown/binding-darwin-x64": "1.0.3",
-                "@rolldown/binding-freebsd-x64": "1.0.3",
-                "@rolldown/binding-linux-arm-gnueabihf": "1.0.3",
-                "@rolldown/binding-linux-arm64-gnu": "1.0.3",
-                "@rolldown/binding-linux-arm64-musl": "1.0.3",
-                "@rolldown/binding-linux-ppc64-gnu": "1.0.3",
-                "@rolldown/binding-linux-s390x-gnu": "1.0.3",
-                "@rolldown/binding-linux-x64-gnu": "1.0.3",
-                "@rolldown/binding-linux-x64-musl": "1.0.3",
-                "@rolldown/binding-openharmony-arm64": "1.0.3",
-                "@rolldown/binding-wasm32-wasi": "1.0.3",
-                "@rolldown/binding-win32-arm64-msvc": "1.0.3",
-                "@rolldown/binding-win32-x64-msvc": "1.0.3"
-            }
-        },
-        "../node_modules/safe-buffer": {
-            "version": "5.2.1",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/feross"
-                },
-                {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/feross"
-                },
-                {
-                    "type": "consulting",
-                    "url": "https://feross.org/support"
-                }
-            ],
-            "license": "MIT"
+                "@rolldown/binding-android-arm-eabi": "1.2.13",
+                "@rolldown/binding-android-arm64": "1.2.13",
+                "@rolldown/binding-darwin-arm64": "1.2.13",
+                "@rolldown/binding-darwin-x64": "1.2.13",
+                "@rolldown/binding-freebsd-x64": "1.2.13",
+                "@rolldown/binding-linux-arm-gnueabihf": "1.2.13",
+                "@rolldown/binding-linux-arm64-gnu": "1.2.13",
+                "@rolldown/binding-linux-arm64-musl": "1.2.13",
+                "@rolldown/binding-linux-ppc64-gnu": "1.2.13",
+                "@rolldown/binding-linux-s390x-gnu": "1.2.13",
+                "@rolldown/binding-linux-x64-gnu": "1.2.13",
+                "@rolldown/binding-linux-x64-musl": "1.2.13",
+                "@rolldown/binding-openharmony-arm64": "1.2.13",
+                "@rolldown/binding-win32-arm64-msvc": "1.2.13",
+                "@rolldown/binding-win32-x64-msvc": "1.2.13"
+            }
         },
         "../node_modules/semver": {
             "version": "7.7.3",
@@ -2368,7 +2803,9 @@
             "license": "ISC"
         },
         "../node_modules/source-map-js": {
-            "version": "1.2.1",
+            "version": "1.2.2",
+            "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.2.tgz",
+            "integrity": "sha512-KGj/8Y43x35aZVDtt+J4mK1hoLGHULMYfSkODJNQjNDC3oW1PqPoxMwo0pLUsWM/UEGzON/NxeHywEfNXNP3Vw==",
             "dev": true,
             "license": "BSD-3-Clause",
             "engines": {
@@ -2385,14 +2822,6 @@
             "dev": true,
             "license": "MIT"
         },
-        "../node_modules/string_decoder": {
-            "version": "1.3.0",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "safe-buffer": "~5.2.0"
-            }
-        },
         "../node_modules/strip-json-comments": {
             "version": "3.1.1",
             "dev": true,
@@ -2430,11 +2859,6 @@
                 "node": ">=18"
             }
         },
-        "../node_modules/tiny-inflate": {
-            "version": "1.0.3",
-            "dev": true,
-            "license": "MIT"
-        },
         "../node_modules/tinybench": {
             "version": "2.9.0",
             "dev": true,
@@ -2464,18 +2888,15 @@
             }
         },
         "../node_modules/tinyrainbow": {
-            "version": "3.1.0",
+            "version": "3.2.0",
+            "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-3.2.0.tgz",
+            "integrity": "sha512-LgO3D9yZJjApUiuUfl9iFAwrtaX4+lok3wJIqttGoKCHlWUqHqbQpnxCf82L8FjgKsh4iGo78hqJwgL8F6To2A==",
             "dev": true,
             "license": "MIT",
             "engines": {
                 "node": ">=14.0.0"
             }
         },
-        "../node_modules/tr46": {
-            "version": "0.0.3",
-            "dev": true,
-            "license": "MIT"
-        },
         "../node_modules/ts-api-utils": {
             "version": "2.4.0",
             "dev": true,
@@ -2532,29 +2953,6 @@
             "dev": true,
             "license": "MIT"
         },
-        "../node_modules/unicode-properties": {
-            "version": "1.4.1",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "base64-js": "^1.3.0",
-                "unicode-trie": "^2.0.0"
-            }
-        },
-        "../node_modules/unicode-trie": {
-            "version": "2.0.0",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "pako": "^0.2.5",
-                "tiny-inflate": "^1.0.0"
-            }
-        },
-        "../node_modules/unicode-trie/node_modules/pako": {
-            "version": "0.2.9",
-            "dev": true,
-            "license": "MIT"
-        },
         "../node_modules/uri-js": {
             "version": "4.4.1",
             "dev": true,
@@ -2563,20 +2961,17 @@
                 "punycode": "^2.1.0"
             }
         },
-        "../node_modules/urijs": {
-            "version": "1.19.11",
-            "dev": true,
-            "license": "MIT"
-        },
         "../node_modules/vite": {
-            "version": "8.0.16",
+            "version": "8.3.4",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-8.3.4.tgz",
+            "integrity": "sha512-IftLE8phJhdNRIGNEV4JCCvfNScoZQVfcXaN8TQropWGJtOHcu+iAB9pHcuGvmEb/kddw0LBe/jS8ztdC6xdiQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "lightningcss": "^1.32.0",
-                "picomatch": "^4.0.4",
-                "postcss": "^8.5.15",
-                "rolldown": "1.0.3",
+                "lightningcss": "^1.33.0",
+                "picomatch": "^4.0.7",
+                "postcss": "^8.5.29",
+                "rolldown": "~1.2.12",
                 "tinyglobby": "^0.2.17"
             },
             "bin": {
@@ -2593,7 +2988,7 @@
             },
             "peerDependencies": {
                 "@types/node": "^20.19.0 || >=22.12.0",
-                "@vitejs/devtools": "^0.1.18",
+                "@vitejs/devtools": "^0.7.1",
                 "esbuild": "^0.27.0 || ^0.28.0",
                 "jiti": ">=1.21.0",
                 "less": "^4.0.0",
@@ -2645,17 +3040,19 @@
             }
         },
         "../node_modules/vitest": {
-            "version": "4.1.8",
+            "version": "4.1.11",
+            "resolved": "https://registry.npmjs.org/vitest/-/vitest-4.1.11.tgz",
+            "integrity": "sha512-fhACrNXUidIbGSBr5FlbuBkO7VWC1ZyLl0DO4CU2DrQoAPxX84Ysxs+HeGQpii5lZWV1Q4gBZTTu49mF+A6Edw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@vitest/expect": "4.1.8",
-                "@vitest/mocker": "4.1.8",
-                "@vitest/pretty-format": "4.1.8",
-                "@vitest/runner": "4.1.8",
-                "@vitest/snapshot": "4.1.8",
-                "@vitest/spy": "4.1.8",
-                "@vitest/utils": "4.1.8",
+                "@vitest/expect": "4.1.11",
+                "@vitest/mocker": "4.1.11",
+                "@vitest/pretty-format": "4.1.11",
+                "@vitest/runner": "4.1.11",
+                "@vitest/snapshot": "4.1.11",
+                "@vitest/spy": "4.1.11",
+                "@vitest/utils": "4.1.11",
                 "es-module-lexer": "^2.0.0",
                 "expect-type": "^1.3.0",
                 "magic-string": "^0.30.21",
@@ -2683,12 +3080,12 @@
                 "@edge-runtime/vm": "*",
                 "@opentelemetry/api": "^1.9.0",
                 "@types/node": "^20.0.0 || ^22.0.0 || >=24.0.0",
-                "@vitest/browser-playwright": "4.1.8",
-                "@vitest/browser-preview": "4.1.8",
-                "@vitest/browser-webdriverio": "4.1.8",
-                "@vitest/coverage-istanbul": "4.1.8",
-                "@vitest/coverage-v8": "4.1.8",
-                "@vitest/ui": "4.1.8",
+                "@vitest/browser-playwright": "4.1.11",
+                "@vitest/browser-preview": "4.1.11",
+                "@vitest/browser-webdriverio": "4.1.11",
+                "@vitest/coverage-istanbul": "4.1.11",
+                "@vitest/coverage-v8": "4.1.11",
+                "@vitest/ui": "4.1.11",
                 "happy-dom": "*",
                 "jsdom": "*",
                 "vite": "^6.0.0 || ^7.0.0 || ^8.0.0"
@@ -2739,20 +3136,6 @@
                 "node": ">=14.0.0"
             }
         },
-        "../node_modules/webidl-conversions": {
-            "version": "3.0.1",
-            "dev": true,
-            "license": "BSD-2-Clause"
-        },
-        "../node_modules/whatwg-url": {
-            "version": "5.0.0",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "tr46": "~0.0.3",
-                "webidl-conversions": "^3.0.0"
-            }
-        },
         "../node_modules/which": {
             "version": "2.0.2",
             "dev": true,
@@ -2790,11 +3173,6 @@
                 "node": ">=0.10.0"
             }
         },
-        "../node_modules/wordwrap": {
-            "version": "1.0.0",
-            "dev": true,
-            "license": "MIT"
-        },
         "../node_modules/ws": {
             "version": "8.21.0",
             "dev": true,
@@ -2823,20 +3201,6 @@
                 "node": ">=18"
             }
         },
-        "../node_modules/yaml": {
-            "version": "2.9.0",
-            "dev": true,
-            "license": "ISC",
-            "bin": {
-                "yaml": "bin.mjs"
-            },
-            "engines": {
-                "node": ">= 14.6"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/eemeli"
-            }
-        },
         "../node_modules/yocto-queue": {
             "version": "0.1.0",
             "dev": true,
diff --git a/nodejs/scripts/package-release.ts b/nodejs/scripts/package-release.ts
index 90ad30615c..7cd973a833 100644
--- a/nodejs/scripts/package-release.ts
+++ b/nodejs/scripts/package-release.ts
@@ -22,6 +22,7 @@ import {
 export const JAVA_CLASSIFIERS = {
     "linux-arm64": "linux.arm64",
     "linuxmusl-x64": "linuxmusl.x64",
+    "linuxmusl-arm64": "linuxmusl.arm64",
     "win32-x64": "win32",
     "win32-arm64": "win32.arm64",
     "darwin-arm64": "darwin",
diff --git a/nodejs/scripts/publish-release.ts b/nodejs/scripts/publish-release.ts
index 292926d409..4a164d7e92 100644
--- a/nodejs/scripts/publish-release.ts
+++ b/nodejs/scripts/publish-release.ts
@@ -24,6 +24,13 @@ type NativeCommand = (
     env?: NodeJS.ProcessEnv
 ) => string;
 
+type GithubRelease = {
+    tag_name: string;
+    draft: boolean;
+    prerelease: boolean;
+    published_at: string | null;
+};
+
 const runNativeCommand: NativeCommand = (command, args, cwd, env = process.env) =>
     execFileSync(command, args, {
         cwd,
@@ -232,12 +239,7 @@ export async function publishJava(
 }
 
 export function previousSdkReleaseTag(
-    releases: {
-        tag_name: string;
-        draft: boolean;
-        prerelease: boolean;
-        published_at: string | null;
-    }[],
+    releases: GithubRelease[],
     identity: ReleaseIdentity
 ): string | undefined {
     return releases
@@ -321,9 +323,24 @@ export async function publishSourceRelease(
         assert.equal(release.draft, false, "Existing SDK release is a draft");
         return;
     }
-    const releases = JSON.parse(
-        gh(["api", "--paginate", "--slurp", `repos/${repository}/releases?per_page=100`])
-    ).flat();
+    let releases: GithubRelease[];
+    if (identity.channel === "latest") {
+        try {
+            releases = [JSON.parse(gh(["api", `repos/${repository}/releases/latest`]))];
+        } catch (error) {
+            if (!/\(HTTP 404\)/.test(String((error as { stderr?: string }).stderr))) throw error;
+            releases = [];
+        }
+    } else {
+        const output = gh([
+            "api",
+            "--paginate",
+            "--jq",
+            ".[] | {tag_name, draft, prerelease, published_at}",
+            `repos/${repository}/releases?per_page=100`,
+        ]);
+        releases = output ? output.split("\n").map((line) => JSON.parse(line)) : [];
+    }
     const previous = previousSdkReleaseTag(releases, identity);
     gh([
         "release",
diff --git a/nodejs/scripts/unified-release.ts b/nodejs/scripts/unified-release.ts
index 56b1b2ddae..5e1477ceb5 100644
--- a/nodejs/scripts/unified-release.ts
+++ b/nodejs/scripts/unified-release.ts
@@ -91,13 +91,12 @@ export function publicationSdks(
         destination !== "public" || visibility === "public",
         "Internal releases cannot publish publicly"
     );
-    // Python publishes in the caller so PyPI authentication and attestations share one workflow identity.
-    return packagedSdks(channel, visibility).filter(
-        (language) =>
-            language !== "python" &&
-            (destination === "public" ||
-                language === "nodejs" ||
-                (channel !== "unstable" && language === "dotnet"))
+    // Public Python publishes in the caller so PyPI authentication and attestations share one workflow identity.
+    return packagedSdks(channel, visibility).filter((language) =>
+        destination === "public"
+            ? language !== "python"
+            : language === "nodejs" ||
+              (channel !== "unstable" && (language === "dotnet" || language === "python"))
     );
 }
 
diff --git a/nodejs/src/cliVersion.ts b/nodejs/src/cliVersion.ts
index 93029c8524..58d20a7d2c 100644
--- a/nodejs/src/cliVersion.ts
+++ b/nodejs/src/cliVersion.ts
@@ -1,3 +1,3 @@
-export const COPILOT_CLI_VERSION = "1.0.92-4";
+export const COPILOT_CLI_VERSION = "1.0.97-2";
 
 export const COPILOT_CLI_USE_NPM_PACKAGE = false;
diff --git a/nodejs/src/client.ts b/nodejs/src/client.ts
index 24f7f6ff2e..464a525427 100644
--- a/nodejs/src/client.ts
+++ b/nodejs/src/client.ts
@@ -1662,6 +1662,9 @@ export class CopilotClient {
         if (config.gitHubToken !== undefined && config.gitHubTokenProvider !== undefined) {
             throw new Error("gitHubToken and gitHubTokenProvider are mutually exclusive");
         }
+        if (config.cloud != null && config.skillProvider) {
+            throw new Error("Skill providers are not supported for cloud sessions.");
+        }
         if (!this.connection) {
             await this.start();
         }
@@ -1745,12 +1748,17 @@ export class CopilotClient {
             if (config.hooks) {
                 s.registerHooks(config.hooks);
             }
+            if (config.skillProvider) {
+                s.registerSkillProvider(config.skillProvider);
+            }
             if (transformCallbacks) {
                 s.registerTransformCallbacks(transformCallbacks);
             }
             if (config.onEvent) {
                 s.on(config.onEvent);
             }
+            // Session-FS setup can throw, so finish it before the session
+            // becomes routable; a failed open must not leave handlers behind.
             this.setupSessionFs(s, config);
             this.sessions.set(sessionId, s);
             return s;
@@ -1782,6 +1790,7 @@ export class CopilotClient {
                 model: config.model,
                 allowedModels: config.allowedModels,
                 sessionId: localSessionId,
+                name: config.name,
                 clientName: config.clientName,
                 reasoningEffort: config.reasoningEffort,
                 reasoningSummary: config.reasoningSummary,
@@ -1798,6 +1807,7 @@ export class CopilotClient {
                     isTerminal: tool.isTerminal,
                 })),
                 toolSearch: config.toolSearch,
+                imageGeneration: config.imageGeneration,
                 canvases: config.canvases?.map((canvas) => canvas.declaration),
                 requestCanvasRenderer: config.requestCanvasRenderer,
                 requestExtensions: config.requestExtensions,
@@ -1862,6 +1872,9 @@ export class CopilotClient {
                 enableSessionStore: config.enableSessionStore,
                 enableSkills: config.enableSkills,
                 skillDirectories: config.skillDirectories,
+                ...(config.skillProvider ? { hasSkillProvider: true } : {}),
+                agentDirectories: config.agentDirectories,
+                hookDirectories: config.hookDirectories,
                 pluginDirectories: config.pluginDirectories,
                 instructionDirectories: config.instructionDirectories,
                 disabledSkills: config.disabledSkills,
@@ -1875,6 +1888,7 @@ export class CopilotClient {
                 featureFlags: config.featureFlags,
                 expAssignments: config.expAssignments,
                 enableManagedSettings: config.enableManagedSettings,
+                enforceManagedModelDefaults: config.enforceManagedModelDefaults,
                 managedSettings: config.managedSettings,
             });
 
@@ -2041,6 +2055,9 @@ export class CopilotClient {
         if (config.hooks) {
             session.registerHooks(config.hooks);
         }
+        if (config.skillProvider) {
+            session.registerSkillProvider(config.skillProvider);
+        }
 
         const modeDefaults = this.configDefaultsForMode();
         config = { ...modeDefaults, ...config };
@@ -2057,10 +2074,13 @@ export class CopilotClient {
         if (config.onEvent) {
             session.on(config.onEvent);
         }
+        // Validation and session-FS setup can throw, so finish them before the
+        // replacement session becomes routable over any resident one.
+        const toolFilterOptions = this.resolveToolFilterOptions(config);
         this.setupSessionFs(session, config);
+        const replacedSession = this.sessions.get(sessionId);
         this.sessions.set(sessionId, session);
 
-        const toolFilterOptions = this.resolveToolFilterOptions(config);
         const gitHubTokenProviderRegistrationId = this.registerGitHubTokenProvider(
             config.gitHubTokenProvider,
             sessionId
@@ -2103,6 +2123,7 @@ export class CopilotClient {
                     isTerminal: tool.isTerminal,
                 })),
                 toolSearch: config.toolSearch,
+                imageGeneration: config.imageGeneration,
                 canvases: config.canvases?.map((canvas) => canvas.declaration),
                 workflows: workflows?.map((workflow) => workflow.meta),
                 requestCanvasRenderer: config.requestCanvasRenderer,
@@ -2159,6 +2180,9 @@ export class CopilotClient {
                 defaultAgent: config.defaultAgent,
                 agent: config.agent,
                 skillDirectories: config.skillDirectories,
+                ...(config.skillProvider ? { hasSkillProvider: true } : {}),
+                agentDirectories: config.agentDirectories,
+                hookDirectories: config.hookDirectories,
                 pluginDirectories: config.pluginDirectories,
                 instructionDirectories: config.instructionDirectories,
                 disabledSkills: config.disabledSkills,
@@ -2174,6 +2198,7 @@ export class CopilotClient {
                 featureFlags: config.featureFlags,
                 expAssignments: config.expAssignments,
                 enableManagedSettings: config.enableManagedSettings,
+                enforceManagedModelDefaults: config.enforceManagedModelDefaults,
                 managedSettings: config.managedSettings,
                 ...(extensionOptions?.requestedEnvironmentVariables
                     ? {
@@ -2222,7 +2247,15 @@ export class CopilotClient {
             this.commitGitHubTokenProvider(sessionId, gitHubTokenProviderRegistrationId);
         } catch (e) {
             session._markDisconnected();
-            this.sessions.delete(sessionId);
+            // The runtime keeps the resident session's bindings when a resume
+            // fails, so its callbacks must keep reaching the replaced session.
+            if (this.sessions.get(sessionId) === session) {
+                if (replacedSession) {
+                    this.sessions.set(sessionId, replacedSession);
+                } else {
+                    this.sessions.delete(sessionId);
+                }
+            }
             if (gitHubTokenProviderRegistrationId !== undefined) {
                 this.githubTokenProviders.delete(gitHubTokenProviderRegistrationId);
             }
@@ -2243,7 +2276,7 @@ export class CopilotClient {
      * This connection owns the host. Disposing it or disconnecting the client
      * stops the listener without deleting sessions. The host uses a separate
      * SDK connection to the same runtime, not another runtime process.
-     * Only one AHP host may own the catalog in an effective Copilot home
+     * Only one AHP host may own a compute-scoped catalog in an effective Copilot home
      * at a time. Other SDK clients and sessions remain usable in that home.
      * Select localServer, githubEnvironment, or both. An empty localServer
      * selects 127.0.0.1 on an available port. `onExit` runs at most once; owner disconnection cannot
@@ -2261,6 +2294,7 @@ export class CopilotClient {
         const rpc = this.rpc;
         const hostId = randomUUID();
         const {
+            computeId,
             localServer,
             githubEnvironment,
             onExit,
@@ -2281,6 +2315,7 @@ export class CopilotClient {
         try {
             const info = await rpc.host.start({
                 hostId,
+                computeId,
                 localServer,
                 githubEnvironment,
                 sessionFactory: createSession ? true : undefined,
@@ -2291,7 +2326,8 @@ export class CopilotClient {
                 async () => {
                     await rpc.host.dispose({ hostId });
                 },
-                (sessionId) => rpc.host.publishSession({ hostId, sessionId })
+                (sessionId) => rpc.host.publishSession({ hostId, sessionId }),
+                () => rpc.host.listSessions({ hostId })
             );
         } catch (error) {
             this.hostExitCallbacks.delete(hostId);
@@ -3224,6 +3260,8 @@ export class CopilotClient {
     /** Starts the in-process FFI runtime with SDK-managed typed options. */
     private async startInProcessFfi(): Promise<void> {
         const explicitEntrypoint = this.resolvedEnv.COPILOT_CLI_PATH;
+        const cliLoginSyncIntegrationId =
+            this.resolvedEnv.GITHUB_COPILOT_INTEGRATION_ID?.trim() || undefined;
         let runtimeLibrary: string;
         if (explicitEntrypoint) {
             const entrypointDirectory = dirname(resolve(explicitEntrypoint));
@@ -3237,7 +3275,8 @@ export class CopilotClient {
                       "runtime.node"
                   );
         } else {
-            runtimeLibrary = join(dirname(await getBundledRuntimePath()), "runtime.node");
+            const bundledRuntimePath = await getBundledRuntimePath();
+            runtimeLibrary = join(dirname(bundledRuntimePath), "runtime.node");
         }
         // Load the FFI host lazily so the native `koffi` addon (and its
         // platform-specific `koffi.node`) is only loaded on the in-process path;
@@ -3272,6 +3311,9 @@ export class CopilotClient {
         if (this.options.enableRemoteSessions) {
             args.push("--remote");
         }
+        if (cliLoginSyncIntegrationId) {
+            args.push(`--cli-login-sync-integration-id=${cliLoginSyncIntegrationId}`);
+        }
 
         const host = FfiRuntimeHost.create(runtimeLibrary, explicitEntrypoint, environment, args);
         this.ffiHost = host;
@@ -3513,6 +3555,23 @@ export class CopilotClient {
             }
         );
 
+        // Internal experimental callbacks backing `SessionConfigBase.skillProvider`.
+        this.connection.onRequest(
+            "skillProvider.list",
+            async (params: { sessionId: string }, token: CancellationToken) =>
+                await this.resolveSkillProviderSession(params)._handleSkillProviderList(token)
+        );
+        this.connection.onRequest(
+            "skillProvider.read",
+            async (params: { sessionId: string; name: string }, token: CancellationToken) => {
+                const session = this.resolveSkillProviderSession(params);
+                if (typeof params.name !== "string") {
+                    throw new Error("Invalid skillProvider.read payload");
+                }
+                return await session._handleSkillProviderRead(params.name, token);
+            }
+        );
+
         const connection = this.connection;
         const messageWriter = this.messageWriter;
         const cliProcess = this.isExternalServer ? null : this.cliProcess;
@@ -3736,6 +3795,17 @@ export class CopilotClient {
         return { response };
     }
 
+    private resolveSkillProviderSession(params: { sessionId: string }): CopilotSession {
+        if (!params || typeof params.sessionId !== "string") {
+            throw new Error("Invalid skillProvider payload");
+        }
+        const session = this.sessions.get(params.sessionId);
+        if (!session) {
+            throw new Error(`Session not found: ${params.sessionId}`);
+        }
+        return session;
+    }
+
     private async handleHooksInvoke(params: {
         sessionId: string;
         hookType: string;
diff --git a/nodejs/src/extension.ts b/nodejs/src/extension.ts
index e7bb21e3b2..f6adc32745 100644
--- a/nodejs/src/extension.ts
+++ b/nodejs/src/extension.ts
@@ -24,7 +24,7 @@ export {
 
 export type JoinSessionConfig = Omit<
     ResumeSessionConfig,
-    "onPermissionRequest" | "extensionSdkPath"
+    "onPermissionRequest" | "extensionSdkPath" | "skillProvider" | "imageGeneration"
 > & {
     onPermissionRequest?: PermissionHandler;
     /**
@@ -124,16 +124,25 @@ export async function joinSession(config: JoinSessionConfig = {}): Promise<Copil
     // Strip `extensionSdkPath` at runtime even though `JoinSessionConfig` omits it
     // at the type level — untyped (JS) callers can still slip it through, and
     // honoring it here would be misleading since the extension subprocess has
-    // already been forked by the host with the SDK the host chose.
+    // already been forked by the host with the SDK the host chose. Skill
+    // providers belong to the session's owning client, and the CLI rejects them
+    // from extensions.
     const {
         extensionSdkPath: _stripped,
+        skillProvider: _strippedSkillProvider,
+        imageGeneration: _strippedImageGeneration,
         workflows,
         requestedEnvironmentVariables,
         ...rest
     } = config as JoinSessionConfig & {
         extensionSdkPath?: string;
+        skillProvider?: unknown;
+        imageGeneration?: unknown;
     };
     void _stripped;
+    void _strippedSkillProvider;
+    // Image generation consent belongs to the session owner, not joining extensions.
+    void _strippedImageGeneration;
 
     return client.resumeSessionForExtension(
         sessionId,
diff --git a/nodejs/src/generated/rpc.ts b/nodejs/src/generated/rpc.ts
index b423be039f..8b029c9e77 100644
--- a/nodejs/src/generated/rpc.ts
+++ b/nodejs/src/generated/rpc.ts
@@ -5,7 +5,7 @@
 
 import type { MessageConnection } from "vscode-jsonrpc/node.js";
 
-import type { AbortReason, AgentModelPolicy, Attachment, AutoTier, ContextTier, EmbeddedBlobResourceContents, EmbeddedTextResourceContents, IndexedSearchState, ManagedSettingsResolvedData, McpOauthHttpResponse, McpOauthWWWAuthenticateParams, McpServerMetadata, McpServerSource, McpServerStatus, ModelChangeSource, PermissionDecisionSource, PermissionMode, PermissionPromptRequest, PermissionRule, ReasoningSummary, RemediationAction, SessionEvent, SessionLimitsConfig, SessionMode, ShutdownType, SkillSource, TaskCompleteData, TaskCompletionOutcome, UserToolSessionApproval, Verbosity } from "./session-events.js";
+import type { AbortReason, AgentModelPolicy, Attachment, AutoTier, ContextTier, EmbeddedBlobResourceContents, EmbeddedTextResourceContents, IndexedSearchState, ManagedPermissionsContext, ManagedSettingsResolvedData, McpOauthHttpResponse, McpOauthWWWAuthenticateParams, McpServerMetadata, McpServerSource, McpServerStatus, ModelChangeSource, ModelProviderKind, ModelProviderRef, PermissionDecisionSource, PermissionMode, PermissionPromptRequest, PermissionRule, ProviderQuotaState, ReasoningSummary, RemediationAction, SessionEvent, SessionLimitsConfig, SessionMode, ShutdownType, SkillSource, TaskCompleteData, TaskCompletionOutcome, UsageGetMetricsResult, 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 };
@@ -31,8 +31,35 @@ export type AuthInfo =
   | TokenProviderAuthInfo
   | CopilotApiTokenAuthInfo
   | UserAuthInfo
+  | AccountAuthInfo
   | GhCliAuthInfo
   | ApiKeyAuthInfo;
+/**
+ * Authentication type
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "AuthInfoType".
+ */
+/** @experimental */
+export type AuthInfoType =
+  /** Authentication provided by a GitHub App HMAC credential. */
+  | "hmac"
+  /** Authentication resolved from environment-provided credentials. */
+  | "env"
+  /** Authentication from an interactive user sign-in. */
+  | "user"
+  /** Authentication from a selected provider-owned account, without a GitHub credential. */
+  | "account"
+  /** Authentication delegated to the GitHub CLI. */
+  | "gh-cli"
+  /** Authentication from an API key credential. */
+  | "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";
 /**
  * The provider kind stamped on a signed-in account.
  *
@@ -402,30 +429,6 @@ export type LoginProviderKind =
   | "proxima"
   /** Microsoft Entra sign-in that derives a GitHub (EMU) credential. */
   | "entra";
-/**
- * Authentication type
- *
- * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "AuthInfoType".
- */
-/** @experimental */
-export type AuthInfoType =
-  /** Authentication provided by a GitHub App HMAC credential. */
-  | "hmac"
-  /** Authentication resolved from environment-provided credentials. */
-  | "env"
-  /** Authentication from an interactive user sign-in. */
-  | "user"
-  /** Authentication delegated to the GitHub CLI. */
-  | "gh-cli"
-  /** Authentication from an API key credential. */
-  | "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";
 /**
  * One step in an interactive login flow. The consumer acts on the step and calls advance to proceed. Browser-open is encoded as two distinct steps by design: `open-url` is CONSUMER-driven (the provider surfaces the authorize URL and the consumer opens it — github.com/GHEC web), while `needs-interaction` is PROVIDER-driven (the provider opens the browser or broker UI itself and does not surface a URL — Entra).
  *
@@ -484,17 +487,19 @@ export type AuthLoginStep =
       kind: "error";
     };
 /**
- * Terminal disposition of a login persistence attempt.
+ * Disposition of a login attempt, including pending user decisions.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
  * via the `definition` "AuthLoginResultStatus".
  */
 /** @experimental */
 export type AuthLoginResultStatus =
-  /** The credential was persisted and the account is signed in. */
+  /** The credential was persisted and the selected account is signed in. */
   | "completed"
   /** Persistence needs explicit consent to store the token in plaintext. */
   | "needs-plaintext-consent"
+  /** Credentials are saved; select an account using a returned selectionId as advance input to complete sign-in. */
+  | "needs-account-selection"
   /** The user declined plaintext persistence. */
   | "declined";
 /**
@@ -507,6 +512,7 @@ export type AuthLoginResultStatus =
 export type AuthReadValue =
   | {
       account?: AccountStatus;
+      authInfo?: AuthIdentity;
       /**
        * Account read-datum variant discriminator.
        */
@@ -1436,6 +1442,20 @@ export type ConnectorMcpStatus =
   | "disabled"
   /** The Connector currently has no live server configuration. */
   | "not_configured";
+/**
+ * Availability.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ConnectorDiscoveryAvailability".
+ */
+/** @experimental */
+export type ConnectorDiscoveryAvailability =
+  /** Enabled. */
+  | "enabled"
+  /** Disabled. */
+  | "disabled"
+  /** Unavailable. */
+  | "unavailable";
 /**
  * Session account selection, or null.
  *
@@ -2010,6 +2030,33 @@ export type ExternalToolTextResultForLlmContentResourceLinkIconTheme =
 export type ExternalToolTextResultForLlmContentResourceDetails =
   | EmbeddedTextResourceContents
   | EmbeddedBlobResourceContents;
+/**
+ * The population a feature flag is declared for, before overrides.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "FeatureFlagAvailability".
+ */
+/** @experimental */
+/** @internal */
+export type FeatureFlagAvailability =
+  /** Enabled for everyone, before any override. */
+  | "on"
+  /** Enabled only for accounts on the owning team. */
+  | "team"
+  /** Enabled only for staff accounts that have also opted into experimental features. */
+  | "staff-and-experimental"
+  /** Enabled for staff accounts and for accounts that opted into experimental features. */
+  | "staff-or-experimental"
+  /** Enabled for any staff account, GitHub or Microsoft. */
+  | "staff"
+  /** Enabled for GitHub staff accounts only. */
+  | "staff-github"
+  /** Enabled for Microsoft staff accounts only. */
+  | "staff-microsoft"
+  /** Enabled only for accounts that opted into experimental features. */
+  | "experimental"
+  /** Disabled for everyone, before any override. */
+  | "off";
 /**
  * Content filtering mode to apply to all tools, or a map of tool name to content filtering mode.
  *
@@ -2066,6 +2113,18 @@ export type GitHubTokenAcquireResult =
        */
       kind: "cancelled";
     };
+/**
+ * Source for direct repo installs (when marketplace is empty)
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "InstalledPluginSource".
+ */
+/** @experimental */
+export type InstalledPluginSource =
+  | string
+  | InstalledPluginSourceGitHub
+  | InstalledPluginSourceUrl
+  | InstalledPluginSourceLocal;
 /**
  * Optional compaction parameters.
  *
@@ -2544,18 +2603,6 @@ export type InstallationDecision =
   | "decline"
   /** The user cancelled the pending decision without granting consent. */
   | "cancel";
-/**
- * Source for direct repo installs (when marketplace is empty)
- *
- * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "InstalledPluginSource".
- */
-/** @experimental */
-export type InstalledPluginSource =
-  | string
-  | InstalledPluginSourceGitHub
-  | InstalledPluginSourceUrl
-  | InstalledPluginSourceLocal;
 /**
  * Which tier this target belongs to
  *
@@ -2660,6 +2707,84 @@ export type SessionLogLevel =
   | "warning"
   /** Error message describing a failure. */
   | "error";
+
+/** @experimental */
+export type ManagedPermissionOperation = {
+  /**
+   * Absolute HTTP(S) URL with a host. Invalid URLs reject the entire evaluation batch.
+   */
+  url: string;
+  /**
+   * Operation to evaluate. Currently only url is supported.
+   */
+  kind: "url";
+};
+/**
+ * Managed-policy verdict only: deny blocks the URL, ask requires approval, allow approves under managed policy, and unmanaged leaves the normal consumer permission flow in effect. No verdict bypasses other security controls.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ManagedPermissionVerdict".
+ */
+/** @experimental */
+export type ManagedPermissionVerdict =
+  /** Managed policy prohibits the operation; do not offer approval. */
+  | "deny"
+  /** Managed policy requires the consumer to obtain approval. */
+  | "ask"
+  /** Managed policy allows the operation, subject to other security controls. */
+  | "allow"
+  /** Managed policy does not decide the operation; use the consumer's normal permission flow. */
+  | "unmanaged";
+/**
+ * What retrying did for one plugin required by managed settings.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ManagedPluginRetryStatus".
+ */
+/** @experimental */
+export type ManagedPluginRetryStatus =
+  /** The plugin was missing and is now installed. */
+  | "installed"
+  /** An update was available and is now installed. */
+  | "updated"
+  /** The plugin was already installed and current, so nothing was done. */
+  | "already_present"
+  /** Checking, installing, or updating the plugin failed. See `error`. */
+  | "failed"
+  /** The plugin was not prepared because another session was changing plugins or the managed settings changed during the retry. It is prepared again before a later message. */
+  | "deferred"
+  /** The session's managed settings do not require this plugin, so nothing was done. */
+  | "not_required";
+/**
+ * Which layer disabled bypass-permissions mode. The layer matters because only a server-delivered disable is pinned to an account and can later be lifted by signing in elsewhere.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ManagedSettingsBypassDisableSource".
+ */
+/** @experimental */
+/** @internal */
+export type ManagedSettingsBypassDisableSource =
+  /** The user turned bypass mode off themselves. */
+  | "user"
+  /** The account's server-delivered org policy disabled it. Pinned to the account named by `currentManagedIdentity`. */
+  | "managed"
+  /** The device/MDM layer disabled it. Outranks the account, so no server answer lifts it. */
+  | "mdm";
+/**
+ * What the managed-policy resolution said about bypass-permissions mode. `unknown` is a third answer rather than a missing one, and the caller must send it explicitly when it has no verdict.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ManagedSettingsBypassPolicyResolution".
+ */
+/** @experimental */
+/** @internal */
+export type ManagedSettingsBypassPolicyResolution =
+  /** The policy resolved and does not disable bypass mode. */
+  | "allowed"
+  /** The policy resolved and disables bypass mode. */
+  | "disabled"
+  /** No verdict: the fetch failed, or the service declared a policy this build may not enforce. Whatever is in force is preserved, because reverting to permissive on an unreadable policy would widen access. */
+  | "unknown";
 /**
  * A channel accepted by managedSettings.compose.
  *
@@ -2686,6 +2811,89 @@ export type ManagedSettingsDiagnosticSeverity =
   | "error"
   /** The runtime accepts the document but ignores the flagged content. */
   | "warning";
+/**
+ * The operation that requires a policy-helper response.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ManagedSettingsPolicyHelperReason".
+ */
+/** @experimental */
+/** @internal */
+export type ManagedSettingsPolicyHelperReason =
+  /** Resolve policy for session startup. */
+  | "sessionStart"
+  /** Resolve policy before plugin activation. */
+  | "pluginActivation";
+/**
+ * How an ingestion may use the on-disk server-policy cache.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ManagedSettingsServerPolicyCacheMode".
+ */
+/** @experimental */
+/** @internal */
+export type ManagedSettingsServerPolicyCacheMode =
+  /** Serve a recent cache entry before a live fetch. */
+  | "preferFresh"
+  /** Read cached policy without a network request. */
+  | "cacheOnly"
+  /** Serve a cached entry only as a fallback after a failed live fetch. */
+  | "fallbackOnly"
+  /** Ignore the cache entirely and rely on the live fetch alone. */
+  | "disabled";
+/**
+ * How the server layer of an ingestion was resolved.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ManagedSettingsServerPolicyResolution".
+ */
+/** @experimental */
+/** @internal */
+export type ManagedSettingsServerPolicyResolution =
+  /** A live fetch succeeded. */
+  | "live"
+  /** A recent cached entry was served without a live fetch. */
+  | "freshCache"
+  /** No cached policy or confirmed no-policy result exists. */
+  | "cacheMiss"
+  /** A live fetch failed and a cached entry was served in its place. */
+  | "fallbackCache"
+  /** No policy could be resolved and the host proceeds unmanaged. */
+  | "failOpen"
+  /** No policy could be resolved and the host applies the fail-closed gates. */
+  | "failClosed"
+  /** No fetch was attempted because no usable token was available. */
+  | "skippedNoToken";
+/**
+ * Which channel registered the policy helper that produced a helper layer.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ManagedSettingsPolicyHelperAuthority".
+ */
+/** @experimental */
+/** @internal */
+export type ManagedSettingsPolicyHelperAuthority =
+  /** The helper was registered by the device (MDM or managed file) layer. */
+  | "device"
+  /** The helper was registered by the account's server-delivered policy. */
+  | "server";
+/**
+ * Severity of a diagnostic emitted while ingesting managed settings.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ManagedSettingsLogLevel".
+ */
+/** @experimental */
+/** @internal */
+export type ManagedSettingsLogLevel =
+  /** Detail useful only when diagnosing an ingestion. */
+  | "debug"
+  /** Ordinary progress worth surfacing under a verbose flag. */
+  | "info"
+  /** A condition the operator should see but which did not stop the ingestion. */
+  | "warning"
+  /** A failure that changed the outcome of the ingestion. */
+  | "error";
 /**
  * UI theme preference per SEP-1865
  *
@@ -3528,6 +3736,18 @@ export type McpSetEnvValueModeDetails =
   | "direct"
   /** Treat MCP server environment values as host-side references to resolve before launch. */
   | "indirect";
+/**
+ * Controls how availableTools (allowlist) and excludedTools (denylist) combine when both are set.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "OptionsUpdateToolFilterPrecedence".
+ */
+/** @experimental */
+export type OptionsUpdateToolFilterPrecedence =
+  /** If availableTools is set, it is the only constraint that applies (excludedTools is ignored). Preserves CLI / pre-existing client behavior. Default. */
+  | "available"
+  /** 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. */
+  | "excluded";
 /**
  * Per-source context-window attribution, or null if the session has not yet been initialized (no system prompt or tool metadata cached).
  *
@@ -3549,15 +3769,15 @@ export type SessionContextAttribution = {
    */
   modelSource: string;
   /**
-   * Maximum prompt tokens the resolved model accepts — the denominator for a `##k/###k` context-usage display. Mirrors `SessionContextInfo.promptTokenLimit`.
+   * Effective input budget after reserving requested output against the combined context ceiling. 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`.
+   * Advertised prompt allowance for the selected context tier: the denominator for context-usage displays and capacity for `categories.freeSpace` and `categories.buffer`. Mirrors `SessionContextInfo.limit`.
    */
   limit: number;
   /**
-   * Output reserve plus the tokens past the buffer-exhaustion blocking threshold. Mirrors `SessionContextInfo.bufferTokens`.
+   * Output reservation overlapping the displayed prompt allowance plus the tokens past the effective input budget's buffer-exhaustion blocking threshold. Mirrors `SessionContextInfo.bufferTokens`.
    */
   bufferTokens: number;
   /**
@@ -3593,7 +3813,7 @@ export type SessionContextAttribution = {
      */
     freeSpace: number;
     /**
-     * Output reserve plus post-blocking-threshold buffer.
+     * Overlapping output reservation plus post-blocking-threshold buffer.
      */
     buffer: number;
   };
@@ -3650,6 +3870,11 @@ export type SessionContextInfo = {
    * The model used for token counting
    */
   modelName: string;
+  provider?: ModelProviderRef;
+  /**
+   * Provider-owned model display label, or the Auto routing label. Presentation only; modelName remains the tokenization identity.
+   */
+  displayModelName?: string;
   /**
    * Tokens consumed by the system prompt
    */
@@ -3671,7 +3896,7 @@ export type SessionContextInfo = {
    */
   totalTokens: number;
   /**
-   * Maximum prompt tokens allowed by the model (or DEFAULT_TOKEN_LIMIT if unspecified)
+   * Effective input budget: the selected tier's prompt allowance bounded by the combined context ceiling minus the requested output allowance. Uses DEFAULT_TOKEN_LIMIT when limits are unspecified.
    */
   promptTokenLimit: number;
   /**
@@ -3679,11 +3904,11 @@ export type SessionContextInfo = {
    */
   compactionThreshold: number;
   /**
-   * Prompt token limit plus the model's full output token limit.
+   * Advertised prompt allowance for the selected context tier, without adding output tokens. The denominator for context-usage displays.
    */
   limit: number;
   /**
-   * Output reserve plus tokens after the buffer-exhaustion blocking threshold (default 95%)
+   * Output reservation overlapping the displayed prompt allowance plus tokens after the effective input budget's buffer-exhaustion blocking threshold (default 95%).
    */
   bufferTokens: number;
 } | null;
@@ -3769,18 +3994,6 @@ export type ModelPickerPriceCategory =
   | "high"
   /** Highest relative token cost tier. */
   | "very_high";
-/**
- * The neutral kind of a model provider — the model analog of `AccountKind`. A model provider is the live, entitled source a model came from; central code never branches on this beyond a single dispatch.
- *
- * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "ModelProviderKind".
- */
-/** @experimental */
-export type ModelProviderKind =
-  /** GitHub Copilot / CAPI models, spawned by a github-resolving account that holds a Copilot seat. */
-  | "copilot"
-  /** Microsoft 365 Copilot (Loki) inference models, spawned by a resolvable Entra-derived Loki account. */
-  | "loki";
 /**
  * Optional listing options.
  *
@@ -4046,18 +4259,6 @@ export type OptionsUpdateReasoningSummary =
   | "concise"
   /** Request a detailed summary of model reasoning. */
   | "detailed";
-/**
- * Controls how availableTools (allowlist) and excludedTools (denylist) combine when both are set.
- *
- * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "OptionsUpdateToolFilterPrecedence".
- */
-/** @experimental */
-export type OptionsUpdateToolFilterPrecedence =
-  /** If availableTools is set, it is the only constraint that applies (excludedTools is ignored). Preserves CLI / pre-existing client behavior. Default. */
-  | "available"
-  /** 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. */
-  | "excluded";
 /**
  * The client's response to the pending permission prompt
  *
@@ -4410,6 +4611,14 @@ export type QueuePendingItemsKind =
   | "message"
   /** A queued slash command or model-change command. */
   | "command";
+/**
+ * Pending warnings returned and cleared by session.quota.takeWarnings.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "QuotaTakeWarningsResult".
+ */
+/** @experimental */
+export type QuotaTakeWarningsResult = QuotaWarningProjection[];
 /**
  * State of the runtime-managed remote-control singleton.
  *
@@ -4464,6 +4673,36 @@ export type RemoteSessionMetadataTaskType =
   | "cca"
   /** CLI remote task. */
   | "cli";
+/**
+ * Which repository settings file to edit.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "RepoSettingsEditScope".
+ */
+/** @experimental */
+/** @internal */
+export type RepoSettingsEditScope =
+  /** The shared repository settings file. */
+  | "repo"
+  /** The local repository settings file. */
+  | "local";
+/**
+ * One atomic settings mutation.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SettingsEditOperation".
+ */
+/** @experimental */
+/** @internal */
+export type SettingsEditOperation =
+  /** Set one scalar value. */
+  | "set"
+  /** Add one string to a list, unless present. */
+  | "add-item"
+  /** Remove one string from a list, unless absent. */
+  | "remove-item"
+  /** Remove the setting without supplying a value. */
+  | "remove";
 /**
  * Provider-native structured output format. JSON Schema is forwarded without rewriting or validating the schema or the generated output.
  *
@@ -4501,7 +4740,7 @@ export type SandboxConfigSource =
   /** A repository policy selected the sandbox state. */
   | "repository_policy";
 /**
- * Extensible identifier of a sandbox policy feature whose availability varies between hosts. A plain string, so an older client decodes a name added by a newer runtime; ignore names you do not recognize. Known values: `network` — sandboxed commands can reach the network (`network.allowOutbound`, on by default); on Linux this needs the tooling for Bubblewrap's private network namespace, such as slirp4netns. `network_filtering` — host rules and the sandbox proxy (`network.allowedHosts`, `network.blockedHosts`, `network.proxy`); on Linux this needs the same tooling as `network`; on Windows it needs a version with Process Security Environment 1.1 host-loopback support, and a policy that uses it must also set `network.allowLocalNetwork`, because Windows reaches the local proxy only together with private-network access. `denied_paths` — native enforcement of `filesystem.deniedPaths`; on Windows this needs a version whose sandbox contract reports denied-path support. `shell` — shell commands inside the sandbox: bash on macOS and Linux, PowerShell on Windows. `filesystem_enumeration` — enumerate-only filesystem grants, which PowerShell's drive roots use on Windows; this needs a version with Process Security Environment 1.1 filesystem enumeration support. Without it, sandboxed PowerShell still runs, but `Get-Location` may report the drive root, `Set-Location` may fail, and relative paths may resolve against the drive root; the session also receives a `session.warning` with `warningType` `sandbox`. Other platforms always report it.
+ * Extensible identifier of a sandbox policy feature whose availability varies between hosts. A plain string, so an older client decodes a name added by a newer runtime; ignore names you do not recognize. Known values: `network` — sandboxed commands can reach the network (`network.allowOutbound`, on by default); on Linux this needs the tooling for Bubblewrap's private network namespace, such as slirp4netns. `network_filtering` — host rules and the sandbox proxy (`network.allowedHosts`, `network.blockedHosts`, `network.proxy`); on Linux this needs the same tooling as `network`; on Windows it needs Process Security Environment 1.1 host-loopback support or MXC's PSEC 1.0-only proxy-loopback compatibility capability, and a policy that uses it must also set `network.allowLocalNetwork`, because Windows reaches the local proxy only together with private-network access. Compatibility applies only to an explicit identity-less runtime proxy, not general host-loopback access, and other policy restrictions still apply. `denied_paths` — native enforcement of `filesystem.deniedPaths`; on Windows this needs a version whose sandbox contract reports denied-path support. `shell` — shell commands inside the sandbox: bash on macOS and Linux, PowerShell on Windows. `filesystem_enumeration` — enumerate-only filesystem grants, which PowerShell's drive roots use on Windows; this needs a version with Process Security Environment 1.1 filesystem enumeration support. Without it, sandboxed PowerShell still runs, but `Get-Location` may report the drive root, `Set-Location` may fail, and relative paths may resolve against the drive root; the session also receives a `session.warning` with `warningType` `sandbox`. Other platforms always report it.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
  * via the `definition` "SandboxHostCapabilityName".
@@ -4949,6 +5188,30 @@ export type SessionsOpenProgressStatus =
   | "in-progress"
   /** The step has completed successfully. */
   | "complete";
+/**
+ * Copilot plan tier used by the session quota projection.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SessionQuotaPlanTier".
+ */
+/** @experimental */
+export type SessionQuotaPlanTier =
+  /** Copilot Free. */
+  | "free"
+  /** Copilot education entitlement. */
+  | "edu"
+  /** Copilot Pro. */
+  | "pro"
+  /** Copilot Pro+. */
+  | "pro_plus"
+  /** Copilot Business. */
+  | "business"
+  /** Copilot Enterprise. */
+  | "enterprise"
+  /** Copilot Max. */
+  | "max"
+  /** The account's plan tier is not known. */
+  | "unknown";
 /**
  * Client metadata outcome for one requested local session.
  *
@@ -5029,6 +5292,7 @@ export type SettableAuthInfo =
   | SettableTokenAuthInfo
   | CopilotApiTokenAuthInfo
   | UserAuthInfo
+  | AccountAuthInfo
   | GhCliAuthInfo
   | ApiKeyAuthInfo;
 /**
@@ -5111,6 +5375,21 @@ export type SessionVisibilityStatus =
   | "repo"
   /** The session is restricted to its creator and collaborators. */
   | "unshared";
+/**
+ * Whether one atomic settings edit changed a file.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SettingsEditStatus".
+ */
+/** @experimental */
+/** @internal */
+export type SettingsEditStatus =
+  /** The edit changed the setting and was stored. */
+  | "changed"
+  /** The setting already had the requested state. */
+  | "unchanged"
+  /** The existing settings file could not be edited safely; nothing was written. */
+  | "invalid";
 /**
  * Signal to send (default: SIGTERM)
  *
@@ -5501,6 +5780,38 @@ export type SlashCommandInvocationResult =
   | SlashCommandShowDialogResult
   | SlashCommandSetModelResult
   | SlashCommandSetPlanModelResult;
+/**
+ * What the one-time staff log-level migration did.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "StaffLogLevelMigrationStatus".
+ */
+/** @experimental */
+export type StaffLogLevelMigrationStatus =
+  /** The account is not a staff account, so the migration does not apply and nothing was recorded. */
+  | "ineligible"
+  /** The migration already ran; the stored completion timestamp is returned unchanged. */
+  | "current"
+  /** The migration ran now. The persisted settings may have changed, so the host should adopt the returned settings when they are present. */
+  | "refreshed";
+/**
+ * What the one-time staff update-channel migration did.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "StaffUpdateChannelMigrationStatus".
+ */
+/** @experimental */
+export type StaffUpdateChannelMigrationStatus =
+  /** The account is not a staff account, so the migration does not apply and nothing was recorded. */
+  | "ineligible"
+  /** The migration already ran within the cutoff window; the stored completion timestamp is returned unchanged. */
+  | "current"
+  /** The persisted update channel was changed to stable. Only this outcome requires the host to reload its configuration. */
+  | "migrated"
+  /** The persisted channel was already stable, so nothing changed, but the migration is now recorded as done. */
+  | "completed"
+  /** The account is on the experimental channel, which the migration deliberately leaves alone, and the migration is recorded as done. */
+  | "excluded-experimental";
 /**
  * Subagent settings to apply, or null to clear the live session override
  *
@@ -5885,6 +6196,23 @@ export type UISessionLimitsExhaustedResponseAction =
   | "unset"
   /** Leave the limit unchanged and cancel the blocked model request. */
   | "cancel";
+/**
+ * What the one-time obsolete-settings cleanup did to the document.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "UserSettingsMigrateObsoleteOnDiskStatus".
+ */
+/** @experimental */
+/** @internal */
+export type UserSettingsMigrateObsoleteOnDiskStatus =
+  /** No settings document exists, so there was nothing to clean. */
+  | "missing"
+  /** The document could not be parsed, so it was left untouched rather than rewritten from a partial read. */
+  | "invalid"
+  /** The document parsed and held nothing obsolete, so nothing was written. */
+  | "unchanged"
+  /** Obsolete keys were removed and the document was rewritten. */
+  | "changed";
 /**
  * Execution-critical workflow storage operation.
  *
@@ -6137,6 +6465,62 @@ export type WorkspacesWorkspaceDetailsHostType =
   | "github"
   /** Workspace repository is hosted on Azure DevOps. */
   | "ado";
+/**
+ * True when this process can offer installing the sandbox credential-proxy certificate authority into OS trust.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SandboxProxyCaCheckInstallationSupportResult".
+ */
+/** @experimental */
+export type SandboxProxyCaCheckInstallationSupportResult = boolean;
+/**
+ * True when the sandbox configuration uses the credential proxy and can need certificate-authority setup.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SandboxProxyCaCheckRelevanceResult".
+ */
+/** @experimental */
+export type SandboxProxyCaCheckRelevanceResult = boolean;
+/**
+ * True when an OS-level sandbox can run on this host.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SandboxCheckPlatformSupportResult".
+ */
+/** @experimental */
+export type SandboxCheckPlatformSupportResult = boolean;
+/**
+ * True when the sandbox on this host can reach host loopback directly.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SandboxCheckWindowsHostLoopbackSupportResult".
+ */
+/** @experimental */
+export type SandboxCheckWindowsHostLoopbackSupportResult = boolean;
+/**
+ * The user-facing refusal, including the platform remedy and the documentation link.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SandboxGetUnsupportedMessageResult".
+ */
+/** @experimental */
+export type SandboxGetUnsupportedMessageResult = string;
+/**
+ * The user-facing notice that a saved sandbox setting is inert for this session.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SandboxGetUnsupportedSettingDisabledNoticeResult".
+ */
+/** @experimental */
+export type SandboxGetUnsupportedSettingDisabledNoticeResult = string;
+/**
+ * True when the command stays available while enforcement is blocked.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SandboxCheckEnforcementCommandResult".
+ */
+/** @experimental */
+export type SandboxCheckEnforcementCommandResult = boolean;
 /**
  * List of all authenticated users
  *
@@ -6177,6 +6561,14 @@ export type SessionGitHubAuthLogoutResult = boolean;
  */
 /** @experimental */
 export type SessionGitHubAuthLogoutUserResult = boolean;
+/**
+ * Pending warnings returned and cleared by session.quota.takeWarnings.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SessionQuotaTakeWarningsResult".
+ */
+/** @experimental */
+export type SessionQuotaTakeWarningsResult = QuotaWarningProjection[];
 
 /**
  * Parameters for aborting the current turn
@@ -6773,6 +7165,27 @@ export interface UserAuthInfo {
   login: string;
   copilotUser?: CopilotUserResponse;
 }
+/**
+ * An interactive account whose model provider owns its credentials. It carries no GitHub credential.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "AccountAuthInfo".
+ */
+/** @experimental */
+export interface AccountAuthInfo {
+  /**
+   * Provider-owned account authentication.
+   */
+  type: "account";
+  /**
+   * Host coordinate owned by the account's model provider.
+   */
+  host: string;
+  /**
+   * Login identifying the provider-owned account.
+   */
+  login: string;
+}
 /**
  * Authentication-info input variant for GitHub CLI credentials, carrying host, login, and the `gh auth token` value.
  *
@@ -6821,6 +7234,62 @@ export interface ApiKeyAuthInfo {
   host: string;
   copilotUser?: CopilotUserResponse;
 }
+/**
+ * The authentication identity whose shared wording should be rendered.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "AccountDescribeAuthInfoRequest".
+ */
+/** @experimental */
+/** @internal */
+export interface AccountDescribeAuthInfoRequest {
+  identity: AuthIdentity;
+}
+/**
+ * Credential-free authentication identity safe to expose to hosts and user interfaces.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "AuthIdentity".
+ */
+/** @experimental */
+export interface AuthIdentity {
+  type: AuthInfoType;
+  /**
+   * Authentication host
+   */
+  host: string;
+  /**
+   * Authenticated login, when available
+   */
+  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;
+}
+/**
+ * The wording the runtime uses for an authentication identity.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "AccountDescribeAuthInfoResult".
+ */
+/** @experimental */
+/** @internal */
+export interface AccountDescribeAuthInfoResult {
+  /**
+   * Sign-in banner announcing the authenticated user.
+   */
+  message: string;
+  /**
+   * One-line description of the identity, suitable after a verb such as "Switched to".
+   */
+  description: string;
+}
 /**
  * Current authentication state
  *
@@ -6835,6 +7304,39 @@ export interface AccountGetCurrentAuthResult {
    */
   authErrors?: string[];
 }
+/**
+ * The authentication identity whose gist support should be reported.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "AccountGetGistSupportRequest".
+ */
+/** @experimental */
+/** @internal */
+export interface AccountGetGistSupportRequest {
+  identity: AuthIdentity;
+}
+/**
+ * Whether the identity can create gists, and why not when it cannot.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "AccountGetGistSupportResult".
+ */
+/** @experimental */
+/** @internal */
+export interface AccountGetGistSupportResult {
+  /**
+   * True when the identity can create gists.
+   */
+  supported: boolean;
+  /**
+   * Machine-readable reason category when unsupported.
+   */
+  kind?: string;
+  /**
+   * Human-readable explanation to show where the gist action would have been.
+   */
+  reason?: string;
+}
 
 /** @experimental */
 export interface AccountGetQuotaRequest {
@@ -6903,6 +7405,49 @@ export interface AccountQuotaSnapshot {
    */
   resetDate?: string;
 }
+/**
+ * The environment variable supplying a classic personal access token, when one is set.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "AccountGetTokenEnvVarResult".
+ */
+/** @experimental */
+/** @internal */
+export interface AccountGetTokenEnvVarResult {
+  /**
+   * Variable name, for example `GH_TOKEN`. Absent when no classic token is present in the environment.
+   */
+  name?: string;
+}
+/**
+ * A path to resolve against the GitHub host an identity is signed in to.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "AccountGetWebUrlRequest".
+ */
+/** @experimental */
+/** @internal */
+export interface AccountGetWebUrlRequest {
+  /**
+   * Host-relative path, without a leading slash, for example `settings/copilot/features`.
+   */
+  path: string;
+  identity?: AuthIdentity;
+}
+/**
+ * An absolute URL on the identity's GitHub host.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "AccountGetWebUrlResult".
+ */
+/** @experimental */
+/** @internal */
+export interface AccountGetWebUrlResult {
+  /**
+   * Absolute URL for the requested path.
+   */
+  url: string;
+}
 /**
  * Credentials to validate and store. Omit login to resolve the authenticated user from the token.
  *
@@ -6997,6 +7542,10 @@ export interface AccountStatus {
    */
   login: string;
   kind: AccountKind;
+  /**
+   * Human-readable credential source used to authenticate this account, such as `gh` or `GITHUB_TOKEN`.
+   */
+  authSource?: string;
   /**
    * Opaque id of the account this one was derived from (e.g. an EMU account's base Entra identity); absent for a root account. Matches the base identity account's selectionId, forming the derivation edge.
    */
@@ -7128,6 +7677,12 @@ export interface AgentInfo {
    * 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.
    */
   prompt?: string;
+  /**
+   * Declarative hook actions keyed by event name, executed only while this agent is active.
+   */
+  hooks?: {
+    [k: string]: JsonValue[] | undefined;
+  };
 }
 /**
  * Agents available to the session.
@@ -7359,6 +7914,46 @@ export interface AgentReloadResult {
    */
   agents: AgentInfo[];
 }
+/**
+ * The models a custom agent asks for, and the models actually available.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "AgentsCustomAgentInitialModelDecisionParams".
+ */
+/** @experimental */
+/** @internal */
+export interface AgentsCustomAgentInitialModelDecisionParams {
+  /**
+   * The agent's declared `model:` entry, serialized. A single name or an ordered list of acceptable names.
+   */
+  agentModelsJson: string;
+  /**
+   * The models available to this session, serialized in the shape the model list carries.
+   */
+  availableModelsJson: string;
+}
+/**
+ * The model to switch to, and the warning to show when the agent's preference could not be met.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "AgentsCustomAgentInitialModelDecisionResult".
+ */
+/** @experimental */
+/** @internal */
+export interface AgentsCustomAgentInitialModelDecisionResult {
+  /**
+   * The first available model that matches the agent's preferences. Absent when none of the requested models is available.
+   */
+  targetModel?: string;
+  /**
+   * The reasoning effort attached to the selected model preference. Absent when that preference does not specify an effort.
+   */
+  reasoningEffort?: string;
+  /**
+   * What to tell the user about an unmet preference. Absent when the preference was met. A warning with no `targetModel` means the agent's models are all unavailable.
+   */
+  warning?: string;
+}
 /**
  * Optional project paths to include in agent discovery.
  *
@@ -7367,6 +7962,10 @@ export interface AgentReloadResult {
  */
 /** @experimental */
 export interface AgentsDiscoverRequest {
+  /**
+   * Explicit discovery-only agent roots, separate from customAgents and filesystem grants. Available without ambient discovery, subject to managed/source disables. Relative paths resolve against the request's effective working directory when supplied. Null and omission are equivalent; an empty array contributes no explicit roots.
+   */
+  agentDirectories?: string[];
   /**
    * 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).
    */
@@ -7416,6 +8015,142 @@ export interface AgentSetPromptRequest {
    */
   prompt: string;
 }
+/**
+ * The feature flags to evaluate shipped agents against.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "AgentsGetAvailableBuiltinsRequest".
+ */
+/** @experimental */
+/** @internal */
+export interface AgentsGetAvailableBuiltinsRequest {
+  /**
+   * Feature flag values keyed by name, evaluated with the runtime's truthiness rules. Omit or pass null for no flags.
+   */
+  featureFlags?: {
+    [k: string]: unknown | undefined;
+  } | null;
+  /**
+   * Flag overrides keyed by name. A null entry uses the corresponding base flag; false explicitly disables it. Omit or pass null for no overrides.
+   */
+  overrides?: {
+    [k: string]: unknown | undefined;
+  } | null;
+  /**
+   * The surface asking, which gates agents that only apply to one client. Omit or pass null to apply no client filter.
+   */
+  context?: string | null;
+}
+/**
+ * The shipped agents available under the requested flags.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "AgentsGetAvailableBuiltinsResult".
+ */
+/** @experimental */
+/** @internal */
+export interface AgentsGetAvailableBuiltinsResult {
+  /**
+   * Available shipped agents, in the runtime's own order.
+   */
+  agents: BuiltinAgentSummary[];
+}
+/**
+ * A shipped agent, named and described.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "BuiltinAgentSummary".
+ */
+/** @experimental */
+/** @internal */
+export interface BuiltinAgentSummary {
+  /**
+   * The agent name, as it appears in `getBuiltins`.
+   */
+  name: string;
+  /**
+   * One-line description of what the agent does.
+   */
+  description: string;
+}
+/**
+ * The shipped agent whose definition to load.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "AgentsGetBuiltinDefinitionRequest".
+ */
+/** @experimental */
+/** @internal */
+export interface AgentsGetBuiltinDefinitionRequest {
+  /**
+   * The agent name, which must be one of `getBuiltins`'s `yamlBasedNames`. A name outside that list is special-cased in code and has no definition, and is reported as an error rather than as an empty definition.
+   */
+  name: string;
+}
+/**
+ * One shipped agent's definition.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "AgentsGetBuiltinDefinitionResult".
+ */
+/** @experimental */
+/** @internal */
+export interface AgentsGetBuiltinDefinitionResult {
+  /**
+   * The agent's definition, serialized as JSON. It carries the authored keys plus the runtime's projected `__nativeCustomAgent` view of the same agent. It is a string rather than an object because the runtime parses it with the agent schema's tolerant shape, which accepts keys this contract does not name.
+   */
+  definitionJson: string;
+}
+/**
+ * The shipped agent whose listing entry to load.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "AgentsGetBuiltinListingDefinitionRequest".
+ */
+/** @experimental */
+/** @internal */
+export interface AgentsGetBuiltinListingDefinitionRequest {
+  /**
+   * The agent name, taken from `getAvailableBuiltins`. Unlike `getBuiltinDefinition`, the agent that `getBuiltins` reports as special-cased rather than YAML-based is answered here too, from its in-code definition.
+   */
+  name: string;
+}
+/**
+ * One shipped agent, projected for a listing.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "AgentsGetBuiltinListingDefinitionResult".
+ */
+/** @experimental */
+/** @internal */
+export interface AgentsGetBuiltinListingDefinitionResult {
+  /**
+   * The agent projected as a custom agent, serialized as JSON. It is a string rather than an object for the same reason as `getBuiltinDefinition`: the runtime parses the underlying definition with the agent schema's tolerant shape, which accepts keys this contract does not name.
+   */
+  definitionJson: string;
+}
+/**
+ * The agents this runtime ships, named so a consumer can tell them apart from authored ones.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "AgentsGetBuiltinsResult".
+ */
+/** @experimental */
+/** @internal */
+export interface AgentsGetBuiltinsResult {
+  /**
+   * Every agent name this runtime ships.
+   */
+  names: string[];
+  /**
+   * The subset of `names` a user is allowed to turn off. A shipped agent outside this list is always active and a client should not offer a toggle for it.
+   */
+  disableableNames: string[];
+  /**
+   * The subset of `names` defined by a shipped YAML definition. The remainder are special-cased in code and have no definition to load.
+   */
+  yamlBasedNames: string[];
+}
 /**
  * Optional project paths to include when enumerating agent discovery directories.
  *
@@ -7424,6 +8159,10 @@ export interface AgentSetPromptRequest {
  */
 /** @experimental */
 export interface AgentsGetDiscoveryPathsRequest {
+  /**
+   * Explicit discovery-only agent roots to enumerate, including configured missing directories. Relative paths resolve against the request's effective working directory when supplied. These are not filesystem grants or preferred creation targets. Null and omission are equivalent.
+   */
+  agentDirectories?: string[];
   /**
    * Optional list of project directory paths. When omitted or empty, only the user-level directory is returned.
    */
@@ -7452,49 +8191,44 @@ export interface ProviderDescriptor {
   available: boolean;
 }
 /**
- * Credential-free authentication identity safe to expose to hosts and user interfaces.
+ * Credential-free identity metadata.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "AuthIdentity".
+ * via the `definition` "AuthIdentityMetadata".
  */
 /** @experimental */
-export interface AuthIdentity {
+export interface AuthIdentityMetadata {
   type: AuthInfoType;
   /**
-   * Authentication host
+   * Identity host.
    */
   host: string;
   /**
-   * Authenticated login, when available
-   */
-  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.
+   * User login.
    */
-  registrationId?: string;
-  copilotUser?: CopilotUserResponse;
+  login: string;
 }
 /**
- * Credential-free identity metadata.
+ * A credential-free account choice after sign-in.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "AuthIdentityMetadata".
+ * via the `definition` "AuthLoginAccount".
  */
 /** @experimental */
-export interface AuthIdentityMetadata {
-  type: AuthInfoType;
+export interface AuthLoginAccount {
   /**
-   * Identity host.
+   * Opaque identifier supplied to the next login step to select this account.
+   */
+  selectionId: string;
+  /**
+   * Host coordinate owned by the selected account's provider.
    */
   host: string;
   /**
-   * User login.
+   * Human-readable login for the account choice.
    */
   login: string;
+  kind: AccountKind;
 }
 /**
  * Advance an in-flight login flow, optionally fulfilling an input-required step.
@@ -7538,7 +8272,7 @@ export interface AuthLoginBegun {
   step: AuthLoginStep;
 }
 /**
- * Terminal result of an interactive login flow.
+ * Result of an interactive login flow. Pending consent or account selection is not terminal.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
  * via the `definition` "AuthLoginResultDto".
@@ -7554,6 +8288,10 @@ export interface AuthLoginResultDto {
    * Login that was signed in, when completed.
    */
   login?: string;
+  /**
+   * Available accounts when sign-in is awaiting account selection, ordered with Microsoft 365 first.
+   */
+  accounts?: AuthLoginAccount[];
 }
 /**
  * Cancel an in-flight login flow.
@@ -7700,6 +8438,74 @@ export interface AutopilotObjectiveState {
   creditCountNanoAiu: string;
   creditLimit?: AutopilotObjectiveCreditLimit;
 }
+/**
+ * A server-advertised routing preference. Identifiers and execution types are extensible.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "AutoTierDescriptor".
+ */
+/** @experimental */
+export interface AutoTierDescriptor {
+  /**
+   * Opaque routing identifier transmitted unchanged to the provider.
+   */
+  id: string;
+  /**
+   * Human-readable label, not a routing identifier.
+   */
+  displayName: string;
+  /**
+   * Description displayed beside the preference.
+   */
+  description: string;
+  /**
+   * Execution kind; this client supports `auto` preferences on the Auto model.
+   */
+  type: string;
+  status: AutoTierStatus;
+}
+/**
+ * Availability of a server-advertised routing preference.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "AutoTierStatus".
+ */
+/** @experimental */
+export interface AutoTierStatus {
+  /**
+   * Whether the provider permits selecting this preference.
+   */
+  enabled: boolean;
+  /**
+   * Extensible machine-readable unavailability reason.
+   */
+  reason?: string;
+  /**
+   * Human-readable explanation of availability.
+   */
+  message?: string;
+}
+/**
+ * Account-bound discovery metadata for the virtual `auto` model.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "AutoTierMetadata".
+ */
+/** @experimental */
+export interface AutoTierMetadata {
+  /**
+   * Provider-default preference, used only when no explicit preference exists.
+   */
+  defaultTier: string;
+  /**
+   * Routing preferences in the server's presentation order.
+   */
+  tiers: AutoTierDescriptor[];
+  /**
+   * Provider that supplied this metadata, when the catalog is provider-attributed.
+   */
+  providerId?: string;
+}
 /**
  * The running runtime's complete catalog of well-known built-in model IDs, including supported models and additional IDs with built-in metadata.
  *
@@ -9838,6 +10644,146 @@ export interface ConnectorDisconnectResult {
   disconnected: boolean;
   status: ConnectorStatus;
 }
+/**
+ * Eligible account.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ConnectorDiscoveryAccount".
+ */
+/** @experimental */
+export interface ConnectorDiscoveryAccount {
+  /**
+   * Opaque account ID.
+   */
+  accountId: string;
+  authInfo: ConnectorDiscoveryAuthInfo;
+}
+/**
+ * Account metadata.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ConnectorDiscoveryAuthInfo".
+ */
+/** @experimental */
+export interface ConnectorDiscoveryAuthInfo {
+  type: AuthInfoType;
+  /**
+   * Host.
+   */
+  host: string;
+  /**
+   * Login.
+   */
+  login: string;
+}
+/**
+ * Eligible accounts.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ConnectorDiscoveryAccountList".
+ */
+/** @experimental */
+export interface ConnectorDiscoveryAccountList {
+  availability: ConnectorDiscoveryAvailability;
+  /**
+   * Eligible accounts.
+   */
+  accounts: ConnectorDiscoveryAccount[];
+}
+/**
+ * Selected account.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ConnectorDiscoveryAccountRequest".
+ */
+/** @experimental */
+export interface ConnectorDiscoveryAccountRequest {
+  /**
+   * Opaque account ID.
+   */
+  accountId: string;
+}
+/**
+ * Feature availability.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ConnectorDiscoveryCapabilities".
+ */
+/** @experimental */
+export interface ConnectorDiscoveryCapabilities {
+  /**
+   * API version.
+   */
+  apiVersion: number;
+  availability: ConnectorDiscoveryAvailability;
+  /**
+   * Whether accounts are selected by opaque ID.
+   */
+  opaqueAccountSelection: boolean;
+  /**
+   * Whether results are cached.
+   */
+  conditionalCache: boolean;
+}
+/**
+ * Entry.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ConnectorDiscoveryCatalogEntry".
+ */
+/** @experimental */
+export interface ConnectorDiscoveryCatalogEntry {
+  /**
+   * Name.
+   */
+  name: string;
+  /**
+   * Display name.
+   */
+  displayName: string;
+  /**
+   * Description.
+   */
+  description?: string;
+  /**
+   * Logo.
+   */
+  logo?: string;
+  /**
+   * Tier.
+   */
+  tier?: string;
+  /**
+   * Release tag.
+   */
+  releaseTag?: string;
+  status: ConnectorCatalogStatus;
+}
+/**
+ * Entries for the selected account.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ConnectorDiscoveryCatalogResult".
+ */
+/** @experimental */
+export interface ConnectorDiscoveryCatalogResult {
+  /**
+   * Opaque account ID.
+   */
+  accountId: string;
+  /**
+   * Revision.
+   */
+  revision: number;
+  /**
+   * Refresh time in Unix epoch milliseconds.
+   */
+  refreshedAtMs: number;
+  /**
+   * Entries.
+   */
+  connectors: ConnectorDiscoveryCatalogEntry[];
+}
 /**
  * Requests authoritative Connector-to-MCP reconciliation for the pinned account.
  *
@@ -10019,10 +10965,18 @@ export interface CurrentModel {
    * Currently active model identifier
    */
   modelId?: string;
+  /**
+   * Provider selected for this model. Together with modelId, identifies a catalog entry even when providers serve the same model. Omitted for unattributed legacy selections.
+   */
+  providerId?: string;
   /**
    * Captured base model to restore when leaving plan mode. Omitted outside plan mode or when no plan override has captured a base model. Persistent agent model requirements apply to this model rather than the temporary plan model.
    */
   planBaseModelId?: string;
+  /**
+   * Provider of planBaseModelId, when that saved selection is provider-qualified.
+   */
+  planBaseProviderId?: 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.
    */
@@ -11476,6 +12430,161 @@ export interface ExternalToolTextResultForLlmContentResource {
   type: "resource";
   resource: ExternalToolTextResultForLlmContentResourceDetails;
 }
+/**
+ * The declared shape of one feature flag, independent of any caller population.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "FeatureFlagMetadata".
+ */
+/** @experimental */
+/** @internal */
+export interface FeatureFlagMetadata {
+  /**
+   * The flag's name, matching the key it is listed under.
+   */
+  name: string;
+  availability: FeatureFlagAvailability;
+  /**
+   * Whether the flag participates in the CAPI sanity suite.
+   */
+  capiSanity: boolean;
+  /**
+   * Text shown to a user choosing whether to turn the flag on in experimental mode. Absent when the flag is not user-facing.
+   */
+  experimentalDescription?: string;
+  /**
+   * The online-experiment (ExP) flag this maps to, when the flag is assigned by an experiment rather than declared statically.
+   */
+  expFlag?: string;
+  /**
+   * Environment variable that overrides this flag's experiment assignment locally in the experiment service, not in `featureFlags.resolve`. Present exactly when `expFlag` is, and derived from it, so a caller reads a local override without reproducing the naming rule.
+   */
+  expFlagEnvVar?: string;
+}
+/**
+ * Every feature flag this runtime declares, with the shape each one was declared with.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "FeatureFlagsMetadataResult".
+ */
+/** @experimental */
+/** @internal */
+export interface FeatureFlagsMetadataResult {
+  /**
+   * Declared feature flags keyed by flag name.
+   */
+  flags: {
+    [k: string]: FeatureFlagMetadata;
+  };
+}
+/**
+ * Caller population and overrides for static feature-flag resolution, independent of experiment assignments and active runtime state.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "FeatureFlagsResolveRequest".
+ */
+/** @experimental */
+/** @internal */
+export interface FeatureFlagsResolveRequest {
+  /**
+   * Whether the caller is GitHub or Microsoft staff.
+   */
+  isStaff: boolean;
+  /**
+   * Whether the caller is in an experimental population.
+   */
+  isExperimental: boolean;
+  /**
+   * Whether the caller belongs to the team population used by feature availability.
+   */
+  isTeam: boolean;
+  /**
+   * GitHub-staff membership. Omit when it was never recorded: a legacy staff account then counts as both staff populations and keeps every staff feature.
+   */
+  isStaffGithub?: boolean;
+  /**
+   * Microsoft-staff membership. Omitted the same way as `isStaffGitHub`.
+   */
+  isStaffMicrosoft?: boolean;
+  /**
+   * Resolve against this already-computed flag set rather than each flag's declared availability. Keyed by flag name.
+   */
+  baseFlags?: {
+    [k: string]: boolean | undefined;
+  };
+  /**
+   * Environment for direct feature-flag overrides and `COPILOT_CLI_ENABLED_FEATURE_FLAGS`. Does not apply `COPILOT_EXP_*` experiment assignments. Defaults to this runtime process's own environment.
+   */
+  environment?: {
+    [k: string]: string | undefined;
+  };
+  /**
+   * User settings to apply, including `enabledFeatureFlags`, legacy `feature_flags.enabled`, and supported convenience settings.
+   */
+  config?: JsonValue;
+  /**
+   * Flags forced to a value after every other layer, keyed by flag name.
+   */
+  flagOverrides?: {
+    [k: string]: boolean | undefined;
+  };
+}
+/**
+ * Caller population and startup inputs to resolve named online-experiment gates for. Carries no account: the runtime resolves the assignment for the authentication it already holds.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "FeatureFlagsResolveStartupGatesRequest".
+ */
+/** @experimental */
+/** @internal */
+export interface FeatureFlagsResolveStartupGatesRequest {
+  /**
+   * The feature flags to resolve. A name this runtime does not declare is reported as an error rather than as a disabled flag.
+   */
+  flags: string[];
+  /**
+   * Whether the caller is GitHub or Microsoft staff.
+   */
+  isStaff: boolean;
+  /**
+   * Whether the caller is in an experimental population.
+   */
+  isExperimental: boolean;
+  /**
+   * Whether the caller belongs to a team plan.
+   */
+  isTeam: boolean;
+  /**
+   * GitHub-staff membership. Omit when it was never recorded: a legacy staff account then counts as both staff populations and keeps every staff feature.
+   */
+  isStaffGithub?: boolean;
+  /**
+   * Microsoft-staff membership. Omitted the same way as `isStaffGitHub`.
+   */
+  isStaffMicrosoft?: boolean;
+  /**
+   * Environment to read flag overrides from. Defaults to this runtime process's own environment.
+   */
+  environment?: {
+    [k: string]: string | undefined;
+  };
+  /**
+   * User settings document whose `featureFlags` block is layered on top of the resolved set.
+   */
+  config?: JsonValue;
+  /**
+   * Whether streamer mode is on, which withholds the populations an experiment would otherwise segment on.
+   */
+  streamerMode: boolean;
+  /**
+   * When this installation first launched, in milliseconds since the Unix epoch. Experiments that segment on installation age read it. Omit when the first launch was never recorded.
+   */
+  firstLaunchAtMillis?: number;
+  /**
+   * Whether the runtime may refresh the cached assignment over the network without an active session. The refresh never blocks this call: the answer comes from the cache either way, so a refresh only affects a later launch.
+   */
+  refreshWithoutSession: boolean;
+}
 /**
  * Parameters for starting fleet orchestration: an optional user prompt combined with the fleet instructions, plus the send options forwarded to the resulting turn.
  *
@@ -11555,6 +12664,243 @@ export interface FolderTrustCheckResult {
    */
   trusted: boolean;
 }
+/**
+ * A folder to check against a persisted trusted-folders list, and the configuration directory holding that list.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "FolderTrustIsTrustedParams".
+ */
+/** @experimental */
+/** @internal */
+export interface FolderTrustIsTrustedParams {
+  /**
+   * Folder to check. A folder counts as trusted when it is itself listed, when an ancestor is listed, or when its git root is listed.
+   */
+  path: string;
+  /**
+   * Configuration directory to read the trusted-folders list from. Omit it to read the default location; supply it when the host has redirected its configuration, or the check answers from a list the host is not using.
+   */
+  configDir?: string;
+}
+/**
+ * The verdict of the `forceLoginOrgs` enterprise sign-in pin for one credential. A managed device may pin Copilot to an approved set of GitHub organizations so a developer cannot sign in with a personal — or another enterprise's — account and escape every control that keys off the signed-in identity. A host must refuse to proceed when `allowed` is false; the remaining fields explain the refusal rather than qualifying it.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ForceLoginOrgsDecision".
+ */
+/** @experimental */
+/** @internal */
+export interface ForceLoginOrgsDecision {
+  /**
+   * Whether the client may proceed. True whenever no pin is in force, so an unmanaged host is never blocked.
+   */
+  allowed: boolean;
+  /**
+   * Whether a pin applies at all. Distinguishes "allowed because unmanaged" from "allowed because the account is approved", which a diagnostics surface needs and which also decides whether a bring-your-own-key provider may serve inference.
+   */
+  enforced: boolean;
+  /**
+   * The approved organization logins, as configured. Enterprise configuration rather than user data, so it is safe to name in a message or a log line.
+   */
+  requiredOrgs: string[];
+  /**
+   * The approved organization the account matched, when allowed under a pin.
+   */
+  matchedOrg?: string;
+  /**
+   * A stable kebab-case reason code when refused: `org-not-approved`, `unverifiable-credential`, `policy-undetermined`, `policy-invalid`, `not-signed-in`, or `membership-unknown`. Omitted when allowed. Treat an unrecognized code as a refusal rather than mapping it to an allow: a code this host has not been taught about still denied the credential.
+   */
+  denial?: string;
+  /**
+   * A developer-facing explanation of the refusal. Omitted when allowed.
+   */
+  message?: string;
+  /**
+   * Error-level detail from managed-policy discovery — which file failed to load, which field failed validation. Carried on the decision rather than left to the log because a refusal can exit the process before a log sink exists, which would discard the only actionable diagnostic a misconfigured managed device produces.
+   */
+  policyDiagnostics: string[];
+}
+/**
+ * The remote the checked-out branch tracks.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "GitCurrentBranchRemoteResult".
+ */
+/** @experimental */
+/** @internal */
+export interface GitCurrentBranchRemoteResult {
+  /**
+   * Name of the tracked remote. Reports `origin` whenever the working tree has no tracking configuration to read, including on a detached HEAD, so this is never null and never empty.
+   */
+  remote: string;
+}
+/**
+ * Working-tree path a git query applies to.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "GitCwdRequest".
+ */
+/** @experimental */
+/** @internal */
+export interface GitCwdRequest {
+  /**
+   * Absolute path to a directory inside the git working tree to query.
+   */
+  cwd: string;
+}
+/**
+ * A GitHub login the authenticated user may act as: their own account, or an organization they belong to.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "GitHubOwnerOption".
+ */
+/** @experimental */
+/** @internal */
+export interface GitHubOwnerOption {
+  /**
+   * The owner's GitHub login.
+   */
+  login: string;
+  /**
+   * Which kind of owner this is. The authenticated user's own account is always reported as `user`.
+   */
+  type: string;
+}
+/**
+ * The owner listing to abandon.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "GitHubOwnersCancelRequest".
+ */
+/** @experimental */
+/** @internal */
+export interface GitHubOwnersCancelRequest {
+  /**
+   * Request id the listing was started with.
+   */
+  requestId: number;
+}
+/**
+ * Whether the id named a running owner listing.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "GitHubOwnersCancelResult".
+ */
+/** @experimental */
+/** @internal */
+export interface GitHubOwnersCancelResult {
+  /**
+   * True when a listing with the id was running and the cancel stopped it. False when the id was never registered, was registered but unused, was released after being abandoned, or its listing had ended. An unused id is released and cannot start a later listing.
+   */
+  canceled: boolean;
+}
+/**
+ * Credential to list owners under, and the request id that makes the listing cancellable.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "GitHubOwnersListRequest".
+ */
+/** @experimental */
+/** @internal */
+export interface GitHubOwnersListRequest {
+  /**
+   * Request id from `gitHubOwners.nextRequestId`. An id that was never registered, canceled before use, released after being abandoned, or already used is refused rather than silently running uncancellable.
+   */
+  requestId: number;
+  /**
+   * The credential the listing runs under, carried opaquely because its shape is the host's own and the runtime only resolves a token and a GitHub host from it. No credential travels: this selects one the runtime already holds.
+   */
+  authInfo: JsonValue;
+}
+/**
+ * Outcome of an owner listing. Exactly one of `owners` and `message` is present, except that `throwError` reports a failure the caller is expected to raise rather than render.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "GitHubOwnersListResult".
+ */
+/** @experimental */
+/** @internal */
+export interface GitHubOwnersListResult {
+  /**
+   * The owners, on success: the authenticated user first, then the organizations they belong to.
+   */
+  owners?: GitHubOwnerOption[];
+  /**
+   * Why no owners could be listed, phrased for a user. Present when the listing failed in a way the caller should render rather than raise.
+   */
+  message?: string;
+  /**
+   * A line the caller should log. Present only alongside `message`, and only for failures worth recording.
+   */
+  warning?: string;
+  /**
+   * A malformed request or an unreadable credential, which the caller raises instead of rendering. Kept a field rather than a dispatch error so it stays distinct from `message`, which the caller renders.
+   */
+  throwError?: string;
+}
+/**
+ * A freshly registered request id. Registering it before the listing starts is what lets a cancel that races the request still find the owner listing slot. The id serves one listing only. Long-abandoned unused ids can be released by later allocations.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "GitHubOwnersRequestIdResult".
+ */
+/** @experimental */
+/** @internal */
+export interface GitHubOwnersRequestIdResult {
+  /**
+   * Request id to pass to `gitHubOwners.list` and, to abandon it, `gitHubOwners.cancel`.
+   */
+  requestId: number;
+}
+/**
+ * Working-tree path whose owning GitHub repository should be resolved.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "GitHubRepositoryAtPathRequest".
+ */
+/** @experimental */
+/** @internal */
+export interface GitHubRepositoryAtPathRequest {
+  /**
+   * Absolute path to a directory inside the git working tree to resolve.
+   */
+  path: string;
+}
+/**
+ * The GitHub repository that owns the requested path, when the selected remote (`origin`, else the first) is on a GitHub host.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "GitHubRepositoryAtPathResult".
+ */
+/** @experimental */
+/** @internal */
+export interface GitHubRepositoryAtPathResult {
+  /**
+   * Resolved repository identity, or null when the selected remote resolves to no GitHub host.
+   */
+  repository?: GitHubRepositoryIdentity | null;
+}
+/**
+ * Owner, name, and host of a GitHub repository, as resolved from a git remote URL.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "GitHubRepositoryIdentity".
+ */
+/** @experimental */
+export interface GitHubRepositoryIdentity {
+  /**
+   * Repository owner login (user or organization).
+   */
+  owner: string;
+  /**
+   * Repository name, without the owner prefix or the `.git` suffix.
+   */
+  name: string;
+  /**
+   * Host the remote points at, for example `github.com` or a GitHub Enterprise hostname.
+   */
+  host: string;
+}
 /**
  * Client environment metadata describing the process that produced a telemetry event.
  *
@@ -11704,6 +13050,322 @@ export interface GitHubTokenAcquireRequest {
   sessionId?: string;
   reason: GitHubTokenAcquireReason;
 }
+/**
+ * A GitHub repository one of a working tree's remotes points at.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "GitRemoteRepository".
+ */
+/** @experimental */
+/** @internal */
+export interface GitRemoteRepository {
+  /**
+   * Account or organization owning the repository.
+   */
+  owner: string;
+  /**
+   * Repository name, without the owner.
+   */
+  name: string;
+  /**
+   * GitHub host serving the repository, which is not `github.com` for a GitHub Enterprise remote.
+   */
+  host: string;
+  /**
+   * Name of the first remote that produced this distinct repository entry, such as `origin` or `upstream`.
+   */
+  remoteName: string;
+}
+/**
+ * Git working tree whose GitHub remotes should be listed.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "GitReposFromRemotesRequest".
+ */
+/** @experimental */
+/** @internal */
+export interface GitReposFromRemotesRequest {
+  /**
+   * Absolute path to the root of the git working tree.
+   */
+  gitRoot: string;
+}
+/**
+ * The GitHub repositories a working tree's remotes point at.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "GitReposFromRemotesResult".
+ */
+/** @experimental */
+/** @internal */
+export interface GitReposFromRemotesResult {
+  /**
+   * One entry per distinct GitHub repository, in the order git reports the first remote for each repository. Empty when no remote points at a GitHub host, which a caller should read as `not connected to GitHub`. Failing to read the remotes is an error, not an empty list.
+   */
+  repositories: GitRemoteRepository[];
+}
+/**
+ * Selects the configuration directory whose machine-wide state to read.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "GlobalStateLoadForConfigDirRequest".
+ */
+/** @experimental */
+/** @internal */
+export interface GlobalStateLoadForConfigDirRequest {
+  /**
+   * Copilot configuration directory to read the state document from, taking precedence over the server's own `COPILOT_HOME` and default home. Omit it, or pass an empty string, to read the directory the server resolved for itself.
+   */
+  configDir?: string;
+}
+/**
+ * The host's machine-wide state. Every field is optional because a fresh install has recorded nothing yet, so a reader must treat an absent field as `not yet`, never as a negative answer. Stored credentials are deliberately absent from this shape.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "GlobalStateLoadResult".
+ */
+/** @experimental */
+/** @internal */
+export interface GlobalStateLoadResult {
+  /**
+   * Plugins installed on this machine.
+   */
+  installedPlugins?: InstalledPlugin[];
+  /**
+   * Models the user selected recently, most recent first.
+   */
+  recentModelIds?: string[];
+  /**
+   * When the host first ran on this machine.
+   */
+  firstLaunchAt?: string;
+  /**
+   * Terminals the user has already been asked to set up, so the host does not ask twice.
+   */
+  askedSetupTerminals?: string[];
+  /**
+   * Folders where the user declined the init prompt, so it stays hidden there.
+   */
+  suppressInitFolders?: string[];
+  /**
+   * Whether the sandbox onboarding has been shown.
+   */
+  sandboxOnboardingShown?: boolean;
+  /**
+   * Whether the user declined to trust the sandbox credential proxy CA.
+   */
+  sandboxCredentialProxyCaDeclined?: boolean;
+  /**
+   * Whether the app tip has been shown.
+   */
+  appTipShown?: boolean;
+  /**
+   * Whether the one-off cleanup of stored reasoning summaries has run.
+   */
+  reasoningSummariesCleanupDone?: boolean;
+  lastLoggedInUser?: LoggedInUser;
+  /**
+   * Every account the host has signed in to on this machine.
+   */
+  loggedInUsers?: LoggedInUser[];
+  /**
+   * Whether the user is a GitHub or Microsoft staff member, which unlocks internal-only behavior.
+   */
+  staff?: boolean;
+  /**
+   * Whether the user was recognized as GitHub staff.
+   */
+  staffGithub?: boolean;
+  /**
+   * Whether the user was recognized as Microsoft staff.
+   */
+  staffMicrosoft?: boolean;
+  /**
+   * When the staff-only model reset last ran.
+   */
+  staffModelResetAt?: string;
+  /**
+   * When the staff-only log level migration last ran.
+   */
+  staffLogLevelMigrationAt?: string;
+  /**
+   * When the staff-only update channel migration last ran.
+   */
+  staffUpdateChannelMigrationAt?: string;
+  /**
+   * Folders the user has marked as trusted.
+   */
+  trustedFolders?: string[];
+  /**
+   * When the Auto-feedback hint was last shown, as an ISO 8601 timestamp. It enforces the once-per-day cap for non-staff users across restarts.
+   */
+  autoFeedbackLastPromptedAt?: string;
+}
+/**
+ * Installed plugin record from global state, with marketplace, version, install time, enabled state, cache path, and source.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "InstalledPlugin".
+ */
+/** @experimental */
+export interface InstalledPlugin {
+  /**
+   * Plugin name
+   */
+  name: string;
+  /**
+   * Marketplace the plugin came from (empty string for direct repo installs)
+   */
+  marketplace: string;
+  /**
+   * Version installed (if available)
+   */
+  version?: string;
+  /**
+   * Installation timestamp
+   */
+  installed_at: string;
+  /**
+   * Whether the plugin is currently enabled
+   */
+  enabled: boolean;
+  /**
+   * Path where the plugin is cached locally
+   */
+  cache_path?: string;
+  source?: InstalledPluginSource;
+  /**
+   * 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.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "InstalledPluginSourceGitHub".
+ */
+/** @experimental */
+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;
+}
+/**
+ * Source descriptor for a direct URL plugin install, with URL, optional ref or full commit SHA, and optional subpath.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "InstalledPluginSourceUrl".
+ */
+/** @experimental */
+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;
+}
+/**
+ * Source descriptor for a direct local plugin install, with a local filesystem path.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "InstalledPluginSourceLocal".
+ */
+/** @experimental */
+export interface InstalledPluginSourceLocal {
+  /**
+   * Constant value. Always "local".
+   */
+  source: "local";
+  /**
+   * Local filesystem path to the plugin.
+   */
+  path: string;
+}
+/**
+ * An account the host has signed in to, identified by the server it lives on and the login it uses there. The same person can appear more than once when they use both github.com and an Enterprise server.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "LoggedInUser".
+ */
+/** @experimental */
+/** @internal */
+export interface LoggedInUser {
+  /**
+   * Host the account belongs to, such as `github.com` or an Enterprise server.
+   */
+  host: string;
+  /**
+   * Account login on that host.
+   */
+  login: string;
+  /**
+   * Account kind, when the host recorded one. Consumers must tolerate new strings.
+   */
+  kind?: string;
+  /**
+   * Source account this account was derived from, when one was recorded.
+   */
+  derivedFrom?: string;
+}
+/**
+ * A single top-level key to record in the host's machine-wide state. The write replaces only that key and leaves the rest of the document untouched, so two writers recording different one-off flags do not overwrite each other. The stored credential keys cannot be written through this method.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "GlobalStateWriteKeyRequest".
+ */
+/** @experimental */
+/** @internal */
+export interface GlobalStateWriteKeyRequest {
+  /**
+   * Copilot configuration directory to write the state document in, taking precedence over the server's own `COPILOT_HOME` and default home. Omit it, or pass an empty string, to write the directory the server resolved for itself. Mirrors `globalState.loadForConfigDir`, so a caller can read and write the same directory.
+   */
+  configDir?: string;
+  /**
+   * Top-level key to write, named as it appears in the result of `globalState.load`. It must be one of the writable keys that `globalState.writeKey` lists.
+   */
+  key: string;
+  /**
+   * Value to store for the key. Omit it, or pass null, to remove the key instead.
+   */
+  value?: JsonValue;
+}
 /**
  * Pending external tool call request ID, with the tool result or an error describing why it failed.
  *
@@ -12099,6 +13761,10 @@ export interface HookInvokeResponse {
  */
 /** @experimental */
 export interface HooksDiscoverRequest {
+  /**
+   * Explicit discovery-only file-hook roots, separate from callback hooks and filesystem grants. Available without ambient discovery or repository file-hook enablement, subject to managed/hook disables. Relative paths resolve against the request's effective working directory when supplied. Null and omission are equivalent; an empty array contributes no explicit roots.
+   */
+  hookDirectories?: string[];
   /**
    * Optional project directory paths whose trusted repository and project-expanded plugin hooks should be discovered. When omitted or empty, user, managed-policy, and globally enabled installed or explicit plugin hooks are returned without project expansion.
    */
@@ -12189,6 +13855,10 @@ export interface HostGitHubEnvironmentOptions {
    * Stable application installation identity, reused across host restarts.
    */
   computeId: string;
+  /**
+   * Require sealed, connection-bound authentication (default true), independent of listener address. False permits unsealed direct credentials and unbound sealed relay credentials; use only when the caller fully controls and trusts the direct transport. Relay token encryption remains mandatory.
+   */
+  requireConnectionBinding?: boolean;
 }
 /**
  * Stops a connection-owned listener and joins its teardown.
@@ -12258,6 +13928,66 @@ export interface HostExitedNotification {
    */
   error?: string | null;
 }
+/**
+ * Reads a running host's catalog or the runtime's saved default catalog.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "HostListSessionsRequest".
+ */
+/** @experimental */
+export interface HostListSessionsRequest {
+  /**
+   * Listener UUID returned by host.start; the caller must own it. Omit to read
+   * the saved default compute-identity catalog without starting a listener.
+   */
+  hostId?: string;
+}
+/**
+ * The complete live and dormant advertised catalog, without subscribing to sessions.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "HostListSessionsResult".
+ */
+/** @experimental */
+export interface HostListSessionsResult {
+  /**
+   * Complete advertised session summaries, in the host's catalog order.
+   */
+  sessions: HostSessionSummary[];
+}
+/**
+ * Metadata advertised by the AHP host, not a guarantee that history can be resumed.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "HostSessionSummary".
+ */
+/** @experimental */
+export interface HostSessionSummary {
+  /**
+   * Stable AHP resource URI identifying the session on this host.
+   */
+  resource: string;
+  /**
+   * Authoritative title advertised by the host.
+   */
+  title: string;
+  /**
+   * Session creation time as an ISO 8601 timestamp.
+   */
+  createdAt: string;
+  /**
+   * Last modification time as an ISO 8601 timestamp.
+   */
+  modifiedAt: string;
+  /**
+   * Unsigned 32-bit AHP session status bitset (0..=4294967295); unknown bits must be preserved.
+   */
+  status: number;
+  /**
+   * Optional activity description advertised by the host.
+   */
+  activity?: string;
+}
 /**
  * Local WebSocket transport options.
  *
@@ -12414,6 +14144,11 @@ export interface HostSessionCreateRequest {
    * Resume an app-owned durable session instead of creating a new session.
    */
   resume?: boolean;
+  /**
+   * For an explicit publication, borrow an existing owning-connection resident
+   * instead of invoking the resume factory. Cold sessions still use the factory.
+   */
+  preferResident?: boolean;
   /**
    * Host-selected SDK creation or resume settings, without executable callbacks or tools.
    */
@@ -12476,6 +14211,10 @@ export interface HostStartRequest {
    * Caller-generated UUID identifying this connection-owned listener.
    */
   hostId: string;
+  /**
+   * Stable application identity selecting its durable host catalog. Defaults to the persisted runtime compute GUID; must agree with githubEnvironment.computeId when both are supplied.
+   */
+  computeId?: string;
   localServer?: HostLocalServerOptions;
   githubEnvironment?: HostGitHubEnvironmentOptions;
   /**
@@ -13025,123 +14764,6 @@ export interface InstallationConfirmationResponse {
   reviewFingerprint: string;
   decision: InstallationDecision;
 }
-/**
- * Installed plugin record from global state, with marketplace, version, install time, enabled state, cache path, and source.
- *
- * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "InstalledPlugin".
- */
-/** @experimental */
-export interface InstalledPlugin {
-  /**
-   * Plugin name
-   */
-  name: string;
-  /**
-   * Marketplace the plugin came from (empty string for direct repo installs)
-   */
-  marketplace: string;
-  /**
-   * Version installed (if available)
-   */
-  version?: string;
-  /**
-   * Installation timestamp
-   */
-  installed_at: string;
-  /**
-   * Whether the plugin is currently enabled
-   */
-  enabled: boolean;
-  /**
-   * Path where the plugin is cached locally
-   */
-  cache_path?: string;
-  source?: InstalledPluginSource;
-  /**
-   * 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.
- *
- * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "InstalledPluginSourceGitHub".
- */
-/** @experimental */
-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;
-}
-/**
- * Source descriptor for a direct URL plugin install, with URL, optional ref or full commit SHA, and optional subpath.
- *
- * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "InstalledPluginSourceUrl".
- */
-/** @experimental */
-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;
-}
-/**
- * Source descriptor for a direct local plugin install, with a local filesystem path.
- *
- * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "InstalledPluginSourceLocal".
- */
-/** @experimental */
-export interface InstalledPluginSourceLocal {
-  /**
-   * Constant value. Always "local".
-   */
-  source: "local";
-  /**
-   * Local filesystem path to the plugin.
-   */
-  path: string;
-}
 /**
  * Information about an installed plugin tracked in global state.
  *
@@ -13227,6 +14849,40 @@ export interface InstructionDiscoveryPathList {
    */
   paths: InstructionDiscoveryPath[];
 }
+/**
+ * Explicit discovery arguments for one location, supplied by the caller rather than derived from a session.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "InstructionsDiscoverRepoSourcesRequest".
+ */
+/** @experimental */
+/** @internal */
+export interface InstructionsDiscoverRepoSourcesRequest {
+  /**
+   * Repository location to discover. An empty string selects no repository scope; cwdPath can still supply working-directory sources.
+   */
+  location: string;
+  /**
+   * When true, include the sources a command-line host reads. Hosts that are not the CLI omit it.
+   */
+  isCli?: boolean;
+  /**
+   * Working directory whose instruction sources should also be included. Omission adds no separate working-directory scope.
+   */
+  cwdPath?: string;
+  /**
+   * Copilot configuration directory for user-level sources. An omitted or empty value uses the server's configuration home.
+   */
+  configDir?: string;
+  /**
+   * Extra directories to scan alongside instruction directories configured in the runtime environment.
+   */
+  additionalDirs?: string[];
+  /**
+   * When true, also discover instruction files nested below the location.
+   */
+  enableChildInstructions?: boolean;
+}
 /**
  * Optional project paths to include in instruction discovery.
  *
@@ -13235,6 +14891,10 @@ export interface InstructionDiscoveryPathList {
  */
 /** @experimental */
 export interface InstructionsDiscoverRequest {
+  /**
+   * Explicit discovery-only instruction roots using existing SDK instruction formats, not filesystem grants. Available without ambient discovery, subject to instruction/managed disables. Relative paths resolve against the request's effective working directory when supplied. Null and omission are equivalent; an empty array contributes no explicit roots.
+   */
+  instructionDirectories?: string[];
   /**
    * 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).
    */
@@ -13252,6 +14912,10 @@ export interface InstructionsDiscoverRequest {
  */
 /** @experimental */
 export interface InstructionsGetDiscoveryPathsRequest {
+  /**
+   * Explicit discovery-only instruction roots to enumerate, including configured missing directories. Relative paths resolve against the request's effective working directory when supplied. These are not filesystem grants or preferred creation targets. Null and omission are equivalent.
+   */
+  instructionDirectories?: string[];
   /**
    * Optional list of project directory paths. When omitted or empty, only the user-level targets are returned.
    */
@@ -13317,6 +14981,20 @@ export interface InstructionSource {
    */
   projectPath?: string;
 }
+/**
+ * The prompt the init command runs.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "InstructionsInitPromptResult".
+ */
+/** @experimental */
+/** @internal */
+export interface InstructionsInitPromptResult {
+  /**
+   * Prompt text authoring repository instructions.
+   */
+  prompt: string;
+}
 /**
  * Parameters for interrupting the main agent turn.
  *
@@ -13650,6 +15328,20 @@ export interface SessionContext {
    */
   branch?: string;
 }
+/**
+ * Which stored location permissions were dropped because their directory is gone.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "LocationPermissionsCleanupResult".
+ */
+/** @experimental */
+/** @internal */
+export interface LocationPermissionsCleanupResult {
+  /**
+   * Location keys whose grants were removed. Empty when every stored location still exists.
+   */
+  removedLocationKeys: string[];
+}
 /**
  * Message text, optional severity level, persistence flag, optional follow-up URL, and optional tip.
  *
@@ -13743,6 +15435,61 @@ export interface ManagedMcpServerConfig {
    */
   headersRefreshTtlMs?: number;
 }
+
+/** @experimental */
+export interface ManagedPermissionEvaluation {
+  operation: ManagedPermissionOperation;
+  verdict: ManagedPermissionVerdict;
+}
+/**
+ * Managed policy context and ordered operations for pure, sessionless evaluation.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ManagedPermissionsEvaluateRequest".
+ */
+/** @experimental */
+export interface ManagedPermissionsEvaluateRequest {
+  context: ManagedPermissionsContext;
+  /**
+   * Operations to evaluate, preserving input order and duplicates. An empty batch is valid.
+   */
+  operations: ManagedPermissionOperation[];
+}
+/**
+ * Ordered managed permission verdicts and the supplied policy's fail-closed posture.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ManagedPermissionsEvaluateResult".
+ */
+/** @experimental */
+export interface ManagedPermissionsEvaluateResult {
+  /**
+   * One verdict per input operation, in the same order, including duplicates.
+   */
+  results: ManagedPermissionEvaluation[];
+  /**
+   * Managed permission policy could not be determined; every operation is denied.
+   */
+  failClosed: boolean;
+}
+/**
+ * Retry outcome for one plugin required by managed settings.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ManagedPluginRetryEntry".
+ */
+/** @experimental */
+export interface ManagedPluginRetryEntry {
+  /**
+   * Plugin spec in "plugin@marketplace" form.
+   */
+  spec: string;
+  status: ManagedPluginRetryStatus;
+  /**
+   * Why the plugin was not prepared. Present when `status` is `failed` or `deferred`.
+   */
+  error?: string;
+}
 /**
  * Lock state and provenance of one managed setting.
  *
@@ -13759,6 +15506,42 @@ export interface ManagedSettingMeta {
    * Channel that supplied this scalar value, matching a `layers[].source`: `device`, `server`, or `policyHelper`. These scalar defaults select one winning channel, not a mixed source. Treat unknown values as additional channels; more may be added.
    */
   source: string;
+  /**
+   * Original managed value when the runtime adjusted it to a supported effective value. Omitted when no adjustment was needed.
+   */
+  requested?: string;
+}
+/**
+ * A user settings document and the effective managed policy whose controlled entries should be stamped onto it.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ManagedSettingsApplyControlsParams".
+ */
+/** @experimental */
+/** @internal */
+export interface ManagedSettingsApplyControlsParams {
+  /**
+   * The user settings document to stamp. Entries the managed layer does not name are returned exactly as supplied.
+   */
+  settings: JsonValue;
+  /**
+   * The effective managed policy, as composed by `managedSettings.resolveEffectiveValue`. Omit it on an unmanaged host: the settings then come back unchanged.
+   */
+  managed?: JsonValue;
+}
+/**
+ * The user settings with the managed layer's controlled entries stamped on.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ManagedSettingsApplyControlsResult".
+ */
+/** @experimental */
+/** @internal */
+export interface ManagedSettingsApplyControlsResult {
+  /**
+   * The resulting settings document.
+   */
+  settingsJson: JsonValue;
 }
 /**
  * One candidate channel; absent settings represents a channel that delivered no document.
@@ -13816,10 +15599,15 @@ export interface ManagedSettingsComposeResult {
 /** @experimental */
 export interface ManagedSettingsValues {
   /**
-   * Managed default model identifier, as configured. New sessions start with it; it can name a model the account cannot use, so hosts match it against the listed models.
+   * Managed default model identifier. When model availability was resolved, aliases and family names are projected to a concrete available model ID; otherwise the configured value is returned.
    */
   model?: string;
   autoTier?: AutoTier;
+  /**
+   * Managed reasoning-effort default for the managed concrete model. The runtime clamps it to an entitled effort when model availability is known.
+   */
+  effortLevel?: string;
+  contextTier?: ContextTier;
 }
 /**
  * Per-key lock state and provenance for `ManagedSettingsValues`, with the same field names. Producers emit each typed key in values and meta together; both outer objects are omitted when no typed key is set.
@@ -13831,6 +15619,8 @@ export interface ManagedSettingsValues {
 export interface ManagedSettingsMeta {
   model?: ManagedSettingMeta;
   autoTier?: ManagedSettingMeta;
+  effortLevel?: ManagedSettingMeta;
+  contextTier?: ManagedSettingMeta;
 }
 /**
  * One managed-settings channel and the document it delivered.
@@ -13867,6 +15657,308 @@ export interface ManagedSettingsDiagnostic {
    */
   message: string;
 }
+/**
+ * Inputs describing the host and account an ingestion should resolve managed policy for.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ManagedSettingsIngestParams".
+ */
+/** @experimental */
+/** @internal */
+export interface ManagedSettingsIngestParams {
+  policyHelperReason?: ManagedSettingsPolicyHelperReason;
+  /**
+   * Whether to run ingestion. Omit or set false to return an empty result without discovering or fetching policy.
+   */
+  selfFetch?: boolean;
+  /**
+   * The authenticated identity to resolve policy for. Omitted before sign-in, in which case no server layer is fetched.
+   */
+  authInfo?: JsonValue;
+  /**
+   * The session whose credential store and working directory the policy helper should use. Omit it when no session exists yet and the process-wide store applies.
+   */
+  sessionId?: string;
+  /**
+   * A device layer supplied by the host instead of discovered from the machine. Pair it with `hasDeviceResponse` so an explicit absence is distinguishable from an omitted override.
+   */
+  deviceResponse?: JsonValue;
+  /**
+   * Whether `deviceResponse` is an override at all. True with a null `deviceResponse` asserts the device layer is empty; false discovers it from the machine.
+   */
+  hasDeviceResponse?: boolean;
+  /**
+   * Whether to ignore a cached server policy when reading, forcing the resolution to come from a live fetch.
+   */
+  bypassCacheRead?: boolean;
+  serverPolicyCacheMode?: ManagedSettingsServerPolicyCacheMode;
+  /**
+   * Whether a configured platform policy helper may be run to produce an enforced helper layer.
+   */
+  policyHelperEnabled?: boolean;
+  /**
+   * Directory the policy helper runs in when this ingestion is not owned by a registered session. A host resolving policy before its session exists must pass this, or a directory-sensitive helper judges the wrong repository.
+   */
+  policyHelperWorkingDirectory?: string;
+  /**
+   * User agent to send with the policy fetch.
+   */
+  userAgent: string;
+  /**
+   * Name of the embedding client, reported to the managed-settings service as `client_id` so it can refuse to deliver a policy this client is too old to enforce. Omit it and the runtime reports a generic identity; the runtime version sent alongside is the gate that actually matters.
+   */
+  clientName?: string;
+  /**
+   * The host's environment variables, read for cache location and policy overrides. Supplied by the host rather than read from the runtime process so a command that selected its own configuration home is honored.
+   */
+  environment: JsonValue;
+  /**
+   * The host's platform, in Node's `process.platform` spelling, used to locate platform-specific cache and policy paths.
+   */
+  platform: string;
+  /**
+   * The host's home directory, used to resolve cache and managed-file locations.
+   */
+  homeDirectory: string;
+}
+/**
+ * The managed policy layers an ingestion resolved, together with the per-layer outcome flags a host needs to decide how much to trust the result. The flags are reported rather than folded into the settings because a host must be able to distinguish an unmanaged device from a managed device whose policy could not be confirmed, and apply its fail-closed gates in the second case.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ManagedSettingsIngestResult".
+ */
+/** @experimental */
+/** @internal */
+export interface ManagedSettingsIngestResult {
+  /**
+   * The effective managed settings composed from every resolved layer. Omitted when no layer set anything, so an unmanaged host locks nothing.
+   */
+  settings?: JsonValue;
+  /**
+   * The effective managed permissions layer, when the resolved policy carries one.
+   */
+  permissions?: JsonValue;
+  /**
+   * The server fetch failed and no cached entry stood in for it, so the server layer is unconfirmed and fail-closed gates apply.
+   */
+  serverFetchFailed: boolean;
+  /**
+   * No usable token was available, so no server fetch was attempted.
+   */
+  serverTokenUnavailable: boolean;
+  /**
+   * The error that made the server fetch fail, when one did.
+   */
+  serverFetchError?: string;
+  serverResolution: ManagedSettingsServerPolicyResolution;
+  /**
+   * The server fetch failed in a way a later retry could succeed at, as opposed to a refusal that no retry will change.
+   */
+  serverRetryableFailure: boolean;
+  /**
+   * A live fetch failed but a recent cached entry was served in its place, so `serverFetchFailed` stays false. Lets a consumer distinguish a clean fetch from a cache-backed fallback.
+   */
+  serverCacheFallback: boolean;
+  /**
+   * A server-managed policy is known to exist even though `serverResponse` is intentionally unset. Consumers should OR this with the presence of `serverResponse` when deciding whether the device is managed, so a fresh start during an outage still applies the fail-closed gates instead of treating the device as unmanaged.
+   */
+  serverSourceFound: boolean;
+  /**
+   * The account's server-delivered policy, when one was resolved.
+   */
+  serverResponse?: JsonValue;
+  /**
+   * The sandbox object from a cached server policy that a forced refresh declined to serve in full. Folded back into the effective sandbox layer so an outage during a forced refresh still synthesizes the fail-closed sandbox floor from the administrator's known intent.
+   */
+  serverSandboxFloor?: JsonValue;
+  /**
+   * The server fetch failed while a policy demanded a fresh confirmation, which is the strict posture an enterprise opted into rather than an ordinary transient failure.
+   */
+  serverForcedRefreshFailure: boolean;
+  /**
+   * The server refused to deliver a policy because this client is too old to enforce it, carrying the user-facing sentence describing the refusal. No retry will help; the remedy is a client update. Gates that exist only because of managed policy should deny on this rather than falling back to their unmanaged default.
+   */
+  serverClientUpdateRequired?: string;
+  /**
+   * Minimum client version requested by a successful response. Advisory only; the delivered policy remains active.
+   */
+  serverClientUpdateRequested?: string;
+  /**
+   * The synthesized fail-closed permissions layer applied in place of a policy a refused client may not enforce.
+   */
+  serverPermissionsFloor?: JsonValue;
+  /**
+   * The device layer discovered from the machine, when one exists.
+   */
+  deviceResponse?: JsonValue;
+  /**
+   * The device layer could not be read, so it is unconfirmed rather than known-absent.
+   */
+  deviceLoadFailed: boolean;
+  /**
+   * The sandbox floor contributed by the device layer.
+   */
+  deviceSandboxFloor?: JsonValue;
+  /**
+   * A device-managed policy is known to exist.
+   */
+  deviceSourceFound: boolean;
+  /**
+   * Whether the device layer's sandbox intent could not be determined, so a consumer must not read its absence as permission to run unsandboxed.
+   */
+  deviceSandboxUndetermined: boolean;
+  /**
+   * The layer produced by the platform policy helper, when one ran.
+   */
+  policyHelperResponse?: JsonValue;
+  policyHelperAuthority?: ManagedSettingsPolicyHelperAuthority;
+  /**
+   * The policy helper was configured but could not be run or its output could not be read.
+   */
+  policyHelperLoadFailed: boolean;
+  /**
+   * A policy helper is configured for this host.
+   */
+  policyHelperConfigured: boolean;
+  /**
+   * The policy helper's failure must be treated as fail-closed rather than ignored.
+   */
+  policyHelperFailClosed: boolean;
+  /**
+   * Diagnostics emitted while resolving the layers, in the order they occurred.
+   */
+  logMessages: ManagedSettingsLogMessage[];
+}
+/**
+ * One diagnostic emitted while ingesting managed settings. Returned rather than logged by the runtime so the host decides where ingestion diagnostics go, which matters because an ingestion runs before a session exists to carry a log sink.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ManagedSettingsLogMessage".
+ */
+/** @experimental */
+/** @internal */
+export interface ManagedSettingsLogMessage {
+  level: ManagedSettingsLogLevel;
+  /**
+   * Human-readable diagnostic text.
+   */
+  message: string;
+}
+/**
+ * Inputs describing the host and account whose managed remote-control policy should be resolved. Mirrors `managedSettings.ingest`, and deliberately carries no retention decision: reading this gate never becomes this runtime process's startup policy.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ManagedSettingsLoadRemoteControlParams".
+ */
+/** @experimental */
+/** @internal */
+export interface ManagedSettingsLoadRemoteControlParams {
+  policyHelperReason?: ManagedSettingsPolicyHelperReason;
+  /**
+   * Whether to run ingestion. Omit or set false to return an empty result without discovering or fetching policy.
+   */
+  selfFetch?: boolean;
+  /**
+   * The authenticated identity to resolve policy for. Omitted before sign-in, in which case no server layer is fetched.
+   */
+  authInfo?: JsonValue;
+  /**
+   * A device layer supplied by the host instead of discovered from the machine. Pair it with `hasDeviceResponse` so an explicit absence is distinguishable from an omitted override.
+   */
+  deviceResponse?: JsonValue;
+  /**
+   * Whether `deviceResponse` is an override at all. True with a null `deviceResponse` asserts the device layer is empty; false discovers it from the machine.
+   */
+  hasDeviceResponse?: boolean;
+  /**
+   * Whether a configured platform policy helper may be run to produce an enforced helper layer.
+   */
+  policyHelperEnabled?: boolean;
+  /**
+   * User agent to send with the policy fetch.
+   */
+  userAgent: string;
+  /**
+   * Name of the embedding client, reported to the managed-settings service as `client_id` so it can refuse to deliver a policy this client is too old to enforce. That refusal is exactly what turns into an explicit `disabled` below, so a host that omits this field forfeits the protection.
+   */
+  clientName?: string;
+  /**
+   * The host's environment variables, read for cache location and policy overrides.
+   */
+  environment: JsonValue;
+  /**
+   * The host's platform, in Node's `process.platform` spelling, used to locate platform-specific cache and policy paths.
+   */
+  platform: string;
+  /**
+   * The host's home directory, used to resolve cache and managed-file locations.
+   */
+  homeDirectory: string;
+}
+/**
+ * The managed remote-control policy in force for an account, if any. An absent policy means the account is unmanaged for this capability, which a host reads as allowed — so absence here is a positive statement that no policy applies, never a stand-in for a resolution that failed. A resolution that cannot be completed is rejected instead.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ManagedSettingsLoadRemoteControlResult".
+ */
+/** @experimental */
+/** @internal */
+export interface ManagedSettingsLoadRemoteControlResult {
+  /**
+   * The account's `remoteControl` policy document. Absent when no managed policy governs remote control for this account. Reported as an explicit disabled policy, rather than as absence, when the service refused to deliver a policy this client is too old to enforce.
+   */
+  remoteControl?: JsonValue;
+}
+/**
+ * The client-supplied managed settings to validate and normalize. Omitting them is valid and yields no policy.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ManagedSettingsParseClientValueParams".
+ */
+/** @experimental */
+/** @internal */
+export interface ManagedSettingsParseClientValueParams {
+  /**
+   * The managed settings a client is supplying for a session it is about to open. Omit them when the client is imposing no policy of its own.
+   */
+  settings?: JsonValue;
+}
+/**
+ * The accepted managed settings, reduced to the keys a client is allowed to set.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ManagedSettingsParseClientValueResult".
+ */
+/** @experimental */
+/** @internal */
+export interface ManagedSettingsParseClientValueResult {
+  /**
+   * The normalized settings. Omitted when the client supplied none. An accepted document that sets nothing comes back as an empty object, which is distinct from omission.
+   */
+  settingsJson?: JsonValue;
+}
+/**
+ * The device-managed settings layer, with the sandbox floor and the load outcome a host needs to compose it into an effective policy.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ManagedSettingsReadDeviceResult".
+ */
+/** @experimental */
+/** @internal */
+export interface ManagedSettingsReadDeviceResult {
+  /**
+   * Validated, canonical device-managed settings. Omitted when no device policy was discovered, when the discovered document failed validation, or when it validated to an empty object — an empty document carries no policy, and reporting it as present would outrank layers that do.
+   */
+  settings?: JsonValue;
+  /**
+   * Sandbox floor read from the discovered document before validation, so a document that is otherwise rejected can still raise the floor it declared.
+   */
+  sandboxFloor?: JsonValue;
+  /**
+   * Whether discovery or validation failed. A host must treat this as "policy unknown" rather than "no policy": absent settings with this set false mean the device genuinely has none.
+   */
+  loadFailed: boolean;
+}
 /**
  * Validated device-managed settings discovered before a session exists.
  *
@@ -13884,6 +15976,107 @@ export interface ManagedSettingsReadResult {
    */
   errorMessage?: string;
 }
+/**
+ * The bypass-permissions state a host holds today, the account now signed in, and what the managed-policy resolution said.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ManagedSettingsResolveBypassDisableTransitionParams".
+ */
+/** @experimental */
+/** @internal */
+export interface ManagedSettingsResolveBypassDisableTransitionParams {
+  currentSource?: ManagedSettingsBypassDisableSource;
+  /**
+   * The account a `managed` disable is pinned to. Omit it when the current source is not `managed`; it is ignored for the other sources.
+   */
+  currentManagedIdentity?: string;
+  /**
+   * The account signed in now. A `managed` disable pinned to a different account is lifted.
+   */
+  activeIdentity: string;
+  policy: ManagedSettingsBypassPolicyResolution;
+}
+/**
+ * The bypass-permissions state a host should hold after the resolution, and what it must do to get there.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ManagedSettingsResolveBypassDisableTransitionResult".
+ */
+/** @experimental */
+/** @internal */
+export interface ManagedSettingsResolveBypassDisableTransitionResult {
+  source?: ManagedSettingsBypassDisableSource;
+  /**
+   * The account the returned `managed` source is pinned to. Store it alongside `source`; the next call needs it to decide whether an account switch lifts the disable.
+   */
+  managedIdentity?: string;
+  /**
+   * The value to store in the host's own bypass-disabled flag. Omitted means leave it exactly as it is, which is not the same as being told to store `false`.
+   */
+  setDisabledState?: boolean;
+  /**
+   * Whether a bypass-permissions session already running must be turned off. True only when this resolution newly disables bypass mode, so a host that is already compliant is not interrupted.
+   */
+  suppressRuntimeAllowAll: boolean;
+}
+/**
+ * The credential and environment to evaluate the device-channel sign-in pin against.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ManagedSettingsResolveDeviceForceLoginOrgsGateParams".
+ */
+/** @experimental */
+/** @internal */
+export interface ManagedSettingsResolveDeviceForceLoginOrgsGateParams {
+  /**
+   * The authenticated identity to judge. Omitted when signed out, which is the case the device channel exists to serve: it can refuse a first sign-in before any credential exists.
+   */
+  authInfo?: JsonValue;
+  /**
+   * The host's environment variables. Read for the variables that would make an identity's membership snapshot forgeable, so a credential whose provenance cannot be trusted is refused rather than accepted.
+   */
+  environment: JsonValue;
+}
+/**
+ * The managed-settings layers to compose into an effective policy. Every layer is optional; omitting all of them yields no effective policy.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ManagedSettingsResolveEffectiveValueParams".
+ */
+/** @experimental */
+/** @internal */
+export interface ManagedSettingsResolveEffectiveValueParams {
+  /**
+   * The account's server-delivered org policy, as returned by a managed-settings fetch. Omitted before sign-in or when the fetch has not landed.
+   */
+  server?: JsonValue;
+  /**
+   * The device layer: native MDM and managed-file settings describing the machine rather than the account.
+   */
+  mdm?: JsonValue;
+  /**
+   * The device sandbox floor, folded into the device layer under `sandbox` before composition.
+   */
+  deviceSandboxFloor?: JsonValue;
+  /**
+   * The policy-helper layer, an enforced channel sourced from a platform policy helper process.
+   */
+  policyHelper?: JsonValue;
+}
+/**
+ * The effective managed policy composed from the supplied layers.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ManagedSettingsResolveEffectiveValueResult".
+ */
+/** @experimental */
+/** @internal */
+export interface ManagedSettingsResolveEffectiveValueResult {
+  /**
+   * The composed effective managed settings. Omitted when no layer sets anything, so an unmanaged host locks nothing. Carries `sandboxAdvisoryFloorDeclined: true` when an advisory server force-on was dropped because this host cannot run the sandbox.
+   */
+  settingsJson?: JsonValue;
+}
 
 /** @experimental */
 export interface ManagedSettingsResolveRequest {
@@ -13899,6 +16092,10 @@ export interface ManagedSettingsResolveRequest {
    * Embedding client identity for server policy requests, as in session creation. Omit for the CLI identity.
    */
   clientName?: string;
+  /**
+   * Working directory used to run an organization policy helper. When omitted, sessionless resolution does not run the helper.
+   */
+  workingDirectory?: string;
 }
 /**
  * Effective enterprise managed settings for an account, resolved without a session.
@@ -13908,6 +16105,7 @@ export interface ManagedSettingsResolveRequest {
  */
 /** @experimental */
 export interface ManagedSettingsResolveResult {
+  permissionsContext?: ManagedPermissionsContext;
   /**
    * Printable opaque identity of the account the settings were resolved for, suitable for comparison and storage, not an account selectionId. Absent when no account was available, in which case only device policy is reported.
    */
@@ -13924,6 +16122,224 @@ export interface ManagedSettingsResolveResult {
    */
   diagnostics: ManagedSettingsDiagnostic[];
 }
+/**
+ * Inputs describing the host and account a startup policy resolution should run for. Mirrors `managedSettings.ingest`, and adds the decision of whether the resolved policy is retained for this runtime process.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ManagedSettingsResolveStartupPolicyParams".
+ */
+/** @experimental */
+/** @internal */
+export interface ManagedSettingsResolveStartupPolicyParams {
+  policyHelperReason?: ManagedSettingsPolicyHelperReason;
+  /**
+   * Whether to run ingestion. Omit or set false to return an empty result without discovering or fetching policy.
+   */
+  selfFetch?: boolean;
+  /**
+   * The authenticated identity to resolve policy for. Omitted before sign-in, in which case no server layer is fetched and the sign-in pin is evaluated against no credential.
+   */
+  authInfo?: JsonValue;
+  /**
+   * The session whose credential store, working directory and client kind the resolution should use. Omit it when no session exists yet and the process-wide store applies. A resolution whose session names a credential other than `authInfo` is returned but not retained, so a stale sign-in cannot apply policy for an account that has already been switched away from.
+   */
+  sessionId?: string;
+  /**
+   * A device layer supplied by the host instead of discovered from the machine. Pair it with `hasDeviceResponse` so an explicit absence is distinguishable from an omitted override.
+   */
+  deviceResponse?: JsonValue;
+  /**
+   * Whether `deviceResponse` is an override at all. True with a null `deviceResponse` asserts the device layer is empty; false discovers it from the machine.
+   */
+  hasDeviceResponse?: boolean;
+  /**
+   * Whether to ignore a cached server policy when reading, forcing the resolution to come from a live fetch.
+   */
+  bypassCacheRead?: boolean;
+  serverPolicyCacheMode?: ManagedSettingsServerPolicyCacheMode;
+  /**
+   * Whether a configured platform policy helper may be run to produce an enforced helper layer.
+   */
+  policyHelperEnabled?: boolean;
+  /**
+   * Directory the policy helper runs in when this resolution is not owned by a registered session. A host resolving policy before its session exists must pass this, or a directory-sensitive helper judges the wrong repository.
+   */
+  policyHelperWorkingDirectory?: string;
+  /**
+   * User agent to send with the policy fetch.
+   */
+  userAgent: string;
+  /**
+   * Name of the embedding client, reported to the managed-settings service as `client_id` so it can refuse to deliver a policy this client is too old to enforce.
+   */
+  clientName?: string;
+  /**
+   * The host's environment variables, read for cache location, policy overrides, and the variables that would make a membership snapshot forgeable.
+   */
+  environment: JsonValue;
+  /**
+   * The host's platform, in Node's `process.platform` spelling, used to locate platform-specific cache and policy paths.
+   */
+  platform: string;
+  /**
+   * The host's home directory, used to resolve cache and managed-file locations.
+   */
+  homeDirectory: string;
+  /**
+   * Whether to retain the resolved policy as this runtime process's startup policy, so later work in the process enforces it. Set false to resolve without side effects, which is what a protocol host wants before session creation: its sessions apply the complete policy through the normal lifecycle, and retaining here would let a readiness credential affect unrelated sessions. The returned verdict is identical either way — this decides only whether the process keeps it.
+   */
+  retainAndApply: boolean;
+}
+/**
+ * The startup policy a resolution composed, the per-layer outcome flags a host needs to decide how much to trust it, and the enterprise sign-in verdict for the credential it ran against. The flags are reported rather than folded into the settings because a host must distinguish an unmanaged device from a managed device whose policy could not be confirmed, and apply its fail-closed gates in the second case.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ManagedSettingsResolveStartupPolicyResult".
+ */
+/** @experimental */
+/** @internal */
+export interface ManagedSettingsResolveStartupPolicyResult {
+  serverResolution: ManagedSettingsServerPolicyResolution;
+  /**
+   * Advisory minimum client version from a successful server response.
+   */
+  clientUpdateRequested?: string;
+  /**
+   * The account's server-delivered policy, when one was resolved.
+   */
+  serverResponse?: JsonValue;
+  /**
+   * The device layer discovered from the machine, when one exists.
+   */
+  deviceResponse?: JsonValue;
+  /**
+   * The sandbox floor contributed by the device layer.
+   */
+  deviceSandboxFloor?: JsonValue;
+  /**
+   * The layer produced by the platform policy helper, when one ran.
+   */
+  policyHelperResponse?: JsonValue;
+  /**
+   * The server fetch failed and no cached entry stood in for it, so the server layer is unconfirmed and fail-closed gates apply.
+   */
+  serverFetchFailed: boolean;
+  /**
+   * The device layer could not be read, so it is unconfirmed rather than known-absent.
+   */
+  deviceLoadFailed: boolean;
+  /**
+   * The policy helper was configured but could not be run, or its output could not be read.
+   */
+  policyHelperLoadFailed: boolean;
+  /**
+   * Telemetry describing which layers answered and how, for the host to report alongside its own startup events.
+   */
+  telemetry: JsonValue;
+  /**
+   * The effective sandbox floor composed across every layer, which a host must apply rather than its own default.
+   */
+  sandboxFloor?: JsonValue;
+  /**
+   * Some layer of the policy could not be confirmed, so its absence must not be read as permission. Folds in a failed server fetch as well as an unreadable device layer.
+   */
+  policyUndetermined: boolean;
+  /**
+   * The permissions layer specifically could not be confirmed, so permission gates apply their fail-closed posture.
+   */
+  permissionPolicyUndetermined: boolean;
+  /**
+   * A managed policy is known to apply to this host, from a discovered source or a resolved document.
+   */
+  managedPolicyPresent: boolean;
+  /**
+   * The sandbox was enabled because policy could not be confirmed rather than because an administrator asked for it. Lets a host explain a sandbox the user did not configure.
+   */
+  sandboxEnabledByUndeterminedPolicy: boolean;
+  forceLoginOrgs: ForceLoginOrgsDecision;
+  /**
+   * The server refused to deliver a policy because this client is too old to enforce it, carrying the user-facing sentence describing the refusal. No retry will help; the remedy is a client update.
+   */
+  clientUpdateRequired?: string;
+  /**
+   * Warnings raised while resolving, in the order they occurred.
+   */
+  warnings: string[];
+}
+/**
+ * The managed layers to retain as this process's startup policy, with the outcome of fetching each one.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ManagedSettingsRetainPolicyParams".
+ */
+/** @experimental */
+/** @internal */
+export interface ManagedSettingsRetainPolicyParams {
+  /**
+   * The resolved server policy. A known source can lack a response after a forced-refresh failure.
+   */
+  serverResponse?: JsonValue;
+  /**
+   * The device/MDM policy layer.
+   */
+  deviceResponse?: JsonValue;
+  /**
+   * Sandbox floor declared by the device layer, carried separately so a document that failed validation can still raise the floor.
+   */
+  deviceSandboxFloor?: JsonValue;
+  /**
+   * Whether a device policy source demonstrably exists. This, not a read error, is the evidence a device is managed, so a fail-closed policy gates on it.
+   */
+  deviceSourceFound: boolean;
+  /**
+   * Whether any managed policy source exists, independently of fetch failures.
+   */
+  managedPolicyPresent: boolean;
+  /**
+   * Whether the server policy source exists, even when its response is unavailable.
+   */
+  serverSourceFound: boolean;
+  /**
+   * Whether a required fresh server-policy confirmation failed.
+   */
+  serverForcedRefreshFailure: boolean;
+  /**
+   * Preserve the retained server layer during a device-only resolution.
+   */
+  preserveServerState: boolean;
+  /**
+   * Whether the device sandbox intent is unreadable independently of its other settings.
+   */
+  deviceSandboxUndetermined: boolean;
+  /**
+   * Whether the shared sandbox policy is undetermined. Diagnostic errors alone do not imply this flag.
+   */
+  sandboxFloorUndetermined: boolean;
+  /**
+   * Whether permission policy is undetermined. Sandbox-only uncertainty does not imply this flag.
+   */
+  permissionPolicyUndetermined: boolean;
+  /**
+   * Whether uncertainty alone enabled the shared sandbox floor.
+   */
+  sandboxEnabledByUndeterminedPolicy: boolean;
+  /**
+   * Shared server/device sandbox floor, excluding session-local helper policy.
+   */
+  sharedSandboxFloor?: JsonValue;
+  /**
+   * Whether the server fetch failed. Report it honestly: true keeps the already-retained server layer rather than replacing it with an absent one.
+   */
+  serverFetchFailed: boolean;
+  /**
+   * Whether the device load failed. Report it honestly, for the same reason as `serverFetchFailed`.
+   */
+  deviceLoadFailed: boolean;
+  /**
+   * The policy helper's response: the third managed layer that a process owning its startup policy resolves. It is retained with the other two so that every ambient read in this process, including the mutation guards and the governed marketplace allowlist that the `plugins.*` handlers derive, sees the whole policy the process fetched. A session-owning process omits it, because it resolves a helper per session against that session's working directory.
+   */
+  policyHelperResponse?: JsonValue;
+}
 /**
  * The authoring JSON schema for managed settings recognized by this runtime.
  *
@@ -14775,6 +17191,64 @@ export interface McpConfigUpdateRequest {
   name: string;
   config: McpSerializableServerConfig;
 }
+/**
+ * Effective MCP configuration entry. Configuration enablement is distinct from the optional live observation.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpConfiguredServer".
+ */
+/** @experimental */
+export interface McpConfiguredServer {
+  /**
+   * Server name (config key)
+   */
+  name: string;
+  /**
+   * Whether this configured server is enabled after session configuration and policy filtering.
+   */
+  enabled: boolean;
+  source?: McpServerSource;
+  /**
+   * Plugin name that provided this server, when source is plugin.
+   */
+  sourcePlugin?: string;
+  /**
+   * Plugin version that provided this server, when source is plugin.
+   */
+  sourcePluginVersion?: string;
+  /**
+   * Human-readable display name supplied by configuration.
+   */
+  displayName?: string;
+  live: McpConfiguredServerState;
+}
+/**
+ * Observational state for a matching already materialized MCP server.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpConfiguredServerState".
+ */
+/** @experimental */
+export interface McpConfiguredServerState {
+  status: McpServerStatus;
+  /**
+   * Observed connection error, when the materialized server failed.
+   */
+  error?: string;
+}
+/**
+ * Effective MCP configuration with optional live observations from matching already materialized servers.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpConfiguredServerList".
+ */
+/** @experimental */
+export interface McpConfiguredServerList {
+  /**
+   * Effective configured MCP servers.
+   */
+  servers: McpConfiguredServer[];
+}
 /**
  * Credential-free authentication identity used to configure GitHub MCP.
  *
@@ -15242,6 +17716,20 @@ export interface McpIsServerRunningResult {
    */
   running: boolean;
 }
+/**
+ * Names of the MCP servers the runtime supplies itself.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpListBuiltinServerNamesResult".
+ */
+/** @experimental */
+/** @internal */
+export interface McpListBuiltinServerNamesResult {
+  /**
+   * Every built-in server name. A host disabling the built-ins wholesale suppresses exactly this set.
+   */
+  names: string[];
+}
 /**
  * Server name whose tool list should be returned.
  *
@@ -15959,6 +18447,92 @@ export interface McpRegisterExternalClientRequest {
    */
   config: OpaqueInProcessValue;
 }
+/**
+ * Registry search to abandon.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpRegistryCancelRequest".
+ */
+/** @experimental */
+/** @internal */
+export interface McpRegistryCancelRequest {
+  /**
+   * Request ID from `mcp.registry.allocateRequestId` that the search uses.
+   */
+  requestId: number;
+}
+/**
+ * Whether the cancel reached a live search.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpRegistryCancelResult".
+ */
+/** @experimental */
+/** @internal */
+export interface McpRegistryCancelResult {
+  /**
+   * True when the cancel stopped a running search. False for unknown or reclaimed IDs, completed or canceled searches, and unused reservations. The cancel releases an unused reservation.
+   */
+  canceled: boolean;
+}
+/**
+ * Request id naming a cancellable registry search.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpRegistryRequestIdResult".
+ */
+/** @experimental */
+/** @internal */
+export interface McpRegistryRequestIdResult {
+  /**
+   * Request ID for `mcp.registry.search` and `mcp.registry.cancel`. It serves one search. Allocation can reclaim unused IDs at the 1,024-ID reservation limit.
+   */
+  requestId: number;
+}
+/**
+ * Registry search terms, the credential to search under, and the request id that makes the search cancellable.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpRegistrySearchRequest".
+ */
+/** @experimental */
+/** @internal */
+export interface McpRegistrySearchRequest {
+  /**
+   * Request ID from `mcp.registry.allocateRequestId`. The search refuses unknown, reclaimed, or canceled IDs and IDs that another search or request already uses.
+   */
+  requestId: number;
+  /**
+   * The credential the search runs under, carried opaquely. Hosts usually send credential-free `AuthIdentity`; a `token` identity can be resolved only when it embeds a token, while `env` and `gh-cli` identities can use a token embedded in the request first.
+   */
+  authInfo: JsonValue;
+  /**
+   * Free-text query. Omitted or empty asks the registry for its top servers rather than searching. A value that is not a string is refused.
+   */
+  query?: string;
+  /**
+   * Repository used for the policy lookup, as `owner/name`. The policy selects the registry URL and whether the user token goes to the registry. The registry receives this repository only when the policy entry lists it as required context. A value that is not a string is refused.
+   */
+  repository?: string;
+  /**
+   * Maximum number of servers to return.
+   */
+  limit: number;
+}
+/**
+ * Servers selected from the registry response.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpRegistrySearchResult".
+ */
+/** @experimental */
+/** @internal */
+export interface McpRegistrySearchResult {
+  /**
+   * The server objects, carried opaquely. The runtime follows pages, keeps the newest entry per server name, cuts the list to `limit`, and sorts an empty-query result by GitHub stars. Each server object remains unchanged because the registry owns that shape.
+   */
+  servers: JsonValue;
+}
 /**
  * In-process MCP reload configuration.
  *
@@ -16341,6 +18915,10 @@ export interface McpServer {
   name: string;
   status: McpServerStatus;
   source?: McpServerSource;
+  /**
+   * Configured URL for an HTTP/SSE server, regardless of configuration source. Omitted for local and in-memory servers.
+   */
+  url?: string;
   /**
    * Plugin name that provided this server, when source is plugin.
    */
@@ -16489,6 +19067,42 @@ export interface McpSetEnvValueModeParams {
 export interface McpSetEnvValueModeResult {
   mode: McpSetEnvValueModeDetails;
 }
+/**
+ * The session tool filters that decide whether the session still has a shell to run `gh` with.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpShouldExcludeGitHubToolsRequest".
+ */
+/** @experimental */
+/** @internal */
+export interface McpShouldExcludeGitHubToolsRequest {
+  /**
+   * The session's tool allowlist, when it set one. Omitted means the session constrains nothing this way.
+   */
+  availableTools?: string[];
+  /**
+   * The session's tool denylist, when it set one. Omitted means the session constrains nothing this way.
+   */
+  excludedTools?: string[];
+  /**
+   * How the allowlist and denylist combine when both are set. Omitted means the default every session gets, so a caller that never chose a precedence is answered as its sessions behave.
+   */
+  toolFilterPrecedence?: OptionsUpdateToolFilterPrecedence | null;
+}
+/**
+ * Whether the gh-replaceable GitHub MCP tools may be clipped for the session described by the request.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "McpShouldExcludeGitHubToolsResult".
+ */
+/** @experimental */
+/** @internal */
+export interface McpShouldExcludeGitHubToolsResult {
+  /**
+   * True only when both halves hold: the session's filters still reach the platform shell tool, and the host actually has the `gh` those tools would be replaced by. Feed it straight back as the `excludeGhReplaceableTools` build option.
+   */
+  excludeGhReplaceableTools: boolean;
+}
 /**
  * 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.
  *
@@ -16637,17 +19251,21 @@ export interface MetadataContextHeaviestMessagesResult {
 /** @experimental */
 export interface MetadataContextInfoRequest {
   /**
-   * Maximum prompt tokens allowed by the target model. Pass 0 to use the runtime default.
+   * Advertised prompt allowance. Pass 0 to resolve the selected model and context tier from the session.
    */
   promptTokenLimit: number;
   /**
-   * Maximum output tokens allowed by the target model. Pass 0 if unknown.
+   * Requested output allowance to reserve against the combined context ceiling. Pass 0 to resolve the session's request cap, falling back to the model's advertised output limit.
    */
   outputTokenLimit: number;
   /**
    * Model identifier used for tokenization. Omit to use the session default. Used both for token counting and to compute display values.
    */
   selectedModel?: string;
+  /**
+   * Provider owning selectedModel. Omit to use the current provider for the current model, or deterministic legacy lookup for a different model.
+   */
+  providerId?: string;
 }
 /**
  * Token breakdown for the session's current context window, or null if uninitialized.
@@ -16879,6 +19497,10 @@ export interface Model {
   metadata?: {
     [k: string]: JsonValue | undefined;
   };
+  /**
+   * Model vendor as the Copilot API reports it, for example "Anthropic" or "Azure OpenAI". Open vocabulary, passed through unchanged. It can name the vendor that serves the model instead of the one that built it, or a label that is not a vendor, such as "Experimental". Absent when the Copilot API reports no vendor.
+   */
+  vendor?: string;
   policy?: ModelPolicy;
   billing?: ModelBilling;
   /**
@@ -17089,24 +19711,6 @@ export interface ModelMessage {
    */
   message: string;
 }
-/**
- * A neutral reference to the model provider that produced a model: an opaque id, a human-readable label, and the provider kind. Carried on each enumerated Model so consumers can group by provider without reaching into a provider-shaped internal type.
- *
- * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "ModelProviderRef".
- */
-/** @experimental */
-export interface ModelProviderRef {
-  /**
-   * Opaque, stable id of the provider that produced this model. Matches the enumerated `ModelProviderDescriptor.id`.
-   */
-  id: string;
-  /**
-   * Human-readable provider label, owned by the runtime so every consumer renders identical text.
-   */
-  label: string;
-  kind: ModelProviderKind;
-}
 /**
  * Managed, repository, and CLI model overrides to overlay onto the session at startup.
  *
@@ -17132,6 +19736,10 @@ export interface ModelApplyStartupOverlayRequest {
    * Model selected by repository settings, when configured.
    */
   repoModel?: string;
+  /**
+   * Provider owning the repository-selected model. Omitted repository provider identity retains legacy bare-model behavior.
+   */
+  repoModelProviderId?: string;
   /**
    * Reasoning effort selected by repository settings, when configured.
    */
@@ -17237,6 +19845,80 @@ export interface ModelCapabilitiesOverrideLimitsVision {
    */
   max_prompt_image_size?: number;
 }
+
+/** @experimental */
+/** @internal */
+export interface ModelClearStartupSeedRequest {
+  expectedModel: string;
+  /**
+   * Provider captured with the startup seed; omission matches only an unqualified seed.
+   */
+  expectedProviderId?: string;
+}
+
+/** @experimental */
+/** @internal */
+export interface ModelClearStartupSeedResult {
+  cleared: boolean;
+}
+/**
+ * Host presentation state the reasoning-summaries policy depends on.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ModelGetReasoningSummariesRequest".
+ */
+/** @experimental */
+export interface ModelGetReasoningSummariesRequest {
+  /**
+   * The host's persisted `showReasoning` user setting, omitted when unset.
+   */
+  persistedShowReasoning?: boolean;
+  /**
+   * Whether the host is currently showing reasoning summaries. Defaults to false.
+   */
+  summariesVisible?: boolean;
+}
+/**
+ * Reasoning-summaries presentation policy for the session's current model.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ModelGetReasoningSummariesResult".
+ */
+/** @experimental */
+export interface ModelGetReasoningSummariesResult {
+  /**
+   * False until the session has a model catalog and a selected model. This read never resolves the catalog itself, and the runtime emits no readiness notification, so repeating this call alone leaves `ready` false indefinitely on a session that has neither listed models nor run a turn. `session.model.list` is the prerequisite and the signal: it resolves and caches the catalog for the session, so a successful return means the next read is ready. The exception is a session that resolves models without a Copilot catalog, that is a BYOK registry or an alternate provider: `session.model.list` returns an empty list without caching a catalog, so `ready` stays false and this policy is unavailable there. While false, every model-policy field is false and `visibility` is omitted; `experimentSettled` is independent of readiness and still reports the assignment state.
+   */
+  ready: boolean;
+  /**
+   * Whether the session's reasoning-summaries experiment assignment has settled. False means this read does not wait for a pending assignment and reports the experiment-derived fields conservatively: `showHiddenHint` is false and `visibility` falls back to `persistedShowReasoning`, or is omitted when none was supplied. A host that wants the assigned answer re-reads until this is true.
+   */
+  experimentSettled: boolean;
+  /**
+   * Whether turns on this session produce reasoning summaries, honouring an explicit session reasoning-summary override.
+   */
+  sessionShowsSummaries: boolean;
+  /**
+   * Whether the selected model shows reasoning summaries by default.
+   */
+  modelDefaultShowsSummaries: boolean;
+  /**
+   * Whether the selected model emits reasoning headers.
+   */
+  showReasoningHeaders: boolean;
+  /**
+   * Default reasoning visibility, and only meaningful once `ready` is true: false when the session produces no summaries, else the persisted setting, else the experiment's default. While `ready` is true it is omitted only when all three are unavailable, that is when the session produces summaries, no `persistedShowReasoning` was supplied, and `experimentSettled` is false. While `ready` is false there is no model policy to report and this field is always omitted, so an absent value alone does not imply a pending experiment.
+   */
+  visibility?: boolean;
+  /**
+   * Whether to show the hint that reasoning summaries are hidden. Always false while `experimentSettled` is false.
+   */
+  showHiddenHint: boolean;
+  /**
+   * Whether the supplied `persistedShowReasoning` setting only restates the model default. This reports a redundancy, not a standing instruction to delete the setting: it stays true for as long as the setting and the model default agree, including for a user who later chose that value deliberately. It exists for a one-time migration of a legacy setting written before the model default made it redundant, so a host that acts on it owns the cleanup and must gate it behind its own persisted `done` marker, delete only a setting whose value still matches the one it read, and never repeat the deletion on a later launch. Under an off-by-default reasoning-summaries experiment an explicit `showReasoning: true` opt-in also reads as redundant on a summary-producing model, so an ungated host would keep deleting that opt-in and hide summaries again on every launch.
+   */
+  clearRedundantSetting: boolean;
+}
 /**
  * List of Copilot models available to the resolved user, including capabilities and billing metadata.
  *
@@ -17851,9 +20533,13 @@ export interface ModelSwitchConfirmation {
 /** @experimental */
 export interface ModelSwitchToRequest {
   /**
-   * 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.
+   * Model id to switch to, as returned by `list`. Include providerId to select an exact catalog entry when providers share the id. Without providerId, a bare id retains incumbent selection behavior; a registry-qualified id (`provider/id`, e.g. `acme/claude-sonnet`) targets a BYOK model.
    */
   modelId: string;
+  /**
+   * Provider id from the selected list entry's provider reference. Selects this exact provider/model pair; an unavailable pair fails rather than using another provider. Omit for deterministic legacy bare-model selection.
+   */
+  providerId?: string;
   /**
    * Optional Auto routing preference to stage atomically with selecting `auto`. Pass null to return to provider-default Auto routing. This field is rejected when `modelId` is not `auto`.
    */
@@ -17958,6 +20644,10 @@ export interface ModeSetRequest {
    * Dedicated model to use in plan mode, when configured.
    */
   planModel?: string;
+  /**
+   * Provider owning planModel. Omit for legacy bare-model selection.
+   */
+  planModelProviderId?: string;
   /**
    * Reasoning effort to use with the dedicated plan model.
    */
@@ -18148,6 +20838,52 @@ export interface OptionsUpdateAdditionalContentExclusionPolicyRuleSource {
    */
   type: string;
 }
+/**
+ * External tool call of the session or one of its sub-agents that is still waiting for session.tools.handlePendingToolCall.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "PendingExternalToolRequest".
+ */
+/** @experimental */
+export interface PendingExternalToolRequest {
+  /**
+   * Request ID to pass to session.tools.handlePendingToolCall
+   */
+  requestId: string;
+  /**
+   * Tool call ID assigned to this external tool invocation
+   */
+  toolCallId: string;
+  /**
+   * Name of the external tool to invoke
+   */
+  toolName: string;
+  /**
+   * Arguments to pass to the external tool
+   */
+  arguments?: JsonValue;
+  /**
+   * Stable identity of the provider that offered the tool, for hosts that route extension-owned tools by provider
+   */
+  providerId?: string;
+  /**
+   * Sub-agent instance identifier (the envelope agentId of its events) of the agent that issued the call; absent for calls issued by the root agent
+   */
+  agentId?: string;
+}
+/**
+ * External tool calls still waiting for a result.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "PendingExternalToolRequestList".
+ */
+/** @experimental */
+export interface PendingExternalToolRequestList {
+  /**
+   * External tool calls of the session and its sub-agents that session.tools.handlePendingToolCall would still accept, in the order they were requested. Includes calls that were pending when the session was last suspended and resumed with pending work continued, so a host that did not observe the original external_tool.requested event can answer them.
+   */
+  items: PendingExternalToolRequest[];
+}
 /**
  * Pending permission prompt reconstructed from event history, with request ID and user-facing prompt details.
  *
@@ -19398,6 +22134,41 @@ export interface PermissionsConfigureResult {
    */
   success: boolean;
 }
+/**
+ * The verbatim managed `permissions` slice to interpret.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "PermissionsEvaluateManagedPolicyParams".
+ */
+/** @experimental */
+/** @internal */
+export interface PermissionsEvaluateManagedPolicyParams {
+  /**
+   * The `permissions` object from a managed settings layer, for example `{"disableBypassPermissionsMode":"disable"}`. Omitted or null means no managed policy applies.
+   */
+  permissions?: JsonValue;
+}
+/**
+ * The policy questions a host asks before granting elevated permissions.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "PermissionsEvaluateManagedPolicyResult".
+ */
+/** @experimental */
+export interface PermissionsEvaluateManagedPolicyResult {
+  /**
+   * True when managed policy forbids bypass-permissions mode, so allow-all style flags must not take effect.
+   */
+  bypassPermissionsDisabled: boolean;
+  /**
+   * True when a managed policy exists but this build could not determine its meaning. Hosts fail closed on it rather than assuming permission was granted.
+   */
+  policyUndetermined: boolean;
+  /**
+   * True when the managed layer supplies permission rules that the session must enforce.
+   */
+  permissionRulesActive: boolean;
+}
 /**
  * Indicates whether the operation succeeded.
  *
@@ -19666,6 +22437,44 @@ export interface PermissionUrlsSetUnrestrictedModeParams {
    */
   enabled: boolean;
 }
+/**
+ * A complete JSON snapshot to write under the runtime's per-path file lock.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "PersistenceWriteRawJsonLockedRequest".
+ */
+/** @experimental */
+export interface PersistenceWriteRawJsonLockedRequest {
+  /**
+   * Absolute path of the file to replace. Parent directories are created when missing.
+   */
+  path: string;
+  /**
+   * The serialized JSON document to write. It replaces the file's contents entirely; nothing is merged.
+   */
+  dataJson: string;
+  /**
+   * Comment lines to emit above the document, for a format that tolerates them. Omit for strict JSON.
+   */
+  fileHeader?: string | null;
+}
+/**
+ * The outcome of a locked snapshot write.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "PersistenceWriteRawJsonLockedResult".
+ */
+/** @experimental */
+export interface PersistenceWriteRawJsonLockedResult {
+  /**
+   * Whether the file now holds the requested contents.
+   */
+  success: boolean;
+  /**
+   * Why the write failed. Absent when `success` is true. A lock the runtime could not acquire in time reports here rather than raising.
+   */
+  error?: string | null;
+}
 /**
  * Optional message to echo back to the caller.
  *
@@ -21385,6 +24194,27 @@ export interface QueueWithdrawMessageResult {
    */
   interrupted: boolean;
 }
+/**
+ * A pending session quota warning, consumed once by takeWarnings.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "QuotaWarningProjection".
+ */
+/** @experimental */
+export interface QuotaWarningProjection {
+  /**
+   * Existing warning category.
+   */
+  warningType: string;
+  /**
+   * User-facing warning text.
+   */
+  message: string;
+  /**
+   * Related account or upgrade link.
+   */
+  url?: string;
+}
 /**
  * Event type to register consumer interest for, used by runtime gating logic.
  *
@@ -21762,6 +24592,131 @@ export interface RemoteSessionRepository {
    */
   branch?: string;
 }
+/**
+ * One atomic edit of an allowed top-level repository setting.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "RepoSettingsEditRequest".
+ */
+/** @experimental */
+/** @internal */
+export interface RepoSettingsEditRequest {
+  /**
+   * Absolute path of the repository root.
+   */
+  repoRoot: string;
+  scope: RepoSettingsEditScope;
+  /**
+   * One canonical top-level repository setting that the allowlist permits.
+   */
+  key: string;
+  operation: SettingsEditOperation;
+  /**
+   * Required boolean, string or number for set, required string for add-item and remove-item, and forbidden for remove. The runtime rejects all other JSON values.
+   */
+  value?: JsonValue;
+}
+/**
+ * Which repository settings file to read.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "RepoSettingsReadRawRequest".
+ */
+/** @experimental */
+/** @internal */
+export interface RepoSettingsReadRawRequest {
+  /**
+   * Absolute path of the repository root.
+   */
+  repoRoot: string;
+  /**
+   * Use repo for shared settings or local for settings.local.json. Other scopes are rejected.
+   */
+  scope: string;
+}
+/**
+ * Parsed repository settings without normalization or layering.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "RepoSettingsReadRawResult".
+ */
+/** @experimental */
+/** @internal */
+export interface RepoSettingsReadRawResult {
+  /**
+   * Stored JSON values after the existing JSONC parser and prototype-safety checks. Empty when the file is missing, blank, or invalid.
+   */
+  config: JsonValue;
+  /**
+   * True when the file exists but did not parse, so `config` is empty for that reason rather than because nothing is set.
+   */
+  invalid: boolean;
+}
+/**
+ * The complete set of repository-overridable settings to store.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "RepoSettingsWriteAllRequest".
+ */
+/** @experimental */
+/** @internal */
+export interface RepoSettingsWriteAllRequest {
+  /**
+   * Absolute path of the repository root.
+   */
+  repoRoot: string;
+  /**
+   * Use repo for shared settings or local for settings.local.json. Other scopes are rejected.
+   */
+  scope: string;
+  /**
+   * Object of allowed settings to store. Missing allowlisted keys are removed. Other input keys are ignored, while unknown stored keys are preserved.
+   */
+  settings: JsonValue;
+}
+/**
+ * One key to write or remove in a repository settings file.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "RepoSettingsWriteKeyRequest".
+ */
+/** @experimental */
+/** @internal */
+export interface RepoSettingsWriteKeyRequest {
+  /**
+   * Absolute path of the repository root.
+   */
+  repoRoot: string;
+  /**
+   * Use repo for shared settings or local for settings.local.json. Other scopes are rejected.
+   */
+  scope: string;
+  /**
+   * Canonical top-level key permitted by the repository settings allowlist.
+   */
+  key: string;
+  /**
+   * Value to validate and write. Required unless delete is true; a null value is validated, not treated as deletion.
+   */
+  value?: JsonValue;
+  /**
+   * True to remove the key instead of writing it.
+   */
+  delete?: boolean;
+}
+/**
+ * The stored sandbox settings to resolve against the defaults.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SandboxApplyDefaultsRequest".
+ */
+/** @experimental */
+export interface SandboxApplyDefaultsRequest {
+  /**
+   * The sandbox settings as stored in the settings file. An empty object resolves to the defaults alone.
+   */
+  stored: JsonValue;
+}
 /**
  * Resolved sandbox configuration.
  *
@@ -21976,6 +24931,36 @@ export interface SandboxMaskedEnvVar {
    */
   injectHosts: string[];
 }
+/**
+ * A possible secret-bearing environment variable and optional locally suggested HTTPS injection hosts. This is a draft for user review, not an active grant.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SandboxCredentialSuggestion".
+ */
+/** @experimental */
+export interface SandboxCredentialSuggestion {
+  /**
+   * Environment variable name. The secret value is never returned.
+   */
+  name: string;
+  /**
+   * HTTPS hostnames suggested by a local known-provider mapping. An empty list requires the user to supply injection hosts before adding a masking entry. These suggestions do not allow network access.
+   */
+  suggestedInjectHosts: string[];
+}
+/**
+ * Possible unconfigured secrets in the sandbox shell environment, sorted by variable name, with no secret values.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SandboxCredentialSuggestionsResult".
+ */
+/** @experimental */
+export interface SandboxCredentialSuggestionsResult {
+  /**
+   * Candidates for user review. Empty when sandboxing is disabled or no unconfigured candidates are present.
+   */
+  suggestions: SandboxCredentialSuggestion[];
+}
 /**
  * Request to disable sandboxing for the current session while resolving an active sandbox-bypass permission prompt.
  *
@@ -22007,6 +24992,69 @@ export interface SandboxDisableForSessionResult {
    */
   enabled: boolean;
 }
+/**
+ * The documentation URL a host cites when it declines or downgrades a sandbox setting.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SandboxDocsUrlResult".
+ */
+/** @experimental */
+export interface SandboxDocsUrlResult {
+  /**
+   * Documentation URL describing the sandbox and the settings that control it.
+   */
+  url: string;
+}
+/**
+ * A sandbox config and the per-feature routing flag to resolve it for.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SandboxEffectiveForOptionalParams".
+ */
+/** @experimental */
+/** @internal */
+export interface SandboxEffectiveForOptionalParams {
+  /**
+   * The session's resolved `sandbox` slice. Omitted when the host has none, which yields a disabled sandbox rather than an error.
+   */
+  sandbox?: JsonValue;
+  /**
+   * The routing flag naming the feature being launched, such as `sandboxMcpServers` or `sandboxLspServers`.
+   */
+  routingFlag: string;
+}
+/**
+ * The sandbox a named feature actually launches under.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SandboxEffectiveForOptionalResult".
+ */
+/** @experimental */
+/** @internal */
+export interface SandboxEffectiveForOptionalResult {
+  /**
+   * The effective sandbox config for the requested feature, or a disabled sandbox when the feature is routed out of it.
+   */
+  sandboxJson: JsonValue;
+}
+/**
+ * One slash command, as typed, to test against the enforcement-block allowlist.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SandboxEnforcementCommandAllowedParams".
+ */
+/** @experimental */
+/** @internal */
+export interface SandboxEnforcementCommandAllowedParams {
+  /**
+   * The command name as the user typed it, with or without its leading slash.
+   */
+  commandName: string;
+  /**
+   * The command's arguments, in order. Pass an empty array for a bare command: several entries in the allowlist admit the bare form and refuse every argument.
+   */
+  args: string[];
+}
 /**
  * Managed sandbox enforcement state for a session.
  *
@@ -22028,6 +25076,60 @@ export interface SandboxEnforcementStatus {
    */
   reason?: string;
 }
+/**
+ * A batch of file-picker candidates to check against a prepared policy.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SandboxFilterPickerCandidatesParams".
+ */
+/** @experimental */
+/** @internal */
+export interface SandboxFilterPickerCandidatesParams {
+  /**
+   * The candidates to check, in the order the answers are returned.
+   */
+  candidates: SandboxPickerCandidate[];
+  /**
+   * The session's working directory, matching the one the policy was prepared from.
+   */
+  cwd: string;
+  /**
+   * The policy returned by `sandbox.preparePickerPolicy`. Omitted keeps every candidate.
+   */
+  sandbox?: JsonValue;
+}
+/**
+ * One file-picker suggestion offered up for the sandbox filesystem check.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SandboxPickerCandidate".
+ */
+/** @experimental */
+/** @internal */
+export interface SandboxPickerCandidate {
+  /**
+   * Absolute path the suggestion would attach.
+   */
+  path: string;
+  /**
+   * Whether the suggestion is a directory. A directory the policy does not itself allow may still be needed as a waypoint to an allowed subtree.
+   */
+  isDirectory: boolean;
+}
+/**
+ * Per-candidate allow decisions, positionally aligned with the request.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SandboxFilterPickerCandidatesResult".
+ */
+/** @experimental */
+/** @internal */
+export interface SandboxFilterPickerCandidatesResult {
+  /**
+   * One decision per candidate, in the same order. Always the same length as the request's `candidates`.
+   */
+  allowed: boolean[];
+}
 /**
  * Request to accept the sandbox path grant offered on an active sandbox escalation permission prompt.
  *
@@ -22094,6 +25196,38 @@ export interface SandboxHostSupport {
    */
   capabilities: SandboxHostCapability[];
 }
+/**
+ * The working directory and sandbox settings to build a file-picker policy from.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SandboxPreparePickerPolicyParams".
+ */
+/** @experimental */
+/** @internal */
+export interface SandboxPreparePickerPolicyParams {
+  /**
+   * The session's working directory. Git discovery and grant canonicalization are resolved against it.
+   */
+  cwd: string;
+  /**
+   * The session's resolved `sandbox` slice. Omitted, or disabled, yields no policy and every candidate is kept.
+   */
+  sandbox?: JsonValue;
+}
+/**
+ * The prepared file-picker policy, or none when the sandbox is disabled.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SandboxPreparePickerPolicyResult".
+ */
+/** @experimental */
+/** @internal */
+export interface SandboxPreparePickerPolicyResult {
+  /**
+   * The prepared policy to pass back to `sandbox.filterPickerCandidates`. Absent when the sandbox is disabled or absent, in which case filtering keeps every candidate.
+   */
+  sandboxJson?: JsonValue;
+}
 /**
  * Result of creating the persistent certificate authority of the sandbox credential proxy.
  *
@@ -22135,6 +25269,125 @@ export interface SandboxProxyCaStatus {
    */
   canInstall: boolean;
 }
+/**
+ * The stored sandbox proxy password, if one is present.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SandboxProxySecretGetResult".
+ */
+/** @experimental */
+export interface SandboxProxySecretGetResult {
+  /**
+   * The stored password. Absent when no entry exists in either the keychain or the on-disk fallback store.
+   */
+  value?: string;
+}
+/**
+ * Where this runtime keeps the sandbox proxy password.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SandboxProxySecretLocation".
+ */
+/** @experimental */
+export interface SandboxProxySecretLocation {
+  /**
+   * Absolute path of the credential store holding the sandbox proxy password. The proxy password belongs to no MCP server, so it is kept in its own directory rather than in the MCP secret store.
+   */
+  configDir: string;
+  /**
+   * Identifier of the proxy password entry within that store. Derived from the configuration directory, so two Copilot homes on one machine never share an entry. Use it to recognize a `${secret:…}` reference in stored settings as this runtime's own proxy password.
+   */
+  secretId: string;
+}
+/**
+ * The sandbox proxy password to store.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SandboxProxySecretSaveRequest".
+ */
+/** @experimental */
+export interface SandboxProxySecretSaveRequest {
+  /**
+   * The password to store for the sandbox proxy.
+   */
+  value: string;
+}
+/**
+ * Where the sandbox proxy password was stored.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SandboxProxySecretSaveResult".
+ */
+/** @experimental */
+export interface SandboxProxySecretSaveResult {
+  /**
+   * Whether the OS keychain accepted the value. False means it was written to the on-disk fallback store instead, which is still readable by `sandbox.proxySecret.get`.
+   */
+  storedInKeychain: boolean;
+}
+/**
+ * The user's sandbox settings and the managed sandbox floor to raise them to.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SandboxResolveFlooredConfigParams".
+ */
+/** @experimental */
+/** @internal */
+export interface SandboxResolveFlooredConfigParams {
+  /**
+   * The user's own `sandbox` settings slice. Omitted when the user has configured none, which still yields the managed floor rather than a disabled sandbox.
+   */
+  userSandbox?: JsonValue;
+  /**
+   * The effective managed `sandbox` slice acting as a floor. Omitted when no administrator policy applies, in which case the user's own settings stand unchanged.
+   */
+  managedSandbox?: JsonValue;
+}
+/**
+ * The user's sandbox settings raised to the managed floor.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SandboxResolveFlooredConfigResult".
+ */
+/** @experimental */
+export interface SandboxResolveFlooredConfigResult {
+  /**
+   * The floored sandbox config, normalized through the declared sandbox shape so only declared fields in a fixed order are present.
+   */
+  sandboxJson: JsonValue;
+}
+/**
+ * The managed sandbox policy in force, which selects which remedy the notice offers.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SandboxUnsupportedStartupNoticeParams".
+ */
+/** @experimental */
+/** @internal */
+export interface SandboxUnsupportedStartupNoticeParams {
+  /**
+   * The managed `sandbox` slice, when a policy supplies one. The notice treats the sandbox as enforced only when this both enables it and sets `failIfUnavailable`, because a managed sandbox that tolerates being unavailable still leaves the user able to turn it off.
+   */
+  managedSandbox?: JsonValue;
+  /**
+   * True when the sandbox stayed on only because the managed policy could not be determined. Distinguishes a policy that positively enforces the sandbox from one that merely failed to resolve, which is the difference between telling the user to contact an administrator and telling them to wait. Defaults to false.
+   */
+  enabledByUndeterminedPolicy?: boolean;
+}
+/**
+ * The startup warning, absent when the machine can run a sandbox.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SandboxUnsupportedStartupNoticeResult".
+ */
+/** @experimental */
+/** @internal */
+export interface SandboxUnsupportedStartupNoticeResult {
+  /**
+   * The user-facing warning, carrying the platform remedy and the recovery the policy in force actually allows. Absent when this machine supports a sandbox, so a host can call unconditionally and print only what it gets.
+   */
+  notice?: string;
+}
 /**
  * Register an absolute-time scheduled prompt.
  *
@@ -22781,6 +26034,23 @@ export interface SessionBulkDeleteResult {
     [k: string]: number | undefined;
   };
 }
+/**
+ * The IDE a host is connected to, as reported to the session.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SessionConnectedIdeInfo".
+ */
+/** @experimental */
+export interface SessionConnectedIdeInfo {
+  /**
+   * Display name of the connected IDE, for example `VS Code`.
+   */
+  ideName: string;
+  /**
+   * Absolute path of the workspace folder the IDE has open.
+   */
+  workspaceFolder: string;
+}
 /**
  * The enriched metadata records, with summary and context fields backfilled where available. Sessions confirmed empty and unnamed are omitted.
  *
@@ -23600,6 +26870,10 @@ export interface SessionManagedPermissions {
    * When set to `disable`, prevents bypass/allow-all permission modes. Advisory auto-approval remains available because normal prompt paths stay active. 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;
+  /**
+   * When true, prevents Assisted Permissions from being activated. An actively Assisted session falls back to Manual Approval while the policy is in force. Omit the key or set it to false to impose no restriction.
+   */
+  disableAssistedPermissionsMode?: boolean;
   /**
    * Permission rules that block matching operations. Deny has highest precedence.
    */
@@ -23612,6 +26886,10 @@ export interface SessionManagedPermissions {
    * Permission rules that allow matching operations unless another managed source, deny, or ask rule restricts them.
    */
   allow?: string[];
+  /**
+   * Closed-world host boundary expressed as `Domain(hostname)`, `Domain(IP)`, or `Domain(*.example.com)` rules. Schemes, ports, paths, queries, and fragments are rejected because every network request must be enforceable at host-level egress. Multiple managed sources intersect their lists; an empty list denies all hosts.
+   */
+  limitTo?: string[];
 }
 /**
  * Managed settings an SDK host may inject at session startup. Only permissions are accepted in this initial contract.
@@ -23623,6 +26901,19 @@ export interface SessionManagedPermissions {
 export interface SessionManagedSettings {
   permissions?: SessionManagedPermissions;
 }
+/**
+ * Records which IDE the host is connected to, or clears it.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SessionMcpSetConnectedIdeInfoParams".
+ */
+/** @experimental */
+export interface SessionMcpSetConnectedIdeInfoParams {
+  /**
+   * The connected IDE. Null or omitted clears the recorded IDE, which is how a host reports that it is disconnected.
+   */
+  ide?: SessionConnectedIdeInfo | null;
+}
 /**
  * Point-in-time snapshot of slow-changing session identifier and state fields
  *
@@ -23713,6 +27004,7 @@ export interface SessionModelList {
   quotaSnapshots?: {
     [k: string]: JsonValue | undefined;
   };
+  auto?: AutoTierMetadata;
 }
 /**
  * Cost-category metadata for a CAPI model.
@@ -23784,6 +27076,10 @@ export interface SessionOpenOptions {
    * Opt-in: self-fetch and enforce enterprise managed settings, including managed hook policies, at session bootstrap.
    */
   enableManagedSettings?: boolean;
+  /**
+   * Opt in to enforcing non-overridable managed model controls on session model, Auto-tier, reasoning-effort, and context-tier changes. Managed defaults still apply when omitted; this option only turns conflicting changes into errors.
+   */
+  enforceManagedModelDefaults?: 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.
@@ -23802,6 +27098,12 @@ export interface SessionOpenOptions {
   authInfo?: AuthInfo;
   provider?: ProviderConfig;
   capi?: CapiSessionOptions;
+  /**
+   * Whether a CLI host explicitly requested the initial Auto preference. False preserves a settings-derived preference without validating availability during creation; execution still validates it. Defaults to true and is ignored for non-CLI callers.
+   *
+   * @internal
+   */
+  autoTierIsExplicit?: boolean;
   /**
    * Named BYOK provider connections, additive to CAPI auth. Combining with `provider` is rejected.
    *
@@ -23902,15 +27204,27 @@ export interface SessionOpenOptions {
    */
   allowAllMcpServerInstructions?: boolean;
   /**
-   * Additional directories to search for skills.
+   * Explicit discovery-only skill roots, not filesystem grants. Available without enableConfigDiscovery, subject to skill/managed disables. Relative SDK paths resolve once when supplied against the request's effective workingDirectory; retained roots do not move on cwd changes. Null and omission are equivalent; [] clears only the explicit SDK contribution.
    */
   skillDirectories?: string[];
+  /**
+   * Explicit discovery-only agent roots, separate from customAgents and filesystem grants. Available without enableConfigDiscovery, subject to managed/source disables. Relative SDK paths resolve once when supplied against the request's effective workingDirectory; retained roots do not move on cwd changes. Null and omission are equivalent; [] clears only the explicit SDK contribution.
+   */
+  agentDirectories?: string[];
+  /**
+   * Explicit discovery-only instruction roots using existing SDK instruction formats, not filesystem grants. Available without enableConfigDiscovery, subject to instruction/managed disables. Relative SDK paths resolve once when supplied against the request's effective workingDirectory; retained roots do not move on cwd changes. Null and omission are equivalent; [] clears only the explicit SDK contribution.
+   */
+  instructionDirectories?: string[];
+  /**
+   * Explicit discovery-only file-hook roots, separate from callback hooks and filesystem grants. Available without enableConfigDiscovery or enableFileHooks, which controls repository-origin hooks only; hook/managed disables still apply. Relative SDK paths resolve once when supplied against the request's effective workingDirectory; retained roots do not move on cwd changes. Null and omission are equivalent; [] clears only the explicit SDK contribution.
+   */
+  hookDirectories?: string[];
   /**
    * Skill scan directories and descendants excluded from discovery. Supports `~`-relative paths.
    */
   ignoredSkillsLocations?: string[];
   /**
-   * Whether skill loading is enabled. When omitted, an SDK skill provider enables skills by default.
+   * Whether skill loading is enabled. When omitted, explicit SDK skill roots or an SDK skill provider enable skills independently of enableConfigDiscovery.
    */
   enableSkills?: boolean;
   /**
@@ -24406,6 +27720,27 @@ export interface SessionPluginsInstallRequest {
    */
   source: string;
 }
+
+/** @experimental */
+export interface SessionPluginsRetryManagedRequest {
+  /**
+   * "plugin@marketplace" specs to retry. Omit to retry every plugin the session's managed settings require.
+   */
+  plugins?: string[];
+}
+/**
+ * Per-plugin outcomes of retrying the plugins required by the session's managed settings.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SessionPluginsRetryManagedResult".
+ */
+/** @experimental */
+export interface SessionPluginsRetryManagedResult {
+  /**
+   * One entry per requested plugin, in request order. When no plugins were requested, one entry per plugin the managed settings require.
+   */
+  plugins: ManagedPluginRetryEntry[];
+}
 /**
  * Outcome of the prune operation: deleted IDs, dry-run candidates, skipped IDs, total bytes freed, and the dry-run flag.
  *
@@ -24435,6 +27770,137 @@ export interface SessionPruneResult {
    */
   dryRun: boolean;
 }
+/**
+ * Existing delegation guidance for an account without delegation access.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SessionQuotaDelegateWarning".
+ */
+/** @experimental */
+export interface SessionQuotaDelegateWarning {
+  /**
+   * User-facing guidance.
+   */
+  text: string;
+  /**
+   * Link to upgrade the account.
+   */
+  url: string;
+}
+/**
+ * The incumbent session-owned quota and account projection.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SessionQuotaProjection".
+ */
+/** @experimental */
+export interface SessionQuotaProjection {
+  /**
+   * Known quota snapshots, keyed by the provider's quota type.
+   */
+  snapshots: {
+    [k: string]: SessionQuotaSnapshot | undefined;
+  };
+  /**
+   * Provider-owned account quota state, including snapshots without numeric balances.
+   */
+  providerQuotas?: ProviderQuotaState[];
+  /**
+   * Whether the account uses the free limited Copilot plan.
+   */
+  isFreeUser: boolean;
+  /**
+   * Whether the account uses token-based billing.
+   */
+  isTbbUser: boolean;
+  planTier: SessionQuotaPlanTier;
+  /**
+   * Whether premium-request costs are billable.
+   */
+  premiumRequestsBillable: boolean;
+  /**
+   * Whether model cost columns should be shown.
+   */
+  modelCostColumnVisible: boolean;
+  /**
+   * Whether the account can delegate tasks to GitHub.
+   */
+  delegateAvailable: boolean;
+  /**
+   * Whether the account can sign up for Copilot Free.
+   */
+  canSignupForCopilotFree: boolean;
+  /**
+   * Whether dynamic workflows are enabled for the active account.
+   */
+  dynamicWorkflowsEnabled: boolean;
+  /**
+   * Whether dynamic workflows are visible under the session's feature flags.
+   */
+  dynamicWorkflowsUiVisible: boolean;
+  /**
+   * Upgrade link for a free account.
+   */
+  upgradeUrl?: string;
+  delegateWarning?: SessionQuotaDelegateWarning;
+}
+/**
+ * Session quota snapshot, preserving the incumbent numeric units and reset metadata.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SessionQuotaSnapshot".
+ */
+/** @experimental */
+export interface SessionQuotaSnapshot {
+  /**
+   * Whether the entitlement is unlimited.
+   */
+  isUnlimitedEntitlement: boolean;
+  /**
+   * Entitled quantity in this quota's units.
+   */
+  entitlementRequests: number;
+  /**
+   * Consumed quantity in this quota's units.
+   */
+  usedRequests: number;
+  /**
+   * Whether usage is allowed after quota exhaustion.
+   */
+  usageAllowedWithExhaustedQuota: boolean;
+  /**
+   * Additional usage in this quota's units.
+   */
+  overage: number;
+  /**
+   * Whether additional usage is allowed after quota exhaustion.
+   */
+  overageAllowedWithExhaustedQuota: boolean;
+  /**
+   * Percentage of the entitlement remaining.
+   */
+  remainingPercentage: number;
+  /**
+   * Quota reset time in milliseconds since the Unix epoch, when known.
+   */
+  resetDateEpochMs?: number;
+  /**
+   * Whether the reset time is estimated.
+   */
+  resetDateEstimated?: boolean;
+  /**
+   * Whether the provider reports available quota.
+   */
+  hasQuota?: boolean;
+  /**
+   * Whether this quota uses token-based billing.
+   */
+  tokenBasedBilling?: boolean;
+  /**
+   * Additional-usage budget cap, when provided.
+   */
+  overageEntitlement?: number;
+}
 /**
  * Session IDs to close, deactivate, and delete from disk.
  *
@@ -24495,6 +27961,90 @@ export interface SessionsCloseRequest {
  */
 /** @experimental */
 export interface SessionsCloseResult {}
+/**
+ * Identity, state location and starting context for a workspace record.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SessionsCreateWorkspaceRequest".
+ */
+/** @experimental */
+export interface SessionsCreateWorkspaceRequest {
+  /**
+   * Session ID the workspace record belongs to
+   */
+  sessionId: string;
+  /**
+   * Directory the session's state is written under when no session filesystem provider is configured. Ignored when a provider is configured; the provider's session state path is used instead.
+   */
+  sessionStatePath: string;
+  /**
+   * `windows` (any letter case) selects Windows path rules. Any other value selects POSIX path rules.
+   */
+  convention: string;
+  context?: SessionWorkingDirectoryContextWithClient;
+  /**
+   * User-supplied display name for the workspace
+   */
+  name?: string;
+}
+/**
+ * A working-directory context together with the client that produced it.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SessionWorkingDirectoryContextWithClient".
+ */
+/** @experimental */
+export interface SessionWorkingDirectoryContextWithClient {
+  /**
+   * Current working directory path
+   */
+  cwd: string;
+  /**
+   * Root directory of the git repository
+   */
+  gitRoot?: string;
+  /**
+   * Repository identifier derived from the git remote URL
+   */
+  repository?: string;
+  /**
+   * Hosting platform type of the repository
+   */
+  hostType?: string;
+  /**
+   * Current git branch name
+   */
+  branch?: string;
+  /**
+   * Raw host string from the git remote URL
+   */
+  repositoryHost?: string;
+  /**
+   * Head commit of the current git branch
+   */
+  headCommit?: string;
+  /**
+   * Merge-base commit SHA
+   */
+  baseCommit?: string;
+  /**
+   * Name of the client that created the session
+   */
+  clientName?: string;
+}
+/**
+ * The workspace record that was written.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SessionsCreateWorkspaceResult".
+ */
+/** @experimental */
+export interface SessionsCreateWorkspaceResult {
+  /**
+   * The created workspace record, as JSON
+   */
+  workspaceJson: string;
+}
 /**
  * Session ID to delete from disk.
  *
@@ -25122,6 +28672,36 @@ export interface SessionsLoadDeferredRepoHooksRequest {
    */
   sessionId: string;
 }
+/**
+ * Where the session's state lives, as a root directory and the session ID under it.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SessionsLoadWorkspaceRequest".
+ */
+/** @experimental */
+export interface SessionsLoadWorkspaceRequest {
+  /**
+   * Root directory every session's state directory sits under
+   */
+  sessionsHome: string;
+  /**
+   * Session ID naming the state directory under the sessions home. Rejected when it is absolute or contains a parent component, so it cannot escape the sessions home.
+   */
+  sessionId: string;
+}
+/**
+ * The workspace record on disk, omitted when the session has none.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SessionsLoadWorkspaceResult".
+ */
+/** @experimental */
+export interface SessionsLoadWorkspaceResult {
+  /**
+   * The workspace record, as JSON. Omitted when the record does not exist.
+   */
+  workspaceJson?: string;
+}
 /**
  * Age threshold and optional flags controlling which old sessions are pruned (or simulated when dryRun is true).
  *
@@ -25313,6 +28893,35 @@ export interface SessionsTransferRemoteControlRequest {
    */
   expectedFromSessionId?: string;
 }
+/**
+ * Where the session's state lives, plus workspace-schema fields to merge into its workspace record. Stored keys outside the schema are not preserved, and a stored `fork_count` is never replaced.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SessionsUpdateWorkspaceFieldsRequest".
+ */
+/** @experimental */
+export interface SessionsUpdateWorkspaceFieldsRequest {
+  /**
+   * Root directory every session's state directory sits under
+   */
+  sessionsHome: string;
+  /**
+   * Session ID naming the state directory under the sessions home. Rejected when it is absolute or contains a parent component, so it cannot escape the sessions home.
+   */
+  sessionId: string;
+  /**
+   * Workspace-schema fields to merge into the record, as a JSON object. Fields the object omits keep their stored values, except stored keys outside the schema are not preserved and a stored `fork_count` is never replaced.
+   */
+  fieldsJson: string;
+}
+/**
+ * The merge completed. The record carries the supplied workspace-schema fields, but a stored `fork_count` stays.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SessionsUpdateWorkspaceFieldsResult".
+ */
+/** @experimental */
+export interface SessionsUpdateWorkspaceFieldsResult {}
 /**
  * Telemetry engagement ID for the session, when available.
  *
@@ -25421,9 +29030,21 @@ export interface SessionUpdateOptionsParams {
    */
   allowAllMcpServerInstructions?: boolean;
   /**
-   * Additional directories to search for skills.
+   * Explicit discovery-only skill roots, not filesystem grants. Available without enableConfigDiscovery, subject to skill/managed disables. Relative SDK paths resolve once when supplied against the request's effective workingDirectory; retained roots do not move on cwd changes. Null and omission are equivalent; [] clears only the explicit SDK contribution.
    */
   skillDirectories?: string[];
+  /**
+   * Explicit discovery-only agent roots, separate from customAgents and filesystem grants. Available without enableConfigDiscovery, subject to managed/source disables. Relative SDK paths resolve once when supplied against the request's effective workingDirectory; retained roots do not move on cwd changes. Null and omission are equivalent; [] clears only the explicit SDK contribution.
+   */
+  agentDirectories?: string[];
+  /**
+   * Explicit discovery-only instruction roots using existing SDK instruction formats, not filesystem grants. Available without enableConfigDiscovery, subject to instruction/managed disables. Relative SDK paths resolve once when supplied against the request's effective workingDirectory; retained roots do not move on cwd changes. Null and omission are equivalent; [] clears only the explicit SDK contribution.
+   */
+  instructionDirectories?: string[];
+  /**
+   * Explicit discovery-only file-hook roots, separate from callback hooks and filesystem grants. Available without enableConfigDiscovery or enableFileHooks, which controls repository-origin hooks only; hook/managed disables still apply. Relative SDK paths resolve once when supplied against the request's effective workingDirectory; retained roots do not move on cwd changes. Null and omission are equivalent; [] clears only the explicit SDK contribution.
+   */
+  hookDirectories?: string[];
   /**
    * Skill scan directories and descendants excluded from discovery. Supports `~`-relative paths.
    */
@@ -25531,7 +29152,7 @@ export interface SessionUpdateOptionsParams {
    */
   organizationCustomInstructions?: string;
   /**
-   * Whether to enable loading of `.github/hooks/` filesystem hooks. Separate from the SDK callback hook mechanism.
+   * Whether to enable repository-origin file hooks from `.github/hooks/` and trusted repository-configured roots. Does not control explicit hookDirectories or SDK callback hooks.
    */
   enableFileHooks?: boolean;
   /**
@@ -25543,7 +29164,7 @@ export interface SessionUpdateOptionsParams {
    */
   enableSessionStore?: boolean;
   /**
-   * Whether skill loading is enabled. Explicit false disables every source, including a bound SDK provider; changing the value invalidates the loaded skill snapshot. When omitted, creation falls back to enableConfigDiscovery unless an SDK skill provider is registered.
+   * Whether skill loading is enabled. Explicit false disables every source, including explicit SDK roots and a bound SDK provider; changing the value invalidates the loaded skill snapshot. When omitted, creation falls back to enableConfigDiscovery unless explicit SDK skill roots or an SDK skill provider are supplied.
    */
   enableSkills?: boolean;
   contextTier?: OptionsUpdateContextTier;
@@ -25569,6 +29190,17 @@ export interface SessionUpdateOptionsResult {
    */
   pluginHookCount?: number;
 }
+/**
+ * Outcome of an atomic user or repository settings edit.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SettingsEditResult".
+ */
+/** @experimental */
+/** @internal */
+export interface SettingsEditResult {
+  status: SettingsEditStatus;
+}
 /**
  * User-requested shell execution cancellation handle.
  *
@@ -25914,7 +29546,7 @@ export interface SkillPlanUninstallRequest {
   policySessionId: string;
 }
 /**
- * Catalog-only metadata for one SDK-provided skill. The complete SKILL.md is fetched separately and lazily.
+ * Authoritative catalog metadata for one SDK-provided skill. The skill's SKILL.md text is fetched separately and lazily.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
  * via the `definition` "SkillProviderDescriptor".
@@ -25977,7 +29609,7 @@ export interface SkillProviderReadRequest {
   name: string;
 }
 /**
- * Complete text-only SKILL.md content returned by an SDK session's skill provider. Related files and assets are not supported.
+ * Text-only SKILL.md content returned by an SDK session's skill provider. YAML frontmatter is optional: fields it omits come from the catalog descriptor, fields it declares must match the descriptor, and `allowed-tools` is read only from frontmatter. Related files and assets are not supported.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
  * via the `definition` "SkillProviderReadResult".
@@ -25986,9 +29618,9 @@ export interface SkillProviderReadRequest {
 /** @internal */
 export interface SkillProviderReadResult {
   /**
-   * Complete SKILL.md text. The runtime enforces a 1 MiB UTF-8 byte limit.
+   * SKILL.md text, with or without YAML frontmatter, or null when the provider has no skill with the requested name. The runtime enforces a 1 MiB UTF-8 byte limit.
    */
-  markdown: string;
+  markdown: string | null;
 }
 /**
  * Skill names to mark as disabled in global configuration, replacing any previous list.
@@ -26046,7 +29678,7 @@ export interface SkillsDiscoverRequest {
    */
   projectPaths?: string[];
   /**
-   * Optional list of additional skill directory paths to include
+   * Explicit discovery-only skill roots, not filesystem grants. Available without ambient discovery, subject to skill/managed disables. Relative paths resolve against the request's effective working directory when supplied. Null and omission are equivalent; an empty array contributes no explicit roots.
    */
   skillDirectories?: string[];
   /**
@@ -26101,6 +29733,10 @@ export interface SkillSetEnabledRequest {
  */
 /** @experimental */
 export interface SkillsGetDiscoveryPathsRequest {
+  /**
+   * Explicit discovery-only skill roots to enumerate, including configured missing directories. Relative paths resolve against the request's effective working directory when supplied. These are not filesystem grants or preferred creation targets. Null and omission are equivalent.
+   */
+  skillDirectories?: string[];
   /**
    * Optional list of project directory paths. When omitted or empty, only personal and custom directories are returned.
    */
@@ -27424,6 +31060,14 @@ export interface ToolsGetCurrentMetadataResult {
  */
 /** @experimental */
 export interface ToolsInitializeAndValidateResult {}
+/**
+ * No parameters; returns the external tool calls of the session and its sub-agents that are still waiting for a result.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ToolsListPendingRequestsRequest".
+ */
+/** @experimental */
+export interface ToolsListPendingRequestsRequest {}
 /**
  * Optional model identifier whose tool overrides should be applied to the listing.
  *
@@ -28109,282 +31753,779 @@ export interface UpdateSubagentSettingsRequest {
   subagents?: SubagentSettings | null;
 }
 /**
- * Accumulated session usage metrics, including premium request cost, token counts, model breakdown, and code-change totals.
+ * Internal absolute code-change totals reported by the owning host.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "UsageGetMetricsResult".
+ * via the `definition` "UsageSetCodeChangesRequest".
  */
 /** @experimental */
-export interface UsageGetMetricsResult {
+/** @internal */
+export interface UsageSetCodeChangesRequest {
   /**
-   * Total user-initiated premium request cost across all models (may be fractional due to multipliers)
+   * Absolute added-line total, replacing the previous reading.
    */
-  totalPremiumRequestCost: number;
+  linesAdded: number;
   /**
-   * Raw count of user-initiated API requests
+   * Absolute removed-line total, replacing the previous reading.
    */
-  totalUserRequests: number;
+  linesRemoved: number;
   /**
-   * Session-wide accumulated nano-AI units cost
+   * Absolute changed-file count; omission preserves the previous count.
    */
-  totalNanoAiu?: number;
+  filesCount?: number;
+}
+/**
+ * Result of a user-requested shell command.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "UserRequestedShellCommandResult".
+ */
+/** @experimental */
+export interface UserRequestedShellCommandResult {
   /**
-   * Session-wide per-token-type accumulated token counts
+   * Tool call id emitted for the shell execution
    */
-  tokenDetails?: {
-    [k: string]: UsageMetricsTokenDetail | undefined;
-  };
+  toolCallId: string;
   /**
-   * Total time spent in model API calls (milliseconds)
+   * Whether the command completed successfully
    */
-  totalApiDurationMs: number;
+  success: boolean;
   /**
-   * ISO 8601 timestamp when the session started
+   * Captured command output
    */
-  sessionStartTime: string;
-  codeChanges: UsageMetricsCodeChanges;
+  output: string;
   /**
-   * Per-model token and request metrics, keyed by model identifier
+   * Process exit code, when available
    */
-  modelMetrics: {
-    [k: string]: UsageMetricsModelMetric | undefined;
-  };
+  exitCode?: number | null;
   /**
-   * Per-agent usage metrics, keyed by agent instance identifier. The main conversation uses the stable key `main`.
+   * Error output when the execution failed
    */
-  agentMetrics?: {
-    [k: string]: UsageMetricsAgentMetric | undefined;
-  };
+  error?: string;
+}
+/**
+ * A single user setting's effective value alongside its default, so consumers can render settings left at their default.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "UserSettingMetadata".
+ */
+/** @experimental */
+export interface UserSettingMetadata {
   /**
-   * Currently active model identifier
+   * The effective value: the user's value if set, otherwise the default.
    */
-  currentModel?: string;
+  value: JsonValue;
   /**
-   * Input tokens from the most recent main-agent API call
+   * The centrally-known default for this setting (null when no default is registered).
    */
-  lastCallInputTokens: number;
+  default: JsonValue;
   /**
-   * Output tokens from the most recent main-agent API call
+   * 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.
    */
-  lastCallOutputTokens: number;
+  isDefault: boolean;
 }
 /**
- * Session-wide token-detail entry containing the accumulated token count for one token type.
+ * A single top-level setting subtree to validate and write.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "UsageMetricsTokenDetail".
+ * via the `definition` "UserSettingsApplyTopKeyRequest".
  */
 /** @experimental */
-export interface UsageMetricsTokenDetail {
+export interface UserSettingsApplyTopKeyRequest {
+  /**
+   * Canonical path of the setting the caller is editing. Currently informational only.
+   */
+  canonicalPath: string[];
   /**
-   * Accumulated token count for this token type
+   * Top-level setting name to write.
    */
-  tokenCount: number;
+  topKey: string;
+  /**
+   * Value to write for the whole top-level key. Omitted when `delete` is true. Explicit null is preserved and validated as null.
+   */
+  value?: JsonValue | null;
+  /**
+   * True to remove the top-level key instead of writing it.
+   */
+  delete?: boolean;
+  /**
+   * Records that the user chose an update channel explicitly, so the one-time staff channel migration stops reapplying. Honored only for the `autoUpdatesChannel` key.
+   */
+  completeStaffUpdateChannelMigration?: boolean;
 }
 /**
- * Aggregated code change metrics
+ * Outcome of validating and writing one top-level setting subtree.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "UsageMetricsCodeChanges".
+ * via the `definition` "UserSettingsApplyTopKeyResult".
  */
 /** @experimental */
-export interface UsageMetricsCodeChanges {
+export interface UserSettingsApplyTopKeyResult {
   /**
-   * Total lines of code added
+   * `ok` when the value was written, `validation-error` when it was rejected before any write, `write-error` when validation passed but the write failed.
    */
-  linesAdded: number;
+  status: string;
   /**
-   * Total lines of code removed
+   * Problems found, present only when `status` is `validation-error`.
    */
-  linesRemoved: number;
+  issues?: UserSettingsValidationIssue[];
   /**
-   * Number of distinct files modified
+   * Why the write failed, present only when `status` is `write-error`.
    */
-  filesModifiedCount: number;
+  error?: string | null;
+}
+/**
+ * One problem found while validating a setting value.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "UserSettingsValidationIssue".
+ */
+/** @experimental */
+export interface UserSettingsValidationIssue {
   /**
-   * Distinct file paths modified during the session
+   * Where in the settings tree the problem sits, as object keys and array indices. The first element is the top-level key; a whole-value problem is reported as that single key.
    */
-  filesModified: string[];
+  path: JsonValue[];
+  /**
+   * Human-readable description of the problem.
+   */
+  message: string;
 }
 /**
- * Per-model usage metrics, including request counts/costs, token usage, nano-AI units, and per-token-type details.
+ * The overrides and host context to resolve effective runtime settings from.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "UsageMetricsModelMetric".
+ * via the `definition` "UserSettingsBuildRuntimeRequest".
  */
 /** @experimental */
-export interface UsageMetricsModelMetric {
-  requests: UsageMetricsModelMetricRequests;
-  usage: UsageMetricsModelMetricUsage;
+/** @internal */
+export interface UserSettingsBuildRuntimeRequest {
   /**
-   * Latest known prompt-cache expiration for this model. A timestamp in the past indicates that the observed cache has expired.
+   * Settings that take precedence over every document and environment layer, such as the values a host derived from its own command line. Keyed by setting name, with each value carried verbatim, so a host may pass keys this runtime does not recognize. Absent when the host contributes no overrides of its own.
    */
-  cacheExpiresAt?: string;
+  overrides?: {
+    [k: string]: JsonValue | undefined;
+  };
   /**
-   * Accumulated nano-AI units cost for this model
+   * The directory the settings are being resolved for. This selects the repository-scoped document, so a host resolving settings for a directory other than its own process working directory must pass that directory here.
    */
-  totalNanoAiu?: number;
+  workingDirectory: string;
   /**
-   * Token count details per type
+   * The environment to read settings-bearing variables from. Passed explicitly rather than read from the server process so a host can resolve settings for an environment it is about to create rather than the one it runs in.
    */
-  tokenDetails?: {
-    [k: string]: UsageMetricsModelMetricTokenDetail | undefined;
+  environment: {
+    [k: string]: string | undefined;
   };
+  /**
+   * The platform to apply platform-specific defaults for, in the same spelling the host's own runtime reports.
+   */
+  platform: string;
 }
 /**
- * Request count and cost metrics for this model
+ * One atomic edit of a canonical setting in settings.json.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "UsageMetricsModelMetricRequests".
+ * via the `definition` "UserSettingsEditRequest".
  */
 /** @experimental */
-export interface UsageMetricsModelMetricRequests {
+/** @internal */
+export interface UserSettingsEditRequest {
   /**
-   * Number of API requests made with this model
+   * Configuration directory to edit. Omitted or empty resolves the server's own home, as in `user.settings.loadForConfigDir`.
    */
-  count: number;
+  configDir?: string;
   /**
-   * User-initiated premium request cost (with multiplier applied)
+   * Nonempty canonical path segments of the setting to edit, starting with its top-level key.
+   *
+   * @minItems 1
    */
-  cost: number;
+  canonicalPath: [string, ...string[]];
+  operation: SettingsEditOperation;
+  /**
+   * Required boolean, string or number for set, required string for add-item and remove-item, and forbidden for remove. The runtime rejects all other JSON values.
+   */
+  value?: JsonValue;
 }
 /**
- * Token usage metrics for this model
+ * Selects which settings file paths to resolve.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "UsageMetricsModelMetricUsage".
+ * via the `definition` "UserSettingsGetPathsRequest".
  */
 /** @experimental */
-export interface UsageMetricsModelMetricUsage {
+export interface UserSettingsGetPathsRequest {
   /**
-   * Total input tokens consumed
+   * Absolute path of a repository root. Supply it to also resolve that repository's two settings file paths; omit it to resolve only the user path.
    */
-  inputTokens: number;
+  repoRoot?: string;
+}
+/**
+ * On-disk locations of the settings files this runtime reads. A path is reported whether or not the file exists.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "UserSettingsGetPathsResult".
+ */
+/** @experimental */
+export interface UserSettingsGetPathsResult {
   /**
-   * Total output tokens produced
+   * The user settings file: `settings.json` under the resolved Copilot home. This is the file `user.settings.get`, `user.settings.load`, and `user.settings.set` read and write.
    */
-  outputTokens: number;
+  userSettings: string;
   /**
-   * Total tokens read from prompt cache
+   * The repository's checked-in settings file, or null when no repository root was supplied.
    */
-  cacheReadTokens: number;
+  repoSettings?: string | null;
   /**
-   * Total tokens written to prompt cache
+   * The repository's local, untracked settings file, or null when no repository root was supplied.
    */
-  cacheWriteTokens: number;
+  repoLocalSettings?: string | null;
+}
+/**
+ * Per-key metadata for every known user setting in settings.json, including settings left at their default. Excludes repository- and enterprise-managed overrides.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "UserSettingsGetResult".
+ */
+/** @experimental */
+export interface UserSettingsGetResult {
   /**
-   * Total output tokens used for reasoning
+   * Every known user setting keyed by setting name, each with its effective value, default, and whether it is at the default.
    */
-  reasoningTokens?: number;
+  settings: {
+    [k: string]: UserSettingMetadata;
+  };
 }
 /**
- * Per-model token-detail entry containing the accumulated token count for one token type.
+ * Top-level user-setting keys grouped by who may govern them.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "UsageMetricsModelMetricTokenDetail".
+ * via the `definition` "UserSettingsGovernanceKeysResult".
  */
 /** @experimental */
-export interface UsageMetricsModelMetricTokenDetail {
+export interface UserSettingsGovernanceKeysResult {
+  /**
+   * Top-level keys a repository may override through `.github/copilot/settings.json` or `.github/copilot/settings.local.json`.
+   */
+  repo: string[];
   /**
-   * Accumulated token count for this token type
+   * Top-level keys a repository may override through a Claude-compatible repository config.
    */
-  tokenCount: number;
+  claudeRepo: string[];
+  /**
+   * Top-level keys an enterprise policy may fix through managed settings.
+   */
+  managed: string[];
 }
 /**
- * Usage attributed to one agent instance, including its identity, API duration, AI units, and per-model breakdown.
+ * The filesystem and environment facts a user-settings file is resolved from. Passed explicitly rather than read from the runtime's own process, so a host whose configuration directory differs from its process environment resolves the file it means.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "UsageMetricsAgentMetric".
+ * via the `definition` "UserSettingsHostContext".
  */
 /** @experimental */
-export interface UsageMetricsAgentMetric {
+export interface UserSettingsHostContext {
   /**
-   * Configured agent name, when this is a subagent
+   * The Copilot configuration directory, when the host set one. Takes precedence over `COPILOT_HOME` and the home directory.
    */
-  agentName?: string;
+  configDir?: 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.
+   * The user's home directory, used when neither a configuration directory nor `COPILOT_HOME` is set.
    */
-  agentDisplayName?: string;
+  homeDirectory: string;
   /**
-   * Time spent in model API calls by this agent, in milliseconds
+   * The host's environment variables. `COPILOT_HOME` is read from here, as are the variables a settings hook may expand.
    */
-  totalApiDurationMs: number;
+  environment: {};
+}
+/**
+ * A repository to read settings from, and the user layer they are merged over.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "UserSettingsLoadAndMergeRepoRequest".
+ */
+/** @experimental */
+/** @internal */
+export interface UserSettingsLoadAndMergeRepoRequest {
   /**
-   * Accumulated nano-AI units cost for this agent
+   * Absolute path of the repository root whose settings to read. When this is the user's home directory, the Claude-compatible configuration is skipped, so a home-directory session does not inherit a personal config as if it were repository policy.
    */
-  totalNanoAiu: number;
+  repoRoot: string;
   /**
-   * Per-model usage for this agent, keyed by model identifier
+   * The user's own settings, keyed by setting name. The repository layer is merged over this; a repository may only add to the collection settings it is allowed to influence, so a user setting it does not name survives unchanged.
    */
-  modelMetrics: {
-    [k: string]: UsageMetricsModelMetric | undefined;
+  userSettings: {
+    [k: string]: JsonValue | undefined;
   };
 }
 /**
- * Result of a user-requested shell command.
+ * The settings a consumer should act on inside a repository, together with any diagnostic raised while reading the repository layer.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "UserRequestedShellCommandResult".
+ * via the `definition` "UserSettingsLoadAndMergeRepoResult".
  */
 /** @experimental */
-export interface UserRequestedShellCommandResult {
+/** @internal */
+export interface UserSettingsLoadAndMergeRepoResult {
   /**
-   * Tool call id emitted for the shell execution
+   * The merged settings document, keyed by setting name. Equals the supplied user layer when the repository declares no settings.
    */
-  toolCallId: string;
+  settings: {
+    [k: string]: JsonValue | undefined;
+  };
   /**
-   * Whether the command completed successfully
+   * Why part of the repository document was ignored, as a single human-readable string joining every diagnostic with `; `. Null when it loaded cleanly. The settings that did load are still merged, so a consumer should surface this and continue rather than treat it as a failure.
    */
-  success: boolean;
+  warning?: string | null;
+}
+/**
+ * Selects the configuration directory whose user settings to read.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "UserSettingsLoadForConfigDirRequest".
+ */
+/** @experimental */
+/** @internal */
+export interface UserSettingsLoadForConfigDirRequest {
   /**
-   * Captured command output
+   * Copilot configuration directory to read the settings document from, taking precedence over the server's own `COPILOT_HOME` and default home. Omit it, or pass an empty string, to read the directory the server resolved for itself.
    */
-  output: string;
+  configDir?: string;
+}
+/**
+ * Contents of settings.json as stored, for a caller about to rewrite it.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "UserSettingsLoadForEditResult".
+ */
+/** @experimental */
+export interface UserSettingsLoadForEditResult {
   /**
-   * Process exit code, when available
+   * `ok` when the file parsed, `missing` when there is no file yet, `invalid` when the file exists but will not parse.
    */
-  exitCode?: number | null;
+  status: string;
   /**
-   * Error output when the execution failed
+   * Parsed contents, present only when `status` is `ok`.
    */
-  error?: string;
+  settings?: JsonValue;
 }
 /**
- * A single user setting's effective value alongside its default, so consumers can render settings left at their default.
+ * Selects the repository whose checked-in settings to read.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "UserSettingMetadata".
+ * via the `definition` "UserSettingsLoadRepoRequest".
  */
 /** @experimental */
-export interface UserSettingMetadata {
+export interface UserSettingsLoadRepoRequest {
   /**
-   * The effective value: the user's value if set, otherwise the default.
+   * Absolute path of the repository root whose settings to read. When this is the user's home directory, the Claude-compatible configuration is skipped, so a home-directory session does not inherit a personal config as if it were repository policy.
    */
-  value: JsonValue;
+  repoRoot: string;
+}
+/**
+ * A repository's settings as stored, together with any diagnostic raised while reading them.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "UserSettingsLoadRepoResult".
+ */
+/** @experimental */
+export interface UserSettingsLoadRepoResult {
   /**
-   * The centrally-known default for this setting (null when no default is registered).
+   * The repository's settings document, keyed by setting name, with each value carried verbatim. Null when the repository declares no settings.
    */
-  default: JsonValue;
+  settings?: {
+    [k: string]: JsonValue | undefined;
+  } | null;
   /**
-   * 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.
+   * Why part of the document was ignored, as a single human-readable string joining every diagnostic with `; `. Null when the document loaded cleanly. The settings that did load are still reported, so a consumer should surface this and continue rather than treat it as a failure.
    */
-  isDefault: boolean;
+  warning?: string | null;
 }
 /**
- * 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.
+ * The user's stored settings, together with any diagnostic raised while reading them.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "UserSettingsGetResult".
+ * via the `definition` "UserSettingsLoadWithWarningResult".
  */
 /** @experimental */
-export interface UserSettingsGetResult {
+export interface UserSettingsLoadWithWarningResult {
   /**
-   * Every known user setting keyed by setting name, each with its effective value, default, and whether it is at the default.
+   * The stored user settings document, keyed by setting name, with each value carried verbatim. Empty when the file could not be read at all.
    */
   settings: {
-    [k: string]: UserSettingMetadata;
+    [k: string]: JsonValue | undefined;
   };
+  /**
+   * Why part of the document was ignored, phrased for display to the user. Null when the document loaded cleanly. The settings that did load are still reported, so a consumer may surface this and continue rather than treat it as a failure.
+   */
+  warning?: string | null;
+}
+/**
+ * The managed (enterprise policy) layer and the user layer to fold together. The field names carry the layer identity: nothing about a settings object identifies which layer produced it, so a generic base/override pair would let a caller transpose them and silently resolve the governance keys in the user's favour.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "UserSettingsMergeManagedAndUserParams".
+ */
+/** @experimental */
+/** @internal */
+export interface UserSettingsMergeManagedAndUserParams {
+  /**
+   * The managed layer. Its governance keys win, and the per-entry `enabledPlugins` and `extraKnownMarketplaces` control maps are stamped back from it after the union. Omitted when the host is unmanaged.
+   */
+  managed?: JsonValue;
+  /**
+   * The user's own settings layer. Wins on every key the managed layer does not govern. Omitted when the user has no settings yet.
+   */
+  user?: JsonValue;
+}
+/**
+ * The user layer folded over the managed layer.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "UserSettingsMergeManagedAndUserResult".
+ */
+/** @experimental */
+export interface UserSettingsMergeManagedAndUserResult {
+  /**
+   * The merged settings. An empty object when neither layer was supplied, so an unmanaged host with no user settings governs nothing.
+   */
+  settingsJson: JsonValue;
+}
+/**
+ * The user layer and the repository layer to fold together.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "UserSettingsMergeRepoValueParams".
+ */
+/** @experimental */
+/** @internal */
+export interface UserSettingsMergeRepoValueParams {
+  /**
+   * The user's settings, already resolved against any managed layer.
+   */
+  userSettings: JsonValue;
+  /**
+   * The repository's checked-in settings layer.
+   */
+  repoSettings: JsonValue;
+}
+/**
+ * The repository layer folded into the user layer.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "UserSettingsMergeRepoValueResult".
+ */
+/** @experimental */
+export interface UserSettingsMergeRepoValueResult {
+  /**
+   * The merged settings, with the per-entry managed control maps re-stamped from the runtime's ambient managed policy.
+   */
+  settingsJson: JsonValue;
+}
+/**
+ * Selects the configuration directory whose settings document to clean.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "UserSettingsMigrateObsoleteOnDiskRequest".
+ */
+/** @experimental */
+/** @internal */
+export interface UserSettingsMigrateObsoleteOnDiskRequest {
+  /**
+   * The configuration directory holding the settings document to clean. A host that scopes a session to its own Copilot home passes that directory here; omit it to clean the document under the home the server resolved for itself. The home directory and environment are deliberately not caller-supplied: they decide only the settings path root and the two hook-parsing flags, and those describe the process doing the reading rather than the caller.
+   */
+  configDir?: string;
+}
+/**
+ * The outcome of the one-time obsolete-settings cleanup.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "UserSettingsMigrateObsoleteOnDiskResult".
+ */
+/** @experimental */
+/** @internal */
+export interface UserSettingsMigrateObsoleteOnDiskResult {
+  status: UserSettingsMigrateObsoleteOnDiskStatus;
+}
+/**
+ * Selects the configuration directory to run the one-time staff log-level migration against, and supplies the caller's record of whether it has already run.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "UserSettingsMigrateStaffLogLevelOnceRequest".
+ */
+/** @experimental */
+/** @internal */
+export interface UserSettingsMigrateStaffLogLevelOnceRequest {
+  context: UserSettingsHostContext;
+  /**
+   * When the caller last recorded this migration, as an ISO-8601 timestamp. Supplying it lets the runtime answer `current` without re-running the evaluation.
+   */
+  cachedCompletedAt?: string;
+}
+/**
+ * The outcome of the one-time staff log-level migration.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "UserSettingsMigrateStaffLogLevelOnceResult".
+ */
+/** @experimental */
+/** @internal */
+export interface UserSettingsMigrateStaffLogLevelOnceResult {
+  status: StaffLogLevelMigrationStatus;
+  /**
+   * When the migration was recorded as done, as an ISO-8601 timestamp. Absent only for `ineligible`, which records nothing.
+   */
+  completedAt?: string;
+  /**
+   * The settings document as it stands after the migration, keyed by setting name. Present only for `refreshed`, and only when the document could be re-read cleanly.
+   */
+  settings?: {};
+}
+/**
+ * The outcome of the one-time staff update-channel migration.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "UserSettingsMigrateStaffUpdateChannelOnceResult".
+ */
+/** @experimental */
+/** @internal */
+export interface UserSettingsMigrateStaffUpdateChannelOnceResult {
+  status: StaffUpdateChannelMigrationStatus;
+  /**
+   * When the migration was recorded as done, as an ISO-8601 timestamp. Absent only for `ineligible`, which records nothing.
+   */
+  completedAt?: string;
+}
+/**
+ * Settings object whose key names should be canonicalized.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "UserSettingsNormalizeRequest".
+ */
+/** @experimental */
+export interface UserSettingsNormalizeRequest {
+  /**
+   * Free-form settings object, possibly using legacy or snake_case key names.
+   */
+  settings: JsonValue;
+}
+/**
+ * Settings object with canonical key names.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "UserSettingsNormalizeResult".
+ */
+/** @experimental */
+export interface UserSettingsNormalizeResult {
+  /**
+   * The same settings with every legacy or snake_case key renamed to its canonical spelling.
+   */
+  settings: JsonValue;
+}
+/**
+ * The on-disk location of the user's settings document.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "UserSettingsPathResult".
+ */
+/** @experimental */
+export interface UserSettingsPathResult {
+  /**
+   * Absolute path to the settings file this runtime reads and writes. Normally `settings.json` under the Copilot configuration directory; an extensionless legacy `settings` file is reported instead when it exists and `settings.json` does not.
+   */
+  path: string;
+}
+/**
+ * One setting that will not take effect, and why.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "UserSettingsProblem".
+ */
+/** @experimental */
+export interface UserSettingsProblem {
+  /**
+   * Stable identifier for this problem within the reported set, so a caller can track a selection across refreshes.
+   */
+  id: string;
+  /**
+   * What is wrong in machine-readable form, for a caller that wants to branch rather than display.
+   */
+  kind: string;
+  /**
+   * Coarse grouping for the problem, for a caller that presents problems in sections.
+   */
+  category: string;
+  source: UserSettingsProblemLocation;
+  /**
+   * The offending key as written in the file, when the problem is attributable to a single key. Absent when the whole file is at fault.
+   */
+  rawKey?: string;
+  /**
+   * Why the setting will not take effect. Never contains the setting's value, which may be a token or another secret.
+   */
+  explanation: string;
+}
+/**
+ * The settings layer a problem was found in.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "UserSettingsProblemLocation".
+ */
+/** @experimental */
+export interface UserSettingsProblemLocation {
+  /**
+   * Which layer this is: `user`, `repo`, or `local`.
+   */
+  kind: string;
+  /**
+   * The caller-supplied display label for the layer.
+   */
+  label: string;
+  /**
+   * Absolute path of the file backing this layer.
+   */
+  filePath: string;
+}
+/**
+ * One already-loaded settings layer to diagnose.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "UserSettingsProblemSource".
+ */
+/** @experimental */
+export interface UserSettingsProblemSource {
+  /**
+   * Which layer this is: `user`, `repo`, or `local`.
+   */
+  kind: string;
+  /**
+   * Caller-chosen display label for the layer, echoed back on each problem so a caller can group by layer without re-deriving its own naming.
+   */
+  label: string;
+  /**
+   * Absolute path of the file backing this layer.
+   */
+  filePath: string;
+  /**
+   * The layer's settings exactly as loaded, unnormalized. Empty when the file is missing or failed to parse.
+   */
+  config?: {
+    [k: string]: unknown | undefined;
+  };
+  /**
+   * True when the file itself failed to parse, so its keys could not be read at all.
+   */
+  invalid?: boolean;
+}
+/**
+ * The settings layers to diagnose.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "UserSettingsProblemsRequest".
+ */
+/** @experimental */
+export interface UserSettingsProblemsRequest {
+  /**
+   * Layers to diagnose, in the precedence order the caller applies them.
+   */
+  sources?: UserSettingsProblemSource[];
+}
+/**
+ * The settings that will not take effect across the given layers.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "UserSettingsProblemsResult".
+ */
+/** @experimental */
+export interface UserSettingsProblemsResult {
+  /**
+   * Each setting that will not take effect, and why. Empty when every layer is healthy.
+   */
+  problems?: UserSettingsProblem[];
+}
+/**
+ * Selects the configuration directory to run the one-time staff model-selection reset against, and supplies the caller's record of whether it has already run.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "UserSettingsResetStaffModelSelectionOnceRequest".
+ */
+/** @experimental */
+/** @internal */
+export interface UserSettingsResetStaffModelSelectionOnceRequest {
+  context: UserSettingsHostContext;
+  /**
+   * Whether the signed-in account is a staff account. The reset applies only to staff, so anything other than `true` returns `didReset: false` without touching the settings document.
+   */
+  staff?: boolean;
+  /**
+   * When the caller last recorded this reset, as an ISO-8601 timestamp. A timestamp at or after the cutoff means the reset already ran and is returned unchanged.
+   */
+  staffModelResetAt?: string;
+}
+/**
+ * The outcome of the one-time staff model-selection reset.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "UserSettingsResetStaffModelSelectionOnceResult".
+ */
+/** @experimental */
+/** @internal */
+export interface UserSettingsResetStaffModelSelectionOnceResult {
+  /**
+   * Whether the persisted model selection was cleared. Only `true` means the settings document changed and the host should adopt the returned settings.
+   */
+  didReset: boolean;
+  /**
+   * The timestamp the host should now record, as an ISO-8601 timestamp. Carries the caller's own value back unchanged when nothing was reset.
+   */
+  resetAt?: string;
+  /**
+   * The cutoff this reset is gated on, as an ISO-8601 timestamp. A recorded timestamp at or after it means the reset is already done.
+   */
+  cutoff: string;
+  /**
+   * The settings document as it stands after the reset, keyed by setting name. Present only when `didReset` is true.
+   */
+  settings?: {};
+}
+/**
+ * One hook to disable or re-enable.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "UserSettingsSetHookDisabledRequest".
+ */
+/** @experimental */
+/** @internal */
+export interface UserSettingsSetHookDisabledRequest {
+  /**
+   * Path of the settings.json to rewrite.
+   */
+  settingsPath: string;
+  /**
+   * Durable content-hash key of the hook, as `hooks.loadResources` reports it.
+   */
+  disableKey: string;
+  /**
+   * True adds the key to `disabledHooks`, false removes it.
+   */
+  disabled: boolean;
+}
+/**
+ * Outcome of rewriting the `disabledHooks` setting.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "UserSettingsSetHookDisabledResult".
+ */
+/** @experimental */
+/** @internal */
+export interface UserSettingsSetHookDisabledResult {
+  /**
+   * `ok` when the setting was written, `invalid` when settings.json could not be parsed and was left alone, `error` when the write itself failed.
+   */
+  status: string;
+  /**
+   * Why the write failed. Absent when the status is `ok`.
+   */
+  errorMessage?: 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.
@@ -28400,17 +32541,120 @@ export interface UserSettingsSetRequest {
   settings: JsonValue;
 }
 /**
- * Outcome of writing user settings.
+ * Selects the configuration directory whose user settings document should be inspected for unrecognized top-level keys.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "UserSettingsUnknownKeysWarningRequest".
+ */
+/** @experimental */
+/** @internal */
+export interface UserSettingsUnknownKeysWarningRequest {
+  context: UserSettingsHostContext;
+}
+/**
+ * The unrecognized top-level keys found in the user settings document, already phrased for display.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "UserSettingsUnknownKeysWarningResult".
+ */
+/** @experimental */
+/** @internal */
+export interface UserSettingsUnknownKeysWarningResult {
+  /**
+   * The warning to show the user, naming the unrecognized keys and the file they were found in. Absent when every top-level key is recognized, and also when the document is missing or could not be read, because an unknown-key list taken from a document the runtime could not load would name keys that may not be there.
+   */
+  warning?: string;
+}
+/**
+ * Names the user setting to merge into, and the partial object to merge.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "UserSettingsUpdateRequest".
+ */
+/** @experimental */
+/** @internal */
+export interface UserSettingsUpdateRequest {
+  /**
+   * Top-level user-setting key to merge into, such as `extensions`.
+   */
+  key: string;
+  /**
+   * Value to store for `key`. When both the stored value and this value are objects, their fields are shallow-merged and fields this object does not name are preserved. Otherwise this value replaces the stored value.
+   */
+  value: JsonValue;
+  /**
+   * Copilot configuration directory to write the settings document in, taking precedence over the server's own `COPILOT_HOME` and default home. Omit it, or pass an empty string, to use the directory the server resolved for itself.
+   */
+  configDir?: string;
+  /**
+   * Single-component name for the settings document at `<configDir>/settings/<subDir>.json`; path separators, `.` and `..` are rejected. Omit it, or pass an empty string, to use the main settings document.
+   */
+  subDir?: string;
+}
+/**
+ * The stored value of the user setting after the merge.
  *
  * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
- * via the `definition` "UserSettingsSetResult".
+ * via the `definition` "UserSettingsUpdateResult".
  */
 /** @experimental */
-export interface UserSettingsSetResult {
+/** @internal */
+export interface UserSettingsUpdateResult {
   /**
-   * 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.
+   * The key's stored value after the write: the merged object when both the stored value and the supplied value are objects, otherwise the supplied value.
    */
-  shadowedKeys: string[];
+  value: JsonValue;
+}
+/**
+ * A single top-level setting subtree to validate.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "UserSettingsValidateRequest".
+ */
+/** @experimental */
+export interface UserSettingsValidateRequest {
+  /**
+   * Top-level setting name to validate.
+   */
+  topKey: string;
+  /**
+   * Value to validate. Omitted when `delete` is true.
+   */
+  value?: JsonValue;
+  /**
+   * True to validate a removal of this key. The current settings file is not read.
+   */
+  delete?: boolean;
+}
+/**
+ * Outcome of validating one top-level setting subtree.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "UserSettingsValidateResult".
+ */
+/** @experimental */
+export interface UserSettingsValidateResult {
+  /**
+   * True when the subtree is valid.
+   */
+  ok: boolean;
+  /**
+   * Problems found, empty when `ok` is true.
+   */
+  issues?: UserSettingsValidationIssue[];
+}
+/**
+ * The whole content to store in the user settings file.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "UserSettingsWriteAllRequest".
+ */
+/** @experimental */
+export interface UserSettingsWriteAllRequest {
+  /**
+   * The settings object to store. It replaces the file's entire content, so a key absent here is removed.
+   */
+  settings: JsonValue;
 }
 /**
  * Current sharing status and shareable GitHub URL for a session.
@@ -29478,6 +33722,23 @@ export interface WorkflowToolRunRequest {
    */
   toolCallId?: string;
 }
+/**
+ * Complete text used to generate one session diff. These are display contents, with the same text decoding as the patch, not a file-restore contract.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "WorkspaceDiffContents".
+ */
+/** @experimental */
+export interface WorkspaceDiffContents {
+  /**
+   * Complete text before the session first changed the file. Omitted when the file did not exist; an empty string represents an existing empty file.
+   */
+  before?: string;
+  /**
+   * Complete current text read when computing the diff. Omitted for a deleted file; an empty string represents an existing empty file.
+   */
+  after?: string;
+}
 /**
  * A single changed file and its unified diff.
  *
@@ -29503,6 +33764,7 @@ export interface WorkspaceDiffFileChange {
    * Whether the diff content was omitted because it exceeded the per-file size limit.
    */
   isTruncated?: boolean;
+  contents?: WorkspaceDiffContents;
 }
 /**
  * Workspace diff result for the requested mode.
@@ -29657,6 +33919,10 @@ export interface WorkspacesDiffRequest {
    * When true, ignore whitespace-only changes (git `--ignore-all-space`). Defaults to false.
    */
   ignoreWhitespace?: boolean;
+  /**
+   * Include the full before/after text used to compute each session diff. Defaults to false; true is accepted only for session mode. Existing capture/read limits still apply, and binary or unavailable contents are not returned. This can substantially increase response size.
+   */
+  includeContents?: boolean;
 }
 /**
  * Optional session context used when creating a local workspace.
@@ -30020,6 +34286,102 @@ export interface WorkspacesWriteAutopilotObjectiveResult {
    */
   operation: string;
 }
+/**
+ * The effective sandbox settings, with every unset value resolved to its default.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SandboxSettingsApplyDefaultsResult".
+ */
+/** @experimental */
+export interface SandboxSettingsApplyDefaultsResult {
+  /**
+   * One resolved sandbox setting's value, carried verbatim.
+   */
+  [k: string]: JsonValue | undefined;
+}
+/**
+ * The stored user settings document, keyed by setting name.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "UserSettingsLoadForConfigDirResult".
+ */
+/** @experimental */
+export interface UserSettingsLoadForConfigDirResult {
+  /**
+   * One setting's stored value, carried verbatim.
+   */
+  [k: string]: JsonValue | undefined;
+}
+/**
+ * The effective runtime settings, keyed by setting name. Keys this runtime does not recognize are preserved rather than dropped, so a caller reading a document written by a newer runtime keeps every value.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "UserSettingsBuildRuntimeResult".
+ */
+/** @experimental */
+export interface UserSettingsBuildRuntimeResult {
+  /**
+   * One resolved setting's effective value, carried verbatim.
+   */
+  [k: string]: JsonValue | undefined;
+}
+/**
+ * The resolved gates, keyed by flag name.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "FeatureFlagsResolveStartupGatesResult".
+ */
+/** @experimental */
+export interface FeatureFlagsResolveStartupGatesResult {
+  /**
+   * Whether the gate is on for this installation.
+   */
+  [k: string]: boolean | undefined;
+}
+/**
+ * The resolved feature flags, keyed by flag name.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "FeatureFlagsResolveResult".
+ */
+/** @experimental */
+export interface FeatureFlagsResolveResult {
+  /**
+   * Whether the flag is enabled for this population.
+   */
+  [k: string]: boolean | undefined;
+}
+/**
+ * Ordered managed permission verdicts and the supplied policy's fail-closed posture.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ManagedSettingsPermissionsEvaluateResult".
+ */
+/** @experimental */
+export interface ManagedSettingsPermissionsEvaluateResult {
+  /**
+   * One verdict per input operation, in the same order, including duplicates.
+   */
+  results: ManagedPermissionEvaluation[];
+  /**
+   * Managed permission policy could not be determined; every operation is denied.
+   */
+  failClosed: boolean;
+}
+/**
+ * Managed policy context and ordered operations for pure, sessionless evaluation.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "ManagedSettingsPermissionsEvaluateRequest".
+ */
+/** @experimental */
+export interface ManagedSettingsPermissionsEvaluateRequest {
+  context: ManagedPermissionsContext;
+  /**
+   * Operations to evaluate, preserving input order and duplicates. An empty batch is valid.
+   */
+  operations: ManagedPermissionOperation[];
+}
 /**
  * The resident session the application has materialized on its own connection.
  *
@@ -30049,6 +34411,11 @@ export interface HostCreateSessionRequest {
    * Resume an app-owned durable session instead of creating a new session.
    */
   resume?: boolean;
+  /**
+   * For an explicit publication, borrow an existing owning-connection resident
+   * instead of invoking the resume factory. Cold sessions still use the factory.
+   */
+  preferResident?: boolean;
   /**
    * Host-selected SDK creation or resume settings, without executable callbacks or tools.
    */
@@ -30143,6 +34510,20 @@ export interface SessionWorkflowPauseAtCheckpointResult {
   action: WorkflowPauseCheckpointAction;
 }
 
+/** @experimental */
+export interface SessionModelClearStartupSeedResult {
+  cleared: boolean;
+}
+
+/** @experimental */
+export interface SessionModelClearStartupSeedRequest {
+  expectedModel: string;
+  /**
+   * Provider captured with the startup seed; omission matches only an unqualified seed.
+   */
+  expectedProviderId?: string;
+}
+
 /** @experimental */
 export interface SessionModelListRequest {
   /**
@@ -30323,6 +34704,141 @@ export interface SessionHistoryCompactRequest {
    */
   tokenLimit?: number;
 }
+/**
+ * Internal absolute code-change totals reported by the owning host.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SessionUsageSetCodeChangesRequest".
+ */
+/** @experimental */
+export interface SessionUsageSetCodeChangesRequest {
+  /**
+   * Absolute added-line total, replacing the previous reading.
+   */
+  linesAdded: number;
+  /**
+   * Absolute removed-line total, replacing the previous reading.
+   */
+  linesRemoved: number;
+  /**
+   * Absolute changed-file count; omission preserves the previous count.
+   */
+  filesCount?: number;
+}
+/**
+ * The incumbent session-owned quota and account projection.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SessionQuotaGetResult".
+ */
+/** @experimental */
+export interface SessionQuotaGetResult {
+  /**
+   * Known quota snapshots, keyed by the provider's quota type.
+   */
+  snapshots: {
+    [k: string]: SessionQuotaSnapshot | undefined;
+  };
+  /**
+   * Provider-owned account quota state, including snapshots without numeric balances.
+   */
+  providerQuotas?: ProviderQuotaState[];
+  /**
+   * Whether the account uses the free limited Copilot plan.
+   */
+  isFreeUser: boolean;
+  /**
+   * Whether the account uses token-based billing.
+   */
+  isTbbUser: boolean;
+  planTier: SessionQuotaPlanTier;
+  /**
+   * Whether premium-request costs are billable.
+   */
+  premiumRequestsBillable: boolean;
+  /**
+   * Whether model cost columns should be shown.
+   */
+  modelCostColumnVisible: boolean;
+  /**
+   * Whether the account can delegate tasks to GitHub.
+   */
+  delegateAvailable: boolean;
+  /**
+   * Whether the account can sign up for Copilot Free.
+   */
+  canSignupForCopilotFree: boolean;
+  /**
+   * Whether dynamic workflows are enabled for the active account.
+   */
+  dynamicWorkflowsEnabled: boolean;
+  /**
+   * Whether dynamic workflows are visible under the session's feature flags.
+   */
+  dynamicWorkflowsUiVisible: boolean;
+  /**
+   * Upgrade link for a free account.
+   */
+  upgradeUrl?: string;
+  delegateWarning?: SessionQuotaDelegateWarning;
+}
+/**
+ * The incumbent session-owned quota and account projection.
+ *
+ * This interface was referenced by `_RpcSchemaRoot`'s JSON-Schema
+ * via the `definition` "SessionQuotaRefreshResult".
+ */
+/** @experimental */
+export interface SessionQuotaRefreshResult {
+  /**
+   * Known quota snapshots, keyed by the provider's quota type.
+   */
+  snapshots: {
+    [k: string]: SessionQuotaSnapshot | undefined;
+  };
+  /**
+   * Provider-owned account quota state, including snapshots without numeric balances.
+   */
+  providerQuotas?: ProviderQuotaState[];
+  /**
+   * Whether the account uses the free limited Copilot plan.
+   */
+  isFreeUser: boolean;
+  /**
+   * Whether the account uses token-based billing.
+   */
+  isTbbUser: boolean;
+  planTier: SessionQuotaPlanTier;
+  /**
+   * Whether premium-request costs are billable.
+   */
+  premiumRequestsBillable: boolean;
+  /**
+   * Whether model cost columns should be shown.
+   */
+  modelCostColumnVisible: boolean;
+  /**
+   * Whether the account can delegate tasks to GitHub.
+   */
+  delegateAvailable: boolean;
+  /**
+   * Whether the account can sign up for Copilot Free.
+   */
+  canSignupForCopilotFree: boolean;
+  /**
+   * Whether dynamic workflows are enabled for the active account.
+   */
+  dynamicWorkflowsEnabled: boolean;
+  /**
+   * Whether dynamic workflows are visible under the session's feature flags.
+   */
+  dynamicWorkflowsUiVisible: boolean;
+  /**
+   * Upgrade link for a free account.
+   */
+  upgradeUrl?: string;
+  delegateWarning?: SessionQuotaDelegateWarning;
+}
 
 /** @experimental */
 export interface SessionLimitPredictionPredictRequest {
@@ -30515,119 +35031,26 @@ export interface InstallationsConfirmRequest {
 /** Create typed server-scoped RPC methods (no session required). */
 export function createServerRpc(connection: MessageConnection) {
     return {
-        /** @experimental */
-        environments: {
-            /**
-             * Lists GitHub Mission Control environments visible to the authenticated identity. Does not require a running host and excludes host relay credentials.
-             *
-             * @param params Optional discovery filters supported by GitHub Mission Control.
-             *
-             * @returns Environments visible to the authenticated caller and matching the supplied filters.
-             */
-            list: async (params: EnvironmentsListRequest): Promise<EnvironmentsListResult> =>
-                connection.sendRequest("environments.list", params),
-            /**
-             * Gets safe discovery information for a GitHub Mission Control environment without requiring a running host.
-             *
-             * @param params Identify a Mission Control environment to retrieve.
-             *
-             * @returns Safe discovery information for the requested environment.
-             */
-            get: async (params: EnvironmentsGetRequest): Promise<EnvironmentsGetResult> =>
-                connection.sendRequest("environments.get", params),
-            /**
-             * Deletes a user-managed GitHub Mission Control environment. GitHub-managed environments cannot be deleted. Does not stop a running host, which may register again.
-             *
-             * @param params Identify a user-managed Mission Control environment to delete.
-             *
-             * @returns Acknowledgement that the requested environment was deleted.
-             */
-            delete: async (params: EnvironmentsDeleteRequest): Promise<EnvironmentsDeleteResult> =>
-                connection.sendRequest("environments.delete", params),
-        },
-        /** @experimental */
-        host: {
-            /**
-             * Publishes an attached resident session for this listener's lifetime without copying it.
-             *
-             * @param params Publishes a resident session attached to the listener's owning connection.
-             *
-             * @returns The existing runtime identity and its resource on the listener.
-             */
-            publishSession: async (params: HostPublishSessionRequest): Promise<HostPublishSessionResult> =>
-                connection.sendRequest("host.publishSession", params),
-            /**
-             * Starts a connection-owned AHP host with explicit localServer and/or githubEnvironment transports as a supervised SDK participant.
-             *
-             * @param params Starts a supervised AHP host with at least one explicitly selected transport.
-             *
-             * @returns Listener readiness, returned only after binding and the supervised participant's SDK handshake.
-             */
-            start: async (params: HostStartRequest): Promise<HostStartResult> =>
-                connection.sendRequest("host.start", params),
-            /**
-             * Stops a listener owned by this SDK connection and joins its cleanup without deleting sessions.
-             *
-             * @param params Stops a connection-owned listener and joins its teardown.
-             *
-             * @returns Empty acknowledgement for a completed host lifecycle operation.
-             */
-            dispose: async (params: HostDisposeRequest): Promise<HostDisposeResult> =>
-                connection.sendRequest("host.dispose", params),
-        },
-        /**
-         * Checks server responsiveness and returns protocol information.
-         *
-         * @param params Optional message to echo back to the caller.
-         *
-         * @returns Server liveness response, including the echoed message, current server timestamp, and protocol version.
-         *
-         * @experimental
-         */
-        ping: async (params: PingRequest): Promise<PingResult> =>
-            connection.sendRequest("ping", params),
-        /** @experimental */
-        hooks: {
-            /**
-             * Discovers hook actions enabled under server-side discovery settings from user, repository, plugin, and managed-policy sources.
-             *
-             * @param params Optional project paths and host-exclusion behavior for server-scoped hook discovery.
-             *
-             * @returns Server-discovered hook actions and partial-load diagnostics from user, repository, plugin, and managed-policy sources. Concrete sessions may include additional session-specific hook sources.
-             */
-            discover: async (params: HooksDiscoverRequest): Promise<HooksDiscoverResult> =>
-                connection.sendRequest("hooks.discover", params),
-        },
-        /** @experimental */
-        models: {
-            /**
-             * Lists Copilot models available to the authenticated user.
-             *
-             * @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.
-             */
-            list: async (params: ModelsListRequest): Promise<ModelList> =>
-                connection.sendRequest("models.list", params),
-            /**
-             * Returns the running runtime's complete catalog of well-known built-in model IDs without authentication or network access.
-             *
-             * @returns The running runtime's complete catalog of well-known built-in model IDs, including supported models and additional IDs with built-in metadata.
-             */
-            getBuiltInCatalog: async (): Promise<BuiltInModelCatalog> =>
-                connection.sendRequest("models.getBuiltInCatalog", {}),
-        },
         /** @experimental */
         sandbox: {
-            /**
-             * Reports whether the host running this runtime can run the command sandbox, without starting a session or spawning a sandboxed command.
-             *
-             * @returns Whether the host running this runtime can run the command sandbox. The runtime checks `supported` once per process. A capability answer can change while the process runs, for example after the user installs a missing package.
-             */
-            getHostSupport: async (): Promise<SandboxHostSupport> =>
-                connection.sendRequest("sandbox.getHostSupport", {}),
             /** @experimental */
             proxyCa: {
+                /**
+                 * Reports whether this runtime process can offer installing the sandbox credential-proxy certificate authority into OS trust.
+                 *
+                 * @returns True when this process can offer installing the sandbox credential-proxy certificate authority into OS trust.
+                 */
+                checkInstallationSupport: async (): Promise<SandboxProxyCaCheckInstallationSupportResult> =>
+                    connection.sendRequest("sandbox.proxyCa.checkInstallationSupport", {}),
+                /**
+                 * Reports whether this sandbox configuration uses the credential proxy and can need certificate-authority setup.
+                 *
+                 * @param params Identifies the credential hosts that the persistent certificate authority of the sandbox credential proxy must cover. The runtime always adds the hosts from the saved user settings.
+                 *
+                 * @returns True when the sandbox configuration uses the credential proxy and can need certificate-authority setup.
+                 */
+                checkRelevance: async (params: SandboxProxyCaRequest): Promise<SandboxProxyCaCheckRelevanceResult> =>
+                    connection.sendRequest("sandbox.proxyCa.checkRelevance", params),
                 /**
                  * Reports whether the persistent certificate authority of the sandbox credential proxy exists, whether OS trust includes it, and whether it must be rotated. Changes nothing.
                  *
@@ -30672,6 +35095,205 @@ export function createServerRpc(connection: MessageConnection) {
                 remove: async (): Promise<SandboxProxyCaStatus> =>
                     connection.sendRequest("sandbox.proxyCa.remove", {}),
             },
+            /**
+             * Reports whether the host running this runtime can run the command sandbox, without starting a session or spawning a sandboxed command.
+             *
+             * @returns Whether the host running this runtime can run the command sandbox. The runtime checks `supported` once per process. A capability answer can change while the process runs, for example after the user installs a missing package.
+             */
+            getHostSupport: async (): Promise<SandboxHostSupport> =>
+                connection.sendRequest("sandbox.getHostSupport", {}),
+        },
+        /** @experimental */
+        user: {
+            /** @experimental */
+            settings: {
+                /**
+                 * Lists every known user setting from settings.json, each with its effective value, its default, and whether it is at the default — so settings the user has never set still appear with their default value. Does not include repository- or enterprise-managed overrides that the runtime layers on top at session time.
+                 *
+                 * @returns Per-key metadata for every known user setting in settings.json, including settings left at their default. Excludes repository- and enterprise-managed overrides.
+                 */
+                get: async (): Promise<UserSettingsGetResult> =>
+                    connection.sendRequest("user.settings.get", {}),
+                /**
+                 * Writes one or more user settings to settings.json, replacing each provided top-level key. A key whose value is null is removed.
+                 *
+                 * @param params 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.
+                 */
+                set: async (params: UserSettingsSetRequest): Promise<void> =>
+                    connection.sendRequest("user.settings.set", params),
+            },
+        },
+        /** @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. `managedSettings.resolve` returns the same device settings together with the account's server policy.
+             *
+             * @returns Validated device-managed settings discovered before a session exists.
+             */
+            read: async (): Promise<ManagedSettingsReadResult> =>
+                connection.sendRequest("managedSettings.read", {}),
+            /**
+             * Force-refreshes enterprise managed settings for every account: wipes the persistent server-policy cache (the whole `<cacheHome>/managed-settings` directory) and drops this runtime process's in-memory retained server policy. It does not itself fetch policy — the effect is that the next time a session resolves managed settings for an account, that resolution re-fetches the account's org policy from the network instead of serving a cached response. Note that `managedSettings.read` returns only device/MDM settings and never triggers the account server-policy fetch, so a host implementing "sync account policy" should call `managedSettings.resolve` or start a fresh session resolution rather than treat a subsequent `managedSettings.read` as the refreshed org policy. Mirrors the invalidation a sign-out performs, broadened from the one signing-out account to all of them; device/MDM layers describe the machine, not the account, and are left untouched. Rejects if the on-disk cache cannot be removed.
+             */
+            clearCache: async (): Promise<void> =>
+                connection.sendRequest("managedSettings.clearCache", {}),
+            /**
+             * Resolves the effective enterprise managed settings without a session, from the device channel and, when an account is available, the account's server policy through the same per-account cache sessions use. A cached server policy less than an hour old is used without a fetch; otherwise the policy is fetched, and when the fetch fails a cached policy up to 24 hours old is used instead, unless `forceRemoteSettingsRefresh` requires a live fetch. With no account requested or signed in, it reports device policy only; signing out removes the account's cached policy. It can fetch server policy over the network when the cache is stale, so call it off latency-critical paths such as startup rather than before listing models. The policy helper is not run. `layers` lists each channel's document before merging, and `values` and `meta` carry typed effective values and their lock state for the keys typed so far.
+             *
+             * @param params Optional opaque account selection or GitHub token whose managed settings are resolved.
+             *
+             * @returns Effective enterprise managed settings for an account, resolved without a session.
+             */
+            resolve: async (params: ManagedSettingsResolveRequest): Promise<ManagedSettingsResolveResult> =>
+                connection.sendRequest("managedSettings.resolve", params),
+            /** @experimental */
+            permissions: {
+                /**
+                 * Pure, sessionless evaluation of operations against a supplied permissionsContext. Performs no policy discovery, I/O, prompting, navigation, permission grants, or sandbox changes. Obtain the context from managedSettings.resolve or session.managedSettings.get, or reuse an in-memory context. Results preserve input order and duplicates. Consumers must block deny, obtain approval for ask, and use their normal permission flow for unmanaged. Unknown policy returns failClosed with every operation denied. This is not a substitute for user permissions or other security controls.
+                 *
+                 * @param params Managed policy context and ordered operations for pure, sessionless evaluation.
+                 *
+                 * @returns Ordered managed permission verdicts and the supplied policy's fail-closed posture.
+                 */
+                evaluate: async (params: ManagedSettingsPermissionsEvaluateRequest): Promise<ManagedSettingsPermissionsEvaluateResult> =>
+                    connection.sendRequest("managedSettings.permissions.evaluate", params),
+            },
+            /**
+             * Returns the managed-settings authoring JSON schema with descriptive `x-composition` annotations aligned with the shared settings-engine vocabulary. These annotations are not a complete runtime composition contract: model, effortLevel, and contextTier remain coupled. Use `managedSettings.compose` for the runtime's effective result. Performs no I/O.
+             *
+             * @returns The authoring JSON schema for managed settings recognized by this runtime.
+             */
+            schema: async (): Promise<ManagedSettingsSchemaResult> =>
+                connection.sendRequest("managedSettings.schema", {}),
+            /**
+             * Validates a candidate managed-settings document the way the runtime validates delivered policy, without applying it. Reports errors that would reject the document, warnings for content the runtime ignores, and the canonical document it would apply. Document text nested more than 64 levels deep is rejected. Performs no I/O.
+             *
+             * @param params A candidate managed-settings document to validate without applying it.
+             *
+             * @returns Result of validating a managed-settings document.
+             */
+            validate: async (params: ManagedSettingsValidateRequest): Promise<ManagedSettingsValidateResult> =>
+                connection.sendRequest("managedSettings.validate", params),
+            /**
+             * Merges candidate managed-settings documents for the device, server, and policy-helper channels into the effective settings the runtime would enforce on this host, using the same precedence and composition rules as live resolution, without applying them. Like live resolution, a server's advisory sandbox force-enable is declined on a host that cannot run the sandbox. Does not fetch policy or read policy files, but may perform blocking OS or subprocess probes for sandbox support. Preview documents are limited to 1 MiB and 64 levels of nesting.
+             *
+             * @param params Candidate managed-settings documents to merge without applying them.
+             *
+             * @returns The effective managed settings the runtime would enforce for the given documents, in the same shape `managedSettings.resolve` returns.
+             */
+            compose: async (params: ManagedSettingsComposeRequest): Promise<ManagedSettingsComposeResult> =>
+                connection.sendRequest("managedSettings.compose", params),
+        },
+        /** @experimental */
+        environments: {
+            /**
+             * Lists GitHub Mission Control environments visible to the authenticated identity. Does not require a running host and excludes host relay credentials.
+             *
+             * @param params Optional discovery filters supported by GitHub Mission Control.
+             *
+             * @returns Environments visible to the authenticated caller and matching the supplied filters.
+             */
+            list: async (params: EnvironmentsListRequest): Promise<EnvironmentsListResult> =>
+                connection.sendRequest("environments.list", params),
+            /**
+             * Gets safe discovery information for a GitHub Mission Control environment without requiring a running host.
+             *
+             * @param params Identify a Mission Control environment to retrieve.
+             *
+             * @returns Safe discovery information for the requested environment.
+             */
+            get: async (params: EnvironmentsGetRequest): Promise<EnvironmentsGetResult> =>
+                connection.sendRequest("environments.get", params),
+            /**
+             * Deletes a user-managed GitHub Mission Control environment. GitHub-managed environments cannot be deleted. Does not stop a running host, which may register again.
+             *
+             * @param params Identify a user-managed Mission Control environment to delete.
+             *
+             * @returns Acknowledgement that the requested environment was deleted.
+             */
+            delete: async (params: EnvironmentsDeleteRequest): Promise<EnvironmentsDeleteResult> =>
+                connection.sendRequest("environments.delete", params),
+        },
+        /** @experimental */
+        host: {
+            /**
+             * Publishes an attached resident session for this listener's lifetime without copying it.
+             *
+             * @param params Publishes a resident session attached to the listener's owning connection.
+             *
+             * @returns The existing runtime identity and its resource on the listener.
+             */
+            publishSession: async (params: HostPublishSessionRequest): Promise<HostPublishSessionResult> =>
+                connection.sendRequest("host.publishSession", params),
+            /**
+             * Reads the complete advertised live and dormant session catalog of an existing host owned by this connection. Does not start hosting, subscribe to sessions, or guarantee resumability.
+             *
+             * @param params Reads a running host's catalog or the runtime's saved default catalog.
+             *
+             * @returns The complete live and dormant advertised catalog, without subscribing to sessions.
+             */
+            listSessions: async (params: HostListSessionsRequest): Promise<HostListSessionsResult> =>
+                connection.sendRequest("host.listSessions", params),
+            /**
+             * Starts a connection-owned AHP host with explicit localServer and/or githubEnvironment transports as a supervised SDK participant.
+             *
+             * @param params Starts a supervised AHP host with at least one explicitly selected transport.
+             *
+             * @returns Listener readiness, returned only after binding and the supervised participant's SDK handshake.
+             */
+            start: async (params: HostStartRequest): Promise<HostStartResult> =>
+                connection.sendRequest("host.start", params),
+            /**
+             * Stops a listener owned by this SDK connection and joins its cleanup without deleting sessions.
+             *
+             * @param params Stops a connection-owned listener and joins its teardown.
+             *
+             * @returns Empty acknowledgement for a completed host lifecycle operation.
+             */
+            dispose: async (params: HostDisposeRequest): Promise<HostDisposeResult> =>
+                connection.sendRequest("host.dispose", params),
+        },
+        /**
+         * Checks server responsiveness and returns protocol information.
+         *
+         * @param params Optional message to echo back to the caller.
+         *
+         * @returns Server liveness response, including the echoed message, current server timestamp, and protocol version.
+         *
+         * @experimental
+         */
+        ping: async (params: PingRequest): Promise<PingResult> =>
+            connection.sendRequest("ping", params),
+        /** @experimental */
+        hooks: {
+            /**
+             * Discovers hook actions enabled under server-side discovery settings from user, repository, plugin, and managed-policy sources.
+             *
+             * @param params Optional project paths and host-exclusion behavior for server-scoped hook discovery.
+             *
+             * @returns Server-discovered hook actions and partial-load diagnostics from user, repository, plugin, and managed-policy sources. Concrete sessions may include additional session-specific hook sources.
+             */
+            discover: async (params: HooksDiscoverRequest): Promise<HooksDiscoverResult> =>
+                connection.sendRequest("hooks.discover", params),
+        },
+        /** @experimental */
+        models: {
+            /**
+             * Lists Copilot models available to the authenticated user.
+             *
+             * @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.
+             */
+            list: async (params: ModelsListRequest): Promise<ModelList> =>
+                connection.sendRequest("models.list", params),
+            /**
+             * Returns the running runtime's complete catalog of well-known built-in model IDs without authentication or network access.
+             *
+             * @returns The running runtime's complete catalog of well-known built-in model IDs, including supported models and additional IDs with built-in metadata.
+             */
+            getBuiltInCatalog: async (): Promise<BuiltInModelCatalog> =>
+                connection.sendRequest("models.getBuiltInCatalog", {}),
         },
         /** @experimental */
         tools: {
@@ -30912,6 +35534,27 @@ export function createServerRpc(connection: MessageConnection) {
                 connection.sendRequest("extensions.disable", params),
         },
         /** @experimental */
+        instructions: {
+            /**
+             * Discovers instruction sources across user, repository, and plugin sources.
+             *
+             * @param params Optional project paths to include in instruction discovery.
+             *
+             * @returns Instruction sources discovered across user, repository, and plugin sources.
+             */
+            discover: async (params: InstructionsDiscoverRequest): Promise<ServerInstructionSourceList> =>
+                connection.sendRequest("instructions.discover", params),
+            /**
+             * Returns the canonical files and directories where a client may create custom instructions that the runtime will recognize, including ones that do not exist yet. Repository targets become active once created.
+             *
+             * @param params Optional project paths to include when enumerating instruction discovery targets.
+             *
+             * @returns Canonical files and directories where custom instructions can be created so the runtime will recognize them.
+             */
+            getDiscoveryPaths: async (params: InstructionsGetDiscoveryPathsRequest): Promise<InstructionDiscoveryPathList> =>
+                connection.sendRequest("instructions.getDiscoveryPaths", params),
+        },
+        /** @experimental */
         skills: {
             /**
              * Plans installation of a verified Agent Finder Skill candidate without writing files. The returned review is safe to present to a user and installing always leaves the Skill disabled until separately enabled.
@@ -31195,27 +35838,6 @@ export function createServerRpc(connection: MessageConnection) {
                 connection.sendRequest("agents.getDiscoveryPaths", params),
         },
         /** @experimental */
-        instructions: {
-            /**
-             * Discovers instruction sources across user, repository, and plugin sources.
-             *
-             * @param params Optional project paths to include in instruction discovery.
-             *
-             * @returns Instruction sources discovered across user, repository, and plugin sources.
-             */
-            discover: async (params: InstructionsDiscoverRequest): Promise<ServerInstructionSourceList> =>
-                connection.sendRequest("instructions.discover", params),
-            /**
-             * Returns the canonical files and directories where a client may create custom instructions that the runtime will recognize, including ones that do not exist yet. Repository targets become active once created.
-             *
-             * @param params Optional project paths to include when enumerating instruction discovery targets.
-             *
-             * @returns Canonical files and directories where custom instructions can be created so the runtime will recognize them.
-             */
-            getDiscoveryPaths: async (params: InstructionsGetDiscoveryPathsRequest): Promise<InstructionDiscoveryPathList> =>
-                connection.sendRequest("instructions.getDiscoveryPaths", params),
-        },
-        /** @experimental */
         commands: {
             /**
              * Lists the well-known built-in slash commands that work as the first message in a new session (e.g. /plan, /env), without requiring an active session. Commands that depend on session state, authentication, or a synced session are omitted.
@@ -31226,82 +35848,6 @@ export function createServerRpc(connection: MessageConnection) {
                 connection.sendRequest("commands.list", {}),
         },
         /** @experimental */
-        user: {
-            /** @experimental */
-            settings: {
-                /**
-                 * Drops this runtime process's in-memory user settings cache so the next settings read observes disk.
-                 */
-                reload: async (): Promise<void> =>
-                    connection.sendRequest("user.settings.reload", {}),
-                /**
-                 * Lists every known user setting (settings.json overlaid with the legacy config.json, config.json wins), each with its effective value, its default, and whether it is at the default — so settings the user has never set still appear with their default value. Does not include repository- or enterprise-managed overrides that the runtime layers on top at session time.
-                 *
-                 * @returns 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.
-                 */
-                get: async (): Promise<UserSettingsGetResult> =>
-                    connection.sendRequest("user.settings.get", {}),
-                /**
-                 * Writes one or more user settings to settings.json, replacing each provided top-level key. A key whose value is null is removed. Returns the keys whose new value is shadowed by a legacy config.json entry (config.json wins on read), which the runtime leaves in place — such writes do not take effect until the legacy value is removed.
-                 *
-                 * @param params 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.
-                 *
-                 * @returns Outcome of writing user settings.
-                 */
-                set: async (params: UserSettingsSetRequest): Promise<UserSettingsSetResult> =>
-                    connection.sendRequest("user.settings.set", params),
-            },
-        },
-        /** @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. `managedSettings.resolve` returns the same device settings together with the account's server policy.
-             *
-             * @returns Validated device-managed settings discovered before a session exists.
-             */
-            read: async (): Promise<ManagedSettingsReadResult> =>
-                connection.sendRequest("managedSettings.read", {}),
-            /**
-             * Force-refreshes enterprise managed settings for every account: wipes the persistent server-policy cache (the whole `<cacheHome>/managed-settings` directory) and drops this runtime process's in-memory retained server policy. It does not itself fetch policy — the effect is that the next time a session resolves managed settings for an account, that resolution re-fetches the account's org policy from the network instead of serving a cached response. Note that `managedSettings.read` returns only device/MDM settings and never triggers the account server-policy fetch, so a host implementing "sync account policy" should call `managedSettings.resolve` or start a fresh session resolution rather than treat a subsequent `managedSettings.read` as the refreshed org policy. Mirrors the invalidation a sign-out performs, broadened from the one signing-out account to all of them; device/MDM layers describe the machine, not the account, and are left untouched. Rejects if the on-disk cache cannot be removed.
-             */
-            clearCache: async (): Promise<void> =>
-                connection.sendRequest("managedSettings.clearCache", {}),
-            /**
-             * Resolves the effective enterprise managed settings without a session, from the device channel and, when an account is available, the account's server policy through the same per-account cache sessions use. A cached server policy less than an hour old is used without a fetch; otherwise the policy is fetched, and when the fetch fails a cached policy up to 24 hours old is used instead, unless `forceRemoteSettingsRefresh` requires a live fetch. With no account requested or signed in, it reports device policy only; signing out removes the account's cached policy. It can fetch server policy over the network when the cache is stale, so call it off latency-critical paths such as startup rather than before listing models. The policy helper is not run. `layers` lists each channel's document before merging, and `values` and `meta` carry typed effective values and their lock state for the keys typed so far.
-             *
-             * @param params Optional opaque account selection or GitHub token whose managed settings are resolved.
-             *
-             * @returns Effective enterprise managed settings for an account, resolved without a session.
-             */
-            resolve: async (params: ManagedSettingsResolveRequest): Promise<ManagedSettingsResolveResult> =>
-                connection.sendRequest("managedSettings.resolve", params),
-            /**
-             * Returns the managed-settings authoring JSON schema with descriptive `x-composition` annotations aligned with the shared settings-engine vocabulary. These annotations are not a complete runtime composition contract: model, effortLevel, and contextTier remain coupled. Use `managedSettings.compose` for the runtime's effective result. Performs no I/O.
-             *
-             * @returns The authoring JSON schema for managed settings recognized by this runtime.
-             */
-            schema: async (): Promise<ManagedSettingsSchemaResult> =>
-                connection.sendRequest("managedSettings.schema", {}),
-            /**
-             * Validates a candidate managed-settings document the way the runtime validates delivered policy, without applying it. Reports errors that would reject the document, warnings for content the runtime ignores, and the canonical document it would apply. Document text nested more than 64 levels deep is rejected. Performs no I/O.
-             *
-             * @param params A candidate managed-settings document to validate without applying it.
-             *
-             * @returns Result of validating a managed-settings document.
-             */
-            validate: async (params: ManagedSettingsValidateRequest): Promise<ManagedSettingsValidateResult> =>
-                connection.sendRequest("managedSettings.validate", params),
-            /**
-             * Merges candidate managed-settings documents for the device, server, and policy-helper channels into the effective settings the runtime would enforce on this host, using the same precedence and composition rules as live resolution, without applying them. Like live resolution, a server's advisory sandbox force-enable is declined on a host that cannot run the sandbox. Does not fetch policy or read policy files, but may perform blocking OS or subprocess probes for sandbox support. Preview documents are limited to 1 MiB and 64 levels of nesting.
-             *
-             * @param params Candidate managed-settings documents to merge without applying them.
-             *
-             * @returns The effective managed settings the runtime would enforce for the given documents, in the same shape `managedSettings.resolve` returns.
-             */
-            compose: async (params: ManagedSettingsComposeRequest): Promise<ManagedSettingsComposeResult> =>
-                connection.sendRequest("managedSettings.compose", params),
-        },
-        /** @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.
@@ -31585,6 +36131,41 @@ export function createServerRpc(connection: MessageConnection) {
             spawn: async (params: AgentRegistrySpawnRequest): Promise<AgentRegistrySpawnResult> =>
                 connection.sendRequest("agentRegistry.spawn", params),
         },
+        /** @experimental */
+        connectors: {
+            /**
+             * Returns feature availability.
+             *
+             * @returns Feature availability.
+             */
+            getCapabilities: async (): Promise<ConnectorDiscoveryCapabilities> =>
+                connection.sendRequest("connectors.getCapabilities", {}),
+            /**
+             * Returns eligible accounts.
+             *
+             * @returns Eligible accounts.
+             */
+            getAccounts: async (): Promise<ConnectorDiscoveryAccountList> =>
+                connection.sendRequest("connectors.getAccounts", {}),
+            /**
+             * Lists entries for the selected account.
+             *
+             * @param params Selected account.
+             *
+             * @returns Entries for the selected account.
+             */
+            list: async (params: ConnectorDiscoveryAccountRequest): Promise<ConnectorDiscoveryCatalogResult> =>
+                connection.sendRequest("connectors.list", params),
+            /**
+             * Refreshes entries for the selected account.
+             *
+             * @param params Selected account.
+             *
+             * @returns Entries for the selected account.
+             */
+            refresh: async (params: ConnectorDiscoveryAccountRequest): Promise<ConnectorDiscoveryCatalogResult> =>
+                connection.sendRequest("connectors.refresh", params),
+        },
     };
 }
 
@@ -31595,6 +36176,554 @@ export function createServerRpc(connection: MessageConnection) {
  */
 export function createInternalServerRpc(connection: MessageConnection) {
     return {
+        /** @experimental */
+        sandbox: {
+            /** @experimental */
+            proxySecret: {
+                /**
+                 * Reports where this runtime keeps the sandbox proxy password: the credential store directory and the entry identifier within it. Both are derived from the configuration directory this runtime was started with, so a host does not resolve them itself. Read this to recognize a `${secret:…}` value in stored sandbox settings as this runtime's own proxy password rather than a reference the user wrote by hand. Marked internal because it exists to carry a CLI call site off the napi boundary onto the SDK contract.
+                 *
+                 * @returns Where this runtime keeps the sandbox proxy password.
+                 */
+                getLocation: async (): Promise<SandboxProxySecretLocation> =>
+                    connection.sendRequest("sandbox.proxySecret.getLocation", {}),
+                /**
+                 * Reads the stored sandbox proxy password from the credential store `sandbox.proxySecret.getLocation` names, preferring the OS keychain and falling back to the on-disk store. Reports an absent value rather than failing when no entry exists. Marked internal because it exists to carry a CLI call site off the napi boundary onto the SDK contract.
+                 *
+                 * @returns The stored sandbox proxy password, if one is present.
+                 */
+                get: async (): Promise<SandboxProxySecretGetResult> =>
+                    connection.sendRequest("sandbox.proxySecret.get", {}),
+                /**
+                 * Stores the sandbox proxy password in the credential store `sandbox.proxySecret.getLocation` names, replacing any existing entry. Reports whether the OS keychain accepted it or it fell back to the on-disk store. Marked internal because it exists to carry a CLI call site off the napi boundary onto the SDK contract.
+                 *
+                 * @param params The sandbox proxy password to store.
+                 *
+                 * @returns Where the sandbox proxy password was stored.
+                 */
+                save: async (params: SandboxProxySecretSaveRequest): Promise<SandboxProxySecretSaveResult> =>
+                    connection.sendRequest("sandbox.proxySecret.save", params),
+                /**
+                 * Removes the stored sandbox proxy password from the credential store `sandbox.proxySecret.getLocation` names. Succeeds when no entry exists, so it is safe to call while clearing a proxy password whose origin is unknown. Marked internal because it exists to carry a CLI call site off the napi boundary onto the SDK contract.
+                 */
+                delete: async (): Promise<void> =>
+                    connection.sendRequest("sandbox.proxySecret.delete", {}),
+            },
+            /** @experimental */
+            settings: {
+                /**
+                 * Resolves a stored sandbox settings object into the effective one, filling every value the user left unset with its default. Read this to render or reason about the sandbox configuration a session would actually run under, rather than the sparse document the user wrote.
+                 *
+                 * @param params The stored sandbox settings to resolve against the defaults.
+                 *
+                 * @returns The effective sandbox settings, with every unset value resolved to its default.
+                 */
+                applyDefaults: async (params: SandboxApplyDefaultsRequest): Promise<SandboxSettingsApplyDefaultsResult> =>
+                    connection.sendRequest("sandbox.settings.applyDefaults", params),
+            },
+            /**
+             * Raises a user's sandbox settings to an administrator's managed sandbox floor and returns the result a session should actually run under. The floor can only tighten: an enterprise force-on is reflected even when the user's own `enabled` is false, and a user cannot lower a setting the floor raised. The result is normalized through the declared sandbox shape, so a key reorder or an undeclared passthrough key is not mistaken for a policy change by callers that diff two results. A host must call this rather than merge the two layers itself, because reimplementing the direction of the fold is what turns an administrator's floor into a suggestion.
+             *
+             * @param params The user's sandbox settings and the managed sandbox floor to raise them to.
+             *
+             * @returns The user's sandbox settings raised to the managed floor.
+             */
+            resolveFlooredConfig: async (params: SandboxResolveFlooredConfigParams): Promise<SandboxResolveFlooredConfigResult> =>
+                connection.sendRequest("sandbox.resolveFlooredConfig", params),
+            /**
+             * Builds the effective filesystem policy one `@`-file picker checks its suggestions against, so Git discovery and grant canonicalization run once for the picker's lifetime instead of on every debounced keystroke. Returns no policy when the sandbox is absent or disabled, which the paired filter reads as "keep every candidate". A host must pair this with `sandbox.filterPickerCandidates` rather than resolve a grant list itself, because the picker's grants are narrower than a file tool's — the same path a built-in tool may read can be one the picker must not offer.
+             *
+             * @param params The working directory and sandbox settings to build a file-picker policy from.
+             *
+             * @returns The prepared file-picker policy, or none when the sandbox is disabled.
+             */
+            preparePickerPolicy: async (params: SandboxPreparePickerPolicyParams): Promise<SandboxPreparePickerPolicyResult> =>
+                connection.sendRequest("sandbox.preparePickerPolicy", params),
+            /**
+             * Checks a batch of `@`-file picker suggestions against a policy prepared by `sandbox.preparePickerPolicy` and returns one allow decision per candidate, positionally aligned with the request. Batched deliberately: each check canonicalizes a path component-by-component through the real filesystem, so one call amortizes that over a single hop rather than dozens while the user types. A directory the policy does not itself allow can still be kept as a waypoint to an allowed subtree. An absent policy keeps every candidate.
+             *
+             * @param params A batch of file-picker candidates to check against a prepared policy.
+             *
+             * @returns Per-candidate allow decisions, positionally aligned with the request.
+             */
+            filterPickerCandidates: async (params: SandboxFilterPickerCandidatesParams): Promise<SandboxFilterPickerCandidatesResult> =>
+                connection.sendRequest("sandbox.filterPickerCandidates", params),
+            /**
+             * The sandbox a single named feature actually launches under, which is not the same as the session's sandbox. A feature is routed out of the sandbox by its own flag — `sandboxMcpServers`, `sandboxLspServers` — so an enabled session can still start one server confined and another free. Returns a disabled sandbox rather than an error when the host has no sandbox slice at all, so an absent config and an opted-out feature read alike at the launch site. A host must ask per feature rather than reuse the session config, because reading only `enabled` confines a server the user opted out of, or reports as sandboxed one that is not.
+             *
+             * @param params A sandbox config and the per-feature routing flag to resolve it for.
+             *
+             * @returns The sandbox a named feature actually launches under.
+             */
+            resolveForOptional: async (params: SandboxEffectiveForOptionalParams): Promise<SandboxEffectiveForOptionalResult> =>
+                connection.sendRequest("sandbox.resolveForOptional", params),
+            /**
+             * Reports whether this machine can run an OS-level command sandbox at all. A host must ask before it offers sandboxing, because the answer is a property of the machine rather than of any setting: on Linux it depends on bubblewrap being installed, and on Windows on the OS build supporting BaseContainer. Probing it requires spawning a process the first time, so the answer is cached for the life of the runtime. A host that assumes support and enables the sandbox anyway produces a session in which every shell command fails.
+             *
+             * @returns True when an OS-level sandbox can run on this host.
+             */
+            checkPlatformSupport: async (): Promise<SandboxCheckPlatformSupportResult> =>
+                connection.sendRequest("sandbox.checkPlatformSupport", {}),
+            /**
+             * Reports whether this Windows host's BaseContainer implementation can reach the host's loopback interface directly, which is what a local-network policy needs to avoid routing through the egress proxy. Like `sandbox.checkPlatformSupport`, the answer is a property of the machine's OS build rather than of any setting, and resolving it the first time spawns a platform probe. A host that offers the direct local-network option on a machine that lacks the capability produces a session whose sandboxed commands cannot reach local services. Always false off Windows.
+             *
+             * @returns True when the sandbox on this host can reach host loopback directly.
+             */
+            checkWindowsHostLoopbackSupport: async (): Promise<SandboxCheckWindowsHostLoopbackSupportResult> =>
+                connection.sendRequest("sandbox.checkWindowsHostLoopbackSupport", {}),
+            /**
+             * The explanation a host shows when it refuses an explicit request to turn the sandbox on for a machine that cannot run one. Carries the platform-specific remedy — install bubblewrap, update Windows — and the documentation link, so a host that got `false` from `sandbox.checkPlatformSupport` does not have to compose its own reason and cannot describe the same machine differently from the runtime's own spawn path.
+             *
+             * @returns The user-facing refusal, including the platform remedy and the documentation link.
+             */
+            getUnsupportedMessage: async (): Promise<SandboxGetUnsupportedMessageResult> =>
+                connection.sendRequest("sandbox.getUnsupportedMessage", {}),
+            /**
+             * The notice a host shows when a stored `sandbox` setting is being ignored for this session because the machine cannot enforce it. Distinct from `sandbox.getUnsupportedMessage`, which refuses an explicit request: this one reports that a setting the user already saved is inert, states that commands will run unsandboxed, and confirms the stored setting itself is left alone. A host that stays silent here leaves the user believing a sandbox is active.
+             *
+             * @returns The user-facing notice that a saved sandbox setting is inert for this session.
+             */
+            getUnsupportedSettingDisabledNotice: async (): Promise<SandboxGetUnsupportedSettingDisabledNoticeResult> =>
+                connection.sendRequest("sandbox.getUnsupportedSettingDisabledNotice", {}),
+            /**
+             * The warning a host prints at startup when a session asked for a sandbox on a machine that cannot run one. The third of the unsupported notices, and the only one that depends on the policy in force: it names the remedy the reader can actually act on, which is the stored setting for an unmanaged host, an administrator for a managed one, and waiting for the policy to resolve when the sandbox stayed on only because the policy could not be determined. Returns no notice when the machine does support a sandbox, so a host can call it unconditionally on the startup path. A host that composes its own warning tells a managed user to change a setting their policy will overwrite.
+             *
+             * @param params The managed sandbox policy in force, which selects which remedy the notice offers.
+             *
+             * @returns The startup warning, absent when the machine can run a sandbox.
+             */
+            getUnsupportedStartupNotice: async (params: SandboxUnsupportedStartupNoticeParams): Promise<SandboxUnsupportedStartupNoticeResult> =>
+                connection.sendRequest("sandbox.getUnsupportedStartupNotice", params),
+            /**
+             * Whether one slash command stays reachable while sandbox enforcement is unavailable and the session is otherwise blocked. The permitted set is deliberately narrow — commands that only report state, and the few that let the user repair or leave the situation — and it is keyed on the arguments as well as the name, so `/sandbox status` is admitted where `/sandbox enable` is not. A host must ask rather than keep its own list: a command this returns false for is one the runtime would refuse anyway, and a divergent list either strands the user with no way out or admits a command that acts on an unenforced session.
+             *
+             * @param params One slash command, as typed, to test against the enforcement-block allowlist.
+             *
+             * @returns True when the command stays available while enforcement is blocked.
+             */
+            checkEnforcementCommand: async (params: SandboxEnforcementCommandAllowedParams): Promise<SandboxCheckEnforcementCommandResult> =>
+                connection.sendRequest("sandbox.checkEnforcementCommand", params),
+            /**
+             * Returns the documentation URL a host should point a user at when it declines or downgrades a sandbox setting. The runtime owns the address so every surface cites the same page and a host does not hard-code a link that later moves.
+             *
+             * @returns The documentation URL a host cites when it declines or downgrades a sandbox setting.
+             */
+            getDocsUrl: async (): Promise<SandboxDocsUrlResult> =>
+                connection.sendRequest("sandbox.getDocsUrl", {}),
+        },
+        /** @experimental */
+        persistence: {
+            /**
+             * Atomically replaces a JSON file's entire contents while holding the runtime's per-path lock. The lock lives in the runtime process, so a host that writes these files itself takes no part in it and can tear a concurrent runtime write; route the write here instead. Unlike a merging write this never reads or parses the existing file, so a previously corrupted snapshot is replaced wholesale rather than failing every later write. Use it only for callers that always persist a complete snapshot.
+             *
+             * @param params A complete JSON snapshot to write under the runtime's per-path file lock.
+             *
+             * @returns The outcome of a locked snapshot write.
+             */
+            writeRawJsonLocked: async (params: PersistenceWriteRawJsonLockedRequest): Promise<PersistenceWriteRawJsonLockedResult> =>
+                connection.sendRequest("persistence.writeRawJsonLocked", params),
+        },
+        /** @experimental */
+        user: {
+            /** @experimental */
+            settings: {
+                /**
+                 * Adds or removes one hook key in the user `disabledHooks` setting, rewriting settings.json in place and leaving every other setting untouched. Reports a typed outcome rather than failing the call, so a host can tell an unparseable settings file apart from a write that could not complete.
+                 *
+                 * @param params One hook to disable or re-enable.
+                 *
+                 * @returns Outcome of rewriting the `disabledHooks` setting.
+                 */
+                setHookDisabled: async (params: UserSettingsSetHookDisabledRequest): Promise<UserSettingsSetHookDisabledResult> =>
+                    connection.sendRequest("user.settings.setHookDisabled", params),
+                /**
+                 * Reads the user's settings document exactly as `user.settings.load` does, but from a caller-supplied configuration directory instead of the one the server resolved for itself. Use this when a consumer scopes a session to its own Copilot home — the SDK's per-session `configDir` override — so the settings read match the directory that session actually uses. An absent or empty `configDir` resolves the server's own home, making this identical to `user.settings.load`. Hook-validation relaxations are deliberately not caller-supplied: they continue to come from the server's environment, so a consumer cannot widen the host's hook policy through this method.
+                 *
+                 * @param params Selects the configuration directory whose user settings to read.
+                 *
+                 * @returns The stored user settings document, keyed by setting name.
+                 */
+                loadForConfigDir: async (params: UserSettingsLoadForConfigDirRequest): Promise<UserSettingsLoadForConfigDirResult> =>
+                    connection.sendRequest("user.settings.loadForConfigDir", params),
+                /**
+                 * Reads a repository's checked-in settings document as stored, normalized, together with any diagnostic raised while reading it. This is the repository half of the layering `user.settings.get` reports: `user.settings.load` reads the user's own document, and this reads the one a repository checks in to govern the keys `user.settings.governanceKeys` lists as repo-governable. A document that fails to parse, or that sets a key a repository may not govern, is reported through `warning` while the settings that did load are still returned, so a consumer surfaces the diagnostic and continues rather than failing the session. When `repoRoot` is the user's home directory the Claude-compatible configuration is skipped, so a home-directory session does not inherit a personal config as repository policy.
+                 *
+                 * @param params Selects the repository whose checked-in settings to read.
+                 *
+                 * @returns A repository's settings as stored, together with any diagnostic raised while reading them.
+                 */
+                loadRepo: async (params: UserSettingsLoadRepoRequest): Promise<UserSettingsLoadRepoResult> =>
+                    connection.sendRequest("user.settings.loadRepo", params),
+                /**
+                 * Reads a repository's settings and merges them over a supplied user layer in one step, returning the settings a consumer should act on inside that repository. Use this rather than reading the two layers separately: the merge is per setting and collection-aware, so a repository adds to the collections it is allowed to influence without replacing the user's own entries, and a whole-document overlay would get that wrong. Any diagnostic raised while reading the repository layer is returned rather than printed, so the consumer decides how to surface it; the settings that did load are merged regardless.
+                 *
+                 * @param params A repository to read settings from, and the user layer they are merged over.
+                 *
+                 * @returns The settings a consumer should act on inside a repository, together with any diagnostic raised while reading the repository layer.
+                 */
+                loadAndMergeRepo: async (params: UserSettingsLoadAndMergeRepoRequest): Promise<UserSettingsLoadAndMergeRepoResult> =>
+                    connection.sendRequest("user.settings.loadAndMergeRepo", params),
+                /**
+                 * Reports the on-disk path of the settings document `user.settings.load` and `user.settings.set` read and write. Resolved the same way those methods resolve it, so a host that shows or opens the settings file names the file the runtime actually uses, including the extensionless legacy `settings` file when that is what is present.
+                 *
+                 * @returns The on-disk location of the user's settings document.
+                 */
+                getPath: async (): Promise<UserSettingsPathResult> =>
+                    connection.sendRequest("user.settings.getPath", {}),
+                /**
+                 * Reads the user's stored settings together with the diagnostic raised while reading them. This is `user.settings.load` plus the reason part of the document was ignored: that one answers the document alone, so a caller cannot tell a clean read from a salvaged one. Read this when the caller is about to write the file back, where accepting a partial parse would discard every value the loader could not read. The settings that did load are still reported alongside the warning, so a consumer may surface it and continue instead of failing.
+                 *
+                 * @returns The user's stored settings, together with any diagnostic raised while reading them.
+                 */
+                loadWithWarning: async (): Promise<UserSettingsLoadWithWarningResult> =>
+                    connection.sendRequest("user.settings.loadWithWarning", {}),
+                /**
+                 * Folds a user settings layer over a managed (enterprise policy) layer and returns the merged settings. The managed layer's governance keys win, `autoTier` resolves through its overridable form, and the two per-entry control maps (`enabledPlugins`, `extraKnownMarketplaces`) union across the layers and are then stamped back from the managed layer, so each entry an administrator declares wins while the user keeps control of the rest. The parameters are named for their layers rather than being a generic base/override pair: nothing about a settings object identifies which layer produced it, so the runtime cannot detect a transposed call, and transposing one resolves the governance keys in the user's favour instead of the administrator's. Supplying only one layer returns it unchanged, and supplying neither returns an empty object. Rejects a managed `autoTier` that is neither a user-configurable tier nor a single-key overridable form, rather than silently dropping it.
+                 *
+                 * @param params The managed (enterprise policy) layer and the user layer to fold together. The field names carry the layer identity: nothing about a settings object identifies which layer produced it, so a generic base/override pair would let a caller transpose them and silently resolve the governance keys in the user's favour.
+                 *
+                 * @returns The user layer folded over the managed layer.
+                 */
+                mergeManagedAndUser: async (params: UserSettingsMergeManagedAndUserParams): Promise<UserSettingsMergeManagedAndUserResult> =>
+                    connection.sendRequest("user.settings.mergeManagedAndUser", params),
+                /**
+                 * Folds a repository's settings layer into the user layer. Each repo-overridable key carries a directional policy chosen so a repository can only add restrictions and never relax the user's own. The two per-entry managed control maps are the exception those directional rules cannot express — a repository may legitimately enable plugins and declare marketplaces — so they are re-stamped afterwards from the runtime's ambient managed policy. That makes the result depend on the runtime process's managed state and not on the arguments alone: a host must call this rather than reimplement the fold, or a repository could relax a restriction the administrator imposed. Rejects when either layer is not a JSON object.
+                 *
+                 * @param params The user layer and the repository layer to fold together.
+                 *
+                 * @returns The repository layer folded into the user layer.
+                 */
+                mergeRepoValue: async (params: UserSettingsMergeRepoValueParams): Promise<UserSettingsMergeRepoValueResult> =>
+                    connection.sendRequest("user.settings.mergeRepoValue", params),
+                /**
+                 * Runs the one-time migration that moves a staff account's update channel to stable, and records that it ran. Idempotent and self-gating: it takes a lock over the global-state file, re-reads the completion stamp inside it, and returns `current` rather than migrating twice, so two hosts racing at startup cannot both migrate. Only a `migrated` status means the persisted settings changed and the caller should reload them. An account on the experimental channel is deliberately left alone and reported as `excluded-experimental`.
+                 *
+                 * @param params The filesystem and environment facts a user-settings file is resolved from. Passed explicitly rather than read from the runtime's own process, so a host whose configuration directory differs from its process environment resolves the file it means.
+                 *
+                 * @returns The outcome of the one-time staff update-channel migration.
+                 */
+                migrateStaffUpdateChannelOnce: async (params: UserSettingsHostContext): Promise<UserSettingsMigrateStaffUpdateChannelOnceResult> =>
+                    connection.sendRequest("user.settings.migrateStaffUpdateChannelOnce", params),
+                /**
+                 * Runs the one-time reset that clears a staff account's pinned model selection, and reports the timestamp the host should record. Idempotent and self-gating: the reset is gated on a fixed cutoff, so a caller that passes back the timestamp it recorded gets `didReset: false` rather than a second reset. It applies to staff accounts only; any other account is reported as not reset without the settings document being opened. Only `didReset: true` means the persisted settings changed, and only then are the updated settings returned for the host to adopt.
+                 *
+                 * @param params Selects the configuration directory to run the one-time staff model-selection reset against, and supplies the caller's record of whether it has already run.
+                 *
+                 * @returns The outcome of the one-time staff model-selection reset.
+                 */
+                resetStaffModelSelectionOnce: async (params: UserSettingsResetStaffModelSelectionOnceRequest): Promise<UserSettingsResetStaffModelSelectionOnceResult> =>
+                    connection.sendRequest("user.settings.resetStaffModelSelectionOnce", params),
+                /**
+                 * Reports the top-level keys in the user settings document that the runtime does not recognize, phrased for display to the user. This is a separate question from the warning `user.settings.loadWithWarning` returns: that one describes parts of the document the loader had to ignore to load the rest, whereas an unknown key parses cleanly and is simply not a setting, so a host that surfaces only the load warning silently accepts a misspelled key that will never take effect. Nothing is reported when the document is absent, unreadable, or failed to load, because an unknown-key list derived from a document the runtime could not read would be misleading rather than helpful. Inspection never modifies the document.
+                 *
+                 * @param params Selects the configuration directory whose user settings document should be inspected for unrecognized top-level keys.
+                 *
+                 * @returns The unrecognized top-level keys found in the user settings document, already phrased for display.
+                 */
+                getUnknownKeysWarning: async (params: UserSettingsUnknownKeysWarningRequest): Promise<UserSettingsUnknownKeysWarningResult> =>
+                    connection.sendRequest("user.settings.getUnknownKeysWarning", params),
+                /**
+                 * Resolves the effective runtime settings for a host that is about to start a session, layering the given overrides over the settings documents, the environment and the platform defaults. A host cannot assemble this itself: the precedence between a user document, a repository document, the managed layers and the environment is the runtime's own rule, and a host that re-implements it drifts from the server it is configuring. The working directory, environment and platform are taken as arguments rather than read from the server process, so a host resolving settings for a directory other than its own gets that directory's answer. Nothing is written; this only computes.
+                 *
+                 * @param params The overrides and host context to resolve effective runtime settings from.
+                 *
+                 * @returns The effective runtime settings, keyed by setting name. Keys this runtime does not recognize are preserved rather than dropped, so a caller reading a document written by a newer runtime keeps every value.
+                 */
+                buildRuntime: async (params: UserSettingsBuildRuntimeRequest): Promise<UserSettingsBuildRuntimeResult> =>
+                    connection.sendRequest("user.settings.buildRuntime", params),
+                /**
+                 * Runs the one-time migration that moves a staff account's log level to the current default, and records that it ran. Idempotent and self-gating: it takes a lock over the global-state file and re-reads the completion stamp inside it, so two hosts racing at startup cannot both migrate. Only `refreshed` can have changed the persisted settings, and the settings it returns are the document re-read after the write, so a host should adopt them rather than reloading separately and racing the next writer.
+                 *
+                 * @param params Selects the configuration directory to run the one-time staff log-level migration against, and supplies the caller's record of whether it has already run.
+                 *
+                 * @returns The outcome of the one-time staff log-level migration.
+                 */
+                migrateStaffLogLevelOnce: async (params: UserSettingsMigrateStaffLogLevelOnceRequest): Promise<UserSettingsMigrateStaffLogLevelOnceResult> =>
+                    connection.sendRequest("user.settings.migrateStaffLogLevelOnce", params),
+                /**
+                 * Runs the one-time cleanup that removes obsolete CLI-owned settings and legacy rubber-duck keys from the user's settings document, and reports what it did. Idempotent and safe to call on every startup: with nothing obsolete left it reports `unchanged` and writes nothing. The cleanup preserves every key it does not recognize, so a setting written by a newer host is never dropped by an older one, and a document that fails to parse is reported `invalid` and left untouched rather than rewritten from a partial read. The cleaned document is not returned: it is written before this replies, so `user.settings.load` reads it authoritatively. A host that surfaces unrecognized keys through `user.settings.unknownKeys` wants this first, because the keys this retires would otherwise be shown to the user as if they were misspelled settings.
+                 *
+                 * @param params Selects the configuration directory whose settings document to clean.
+                 *
+                 * @returns The outcome of the one-time obsolete-settings cleanup.
+                 */
+                migrateObsoleteOnDisk: async (params: UserSettingsMigrateObsoleteOnDiskRequest): Promise<UserSettingsMigrateObsoleteOnDiskResult> =>
+                    connection.sendRequest("user.settings.migrateObsoleteOnDisk", params),
+                /**
+                 * Resolves the on-disk locations of the settings files this runtime reads, so a consumer can show or open them. The user path is the same file `user.settings.get`, `user.settings.load`, and `user.settings.set` operate on. Supply `repoRoot` to also resolve that repository's checked-in and local settings paths. A path is reported whether or not the file exists.
+                 *
+                 * @param params Selects which settings file paths to resolve.
+                 *
+                 * @returns On-disk locations of the settings files this runtime reads. A path is reported whether or not the file exists.
+                 */
+                getPaths: async (params: UserSettingsGetPathsRequest): Promise<UserSettingsGetPathsResult> =>
+                    connection.sendRequest("user.settings.getPaths", params),
+                /**
+                 * Lists the top-level user-setting keys by who is allowed to govern them: `repo` keys a repository may override through `.github/copilot/settings.json`, `claudeRepo` keys a repository may override through a Claude-compatible config, and `managed` keys an enterprise policy may fix. The lists are static for a given runtime build and fail closed: a key absent from a list cannot be governed that way.
+                 *
+                 * @returns Top-level user-setting keys grouped by who may govern them.
+                 */
+                listGovernanceKeys: async (): Promise<UserSettingsGovernanceKeysResult> =>
+                    connection.sendRequest("user.settings.listGovernanceKeys", {}),
+                /**
+                 * Atomically edits one canonical user setting inside its settings-file lock. Reads, canonicalizes touched aliases, applies the edit, validates the resulting top-level setting and writes before releasing the lock. An explicit autoUpdatesChannel set completes the staff migration in the same transaction. Only a malformed existing file returns `invalid`; refused keys, invalid values and I/O errors reject the call.
+                 *
+                 * @param params One atomic edit of a canonical setting in settings.json.
+                 *
+                 * @returns Outcome of an atomic user or repository settings edit.
+                 */
+                edit: async (params: UserSettingsEditRequest): Promise<SettingsEditResult> =>
+                    connection.sendRequest("user.settings.edit", params),
+                /**
+                 * Rewrites legacy and snake_case setting names in a settings object to their canonical spelling. A caller editing settings.json must normalize before writing: a legacy key left in place survives the write, is re-normalized on the next load, and silently shadows the canonical value the write just stored.
+                 *
+                 * @param params Settings object whose key names should be canonicalized.
+                 *
+                 * @returns Settings object with canonical key names.
+                 */
+                normalize: async (params: UserSettingsNormalizeRequest): Promise<UserSettingsNormalizeResult> =>
+                    connection.sendRequest("user.settings.normalize", params),
+                /**
+                 * Diagnoses a set of already-loaded settings layers, reporting each key that will not take effect and why. Settings load tolerantly so that one bad key does not stop a session from starting; this method surfaces what was dropped so a caller can report it instead of silently ignoring the user's intent. Takes the layers as given rather than reading them, so a caller can diagnose exactly the content it is showing, including unsaved edits. Never echoes a setting's value, because a value may be a token or another secret. Marked internal because it exists to carry a CLI call site off the native addon, not to serve a consumer-facing need; it becomes public once an SDK consumer needs to inspect settings health itself.
+                 *
+                 * @param params The settings layers to diagnose.
+                 *
+                 * @returns The settings that will not take effect across the given layers.
+                 */
+                diagnoseProblems: async (params: UserSettingsProblemsRequest): Promise<UserSettingsProblemsResult> =>
+                    connection.sendRequest("user.settings.diagnoseProblems", params),
+                /**
+                 * Validates one top-level setting subtree and writes just that key to settings.json as a single step. Doing both here closes the race a caller cannot close itself: between a separate preflight read and the write, the file may change. Rewriting only the touched key keeps legacy siblings out of settings.json. Answers a status rather than failing, so a validation problem and a write problem stay distinguishable.
+                 *
+                 * @param params A single top-level setting subtree to validate and write.
+                 *
+                 * @returns Outcome of validating and writing one top-level setting subtree.
+                 */
+                applyTopKey: async (params: UserSettingsApplyTopKeyRequest): Promise<UserSettingsApplyTopKeyResult> =>
+                    connection.sendRequest("user.settings.applyTopKey", params),
+                /**
+                 * Replaces the user settings file's entire content in one write. A key absent from `settings` is removed, which is what distinguishes this from `user.settings.set`: that one merges, so it can never clear a key the caller has dropped. For a caller saving the result of a raw edit, a merge would silently resurrect every key the user deleted. Records the same one-time mutation marks a per-key write records, so a setting the user has now chosen explicitly stops being migrated for them.
+                 *
+                 * @param params The whole content to store in the user settings file.
+                 */
+                writeAll: async (params: UserSettingsWriteAllRequest): Promise<void> =>
+                    connection.sendRequest("user.settings.writeAll", params),
+                /**
+                 * Merges a partial object into one top-level user setting, re-reading the stored value inside this runtime process's settings.json write lock so that concurrent writers in this process to different sub-fields of the same key do not clobber each other. Unlike `user.settings.set`, which replaces a key's whole value with what the caller last read, this keeps sub-fields the caller did not name when both the stored value and supplied value are objects; otherwise the supplied value replaces the stored value. Use it whenever two independent surfaces own different sub-fields of one setting. Returns the key's stored value after the write, in `value`.
+                 *
+                 * @param params Names the user setting to merge into, and the partial object to merge.
+                 *
+                 * @returns The stored value of the user setting after the merge.
+                 */
+                update: async (params: UserSettingsUpdateRequest): Promise<UserSettingsUpdateResult> =>
+                    connection.sendRequest("user.settings.update", params),
+                /**
+                 * Reads settings.json as stored for a caller that is about to edit it. Unlike `user.settings.get`, this returns file values rather than per-key metadata and defaults. Reports `missing` for an absent file and `invalid` when the existing file will not parse. Retired config.json and extensionless files are not read.
+                 *
+                 * @returns Contents of settings.json as stored, for a caller about to rewrite it.
+                 */
+                loadForEdit: async (): Promise<UserSettingsLoadForEditResult> =>
+                    connection.sendRequest("user.settings.loadForEdit", {}),
+                /**
+                 * Validates one top-level setting subtree without writing it, reporting each problem with the path it applies to. Scoped to a single top-level key on purpose: validating the whole file would reject an edit whenever an unrelated pre-existing field is malformed, locking the user out of the very tool that could fix it.
+                 *
+                 * @param params A single top-level setting subtree to validate.
+                 *
+                 * @returns Outcome of validating one top-level setting subtree.
+                 */
+                validate: async (params: UserSettingsValidateRequest): Promise<UserSettingsValidateResult> =>
+                    connection.sendRequest("user.settings.validate", params),
+            },
+        },
+        /** @experimental */
+        repo: {
+            /** @experimental */
+            settings: {
+                /**
+                 * Atomically edits one allowed top-level repository setting. Reads the raw file, preserves unrelated keys, applies one scalar or list edit, validates the result and writes under one file lock, so concurrent sibling or list edits are not lost. A malformed or unsafe existing file returns `invalid` without a write; rejected keys, invalid values and I/O errors reject the call.
+                 *
+                 * @param params One atomic edit of an allowed top-level repository setting.
+                 *
+                 * @returns Outcome of an atomic user or repository settings edit.
+                 */
+                edit: async (params: RepoSettingsEditRequest): Promise<SettingsEditResult> =>
+                    connection.sendRequest("repo.settings.edit", params),
+                /**
+                 * Reads one repository settings file without settings normalization or layering. The existing JSONC parser accepts comments and trailing commas and applies its prototype-safety rules. Missing or blank files return an empty valid config. Invalid files return an empty config with invalid=true; other read failures reject.
+                 *
+                 * @param params Which repository settings file to read.
+                 *
+                 * @returns Parsed repository settings without normalization or layering.
+                 */
+                readRaw: async (params: RepoSettingsReadRawRequest): Promise<RepoSettingsReadRawResult> =>
+                    connection.sendRequest("repo.settings.readRaw", params),
+                /**
+                 * Writes or removes one allowed top-level repository setting through the existing validator and file lock. Preserves unrelated stored keys. Invalid keys, values, existing documents, and I/O errors reject without replacing the file. Deletion requires delete=true; otherwise value must be present.
+                 *
+                 * @param params One key to write or remove in a repository settings file.
+                 */
+                writeKey: async (params: RepoSettingsWriteKeyRequest): Promise<void> =>
+                    connection.sendRequest("repo.settings.writeKey", params),
+                /**
+                 * Replaces the repository-overridable settings in one locked write. Allowed keys present in settings are validated and written; allowed keys absent from settings are removed. Other input keys are ignored, and unknown keys already stored in the file remain unchanged. Invalid values or an invalid existing file reject without a partial write.
+                 *
+                 * @param params The complete set of repository-overridable settings to store.
+                 */
+                writeAll: async (params: RepoSettingsWriteAllRequest): Promise<void> =>
+                    connection.sendRequest("repo.settings.writeAll", params),
+            },
+        },
+        /** @experimental */
+        featureFlags: {
+            /**
+             * Resolves named gates against this installation's cached online-experiment assignment, for the account the runtime is already authenticated as. Unlike `featureFlags.resolve`, which layers static availability with the populations supplied, this reads the experiment assignment the runtime cached for its own current authentication, so a launch can honor a rollout before any session exists. The account is never taken from the request: naming one would read another account's cached assignments. The cached assignment answers immediately and any network refresh happens behind it, so this call does not wait on the network. Not available to an extension, which cannot carry the user's consent to read their assignment.
+             *
+             * @param params Caller population and startup inputs to resolve named online-experiment gates for. Carries no account: the runtime resolves the assignment for the authentication it already holds.
+             *
+             * @returns The resolved gates, keyed by flag name.
+             */
+            resolveStartupGates: async (params: FeatureFlagsResolveStartupGatesRequest): Promise<FeatureFlagsResolveStartupGatesResult> =>
+                connection.sendRequest("featureFlags.resolveStartupGates", params),
+            /**
+             * Lists every feature flag this runtime declares, with the population each one is declared for, its experimental description, and the online-experiment flag it maps to. This is the static catalog: it describes how each flag is defined, not whether it is on for anyone. Use `featureFlags.resolve` for static values with caller overrides, not active runtime values or experiment assignments.
+             *
+             * @returns Every feature flag this runtime declares, with the shape each one was declared with.
+             */
+            listMetadata: async (): Promise<FeatureFlagsMetadataResult> =>
+                connection.sendRequest("featureFlags.listMetadata", {}),
+            /**
+             * Computes static feature flags from the supplied population and overrides without changing runtime state or verifying audience membership. Starts from declared availability, then applies direct feature-flag environment values, user settings, and explicit `flagOverrides`. It does not apply `COPILOT_EXP_*` experiment assignments, authenticated startup gates, or active runtime state. Settings include `enabledFeatureFlags`, the legacy `feature_flags.enabled` list, and supported convenience settings. Supply `baseFlags` to use an existing flag set instead of declared availability. Omit `isStaffGitHub` or `isStaffMicrosoft` when membership was never recorded: a legacy staff account then counts as both populations.
+             *
+             * @param params Caller population and overrides for static feature-flag resolution, independent of experiment assignments and active runtime state.
+             *
+             * @returns The resolved feature flags, keyed by flag name.
+             */
+            resolve: async (params: FeatureFlagsResolveRequest): Promise<FeatureFlagsResolveResult> =>
+                connection.sendRequest("featureFlags.resolve", params),
+        },
+        /** @experimental */
+        permissions: {
+            /** @experimental */
+            locations: {
+                /**
+                 * Drops stored per-location permission grants whose directory no longer exists, and reports which location keys were removed. Runs against the permission store under the runtime's own Copilot home, the same store `session.permissions.locations.resolve` reads. Marked internal because it exists to carry a CLI call site off the napi boundary onto the SDK contract; it is migration plumbing, not a surface consumers are meant to depend on. It can become public once an SDK consumer needs to prune its own permission store.
+                 *
+                 * @returns Which stored location permissions were dropped because their directory is gone.
+                 */
+                cleanupOrphaned: async (): Promise<LocationPermissionsCleanupResult> =>
+                    connection.sendRequest("permissions.locations.cleanupOrphaned", {}),
+            },
+            /** @experimental */
+            folderTrust: {
+                /**
+                 * Reports whether a folder is trusted, reading the persisted trusted-folders list directly rather than through a session. Use this from a host that has no session yet, such as a one-shot command deciding whether to honor a checkout's own settings. It differs from the session-scoped check in two ways that matter: it takes the configuration directory to read the list from, instead of inheriting the session's, and it answers only from the persisted list, so trust a user granted for the lifetime of one session is not visible here. A host that has a session should prefer the session-scoped check, which also covers session-only trust.
+                 *
+                 * @param params A folder to check against a persisted trusted-folders list, and the configuration directory holding that list.
+                 *
+                 * @returns Folder trust check result.
+                 */
+                checkTrust: async (params: FolderTrustIsTrustedParams): Promise<FolderTrustCheckResult> =>
+                    connection.sendRequest("permissions.folderTrust.checkTrust", params),
+            },
+            /**
+             * Interprets a verbatim managed `permissions` slice into the three policy questions a host asks before granting elevated permissions: whether bypass-permissions mode is forbidden, whether a policy exists that this build could not determine, and whether the layer supplies permission rules the session must enforce. An absent or empty slice means no managed policy applies. The runtime and its permission service share one policy type, so a new managed permission setting is interpreted in exactly one place; a host that reimplements the reading would silently diverge the first time that set grows. Hosts must fail closed on an undetermined policy rather than treating it as permission granted.
+             *
+             * @param params The verbatim managed `permissions` slice to interpret.
+             *
+             * @returns The policy questions a host asks before granting elevated permissions.
+             */
+            evaluateManagedPolicy: async (params: PermissionsEvaluateManagedPolicyParams): Promise<PermissionsEvaluateManagedPolicyResult> =>
+                connection.sendRequest("permissions.evaluateManagedPolicy", params),
+        },
+        /** @experimental */
+        managedSettings: {
+            /**
+             * Discovers device-managed settings the way the runtime's own device layer does, and reports the sandbox floor and the load outcome alongside the validated document. This differs from `managedSettings.read` in three ways a policy-enforcing host depends on: a document that validates to an empty object is reported as absent rather than as an empty policy, a discovery error does not suppress a document that still validates, and a failure is reported as a flag rather than only as error text. Hosts that compose the device layer into an effective policy use this, because `managedSettings.read` cannot distinguish "no device policy" from "device policy could not be read" and would silently hand the user's own layer the win.
+             *
+             * @returns The device-managed settings layer, with the sandbox floor and the load outcome a host needs to compose it into an effective policy.
+             */
+            readDevice: async (): Promise<ManagedSettingsReadDeviceResult> =>
+                connection.sendRequest("managedSettings.readDevice", {}),
+            /**
+             * Retains the supplied managed layers as this runtime process's startup policy and re-applies the result to every live session. Hosts that own their own short-lived process policy use this, so a guarded mutation is checked against the policy the host actually fetched. Retaining is a whole-process replacement rather than a merge, so a host that already resolved a good policy must not retain a partial one over it. The failure flags are honest inputs rather than assumptions: reporting a fetch or load that failed keeps the layers already retained, and the interim fail-closed state, instead of clearing them.
+             *
+             * @param params The managed layers to retain as this process's startup policy, with the outcome of fetching each one.
+             */
+            retainPolicy: async (params: ManagedSettingsRetainPolicyParams): Promise<void> =>
+                connection.sendRequest("managedSettings.retainPolicy", params),
+            /**
+             * Stamps an effective managed policy's individually-controlled entries onto a user settings document, returning the settings a host should actually act on. The managed layer wins on every plugin spec and marketplace name it names, and leaves everything it does not name as the user wrote it. Hosts use this rather than merging the two documents themselves, because the merge is per entry rather than per document and a whole-document overlay would either discard the user's unmanaged entries or let a user entry outrank a managed one. Omitting the managed layer returns the settings unchanged, which is what an unmanaged host wants. Rejects when either document is present but is not a JSON object rather than treating it as absent, since silently dropping a malformed policy hands the user's layer the win on exactly the entries the policy exists to control.
+             *
+             * @param params A user settings document and the effective managed policy whose controlled entries should be stamped onto it.
+             *
+             * @returns The user settings with the managed layer's controlled entries stamped on.
+             */
+            applyControls: async (params: ManagedSettingsApplyControlsParams): Promise<ManagedSettingsApplyControlsResult> =>
+                connection.sendRequest("managedSettings.applyControls", params),
+            /**
+             * Validates the managed settings a client is supplying for a session it is about to open, and returns them reduced to the keys a client is allowed to set. A client-supplied policy is not the same thing as an administrator's: it may only narrow permissions, so this accepts `permissions` and rejects every other key outright rather than ignoring it. Rejecting is the point — a host that silently dropped an unsupported key would report a policy as applied while running without it. Hosts call this before opening the session rather than letting the open fail, so a malformed policy is reported against the request that carried it. The runtime applies the same rule again when the session starts, so this cannot be used to smuggle a wider document past it. An accepted document that sets nothing comes back as an empty object, which is distinct from supplying nothing at all.
+             *
+             * @param params The client-supplied managed settings to validate and normalize. Omitting them is valid and yields no policy.
+             *
+             * @returns The accepted managed settings, reduced to the keys a client is allowed to set.
+             */
+            parseClientValue: async (params: ManagedSettingsParseClientValueParams): Promise<ManagedSettingsParseClientValueResult> =>
+                connection.sendRequest("managedSettings.parseClientValue", params),
+            /**
+             * Composes the supplied server, device/MDM, device sandbox floor and policy-helper layers into the single effective managed policy a host should enforce, resolving each key across the layers by the runtime's own precedence rules. Hosts that assemble managed layers themselves use this so their precedence matches the runtime's exactly instead of reimplementing it. The composition is not a pure function of its inputs: an advisory sandbox force-on that arrived over the server channel is declined when this host cannot run a sandbox, so the result reflects the runtime host's capabilities, and the returned settings carry `sandboxAdvisoryFloorDeclined: true` when that happened. Enforced channels (device/MDM and policy helper) are never declined, and a server force-on carrying `failIfUnavailable` is preserved so the session fails loudly instead of quietly running unsandboxed. Rejects when a supplied layer is present but is not a JSON object, rather than treating it as unmanaged, because silently dropping a malformed policy would hand the user's own layer the win on exactly the keys the policy exists to control.
+             *
+             * @param params The managed-settings layers to compose into an effective policy. Every layer is optional; omitting all of them yields no effective policy.
+             *
+             * @returns The effective managed policy composed from the supplied layers.
+             */
+            resolveEffectiveValue: async (params: ManagedSettingsResolveEffectiveValueParams): Promise<ManagedSettingsResolveEffectiveValueResult> =>
+                connection.sendRequest("managedSettings.resolveEffectiveValue", params),
+            /**
+             * Decides what a host must do to its bypass-permissions state after a managed-policy resolution lands, given the state already in force and the account now signed in. A host holds two pieces of state — which layer disabled bypass mode, and for a server-delivered disable, the account it was pinned to — and cannot decide the next step from the new policy alone. Three rules make that so, and each one is a control rather than a preference. A device/MDM disable outranks the account, so a later server answer never lifts it. An unknown policy, which is what a failed fetch or a refusal this build cannot enforce yields, preserves whatever is in force instead of reverting to permissive. And a server disable is lifted only when the account it was pinned to is no longer the signed-in one, which is what makes signing in to an unrestricted account recover without a restart while a reconnect on the same restricted account does not. Hosts call this rather than reimplementing it because getting the pinning backwards either strands a disable on an account that never carried one or drops one that still applies. `setDisabledState` is omitted when the host must leave its stored flag untouched, which is distinct from being told to set it to false.
+             *
+             * @param params The bypass-permissions state a host holds today, the account now signed in, and what the managed-policy resolution said.
+             *
+             * @returns The bypass-permissions state a host should hold after the resolution, and what it must do to get there.
+             */
+            resolveBypassDisableTransition: async (params: ManagedSettingsResolveBypassDisableTransitionParams): Promise<ManagedSettingsResolveBypassDisableTransitionResult> =>
+                connection.sendRequest("managedSettings.resolveBypassDisableTransition", params),
+            /**
+             * Resolves managed (enterprise policy) settings for a host from every layer at once: the account's server-delivered policy, the device/MDM layer, and a platform policy helper. Hosts use this instead of fetching and composing the layers themselves, because the per-layer precedence and the fail-closed rules that apply when a layer cannot be confirmed are the runtime's own and must match the policy a session will later enforce. It does not retain or apply anything to process-global policy state, so a host may call it before any session exists — which is the point, since plugin activation and one-shot commands resolve policy before a session is available to carry it. The returned per-layer outcome flags are load-bearing rather than diagnostic: a host must distinguish an unmanaged device from a managed device whose policy could not be confirmed, and apply its fail-closed gates in the second case. Reports its diagnostics in `logMessages` rather than logging them, so a host that runs before a log sink exists still sees them.
+             *
+             * @param params Inputs describing the host and account an ingestion should resolve managed policy for.
+             *
+             * @returns The managed policy layers an ingestion resolved, together with the per-layer outcome flags a host needs to decide how much to trust the result. The flags are reported rather than folded into the settings because a host must be able to distinguish an unmanaged device from a managed device whose policy could not be confirmed, and apply its fail-closed gates in the second case.
+             */
+            ingest: async (params: ManagedSettingsIngestParams): Promise<ManagedSettingsIngestResult> =>
+                connection.sendRequest("managedSettings.ingest", params),
+            /**
+             * Resolves the managed (enterprise policy) settings a host must enforce from startup, and judges the account against the enterprise sign-in pin in the same pass. This composes the layers the way `managedSettings.ingest` does and then answers the two questions a host cannot answer for itself: which fail-closed floors apply when a layer could not be confirmed, and whether this credential is allowed to sign in at all. The sign-in verdict is the reason a host must not assemble this itself from `managedSettings.ingest` — a pinned organization is an access control, and a host that composed the layers but skipped the pin would let a developer sign in with a personal or another enterprise's account and escape every control that keys off the signed-in identity. The verdict is computed on every resolution, including one that is not retained, so declining to apply policy never widens access. Set `retainAndApply` to keep the resolved policy as this runtime process's startup policy; leave it false to resolve without side effects.
+             *
+             * @param params Inputs describing the host and account a startup policy resolution should run for. Mirrors `managedSettings.ingest`, and adds the decision of whether the resolved policy is retained for this runtime process.
+             *
+             * @returns The startup policy a resolution composed, the per-layer outcome flags a host needs to decide how much to trust it, and the enterprise sign-in verdict for the credential it ran against. The flags are reported rather than folded into the settings because a host must distinguish an unmanaged device from a managed device whose policy could not be confirmed, and apply its fail-closed gates in the second case.
+             */
+            resolveStartupPolicy: async (params: ManagedSettingsResolveStartupPolicyParams): Promise<ManagedSettingsResolveStartupPolicyResult> =>
+                connection.sendRequest("managedSettings.resolveStartupPolicy", params),
+            /**
+             * Resolves the managed `remoteControl` policy for an account on its own, for a host deciding whether a remote-control session may start. Composes the same layers as `managedSettings.ingest` and returns only that one key, so a host does not have to know which layer won. An absent policy means the account is unmanaged for this capability and the host may proceed; that default is safe only while absence really does mean "no policy", so a service refusal that says an account policy exists which this client is too old to enforce resolves to an explicit disabled policy instead of to absence. A resolution that cannot be completed is rejected rather than answered as absence, for the same reason.
+             *
+             * @param params Inputs describing the host and account whose managed remote-control policy should be resolved. Mirrors `managedSettings.ingest`, and deliberately carries no retention decision: reading this gate never becomes this runtime process's startup policy.
+             *
+             * @returns The managed remote-control policy in force for an account, if any. An absent policy means the account is unmanaged for this capability, which a host reads as allowed — so absence here is a positive statement that no policy applies, never a stand-in for a resolution that failed. A resolution that cannot be completed is rejected instead.
+             */
+            loadRemoteControl: async (params: ManagedSettingsLoadRemoteControlParams): Promise<ManagedSettingsLoadRemoteControlResult> =>
+                connection.sendRequest("managedSettings.loadRemoteControl", params),
+            /**
+             * Evaluates the device-channel enterprise sign-in pin (MDM plist, registry, or managed-settings file) against a credential, without resolving any server-delivered policy. This is the gate an entry point runs before it branches, and the only one that can refuse a developer's first sign-in: it is local, needs no credential, and a server-delivered pin only ever reaches accounts already inside the organization. It fails closed by construction — a discovery that cannot determine whether a pin exists refuses rather than allows, because a control that fails open under a triggerable condition is not a control. Hosts that also want the server channel should call `managedSettings.resolveStartupPolicy`, which folds both channels into one verdict.
+             *
+             * @param params The credential and environment to evaluate the device-channel sign-in pin against.
+             *
+             * @returns The verdict of the `forceLoginOrgs` enterprise sign-in pin for one credential. A managed device may pin Copilot to an approved set of GitHub organizations so a developer cannot sign in with a personal — or another enterprise's — account and escape every control that keys off the signed-in identity. A host must refuse to proceed when `allowed` is false; the remaining fields explain the refusal rather than qualifying it.
+             */
+            resolveDeviceForceLoginOrgsGate: async (params: ManagedSettingsResolveDeviceForceLoginOrgsGateParams): Promise<ForceLoginOrgsDecision> =>
+                connection.sendRequest("managedSettings.resolveDeviceForceLoginOrgsGate", params),
+        },
         /** @experimental */
         host: {
             /**
@@ -31651,6 +36780,256 @@ export function createInternalServerRpc(connection: MessageConnection) {
         connect: async (params: ConnectRequest): Promise<ConnectResult> =>
             connection.sendRequest("connect", params),
         /** @experimental */
+        account: {
+            /**
+             * Renders the sign-in banner and the one-line account description the runtime uses for an authentication identity. The runtime words these in several places for its own callers, so a host that announces a sign-in or an account switch should render them from here rather than composing its own, which would let the two spellings drift apart.
+             *
+             * @param params The authentication identity whose shared wording should be rendered.
+             *
+             * @returns The wording the runtime uses for an authentication identity.
+             */
+            describeAuthInfo: async (params: AccountDescribeAuthInfoRequest): Promise<AccountDescribeAuthInfoResult> =>
+                connection.sendRequest("account.describeAuthInfo", params),
+            /**
+             * Reports whether the supplied identity can create gists. Gists are unavailable on GitHub Enterprise Cloud with data residency, and to Enterprise Managed Users on github.com, so a host that offers gist actions should hide or disable them when this reports no support.
+             *
+             * @param params The authentication identity whose gist support should be reported.
+             *
+             * @returns Whether the identity can create gists, and why not when it cannot.
+             */
+            getGistSupport: async (params: AccountGetGistSupportRequest): Promise<AccountGetGistSupportResult> =>
+                connection.sendRequest("account.getGistSupport", params),
+            /**
+             * Resolves a path on the identity's GitHub host into an absolute URL, so a host can link to settings or documentation on the enterprise instance the user is signed in to rather than to github.com. Falls back to the public host when no identity is supplied.
+             *
+             * @param params A path to resolve against the GitHub host an identity is signed in to.
+             *
+             * @returns An absolute URL on the identity's GitHub host.
+             */
+            getWebUrl: async (params: AccountGetWebUrlRequest): Promise<AccountGetWebUrlResult> =>
+                connection.sendRequest("account.getWebUrl", params),
+            /**
+             * Names the environment variable supplying a classic personal access token, if one is set. A classic token cannot be upgraded in place, so a host that finds one should tell the user which variable to unset rather than starting an interactive sign-in that the variable would override.
+             *
+             * @returns The environment variable supplying a classic personal access token, when one is set.
+             */
+            getTokenEnvVar: async (): Promise<AccountGetTokenEnvVarResult> =>
+                connection.sendRequest("account.getTokenEnvVar", {}),
+        },
+        /** @experimental */
+        mcp: {
+            /** @experimental */
+            registry: {
+                /**
+                 * Allocates an ID for one cancellable MCP registry search. The ID exists before the search starts, so callers can cancel before it starts. The networking stack supplies the cancellation namespace. The runtime retains at most 1,024 unused IDs. At capacity, another allocation can reclaim an unused ID. Active searches retain their IDs until they finish.
+                 *
+                 * @returns Request id naming a cancellable registry search.
+                 */
+                allocateRequestId: async (): Promise<McpRegistryRequestIdResult> =>
+                    connection.sendRequest("mcp.registry.allocateRequestId", {}),
+                /**
+                 * Searches the MCP registry the supplied credential may read, resolving the registry endpoint from policy first. Hosts usually send credential-free `AuthIdentity`; a `token` identity can be resolved only when it embeds a token, while `env` and `gh-cli` identities can use a token embedded in the request first. The runtime follows registry pages, keeps the newest entry per server name, cuts the list to `limit`, and sorts an empty-query result by GitHub stars. Each server object is carried opaquely.
+                 *
+                 * @param params Registry search terms, the credential to search under, and the request id that makes the search cancellable.
+                 *
+                 * @returns Servers selected from the registry response.
+                 */
+                search: async (params: McpRegistrySearchRequest): Promise<McpRegistrySearchResult> =>
+                    connection.sendRequest("mcp.registry.search", params),
+                /**
+                 * Abandons the registry search that uses the given request ID. It acts only on IDs from `mcp.registry.allocateRequestId`, so it never cancels another component's request. Answers `canceled: true` when it stops a running search. Answers `canceled: false` for unknown or reclaimed IDs, completed or canceled searches, and unused reservations. It releases an unused reservation, so a later search with that ID is refused.
+                 *
+                 * @param params Registry search to abandon.
+                 *
+                 * @returns Whether the cancel reached a live search.
+                 */
+                cancel: async (params: McpRegistryCancelRequest): Promise<McpRegistryCancelResult> =>
+                    connection.sendRequest("mcp.registry.cancel", params),
+            },
+            /**
+             * Lists the MCP servers the runtime supplies itself, so a host that disables the built-ins wholesale suppresses exactly the set the runtime would otherwise add. The names are fixed for a build and depend on no configuration, session or account.
+             *
+             * @returns Names of the MCP servers the runtime supplies itself.
+             */
+            listBuiltinServerNames: async (): Promise<McpListBuiltinServerNamesResult> =>
+                connection.sendRequest("mcp.listBuiltinServerNames", {}),
+            /**
+             * Reports whether the gh-replaceable GitHub MCP tools may be clipped for a session, which a host feeds back as the `excludeGhReplaceableTools` build option. The tools are redundant only when the session can reach a shell *and* the host has the `gh` that would replace them, so both halves are decided here. The shell half runs the platform shell tool through the runtime's own tool-filter matcher, so entry forms like `builtin:bash` and `builtin:*` behave exactly as they do when a session builds its tool catalog. The host half probes for `gh`, and is skipped entirely when the filters already rule the shell out. Host presence alone is not enough: a session restricted to, say, `view` would otherwise lose the built-in issue-read fallback while having no shell to replace it with. The answer describes the host the runtime runs on, so it is never forwarded to a remote engine.
+             *
+             * @param params The session tool filters that decide whether the session still has a shell to run `gh` with.
+             *
+             * @returns Whether the gh-replaceable GitHub MCP tools may be clipped for the session described by the request.
+             */
+            shouldExcludeGitHubTools: async (params: McpShouldExcludeGitHubToolsRequest): Promise<McpShouldExcludeGitHubToolsResult> =>
+                connection.sendRequest("mcp.shouldExcludeGitHubTools", params),
+        },
+        /** @experimental */
+        instructions: {
+            /**
+             * Returns the prompt the `init` command runs to author repository instructions. A host offering its own initialize action sends this text so the instructions it produces match the ones the CLI produces. The text is fixed for a build and depends on no configuration, session or repository.
+             *
+             * @returns The prompt the init command runs.
+             */
+            getInitPrompt: async (): Promise<InstructionsInitPromptResult> =>
+                connection.sendRequest("instructions.getInitPrompt", {}),
+            /**
+             * Discovers the instruction sources for one caller-named location and returns them in the order the runtime applies them. `discover` answers for a set of project paths and derives the rest of its scope itself; this one instead takes every argument from the caller — the extra directories to scan and whether to descend into nested instruction files — and honors them as given. It also includes instruction directories from trusted repository settings, matching native repository discovery. Use it when the caller knows its own scope and no session exists to derive that scope from, such as a host reporting how many instruction files a directory contributes before any session starts. Marked internal because it exists to carry a CLI call site off the napi boundary onto the SDK contract; it is migration plumbing, not a surface consumers are meant to depend on.
+             *
+             * @param params Explicit discovery arguments for one location, supplied by the caller rather than derived from a session.
+             *
+             * @returns Instruction sources discovered across user, repository, and plugin sources.
+             */
+            discoverRepoSources: async (params: InstructionsDiscoverRepoSourcesRequest): Promise<ServerInstructionSourceList> =>
+                connection.sendRequest("instructions.discoverRepoSources", params),
+            /**
+             * Drops the runtime's in-memory cache of discovered custom instructions so the next discovery reads them from disk again. A host calls this after it changes instruction files, or after it trusts a folder whose instructions an earlier discovery skipped, so that a session started afterwards sees the current files instead of a cached earlier answer. The call performs no I/O of its own and removes nothing from disk; it only invalidates, so the cost lands on the next discovery.         Returns once the cache is clear, which is what lets a caller order a session start after it. Marked internal because it exists to carry a CLI call site off the napi boundary onto the SDK contract; it is migration plumbing, not a surface consumers are meant to depend on.
+             */
+            clearCache: async (): Promise<void> =>
+                connection.sendRequest("instructions.clearCache", {}),
+        },
+        /** @experimental */
+        agents: {
+            /**
+             * Lists the agents this runtime ships, by name. A consumer separating shipped agents from ones the user or a plugin authored should compare against these names rather than against `AgentInfo.source`: an authored agent may carry the `builtin` source while not being one of these, and the runtime treats the two as separate questions. `disableableNames` is the subset a user may turn off, which a client needs to decide whether to offer a toggle. `yamlBasedNames` is the subset backed by a shipped YAML definition, which a client needs before asking the runtime to load one.
+             *
+             * @returns The agents this runtime ships, named so a consumer can tell them apart from authored ones.
+             */
+            getBuiltins: async (): Promise<AgentsGetBuiltinsResult> =>
+                connection.sendRequest("agents.getBuiltins", {}),
+            /**
+             * Lists the shipped agents a client should offer right now, filtered by the feature flags it passes. `getBuiltins` names every agent the runtime knows about; some of those are gated, so a client rendering a picker wants this narrower list together with the description to show beside each name.
+             *
+             * @param params The feature flags to evaluate shipped agents against.
+             *
+             * @returns The shipped agents available under the requested flags.
+             */
+            getAvailableBuiltins: async (params: AgentsGetAvailableBuiltinsRequest): Promise<AgentsGetAvailableBuiltinsResult> =>
+                connection.sendRequest("agents.getAvailableBuiltins", params),
+            /**
+             * Loads one shipped agent's YAML definition, for a client that needs what the agent declares rather than only its name. `getBuiltins` reports which names have a definition to load: a name outside its `yamlBasedNames` is special-cased in code and has none. The definition crosses as its own JSON rather than as contract-typed fields, because the runtime parses it with the agent schema's tolerant shape and re-typing it here would drop the keys that shape accepts and this one does not. The projected `__nativeCustomAgent` view the runtime derives is included, so a caller reading the declared model and a caller rendering the agent see the same definition.
+             *
+             * @param params The shipped agent whose definition to load.
+             *
+             * @returns One shipped agent's definition.
+             */
+            getBuiltinDefinition: async (params: AgentsGetBuiltinDefinitionRequest): Promise<AgentsGetBuiltinDefinitionResult> =>
+                connection.sendRequest("agents.getBuiltinDefinition", params),
+            /**
+             * Projects one shipped agent the way a picker lists it, reading only the metadata at the head of the definition file and stopping before the prompt body. `getBuiltinDefinition` answers the whole definition instead, so a client listing every shipped agent should prefer this one: the cost of a listing grows with the number of agents, and the prompt body is the part a listing never shows. The two also differ in shape. This returns the projected custom agent on its own, whereas `getBuiltinDefinition` returns the authored definition with that projection nested under `__nativeCustomAgent`.
+             *
+             * @param params The shipped agent whose listing entry to load.
+             *
+             * @returns One shipped agent, projected for a listing.
+             */
+            getBuiltinListingDefinition: async (params: AgentsGetBuiltinListingDefinitionRequest): Promise<AgentsGetBuiltinListingDefinitionResult> =>
+                connection.sendRequest("agents.getBuiltinListingDefinition", params),
+            /**
+             * Resolves the model a custom agent asks for against the models actually available, and answers both the model to switch to and the warning a user should see when the agent's preference cannot be met. A custom agent may name several acceptable models in preference order, so the decision is a match rather than a lookup, and an agent whose preference is unavailable is a normal outcome that produces a warning rather than an error. A host must call this rather than pick the first available name itself, because the preference order and the wording of the warning are what keep one installation's agent selection the same as another's.
+             *
+             * @param params The models a custom agent asks for, and the models actually available.
+             *
+             * @returns The model to switch to, and the warning to show when the agent's preference could not be met.
+             */
+            customAgentInitialModelDecision: async (params: AgentsCustomAgentInitialModelDecisionParams): Promise<AgentsCustomAgentInitialModelDecisionResult> =>
+                connection.sendRequest("agents.customAgentInitialModelDecision", params),
+        },
+        /** @experimental */
+        globalState: {
+            /**
+             * Reads the host's machine-wide state: which plugins are installed and the one-off flags and timestamps that record what the user has already been shown or migrated. This is the state that outlives a single session and a single workspace, so a host reads it to decide whether to run a first-launch step, offer an onboarding prompt, or skip one it has already completed. The stored credentials are deliberately not part of this result; a caller that needs an authenticated identity asks the account methods for it instead. Reading is non-destructive and every field is optional, because a fresh install has recorded nothing yet.
+             *
+             * @returns The host's machine-wide state. Every field is optional because a fresh install has recorded nothing yet, so a reader must treat an absent field as `not yet`, never as a negative answer. Stored credentials are deliberately absent from this shape.
+             */
+            load: async (): Promise<GlobalStateLoadResult> =>
+                connection.sendRequest("globalState.load", {}),
+            /**
+             * Reads the host's machine-wide state exactly as `globalState.load` does, but from a caller-supplied configuration directory instead of the one the server resolved for itself. Use this when a consumer scopes a session to its own Copilot home — the SDK's per-session `configDir` override — so the state read matches the directory that session actually uses. An absent or empty `configDir` resolves the server's own home, making this identical to `globalState.load`. The stored credentials are omitted here for the same reason they are omitted from `globalState.load`: a caller that needs an authenticated identity asks the account methods instead, so pointing this at another directory cannot be used to read the credentials kept in it.
+             *
+             * @param params Selects the configuration directory whose machine-wide state to read.
+             *
+             * @returns The host's machine-wide state. Every field is optional because a fresh install has recorded nothing yet, so a reader must treat an absent field as `not yet`, never as a negative answer. Stored credentials are deliberately absent from this shape.
+             */
+            loadForConfigDir: async (params: GlobalStateLoadForConfigDirRequest): Promise<GlobalStateLoadResult> =>
+                connection.sendRequest("globalState.loadForConfigDir", params),
+            /**
+             * Records one top-level key in the host's machine-wide state, the counterpart to `globalState.load`. A host calls this to remember that it has shown an onboarding step, asked a one-off question, or completed a migration, so the next run can skip it. Only the named key is replaced and the rest of the document is preserved, which lets two writers record different flags without overwriting each other; passing no value removes the key instead. Only the keys a host records itself are writable: `appTipShown`, `askedSetupTerminals`, `autoFeedbackLastPromptedAt`, `firstLaunchAt`, `recentModelIds`, `sandboxCredentialProxyCaDeclined` and `sandboxOnboardingShown`. Every other key is refused, including `installedPlugins`, the stored credentials, `trustedFolders`, the staff flags and the signed-in accounts. Plugin enablement must use the plugin APIs, which apply repository and managed-policy checks.
+             *
+             * @param params A single top-level key to record in the host's machine-wide state. The write replaces only that key and leaves the rest of the document untouched, so two writers recording different one-off flags do not overwrite each other. The stored credential keys cannot be written through this method.
+             */
+            writeKey: async (params: GlobalStateWriteKeyRequest): Promise<void> =>
+                connection.sendRequest("globalState.writeKey", params),
+        },
+        /** @experimental */
+        gitHubRepository: {
+            /**
+             * Resolves the GitHub repository that owns a working-tree path by reading the selected git remote configured for it, preferring `origin`. Returns a null `repository` when the path is inside a git working tree but that selected remote does not resolve to a GitHub host. Fails when the path is not inside a git working tree at all, so a caller can tell 'not a repository' apart from 'a repository with no GitHub remote'.
+             *
+             * @param params Working-tree path whose owning GitHub repository should be resolved.
+             *
+             * @returns The GitHub repository that owns the requested path, when the selected remote (`origin`, else the first) is on a GitHub host.
+             */
+            atPath: async (params: GitHubRepositoryAtPathRequest): Promise<GitHubRepositoryAtPathResult> =>
+                connection.sendRequest("gitHubRepository.atPath", params),
+        },
+        /** @experimental */
+        gitHubOwners: {
+            /**
+             * Registers a cancellable owner listing and returns its request id. Separate from `gitHubOwners.list` so the id exists before the listing starts: a caller that abandons the listing the moment it begins would otherwise have nothing to name in `gitHubOwners.cancel`. The id serves one listing only. Long-abandoned unused ids can be released by later allocations.
+             *
+             * @returns A freshly registered request id. Registering it before the listing starts is what lets a cancel that races the request still find the owner listing slot. The id serves one listing only. Long-abandoned unused ids can be released by later allocations.
+             */
+            nextRequestId: async (): Promise<GitHubOwnersRequestIdResult> =>
+                connection.sendRequest("gitHubOwners.nextRequestId", {}),
+            /**
+             * Lists the logins the authenticated user may act as — their own account first, then the organizations they belong to — by asking the GitHub API under the supplied credential. No credential travels in the request: `authInfo` selects one the runtime already holds, and the runtime resolves the token and the GitHub host from it. A failure the caller should render arrives as `message`; one it should raise arrives as `throwError`.
+             *
+             * @param params Credential to list owners under, and the request id that makes the listing cancellable.
+             *
+             * @returns Outcome of an owner listing. Exactly one of `owners` and `message` is present, except that `throwError` reports a failure the caller is expected to raise rather than render.
+             */
+            list: async (params: GitHubOwnersListRequest): Promise<GitHubOwnersListResult> =>
+                connection.sendRequest("gitHubOwners.list", params),
+            /**
+             * Abandons an owner listing started with the given request id. Answers `canceled: true` while a listing with that id is running. Answers `canceled: false` when the id was never registered, was registered but not used, was released after being abandoned, or its listing has ended. Canceling an unused id releases it, and a later `list` with that id is refused. The cancel acts only on owner listings and never reaches another request of the host.
+             *
+             * @param params The owner listing to abandon.
+             *
+             * @returns Whether the id named a running owner listing.
+             */
+            cancel: async (params: GitHubOwnersCancelRequest): Promise<GitHubOwnersCancelResult> =>
+                connection.sendRequest("gitHubOwners.cancel", params),
+        },
+        /** @experimental */
+        git: {
+            /**
+             * Reads the remote that the branch checked out in a working tree tracks, as `branch.<name>.remote` configures it. Reports `origin` rather than failing whenever there is no tracking configuration to read — on a detached HEAD, on a branch with no upstream, or when git itself fails — because a caller asking which remote to talk to needs an answer it can act on, not an error. Marked internal because it exists to carry a CLI call site off the napi boundary onto the SDK contract; it is migration plumbing, not a surface consumers are meant to depend on.
+             *
+             * @param params Working-tree path a git query applies to.
+             *
+             * @returns The remote the checked-out branch tracks.
+             */
+            currentBranchRemote: async (params: GitCwdRequest): Promise<GitCurrentBranchRemoteResult> =>
+                connection.sendRequest("git.currentBranchRemote", params),
+            /**
+             * Collects the repository context of a working directory in one call: working tree root, repository identifier and host, current branch, and the HEAD and base commits. Every repository field is omitted when the path is not inside a git working tree, and the requested path is echoed back as `cwd`. The answer is the same `SessionWorkingDirectoryContext` that `session.metadata.recordContextChange` accepts, so a caller polling for a context change can forward the result unchanged. Marked internal because it exists to carry a CLI call site off the napi boundary onto the SDK contract; it is migration plumbing, not a surface consumers are meant to depend on. It can become public once an SDK consumer needs to derive session context from a directory itself.
+             *
+             * @param params Working-tree path a git query applies to.
+             *
+             * @returns Updated working directory and git context. Emitted as the new payload of `session.context_changed`.
+             */
+            workingDirectoryContext: async (params: GitCwdRequest): Promise<SessionWorkingDirectoryContext> =>
+                connection.sendRequest("git.workingDirectoryContext", params),
+            /**
+             * Lists the GitHub repositories a working tree's remotes point at, one entry per distinct repository, so a caller can resolve a base and head repository without parsing remote URLs itself. When several remotes name the same repository, only the first is listed, and the entry keeps that remote name. Remotes pointing at no GitHub host are left out, so an empty list means the tree reaches GitHub through no remote. Failing to read the remotes is reported as an error rather than as an empty list, because the two mean different things to a caller. Marked internal because it exists to carry a CLI call site off the napi boundary onto the SDK contract; it is migration plumbing, not a surface consumers are meant to depend on.
+             *
+             * @param params Git working tree whose GitHub remotes should be listed.
+             *
+             * @returns The GitHub repositories a working tree's remotes point at.
+             */
+            reposFromRemotes: async (params: GitReposFromRemotesRequest): Promise<GitReposFromRemotesResult> =>
+                connection.sendRequest("git.reposFromRemotes", params),
+        },
+        /** @experimental */
         sessions: {
             /**
              * Reads lightweight persisted metadata for one local session without opening it.
@@ -31695,6 +37074,33 @@ export function createInternalServerRpc(connection: MessageConnection) {
              */
             delete: async (params: SessionsDeleteRequest): Promise<void> =>
                 connection.sendRequest("sessions.delete", params),
+            /**
+             * Creates the workspace record for a session that has not been opened yet. A host that hands a session off to another application — writing the record and then launching that application against the session ID — needs the record on disk before any session exists to carry it, which the session-scoped workspace methods cannot do. Replaces any existing record and resets the checkpoint index. When writing to the local filesystem, a stored `fork_count` survives on disk. Returns the record it built, so a surviving stored `fork_count` can differ from the answer.
+             *
+             * @param params Identity, state location and starting context for a workspace record.
+             *
+             * @returns The workspace record that was written.
+             */
+            createWorkspace: async (params: SessionsCreateWorkspaceRequest): Promise<SessionsCreateWorkspaceResult> =>
+                connection.sendRequest("sessions.createWorkspace", params),
+            /**
+             * Reads a session's workspace record straight from disk, without opening the session. Resuming by session ID has to know where the session lives before it can connect, so the lookup cannot come from the session-scoped workspace methods, which resolve their location from a live session's context. Returns no record when the file is absent.
+             *
+             * @param params Where the session's state lives, as a root directory and the session ID under it.
+             *
+             * @returns The workspace record on disk, omitted when the session has none.
+             */
+            loadWorkspace: async (params: SessionsLoadWorkspaceRequest): Promise<SessionsLoadWorkspaceResult> =>
+                connection.sendRequest("sessions.loadWorkspace", params),
+            /**
+             * Merges fields into a session's workspace record on disk, creating the record when it is absent. The counterpart to `sessions.loadWorkspace`, for the same before-the-session-exists case. It preserves stored workspace-schema fields the request does not supply, does not preserve stored keys outside the workspace schema, and never replaces a stored `fork_count`.
+             *
+             * @param params Where the session's state lives, plus workspace-schema fields to merge into its workspace record. Stored keys outside the schema are not preserved, and a stored `fork_count` is never replaced.
+             *
+             * @returns The merge completed. The record carries the supplied workspace-schema fields, but a stored `fork_count` stays.
+             */
+            updateWorkspaceFields: async (params: SessionsUpdateWorkspaceFieldsRequest): Promise<SessionsUpdateWorkspaceFieldsResult> =>
+                connection.sendRequest("sessions.updateWorkspaceFields", params),
             /**
              * Gets the dynamic-context board entry count associated with a session, when available. Internal: this exists solely so CLI telemetry events (`rem_spawn_gate`, `rem_consolidation_complete`) can pair START / END board counts around the detached rem-agent spawn. "Dynamic context board" is a runtime-internal concept that is not part of the public SDK contract; the long-term plan is to relocate the telemetry emission into the runtime so this method can be deleted entirely.
              *
@@ -31805,6 +37211,13 @@ export function createSessionRpc(connection: MessageConnection, sessionId: strin
              */
             getEnforcementStatus: async (): Promise<SandboxEnforcementStatus> =>
                 connection.sendRequest("session.sandbox.getEnforcementStatus", { sessionId }),
+            /**
+             * Lists possible secret-bearing environment variables available to new sandboxed shells that are not already covered by credential masking. Uses local name rules and known-provider host suggestions, never returns secret values, and changes no settings or network permissions. Returns no suggestions while the session is not sandboxed.
+             *
+             * @returns Possible unconfigured secrets in the sandbox shell environment, sorted by variable name, with no secret values.
+             */
+            getCredentialSuggestions: async (): Promise<SandboxCredentialSuggestionsResult> =>
+                connection.sendRequest("session.sandbox.getCredentialSuggestions", { sessionId }),
             /**
              * Disables sandboxing for the remainder of the current session and approves the referenced pending sandbox-bypass permission request. The request is rejected unless the exact request is still pending and the effective sandbox policy permits bypass.
              *
@@ -32157,6 +37570,15 @@ export function createSessionRpc(connection: MessageConnection, sessionId: strin
              */
             setReasoningEffort: async (params: ModelSetReasoningEffortRequest): Promise<ModelSetReasoningEffortResult> =>
                 connection.sendRequest("session.model.setReasoningEffort", { ...params, sessionId }),
+            /**
+             * Computes whether the session's current model shows reasoning summaries and how a host should present them: the default Ctrl+T visibility, reasoning headers, the hidden-summaries hint, and whether a persisted `showReasoning` setting is redundant. The runtime folds in the session's model catalog, selection and reasoning-summaries experiment assignment; the host supplies only its own persisted setting and current visibility. This method reads the session's resolved model catalog rather than resolving it, so call `session.model.list` first on a session that has not listed models or run a turn; until then the result is `ready: false`. A session that resolves models without a Copilot catalog, that is a BYOK registry or an alternate provider, never caches one and stays `ready: false`.
+             *
+             * @param params Host presentation state the reasoning-summaries policy depends on.
+             *
+             * @returns Reasoning-summaries presentation policy for the session's current model.
+             */
+            getReasoningSummaries: async (params: ModelGetReasoningSummariesRequest): Promise<ModelGetReasoningSummariesResult> =>
+                connection.sendRequest("session.model.getReasoningSummaries", { ...params, sessionId }),
             /**
              * Lists models available to this session using its own auth and integration context. Connected hosts (CLI TUI, GitHub App) should call this through the session client so remote sessions return the remote CLI's available models rather than the caller's.
              *
@@ -32682,12 +38104,19 @@ export function createSessionRpc(connection: MessageConnection, sessionId: strin
         /** @experimental */
         mcp: {
             /**
-             * Lists MCP servers configured for the session, their connection status, and host-level state. The host-level state (disabled/filtered servers, failed/needs-auth/pending connections, mcp3p policy, full config) is empty/zero when no MCP host has been initialized for the session.
+             * Lists materialized MCP servers and their connection status. Cache misses may start and wait for MCP servers.
              *
              * @returns MCP servers configured for the session, with their connection status and host-level state.
              */
             list: async (): Promise<McpServerList> =>
                 connection.sendRequest("session.mcp.list", { sessionId }),
+            /**
+             * Lists effective MCP configuration without starting, restarting, authenticating, or waiting for servers. An optional live observation is from an already materialized matching server; this is not a readiness guarantee.
+             *
+             * @returns Effective MCP configuration with optional live observations from matching already materialized servers.
+             */
+            listConfigured: async (): Promise<McpConfiguredServerList> =>
+                connection.sendRequest("session.mcp.listConfigured", { sessionId }),
             /**
              * Lists the tools exposed by a connected MCP server on this session's host. This performs a live `tools/list` request. Tool UI metadata is returned independently of whether MCP Apps rendering is enabled for the session.
              *
@@ -33194,6 +38623,15 @@ export function createSessionRpc(connection: MessageConnection, sessionId: strin
              */
             reload: async (params?: SessionPluginsReloadRequest): Promise<void> =>
                 connection.sendRequest("session.plugins.reload", { ...params, sessionId }),
+            /**
+             * Installs or updates the plugins the session's managed settings require now, without waiting for the next automatic attempt after a failure, then reloads plugins. Reports progress and failures with the same `session.info` and `session.warning` events as automatic preparation. Fails when the runtime does not prepare managed plugins for the session.
+             *
+             * @param params Plugins required by the session's managed settings to install or update again.
+             *
+             * @returns Per-plugin outcomes of retrying the plugins required by the session's managed settings.
+             */
+            retryManaged: async (params?: SessionPluginsRetryManagedRequest): Promise<SessionPluginsRetryManagedResult> =>
+                connection.sendRequest("session.plugins.retryManaged", { ...params, sessionId }),
         },
         /** @experimental */
         provider: {
@@ -33266,14 +38704,14 @@ export function createSessionRpc(connection: MessageConnection, sessionId: strin
             list: async (): Promise<ExtensionList> =>
                 connection.sendRequest("session.extensions.list", { sessionId }),
             /**
-             * Enables an extension for the session.
+             * Enables an extension for the session and persists the preference when the session has a settings store. Hosts synchronizing effective membership should use extensions.reconcile instead.
              *
              * @param params Source-qualified extension identifier to enable for the session.
              */
             enable: async (params: ExtensionsEnableRequest): Promise<void> =>
                 connection.sendRequest("session.extensions.enable", { ...params, sessionId }),
             /**
-             * Disables an extension for the session.
+             * Disables an extension for the session and persists the preference when the session has a settings store. Hosts synchronizing effective membership should use extensions.reconcile instead.
              *
              * @param params Source-qualified extension identifier to disable for the session.
              */
@@ -33284,6 +38722,13 @@ export function createSessionRpc(connection: MessageConnection, sessionId: strin
              */
             reload: async (): Promise<void> =>
                 connection.sendRequest("session.extensions.reload", { sessionId }),
+            /**
+             * Host-only reconciliation of authoritative session-effective extension membership and enablement. Refreshes runtime-owned discovery and preferences without persisting settings, installing plugins, or restarting unchanged activations. Returns ExtensionList only after required starts and process/contribution cleanup settle. Takes no caller inventory or overrides. Missing controllers, unready/incomplete discovery, unavailable workspaces, superseded inputs, and lifecycle failures are errors, not empty membership. Independently proven revocations may be applied before an error; retry converges without restarting healthy activations. Error data contains lifecycleChangesApplied and code: extension_reconciliation_host_required, extension_reconciliation_unavailable, extension_reconciliation_not_ready, extension_reconciliation_discovery_failed, extension_reconciliation_workspace_unavailable, extension_reconciliation_superseded, or extension_reconciliation_lifecycle_failed. Mark host reconciliation state applied only on success. On older runtimes, method-not-found must not fall back to global discovery and persistent extension disables.
+             *
+             * @returns Extensions discovered for the session, with their current status.
+             */
+            reconcile: async (): Promise<ExtensionList> =>
+                connection.sendRequest("session.extensions.reconcile", { sessionId }),
             /**
              * Push attachments into the next user-message turn from an extension. The host should surface them as composer pills and forward them via the next session.send call. Callable only by extension-owned connections.
              *
@@ -33330,6 +38775,13 @@ export function createSessionRpc(connection: MessageConnection, sessionId: strin
              */
             handlePendingToolCall: async (params: HandlePendingToolCallRequest): Promise<HandlePendingToolCallResult> =>
                 connection.sendRequest("session.tools.handlePendingToolCall", { ...params, sessionId }),
+            /**
+             * Lists the external tool calls of the session and its sub-agents that are still waiting for session.tools.handlePendingToolCall.
+             *
+             * @returns External tool calls still waiting for a result.
+             */
+            listPendingRequests: async (): Promise<PendingExternalToolRequestList> =>
+                connection.sendRequest("session.tools.listPendingRequests", { sessionId }),
             /**
              * Resolves, builds, and validates the runtime tool list for the session.
              *
@@ -34105,6 +39557,30 @@ export function createSessionRpc(connection: MessageConnection, sessionId: strin
                 connection.sendRequest("session.usage.getMetrics", { sessionId }),
         },
         /** @experimental */
+        quota: {
+            /**
+             * Gets the session's current quota and account projection without making a network request.
+             *
+             * @returns The incumbent session-owned quota and account projection.
+             */
+            get: async (): Promise<SessionQuotaGetResult> =>
+                connection.sendRequest("session.quota.get", { sessionId }),
+            /**
+             * Refreshes the session's provider model catalog bypassing its cache, folds quota snapshots into session state, and returns the updated projection. Failures leave the last known quota intact.
+             *
+             * @returns The incumbent session-owned quota and account projection.
+             */
+            refresh: async (): Promise<SessionQuotaRefreshResult> =>
+                connection.sendRequest("session.quota.refresh", { sessionId }),
+            /**
+             * Returns and clears the session's pending quota warnings. Reading or refreshing quota does not drain warnings.
+             *
+             * @returns Pending warnings returned and cleared by session.quota.takeWarnings.
+             */
+            takeWarnings: async (): Promise<SessionQuotaTakeWarningsResult> =>
+                connection.sendRequest("session.quota.takeWarnings", { sessionId }),
+        },
+        /** @experimental */
         limitPrediction: {
             /**
              * Predicts an AI-credit session limit for the session's resolved model. Returns an unavailable result instead of falling back when the current model is unresolved auto.
@@ -34321,9 +39797,21 @@ export function createInternalSessionRpc(connection: MessageConnection, sessionI
              */
             applyStartupOverlay: async (params: ModelApplyStartupOverlayRequest): Promise<ModelSwitchToResult> =>
                 connection.sendRequest("session.model.applyStartupOverlay", { ...params, sessionId }),
+            /**
+             * Clears an unchanged startup model/provider seed before default-model resolution. Never clears a resumed or user-selected model.
+             */
+            clearStartupSeed: async (params: SessionModelClearStartupSeedRequest): Promise<SessionModelClearStartupSeedResult> =>
+                connection.sendRequest("session.model.clearStartupSeed", { ...params, sessionId }),
         },
         /** @experimental */
         mcp: {
+            /**
+             * Records the IDE the host is connected to, so the agent's system prompt can name it and its workspace folder. Null or an omitted `ide` clears the recorded value, which is how a host reports that it is disconnected; there is no separate clear method. Both `ideName` and `workspaceFolder` are required together, because half a state cannot be attributed to a project.
+             *
+             * @param params Records which IDE the host is connected to, or clears it.
+             */
+            setConnectedIdeInfo: async (params: SessionMcpSetConnectedIdeInfoParams): Promise<void> =>
+                connection.sendRequest("session.mcp.setConnectedIdeInfo", { ...params, sessionId }),
             /**
              * Reloads MCP server connections for the session with an explicit host-provided configuration.
              *
@@ -34501,6 +39989,16 @@ export function createInternalSessionRpc(connection: MessageConnection, sessionI
                 connection.sendRequest("session.queue.process", { sessionId }),
         },
         /** @experimental */
+        usage: {
+            /**
+             * Internal host-only replacement of absolute code-change totals reported by a relay host.
+             *
+             * @param params Internal absolute code-change totals reported by the owning host.
+             */
+            setCodeChanges: async (params: SessionUsageSetCodeChangesRequest): Promise<void> =>
+                connection.sendRequest("session.usage.setCodeChanges", { ...params, sessionId }),
+        },
+        /** @experimental */
         schedule: {
             /**
              * Hydrates the native schedule registry from persisted session events.
diff --git a/nodejs/src/generated/session-events.ts b/nodejs/src/generated/session-events.ts
index d6e4a099d9..6e7bb5bd02 100644
--- a/nodejs/src/generated/session-events.ts
+++ b/nodejs/src/generated/session-events.ts
@@ -39,6 +39,7 @@ export type SessionEvent =
   | SnapshotRewindEvent
   | ShutdownEvent
   | UsageCheckpointEvent
+  | ProviderQuotaObservationEvent
   | ContextChangedEvent
   | UsageInfoEvent
   | ContextClearedEvent
@@ -123,6 +124,7 @@ export type SessionEvent =
   | SessionLimitsExhaustedRequestedEvent
   | SessionLimitsExhaustedCompletedEvent
   | AutoModeResolvedEvent
+  | ManagedPluginProgressEvent
   | ManagedSettingsResolvedEvent
   | ManagedSettingsEnforcedEvent
   | CommandsChangedEvent
@@ -154,7 +156,7 @@ export type SessionEvent =
   | ExtensionsAttachmentsPushedEvent
   | McpAppToolCallCompleteEvent;
 /**
- * Routing preference used when the session model is `auto`. `fast` is an integrator-only latency preset and is not a first-party GitHub Copilot product preference.
+ * Extensible routing preference for the virtual `auto` model. New identifiers must be advertised and enabled by the provider. `fast` is an integrator-only latency preset.
  */
 export type AutoTier =
   /** Optimize for efficiency. */
@@ -164,7 +166,8 @@ export type AutoTier =
   /** Optimize for intelligence. */
   | "intelligence"
   /** Integrator-only preset that optimizes for latency. */
-  | "fast";
+  | "fast"
+  | (string & {});
 /**
  * Hosting platform type of the repository (github or ado)
  */
@@ -214,7 +217,9 @@ export type RemediationAction =
   /** Review or widen the sandbox policy. The blocked path or host is named by the accompanying message or by the tool result the action arrived with. */
   | "review_sandbox_policy"
   /** Permit outbound network access in the sandbox policy. */
-  | "allow_sandbox_outbound";
+  | "allow_sandbox_outbound"
+  /** Discard conversation history back through the blocked request before continuing. */
+  | "rewind_conversation";
 /**
  * The session mode the agent is operating in
  */
@@ -455,7 +460,7 @@ export type ModelDeselectedReason =
   /** A host-managed provider snapshot no longer publishes the selected model. */
   "provider_withdrawn";
 /**
- * Auto preferences that Copilot API can recommend.
+ * Enabled Auto preferences that Copilot API can recommend.
  */
 export type RecommendedAutoTier =
   /** Optimize for efficiency. */
@@ -463,7 +468,8 @@ export type RecommendedAutoTier =
   /** Balance efficiency and intelligence. */
   | "balance"
   /** Optimize for intelligence. */
-  | "intelligence";
+  | "intelligence"
+  | (string & {});
 /**
  * Terminal reason an Auto preference activation failed.
  */
@@ -513,6 +519,25 @@ export type HandoffSourceType =
   | "remote"
   /** The handoff originated from a local session. */
   | "local";
+/**
+ * Whether the accumulated numeric AI-credit subtotal covers the observed calls.
+ */
+export type AiCreditsStatus =
+  /** Every observed call supplied an AI-credit amount, including an explicit zero. */
+  | "complete"
+  /** Some calls supplied amounts and some did not; the numeric value is only a reported subtotal. */
+  | "partial"
+  /** No AI-credit amount was reported for the observed calls. Numeric zero is not a zero-cost claim. */
+  | "unavailable";
+/**
+ * The neutral kind of a model provider — the model analog of `AccountKind`. A model provider is the live, entitled source a model came from; central code never branches on this beyond a single dispatch.
+ */
+/** @experimental */
+export type ModelProviderKind =
+  /** GitHub Copilot / CAPI models, spawned by a github-resolving account that holds a Copilot seat. */
+  | "copilot"
+  /** Microsoft 365 Copilot (Loki) inference models, spawned by a resolvable Entra-derived Loki account. */
+  | "loki";
 /**
  * Whether the session ended normally ("routine") or due to a crash/fatal error ("error")
  */
@@ -521,6 +546,98 @@ export type ShutdownType =
   | "routine"
   /** The session ended because of a crash or fatal error. */
   | "error";
+/**
+ * Access policy reported by the quota service.
+ */
+export type ProviderQuotaAccessState =
+  /** Access is allowed. */
+  | "allowed"
+  /** Access is denied. */
+  | "denied"
+  /** Quota is not required for this access. */
+  | "not_required"
+  /** The service did not supply a recognized access state. */
+  | "unknown"
+  /** Client-only compatibility placeholder when acquisitionStatus is unavailable or failed; not an observed service verdict. */
+  | "unavailable";
+/**
+ * Acquisition state, independent of the service's business access/capacity verdict.
+ */
+export type ProviderQuotaAcquisitionStatus =
+  /** A service quota observation was received. */
+  | "succeeded"
+  /** No service snapshot is available for this caller or surface. */
+  | "unavailable"
+  /** Acquisition failed; inspect httpStatus/acquisitionError without inferring a business verdict. */
+  | "failed";
+/**
+ * Capacity is independent of whether a numeric balance was supplied.
+ */
+export type ProviderQuotaCapacityState =
+  /** Capacity is available. */
+  | "available"
+  /** The service explicitly reports exhaustion. */
+  | "exhausted"
+  /** The reported entitlement is unlimited. */
+  | "unlimited"
+  /** No billable quota is required. */
+  | "not_required"
+  /** The service reports that capacity is not applicable. */
+  | "not_applicable"
+  /** No recognized capacity state was supplied. */
+  | "unknown"
+  /** Client-only compatibility placeholder when acquisitionStatus is unavailable or failed; not an observed service verdict. */
+  | "unavailable";
+/**
+ * Identity scope of a monthly usage reading.
+ */
+export type ProviderMonthlyUsageScope =
+  /** Consumption of the authenticated user within the parent observation's service and returned cycle. */
+  | "user"
+  /** The service did not establish a recognized usage scope. */
+  | "unknown";
+/**
+ * Availability of a service's monthly consumption reading.
+ */
+export type ProviderMonthlyUsageState =
+  /** The service reported a usable consumption reading, including an explicit zero. */
+  | "available"
+  /** The service found no usage policy; no consumption amount is known. */
+  | "no_policy"
+  /** The read failed or its data could not be used; consumption is unknown. */
+  | "unavailable"
+  /** The service reported an unrecognized usage state. */
+  | "unknown";
+/**
+ * Units explicitly reported by a quota provider.
+ */
+export type ProviderQuotaUnit =
+  /** AI credits, not tokens or currency. */
+  | "ai_credits"
+  /** Requests charged against an entitlement. */
+  | "requests"
+  /** Model tokens. */
+  | "tokens"
+  /** The observation does not establish a quantity unit. */
+  | "unknown";
+/**
+ * Timing and purpose of a provider quota observation.
+ */
+export type ProviderQuotaObservationKind =
+  /** An explicit account read; consumption may still be subject to service aggregation delay. */
+  | "account_snapshot"
+  /** A verdict attached before an inference response. May be cached; never a post-charge balance. */
+  | "admission_state";
+/**
+ * Interpretation permitted for independently reported quantities.
+ */
+export type ProviderQuotaQuantityKind =
+  /** Quantities form an authoritative available-of-entitled budget suitable for percentage presentation. */
+  | "authoritative_budget"
+  /** Raw advisory quantities; do not infer permission, usage percentage, reset cadence, or post-charge balance. */
+  | "advisory_balance"
+  /** No quantity measurement, as with admission-only response headers. */
+  | "none";
 /**
  * What initiated a conversation compaction
  */
@@ -847,6 +964,16 @@ export type AssistantUsageApiEndpoint =
   | "/responses"
   /** WebSocket Responses API endpoint. */
   | "ws:/responses";
+/**
+ * Content-Encoding applied to the request body sent on the wire
+ */
+export type ModelCallRequestBodyEncoding =
+  /** The request body was sent uncompressed (including every WebSocket request). */
+  | "identity"
+  /** The request body was sent gzip-compressed. */
+  | "gzip"
+  /** The request body was sent zstd-compressed. */
+  | "zstd";
 /**
  * Transport used for a successful model call
  */
@@ -855,6 +982,48 @@ export type AssistantUsageTransport =
   | "http"
   /** WebSocket transport. */
   | "websocket";
+/**
+ * Normalized cause of the WebSocket failure that triggered the HTTP fallback
+ */
+export type ModelCallWebSocketFallbackErrorKind =
+  /** DNS resolution of the WebSocket host failed. */
+  | "dns"
+  /** The TLS handshake or a TLS record failed. */
+  | "tls"
+  /** A WebSocket connect or read timed out. */
+  | "timeout"
+  /** The peer refused the TCP connection. */
+  | "connection_refused"
+  /** The connection was reset, aborted, or ended mid-stream without a close. */
+  | "connection_reset"
+  /** The peer closed the WebSocket. */
+  | "closed_by_peer"
+  /** The runtime closed the WebSocket itself. */
+  | "closed_locally"
+  /** The socket was already closed before it was used. */
+  | "not_connected"
+  /** The upgrade or request was rejected with an HTTP status. */
+  | "http_status"
+  /** A WebSocket protocol violation or an undecodable frame. */
+  | "protocol"
+  /** The WebSocket request could not be built. */
+  | "configuration"
+  /** A failure that maps onto none of the other kinds. */
+  | "other";
+/**
+ * Why a WebSocket-capable model call was carried by the HTTP fallback
+ */
+export type ModelCallWebSocketFallbackReason =
+  /** The WebSocket connection could not be established. */
+  | "connect_failed"
+  /** No usable WebSocket connection was available for the request. */
+  | "connection_unavailable"
+  /** Sending the request over the WebSocket failed. */
+  | "send_failed"
+  /** The WebSocket returned a retryable API error. */
+  | "api_error"
+  /** The WebSocket transport failed before any output reached the consumer. */
+  | "transport_failed";
 /**
  * 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.
  */
@@ -914,7 +1083,7 @@ export type AbortReason =
   /** Autopilot stopped the run because the active objective reached its user-set --max-ai-credits limit. */
   | "autopilot_credit_limit";
 /**
- * Configuration source: user, workspace, plugin, builtin, or managed
+ * Configuration source: user, workspace, plugin, builtin, managed, or account
  */
 export type McpServerSource =
   /** Server configured in the user's global MCP configuration. */
@@ -926,7 +1095,9 @@ export type McpServerSource =
   /** Server bundled with the runtime. */
   | "builtin"
   /** Server supplied by a trusted host-managed catalog. */
-  | "managed";
+  | "managed"
+  /** Server contributed by a signed-in account; enablement and organization policy still apply. */
+  | "account";
 /**
  * Transport mechanism: stdio, http, sse (deprecated), or memory (in-process MCP server)
  */
@@ -1423,6 +1594,19 @@ export type AutoModeResolvedReasoningBucket =
   | "medium"
   /** The request looks high-reasoning; a stronger model is appropriate. */
   | "high";
+/**
+ * Current phase of organization-required plugin preparation.
+ */
+/** @experimental */
+export type ManagedPluginProgressPhase =
+  /** Managed settings are still resolving before plugin preparation can be planned. */
+  | "initializing"
+  /** Required plugin content is being installed. */
+  | "installing"
+  /** Installed required plugin content is being updated. */
+  | "updating"
+  /** Managed plugin preparation has completed. */
+  | "complete";
 /**
  * Summary of which managed-settings channels contributed to the effective session policy. Use the per-channel booleans for exact provenance.
  */
@@ -1443,17 +1627,17 @@ export type ManagedSettingsResolvedSource =
  * The category of runtime action that enterprise managed settings governed (blocked or capped)
  */
 export type ManagedSettingsEnforcedAction =
-  /** An attempt to turn on a bypass-permissions ("yolo") escalation was refused or capped because policy disables bypass-permissions mode. */
+  /** An attempt to enter a permission mode governed by managed policy was refused or capped. The `setting` and `escalation` fields identify whether this was bypass permissions or Assisted Permissions. */
   "bypass_permissions_blocked";
 /**
- * For a `bypass_permissions_blocked` action, which permission-escalation primitive was refused
+ * For a `bypass_permissions_blocked` action, which permission-mode or escalation primitive was refused
  */
 export type ManagedSettingsEnforcedEscalation =
   /** Full allow-all permissions — automatically approving tools, paths, and URLs. */
   | "allow_all"
   /** Automatic approval of all tool permission requests. */
   | "approve_all"
-  /** Assisted mode — keeps normal prompt paths and adds an LLM recommendation, distinct from allow-all. */
+  /** Assisted Permissions — uses an LLM review to reduce prompts, distinct from allow-all and not a hard security boundary. */
   | "assisted_approval"
   /** Unrestricted filesystem access outside the session's allowed directories. */
   | "unrestricted_paths"
@@ -1618,7 +1802,7 @@ export type McpServerStatus =
   | "pending"
   /** The server is configured but disabled. */
   | "disabled"
-  /** The server was intentionally stopped and can be restarted on demand when policy permits; a server quarantined by restrictive managed policy stays stopped and cannot be restarted until the policy allows it. */
+  /** The server is not running: it may not have started yet, may have been explicitly stopped, or may be quarantined by restrictive managed policy. It can be restarted on demand when policy permits. */
   | "stopped"
   /** The server is not configured for this session. */
   | "not_configured";
@@ -1686,11 +1870,19 @@ export interface StartData {
    */
   alreadyInUse?: boolean;
   autoTier?: AutoTier;
+  /**
+   * True when autoTier is a managed-policy default. Omitted for user-authored and legacy values.
+   */
+  autoTierManaged?: boolean;
   context?: WorkingDirectoryContext;
   /**
    * Context tier selected at session creation time for models with tiered context pricing; null when no tier is selected (e.g., non-tiered model)
    */
   contextTier?: ContextTier | null;
+  /**
+   * True when contextTier is a managed-policy default. Omitted for user-authored and legacy values.
+   */
+  contextTierManaged?: boolean;
   /**
    * Version string of the Copilot application
    */
@@ -1704,10 +1896,18 @@ export interface StartData {
    * Identifier of the software producing the events (e.g., "copilot-agent")
    */
   producer: string;
+  /**
+   * Provider of selectedModel at creation time, when explicitly selected.
+   */
+  providerId?: string;
   /**
    * Reasoning effort level used for model calls, if applicable (e.g. "none", "low", "medium", "high", "xhigh", "max")
    */
   reasoningEffort?: string;
+  /**
+   * True when the reasoning effort is a managed-policy default bound to reasoningEffortModel. Omitted for agent-authored, user-authored, independent, and legacy effort.
+   */
+  reasoningEffortManaged?: boolean;
   /**
    * Model that owns effort embedded in an authored model selection. Omitted for independent reasoning-effort overrides and legacy events.
    */
@@ -1843,11 +2043,19 @@ export interface ResumeData {
    */
   alreadyInUse?: boolean;
   autoTier?: AutoTier;
+  /**
+   * True when autoTier is a managed-policy default. Omitted for user-authored and legacy values.
+   */
+  autoTierManaged?: boolean;
   context?: WorkingDirectoryContext;
   /**
    * Context tier currently selected at resume time; null when no tier is active
    */
   contextTier?: ContextTier | null;
+  /**
+   * True when contextTier is a managed-policy default. Omitted for user-authored and legacy values.
+   */
+  contextTierManaged?: boolean;
   /**
    * When true, tool calls and permission requests left in flight by the previous session lifetime remain pending after resume and the agentic loop awaits their results. User sends are queued behind the pending work until all such requests reach a terminal state. When false or omitted, pending work is normally marked as interrupted unless the resume passively joined live work owned by another client; sessionWasActive distinguishes that case.
    */
@@ -1860,10 +2068,18 @@ export interface ResumeData {
    * On-disk byte size of the session's persisted events.jsonl file at resume time; omitted when the file does not exist or cannot be stat'd
    */
   eventsFileSizeBytes?: number;
+  /**
+   * Provider of selectedModel at resume time, when explicitly selected.
+   */
+  providerId?: string;
   /**
    * Reasoning effort level used for model calls, if applicable (e.g. "none", "low", "medium", "high", "xhigh", "max")
    */
   reasoningEffort?: string;
+  /**
+   * True when the reasoning effort is a managed-policy default bound to reasoningEffortModel. Omitted for agent-authored, user-authored, independent, and legacy effort.
+   */
+  reasoningEffortManaged?: boolean;
   /**
    * Model that owns effort embedded in an authored model selection. Omitted for independent reasoning-effort overrides and legacy events.
    */
@@ -1973,7 +2189,7 @@ export interface ErrorData {
    */
   errorCode?: string;
   /**
-   * Category of error (e.g., "authentication", "authorization", "quota", "rate_limit", "context_limit", "query")
+   * Category of error (e.g., "authentication", "authorization", "policy", "quota", "rate_limit", "context_limit", "query")
    */
   errorType: string;
   /**
@@ -1984,6 +2200,14 @@ export interface ErrorData {
    * GitHub request tracing ID (x-github-request-id header) for correlating with server-side logs
    */
   providerCallId?: string;
+  /**
+   * Sanitized provider-defined error parameter preserved from a structured upstream error envelope, when available.
+   */
+  providerErrorParam?: string;
+  /**
+   * Provider-defined error type preserved from a structured upstream error envelope, when available (for example, `invalid_request_error`).
+   */
+  providerErrorType?: string;
   remediation?: RemediationAction;
   /**
    * Copilot service request ID (x-copilot-service-request-id header) for CAPI log correlation
@@ -2443,6 +2667,10 @@ export interface ModelChangeData {
    * Committed Auto preference after the model configuration change, when applicable.
    */
   autoTier?: AutoTier | null;
+  /**
+   * True when autoTier is a managed-policy default. Omitted for user-authored and legacy values.
+   */
+  autoTierManaged?: boolean;
   /**
    * 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.
    */
@@ -2451,6 +2679,10 @@ export interface ModelChangeData {
    * Context tier after the model change; null explicitly clears a previously selected tier
    */
   contextTier?: ContextTier | null;
+  /**
+   * True when contextTier is a managed-policy default. Omitted for user-authored and legacy values.
+   */
+  contextTierManaged?: boolean;
   /**
    * Newly selected model identifier
    */
@@ -2460,16 +2692,28 @@ export interface ModelChangeData {
    * Model that was previously selected, if any
    */
   previousModel?: string;
+  /**
+   * Provider of previousModel, when known. A provider-only change is a model selection change even when the model identifiers are equal.
+   */
+  previousProviderId?: string;
   /**
    * Reasoning effort level before the model change, if applicable
    */
   previousReasoningEffort?: string;
   previousReasoningSummary?: ReasoningSummary;
   previousVerbosity?: Verbosity;
+  /**
+   * Provider selected for newModel. Omitted for legacy or unattributed selections; never inferred from a later selection.
+   */
+  providerId?: string;
   /**
    * Reasoning effort level after the model change, if applicable
    */
   reasoningEffort?: string | null;
+  /**
+   * True when the reasoning effort is a managed-policy default bound to reasoningEffortModel. Omitted for agent-authored, user-authored, independent, and legacy effort.
+   */
+  reasoningEffortManaged?: boolean;
   /**
    * Model that owns effort embedded in an authored model selection. Omitted for independent reasoning-effort overrides and legacy events.
    */
@@ -3100,6 +3344,12 @@ export interface ShutdownEvent {
  * Session termination metrics including usage statistics, code changes, and shutdown reason
  */
 export interface ShutdownData {
+  /**
+   * Complete accounting state captured atomically with receipt watermarks.
+   *
+   * @internal
+   */
+  accountingSnapshot?: UsageGetMetricsResult;
   /**
    * Per-agent usage breakdown, keyed by agent instance identifier. The main conversation uses the stable key `main`.
    */
@@ -3133,6 +3383,10 @@ export interface ShutdownData {
   modelMetrics: {
     [k: string]: ShutdownModelMetric | undefined;
   };
+  /**
+   * Provider/model accounting preserved for replay without consulting current provider selection.
+   */
+  providerModelMetrics?: UsageMetricsProviderModelMetric[];
   /**
    * Unix timestamp (milliseconds) when the session started
    */
@@ -3168,6 +3422,233 @@ export interface ShutdownData {
    * @internal
    */
   totalPremiumRequests?: number;
+  /**
+   * Per-source accounting sequence watermarks subsuming preceding usage receipts.
+   */
+  usageAccountingWatermarks?: {
+    [k: string]: number | undefined;
+  };
+}
+/**
+ * Accumulated session usage metrics, including premium request cost, token counts, model breakdown, and code-change totals.
+ */
+export interface UsageGetMetricsResult {
+  /**
+   * Per-agent usage metrics, keyed by agent instance identifier. The main conversation uses the stable key `main`.
+   */
+  agentMetrics?: {
+    [k: string]: UsageMetricsAgentMetric | undefined;
+  };
+  aiCreditsStatus?: AiCreditsStatus;
+  codeChanges: UsageMetricsCodeChanges;
+  /**
+   * Currently active model identifier
+   */
+  currentModel?: string;
+  /**
+   * Input tokens from the most recent main-agent API call
+   */
+  lastCallInputTokens: number;
+  /**
+   * Output tokens from the most recent main-agent API call
+   */
+  lastCallOutputTokens: number;
+  /**
+   * Per-model token and request metrics, keyed by model identifier
+   */
+  modelMetrics: {
+    [k: string]: UsageMetricsModelMetric | undefined;
+  };
+  /**
+   * Provider-attributed model metrics, ordered by first observed provider and model.
+   * Null attribution preserves historical usage whose provider or model was not recorded.
+   */
+  providerModelMetrics?: UsageMetricsProviderModelMetric[];
+  /**
+   * ISO 8601 timestamp when the session started
+   */
+  sessionStartTime: string;
+  /**
+   * Session-wide per-token-type accumulated token counts
+   */
+  tokenDetails?: {
+    [k: string]: UsageMetricsTokenDetail | undefined;
+  };
+  /**
+   * Total time spent in model API calls (milliseconds)
+   */
+  totalApiDurationMs: number;
+  /**
+   * Session-wide accumulated nano-AI units cost
+   */
+  totalNanoAiu?: number;
+  /**
+   * Total user-initiated premium request cost across all models (may be fractional due to multipliers)
+   */
+  totalPremiumRequestCost: number;
+  /**
+   * Raw count of user-initiated API requests
+   */
+  totalUserRequests: number;
+}
+/**
+ * Usage attributed to one agent instance, including its identity, API duration, AI units, and per-model breakdown.
+ */
+export interface 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.
+   */
+  agentDisplayName?: string;
+  /**
+   * Configured agent name, when this is a subagent
+   */
+  agentName?: string;
+  /**
+   * Per-model usage for this agent, keyed by model identifier
+   */
+  modelMetrics: {
+    [k: string]: UsageMetricsModelMetric | 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 usage metrics, including request counts/costs, token usage, nano-AI units, and per-token-type details.
+ */
+export interface UsageMetricsModelMetric {
+  aiCreditsStatus?: AiCreditsStatus;
+  /**
+   * Latest known prompt-cache expiration for this model. A timestamp in the past indicates that the observed cache has expired.
+   */
+  cacheExpiresAt?: string;
+  requests: UsageMetricsModelMetricRequests;
+  /**
+   * Token count details per type
+   */
+  tokenDetails?: {
+    [k: string]: UsageMetricsModelMetricTokenDetail | undefined;
+  };
+  /**
+   * Accumulated nano-AI units cost for this model
+   */
+  totalNanoAiu?: number;
+  usage: UsageMetricsModelMetricUsage;
+}
+/**
+ * Request count and cost metrics for this model
+ */
+export interface UsageMetricsModelMetricRequests {
+  /**
+   * User-initiated premium request cost (with multiplier applied)
+   */
+  cost: number;
+  /**
+   * Number of API requests made with this model
+   */
+  count: number;
+}
+/**
+ * Per-model token-detail entry containing the accumulated token count for one token type.
+ */
+export interface UsageMetricsModelMetricTokenDetail {
+  /**
+   * Accumulated token count for this token type
+   */
+  tokenCount: number;
+}
+/**
+ * Token usage metrics for this model
+ */
+export interface UsageMetricsModelMetricUsage {
+  /**
+   * Total tokens read from prompt cache
+   */
+  cacheReadTokens: number;
+  /**
+   * Total tokens written to prompt cache
+   */
+  cacheWriteTokens: number;
+  /**
+   * Total input tokens consumed
+   */
+  inputTokens: number;
+  /**
+   * Total output tokens produced
+   */
+  outputTokens: number;
+  /**
+   * Total output tokens used for reasoning
+   */
+  reasoningTokens?: number;
+}
+/**
+ * Aggregated code change metrics
+ */
+export interface UsageMetricsCodeChanges {
+  /**
+   * Distinct file paths modified during the session
+   */
+  filesModified: string[];
+  /**
+   * Number of distinct files modified
+   */
+  filesModifiedCount: number;
+  /**
+   * Total lines of code added
+   */
+  linesAdded: number;
+  /**
+   * Total lines of code removed
+   */
+  linesRemoved: number;
+}
+/**
+ * Usage for one recorded provider and model, without merging identical model IDs across providers.
+ */
+export interface UsageMetricsProviderModelMetric {
+  metrics: UsageMetricsModelMetric | undefined;
+  /**
+   * Model display name captured at call time, when known.
+   */
+  modelDisplayName?: string;
+  /**
+   * Model identity, or null for legacy aggregate-only usage.
+   */
+  modelId: string | null;
+  /**
+   * Provider identity and product label captured when the call was dispatched; null when unknown.
+   */
+  provider: ModelProviderRef | null;
+}
+/**
+ * A neutral reference to the model provider that produced a model: an opaque id, a human-readable label, and the provider kind. Carried on each enumerated Model so consumers can group by provider without reaching into a provider-shaped internal type.
+ */
+/** @experimental */
+export interface ModelProviderRef {
+  /**
+   * Opaque, stable id of the provider that produced this model. Matches the enumerated `ModelProviderDescriptor.id`.
+   */
+  id: string;
+  kind: ModelProviderKind;
+  /**
+   * Human-readable provider label, owned by the runtime so every consumer renders identical text.
+   */
+  label: string;
+}
+/**
+ * Session-wide token-detail entry containing the accumulated token count for one token type.
+ */
+export interface UsageMetricsTokenDetail {
+  /**
+   * Accumulated token count for this token type
+   */
+  tokenCount: number;
 }
 /**
  * Usage attributed to one agent instance at session shutdown.
@@ -3326,6 +3807,12 @@ export interface UsageCheckpointEvent {
  * Durable session usage checkpoint for reconstructing aggregate accounting on resume
  */
 export interface UsageCheckpointData {
+  /**
+   * Complete accounting state captured atomically with the receipt watermarks.
+   *
+   * @internal
+   */
+  accountingSnapshot?: UsageGetMetricsResult;
   /**
    * Internal per-model prompt-cache state used to restore expiration tracking on resume
    *
@@ -3338,6 +3825,10 @@ export interface UsageCheckpointData {
    * @internal
    */
   promptCacheBreakState?: JsonValue[];
+  /**
+   * Provider/model accounting snapshot that subsumes preceding usage receipts.
+   */
+  providerModelMetrics?: UsageMetricsProviderModelMetric[];
   /**
    * Session-wide accumulated nano-AI units cost at checkpoint time
    */
@@ -3348,6 +3839,12 @@ export interface UsageCheckpointData {
    * @internal
    */
   totalPremiumRequests?: number;
+  /**
+   * Highest accounted sequence per source session; no per-call deduplication history is retained.
+   */
+  usageAccountingWatermarks?: {
+    [k: string]: number | undefined;
+  };
 }
 /**
  * Internal prompt-cache expiration state for one model
@@ -3369,6 +3866,177 @@ export interface UsageCheckpointModelCacheState {
    */
   modelId: string;
 }
+/**
+ * Session event "session.quota_observation". A provider-owned quota observation, distinct from per-call usage and charge accounting.
+ */
+/** @experimental */
+export interface ProviderQuotaObservationEvent {
+  /**
+   * Sub-agent instance identifier. Absent for events from the root/main agent and session-level events.
+   */
+  agentId?: string;
+  data: ProviderQuotaObservationData;
+  /**
+   * 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 "session.quota_observation".
+   */
+  type: "session.quota_observation";
+}
+/**
+ * A provider-owned quota observation, distinct from per-call usage and charge accounting.
+ */
+/** @experimental */
+export interface ProviderQuotaObservationData {
+  observation: ProviderQuotaState;
+}
+/**
+ * An account quota reading. Absence of a quantity is unknown, never zero.
+ */
+/** @experimental */
+export interface ProviderQuotaState {
+  accessState: ProviderQuotaAccessState;
+  /**
+   * Service error code or client acquisition category, separate from the business-state reason.
+   */
+  acquisitionError?: string;
+  acquisitionStatus?: ProviderQuotaAcquisitionStatus;
+  /**
+   * Independently reported signed 64-bit available quantity. Zero does not override the service access/capacity verdict; omission and null are preserved.
+   */
+  availableQuantity?: number | null;
+  budgetMetadata?: ProviderQuotaBudgetMetadata;
+  capacityState: ProviderQuotaCapacityState;
+  /**
+   * Key for the backwards-compatible snapshots projection, when the authoritative budget supports that contract.
+   */
+  compatibilityKey?: string;
+  /**
+   * Independently reported signed 64-bit entitlement. -1 is an unlimited sentinel, not a capacity-state rewrite; omission and null are preserved.
+   */
+  entitledQuantity?: number | null;
+  /**
+   * Explicit service admission flag, when reported.
+   */
+  hasQuota?: boolean | null;
+  /**
+   * HTTP status from acquisition, when available.
+   */
+  httpStatus?: number;
+  monthlyUsage?: ProviderMonthlyUsage;
+  observationKind?: ProviderQuotaObservationKind;
+  /**
+   * When the runtime observed this reading, not a charge timestamp or guarantee that consumption has settled.
+   */
+  observedAt?: string;
+  provider: ModelProviderRef;
+  quantityKind?: ProviderQuotaQuantityKind;
+  /**
+   * Service-owned quota identifier within this provider.
+   */
+  quotaId: string;
+  /**
+   * Service-reported explanation for the state.
+   */
+  reason?: string | null;
+  /**
+   * Service name owning this reading.
+   */
+  service?: string | null;
+  /**
+   * Service-reported quota source.
+   */
+  source?: string | null;
+  unit: ProviderQuotaUnit;
+}
+/**
+ * Authoritative budget measurements and policy metadata, independent of provider.
+ */
+export interface ProviderQuotaBudgetMetadata {
+  /**
+   * Exact measured consumption in the budget's unit.
+   */
+  consumed: number;
+  /**
+   * Exact budget entitlement, retaining incumbent fractional-unit compatibility.
+   */
+  entitlement: number;
+  /**
+   * Usage beyond entitlement, in the budget's unit.
+   */
+  overage: number;
+  /**
+   * Whether additional usage is allowed when the budget is exhausted.
+   */
+  overageAllowedWhenExhausted: boolean;
+  /**
+   * Optional additional-usage budget cap.
+   */
+  overageLimit?: number;
+  /**
+   * Service-reported remaining percentage for authoritative budget presentation.
+   */
+  remainingPercentage: number;
+  /**
+   * Reset instant in epoch milliseconds when this budget actually defines a window.
+   */
+  resetAtEpochMs?: number;
+  /**
+   * Whether the reset instant is an estimate.
+   */
+  resetEstimated?: boolean;
+  /**
+   * Whether this budget uses token-based billing.
+   */
+  tokenBasedBilling?: boolean;
+  /**
+   * Whether the budget has unlimited entitlement.
+   */
+  unlimited: boolean;
+  /**
+   * Whether service policy allows continued usage after exhaustion.
+   */
+  usageAllowedWhenExhausted: boolean;
+}
+/**
+ * An authoritative monthly usage reading for the observation's provider, account, and service.
+ */
+/** @experimental */
+export interface ProviderMonthlyUsage {
+  /**
+   * Nonnegative finite consumption reported by the service, preserving zero and fractions. Present only when state is available; never computed from tokens or balance differences.
+   */
+  consumedQuantity?: number;
+  /**
+   * Start of the service-reported monthly billing cycle, in UTC RFC 3339.
+   */
+  cycleStart?: string;
+  /**
+   * Service read time in UTC RFC 3339, not a ledger reconciliation watermark or confirmation of the latest inference charge.
+   */
+  queriedAt?: string;
+  /**
+   * End of the service-reported monthly billing cycle, in UTC RFC 3339.
+   */
+  resetOn?: string;
+  scope: ProviderMonthlyUsageScope;
+  state: ProviderMonthlyUsageState;
+  unit: ProviderQuotaUnit;
+}
 /**
  * Session event "session.context_changed". Updated working directory and git context after the change
  */
@@ -3695,6 +4363,7 @@ export interface CompactionCompleteData {
  * Token usage breakdown for the compaction LLM call (aligned with assistant.usage format)
  */
 export interface CompactionCompleteCompactionTokensUsed {
+  aiCreditsStatus?: AiCreditsStatus;
   /**
    * Cached input tokens reused in the compaction LLM call
    */
@@ -3721,10 +4390,19 @@ export interface CompactionCompleteCompactionTokensUsed {
    * Model identifier used for the compaction LLM call
    */
   model?: string;
+  /**
+   * Model display name captured for the compaction call.
+   */
+  modelDisplayName?: string;
   /**
    * Output tokens produced by the compaction LLM call
    */
   outputTokens?: number;
+  provider?: ModelProviderRef;
+  /**
+   * Number of model requests represented by this aggregated compaction usage
+   */
+  requestCount?: number;
 }
 /**
  * Per-request cost and usage data from the CAPI copilot_usage response field
@@ -3873,6 +4551,14 @@ export interface PermissionRecoveryData {
    */
   maxAttempts: number;
   onBlocked: PermissionRecoveryOnBlocked;
+  /**
+   * Subagent identifier that owns this recovery episode when the request was delegated through a parent permission service
+   */
+  ownerAgentId?: string;
+  /**
+   * Root or child execution-session identifier that owns this recovery episode; omitted for legacy snapshots
+   */
+  ownerSessionId?: string;
   reason: PermissionRecoveryReason;
   status: PermissionRecoveryStatus;
 }
@@ -5752,6 +6438,10 @@ export interface AssistantMessageData {
    * Generation phase for phased-output models (e.g., thinking vs. response phases)
    */
   phase?: string;
+  /**
+   * Opaque origin provider identity captured at dispatch. Only an exact match with the target provider permits replay of reasoningOpaque, encryptedContent, reasoningBlocks, serverTools, and provider response/item identifiers. Matching model ids or wire protocols is insufficient. Omitted for legacy or unattributed messages; the runtime excludes unproven opaque state when projecting to a known provider. Text content and client tool requests/results remain portable semantic history.
+   */
+  providerId?: string;
   reasoningBlocks?: AssistantMessageReasoningBlocks;
   /**
    * Opaque/encrypted extended thinking data from Anthropic models. Session-bound and stripped on resume.
@@ -6275,6 +6965,8 @@ export interface AssistantUsageData {
    * Number of accepted speculative prediction tokens
    */
   acceptedPredictionTokens?: number;
+  accounting?: UsageAccountingIdentity;
+  aiCreditsStatus?: AiCreditsStatus;
   /**
    * Completion ID from the model provider (e.g., chatcmpl-abc123)
    */
@@ -6381,6 +7073,10 @@ export interface AssistantUsageData {
    * Model identifier used for this API call
    */
   model: string;
+  /**
+   * Model display name captured for this call, not derived from the current selection.
+   */
+  modelDisplayName?: string;
   /**
    * Fixed-set provider family serving the bring-your-own-key model (for example "openai", "anthropic", "azure_openai", "ollama", "llama_cpp", or "other"). Never the caller-supplied provider name. Absent for Copilot-served models.
    */
@@ -6404,6 +7100,7 @@ export interface AssistantUsageData {
    * Parent tool call ID when this usage originates from a sub-agent
    */
   parentToolCallId?: string;
+  provider?: ModelProviderRef;
   /**
    * GitHub request tracing ID (x-github-request-id header) for server-side log correlation
    */
@@ -6429,6 +7126,15 @@ export interface AssistantUsageData {
    * Number of rejected speculative prediction tokens
    */
   rejectedPredictionTokens?: number;
+  /**
+   * Serialized (uncompressed) byte length of the request body, before any Content-Encoding. A content-free size signal.
+   */
+  requestBodyBytes?: number;
+  requestBodyEncoding?: ModelCallRequestBodyEncoding;
+  /**
+   * Byte length of the request body actually sent on the wire for the attempt that produced this outcome, after any Content-Encoding. Equals requestBodyBytes when the body was not compressed.
+   */
+  requestBodyWireBytes?: 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.
    */
@@ -6468,6 +7174,45 @@ export interface AssistantUsageData {
    */
   toolTokenCount?: number;
   transport?: AssistantUsageTransport;
+  /**
+   * Milliseconds spent on the WebSocket attempt before falling back to HTTP
+   */
+  websocketFallbackAfterMs?: number;
+  /**
+   * WebSocket close code received before the HTTP fallback
+   */
+  websocketFallbackCloseCode?: number;
+  websocketFallbackErrorKind?: ModelCallWebSocketFallbackErrorKind;
+  websocketFallbackReason?: ModelCallWebSocketFallbackReason;
+  /**
+   * Whether a WebSocket reconnect was attempted before falling back to HTTP
+   */
+  websocketFallbackReconnectAttempted?: boolean;
+  /**
+   * Whether the HTTP fallback started during this model call, rather than being inherited from an earlier call
+   */
+  websocketFallbackStartedThisCall?: boolean;
+  /**
+   * HTTP status of the WebSocket upgrade rejection or WebSocket API error that triggered the HTTP fallback
+   */
+  websocketFallbackStatusCode?: number;
+}
+/**
+ * Ordered accounting identity assigned under the source session's emission lock.
+ */
+export interface UsageAccountingIdentity {
+  /**
+   * Monotonically increasing sequence within the source session.
+   */
+  sequence: number;
+  /**
+   * Session that assigned this accounting sequence.
+   */
+  sourceSessionId: string;
+  /**
+   * Existing API call identifier, or a runtime-generated identity when none was supplied.
+   */
+  usageId: string;
 }
 /**
  * Per-request cost and usage data from the CAPI copilot_usage response field
@@ -6704,7 +7449,20 @@ export interface ModelCallFailureData {
    * Reasoning effort level used for the failed model call, if applicable
    */
   reasoningEffort?: string;
+  /**
+   * Serialized (uncompressed) byte length of the failed request body, before any Content-Encoding. A content-free size signal.
+   */
+  requestBodyBytes?: number;
+  requestBodyEncoding?: ModelCallRequestBodyEncoding;
+  /**
+   * Byte length of the failed request body actually sent on the wire, after any Content-Encoding. Equals requestBodyBytes when the body was not compressed.
+   */
+  requestBodyWireBytes?: number;
   requestFingerprint?: ModelCallFailureRequestFingerprint;
+  /**
+   * Zero-based orchestrator retry index of the failed attempt
+   */
+  retryAttempt?: 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.
    */
@@ -6719,11 +7477,41 @@ export interface ModelCallFailureData {
    */
   statusCode?: number;
   transport?: ModelCallFailureTransport;
+  /**
+   * Milliseconds spent on the WebSocket attempt before falling back to HTTP
+   */
+  websocketFallbackAfterMs?: number;
+  /**
+   * WebSocket close code received before the HTTP fallback
+   */
+  websocketFallbackCloseCode?: number;
+  websocketFallbackErrorKind?: ModelCallWebSocketFallbackErrorKind;
+  websocketFallbackReason?: ModelCallWebSocketFallbackReason;
+  /**
+   * Whether a WebSocket reconnect was attempted before falling back to HTTP
+   */
+  websocketFallbackReconnectAttempted?: boolean;
+  /**
+   * Whether the HTTP fallback started during this model call, rather than being inherited from an earlier call
+   */
+  websocketFallbackStartedThisCall?: boolean;
+  /**
+   * HTTP status of the WebSocket upgrade rejection or WebSocket API error that triggered the HTTP fallback
+   */
+  websocketFallbackStatusCode?: number;
 }
 /**
  * Content-free structural summary of the failing request for diagnosing malformed 4xx calls
  */
 export interface ModelCallFailureRequestFingerprint {
+  /**
+   * Summed byte length of opaque or encrypted reasoning payloads
+   */
+  encryptedContentBytes?: number;
+  /**
+   * Summed byte length of inline image payloads (data URLs and base64 sources)
+   */
+  imageBytes?: number;
   /**
    * Total number of image content parts
    */
@@ -6744,6 +7532,10 @@ export interface ModelCallFailureRequestFingerprint {
    * Tool calls whose name is missing or empty (rejected by strict providers)
    */
   namelessToolCallCount: number;
+  /**
+   * Number of messages carrying opaque or encrypted reasoning
+   */
+  reasoningItemCount?: number;
   /**
    * Total number of tool calls across assistant messages
    */
@@ -8902,6 +9694,14 @@ export interface PermissionRequestedEvent {
  */
 export interface PermissionRequestedData {
   agentMode?: SessionMode;
+  /**
+   * Delegated agent that owns permission recovery when the owner session multiplexes remote agents. Absent otherwise.
+   */
+  ownerAgentId?: string;
+  /**
+   * Execution session that owns permission recovery for this request. Absent on historical events.
+   */
+  ownerSessionId?: string;
   permissionMode?: PermissionMode;
   permissionRequest: PermissionRequest;
   promptRequest?: PermissionPromptRequest;
@@ -9073,6 +9873,12 @@ export interface PermissionRequestWrite {
    * Unified diff showing the proposed changes
    */
   diff: string;
+  /**
+   * Complete before/after text previews captured while planning this request. Omitted when a complete preview is unavailable, including pre-read sandbox requests and non-UTF-8 files. Missing sides mean creation or deletion, not unavailable content.
+   *
+   * @minItems 1
+   */
+  fileEdits?: [PermissionWriteFileEdit, ...PermissionWriteFileEdit[]];
   /**
    * Path of the file being written to
    */
@@ -9118,6 +9924,26 @@ export interface PermissionRequestWrite {
    */
   toolCallId?: string;
 }
+/**
+ * Complete text snapshots for one proposed file change. At least one side is present. Different before and after paths describe a move.
+ */
+export interface PermissionWriteFileEdit {
+  after?: PermissionWriteFileContent;
+  before?: PermissionWriteFileContent;
+}
+/**
+ * A named, complete UTF-8 text snapshot for a pending file operation.
+ */
+export interface PermissionWriteFileContent {
+  /**
+   * Complete file contents, including an empty string for an empty file.
+   */
+  content: string;
+  /**
+   * Absolute path in the session filesystem namespace.
+   */
+  path: string;
+}
 /**
  * File or directory read permission request
  */
@@ -9353,6 +10179,8 @@ export interface PermissionApprovalEvaluation {
     | "action-too-long"
     /** The script path was not authorized for inspection. */
     | "path-not-authorized"
+    /** A code source was excluded from review by content exclusion policy. */
+    | "content-excluded"
     /** The script working directory was invalid. */
     | "invalid-working-directory"
     /** The script snapshot could not be read. */
@@ -9377,6 +10205,18 @@ export interface PermissionApprovalEvaluation {
     | "unreviewable-script-invocation"
     /** The script argument binding could not be reviewed. */
     | "argument-binding-unreviewable"
+    /** The shell command could not be analyzed for execution evidence. */
+    | "unsupported-command-shape"
+    /** The shell command used a code source that cannot be bound for review. */
+    | "unsupported-source"
+    /** The shell command used a code source computed at run time. */
+    | "dynamic-source"
+    /** The shell command referenced more code sources than can be reviewed. */
+    | "too-many-sources"
+    /** A code-bearing executable could not be inspected. */
+    | "executable-unavailable"
+    /** A code-bearing executable exceeded the binding size limit. */
+    | "executable-too-large"
     /** The script review metadata was malformed. */
     | "malformed-script-action-review"
     /** The script snapshot manifest was malformed. */
@@ -9671,6 +10511,12 @@ export interface PermissionPromptRequestWrite {
    * Unified diff showing the proposed changes
    */
   diff: string;
+  /**
+   * Complete before/after text previews captured while planning this request. Omitted when a complete preview is unavailable, including pre-read sandbox requests and non-UTF-8 files. Missing sides mean creation or deletion, not unavailable content.
+   *
+   * @minItems 1
+   */
+  fileEdits?: [PermissionWriteFileEdit, ...PermissionWriteFileEdit[]];
   /**
    * Path of the file being written to
    */
@@ -12028,6 +12874,48 @@ export interface AutoModeResolvedData {
    */
   stickyOverride?: boolean;
 }
+/**
+ * Session event "session.managed_plugin_progress". Experimental transient presentation-neutral progress for organization-required plugin preparation. Clients should localize the phase copy and display plugin specs without translating them.
+ */
+/** @experimental */
+export interface ManagedPluginProgressEvent {
+  /**
+   * Sub-agent instance identifier. Absent for events from the root/main agent and session-level events.
+   */
+  agentId?: string;
+  data: ManagedPluginProgressData;
+  /**
+   * 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 "session.managed_plugin_progress".
+   */
+  type: "session.managed_plugin_progress";
+}
+/**
+ * Experimental transient presentation-neutral progress for organization-required plugin preparation. Clients should localize the phase copy and display plugin specs without translating them.
+ */
+/** @experimental */
+export interface ManagedPluginProgressData {
+  phase: ManagedPluginProgressPhase;
+  /**
+   * Ordered plugin install specs affected by this phase. Empty while managed settings initialize and when preparation completes.
+   */
+  pluginSpecs: string[];
+}
 /**
  * Session event "session.managed_settings_resolved". Effective enterprise managed settings applied to the session and their contributing channels. Emitted whenever managed policy is applied or reapplied, including session start, resume, and account switch. This ephemeral live snapshot is delivered to subscribers but not persisted to the session event log; initial resolution occurs before session.start.
  */
@@ -12065,7 +12953,7 @@ export interface ManagedSettingsResolvedEvent {
 /** @experimental */
 export interface ManagedSettingsResolvedData {
   /**
-   * Whether enterprise policy disables bypass-permissions ("yolo") mode for this session. Deny-wins across layers, and forced on when `failClosed` is true.
+   * Whether an explicit enterprise policy restriction disables bypass-permissions ("yolo") mode for this session. Deny-wins across layers; an unresolved policy does not force this on by itself.
    */
   bypassPermissionsDisabled: boolean;
   /**
@@ -12077,7 +12965,7 @@ export interface ManagedSettingsResolvedData {
    */
   deviceManaged: boolean;
   /**
-   * 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.
+   * Whether managed policy could not be determined (e.g. a failed server fetch) and unresolved-policy safeguards remain active. This does not by itself disable bypass-permissions; `bypassPermissionsDisabled` reports only an explicit policy restriction.
    */
   failClosed: boolean;
   /**
@@ -12088,6 +12976,7 @@ export interface ManagedSettingsResolvedData {
    * Whether at least two managed sources supplied permission allowlists, so enforcement intersects them and the flattened settings payload omits `permissions.allow`.
    */
   permissionsAllowIntersected?: boolean;
+  permissionsContext?: ManagedPermissionsContext;
   /**
    * Whether the policy-helper managed-settings layer was present. The policy helper is the weakest channel: it fills keys no enterprise source set and can never replace one.
    */
@@ -12107,7 +12996,20 @@ export interface ManagedSettingsResolvedData {
   source: ManagedSettingsResolvedSource;
 }
 /**
- * Session event "session.managed_settings_enforced". Runtime enforcement of enterprise managed settings: fires when the session blocks or caps a runtime action because enterprise policy governs it, so SDK clients can explain *why* an action was governed. Unlike `session.managed_settings_resolved` (which reports *what* is managed), this reports a concrete governed action — e.g. a user or host tried to turn on a bypass-permissions escalation while policy disables it. Emitted live (not persisted to the session event log) on user/host-initiated attempts only, never for silent policy application. Marked experimental while the managed-settings surface stabilizes.
+ * Reusable managed permission evaluation context. Treat permissions as runtime-owned policy data and retain it verbatim; it includes source-aware composition metadata. This is a snapshot, not a capability or approval token; only use contexts obtained from trusted policy sources.
+ */
+export interface ManagedPermissionsContext {
+  /**
+   * Policy could not be determined; evaluation must deny every operation.
+   */
+  failClosed: boolean;
+  /**
+   * Runtime-owned composed permissions object. Absent when no permission policy is configured.
+   */
+  permissions?: JsonValue;
+}
+/**
+ * Session event "session.managed_settings_enforced". Runtime enforcement of enterprise managed settings: fires when the session blocks or caps a runtime action because enterprise policy governs it, so SDK clients can explain *why* an action was governed. Unlike `session.managed_settings_resolved` (which reports *what* is managed), this reports a concrete governed action — e.g. a user or host tried to turn on bypass permissions or Assisted Permissions while the corresponding policy disables it. Emitted live (not persisted to the session event log) on user/host-initiated attempts only, never for silent policy application. Marked experimental while the managed-settings surface stabilizes.
  */
 /** @experimental */
 export interface ManagedSettingsEnforcedEvent {
@@ -12138,7 +13040,7 @@ export interface ManagedSettingsEnforcedEvent {
   type: "session.managed_settings_enforced";
 }
 /**
- * Runtime enforcement of enterprise managed settings: fires when the session blocks or caps a runtime action because enterprise policy governs it, so SDK clients can explain *why* an action was governed. Unlike `session.managed_settings_resolved` (which reports *what* is managed), this reports a concrete governed action — e.g. a user or host tried to turn on a bypass-permissions escalation while policy disables it. Emitted live (not persisted to the session event log) on user/host-initiated attempts only, never for silent policy application. Marked experimental while the managed-settings surface stabilizes.
+ * Runtime enforcement of enterprise managed settings: fires when the session blocks or caps a runtime action because enterprise policy governs it, so SDK clients can explain *why* an action was governed. Unlike `session.managed_settings_resolved` (which reports *what* is managed), this reports a concrete governed action — e.g. a user or host tried to turn on bypass permissions or Assisted Permissions while the corresponding policy disables it. Emitted live (not persisted to the session event log) on user/host-initiated attempts only, never for silent policy application. Marked experimental while the managed-settings surface stabilizes.
  */
 /** @experimental */
 export interface ManagedSettingsEnforcedData {
@@ -12153,7 +13055,7 @@ export interface ManagedSettingsEnforcedData {
    */
   message: string;
   /**
-   * The managed setting key responsible for the enforcement (e.g. `permissions.disableBypassPermissionsMode`).
+   * The managed setting key responsible for the enforcement (for example `permissions.disableBypassPermissionsMode` or `permissions.disableAssistedPermissionsMode`).
    */
   setting: string;
 }
diff --git a/nodejs/src/host.ts b/nodejs/src/host.ts
index 28d64b89f6..40b1060f69 100644
--- a/nodejs/src/host.ts
+++ b/nodejs/src/host.ts
@@ -6,6 +6,7 @@ import type {
     HostExitedNotification,
     HostStartResult,
     HostPublishSessionResult,
+    HostListSessionsResult,
     HostLocalServerOptions,
     HostGitHubEnvironmentOptions,
 } from "./generated/rpc.js";
@@ -44,6 +45,8 @@ export type AhpHostExit = HostExitedNotification;
  * @experimental
  */
 export interface AhpHostOptions {
+    /** Stable catalog identity; must agree with githubEnvironment.computeId when both are supplied. */
+    computeId?: string;
     /** Enable a local WebSocket listener; an empty object selects loopback defaults. */
     localServer?: HostLocalServerOptions;
     /** Register a Mission Control environment and enable remote WPS connections. */
@@ -57,7 +60,7 @@ export interface AhpHostOptions {
      */
     createSession?: (request: AhpSessionCreateRequest) => Promise<CopilotSession>;
     /**
-     * Resume a durable session previously created by an application factory.
+     * Resume a durable application-owned session, including a previously published session.
      * Return the original object from this client's resumeSession, or an existing
      * attached original without reconfiguring it. Published resident sessions
      * attach directly and never invoke this callback.
@@ -77,7 +80,7 @@ export interface AhpHostOptions {
  * the owning client also stops the host; reconnecting does not reclaim it.
  * Stopping a host does not delete its underlying sessions.
  * Its durable AHP catalog is shared by successive hosts in the runtime's
- * effective Copilot home; a concurrent host for that catalog is rejected.
+ * effective Copilot home and compute identity; a concurrent host for that catalog is rejected.
  *
  * @experimental
  */
@@ -98,7 +101,8 @@ export class AhpHost {
         private readonly disposeHost: () => Promise<void>,
         private readonly publishHostSession: (
             sessionId: string
-        ) => Promise<HostPublishSessionResult>
+        ) => Promise<HostPublishSessionResult>,
+        private readonly listHostSessions: () => Promise<HostListSessionsResult>
     ) {
         this.hostId = info.hostId;
         this.url = info.url;
@@ -112,11 +116,16 @@ export class AhpHost {
         return this.disposeHost();
     }
 
-    /** Publish an existing session attached to this client, until this listener stops. */
+    /** Publish an attached application session into the durable compute-scoped host catalog. */
     publishSession(sessionId: string): Promise<HostPublishSessionResult> {
         return this.publishHostSession(sessionId);
     }
 
+    /** List all live and dormant catalog sessions advertised by this host. */
+    listSessions(): Promise<HostListSessionsResult> {
+        return this.listHostSessions();
+    }
+
     async [Symbol.asyncDispose](): Promise<void> {
         await this.dispose();
     }
diff --git a/nodejs/src/index.ts b/nodejs/src/index.ts
index 897be6cb1c..e95b5362de 100644
--- a/nodejs/src/index.ts
+++ b/nodejs/src/index.ts
@@ -9,7 +9,12 @@
  */
 
 export { CopilotClient } from "./client.js";
-export type { HostLocalServerOptions, HostGitHubEnvironmentOptions } from "./generated/rpc.js";
+export type {
+    HostLocalServerOptions,
+    HostGitHubEnvironmentOptions,
+    ModelGetReasoningSummariesRequest,
+    ModelGetReasoningSummariesResult,
+} from "./generated/rpc.js";
 export {
     AhpHost,
     type AhpHostExit,
@@ -226,6 +231,9 @@ export type {
     SessionFsSqliteProvider,
     SessionFsSqliteStatement,
     SessionFsSqliteTransactionErrorClass,
+    SkillProvider,
+    SkillProviderCallOptions,
+    SkillProviderDescriptor,
     CopilotRequestContext,
     SystemMessageAppendConfig,
     SystemMessageConfig,
@@ -242,6 +250,7 @@ export type {
     ToolTelemetry,
     ToolResultObject,
     ToolSearchConfig,
+    ImageGenerationConfig,
     TypedSessionEventHandler,
     TypedSessionLifecycleHandler,
     ZodSchema,
diff --git a/nodejs/src/session.ts b/nodejs/src/session.ts
index 5790ff2643..02e60dfbcf 100644
--- a/nodejs/src/session.ts
+++ b/nodejs/src/session.ts
@@ -8,7 +8,7 @@
  */
 
 import { AsyncLocalStorage } from "node:async_hooks";
-import type { MessageConnection } from "vscode-jsonrpc/node.js";
+import type { CancellationToken, MessageConnection } from "vscode-jsonrpc/node.js";
 import { ConnectionError, ErrorCodes, ResponseError } from "vscode-jsonrpc/node.js";
 import { createInternalSessionRpc, createSessionRpc } from "./generated/rpc.js";
 import type {
@@ -60,6 +60,9 @@ import type {
     SessionEventType,
     SessionHooks,
     SessionUiApi,
+    SkillProvider,
+    SkillProviderCallOptions,
+    SkillProviderDescriptor,
     Tool,
     ToolHandler,
     ToolResult,
@@ -195,13 +198,13 @@ function isOpenCanvasInstance(value: unknown): value is OpenCanvasInstance {
     );
 }
 
-const FACTORY_LOG_FLUSH_DELAY_MS = 10;
-const MAX_FACTORY_FANOUT_ITEMS = 4096;
+const WORKFLOW_LOG_FLUSH_DELAY_MS = 10;
+const MAX_WORKFLOW_FANOUT_ITEMS = 4096;
 
 function assertWorkflowFanoutSize(kind: "parallel" | "pipeline", size: number): void {
-    if (size > MAX_FACTORY_FANOUT_ITEMS) {
+    if (size > MAX_WORKFLOW_FANOUT_ITEMS) {
         throw new Error(
-            `${kind}() accepts at most ${MAX_FACTORY_FANOUT_ITEMS} items; got ${size}.`
+            `${kind}() accepts at most ${MAX_WORKFLOW_FANOUT_ITEMS} items; got ${size}.`
         );
     }
 }
@@ -334,7 +337,7 @@ class WorkflowProgressBuffer {
         this.flushTimer = setTimeout(() => {
             this.flushTimer = undefined;
             void this.flush().catch(() => {});
-        }, FACTORY_LOG_FLUSH_DELAY_MS);
+        }, WORKFLOW_LOG_FLUSH_DELAY_MS);
         this.flushTimer.unref?.();
     }
 
@@ -463,6 +466,7 @@ export class CopilotSession {
     private elicitationHandler?: ElicitationHandler;
     private exitPlanModeHandler?: ExitPlanModeHandler;
     private autoModeSwitchHandler?: AutoModeSwitchHandler;
+    private skillProvider?: SkillProvider;
     private hooks?: SessionHooks;
     private transformCallbacks?: Map<string, SectionTransformFn>;
     private _rpc: ReturnType<typeof createSessionRpc> | null = null;
@@ -472,6 +476,7 @@ export class CopilotSession {
     private _capabilities: SessionCapabilities = {};
     private openCanvasInstances: OpenCanvasInstance[] = [];
     private disconnected = false;
+    private readonly pendingResponseWaits = new Set<(error: Error) => void>();
     private readonly pendingStructuredWaits = new Set<(error: Error) => void>();
     private disconnecting = false;
     private onDisconnected?: () => void;
@@ -884,6 +889,8 @@ export class CopilotSession {
                 resolveOutcome({ kind: "error", error });
             }
         });
+        const fail = (error: Error) => resolveOutcome({ kind: "error", error });
+        this.pendingResponseWaits.add(fail);
 
         let timeoutId: ReturnType<typeof setTimeout> | undefined;
         try {
@@ -911,6 +918,7 @@ export class CopilotSession {
                 clearTimeout(timeoutId);
             }
             unsubscribe();
+            this.pendingResponseWaits.delete(fail);
         }
     }
 
@@ -1012,12 +1020,22 @@ export class CopilotSession {
         }
     }
 
+    private assertConnected(): void {
+        if (this.disconnected) {
+            throw new Error("Session is disconnected");
+        }
+    }
+
     /** @internal */
     _markDisconnected(): void {
         if (this.disconnected) {
             return;
         }
         this.disconnected = true;
+        for (const fail of this.pendingResponseWaits) {
+            fail(new Error("Session disconnected while waiting for a response"));
+        }
+        this.pendingResponseWaits.clear();
         for (const fail of this.pendingStructuredWaits) {
             fail(new Error("Session disconnected while waiting for a structured response"));
         }
@@ -1026,15 +1044,19 @@ export class CopilotSession {
             controller.abort();
         }
         this.pendingExternalTools.clear();
-        this._runOnDisconnected();
         this.eventHandlers.clear();
         this.typedEventHandlers.clear();
         this.toolHandlers.clear();
         this.permissionHandler = undefined;
+        this.mcpAuthHandler = undefined;
         this.userInputHandler = undefined;
         this.elicitationHandler = undefined;
         this.exitPlanModeHandler = undefined;
         this.autoModeSwitchHandler = undefined;
+        this.skillProvider = undefined;
+        this.hooks = undefined;
+        this.traceContextProvider = undefined;
+        this.bearerTokenProviders.clear();
         this.commandHandlers.clear();
         this.canvases.clear();
         this.workflows.clear();
@@ -1044,17 +1066,24 @@ export class CopilotSession {
             }
         }
         this.workflowAbortControllers.clear();
-        this.transformCallbacks?.clear();
+        this.transformCallbacks = undefined;
+        delete this.clientSessionApis.providerToken;
+        delete this.clientSessionApis.canvas;
+        delete this.clientSessionApis.workflow;
+        delete this.clientSessionApis.sessionFs;
+        this._runOnDisconnected();
     }
 
     /** @internal */
     _runOnDisconnected(): void {
-        this.onDisconnected?.();
+        const callback = this.onDisconnected;
         this.onDisconnected = undefined;
+        callback?.();
     }
 
     /** @internal */
     _setOnDisconnected(callback: () => void): void {
+        this.assertConnected();
         this.onDisconnected = callback;
     }
 
@@ -1110,6 +1139,9 @@ export class CopilotSession {
         eventTypeOrHandler: K | SessionEventHandler,
         handler?: TypedSessionEventHandler<K>
     ): () => void {
+        if (this.disconnected) {
+            throw new Error("Session is disconnected");
+        }
         // Overload 1: on(eventType, handler) - typed event subscription
         if (typeof eventTypeOrHandler === "string" && handler) {
             const eventType = eventTypeOrHandler;
@@ -1199,7 +1231,8 @@ export class CopilotSession {
                     args,
                     handler,
                     traceparent,
-                    tracestate
+                    tracestate,
+                    event.agentId || undefined
                 );
             }
         } else if (event.type === "external_tool.completed") {
@@ -1318,7 +1351,8 @@ export class CopilotSession {
         args: unknown,
         handler: ToolHandler,
         traceparent?: string,
-        tracestate?: string
+        tracestate?: string,
+        agentId?: string
     ): Promise<void> {
         const controller = new AbortController();
         if (this.disconnected || this.pendingExternalTools.has(requestId)) {
@@ -1364,6 +1398,8 @@ export class CopilotSession {
                 traceparent,
                 tracestate,
                 signal: controller.signal,
+                agentId,
+                requestId,
             });
             let result: ToolResult;
             if (rawResult == null) {
@@ -1547,6 +1583,7 @@ export class CopilotSession {
      * @internal This method is typically called internally when creating a session with tools.
      */
     registerTools(tools?: Tool[]): void {
+        this.assertConnected();
         this.toolHandlers.clear();
         if (!tools) {
             return;
@@ -1599,6 +1636,7 @@ export class CopilotSession {
      * @internal Called by the SDK when creating/resuming a session with `canvases`.
      */
     registerCanvases(canvases?: Canvas[]): void {
+        this.assertConnected();
         this.canvases.clear();
         if (!canvases || canvases.length === 0) {
             delete this.clientSessionApis.canvas;
@@ -1656,6 +1694,7 @@ export class CopilotSession {
      * @internal Called by the SDK when an extension joins a session.
      */
     registerWorkflows(workflows?: WorkflowHandle[]): void {
+        this.assertConnected();
         this.workflows.clear();
         if (!workflows || workflows.length === 0) {
             delete this.clientSessionApis.workflow;
@@ -1869,6 +1908,7 @@ export class CopilotSession {
      * @internal This method is called internally when creating/resuming a session.
      */
     registerBearerTokenProviders(providers?: Map<string, BearerTokenProvider>): void {
+        this.assertConnected();
         this.bearerTokenProviders.clear();
         if (!providers || providers.size === 0) {
             delete this.clientSessionApis.providerToken;
@@ -1881,6 +1921,7 @@ export class CopilotSession {
         const self = this;
         this.clientSessionApis.providerToken = {
             async getToken(params) {
+                self.assertConnected();
                 const callback = self.bearerTokenProviders.get(params.providerName);
                 if (!callback) {
                     throw new Error(
@@ -1903,6 +1944,7 @@ export class CopilotSession {
      * @internal This method is typically called internally when creating/resuming a session.
      */
     registerCommands(commands?: { name: string; handler: CommandHandler }[]): void {
+        this.assertConnected();
         this.commandHandlers.clear();
         if (!commands) {
             return;
@@ -1919,6 +1961,7 @@ export class CopilotSession {
      * @internal This method is typically called internally when creating/resuming a session.
      */
     registerElicitationHandler(handler?: ElicitationHandler): void {
+        this.assertConnected();
         this.elicitationHandler = handler;
     }
 
@@ -1929,6 +1972,7 @@ export class CopilotSession {
      * @internal This method is typically called internally when creating/resuming a session.
      */
     registerExitPlanModeHandler(handler?: ExitPlanModeHandler): void {
+        this.assertConnected();
         this.exitPlanModeHandler = handler;
     }
 
@@ -1939,6 +1983,7 @@ export class CopilotSession {
      * @internal This method is typically called internally when creating/resuming a session.
      */
     registerAutoModeSwitchHandler(handler?: AutoModeSwitchHandler): void {
+        this.assertConnected();
         this.autoModeSwitchHandler = handler;
     }
 
@@ -1981,6 +2026,7 @@ export class CopilotSession {
      * @internal
      */
     async _handleExitPlanModeRequest(request: ExitPlanModeRequest): Promise<ExitPlanModeResult> {
+        this.assertConnected();
         if (!this.exitPlanModeHandler) {
             return { approved: true };
         }
@@ -1995,6 +2041,7 @@ export class CopilotSession {
     async _handleAutoModeSwitchRequest(
         request: AutoModeSwitchRequest
     ): Promise<AutoModeSwitchResponse> {
+        this.assertConnected();
         if (!this.autoModeSwitchHandler) {
             return "no";
         }
@@ -2118,6 +2165,7 @@ export class CopilotSession {
      * @internal This method is typically called internally when creating a session.
      */
     registerPermissionHandler(handler?: PermissionHandler): void {
+        this.assertConnected();
         this.permissionHandler = handler;
     }
 
@@ -2131,9 +2179,88 @@ export class CopilotSession {
      * @internal This method is typically called internally when creating a session.
      */
     registerUserInputHandler(handler?: UserInputHandler): void {
+        this.assertConnected();
         this.userInputHandler = handler;
     }
 
+    /**
+     * Registers the session's skill provider.
+     *
+     * @param provider - The skill provider, or undefined to remove it
+     * @internal This method is typically called internally when creating a session.
+     */
+    registerSkillProvider(provider?: SkillProvider): void {
+        this.assertConnected();
+        this.skillProvider = provider;
+    }
+
+    /**
+     * Handles a `skillProvider.list` request from the runtime.
+     *
+     * @internal This method is for internal use by the SDK.
+     */
+    async _handleSkillProviderList(
+        token?: CancellationToken
+    ): Promise<{ skills: SkillProviderDescriptor[] }> {
+        const provider = this.requireSkillProvider();
+        return await this.callSkillProvider("listSkills", token, async (options) => ({
+            skills: (await provider.listSkills(options)) ?? [],
+        }));
+    }
+
+    /**
+     * Handles a `skillProvider.read` request from the runtime.
+     *
+     * @internal This method is for internal use by the SDK.
+     */
+    async _handleSkillProviderRead(
+        name: string,
+        token?: CancellationToken
+    ): Promise<{ markdown: string | null }> {
+        const provider = this.requireSkillProvider();
+        return await this.callSkillProvider("readSkill", token, async (options) => ({
+            markdown: (await provider.readSkill(name, options)) ?? null,
+        }));
+    }
+
+    private requireSkillProvider(): SkillProvider {
+        this.assertConnected();
+        if (!this.skillProvider) {
+            throw new Error(`No skill provider for session: ${this.sessionId}`);
+        }
+        return this.skillProvider;
+    }
+
+    /**
+     * Runs a provider call with an abort signal tied to the runtime's request
+     * cancellation. Failures are logged locally and reported generically.
+     */
+    private async callSkillProvider<T>(
+        operation: string,
+        token: CancellationToken | undefined,
+        call: (options: SkillProviderCallOptions) => Promise<T>
+    ): Promise<T> {
+        const controller = new AbortController();
+        const subscription = token?.onCancellationRequested(() => controller.abort());
+        if (token?.isCancellationRequested) {
+            controller.abort();
+        }
+        try {
+            return await call({ signal: controller.signal });
+        } catch (error) {
+            if (controller.signal.aborted) {
+                throw new ResponseError(-32800, `Skill provider ${operation} cancelled`);
+            }
+            console.error(`Skill provider ${operation} failed`, {
+                sessionId: this.sessionId,
+                error,
+            });
+            throw skillProviderFailure(operation);
+        } finally {
+            subscription?.dispose();
+        }
+    }
+
     /**
      * Registers hook handlers for session lifecycle events.
      *
@@ -2144,6 +2271,7 @@ export class CopilotSession {
      * @internal This method is typically called internally when creating a session.
      */
     registerHooks(hooks?: SessionHooks): void {
+        this.assertConnected();
         this.hooks = hooks;
     }
 
@@ -2154,6 +2282,7 @@ export class CopilotSession {
      * @internal This method is typically called internally when creating a session.
      */
     registerTransformCallbacks(callbacks?: Map<string, SectionTransformFn>): void {
+        this.assertConnected();
         this.transformCallbacks = callbacks;
     }
 
@@ -2168,6 +2297,7 @@ export class CopilotSession {
     async _handleSystemMessageTransform(
         sections: Record<string, { content: string }>
     ): Promise<{ sections: Record<string, { content: string }> }> {
+        this.assertConnected();
         const result: Record<string, { content: string }> = {};
 
         for (const [sectionId, { content }] of Object.entries(sections)) {
@@ -2197,6 +2327,7 @@ export class CopilotSession {
      * @internal This method is for internal use by the SDK.
      */
     async _handleUserInputRequest(request: unknown): Promise<UserInputResponse> {
+        this.assertConnected();
         if (!this.userInputHandler) {
             // No handler registered, throw error
             throw new Error("User input requested but no handler registered");
@@ -2222,6 +2353,7 @@ export class CopilotSession {
      * @internal This method is for internal use by the SDK.
      */
     async _handleHooksInvoke(hookType: string, input: unknown): Promise<unknown> {
+        this.assertConnected();
         if (!this.hooks) {
             return undefined;
         }
@@ -2472,6 +2604,7 @@ export class CopilotSession {
      * replace tools while the session is idle.
      *
      * @param tools - The complete set of tools this client supplies
+     * @throws Error if the session disconnects before the replacement is applied
      *
      * @experimental Wraps the experimental `session.tools.set` RPC and may change
      * or be removed in a future release.
@@ -2488,8 +2621,10 @@ export class CopilotSession {
      * ```
      */
     async setTools(tools: Tool[]): Promise<void> {
+        this.assertConnected();
         const definitions = tools.map(toToolDefinition);
         const replacement = this.setToolsQueue.then(async () => {
+            this.assertConnected();
             await this.rpc.tools.set({ tools: definitions });
             this.registerTools(tools);
         });
@@ -2563,6 +2698,11 @@ function toCanvasRpcError(error: unknown): ResponseError<unknown> {
     return new ResponseError(ErrorCodes.InternalError, message, { code, message });
 }
 
+// The provider's own error text is deliberately not forwarded to the runtime.
+function skillProviderFailure(operation: string): ResponseError<undefined> {
+    return new ResponseError(ErrorCodes.InternalError, `Skill provider ${operation} failed`);
+}
+
 type WorkflowResultValidationCategory =
     | "unsupported_type"
     | "non_finite_number"
diff --git a/nodejs/src/types.ts b/nodejs/src/types.ts
index 7b0f1fcf8e..d3722a99d8 100644
--- a/nodejs/src/types.ts
+++ b/nodejs/src/types.ts
@@ -122,6 +122,8 @@ export type { SessionFsSqliteTransactionErrorClass } from "./sessionFsProvider.j
 export { SessionFsSqliteTransactionFailure } from "./sessionFsProvider.js";
 export { SessionFsWriteFailure } from "./sessionFsProvider.js";
 export type { LlmInferenceHeaders } from "./generated/rpc.js";
+import type { SkillProviderDescriptor } from "./generated/rpc.js";
+export type { SkillProviderDescriptor };
 export type {
     PermissionDecisionContext,
     PermissionDecisionOutcome,
@@ -746,6 +748,24 @@ export interface ToolInvocation {
     tracestate?: string;
     /** Aborted when the runtime completes this request or the session disconnects. */
     signal?: AbortSignal;
+    /**
+     * Sub-agent instance that issued this call (the `agentId` of its session
+     * events). `undefined` for a root-agent call, and for every call when the
+     * runtime does not attribute sub-agent tool calls.
+     *
+     * @experimental
+     */
+    agentId?: string;
+    /**
+     * Runtime request id of this call: the key
+     * `session.tools.handlePendingToolCall` and `session.tools.listPendingRequests`
+     * use. A root-agent call stays answerable after the session is resumed with
+     * pending work continued; a sub-agent's call can be answered only while that
+     * sub-agent is still running.
+     *
+     * @experimental
+     */
+    requestId?: string;
 }
 
 export type ToolHandler<TArgs = unknown> = (
@@ -843,6 +863,21 @@ export function defineTool<T = unknown>(
     return { name, ...config };
 }
 
+/**
+ * Non-persisted opt-in to image generation.
+ * @experimental This API may change or be removed in a future release.
+ */
+export interface ImageGenerationConfig {
+    /**
+     * Opt in to image generation through an authorized Copilot image model.
+     * False disables it; omission defaults to disabled on create/cold resume and
+     * preserves the setting on resident resume. Not persisted: re-supply after
+     * runtime restart. Policy, permissions, offline mode, and tool filters still
+     * apply. BYOK image generation is not supported.
+     */
+    enabled?: boolean;
+}
+
 /**
  * SDK-supplied override for the runtime's built-in tool-search behavior.
  *
@@ -1990,6 +2025,8 @@ export type MCPServerConfig = MCPStdioServerConfig | MCPHTTPServerConfig;
  * Configuration for a custom agent.
  */
 export interface CustomAgentConfig {
+    /** Declarative hook actions keyed by event name, active only for this agent. */
+    hooks?: Record<string, Record<string, unknown>[]>;
     /**
      * Unique name of the custom agent.
      */
@@ -2347,6 +2384,11 @@ export interface ManagedSettingsPermissions {
      * values are forwarded so newer runtime policies fail closed.
      */
     disableBypassPermissionsMode?: string;
+    /**
+     * When true, prevents Assisted Permissions from being activated. Omit or
+     * set to false to impose no restriction.
+     */
+    disableAssistedPermissionsMode?: boolean;
     /** Operations that must always be denied. Unioned across managed layers. */
     deny?: string[];
     /**
@@ -2358,6 +2400,13 @@ export interface ManagedSettingsPermissions {
      * (across managed layers) must admit an operation for it to be allowed.
      */
     allow?: string[];
+    /**
+     * Closed-world host boundary expressed as `Domain(hostname)`, `Domain(IP)`,
+     * or `Domain(*.example.com)` rules. Schemes, ports, paths, queries, and
+     * fragments are rejected. Multiple managed layers intersect their lists;
+     * an empty list denies all hosts.
+     */
+    limitTo?: string[];
 }
 
 /**
@@ -2374,6 +2423,65 @@ export interface ManagedSettings {
 /** Selects the model-facing shape of the built-in `ask_user` tool. */
 export type AskUserVariant = "legacy" | "elicitation";
 
+/**
+ * Supplies session-scoped skills from the host's own storage, such as a
+ * database, instead of `SKILL.md` files on disk.
+ *
+ * The runtime calls {@link SkillProvider.listSkills} when it builds the
+ * session's skill catalog, and {@link SkillProvider.readSkill} each time it
+ * needs a skill's instructions: when the model loads the skill through the
+ * `skill` tool, when a user runs `/skill-name`, or when a custom agent lists
+ * the skill. Calls may run concurrently, including on behalf of sub-agents, and
+ * each call must finish within 30 seconds. Errors thrown by a provider are
+ * never shown to the model.
+ *
+ * Supply a provider with {@link SessionConfigBase.skillProvider}. Providers
+ * aren't supported for cloud sessions.
+ *
+ * @experimental Session-scoped skill providers are experimental and may change
+ * or be removed in future SDK or CLI releases.
+ */
+export interface SkillProvider {
+    /**
+     * Returns catalog metadata for every skill the provider supplies. The
+     * descriptors are authoritative: names must be unique ignoring case, and
+     * the runtime validates their limits.
+     */
+    listSkills(
+        options: SkillProviderCallOptions
+    ): SkillProviderDescriptor[] | Promise<SkillProviderDescriptor[]>;
+
+    /**
+     * Returns the `SKILL.md` text for the named skill, or `null`/`undefined`
+     * when the skill no longer exists.
+     *
+     * YAML frontmatter is optional. Fields it omits come from the skill's
+     * descriptor, fields it declares must match the descriptor, and
+     * `allowed-tools` can only be set there. Text whose first line is `---` is
+     * parsed as frontmatter.
+     *
+     * @param name - The skill's name, as listed by {@link SkillProvider.listSkills}.
+     */
+    readSkill(
+        name: string,
+        options: SkillProviderCallOptions
+    ): string | null | undefined | Promise<string | null | undefined>;
+}
+
+/**
+ * Per-call options passed to {@link SkillProvider} methods.
+ *
+ * @experimental Session-scoped skill providers are experimental and may change
+ * or be removed in future SDK or CLI releases.
+ */
+export interface SkillProviderCallOptions {
+    /**
+     * Aborted when the runtime cancels the call, for example when it times out
+     * or the session disconnects. The runtime ignores any later result.
+     */
+    signal: AbortSignal;
+}
+
 /**
  * Shared configuration fields used by both {@link SessionConfig} (for
  * creating a new session) and {@link ResumeSessionConfig} (for resuming
@@ -2537,6 +2645,12 @@ export interface SessionConfigBase {
      */
     toolSearch?: ToolSearchConfig;
 
+    /**
+     * Image generation opt-in. Re-supply after runtime restart.
+     * @experimental This API may change or be removed in a future release.
+     */
+    imageGeneration?: ImageGenerationConfig;
+
     /**
      * List of tool names to allow. When specified, only these tools will be available.
      *
@@ -2848,10 +2962,52 @@ export interface SessionConfigBase {
     agent?: string;
 
     /**
-     * Directories to load skills from.
+     * Explicit discovery-only skill roots. No general filesystem access is granted.
+     * Available without `enableConfigDiscovery`; skill and managed disables still apply.
+     * Relative paths resolve once when supplied against the request's effective
+     * `workingDirectory`, and retained roots do not move when it changes.
+     * Null and omission are equivalent; `[]` clears only the explicit SDK contribution.
      */
     skillDirectories?: string[];
 
+    /**
+     * Supplies skills from the host's own storage instead of `SKILL.md` files on
+     * disk. Provider skills join the session's skill catalog alongside file-based
+     * skills. See {@link SkillProvider}.
+     *
+     * Supplying a provider enables skills unless `enableSkills` is set explicitly,
+     * so set `enableSkills: true` when the client runs in `"empty"` mode. With
+     * `enableSkills: false` the provider stays bound but receives no calls.
+     *
+     * The provider isn't persisted. Pass it again when resuming the session;
+     * resuming without one removes the provider's skills.
+     *
+     * @experimental Session-scoped skill providers are experimental and may change
+     * or be removed in future SDK or CLI releases.
+     */
+    skillProvider?: SkillProvider;
+
+    /**
+     * Explicit discovery-only agent roots, separate from `customAgents` objects.
+     * No general filesystem access is granted. Available without `enableConfigDiscovery`;
+     * source and managed disables still apply.
+     * Relative paths resolve once when supplied against the request's effective
+     * `workingDirectory`, and retained roots do not move when it changes.
+     * Null and omission are equivalent; `[]` clears only the explicit SDK contribution.
+     */
+    agentDirectories?: string[];
+
+    /**
+     * Explicit discovery-only file-hook roots, separate from callback `hooks`.
+     * No general filesystem access is granted. Available without `enableConfigDiscovery`
+     * or `enableFileHooks` (which controls repository-origin hooks only);
+     * hook and managed disables still apply.
+     * Relative paths resolve once when supplied against the request's effective
+     * `workingDirectory`, and retained roots do not move when it changes.
+     * Null and omission are equivalent; `[]` clears only the explicit SDK contribution.
+     */
+    hookDirectories?: string[];
+
     /**
      * Local filesystem paths to Open Plugins-format directories
      * (https://open-plugins.com/) to load for this session.
@@ -2868,7 +3024,12 @@ export interface SessionConfigBase {
     pluginDirectories?: string[];
 
     /**
-     * Additional directories to search for custom instruction files.
+     * Explicit discovery-only instruction roots using the existing SDK instruction formats.
+     * No general filesystem access is granted. Available without `enableConfigDiscovery`;
+     * instruction and managed disables still apply.
+     * Relative paths resolve once when supplied against the request's effective
+     * `workingDirectory`, and retained roots do not move when it changes.
+     * Null and omission are equivalent; `[]` clears only the explicit SDK contribution.
      */
     instructionDirectories?: string[];
 
@@ -2926,6 +3087,13 @@ export interface SessionConfigBase {
      */
     enableManagedSettings?: boolean;
 
+    /**
+     * When true, locked managed model controls are enforced for this session.
+     * Conflicting model changes are rejected, and locked startup values replace
+     * conflicting session options. Overridable managed defaults remain mutable.
+     */
+    enforceManagedModelDefaults?: boolean;
+
     /**
      * Host-injected enterprise managed settings for this session.
      *
@@ -2979,9 +3147,9 @@ export interface SessionConfigBase {
     enableOnDemandInstructionDiscovery?: boolean;
 
     /**
-     * When true, enables loading of file-based hooks from `.github/hooks/`.
-     * This is separate from the `hooks` callback parameter which gates SDK
-     * hook event registration.
+     * When true, enables repository-origin file hooks from `.github/hooks/` and
+     * trusted repository-configured roots. Does not control explicit `hookDirectories`
+     * or the `hooks` callback parameter.
      */
     enableFileHooks?: boolean;
 
@@ -3061,6 +3229,15 @@ export interface SessionConfig extends SessionConfigBase {
      */
     sessionId?: string;
 
+    /**
+     * Names the session at creation, as `session.name.set` would, and is validated the
+     * same way: non-empty, no leading or trailing whitespace, at most 100 UTF-16 units,
+     * no control characters, and no double quotes. A name also makes the session persist
+     * from the start, so it can be listed and resumed without ever running a turn.
+     * Local sessions only: cloud creation rejects it.
+     */
+    name?: string;
+
     /**
      * Invalidates the process-wide custom-instruction discovery cache before
      * creating this session. Use when instruction files changed in the same runtime.
diff --git a/nodejs/test/account-facts-projection.test.ts b/nodejs/test/account-facts-projection.test.ts
new file mode 100644
index 0000000000..5e689bb423
--- /dev/null
+++ b/nodejs/test/account-facts-projection.test.ts
@@ -0,0 +1,45 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { readFileSync } from "node:fs";
+import { describe, expect, it } from "vitest";
+
+describe("account facts Go projection", () => {
+    const source = readFileSync(new URL("../../go/rpc/zrpc.go", import.meta.url), "utf8");
+
+    for (const name of ["AccountGetWebURLRequest", "AccountGetWebURLResult"]) {
+        it(`marks ${name} as internal after Go initialism normalization`, () => {
+            const comment = source.match(new RegExp(`((?://[^\\n]*\\n)+)type ${name} struct`))?.[1];
+            expect(comment).toContain(`// Internal: ${name} `);
+        });
+    }
+});
+
+describe("account facts Python projection", () => {
+    const source = readFileSync(
+        new URL("../../python/copilot/generated/rpc.py", import.meta.url),
+        "utf8"
+    );
+    const exports = source.match(/^__all__ = \[([\s\S]*?)^\]/m)?.[1];
+
+    for (const [name, keys] of [
+        ["AccountGetWebURLRequest", ["identity", "path"]],
+        ["AccountGetWebURLResult", ["url"]],
+    ] as const) {
+        it(`keeps ${name} private without changing its wire keys`, () => {
+            const declaration = source.match(
+                new RegExp(`^class _${name}:\\n[\\s\\S]*?(?=^class )`, "m")
+            )?.[0];
+            expect(declaration).toBeDefined();
+            expect(source).not.toMatch(new RegExp(`^class ${name}\\b`, "m"));
+            expect(exports).toBeDefined();
+            expect(exports).not.toContain(`"${name}"`);
+            expect(exports).not.toContain(`"_${name}"`);
+            for (const key of keys) {
+                expect(declaration).toContain(`obj.get("${key}")`);
+                expect(declaration).toContain(`result["${key}"]`);
+            }
+        });
+    }
+});
diff --git a/nodejs/test/ahpSealedAuth.test.ts b/nodejs/test/ahpSealedAuth.test.ts
new file mode 100644
index 0000000000..33d1fdf1b1
--- /dev/null
+++ b/nodejs/test/ahpSealedAuth.test.ts
@@ -0,0 +1,299 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from "node:assert/strict";
+import { spawn } from "node:child_process";
+import { createHash, randomBytes } from "node:crypto";
+import { once } from "node:events";
+import { createInterface } from "node:readline";
+import { fileURLToPath } from "node:url";
+import { AeadId, CipherSuite, KdfId, KemId } from "hpke-js";
+import { expect, it } from "vitest";
+import { WebSocketServer } from "ws";
+import { withDeadline } from "./e2e/harness/ahpClient.js";
+import { AUTH_ALGORITHM, sealAhpAuthToken } from "./e2e/harness/ahpSealedAuth.js";
+
+it("seals connect, create reauthentication and reconnect in the shared cross-SDK AHP subprocess", async () => {
+    const token = "fake-token-for-e2e-tests";
+    const resource = "https://api.github.com";
+    const suite = new CipherSuite({
+        kem: KemId.DhkemX25519HkdfSha256,
+        kdf: KdfId.HkdfSha256,
+        aead: AeadId.Aes256Gcm,
+    });
+
+    const recipient = await suite.kem.generateKeyPair();
+    const publicKey = Buffer.from(await suite.kem.serializePublicKey(recipient.publicKey));
+    const keyId = createHash("sha256")
+        .update(publicKey)
+        .digest()
+        .subarray(0, 8)
+        .toString("base64url");
+    const accepted: { challenge: string; nonce: string }[] = [];
+    const rejected: unknown[] = [];
+    const server = new WebSocketServer({ host: "127.0.0.1", port: 0 });
+    server.on("connection", (socket) => {
+        const challenge = randomBytes(16).toString("hex");
+        socket.on("message", async (data) => {
+            const request = JSON.parse(data.toString());
+            try {
+                let result: unknown = {};
+                switch (request.method) {
+                    case "initialize":
+                        expect(request.params.protocolVersions).toEqual(["0.9.0"]);
+                        result = {
+                            protocolVersion: "0.9.0",
+                            _meta: {
+                                "copilot.encryptionRequired": ["auth-token", "mcp-auth-token"],
+                                "copilot.authChallenge": {
+                                    challenge,
+                                    responseMaxAgeSeconds: 300,
+                                    required: true,
+                                },
+                            },
+                        };
+                        break;
+                    case "subscribe": {
+                        const channel = request.params.channel;
+                        const state =
+                            channel === "ahp-root://"
+                                ? {
+                                      agents: [
+                                          {
+                                              provider: "copilot",
+                                              protectedResources: [
+                                                  { resource, resource_name: "GitHub API" },
+                                              ],
+                                          },
+                                      ],
+                                      _meta: {
+                                          "copilot.encryptionKeys": [
+                                              {
+                                                  keyId,
+                                                  use: "auth-token",
+                                                  algorithm: AUTH_ALGORITHM,
+                                                  publicKey: publicKey.toString("base64"),
+                                              },
+                                          ],
+                                      },
+                                  }
+                                : channel.startsWith("ahp-session:")
+                                  ? { defaultChat: "ahp-chat:/fixture" }
+                                  : { turns: [] };
+                        result = { snapshot: { resource: channel, fromSeq: 0, state } };
+                        break;
+                    }
+                    case "authenticate": {
+                        expect(request.params.resource).toBe(resource);
+                        const prefix = `copilot-sealed.v1.${keyId}.`;
+                        expect(request.params.token.startsWith(prefix)).toBe(true);
+                        expect(request.params.token).not.toContain(token);
+                        const box = Buffer.from(
+                            request.params.token.slice(prefix.length),
+                            "base64url"
+                        );
+                        const receiver = await suite.createRecipientContext({
+                            recipientKey: recipient.privateKey,
+                            enc: new Uint8Array(box.subarray(0, 32)),
+                        });
+                        const plaintext = JSON.parse(
+                            Buffer.from(
+                                await receiver.open(new Uint8Array(box.subarray(32)))
+                            ).toString()
+                        );
+                        expect(plaintext).toMatchObject({
+                            cty: "text",
+                            value: token,
+                            ctx: { purpose: "auth-token", resource, connection: { challenge } },
+                        });
+                        const binding = plaintext.ctx.connection;
+                        expect(binding.nonce).toMatch(/^[0-9a-f]{32}$/);
+                        expect(
+                            Math.abs(Math.floor(Date.now() / 1000) - binding.issuedAt)
+                        ).toBeLessThan(300);
+                        expect(accepted.some((previous) => previous.nonce === binding.nonce)).toBe(
+                            false
+                        );
+                        accepted.push({ challenge, nonce: binding.nonce });
+                        break;
+                    }
+                    case "createSession":
+                    case "unsubscribe":
+                        break;
+                    default:
+                        throw new Error(`Unexpected AHP method ${request.method}`);
+                }
+                if (request.id !== undefined)
+                    socket.send(
+                        JSON.stringify({
+                            jsonrpc: "2.0",
+                            id: request.id,
+                            result,
+                        })
+                    );
+            } catch (error) {
+                rejected.push(error);
+                socket.send(
+                    JSON.stringify({
+                        jsonrpc: "2.0",
+                        id: request.id,
+                        error: {
+                            code: -32602,
+                            message: "fixture rejected unbound authentication",
+                        },
+                    })
+                );
+            }
+        });
+    });
+    await once(server, "listening");
+    const address = server.address();
+    assert(address && typeof address !== "string");
+    // Exactly the entry point launched by .NET, Java, Go and Python harnesses.
+    const driver = spawn(
+        process.execPath,
+        ["--import", "tsx", "test/e2e/harness/ahpTestDriver.ts"],
+        { cwd: fileURLToPath(new URL("../", import.meta.url)), stdio: "pipe" }
+    );
+    const exited = once(driver, "exit");
+    let diagnostics = "";
+    driver.stderr.on("data", (data) => {
+        diagnostics += data.toString();
+    });
+    const lines = createInterface({ input: driver.stdout })[Symbol.asyncIterator]();
+    async function read() {
+        const line = await withDeadline(lines.next(), "shared AHP subprocess response");
+        assert(!line.done, "shared AHP subprocess closed output");
+        return JSON.parse(line.value);
+    }
+    async function request(command: Record<string, unknown>) {
+        driver.stdin.write(JSON.stringify(command) + "\n");
+        const response = await read();
+        expect(rejected).toEqual([]);
+        expect(response).not.toHaveProperty("error");
+        return response.result;
+    }
+    try {
+        expect(await read()).toEqual({ ready: true });
+        const command = {
+            op: "connect",
+            url: `ws://127.0.0.1:${address.port}`,
+            githubToken: token,
+            clientId: "cross-sdk-sealed-auth",
+        };
+        const connected = await request(command);
+        const created = await request({
+            op: "create",
+            clientId: connected.clientId,
+            workDir: fileURLToPath(new URL(".", import.meta.url)),
+        });
+        expect(created.sessionUri).toMatch(/^ahp-session:/);
+        await request({ op: "close", clientId: connected.clientId });
+        const reconnected = await request(command);
+        await request({ op: "close", clientId: reconnected.clientId });
+        expect(accepted).toHaveLength(3);
+        expect(accepted[0].challenge).toBe(accepted[1].challenge);
+        expect(accepted[2].challenge).not.toBe(accepted[0].challenge);
+    } finally {
+        driver.stdin.end();
+        try {
+            const [code] = await withDeadline(exited, "shared AHP subprocess exit", 10_000);
+            expect(code, diagnostics).toBe(0);
+        } finally {
+            if (driver.exitCode === null && driver.signalCode === null) {
+                driver.kill();
+                await withDeadline(exited, "reap shared AHP subprocess", 10_000);
+            }
+            for (const socket of server.clients) socket.terminate();
+            await new Promise<void>((resolve, reject) => {
+                server.close((error) => (error ? reject(error) : resolve()));
+            });
+        }
+    }
+});
+
+it("seals fixture authentication to the advertised key, resource and live challenge", async () => {
+    const suite = new CipherSuite({
+        kem: KemId.DhkemX25519HkdfSha256,
+        kdf: KdfId.HkdfSha256,
+        aead: AeadId.Aes256Gcm,
+    });
+    const recipient = await suite.kem.generateKeyPair();
+    const publicKey = Buffer.from(await suite.kem.serializePublicKey(recipient.publicKey));
+    const keyId = createHash("sha256")
+        .update(publicKey)
+        .digest()
+        .subarray(0, 8)
+        .toString("base64url");
+    const challenge = "00112233445566778899aabbccddeeff";
+    const initializeMeta = {
+        "copilot.encryptionRequired": ["auth-token", "mcp-auth-token"],
+        "copilot.authChallenge": { challenge, responseMaxAgeSeconds: 300, required: true },
+    };
+    const rootMeta = {
+        "copilot.encryptionKeys": [
+            {
+                keyId,
+                use: "auth-token",
+                algorithm: AUTH_ALGORITHM,
+                publicKey: publicKey.toString("base64"),
+            },
+        ],
+    };
+    const nonces = new Set<string>();
+    for (let attempt = 0; attempt < 2; attempt++) {
+        const before = Math.floor(Date.now() / 1000);
+        const sealed = await sealAhpAuthToken(
+            initializeMeta,
+            rootMeta,
+            "https://api.github.com",
+            "fixture-only-token"
+        );
+        const prefix = `copilot-sealed.v1.${keyId}.`;
+        expect(sealed.startsWith(prefix)).toBe(true);
+        expect(sealed).not.toContain("fixture-only-token");
+        const box = Buffer.from(sealed.slice(prefix.length), "base64url");
+        const receiver = await suite.createRecipientContext({
+            recipientKey: recipient.privateKey,
+            enc: new Uint8Array(box.subarray(0, 32)),
+        });
+        const value = JSON.parse(
+            Buffer.from(await receiver.open(new Uint8Array(box.subarray(32)))).toString()
+        );
+        expect(value).toMatchObject({
+            cty: "text",
+            value: "fixture-only-token",
+            ctx: {
+                purpose: "auth-token",
+                resource: "https://api.github.com",
+                connection: { challenge },
+            },
+        });
+        expect(value.ctx.connection.nonce).toMatch(/^[0-9a-f]{32}$/);
+        expect(value.ctx.connection.issuedAt).toBeGreaterThanOrEqual(before);
+        expect(value.ctx.connection.issuedAt).toBeLessThanOrEqual(Math.floor(Date.now() / 1000));
+        nonces.add(value.ctx.connection.nonce);
+    }
+    expect(nonces.size).toBe(2);
+    await expect(
+        sealAhpAuthToken({}, rootMeta, "https://api.github.com", "fixture-only-token")
+    ).rejects.toThrow();
+    await expect(
+        sealAhpAuthToken(
+            initializeMeta,
+            {
+                "copilot.encryptionKeys": [
+                    {
+                        keyId,
+                        use: "mcp-auth-token",
+                        algorithm: AUTH_ALGORITHM,
+                        publicKey: publicKey.toString("base64"),
+                    },
+                ],
+            },
+            "https://api.github.com",
+            "fixture-only-token"
+        )
+    ).rejects.toThrow();
+});
diff --git a/nodejs/test/childUserPrompts.test.ts b/nodejs/test/childUserPrompts.test.ts
new file mode 100644
index 0000000000..a2c450b31d
--- /dev/null
+++ b/nodejs/test/childUserPrompts.test.ts
@@ -0,0 +1,123 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { describe, expect, it } from "vitest";
+import { childUserPrompts } from "./e2e/harness/childUserPrompts.js";
+
+const context = "start hook context\n\nRead the requested file.";
+
+describe("subagent request observation", () => {
+    it.each([
+        ["/chat/completions", { messages: [{ role: "user", content: context }] }],
+        ["/messages", { messages: [{ role: "user", content: [{ type: "text", text: context }] }] }],
+        ["/responses", { input: context }],
+        [
+            "/responses",
+            {
+                input: [
+                    {
+                        type: "message",
+                        role: "user",
+                        content: [{ type: "input_text", text: context }],
+                    },
+                ],
+            },
+        ],
+    ])("observes the child's user input on %s", (endpoint, body) => {
+        expect(
+            childUserPrompts(`http://localhost${endpoint}`, JSON.stringify(body), {
+                parentAgentId: "parent",
+            })
+        ).toEqual([context]);
+    });
+
+    it.each(["/chat/completions", "/messages", "/responses"])(
+        "does not mistake a parent request for child context on %s",
+        (endpoint) => {
+            expect(
+                childUserPrompts(
+                    `http://localhost${endpoint}`,
+                    JSON.stringify({
+                        messages: [{ role: "user", content: context }],
+                        input: [{ type: "message", role: "user", content: context }],
+                    }),
+                    {}
+                )
+            ).toEqual([]);
+        }
+    );
+
+    it.each(["/chat/completions", "/messages", "/responses"])(
+        "does not find hook context in system, developer, assistant, or tool content on %s",
+        (endpoint) => {
+            const messages = ["system", "developer", "assistant", "tool"].map((role) => ({
+                role,
+                content: context,
+            }));
+            expect(
+                childUserPrompts(
+                    `http://localhost${endpoint}`,
+                    JSON.stringify({
+                        instructions: context,
+                        system: context,
+                        messages,
+                        input: [
+                            ...messages
+                                .filter((message) => message.role !== "tool")
+                                .map((message) => ({ type: "message", ...message })),
+                            { type: "function_call_output", call_id: "tool", output: context },
+                        ],
+                    }),
+                    { parentAgentId: "parent" }
+                )
+            ).toEqual([]);
+        }
+    );
+
+    it.each([
+        { kind: "string", content: context },
+        { kind: "blocks", content: [{ type: "input_text", text: context }] },
+    ])("ignores Responses developer-only $kind input", ({ content }) => {
+        expect(
+            childUserPrompts(
+                "http://localhost/responses",
+                JSON.stringify({
+                    input: [{ type: "message", role: "developer", content }],
+                }),
+                { parentAgentId: "parent" }
+            )
+        ).toEqual([]);
+    });
+
+    it("extracts only the original user input from mixed Responses roles", () => {
+        const userPrompt = "Read the requested file.";
+        expect(
+            childUserPrompts(
+                "http://localhost/responses",
+                JSON.stringify({
+                    input: [
+                        { type: "message", role: "developer", content: context },
+                        {
+                            type: "message",
+                            role: "user",
+                            content: [{ type: "input_text", text: userPrompt }],
+                        },
+                    ],
+                }),
+                { parentAgentId: "parent" }
+            )
+        ).toEqual([userPrompt]);
+    });
+
+    it.each(["/chat/completions", "/messages", "/responses"])(
+        "keeps missing child context missing on %s",
+        (endpoint) => {
+            expect(
+                childUserPrompts(`http://localhost${endpoint}`, "{}", {
+                    parentAgentId: "parent",
+                })
+            ).toEqual([]);
+        }
+    );
+});
diff --git a/nodejs/test/client.test.ts b/nodejs/test/client.test.ts
index d0466fb7a2..22831ad930 100644
--- a/nodejs/test/client.test.ts
+++ b/nodejs/test/client.test.ts
@@ -5345,9 +5345,11 @@ describe("managedSettings serialization", () => {
         const managedSettings = {
             permissions: {
                 disableBypassPermissionsMode: DisableBypassPermissionsModes.AllowAutoOnly,
+                disableAssistedPermissionsMode: true,
                 deny: ["Shell(git push)"],
                 ask: ["Domain(publish.example)"],
                 allow: ["Read(**)"],
+                limitTo: ["Domain(api.github.com)"],
             },
         } satisfies ManagedSettings;
         const params = await captureCreateParams({
@@ -5356,9 +5358,11 @@ describe("managedSettings serialization", () => {
         expect(params.managedSettings).toEqual({
             permissions: {
                 disableBypassPermissionsMode: "allow-auto-only",
+                disableAssistedPermissionsMode: true,
                 deny: ["Shell(git push)"],
                 ask: ["Domain(publish.example)"],
                 allow: ["Read(**)"],
+                limitTo: ["Domain(api.github.com)"],
             },
         });
     });
@@ -5416,17 +5420,21 @@ describe("managedSettings serialization", () => {
     it("coexists with enableManagedSettings", async () => {
         const params = await captureCreateParams({
             enableManagedSettings: true,
+            enforceManagedModelDefaults: true,
             managedSettings: { permissions: { deny: ["Edit(/secrets/**)"] } },
         });
         expect(params.enableManagedSettings).toBe(true);
+        expect(params.enforceManagedModelDefaults).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: [] } },
+            managedSettings: { permissions: { deny: [], ask: [], allow: [], limitTo: [] } },
+        });
+        expect(params.managedSettings).toEqual({
+            permissions: { deny: [], ask: [], allow: [], limitTo: [] },
         });
-        expect(params.managedSettings).toEqual({ permissions: { deny: [], ask: [], allow: [] } });
     });
 
     it("forwards managedSettings on session.resume", async () => {
diff --git a/nodejs/test/computer-use-oauth-fixture.test.ts b/nodejs/test/computer-use-oauth-fixture.test.ts
new file mode 100644
index 0000000000..419563d9dd
--- /dev/null
+++ b/nodejs/test/computer-use-oauth-fixture.test.ts
@@ -0,0 +1,68 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { test } from "vitest";
+import { startComputerUseOAuthServer } from "../../test/harness/test-mcp-computer-use-oauth-server.mjs";
+
+test("rejects token exchanges without a registered client", async (context) => {
+    const { expect } = context;
+    const starting = startComputerUseOAuthServer();
+    context.onTestFinished(async () => {
+        const [result] = await Promise.allSettled([starting]);
+        if (result.status === "fulfilled") await result.value.close();
+    });
+    const server = await starting;
+    context.signal.throwIfAborted();
+    const exchange = (clientId: string) =>
+        fetch(`${server.url}/token`, {
+            method: "POST",
+            body: new URLSearchParams({
+                grant_type: "authorization_code",
+                code: "accepted-code",
+                code_verifier: "test-verifier",
+                ...(clientId ? { client_id: clientId } : {}),
+            }),
+        });
+    for (const clientId of ["", "wrong-client", "registered-client"]) {
+        const response = await exchange(clientId);
+        expect(response.status).toBe(400);
+        expect(await response.json()).toEqual({ error: "invalid_client" });
+    }
+    const registration = await fetch(`${server.url}/register`, { method: "POST" });
+    expect(registration.status).toBe(201);
+    const { client_id: clientId } = await registration.json();
+    for (const invalidClient of ["", "wrong-client"]) {
+        const response = await exchange(invalidClient);
+        expect(response.status).toBe(400);
+        expect(await response.json()).toEqual({ error: "invalid_client" });
+    }
+    expect((await exchange(clientId)).status).toBe(200);
+});
+
+test("binds preconfigured-client token exchanges without dynamic registration", async (context) => {
+    const { expect } = context;
+    const starting = startComputerUseOAuthServer({ preconfiguredClientId: "app-client" });
+    context.onTestFinished(async () => {
+        const [result] = await Promise.allSettled([starting]);
+        if (result.status === "fulfilled") await result.value.close();
+    });
+    const server = await starting;
+    context.signal.throwIfAborted();
+    for (const clientId of ["", "wrong-client", "app-client"]) {
+        const response = await fetch(`${server.url}/token`, {
+            method: "POST",
+            body: new URLSearchParams({
+                grant_type: "authorization_code",
+                code: "accepted-code",
+                code_verifier: "test-verifier",
+                ...(clientId ? { client_id: clientId } : {}),
+            }),
+        });
+        expect(response.status).toBe(clientId === "app-client" ? 200 : 400);
+        if (clientId !== "app-client") {
+            expect(await response.json()).toEqual({ error: "invalid_client" });
+        }
+    }
+    expect(server.requests.map((request) => request.path)).not.toContain("/register");
+});
diff --git a/nodejs/test/connectors.test.ts b/nodejs/test/connectors.test.ts
index e19d0e7c3e..cf83c7959b 100644
--- a/nodejs/test/connectors.test.ts
+++ b/nodejs/test/connectors.test.ts
@@ -5,6 +5,7 @@
 import { describe, expect, it, vi } from "vitest";
 import type { MessageConnection } from "vscode-jsonrpc";
 
+import { createServerRpc } from "../src/generated/rpc.js";
 import type {
     AuthIdentityMetadata,
     ConnectorSessionAccount,
@@ -12,6 +13,82 @@ import type {
 } from "../src/index.js";
 import { CopilotSession } from "../src/session.js";
 
+describe("client Connector discovery RPC", () => {
+    it("lists Connectors without creating a session", async () => {
+        const sendRequest = vi.fn(async (method: string) => {
+            if (method === "connectors.getCapabilities") {
+                return {
+                    apiVersion: 1,
+                    availability: "enabled",
+                    opaqueAccountSelection: true,
+                    conditionalCache: true,
+                };
+            }
+            if (method === "connectors.getAccounts") {
+                return {
+                    availability: "enabled",
+                    accounts: [
+                        {
+                            accountId: "account-1",
+                            authInfo: {
+                                type: "user",
+                                host: "https://github.com",
+                                login: "octocat",
+                            },
+                        },
+                    ],
+                };
+            }
+            return {
+                accountId: "account-1",
+                revision: 1,
+                refreshedAtMs: 1,
+                connectors: [
+                    {
+                        name: "calendar",
+                        displayName: "Calendar",
+                        status: "connected",
+                    },
+                ],
+            };
+        });
+        const rpc = createServerRpc({
+            sendRequest,
+        } as unknown as MessageConnection);
+
+        expect(await rpc.connectors.getCapabilities()).toMatchObject({
+            apiVersion: 1,
+            availability: "enabled",
+        });
+        expect(await rpc.connectors.getAccounts()).toEqual({
+            availability: "enabled",
+            accounts: [
+                {
+                    accountId: "account-1",
+                    authInfo: {
+                        type: "user",
+                        host: "https://github.com",
+                        login: "octocat",
+                    },
+                },
+            ],
+        });
+        expect(await rpc.connectors.list({ accountId: "account-1" })).toMatchObject({
+            revision: 1,
+        });
+        expect(await rpc.connectors.refresh({ accountId: "account-1" })).toMatchObject({
+            revision: 1,
+        });
+
+        expect(sendRequest.mock.calls).toEqual([
+            ["connectors.getCapabilities", {}],
+            ["connectors.getAccounts", {}],
+            ["connectors.list", { accountId: "account-1" }],
+            ["connectors.refresh", { accountId: "account-1" }],
+        ]);
+    });
+});
+
 describe("session Connector RPC", () => {
     it("exposes the host-owned experimental Connector lifecycle", async () => {
         const sendRequest = vi.fn(async (method: string) => {
diff --git a/nodejs/test/csharp-codegen.test.ts b/nodejs/test/csharp-codegen.test.ts
index 1ad071369a..4d215e1b11 100644
--- a/nodejs/test/csharp-codegen.test.ts
+++ b/nodejs/test/csharp-codegen.test.ts
@@ -3,8 +3,63 @@ import { describe, expect, it } from "vitest";
 
 import { generateRpcCode, generateSessionEventsCode } from "../../scripts/codegen/csharp.ts";
 import type { ApiSchema, RpcMethod } from "../../scripts/codegen/utils.ts";
+import { postProcessSchema } from "../../scripts/codegen/utils.ts";
 import { legacyRequestSchema } from "./legacy-parameters-fixture.ts";
 
+describe("C# RPC dictionaries", () => {
+    it.each([undefined, true, { type: "string" } as const])(
+        "retains open object entries with additionalProperties=%j",
+        (additionalProperties) => {
+            const dictionary: JSONSchema7 = {
+                type: "object",
+                properties: {},
+                ...(additionalProperties === undefined ? {} : { additionalProperties }),
+            };
+            const schema: ApiSchema = {
+                server: {
+                    sample: {
+                        read: {
+                            rpcMethod: "sample.read",
+                            params: {
+                                title: "SampleRequest",
+                                type: "object",
+                                properties: { environment: dictionary },
+                                required: ["environment"],
+                            },
+                            result: {
+                                title: "SampleResult",
+                                type: "object",
+                                properties: {
+                                    settings: dictionary,
+                                    referenced: { $ref: "#/definitions/Dictionary" },
+                                    entries: { type: "array", items: dictionary },
+                                    closed: {
+                                        type: "object",
+                                        properties: {},
+                                        additionalProperties: false,
+                                    },
+                                },
+                            },
+                        },
+                    },
+                },
+                definitions: { Dictionary: dictionary },
+            };
+            const before = structuredClone(schema);
+            const code = generateRpcCode(schema);
+            const valueType = typeof additionalProperties === "object" ? "string" : "JsonElement";
+            expect(code).toContain(`IDictionary<string, ${valueType}> Environment`);
+            expect(code).toContain(`IDictionary<string, ${valueType}>? Settings`);
+            expect(code).toContain(`IDictionary<string, ${valueType}>? Referenced`);
+            expect(code).toContain(`IList<IDictionary<string, ${valueType}>>? Entries`);
+            expect(code).toContain("class SampleResultClosed");
+            expect(code).not.toContain("class SampleRequestEnvironment");
+            expect(code).not.toContain("class SampleResultSettings");
+            expect(schema).toEqual(before);
+        }
+    );
+});
+
 function legacySignatureFixture(scope: "server" | "session", legacy: unknown) {
     const params: JSONSchema7 & { "x-legacy-parameters"?: unknown } = {
         title: "SampleRequest",
@@ -30,6 +85,21 @@ function legacySignatureFixture(scope: "server" | "session", legacy: unknown) {
     return { schema, params, methods };
 }
 
+describe("C# required opaque JSON parameters", () => {
+    it.each(["server", "session"] as const)("preserves JSON null in %s requests", (scope) => {
+        const { schema, params } = legacySignatureFixture(scope, undefined);
+        params.required!.push("config");
+        const code = generateRpcCode(schema);
+
+        expect(code).toContain("RunAsync(string name, object? config,");
+        expect(code).toContain(
+            'Config = CopilotClient.ToJsonElementForWire(config) ?? JsonElement.Parse("null")'
+        );
+        expect(code).not.toContain("ArgumentNullException.ThrowIfNull(config);");
+        expect(code).toContain("ArgumentNullException.ThrowIfNull(name);");
+    });
+});
+
 describe("C# additive request entry compatibility", () => {
     it.each(["server", "session"] as const)(
         "preserves the exact legacy %s signature and adds a same-name request overload",
@@ -300,6 +370,116 @@ describe("C# session event dispatch", () => {
 });
 
 describe("C# RPC codegen", () => {
+    it("emits parameterless MCP list methods", () => {
+        const code = generateRpcCode({
+            session: {
+                mcp: {
+                    list: {
+                        rpcMethod: "session.mcp.list",
+                        params: null,
+                    },
+                },
+            },
+        });
+        expect(code).toContain(
+            "public async Task ListAsync(CancellationToken cancellationToken = default)"
+        );
+        expect(code).not.toContain("ListWithParamsAsync");
+        expect(code).not.toContain("StartServers");
+        expect(code).toContain('"session.mcp.list"');
+    });
+
+    it("uses ordinal identity for open tiers without changing closed string enums", () => {
+        const tier = {
+            type: "string",
+            title: "AutoTier",
+            "x-extensible-enum": ["efficiency", "balance", "intelligence", "fast"],
+        };
+        const code = generateRpcCode({
+            definitions: {
+                AutoTier: tier,
+                ClosedMode: { type: "string", enum: ["on", "off"] },
+            },
+            server: {
+                sample: {
+                    rpcMethod: "sample",
+                    params: {
+                        type: "object",
+                        properties: {
+                            tier: { $ref: "#/definitions/AutoTier" },
+                            mode: { $ref: "#/definitions/ClosedMode" },
+                        },
+                    },
+                    result: null,
+                },
+            },
+        } as ApiSchema);
+        expect(code).toContain(
+            "Equals(AutoTier other) => string.Equals(Value, other.Value, StringComparison.Ordinal);"
+        );
+        expect(code).toContain(
+            "Equals(ClosedMode other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);"
+        );
+        const tierBody = code.match(
+            /public readonly struct AutoTier[\s\S]*?public override string ToString/
+        );
+        expect(tierBody?.[0]).toContain("StringComparer.Ordinal.GetHashCode(Value)");
+        expect(tierBody?.[0]).not.toContain("OrdinalIgnoreCase");
+
+        const events = generateSessionEventsCode(
+            postProcessSchema({
+                definitions: {
+                    AutoTier: tier,
+                    SessionEvent: {
+                        anyOf: [
+                            {
+                                title: "SampleEvent",
+                                type: "object",
+                                properties: {
+                                    type: { const: "sample" },
+                                    data: {
+                                        type: "object",
+                                        properties: {
+                                            autoTier: { $ref: "#/definitions/AutoTier" },
+                                        },
+                                    },
+                                },
+                            },
+                        ],
+                    },
+                },
+            } as JSONSchema7)
+        );
+        expect(events).toContain(
+            "Equals(AutoTier other) => string.Equals(Value, other.Value, StringComparison.Ordinal);"
+        );
+        expect(events).toContain("StringComparer.Ordinal.GetHashCode(Value)");
+    });
+
+    it("retains named extensible tier values and the existing request type", () => {
+        const code = generateRpcCode({
+            definitions: {
+                AutoTier: {
+                    type: "string",
+                    "x-extensible-enum": ["efficiency", "balance", "intelligence", "fast"],
+                },
+            },
+            server: {
+                setAutoTier: {
+                    rpcMethod: "session.model.setAutoTier",
+                    params: {
+                        type: "object",
+                        properties: { autoTier: { $ref: "#/definitions/AutoTier" } },
+                    },
+                    result: { type: "null" },
+                },
+            },
+        } as ApiSchema);
+        expect(code).toContain("AutoTier? AutoTier");
+        expect(code).toContain('public static AutoTier Balance { get; } = new("balance");');
+        expect(code).toContain("public AutoTier(string value)");
+    });
+
     it("preserves arbitrary JSON handoff settings instead of emitting an empty DTO", () => {
         const code = generateRpcCode({
             server: {
@@ -344,6 +524,32 @@ describe("C# RPC codegen", () => {
         expect(code).toContain("bool? RequireConnectionToken");
     });
 
+    it("keeps inline and referenced boolean literals as boolean RPC fields", () => {
+        const code = generateRpcCode({
+            definitions: {
+                Enabled: { type: "boolean", const: true },
+            },
+            server: {
+                sample: {
+                    status: {
+                        rpcMethod: "sample.status",
+                        result: {
+                            type: "object",
+                            properties: {
+                                enabled: { $ref: "#/definitions/Enabled" },
+                                disabled: { type: "boolean", const: false },
+                            },
+                            required: ["enabled", "disabled"],
+                        },
+                    },
+                },
+            },
+        } as ApiSchema);
+        expect(code).toContain("public bool Enabled { get; set; }");
+        expect(code).toContain("public bool Disabled { get; set; }");
+        expect(code).not.toContain("readonly record struct Enabled");
+    });
+
     it.each(["uninstall", "update"])(
         "separates the session wire envelope from the shared plugins %s request",
         (method) => {
@@ -766,3 +972,71 @@ describe("C# RPC codegen", () => {
         }
     );
 });
+
+describe("C# RPC class visibility", () => {
+    const sharedResultSchema = (): ApiSchema => ({
+        definitions: {
+            FolderTrustCheckResult: {
+                type: "object",
+                title: "FolderTrustCheckResult",
+                properties: { trusted: { type: "boolean" } },
+                required: ["trusted"],
+            },
+        },
+        // The server tree is emitted before the session tree, so the internal
+        // method reaches the shared result type first.
+        server: {
+            permissions: {
+                isTrusted: {
+                    rpcMethod: "permissions.folderTrust.isTrusted",
+                    visibility: "internal",
+                    result: { $ref: "#/definitions/FolderTrustCheckResult" },
+                },
+            },
+        },
+        session: {
+            permissions: {
+                isTrusted: {
+                    rpcMethod: "session.permissions.folderTrust.isTrusted",
+                    result: { $ref: "#/definitions/FolderTrustCheckResult" },
+                },
+            },
+        },
+    });
+
+    it("keeps a type shared with an internal method public", () => {
+        const code = generateRpcCode(sharedResultSchema());
+
+        expect(code).toContain("public sealed class FolderTrustCheckResult\n");
+        expect(code).not.toContain("internal sealed class FolderTrustCheckResult\n");
+    });
+
+    it("still emits a request wrapper as internal", () => {
+        const code = generateRpcCode({
+            definitions: {},
+            server: {
+                git: {
+                    workingDirectoryContext: {
+                        rpcMethod: "git.workingDirectoryContext",
+                        params: {
+                            type: "object",
+                            properties: { cwd: { type: "string" } },
+                            required: ["cwd"],
+                        },
+                    },
+                },
+            },
+        });
+
+        expect(code).toContain("internal sealed class GitWorkingDirectoryContextRequest\n");
+    });
+
+    it("honors an explicitly internal schema over public reachability", () => {
+        const schema = sharedResultSchema();
+        (schema.definitions!.FolderTrustCheckResult as Record<string, unknown>).visibility =
+            "internal";
+        const code = generateRpcCode(schema);
+
+        expect(code).toContain("internal sealed class FolderTrustCheckResult\n");
+    });
+});
diff --git a/nodejs/test/customization-directories.test.ts b/nodejs/test/customization-directories.test.ts
new file mode 100644
index 0000000000..af06711fa1
--- /dev/null
+++ b/nodejs/test/customization-directories.test.ts
@@ -0,0 +1,100 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+
+import { once } from "node:events";
+import { createServer, type Socket } from "node:net";
+import { describe, expect, it, onTestFinished } from "vitest";
+import {
+    createMessageConnection,
+    StreamMessageReader,
+    StreamMessageWriter,
+    type MessageConnection,
+} from "vscode-jsonrpc/node.js";
+import { CopilotClient, RuntimeConnection, approveAll } from "../src/index.js";
+import { getSdkProtocolVersion } from "../src/sdkProtocolVersion.js";
+
+describe("customization directory adapters", () => {
+    it.each([
+        { name: "omitted", roots: undefined },
+        { name: "empty", roots: [] },
+        { name: "relative", roots: ["relative-root", "other-root"] },
+    ])("preserves supplied roots on create and resume: $name", async ({ roots }) => {
+        const requests = new Map<string, Record<string, unknown>>();
+        const peers: { connection: MessageConnection; socket: Socket }[] = [];
+        let client: CopilotClient | undefined;
+        const server = createServer((socket) => {
+            const connection = createMessageConnection(
+                new StreamMessageReader(socket),
+                new StreamMessageWriter(socket)
+            );
+            peers.push({ connection, socket });
+            connection.onRequest("connect", () => ({
+                ok: true,
+                protocolVersion: getSdkProtocolVersion(),
+                version: "adapter-test",
+            }));
+            for (const method of ["session.create", "session.resume"]) {
+                connection.onRequest(method, (params: Record<string, unknown>) => {
+                    requests.set(method, params);
+                    return { sessionId: params.sessionId };
+                });
+            }
+            connection.onRequest("session.options.update", () => ({}));
+            connection.onRequest("session.detach", () => ({ success: true }));
+            connection.onRequest("session.skills.reload", () => ({}));
+            connection.listen();
+        });
+        onTestFinished(async () => {
+            try {
+                await client?.forceStop();
+            } finally {
+                for (const peer of peers) {
+                    peer.connection.dispose();
+                    peer.socket.destroy();
+                }
+                if (server.listening) {
+                    await new Promise<void>((resolve, reject) =>
+                        server.close((error) => (error ? reject(error) : resolve()))
+                    );
+                }
+            }
+        });
+        server.listen(0, "127.0.0.1");
+        await once(server, "listening");
+        const address = server.address();
+        if (!address || typeof address === "string") throw new Error("Missing test listener");
+        client = new CopilotClient({
+            connection: RuntimeConnection.forUri(`127.0.0.1:${address.port}`),
+        });
+        const directories = {
+            skillDirectories: roots?.map((root) => `${root}-skills`),
+            agentDirectories: roots?.map((root) => `${root}-agents`),
+            instructionDirectories: roots?.map((root) => `${root}-instructions`),
+            hookDirectories: roots?.map((root) => `${root}-hooks`),
+        };
+        const config = {
+            workingDirectory: "request-cwd",
+            enableConfigDiscovery: false,
+            enableFileHooks: false,
+            ...directories,
+            onPermissionRequest: approveAll,
+        };
+        const session = await client.createSession(config);
+        await client.resumeSession(session.sessionId, config);
+        for (const method of ["session.create", "session.resume"]) {
+            const request = requests.get(method);
+            expect(request).toBeDefined();
+            for (const [key, expected] of Object.entries(directories)) {
+                if (expected === undefined) {
+                    expect(request).not.toHaveProperty(key);
+                } else {
+                    expect(request).toHaveProperty(key, expected);
+                }
+            }
+            expect(request).toHaveProperty("enableConfigDiscovery", false);
+            expect(request).toHaveProperty("enableFileHooks", false);
+            expect(request).not.toHaveProperty("additionalDirectories");
+            expect(request).not.toHaveProperty("customAgents");
+            expect(request).toHaveProperty("hooks", false);
+        }
+    });
+});
diff --git a/nodejs/test/e2e/accounts_login.e2e.test.ts b/nodejs/test/e2e/accounts_login.e2e.test.ts
new file mode 100644
index 0000000000..2440111bca
--- /dev/null
+++ b/nodejs/test/e2e/accounts_login.e2e.test.ts
@@ -0,0 +1,117 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { describe, expect, it, onTestFinished } from "vitest";
+import { approveAll, CopilotClient, RuntimeConnection } from "../../src/index.js";
+import { createSdkTestContext } from "./harness/sdkTestContext.js";
+
+const { openAiEndpoint, env, workDir } = await createSdkTestContext({
+    useStdio: true,
+    copilotClientOptions: { gitHubToken: undefined, useLoggedInUser: false },
+});
+const loginEnv = {
+    ...env,
+    GH_TOKEN: "",
+    GITHUB_TOKEN: "",
+    COPILOT_GITHUB_TOKEN: "",
+    COPILOT_SDK_AUTH_TOKEN: "",
+    GITHUB_COPILOT_API_TOKEN: "",
+    COPILOT_HMAC_KEY: "",
+    CAPI_HMAC_KEY: "",
+    COPILOT_DISABLE_KEYTAR: "1",
+    COPILOT_DEBUG_ENTRA_BROKER_URL: `${env.COPILOT_API_URL}/entra-broker`,
+};
+const githubToken = "ghu_sdk_entra_login";
+await openAiEndpoint.setEntraLogin("sdk-entra-subject", githubToken);
+await openAiEndpoint.setCopilotUserByToken(githubToken, {
+    login: "sdk_entra_user",
+    copilot_plan: "business",
+    is_staff: false,
+    is_mcp_enabled: true,
+    endpoints: { api: env.COPILOT_API_URL, telemetry: "https://localhost:1/telemetry" },
+});
+
+function clientForTest(): CopilotClient {
+    const client = new CopilotClient({
+        workingDirectory: workDir,
+        env: loginEnv,
+        useLoggedInUser: false,
+        connection: RuntimeConnection.forStdio({ path: process.env.COPILOT_CLI_PATH }),
+    });
+    onTestFinished(() => client.stop());
+    return client;
+}
+
+describe.skipIf(process.platform === "linux")("Shared Entra login", () => {
+    it("returns a cancellable flow before discovery and preserves session ownership", async () => {
+        const client = clientForTest();
+        await using session = await client.createSession({ onPermissionRequest: approveAll });
+        await using other = await client.createSession({ onPermissionRequest: approveAll });
+        const providers = await session.rpc.accounts.enumerate({ query: { kind: "providers" } });
+        expect(providers.kind).toBe("providers");
+        if (providers.kind !== "providers") throw new Error("Expected provider descriptors");
+        expect(providers.items).toContainEqual(
+            expect.objectContaining({ kind: "entra", available: true })
+        );
+        const begun = await session.rpc.accounts.login.begin({ kind: "entra" });
+        expect(begun.step).toEqual({ kind: "awaiting" });
+        await expect(other.rpc.accounts.login.cancel({ flowId: begun.flowId })).rejects.toThrow(
+            "different session"
+        );
+        await session.rpc.accounts.login.cancel({ flowId: begun.flowId });
+        await expect(session.rpc.accounts.login.advance({ flowId: begun.flowId })).rejects.toThrow(
+            "Unknown or completed"
+        );
+    });
+
+    it("completes Entra sign-in through the public API and applies the live session", async () => {
+        const client = clientForTest();
+        await using session = await client.createSession({ onPermissionRequest: approveAll });
+        const begun = await session.rpc.accounts.login.begin({ kind: "entra" });
+        const request = { flowId: begun.flowId };
+        expect(await session.rpc.accounts.login.advance(request)).toEqual({
+            kind: "needs-interaction",
+        });
+        expect(await session.rpc.accounts.login.advance(request)).toEqual({
+            kind: "completed",
+            result: { status: "needs-plaintext-consent" },
+        });
+        const completed = await session.rpc.accounts.login.advance({ ...request, input: "allow" });
+        expect(completed).toEqual({
+            kind: "completed",
+            result: { status: "completed", host: "https://github.com", login: "sdk_entra_user" },
+        });
+        expect(await session.rpc.gitHubAuth.getStatus()).toMatchObject({
+            isAuthenticated: true,
+            login: "sdk_entra_user",
+        });
+        const active = await session.rpc.accounts.get({ query: { kind: "activeAccount" } });
+        expect(active).toMatchObject({
+            kind: "activeAccount",
+            account: { login: "sdk_entra_user", kind: "entraEmu", active: true },
+            authInfo: { host: "https://github.com", login: "sdk_entra_user" },
+        });
+        expect(JSON.stringify(active)).not.toContain(githubToken);
+        expect(JSON.stringify(active)).not.toContain("sdk-entra-subject");
+        await expect(session.rpc.accounts.login.advance(request)).rejects.toThrow(
+            "Unknown or completed"
+        );
+    });
+
+    it("declines storage consent without activating an account", async () => {
+        const client = clientForTest();
+        await using session = await client.createSession({ onPermissionRequest: approveAll });
+        const { flowId } = await session.rpc.accounts.login.begin({ kind: "entra" });
+        await session.rpc.accounts.login.advance({ flowId });
+        await session.rpc.accounts.login.advance({ flowId });
+        expect(await session.rpc.accounts.login.advance({ flowId, input: "decline" })).toEqual({
+            kind: "completed",
+            result: { status: "declined" },
+        });
+        expect(await session.rpc.accounts.get({ query: { kind: "activeAccount" } })).toEqual({
+            kind: "activeAccount",
+            account: null,
+        });
+    });
+});
diff --git a/nodejs/test/e2e/accounts_platform.e2e.test.ts b/nodejs/test/e2e/accounts_platform.e2e.test.ts
new file mode 100644
index 0000000000..ae9bf93726
--- /dev/null
+++ b/nodejs/test/e2e/accounts_platform.e2e.test.ts
@@ -0,0 +1,180 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { readFile, writeFile } from "node:fs/promises";
+import { join } from "node:path";
+import { describe, expect, it } from "vitest";
+import { approveAll } from "../../src/index.js";
+import { createSdkTestContext } from "./harness/sdkTestContext.js";
+
+describe("Account provider platform support", async () => {
+    const { copilotClient: client } = await createSdkTestContext({
+        useStdio: true,
+        copilotClientOptions: {
+            env: {
+                COPILOT_ENTRA_AUTH_AUD: "api://platform-gate-override",
+                COPILOT_DEBUG_ENTRA_BROKER_URL: "http://127.0.0.1:1/unused-broker",
+            },
+        },
+    });
+
+    it("keeps ordinary providers available and rejects unsupported Entra login", async () => {
+        const session = await client.createSession({ onPermissionRequest: approveAll });
+        expect(
+            await session.rpc.accounts.enumerate({ query: { kind: "providers" } })
+        ).toMatchObject({
+            kind: "providers",
+            items: expect.arrayContaining([
+                { kind: "githubDotCom", label: "GitHub.com", available: true },
+                { kind: "proxima", label: "GitHub Enterprise Cloud (*.ghe.com)", available: true },
+            ]),
+        });
+        const flow = await session.rpc.accounts.login.begin({ kind: "proxima" });
+        try {
+            expect(flow.step.kind).toBe("input-required");
+        } finally {
+            await session.rpc.accounts.login.cancel({ flowId: flow.flowId });
+        }
+        if (process.platform === "linux") {
+            expect(
+                await session.rpc.accounts.enumerate({
+                    query: { kind: "providers", brokerAvailable: true },
+                })
+            ).toMatchObject({
+                kind: "providers",
+                items: expect.arrayContaining([
+                    expect.objectContaining({ kind: "entra", available: false }),
+                ]),
+            });
+            await expect(session.rpc.accounts.login.begin({ kind: "entra" })).rejects.toThrow(
+                "only on Windows and macOS"
+            );
+        }
+    });
+});
+
+describe("Saved account platform support", async () => {
+    const { createClient, env, openAiEndpoint } = await createSdkTestContext({
+        useStdio: true,
+        copilotClientOptions: {
+            gitHubToken: undefined,
+            useLoggedInUser: true,
+            env: {
+                COPILOT_GITHUB_TOKEN: "",
+                GH_TOKEN: "",
+                GITHUB_TOKEN: "",
+                GITHUB_ASKPASS: "",
+                COPILOT_GH_HOST: "github.com",
+                GH_HOST: "github.com",
+                COPILOT_HMAC_KEY: "",
+                CAPI_HMAC_KEY: "",
+                GITHUB_COPILOT_API_TOKEN: "",
+                COPILOT_ENABLE_ALT_PROVIDERS: "false",
+                COPILOT_DISABLE_KEYTAR: "1",
+            },
+        },
+    });
+    it.each(["entraEmu", "githubDotCom"] as const)(
+        "restores %s only where supported",
+        async (kind) => {
+            const path = join(env.COPILOT_HOME, "config.json");
+            const authTokens = {
+                "https://github.com:emu:entra": {
+                    token: "ghu_platform_emu",
+                    expiresAt: "2099-01-01T00:00:00Z",
+                    accountType: "entra",
+                },
+                "https://github.com:entra:github": { token: "ghu_platform_github" },
+            };
+            const login = kind === "entraEmu" ? "emu" : "entra";
+            const profile = {
+                storeTokenPlaintext: true,
+                loggedInUsers: [
+                    {
+                        host: "https://github.com",
+                        login: "emu",
+                        kind: "entraEmu",
+                        derivedFrom: "base@tenant",
+                    },
+                    { host: "https://github.com", login: "entra", kind: "githubDotCom" },
+                ],
+                lastLoggedInUser: { host: "https://github.com", login },
+                authTokens,
+            };
+            await writeFile(path, JSON.stringify(profile));
+            await openAiEndpoint.setCopilotUserByToken("ghu_platform_emu", {
+                login: "emu",
+                copilot_plan: "individual",
+            });
+            await openAiEndpoint.setCopilotUserByToken("ghu_platform_github", {
+                login: "entra",
+                copilot_plan: "individual",
+            });
+            const client = createClient({ gitHubToken: undefined, useLoggedInUser: true });
+            try {
+                await client.start();
+                expect(await client.getAuthStatus()).toMatchObject({
+                    isAuthenticated: kind === "githubDotCom" || process.platform !== "linux",
+                });
+            } finally {
+                await client.stop();
+            }
+            // The runtime adds a comment header to this JSON fixture.
+            const saved = (await readFile(path, "utf8")).replace(/^\/\/.*$/gm, "");
+            expect(JSON.parse(saved).authTokens).toEqual(authTokens);
+        }
+    );
+
+    it("checks platform support before setCredentials replaces the selected account", async () => {
+        const path = join(env.COPILOT_HOME, "config.json");
+        const authTokens = {
+            "https://github.com:emu:entra": { token: "ghu_platform_emu" },
+            "https://github.com:ordinary:github": { token: "ghu_platform_github" },
+        };
+        await writeFile(
+            path,
+            JSON.stringify({
+                storeTokenPlaintext: true,
+                loggedInUsers: [
+                    { host: "https://github.com", login: "emu" },
+                    { host: "https://github.com", login: "ordinary", kind: "githubDotCom" },
+                ],
+                lastLoggedInUser: { host: "https://github.com", login: "ordinary" },
+                authTokens,
+            })
+        );
+        await openAiEndpoint.setCopilotUserByToken("ghu_platform_github", {
+            login: "ordinary",
+            copilot_plan: "individual",
+        });
+        const client = createClient({ gitHubToken: undefined, useLoggedInUser: true });
+        try {
+            const session = await client.createSession({ onPermissionRequest: approveAll });
+            const original = await session.rpc.gitHubAuth.getStatus();
+            expect(original).toMatchObject({ isAuthenticated: true, login: "ordinary" });
+            const update = session.rpc.gitHubAuth.setCredentials({
+                credentials: {
+                    type: "user",
+                    host: "https://github.com",
+                    login: "emu",
+                    copilotUser: { login: "emu" },
+                },
+            });
+            if (process.platform === "linux") {
+                await expect(update).rejects.toThrow("only on Windows and macOS");
+                expect(await session.rpc.gitHubAuth.getStatus()).toEqual(original);
+            } else {
+                expect(await update).toMatchObject({ success: true });
+                expect(await session.rpc.gitHubAuth.getStatus()).toMatchObject({
+                    isAuthenticated: true,
+                    login: "emu",
+                });
+            }
+        } finally {
+            await client.stop();
+        }
+        const saved = (await readFile(path, "utf8")).replace(/^\/\/.*$/gm, "");
+        expect(JSON.parse(saved).authTokens).toEqual(authTokens);
+    });
+});
diff --git a/nodejs/test/e2e/agent_scoped_hooks.e2e.test.ts b/nodejs/test/e2e/agent_scoped_hooks.e2e.test.ts
new file mode 100644
index 0000000000..56664421bb
--- /dev/null
+++ b/nodejs/test/e2e/agent_scoped_hooks.e2e.test.ts
@@ -0,0 +1,69 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { readFile, writeFile } from "node:fs/promises";
+import { join } from "node:path";
+import { describe, expect, it } from "vitest";
+import { approveAll } from "../../src/index.js";
+import { createSdkTestContext } from "./harness/sdkTestContext.js";
+
+describe("Agent-scoped hooks", async () => {
+    const { copilotClient: client, workDir } = await createSdkTestContext();
+
+    it("runs scoped commands additively and follows selection without model requests", async () => {
+        const script = join(workDir, "scoped-hook.cjs");
+        const log = join(workDir, "scoped-hook.log");
+        await writeFile(
+            script,
+            `const fs = require("node:fs");
+const [log, label] = process.argv.slice(2);
+fs.appendFileSync(log, label + "\\n");
+process.stdout.write(JSON.stringify({ handled: true, responseContent: label }));
+`
+        );
+        let sessionHookCalls = 0;
+        const scoped = (name: string) => ({
+            name,
+            prompt: "No model request is necessary for this test.",
+            hooks: {
+                userPromptSubmitted: [
+                    { type: "command", exec: process.execPath, args: [script, log, name] },
+                ],
+            },
+        });
+        const session = await client.createSession({
+            onPermissionRequest: approveAll,
+            customAgents: [scoped("FIRST_SCOPE"), scoped("SECOND_SCOPE")],
+            hooks: {
+                onUserPromptSubmitted: () => {
+                    sessionHookCalls++;
+                    return {
+                        additionalContext: "Session hook ran.",
+                        handled: true,
+                        responseContent: "SESSION_ONLY",
+                    };
+                },
+            },
+        });
+        try {
+            const selected = await session.rpc.agent.select({ name: "FIRST_SCOPE" });
+            expect(selected.agent.hooks).toBeDefined();
+            expect((await session.sendAndWait({ prompt: "First request" }))?.data.content).toBe(
+                "FIRST_SCOPE"
+            );
+            await session.rpc.agent.select({ name: "SECOND_SCOPE" });
+            expect((await session.sendAndWait({ prompt: "Second request" }))?.data.content).toBe(
+                "SECOND_SCOPE"
+            );
+            await session.rpc.agent.deselect();
+            expect((await session.sendAndWait({ prompt: "Default request" }))?.data.content).toBe(
+                "SESSION_ONLY"
+            );
+            expect(sessionHookCalls).toBe(3);
+            expect(await readFile(log, "utf8")).toBe("FIRST_SCOPE\nSECOND_SCOPE\n");
+        } finally {
+            await session.disconnect();
+        }
+    });
+});
diff --git a/nodejs/test/e2e/assisted_autopilot_permission.e2e.test.ts b/nodejs/test/e2e/assisted_autopilot_permission.e2e.test.ts
new file mode 100644
index 0000000000..37d6346089
--- /dev/null
+++ b/nodejs/test/e2e/assisted_autopilot_permission.e2e.test.ts
@@ -0,0 +1,1154 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { execFileSync } from "node:child_process";
+import { existsSync } from "node:fs";
+import { mkdir, realpath, rm, writeFile } from "node:fs/promises";
+import { createServer } from "node:http";
+import { join } from "node:path";
+import { text } from "node:stream/consumers";
+import { describe, expect, it, onTestFailed, onTestFinished } from "vitest";
+import {
+    createAttributedPermissionResult,
+    type CopilotSession,
+    type NamedProviderConfig,
+    type PermissionRequest,
+    type ProviderModelConfig,
+} from "../../src/index.js";
+import { createSdkTestContext } from "./harness/sdkTestContext.js";
+import { getNextEventOfType } from "./harness/sdkTestHelper.js";
+
+const JUDGE_OUTPUT = "ALLOW: Explicitly authorized bounded filename search.";
+const HUMAN_REVIEW_OUTPUT = "DENY: Ask the registered human permission handler.";
+const SHELL_TOOL = process.platform === "win32" ? "powershell" : "bash";
+const EARLIER_RESTRICTION_MARKER = "ASSISTED_AUTHORIZATION_RESTRICT";
+const LATER_AUTHORIZATION_MARKER = "ASSISTED_AUTHORIZATION_ALLOW";
+const AUTHORIZATION_FIXTURE = "assisted-authorization-updated";
+
+type ContractRecommendation = "approve" | "requireApproval" | "excluded";
+type ContractScope = "root" | "subagent";
+
+function contractMarker(recommendation: ContractRecommendation): string {
+    return recommendation === "requireApproval" ? "REQUIRE" : recommendation.toUpperCase();
+}
+
+function contractShellCallId(scope: ContractScope, recommendation: ContractRecommendation): string {
+    const owner = scope === "subagent" ? "child" : "root";
+    return `assisted-contract-${owner}-${recommendation}`;
+}
+
+function contractFixtureName(scope: ContractScope, recommendation: ContractRecommendation): string {
+    return `assisted-contract-${recommendation}-${scope}`;
+}
+
+describe("Assisted permission handling in Autopilot", async () => {
+    const { copilotClient: client, workDir } = await createSdkTestContext({ useStdio: true });
+
+    const scenarioGroups = ["routing", "updated authorization", "recovery"] as const;
+    it.each(scenarioGroups)("Assisted Autopilot permissions (%s)", async (group) => {
+        let agentCalls = 0;
+        const judgeOutputs: string[] = [];
+        const authorizationJudgeRequests: string[] = [];
+        const providerFailures: Error[] = [];
+        const progress = {
+            scenario: "fixture",
+            phase: "setup",
+            permissionCallbacks: 0,
+            permissionRequests: 0,
+            toolCompletions: 0,
+            taskCompletions: 0,
+            lastEventType: "none",
+        };
+        const recordEvent = (type: string) => {
+            progress.lastEventType = type;
+            if (type === "permission.requested") progress.permissionRequests++;
+            if (type === "tool.execution_complete") progress.toolCompletions++;
+            if (type === "session.task_complete") progress.taskCompletions++;
+        };
+        onTestFailed(() => {
+            console.error(
+                `[Assisted fixture progress] ${JSON.stringify({
+                    ...progress,
+                    agentCalls,
+                    judgeCalls: judgeOutputs.length,
+                    authorizationJudgeCalls: authorizationJudgeRequests.length,
+                    providerFailures: providerFailures.length,
+                })}`
+            );
+        });
+        const outsideDir = `${workDir}-outside`;
+        await mkdir(outsideDir, { recursive: true });
+        await writeFile(join(outsideDir, "approval-probe.txt"), "ASSISTED_READ_PROBE\n");
+        onTestFinished(() => rm(outsideDir, { recursive: true, force: true }));
+        const modelServer = createServer((request, response) => {
+            void (async () => {
+                const body = JSON.parse(await text(request)) as {
+                    model: string;
+                    stream?: boolean;
+                    messages: Array<{ role?: string; content?: unknown }>;
+                };
+                const isJudge = body.model === "gpt-6-luna";
+                const messages = JSON.stringify(body.messages);
+                const latestUserMessage = [...body.messages]
+                    .reverse()
+                    .find((entry) => entry.role === "user");
+                const latestUserText = JSON.stringify(latestUserMessage?.content);
+                let message:
+                    | { role: "assistant"; content: string }
+                    | {
+                          role: "assistant";
+                          content: string;
+                          tool_calls: Array<{
+                              id: string;
+                              type: "function";
+                              function: { name: string; arguments: string };
+                          }>;
+                      };
+                if (isJudge) {
+                    const earlierRestrictionIndex = messages.lastIndexOf(
+                        EARLIER_RESTRICTION_MARKER
+                    );
+                    const laterAuthorizationIndex = messages.lastIndexOf(
+                        LATER_AUTHORIZATION_MARKER
+                    );
+                    const authorizationRoute = laterAuthorizationIndex !== -1;
+                    if (authorizationRoute) {
+                        authorizationJudgeRequests.push(messages);
+                    }
+                    const contractRequiresApproval =
+                        messages.includes(contractFixtureName("root", "requireApproval")) ||
+                        messages.includes(contractFixtureName("subagent", "requireApproval"));
+                    const output = authorizationRoute
+                        ? earlierRestrictionIndex !== -1 &&
+                          earlierRestrictionIndex < laterAuthorizationIndex
+                            ? JUDGE_OUTPUT
+                            : HUMAN_REVIEW_OUTPUT
+                        : messages.includes("assisted-human-ask") || contractRequiresApproval
+                          ? HUMAN_REVIEW_OUTPUT
+                          : JUDGE_OUTPUT;
+                    judgeOutputs.push(output);
+                    message = { role: "assistant", content: output };
+                } else {
+                    agentCalls++;
+                    const toolResultCount = body.messages.filter(
+                        (entry) => entry.role === "tool"
+                    ).length;
+                    const contractChildRoute = latestUserText.includes("ASSISTED_CONTRACT_CHILD_");
+                    const contractSubagentRoute = latestUserText.includes(
+                        "ASSISTED_CONTRACT_SUBAGENT_"
+                    );
+                    const contractRootRoute = latestUserText.includes("ASSISTED_CONTRACT_ROOT_");
+                    const authorizationRestrictionRoute = latestUserText.includes(
+                        EARLIER_RESTRICTION_MARKER
+                    );
+                    const authorizationAllowRoute = latestUserText.includes(
+                        LATER_AUTHORIZATION_MARKER
+                    );
+                    if (authorizationRestrictionRoute) {
+                        message = { role: "assistant", content: "restriction-recorded" };
+                    } else if (authorizationAllowRoute) {
+                        message =
+                            toolResultCount >= 2
+                                ? { role: "assistant", content: "authorization-updated" }
+                                : toolResultCount === 1
+                                  ? {
+                                        role: "assistant",
+                                        content: "",
+                                        tool_calls: [
+                                            {
+                                                id: "assisted-authorization-task-complete",
+                                                type: "function",
+                                                function: {
+                                                    name: "task_complete",
+                                                    arguments: JSON.stringify({
+                                                        summary: "authorization-updated",
+                                                    }),
+                                                },
+                                            },
+                                        ],
+                                    }
+                                  : {
+                                        role: "assistant",
+                                        content: "",
+                                        tool_calls: [
+                                            {
+                                                id: "assisted-authorization-shell",
+                                                type: "function",
+                                                function: {
+                                                    name: SHELL_TOOL,
+                                                    arguments: JSON.stringify({
+                                                        command:
+                                                            process.platform === "win32"
+                                                                ? `New-Item -ItemType Directory -Path ${AUTHORIZATION_FIXTURE}`
+                                                                : `mkdir ${AUTHORIZATION_FIXTURE}`,
+                                                        description:
+                                                            "Create the fixture authorized by the latest instruction",
+                                                    }),
+                                                },
+                                            },
+                                        ],
+                                    };
+                    } else if (contractChildRoute || contractSubagentRoute || contractRootRoute) {
+                        const recommendation: ContractRecommendation = latestUserText.includes(
+                            "_REQUIRE"
+                        )
+                            ? "requireApproval"
+                            : latestUserText.includes("_EXCLUDED")
+                              ? "excluded"
+                              : "approve";
+                        const scope: ContractScope =
+                            contractChildRoute || contractSubagentRoute ? "subagent" : "root";
+                        const finalText = `contract-${scope}-${
+                            recommendation === "approve" ? "approved" : "blocked"
+                        }`;
+                        if (contractSubagentRoute) {
+                            message =
+                                toolResultCount === 0
+                                    ? {
+                                          role: "assistant",
+                                          content: "",
+                                          tool_calls: [
+                                              {
+                                                  id: `assisted-contract-task-${recommendation}`,
+                                                  type: "function",
+                                                  function: {
+                                                      name: "task",
+                                                      arguments: JSON.stringify({
+                                                          name: "assisted-contract",
+                                                          description:
+                                                              "Exercise an Assisted permission request",
+                                                          prompt: `ASSISTED_CONTRACT_CHILD_${contractMarker(
+                                                              recommendation
+                                                          )}: Run the requested shell command once and report whether it completed.`,
+                                                          agent_type: "task",
+                                                          mode: "sync",
+                                                      }),
+                                                  },
+                                              },
+                                          ],
+                                      }
+                                    : {
+                                          role: "assistant",
+                                          content: "",
+                                          tool_calls: [
+                                              {
+                                                  id: `assisted-contract-task-complete-${recommendation}`,
+                                                  type: "function",
+                                                  function: {
+                                                      name: "task_complete",
+                                                      arguments: JSON.stringify({
+                                                          summary: finalText,
+                                                      }),
+                                                  },
+                                              },
+                                          ],
+                                      };
+                        } else if (contractChildRoute && toolResultCount > 0) {
+                            message = { role: "assistant", content: finalText };
+                        } else if (
+                            (contractChildRoute || contractRootRoute) &&
+                            (toolResultCount === 0 ||
+                                (recommendation === "excluded" && toolResultCount === 1))
+                        ) {
+                            const command =
+                                recommendation === "excluded"
+                                    ? process.platform === "win32"
+                                        ? "Get-Content approval-probe.txt | & $runner"
+                                        : "printf payload | $runner"
+                                    : process.platform === "win32"
+                                      ? `New-Item -ItemType Directory -Path ${contractFixtureName(
+                                            scope,
+                                            recommendation
+                                        )}`
+                                      : `mkdir ${contractFixtureName(scope, recommendation)}`;
+                            message = {
+                                role: "assistant",
+                                content: "",
+                                tool_calls: [
+                                    {
+                                        id:
+                                            toolResultCount === 0
+                                                ? contractShellCallId(scope, recommendation)
+                                                : `${contractShellCallId(
+                                                      scope,
+                                                      recommendation
+                                                  )}-retry`,
+                                        type: "function",
+                                        function: {
+                                            name: SHELL_TOOL,
+                                            arguments: JSON.stringify({
+                                                command,
+                                                description: "Exercise Assisted permission routing",
+                                            }),
+                                        },
+                                    },
+                                ],
+                            };
+                        } else {
+                            message = {
+                                role: "assistant",
+                                content: "",
+                                tool_calls: [
+                                    {
+                                        id: `assisted-contract-task-complete-${recommendation}`,
+                                        type: "function",
+                                        function: {
+                                            name: "task_complete",
+                                            arguments: JSON.stringify({ summary: finalText }),
+                                        },
+                                    },
+                                ],
+                            };
+                        }
+                    } else {
+                        const primeIndex = messages.lastIndexOf("ASSISTED_SESSION_PRIME");
+                        const shellIndex = messages.lastIndexOf("ASSISTED_SHELL_");
+                        const pathIndex = messages.lastIndexOf("ASSISTED_PATH_ROUTE");
+                        const humanIndex = messages.lastIndexOf("ASSISTED_HUMAN_");
+                        const primeRoute = primeIndex > Math.max(shellIndex, pathIndex, humanIndex);
+                        const humanRoute = humanIndex > Math.max(primeIndex, shellIndex, pathIndex);
+                        const shellRoute = shellIndex > Math.max(primeIndex, pathIndex, humanIndex);
+                        const resumedShellRoute =
+                            messages.lastIndexOf("ASSISTED_SHELL_RESUME_ROUTE") === shellIndex;
+                        const humanApproved = messages.includes("ASSISTED_HUMAN_APPROVE_");
+                        const humanLifecycle =
+                            messages.includes("ASSISTED_HUMAN_APPROVE_RESUME_ROUTE") ||
+                            messages.includes("ASSISTED_HUMAN_DENY_RESUME_ROUTE")
+                                ? "resume"
+                                : "create";
+                        const finalText = humanRoute
+                            ? humanApproved
+                                ? "human-approved"
+                                : "human-denied"
+                            : shellRoute
+                              ? "shell-approved"
+                              : "approval-probe.txt";
+                        message = primeRoute
+                            ? { role: "assistant", content: "prime-ready" }
+                            : toolResultCount >= 2
+                              ? {
+                                    role: "assistant",
+                                    content: finalText,
+                                }
+                              : toolResultCount === 1
+                                ? {
+                                      role: "assistant",
+                                      content: "",
+                                      tool_calls: [
+                                          {
+                                              id: "assisted-autopilot-task-complete",
+                                              type: "function",
+                                              function: {
+                                                  name: "task_complete",
+                                                  arguments: JSON.stringify({
+                                                      summary: finalText,
+                                                  }),
+                                              },
+                                          },
+                                      ],
+                                  }
+                                : {
+                                      role: "assistant",
+                                      content: "",
+                                      tool_calls: [
+                                          {
+                                              id: shellRoute
+                                                  ? "assisted-autopilot-shell"
+                                                  : humanRoute
+                                                    ? "assisted-autopilot-human"
+                                                    : "assisted-autopilot-glob",
+                                              type: "function",
+                                              function:
+                                                  shellRoute || humanRoute
+                                                      ? {
+                                                            name: SHELL_TOOL,
+                                                            arguments: JSON.stringify({
+                                                                command: humanRoute
+                                                                    ? process.platform === "win32"
+                                                                        ? `New-Item -ItemType Directory -Path assisted-human-ask-${humanApproved ? "approve" : "deny"}-${humanLifecycle}`
+                                                                        : `mkdir assisted-human-ask-${humanApproved ? "approve" : "deny"}-${humanLifecycle}`
+                                                                    : process.platform === "win32"
+                                                                      ? `New-Item -ItemType Directory -Path assisted-shell-${resumedShellRoute ? "resume" : "create"}`
+                                                                      : `mkdir assisted-shell-${resumedShellRoute ? "resume" : "create"}`,
+                                                                description: humanRoute
+                                                                    ? "Create the human-reviewed SDK permission fixture"
+                                                                    : "Create the authorized SDK permission fixture",
+                                                            }),
+                                                        }
+                                                      : {
+                                                            name: "glob",
+                                                            arguments: JSON.stringify({
+                                                                pattern: "*.txt",
+                                                                path: outsideDir,
+                                                            }),
+                                                        },
+                                          },
+                                      ],
+                                  };
+                    }
+                }
+
+                const choice = {
+                    index: 0,
+                    message,
+                    finish_reason: "tool_calls" in message ? "tool_calls" : "stop",
+                };
+                const completion = {
+                    id: `assisted-autopilot-${judgeOutputs.length + agentCalls}`,
+                    object: "chat.completion",
+                    created: 1,
+                    model: body.model,
+                    choices: [choice],
+                    usage: { prompt_tokens: 100, completion_tokens: 20, total_tokens: 120 },
+                };
+                if (body.stream) {
+                    response.writeHead(200, { "content-type": "text/event-stream" });
+                    response.end(
+                        `data: ${JSON.stringify({
+                            ...completion,
+                            object: "chat.completion.chunk",
+                            choices: [
+                                {
+                                    index: 0,
+                                    delta: {
+                                        ...message,
+                                        ...("tool_calls" in message
+                                            ? {
+                                                  tool_calls: message.tool_calls.map(
+                                                      (call, index) => ({ index, ...call })
+                                                  ),
+                                              }
+                                            : {}),
+                                    },
+                                    finish_reason: choice.finish_reason,
+                                },
+                            ],
+                        })}\n\ndata: [DONE]\n\n`
+                    );
+                } else {
+                    response.writeHead(200, { "content-type": "application/json" });
+                    response.end(JSON.stringify(completion));
+                }
+            })().catch((error: unknown) => {
+                providerFailures.push(error instanceof Error ? error : new Error(String(error)));
+                response.writeHead(500).end();
+            });
+        });
+        await new Promise<void>((resolve, reject) => {
+            modelServer.once("error", reject);
+            modelServer.listen(0, "127.0.0.1", resolve);
+        });
+        onTestFinished(async () => {
+            modelServer.closeAllConnections();
+            if (modelServer.listening) {
+                await new Promise<void>((resolve, reject) => {
+                    modelServer.close((error) => (error ? reject(error) : resolve()));
+                });
+            }
+        });
+        const address = modelServer.address();
+        if (!address || typeof address === "string") {
+            throw new Error("Missing local model server address");
+        }
+
+        execFileSync("git", ["init", "--quiet"], { cwd: workDir });
+        await writeFile(join(workDir, "approval-probe.txt"), "ASSISTED_READ_PROBE\n");
+
+        const providers: NamedProviderConfig[] = [
+            {
+                name: "local",
+                type: "openai",
+                baseUrl: `http://127.0.0.1:${address.port}/v1`,
+                apiKey: "synthetic-test-token",
+                wireApi: "completions",
+            },
+        ];
+        const models: ProviderModelConfig[] = ["gpt-5.6-sol", "gpt-6-luna"].map((id) => ({
+            id,
+            provider: "local",
+            modelId: "gpt-4o",
+            wireModel: id,
+        }));
+        const scenarios =
+            group === "routing"
+                ? ([
+                      { route: "shell", lifecycle: "create", decision: "judge" },
+                      { route: "path", lifecycle: "create", decision: "judge" },
+                      { route: "shell", lifecycle: "resume", decision: "judge" },
+                      { route: "path", lifecycle: "resume", decision: "judge" },
+                      { route: "human", lifecycle: "create", decision: "approve" },
+                      { route: "human", lifecycle: "create", decision: "deny" },
+                      { route: "human", lifecycle: "resume", decision: "approve" },
+                      { route: "human", lifecycle: "resume", decision: "deny" },
+                  ] as const)
+                : [];
+        for (const scenario of scenarios) {
+            progress.scenario = `routing:${JSON.stringify(scenario)}`;
+            progress.phase = "create-session";
+            let permissionCallbacks = 0;
+            const expectedRecommendation =
+                scenario.decision === "judge" ? "approve" : "requireApproval";
+            const recommendationByToolCallId = new Map<string, string | undefined>();
+            const recommendationWaiters = new Map<
+                string,
+                (recommendation: string | undefined) => void
+            >();
+            const recommendations: string[] = [];
+            const recoveryStatuses: string[] = [];
+            const toolResults: Array<{ success?: boolean; result?: { content?: string } }> = [];
+            const decisionSources: string[] = [];
+            const taskOutcomes: Array<{
+                success?: boolean;
+                summary?: string;
+                outcome?: string;
+                reason?: string;
+            }> = [];
+            const sessionConfig = {
+                model: "local/gpt-5.6-sol",
+                providers,
+                models,
+                availableTools: [SHELL_TOOL, "glob", "task_complete"],
+                streaming: false,
+                skipCustomInstructions: true,
+                featureFlags: {
+                    AUTO_APPROVAL: true,
+                    ASSISTED_PERMISSIONS_V2: true,
+                },
+                onPermissionRequest: async (request: PermissionRequest) => {
+                    progress.permissionCallbacks++;
+                    permissionCallbacks++;
+                    if (!request.toolCallId) {
+                        throw new Error(
+                            "Expected the permission request to identify its tool call"
+                        );
+                    }
+                    const recommendation = recommendationByToolCallId.has(request.toolCallId)
+                        ? recommendationByToolCallId.get(request.toolCallId)
+                        : await new Promise<string | undefined>((resolve) => {
+                              recommendationWaiters.set(request.toolCallId!, resolve);
+                          });
+                    recommendationByToolCallId.delete(request.toolCallId);
+                    if (recommendation !== expectedRecommendation) {
+                        throw new Error(
+                            `Expected Assisted recommendation ${expectedRecommendation}, got ${String(
+                                recommendation
+                            )}`
+                        );
+                    }
+                    if (scenario.decision === "judge") {
+                        return createAttributedPermissionResult(
+                            { kind: "approve-once" },
+                            {
+                                outcome: "auto_approved",
+                                source: "assisted_approval",
+                                surface: "sdk",
+                                responseCapability: "headless",
+                            }
+                        );
+                    }
+                    return createAttributedPermissionResult(
+                        { kind: scenario.decision === "approve" ? "approve-once" : "reject" },
+                        {
+                            outcome: "prompted_user",
+                            source: "human_response",
+                            surface: "sdk",
+                            responseCapability: "interactive",
+                        }
+                    );
+                },
+            } as const;
+            let session: CopilotSession | undefined;
+            try {
+                session = await client.createSession(sessionConfig);
+                if (scenario.lifecycle === "resume") {
+                    const sessionId = session.sessionId;
+                    progress.phase = "prime-turn";
+                    await session.sendAndWait({
+                        prompt: "ASSISTED_SESSION_PRIME: Reply with prime-ready without tools.",
+                    });
+                    progress.phase = "configure-before-resume";
+                    await configureAssistedAutopilot(session, workDir);
+                    progress.phase = "verify-before-resume";
+                    await expectAssistedAutopilotConfigured(session, workDir);
+                    progress.phase = "disconnect-before-resume";
+                    await session.disconnect();
+                    session = undefined;
+                    progress.phase = "resume-session";
+                    session = await client.resumeSession(sessionId, sessionConfig);
+                    progress.phase = "verify-after-resume";
+                    await expectAssistedAutopilotConfigured(session, workDir);
+                } else {
+                    progress.phase = "configure-session";
+                    await configureAssistedAutopilot(session, workDir);
+                }
+                session.on((event) => {
+                    recordEvent(event.type);
+                    if (event.type === "permission.requested") {
+                        const promptRequest = (
+                            event.data as {
+                                promptRequest?: {
+                                    assistedApproval?: { recommendation?: string };
+                                    autoApproval?: { recommendation?: string };
+                                };
+                            }
+                        ).promptRequest;
+                        const recommendation =
+                            promptRequest?.assistedApproval?.recommendation ??
+                            promptRequest?.autoApproval?.recommendation;
+                        const toolCallId = (
+                            event.data as {
+                                permissionRequest?: { toolCallId?: string };
+                            }
+                        ).permissionRequest?.toolCallId;
+                        if (toolCallId) {
+                            const waiter = recommendationWaiters.get(toolCallId);
+                            if (waiter) {
+                                recommendationWaiters.delete(toolCallId);
+                                waiter(recommendation);
+                            } else {
+                                recommendationByToolCallId.set(toolCallId, recommendation);
+                            }
+                        }
+                        if (recommendation) recommendations.push(recommendation);
+                    } else if (event.type === "permission.completed") {
+                        const source = (event.data as { decisionSource?: string }).decisionSource;
+                        if (source) decisionSources.push(source);
+                    } else if (event.type === "session.permission_recovery") {
+                        recoveryStatuses.push((event.data as { status: string }).status);
+                    } else if (event.type === "tool.execution_complete") {
+                        toolResults.push(event.data);
+                    } else if (event.type === "session.task_complete") {
+                        taskOutcomes.push(event.data);
+                    }
+                });
+
+                try {
+                    const taskComplete = getNextEventOfType(session, "session.task_complete");
+                    progress.phase = "send-turn";
+                    await session.send({
+                        prompt:
+                            scenario.route === "shell"
+                                ? `ASSISTED_SHELL_${scenario.lifecycle.toUpperCase()}_ROUTE: Create the authorized fixture directory once and report shell-approved.`
+                                : scenario.route === "path"
+                                  ? `ASSISTED_PATH_ROUTE: Use only glob to find *.txt in ${outsideDir} and report the matching filename.`
+                                  : `ASSISTED_HUMAN_${scenario.decision.toUpperCase()}_${scenario.lifecycle.toUpperCase()}_ROUTE: Try to create the human-reviewed fixture directory once and report human-${scenario.decision === "approve" ? "approved" : "denied"}.`,
+                    });
+                    progress.phase = "await-task-complete";
+                    await taskComplete;
+                } catch (error) {
+                    throw new Error(`${JSON.stringify(scenario)} failed`, { cause: error });
+                }
+
+                progress.phase = "assert-results";
+                const expectedCompletions =
+                    scenario.route === "path" && scenario.lifecycle === "create" ? 2 : 1;
+                expect(permissionCallbacks, JSON.stringify(scenario)).toBe(expectedCompletions);
+                expect(recommendations, JSON.stringify(scenario)).toEqual(
+                    Array(expectedCompletions).fill(expectedRecommendation)
+                );
+                expect(decisionSources, JSON.stringify(scenario)).toEqual(
+                    Array(expectedCompletions).fill(
+                        scenario.decision === "judge" ? "assisted_approval" : "human_response"
+                    )
+                );
+                expect(recoveryStatuses, JSON.stringify(scenario)).toEqual([]);
+                expect(toolResults, JSON.stringify(scenario)).toHaveLength(2);
+                if (scenario.decision === "deny") {
+                    expect(
+                        toolResults.some((result) => result.success === false),
+                        JSON.stringify(scenario)
+                    ).toBe(true);
+                    expect(toolResults.at(-1)?.success, JSON.stringify(scenario)).toBe(true);
+                } else {
+                    expect(
+                        toolResults.every((result) => result.success === true),
+                        JSON.stringify(scenario)
+                    ).toBe(true);
+                }
+                expect(taskOutcomes, JSON.stringify(scenario)).toHaveLength(1);
+                expect(taskOutcomes[0], JSON.stringify(scenario)).toMatchObject({
+                    success: true,
+                });
+                expect(taskOutcomes[0]?.summary, JSON.stringify(scenario)).toContain(
+                    scenario.route === "shell"
+                        ? "shell-approved"
+                        : scenario.route === "path"
+                          ? "approval-probe.txt"
+                          : `human-${scenario.decision === "approve" ? "approved" : "denied"}`
+                );
+                if (scenario.route === "human") {
+                    expect(
+                        existsSync(
+                            join(
+                                workDir,
+                                `assisted-human-ask-${scenario.decision}-${scenario.lifecycle}`
+                            )
+                        ),
+                        JSON.stringify(scenario)
+                    ).toBe(scenario.decision === "approve");
+                }
+            } finally {
+                if (session) {
+                    progress.phase = "abort-session";
+                    await session.abort();
+                    progress.phase = "disconnect-session";
+                    await session.disconnect();
+                }
+            }
+        }
+
+        if (group === "routing") {
+            progress.phase = "assert-routing-totals";
+            expect(providerFailures).toEqual([]);
+            expect(judgeOutputs).toEqual([
+                ...Array(4).fill(JUDGE_OUTPUT),
+                ...Array(4).fill(HUMAN_REVIEW_OUTPUT),
+            ]);
+            expect(agentCalls).toBe(scenarios.length * 2 + 4);
+            progress.phase = "complete";
+            return;
+        }
+
+        if (group === "updated authorization") {
+            const authorizationJudgeStart = judgeOutputs.length;
+            let authorizationPermissionCallbacks = 0;
+            const authorizationRecommendations: string[] = [];
+            const authorizationDecisionSources: string[] = [];
+            const authorizationRecoveryStatuses: string[] = [];
+            const authorizationToolResults: Array<{ toolCallId?: string; success?: boolean }> = [];
+            const authorizationTaskOutcomes: Array<{ success?: boolean; summary?: string }> = [];
+            let resolveAuthorizationRecommendation: (recommendation: string | undefined) => void;
+            const authorizationRecommendation = new Promise<string | undefined>((resolve) => {
+                resolveAuthorizationRecommendation = resolve;
+            });
+            let authorizationSession: CopilotSession | undefined;
+            progress.scenario = "updated-authorization";
+            progress.phase = "create-session";
+            try {
+                authorizationSession = await client.createSession({
+                    model: "local/gpt-5.6-sol",
+                    providers,
+                    models,
+                    availableTools: [SHELL_TOOL, "task_complete"],
+                    streaming: false,
+                    skipCustomInstructions: true,
+                    featureFlags: {
+                        AUTO_APPROVAL: true,
+                        ASSISTED_PERMISSIONS_V2: true,
+                    },
+                    onPermissionRequest: async (request) => {
+                        progress.permissionCallbacks++;
+                        authorizationPermissionCallbacks++;
+                        if (request.toolCallId !== "assisted-authorization-shell") {
+                            throw new Error(
+                                `Expected authorization shell permission, got ${String(
+                                    request.toolCallId
+                                )}`
+                            );
+                        }
+                        const recommendation = await authorizationRecommendation;
+                        if (recommendation !== "approve") {
+                            throw new Error(
+                                `Expected later authorization to reach the judge as approve, got ${String(
+                                    recommendation
+                                )}`
+                            );
+                        }
+                        return createAttributedPermissionResult(
+                            { kind: "approve-once" },
+                            {
+                                outcome: "auto_approved",
+                                source: "assisted_approval",
+                                surface: "sdk",
+                                responseCapability: "headless",
+                            }
+                        );
+                    },
+                });
+                progress.phase = "restriction-turn";
+                await authorizationSession.sendAndWait({
+                    prompt: `${EARLIER_RESTRICTION_MARKER}: Do not create the authorization fixture. Reply restriction-recorded without tools.`,
+                });
+                progress.phase = "configure-session";
+                await configureAssistedAutopilot(authorizationSession, workDir);
+                authorizationSession.on((event) => {
+                    recordEvent(event.type);
+                    if (event.type === "permission.requested") {
+                        const recommendation = (
+                            event.data as {
+                                promptRequest?: {
+                                    assistedApproval?: { recommendation?: string };
+                                };
+                            }
+                        ).promptRequest?.assistedApproval?.recommendation;
+                        if (recommendation) {
+                            authorizationRecommendations.push(recommendation);
+                        }
+                        resolveAuthorizationRecommendation(recommendation);
+                    } else if (event.type === "permission.completed") {
+                        const source = (event.data as { decisionSource?: string }).decisionSource;
+                        if (source) authorizationDecisionSources.push(source);
+                    } else if (event.type === "session.permission_recovery") {
+                        authorizationRecoveryStatuses.push(
+                            (event.data as { status: string }).status
+                        );
+                    } else if (event.type === "tool.execution_complete") {
+                        authorizationToolResults.push({
+                            toolCallId: event.data.toolCallId,
+                            success: event.data.success,
+                        });
+                    } else if (event.type === "session.task_complete") {
+                        authorizationTaskOutcomes.push(event.data);
+                    }
+                });
+
+                const taskComplete = getNextEventOfType(
+                    authorizationSession,
+                    "session.task_complete"
+                );
+                progress.phase = "send-turn";
+                await authorizationSession.send({
+                    prompt: `${LATER_AUTHORIZATION_MARKER}: The earlier restriction is superseded. Create the authorization fixture now and report authorization-updated.`,
+                });
+                progress.phase = "await-task-complete";
+                await taskComplete;
+
+                progress.phase = "assert-results";
+                expect(judgeOutputs.slice(authorizationJudgeStart)).toEqual([JUDGE_OUTPUT]);
+                expect(authorizationJudgeRequests).toHaveLength(1);
+                const authorizationRequest = authorizationJudgeRequests[0] ?? "";
+                expect(
+                    authorizationRequest.indexOf(EARLIER_RESTRICTION_MARKER)
+                ).toBeGreaterThanOrEqual(0);
+                expect(authorizationRequest.indexOf(LATER_AUTHORIZATION_MARKER)).toBeGreaterThan(
+                    authorizationRequest.indexOf(EARLIER_RESTRICTION_MARKER)
+                );
+                expect(authorizationPermissionCallbacks).toBe(1);
+                expect(authorizationRecommendations).toEqual(["approve"]);
+                expect(authorizationDecisionSources).toEqual(["assisted_approval"]);
+                expect(authorizationRecoveryStatuses).toEqual([]);
+                expect(authorizationToolResults).toContainEqual({
+                    toolCallId: "assisted-authorization-shell",
+                    success: true,
+                });
+                expect(authorizationTaskOutcomes).toEqual([
+                    expect.objectContaining({
+                        success: true,
+                        summary: "authorization-updated",
+                    }),
+                ]);
+                expect(existsSync(join(workDir, AUTHORIZATION_FIXTURE))).toBe(true);
+            } finally {
+                if (authorizationSession) {
+                    progress.phase = "abort-session";
+                    await authorizationSession.abort();
+                    progress.phase = "disconnect-session";
+                    await authorizationSession.disconnect();
+                }
+            }
+            expect(providerFailures).toEqual([]);
+            progress.phase = "complete";
+            return;
+        }
+
+        const contractScenarios = [
+            { scope: "root", recommendation: "approve", handler: "registered" },
+            { scope: "root", recommendation: "requireApproval", handler: "registered" },
+            { scope: "root", recommendation: "excluded", handler: "registered" },
+            { scope: "subagent", recommendation: "approve", handler: "registered" },
+            { scope: "subagent", recommendation: "requireApproval", handler: "registered" },
+            { scope: "root", recommendation: "requireApproval", handler: "none" },
+        ] as const satisfies readonly {
+            scope: ContractScope;
+            recommendation: ContractRecommendation;
+            handler: "registered" | "none";
+        }[];
+        const contractJudgeStart = judgeOutputs.length;
+        for (const scenario of contractScenarios) {
+            progress.scenario = `recovery:${JSON.stringify(scenario)}`;
+            progress.phase = "create-session";
+            let permissionCallbacks = 0;
+            const recommendations: string[] = [];
+            const recoveryStatuses: string[] = [];
+            const decisionSources: string[] = [];
+            const sequence: string[] = [];
+            const subagentIds = new Set<string>();
+            const permissionAgentIds: Array<string | undefined> = [];
+            const toolResults: Array<{
+                agentId?: string;
+                toolCallId?: string;
+                success?: boolean;
+                error?: { message?: string };
+                result?: unknown;
+            }> = [];
+            const taskOutcomes: Array<{ success?: boolean; summary?: string }> = [];
+            const onPermissionRequest = () => {
+                progress.permissionCallbacks++;
+                permissionCallbacks++;
+                sequence.push("host");
+                if (scenario.recommendation === "approve") {
+                    return createAttributedPermissionResult(
+                        { kind: "approve-once" },
+                        {
+                            outcome: "auto_approved",
+                            source: "assisted_approval",
+                            surface: "sdk",
+                            responseCapability: "headless",
+                        }
+                    );
+                }
+                if (scenario.recommendation === "requireApproval") {
+                    return createAttributedPermissionResult(
+                        {
+                            kind: "reject",
+                            feedback: HUMAN_REVIEW_OUTPUT.replace(/^DENY:\s*/, ""),
+                        },
+                        {
+                            outcome: "autopilot_denied",
+                            source: "assisted_approval",
+                            surface: "sdk",
+                            responseCapability: "headless",
+                        }
+                    );
+                }
+                if (scenario.recommendation === "excluded") {
+                    return createAttributedPermissionResult(
+                        { kind: "user-not-available" },
+                        {
+                            outcome: "autopilot_denied",
+                            source: "unattended_fallback",
+                            surface: "sdk",
+                            responseCapability: "headless",
+                        }
+                    );
+                }
+                throw new Error("Unexpected Assisted permission recommendation");
+            };
+            const sessionConfig = {
+                model: "local/gpt-5.6-sol",
+                providers,
+                models,
+                availableTools: [SHELL_TOOL, "task", "task_complete"],
+                streaming: false,
+                skipCustomInstructions: true,
+                featureFlags: {
+                    AUTO_APPROVAL: true,
+                    ASSISTED_PERMISSIONS_V2: true,
+                },
+                ...(scenario.handler === "registered" ? { onPermissionRequest } : {}),
+            } as const;
+            let session: CopilotSession | undefined;
+            try {
+                session = await client.createSession(sessionConfig);
+                progress.phase = "configure-session";
+                await configureAssistedAutopilot(session, workDir);
+                session.on((event) => {
+                    recordEvent(event.type);
+                    if (event.type === "permission.requested") {
+                        const promptRequest = (
+                            event.data as {
+                                promptRequest?: {
+                                    assistedApproval?: { recommendation?: string };
+                                    autoApproval?: { recommendation?: string };
+                                };
+                            }
+                        ).promptRequest;
+                        const recommendation =
+                            promptRequest?.assistedApproval?.recommendation ??
+                            promptRequest?.autoApproval?.recommendation;
+                        if (recommendation) {
+                            recommendations.push(recommendation);
+                            sequence.push(`permission:${recommendation}`);
+                        }
+                        permissionAgentIds.push(event.agentId);
+                    } else if (event.type === "permission.completed") {
+                        const source = (event.data as { decisionSource?: string }).decisionSource;
+                        if (source) decisionSources.push(source);
+                    } else if (event.type === "session.permission_recovery") {
+                        const status = (event.data as { status: string }).status;
+                        recoveryStatuses.push(status);
+                        sequence.push(`recovery:${status}`);
+                    } else if (event.type === "tool.execution_complete") {
+                        toolResults.push({
+                            agentId: event.agentId,
+                            toolCallId: event.data.toolCallId,
+                            success: event.data.success,
+                            error: event.data.error,
+                            result: event.data.result,
+                        });
+                    } else if (event.type === "session.task_complete") {
+                        taskOutcomes.push(event.data);
+                    } else if (event.type === "subagent.started") {
+                        subagentIds.add(event.agentId);
+                    }
+                });
+
+                const marker = contractMarker(scenario.recommendation);
+                const prompt =
+                    scenario.scope === "root"
+                        ? `ASSISTED_CONTRACT_ROOT_${marker}: Run the requested shell command once and report the outcome.`
+                        : `ASSISTED_CONTRACT_SUBAGENT_${marker}: Use the task tool once so a task subagent runs the requested shell command.`;
+                try {
+                    const taskComplete = getNextEventOfType(session, "session.task_complete");
+                    progress.phase = "send-turn";
+                    await session.send({ prompt });
+                    progress.phase = "await-task-complete";
+                    await taskComplete;
+                } catch (error) {
+                    throw new Error(`${JSON.stringify(scenario)} failed`, { cause: error });
+                }
+
+                progress.phase = "assert-results";
+                if (scenario.handler === "none") {
+                    expect(permissionCallbacks, JSON.stringify(scenario)).toBe(0);
+                    expect(recommendations, JSON.stringify(scenario)).toEqual([]);
+                } else if (scenario.recommendation === "approve") {
+                    expect(permissionCallbacks, JSON.stringify(scenario)).toBe(1);
+                    expect(recommendations, JSON.stringify(scenario)).toEqual(["approve"]);
+                } else if (scenario.recommendation === "requireApproval") {
+                    expect(permissionCallbacks, JSON.stringify(scenario)).toBe(1);
+                    expect(recommendations, JSON.stringify(scenario)).toEqual(["requireApproval"]);
+                } else {
+                    expect(permissionCallbacks, JSON.stringify(scenario)).toBeGreaterThanOrEqual(1);
+                    expect(recommendations, JSON.stringify(scenario)).toEqual(
+                        Array(permissionCallbacks).fill("excluded")
+                    );
+                }
+                if (scenario.handler === "none") {
+                    expect(decisionSources, JSON.stringify(scenario)).toEqual([]);
+                    expect(recoveryStatuses, JSON.stringify(scenario)).toEqual(["recovering"]);
+                } else {
+                    expect(decisionSources, JSON.stringify(scenario)).toContain(
+                        scenario.recommendation === "excluded"
+                            ? "unattended_fallback"
+                            : "assisted_approval"
+                    );
+                }
+                if (scenario.recommendation === "excluded") {
+                    expect(recoveryStatuses.at(-1), JSON.stringify(scenario)).toBe("blocked");
+                } else if (scenario.handler === "registered") {
+                    expect(recoveryStatuses, JSON.stringify(scenario)).toEqual([]);
+                }
+                const hostIndex = sequence.indexOf("host");
+                const firstRecoveryIndex = sequence.findIndex((entry) =>
+                    entry.startsWith("recovery:")
+                );
+                if (firstRecoveryIndex !== -1 && scenario.handler === "registered") {
+                    expect(
+                        hostIndex,
+                        JSON.stringify({ scenario, sequence })
+                    ).toBeGreaterThanOrEqual(0);
+                    expect(hostIndex, JSON.stringify({ scenario, sequence })).toBeLessThan(
+                        firstRecoveryIndex
+                    );
+                }
+
+                const shellResult = toolResults.find(
+                    (result) =>
+                        result.toolCallId ===
+                        contractShellCallId(scenario.scope, scenario.recommendation)
+                );
+                expect(shellResult, JSON.stringify({ scenario, toolResults })).toBeDefined();
+                expect(shellResult?.success, JSON.stringify(scenario)).toBe(
+                    scenario.recommendation === "approve" && scenario.handler === "registered"
+                );
+                if (
+                    scenario.recommendation === "requireApproval" &&
+                    scenario.handler === "registered"
+                ) {
+                    expect(shellResult?.error?.message, JSON.stringify(scenario)).toContain(
+                        "Ask the registered human permission handler."
+                    );
+                } else if (scenario.handler === "none") {
+                    expect(shellResult?.error?.message, JSON.stringify(scenario)).toContain(
+                        "Permission could not be granted automatically."
+                    );
+                }
+                if (scenario.scope === "subagent") {
+                    expect(subagentIds.size, JSON.stringify(scenario)).toBe(1);
+                    expect(
+                        subagentIds.has(shellResult?.agentId ?? ""),
+                        JSON.stringify(scenario)
+                    ).toBe(true);
+                    for (const agentId of permissionAgentIds) {
+                        expect(subagentIds.has(agentId ?? ""), JSON.stringify(scenario)).toBe(true);
+                    }
+                }
+
+                expect(
+                    existsSync(
+                        join(workDir, contractFixtureName(scenario.scope, scenario.recommendation))
+                    ),
+                    JSON.stringify(scenario)
+                ).toBe(scenario.recommendation === "approve" && scenario.handler === "registered");
+                progress.phase = "read-pending-requests";
+                expect(
+                    (await session.rpc.permissions.pendingRequests()).items,
+                    JSON.stringify(scenario)
+                ).toEqual([]);
+                expect(taskOutcomes, JSON.stringify(scenario)).toHaveLength(1);
+                expect(taskOutcomes[0]?.success, JSON.stringify(scenario)).toBe(
+                    scenario.recommendation !== "excluded" && scenario.handler === "registered"
+                );
+                if (scenario.handler === "none") {
+                    expect(taskOutcomes[0], JSON.stringify(scenario)).toMatchObject({
+                        outcome: "continue",
+                        reason: "Autopilot is still recovering from a required permission.",
+                    });
+                }
+            } finally {
+                if (session) {
+                    progress.phase = "abort-session";
+                    await session.abort();
+                    progress.phase = "disconnect-session";
+                    await session.disconnect();
+                }
+            }
+        }
+
+        progress.phase = "assert-recovery-totals";
+        expect(providerFailures).toEqual([]);
+        expect(judgeOutputs.slice(contractJudgeStart)).toEqual([
+            JUDGE_OUTPUT,
+            HUMAN_REVIEW_OUTPUT,
+            JUDGE_OUTPUT,
+            HUMAN_REVIEW_OUTPUT,
+            HUMAN_REVIEW_OUTPUT,
+        ]);
+        progress.phase = "complete";
+    });
+});
+
+async function configureAssistedAutopilot(session: CopilotSession, workDir: string): Promise<void> {
+    await session.rpc.permissions.folderTrust.addTrusted({ path: workDir });
+    await session.rpc.permissions.configure({
+        approveAllToolPermissionRequests: false,
+        approveAllReadPermissionRequests: false,
+        rules: { approved: [], denied: [] },
+        paths: {
+            workspacePath: workDir,
+            additionalDirectories: [],
+            unrestricted: false,
+            includeTempDirectory: false,
+        },
+    });
+    await session.rpc.permissions.setMode({
+        mode: "assisted",
+        assistedApprovalModel: "local/gpt-6-luna",
+        source: "rpc",
+    });
+    await session.rpc.mode.set({ mode: "autopilot" });
+}
+
+async function expectAssistedAutopilotConfigured(
+    session: CopilotSession,
+    workDir: string
+): Promise<void> {
+    expect(await session.rpc.mode.get()).toBe("autopilot");
+    expect(await session.rpc.permissions.getMode()).toMatchObject({ mode: "assisted" });
+    expect((await session.rpc.permissions.folderTrust.isTrusted({ path: workDir })).trusted).toBe(
+        true
+    );
+    expect((await session.rpc.permissions.paths.list()).primary).toBe(await realpath(workDir));
+}
diff --git a/nodejs/test/e2e/auto_fusion_routing.e2e.test.ts b/nodejs/test/e2e/auto_fusion_routing.e2e.test.ts
new file mode 100644
index 0000000000..798b450028
--- /dev/null
+++ b/nodejs/test/e2e/auto_fusion_routing.e2e.test.ts
@@ -0,0 +1,904 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { beforeEach, describe, expect, it, onTestFailed } from "vitest";
+import { approveAll, CopilotRequestHandler, type SessionEvent } from "../../src/index.js";
+import { createSdkTestContext, DEFAULT_GITHUB_TOKEN } from "./harness/sdkTestContext.js";
+import { isByokBackend } from "./harness/testBackend.js";
+
+const MODEL = "gpt-5.6-sol";
+const REPLY = "AUTO_FUSION_EXECUTION_DONE";
+
+class AutoFusionRequestHandler extends CopilotRequestHandler {
+    readonly plans: Record<string, unknown>[] = [];
+    readonly auto: Record<string, unknown>[] = [];
+    readonly inference: Record<string, unknown>[] = [];
+    failRoute = false;
+    disabled = false;
+    constituentsEnabled = true;
+    inferenceGate?: {
+        entered: ReturnType<typeof Promise.withResolvers<void>>;
+        release: ReturnType<typeof Promise.withResolvers<void>>;
+    };
+
+    constructor(
+        private readonly planVersion: "1" | "2",
+        private readonly executionModel = MODEL
+    ) {
+        super();
+    }
+
+    protected override async sendRequest(request: Request): Promise<Response> {
+        const path = new URL(request.url).pathname;
+        const models = {
+            data: [...new Set([MODEL, this.executionModel])].map((id) => ({
+                id,
+                name: id,
+                model_picker_enabled: this.constituentsEnabled,
+                policy: { state: this.constituentsEnabled ? "enabled" : "disabled" },
+                supported_endpoints: ["/chat/completions"],
+                capabilities: {
+                    supports: { streaming: true, tool_calls: true, vision: true },
+                    limits: {
+                        max_prompt_tokens: 128000,
+                        max_output_tokens: 16384,
+                        max_context_window_tokens: 144384,
+                    },
+                },
+            })),
+        };
+        if (path === "/models") return Response.json(models);
+        if (path === "/meta") {
+            return Response.json({
+                models,
+                auto: {
+                    default_tier: "Balance-V2",
+                    tiers: [
+                        {
+                            id: "Balance-V2",
+                            display_name: "Balance",
+                            description: "",
+                            type: "auto",
+                            status: { enabled: true },
+                        },
+                        {
+                            id: "Other-V2",
+                            display_name: "Ordinary Auto",
+                            description: "",
+                            type: "auto",
+                            status: { enabled: !this.disabled, message: "Contact admin" },
+                        },
+                        ...["hydrafusion", "hydrafusion-max"].map((id) => ({
+                            id,
+                            display_name: id,
+                            description: "",
+                            type: "fusion",
+                            status: { enabled: !this.disabled, message: "Contact admin" },
+                        })),
+                        {
+                            id: "future-fusion",
+                            display_name: "Future",
+                            description: "",
+                            type: "fusion",
+                            status: { enabled: true },
+                        },
+                        {
+                            id: "future-type",
+                            display_name: "Unknown",
+                            description: "",
+                            type: "ensemble",
+                            status: { enabled: true },
+                        },
+                    ],
+                },
+            });
+        }
+        if (path === "/model/fusion") {
+            const body = (await request.json()) as Record<string, unknown>;
+            this.plans.push(body);
+            if (this.failRoute)
+                return Response.json({ message: "Route unavailable" }, { status: 500 });
+            return Response.json({
+                fusion_mode: body.fusion_mode,
+                fusion_pattern: "solo",
+                plan_version: this.planVersion,
+                steps: [{ role: "generation", model_id: this.executionModel }],
+                session: { token: "jwt.fake.auto.fusion.plan", expires_at: 0 },
+            });
+        }
+        if (path === "/auto") {
+            this.auto.push((await request.json()) as Record<string, unknown>);
+            return Response.json({
+                selected_model: models.data[0],
+                session_token: "jwt.fake.auto.fusion.reset",
+                expires_at: Math.floor(Date.now() / 1000) + 3600,
+            });
+        }
+        if (path === "/chat/completions") {
+            const body = (await request.json()) as Record<string, unknown>;
+            this.inference.push(body);
+            const gate = this.inferenceGate;
+            if (gate) {
+                gate.entered.resolve();
+                await gate.release.promise;
+            }
+            if (body.model !== MODEL && body.model !== this.executionModel)
+                throw new Error(`Synthetic model escaped to inference: ${body.model}`);
+            const completion = {
+                id: "chatcmpl-auto-fusion",
+                object: "chat.completion",
+                created: 0,
+                model: body.model,
+                choices: [
+                    {
+                        index: 0,
+                        message: { role: "assistant", content: REPLY },
+                        finish_reason: "stop",
+                    },
+                ],
+                usage: { prompt_tokens: 11, completion_tokens: 7, total_tokens: 18 },
+            };
+            if (!body.stream) return Response.json(completion);
+            return new Response(
+                `data: ${JSON.stringify({
+                    ...completion,
+                    object: "chat.completion.chunk",
+                    choices: [
+                        {
+                            index: 0,
+                            delta: { role: "assistant", content: REPLY },
+                            finish_reason: "stop",
+                        },
+                    ],
+                })}\n\ndata: [DONE]\n\n`,
+                { headers: { "content-type": "text/event-stream" } }
+            );
+        }
+        throw new Error(`Unexpected routing request: ${request.method} ${path}`);
+    }
+}
+
+describe.skipIf(isByokBackend).each([
+    { mode: "hydrafusion", version: "1" as const },
+    { mode: "hydrafusion", version: "2" as const },
+    { mode: "hydrafusion-max", version: "2" as const },
+])("Metadata Auto execution: $mode v$version", async ({ mode, version }) => {
+    const executionModel = mode === "hydrafusion" ? "claude-sonnet-5" : MODEL;
+    const handler = new AutoFusionRequestHandler(version, executionModel);
+    const {
+        copilotClient: client,
+        createClient,
+        workDir,
+    } = await createSdkTestContext({
+        useStdio: true,
+        copilotClientOptions: {
+            gitHubToken: DEFAULT_GITHUB_TOKEN,
+            requestHandler: handler,
+            env: {
+                DYNAMIC_AUTO_TIERS: "false",
+                COPILOT_EXP_COPILOT_CLI_DYNAMIC_AUTO_TIERS: "false",
+                HYDRAFUSION: "false",
+                HYDRAFUSION_ROLLOUT: "false",
+                COPILOT_EXP_COPILOT_CLI_HYDRAFUSION_ROLLOUT: "false",
+                HYDRAFUSION_PLAN_V2: String(version === "2"),
+                COPILOT_EXP_COPILOT_CLI_HYDRAFUSION_PLAN_V2: String(version === "2"),
+            },
+        },
+    });
+    const config = {
+        model: "auto",
+        workingDirectory: workDir,
+        expAssignments: {
+            Features: [],
+            Flights: {},
+            Configs: [{ Id: "default", Parameters: { copilot_cli_dynamic_auto_tiers: true } }],
+            AssignmentContext: "metadata-fusion-treatment",
+        },
+        capi: { enableWebSocketResponses: false },
+        onPermissionRequest: approveAll,
+    };
+    beforeEach(() => {
+        handler.plans.length = 0;
+        handler.auto.length = 0;
+        handler.inference.length = 0;
+        handler.failRoute = false;
+        handler.disabled = false;
+        handler.constituentsEnabled = true;
+        handler.inferenceGate = undefined;
+    });
+
+    it("routes only the selected preference, commits it, resumes cold and resets to Auto", async () => {
+        const diagnosticStart = performance.now();
+        const phases: { phase: string; elapsedMs: number }[] = [];
+        const markPhase = (phase: string) =>
+            phases.push({ phase, elapsedMs: Math.round(performance.now() - diagnosticStart) });
+        onTestFailed(() => {
+            process.stderr.write(
+                `${JSON.stringify({
+                    test: "metadata Auto create/resume/reset",
+                    mode,
+                    version,
+                    phases,
+                    planCount: handler.plans.length,
+                    autoCount: handler.auto.length,
+                    inferenceCount: handler.inference.length,
+                })}\n`
+            );
+        });
+        markPhase("creating session");
+        const session = await client.createSession(config);
+        markPhase("listing models");
+        const catalog = await session.rpc.model.list();
+        expect(catalog.auto?.tiers.some((tier) => tier.id === mode)).toBe(true);
+        expect(
+            catalog.list.some(
+                (model) =>
+                    typeof model === "object" &&
+                    model !== null &&
+                    "id" in model &&
+                    typeof model.id === "string" &&
+                    model.id.startsWith("hydrafusion")
+            )
+        ).toBe(false);
+        expect(handler.plans).toEqual([]);
+        await expect(session.setAutoTier("future-fusion")).rejects.toThrow("unsupported execution");
+        await expect(session.setAutoTier("future-type")).rejects.toThrow("unsupported execution");
+        await expect(session.setAutoTier("HydraFusion")).rejects.toThrow("unavailable");
+        const pending = await session.setAutoTier(mode);
+        markPhase("first turn");
+        expect(pending.pendingAutoTier).toBe(mode);
+        expect((await session.rpc.model.getCurrent()).autoTier).toBeUndefined();
+        const events: SessionEvent[] = [];
+        session.on((event) => events.push(event));
+        expect(
+            (
+                await session.sendAndWait({
+                    prompt: "What is the chemical symbol for gold? Do not use tools.",
+                })
+            )?.data.content
+        ).toBe(REPLY);
+        expect(handler.plans).toEqual([
+            expect.objectContaining({
+                fusion_mode: mode,
+                ...(version === "2" ? { plan_version: version } : {}),
+            }),
+        ]);
+        if (version === "1") expect(handler.plans[0]).not.toHaveProperty("plan_version");
+        expect(handler.auto).toEqual([]);
+        expect(events.some((event) => event.type === "session.fusion_route_failed")).toBe(false);
+        expect(events).toEqual(
+            expect.arrayContaining([
+                expect.objectContaining({
+                    type: "session.fusion_completed",
+                    data: expect.objectContaining({ syntheticModel: mode }),
+                }),
+            ])
+        );
+        expect(events).toEqual(
+            expect.arrayContaining([
+                expect.objectContaining({
+                    type: "session.fusion_resolved",
+                    data: expect.objectContaining({
+                        syntheticModel: mode,
+                        policy: mode === "hydrafusion" ? "standard" : "max",
+                        primaryModel: executionModel,
+                    }),
+                }),
+            ])
+        );
+        expect(await session.rpc.model.getCurrent()).toMatchObject({
+            modelId: "auto",
+            autoTier: mode,
+        });
+        const sessionId = session.sessionId;
+        markPhase("cold client shutdown");
+        await session.disconnect();
+        await client.stop();
+        const coldClient = createClient({ requestHandler: handler });
+        try {
+            markPhase("cold resume");
+            const resumed = await coldClient.resumeSession(sessionId, config);
+            markPhase("cold structured-output admission");
+            expect(await resumed.rpc.model.getCurrent()).toMatchObject({
+                modelId: "auto",
+                autoTier: mode,
+            });
+            await expect(
+                resumed.sendAndWait({
+                    prompt: "Return a structured chemical symbol before the resumed turn.",
+                    responseSchema: { type: "object", properties: { symbol: { type: "string" } } },
+                })
+            ).rejects.toThrow("responseFormat is not supported");
+            expect(handler.plans).toHaveLength(1);
+
+            markPhase("resumed turn");
+            expect(
+                (
+                    await resumed.sendAndWait({
+                        prompt: "What is the chemical symbol for silver? Do not use tools.",
+                    })
+                )?.data.content
+            ).toBe(REPLY);
+            expect(handler.plans).toHaveLength(2);
+            markPhase("switch concrete then auto");
+            await resumed.setModel(MODEL);
+            expect((await resumed.rpc.model.getCurrent()).autoTier).toBe(mode);
+            await resumed.setModel("auto");
+            expect(
+                (
+                    await resumed.sendAndWait({
+                        prompt: "Name the chemical symbol for iron. Do not use tools.",
+                    })
+                )?.data.content
+            ).toBe(REPLY);
+            expect(handler.plans).toHaveLength(3);
+            markPhase("switch ordinary auto");
+            await resumed.setModel("auto", { autoTier: "Balance-V2" });
+            expect((await resumed.rpc.model.getCurrent()).autoTier).toBe(mode);
+            expect(
+                (
+                    await resumed.sendAndWait({
+                        prompt: "What is the chemical symbol for copper? Do not use tools.",
+                    })
+                )?.data.content
+            ).toBe(REPLY);
+            expect(handler.plans).toHaveLength(3);
+            expect(handler.auto.at(-1)).toMatchObject({ tier: "Balance-V2" });
+            expect(await resumed.rpc.model.getCurrent()).toMatchObject({
+                modelId: "auto",
+                autoTier: "Balance-V2",
+            });
+            await resumed.setAutoTier(null);
+            markPhase("reset turn");
+            expect(
+                (
+                    await resumed.sendAndWait({
+                        prompt: "Name the chemical symbol for lead. Do not use tools.",
+                    })
+                )?.data.content
+            ).toBe(REPLY);
+            expect((await resumed.rpc.model.getCurrent()).autoTier).toBeUndefined();
+            expect(handler.plans).toHaveLength(3);
+            await resumed.disconnect();
+        } finally {
+            markPhase("cold client cleanup");
+            await coldClient.stop();
+        }
+        markPhase("complete");
+    });
+
+    it("executes explicit create and atomic Auto selection without rewriting the logical model", async () => {
+        const created = await client.createSession({
+            ...config,
+            capi: { ...config.capi, autoTier: mode },
+        });
+        expect(
+            (
+                await created.sendAndWait({
+                    prompt: "Name the chemical symbol for gold. Do not use tools.",
+                })
+            )?.data.content
+        ).toBe(REPLY);
+        expect(await created.rpc.model.getCurrent()).toMatchObject({
+            modelId: "auto",
+            autoTier: mode,
+        });
+        await created.disconnect();
+        const switched = await client.createSession({ ...config, model: MODEL });
+        await switched.setModel("auto", { autoTier: mode });
+        expect((await switched.rpc.model.getCurrent()).pendingAutoTier).toBe(mode);
+        expect(
+            (
+                await switched.sendAndWait({
+                    prompt: "Name the chemical symbol for silver. Do not use tools.",
+                })
+            )?.data.content
+        ).toBe(REPLY);
+        expect(await switched.rpc.model.getCurrent()).toMatchObject({
+            modelId: "auto",
+            autoTier: mode,
+        });
+        expect(handler.plans).toHaveLength(2);
+        expect(
+            handler.plans.every(
+                (plan) =>
+                    plan.fusion_mode === mode &&
+                    plan.plan_version === (version === "2" ? version : undefined)
+            )
+        ).toBe(true);
+        expect(handler.auto).toEqual([]);
+        await switched.disconnect();
+    });
+
+    it("retains typed Fusion route-failure fallback and commits only the concrete response", async () => {
+        handler.failRoute = true;
+        const session = await client.createSession(config);
+        await session.setAutoTier(mode);
+        const events: SessionEvent[] = [];
+        session.on((event) => events.push(event));
+        expect(
+            (
+                await session.sendAndWait({
+                    prompt: "What is the chemical symbol for gold? Do not use tools.",
+                })
+            )?.data.content
+        ).toBe(REPLY);
+        expect(events.some((event) => event.type === "session.fusion_route_failed")).toBe(true);
+        expect(events.filter((event) => event.type === "assistant.message")).toHaveLength(1);
+        expect(await session.rpc.model.getCurrent()).toMatchObject({
+            modelId: "auto",
+            autoTier: mode,
+        });
+        expect(handler.plans).toHaveLength(1);
+        expect(handler.auto).toEqual([]);
+        await session.disconnect();
+    });
+
+    it("applies reasoning-effort constraints consistently to dedicated Fusion setters", async () => {
+        const session = await client.createSession(config);
+        await session.rpc.model.setReasoningEffort({ reasoningEffort: "high" });
+        await expect(session.setAutoTier(mode)).rejects.toThrow("do not support reasoning effort");
+        expect((await session.rpc.model.getCurrent()).reasoningEffort).toBe("high");
+        expect((await session.rpc.model.getCurrent()).pendingAutoTier).toBeUndefined();
+        await session.rpc.model.setReasoningEffort({ reasoningEffort: "none" });
+        await session.setAutoTier(mode);
+        await expect(
+            session.rpc.model.setReasoningEffort({ reasoningEffort: "high" })
+        ).rejects.toThrow("do not support reasoning effort");
+        await session.rpc.model.setReasoningEffort({ reasoningEffort: "none" });
+        await session.setAutoTier(null);
+        await session.rpc.model.setReasoningEffort({ reasoningEffort: "high" });
+        expect((await session.rpc.model.getCurrent()).reasoningEffort).toBe("high");
+        await session.disconnect();
+    });
+
+    it("retains the staged Fusion preference when the first inference is cancelled", async () => {
+        const session = await client.createSession({
+            ...config,
+            capi: { ...config.capi, autoTier: "Balance-V2" },
+        });
+        const events: SessionEvent[] = [];
+        session.on((event) => events.push(event));
+        await session.setAutoTier(mode);
+        const gate = {
+            entered: Promise.withResolvers<void>(),
+            release: Promise.withResolvers<void>(),
+        };
+        handler.inferenceGate = gate;
+        const turn = session
+            .sendAndWait({
+                prompt: "What is the chemical symbol for gold? Do not use tools.",
+            })
+            .then(
+                (reply) => ({ reply, error: undefined }),
+                (error: Error) => ({ reply: undefined, error })
+            );
+        try {
+            await gate.entered.promise;
+            expect((await session.rpc.model.getCurrent()).activatingAutoTier).toBe(mode);
+            await session.abort();
+        } finally {
+            gate.release.resolve();
+            handler.inferenceGate = undefined;
+        }
+        await turn;
+        expect(await session.rpc.model.getCurrent()).toMatchObject({
+            modelId: "auto",
+            autoTier: "Balance-V2",
+            pendingAutoTier: mode,
+        });
+        expect((await session.rpc.model.getCurrent()).activatingAutoTier).toBeUndefined();
+        expect(events.some((event) => event.type === "session.auto_tier_switch_failed")).toBe(
+            false
+        );
+        expect(
+            (
+                await session.sendAndWait({
+                    prompt: "What is the chemical symbol for silver? Do not use tools.",
+                })
+            )?.data.content
+        ).toBe(REPLY);
+        expect(handler.plans).toHaveLength(2);
+        expect(handler.auto).toEqual([]);
+        expect(await session.rpc.model.getCurrent()).toMatchObject({
+            modelId: "auto",
+            autoTier: mode,
+        });
+        await session.disconnect();
+    });
+
+    it.each(["fusion", "auto"] as const)(
+        "settles an invalidated pending %s preference once and preserves the incumbent",
+        async (execution) => {
+            await client.stop();
+            const session = await client.createSession({
+                ...config,
+                capi: { ...config.capi, autoTier: "Balance-V2" },
+            });
+            const events: SessionEvent[] = [];
+            session.on((event) => events.push(event));
+            const requested = execution === "fusion" ? mode : "Other-V2";
+            await session.setAutoTier(requested);
+            expect((await session.rpc.model.getCurrent()).pendingAutoTier).toBe(requested);
+            handler.disabled = true;
+            await session.rpc.model.list({ skipCache: true });
+            await session
+                .sendAndWait({
+                    prompt: "What is the chemical symbol for gold? Do not use tools.",
+                })
+                .then(
+                    (reply) => expect(reply?.data.content).toBe(REPLY),
+                    (error: unknown) => {
+                        expect(error).toBeInstanceOf(Error);
+                        expect((error as Error).message).toContain("Contact admin");
+                    }
+                );
+            const current = await session.rpc.model.getCurrent();
+            expect(current.autoTier).toBe("Balance-V2");
+            expect(current.pendingAutoTier).toBeUndefined();
+            expect(current.activatingAutoTier).toBeUndefined();
+            expect(
+                events.filter((event) => event.type === "session.auto_tier_switch_failed")
+            ).toEqual([
+                expect.objectContaining({
+                    data: expect.objectContaining({
+                        requestedAutoTier: requested,
+                        effectiveAutoTier: "Balance-V2",
+                        reason: "unsupported",
+                    }),
+                }),
+            ]);
+            expect(
+                (
+                    await session.sendAndWait({
+                        prompt: "What is the chemical symbol for silver? Do not use tools.",
+                    })
+                )?.data.content
+            ).toBe(REPLY);
+            expect(handler.plans).toEqual([]);
+            expect(handler.auto.every((body) => body.tier === "Balance-V2")).toBe(true);
+            expect(
+                events.filter((event) => event.type === "session.auto_tier_switch_failed")
+            ).toHaveLength(1);
+            await session.disconnect();
+        }
+    );
+
+    it("reports setup failure after claiming Fusion and clears only the failed request", async () => {
+        await client.stop();
+        const session = await client.createSession({
+            ...config,
+            capi: { ...config.capi, autoTier: "Balance-V2" },
+        });
+        const events: SessionEvent[] = [];
+        const failedTurnIdle = Promise.withResolvers<void>();
+        let failureObserved = false;
+        session.on((event) => {
+            events.push(event);
+            if (event.type === "session.error") failureObserved = true;
+            if (event.type === "session.idle" && failureObserved) failedTurnIdle.resolve();
+        });
+        await session.setAutoTier(mode);
+        handler.constituentsEnabled = false;
+        await session.rpc.model.list({ skipCache: true });
+        await expect(
+            session.sendAndWait({
+                prompt: "What is the chemical symbol for gold? Do not use tools.",
+            })
+        ).rejects.toThrow("no executable constituent");
+        // sendAndWait rejects on session.error before that failed turn's idle tail settles.
+        await failedTurnIdle.promise;
+        // Host-forwarded error/idle can overtake this event's recorded-stream delivery.
+        await expect
+            .poll(() => events.filter((event) => event.type === "session.auto_tier_switch_failed"))
+            .toEqual([
+                expect.objectContaining({
+                    data: expect.objectContaining({
+                        requestedAutoTier: mode,
+                        effectiveAutoTier: "Balance-V2",
+                        reason: "setup_failed",
+                    }),
+                }),
+            ]);
+        expect(await session.rpc.model.getCurrent()).toMatchObject({
+            modelId: "auto",
+            autoTier: "Balance-V2",
+        });
+        expect((await session.rpc.model.getCurrent()).pendingAutoTier).toBeUndefined();
+        expect((await session.rpc.model.getCurrent()).activatingAutoTier).toBeUndefined();
+        expect(handler.plans).toEqual([]);
+        expect(handler.inference).toEqual([]);
+        handler.constituentsEnabled = true;
+        await session.rpc.model.list({ skipCache: true });
+        expect(
+            (
+                await session.sendAndWait({
+                    prompt: "What is the chemical symbol for silver? Do not use tools.",
+                })
+            )?.data.content
+        ).toBe(REPLY);
+        expect(handler.plans).toEqual([]);
+        expect(
+            events.filter((event) => event.type === "session.auto_tier_switch_failed")
+        ).toHaveLength(1);
+        await session.disconnect();
+    });
+
+    it("rejects unsupported context and structured output before Fusion activation", async () => {
+        const session = await client.createSession(config);
+        await expect(
+            session.rpc.model.switchTo({
+                modelId: "auto",
+                autoTier: mode,
+                contextTier: "long",
+            })
+        ).rejects.toThrow("do not support context tiers");
+        expect((await session.rpc.model.getCurrent()).autoTier).toBeUndefined();
+        await session.setAutoTier(mode);
+        await expect(
+            session.sendAndWait({
+                prompt: "Return the chemical symbol for gold as structured JSON.",
+                responseSchema: {
+                    type: "object",
+                    properties: { symbol: { type: "string" } },
+                    required: ["symbol"],
+                    additionalProperties: false,
+                },
+            })
+        ).rejects.toThrow("responseFormat is not supported");
+        expect(await session.rpc.model.getCurrent()).toMatchObject({
+            modelId: "auto",
+            pendingAutoTier: mode,
+        });
+        expect((await session.rpc.model.getCurrent()).autoTier).toBeUndefined();
+        expect(handler.plans).toEqual([]);
+        expect(handler.auto).toEqual([]);
+        expect(handler.inference).toEqual([]);
+        expect((await session.rpc.queue.pendingItems()).items).toEqual([]);
+        expect(
+            (await session.getEvents()).filter(
+                (event) => event.type === "user.message" || event.type === "session.error"
+            )
+        ).toEqual([]);
+        await session.disconnect();
+    });
+});
+
+describe.skipIf(isByokBackend).each(["1", "2"] as const)(
+    "Manual HydraFusion plan-version control: %s",
+    async (version) => {
+        const handler = new AutoFusionRequestHandler(version);
+        const { copilotClient: client, workDir } = await createSdkTestContext({
+            useStdio: true,
+            copilotClientOptions: {
+                gitHubToken: DEFAULT_GITHUB_TOKEN,
+                requestHandler: handler,
+                env: {
+                    DYNAMIC_AUTO_TIERS: "false",
+                    COPILOT_EXP_COPILOT_CLI_DYNAMIC_AUTO_TIERS: "false",
+                    HYDRAFUSION: "true",
+                    HYDRAFUSION_ROLLOUT: "true",
+                    HYDRAFUSION_PLAN_V2: String(version === "2"),
+                    COPILOT_EXP_COPILOT_CLI_HYDRAFUSION_PLAN_V2: String(version === "2"),
+                },
+            },
+        });
+        it("retains the manual v1 Max and v2 Standard execution mapping", async () => {
+            const session = await client.createSession({
+                model: "hydrafusion",
+                enableExperimentalMode: true,
+                workingDirectory: workDir,
+                capi: { enableWebSocketResponses: false },
+                onPermissionRequest: approveAll,
+            });
+            const events: SessionEvent[] = [];
+            session.on((event) => events.push(event));
+            expect(
+                (
+                    await session.sendAndWait({
+                        prompt: "What is the chemical symbol for gold? Do not use tools.",
+                    })
+                )?.data.content
+            ).toBe(REPLY);
+            expect(handler.plans).toEqual([
+                expect.objectContaining({
+                    fusion_mode: version === "1" ? "hydrafusion-max" : "hydrafusion",
+                    ...(version === "2" ? { plan_version: "2" } : {}),
+                }),
+            ]);
+            expect(events).toEqual(
+                expect.arrayContaining([
+                    expect.objectContaining({
+                        type: "session.fusion_resolved",
+                        data: expect.objectContaining({
+                            policy: version === "1" ? "max" : "standard",
+                        }),
+                    }),
+                ])
+            );
+            expect(events.some((event) => event.type === "session.fusion_route_failed")).toBe(
+                false
+            );
+            expect((await session.rpc.model.getCurrent()).modelId).toBe("hydrafusion");
+            await session.disconnect();
+        });
+
+        if (version === "1") {
+            it("routes metadata Standard independently of manual Max history and resumes same-policy reuse", async () => {
+                const planStart = handler.plans.length;
+                const config = {
+                    model: "hydrafusion",
+                    enableExperimentalMode: true,
+                    workingDirectory: workDir,
+                    capi: { enableWebSocketResponses: false },
+                    onPermissionRequest: approveAll,
+                    expAssignments: {
+                        Features: [],
+                        Flights: {},
+                        Configs: [
+                            {
+                                Id: "default",
+                                Parameters: {
+                                    copilot_cli_dynamic_auto_tiers: true,
+                                    copilot_cli_hydrafusion_turn_policy: "initial_only",
+                                },
+                            },
+                        ],
+                        AssignmentContext: "policy-scoped-fusion-history",
+                    },
+                };
+                const session = await client.createSession(config);
+                const events: SessionEvent[] = [];
+                session.on((event) => events.push(event));
+                expect(
+                    (
+                        await session.sendAndWait({
+                            prompt: "Name the chemical symbol for gold. Do not use tools.",
+                        })
+                    )?.data.content
+                ).toBe(REPLY);
+                expect(handler.plans.slice(planStart)).toEqual([
+                    expect.objectContaining({ fusion_mode: "hydrafusion-max" }),
+                ]);
+                await session.setModel("auto", { autoTier: "hydrafusion" });
+                expect(
+                    (
+                        await session.sendAndWait({
+                            prompt: "Name the chemical symbol for silver. Do not use tools.",
+                        })
+                    )?.data.content
+                ).toBe(REPLY);
+                expect(handler.plans.slice(planStart)).toEqual([
+                    expect.objectContaining({ fusion_mode: "hydrafusion-max" }),
+                    expect.objectContaining({ fusion_mode: "hydrafusion" }),
+                ]);
+                expect(
+                    events
+                        .filter((event) => event.type === "session.fusion_resolved")
+                        .map((event) => event.data.policy)
+                ).toEqual(["max", "standard"]);
+                expect(await session.rpc.model.getCurrent()).toMatchObject({
+                    modelId: "auto",
+                    autoTier: "hydrafusion",
+                });
+                const sessionId = session.sessionId;
+                await session.disconnect();
+                await client.stop();
+                const resumed = await client.resumeSession(sessionId, {
+                    ...config,
+                    model: "auto",
+                });
+                expect(
+                    (
+                        await resumed.sendAndWait({
+                            prompt: "Name the chemical symbol for copper. Do not use tools.",
+                        })
+                    )?.data.content
+                ).toBe(REPLY);
+                expect(handler.plans.slice(planStart)).toHaveLength(2);
+                expect(await resumed.rpc.model.getCurrent()).toMatchObject({
+                    modelId: "auto",
+                    autoTier: "hydrafusion",
+                });
+                await resumed.disconnect();
+            });
+        }
+    }
+);
+
+describe.skipIf(isByokBackend)("Metadata Fusion rejection before activation", async () => {
+    const handler = new AutoFusionRequestHandler("1");
+    const { copilotClient: client, workDir } = await createSdkTestContext({
+        useStdio: true,
+        copilotClientOptions: {
+            gitHubToken: DEFAULT_GITHUB_TOKEN,
+            requestHandler: handler,
+            env: {
+                DYNAMIC_AUTO_TIERS: "true",
+                HYDRAFUSION_PLAN_V2: "false",
+                COPILOT_EXP_COPILOT_CLI_HYDRAFUSION_PLAN_V2: "false",
+            },
+        },
+    });
+
+    it("rejects Max with actionable plan-v2 guidance without changing incumbent or calling endpoints", async () => {
+        const config = {
+            model: "auto",
+            workingDirectory: workDir,
+            capi: { autoTier: "Balance-V2" },
+            onPermissionRequest: approveAll,
+        };
+        await expect(
+            client.createSession({ ...config, capi: { autoTier: "hydrafusion-max" } })
+        ).rejects.toThrow("HYDRAFUSION_PLAN_V2");
+        const session = await client.createSession(config);
+        await expect(session.setAutoTier("hydrafusion-max")).rejects.toThrow("HYDRAFUSION_PLAN_V2");
+        await expect(session.setModel("auto", { autoTier: "hydrafusion-max" })).rejects.toThrow(
+            "HYDRAFUSION_PLAN_V2"
+        );
+        expect(await session.rpc.model.getCurrent()).toMatchObject({
+            modelId: "auto",
+            autoTier: "Balance-V2",
+        });
+        expect((await session.rpc.model.getCurrent()).pendingAutoTier).toBeUndefined();
+        expect(handler.plans).toEqual([]);
+        expect(handler.auto).toEqual([]);
+        expect(handler.inference).toEqual([]);
+        handler.disabled = true;
+        await session.rpc.model.list({ skipCache: true });
+        await expect(session.setAutoTier("hydrafusion")).rejects.toThrow("Contact admin");
+        await expect(session.setAutoTier("Other-V2")).rejects.toThrow("Contact admin");
+        expect((await session.rpc.model.getCurrent()).autoTier).toBe("Balance-V2");
+        await session.disconnect();
+    });
+
+    it("does not settle pending Auto intent when structured-output admission rejects metadata", async () => {
+        await client.stop();
+        handler.disabled = false;
+        const session = await client.createSession({
+            model: "auto",
+            workingDirectory: workDir,
+            capi: { autoTier: "Balance-V2", enableWebSocketResponses: false },
+            onPermissionRequest: approveAll,
+        });
+        await session.setAutoTier("Other-V2");
+        handler.disabled = true;
+        await session.rpc.model.list({ skipCache: true });
+        const before = await session.getEvents();
+        await expect(
+            session.sendAndWait({
+                prompt: "Return the chemical symbol for gold as structured JSON.",
+                responseSchema: {
+                    type: "object",
+                    properties: { symbol: { type: "string" } },
+                },
+            })
+        ).rejects.toThrow("Contact admin");
+        expect(await session.rpc.model.getCurrent()).toMatchObject({
+            modelId: "auto",
+            autoTier: "Balance-V2",
+            pendingAutoTier: "Other-V2",
+        });
+        expect((await session.rpc.model.getCurrent()).activatingAutoTier).toBeUndefined();
+        expect((await session.rpc.queue.pendingItems()).items).toEqual([]);
+        expect(await session.getEvents()).toEqual(before);
+        expect(handler.plans).toEqual([]);
+        expect(handler.inference).toEqual([]);
+        handler.disabled = false;
+        await session.rpc.model.list({ skipCache: true });
+        expect(
+            (
+                await session.sendAndWait({
+                    prompt: "What is the chemical symbol for silver? Do not use tools.",
+                })
+            )?.data.content
+        ).toBe(REPLY);
+        expect(handler.auto.at(-1)).toMatchObject({ tier: "Other-V2" });
+        expect(await session.rpc.model.getCurrent()).toMatchObject({
+            modelId: "auto",
+            autoTier: "Other-V2",
+        });
+        await session.disconnect();
+    });
+});
diff --git a/nodejs/test/e2e/auto_tier.e2e.test.ts b/nodejs/test/e2e/auto_tier.e2e.test.ts
index 21401be17d..45d557a9ea 100644
--- a/nodejs/test/e2e/auto_tier.e2e.test.ts
+++ b/nodejs/test/e2e/auto_tier.e2e.test.ts
@@ -17,6 +17,21 @@ import { isByokBackend } from "./harness/testBackend";
 describe("Auto tier switching", async () => {
     const { copilotClient: client, createClient } = await createSdkTestContext();
 
+    it("rejects new tier activation while dynamic discovery is disabled", async () => {
+        const session = await client.createSession({
+            onPermissionRequest: approveAll,
+            model: "auto",
+            capi: { autoTier: "balance" },
+        });
+        await expect(session.setAutoTier("premium-v2")).rejects.toThrow(
+            "requires dynamic Auto tiers"
+        );
+        const current = await session.rpc.model.getCurrent();
+        expect(current.autoTier).toBe("balance");
+        expect(current.pendingAutoTier).toBeUndefined();
+        await session.disconnect();
+    });
+
     it("should stage and reset auto tier preference", async () => {
         const session = await client.createSession({
             onPermissionRequest: approveAll,
diff --git a/nodejs/test/e2e/autopilot_assisted_permissions.e2e.test.ts b/nodejs/test/e2e/autopilot_assisted_permissions.e2e.test.ts
new file mode 100644
index 0000000000..5892a081c4
--- /dev/null
+++ b/nodejs/test/e2e/autopilot_assisted_permissions.e2e.test.ts
@@ -0,0 +1,423 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { existsSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { randomUUID } from "node:crypto";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { beforeEach, describe, expect, it, onTestFailed } from "vitest";
+import {
+    CopilotRequestHandler,
+    type CopilotRequestContext,
+    type PermissionRequest,
+    type SessionEvent,
+} from "../../src/index.js";
+import { createSdkTestContext } from "./harness/sdkTestContext.js";
+import { getNextEventOfType } from "./harness/sdkTestHelper.js";
+import { isByokBackend } from "./harness/testBackend.js";
+
+const MODEL = "claude-sonnet-5";
+const COMPLETION = "SDK_ASSISTED_TURN_FINISHED";
+
+class AssistedPermissionRequestHandler extends CopilotRequestHandler {
+    judgeCalls = 0;
+    requiresApproval = false;
+    directoryName = "";
+    viewPaths: string[] = [];
+
+    protected override async sendRequest(
+        request: Request,
+        context: CopilotRequestContext
+    ): Promise<Response> {
+        const url = new URL(request.url);
+        if (url.pathname.endsWith("/models")) {
+            return Response.json({
+                data: [
+                    {
+                        id: MODEL,
+                        name: MODEL,
+                        vendor: "Anthropic",
+                        model_picker_enabled: true,
+                        supported_endpoints: ["/chat/completions"],
+                        capabilities: {
+                            type: "chat",
+                            family: MODEL,
+                            tokenizer: "o200k_base",
+                            limits: { max_context_window_tokens: 128000, max_output_tokens: 8192 },
+                            supports: { streaming: true, tool_calls: true, vision: false },
+                        },
+                    },
+                ],
+            });
+        }
+        if (!url.pathname.endsWith("/chat/completions")) {
+            return super.sendRequest(request, context);
+        }
+        const body: {
+            messages: { role: string; content: unknown }[];
+            tools?: { function: { name: string } }[];
+            stream?: boolean;
+        } = await request.json();
+        const isJudge = JSON.stringify(body.messages).includes("exactly one line");
+        let message: object;
+        if (isJudge) {
+            this.judgeCalls++;
+            message = {
+                role: "assistant",
+                content: this.requiresApproval
+                    ? "REQUIRE_APPROVAL: A person must approve this action."
+                    : "ALLOW: The action creates a workspace-local fixture.",
+            };
+        } else if (
+            JSON.stringify(body.messages.findLast((message) => message.role === "user"))?.includes(
+                "ASSISTED_SETUP_ONLY"
+            )
+        ) {
+            message = { role: "assistant", content: "SDK_ASSISTED_SETUP_READY" };
+        } else if (body.messages.some((message) => message.role === "tool")) {
+            message = {
+                role: "assistant",
+                content: COMPLETION,
+                tool_calls: [
+                    {
+                        id: "finish-task",
+                        type: "function",
+                        function: {
+                            name: "task_complete",
+                            arguments: JSON.stringify({ summary: COMPLETION }),
+                        },
+                    },
+                ],
+            };
+        } else if (this.viewPaths.length > 0) {
+            message = {
+                role: "assistant",
+                content: "",
+                tool_calls: this.viewPaths.map((path, index) => ({
+                    id: `assisted-view-${index}`,
+                    type: "function",
+                    function: { name: "view", arguments: JSON.stringify({ path }) },
+                })),
+            };
+        } else {
+            const shell = body.tools?.find((tool) =>
+                ["bash", "powershell"].includes(tool.function.name)
+            )?.function.name;
+            if (!shell) {
+                throw new Error("The runtime did not offer a shell tool");
+            }
+            message = {
+                role: "assistant",
+                content: "",
+                tool_calls: [
+                    {
+                        id: `assisted-shell-${body.messages.filter((message) => message.role === "tool").length}`,
+                        type: "function",
+                        function: {
+                            name: shell,
+                            arguments: JSON.stringify({
+                                command: `mkdir ${this.directoryName}`,
+                                description: "Create a fixture directory",
+                                initial_wait: 30,
+                            }),
+                        },
+                    },
+                ],
+            };
+        }
+        const finishReason = "tool_calls" in message ? "tool_calls" : "stop";
+        const completion = {
+            id: "assisted-completion",
+            model: MODEL,
+            created: 1,
+            choices: [
+                {
+                    index: 0,
+                    ...(body.stream ? { delta: message } : { message }),
+                    finish_reason: finishReason,
+                },
+            ],
+            usage: { prompt_tokens: 10, completion_tokens: 10, total_tokens: 20 },
+        };
+        return new Response(
+            body.stream
+                ? `data: ${JSON.stringify({ ...completion, object: "chat.completion.chunk" })}\n\ndata: [DONE]\n\n`
+                : JSON.stringify({ ...completion, object: "chat.completion" }),
+            {
+                headers: { "content-type": body.stream ? "text/event-stream" : "application/json" },
+            }
+        );
+    }
+}
+
+// Assisted uses a CAPI judge; this suite owns its deterministic model responses.
+describe.skipIf(isByokBackend)("Autopilot Assisted SDK permissions", async () => {
+    const handler = new AssistedPermissionRequestHandler();
+    const { copilotClient: client, workDir } = await createSdkTestContext({
+        // CAPI model turns are not supported by the current in-process test transport.
+        useStdio: true,
+        copilotClientOptions: { requestHandler: handler },
+    });
+    beforeEach(() => {
+        handler.judgeCalls = 0;
+        handler.requiresApproval = false;
+        handler.directoryName = `assisted-result-${randomUUID()}`;
+        handler.viewPaths = [];
+    });
+
+    it("settles a parallel batch of judged reads", async () => {
+        const outsideDirectory = mkdtempSync(join(tmpdir(), "assisted-parallel-views-"));
+        handler.viewPaths = Array.from({ length: 4 }, (_, index) => {
+            const path = join(outsideDirectory, `file-${index}.txt`);
+            writeFileSync(path, `PARALLEL_VIEW_CONTENT_${index}\n`);
+            return path;
+        });
+        const requests: PermissionRequest[] = [];
+        const events: SessionEvent[] = [];
+        onTestFailed(() =>
+            console.error(
+                JSON.stringify(
+                    {
+                        judgeCalls: handler.judgeCalls,
+                        requests,
+                        events: events
+                            .filter((event) =>
+                                [
+                                    "permission.requested",
+                                    "permission.completed",
+                                    "tool.execution_start",
+                                    "tool.execution_complete",
+                                    "session.permission_recovery",
+                                    "session.error",
+                                ].includes(event.type)
+                            )
+                            .map((event) => ({ type: event.type, data: event.data })),
+                    },
+                    null,
+                    2
+                )
+            )
+        );
+        const session = await client.createSession({
+            model: MODEL,
+            workingDirectory: workDir,
+            featureFlags: { AUTO_APPROVAL: true },
+            onPermissionRequest: (request: PermissionRequest) => {
+                requests.push(request);
+                return { kind: "approve-once" };
+            },
+        });
+        try {
+            await session.rpc.mode.set({ mode: "autopilot" });
+            await session.rpc.permissions.setMode({
+                mode: "assisted",
+                assistedApprovalModel: MODEL,
+                source: "rpc",
+            });
+            session.on((event) => events.push(event));
+            const completion = getNextEventOfType(session, "session.task_complete");
+            await Promise.all([session.send({ prompt: "Read the requested files." }), completion]);
+            const viewCompletions = events.filter(
+                (event) =>
+                    event.type === "tool.execution_complete" &&
+                    event.data.toolCallId.startsWith("assisted-view-")
+            );
+            expect(viewCompletions.map((event) => event.data.success)).toEqual(
+                handler.viewPaths.map(() => true)
+            );
+            expect(requests.filter((request) => request.kind === "read")).toHaveLength(
+                handler.viewPaths.length
+            );
+            expect(handler.judgeCalls).toBe(handler.viewPaths.length);
+        } finally {
+            await session.disconnect();
+            rmSync(outsideDirectory, { recursive: true, force: true });
+        }
+    }, 90_000);
+
+    it.each([
+        [false, "approve-once"],
+        [true, "approve-once"],
+        [false, "reject"],
+    ] as const)("honors host adjudication (resume=%s, result=%s)", async (resume, result) => {
+        let phase = "creating the session";
+        const outputDirectory = join(workDir, handler.directoryName);
+        expect(existsSync(outputDirectory)).toBe(false);
+        const requests: PermissionRequest[] = [];
+        const events: SessionEvent[] = [];
+        onTestFailed(() =>
+            console.error(
+                JSON.stringify(
+                    {
+                        judgeCalls: handler.judgeCalls,
+                        phase,
+                        requests,
+                        events: events
+                            .filter((event) =>
+                                [
+                                    "permission.requested",
+                                    "permission.completed",
+                                    "tool.execution_start",
+                                    "tool.execution_complete",
+                                    "session.task_complete",
+                                    "session.permission_recovery",
+                                    "session.error",
+                                ].includes(event.type)
+                            )
+                            .slice(-10),
+                    },
+                    null,
+                    2
+                )
+            )
+        );
+        const onPermissionRequest = (request: PermissionRequest) => {
+            requests.push(request);
+            return { kind: result };
+        };
+        let session = await client.createSession({
+            model: MODEL,
+            workingDirectory: workDir,
+            featureFlags: { AUTO_APPROVAL: true },
+            onPermissionRequest,
+        });
+        if (resume) {
+            phase = "initializing before resume";
+            await session.sendAndWait({
+                prompt: "Initialize this session. ASSISTED_SETUP_ONLY",
+            });
+            const sessionId = session.sessionId;
+            await session.disconnect();
+            session = await client.resumeSession(sessionId, {
+                onPermissionRequest,
+                featureFlags: { AUTO_APPROVAL: true },
+            });
+        }
+        try {
+            phase = "selecting Autopilot";
+            await session.rpc.mode.set({ mode: "autopilot" });
+            phase = "selecting Assisted";
+            const permissionMode = await session.rpc.permissions.setMode({
+                mode: "assisted",
+                assistedApprovalModel: MODEL,
+                source: "rpc",
+            });
+            expect(permissionMode).toMatchObject({ success: true, mode: "assisted" });
+            session.on((event) => events.push(event));
+            phase = "running the protected operation";
+            // sendAndWait deliberately ignores Autopilot idle; wait for task completion instead.
+            const completion = getNextEventOfType(session, "session.task_complete");
+            const [, completed] = await Promise.all([
+                session.send({ prompt: "Create the requested workspace fixture." }),
+                completion,
+            ]);
+            expect(completed.data).toMatchObject({ success: true, summary: COMPLETION });
+            expect(
+                events.filter((event) => event.type === "assistant.message").at(-1)?.data.content
+            ).toBe(COMPLETION);
+            expect(handler.judgeCalls).toBe(1);
+            expect(requests).toHaveLength(1);
+            expect(requests[0]?.kind).toBe("shell");
+            const permissionEvents = events.filter(
+                (event) => event.type === "permission.requested"
+            );
+            expect(permissionEvents).toHaveLength(1);
+            expect(permissionEvents[0]?.data.promptRequest?.assistedApproval?.recommendation).toBe(
+                "approve"
+            );
+            expect(events.filter((event) => event.type === "session.permission_recovery")).toEqual(
+                []
+            );
+            const completions = events.filter(
+                (event) =>
+                    event.type === "tool.execution_complete" &&
+                    event.data.toolCallId.startsWith("assisted-")
+            );
+            expect(completions).toHaveLength(1);
+            expect(completions[0]?.data.success).toBe(result === "approve-once");
+            expect(existsSync(outputDirectory)).toBe(result === "approve-once");
+        } finally {
+            await session.disconnect();
+        }
+    });
+
+    it.each([false, true])(
+        "delivers a human-required recommendation to the SDK provider (resume=%s)",
+        async (resume) => {
+            const outputDirectory = join(workDir, handler.directoryName);
+            expect(existsSync(outputDirectory)).toBe(false);
+            handler.requiresApproval = true;
+            const requests: PermissionRequest[] = [];
+            const events: SessionEvent[] = [];
+            const onPermissionRequest = (request: PermissionRequest) => {
+                requests.push(request);
+                return { kind: "approve-once" } as const;
+            };
+            let session = await client.createSession({
+                model: MODEL,
+                workingDirectory: workDir,
+                featureFlags: { AUTO_APPROVAL: true },
+                onPermissionRequest,
+            });
+            if (resume) {
+                await session.sendAndWait({
+                    prompt: "Initialize this session. ASSISTED_SETUP_ONLY",
+                });
+                const sessionId = session.sessionId;
+                await session.disconnect();
+                session = await client.resumeSession(sessionId, {
+                    onPermissionRequest,
+                    featureFlags: { AUTO_APPROVAL: true },
+                });
+            }
+            try {
+                await session.rpc.mode.set({ mode: "autopilot" });
+                const permissionMode = await session.rpc.permissions.setMode({
+                    mode: "assisted",
+                    assistedApprovalModel: MODEL,
+                    source: "rpc",
+                });
+                expect(permissionMode).toMatchObject({ success: true, mode: "assisted" });
+                session.on((event) => events.push(event));
+                const completion = getNextEventOfType(session, "session.task_complete");
+                const [, completed] = await Promise.all([
+                    session.send({ prompt: "Create the requested workspace fixture." }),
+                    completion,
+                ]);
+                expect(completed.data).toMatchObject({ success: true, summary: COMPLETION });
+                expect(
+                    events.filter((event) => event.type === "assistant.message").at(-1)?.data
+                        .content
+                ).toBe(COMPLETION);
+                expect(handler.judgeCalls).toBe(1);
+                expect(requests).toHaveLength(1);
+                const permissionEvents = events.filter(
+                    (event) => event.type === "permission.requested"
+                );
+                expect(permissionEvents).toHaveLength(1);
+                expect(permissionEvents[0]?.data.recoveryEpisodeId).toBeUndefined();
+                expect(
+                    permissionEvents[0]?.data.promptRequest?.assistedApproval?.recommendation
+                ).toBe("requireApproval");
+                expect(
+                    events
+                        .filter((event) => event.type === "session.permission_recovery")
+                        .map((event) => event.data.status)
+                ).toEqual([]);
+                expect(
+                    events
+                        .filter(
+                            (event) =>
+                                event.type === "tool.execution_complete" &&
+                                event.data.toolCallId.startsWith("assisted-")
+                        )
+                        .map((event) => event.data.success)
+                ).toEqual([true]);
+                expect(existsSync(outputDirectory)).toBe(true);
+            } finally {
+                await session.disconnect();
+            }
+        }
+    );
+});
diff --git a/nodejs/test/e2e/browser_shadow_reload.e2e.test.ts b/nodejs/test/e2e/browser_shadow_reload.e2e.test.ts
new file mode 100644
index 0000000000..82a005528d
--- /dev/null
+++ b/nodejs/test/e2e/browser_shadow_reload.e2e.test.ts
@@ -0,0 +1,143 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { dirname, join, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+import { describe, expect, it } from "vitest";
+import { approveAll, RuntimeConnection } from "../../src/index.js";
+import { createSdkTestContext } from "./harness/sdkTestContext.js";
+import { waitForCondition } from "./harness/sdkTestHelper.js";
+
+const BROWSER_NAME = "github-copilot-browser";
+const SHADOW_SERVER = "installed-browser-shadow";
+const TEST_MCP_SERVER = resolve(
+    dirname(fileURLToPath(import.meta.url)),
+    "../../../test/harness/test-mcp-server.mjs"
+);
+
+describe("Browser shadow reload", async () => {
+    const { createClient, workDir, env } = await createSdkTestContext({ useStdio: true });
+
+    it(
+        "observes another process's install, disable and removal on a warm session",
+        { timeout: 90_000 },
+        async () => {
+            const bundle = join(workDir, "bundle");
+            const shadow = join(workDir, "shadow");
+            for (const [directory, server] of [
+                [bundle, BROWSER_NAME],
+                [shadow, SHADOW_SERVER],
+            ]) {
+                mkdirSync(join(directory, ".plugin"), { recursive: true });
+                writeFileSync(
+                    join(directory, ".plugin", "plugin.json"),
+                    JSON.stringify({
+                        name: BROWSER_NAME,
+                        version: "0.0.3",
+                        mcpServers: "./.mcp.json",
+                    })
+                );
+                writeFileSync(
+                    join(directory, ".mcp.json"),
+                    JSON.stringify({
+                        mcpServers: {
+                            [server]: {
+                                command: process.execPath,
+                                args: [TEST_MCP_SERVER],
+                                tools: ["*"],
+                            },
+                        },
+                    })
+                );
+            }
+            writeFileSync(
+                join(env.COPILOT_HOME, "settings.json"),
+                JSON.stringify({ enabledPlugins: { [BROWSER_NAME]: true }, disableAllHooks: true })
+            );
+            await using owner = createClient({
+                connection: RuntimeConnection.forStdio(),
+                builtinPluginDirectories: [bundle],
+            });
+            await using writer = createClient({ connection: RuntimeConnection.forStdio() });
+            await owner.start();
+            await writer.start();
+            await writer.rpc.plugins.builtin.set({ paths: [] });
+            // Exercise persisted MCP discovery, not a host-owned effective-plugin snapshot.
+            const session = await owner.createSession({
+                onPermissionRequest: approveAll,
+                enableConfigDiscovery: false,
+                mcpServers: {
+                    peer: {
+                        type: "local",
+                        command: process.execPath,
+                        args: [TEST_MCP_SERVER],
+                        tools: ["*"],
+                    },
+                },
+            });
+            try {
+                const connected = async (serverName: string) => {
+                    await waitForCondition(
+                        async () =>
+                            (await session.rpc.mcp.list()).servers.some(
+                                (server) =>
+                                    server.name === serverName && server.status === "connected"
+                            ),
+                        { timeoutMs: 30_000, timeoutMessage: `${serverName} did not connect` }
+                    ).catch(async (error: unknown) => {
+                        const current = (await session.rpc.mcp.list()).servers.map(
+                            ({ name, status }) => ({ name, status })
+                        );
+                        const installed = (await writer.rpc.plugins.list()).plugins.filter(
+                            (plugin) => plugin.name === BROWSER_NAME
+                        );
+                        const discovered = (
+                            await owner.rpc.mcp.discover({ workingDirectory: workDir })
+                        ).servers.map(({ name, enabled }) => ({ name, enabled }));
+                        throw new Error(
+                            `${serverName} did not connect: ${JSON.stringify({ current, installed, discovered })}`,
+                            { cause: error }
+                        );
+                    });
+                    expect((await session.rpc.mcp.listTools({ serverName })).tools).toEqual(
+                        expect.arrayContaining([expect.objectContaining({ name: "get_env" })])
+                    );
+                };
+                const absent = async (serverName: string) => {
+                    expect(
+                        (await session.rpc.mcp.list()).servers.some(
+                            (server) => server.name === serverName
+                        )
+                    ).toBe(false);
+                };
+                await connected("peer");
+                await connected(BROWSER_NAME);
+
+                const installed = await writer.rpc.plugins.install({ source: shadow });
+                expect(installed.plugin.name).toBe(BROWSER_NAME);
+                expect(installed.plugin.enabled).toBe(true);
+                await session.rpc.mcp.reload();
+                await connected(SHADOW_SERVER);
+                await absent(BROWSER_NAME);
+
+                await writer.rpc.plugins.disable({ names: [BROWSER_NAME] });
+                await session.rpc.mcp.reload();
+                await absent(SHADOW_SERVER);
+                await absent(BROWSER_NAME);
+
+                await writer.rpc.plugins.uninstall({ name: BROWSER_NAME });
+                expect(
+                    JSON.parse(readFileSync(join(env.COPILOT_HOME, "settings.json"), "utf8"))
+                        .enabledPlugins[BROWSER_NAME]
+                ).toBe(true);
+                await session.rpc.mcp.reload();
+                await connected(BROWSER_NAME);
+                await absent(SHADOW_SERVER);
+            } finally {
+                await session.disconnect();
+            }
+        }
+    );
+});
diff --git a/nodejs/test/e2e/builtin_skills.e2e.test.ts b/nodejs/test/e2e/builtin_skills.e2e.test.ts
new file mode 100644
index 0000000000..4135da4ec2
--- /dev/null
+++ b/nodejs/test/e2e/builtin_skills.e2e.test.ts
@@ -0,0 +1,114 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { randomUUID } from "node:crypto";
+import { mkdirSync, writeFileSync } from "node:fs";
+import { join } from "node:path";
+import { describe, expect, it } from "vitest";
+import { approveAll, RuntimeConnection } from "../../src/index.js";
+import { createSdkTestContext, DEFAULT_GITHUB_TOKEN } from "./harness/sdkTestContext.js";
+
+interface SkillPolicyCase {
+    label: string;
+    includedBuiltinSkills?: string[];
+    disabledSkills?: string[];
+    enableSkills?: boolean;
+    expectedEnabled?: boolean;
+    expectedCustom?: boolean;
+}
+
+describe("Runtime-bundled skills", async () => {
+    const { createClient, workDir, env } = await createSdkTestContext({ useStdio: true });
+
+    it.each<SkillPolicyCase>([
+        { label: "default", expectedEnabled: true },
+        {
+            label: "explicit opt-in",
+            includedBuiltinSkills: ["github-pr-media"],
+            expectedEnabled: true,
+        },
+        { label: "explicit opt-out", includedBuiltinSkills: [] },
+        {
+            label: "disabled builtin",
+            disabledSkills: ["github-pr-media"],
+            expectedEnabled: false,
+        },
+        { label: "skills disabled", enableSkills: false, expectedCustom: false },
+    ])(
+        "preserves $label on create and resume alongside custom skills",
+        async ({
+            includedBuiltinSkills,
+            disabledSkills,
+            enableSkills,
+            expectedEnabled,
+            expectedCustom = true,
+        }) => {
+            const skillsDir = join(workDir, randomUUID());
+            const customSkillDir = join(skillsDir, "custom-proof");
+            mkdirSync(customSkillDir, { recursive: true });
+            writeFileSync(
+                join(customSkillDir, "SKILL.md"),
+                "---\nname: custom-proof\ndescription: Explicit custom skill.\n---\nCustom instructions.\n"
+            );
+
+            // A replacement child process proves cold resume, not a warm registry lookup.
+            await using client = createClient({
+                connection: RuntimeConnection.forStdio(),
+                mode: "copilot-cli",
+                gitHubToken: DEFAULT_GITHUB_TOKEN,
+            });
+            await client.start();
+            await client.rpc.plugins.builtin.set({ paths: [] });
+            const config = {
+                onPermissionRequest: approveAll,
+                enableConfigDiscovery: false,
+                skillDirectories: [skillsDir],
+                includedBuiltinSkills,
+                disabledSkills,
+                enableSkills,
+            };
+            const session = await client.createSession(config);
+            let history;
+            try {
+                await session.rpc.name.set({ name: "Builtin skill discovery" });
+                const { skills } = await session.rpc.skills.list();
+                expect(skills.some((skill) => skill.name === "custom-proof" && skill.enabled)).toBe(
+                    expectedCustom
+                );
+                expect(skills.find((skill) => skill.name === "github-pr-media")?.enabled).toBe(
+                    expectedEnabled
+                );
+                history = await session.getEvents();
+                expect(history[0]?.type).toBe("session.start");
+            } finally {
+                await session.disconnect();
+            }
+            expect(await client.stop()).toHaveLength(0);
+            // A no-turn session has no persisted journal. Seed its real emitted history
+            // after the writer stops, without a model call or any upload.
+            writeFileSync(
+                join(env.COPILOT_HOME, "session-state", session.sessionId, "events.jsonl"),
+                `${history.map((event) => JSON.stringify(event)).join("\n")}\n`
+            );
+
+            await using replacement = createClient({
+                connection: RuntimeConnection.forStdio(),
+                mode: "copilot-cli",
+                gitHubToken: DEFAULT_GITHUB_TOKEN,
+            });
+            const resumed = await replacement.resumeSession(session.sessionId, config);
+            try {
+                const { skills } = await resumed.rpc.skills.list();
+                expect(skills.some((skill) => skill.name === "custom-proof" && skill.enabled)).toBe(
+                    expectedCustom
+                );
+                expect(skills.find((skill) => skill.name === "github-pr-media")?.enabled).toBe(
+                    expectedEnabled
+                );
+            } finally {
+                await resumed.disconnect();
+            }
+        }
+    );
+});
diff --git a/nodejs/test/e2e/commands.e2e.test.ts b/nodejs/test/e2e/commands.e2e.test.ts
index 0a4327370e..9cd17759ff 100644
--- a/nodejs/test/e2e/commands.e2e.test.ts
+++ b/nodejs/test/e2e/commands.e2e.test.ts
@@ -2,7 +2,10 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *--------------------------------------------------------------------------------------------*/
 
-import { afterAll, describe, expect, it } from "vitest";
+import { randomUUID } from "node:crypto";
+import { writeFile } from "node:fs/promises";
+import { join } from "node:path";
+import { afterAll, describe, expect, it, onTestFinished } from "vitest";
 import { CopilotClient, approveAll, RuntimeConnection } from "../../src/index.js";
 import type { CommandContext, SessionEvent } from "../../src/index.js";
 import { createSdkTestContext } from "./harness/sdkTestContext.js";
@@ -273,6 +276,82 @@ describe("Commands", async () => {
     });
 });
 
+describe("Usage command after restart", async () => {
+    // Custom-provider sessions bypass the server's Copilot billing account.
+    const { createClient, openAiEndpoint, env } = await createSdkTestContext({
+        backend: "capi",
+    });
+
+    it.each([
+        {
+            status: "partial",
+            totalNanoAiu: 23_275_500_000,
+            expected: "Requests: 23.28 AI Credits reported (partial)",
+        },
+        {
+            status: "unavailable",
+            totalNanoAiu: 0,
+            expected: "Requests: unavailable AI Credits",
+        },
+    ])("reports $status checkpoint AI credits", async ({ status, totalNanoAiu, expected }) => {
+        const token = `usage-command-checkpoint-token-${randomUUID()}`;
+        await openAiEndpoint.setCopilotUserByToken(token, {
+            login: "usage-command-user",
+            copilot_plan: "individual_pro",
+            token_based_billing: true,
+            endpoints: { api: openAiEndpoint.url },
+        });
+        const originalClient = createClient({
+            connection: RuntimeConnection.forStdio(),
+            gitHubToken: token,
+        });
+        onTestFinished(async () => {
+            expect(await originalClient.stop()).toHaveLength(0);
+        });
+        const original = await originalClient.createSession({
+            onPermissionRequest: approveAll,
+        });
+        await original.rpc.name.set({ name: "Usage checkpoint fixture" });
+        const events = await original.getEvents();
+        const checkpoint: SessionEvent = {
+            type: "session.usage_checkpoint",
+            id: randomUUID(),
+            timestamp: new Date().toISOString(),
+            parentId: events.at(-1)?.id ?? null,
+            data: { totalNanoAiu, totalPremiumRequests: 1 },
+        };
+        await originalClient.rpc.sessions.save({ sessionId: original.sessionId });
+        await originalClient.rpc.sessions.close({ sessionId: original.sessionId });
+        expect(await originalClient.stop()).toHaveLength(0);
+
+        // Seed durable accounting only after the session writer has stopped.
+        await writeFile(
+            join(env.COPILOT_HOME, "session-state", original.sessionId, "events.jsonl"),
+            `${[...events, checkpoint].map((event) => JSON.stringify(event)).join("\n")}\n`
+        );
+        const resumedClient = createClient({
+            connection: RuntimeConnection.forStdio(),
+            gitHubToken: token,
+        });
+        onTestFinished(async () => {
+            expect(await resumedClient.stop()).toHaveLength(0);
+        });
+        const resumed = await resumedClient.resumeSession(original.sessionId, {
+            onPermissionRequest: approveAll,
+        });
+        expect(await resumed.rpc.usage.getMetrics()).toMatchObject({
+            totalNanoAiu: checkpoint.data.totalNanoAiu,
+            totalPremiumRequestCost: checkpoint.data.totalPremiumRequests,
+            aiCreditsStatus: status,
+        });
+        const result = await resumed.rpc.commands.invoke({ name: "usage" });
+        expect(result.kind).toBe("text");
+        if (result.kind !== "text") throw new Error(`Unexpected usage result: ${result.kind}`);
+        expect(result.text).toContain(expected);
+        expect(result.text).not.toContain("1 AI Units");
+    });
+});
+
 function isCommand(command: { name: string; kind: string }, name: string, kind: string): boolean {
     return command.name.toLowerCase() === name.toLowerCase() && command.kind === kind;
 }
diff --git a/nodejs/test/e2e/compaction.e2e.test.ts b/nodejs/test/e2e/compaction.e2e.test.ts
index 04de4d1d4a..f42e515cdf 100644
--- a/nodejs/test/e2e/compaction.e2e.test.ts
+++ b/nodejs/test/e2e/compaction.e2e.test.ts
@@ -1,9 +1,1063 @@
-import { describe, expect, it } from "vitest";
-import { approveAll, type CopilotSession, type SessionEvent } from "../../src/index.js";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { describe, expect, it, onTestFailed } from "vitest";
+import { existsSync } from "node:fs";
+import * as fs from "node:fs/promises";
+import { join } from "node:path";
+import { DatabaseSync } from "node:sqlite";
+import {
+    approveAll,
+    CopilotRequestHandler,
+    type CopilotSession,
+    type SessionEvent,
+} from "../../src/index.js";
 import { createSdkTestContext, isCI } from "./harness/sdkTestContext.js";
+import { testBackend } from "./harness/testBackend.js";
+import { withTestCleanup } from "../helpers/withTestCleanup.js";
 
 const compactionTimeoutMs = 60_000;
 
+interface CacheWireBlock {
+    text?: string;
+    cache_control?: unknown;
+    copilot_cache_control?: unknown;
+    output_config?: { effort?: string };
+}
+
+interface CacheWireRequest extends CacheWireBlock {
+    model: string;
+    max_tokens: number;
+    stream?: boolean;
+    system?: CacheWireBlock[];
+    tools?: CacheWireBlock[];
+    tool_choice?: unknown;
+    messages: (CacheWireBlock & { role: string; content: string | CacheWireBlock[] })[];
+}
+
+class RefusalBudgetReplayHandler extends CopilotRequestHandler {
+    readonly requests: CacheWireRequest[] = [];
+    readonly requestUrls: string[] = [];
+
+    constructor(
+        private readonly endpoint: "/v1/messages" | "/chat/completions" = "/v1/messages",
+        private readonly fusionCritic = false
+    ) {
+        super();
+    }
+
+    protected override async sendRequest(request: Request): Promise<Response> {
+        const path = new URL(request.url).pathname;
+        if (path === "/models") {
+            return Response.json({
+                data: [
+                    ["claude-sonnet-5.5", 250_000, 384_000, 128_000],
+                    ["claude-sonnet-5", 112_000, 128_000, 64_000],
+                    ...(this.fusionCritic ? [["claude-opus-5", 112_000, 128_000, 64_000]] : []),
+                ].map(([id, prompt, context, output]) => ({
+                    id,
+                    name: id,
+                    object: "model",
+                    vendor: "Anthropic",
+                    version: "1",
+                    model_picker_enabled: true,
+                    policy: { state: "enabled" },
+                    supported_endpoints: [this.endpoint],
+                    // Synthetic prices exercise TTL eligibility, not measured savings.
+                    billing: {
+                        token_prices: {
+                            batch_size: 1_000_000,
+                            default: {
+                                input_price: 3,
+                                output_price: 15,
+                                cache_read_price: 0.3,
+                                cache_write_price: 1,
+                                cache_write_1h_price: 2,
+                            },
+                        },
+                    },
+                    capabilities: {
+                        type: "chat",
+                        family: id,
+                        tokenizer: "o200k_base",
+                        supports: { streaming: true, tool_calls: true, vision: false },
+                        limits: {
+                            max_prompt_tokens: prompt,
+                            max_context_window_tokens: context,
+                            max_output_tokens: output,
+                        },
+                    },
+                })),
+            });
+        }
+        if (this.fusionCritic && path === "/model/fusion") {
+            return Response.json({
+                fusion_mode: "hydrafusion-max",
+                fusion_pattern: "critique",
+                plan_version: "1",
+                steps: [
+                    { role: "draft", model_id: "claude-opus-5" },
+                    { role: "critic", model_id: "claude-opus-5" },
+                    { role: "revision", model_id: "claude-opus-5" },
+                ],
+                session: { token: "jwt.fake.cache-wire-fusion", expires_at: 0 },
+            });
+        }
+        if (path.endsWith("/models/session")) return Response.json({});
+        if (path.includes("/policy")) return Response.json({ state: "enabled" });
+        expect(path).toBe(this.endpoint);
+        const body = (await request.json()) as CacheWireRequest;
+        this.requests.push(body);
+        this.requestUrls.push(request.url);
+        const refuses = body.model === "claude-sonnet-5.5";
+        const content = refuses
+            ? "PRIMARY_REFUSAL"
+            : this.fusionCritic && !body.tools?.length
+              ? JSON.stringify({ assessment: "approve", feedback: "" })
+              : "FALLBACK_BUDGET_OK";
+        const compaction =
+            Boolean(body.tools?.length) &&
+            (body.tool_choice === "none" ||
+                (typeof body.tool_choice === "object" &&
+                    body.tool_choice !== null &&
+                    "type" in body.tool_choice &&
+                    body.tool_choice.type === "none"));
+        // Model a warm tools/system prefix; this is accounting coverage, not a measured hit.
+        const cacheReadTokens = compaction ? 50 : 0;
+        if (this.endpoint === "/chat/completions") {
+            const usage = {
+                prompt_tokens: 100 + cacheReadTokens,
+                completion_tokens: 10,
+                total_tokens: 110 + cacheReadTokens,
+                prompt_tokens_details: {
+                    cached_tokens: cacheReadTokens,
+                    cache_creation_tokens: 0,
+                },
+            };
+            const choice = {
+                index: 0,
+                message: { role: "assistant", content },
+                finish_reason: "stop",
+            };
+            if (!body.stream) {
+                return Response.json({
+                    id: "cache-wire-replay",
+                    object: "chat.completion",
+                    model: body.model,
+                    choices: [choice],
+                    usage,
+                });
+            }
+            const chunk = {
+                id: "cache-wire-replay",
+                object: "chat.completion.chunk",
+                model: body.model,
+                choices: [{ index: 0, delta: { content }, finish_reason: "stop" }],
+                usage,
+            };
+            return new Response(`data: ${JSON.stringify(chunk)}\n\ndata: [DONE]\n\n`, {
+                headers: { "content-type": "text/event-stream" },
+            });
+        }
+        const message = {
+            id: "refusal-budget-replay",
+            type: "message",
+            role: "assistant",
+            model: body.model,
+            content: [{ type: "text", text: content }],
+            stop_reason: refuses ? "refusal" : "end_turn",
+            stop_sequence: null,
+            usage: {
+                input_tokens: 100,
+                output_tokens: 10,
+                cache_read_input_tokens: cacheReadTokens,
+                cache_creation_input_tokens: 0,
+            },
+        };
+        if (!body.stream) return Response.json(message);
+        const events = [
+            {
+                type: "message_start",
+                message: { ...message, content: [], stop_reason: null },
+            },
+            {
+                type: "content_block_start",
+                index: 0,
+                content_block: { type: "text", text: "" },
+            },
+            {
+                type: "content_block_delta",
+                index: 0,
+                delta: { type: "text_delta", text: content },
+            },
+            { type: "content_block_stop", index: 0 },
+            {
+                type: "message_delta",
+                delta: { stop_reason: message.stop_reason, stop_sequence: null },
+                usage: { output_tokens: 10 },
+            },
+            { type: "message_stop" },
+        ];
+        return new Response(
+            events
+                .map((event) => `event: ${event.type}\ndata: ${JSON.stringify(event)}\n\n`)
+                .join(""),
+            { headers: { "content-type": "text/event-stream" } }
+        );
+    }
+}
+
+function expectNoConversationCacheMarkers(request: CacheWireRequest): void {
+    expect(request.cache_control).toBeUndefined();
+    expect(Boolean(request.copilot_cache_control)).toBe(false);
+    for (const message of request.messages.filter(({ role }) => role !== "system")) {
+        expect(Boolean(message.copilot_cache_control)).toBe(false);
+        if (typeof message.content !== "string") {
+            for (const block of message.content) {
+                expect(block.cache_control).toBeUndefined();
+            }
+        }
+    }
+}
+
+function systemCacheMarkers(request: CacheWireRequest): unknown[] {
+    return [
+        ...(request.system ?? []).map(({ cache_control }) => cache_control),
+        ...request.messages
+            .filter(({ role }) => role === "system")
+            .map(({ copilot_cache_control }) => copilot_cache_control),
+    ].filter(Boolean);
+}
+
+for (const oneHour of [false, true]) {
+    describe(`Disposable Anthropic prompt caching (one-hour ${oneHour})`, async () => {
+        const { createClient } = await createSdkTestContext({
+            replayOnly: true,
+            logLevel: "debug",
+        });
+
+        it.each(["CAPI Messages", "CAPI Chat", "BYOK Messages"] as const)(
+            "keeps reusable prefixes but not disposable writes on %s",
+            async (route) => {
+                const handler = new RefusalBudgetReplayHandler(
+                    route === "CAPI Chat" ? "/chat/completions" : "/v1/messages"
+                );
+                const cacheClient = createClient({ requestHandler: handler });
+                let phase = "create session";
+                const events: string[] = [];
+                onTestFailed(() => {
+                    console.error(
+                        `[cache-wire-progress] ${JSON.stringify({
+                            phase,
+                            events: events.slice(-20),
+                            requests: handler.requests.map((request, index) => ({
+                                endpoint: new URL(handler.requestUrls[index]!).pathname,
+                                model: request.model,
+                                stream: request.stream,
+                                messages: request.messages.length,
+                                hasTools: Boolean(request.tools?.length),
+                                toolChoice: request.tool_choice,
+                            })),
+                        })}`
+                    );
+                });
+                try {
+                    const session = await cacheClient.createSession({
+                        onPermissionRequest: approveAll,
+                        model: "claude-sonnet-5",
+                        contextTier: "default",
+                        featureFlags: { ANTHROPIC_1_HOUR_PROMPT_CACHE: oneHour },
+                        expAssignments: {
+                            Features: ["copilot_cli_anthropic_1_hour_prompt_cache"],
+                            Flights: {
+                                copilot_cli_anthropic_1_hour_prompt_cache: String(oneHour),
+                            },
+                            Configs: [
+                                {
+                                    Id: "default",
+                                    Parameters: {
+                                        copilot_cli_anthropic_1_hour_prompt_cache: oneHour,
+                                    },
+                                },
+                            ],
+                            AssignmentContext: `cache-wire-one-hour-${oneHour}`,
+                        },
+                        ...(route === "BYOK Messages"
+                            ? {
+                                  provider: {
+                                      type: "anthropic" as const,
+                                      baseUrl: "https://cache-wire-replay.invalid",
+                                      apiKey: "fake-cache-wire-key",
+                                      modelId: "claude-sonnet-5",
+                                  },
+                              }
+                            : { providers: [] }),
+                        systemMessage: {
+                            mode: "replace",
+                            content: "Reusable agent policy. ".repeat(4_096),
+                        },
+                        streaming: false,
+                        infiniteSessions: { enabled: false },
+                    });
+                    session.on((event) => events.push(event.type));
+                    phase = "initial turn";
+                    expect(
+                        (
+                            await session.sendAndWait({
+                                prompt: "Initialize the reusable conversation.",
+                            })
+                        )?.data.content
+                    ).toBe("FALLBACK_BUDGET_OK");
+                    const initial = handler.requests.at(-1)!;
+                    expect(
+                        new URL(handler.requestUrls.at(-1)!).hostname ===
+                            "cache-wire-replay.invalid"
+                    ).toBe(route === "BYOK Messages");
+                    const marker = {
+                        type: "ephemeral",
+                        ...(oneHour && route !== "BYOK Messages" ? { ttl: "1h" } : {}),
+                    };
+                    expect(systemCacheMarkers(initial)).toContainEqual(marker);
+                    expect(
+                        initial.tools?.some((tool) =>
+                            Boolean(tool.cache_control ?? tool.copilot_cache_control)
+                        )
+                    ).toBe(true);
+
+                    const beforeSampling = handler.requests.length;
+                    phase = "sampling and concurrent turn";
+                    const [sampling, concurrentTurn] = await Promise.all([
+                        session.rpc.mcp.executeSampling({
+                            requestId: "cache-wire-sampling",
+                            serverName: "cache-wire-server",
+                            mcpRequestId: "cache-wire-mcp",
+                            request: {
+                                systemPrompt: "Disposable caller-owned policy. ".repeat(4_096),
+                                messages: [
+                                    {
+                                        role: "user",
+                                        content: {
+                                            type: "text",
+                                            text: "Compute a sampling result.",
+                                        },
+                                    },
+                                ],
+                                maxTokens: 4096,
+                            },
+                        }),
+                        session.sendAndWait({
+                            prompt: "Continue while sampling runs independently.",
+                        }),
+                    ]);
+                    expect(concurrentTurn?.data.content).toBe("FALLBACK_BUDGET_OK");
+                    expect(sampling).toMatchObject({
+                        action: "success",
+                        result: { content: { type: "text", text: "FALLBACK_BUDGET_OK" } },
+                    });
+                    const concurrentRequests = handler.requests.slice(beforeSampling);
+                    expect(concurrentRequests).toHaveLength(2);
+                    const sampled = concurrentRequests.find((request) => !request.tools?.length)!;
+                    const continued = concurrentRequests.find((request) =>
+                        Boolean(request.tools?.length)
+                    )!;
+                    expect(systemCacheMarkers(sampled)).toEqual([]);
+                    expectNoConversationCacheMarkers(sampled);
+                    expect(systemCacheMarkers(continued)).toContainEqual(marker);
+
+                    phase = "handoff summary";
+                    expect(await session.rpc.history.summarizeForHandoff()).toMatchObject({
+                        summary: "FALLBACK_BUDGET_OK",
+                    });
+                    expect(systemCacheMarkers(handler.requests.at(-1)!)).toEqual([]);
+                    expectNoConversationCacheMarkers(handler.requests.at(-1)!);
+
+                    phase = "manual compaction";
+                    const completed = getNextSessionEvent(
+                        session,
+                        "session.compaction_complete",
+                        "manual cache compaction"
+                    );
+                    const [compacted, completionEvent] = await Promise.all([
+                        session.rpc.history.compact({ trigger: "manual" }),
+                        completed,
+                    ]);
+                    expect(compacted).toMatchObject({
+                        success: true,
+                        summaryContent: "FALLBACK_BUDGET_OK",
+                    });
+                    expect(completionEvent.data.compactionTokensUsed).toMatchObject({
+                        inputTokens: 150,
+                        outputTokens: 10,
+                        cacheReadTokens: 50,
+                        cacheWriteTokens: 0,
+                    });
+                    const compacting = handler.requests.at(-1)!;
+                    expect(systemCacheMarkers(compacting)).toEqual(systemCacheMarkers(initial));
+                    expect(compacting.tools).toEqual(initial.tools);
+                    expect(compacting.tool_choice).toEqual(
+                        route === "CAPI Chat" ? "none" : { type: "none" }
+                    );
+                    expectNoConversationCacheMarkers(compacting);
+
+                    phase = "post-compaction turn";
+                    expect(
+                        (await session.sendAndWait({ prompt: "Continue after compaction." }))?.data
+                            .content
+                    ).toBe("FALLBACK_BUDGET_OK");
+                    expect(systemCacheMarkers(handler.requests.at(-1)!)).toContainEqual(marker);
+                    phase = "disconnect session";
+                    await session.disconnect();
+                } finally {
+                    phase = `stop client (after ${phase})`;
+                    await cacheClient.stop();
+                }
+            }
+        );
+    });
+}
+
+describe("Disposable Anthropic prompt caching during automatic compaction", async () => {
+    const { createClient } = await createSdkTestContext({ replayOnly: true });
+    it.each(["CAPI Messages", "CAPI Chat", "BYOK Messages"] as const)(
+        "avoids discarded transcript writes during automatic compaction on %s",
+        async (route) => {
+            const handler = new RefusalBudgetReplayHandler(
+                route === "CAPI Chat" ? "/chat/completions" : "/v1/messages"
+            );
+            const cacheClient = createClient({ requestHandler: handler });
+            try {
+                const session = await cacheClient.createSession({
+                    onPermissionRequest: approveAll,
+                    model: "claude-sonnet-5",
+                    ...(route === "BYOK Messages"
+                        ? {
+                              provider: {
+                                  type: "anthropic" as const,
+                                  baseUrl: "https://cache-wire-replay.invalid",
+                                  apiKey: "fake-cache-wire-key",
+                                  modelId: "claude-sonnet-5",
+                              },
+                          }
+                        : { providers: [] }),
+                    systemMessage: {
+                        mode: "replace",
+                        content: "Reusable automatic policy. ".repeat(600),
+                    },
+                    streaming: false,
+                    infiniteSessions: {
+                        enabled: true,
+                        backgroundCompactionThreshold: 0.005,
+                        bufferExhaustionThreshold: 0.01,
+                    },
+                });
+                const completed = getNextSessionEvent(
+                    session,
+                    "session.compaction_complete",
+                    "automatic cache compaction"
+                );
+                const [, completionEvent] = await Promise.all([
+                    (async () => {
+                        expect(
+                            (
+                                await session.sendAndWait({
+                                    prompt: "Start the automatic compaction scenario.",
+                                })
+                            )?.data.content
+                        ).toBe("FALLBACK_BUDGET_OK");
+                        expect(
+                            (
+                                await session.sendAndWait({
+                                    prompt: "Continue the automatic compaction scenario.",
+                                })
+                            )?.data.content
+                        ).toBe("FALLBACK_BUDGET_OK");
+                    })(),
+                    completed,
+                ]);
+                expect(completionEvent.data).toMatchObject({
+                    success: true,
+                    summaryContent: "FALLBACK_BUDGET_OK",
+                    compactionTokensUsed: {
+                        inputTokens: 150,
+                        outputTokens: 10,
+                        cacheReadTokens: 50,
+                        cacheWriteTokens: 0,
+                    },
+                });
+                const compactions = handler.requests.filter(({ tool_choice }) =>
+                    route === "CAPI Chat"
+                        ? tool_choice === "none"
+                        : typeof tool_choice === "object" &&
+                          tool_choice !== null &&
+                          "type" in tool_choice &&
+                          tool_choice.type === "none"
+                );
+                expect(compactions.length).toBeGreaterThan(0);
+                for (const request of compactions) {
+                    expect(systemCacheMarkers(request)).not.toEqual([]);
+                    expect(request.tools).toEqual(handler.requests[0].tools);
+                    expectNoConversationCacheMarkers(request);
+                }
+                await session.disconnect();
+            } finally {
+                await cacheClient.stop();
+            }
+        }
+    );
+});
+
+describe("Disposable Anthropic prompt caching during refusal fallback", async () => {
+    const { createClient } = await createSdkTestContext({
+        replayOnly: true,
+        copilotClientOptions: {
+            env: {
+                ANTHROPIC_REFUSAL_FALLBACK: "true",
+                COPILOT_EXP_COPILOT_CLI_ANTHROPIC_REFUSAL_FALLBACK: "true",
+            },
+        },
+    });
+
+    it("preserves single-use cache intent across refusal fallback", async () => {
+        const handler = new RefusalBudgetReplayHandler();
+        const cacheClient = createClient({ requestHandler: handler });
+        try {
+            const session = await cacheClient.createSession({
+                onPermissionRequest: approveAll,
+                model: "claude-sonnet-5.5",
+                providers: [],
+                infiniteSessions: { enabled: false },
+            });
+            const sampled = await session.rpc.mcp.executeSampling({
+                requestId: "fallback-cache-sampling",
+                serverName: "cache-wire-server",
+                mcpRequestId: "fallback-cache-mcp",
+                request: {
+                    systemPrompt: "Disposable fallback policy. ".repeat(4_096),
+                    messages: [
+                        {
+                            role: "user",
+                            content: { type: "text", text: "Compute a sampling result." },
+                        },
+                    ],
+                    maxTokens: 4096,
+                },
+            });
+            expect(sampled).toMatchObject({
+                action: "success",
+                result: { content: { text: "FALLBACK_BUDGET_OK" } },
+            });
+            expect(handler.requests.map(({ model }) => model)).toEqual([
+                "claude-sonnet-5.5",
+                "claude-sonnet-5",
+            ]);
+            for (const request of handler.requests) {
+                expect(systemCacheMarkers(request)).toEqual([]);
+                expectNoConversationCacheMarkers(request);
+            }
+            await session.disconnect();
+        } finally {
+            await cacheClient.stop();
+        }
+    });
+});
+
+describe("Disposable Anthropic prompt caching during Fusion review", async () => {
+    const { createClient } = await createSdkTestContext({ replayOnly: true });
+    it("avoids tool-less critic writes without disabling the solver cache", async () => {
+        const handler = new RefusalBudgetReplayHandler("/v1/messages", true);
+        const cacheClient = createClient({ requestHandler: handler });
+        try {
+            const session = await cacheClient.createSession({
+                onPermissionRequest: approveAll,
+                model: "hydrafusion-max",
+                providers: [],
+                enableExperimentalMode: true,
+                featureFlags: {
+                    HYDRAFUSION: true,
+                    HYDRAFUSION_ROLLOUT: true,
+                    HYDRAFUSION_PLAN_V2: true,
+                },
+                expAssignments: {
+                    Features: [],
+                    Flights: {},
+                    Configs: [],
+                    AssignmentContext: "cache-wire-fusion-review",
+                },
+                infiniteSessions: { enabled: false },
+            });
+            const events: SessionEvent[] = [];
+            expect((await session.rpc.model.getCurrent()).modelId).toBe("hydrafusion-max");
+            const unsubscribe = session.on((event) => events.push(event));
+            try {
+                expect(
+                    (
+                        await session.sendAndWait({
+                            prompt: "Answer the cache policy review scenario without using tools.",
+                        })
+                    )?.data.content
+                ).toBe("FALLBACK_BUDGET_OK");
+                expect(
+                    events.filter((event) => event.type === "session.fusion_route_failed")
+                ).toEqual([]);
+                expect(
+                    events
+                        .filter((event) => event.type === "assistant.fusion_phase_completed")
+                        .map((event) => event.data.phaseKind)
+                ).toEqual(["draft", "critic"]);
+                expect(handler.requests).toHaveLength(2);
+                expect(systemCacheMarkers(handler.requests[0])).not.toEqual([]);
+                expect(handler.requests[0].tools?.length).toBeGreaterThan(0);
+                const critic = handler.requests[1];
+                expect(critic.model).toBe("claude-opus-5");
+                expect(critic.tools ?? []).toEqual([]);
+                expect(systemCacheMarkers(critic)).toEqual([]);
+                expectNoConversationCacheMarkers(critic);
+            } finally {
+                unsubscribe();
+                await session.disconnect();
+            }
+        } finally {
+            await cacheClient.stop();
+        }
+    });
+});
+
+class BudgetReplayHandler extends CopilotRequestHandler {
+    readonly requests: unknown[] = [];
+
+    protected override async sendRequest(request: Request): Promise<Response> {
+        expect(request.url).toMatch(/\/chat\/completions$/);
+        const body = (await request.json()) as { stream?: boolean };
+        this.requests.push(body);
+        if (!body.stream) {
+            return Response.json({
+                id: "budget-replay",
+                object: "chat.completion",
+                created: 1,
+                model: "uncatalogued-budget-model",
+                choices: [
+                    {
+                        index: 0,
+                        message: { role: "assistant", content: "BUDGET_CONTROL_OK" },
+                        finish_reason: "stop",
+                    },
+                ],
+                usage: { prompt_tokens: 100, completion_tokens: 10, total_tokens: 110 },
+            });
+        }
+        const chunk = {
+            id: "budget-replay",
+            object: "chat.completion.chunk",
+            created: 1,
+            model: "uncatalogued-budget-model",
+            choices: [{ index: 0, delta: { content: "BUDGET_CONTROL_OK" }, finish_reason: null }],
+        };
+        return new Response(
+            `data: ${JSON.stringify(chunk)}\n\ndata: ${JSON.stringify({
+                ...chunk,
+                choices: [{ index: 0, delta: {}, finish_reason: "stop" }],
+            })}\n\ndata: [DONE]\n\n`,
+            { headers: { "content-type": "text/event-stream" } }
+        );
+    }
+}
+
+interface CompactionEffortRequest {
+    model: string;
+    stream?: boolean;
+    reasoning?: { effort?: string };
+    input: Array<{ type?: string; role?: string; reasoning?: { effort?: string } }>;
+}
+
+class CompactionEffortReplayHandler extends CopilotRequestHandler {
+    readonly requests: CompactionEffortRequest[] = [];
+    summaryGate?: {
+        entered: ReturnType<typeof Promise.withResolvers<void>>;
+        release: ReturnType<typeof Promise.withResolvers<void>>;
+    };
+
+    protected override async sendRequest(request: Request): Promise<Response> {
+        expect(new URL(request.url).pathname).toBe("/responses");
+        const body = (await request.json()) as CompactionEffortRequest;
+        this.requests.push(body);
+        expect(body.stream).not.toBe(true);
+        const incompleteSummary = this.requests.length === 2 && this.summaryGate;
+        if (incompleteSummary) {
+            incompleteSummary.entered.resolve();
+            await incompleteSummary.release.promise;
+        }
+        return Response.json({
+            id: "compaction-effort-response",
+            object: "response",
+            model: body.model,
+            status: incompleteSummary ? "incomplete" : "completed",
+            ...(incompleteSummary ? { incomplete_details: { reason: "max_output_tokens" } } : {}),
+            output: [
+                {
+                    id: "compaction-effort-message",
+                    type: "message",
+                    role: "assistant",
+                    status: "completed",
+                    content: [
+                        {
+                            type: "output_text",
+                            text: incompleteSummary ? "SUMMARY_PART_ONE" : "COMPACTION_EFFORT_OK",
+                        },
+                    ],
+                },
+            ],
+            usage: { input_tokens: 100, output_tokens: 10, total_tokens: 110 },
+        });
+    }
+}
+
+describe("Compaction reasoning effort", async () => {
+    const { createClient } = await createSdkTestContext({ replayOnly: true });
+
+    it("reduces only the OpenAI summary request and retains the session effort", async () => {
+        const handler = new CompactionEffortReplayHandler();
+        const effortClient = createClient({ requestHandler: handler });
+        try {
+            await using session = await effortClient.createSession({
+                onPermissionRequest: approveAll,
+                model: "gpt-6-sol",
+                reasoningEffort: "max",
+                provider: {
+                    type: "openai",
+                    wireApi: "responses",
+                    baseUrl: "https://compaction-effort.invalid",
+                    apiKey: "fake-byok-credential-for-e2e-tests",
+                    modelId: "gpt-6-sol",
+                },
+                streaming: false,
+                featureFlags: { COMPACTION_MEDIUM_REASONING_EFFORT: true },
+                expAssignments: {
+                    Features: [],
+                    Flights: {},
+                    Configs: [],
+                    AssignmentContext: "compaction-medium-effort",
+                },
+                infiniteSessions: { enabled: false },
+            });
+            expect(
+                (await session.sendAndWait({ prompt: "Initialize the effort scenario." }))?.data
+                    .content
+            ).toBe("COMPACTION_EFFORT_OK");
+            expect(handler.requests).toHaveLength(1);
+            expect(handler.requests[0].reasoning?.effort).toBe("max");
+
+            const compacted = await session.rpc.history.compact({ trigger: "manual" });
+            expect(compacted).toMatchObject({
+                success: true,
+                summaryContent: "COMPACTION_EFFORT_OK",
+            });
+            expect(handler.requests).toHaveLength(2);
+            const summaryRequest = handler.requests[1];
+            expect(summaryRequest.reasoning?.effort).toBe("max");
+            expect(
+                summaryRequest.input.filter((item) => item.type === "configuration_update")
+            ).toEqual([{ type: "configuration_update", reasoning: { effort: "medium" } }]);
+            expect(summaryRequest.input.at(-2)?.reasoning?.effort).toBe("medium");
+            expect((await session.rpc.model.getCurrent()).reasoningEffort).toBe("max");
+
+            expect(
+                (await session.sendAndWait({ prompt: "Continue after the summary." }))?.data.content
+            ).toBe("COMPACTION_EFFORT_OK");
+            expect(handler.requests).toHaveLength(3);
+            const nextRequest = handler.requests[2];
+            expect(nextRequest.reasoning?.effort).toBe("max");
+            expect(
+                nextRequest.input.filter((item) => item.type === "configuration_update")
+            ).toEqual([]);
+        } finally {
+            await effortClient.stop();
+        }
+    });
+
+    it("preserves Anthropic compaction effort even when the reduction is enabled", async () => {
+        const handler = new RefusalBudgetReplayHandler();
+        const effortClient = createClient({ requestHandler: handler });
+        try {
+            await using session = await effortClient.createSession({
+                onPermissionRequest: approveAll,
+                model: "claude-opus-5.5",
+                reasoningEffort: "max",
+                provider: {
+                    type: "anthropic",
+                    baseUrl: "https://compaction-effort.invalid",
+                    bearerToken: "fake-byok-credential-for-e2e-tests",
+                    modelId: "claude-opus-5.5",
+                },
+                featureFlags: { COMPACTION_MEDIUM_REASONING_EFFORT: true },
+                expAssignments: {
+                    Features: [],
+                    Flights: {},
+                    Configs: [],
+                    AssignmentContext: "compaction-medium-effort",
+                },
+                infiniteSessions: { enabled: false },
+            });
+            expect(
+                (await session.sendAndWait({ prompt: "Initialize the effort scenario." }))?.data
+                    .content
+            ).toBe("FALLBACK_BUDGET_OK");
+            expect(handler.requests).toHaveLength(1);
+            expect(handler.requests[0].output_config?.effort).toBe("max");
+
+            const compacted = await session.rpc.history.compact({ trigger: "manual" });
+            expect(compacted).toMatchObject({
+                success: true,
+                summaryContent: "FALLBACK_BUDGET_OK",
+            });
+            expect(handler.requests).toHaveLength(2);
+            const summaryRequest = handler.requests[1];
+            expect(summaryRequest.output_config?.effort).toBe("max");
+            expect(
+                summaryRequest.messages.flatMap((message) =>
+                    message.output_config?.effort ? [message.output_config.effort] : []
+                )
+            ).toEqual([]);
+            expect((await session.rpc.model.getCurrent()).reasoningEffort).toBe("max");
+
+            expect(
+                (await session.sendAndWait({ prompt: "Continue after the summary." }))?.data.content
+            ).toBe("FALLBACK_BUDGET_OK");
+            expect(handler.requests).toHaveLength(3);
+            const nextRequest = handler.requests[2];
+            expect(nextRequest.output_config?.effort).toBe("max");
+            expect(nextRequest.messages.filter((message) => message.output_config)).toEqual([]);
+        } finally {
+            await effortClient.stop();
+        }
+    });
+
+    it("isolates compaction effort from concurrent sampling and selected effort changes", async ({
+        expect,
+        onTestFinished,
+    }) => {
+        const handler = new CompactionEffortReplayHandler();
+        const gate = {
+            entered: Promise.withResolvers<void>(),
+            release: Promise.withResolvers<void>(),
+        };
+        handler.summaryGate = gate;
+        const effortClient = createClient({ requestHandler: handler });
+        const stopClient = async () => {
+            gate.release.resolve();
+            const errors = await effortClient.stop();
+            if (errors.length) {
+                throw new AggregateError(errors, "Failed to stop compaction overlap client");
+            }
+        };
+        onTestFinished(stopClient);
+        await withTestCleanup(async () => {
+            const session = await effortClient.createSession({
+                onPermissionRequest: approveAll,
+                model: "gpt-6-sol",
+                reasoningEffort: "max",
+                provider: {
+                    type: "openai",
+                    wireApi: "responses",
+                    baseUrl: "https://compaction-effort.invalid",
+                    apiKey: "fake-byok-credential-for-e2e-tests",
+                    modelId: "gpt-6-sol",
+                },
+                streaming: false,
+                featureFlags: { COMPACTION_MEDIUM_REASONING_EFFORT: true },
+                expAssignments: {
+                    Features: [],
+                    Flights: {},
+                    Configs: [],
+                    AssignmentContext: "compaction-overlap",
+                },
+                infiniteSessions: { enabled: false },
+            });
+            expect(
+                (await session.sendAndWait({ prompt: "Initialize the overlap scenario." }))?.data
+                    .content
+            ).toBe("COMPACTION_EFFORT_OK");
+            const compaction = session.rpc.history.compact({ trigger: "manual" });
+            await withTestCleanup(
+                async () => {
+                    await Promise.race([
+                        gate.entered.promise,
+                        compaction.then((result) => {
+                            throw new Error(
+                                `Compaction completed before its summary gate: ${JSON.stringify(result)}`
+                            );
+                        }),
+                    ]);
+                    expect(handler.requests).toHaveLength(2);
+                    expect(handler.requests[1].input.at(-2)?.reasoning?.effort).toBe("medium");
+                    expect((await session.rpc.model.getCurrent()).reasoningEffort).toBe("max");
+
+                    expect(
+                        await session.rpc.mcp.executeSampling({
+                            requestId: "compaction-overlap-sampling",
+                            serverName: "compaction-overlap-server",
+                            mcpRequestId: "compaction-overlap-mcp",
+                            request: {
+                                messages: [
+                                    {
+                                        role: "user",
+                                        content: {
+                                            type: "text",
+                                            text: "Compute a sampling result.",
+                                        },
+                                    },
+                                ],
+                                maxTokens: 4096,
+                            },
+                        })
+                    ).toMatchObject({
+                        action: "success",
+                        result: { content: { type: "text", text: "COMPACTION_EFFORT_OK" } },
+                    });
+                    expect(handler.requests).toHaveLength(3);
+                    expect(handler.requests[2].reasoning?.effort).toBe("max");
+                    expect(
+                        handler.requests[2].input.filter(
+                            (item) => item.type === "configuration_update"
+                        )
+                    ).toEqual([]);
+
+                    await session.rpc.model.setReasoningEffort({ reasoningEffort: "high" });
+                    expect((await session.rpc.model.getCurrent()).reasoningEffort).toBe("high");
+                },
+                () => gate.release.resolve(),
+                async () => {
+                    expect(await compaction).toMatchObject({
+                        success: true,
+                        summaryContent: expect.stringContaining("COMPACTION_EFFORT_OK"),
+                    });
+                }
+            );
+            expect(handler.requests).toHaveLength(4);
+            const continuation = handler.requests[3];
+            expect(continuation.reasoning?.effort).toBe("max");
+            expect(
+                continuation.input.filter((item) => item.type === "configuration_update")
+            ).toEqual([{ type: "configuration_update", reasoning: { effort: "medium" } }]);
+            expect((await session.rpc.model.getCurrent()).reasoningEffort).toBe("high");
+            expect(
+                (await session.sendAndWait({ prompt: "Continue after the held summary." }))?.data
+                    .content
+            ).toBe("COMPACTION_EFFORT_OK");
+            expect(handler.requests).toHaveLength(5);
+            // The cache baseline stays pinned; the durable user boundary selects high.
+            expect(handler.requests[4].reasoning?.effort).toBe("max");
+            expect(
+                handler.requests[4].input.filter((item) => item.type === "configuration_update")
+            ).toEqual([{ type: "configuration_update", reasoning: { effort: "high" } }]);
+            expect(handler.requests[4].input.at(-2)?.reasoning?.effort).toBe("high");
+            expect((await session.rpc.model.getCurrent()).reasoningEffort).toBe("high");
+            await session.disconnect();
+        }, stopClient);
+    });
+});
+
+describe("Refusal fallback output budget", async () => {
+    const { createClient } = await createSdkTestContext();
+
+    it("should clamp fallback output before admission and retain its effective budget", async () => {
+        const handler = new RefusalBudgetReplayHandler();
+        const budgetClient = createClient({ requestHandler: handler });
+        try {
+            await budgetClient.start();
+            expect(
+                (await budgetClient.listModels()).find((model) => model.id === "claude-sonnet-5")
+            ).toMatchObject({
+                capabilities: {
+                    limits: {
+                        max_prompt_tokens: 112_000,
+                        max_context_window_tokens: 128_000,
+                        max_output_tokens: 64_000,
+                    },
+                },
+            });
+            const session = await budgetClient.createSession({
+                onPermissionRequest: approveAll,
+                model: "claude-sonnet-5.5",
+                // Refusal fallback is a first-party contract, not a BYOK switch.
+                providers: [],
+                infiniteSessions: { enabled: false },
+            });
+            const events: SessionEvent[] = [];
+            session.on((event) => events.push(event));
+            expect(
+                (await session.sendAndWait({ prompt: "Exercise refusal fallback admission." }))
+                    ?.data.content
+            ).toBe("FALLBACK_BUDGET_OK");
+            expect(
+                handler.requests.map(({ model, max_tokens }) => ({ model, max_tokens }))
+            ).toEqual([
+                { model: "claude-sonnet-5.5", max_tokens: 128_000 },
+                { model: "claude-sonnet-5", max_tokens: 64_000 },
+            ]);
+            expect(events.filter((event) => event.type === "session.error")).toEqual([]);
+            // Recorded model changes can arrive after the directly forwarded idle event.
+            await expect
+                .poll(() => events.filter((event) => event.type === "session.model_change"))
+                .toEqual([
+                    expect.objectContaining({
+                        data: expect.objectContaining({
+                            newModel: "claude-sonnet-5",
+                            previousModel: "claude-sonnet-5.5",
+                            cause: "refusal_fallback",
+                            source: "automatic",
+                        }),
+                    }),
+                ]);
+            expect((await session.rpc.model.getCurrent()).modelId).toBe("claude-sonnet-5");
+            const usage = events.filter((event) => event.type === "assistant.usage");
+            expect(
+                usage.map(({ data: { model, maxPromptTokens, maxOutputTokens } }) => ({
+                    model,
+                    maxPromptTokens,
+                    maxOutputTokens,
+                }))
+            ).toEqual([
+                { model: "claude-sonnet-5.5", maxPromptTokens: 250_000, maxOutputTokens: 128_000 },
+                { model: "claude-sonnet-5", maxPromptTokens: 64_000, maxOutputTokens: 64_000 },
+            ]);
+            expect(
+                (
+                    await session.rpc.metadata.contextInfo({
+                        promptTokenLimit: 0,
+                        outputTokenLimit: 64_000,
+                    })
+                ).contextInfo
+            ).toMatchObject({
+                modelName: "claude-sonnet-5",
+                limit: 112_000,
+                promptTokenLimit: 64_000,
+            });
+            // The next turn uses Sonnet 5's normal 32k cap, not the one-shot retry's 64k cap.
+            expect(
+                (
+                    await session.rpc.metadata.contextInfo({
+                        promptTokenLimit: 0,
+                        outputTokenLimit: 0,
+                    })
+                ).contextInfo
+            ).toMatchObject({ limit: 112_000, promptTokenLimit: 96_000 });
+            expect(
+                (await session.sendAndWait({ prompt: "Check the retained fallback budget." }))?.data
+                    .content
+            ).toBe("FALLBACK_BUDGET_OK");
+            expect(handler.requests).toHaveLength(3);
+            expect(handler.requests[2]).toMatchObject({
+                model: "claude-sonnet-5",
+                max_tokens: 32_000,
+            });
+            await session.disconnect();
+        } finally {
+            await budgetClient.stop();
+        }
+    });
+});
+
 function getNextSessionEvent<TEventType extends SessionEvent["type"]>(
     session: CopilotSession,
     eventType: TEventType,
@@ -35,12 +1089,408 @@ function getNextSessionEvent<TEventType extends SessionEvent["type"]>(
 }
 
 describe("Compaction", async () => {
-    const { copilotClient: client, openAiEndpoint } = await createSdkTestContext();
+    const {
+        copilotClient: client,
+        openAiEndpoint,
+        createClient,
+        workDir,
+    } = await createSdkTestContext();
+
+    // Paused-clock Rust tests pin the cancellation/timeout budgets; this covers
+    // cancellation across the real SDK filesystem callback boundary.
+    it("should abort manual compaction while workflow storage is stalled", async () => {
+        let markEntered!: () => void;
+        const entered = new Promise<void>((resolve) => {
+            markEntered = resolve;
+        });
+        let releaseStorage!: () => void;
+        const release = new Promise<void>((resolve) => {
+            releaseStorage = resolve;
+        });
+        const database = new DatabaseSync(":memory:");
+        const handler = new BudgetReplayHandler();
+        const compactionClient = createClient({
+            requestHandler: handler,
+            sessionFs: {
+                initialCwd: workDir,
+                sessionStatePath: join(workDir, "compaction-state"),
+                conventions: process.platform === "win32" ? "windows" : "posix",
+                capabilities: { sqlite: true },
+            },
+        });
+        let stalled = false;
+        let storageRequest: Promise<void> | undefined;
+        try {
+            await using session = await compactionClient.createSession({
+                onPermissionRequest: approveAll,
+                model: "uncatalogued-budget-model",
+                provider: {
+                    type: "openai",
+                    wireApi: "completions",
+                    baseUrl: "https://budget-replay.invalid/v1",
+                    bearerToken: "fake-byok-credential-for-e2e-tests",
+                    modelId: "uncatalogued-budget-model",
+                    maxPromptTokens: 100_000,
+                },
+                infiniteSessions: { enabled: false },
+                createSessionFsProvider: () => ({
+                    readFile: (path) => fs.readFile(path, "utf8"),
+                    writeFile: (path, content) => fs.writeFile(path, content),
+                    appendFile: (path, content) => fs.appendFile(path, content),
+                    exists: async (path) => existsSync(path),
+                    stat: async (path) => {
+                        const info = await fs.stat(path);
+                        return {
+                            isFile: info.isFile(),
+                            isDirectory: info.isDirectory(),
+                            size: info.size,
+                            mtime: info.mtime.toISOString(),
+                            birthtime: info.birthtime.toISOString(),
+                        };
+                    },
+                    mkdir: async (path, recursive, mode) => {
+                        await fs.mkdir(path, { recursive, mode });
+                    },
+                    readdir: (path) => fs.readdir(path),
+                    readdirWithTypes: async (path) =>
+                        (await fs.readdir(path, { withFileTypes: true })).map((entry) => ({
+                            name: entry.name,
+                            type: entry.isDirectory() ? "directory" : "file",
+                        })),
+                    rm: (path, recursive, force) => fs.rm(path, { recursive, force }),
+                    rename: (from, to) => fs.rename(from, to),
+                    sqlite: {
+                        exists: async () => true,
+                        query: async (queryType, query, params) => {
+                            if (stalled && /\b(?:factory|workflow)_runs\b/.test(query)) {
+                                markEntered();
+                                storageRequest = release;
+                                await storageRequest;
+                                throw new Error("Controlled workflow storage failure");
+                            }
+                            if (queryType === "exec") {
+                                database.exec(query);
+                                return;
+                            }
+                            const statement = database.prepare(query);
+                            if (queryType === "query") {
+                                const rows = statement.all(params ?? {}).map((row) => {
+                                    const values: Record<string, string | number | null> = {};
+                                    for (const [key, value] of Object.entries(row)) {
+                                        if (
+                                            value !== null &&
+                                            typeof value !== "string" &&
+                                            typeof value !== "number"
+                                        ) {
+                                            throw new Error(`Unexpected SQLite value in ${key}`);
+                                        }
+                                        values[key] = value;
+                                    }
+                                    return values;
+                                });
+                                return {
+                                    rows,
+                                    columns: statement.columns().map((column) => column.name),
+                                    rowsAffected: 0,
+                                };
+                            }
+                            const result = statement.run(params ?? {});
+                            return {
+                                rows: [],
+                                columns: [],
+                                rowsAffected: Number(result.changes),
+                                lastInsertRowid: Number(result.lastInsertRowid),
+                            };
+                        },
+                    },
+                }),
+            });
+            expect(
+                (await session.sendAndWait({ prompt: "Initialize cancellable compaction." }))?.data
+                    .content
+            ).toBe("BUDGET_CONTROL_OK");
+            const conversation = (events: SessionEvent[]) =>
+                events.filter(
+                    (event) => event.type === "user.message" || event.type === "assistant.message"
+                );
+            const before = conversation(await session.getEvents());
+            const completed: Extract<SessionEvent, { type: "session.compaction_complete" }>[] = [];
+            session.on("session.compaction_complete", (event) => completed.push(event));
+            stalled = true;
+            const compaction = session.rpc.history.compact().then(
+                (result) => ({ result }),
+                (error: unknown) => ({ error })
+            );
+            await Promise.race([
+                entered,
+                compaction.then((outcome) => {
+                    throw new Error(
+                        `Compaction settled before workflow storage: ${JSON.stringify(outcome)}`
+                    );
+                }),
+            ]);
+
+            expect(await session.rpc.history.abortManualCompaction()).toEqual({ aborted: true });
+            const outcome = await compaction;
+            expect(outcome).toMatchObject({
+                error: expect.objectContaining({
+                    message: expect.stringContaining("Compaction Cancelled"),
+                }),
+            });
+            await expect
+                .poll(() => completed)
+                .toEqual([
+                    expect.objectContaining({
+                        data: expect.objectContaining({
+                            success: false,
+                            error: "Compaction Cancelled",
+                        }),
+                    }),
+                ]);
+            expect(conversation(await session.getEvents())).toEqual(before);
+            expect(await session.rpc.history.abortManualCompaction()).toEqual({ aborted: false });
+            expect(
+                (await session.sendAndWait({ prompt: "Continue after the cancelled compaction." }))
+                    ?.data.content
+            ).toBe("BUDGET_CONTROL_OK");
+            expect(handler.requests.at(-1)).toMatchObject({
+                messages: expect.arrayContaining([
+                    expect.objectContaining({
+                        role: "user",
+                        content: expect.stringContaining("Initialize cancellable compaction."),
+                    }),
+                ]),
+            });
+        } finally {
+            releaseStorage();
+            await storageRequest;
+            try {
+                await compactionClient.stop();
+            } finally {
+                database.close();
+            }
+        }
+    });
+
+    it("should reject an oversized provider prompt before any inference request", async () => {
+        const handler = new BudgetReplayHandler();
+        const budgetClient = createClient({ requestHandler: handler });
+        const createSession = (maxPromptTokens: number) =>
+            budgetClient.createSession({
+                onPermissionRequest: approveAll,
+                model: "uncatalogued-budget-model",
+                provider: {
+                    type: "openai",
+                    wireApi: "completions",
+                    baseUrl: "https://budget-replay.invalid/v1",
+                    bearerToken: "fake-byok-credential-for-e2e-tests",
+                    modelId: "uncatalogued-budget-model",
+                    maxPromptTokens,
+                    maxOutputTokens: 200_000,
+                },
+                infiniteSessions: { enabled: false },
+            });
+        try {
+            const prompt = "budget-boundary ".repeat(16_384);
+            const control = await createSession(250_000);
+            expect((await control.sendAndWait({ prompt }))?.data.content).toBe("BUDGET_CONTROL_OK");
+            expect(handler.requests).toHaveLength(1);
+            await control.disconnect();
+            // Leave room for static context so this reaches final request admission.
+            const session = await createSession(32_000);
+            const errors: Extract<SessionEvent, { type: "session.error" }>[] = [];
+            session.on((event) => {
+                if (event.type === "session.error") errors.push(event);
+            });
+            const admissionError =
+                /Request exceeds the model's prompt budget after reserving output \(\d+ tokens; limit 32000\)\. Reduce context or compact before continuing\./;
+            await expect(session.sendAndWait({ prompt })).rejects.toThrow(admissionError);
+            expect(errors).toHaveLength(1);
+            expect(errors[0].data.message).toMatch(admissionError);
+            expect(handler.requests).toHaveLength(1);
+            expect((await session.rpc.model.getCurrent()).modelId).toBe(
+                "uncatalogued-budget-model"
+            );
+            await session.disconnect();
+        } finally {
+            await budgetClient.stop();
+        }
+    });
+
+    it("should report the effective prompt budget after manual compaction", async () => {
+        const handler = new BudgetReplayHandler();
+        const budgetClient = createClient({ requestHandler: handler });
+        try {
+            const session = await budgetClient.createSession({
+                onPermissionRequest: approveAll,
+                model: "uncatalogued-budget-model",
+                provider: {
+                    type: "openai",
+                    wireApi: "completions",
+                    baseUrl: "https://budget-replay.invalid/v1",
+                    bearerToken: "fake-byok-credential-for-e2e-tests",
+                    modelId: "uncatalogued-budget-model",
+                },
+                modelCapabilities: {
+                    limits: {
+                        max_prompt_tokens: 112_000,
+                        max_context_window_tokens: 128_000,
+                        max_output_tokens: 32_000,
+                    },
+                },
+                infiniteSessions: { enabled: false },
+            });
+            expect(
+                (await session.sendAndWait({ prompt: "Initialize manual compaction." }))?.data
+                    .content
+            ).toBe("BUDGET_CONTROL_OK");
+            const events: SessionEvent[] = [];
+            session.on((event) => {
+                if (
+                    event.type === "session.compaction_start" ||
+                    event.type === "session.compaction_complete"
+                ) {
+                    events.push(event);
+                }
+            });
+            const result = await session.rpc.history.compact({ trigger: "manual" });
+            expect(result).toMatchObject({
+                success: true,
+                summaryContent: "BUDGET_CONTROL_OK",
+                contextWindow: { tokenLimit: 96_000 },
+            });
+            expect(events.map((event) => [event.type, event.data])).toEqual([
+                ["session.compaction_start", expect.objectContaining({ tokenLimit: 96_000 })],
+                [
+                    "session.compaction_complete",
+                    expect.objectContaining({ success: true, tokenLimit: 96_000 }),
+                ],
+            ]);
+            expect(handler.requests).toHaveLength(2);
+            await session.disconnect();
+        } finally {
+            await budgetClient.stop();
+        }
+    });
+
+    it("should reject capacity-consuming output caps without an inference request", async () => {
+        const handler = new BudgetReplayHandler();
+        const budgetClient = createClient({ requestHandler: handler });
+        try {
+            const session = await budgetClient.createSession({
+                onPermissionRequest: approveAll,
+                model: "uncatalogued-budget-model",
+                provider: {
+                    type: "openai",
+                    wireApi: "completions",
+                    baseUrl: "https://budget-replay.invalid/v1",
+                    bearerToken: "fake-byok-credential-for-e2e-tests",
+                    modelId: "uncatalogued-budget-model",
+                },
+                modelCapabilities: {
+                    limits: {
+                        max_prompt_tokens: 112_000,
+                        max_context_window_tokens: 128_000,
+                        max_output_tokens: 128_000,
+                    },
+                },
+                infiniteSessions: { enabled: false },
+            });
+            const noCapacity =
+                "Output token reservation 128000 leaves no room in the 128000-token context window";
+            await expect(
+                session.sendAndWait({ prompt: "Initialize an invalid context budget." })
+            ).rejects.toThrow(noCapacity);
+            for (const outputTokenLimit of [128_000, 0]) {
+                await expect(
+                    session.rpc.metadata.contextInfo({ promptTokenLimit: 0, outputTokenLimit })
+                ).rejects.toThrow(noCapacity);
+            }
+            await expect(session.rpc.history.compact({ trigger: "manual" })).rejects.toThrow(
+                noCapacity
+            );
+            const context = await session.rpc.metadata.contextInfo({
+                promptTokenLimit: 0,
+                outputTokenLimit: 32_000,
+            });
+            expect(context.contextInfo).toMatchObject({
+                limit: 112_000,
+                promptTokenLimit: 96_000,
+            });
+            expect(handler.requests).toHaveLength(0);
+            await session.disconnect();
+        } finally {
+            await budgetClient.stop();
+        }
+    });
+
+    it("should resolve model switch budgets after the next request initializes context", async () => {
+        const handler = new BudgetReplayHandler();
+        const budgetClient = createClient({ requestHandler: handler });
+        try {
+            const session = await budgetClient.createSession({
+                onPermissionRequest: approveAll,
+                model: "uncatalogued-budget-model",
+                provider: {
+                    type: "openai",
+                    wireApi: "completions",
+                    baseUrl: "https://budget-replay.invalid/v1",
+                    bearerToken: "fake-byok-credential-for-e2e-tests",
+                    modelId: "uncatalogued-budget-model",
+                },
+                modelCapabilities: {
+                    limits: {
+                        max_prompt_tokens: 112_000,
+                        max_context_window_tokens: 128_000,
+                        max_output_tokens: 32_000,
+                    },
+                },
+                infiniteSessions: { enabled: false },
+            });
+            for (const promptLimit of [112_000, 100_000]) {
+                if (promptLimit === 100_000) {
+                    await session.setModel("uncatalogued-budget-model", {
+                        modelCapabilities: {
+                            limits: {
+                                max_prompt_tokens: promptLimit,
+                                max_context_window_tokens: 128_000,
+                                max_output_tokens: 32_000,
+                            },
+                        },
+                    });
+                }
+                expect(
+                    (await session.sendAndWait({ prompt: "Initialize the current budget." }))?.data
+                        .content
+                ).toBe("BUDGET_CONTROL_OK");
+                const context = await session.rpc.metadata.contextInfo({
+                    promptTokenLimit: 0,
+                    outputTokenLimit: 0,
+                });
+                expect(context.contextInfo).toMatchObject({
+                    modelName: "uncatalogued-budget-model",
+                    limit: promptLimit,
+                    promptTokenLimit: 96_000,
+                });
+            }
+            expect(handler.requests).toHaveLength(2);
+            await session.disconnect();
+        } finally {
+            await budgetClient.stop();
+        }
+    });
 
     it("should trigger compaction with low threshold and emit events", async () => {
         // Create session with very low compaction thresholds to trigger compaction quickly
         const session = await client.createSession({
             onPermissionRequest: approveAll,
+            modelCapabilities: {
+                limits: {
+                    max_prompt_tokens: 112_000,
+                    max_context_window_tokens: 128_000,
+                    max_output_tokens: 32_000,
+                },
+            },
             infiniteSessions: {
                 enabled: true,
                 // Trigger background compaction at 0.5% context usage (~1000 tokens)
@@ -59,6 +1509,10 @@ describe("Compaction", async () => {
             "session.compaction_start",
             "session.compaction_start"
         );
+        const usageEvents: Extract<SessionEvent, { type: "session.usage_info" }>[] = [];
+        session.on((event) => {
+            if (event.type === "session.usage_info") usageEvents.push(event);
+        });
         // Wait specifically for a *successful* compaction_complete so that any transient
         // failed compaction event the daemon may emit before a successful retry is ignored
         // (mirrors the dotnet/rust references).
@@ -116,6 +1570,60 @@ describe("Compaction", async () => {
         // Should remember it was about a dragon (context preserved via summary)
         expect(content).toContain("kaedrith");
         expect(content).toContain("dragon");
+
+        // OpenAI transports omit the output cap; Anthropic sends its advertised maximum.
+        // Both must reserve the same output headroom.
+        expect(usageEvents.length).toBeGreaterThan(0);
+        for (const event of usageEvents) expect(event.data.tokenLimit).toBe(96_000);
+        const context = await session.rpc.metadata.contextInfo({
+            promptTokenLimit: 0,
+            outputTokenLimit: 0,
+        });
+        expect(context.contextInfo).toMatchObject({ limit: 112_000, promptTokenLimit: 96_000 });
+        const attribution = await session.rpc.metadata.getContextAttribution();
+        expect(attribution.contextAttribution).toMatchObject({
+            modelId: context.contextInfo?.modelName,
+            limit: 112_000,
+            promptTokenLimit: 96_000,
+            bufferTokens: context.contextInfo?.bufferTokens,
+            compactionThreshold: context.contextInfo?.compactionThreshold,
+        });
+        for (const outputTokenLimit of [-1, 32_001]) {
+            await expect(
+                session.rpc.metadata.contextInfo({ promptTokenLimit: 0, outputTokenLimit })
+            ).rejects.toThrow(
+                outputTokenLimit < 0
+                    ? /Invalid output token limit/
+                    : /exceeds the advertised maximum/
+            );
+        }
+        const afterInvalidCaps = await session.rpc.metadata.contextInfo({
+            promptTokenLimit: 0,
+            outputTokenLimit: 0,
+        });
+        expect(afterInvalidCaps.contextInfo).toMatchObject({
+            limit: 112_000,
+            promptTokenLimit: 96_000,
+        });
+        const endpoint = {
+            capi: "/chat/completions",
+            "openai-completions": "/chat/completions",
+            "openai-responses": "/responses",
+            "anthropic-messages": "/v1/messages",
+        }[testBackend];
+        const requests = (await openAiEndpoint.getRequests()).filter(
+            (request) => request.method === "POST" && request.url.endsWith(endpoint)
+        );
+        expect(requests.length).toBeGreaterThan(0);
+        for (const request of requests) {
+            const body = JSON.parse(request.body);
+            if (testBackend === "anthropic-messages") {
+                expect(body.max_tokens).toBe(32_000);
+            } else {
+                expect(body).not.toHaveProperty("max_tokens");
+                expect(body).not.toHaveProperty("max_output_tokens");
+            }
+        }
     }, 120000);
 
     it("should not emit compaction events when infinite sessions disabled", async () => {
@@ -175,4 +1683,153 @@ describe("Compaction", async () => {
             await session.disconnect();
         }
     });
+    it("should resolve selected-tier defaults and confirm a smaller-tier switch", async () => {
+        const modelId = "gpt-5.4-mini";
+        class TierBudgetReplayHandler extends BudgetReplayHandler {
+            protected override async sendRequest(request: Request): Promise<Response> {
+                const path = new URL(request.url).pathname;
+                if (path === "/models") {
+                    return Response.json({
+                        data: [
+                            {
+                                id: modelId,
+                                name: "Tier budget fixture",
+                                object: "model",
+                                vendor: "OpenAI",
+                                version: "1",
+                                model_picker_enabled: true,
+                                supported_endpoints: ["/chat/completions"],
+                                capabilities: {
+                                    type: "chat",
+                                    family: modelId,
+                                    tokenizer: "o200k_base",
+                                    supports: { vision: false, streaming: true, tool_calls: true },
+                                    limits: {
+                                        max_prompt_tokens: 112_000,
+                                        max_context_window_tokens: 128_000,
+                                        max_output_tokens: 32_000,
+                                    },
+                                },
+                                billing: {
+                                    token_prices: {
+                                        default: { max_prompt_tokens: 88_000 },
+                                        long_context: { max_prompt_tokens: 112_000 },
+                                    },
+                                },
+                            },
+                        ],
+                    });
+                }
+                if (path.endsWith("/models/session")) return Response.json({});
+                if (path.includes("/policy")) return Response.json({ state: "enabled" });
+                return super.sendRequest(request);
+            }
+        }
+        const handler = new TierBudgetReplayHandler();
+        const budgetClient = createClient({ requestHandler: handler });
+        try {
+            await budgetClient.start();
+            expect(
+                (await budgetClient.listModels()).find((model) => model.id === modelId)
+            ).toMatchObject({
+                capabilities: {
+                    limits: { max_prompt_tokens: 112_000 },
+                },
+            });
+            const session = await budgetClient.createSession({
+                onPermissionRequest: approveAll,
+                model: modelId,
+                // Exercise CAPI pricing tiers even in the provider transport matrix.
+                providers: [],
+                contextTier: "long_context",
+                infiniteSessions: { enabled: false },
+            });
+            expect(
+                (await session.sendAndWait({ prompt: "tier-budget-boundary ".repeat(16_384) }))
+                    ?.data.content
+            ).toBe("BUDGET_CONTROL_OK");
+            const longContext = await session.rpc.metadata.contextInfo({
+                promptTokenLimit: 0,
+                outputTokenLimit: 0,
+            });
+            expect(longContext.contextInfo).toMatchObject({
+                modelName: modelId,
+                limit: 112_000,
+                promptTokenLimit: 96_000,
+            });
+            const attribution = await session.rpc.metadata.getContextAttribution();
+            expect(attribution.contextAttribution).toMatchObject({
+                modelId,
+                limit: 112_000,
+                promptTokenLimit: 96_000,
+                bufferTokens: longContext.contextInfo?.bufferTokens,
+            });
+            expect((await session.rpc.model.getCurrent()).contextTier).toBe("long_context");
+            const target = {
+                modelId,
+                contextTier: "default",
+                modelCapabilities: { limits: { max_output_tokens: 64_000 } },
+                runCompactionPreflight: true,
+            } as const;
+            const preflight = await session.rpc.model.switchTo(target);
+            expect(preflight).toMatchObject({
+                status: "confirmation_required",
+                modelState: { contextTier: "long_context" },
+                confirmation: {
+                    targetModelDisplayName: modelId,
+                    targetLimit: 64_000,
+                },
+            });
+            expect(preflight.confirmation?.currentTokens).toBeGreaterThan(64_000);
+            expect(preflight.confirmation?.currentTokens).toBeLessThanOrEqual(88_000);
+            expect(handler.requests).toHaveLength(1);
+            expect(
+                await session.rpc.model.switchTo({ ...target, compactionDecision: "cancel" })
+            ).toMatchObject({
+                status: "cancelled",
+                modelState: { contextTier: "long_context" },
+            });
+            expect(handler.requests).toHaveLength(1);
+            const compactionEvents: SessionEvent[] = [];
+            session.on((event) => {
+                if (
+                    event.type === "session.compaction_start" ||
+                    event.type === "session.compaction_complete"
+                ) {
+                    compactionEvents.push(event);
+                }
+            });
+            expect(
+                await session.rpc.model.switchTo({ ...target, compactionDecision: "compact" })
+            ).toMatchObject({
+                status: "applied",
+                modelState: { contextTier: "default" },
+            });
+            expect(compactionEvents.map((event) => [event.type, event.data])).toEqual([
+                ["session.compaction_start", expect.objectContaining({ tokenLimit: 64_000 })],
+                [
+                    "session.compaction_complete",
+                    expect.objectContaining({ success: true, tokenLimit: 64_000 }),
+                ],
+            ]);
+            expect(handler.requests).toHaveLength(2);
+            expect(
+                (await session.sendAndWait({ prompt: "Check the compacted default tier." }))?.data
+                    .content
+            ).toBe("BUDGET_CONTROL_OK");
+            const defaultContext = await session.rpc.metadata.contextInfo({
+                promptTokenLimit: 0,
+                outputTokenLimit: 0,
+            });
+            expect(defaultContext.contextInfo).toMatchObject({
+                modelName: modelId,
+                limit: 88_000,
+                promptTokenLimit: 64_000,
+            });
+            expect(handler.requests).toHaveLength(3);
+            await session.disconnect();
+        } finally {
+            await budgetClient.stop();
+        }
+    });
 });
diff --git a/nodejs/test/e2e/computer_use_oauth.e2e.test.ts b/nodejs/test/e2e/computer_use_oauth.e2e.test.ts
new file mode 100644
index 0000000000..76bdd90390
--- /dev/null
+++ b/nodejs/test/e2e/computer_use_oauth.e2e.test.ts
@@ -0,0 +1,347 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { execFileSync } from "node:child_process";
+import { mkdir, mkdtemp, readFile, realpath, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
+import { describe, test, type TestContext } from "vitest";
+import { approveAll, CopilotClient, RuntimeConnection } from "../../src/index.js";
+import { startComputerUseOAuthServer } from "../../../test/harness/test-mcp-computer-use-oauth-server.mjs";
+import { createSdkTestContext, DEFAULT_GITHUB_TOKEN } from "./harness/sdkTestContext.js";
+
+const TEST_MCP_SERVER = fileURLToPath(
+    new URL("../../../test/harness/test-mcp-server.mjs", import.meta.url)
+);
+const SERVER_NAME = "unrelated-oauth";
+
+describe("Computer Use OAuth isolation", async () => {
+    const { env } = await createSdkTestContext();
+
+    async function createFixture(context: TestContext, preference?: boolean, startup = false) {
+        // The shared harness clears workDir before this fixture's onTestFinished cleanup.
+        const directory = await realpath(await mkdtemp(join(tmpdir(), "computer-use-oauth-")));
+        const home = join(directory, "home");
+        const plugin = join(directory, "computer-use");
+        let client: CopilotClient | undefined;
+        const startingOAuthServer = startComputerUseOAuthServer({
+            deferRegistration: !startup,
+            deferInitialChallenge: startup,
+            deferAuthorizationMetadata: startup,
+            preconfiguredClientId: startup ? "app-client" : "",
+        });
+        context.onTestFinished(async () => {
+            const errors: unknown[] = [];
+            const [serverStartup] = await Promise.allSettled([startingOAuthServer]);
+            if (serverStartup.status === "fulfilled") {
+                serverStartup.value.releaseRegistration();
+                serverStartup.value.releaseInitialChallenge();
+                serverStartup.value.releaseAuthorizationMetadata();
+            }
+            if (client) {
+                try {
+                    await readFile(join(plugin, ".plugin", "plugin.json"), "utf8");
+                } catch (error) {
+                    errors.push(
+                        new Error(
+                            "Computer Use OAuth fixture was removed before its client stopped",
+                            {
+                                cause: error,
+                            }
+                        )
+                    );
+                }
+                try {
+                    errors.push(...(await client.stop()));
+                } catch (error) {
+                    errors.push(error);
+                }
+            }
+            if (serverStartup.status === "fulfilled") {
+                try {
+                    await serverStartup.value.close();
+                } catch (error) {
+                    errors.push(error);
+                }
+            }
+            try {
+                await rm(directory, {
+                    recursive: true,
+                    force: true,
+                    maxRetries: 10,
+                    retryDelay: 100,
+                });
+            } catch (error) {
+                errors.push(error);
+            }
+            if (errors.length)
+                throw new AggregateError(errors, "Computer Use OAuth cleanup failed");
+        });
+        const oauthServer = await startingOAuthServer;
+        context.signal.throwIfAborted();
+        await mkdir(home);
+        await mkdir(join(plugin, ".plugin"), { recursive: true });
+        execFileSync("git", ["init", "--quiet", directory], { windowsHide: true });
+        if (preference !== undefined) {
+            await writeFile(
+                join(home, "settings.json"),
+                JSON.stringify({
+                    enabledPlugins: { "computer-use": preference },
+                })
+            );
+        }
+        await writeFile(
+            join(plugin, ".plugin", "plugin.json"),
+            JSON.stringify({
+                name: "computer-use",
+                version: "1.0.0",
+                mcpServers: "./.mcp.json",
+            })
+        );
+        await writeFile(
+            join(plugin, ".mcp.json"),
+            JSON.stringify({
+                mcpServers: {
+                    "computer-use": {
+                        command: process.execPath,
+                        args: [TEST_MCP_SERVER, "--server-name", "computer-use"],
+                        cwd: dirname(TEST_MCP_SERVER),
+                        tools: ["*"],
+                    },
+                },
+            })
+        );
+        client = new CopilotClient({
+            workingDirectory: directory,
+            env: {
+                ...env,
+                COPILOT_HOME: home,
+                GH_CONFIG_DIR: home,
+                XDG_CONFIG_HOME: home,
+                XDG_STATE_HOME: home,
+                COPILOT_DISABLE_KEYTAR: "1",
+            },
+            gitHubToken: DEFAULT_GITHUB_TOKEN,
+            connection: RuntimeConnection.forStdio({ path: process.env.COPILOT_CLI_PATH }),
+        });
+        await client.start();
+        context.signal.throwIfAborted();
+        await client.rpc.plugins.builtin.set({ paths: [plugin] });
+        const session = await client.createSession({
+            workingDirectory: directory,
+            onPermissionRequest: approveAll,
+            onMcpAuthRequest: async () => ({ kind: "cancelled" }),
+            mcpServers: {
+                [SERVER_NAME]: {
+                    type: "http",
+                    url: `${oauthServer.url}/mcp`,
+                    tools: ["*"],
+                    ...(startup ? { oauthClientId: "app-client", oauthPublicClient: true } : {}),
+                },
+            },
+        });
+        return { client, session, oauthServer };
+    }
+
+    test.for([
+        { preference: "unset", hosted: false },
+        { preference: "disabled", hosted: false },
+        { preference: "unset", hosted: true },
+        { preference: "disabled", hosted: true },
+    ] as const)(
+        "returns the initial OAuth URL across Computer Use toggles ($preference, hosted=$hosted)",
+        { timeout: 90_000 },
+        async ({ preference, hosted }, context) => {
+            const { expect } = context;
+            const { client, session, oauthServer } = await createFixture(
+                context,
+                preference === "disabled" ? false : undefined
+            );
+            const [initial] = await Promise.all([
+                session.rpc.mcp.list(),
+                session.rpc.plugins.list(),
+            ]);
+            expect(initial.servers.map((server) => server.name)).not.toContain("computer-use");
+            const login = session.rpc.mcp.oauth
+                .login({
+                    serverName: SERVER_NAME,
+                    forceReauth: true,
+                    ...(hosted ? { redirectUri: "https://agent.example.test/oauth/callback" } : {}),
+                })
+                .then(
+                    (result) => ({ result }),
+                    (error: unknown) => ({ error })
+                );
+            // Registration is after lifetime capture but before the browser URL is returned.
+            await expect
+                .poll(() => oauthServer.requests.map((request) => request.path), {
+                    timeout: 60_000,
+                })
+                .toContain("/register");
+            for (const enabled of [true, false, true]) {
+                if (enabled) await client.rpc.plugins.enable({ names: ["computer-use"] });
+                else await client.rpc.plugins.disable({ names: ["computer-use"] });
+                await expect
+                    .poll(
+                        async () =>
+                            (await session.rpc.mcp.list()).servers.find(
+                                (candidate) => candidate.name === "computer-use"
+                            )?.status,
+                        { timeout: 60_000 }
+                    )
+                    .toBe(enabled ? "connected" : undefined);
+            }
+            oauthServer.releaseRegistration();
+            const outcome = await login;
+            if ("error" in outcome) throw outcome.error;
+            const result = outcome.result;
+            expect(result.authorizationUrl).toBeDefined();
+            const authorization = new URL(result.authorizationUrl!);
+            expect(authorization.origin).toBe(oauthServer.url);
+            expect(authorization.searchParams.get("client_id")).toBe("registered-client");
+
+            await client.rpc.plugins.disable({ names: ["computer-use"] });
+            await expect
+                .poll(
+                    async () => (await session.rpc.mcp.list()).servers.map((server) => server.name),
+                    { timeout: 60_000 }
+                )
+                .not.toContain("computer-use");
+            const callback = new URL(authorization.searchParams.get("redirect_uri")!);
+            callback.searchParams.set("code", "accepted-code");
+            callback.searchParams.set("state", authorization.searchParams.get("state")!);
+            if (hosted) {
+                expect(result.authorizationId).toBe(authorization.searchParams.get("state"));
+                expect(callback.origin).toBe("https://agent.example.test");
+                await session.rpc.mcp.oauth.complete({
+                    authorizationId: result.authorizationId!,
+                    callbackUrl: callback.toString(),
+                });
+            } else {
+                const response = await fetch(callback);
+                expect(response.ok).toBe(true);
+            }
+            await expect
+                .poll(
+                    async () =>
+                        (await session.rpc.mcp.list()).servers.find(
+                            (server) => server.name === SERVER_NAME
+                        )?.status,
+                    { timeout: 60_000 }
+                )
+                .toBe("connected");
+            expect(
+                (await session.rpc.mcp.listTools({ serverName: SERVER_NAME })).tools.map(
+                    (tool) => tool.name
+                )
+            ).toContain("whoami");
+            const tokens = oauthServer.requests.filter((request) => request.path === "/token");
+            expect(tokens).toHaveLength(1);
+            expect(new URLSearchParams(tokens[0].body).get("client_id")).toBe("registered-client");
+        }
+    );
+
+    test.for(["unset", "disabled"] as const)(
+        "preserves preconfigured-client OAuth overlapping initial discovery (%s preference)",
+        { timeout: 90_000 },
+        async (preference, context) => {
+            const { expect } = context;
+            const { client, session, oauthServer } = await createFixture(
+                context,
+                preference === "disabled" ? false : undefined,
+                true
+            );
+            const discovery = session.rpc.mcp.list().then(
+                (result) => ({ result }),
+                (error: unknown) => ({ error })
+            );
+            const login = session.rpc.mcp.oauth.login({ serverName: SERVER_NAME }).then(
+                (result) => ({ result }),
+                (error: unknown) => ({ error })
+            );
+            await expect
+                .poll(() => oauthServer.requests.filter((request) => request.path === "/mcp"), {
+                    timeout: 60_000,
+                })
+                .not.toHaveLength(0);
+            await session.rpc.plugins.list();
+            oauthServer.releaseInitialChallenge();
+            await expect
+                .poll(() => oauthServer.requests.map((request) => request.path), {
+                    timeout: 60_000,
+                })
+                .toContain("/.well-known/oauth-authorization-server");
+            const discovered = await discovery;
+            if ("error" in discovered) throw discovered.error;
+            expect(discovered.result.servers.map((server) => server.name)).not.toContain(
+                "computer-use"
+            );
+            await client.rpc.plugins.enable({ names: ["computer-use"] });
+            await expect
+                .poll(
+                    async () =>
+                        (await session.rpc.mcp.list()).servers.find(
+                            (server) => server.name === "computer-use"
+                        )?.status,
+                    { timeout: 60_000 }
+                )
+                .toBe("connected");
+            oauthServer.releaseAuthorizationMetadata();
+            const outcome = await login;
+            if ("error" in outcome) throw outcome.error;
+            const authorization = new URL(outcome.result.authorizationUrl!);
+            expect(authorization.searchParams.get("client_id")).toBe("app-client");
+            const callback = new URL(authorization.searchParams.get("redirect_uri")!);
+            callback.searchParams.set("code", "accepted-code");
+            callback.searchParams.set("state", authorization.searchParams.get("state")!);
+            expect((await fetch(callback)).ok).toBe(true);
+            await expect
+                .poll(
+                    async () =>
+                        (await session.rpc.mcp.list()).servers.find(
+                            (server) => server.name === SERVER_NAME
+                        )?.status,
+                    { timeout: 60_000 }
+                )
+                .toBe("connected");
+            expect(
+                (await session.rpc.mcp.listTools({ serverName: SERVER_NAME })).tools.map(
+                    (tool) => tool.name
+                )
+            ).toContain("whoami");
+            expect(
+                oauthServer.requests.filter((request) => request.path === "/register")
+            ).toHaveLength(0);
+            const tokens = oauthServer.requests.filter((request) => request.path === "/token");
+            expect(tokens).toHaveLength(1);
+            expect(new URLSearchParams(tokens[0].body).get("client_id")).toBe("app-client");
+        }
+    );
+
+    test("still cancels initial OAuth when its own server is reloaded", async (context) => {
+        const { expect } = context;
+        const { session, oauthServer } = await createFixture(context);
+        await session.rpc.mcp.list();
+        const login = session.rpc.mcp.oauth
+            .login({ serverName: SERVER_NAME, forceReauth: true })
+            .then(
+                (result) => ({ result }),
+                (error: unknown) => ({ error })
+            );
+        await expect
+            .poll(() => oauthServer.requests.map((request) => request.path), { timeout: 60_000 })
+            .toContain("/register");
+        await session.rpc.mcp.reload();
+        oauthServer.releaseRegistration();
+        expect(await login).toEqual({
+            error: expect.objectContaining({
+                message: expect.stringContaining(
+                    "MCP OAuth was cancelled because its original requester or configuration changed."
+                ),
+            }),
+        });
+        expect(oauthServer.requests.filter((request) => request.path === "/token")).toHaveLength(0);
+    }, 90_000);
+});
diff --git a/nodejs/test/e2e/copilot_request_handler.e2e.test.ts b/nodejs/test/e2e/copilot_request_handler.e2e.test.ts
index af79d84ae3..6faaf40a32 100644
--- a/nodejs/test/e2e/copilot_request_handler.e2e.test.ts
+++ b/nodejs/test/e2e/copilot_request_handler.e2e.test.ts
@@ -4,6 +4,8 @@
 
 import { createServer, IncomingMessage, Server as HttpServer, ServerResponse } from "http";
 import { AddressInfo } from "net";
+import { writeFile } from "node:fs/promises";
+import { join } from "node:path";
 import { afterAll, describe, expect, it } from "vitest";
 import { WebSocketServer } from "ws";
 import {
@@ -12,9 +14,11 @@ import {
     CopilotWebSocketForwarder,
     defineTool,
     type CopilotRequestContext,
+    type SessionConfig,
 } from "../../src/index.js";
 import { createSdkTestContext } from "./harness/sdkTestContext.js";
 import { waitForCondition } from "./harness/sdkTestHelper.js";
+import { mcpTestServerConfig } from "./harness/mcpTestServer.js";
 
 const HTTP_TEXT = "OK from synthetic HTTP upstream.";
 const WS_TEXT = "OK from synthetic WS upstream.";
@@ -36,11 +40,13 @@ async function startFakeUpstream(): Promise<{
     wsRequestCount: () => number;
     wsBodies: () => Array<Record<string, unknown>>;
     httpBodies: () => Array<Record<string, unknown>>;
+    chatBodies: () => Array<Record<string, unknown>>;
     close: () => Promise<void>;
 }> {
     let wsRequests = 0;
     const wsBodies: Array<Record<string, unknown>> = [];
     const httpBodies: Array<Record<string, unknown>> = [];
+    const chatBodies: Array<Record<string, unknown>> = [];
 
     const httpServer = createServer((req, res) => {
         const url = new URL(req.url ?? "/", `http://${req.headers.host ?? "localhost"}`);
@@ -72,6 +78,20 @@ async function startFakeUpstream(): Promise<{
                             },
                         },
                     },
+                    {
+                        id: "gpt-5.5",
+                        name: "GPT-5.5",
+                        vendor: "OpenAI",
+                        model_picker_enabled: true,
+                        supported_endpoints: ["/chat/completions"],
+                        capabilities: {
+                            type: "chat",
+                            family: "gpt-5.5",
+                            tokenizer: "o200k_base",
+                            limits: { max_context_window_tokens: 200000, max_output_tokens: 8192 },
+                            supports: { streaming: true, tool_calls: true },
+                        },
+                    },
                     {
                         id: "gpt-6-sol",
                         name: "GPT-6 Sol",
@@ -108,12 +128,73 @@ async function startFakeUpstream(): Promise<{
             sendJson(res, 200, { state: "enabled" });
             return;
         }
+        if (url.pathname.endsWith("/chat/completions") && req.method === "POST") {
+            drainBody(req)
+                .then((raw) => {
+                    const body = JSON.parse(raw.toString()) as Record<string, unknown>;
+                    chatBodies.push(body);
+                    const serialized = JSON.stringify(body.messages);
+                    const toolResult = (body.messages as Array<{ role: string }>).some(
+                        (message) => message.role === "tool"
+                    );
+                    const call =
+                        serialized.includes("SDK_CHAT_RESTORED") &&
+                        !serialized.includes("SDK_CHAT_EXECUTED_RESULT");
+                    const removedCall = serialized.includes("SDK_CHAT_REMOVED") && !toolResult;
+                    const message =
+                        call || removedCall
+                            ? {
+                                  role: "assistant",
+                                  content: null,
+                                  tool_calls: [
+                                      {
+                                          index: 0,
+                                          id: "chat_call",
+                                          type: "function",
+                                          function: { name: "sdk_chat_removed", arguments: "{}" },
+                                      },
+                                  ],
+                              }
+                            : {
+                                  role: "assistant",
+                                  content: serialized.includes("SDK_CHAT_RESTORED")
+                                      ? "SDK_CHAT_RESTORED_OK"
+                                      : serialized.includes("SDK_CHAT_REMOVED")
+                                        ? "SDK_CHAT_REMOVED_OK"
+                                        : "SDK_CHAT_FIRST_OK",
+                              };
+                    const finishReason = call || removedCall ? "tool_calls" : "stop";
+                    if (body.stream !== true) {
+                        sendJson(res, 200, {
+                            id: "chat_response",
+                            choices: [{ index: 0, message, finish_reason: finishReason }],
+                            usage: { prompt_tokens: 5, completion_tokens: 7 },
+                        });
+                        return;
+                    }
+                    res.writeHead(200, { "content-type": "text/event-stream" });
+                    res.write(
+                        `data: ${JSON.stringify({ id: "chat_response", choices: [{ index: 0, delta: message, finish_reason: null }] })}\n\n`
+                    );
+                    res.end(
+                        `data: ${JSON.stringify({ id: "chat_response", choices: [{ index: 0, delta: {}, finish_reason: finishReason }] })}\n\ndata: [DONE]\n\n`
+                    );
+                })
+                .catch((error: unknown) => {
+                    sendJson(res, 500, { error: String(error) });
+                });
+            return;
+        }
         if (url.pathname.endsWith("/responses") && req.method === "POST") {
             drainBody(req)
                 .then((raw) => {
                     const body = JSON.parse(raw.toString()) as Record<string, unknown>;
                     httpBodies.push(body);
-                    const events = buildResponsesEvents(HTTP_TEXT, "resp_stub_http");
+                    const events = toolUpdateEvents(body, "resp_stub_http", HTTP_TEXT);
+                    if (events[0]?.type === "error") {
+                        sendJson(res, 422, { error: events[0].error });
+                        return;
+                    }
                     if (body.stream !== true) {
                         sendJson(res, 200, events.at(-1)!.response);
                         return;
@@ -143,69 +224,8 @@ async function startFakeUpstream(): Promise<{
             wsRequests++;
             const body = JSON.parse(raw.toString()) as Record<string, unknown>;
             wsBodies.push(body);
-            const input = JSON.stringify(body.input);
             const id = `resp_stub_ws_${wsRequests}`;
-            const positionedUpdate =
-                Array.isArray(body.input) &&
-                body.input.some((item: { type?: string }) => item.type === "additional_tools");
-            const rejection = {
-                type: "error",
-                error: {
-                    code: "bad_request",
-                    type: "websocket_error",
-                    message: "additional_tools rejected",
-                },
-            };
-            const restricted =
-                (body.tool_choice as { type?: string } | undefined)?.type === "allowed_tools";
-            let events: Array<Record<string, unknown>>;
-            if (restricted && input.includes("SDK_ALLOWLIST_REJECT_BEFORE")) {
-                events = [
-                    {
-                        ...rejection,
-                        error: {
-                            ...rejection.error,
-                            code: "invalid_request_body",
-                            message: "allowed_tools rejected",
-                        },
-                    },
-                ];
-            } else if (restricted && input.includes("SDK_ALLOWLIST_REJECT_AFTER")) {
-                events = [
-                    ...buildResponsesEvents("already streamed", id).slice(0, 4),
-                    {
-                        ...rejection,
-                        error: {
-                            ...rejection.error,
-                            code: "invalid_request_body",
-                            message: "allowed_tools rejected",
-                        },
-                    },
-                ];
-            } else if (input.includes("SDK_REMOVAL_RESTORED")) {
-                events = buildResponsesEvents("SDK_REMOVAL_RESTORED_OK", id);
-            } else if (input.includes("SDK_ALLOWLIST_REJECT_BEFORE")) {
-                events = buildResponsesEvents("SDK_ALLOWLIST_RECOVERED", id);
-            } else if (positionedUpdate && input.includes("SDK_RESPONSES_REJECT_BEFORE")) {
-                events = [rejection];
-            } else if (positionedUpdate && input.includes("SDK_RESPONSES_REJECT_AFTER")) {
-                events = [...buildResponsesEvents("already streamed", id).slice(0, 4), rejection];
-            } else if (input.includes("SDK_RESPONSES_LEGACY_FOLLOW_UP")) {
-                events = buildResponsesEvents("SDK_RESPONSES_LEGACY_OK", id);
-            } else if (input.includes("SDK_RESPONSES_REJECT_BEFORE")) {
-                events = buildResponsesEvents("SDK_RESPONSES_RECOVERED", id);
-            } else if (
-                input.includes("SDK_RESPONSES_AFTER") &&
-                !input.includes("SDK_ADDED_TOOL_RESULT")
-            ) {
-                events = buildFunctionCallEvents(id);
-            } else {
-                events = buildResponsesEvents(
-                    input.includes("SDK_ADDED_TOOL_RESULT") ? "SDK_RESPONSES_TOOL_OK" : WS_TEXT,
-                    id
-                );
-            }
-            for (const event of events) {
+            for (const event of toolUpdateEvents(body, id, WS_TEXT)) {
                 socket.send(JSON.stringify(event));
             }
         });
@@ -221,6 +241,7 @@ async function startFakeUpstream(): Promise<{
         wsRequestCount: () => wsRequests,
         wsBodies: () => [...wsBodies],
         httpBodies: () => [...httpBodies],
+        chatBodies: () => [...chatBodies],
         async close() {
             wss.clients.forEach((c) => c.terminate());
             await new Promise<void>((resolve) => wss.close(() => resolve()));
@@ -229,13 +250,107 @@ async function startFakeUpstream(): Promise<{
     };
 }
 
-function buildFunctionCallEvents(id: string): Array<Record<string, unknown>> {
+function toolUpdateEvents(
+    body: Record<string, unknown>,
+    id: string,
+    defaultText: string
+): Array<Record<string, unknown>> {
+    const input = JSON.stringify(body.input);
+    const positionedUpdate =
+        Array.isArray(body.input) &&
+        body.input.some((item: { type?: string }) => item.type === "additional_tools");
+    const rejection = {
+        type: "error",
+        error: {
+            code: "bad_request",
+            type: "websocket_error",
+            message: "additional_tools rejected",
+        },
+    };
+    const restricted =
+        (body.tool_choice as { type?: string } | undefined)?.type === "allowed_tools";
+    if (positionedUpdate && input.includes("SDK_RESPONSES_REJECT_GENERIC")) {
+        return [{ type: "error", error: { message: "invalid request" } }];
+    }
+    if (restricted && input.includes("SDK_ALLOWLIST_REJECT_BEFORE")) {
+        return [
+            {
+                ...rejection,
+                error: {
+                    ...rejection.error,
+                    code: "invalid_request_body",
+                    message: "allowed_tools rejected",
+                },
+            },
+        ];
+    }
+    if (restricted && input.includes("SDK_ALLOWLIST_REJECT_AFTER")) {
+        return [
+            ...buildResponsesEvents("already streamed", id).slice(0, 4),
+            {
+                ...rejection,
+                error: {
+                    ...rejection.error,
+                    code: "invalid_request_body",
+                    message: "allowed_tools rejected",
+                },
+            },
+        ];
+    }
+    if (input.includes("SDK_REMOVAL_RESTORED")) {
+        return buildResponsesEvents("SDK_REMOVAL_RESTORED_OK", id);
+    }
+    if (input.includes("SDK_REMOVAL_ALL")) {
+        return buildResponsesEvents(defaultText, id);
+    }
+    if (input.includes("SDK_ALLOWLIST_REJECT_BEFORE")) {
+        return buildResponsesEvents("SDK_ALLOWLIST_RECOVERED", id);
+    }
+    if (positionedUpdate && input.includes("SDK_RESPONSES_REJECT_BEFORE")) {
+        return [rejection];
+    }
+    if (positionedUpdate && input.includes("SDK_RESPONSES_REJECT_AFTER")) {
+        return [...buildResponsesEvents("already streamed", id).slice(0, 4), rejection];
+    }
+    if (input.includes("SDK_RESPONSES_LEGACY_FOLLOW_UP")) {
+        return buildResponsesEvents("SDK_RESPONSES_LEGACY_OK", id);
+    }
+    if (input.includes("SDK_RESPONSES_REJECT_BEFORE")) {
+        return buildResponsesEvents("SDK_RESPONSES_RECOVERED", id);
+    }
+    if (input.includes("MCP_RESPONSES_REMOVED_AGAIN")) {
+        return buildResponsesEvents("MCP_RESPONSES_REMOVED_OK", id);
+    }
+    if (input.includes("MCP_RESPONSES_AFTER") && !input.includes("MCP_ADDED_TOOL_RESULT")) {
+        return buildFunctionCallEvents(
+            id,
+            "a_server-get_env",
+            JSON.stringify({ name: "CACHE_TEST_RESULT" })
+        );
+    }
+    if (input.includes("MCP_ADDED_TOOL_RESULT")) {
+        return buildResponsesEvents("MCP_RESPONSES_TOOL_OK", id);
+    }
+    if (input.includes("SDK_RESPONSES_AFTER") && !input.includes("SDK_ADDED_TOOL_RESULT")) {
+        return buildFunctionCallEvents(id);
+    }
+    return buildResponsesEvents(
+        input.includes("SDK_ADDED_TOOL_RESULT") ? "SDK_RESPONSES_TOOL_OK" : defaultText,
+        id
+    );
+}
+
+function buildFunctionCallEvents(
+    id: string,
+    name = "sdk_epoch_added",
+    args = "{}"
+): Array<Record<string, unknown>> {
     const call = {
         type: "function_call",
         id: "fc_sdk_added",
         call_id: "call_sdk_added",
-        name: "sdk_epoch_added",
-        arguments: "{}",
+        name,
+        arguments: args,
         status: "completed",
     };
     return [
@@ -333,7 +448,8 @@ interface Counters {
 class TestHandler extends CopilotRequestHandler {
     constructor(
         private readonly upstreamUrl: string,
-        private readonly counters: Counters
+        private readonly counters: Counters,
+        private readonly failWebSocket = false
     ) {
         super();
     }
@@ -384,6 +500,9 @@ class TestHandler extends CopilotRequestHandler {
     protected override async openWebSocket(
         ctx: CopilotRequestContext
     ): Promise<CopilotWebSocketForwarder> {
+        if (this.failWebSocket) {
+            throw new Error("Synthetic WebSocket handshake refused");
+        }
         ctx.url = this.rewriteWsUrl(ctx.url);
         return new CountingSocketForwarder(ctx, this.counters);
     }
@@ -417,7 +536,11 @@ describe("CopilotRequestHandler — single subclass handles HTTP + WebSocket", a
         wsResponseMessages: 0,
     };
 
-    const { copilotClient: client, env } = await createSdkTestContext({
+    const {
+        copilotClient: client,
+        env,
+        workDir,
+    } = await createSdkTestContext({
         copilotClientOptions: {
             requestHandler: new TestHandler(upstream.url, counters),
         },
@@ -551,6 +674,470 @@ describe("CopilotRequestHandler — single subclass handles HTTP + WebSocket", a
         }
     }, 90_000);
 
+    const routes: Array<{
+        name: string;
+        config: Partial<SessionConfig>;
+        bodies: () => Array<Record<string, unknown>>;
+        firstText: string;
+    }> = [
+        {
+            name: "CAPI WebSocket",
+            config: { capi: { enableWebSocketResponses: true } },
+            bodies: upstream.wsBodies,
+            firstText: WS_TEXT,
+        },
+        {
+            name: "CAPI HTTP",
+            config: { capi: { enableWebSocketResponses: false } },
+            bodies: upstream.httpBodies,
+            firstText: HTTP_TEXT,
+        },
+        ...(["http", "websockets"] as const).map((transport) => ({
+            name: `BYOK ${transport}`,
+            config: {
+                provider: {
+                    type: "openai" as const,
+                    wireApi: "responses" as const,
+                    transport,
+                    baseUrl: upstream.url,
+                    apiKey: "synthetic-provider-key",
+                    modelId: "gpt-6-sol",
+                    wireModel: "gpt-6-sol",
+                },
+            },
+            bodies: transport === "http" ? upstream.httpBodies : upstream.wsBodies,
+            firstText: transport === "http" ? HTTP_TEXT : WS_TEXT,
+        })),
+    ];
+    for (const route of routes) {
+        describe(route.name, async () => {
+            const routeClient =
+                route.config.capi?.enableWebSocketResponses === false
+                    ? (
+                          await createSdkTestContext({
+                              copilotClientOptions: {
+                                  requestHandler: new TestHandler(upstream.url, counters),
+                                  // This runtime does not yet wire the session-level CAPI transport opt-out.
+                                  env: { COPILOT_CLI_DISABLE_WEBSOCKET_RESPONSES: "true" },
+                              },
+                          })
+                      ).copilotClient
+                    : client;
+            it(`${route.config.provider ? "sends current tools" : "preserves the prefix"} on ${route.name} and executes a tool from a newly enabled MCP server`, async () => {
+                const config = mcpTestServerConfig("MCP_ADDED_TOOL_RESULT");
+                await routeClient.start();
+                const beforeRequests = route.bodies().length;
+                const session = await routeClient.createSession({
+                    model: "gpt-6-sol",
+                    onPermissionRequest: approveAll,
+                    ...route.config,
+                    toolSearch: { enabled: false },
+                    mcpServers: { z_server: config, a_server: config },
+                    disabledMcpServers: ["a_server"],
+                });
+                try {
+                    await session.rpc.tools.initializeAndValidate();
+                    expect(
+                        (await session.rpc.tools.getCurrentMetadata()).tools.map(
+                            (tool) => tool.name
+                        )
+                    ).toContain("z_server-get_env");
+                    expect(
+                        (await session.rpc.tools.getCurrentMetadata()).tools.map(
+                            (tool) => tool.name
+                        )
+                    ).not.toContain("a_server-get_env");
+                    const first = await session.sendAndWait({ prompt: "MCP_RESPONSES_FIRST" });
+                    expect(first?.data.content).toContain(route.firstText);
+
+                    await session.rpc.mcp.setEnvValueMode({ mode: "direct" });
+                    await session.rpc.mcp.enable({ serverName: "a_server" });
+                    await session.rpc.tools.initializeAndValidate();
+                    expect(
+                        (await session.rpc.tools.getCurrentMetadata()).tools.map(
+                            (tool) => tool.name
+                        )
+                    ).toContain("a_server-get_env");
+                    const second = await session.sendAndWait({
+                        prompt: "MCP_RESPONSES_AFTER: call a_server-get_env.",
+                    });
+                    expect(second?.data.content).toContain("MCP_RESPONSES_TOOL_OK");
+
+                    const requests = route.bodies().slice(beforeRequests);
+                    expect(requests).toHaveLength(3);
+                    const [before, update, afterTool] = requests;
+                    expect(before.tools).toEqual(
+                        expect.arrayContaining([
+                            expect.objectContaining({ name: "z_server-get_env" }),
+                        ])
+                    );
+                    expect(JSON.stringify(before.tools)).not.toContain('"name":"a_server-get_env"');
+                    for (const request of [update, afterTool]) {
+                        if (route.config.provider) {
+                            expect(request.tools).toEqual(
+                                expect.arrayContaining([
+                                    expect.objectContaining({ name: "a_server-get_env" }),
+                                    expect.objectContaining({ name: "z_server-get_env" }),
+                                ])
+                            );
+                            expect(request.tools).toEqual(update.tools);
+                        } else {
+                            expect(JSON.stringify(request.tools)).toBe(
+                                JSON.stringify(before.tools)
+                            );
+                        }
+                        expect(request.instructions).toEqual(before.instructions);
+                    }
+                    expect(update.previous_response_id ?? null).toBeNull();
+                    const input = update.input as Array<Record<string, unknown>>;
+                    expect(JSON.stringify(input[0])).toBe(
+                        JSON.stringify((before.input as Array<Record<string, unknown>>)[0])
+                    );
+                    if (route.config.provider) {
+                        expect(JSON.stringify(input)).not.toContain('"type":"additional_tools"');
+                    } else {
+                        expect(input).toContainEqual(
+                            expect.objectContaining({
+                                type: "additional_tools",
+                                tools: expect.arrayContaining([
+                                    expect.objectContaining({ name: "a_server-get_env" }),
+                                ]),
+                            })
+                        );
+                        const additionIndex = input.findIndex(
+                            (item) => item.type === "additional_tools"
+                        );
+                        expect(additionIndex).toBeGreaterThan(0);
+                        expect(JSON.stringify(input.slice(0, additionIndex))).toContain(
+                            "MCP_RESPONSES_AFTER"
+                        );
+                    }
+                    expect(JSON.stringify(afterTool.input)).toContain("MCP_ADDED_TOOL_RESULT");
+                } finally {
+                    await session.disconnect();
+                }
+            }, 90_000);
+
+            it(`removes MCP tools on ${route.name} and executes a restored tool`, async () => {
+                const toolName = "a_server-get_env";
+                const survivor = "z_server-get_env";
+                const config = mcpTestServerConfig("MCP_ADDED_TOOL_RESULT");
+                await client.start();
+                const beforeRequests = route.bodies().length;
+                const session = await routeClient.createSession({
+                    model: "gpt-6-sol",
+                    onPermissionRequest: approveAll,
+                    ...route.config,
+                    toolSearch: { enabled: false },
+                    availableTools: [toolName, survivor],
+                    mcpServers: { a_server: config, z_server: config },
+                });
+                try {
+                    await session.rpc.mcp.setEnvValueMode({ mode: "direct" });
+                    await session.rpc.tools.initializeAndValidate();
+                    expect(
+                        (await session.rpc.tools.getCurrentMetadata()).tools.map(
+                            (tool) => tool.name
+                        )
+                    ).toEqual(expect.arrayContaining([toolName, survivor]));
+                    expect(
+                        (await session.sendAndWait({ prompt: "MCP_RESPONSES_FIRST" }))?.data.content
+                    ).toContain(route.firstText);
+
+                    await session.rpc.mcp.disable({ serverName: "a_server" });
+                    await session.rpc.tools.initializeAndValidate();
+                    // Tool metadata includes the previous request; the host reports live availability.
+                    const disabled = await session.rpc.mcp.list();
+                    expect(disabled.host?.disabledServers).toContain("a_server");
+                    expect(disabled.host?.disabledServers).not.toContain("z_server");
+                    expect(disabled.servers).toContainEqual(
+                        expect.objectContaining({ name: "a_server", status: "disabled" })
+                    );
+                    expect(
+                        (await session.sendAndWait({ prompt: "MCP_RESPONSES_REMOVED" }))?.data
+                            .content
+                    ).toContain(route.firstText);
+
+                    await session.rpc.mcp.enable({ serverName: "a_server" });
+                    await session.rpc.tools.initializeAndValidate();
+                    expect(
+                        (await session.rpc.tools.getCurrentMetadata()).tools.map(
+                            (tool) => tool.name
+                        )
+                    ).toContain(toolName);
+                    expect(
+                        (
+                            await session.sendAndWait({
+                                prompt: `MCP_RESPONSES_AFTER: call ${toolName}.`,
+                            })
+                        )?.data.content
+                    ).toContain("MCP_RESPONSES_TOOL_OK");
+
+                    await session.rpc.mcp.disable({ serverName: "a_server" });
+                    await session.rpc.tools.initializeAndValidate();
+                    const disabledAgain = await session.rpc.mcp.list();
+                    expect(disabledAgain.host?.disabledServers).toContain("a_server");
+                    expect(disabledAgain.host?.disabledServers).not.toContain("z_server");
+                    expect(disabledAgain.servers).toContainEqual(
+                        expect.objectContaining({ name: "a_server", status: "disabled" })
+                    );
+                    expect(
+                        (await session.sendAndWait({ prompt: "MCP_RESPONSES_REMOVED_AGAIN" }))?.data
+                            .content
+                    ).toContain("MCP_RESPONSES_REMOVED_OK");
+
+                    const requests = route.bodies().slice(beforeRequests);
+                    expect(requests).toHaveLength(5);
+                    const [before, removed, restored, afterTool, removedAgain] = requests;
+                    expect(before.tools).toEqual(
+                        expect.arrayContaining([
+                            expect.objectContaining({ name: toolName }),
+                            expect.objectContaining({ name: survivor }),
+                        ])
+                    );
+                    for (const request of [removed, restored, afterTool, removedAgain]) {
+                        expect(request.instructions).toEqual(before.instructions);
+                        expect(JSON.stringify(request.input)).not.toContain(
+                            '"type":"additional_tools"'
+                        );
+                    }
+                    const choice = {
+                        type: "allowed_tools",
+                        mode: "auto",
+                        tools: [{ type: "function", name: survivor }],
+                    };
+                    for (const request of [removed, removedAgain]) {
+                        if (route.config.provider) {
+                            expect(request.tools).toEqual(
+                                (before.tools as Array<Record<string, unknown>>).filter(
+                                    (tool) => tool.name !== toolName
+                                )
+                            );
+                            expect(request.tool_choice).not.toEqual(
+                                expect.objectContaining({ type: "allowed_tools" })
+                            );
+                        } else {
+                            expect(JSON.stringify(request.tools)).toBe(
+                                JSON.stringify(before.tools)
+                            );
+                            expect(request.tool_choice).toEqual(choice);
+                        }
+                        expect(request.previous_response_id ?? null).toBeNull();
+                    }
+                    for (const request of [restored, afterTool]) {
+                        expect(JSON.stringify(request.tools)).toBe(JSON.stringify(before.tools));
+                        expect(request.tool_choice).not.toEqual(
+                            expect.objectContaining({ type: "allowed_tools" })
+                        );
+                    }
+                    expect(restored.previous_response_id ?? null).toBeNull();
+                    expect(JSON.stringify(afterTool.input)).toContain("MCP_ADDED_TOOL_RESULT");
+                } finally {
+                    await session.disconnect();
+                }
+            }, 90_000);
+        });
+    }
+
+    for (const byok of [false, true]) {
+        it(`preserves ${byok ? "BYOK" : "CAPI"} Chat Completions tools through removal and restores real execution`, async () => {
+            const original = {
+                name: "sdk_chat_original",
+                description: "Original",
+                parameters: { type: "object", properties: {} },
+                defer: "never",
+            } as const;
+            const removable = { ...original, name: "sdk_chat_removed", description: "Removable" };
+            let calls = 0;
+            const start = upstream.chatBodies().length;
+            const session = await client.createSession({
+                model: "gpt-5.5",
+                ...(byok
+                    ? {
+                          provider: {
+                              type: "openai" as const,
+                              wireApi: "completions" as const,
+                              baseUrl: upstream.url,
+                              apiKey: "synthetic-provider-key",
+                              modelId: "gpt-5.5",
+                              wireModel: "gpt-5.5",
+                          },
+                      }
+                    : {}),
+                toolSearch: { enabled: false },
+                onPermissionRequest: approveAll,
+                availableTools: [original.name, removable.name],
+                tools: [
+                    defineTool(original.name, {
+                        description: original.description,
+                        handler: () => "SDK_CHAT_ORIGINAL_RESULT",
+                    }),
+                    defineTool(removable.name, {
+                        description: removable.description,
+                        handler: () => {
+                            calls++;
+                            return "SDK_CHAT_EXECUTED_RESULT";
+                        },
+                    }),
+                ],
+            });
+            try {
+                await session.rpc.tools.initializeAndValidate();
+                expect(
+                    (await session.sendAndWait({ prompt: "SDK_CHAT_FIRST" }))?.data.content
+                ).toContain("SDK_CHAT_FIRST_OK");
+                await session.rpc.tools.set({ tools: [original] });
+                expect(
+                    (await session.sendAndWait({ prompt: "SDK_CHAT_REMOVED" }))?.data.content
+                ).toContain("SDK_CHAT_REMOVED_OK");
+                expect(calls).toBe(0);
+                const removedRequests = upstream.chatBodies().slice(start);
+                expect(removedRequests).toHaveLength(3);
+                const [before, removed, afterRejectedCall] = removedRequests;
+                expect(JSON.stringify(removed.tools)).toBe(JSON.stringify(before.tools));
+                expect(removed.tool_choice).toEqual({
+                    type: "allowed_tools",
+                    allowed_tools: {
+                        mode: "auto",
+                        tools: [{ type: "function", function: { name: original.name } }],
+                    },
+                });
+                expect(JSON.stringify(afterRejectedCall.messages)).toContain("does not exist");
+                await session.rpc.tools.set({ tools: [original, removable] });
+                expect(
+                    (await session.sendAndWait({ prompt: "SDK_CHAT_RESTORED" }))?.data.content
+                ).toContain("SDK_CHAT_RESTORED_OK");
+                expect(calls).toBe(1);
+                const requests = upstream.chatBodies().slice(start);
+                expect(requests).toHaveLength(5);
+                for (const request of requests.slice(3)) {
+                    expect(JSON.stringify(request.tools)).toBe(JSON.stringify(before.tools));
+                    expect(request.tool_choice).not.toEqual(
+                        expect.objectContaining({ type: "allowed_tools" })
+                    );
+                }
+                expect(JSON.stringify(requests[4].messages)).toContain("SDK_CHAT_EXECUTED_RESULT");
+            } finally {
+                await session.disconnect();
+            }
+        });
+    }
+
+    describe("WebSocket to HTTP tool-update fallback", async () => {
+        const { copilotClient: fallbackClient } = await createSdkTestContext({
+            copilotClientOptions: { requestHandler: new TestHandler(upstream.url, counters, true) },
+        });
+        it("recovers an unrecognized HTTP 422 once and keeps later turns on current tools", async () => {
+            const original = {
+                name: "sdk_epoch_original",
+                description: "Original",
+                parameters: { type: "object", properties: {} },
+                defer: "never",
+            } as const;
+            const added = { ...original, name: "sdk_epoch_added", description: "Added" };
+            const start = upstream.httpBodies().length;
+            const session = await fallbackClient.createSession({
+                model: "gpt-6-sol",
+                capi: { enableWebSocketResponses: true },
+                toolSearch: { enabled: false },
+                onPermissionRequest: approveAll,
+                tools: [
+                    defineTool(original.name, { handler: () => "original" }),
+                    defineTool(added.name, { handler: () => "added" }),
+                ],
+            });
+            try {
+                await session.rpc.tools.initializeAndValidate();
+                await session.rpc.tools.set({ tools: [original] });
+                expect(
+                    (await session.sendAndWait({ prompt: "SDK_RESPONSES_FIRST" }))?.data.content
+                ).toContain(HTTP_TEXT);
+                await session.rpc.tools.set({ tools: [original, added] });
+                expect(
+                    (await session.sendAndWait({ prompt: "SDK_RESPONSES_REJECT_GENERIC" }))?.data
+                        .content
+                ).toContain(HTTP_TEXT);
+                expect(
+                    (await session.sendAndWait({ prompt: "SDK_RESPONSES_LEGACY_FOLLOW_UP" }))?.data
+                        .content
+                ).toContain("SDK_RESPONSES_LEGACY_OK");
+                const requests = upstream.httpBodies().slice(start);
+                expect(requests).toHaveLength(4);
+                const [before, rejected, recovered, later] = requests;
+                expect(JSON.stringify(rejected.tools)).toBe(JSON.stringify(before.tools));
+                expect(JSON.stringify(rejected.input)).toContain('"type":"additional_tools"');
+                for (const request of [recovered, later]) {
+                    expect(JSON.stringify(request.input)).not.toContain(
+                        '"type":"additional_tools"'
+                    );
+                    expect(request.tools).toEqual(
+                        expect.arrayContaining([expect.objectContaining({ name: added.name })])
+                    );
+                }
+            } finally {
+                await session.disconnect();
+            }
+        });
+    });
+
+    it("rebases a refreshed MCP definition before executing the restarted server", async () => {
+        const toolName = "a_server-get_env";
+        const descriptionFile = join(workDir, "tool-description.txt");
+        await writeFile(descriptionFile, "MCP_ORIGINAL_DESCRIPTION");
+        await client.start();
+        const beforeRequests = upstream.wsBodies().length;
+        const session = await client.createSession({
+            model: "gpt-6-sol",
+            onPermissionRequest: approveAll,
+            capi: { enableWebSocketResponses: true },
+            toolSearch: { enabled: false },
+            mcpServers: {
+                a_server: mcpTestServerConfig("MCP_ADDED_TOOL_RESULT", descriptionFile),
+            },
+        });
+        try {
+            await session.rpc.mcp.setEnvValueMode({ mode: "direct" });
+            await session.rpc.tools.initializeAndValidate();
+            expect(
+                (await session.rpc.tools.getCurrentMetadata()).tools.find(
+                    (tool) => tool.name === toolName
+                )?.description
+            ).toContain("MCP_ORIGINAL_DESCRIPTION");
+            expect(
+                (await session.sendAndWait({ prompt: "MCP_RESPONSES_FIRST" }))?.data.content
+            ).toContain(WS_TEXT);
+
+            await writeFile(descriptionFile, "MCP_REPLACEMENT_DESCRIPTION");
+            await session.rpc.mcp.restartServer({ serverName: "a_server" });
+            await session.rpc.tools.initializeAndValidate();
+            expect(
+                (await session.rpc.tools.getCurrentMetadata()).tools.find(
+                    (tool) => tool.name === toolName
+                )?.description
+            ).toContain("MCP_REPLACEMENT_DESCRIPTION");
+            expect(
+                (await session.sendAndWait({ prompt: `MCP_RESPONSES_AFTER: call ${toolName}.` }))
+                    ?.data.content
+            ).toContain("MCP_RESPONSES_TOOL_OK");
+
+            const requests = upstream.wsBodies().slice(beforeRequests);
+            expect(requests).toHaveLength(3);
+            const [before, update, afterTool] = requests;
+            expect(JSON.stringify(before.tools)).toContain("MCP_ORIGINAL_DESCRIPTION");
+            expect(JSON.stringify(update.tools)).toContain("MCP_REPLACEMENT_DESCRIPTION");
+            expect(JSON.stringify(update.tools)).not.toContain("MCP_ORIGINAL_DESCRIPTION");
+            expect(update.instructions).toEqual(before.instructions);
+            expect(update.previous_response_id ?? null).toBeNull();
+            for (const request of [update, afterTool]) {
+                expect(JSON.stringify(request.input)).not.toContain('"type":"additional_tools"');
+            }
+            expect(JSON.stringify(afterTool.tools)).toBe(JSON.stringify(update.tools));
+            expect(JSON.stringify(afterTool.input)).toContain("MCP_ADDED_TOOL_RESULT");
+        } finally {
+            await session.disconnect();
+        }
+    }, 90_000);
+
     it("keeps the SDK removal prefix while restricting tools across continuations and restoration", async () => {
         const original = {
             name: "sdk_epoch_original",
@@ -619,12 +1206,12 @@ describe("CopilotRequestHandler — single subclass handles HTTP + WebSocket", a
             expect(
                 (await session.sendAndWait({ prompt: "SDK_REMOVAL_ALL" }))?.data.content
             ).toContain(HTTP_TEXT);
-            // No remaining tools selects the runtime's single-shot HTTP route.
+            // No remaining tools selects HTTP, which keeps the prefix and forbids all calls.
             const allRemoved = upstream
                 .httpBodies()
                 .findLast((body) => JSON.stringify(body.input).includes("SDK_REMOVAL_ALL"))!;
-            expect(allRemoved.tools).toEqual([]);
-            expect(allRemoved.tool_choice).toBeUndefined();
+            expect(JSON.stringify(allRemoved.tools)).toBe(JSON.stringify(before.tools));
+            expect(allRemoved.tool_choice).toBe("none");
             expect(allRemoved.previous_response_id ?? null).toBeNull();
 
             await session.rpc.tools.set({ tools: [original, added] });
diff --git a/nodejs/test/e2e/customization_directories.e2e.test.ts b/nodejs/test/e2e/customization_directories.e2e.test.ts
new file mode 100644
index 0000000000..2a3adefa51
--- /dev/null
+++ b/nodejs/test/e2e/customization_directories.e2e.test.ts
@@ -0,0 +1,387 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { execFileSync } from "node:child_process";
+import fs from "node:fs";
+import path from "node:path";
+import { beforeEach, describe, expect, it } from "vitest";
+import { approveAll, RuntimeConnection } from "../../src/index.js";
+import { createSdkTestContext } from "./harness/sdkTestContext.js";
+
+function writeFile(root: string, relative: string[], content: string): string {
+    const file = path.join(root, ...relative);
+    fs.mkdirSync(path.dirname(file), { recursive: true });
+    fs.writeFileSync(file, content);
+    return file;
+}
+
+function writeSkill(root: string, directory: string, name: string): void {
+    writeFile(
+        root,
+        [directory, name, "SKILL.md"],
+        `---\nname: ${name}\ndescription: Discovery directory regression fixture.\n---\n\nUse this skill.\n`
+    );
+}
+
+describe("Customization directory discovery", async () => {
+    const {
+        copilotClient: client,
+        env,
+        workDir: testRoot,
+        createClient,
+    } = await createSdkTestContext({
+        copilotClientOptions: { env: { COPILOT_ALLOW_ALL: "1" } },
+    });
+    let workDir: string;
+
+    beforeEach(async () => {
+        workDir = fs.realpathSync.native(fs.mkdtempSync(path.join(testRoot, "customizations-")));
+        execFileSync("git", ["init", "--quiet"], { cwd: workDir, windowsHide: true });
+        writeFile(
+            env.COPILOT_HOME,
+            ["config.json"],
+            JSON.stringify({ trustedFolders: [testRoot] })
+        );
+        await client.start();
+    });
+
+    it("discovers all four repository lists and applies independent local replacements", async () => {
+        writeSkill(workDir, "vendor-skills", "repository-directory-skill");
+        writeFile(
+            workDir,
+            ["vendor-agents", "directory.agent.md"],
+            "---\nname: repository-directory-agent\ndescription: Directory fixture.\n---\n\nRead the repository.\n"
+        );
+        const instruction = writeFile(
+            workDir,
+            ["vendor-instructions", "guard.instructions.md"],
+            "---\napplyTo: '**/*.ts'\n---\n\nRepository directory instruction sentinel.\n"
+        );
+        writeFile(
+            workDir,
+            ["vendor-instructions", "AGENTS.md"],
+            "Do not inject this package hierarchy."
+        );
+        writeFile(
+            workDir,
+            ["vendor-hooks", "hooks.json"],
+            JSON.stringify({ hooks: { sessionStart: [{ command: "echo directory-hook" }] } })
+        );
+        writeFile(
+            workDir,
+            [".github", "copilot", "settings.json"],
+            JSON.stringify({
+                skillDirectories: ["vendor-skills"],
+                agentDirectories: ["vendor-agents"],
+                instructionDirectories: ["vendor-instructions"],
+                hookDirectories: ["vendor-hooks"],
+            })
+        );
+        const projectPaths = [workDir];
+        const skills = await client.rpc.skills.discover({ projectPaths, excludeHostSkills: true });
+        expect(
+            skills.skills.filter((skill) => skill.name === "repository-directory-skill")
+        ).toHaveLength(1);
+        const agents = await client.rpc.agents.discover({ projectPaths, excludeHostAgents: true });
+        expect(
+            agents.agents.filter((agent) => agent.name === "repository-directory-agent")
+        ).toHaveLength(1);
+        const instructions = await client.rpc.instructions.discover({
+            projectPaths,
+            excludeHostInstructions: true,
+        });
+        expect(
+            instructions.sources.filter((source) => source.sourcePath === instruction)
+        ).toHaveLength(1);
+        expect(
+            instructions.sources.some((source) =>
+                source.content.includes("Do not inject this package hierarchy.")
+            )
+        ).toBe(false);
+        const hooks = await client.rpc.hooks.discover({ projectPaths, excludeHostHooks: true });
+        expect(hooks.hooks.some((hook) => hook.source.includes("vendor-hooks"))).toBe(true);
+
+        writeFile(
+            workDir,
+            [".github", "copilot", "settings.local.json"],
+            JSON.stringify({ skillDirectories: [], hookDirectories: [] })
+        );
+        const clearedSkills = await client.rpc.skills.discover({
+            projectPaths,
+            excludeHostSkills: true,
+        });
+        expect(
+            clearedSkills.skills.some((skill) => skill.name === "repository-directory-skill")
+        ).toBe(false);
+        const retainedAgents = await client.rpc.agents.discover({
+            projectPaths,
+            excludeHostAgents: true,
+        });
+        expect(
+            retainedAgents.agents.some((agent) => agent.name === "repository-directory-agent")
+        ).toBe(true);
+        const clearedHooks = await client.rpc.hooks.discover({
+            projectPaths,
+            excludeHostHooks: true,
+        });
+        expect(clearedHooks.hooks.some((hook) => hook.source.includes("vendor-hooks"))).toBe(false);
+    });
+
+    it("anchors SDK relative roots once and reanchors only newly supplied lists", async () => {
+        const original = path.join(workDir, "original");
+        const next = path.join(workDir, "next");
+        writeSkill(original, "skills", "original-directory-skill");
+        writeSkill(next, "skills", "next-directory-skill");
+        const session = await client.createSession({
+            onPermissionRequest: approveAll,
+            workingDirectory: original,
+            enableConfigDiscovery: false,
+            skillDirectories: ["skills"],
+        });
+        try {
+            await session.rpc.skills.ensureLoaded();
+            expect(
+                (await session.rpc.skills.list()).skills.some(
+                    (skill) => skill.name === "original-directory-skill"
+                )
+            ).toBe(true);
+            expect((await session.rpc.options.update({ workingDirectory: next })).success).toBe(
+                true
+            );
+            await session.rpc.skills.ensureLoaded();
+            const retained = await session.rpc.skills.list();
+            expect(retained.skills.some((skill) => skill.name === "original-directory-skill")).toBe(
+                true
+            );
+            expect(retained.skills.some((skill) => skill.name === "next-directory-skill")).toBe(
+                false
+            );
+            expect(
+                (await session.rpc.options.update({ skillDirectories: ["skills"] })).success
+            ).toBe(true);
+            await session.rpc.skills.ensureLoaded();
+            const changed = await session.rpc.skills.list();
+            expect(changed.skills.some((skill) => skill.name === "original-directory-skill")).toBe(
+                false
+            );
+            expect(changed.skills.some((skill) => skill.name === "next-directory-skill")).toBe(
+                true
+            );
+            expect((await session.rpc.options.update({ skillDirectories: [] })).success).toBe(true);
+            await session.rpc.skills.ensureLoaded();
+            expect(
+                (await session.rpc.skills.list()).skills.some(
+                    (skill) => skill.name === "next-directory-skill"
+                )
+            ).toBe(false);
+        } finally {
+            await session.disconnect();
+        }
+    });
+
+    it("anchors newly supplied roots to the persisted workspace on cold resume", async () => {
+        const original = path.join(workDir, "nested");
+        fs.mkdirSync(original);
+        writeSkill(workDir, path.join("vendor", "alternate-skills"), "cold-resume-directory-skill");
+        const first = createClient({ connection: RuntimeConnection.forStdio() });
+        const next = createClient({ connection: RuntimeConnection.forStdio() });
+        try {
+            await first.start();
+            const session = await first.createSession({
+                onPermissionRequest: approveAll,
+                workingDirectory: original,
+                enableConfigDiscovery: false,
+                requestExtensions: false,
+            });
+            await session.rpc.workspaces.ensure({});
+            const { sessionId } = await first.rpc.sessions.fork({ sessionId: session.sessionId });
+            await session.disconnect();
+            await first.stop();
+            await next.start();
+            const resumed = await next.resumeSession(sessionId, {
+                onPermissionRequest: approveAll,
+                enableConfigDiscovery: false,
+                requestExtensions: false,
+                skillDirectories: [path.join("..", "vendor", "alternate-skills")],
+            });
+            try {
+                expect((await resumed.rpc.metadata.snapshot()).workingDirectory).toBe(original);
+                await resumed.rpc.skills.ensureLoaded();
+                const skills = await resumed.rpc.skills.list();
+                expect(
+                    skills.skills.some((skill) => skill.name === "cold-resume-directory-skill")
+                ).toBe(true);
+            } finally {
+                await resumed.disconnect();
+            }
+        } finally {
+            await next.stop();
+            await first.stop();
+        }
+    });
+
+    it("retains explicit file hooks when repository hooks and ambient discovery are disabled", async () => {
+        const hooks = path.join(workDir, "explicit-hooks");
+        writeFile(hooks, ["resource.txt"], "resource-sentinel");
+        writeFile(
+            hooks,
+            ["probe.cjs"],
+            "const fs = require('node:fs'); const path = require('node:path');\n" +
+                "fs.appendFileSync(path.join(process.cwd(), 'hook-observations.jsonl'), JSON.stringify({" +
+                "directory: process.env.COPILOT_HOOK_DIR, cwd: process.cwd(), " +
+                "resource: fs.readFileSync(path.join(process.env.COPILOT_HOOK_DIR, 'resource.txt'), 'utf8')" +
+                "}) + '\\n');\n"
+        );
+        writeFile(
+            hooks,
+            ["hooks.json"],
+            JSON.stringify({
+                hooks: {
+                    preToolUse: [
+                        {
+                            type: "command",
+                            bash: `"${process.execPath}" "$COPILOT_HOOK_DIR/probe.cjs"`,
+                            powershell: `& "${process.execPath}" (Join-Path $env:COPILOT_HOOK_DIR 'probe.cjs')`,
+                        },
+                    ],
+                },
+            })
+        );
+        writeFile(
+            workDir,
+            [".github", "hooks", "ambient.json"],
+            JSON.stringify({
+                hooks: { preToolUse: [{ command: "echo ambient-hook" }] },
+            })
+        );
+        let callbackInvocations = 0;
+        const session = await client.createSession({
+            onPermissionRequest: approveAll,
+            workingDirectory: workDir,
+            enableConfigDiscovery: false,
+            enableFileHooks: false,
+            hookDirectories: [hooks],
+            hooks: {
+                onPreToolUse: async () => {
+                    callbackInvocations++;
+                    return { permissionDecision: "allow" };
+                },
+            },
+        });
+        try {
+            await client.rpc.sessions.reloadPluginHooks({
+                sessionId: session.sessionId,
+                deferRepoHooks: true,
+            });
+            await session.rpc.tools.initializeAndValidate();
+            const result = await session.rpc.tools.execute({
+                name: "view",
+                arguments: { path: path.join(hooks, "resource.txt") },
+                toolCallId: "explicit-hook-directory-probe",
+            });
+            expect(JSON.stringify(result)).toContain("resource-sentinel");
+            expect(callbackInvocations).toBe(1);
+            const observations = path.join(workDir, "hook-observations.jsonl");
+            const first = fs.readFileSync(observations, "utf8").trim().split("\n");
+            expect(first).toHaveLength(1);
+            expect(JSON.parse(first[0])).toEqual({
+                directory: hooks,
+                cwd: workDir,
+                resource: "resource-sentinel",
+            });
+            expect((await session.rpc.options.update({ hookDirectories: [] })).success).toBe(true);
+            await client.rpc.sessions.reloadPluginHooks({
+                sessionId: session.sessionId,
+                deferRepoHooks: true,
+            });
+            await session.rpc.tools.execute({
+                name: "view",
+                arguments: { path: path.join(hooks, "resource.txt") },
+                toolCallId: "cleared-hook-directory-probe",
+            });
+            expect(fs.readFileSync(observations, "utf8").trim().split("\n")).toHaveLength(1);
+            expect(callbackInvocations).toBe(2);
+        } finally {
+            await session.disconnect();
+        }
+    });
+
+    it("retains conventional and configured guard hooks after changing to a repository subdirectory", async () => {
+        const observations = path.join(workDir, "cwd-hooks.jsonl");
+        const subdir = path.join(workDir, "subdir");
+        fs.mkdirSync(subdir);
+        for (const parts of [[".github", "hooks"], ["vendor-hooks"]]) {
+            const hooks = path.join(workDir, ...parts);
+            writeFile(
+                hooks,
+                ["probe.cjs"],
+                "require('node:fs').appendFileSync(" +
+                    JSON.stringify(observations) +
+                    ", JSON.stringify({directory: process.env.COPILOT_HOOK_DIR, cwd: process.cwd()}) + '\\n');\n"
+            );
+            writeFile(
+                hooks,
+                ["hooks.json"],
+                JSON.stringify({
+                    hooks: {
+                        preToolUse: [
+                            {
+                                type: "command",
+                                bash: `"${process.execPath}" "$COPILOT_HOOK_DIR/probe.cjs"`,
+                                powershell: `& "${process.execPath}" (Join-Path $env:COPILOT_HOOK_DIR 'probe.cjs')`,
+                            },
+                        ],
+                    },
+                })
+            );
+        }
+        writeFile(
+            workDir,
+            [".github", "copilot", "settings.json"],
+            JSON.stringify({ hookDirectories: ["vendor-hooks"] })
+        );
+        const resource = writeFile(workDir, ["resource.txt"], "cwd-hook-resource");
+        const session = await client.createSession({
+            onPermissionRequest: approveAll,
+            workingDirectory: workDir,
+            enableConfigDiscovery: true,
+            requestExtensions: false,
+        });
+        try {
+            await session.rpc.tools.initializeAndValidate();
+            await session.rpc.tools.execute({
+                name: "view",
+                arguments: { path: resource },
+                toolCallId: "guard-before-cwd-change",
+            });
+            expect(fs.readFileSync(observations, "utf8").trim().split("\n")).toHaveLength(2);
+            expect(
+                await session.rpc.metadata.setWorkingDirectory({ workingDirectory: subdir })
+            ).toMatchObject({ workingDirectory: subdir });
+            await session.rpc.tools.execute({
+                name: "view",
+                arguments: { path: resource },
+                toolCallId: "guard-after-cwd-change",
+            });
+            const rows = fs
+                .readFileSync(observations, "utf8")
+                .trim()
+                .split("\n")
+                .map((row) => JSON.parse(row));
+            expect(rows).toHaveLength(4);
+            expect(
+                rows
+                    .slice(2)
+                    .map((row) => row.directory)
+                    .sort()
+            ).toEqual(
+                [path.join(workDir, ".github", "hooks"), path.join(workDir, "vendor-hooks")].sort()
+            );
+            // Hooks without an explicit cwd remain anchored to the consuming project root.
+            expect(rows.slice(2).map((row) => row.cwd)).toEqual([workDir, workDir]);
+        } finally {
+            await session.disconnect();
+        }
+    });
+});
diff --git a/nodejs/test/e2e/disabled_mcp_servers.e2e.test.ts b/nodejs/test/e2e/disabled_mcp_servers.e2e.test.ts
index d9e8cee28c..e62de0e5d9 100644
--- a/nodejs/test/e2e/disabled_mcp_servers.e2e.test.ts
+++ b/nodejs/test/e2e/disabled_mcp_servers.e2e.test.ts
@@ -223,7 +223,10 @@ describe("disabled MCP servers", async () => {
         },
     });
 
-    function createPluginDirectory(prefix: string): {
+    function createPluginDirectory(
+        prefix: string,
+        controlArgs: string[] = []
+    ): {
         pluginDirectory: string;
         controlMarker: string;
         disabledMarker: string;
@@ -253,6 +256,7 @@ describe("disabled MCP servers", async () => {
                             controlMarker,
                             "--server-name",
                             "control",
+                            ...controlArgs,
                         ],
                     },
                     disabled: {
@@ -339,6 +343,250 @@ describe("disabled MCP servers", async () => {
         );
     }
 
+    it.each(["connected", "failed"] as const)(
+        "lists cold configured servers without starting or awaiting them before a %s first-turn startup",
+        { timeout: 120_000 },
+        async (expectedStatus) => {
+            const startupGate = join(workDir, `startup-gate-${randomUUID()}`);
+            const { pluginDirectory, controlMarker, disabledMarker } = createPluginDirectory(
+                "configured-mcp",
+                [
+                    "--startup-gate",
+                    startupGate,
+                    ...(expectedStatus === "failed" ? ["--fail-startup"] : []),
+                ]
+            );
+            await using session = await client.createSession({
+                onPermissionRequest: approveAll,
+                pluginDirectories: [pluginDirectory],
+                disabledMcpServers: ["disabled"],
+            });
+
+            for (let i = 0; i < 2; i++) {
+                const inventory = await session.rpc.mcp.listConfigured();
+                expect(
+                    inventory.servers
+                        .filter((server) => ["control", "disabled"].includes(server.name))
+                        .map(({ name, enabled, live }) => ({ name, enabled, live }))
+                        .sort((a, b) => a.name.localeCompare(b.name))
+                ).toEqual([
+                    { name: "control", enabled: true, live: { status: "not_configured" } },
+                    { name: "disabled", enabled: false, live: { status: "not_configured" } },
+                ]);
+                expect(markerCount(controlMarker)).toBe(0);
+                expect(markerCount(disabledMarker)).toBe(0);
+            }
+
+            const [response] = await Promise.all([
+                session.sendAndWait({ prompt: MCP_TRIGGER_PROMPT }, 90_000),
+                (async () => {
+                    try {
+                        await waitForMarkerCount(controlMarker, 1);
+                        // Inventory must also return while initialize is held behind the gate.
+                        const inventory = await session.rpc.mcp.listConfigured();
+                        expect(
+                            inventory.servers.find((server) => server.name === "control")?.live
+                                ?.status
+                        ).toBe("pending");
+                        expect(markerCount(controlMarker)).toBe(1);
+                    } finally {
+                        writeFileSync(startupGate, "release");
+                    }
+                })(),
+            ]);
+            expectSyntheticResponse(response);
+            const startsAfterTurn = markerCount(controlMarker);
+            if (expectedStatus === "connected") {
+                expect(startsAfterTurn).toBe(1);
+            }
+            // Turn initialization may retry a failed server; inventory must not.
+            for (let i = 0; i < 2; i++) {
+                const inventory = await session.rpc.mcp.listConfigured();
+                expect(
+                    inventory.servers.find((server) => server.name === "control")?.live?.status
+                ).toBe(expectedStatus);
+                expect(markerCount(controlMarker)).toBe(startsAfterTurn);
+            }
+            expect(markerCount(disabledMarker)).toBe(0);
+        }
+    );
+
+    it.each([false, true])(
+        "restores cold default inheritance for disabled default %s without starting MCP",
+        async (configDisabled) => {
+            const configDirectory = join(workDir, `cold-file-mcp-${randomUUID()}`);
+            mkdirSync(configDirectory, { recursive: true });
+            const marker = join(configDirectory, "server-started.log");
+            const serverName = "cold-file-server";
+            await using session = await client.createSession({
+                onPermissionRequest: approveAll,
+                configDirectory,
+                enableConfigDiscovery: true,
+                requestExtensions: false,
+            });
+            await drainPostCreateRpc(session);
+
+            // These names are entirely unconfigured; every call must remain inert.
+            for (let i = 0; i < 2; i++) {
+                await session.rpc.mcp.enable({ serverName });
+                await session.rpc.mcp.enable({ serverName });
+                await session.rpc.mcp.disable({ serverName });
+                await session.rpc.mcp.disable({ serverName });
+            }
+            await session.rpc.mcp.enable({ serverName });
+
+            writeFileSync(
+                join(configDirectory, "mcp-config.json"),
+                JSON.stringify({
+                    mcpServers: {
+                        [serverName]: {
+                            type: "stdio",
+                            command: process.execPath,
+                            args: [TEST_MCP_SERVER, "--startup-marker", marker],
+                            tools: ["*"],
+                            disabled: configDisabled,
+                        },
+                    },
+                })
+            );
+            const after = await session.rpc.mcp.listConfigured();
+            expect(after.servers.find((server) => server.name === serverName)).toMatchObject({
+                enabled: !configDisabled,
+            });
+            expect(after.servers.find((server) => server.name === serverName)?.live).toEqual({
+                status: "not_configured",
+            });
+            expect(markerCount(marker)).toBe(0);
+
+            // A live-list read is the first operation that may materialize the graph.
+            const loaded = await session.rpc.mcp.list();
+            expect(loaded.servers.find((server) => server.name === serverName)?.status).toBe(
+                configDisabled ? "disabled" : "connected"
+            );
+            expect(markerCount(marker)).toBe(configDisabled ? 0 : 1);
+        }
+    );
+
+    // SDK runners provide a sandbox backend only on macOS (no bwrap/BaseContainer elsewhere).
+    it.skipIf(process.platform !== "darwin").each([
+        ["create", "connected"],
+        ["create", "failed"],
+        ["resume", "connected"],
+        ["resume", "failed"],
+    ] as const)(
+        "%s applies sandbox without starting MCP and skips a gated %s startup",
+        { timeout: 120_000 },
+        async (mode, expectedStatus) => {
+            const startupGate = join(workDir, `sandbox-startup-gate-${randomUUID()}`);
+            const { pluginDirectory, controlMarker, disabledMarker } = createPluginDirectory(
+                "sandbox-mcp",
+                [
+                    "--startup-gate",
+                    startupGate,
+                    ...(expectedStatus === "failed" ? ["--fail-startup"] : []),
+                ]
+            );
+            const createOptions = {
+                onPermissionRequest: approveAll,
+                enableSessionStore: true,
+                pluginDirectories: [pluginDirectory],
+                disabledMcpServers: ["disabled"],
+            };
+            const activeClient = createClient({
+                connection: RuntimeConnection.forStdio({ path: process.env.COPILOT_CLI_PATH }),
+                requestHandler: new PersistingRequestHandler(),
+            });
+            let sessionId: string | undefined;
+            if (mode === "resume") {
+                const seedClient = createClient({
+                    connection: RuntimeConnection.forStdio({ path: process.env.COPILOT_CLI_PATH }),
+                    requestHandler: new PersistingRequestHandler(),
+                });
+                try {
+                    const seed = await seedClient.createSession({
+                        onPermissionRequest: approveAll,
+                        enableSessionStore: true,
+                    });
+                    sessionId = seed.sessionId;
+                    expectSyntheticResponse(await seed.sendAndWait({ prompt: MCP_TRIGGER_PROMPT }));
+                } finally {
+                    await seedClient.stop();
+                }
+            }
+            try {
+                await using session = sessionId
+                    ? await activeClient.resumeSession(sessionId, createOptions)
+                    : await activeClient.createSession(createOptions);
+                let startupFailure: string | undefined;
+                const unsubscribe = session.on("session.mcp_server_status_changed", (event) => {
+                    if (event.data.serverName === "control" && event.data.status === "failed") {
+                        startupFailure = event.data.error ?? "MCP startup failed";
+                    }
+                });
+                try {
+                    const updated = await session.rpc.options.update({
+                        sandboxConfig: {
+                            enabled: true,
+                            allowBypass: true,
+                            addCurrentWorkingDirectory: true,
+                            allowDevToolAccess: true,
+                            userPolicy: {
+                                // The fixture and its dependencies live outside the session workspace.
+                                filesystem: {
+                                    readonlyPaths: [resolve(__dirname, "../../../../..")],
+                                },
+                            },
+                        },
+                    });
+                    expect(updated.success).toBe(true);
+                    const inventory = await session.rpc.mcp.listConfigured();
+                    expect(inventory.servers.filter((s) => s.name === "control")).toMatchObject([
+                        { enabled: true },
+                    ]);
+                    expect(markerCount(controlMarker)).toBe(0);
+                    expect(markerCount(disabledMarker)).toBe(0);
+                    const [response] = await Promise.all([
+                        session.sendAndWait({ prompt: MCP_TRIGGER_PROMPT }, 60_000),
+                        (async () => {
+                            await waitForCondition(
+                                () => {
+                                    if (startupFailure) {
+                                        throw new Error(startupFailure);
+                                    }
+                                    return markerCount(controlMarker) === 1;
+                                },
+                                { timeoutMs: 60_000, intervalMs: 100 }
+                            );
+                            const background = await session.rpc.mcp.moveLoadingToBackground();
+                            expect(background.movedToBackground).toBe(true);
+                        })(),
+                    ]);
+                    expectSyntheticResponse(response);
+                    expect(existsSync(startupGate)).toBe(false);
+                    expect(markerCount(controlMarker)).toBe(1);
+                    expect(markerCount(disabledMarker)).toBe(0);
+                    writeFileSync(startupGate, "release");
+                    await waitForCondition(
+                        async () => {
+                            const configured = await session.rpc.mcp.listConfigured();
+                            return (
+                                configured.servers.find((server) => server.name === "control")?.live
+                                    ?.status === expectedStatus
+                            );
+                        },
+                        { timeoutMs: 60_000, intervalMs: 100 }
+                    );
+                    expect(markerCount(controlMarker)).toBe(1);
+                } finally {
+                    unsubscribe();
+                    writeFileSync(startupGate, "release");
+                }
+            } finally {
+                await activeClient.stop();
+            }
+        }
+    );
+
     it(
         "keeps disabled plugin MCP servers per-session on create",
         { timeout: 120_000 },
@@ -473,11 +721,26 @@ describe("disabled MCP servers", async () => {
                     onPermissionRequest: approveAll,
                     enableSessionStore: true,
                     pluginDirectories: [pluginDirectory],
-                    disabledMcpServers: ["disabled"],
+                    disabledMcpServers: ["disabled", "github-mcp-server", "computer-use"],
                 });
                 await waitForMcpStatus(resumedSession, "control", "connected");
                 await waitForMcpStatus(resumedSession, "disabled", "disabled");
                 await waitForMarkerCount(controlMarker, 1);
+                const inventory = await resumedSession.rpc.mcp.listConfigured();
+                expect(
+                    inventory.servers
+                        .filter((server) => ["control", "disabled"].includes(server.name))
+                        .map(({ name, enabled }) => ({ name, enabled }))
+                        .sort((a, b) => a.name.localeCompare(b.name))
+                ).toEqual([
+                    { name: "control", enabled: true },
+                    { name: "disabled", enabled: false },
+                ]);
+                expect(
+                    inventory.servers.filter(
+                        (server) => server.source === "builtin" && server.enabled
+                    )
+                ).toEqual([]);
                 expect(existsSync(disabledMarker)).toBe(false);
             } finally {
                 await initialClient.stop().catch(() => {});
diff --git a/nodejs/test/e2e/dynamic_auto_tiers.e2e.test.ts b/nodejs/test/e2e/dynamic_auto_tiers.e2e.test.ts
new file mode 100644
index 0000000000..181f4de3b1
--- /dev/null
+++ b/nodejs/test/e2e/dynamic_auto_tiers.e2e.test.ts
@@ -0,0 +1,350 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { fileURLToPath } from "node:url";
+import { describe, expect, it } from "vitest";
+import { approveAll } from "../../src/index.js";
+import { createGetModelsResponse } from "../../../test/harness/replayingCapiProxy.js";
+import { createSdkTestContext } from "./harness/sdkTestContext.js";
+import { getNextEventOfType } from "./harness/sdkTestHelper.js";
+import { isByokBackend } from "./harness/testBackend";
+
+function metadataResponse() {
+    return {
+        models: createGetModelsResponse(["claude-sonnet-5"]),
+        auto: {
+            default_tier: "premium-v2",
+            tiers: [
+                {
+                    id: "efficiency",
+                    display_name: "Quick",
+                    description: "Provider quick description",
+                    type: "auto",
+                    status: { enabled: true },
+                },
+                {
+                    id: "premium-v2",
+                    display_name: "Adaptive",
+                    description: "Provider adaptive description",
+                    type: "auto",
+                    status: { enabled: true },
+                },
+                {
+                    id: "intelligence",
+                    display_name: "Careful",
+                    description: "Provider disabled description",
+                    type: "auto",
+                    status: { enabled: false, message: "Contact admin" },
+                },
+                {
+                    id: "ensemble",
+                    display_name: "Ensemble",
+                    description: "Not an Auto execution type",
+                    type: "ensemble",
+                    status: { enabled: true },
+                },
+            ],
+        },
+    };
+}
+
+describe.skipIf(isByokBackend)("Assignment-only Dynamic Auto tiers", async () => {
+    let context: Awaited<ReturnType<typeof createSdkTestContext>>;
+    if (!isByokBackend) {
+        context = await createSdkTestContext({
+            useStdio: true,
+            copilotClientOptions: {
+                env: {
+                    DYNAMIC_AUTO_TIERS: "false",
+                    COPILOT_EXP_COPILOT_CLI_DYNAMIC_AUTO_TIERS: "false",
+                },
+            },
+        });
+    }
+    const expAssignments = {
+        Features: [],
+        Flights: {},
+        Configs: [{ Id: "default", Parameters: { copilot_cli_dynamic_auto_tiers: true } }],
+        AssignmentContext: "assignment-only-dynamic-auto",
+    };
+
+    for (const operation of ["create", "cold resume"] as const) {
+        for (const [tier, error] of [
+            ["premium-v2", undefined],
+            ["intelligence", "Contact admin"],
+            ["removed", "unavailable"],
+        ] as const) {
+            it(`${operation} validates ${tier} using the request assignment`, async () => {
+                const { copilotClient: client, createClient, openAiEndpoint: proxy } = context;
+                await client.stop();
+                await proxy.setMetaResponse(metadataResponse());
+                const config = {
+                    model: "auto",
+                    capi: { autoTier: tier },
+                    expAssignments,
+                    onPermissionRequest: approveAll,
+                };
+                let resumedClient: ReturnType<typeof createClient> | undefined;
+                try {
+                    let request;
+                    if (operation === "create") {
+                        request = client.createSession(config);
+                    } else {
+                        await proxy.updateConfig({
+                            filePath: fileURLToPath(
+                                new URL(
+                                    "../../../test/snapshots/auto_tier/should_commit_fast_auto_tier_after_successful_turn.yaml",
+                                    import.meta.url
+                                )
+                            ),
+                            workDir: context.workDir,
+                            replayOnly: true,
+                        });
+                        await proxy.setMetaResponse(metadataResponse());
+                        const original = await client.createSession({
+                            model: "auto",
+                            capi: { enableWebSocketResponses: false },
+                            onPermissionRequest: approveAll,
+                        });
+                        const reply = await original.sendAndWait({
+                            prompt: "Reply with exactly AUTO_TIER_FAST_COMMITTED.",
+                        });
+                        expect(reply?.data.content).toBe("AUTO_TIER_FAST_COMMITTED");
+                        const sessionId = original.sessionId;
+                        await original.disconnect();
+                        await client.stop();
+                        resumedClient = createClient();
+                        request = resumedClient.resumeSession(sessionId, config);
+                    }
+                    if (error) {
+                        await expect(request).rejects.toThrow(error);
+                    } else {
+                        const session = await request;
+                        expect((await session.rpc.model.getCurrent()).autoTier).toBe(tier);
+                        await session.disconnect();
+                    }
+                    const requests = await proxy.getRequests();
+                    expect(requests.some((entry) => entry.url === "/meta")).toBe(true);
+                } finally {
+                    await resumedClient?.stop();
+                }
+            });
+        }
+    }
+});
+
+// This contract belongs to CAPI discovery/routing, not the alternate BYOK backend matrix.
+describe.skipIf(isByokBackend)("Dynamic Auto tiers", async () => {
+    let context: Awaited<ReturnType<typeof createSdkTestContext>>;
+    if (!isByokBackend) {
+        context = await createSdkTestContext({
+            useStdio: true,
+            copilotClientOptions: {
+                env: { DYNAMIC_AUTO_TIERS: "true" },
+            },
+        });
+    }
+
+    it("creates Fast without catalog discovery when metadata is unavailable", async () => {
+        const { copilotClient: client, openAiEndpoint: proxy } = context;
+        await proxy.setMetaResponse({ message: "Meta is disabled" }, 404);
+        const session = await client.createSession({
+            model: "auto",
+            capi: { autoTier: "fast" },
+            onPermissionRequest: approveAll,
+        });
+        try {
+            expect((await session.rpc.model.getCurrent()).autoTier).toBe("fast");
+            const fastRequests = await proxy.getRequests();
+            expect(
+                fastRequests.filter(
+                    (request) => request.url === "/meta" || request.url === "/models"
+                )
+            ).toEqual([]);
+
+            await expect(
+                client.createSession({
+                    model: "auto",
+                    capi: { autoTier: "efficiency" },
+                    onPermissionRequest: approveAll,
+                })
+            ).rejects.toThrow("Meta is disabled");
+            const requests = await proxy.getRequests();
+            expect(requests.some((request) => request.url === "/meta")).toBe(true);
+            expect(requests.some((request) => request.url === "/models")).toBe(false);
+        } finally {
+            await session.disconnect();
+        }
+    });
+
+    it("discovers provider tiers without committing the default and validates staged preferences", async () => {
+        const { copilotClient: client, openAiEndpoint: proxy } = context;
+        await proxy.setMetaResponse(metadataResponse());
+        const session = await client.createSession({
+            model: "auto",
+            onPermissionRequest: approveAll,
+        });
+        const catalog = await session.rpc.model.list();
+        expect(catalog.auto?.defaultTier).toBe("premium-v2");
+        expect(catalog.auto?.tiers.map((tier) => tier.id)).toEqual([
+            "efficiency",
+            "premium-v2",
+            "intelligence",
+            "ensemble",
+        ]);
+        expect(catalog.auto?.tiers[1].displayName).toBe("Adaptive");
+        expect((await session.rpc.model.getCurrent()).autoTier).toBeUndefined();
+
+        const pending = await session.setAutoTier("premium-v2");
+        expect(pending.status).toBe("pending");
+        expect(pending.pendingAutoTier).toBe("premium-v2");
+        expect((await session.rpc.model.getCurrent()).autoTier).toBeUndefined();
+        await session.setModel("auto");
+        expect((await session.rpc.model.getCurrent()).pendingAutoTier).toBe("premium-v2");
+        await expect(session.setAutoTier("intelligence")).rejects.toThrow("Contact admin");
+        await expect(session.setAutoTier("ensemble")).rejects.toThrow();
+        await expect(session.setAutoTier("removed")).rejects.toThrow();
+        expect((await session.rpc.model.getCurrent()).pendingAutoTier).toBe("premium-v2");
+        await session.setAutoTier(null);
+        expect((await session.rpc.model.getCurrent()).pendingAutoTier).toBeUndefined();
+        await session.disconnect();
+    });
+
+    it("does not use models as a fallback when required metadata discovery fails", async () => {
+        const { copilotClient: client, openAiEndpoint: proxy } = context;
+        await proxy.setMetaResponse(metadataResponse());
+        const session = await client.createSession({
+            model: "auto",
+            onPermissionRequest: approveAll,
+        });
+        await proxy.setMetaResponse({ message: "Meta is disabled" }, 404);
+        await expect(session.rpc.model.list({ skipCache: true })).rejects.toThrow();
+        const requests = await proxy.getRequests();
+        expect(requests.some((request) => request.url === "/meta")).toBe(true);
+        expect(requests.some((request) => request.url === "/models")).toBe(false);
+        await session.disconnect();
+    });
+
+    it("preserves a newer reset while an older tier request waits for discovery", async () => {
+        const { copilotClient: client, openAiEndpoint: proxy } = context;
+        await client.stop();
+        await proxy.setMetaResponse(metadataResponse());
+        const session = await client.createSession({
+            model: "auto",
+            onPermissionRequest: approveAll,
+        });
+        const gate = await proxy.gateMetaResponse();
+        const older = session.setAutoTier("premium-v2").then(
+            (value) => ({ value, error: undefined }),
+            (error: Error) => ({ value: undefined, error })
+        );
+        try {
+            await gate.reached();
+            const reset = await session.setAutoTier(null);
+            expect(reset.status).toBe("unchanged");
+        } finally {
+            await gate.release();
+        }
+        const outcome = await older;
+        const current = await session.rpc.model.getCurrent();
+        expect(current.autoTier).toBeUndefined();
+        expect(current.pendingAutoTier).toBeUndefined();
+        expect(outcome.error).toBeInstanceOf(Error);
+        expect(outcome.error?.message).toContain("superseded");
+        await session.disconnect();
+    });
+
+    it("validates explicit create and resume preferences without rejecting restored historical preferences", async () => {
+        const { copilotClient: client, openAiEndpoint: proxy } = context;
+        await proxy.setMetaResponse(metadataResponse());
+        await expect(
+            client.createSession({
+                model: "auto",
+                capi: { autoTier: "intelligence" },
+                onPermissionRequest: approveAll,
+            })
+        ).rejects.toThrow("Contact admin");
+        const session = await client.createSession({
+            model: "auto",
+            capi: { autoTier: "premium-v2" },
+            onPermissionRequest: approveAll,
+        });
+        expect((await session.rpc.model.getCurrent()).autoTier).toBe("premium-v2");
+        await expect(
+            client.resumeSession(session.sessionId, {
+                capi: { autoTier: "removed" },
+                onPermissionRequest: approveAll,
+            })
+        ).rejects.toThrow("removed");
+        expect((await session.rpc.model.getCurrent()).autoTier).toBe("premium-v2");
+        await session.disconnect();
+    });
+
+    it("does not synthesize Auto options when the metadata envelope omits auto", async () => {
+        const { copilotClient: client, openAiEndpoint: proxy } = context;
+        await proxy.setMetaResponse({ models: createGetModelsResponse(["claude-sonnet-5"]) });
+        const session = await client.createSession({
+            model: "auto",
+            onPermissionRequest: approveAll,
+        });
+        expect((await session.rpc.model.list({ skipCache: true })).auto).toBeUndefined();
+        await expect(session.setAutoTier("balance")).rejects.toThrow(
+            "unavailable for this account"
+        );
+        await session.disconnect();
+    });
+
+    it("routes a new tier unchanged and retains it on cold resume after removal", async () => {
+        const { copilotClient: client, createClient, openAiEndpoint: proxy, workDir } = context;
+        // Replay the same assistant exchange; the routing endpoint and its tier are asserted independently.
+        await proxy.updateConfig({
+            filePath: fileURLToPath(
+                new URL(
+                    "../../../test/snapshots/auto_tier/should_commit_fast_auto_tier_after_successful_turn.yaml",
+                    import.meta.url
+                )
+            ),
+            workDir,
+            replayOnly: true,
+        });
+        await proxy.setMetaResponse(metadataResponse());
+        const session = await client.createSession({
+            model: "auto",
+            onPermissionRequest: approveAll,
+            capi: { enableWebSocketResponses: false },
+        });
+        await session.rpc.model.list({ skipCache: true });
+        const changed = getNextEventOfType(session, "session.model_change");
+        await session.setAutoTier("premium-v2");
+        const reply = await session.sendAndWait({
+            prompt: "Reply with exactly AUTO_TIER_FAST_COMMITTED.",
+        });
+        expect(reply?.data.content).toBe("AUTO_TIER_FAST_COMMITTED");
+        expect((await changed).data.autoTier).toBe("premium-v2");
+        expect((await session.rpc.model.getCurrent()).autoTier).toBe("premium-v2");
+        const request = (await proxy.getRequests()).find((entry) => entry.url === "/auto");
+        expect(JSON.parse(request!.body).tier).toBe("premium-v2");
+        const sessionId = session.sessionId;
+        await session.disconnect();
+        await client.stop();
+
+        const removed = metadataResponse();
+        removed.auto.default_tier = "efficiency";
+        removed.auto.tiers = removed.auto.tiers.filter((tier) => tier.id !== "premium-v2");
+        await proxy.setMetaResponse(removed);
+        const resumedClient = createClient();
+        try {
+            const resumed = await resumedClient.resumeSession(sessionId, {
+                onPermissionRequest: approveAll,
+            });
+            expect((await resumed.rpc.model.getCurrent()).autoTier).toBe("premium-v2");
+            await expect(resumed.setModel("auto")).rejects.toThrow("premium-v2");
+            const replacement = await resumed.setAutoTier("efficiency");
+            expect(replacement.pendingAutoTier).toBe("efficiency");
+            expect(replacement.effectiveAutoTier).toBe("premium-v2");
+        } finally {
+            await resumedClient.stop();
+        }
+    }, 120_000);
+});
diff --git a/nodejs/test/e2e/entra_identity_first.e2e.test.ts b/nodejs/test/e2e/entra_identity_first.e2e.test.ts
new file mode 100644
index 0000000000..7df4d67c50
--- /dev/null
+++ b/nodejs/test/e2e/entra_identity_first.e2e.test.ts
@@ -0,0 +1,638 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { randomUUID } from "node:crypto";
+import { mkdir, readFile, writeFile } from "node:fs/promises";
+import { join } from "node:path";
+import { describe, expect, it, onTestFailed, onTestFinished } from "vitest";
+import { approveAll, CopilotClient, RuntimeConnection } from "../../src/index.js";
+import { createSdkTestContext } from "./harness/sdkTestContext.js";
+import { ConnectProxy } from "../../../test/harness/connectProxy.js";
+import { createE2eRequestHandler } from "../../../test/harness/mockHandlers.js";
+import { readDiagnosticTail } from "../../../test/harness/sdk-diagnostics.mjs";
+
+const { env, workDir, openAiEndpoint } = await createSdkTestContext({
+    useStdio: true,
+    copilotClientOptions: { useLoggedInUser: false, gitHubToken: undefined },
+});
+const EMU_SCOPE = "12f6db80-0741-4a7e-b9c5-b85d737b3a31/user_impersonation";
+const M365_SCOPE = "42c8f7bd-c7a8-4ba9-bc1c-91edfb716247/.default";
+const LOKI_HOST = "loki.identity-first.example";
+const VERIFICATION_UNAVAILABLE =
+    "Microsoft sign-in succeeded, but GitHub account verification is temporarily unavailable. Please try again later. Your active account has not changed.";
+type CatalogReceipt = {
+    resource: "capi_models" | "loki_models" | "loki_quota";
+    authenticated: boolean;
+    receivedAtMs: number;
+    status?: number;
+    /** Fixture-selected class, not proof that the runtime decoded the response. */
+    responseClass?: "catalog" | "quota" | "mos_disabled" | "access_denied";
+    replyAtMs?: number;
+    finishedAtMs?: number;
+    closedAtMs?: number;
+    closedBeforeFinish?: boolean;
+    requestAborted?: boolean;
+};
+const scenarios = [
+    { name: "both", emuGrant: true, staff: true, capi: 200, loki: 200, expected: "choices" },
+    { name: "emu only", emuGrant: true, staff: true, capi: 200, loki: 403, expected: "entraEmu" },
+    {
+        name: "hidden CAPI models still establish service access",
+        emuGrant: true,
+        staff: true,
+        capi: 200,
+        loki: 403,
+        hiddenCapi: true,
+        expected: "entraEmu",
+    },
+    {
+        name: "selection-restricted CAPI models still establish service access",
+        emuGrant: true,
+        staff: false,
+        capi: 200,
+        loki: 403,
+        restrictedCapi: true,
+        expected: "entraEmu",
+    },
+    {
+        name: "loki only",
+        emuGrant: true,
+        staff: true,
+        capi: 200,
+        loki: 200,
+        expected: "loki",
+        emptyCapi: true,
+    },
+    { name: "CAPI failed", emuGrant: true, staff: true, capi: 403, loki: 200, expected: "loki" },
+    {
+        name: "neither",
+        emuGrant: true,
+        staff: true,
+        capi: 200,
+        loki: 403,
+        expected: "failure",
+        emptyCapi: true,
+    },
+    {
+        name: "EMU grant denied",
+        emuGrant: false,
+        staff: true,
+        capi: 200,
+        loki: 200,
+        expected: "failure",
+    },
+    {
+        name: "denied EMU exchange preserves the rotated web identity",
+        emuGrant: true,
+        exchangeDenied: true,
+        staff: true,
+        capi: 200,
+        loki: 200,
+        expected: "failure",
+    },
+    {
+        name: "initial EMU user lookup outage suggests trying again later",
+        emuGrant: true,
+        userLookupFailure: 503,
+        staff: true,
+        capi: 200,
+        loki: 200,
+        expected: "failure",
+    },
+    {
+        name: "initial EMU network failure suggests trying again later",
+        emuGrant: true,
+        userLookupFailure: "network",
+        staff: true,
+        capi: 200,
+        loki: 200,
+        expected: "failure",
+    },
+    {
+        name: "initial EMU lookup outage survives plaintext consent",
+        emuGrant: true,
+        userLookupFailure: 503,
+        plaintextConsent: true,
+        staff: true,
+        capi: 200,
+        loki: 200,
+        expected: "failure",
+    },
+    {
+        name: "initial EMU access denial is not presented as a temporary outage",
+        emuGrant: true,
+        userLookupFailure: 403,
+        staff: true,
+        capi: 200,
+        loki: 200,
+        expected: "failure",
+    },
+    {
+        name: "initial EMU lookup outage does not block an available linked Loki account",
+        emuGrant: true,
+        userLookupFailure: 503,
+        savedLoki: true,
+        staff: true,
+        capi: 200,
+        loki: 200,
+        expected: "loki",
+    },
+    {
+        name: "linked nonstaff",
+        emuGrant: true,
+        staff: false,
+        capi: 200,
+        loki: 200,
+        expected: "failure",
+        emptyCapi: true,
+    },
+    {
+        name: "MOS model denial preserves only EMU",
+        emuGrant: true,
+        staff: true,
+        capi: 200,
+        loki: 403,
+        mosDenied: "models",
+        expected: "entraEmu",
+    },
+    {
+        name: "MOS quota denial overrides a successful Loki catalog",
+        emuGrant: true,
+        staff: true,
+        capi: 200,
+        loki: 200,
+        mosDenied: "quota",
+        emptyCapi: true,
+        expected: "failure",
+    },
+] as const;
+
+describe("Entra identity-first resource discovery", () => {
+    for (const scenario of scenarios) {
+        it(scenario.name, async () => {
+            const profile = join(workDir, `identity-first-${randomUUID()}`);
+            await mkdir(profile, { recursive: true });
+            await writeFile(
+                join(profile, "settings.json"),
+                JSON.stringify({ storeTokenPlaintext: !("plaintextConsent" in scenario) })
+            );
+            const oid = randomUUID();
+            const tid = randomUUID();
+            const baseId = `entra:${oid}@${tid}`;
+            const emuToken = `ghu_identity_first_${randomUUID()}`;
+            const savedEmuToken = `ghu_saved_${randomUUID()}`;
+            if ("savedLoki" in scenario) {
+                await writeFile(
+                    join(profile, "config.json"),
+                    JSON.stringify({
+                        loggedInUsers: [
+                            {
+                                host: "https://github.com",
+                                login: "saved_emu",
+                                kind: "entraEmu",
+                                derivedFrom: baseId,
+                            },
+                            {
+                                host: `https://${LOKI_HOST}/api`,
+                                login: "identity@example.test",
+                                kind: "loki",
+                                derivedFrom: baseId,
+                            },
+                        ],
+                        authTokens: {
+                            "https://github.com:saved_emu:entra": {
+                                token: savedEmuToken,
+                                accountType: "entra",
+                                expiresAt: "2099-01-01T00:00:00Z",
+                            },
+                        },
+                    })
+                );
+            }
+            const grants: URLSearchParams[] = [];
+            const catalogs: string[] = [];
+            const receipts: CatalogReceipt[] = [];
+            let omittedReceipts = 0;
+            let loginOutcome:
+                | "pending"
+                | "fulfilled"
+                | "rejected_no_backend"
+                | "rejected_verification"
+                | "rejected_rpc_timeout"
+                | "rejected_other" = "pending";
+            const startedAt = performance.now();
+            const elapsedMs = () => Math.round(performance.now() - startedAt);
+            onTestFailed(async () => {
+                console.error(
+                    `[Entra discovery fixture] ${JSON.stringify({ loginOutcome, receipts, omittedReceipts })}`
+                );
+                try {
+                    const diagnostics = await readDiagnosticTail(profile);
+                    console.error(
+                        `[SDK diagnostics: last ${diagnostics.length} audited records]\n${diagnostics.join("\n")}`
+                    );
+                } catch {
+                    console.error("SDK diagnostics unavailable");
+                }
+            });
+            let latestRefresh = "identity-refresh";
+            const fallback = createE2eRequestHandler({ capiProxyUrl: openAiEndpoint.url });
+            const proxy = new ConnectProxy(
+                async (request, response, host) => {
+                    const path = request.url ?? "/";
+                    const resource =
+                        host === "api.githubcopilot.com" && path === "/models"
+                            ? "capi_models"
+                            : host === LOKI_HOST && path === "/api/models"
+                              ? "loki_models"
+                              : host === LOKI_HOST && path === "/api/quota"
+                                ? "loki_quota"
+                                : undefined;
+                    const receipt: CatalogReceipt | undefined = resource
+                        ? { resource, authenticated: false, receivedAtMs: elapsedMs() }
+                        : undefined;
+                    if (receipt) {
+                        if (receipts.length < 32) receipts.push(receipt);
+                        else omittedReceipts++;
+                        request.once("aborted", () => {
+                            receipt.requestAborted = true;
+                        });
+                        response.once("finish", () => {
+                            receipt.finishedAtMs = elapsedMs();
+                        });
+                        response.once("close", () => {
+                            receipt.closedAtMs = elapsedMs();
+                            receipt.closedBeforeFinish = !response.writableFinished;
+                        });
+                    }
+                    const reply = (
+                        status: number,
+                        body: unknown,
+                        responseClass?: CatalogReceipt["responseClass"]
+                    ) => {
+                        if (receipt) {
+                            receipt.status = status;
+                            receipt.responseClass = responseClass;
+                            receipt.replyAtMs = elapsedMs();
+                        }
+                        response.writeHead(status, { "content-type": "application/json" });
+                        response.end(JSON.stringify(body));
+                        return true;
+                    };
+                    if (host === "login.microsoftonline.com" && path.endsWith("/token")) {
+                        let body = "";
+                        for await (const chunk of request) body += chunk.toString();
+                        const grant = new URLSearchParams(body);
+                        grants.push(grant);
+                        if (grant.get("grant_type") === "authorization_code") {
+                            expect(grants).toHaveLength(1);
+                            expect(grant.get("scope")).toBe("openid profile offline_access");
+                            return reply(200, {
+                                id_token: `e30.${Buffer.from(JSON.stringify({ oid, tid, preferred_username: "identity@example.test" })).toString("base64url")}.fixture`,
+                                refresh_token: latestRefresh,
+                            });
+                        }
+                        expect(grant.get("grant_type")).toBe("refresh_token");
+                        expect(grant.get("refresh_token")).toBe(latestRefresh);
+                        const scope = grant.get("scope") ?? "";
+                        if (scope.includes(EMU_SCOPE)) {
+                            if (!scenario.emuGrant) return reply(400, { error: "access_denied" });
+                            latestRefresh = "rotated-after-emu";
+                            return reply(200, {
+                                access_token: "emu-resource-token",
+                                refresh_token: latestRefresh,
+                                expires_in: 3600,
+                            });
+                        }
+                        expect(scope).toContain(M365_SCOPE);
+                        latestRefresh = "rotated-after-m365";
+                        return reply(200, {
+                            access_token: "m365-resource-token",
+                            refresh_token: latestRefresh,
+                            expires_in: 3600,
+                        });
+                    }
+                    if (host === "github.com" && path === "/login/oauth/access_token") {
+                        let body = "";
+                        for await (const chunk of request) body += chunk.toString();
+                        expect(new URLSearchParams(body).get("subject_token")).toBe(
+                            "emu-resource-token"
+                        );
+                        if ("exchangeDenied" in scenario) {
+                            return reply(403, { error: "access_denied" });
+                        }
+                        return reply(200, {
+                            access_token: emuToken,
+                            token_type: "bearer",
+                            expires_in: 3600,
+                        });
+                    }
+                    if (host === "api.github.com" && path.startsWith("/copilot_internal/user")) {
+                        if (
+                            "savedLoki" in scenario &&
+                            request.headers.authorization?.endsWith(savedEmuToken)
+                        ) {
+                            return reply(200, {
+                                login: "saved_emu",
+                                copilot_plan: "business",
+                                is_staff: true,
+                            });
+                        }
+                        if ("userLookupFailure" in scenario) {
+                            if (scenario.userLookupFailure === "network") {
+                                response.destroy();
+                                return true;
+                            }
+                            return reply(scenario.userLookupFailure, {
+                                message: "Fixture user lookup failure",
+                            });
+                        }
+                        expect(request.headers.authorization).toBe(`Bearer ${emuToken}`);
+                        return reply(200, {
+                            login: "identity_emu",
+                            copilot_plan: "business",
+                            is_staff: scenario.staff,
+                            is_mcp_enabled: true,
+                            endpoints: {
+                                api: "https://api.githubcopilot.com",
+                                telemetry: "https://localhost:1",
+                            },
+                        });
+                    }
+                    if (host === "api.githubcopilot.com" && path === "/models") {
+                        expect(request.headers.authorization).toBe(`Bearer ${emuToken}`);
+                        catalogs.push("capi");
+                        if (receipt) receipt.authenticated = true;
+                        return reply(
+                            scenario.capi,
+                            {
+                                data:
+                                    "emptyCapi" in scenario && scenario.emptyCapi
+                                        ? []
+                                        : [
+                                              {
+                                                  id: "gpt-5.2",
+                                                  name: "Candidate CAPI model",
+                                                  capabilities: { supports: { tool_calls: true } },
+                                                  model_picker_enabled: !(
+                                                      "hiddenCapi" in scenario &&
+                                                      scenario.hiddenCapi
+                                                  ),
+                                                  ...("restrictedCapi" in scenario
+                                                      ? {
+                                                            billing: {
+                                                                restricted_to: ["enterprise"],
+                                                            },
+                                                        }
+                                                      : {}),
+                                              },
+                                          ],
+                            },
+                            scenario.capi === 200 ? "catalog" : "access_denied"
+                        );
+                    }
+                    if (host === LOKI_HOST && (path === "/api/models" || path === "/api/quota")) {
+                        expect(request.headers.authorization).toBe("Bearer m365-resource-token");
+                        if (receipt) receipt.authenticated = true;
+                        if ("mosDenied" in scenario && path === `/api/${scenario.mosDenied}`) {
+                            if (scenario.mosDenied === "models") catalogs.push("loki");
+                            return reply(
+                                403,
+                                {
+                                    error: {
+                                        message:
+                                            "Copilot CLI Entra access is not enabled for this user.",
+                                        type: "invalid_request_error",
+                                        code: "copilot_cli_entra_access_disabled",
+                                    },
+                                },
+                                "mos_disabled"
+                            );
+                        }
+                        if (path === "/api/quota") return reply(200, {}, "quota");
+                        catalogs.push("loki");
+                        return reply(
+                            scenario.loki,
+                            {
+                                data: [
+                                    {
+                                        id: "loki-test",
+                                        name: "Candidate M365 model",
+                                        capabilities: { supports: { tool_calls: true } },
+                                        model_picker_enabled: true,
+                                    },
+                                ],
+                            },
+                            scenario.loki === 200 ? "catalog" : "access_denied"
+                        );
+                    }
+                    return fallback(request, response, host);
+                },
+                {
+                    interceptDomains: [
+                        "login.microsoftonline.com",
+                        "github.com",
+                        "api.github.com",
+                        "api.githubcopilot.com",
+                        "api.mcp.github.com",
+                        LOKI_HOST,
+                    ],
+                }
+            );
+            let client: CopilotClient | undefined;
+            const starting = proxy.start();
+            onTestFinished(async () => {
+                try {
+                    await client?.stop();
+                } finally {
+                    await starting;
+                    await proxy.stop();
+                }
+            });
+            await starting;
+            const clientOptions = {
+                connection: RuntimeConnection.forStdio({ path: process.env.COPILOT_CLI_PATH }),
+                workingDirectory: workDir,
+                useLoggedInUser: false,
+                logLevel: "debug" as const,
+                env: {
+                    ...env,
+                    COPILOT_HOME: profile,
+                    RUST_LOG: "error,sdk_diagnostics=debug",
+                    COPILOT_DISABLE_KEYTAR: "1",
+                    GH_TOKEN: "",
+                    GITHUB_TOKEN: "",
+                    COPILOT_GITHUB_TOKEN: "",
+                    COPILOT_SDK_AUTH_TOKEN: "",
+                    GITHUB_COPILOT_API_TOKEN: "",
+                    COPILOT_HMAC_KEY: "",
+                    CAPI_HMAC_KEY: "",
+                    COPILOT_ENABLE_ALT_PROVIDERS: "",
+                    COPILOT_DEBUG_ENTRA_BROKER_URL: "",
+                    COPILOT_API_URL: "https://api.githubcopilot.com",
+                    COPILOT_DEBUG_GITHUB_API_URL: "https://api.github.com",
+                    COPILOT_LOKI_BASE_URL: `https://${LOKI_HOST}/api`,
+                    HTTPS_PROXY: proxy.proxyUrl,
+                    HTTP_PROXY: proxy.proxyUrl,
+                    https_proxy: proxy.proxyUrl,
+                    http_proxy: proxy.proxyUrl,
+                    NODE_EXTRA_CA_CERTS: proxy.caFilePath,
+                    SSL_CERT_FILE: proxy.caFilePath,
+                },
+            };
+            client = new CopilotClient(clientOptions);
+            const session = await client.createSession({
+                configDirectory: profile,
+                onPermissionRequest: approveAll,
+            });
+            if (process.platform === "linux") {
+                await expect(session.rpc.accounts.login.begin({ kind: "entra" })).rejects.toThrow(
+                    "only on Windows and macOS"
+                );
+                expect(grants).toEqual([]);
+                expect(catalogs).toEqual([]);
+                expect(
+                    await session.rpc.accounts.get({ query: { kind: "activeAccount" } })
+                ).toEqual({
+                    kind: "activeAccount",
+                    account: null,
+                });
+                return;
+            }
+            const { flowId } = await session.rpc.accounts.login.begin({ kind: "entra" });
+            const step = await session.rpc.accounts.login.advance({ flowId });
+            expect(step.kind).toBe("open-url");
+            if (step.kind !== "open-url")
+                throw new Error(`Expected web identity flow, got ${step.kind}`);
+            const authorize = new URL(step.url);
+            expect(authorize.searchParams.get("scope")).toBe("openid profile offline_access");
+            expect(grants).toHaveLength(0);
+            const callback = new URL(authorize.searchParams.get("redirect_uri")!);
+            callback.searchParams.set("code", "identity-code");
+            callback.searchParams.set("state", authorize.searchParams.get("state")!);
+            const completing = session.rpc.accounts.login.advance({ flowId }).then((step) => {
+                if ("plaintextConsent" in scenario) {
+                    expect(step).toMatchObject({
+                        kind: "completed",
+                        result: { status: "needs-plaintext-consent" },
+                    });
+                    return session.rpc.accounts.login.advance({ flowId, input: "allow" });
+                }
+                return step;
+            });
+            void completing.then(
+                () => {
+                    loginOutcome = "fulfilled";
+                },
+                (error: unknown) => {
+                    const message = error instanceof Error ? error.message : "";
+                    loginOutcome = message.includes("No usable inference backend")
+                        ? "rejected_no_backend"
+                        : message.includes(VERIFICATION_UNAVAILABLE)
+                          ? "rejected_verification"
+                          : /timed out|timeout/i.test(message)
+                            ? "rejected_rpc_timeout"
+                            : "rejected_other";
+                }
+            );
+            // Attach the failure assertion before the callback can complete the request.
+            const completed =
+                scenario.expected === "failure"
+                    ? expect(completing).rejects.toThrow(
+                          "userLookupFailure" in scenario && scenario.userLookupFailure !== 403
+                              ? VERIFICATION_UNAVAILABLE
+                              : "No usable inference backend"
+                      )
+                    : completing;
+            expect((await fetch(callback)).ok).toBe(true);
+            const result = await completed;
+            const saved = JSON.parse(
+                (await readFile(join(profile, "config.json"), "utf8"))
+                    .split("\n")
+                    .filter((line) => !line.trimStart().startsWith("//"))
+                    .join("\n")
+            );
+            const base = JSON.parse(saved.authTokens[`entra:${baseId}:entra`].token);
+            expect(base.web.refresh_token).toBe(latestRefresh);
+            if (
+                "exchangeDenied" in scenario ||
+                ("userLookupFailure" in scenario && !("savedLoki" in scenario))
+            ) {
+                expect(base.web.refresh_token).toBe("rotated-after-emu");
+            }
+            if (scenario.expected === "failure") {
+                expect(saved.lastLoggedInUser).toBeUndefined();
+                expect(
+                    await session.rpc.accounts.get({ query: { kind: "activeAccount" } })
+                ).toEqual({
+                    kind: "activeAccount",
+                    account: null,
+                });
+                await client.stop();
+                client = new CopilotClient({ ...clientOptions, useLoggedInUser: true });
+                const restarted = await client.createSession({
+                    configDirectory: profile,
+                    onPermissionRequest: approveAll,
+                });
+                expect(
+                    await restarted.rpc.accounts.get({ query: { kind: "activeAccount" } })
+                ).toEqual({ kind: "activeAccount", account: null });
+            } else {
+                let expected = scenario.expected;
+                if (expected === "choices") {
+                    expect(result).toMatchObject({
+                        kind: "completed",
+                        result: {
+                            status: "needs-account-selection",
+                            accounts: expect.arrayContaining([
+                                expect.objectContaining({ kind: "entraEmu" }),
+                                expect.objectContaining({ kind: "loki" }),
+                            ]),
+                        },
+                    });
+                    expect(saved.lastLoggedInUser).toBeUndefined();
+                    if (!result || result.kind !== "completed")
+                        throw new Error("Expected account choices");
+                    const selected = result.result.accounts?.find(
+                        (account) => account.kind === "loki"
+                    );
+                    expect(selected).toBeDefined();
+                    await session.rpc.accounts.login.advance({
+                        flowId,
+                        input: selected!.selectionId,
+                    });
+                    expected = "loki";
+                } else {
+                    expect(result).toMatchObject({
+                        kind: "completed",
+                        result: { status: "completed" },
+                    });
+                }
+                expect(
+                    await session.rpc.accounts.get({ query: { kind: "activeAccount" } })
+                ).toMatchObject({
+                    kind: "activeAccount",
+                    account: { kind: expected, active: true, derivedFrom: baseId },
+                });
+            }
+            const emuVerified =
+                scenario.emuGrant &&
+                !("exchangeDenied" in scenario) &&
+                !("userLookupFailure" in scenario);
+            if (emuVerified) expect(catalogs).toContain("capi");
+            else expect(catalogs).not.toContain("capi");
+            if ((scenario.staff && emuVerified) || "savedLoki" in scenario) {
+                expect(catalogs).toContain("loki");
+                expect(grants.map((grant) => grant.get("scope"))).toEqual([
+                    "openid profile offline_access",
+                    `${EMU_SCOPE} openid profile offline_access`,
+                    `${M365_SCOPE} openid profile offline_access`,
+                ]);
+            } else {
+                expect(catalogs).not.toContain("loki");
+                expect(grants).toHaveLength(2);
+            }
+        });
+    }
+});
diff --git a/nodejs/test/e2e/entra_renewal.e2e.test.ts b/nodejs/test/e2e/entra_renewal.e2e.test.ts
new file mode 100644
index 0000000000..82f20c6a27
--- /dev/null
+++ b/nodejs/test/e2e/entra_renewal.e2e.test.ts
@@ -0,0 +1,289 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { randomUUID } from "node:crypto";
+import { mkdir, readFile, writeFile } from "node:fs/promises";
+import { join } from "node:path";
+import { expect, it, onTestFinished } from "vitest";
+import { approveAll, CopilotClient, RuntimeConnection } from "../../src/index.js";
+import { createSdkTestContext } from "./harness/sdkTestContext.js";
+import { ConnectProxy } from "../../../test/harness/connectProxy.js";
+import { createE2eRequestHandler } from "../../../test/harness/mockHandlers.js";
+
+const { env, workDir, openAiEndpoint } = await createSdkTestContext({
+    useStdio: true,
+    replayOnly: true,
+    copilotClientOptions: { useLoggedInUser: false, gitHubToken: undefined },
+});
+
+it("requires linked sign-in, adopts same-session re-login, and persists silent renewal", async () => {
+    const profile = join(workDir, `entra-renewal-${randomUUID()}`);
+    await mkdir(profile);
+    await writeFile(join(profile, "settings.json"), '{"storeTokenPlaintext":true}');
+    const host = "https://github.com";
+    const login = "renewal_emu";
+    const slot = `${host}:${login}`;
+    const oid = randomUUID();
+    const tid = randomUUID();
+    const baseId = `entra:${oid}@${tid}`;
+    const legacyToken = `ghu_legacy_${randomUUID()}`;
+    await writeFile(
+        join(profile, "config.json"),
+        JSON.stringify({
+            loggedInUsers: [{ host, login, kind: "entraEmu" }],
+            authTokens: {
+                [slot]: {
+                    token: legacyToken,
+                    expiresAt: "2099-01-01T00:00:00Z",
+                    accountType: "entra",
+                },
+            },
+        })
+    );
+    let signIns = 0;
+    let grants = 0;
+    let exchanges = 0;
+    let refreshToken = "";
+    let expectedGeneration = 1;
+    let phase = "legacy account";
+    const modelRequests: number[] = [];
+    const tokenFor = (generation: number) => `ghu_renewal_${oid}_${generation}`;
+    const fallback = createE2eRequestHandler({ capiProxyUrl: openAiEndpoint.url });
+    const proxy = new ConnectProxy(
+        async (request, response, domain) => {
+            const path = request.url ?? "/";
+            const reply = (status: number, body: unknown) => {
+                response.writeHead(status, { "content-type": "application/json" });
+                response.end(JSON.stringify(body));
+                return true;
+            };
+            if (domain === "login.microsoftonline.com" && path.endsWith("/token")) {
+                let body = "";
+                for await (const chunk of request) body += chunk.toString();
+                const grant = new URLSearchParams(body);
+                if (grant.get("grant_type") === "authorization_code") {
+                    signIns++;
+                    expect(grant.get("scope")).toBe("openid profile offline_access");
+                    refreshToken = `identity-refresh-${signIns}`;
+                    return reply(200, {
+                        id_token: `e30.${Buffer.from(JSON.stringify({ oid, tid })).toString("base64url")}.fixture`,
+                        refresh_token: refreshToken,
+                    });
+                }
+                expect(grant.get("grant_type")).toBe("refresh_token");
+                expect(grant.get("refresh_token")).toBe(refreshToken);
+                expect(grant.get("scope")).toContain(
+                    "12f6db80-0741-4a7e-b9c5-b85d737b3a31/user_impersonation"
+                );
+                grants++;
+                refreshToken = `rotated-refresh-${grants}`;
+                return reply(200, {
+                    access_token: "emu-resource-token",
+                    refresh_token: refreshToken,
+                    expires_in: 3600,
+                });
+            }
+            if (domain === "github.com" && path === "/login/oauth/access_token") {
+                let body = "";
+                for await (const chunk of request) body += chunk.toString();
+                expect(new URLSearchParams(body).get("subject_token")).toBe("emu-resource-token");
+                exchanges++;
+                return reply(200, {
+                    access_token: tokenFor(exchanges),
+                    token_type: "bearer",
+                    expires_in: 3600,
+                });
+            }
+            if (domain === "api.github.com" && path.startsWith("/copilot_internal/user")) {
+                const issued = [
+                    legacyToken,
+                    ...Array.from({ length: exchanges }, (_, i) => tokenFor(i + 1)),
+                ];
+                expect(issued).toContain(request.headers.authorization?.split(" ").at(-1));
+                return reply(200, {
+                    login,
+                    copilot_plan: "business",
+                    is_staff: false,
+                    is_mcp_enabled: true,
+                    endpoints: {
+                        api: "https://api.githubcopilot.com",
+                        telemetry: "https://localhost:1",
+                    },
+                });
+            }
+            if (domain === "api.githubcopilot.com" && path === "/models") {
+                const generation = Array.from({ length: exchanges }, (_, i) => i + 1).find(
+                    (value) => request.headers.authorization?.split(" ").at(-1) === tokenFor(value)
+                );
+                modelRequests.push(generation ?? 0);
+                if (generation !== expectedGeneration) {
+                    return reply(401, {
+                        error: {
+                            message: `fixture rejected generation ${generation ?? 0} during ${phase}; expected ${expectedGeneration}, sign-ins ${signIns}, grants ${grants}, exchanges ${exchanges}`,
+                        },
+                    });
+                }
+                return reply(200, {
+                    data: [
+                        {
+                            id: "gpt-5.2",
+                            name: `Renewed catalog ${generation}`,
+                            capabilities: { supports: { tool_calls: true } },
+                            model_picker_enabled: true,
+                        },
+                    ],
+                });
+            }
+            return fallback(request, response, domain);
+        },
+        {
+            interceptDomains: [
+                "login.microsoftonline.com",
+                "github.com",
+                "api.github.com",
+                "api.githubcopilot.com",
+                "api.mcp.github.com",
+            ],
+        }
+    );
+    let client: CopilotClient | undefined;
+    const starting = proxy.start();
+    onTestFinished(async () => {
+        try {
+            await client?.stop();
+        } finally {
+            await starting;
+            await proxy.stop();
+        }
+    });
+    await starting;
+    const clientOptions = {
+        connection: RuntimeConnection.forStdio({ path: process.env.COPILOT_CLI_PATH }),
+        workingDirectory: workDir,
+        useLoggedInUser: true,
+        env: {
+            ...env,
+            COPILOT_HOME: profile,
+            COPILOT_DISABLE_KEYTAR: "1",
+            GH_TOKEN: "",
+            GITHUB_TOKEN: "",
+            COPILOT_GITHUB_TOKEN: "",
+            COPILOT_SDK_AUTH_TOKEN: "",
+            GITHUB_COPILOT_API_TOKEN: "",
+            COPILOT_HMAC_KEY: "",
+            CAPI_HMAC_KEY: "",
+            COPILOT_ENABLE_ALT_PROVIDERS: "",
+            COPILOT_DEBUG_ENTRA_BROKER_URL: "",
+            COPILOT_API_URL: "https://api.githubcopilot.com",
+            COPILOT_DEBUG_GITHUB_API_URL: "https://api.github.com",
+            HTTPS_PROXY: proxy.proxyUrl,
+            HTTP_PROXY: proxy.proxyUrl,
+            https_proxy: proxy.proxyUrl,
+            http_proxy: proxy.proxyUrl,
+            NODE_EXTRA_CA_CERTS: proxy.caFilePath,
+            SSL_CERT_FILE: proxy.caFilePath,
+        },
+    };
+    const sessionOptions = { configDirectory: profile, onPermissionRequest: approveAll };
+    client = new CopilotClient(clientOptions);
+    let session = await client.createSession(sessionOptions);
+    expect(await session.rpc.accounts.get({ query: { kind: "activeAccount" } })).toEqual({
+        kind: "activeAccount",
+        account: null,
+    });
+    await expect(session.rpc.model.list({ skipCache: true })).rejects.toThrow(
+        /Not authenticated|Sign in to Microsoft Entra again/
+    );
+    expect(modelRequests).toEqual([]);
+    expect(grants).toBe(0);
+    if (process.platform === "linux") {
+        await expect(session.rpc.accounts.login.begin({ kind: "entra" })).rejects.toThrow(
+            "only on Windows and macOS"
+        );
+        expect(signIns).toBe(0);
+        expect(exchanges).toBe(0);
+        expect(grants).toBe(0);
+        expect(modelRequests).toEqual([]);
+        return;
+    }
+
+    const signIn = async () => {
+        const { flowId } = await session.rpc.accounts.login.begin({ kind: "entra" });
+        const step = await session.rpc.accounts.login.advance({ flowId });
+        if (step.kind !== "open-url") throw new Error(`Expected web sign-in, got ${step.kind}`);
+        const authorize = new URL(step.url);
+        const callback = new URL(authorize.searchParams.get("redirect_uri")!);
+        callback.searchParams.set("code", "renewal-code");
+        callback.searchParams.set("state", authorize.searchParams.get("state")!);
+        const completing = session.rpc.accounts.login.advance({ flowId });
+        expect((await fetch(callback)).ok).toBe(true);
+        expect(await completing).toMatchObject({
+            kind: "completed",
+            result: { status: "completed" },
+        });
+        expect(await session.rpc.accounts.get({ query: { kind: "activeAccount" } })).toMatchObject({
+            account: { kind: "entraEmu", derivedFrom: baseId },
+        });
+    };
+    const assertCatalog = async () => {
+        const before = modelRequests.length;
+        const catalog = await session.rpc.model.list({ skipCache: true });
+        expect(catalog).toMatchObject({
+            list: expect.arrayContaining([expect.objectContaining({ id: "gpt-5.2" })]),
+        });
+        expect(modelRequests.slice(before)).toContain(expectedGeneration);
+        expect(modelRequests.slice(before).every((value) => value === expectedGeneration)).toBe(
+            true
+        );
+    };
+    phase = "initial sign-in";
+    await signIn();
+    await assertCatalog();
+
+    expectedGeneration = 2;
+    phase = "same-session rejection";
+    const beforeRejection = modelRequests.length;
+    await expect(session.rpc.model.list({ skipCache: true })).rejects.toThrow();
+    expect(modelRequests.slice(beforeRejection)).toContain(1);
+    phase = "same-session re-login";
+    await signIn();
+    await assertCatalog();
+    expect(signIns).toBe(2);
+
+    expect(await client.stop()).toEqual([]);
+    const readState = async () =>
+        JSON.parse(
+            (await readFile(join(profile, "config.json"), "utf8"))
+                .split("\n")
+                .filter((line) => !line.trimStart().startsWith("//"))
+                .join("\n")
+        );
+    const saved = await readState();
+    // Seed the early-refresh boundary only while the runtime is stopped.
+    const nearExpiry = new Date(Date.now() + 60_000).toISOString().replace(/\.\d{3}Z$/, "Z");
+    saved.authTokens[`${slot}:entra`].expiresAt = nearExpiry;
+    if (saved.authTokens[slot]) saved.authTokens[slot].expiresAt = nearExpiry;
+    await writeFile(join(profile, "config.json"), JSON.stringify(saved));
+    expectedGeneration = 3;
+    phase = "renewal after restart";
+    const grantsBeforeRestart = grants;
+    client = new CopilotClient(clientOptions);
+    session = await client.createSession(sessionOptions);
+    await assertCatalog();
+    expect(grants).toBe(grantsBeforeRestart + 1);
+    expect(signIns).toBe(2);
+    const renewed = await readState();
+    expect(renewed.authTokens[`${slot}:entra`].token).toBe(tokenFor(3));
+    expect(JSON.parse(renewed.authTokens[`entra:${baseId}:entra`].token).web.refresh_token).toBe(
+        refreshToken
+    );
+
+    expect(await client.stop()).toEqual([]);
+    phase = "persisted restart";
+    client = new CopilotClient(clientOptions);
+    session = await client.createSession(sessionOptions);
+    await assertCatalog();
+    expect(grants).toBe(grantsBeforeRestart + 1);
+    expect(signIns).toBe(2);
+});
diff --git a/nodejs/test/e2e/exp_assignments.e2e.test.ts b/nodejs/test/e2e/exp_assignments.e2e.test.ts
new file mode 100644
index 0000000000..e3caab765f
--- /dev/null
+++ b/nodejs/test/e2e/exp_assignments.e2e.test.ts
@@ -0,0 +1,179 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { dirname, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+import { describe, expect, it } from "vitest";
+import {
+    approveAll,
+    type CopilotExpAssignmentResponse,
+    type MCPStdioServerConfig,
+} from "../../src/index.js";
+import { createSdkTestContext } from "./harness/sdkTestContext.js";
+import { retry } from "./harness/sdkTestHelper.js";
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const TEST_MCP_SERVER = resolve(__dirname, "../../../test/harness/test-mcp-server.mjs");
+
+describe("create-time ExP assignments", async () => {
+    const { copilotClient: client } = await createSdkTestContext();
+
+    it("selects the semantic search mode", async () => {
+        for (const [mode, expected] of [
+            ["absent", false],
+            ["eager", true],
+        ] as const) {
+            const session = await client.createSession({
+                onPermissionRequest: approveAll,
+                expAssignments: {
+                    Features: ["copilot_cli_semantic_code_search_mode"],
+                    Flights: {
+                        copilot_cli_semantic_code_search_mode: mode,
+                    },
+                    Configs: [
+                        {
+                            Id: "default",
+                            Parameters: {
+                                copilot_cli_semantic_code_search_mode: mode,
+                            },
+                        },
+                    ],
+                    AssignmentContext: `sdk-semantic-${mode}`,
+                },
+            });
+
+            try {
+                await session.rpc.tools.initializeAndValidate();
+                const { tools } = await session.rpc.tools.getCurrentMetadata();
+                const names = tools.map((tool) => tool.name);
+                expect(names.includes("semantic_code_search")).toBe(expected);
+            } finally {
+                await session.disconnect();
+            }
+        }
+    });
+
+    it("drops malformed assignments and preserves a resident assignment", async () => {
+        const malformed = {
+            Features: [],
+            Flights: "invalid",
+            Configs: [],
+            AssignmentContext: "malformed",
+        } as unknown as CopilotExpAssignmentResponse;
+        const malformedCreate = await client.createSession({
+            onPermissionRequest: approveAll,
+            expAssignments: malformed,
+        });
+        try {
+            await malformedCreate.rpc.tools.initializeAndValidate();
+            const { tools } = await malformedCreate.rpc.tools.getCurrentMetadata();
+            expect(tools.map((tool) => tool.name)).not.toContain("semantic_code_search");
+        } finally {
+            await malformedCreate.disconnect();
+        }
+
+        const eager = await client.createSession({
+            onPermissionRequest: approveAll,
+            expAssignments: {
+                Features: ["copilot_cli_semantic_code_search_mode"],
+                Flights: {
+                    copilot_cli_semantic_code_search_mode: "eager",
+                },
+                Configs: [
+                    {
+                        Id: "default",
+                        Parameters: {
+                            copilot_cli_semantic_code_search_mode: "eager",
+                        },
+                    },
+                ],
+                AssignmentContext: "sdk-semantic-eager",
+            },
+        });
+        try {
+            await eager.rpc.tools.initializeAndValidate();
+            expect(
+                (await eager.rpc.tools.getCurrentMetadata()).tools.map((tool) => tool.name)
+            ).toContain("semantic_code_search");
+
+            const resumed = await client.resumeSession(eager.sessionId, {
+                onPermissionRequest: approveAll,
+                expAssignments: malformed,
+            });
+            try {
+                await resumed.rpc.tools.initializeAndValidate();
+                expect(
+                    (await resumed.rpc.tools.getCurrentMetadata()).tools.map((tool) => tool.name)
+                ).toContain("semantic_code_search");
+            } finally {
+                await resumed.disconnect();
+            }
+        } finally {
+            await eager.disconnect();
+        }
+    });
+
+    it("selects native lexical search and suppresses GitHub MCP code search", async () => {
+        const session = await client.createSession({
+            onPermissionRequest: approveAll,
+            expAssignments: {
+                Features: ["copilot_cli_blackbird_lexical_search"],
+                Flights: {
+                    copilot_cli_blackbird_lexical_search: "treatment",
+                },
+                Configs: [
+                    {
+                        Id: "default",
+                        Parameters: {
+                            copilot_cli_blackbird_lexical_search: true,
+                        },
+                    },
+                ],
+                AssignmentContext: "sdk-lexical-treatment",
+            },
+            mcpServers: {
+                "github-mcp-server": {
+                    type: "local",
+                    command: "node",
+                    args: [
+                        TEST_MCP_SERVER,
+                        "--server-name",
+                        "github-mcp-server",
+                        "--tool-name",
+                        "search_code",
+                    ],
+                    workingDirectory: dirname(TEST_MCP_SERVER),
+                    tools: ["*"],
+                } satisfies MCPStdioServerConfig,
+            },
+        });
+
+        try {
+            await retry(
+                "connect GitHub MCP test server",
+                async () => {
+                    const servers = await session.rpc.mcp.list();
+                    expect(
+                        servers.servers.find((server) => server.name === "github-mcp-server")
+                            ?.status
+                    ).toBe("connected");
+                },
+                1_200
+            );
+
+            for (const operation of ["initialize first turn", "reuse catalog on second turn"]) {
+                await session.rpc.tools.initializeAndValidate();
+                const { tools } = await session.rpc.tools.getCurrentMetadata();
+                const names = tools.map((tool) => tool.name);
+                expect(names).toContain("lexical_code_search");
+                expect(
+                    names,
+                    `${operation}: GitHub MCP search_code must be suppressed`
+                ).not.toContain("github-mcp-server-search_code");
+            }
+        } finally {
+            await session.disconnect();
+        }
+    });
+});
diff --git a/nodejs/test/e2e/extension_env_access.e2e.test.ts b/nodejs/test/e2e/extension_env_access.e2e.test.ts
index 15da3a9327..236201a21b 100644
--- a/nodejs/test/e2e/extension_env_access.e2e.test.ts
+++ b/nodejs/test/e2e/extension_env_access.e2e.test.ts
@@ -103,8 +103,9 @@ async function runExtensionAgainstStubHost(options: {
         await retry(
             "wait for the fixture extension to report its join result",
             async () => {
+                // File creation is visible before the child writes the result.
                 expect(
-                    existsSync(resultFile),
+                    existsSync(resultFile) && readFileSync(resultFile, "utf-8") !== "",
                     `extension never reported; stderr: ${stderr.join("")}`
                 ).toBe(true);
             },
diff --git a/nodejs/test/e2e/fixtures/http-mcp-extension.mjs b/nodejs/test/e2e/fixtures/http-mcp-extension.mjs
new file mode 100644
index 0000000000..310ef59893
--- /dev/null
+++ b/nodejs/test/e2e/fixtures/http-mcp-extension.mjs
@@ -0,0 +1,60 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { appendFile, rename, writeFile } from "node:fs/promises";
+import { joinSession } from "@github/copilot-sdk/extension";
+
+const url = process.env.EXTENSION_HTTP_MCP_URL;
+const statusPath = process.env.EXTENSION_HTTP_MCP_STATUS;
+const callsPath = process.env.EXTENSION_HTTP_MCP_CALLS;
+if (!url || !statusPath || !callsPath) {
+    throw new Error("HTTP MCP extension fixture requires its URL, status path, and calls path");
+}
+
+async function recordStatus(status) {
+    const pendingPath = `${statusPath}.pending`;
+    await writeFile(pendingPath, JSON.stringify(status));
+    await rename(pendingPath, statusPath);
+}
+
+const mcpServers = {
+    extensionprobe: { type: "http", url, tools: ["http_probe"], timeout: 5000 },
+};
+
+try {
+    const session = await joinSession({
+        tools: [
+            {
+                name: "extension_direct_probe",
+                description: "Record a marker in the extension process and return it.",
+                parameters: {
+                    type: "object",
+                    properties: { marker: { type: "string" } },
+                    required: ["marker"],
+                    additionalProperties: false,
+                },
+                handler: async ({ marker }) => {
+                    if (typeof marker !== "string") {
+                        throw new Error("Direct probe requires a string marker");
+                    }
+                    await appendFile(callsPath, `${JSON.stringify({ marker })}\n`);
+                    return `EXTENSION_DIRECT_REPLY_${marker}`;
+                },
+            },
+        ],
+        mcpServers,
+    });
+    await recordStatus({
+        state: "joined",
+        sessionId: session.sessionId,
+        sdkPath: process.env.COPILOT_SDK_PATH,
+        mcpServers,
+    });
+} catch (error) {
+    await recordStatus({
+        state: "failed",
+        error: error instanceof Error ? error.message : String(error),
+    });
+    throw error;
+}
diff --git a/nodejs/test/e2e/harness/CapiProxy.ts b/nodejs/test/e2e/harness/CapiProxy.ts
index a59591b75f..0ad0595af9 100644
--- a/nodejs/test/e2e/harness/CapiProxy.ts
+++ b/nodejs/test/e2e/harness/CapiProxy.ts
@@ -149,6 +149,7 @@ export class CapiProxy {
         filePath: string;
         workDir: string;
         backend?: ReplayBackend;
+        replayOnly?: boolean;
         testInfo?: { file: string; line?: number };
         modelNames?: Record<string, string>;
     }): Promise<void> {
@@ -233,6 +234,50 @@ export class CapiProxy {
         });
         expect(response.ok).toBe(true);
     }
+
+    async setEntraLogin(subjectToken: string, githubToken: string): Promise<void> {
+        const response = await fetch(`${this.proxyUrl}/entra-login-config`, {
+            method: "POST",
+            headers: { "content-type": "application/json" },
+            body: JSON.stringify({ subjectToken, githubToken }),
+        });
+        expect(response.ok).toBe(true);
+    }
+
+    async setMetaResponse(body: unknown, statusCode = 200): Promise<void> {
+        const response = await fetch(`${this.proxyUrl}/meta-response-config`, {
+            method: "POST",
+            headers: { "content-type": "application/json" },
+            body: JSON.stringify({ body, statusCode }),
+        });
+        expect(response.ok).toBe(true);
+    }
+
+    async gateMetaResponse(): Promise<{
+        reached: () => Promise<void>;
+        release: () => Promise<void>;
+    }> {
+        const response = await fetch(`${this.proxyUrl}/meta-response-gate`, {
+            method: "POST",
+            headers: { "content-type": "application/json" },
+            body: JSON.stringify({ hold: true }),
+        });
+        expect(response.ok).toBe(true);
+        return {
+            reached: async () => {
+                const response = await fetch(`${this.proxyUrl}/meta-response-gate`);
+                expect(response.ok).toBe(true);
+            },
+            release: async () => {
+                const response = await fetch(`${this.proxyUrl}/meta-response-gate`, {
+                    method: "POST",
+                    headers: { "content-type": "application/json" },
+                    body: JSON.stringify({ hold: false }),
+                });
+                expect(response.ok).toBe(true);
+            },
+        };
+    }
 }
 
 function tryParseStartupInfo(line: string): ProxyStartupInfo | undefined {
diff --git a/nodejs/test/e2e/harness/ahpClient.ts b/nodejs/test/e2e/harness/ahpClient.ts
index 13fea3ef5a..a121b563a6 100644
--- a/nodejs/test/e2e/harness/ahpClient.ts
+++ b/nodejs/test/e2e/harness/ahpClient.ts
@@ -23,6 +23,7 @@ import {
 import { AhpClient, type Subscription } from "@microsoft/agent-host-protocol-v09/client";
 import { WebSocketTransport } from "@microsoft/agent-host-protocol-v09/ws";
 import WebSocket from "ws";
+import { sealAhpAuthToken } from "./ahpSealedAuth.js";
 
 export async function withDeadline<T>(promise: Promise<T>, label: string, ms = 30_000): Promise<T> {
     let timer: ReturnType<typeof setTimeout> | undefined;
@@ -60,7 +61,7 @@ export async function connectAhp(
             capabilities,
         });
         assert.equal(initialized.protocolVersion, PROTOCOL_VERSION);
-        return { client, clientId, transport };
+        return { client, clientId, transport, initialized };
     } catch (error) {
         socket.terminate();
         throw error;
@@ -83,7 +84,12 @@ export async function authenticateAhp(
     await ahp.client.request("authenticate", {
         channel: "ahp-root://",
         resource: resource.resource,
-        token: githubToken,
+        token: await sealAhpAuthToken(
+            ahp.initialized._meta,
+            (root.snapshot?.state as RootState)._meta,
+            resource.resource,
+            githubToken
+        ),
     });
 }
 
@@ -94,6 +100,7 @@ export async function createAhpSession(
     tools: SessionActiveClient["tools"] = []
 ) {
     await authenticateAhp(ahp, githubToken);
+    // This token names the public AHP URI, not the independently allocated SDK session.
     const sessionId = randomUUID();
     const sessionUri = `ahp-session:/${sessionId}`;
     await ahp.client.request("createSession", {
diff --git a/nodejs/test/e2e/harness/ahpSealedAuth.ts b/nodejs/test/e2e/harness/ahpSealedAuth.ts
new file mode 100644
index 0000000000..de1ec061a4
--- /dev/null
+++ b/nodejs/test/e2e/harness/ahpSealedAuth.ts
@@ -0,0 +1,72 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from "node:assert/strict";
+import { createHash, randomBytes } from "node:crypto";
+import { AeadId, CipherSuite, KdfId, KemId } from "hpke-js";
+
+export const AUTH_ALGORITHM = "hpke-x25519-hkdf-sha256-aes256gcm";
+
+function object(value: unknown): Record<string, unknown> {
+    assert(value !== null && typeof value === "object" && !Array.isArray(value));
+    return value as Record<string, unknown>;
+}
+
+// These tests own the direct listener endpoint. Its actual handshake supplies
+// the connection binding; the root advertises the recipient, not initialize.
+// Matches protocol_base/ahp/sealing.rs and copilot-host spec/encryption.
+export async function sealAhpAuthToken(
+    initializeMeta: unknown,
+    rootMeta: unknown,
+    resource: string,
+    token: string
+): Promise<string> {
+    const initialized = object(initializeMeta);
+    const required = initialized["copilot.encryptionRequired"];
+    assert(Array.isArray(required) && required.includes("auth-token"));
+    const binding = object(initialized["copilot.authChallenge"]);
+    assert.equal(binding.required, true);
+    assert.equal(typeof binding.challenge, "string");
+    assert.match(binding.challenge as string, /^[0-9a-f]{32}$/);
+    assert(typeof binding.responseMaxAgeSeconds === "number" && binding.responseMaxAgeSeconds > 0);
+    const keys = object(rootMeta)["copilot.encryptionKeys"];
+    assert(Array.isArray(keys), "Root must advertise encryption keys");
+    const key = keys
+        .map(object)
+        .find((entry) => entry.use === "auth-token" && entry.algorithm === AUTH_ALGORITHM);
+    assert(key, "Host must advertise an auth-token HPKE key");
+    assert.equal(typeof key.publicKey, "string");
+    const publicKey = Buffer.from(key.publicKey as string, "base64");
+    assert.equal(publicKey.length, 32);
+    assert.equal(
+        key.keyId,
+        createHash("sha256").update(publicKey).digest().subarray(0, 8).toString("base64url")
+    );
+    const suite = new CipherSuite({
+        kem: KemId.DhkemX25519HkdfSha256,
+        kdf: KdfId.HkdfSha256,
+        aead: AeadId.Aes256Gcm,
+    });
+    const recipient = await suite.kem.deserializePublicKey(new Uint8Array(publicKey));
+    const sender = await suite.createSenderContext({ recipientPublicKey: recipient });
+    const ciphertext = await sender.seal(
+        new TextEncoder().encode(
+            JSON.stringify({
+                cty: "text",
+                ctx: {
+                    purpose: "auth-token",
+                    resource,
+                    connection: {
+                        challenge: binding.challenge,
+                        nonce: randomBytes(16).toString("hex"),
+                        issuedAt: Math.floor(Date.now() / 1000),
+                    },
+                },
+                value: token,
+            })
+        )
+    );
+    const box = Buffer.concat([Buffer.from(sender.enc), Buffer.from(ciphertext)]);
+    return `copilot-sealed.v1.${key.keyId}.${box.toString("base64url")}`;
+}
diff --git a/nodejs/test/e2e/harness/childUserPrompts.ts b/nodejs/test/e2e/harness/childUserPrompts.ts
new file mode 100644
index 0000000000..66dc278e73
--- /dev/null
+++ b/nodejs/test/e2e/harness/childUserPrompts.ts
@@ -0,0 +1,39 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import type { CopilotRequestContext } from "../../../src/index.js";
+import { isObject } from "../../../../test/harness/modelProtocolAdapterShared.js";
+
+export function childUserPrompts(
+    requestUrl: string,
+    requestBody: string,
+    context: Pick<CopilotRequestContext, "parentAgentId">
+): string[] {
+    if (!context.parentAgentId) {
+        return [];
+    }
+    const isResponses = new URL(requestUrl).pathname.endsWith("/responses");
+    const body = JSON.parse(requestBody) as {
+        messages?: unknown[];
+        input?: string | unknown[];
+    };
+    const messages = isResponses
+        ? typeof body.input === "string"
+            ? [{ role: "user", content: body.input }]
+            : (body.input ?? [])
+        : (body.messages ?? []);
+    return messages.flatMap((message) => {
+        if (!isObject(message) || message.role !== "user") return [];
+        if (typeof message.content === "string") return [message.content];
+        if (!Array.isArray(message.content)) return [];
+        return message.content
+            .filter(
+                (part): part is { type: "text" | "input_text"; text: string } =>
+                    isObject(part) &&
+                    part.type === (isResponses ? "input_text" : "text") &&
+                    typeof part.text === "string"
+            )
+            .map((part) => part.text);
+    });
+}
diff --git a/nodejs/test/e2e/harness/mcpTestServer.ts b/nodejs/test/e2e/harness/mcpTestServer.ts
new file mode 100644
index 0000000000..76e50a5837
--- /dev/null
+++ b/nodejs/test/e2e/harness/mcpTestServer.ts
@@ -0,0 +1,24 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { dirname, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+
+export function mcpTestServerConfig(result: string, descriptionFile?: string) {
+    const serverPath = resolve(
+        dirname(fileURLToPath(import.meta.url)),
+        "../../../../test/harness/test-mcp-server.mjs"
+    );
+    return {
+        type: "stdio" as const,
+        command: process.execPath,
+        args: [
+            serverPath,
+            ...(descriptionFile ? ["--tool-description-file", descriptionFile] : []),
+        ],
+        workingDirectory: dirname(serverPath),
+        env: { CACHE_TEST_RESULT: result },
+        tools: ["get_env"],
+    };
+}
diff --git a/nodejs/test/e2e/harness/rawAhpClient.ts b/nodejs/test/e2e/harness/rawAhpClient.ts
new file mode 100644
index 0000000000..4c66cc966f
--- /dev/null
+++ b/nodejs/test/e2e/harness/rawAhpClient.ts
@@ -0,0 +1,140 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from "node:assert/strict";
+import { randomUUID } from "node:crypto";
+import { once } from "node:events";
+import WebSocket from "ws";
+import { withDeadline } from "./ahpClient.js";
+import { sealAhpAuthToken } from "./ahpSealedAuth.js";
+
+type JsonObject = Record<string, unknown>;
+type Notification = { method: string; params: JsonObject };
+
+// Wire-only observer: never passes a 1.0 snapshot through the released 0.9
+// client/reducers. The ordinary SDK E2Es continue to negotiate 0.9.
+export async function connectRawAhp(
+    host: { url?: string; token?: string },
+    protocolVersion: "0.9.0" | "1.0.0",
+    token: string
+) {
+    assert(host.url);
+    const url = new URL(host.url);
+    if (host.token !== undefined) url.searchParams.set("tkn", host.token);
+    const socket = new WebSocket(url, { handshakeTimeout: 10_000 });
+    const pending = new Map<
+        number,
+        { resolve: (value: JsonObject) => void; reject: (error: Error) => void }
+    >();
+    const notifications: Notification[] = [];
+    const listeners = new Set<() => void>();
+    let sequence = 0;
+    let closed: Error | undefined;
+    function fail(error: Error) {
+        closed = error;
+        for (const request of pending.values()) request.reject(error);
+        pending.clear();
+        for (const notify of listeners) notify();
+    }
+    socket.on("error", fail);
+    socket.on("close", () => fail(new Error("Raw AHP connection closed")));
+    socket.on("message", (data) => {
+        try {
+            const message = JSON.parse(data.toString());
+            if (typeof message.id === "number") {
+                const request = pending.get(message.id);
+                if (request) {
+                    pending.delete(message.id);
+                    if (message.error) {
+                        // Do not include request payloads or credentials in failures.
+                        request.reject(new Error(`AHP error ${message.error.code}`));
+                    } else {
+                        request.resolve(message.result);
+                    }
+                }
+            } else if (typeof message.method === "string") {
+                notifications.push({ method: message.method, params: message.params });
+                for (const notify of listeners) notify();
+            }
+        } catch {
+            fail(new Error("Invalid AHP JSON-RPC frame"));
+        }
+    });
+    async function request(method: string, params: JsonObject): Promise<JsonObject> {
+        if (closed) throw closed;
+        const id = ++sequence;
+        try {
+            return await withDeadline(
+                new Promise<JsonObject>((resolve, reject) => {
+                    pending.set(id, { resolve, reject });
+                    socket.send(JSON.stringify({ jsonrpc: "2.0", id, method, params }));
+                }),
+                `raw ${method}`
+            );
+        } finally {
+            pending.delete(id);
+        }
+    }
+    async function notification(
+        method: string,
+        matches: (params: JsonObject) => boolean
+    ): Promise<JsonObject> {
+        let wake: () => void = () => {};
+        try {
+            return await withDeadline(
+                new Promise<JsonObject>((resolve, reject) => {
+                    wake = () => {
+                        const index = notifications.findIndex(
+                            (entry) => entry.method === method && matches(entry.params)
+                        );
+                        if (index >= 0) resolve(notifications.splice(index, 1)[0].params);
+                        else if (closed) reject(closed);
+                    };
+                    listeners.add(wake);
+                    wake();
+                }),
+                `raw ${method} notification`
+            );
+        } finally {
+            listeners.delete(wake);
+        }
+    }
+    try {
+        await withDeadline(once(socket, "open"), "raw AHP connect");
+        const initialized = await request("initialize", {
+            channel: "ahp-root://",
+            clientId: randomUUID(),
+            protocolVersions: [protocolVersion],
+        });
+        assert.equal(initialized.protocolVersion, protocolVersion);
+        const subscribed = await request("subscribe", { channel: "ahp-root://" });
+        const root = (subscribed.snapshot as { state: JsonObject }).state;
+        const agents = root.agents as {
+            provider: string;
+            protectedResources?: { resource: string; resource_name: string }[];
+        }[];
+        const resource = agents
+            .find((agent) => agent.provider === "copilot")
+            ?.protectedResources?.find((entry) => entry.resource_name === "GitHub API")?.resource;
+        assert(resource);
+        await request("authenticate", {
+            channel: "ahp-root://",
+            resource,
+            token: await sealAhpAuthToken(initialized._meta, root._meta, resource, token),
+        });
+        return {
+            request,
+            notification,
+            async [Symbol.asyncDispose]() {
+                if (socket.readyState === WebSocket.CLOSED) return;
+                const finished = once(socket, "close");
+                socket.terminate();
+                await withDeadline(finished, "raw AHP close");
+            },
+        };
+    } catch (error) {
+        socket.terminate();
+        throw error;
+    }
+}
diff --git a/nodejs/test/e2e/harness/sdkTestContext.test.ts b/nodejs/test/e2e/harness/sdkTestContext.test.ts
index 3503e1080f..ad89ec5d61 100644
--- a/nodejs/test/e2e/harness/sdkTestContext.test.ts
+++ b/nodejs/test/e2e/harness/sdkTestContext.test.ts
@@ -33,13 +33,18 @@ describe("SDK test context cleanup", async () => {
     const context = await createSdkTestContext();
     workDir = context.workDir;
 
+    it("isolates persistent account metadata from other proxy fixtures", () => {
+        expect(context.env.COPILOT_CACHE_HOME).toBe(join(context.env.COPILOT_HOME, "cache"));
+    });
+
     it("keeps working files available until test-owned client cleanup finishes", async () => {
+        const cleanupCount = vi.mocked(rimraf).mock.calls.length;
         const client = context.createClient();
         const logsDir = join(workDir, "logs");
         const logPath = join(logsDir, "client.log");
         onTestFinished(async () => {
             try {
-                expect(rimraf).not.toHaveBeenCalled();
+                expect(rimraf).toHaveBeenCalledTimes(cleanupCount);
                 expect(await readFile(logPath, "utf8")).toBe("client is running");
                 await writeFile(logPath, "client is stopped");
             } finally {
diff --git a/nodejs/test/e2e/harness/sdkTestContext.ts b/nodejs/test/e2e/harness/sdkTestContext.ts
index 4a54acca93..515177ee44 100644
--- a/nodejs/test/e2e/harness/sdkTestContext.ts
+++ b/nodejs/test/e2e/harness/sdkTestContext.ts
@@ -3,10 +3,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import fs, { realpathSync } from "fs";
-import { rm } from "fs/promises";
+import { readdir, rm } from "fs/promises";
 import os from "os";
 import { basename, dirname, join, resolve } from "path";
 import { rimraf } from "rimraf";
+import { createInterface } from "readline";
 import { fileURLToPath } from "url";
 import { afterAll, afterEach, beforeEach, onTestFailed, onTestFinished, TestContext } from "vitest";
 import { CopilotClient, CopilotClientOptions, RuntimeConnection } from "../../../src";
@@ -15,6 +16,8 @@ import { CapiProxy } from "./CapiProxy";
 import { formatError, retry } from "./sdkTestHelper";
 import { resolvePreparedRuntimePath } from "../../../scripts/prepare-runtime.js";
 import { testBackend, withTestBackend } from "./testBackend";
+import { readDiagnosticTail } from "../../../../test/harness/sdk-diagnostics.mjs";
+import type { ReplayBackend } from "../../../../test/harness/replayingCapiProxy";
 
 export const isCI = process.env.GITHUB_ACTIONS === "true";
 export const DEFAULT_GITHUB_TOKEN = "fake-token-for-e2e-tests";
@@ -62,13 +65,18 @@ export async function createSdkTestContext({
     logLevel,
     useStdio,
     copilotClientOptions,
+    replayOnly = process.env.COPILOT_SDK_E2E_REPLAY_ONLY === "true",
     modelNames,
+    backend = testBackend,
 }: {
     logLevel?: "error" | "none" | "warning" | "info" | "debug" | "all";
     cliPath?: string;
     useStdio?: boolean;
     copilotClientOptions?: CopilotClientOptions;
+    replayOnly?: boolean;
     modelNames?: Record<string, string>;
+    /** Pin a provider-specific contract instead of inheriting the CI backend matrix. */
+    backend?: ReplayBackend;
 } = {}) {
     const homeDir = realpathSync(fs.mkdtempSync(join(os.tmpdir(), "copilot-test-config-")));
     const copilotHomeDir = realpathSync(fs.mkdtempSync(join(os.tmpdir(), "copilot-test-home-")));
@@ -101,6 +109,8 @@ export async function createSdkTestContext({
         // CI runners and makes MCP servers time out before reaching connected.
         COPILOT_DEBUG_GITHUB_API_URL: proxyUrl,
         COPILOT_HOME: copilotHomeDir,
+        // Proxy ports can be reused by later fixtures with different account metadata.
+        COPILOT_CACHE_HOME: join(copilotHomeDir, "cache"),
         COPILOT_SDK_AUTH_TOKEN: "",
         GH_CONFIG_DIR: homeDir,
         // Use the proxy-recognized token rather than blanking these. Tests that spin up
@@ -165,11 +175,11 @@ export async function createSdkTestContext({
 
     class TestClient extends CopilotClient {
         override createSession(config: SessionConfig) {
-            return super.createSession(withTestBackend(config, testBackend, proxyUrl));
+            return super.createSession(withTestBackend(config, backend, proxyUrl));
         }
 
         override resumeSession(sessionId: string, config: ResumeSessionConfig) {
-            return super.resumeSession(sessionId, withTestBackend(config, testBackend, proxyUrl));
+            return super.resumeSession(sessionId, withTestBackend(config, backend, proxyUrl));
         }
     }
 
@@ -259,8 +269,43 @@ export async function createSdkTestContext({
     // Wire up to Vitest lifecycle
     beforeEach(async (testContext) => {
         // Must be inside beforeEach - vitest requires test context
-        onTestFailed(() => {
+        onTestFailed(async () => {
             anyTestFailed = true;
+            // Preserve only the bounded, metadata-only runtime diagnostics before afterAll removes the home.
+            if (logLevel === "debug") {
+                try {
+                    const diagnostics = await readDiagnosticTail(copilotHomeDir);
+                    console.error(
+                        `[SDK diagnostics: last ${diagnostics.length} audited records]\n${diagnostics.join("\n")}`
+                    );
+                    const logDir = join(copilotHomeDir, "logs");
+                    for (const file of await readdir(logDir)) {
+                        if (!file.endsWith(".log")) continue;
+                        const lines = createInterface({
+                            input: fs.createReadStream(join(logDir, file)),
+                        });
+                        const mcpClosureDiagnostics: string[] = [];
+                        for await (const line of lines) {
+                            const mcpClosure = line.match(
+                                /^\S+ \[(?:DEBUG|WARN)\] \[rust:mcp::client\] MCP (?:liveness probe (?:found the (?:session expired|transport (?:closed|channel closed))|failed; awaiting corroboration|went unanswered; inconclusive|could not be sent in time; inconclusive|failed inconclusively|failed with an unrecognised transport error)|liveness probes are neither proving life nor consistently failing|session reported closed)/
+                            );
+                            if (mcpClosure) {
+                                // Keep only static messages; transport error fields can contain user data.
+                                mcpClosureDiagnostics.push(mcpClosure[0]);
+                                if (mcpClosureDiagnostics.length > 32)
+                                    mcpClosureDiagnostics.shift();
+                            }
+                        }
+                        if (mcpClosureDiagnostics.length > 0) {
+                            console.error(
+                                `[MCP session-closure diagnostics: ${file}; last ${mcpClosureDiagnostics.length} matching lines]\n${mcpClosureDiagnostics.join("\n")}`
+                            );
+                        }
+                    }
+                } catch {
+                    console.error("SDK diagnostics unavailable");
+                }
+            }
         });
         // Finished hooks run in reverse order, so test-owned clients stop before files are removed.
         onTestFinished(async () => {
@@ -293,6 +338,8 @@ export async function createSdkTestContext({
         }
 
         await openAiEndpoint.updateConfig({
+            backend,
+            replayOnly,
             filePath: getTrafficCapturePath(testContext),
             workDir,
             modelNames,
diff --git a/nodejs/test/e2e/harness/sdkTestHelper.test.ts b/nodejs/test/e2e/harness/sdkTestHelper.test.ts
new file mode 100644
index 0000000000..8aa8980ac7
--- /dev/null
+++ b/nodejs/test/e2e/harness/sdkTestHelper.test.ts
@@ -0,0 +1,92 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { existsSync, readFileSync } from "node:fs";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { waitForFileText } from "./sdkTestHelper.js";
+
+vi.mock("node:fs", () => ({
+    existsSync: vi.fn(),
+    readFileSync: vi.fn(),
+}));
+
+describe("waitForFileText", () => {
+    beforeEach(() => {
+        vi.useFakeTimers();
+        vi.mocked(existsSync).mockReturnValue(true);
+    });
+
+    afterEach(() => {
+        vi.useRealTimers();
+        vi.resetAllMocks();
+    });
+
+    it("waits for a Windows writer to release the marker", async () => {
+        vi.mocked(readFileSync)
+            .mockImplementationOnce(() => {
+                throw Object.assign(new Error("resource busy"), { code: "EBUSY" });
+            })
+            .mockReturnValue("done");
+
+        const result = expect(waitForFileText("marker", "done")).resolves.toBeUndefined();
+        await Promise.all([result, vi.advanceTimersByTimeAsync(100)]);
+        expect(readFileSync).toHaveBeenCalledTimes(2);
+    });
+
+    it("preserves the locking error when the observation deadline expires", async () => {
+        const busy = Object.assign(new Error("resource busy"), { code: "EBUSY" });
+        vi.mocked(readFileSync).mockImplementation(() => {
+            throw busy;
+        });
+
+        const result = expect(waitForFileText("marker", "done", 200)).rejects.toMatchObject({
+            message: expect.stringContaining("Timed out waiting for shell command"),
+            cause: busy,
+        });
+        await Promise.all([result, vi.advanceTimersByTimeAsync(200)]);
+    });
+
+    it("does not hide other filesystem errors", async () => {
+        const denied = Object.assign(new Error("permission denied"), { code: "EACCES" });
+        vi.mocked(readFileSync).mockImplementation(() => {
+            throw denied;
+        });
+
+        await expect(waitForFileText("marker", "done")).rejects.toBe(denied);
+    });
+
+    it("preserves timeout diagnostics without replacing the marker error", async () => {
+        const busy = Object.assign(new Error("resource busy"), { code: "EBUSY" });
+        vi.mocked(existsSync).mockImplementation((filePath) => filePath !== "absent");
+        vi.mocked(readFileSync).mockImplementation((filePath) => {
+            if (filePath === "marker.phase") {
+                return "marker-written";
+            }
+            if (filePath === "unreadable") {
+                throw new Error("permission denied");
+            }
+            throw busy;
+        });
+
+        const result = expect(
+            waitForFileText("marker", "done", 200, ["marker.phase", "absent", "unreadable"])
+        ).rejects.toMatchObject({
+            message:
+                "Timed out waiting for shell command to write 'done' to 'marker'.\n" +
+                "marker.phase: marker-written\nabsent: absent\n" +
+                "unreadable: could not read: Error: permission denied",
+            cause: busy,
+        });
+        await Promise.all([result, vi.advanceTimersByTimeAsync(200)]);
+    });
+
+    it("continues observing an absent or incomplete marker", async () => {
+        vi.mocked(existsSync).mockReturnValueOnce(false);
+        vi.mocked(readFileSync).mockReturnValueOnce("").mockReturnValue("done");
+
+        const result = expect(waitForFileText("marker", "done")).resolves.toBeUndefined();
+        await Promise.all([result, vi.advanceTimersByTimeAsync(200)]);
+        expect(readFileSync).toHaveBeenCalledTimes(2);
+    });
+});
diff --git a/nodejs/test/e2e/harness/sdkTestHelper.ts b/nodejs/test/e2e/harness/sdkTestHelper.ts
index 965857a4f1..0efe11aed7 100644
--- a/nodejs/test/e2e/harness/sdkTestHelper.ts
+++ b/nodejs/test/e2e/harness/sdkTestHelper.ts
@@ -3,10 +3,54 @@
  *--------------------------------------------------------------------------------------------*/
 
 import type { ChildProcess } from "node:child_process";
+import { existsSync, readFileSync } from "node:fs";
+import { basename } from "node:path";
 import { AssistantMessageEvent, CopilotSession, SessionEvent } from "../../../src";
 
 const CHILD_SHUTDOWN_TIMEOUT_MS = 1_000;
 
+export async function waitForFileText(
+    filePath: string,
+    expected: string,
+    timeoutMs = 30_000,
+    diagnosticPaths: string[] = []
+): Promise<void> {
+    const deadline = Date.now() + timeoutMs;
+    let lastBusyError: Error | undefined;
+    while (Date.now() < deadline) {
+        if (existsSync(filePath)) {
+            try {
+                const content = readFileSync(filePath, "utf8");
+                lastBusyError = undefined;
+                if (content.includes(expected)) {
+                    return;
+                }
+            } catch (error) {
+                // PowerShell can expose the marker before releasing its Windows file lock.
+                if (!(error instanceof Error) || !("code" in error) || error.code !== "EBUSY") {
+                    throw error;
+                }
+                lastBusyError = error;
+            }
+        }
+        await new Promise((resolve) => setTimeout(resolve, 100));
+    }
+    const diagnostics = diagnosticPaths.map((diagnosticPath) => {
+        try {
+            return existsSync(diagnosticPath)
+                ? `${basename(diagnosticPath)}: ${readFileSync(diagnosticPath, "utf8")}`
+                : `${basename(diagnosticPath)}: absent`;
+        } catch (error) {
+            return `${basename(diagnosticPath)}: could not read: ${formatError(error)}`;
+        }
+    });
+    throw new Error(
+        `Timed out waiting for shell command to write '${expected}' to '${filePath}'.` +
+            (diagnostics.length ? `\n${diagnostics.join("\n")}` : ""),
+        { cause: lastBusyError }
+    );
+}
+
 export async function stopChildProcess(child: ChildProcess): Promise<void> {
     if (hasChildExited(child)) {
         return;
diff --git a/nodejs/test/e2e/harness/webSocketResponsesServer.ts b/nodejs/test/e2e/harness/webSocketResponsesServer.ts
new file mode 100644
index 0000000000..de4810802c
--- /dev/null
+++ b/nodejs/test/e2e/harness/webSocketResponsesServer.ts
@@ -0,0 +1,204 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import http from "node:http";
+import { WebSocketServer } from "ws";
+
+export type WebSocketEnvelope = Record<string, unknown>;
+type WebSocketReply = WebSocketEnvelope | (() => Promise<WebSocketEnvelope>);
+
+/** Controlled provider terminals cannot be reproduced by ordinary successful-conversation replay. */
+export async function startWebSocketResponsesServer() {
+    const state = {
+        messages: [] as Array<Record<string, unknown>>,
+        messageConnectionIds: [] as number[],
+        responses: [] as WebSocketReply[],
+        /** Scripted HTTP `/responses` SSE replies; when empty, HTTP requests are forwarded. */
+        httpResponses: [] as WebSocketEnvelope[][],
+        httpResponseRequestPaths: [] as string[],
+        openConnectionIds: new Set<number>(),
+        connectionCount: 0,
+        closedConnectionCount: 0,
+    };
+    const errors: unknown[] = [];
+    const forwardedRequests = new Set<http.ClientRequest>();
+    const forwardedResponses = new Set<http.IncomingMessage>();
+    const forwardingAgent = new http.Agent();
+    let stopping = false;
+    let httpTargetUrl: string | undefined;
+    const server = http.createServer((req, res) => {
+        if (stopping) {
+            res.destroy();
+            return;
+        }
+        if (req.url === "/models") {
+            res.writeHead(200, { "content-type": "application/json" });
+            res.end(
+                JSON.stringify({
+                    data: [
+                        {
+                            id: "gpt-5-responses",
+                            name: "GPT-5 Responses",
+                            supported_endpoints: ["/responses", "ws:/responses"],
+                            capabilities: {
+                                supports: { streaming: true, tool_calls: true },
+                                limits: {
+                                    max_context_window_tokens: 128000,
+                                    max_output_tokens: 16384,
+                                },
+                            },
+                        },
+                    ],
+                })
+            );
+            return;
+        }
+        const scriptedHttpEvents =
+            req.method === "POST" &&
+            new URL(req.url ?? "/", "http://localhost").pathname.endsWith("/responses")
+                ? state.httpResponses.shift()
+                : undefined;
+        if (scriptedHttpEvents) {
+            state.httpResponseRequestPaths.push(req.url ?? "/");
+            req.resume();
+            req.on("error", (error) => errors.push(error));
+            req.on("end", () => {
+                res.writeHead(200, { "content-type": "text/event-stream" });
+                for (const event of scriptedHttpEvents) {
+                    res.write(`event: ${String(event.type)}\ndata: ${JSON.stringify(event)}\n\n`);
+                }
+                res.end();
+            });
+            return;
+        }
+        if (!httpTargetUrl) {
+            res.writeHead(503);
+            res.end("The test CAPI proxy has not been attached.");
+            return;
+        }
+        // Absolute-form request paths must not replace the configured proxy origin.
+        const target = new URL(httpTargetUrl);
+        const upstream = http.request(
+            {
+                protocol: target.protocol,
+                hostname: target.hostname,
+                port: target.port,
+                path: req.url ?? "/",
+                method: req.method,
+                headers: { ...req.headers, host: target.host },
+                agent: forwardingAgent,
+            },
+            (response) => {
+                forwardedResponses.add(response);
+                response.once("close", () => forwardedResponses.delete(response));
+                response.on("error", (error) => {
+                    if (!stopping) errors.push(error);
+                    res.destroy();
+                });
+                if (stopping) {
+                    response.destroy();
+                    return;
+                }
+                res.writeHead(response.statusCode ?? 500, response.headers);
+                response.pipe(res);
+            }
+        );
+        forwardedRequests.add(upstream);
+        upstream.once("close", () => forwardedRequests.delete(upstream));
+        upstream.on("error", (error) => {
+            if (stopping) return;
+            errors.push(error);
+            if (!res.headersSent) res.writeHead(502);
+            res.end(String(error));
+        });
+        req.pipe(upstream);
+    });
+    const sockets = new WebSocketServer({ server });
+    sockets.on("connection", (socket) => {
+        const connectionId = ++state.connectionCount;
+        state.openConnectionIds.add(connectionId);
+        socket.on("close", () => {
+            state.closedConnectionCount++;
+            state.openConnectionIds.delete(connectionId);
+        });
+        socket.on("error", (error) => errors.push(error));
+        socket.on("message", (raw) => {
+            void (async () => {
+                state.messages.push(JSON.parse(raw.toString()) as Record<string, unknown>);
+                state.messageConnectionIds.push(connectionId);
+                const reply = state.responses.shift();
+                if (!reply) {
+                    throw new Error("Unexpected WebSocket response.create request.");
+                }
+                const envelope = typeof reply === "function" ? await reply() : reply;
+                if (stopping) return;
+                await new Promise<void>((resolve, reject) => {
+                    socket.send(JSON.stringify(envelope), (error) =>
+                        error ? reject(error) : resolve()
+                    );
+                });
+            })().catch((error: unknown) => {
+                errors.push(error);
+                socket.terminate();
+            });
+        });
+    });
+    await new Promise<void>((resolve, reject) => {
+        server.once("error", reject);
+        server.listen(0, "127.0.0.1", resolve);
+    });
+    const address = server.address();
+    if (address === null || typeof address === "string") {
+        throw new Error("Expected a bound TCP address for the WebSocket provider.");
+    }
+    return {
+        baseUrl: `http://127.0.0.1:${address.port}`,
+        state,
+        forwardHttpTo(url: string) {
+            httpTargetUrl = url;
+        },
+        async stop() {
+            stopping = true;
+            const forwarded = [...forwardedRequests, ...forwardedResponses];
+            const forwardedClosed = Promise.all(
+                forwarded.map(
+                    (stream) => new Promise<void>((resolve) => stream.once("close", resolve))
+                )
+            );
+            for (const stream of forwarded) stream.destroy();
+            forwardingAgent.destroy();
+            for (const socket of sockets.clients) socket.terminate();
+            await new Promise<void>((resolve, reject) =>
+                sockets.close((error) => (error ? reject(error) : resolve()))
+            );
+            server.closeAllConnections();
+            await new Promise<void>((resolve, reject) =>
+                server.close((error) => (error ? reject(error) : resolve()))
+            );
+            await forwardedClosed;
+            if (errors.length > 0)
+                throw new AggregateError(errors, "WebSocket provider fixture failed.");
+        },
+    };
+}
+
+export function createCompletedResponse(text: string, id: string) {
+    return {
+        id,
+        object: "response",
+        model: "gpt-5-responses",
+        status: "completed",
+        output: [
+            {
+                type: "message",
+                id: "msg-1",
+                role: "assistant",
+                content: [{ type: "output_text", text, annotations: [] }],
+                status: "completed",
+            },
+        ],
+        output_text: text,
+        usage: null,
+    };
+}
diff --git a/nodejs/test/e2e/hydrafusion_max.e2e.test.ts b/nodejs/test/e2e/hydrafusion_max.e2e.test.ts
new file mode 100644
index 0000000000..078dbeeaab
--- /dev/null
+++ b/nodejs/test/e2e/hydrafusion_max.e2e.test.ts
@@ -0,0 +1,490 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { describe, expect, it } from "vitest";
+import { z } from "zod";
+import {
+    approveAll,
+    defineTool,
+    CopilotRequestHandler,
+    RuntimeConnection,
+    type SessionEvent,
+} from "../../src/index.js";
+import {
+    createSdkTestContext,
+    DEFAULT_GITHUB_TOKEN,
+    getLegacyCliPathForTests,
+} from "./harness/sdkTestContext.js";
+import { isByokBackend } from "./harness/testBackend.js";
+
+const MODEL = "gpt-5.6-sol";
+const REPLY = "SDK_HYDRAFUSION_MAX_DONE: Au";
+
+interface ChatToolCall {
+    id: string;
+    type: "function";
+    function: { name: string; arguments: string };
+}
+
+interface ChatMessage {
+    role: string;
+    content?: unknown;
+    tool_calls?: ChatToolCall[];
+    tool_call_id?: string;
+}
+
+interface ChatRequest {
+    model?: string;
+    stream?: boolean;
+    messages: ChatMessage[];
+}
+
+class FusionRequestHandler extends CopilotRequestHandler {
+    readonly plans: unknown[] = [];
+    readonly inference: ChatRequest[] = [];
+
+    constructor(
+        private readonly reply: (request: ChatRequest) => ChatMessage = () => ({
+            role: "assistant",
+            content: REPLY,
+        })
+    ) {
+        super();
+    }
+
+    protected override async sendRequest(request: Request): Promise<Response> {
+        const path = new URL(request.url).pathname;
+        if (path === "/models") {
+            return Response.json({
+                data: [
+                    {
+                        id: MODEL,
+                        name: MODEL,
+                        model_picker_enabled: true,
+                        policy: { state: "enabled" },
+                        supported_endpoints: ["/chat/completions"],
+                        capabilities: {
+                            supports: { streaming: true, tool_calls: true, vision: true },
+                            limits: {
+                                max_prompt_tokens: 128000,
+                                max_output_tokens: 16384,
+                                max_context_window_tokens: 144384,
+                            },
+                        },
+                    },
+                ],
+            });
+        }
+        if (path === "/model/fusion") {
+            this.plans.push(await request.json());
+            return Response.json({
+                fusion_mode: "hydrafusion-max",
+                fusion_pattern: "solo",
+                plan_version: "2",
+                steps: [{ role: "generation", model_id: MODEL }],
+                session: { token: "jwt.fake.sdk.max.plan", expires_at: 0 },
+            });
+        }
+        if (path === "/chat/completions") {
+            const body = (await request.json()) as ChatRequest;
+            this.inference.push(body);
+            if (body.model !== MODEL) {
+                throw new Error(`Expected concrete Fusion constituent, received ${body.model}`);
+            }
+            const message = this.reply(body);
+            const finishReason = message.tool_calls ? "tool_calls" : "stop";
+            const completion = {
+                id: "chatcmpl-sdk-max",
+                object: "chat.completion",
+                created: 0,
+                model: MODEL,
+                choices: [{ index: 0, message, finish_reason: finishReason }],
+                usage: { prompt_tokens: 11, completion_tokens: 7, total_tokens: 18 },
+            };
+            if (!body.stream) return Response.json(completion);
+            return new Response(
+                `data: ${JSON.stringify({
+                    ...completion,
+                    object: "chat.completion.chunk",
+                    choices: [
+                        {
+                            index: 0,
+                            delta: {
+                                ...message,
+                                ...(message.tool_calls
+                                    ? {
+                                          tool_calls: message.tool_calls.map((call, index) => ({
+                                              index,
+                                              ...call,
+                                          })),
+                                      }
+                                    : {}),
+                            },
+                            finish_reason: finishReason,
+                        },
+                    ],
+                })}\n\ndata: [DONE]\n\n`,
+                { headers: { "content-type": "text/event-stream" } }
+            );
+        }
+        if (path === "/models/session/intent") {
+            return Response.json({ error: "Intent unavailable in this fixture" }, { status: 404 });
+        }
+        if (path === "/models/session") {
+            return Response.json({
+                available_models: [MODEL],
+                selected_model: MODEL,
+                session_token: "jwt.fake.sdk.max.routing",
+                expires_at: 0,
+            });
+        }
+        throw new Error(`Unexpected model request: ${request.method} ${path}`);
+    }
+}
+
+describe.skipIf(isByokBackend).each([false, true])(
+    "HydraFusion Max plan-v2 gate: %s",
+    async (enabled) => {
+        const handler = new FusionRequestHandler();
+        const { copilotClient: client, workDir } = await createSdkTestContext({
+            copilotClientOptions: {
+                gitHubToken: DEFAULT_GITHUB_TOKEN,
+                requestHandler: handler,
+                env: {
+                    HYDRAFUSION: "true",
+                    HYDRAFUSION_ROLLOUT: "true",
+                    HYDRAFUSION_PLAN_V2: String(enabled),
+                    COPILOT_EXP_COPILOT_CLI_HYDRAFUSION_PLAN_V2: String(enabled),
+                },
+            },
+        });
+
+        if (!enabled) {
+            it.each([false, true])(
+                "rejects public SDK creation before inference (provider=%s)",
+                async (providerPresent) => {
+                    await expect(
+                        client.createSession({
+                            model: "hydrafusion-max",
+                            enableExperimentalMode: true,
+                            workingDirectory: workDir,
+                            onPermissionRequest: approveAll,
+                            ...(providerPresent
+                                ? {
+                                      provider: {
+                                          baseUrl: "https://provider.example.invalid",
+                                          apiKey: "fixture-key",
+                                      },
+                                  }
+                                : {}),
+                        })
+                    ).rejects.toThrow('Model "hydrafusion-max" is not available.');
+                    expect(handler.plans).toEqual([]);
+                    expect(handler.inference).toEqual([]);
+                }
+            );
+
+            describe.skipIf(isByokBackend).each(["native", "legacy"] as const)(
+                "HydraFusion Max session flags (%s)",
+                async (transport) => {
+                    const handler = new FusionRequestHandler();
+                    const { copilotClient: client, workDir } = await createSdkTestContext({
+                        copilotClientOptions: {
+                            connection: RuntimeConnection.forStdio({
+                                path:
+                                    transport === "legacy"
+                                        ? await getLegacyCliPathForTests()
+                                        : process.env.COPILOT_CLI_PATH,
+                            }),
+                            gitHubToken: DEFAULT_GITHUB_TOKEN,
+                            requestHandler: handler,
+                            env: {
+                                HYDRAFUSION: "true",
+                                HYDRAFUSION_ROLLOUT: "true",
+                                HYDRAFUSION_PLAN_V2: "false",
+                                COPILOT_EXP_COPILOT_CLI_HYDRAFUSION_PLAN_V2: "false",
+                            },
+                        },
+                    });
+
+                    it("enables Max for one session without enabling it for the host", async () => {
+                        const options = {
+                            model: "hydrafusion-max",
+                            enableExperimentalMode: true,
+                            workingDirectory: workDir,
+                            onPermissionRequest: approveAll,
+                        };
+                        const session = await client.createSession({
+                            ...options,
+                            featureFlags: {
+                                HYDRAFUSION: true,
+                                HYDRAFUSION_ROLLOUT: true,
+                                HYDRAFUSION_PLAN_V2: true,
+                            },
+                        });
+                        const events: SessionEvent[] = [];
+                        const unsubscribe = session.on((event) => events.push(event));
+                        try {
+                            const reply = await session.sendAndWait({
+                                prompt: "What is the chemical symbol for gold? Do not use tools.",
+                            });
+                            expect(reply?.data.content).toBe(REPLY);
+                            expect(handler.plans).toEqual([
+                                expect.objectContaining({
+                                    fusion_mode: "hydrafusion-max",
+                                    plan_version: "2",
+                                }),
+                            ]);
+                            expect(events).toEqual(
+                                expect.arrayContaining([
+                                    expect.objectContaining({
+                                        type: "session.fusion_resolved",
+                                        data: expect.objectContaining({
+                                            syntheticModel: "hydrafusion-max",
+                                            policy: "max",
+                                            planVersion: "2",
+                                        }),
+                                    }),
+                                ])
+                            );
+                            await expect(client.createSession(options)).rejects.toThrow(
+                                'Model "hydrafusion-max" is not available.'
+                            );
+                        } finally {
+                            unsubscribe();
+                            await session.disconnect();
+                        }
+                    });
+                }
+            );
+        } else {
+            it("creates Max through the public SDK and executes a concrete v2 plan", async () => {
+                const session = await client.createSession({
+                    model: "hydrafusion-max",
+                    enableExperimentalMode: true,
+                    workingDirectory: workDir,
+                    onPermissionRequest: approveAll,
+                });
+                const events: SessionEvent[] = [];
+                const unsubscribe = session.on((event) => events.push(event));
+                try {
+                    const reply = await session.sendAndWait({
+                        prompt: "What is the chemical symbol for gold? Do not use tools.",
+                    });
+                    expect(reply?.data.content).toBe(REPLY);
+                    expect(handler.plans).toEqual([
+                        expect.objectContaining({
+                            fusion_mode: "hydrafusion-max",
+                            plan_version: "2",
+                        }),
+                    ]);
+                    expect(handler.inference.length).toBeGreaterThan(0);
+                    expect(events).toEqual(
+                        expect.arrayContaining([
+                            expect.objectContaining({
+                                type: "session.fusion_resolved",
+                                data: expect.objectContaining({
+                                    syntheticModel: "hydrafusion-max",
+                                    policy: "max",
+                                    planVersion: "2",
+                                }),
+                            }),
+                        ])
+                    );
+                } finally {
+                    unsubscribe();
+                    await session.disconnect();
+                }
+            });
+        }
+    }
+);
+
+const DRAFT_NOTE = "FUSION_DRAFT_NOTE_BEFORE_STOP";
+const RECORD_CALL_ID = "call_fusion_record_progress";
+const RECORD_RESULT = "FUSION_PROGRESS_RECORDED";
+const WAIT_CALL_ID = "call_fusion_wait_for_stop";
+const FOLLOW_UP_PROMPT = "FUSION_FOLLOW_UP_AFTER_STOP: continue where you left off.";
+const FOLLOW_UP_REPLY = "FUSION_FOLLOW_UP_DONE";
+
+function messageText(content: unknown): string {
+    if (typeof content === "string") return content;
+    if (Array.isArray(content)) {
+        return content
+            .map((part) => (typeof part?.text === "string" ? (part.text as string) : ""))
+            .join("");
+    }
+    return "";
+}
+
+// The draft writes a note and finishes one tool call, then blocks in a second one until the
+// user stops the turn. The follow-up turn answers once it sees the user's next prompt.
+function interruptedDraftReply(request: ChatRequest): ChatMessage {
+    if (
+        request.messages.some((message) => messageText(message.content).includes(FOLLOW_UP_PROMPT))
+    ) {
+        return { role: "assistant", content: FOLLOW_UP_REPLY };
+    }
+    const recorded = request.messages.some(
+        (message) => message.role === "tool" && message.tool_call_id === RECORD_CALL_ID
+    );
+    const call = (id: string, name: string, args: object): ChatToolCall => ({
+        id,
+        type: "function",
+        function: { name, arguments: JSON.stringify(args) },
+    });
+    return recorded
+        ? { role: "assistant", content: "", tool_calls: [call(WAIT_CALL_ID, "wait_for_stop", {})] }
+        : {
+              role: "assistant",
+              content: DRAFT_NOTE,
+              tool_calls: [call(RECORD_CALL_ID, "record_progress", { note: "alpha" })],
+          };
+}
+
+async function withTimeout<T>(promise: Promise<T>, ms: number, label: string): Promise<T> {
+    let timer: ReturnType<typeof setTimeout> | undefined;
+    try {
+        return await Promise.race([
+            promise,
+            new Promise<T>((_, reject) => {
+                timer = setTimeout(() => reject(new Error(`Timeout: ${label}`)), ms);
+            }),
+        ]);
+    } finally {
+        if (timer) clearTimeout(timer);
+    }
+}
+
+describe.skipIf(isByokBackend)("HydraFusion interrupted turn", async () => {
+    const handler = new FusionRequestHandler(interruptedDraftReply);
+    const { copilotClient: client, workDir } = await createSdkTestContext({
+        copilotClientOptions: {
+            gitHubToken: DEFAULT_GITHUB_TOKEN,
+            requestHandler: handler,
+            env: {
+                HYDRAFUSION: "true",
+                HYDRAFUSION_ROLLOUT: "true",
+                HYDRAFUSION_PLAN_V2: "true",
+                COPILOT_EXP_COPILOT_CLI_HYDRAFUSION_PLAN_V2: "true",
+                HYDRAFUSION_INTERRUPTED_COMMIT: "true",
+            },
+        },
+    });
+
+    it("keeps the stopped draft's work in history and in the next turn", async () => {
+        let markWaitStarted!: () => void;
+        const waitStarted = new Promise<void>((resolve) => {
+            markWaitStarted = resolve;
+        });
+        let releaseWait!: () => void;
+        const waitReleased = new Promise<void>((resolve) => {
+            releaseWait = resolve;
+        });
+        const session = await client.createSession({
+            model: "hydrafusion-max",
+            enableExperimentalMode: true,
+            workingDirectory: workDir,
+            onPermissionRequest: approveAll,
+            tools: [
+                defineTool("record_progress", {
+                    description: "Records a progress note.",
+                    parameters: z.object({ note: z.string() }),
+                    handler: async () => RECORD_RESULT,
+                }),
+                defineTool("wait_for_stop", {
+                    description: "Blocks until released.",
+                    parameters: z.object({}),
+                    handler: async (_args, invocation) => {
+                        markWaitStarted();
+                        await new Promise<void>((resolve) => {
+                            void waitReleased.then(resolve);
+                            invocation.signal?.addEventListener("abort", () => resolve(), {
+                                once: true,
+                            });
+                        });
+                        return "RELEASED_AFTER_STOP";
+                    },
+                }),
+            ],
+        });
+        let stopRequested = false;
+        let markStoppedIdle!: () => void;
+        const stoppedIdle = new Promise<void>((resolve) => {
+            markStoppedIdle = resolve;
+        });
+        const unsubscribe = session.on((event) => {
+            if (stopRequested && event.type === "session.idle") markStoppedIdle();
+        });
+        try {
+            void session.send({ prompt: "Record progress, then wait for the stop signal." });
+            await withTimeout(waitStarted, 60_000, "wait_for_stop start");
+            stopRequested = true;
+            await session.abort();
+            releaseWait();
+            await withTimeout(stoppedIdle, 60_000, "idle after stop");
+
+            const history = await session.getEvents();
+            const commit = history.find((event) => event.type === "session.fusion_commit_started");
+            expect(commit?.data).toMatchObject({
+                commitId: expect.stringMatching(/:commit:interrupted:0$/),
+            });
+            const commitId = (commit?.data as { commitId: string }).commitId;
+            const committed = history.filter(
+                (event) =>
+                    (event.data as { fusion?: { commitId?: string } }).fusion?.commitId === commitId
+            );
+            expect(committed).toEqual(
+                expect.arrayContaining([
+                    expect.objectContaining({
+                        type: "assistant.message",
+                        data: expect.objectContaining({ content: DRAFT_NOTE }),
+                    }),
+                    expect.objectContaining({
+                        type: "tool.execution_complete",
+                        data: expect.objectContaining({
+                            toolCallId: RECORD_CALL_ID,
+                            success: true,
+                        }),
+                    }),
+                ])
+            );
+            expect(history.some((event) => event.type === "session.fusion_completed")).toBe(false);
+
+            const reply = await session.sendAndWait({ prompt: FOLLOW_UP_PROMPT });
+            expect(reply?.data.content).toBe(FOLLOW_UP_REPLY);
+            const followUp = handler.inference.find((request) =>
+                request.messages.some((message) =>
+                    messageText(message.content).includes(FOLLOW_UP_PROMPT)
+                )
+            );
+            const messages = followUp?.messages ?? [];
+            const followUpIndex = messages.findIndex((message) =>
+                messageText(message.content).includes(FOLLOW_UP_PROMPT)
+            );
+            const earlier = messages.slice(0, followUpIndex);
+            expect(
+                earlier.some(
+                    (message) =>
+                        message.role === "assistant" &&
+                        messageText(message.content).includes(DRAFT_NOTE)
+                )
+            ).toBe(true);
+            expect(
+                earlier.flatMap((message) => message.tool_calls?.map((call) => call.id) ?? [])
+            ).toEqual(expect.arrayContaining([RECORD_CALL_ID, WAIT_CALL_ID]));
+            const results = new Map(
+                earlier
+                    .filter((message) => message.role === "tool")
+                    .map((message) => [message.tool_call_id, messageText(message.content)])
+            );
+            expect(results.get(RECORD_CALL_ID)).toContain(RECORD_RESULT);
+            expect(results.has(WAIT_CALL_ID)).toBe(true);
+        } finally {
+            releaseWait();
+            unsubscribe();
+            await session.disconnect();
+        }
+    });
+});
diff --git a/nodejs/test/e2e/hydrafusion_task_complete.e2e.test.ts b/nodejs/test/e2e/hydrafusion_task_complete.e2e.test.ts
new file mode 100644
index 0000000000..2936942ded
--- /dev/null
+++ b/nodejs/test/e2e/hydrafusion_task_complete.e2e.test.ts
@@ -0,0 +1,227 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { describe, expect, it, onTestFinished } from "vitest";
+import {
+    approveAll,
+    CopilotRequestHandler,
+    type CopilotSession,
+    type SessionEvent,
+} from "../../src/index.js";
+import { createSdkTestContext, DEFAULT_GITHUB_TOKEN } from "./harness/sdkTestContext.js";
+import { isByokBackend } from "./harness/testBackend.js";
+
+const MODEL = "gpt-5.6-sol";
+const SUMMARY = "SDK_HYDRAFUSION_TASK_COMPLETE_SUMMARY_OK";
+const TASK_COMPLETE_CALL_ID = "sdk-hydrafusion-task-complete";
+const UNEXPECTED_CONTINUATION = "SDK_HYDRAFUSION_UNEXPECTED_CONTINUATION";
+const FUSION_COMPLETED_TIMEOUT_MS = 60_000;
+
+type ChatRequest = {
+    model?: string;
+    stream?: boolean;
+    messages?: Array<{ role?: string }>;
+};
+
+/** Routes one Max Single turn whose solver answers only through `task_complete`. */
+class SummaryOnlyTaskCompleteHandler extends CopilotRequestHandler {
+    readonly inference: ChatRequest[] = [];
+
+    protected override async sendRequest(request: Request): Promise<Response> {
+        const path = new URL(request.url).pathname;
+        if (path === "/models") {
+            return Response.json({
+                data: [
+                    {
+                        id: MODEL,
+                        name: MODEL,
+                        model_picker_enabled: true,
+                        policy: { state: "enabled" },
+                        supported_endpoints: ["/chat/completions"],
+                        capabilities: {
+                            supports: { streaming: true, tool_calls: true, vision: true },
+                            limits: {
+                                max_prompt_tokens: 128000,
+                                max_output_tokens: 16384,
+                                max_context_window_tokens: 144384,
+                            },
+                        },
+                    },
+                ],
+            });
+        }
+        if (path === "/model/fusion") {
+            return Response.json({
+                fusion_mode: "hydrafusion-max",
+                fusion_pattern: "solo",
+                plan_version: "2",
+                steps: [{ role: "generation", model_id: MODEL }],
+                session: { token: "jwt.fake.sdk.task-complete.plan", expires_at: 0 },
+            });
+        }
+        if (path === "/chat/completions") {
+            const body = (await request.json()) as ChatRequest;
+            this.inference.push(body);
+            if (body.model !== MODEL) {
+                throw new Error(`Expected concrete Fusion constituent, received ${body.model}`);
+            }
+            // task_complete is terminal in Autopilot, so a request carrying its
+            // result would be an unexpected continuation; answer with text the
+            // test then proves never reached the committed transcript.
+            const continuation = body.messages?.some((message) => message.role === "tool");
+            const message = continuation
+                ? { role: "assistant", content: UNEXPECTED_CONTINUATION }
+                : {
+                      role: "assistant",
+                      content: "",
+                      tool_calls: [
+                          {
+                              id: TASK_COMPLETE_CALL_ID,
+                              type: "function",
+                              function: {
+                                  name: "task_complete",
+                                  arguments: JSON.stringify({ summary: SUMMARY }),
+                              },
+                          },
+                      ],
+                  };
+            const finishReason = "tool_calls" in message ? "tool_calls" : "stop";
+            const completion = {
+                id: "chatcmpl-sdk-hydrafusion-task-complete",
+                object: "chat.completion",
+                created: 0,
+                model: MODEL,
+                choices: [{ index: 0, message, finish_reason: finishReason }],
+                usage: { prompt_tokens: 11, completion_tokens: 7, total_tokens: 18 },
+            };
+            if (!body.stream) return Response.json(completion);
+            return new Response(
+                `data: ${JSON.stringify({
+                    ...completion,
+                    object: "chat.completion.chunk",
+                    choices: [
+                        {
+                            index: 0,
+                            delta: {
+                                ...message,
+                                ...("tool_calls" in message
+                                    ? {
+                                          tool_calls: message.tool_calls.map((call, index) => ({
+                                              index,
+                                              ...call,
+                                          })),
+                                      }
+                                    : {}),
+                            },
+                            finish_reason: finishReason,
+                        },
+                    ],
+                })}\n\ndata: [DONE]\n\n`,
+                { headers: { "content-type": "text/event-stream" } }
+            );
+        }
+        if (path === "/models/session/intent") {
+            return Response.json({ error: "Intent unavailable in this fixture" }, { status: 404 });
+        }
+        if (path === "/models/session") {
+            return Response.json({
+                available_models: [MODEL],
+                selected_model: MODEL,
+                session_token: "jwt.fake.sdk.task-complete.routing",
+                expires_at: 0,
+            });
+        }
+        throw new Error(`Unexpected model request: ${request.method} ${path}`);
+    }
+}
+
+function waitForFusionCompleted(session: CopilotSession): Promise<SessionEvent> {
+    return new Promise<SessionEvent>((resolve, reject) => {
+        let unsubscribe: () => void = () => {};
+        const timer = setTimeout(() => {
+            unsubscribe();
+            reject(new Error("Timed out waiting for session.fusion_completed"));
+        }, FUSION_COMPLETED_TIMEOUT_MS);
+        unsubscribe = session.on((event) => {
+            if (event.type === "session.fusion_completed") {
+                clearTimeout(timer);
+                unsubscribe();
+                resolve(event);
+            } else if (event.type === "session.error") {
+                clearTimeout(timer);
+                unsubscribe();
+                reject(new Error(`${event.data.message}\n${event.data.stack ?? ""}`));
+            }
+        });
+    });
+}
+
+function assistantContents(events: SessionEvent[]): string[] {
+    return events.flatMap((event) =>
+        event.type === "assistant.message" ? [event.data.content] : []
+    );
+}
+
+describe.skipIf(isByokBackend)("HydraFusion summary-only task_complete", async () => {
+    const handler = new SummaryOnlyTaskCompleteHandler();
+    const { copilotClient: client, workDir } = await createSdkTestContext({
+        copilotClientOptions: {
+            gitHubToken: DEFAULT_GITHUB_TOKEN,
+            requestHandler: handler,
+            env: {
+                HYDRAFUSION: "true",
+                HYDRAFUSION_ROLLOUT: "true",
+                HYDRAFUSION_PLAN_V2: "true",
+                COPILOT_EXP_COPILOT_CLI_HYDRAFUSION_PLAN_V2: "true",
+            },
+        },
+    });
+
+    it("commits the summary only as the task completion, not as assistant text", async () => {
+        const session = await client.createSession({
+            model: "hydrafusion-max",
+            enableExperimentalMode: true,
+            workingDirectory: workDir,
+            onPermissionRequest: approveAll,
+        });
+        const liveEvents: SessionEvent[] = [];
+        const unsubscribe = session.on((event) => liveEvents.push(event));
+        onTestFinished(async () => {
+            unsubscribe();
+            await session.disconnect();
+        });
+
+        await session.rpc.mode.set({ mode: "autopilot" });
+        const fusionCompleted = waitForFusionCompleted(session);
+        await session.send({
+            prompt: "Call task_complete and give your answer only in its summary.",
+        });
+        await fusionCompleted;
+        const persistedEvents = await session.getEvents();
+
+        expect(handler.inference.length).toBeGreaterThan(0);
+        for (const events of [liveEvents, persistedEvents]) {
+            expect(events).toEqual(
+                expect.arrayContaining([
+                    expect.objectContaining({
+                        type: "tool.execution_complete",
+                        data: expect.objectContaining({
+                            toolCallId: TASK_COMPLETE_CALL_ID,
+                            success: true,
+                            fusion: expect.objectContaining({ commitId: expect.any(String) }),
+                        }),
+                    }),
+                    expect.objectContaining({
+                        type: "session.task_complete",
+                        data: expect.objectContaining({ success: true, summary: SUMMARY }),
+                    }),
+                ])
+            );
+            // The solver produced no assistant text, so the committed turn must
+            // not republish the task_complete summary as an assistant message:
+            // hosts already render it from the completion, and a copy shows twice.
+            expect(assistantContents(events).filter((content) => content.trim())).toEqual([]);
+        }
+    });
+});
diff --git a/nodejs/test/e2e/image_edits.e2e.test.ts b/nodejs/test/e2e/image_edits.e2e.test.ts
new file mode 100644
index 0000000000..952a61fb0c
--- /dev/null
+++ b/nodejs/test/e2e/image_edits.e2e.test.ts
@@ -0,0 +1,508 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { createHash, randomUUID } from "node:crypto";
+import { readFile } from "node:fs/promises";
+import { join } from "node:path";
+import { deflateSync } from "node:zlib";
+import { describe, expect, it } from "vitest";
+import {
+    approveAll,
+    CopilotRequestHandler,
+    type CopilotClient,
+    type CopilotRequestContext,
+    type SessionEvent,
+    type UserPromptTransformedHookInput,
+} from "../../src/index.js";
+import { createSdkTestContext } from "./harness/sdkTestContext.js";
+
+const MODEL = "gpt-image-2.5-sunburst";
+const FINAL = "IMAGE_EDIT_SDK_FINISHED";
+
+function png(red: number, width = 1): string {
+    function chunk(name: string, data: Buffer): Buffer {
+        const payload = Buffer.concat([Buffer.from(name), data]);
+        let crc = 0xffffffff;
+        for (const byte of payload) {
+            crc ^= byte;
+            for (let bit = 0; bit < 8; bit++) {
+                crc = (crc >>> 1) ^ (crc & 1 ? 0xedb88320 : 0);
+            }
+        }
+        const length = Buffer.alloc(4);
+        length.writeUInt32BE(data.length);
+        const checksum = Buffer.alloc(4);
+        checksum.writeUInt32BE((crc ^ 0xffffffff) >>> 0);
+        return Buffer.concat([length, payload, checksum]);
+    }
+    const header = Buffer.alloc(13);
+    header.writeUInt32BE(width, 0);
+    header.writeUInt32BE(1, 4);
+    header[8] = 8;
+    header[9] = 2;
+    const pixels = Buffer.alloc(1 + width * 3);
+    for (let column = 0; column < width; column++) {
+        pixels[1 + column * 3] = red;
+    }
+    return Buffer.concat([
+        Buffer.from("89504e470d0a1a0a", "hex"),
+        chunk("IHDR", header),
+        chunk("IDAT", deflateSync(pixels)),
+        chunk("IEND", Buffer.alloc(0)),
+    ]).toString("base64");
+}
+
+function imageId(data: string): string {
+    return `sha256:${createHash("sha256").update(Buffer.from(data, "base64")).digest("hex")}`;
+}
+
+const SOURCE = png(20);
+const EDITED = png(200);
+
+class ImageHandler extends CopilotRequestHandler {
+    readonly edits: Array<Record<string, unknown>> = [];
+    readonly generations: Array<Record<string, unknown>> = [];
+    readonly chats: Array<Record<string, unknown>> = [];
+    outputImage = EDITED;
+    supportedEndpoints = ["/v1/images/generations", "/v1/images/edits"];
+    nextArguments: Record<string, unknown> | undefined;
+    private calls = 0;
+
+    protected override async sendRequest(
+        request: Request,
+        _context: CopilotRequestContext
+    ): Promise<Response> {
+        const path = new URL(request.url).pathname;
+        const body: Record<string, unknown> = request.body ? await request.json() : {};
+        if (path.endsWith("/models")) {
+            return Response.json({
+                data: [
+                    {
+                        id: MODEL,
+                        name: "Image test",
+                        capabilities: { type: "image" },
+                        supported_endpoints: this.supportedEndpoints,
+                        model_picker_enabled: false,
+                        policy: { state: "enabled" },
+                    },
+                ],
+            });
+        }
+        if (path.endsWith("/models/session") || path.includes("/policy")) {
+            return Response.json({ state: "enabled" });
+        }
+        if (path === "/v1/images/edits" || path === "/v1/images/generations") {
+            (path.endsWith("/edits") ? this.edits : this.generations).push(body);
+            return Response.json({
+                created: 1,
+                data: [{ b64_json: this.outputImage }],
+                output_format: "png",
+            });
+        }
+        if (path.endsWith("/chat/completions")) {
+            this.chats.push(body);
+            const args = this.nextArguments;
+            this.nextArguments = undefined;
+            const toolCalls = args
+                ? [
+                      {
+                          id: `image-edit-${++this.calls}`,
+                          type: "function",
+                          function: { name: "image_generation", arguments: JSON.stringify(args) },
+                      },
+                  ]
+                : undefined;
+            const message = {
+                role: "assistant",
+                content: args ? null : FINAL,
+                tool_calls: toolCalls,
+            };
+            const finish = args ? "tool_calls" : "stop";
+            if (body.stream === true) {
+                const delta = {
+                    ...message,
+                    tool_calls: toolCalls?.map((call, index) => ({ index, ...call })),
+                };
+                return new Response(
+                    [
+                        `data: ${JSON.stringify({ id: "image-chat", object: "chat.completion.chunk", choices: [{ index: 0, delta, finish_reason: null }] })}\n\n`,
+                        `data: ${JSON.stringify({ id: "image-chat", object: "chat.completion.chunk", choices: [{ index: 0, delta: {}, finish_reason: finish }], usage: { prompt_tokens: 1, completion_tokens: 1, total_tokens: 2 } })}\n\n`,
+                        "data: [DONE]\n\n",
+                    ].join(""),
+                    { headers: { "content-type": "text/event-stream" } }
+                );
+            }
+            return Response.json({
+                id: "image-chat",
+                object: "chat.completion",
+                model: "image-edit-chat",
+                choices: [{ index: 0, message, finish_reason: finish }],
+                usage: { prompt_tokens: 1, completion_tokens: 1, total_tokens: 2 },
+            });
+        }
+        throw new Error(`Unexpected image test request: ${request.method} ${path}`);
+    }
+}
+
+describe("Native image editing", async () => {
+    const { createClient, env, openAiEndpoint } = await createSdkTestContext({
+        copilotClientOptions: { env: { IMAGE_GENERATION_TOOL: "true" } },
+    });
+    async function readPersistedAssets(client: CopilotClient, sessionId: string) {
+        // Binary assets are internal persistence records, not public SDK events.
+        await client.rpc.sessions.save({ sessionId });
+        const log = await readFile(
+            join(env.COPILOT_HOME, "session-state", sessionId, "events.jsonl"),
+            "utf8"
+        );
+        return log
+            .trim()
+            .split("\n")
+            .map((line): SessionEvent => JSON.parse(line))
+            .filter((event) => event.type === "session.binary_asset");
+    }
+    const options = {
+        model: "image-edit-chat",
+        imageGeneration: { enabled: true },
+        provider: {
+            type: "openai" as const,
+            wireApi: "completions" as const,
+            baseUrl: "https://image-edit-test.invalid/v1",
+            apiKey: "synthetic-image-test",
+        },
+        onPermissionRequest: approveAll,
+    };
+
+    it("edits an explicit attachment and can reuse the generated result after resume", async () => {
+        const handler = new ImageHandler();
+        const client = createClient({ requestHandler: handler });
+        try {
+            await client.start();
+            const session = await client.createSession(options);
+            const events: SessionEvent[] = [];
+            session.on((event) => events.push(event));
+            handler.nextArguments = {
+                prompt: "Use this reference",
+                input_images: [{ image_id: imageId(SOURCE) }],
+            };
+            const reply = await session.sendAndWait({
+                prompt: "Use the attached image as a reference for a new image.",
+                attachments: [{ type: "blob", mimeType: "image/png", data: SOURCE }],
+            });
+            expect(reply?.data.content).toBe(FINAL);
+            const completion = events.find((event) => event.type === "tool.execution_complete");
+            expect(completion?.data.error).toBeUndefined();
+            expect(completion?.data.success).toBe(true);
+            expect(handler.generations).toHaveLength(0);
+            expect(handler.edits).toEqual([
+                {
+                    model: MODEL,
+                    prompt: "Use this reference",
+                    images: [{ image_url: `data:image/png;base64,${SOURCE}` }],
+                    n: 1,
+                    output_format: "png",
+                    stream: false,
+                },
+            ]);
+            const sessionId = session.sessionId;
+            await session.disconnect();
+            await client.stop();
+            await client.start();
+            const resumed = await client.resumeSession(sessionId, options);
+            handler.nextArguments = {
+                prompt: "Make the result brighter",
+                input_images: [{ image_id: imageId(EDITED) }],
+            };
+            expect(
+                (await resumed.sendAndWait({ prompt: "Make the generated image brighter." }))?.data
+                    .content
+            ).toBe(FINAL);
+            expect(handler.edits).toHaveLength(2);
+            expect(handler.edits[1].images).toEqual([
+                { image_url: `data:image/png;base64,${EDITED}` },
+            ]);
+            expect(handler.generations).toHaveLength(0);
+            await resumed.disconnect();
+        } finally {
+            await client.stop();
+        }
+    });
+
+    it("does not upload an unrelated attachment when the tool selects text-only generation", async () => {
+        const handler = new ImageHandler();
+        const client = createClient({ requestHandler: handler });
+        try {
+            await client.start();
+            const session = await client.createSession(options);
+            handler.nextArguments = { prompt: "A fresh landscape" };
+            expect(
+                (
+                    await session.sendAndWait({
+                        prompt: "Ignore the attachment and generate a fresh landscape.",
+                        attachments: [{ type: "blob", mimeType: "image/png", data: SOURCE }],
+                    })
+                )?.data.content
+            ).toBe(FINAL);
+            expect(handler.edits).toHaveLength(0);
+            expect(handler.generations).toHaveLength(1);
+            expect(handler.generations[0]).not.toHaveProperty("images");
+            await session.disconnect();
+        } finally {
+            await client.stop();
+        }
+    });
+
+    it("rejects image references outside the session instead of generating a substitute", async () => {
+        const handler = new ImageHandler();
+        const client = createClient({ requestHandler: handler });
+        try {
+            await client.start();
+            const session = await client.createSession(options);
+            const events: SessionEvent[] = [];
+            session.on((event) => events.push(event));
+            handler.nextArguments = {
+                prompt: "Edit",
+                input_images: [{ image_id: imageId(SOURCE) }],
+            };
+            expect(
+                (await session.sendAndWait({ prompt: "Edit the selected image." }))?.data.content
+            ).toBe(FINAL);
+            expect(handler.edits).toHaveLength(0);
+            expect(handler.generations).toHaveLength(0);
+            const completion = events.find((event) => event.type === "tool.execution_complete");
+            expect(completion?.data.error?.message).toMatch(/^image_generation_input_unavailable:/);
+            expect(completion?.data.success).toBe(false);
+            await session.disconnect();
+        } finally {
+            await client.stop();
+        }
+    });
+
+    it("keeps the transformed hook final for batched image attachments", async () => {
+        const handler = new ImageHandler();
+        const client = createClient({ requestHandler: handler });
+        const preceding = "Inspect the first batch image.";
+        const replacement = "IMAGE_BATCH_HOOK_REPLACEMENT";
+        const inputs: UserPromptTransformedHookInput[] = [];
+        try {
+            await client.start();
+            const session = await client.createSession({
+                ...options,
+                hooks: {
+                    onUserPromptTransformed: async (input) => {
+                        inputs.push(input);
+                        return { modifiedTransformedPrompt: replacement };
+                    },
+                },
+            });
+            const events: SessionEvent[] = [];
+            session.on((event) => events.push(event));
+            await session.rpc.sendMessages({
+                messages: [
+                    {
+                        prompt: preceding,
+                        attachments: [{ type: "blob", mimeType: "image/png", data: SOURCE }],
+                    },
+                    { prompt: "Finish the batch." },
+                ],
+                wait: true,
+            });
+            expect(inputs.find((input) => input.prompt === preceding)?.transformedPrompt).toContain(
+                imageId(SOURCE)
+            );
+            const messages = events.filter((event) => event.type === "user.message");
+            expect(messages).toHaveLength(2);
+            for (const message of messages) {
+                expect(message.data.transformedContent).toBe(replacement);
+            }
+            expect(JSON.stringify(handler.chats.at(-1)?.messages)).not.toContain(
+                "Image input references"
+            );
+            // Validate the final assistant response arrived (guards against truncated captures).
+            expect(
+                events.findLast((event) => event.type === "assistant.message")?.data.content
+            ).toBe(FINAL);
+            await session.disconnect();
+        } finally {
+            await client.stop();
+        }
+    });
+
+    it("emits the preceding image message when its transformed hook throws", async () => {
+        const handler = new ImageHandler();
+        const client = createClient({ requestHandler: handler });
+        const preceding = "Inspect the first batch image.";
+        const hooked: string[] = [];
+        try {
+            await client.start();
+            const session = await client.createSession({
+                ...options,
+                hooks: {
+                    onUserPromptTransformed: async (input) => {
+                        hooked.push(input.prompt);
+                        if (input.prompt === preceding) {
+                            throw new Error("IMAGE_TRANSFORM_EXPECTED_FAILURE");
+                        }
+                    },
+                },
+            });
+            const events: SessionEvent[] = [];
+            session.on((event) => events.push(event));
+            await session.rpc.sendMessages({
+                messages: [
+                    {
+                        prompt: preceding,
+                        attachments: [{ type: "blob", mimeType: "image/png", data: SOURCE }],
+                    },
+                    { prompt: "Finish the batch." },
+                ],
+                wait: true,
+            });
+            expect(hooked).toEqual([preceding, "Finish the batch."]);
+            const messages = events.filter((event) => event.type === "user.message");
+            expect(messages.map((message) => message.data.content)).toEqual(hooked);
+            expect(messages[0].data.attachments).toContainEqual(
+                expect.objectContaining({ type: "blob", mimeType: "image/png", data: SOURCE })
+            );
+            expect(
+                (await readPersistedAssets(client, session.sessionId)).map(
+                    (asset) => asset.data.assetId
+                )
+            ).toEqual([imageId(SOURCE)]);
+            // Validate the final assistant response arrived (guards against truncated captures).
+            expect(
+                events.findLast((event) => event.type === "assistant.message")?.data.content
+            ).toBe(FINAL);
+            await session.disconnect();
+        } finally {
+            await client.stop();
+        }
+    });
+
+    it("adds a persisted preview when reattaching a generated image", async () => {
+        const handler = new ImageHandler();
+        handler.outputImage = png(200, 2200);
+        const client = createClient({ requestHandler: handler });
+        try {
+            await client.start();
+            const session = await client.createSession(options);
+            handler.nextArguments = { prompt: "Generate a wide image." };
+            expect(
+                (await session.sendAndWait({ prompt: "Generate a wide image." }))?.data.content
+            ).toBe(FINAL);
+            expect(handler.generations).toHaveLength(1);
+            expect(
+                (
+                    await session.sendAndWait({
+                        prompt: "Inspect the reattached image.",
+                        attachments: [
+                            { type: "blob", mimeType: "image/png", data: handler.outputImage },
+                        ],
+                    })
+                )?.data.content
+            ).toBe(FINAL);
+            const assets = await readPersistedAssets(client, session.sessionId);
+            const update = assets.findLast(
+                (event) => event.data.assetId === `image-edit:${imageId(handler.outputImage)}`
+            );
+            expect(update?.data.metadata?.imageEditSource).toEqual({
+                data: handler.outputImage,
+                mimeType: "image/png",
+            });
+            const preview = update?.data.data;
+            if (typeof preview !== "string") {
+                throw new Error("The reattached image has no persisted chat preview");
+            }
+            expect(preview).not.toBe(handler.outputImage);
+            expect(Buffer.from(preview, "base64").length).toBeLessThanOrEqual(3 * 1024 * 1024);
+            const imageMessage = expect.objectContaining({
+                role: "user",
+                content: expect.arrayContaining([
+                    expect.objectContaining({
+                        type: "image_url",
+                        image_url: expect.objectContaining({
+                            url: `data:image/png;base64,${preview}`,
+                        }),
+                    }),
+                ]),
+            });
+            expect(handler.chats.at(-1)?.messages).toContainEqual(imageMessage);
+
+            const sessionId = session.sessionId;
+            await session.disconnect();
+            await client.stop();
+            await client.start();
+            const resumed = await client.resumeSession(sessionId, options);
+            expect((await resumed.sendAndWait({ prompt: "Inspect it again." }))?.data.content).toBe(
+                FINAL
+            );
+            expect(handler.chats.at(-1)?.messages).toContainEqual(imageMessage);
+            handler.nextArguments = {
+                prompt: "Edit the original wide image.",
+                input_images: [{ image_id: imageId(handler.outputImage) }],
+            };
+            // Validate the final assistant response arrived (guards against truncated captures).
+            expect(
+                (await resumed.sendAndWait({ prompt: "Edit the reattached image." }))?.data.content
+            ).toBe(FINAL);
+            expect(handler.edits.at(-1)?.images).toEqual([
+                { image_url: `data:image/png;base64,${handler.outputImage}` },
+            ]);
+            await resumed.disconnect();
+        } finally {
+            await client.stop();
+        }
+    });
+
+    it.each(["generations-only", "filtered-out"] as const)(
+        "does not retain originals or advertise image inputs when %s",
+        async (availability) => {
+            const handler = new ImageHandler();
+            if (availability === "generations-only") {
+                handler.supportedEndpoints = ["/v1/images/generations"];
+            }
+            // In-process clients share the model catalog cache, keyed by endpoint and auth.
+            const token = `image-input-${randomUUID()}`;
+            await openAiEndpoint.setCopilotUserByToken(token, {
+                login: "image-input-test",
+                copilot_plan: "individual_pro",
+                endpoints: { api: env.COPILOT_API_URL },
+                analytics_tracking_id: token,
+            });
+            const client = createClient({ requestHandler: handler, gitHubToken: token });
+            const inputs: UserPromptTransformedHookInput[] = [];
+            try {
+                await client.start();
+                const session = await client.createSession({
+                    ...options,
+                    excludedTools: availability === "filtered-out" ? ["image_generation"] : [],
+                    hooks: {
+                        onUserPromptTransformed: async (input) => {
+                            inputs.push(input);
+                        },
+                    },
+                });
+                const original = png(20, 2200);
+                // Validate the final assistant response arrived (guards against truncated captures).
+                expect(
+                    (
+                        await session.sendAndWait({
+                            prompt: "Inspect this attachment.",
+                            attachments: [{ type: "blob", mimeType: "image/png", data: original }],
+                        })
+                    )?.data.content
+                ).toBe(FINAL);
+                expect(inputs).toHaveLength(1);
+                expect(inputs[0].transformedPrompt).not.toContain("Image input references");
+                const assets = await readPersistedAssets(client, session.sessionId);
+                expect(assets).toHaveLength(1);
+                expect(assets[0].data.data).not.toBe(original);
+                expect(assets[0].data.metadata?.imageEditSource).toBeUndefined();
+                await session.disconnect();
+            } finally {
+                await client.stop();
+            }
+        }
+    );
+});
diff --git a/nodejs/test/e2e/image_generation.e2e.test.ts b/nodejs/test/e2e/image_generation.e2e.test.ts
new file mode 100644
index 0000000000..2473d39127
--- /dev/null
+++ b/nodejs/test/e2e/image_generation.e2e.test.ts
@@ -0,0 +1,254 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { describe, expect, it } from "vitest";
+import {
+    approveAll,
+    CopilotRequestHandler,
+    RuntimeConnection,
+    type CopilotRequestContext,
+    type CopilotSession,
+} from "../../src/index.js";
+import { createSdkTestContext } from "./harness/sdkTestContext.js";
+import { withTestBackend } from "./harness/testBackend.js";
+
+const IMAGE_MODEL = "gpt-image-2.5-sunburst";
+const IMAGE_ENDPOINT = "/v1/images/generations";
+const PNG =
+    "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAABHNCSVQICAgIfAhkiAAAAAFzUkdCAK7OHOkAAAANSURBVAiZY2BgYPgPAAEEAQB9ssjfAAAAAElFTkSuQmCC";
+
+class ImageService extends CopilotRequestHandler {
+    readonly imageRequests: unknown[] = [];
+    readonly chatToolNames: string[][] = [];
+
+    constructor(private readonly modelAvailable = true) {
+        super();
+    }
+
+    protected override async sendRequest(
+        request: Request,
+        context: CopilotRequestContext
+    ): Promise<Response> {
+        const pathname = new URL(request.url).pathname;
+        if (pathname.endsWith("/chat/completions") && request.method === "POST") {
+            const body = (await request.json()) as {
+                model: string;
+                stream?: boolean;
+                tools?: Array<{ function: { name: string } }>;
+            };
+            this.chatToolNames.push(body.tools?.map((tool) => tool.function.name) ?? []);
+            const message = { role: "assistant", content: "IMAGE_CONSENT_TURN_COMPLETE" };
+            const response = {
+                id: "image-consent-turn",
+                created: 123,
+                model: body.model,
+                usage: { prompt_tokens: 5, completion_tokens: 1, total_tokens: 6 },
+            };
+            if (!body.stream) {
+                return Response.json({
+                    ...response,
+                    object: "chat.completion",
+                    choices: [{ index: 0, message, finish_reason: "stop" }],
+                });
+            }
+            return new Response(
+                `data: ${JSON.stringify({
+                    ...response,
+                    object: "chat.completion.chunk",
+                    choices: [{ index: 0, delta: message, finish_reason: "stop" }],
+                })}\n\ndata: [DONE]\n\n`,
+                { headers: { "content-type": "text/event-stream" } }
+            );
+        }
+        if (pathname === IMAGE_ENDPOINT) {
+            this.imageRequests.push(await request.json());
+            return Response.json({
+                created: 123,
+                data: [{ b64_json: PNG }],
+                output_format: "png",
+            });
+        }
+        const response = await super.sendRequest(request, context);
+        if (pathname !== "/models" || !response.ok) {
+            return response;
+        }
+        const catalog = (await response.json()) as { data: unknown[] };
+        if (this.modelAvailable) {
+            catalog.data.push({
+                id: IMAGE_MODEL,
+                name: "SDK test image model",
+                capabilities: { type: "image" },
+                supported_endpoints: [IMAGE_ENDPOINT],
+                model_picker_enabled: false,
+                policy: { state: "enabled" },
+            });
+        }
+        return Response.json(catalog);
+    }
+}
+
+async function imageToolOffered(session: CopilotSession): Promise<boolean> {
+    await session.rpc.tools.initializeAndValidate();
+    const { tools } = await session.rpc.tools.getCurrentMetadata();
+    return tools.some((tool) => tool.name === "image_generation");
+}
+
+describe("Native image generation consent", async () => {
+    // Native image inference is CAPI-only, independent of the chat-provider CI matrix.
+    const { createClient, openAiEndpoint } = await createSdkTestContext({
+        replayOnly: true,
+        backend: "capi",
+    });
+
+    it("requires SDK consent and CAPI access regardless of the CLI rollout flag", async () => {
+        for (const flag of [false, true]) {
+            for (const enabled of [undefined, false, true]) {
+                const service = new ImageService();
+                await using client = createClient({ requestHandler: service });
+                await using session = await client.createSession({
+                    onPermissionRequest: approveAll,
+                    featureFlags: { IMAGE_GENERATION_TOOL: flag },
+                    imageGeneration: enabled === undefined ? undefined : { enabled },
+                });
+                expect(await imageToolOffered(session)).toBe(enabled === true);
+                expect(service.imageRequests).toEqual([]);
+            }
+        }
+    });
+
+    it("executes an opted-in CAPI image tool while the rollout flag is off", async () => {
+        const service = new ImageService();
+        await using client = createClient({ requestHandler: service });
+        await using session = await client.createSession({
+            onPermissionRequest: approveAll,
+            featureFlags: { IMAGE_GENERATION_TOOL: false },
+            imageGeneration: { enabled: true },
+        });
+        expect(await imageToolOffered(session)).toBe(true);
+        const result = await session.rpc.tools.execute({
+            name: "image_generation",
+            arguments: { prompt: "A watercolor fox" },
+            toolCallId: "sdk-image",
+        });
+        expect(result).toMatchObject({
+            resultType: "success",
+            contents: [{ type: "image", mimeType: "image/png", data: PNG }],
+        });
+        expect(service.imageRequests).toEqual([
+            {
+                model: IMAGE_MODEL,
+                prompt: "A watercolor fox",
+                n: 1,
+                output_format: "png",
+                stream: false,
+            },
+        ]);
+    });
+
+    it("still requires an image model from CAPI", async () => {
+        const service = new ImageService(false);
+        await using client = createClient({ requestHandler: service });
+        await using session = await client.createSession({
+            onPermissionRequest: approveAll,
+            imageGeneration: { enabled: true },
+            featureFlags: { IMAGE_GENERATION_TOOL: true },
+        });
+        expect(await imageToolOffered(session)).toBe(false);
+        expect(service.imageRequests).toEqual([]);
+    });
+
+    it("preserves resident consent but applies an explicit opt-out", async () => {
+        await using client = createClient({ requestHandler: new ImageService() });
+        await using session = await client.createSession({
+            onPermissionRequest: approveAll,
+            imageGeneration: { enabled: true },
+            featureFlags: { IMAGE_GENERATION_TOOL: false },
+        });
+        expect(await imageToolOffered(session)).toBe(true);
+        await using resumed = await client.resumeSession(session.sessionId, {
+            onPermissionRequest: approveAll,
+        });
+        expect(await imageToolOffered(resumed)).toBe(true);
+        await using disabled = await client.resumeSession(session.sessionId, {
+            onPermissionRequest: approveAll,
+            imageGeneration: { enabled: false },
+            featureFlags: { IMAGE_GENERATION_TOOL: true },
+        });
+        expect(await imageToolOffered(disabled)).toBe(false);
+    });
+
+    it("requires renewed consent after a runtime restart", async () => {
+        // Separate stdio runtimes prove that consent is not restored from disk.
+        const firstService = new ImageService();
+        await using first = createClient({
+            requestHandler: firstService,
+            connection: RuntimeConnection.forStdio(),
+        });
+        const original = await first.createSession({
+            model: "claude-sonnet-5",
+            onPermissionRequest: approveAll,
+            imageGeneration: { enabled: true },
+        });
+        expect(await imageToolOffered(original)).toBe(true);
+        // A session with no user activity is deliberately not persisted.
+        const response = await original.sendAndWait({
+            prompt: "Acknowledge this message without using tools.",
+        });
+        expect(response?.data.content).toBe("IMAGE_CONSENT_TURN_COMPLETE");
+        expect(firstService.chatToolNames.some((names) => names.includes("image_generation"))).toBe(
+            true
+        );
+        const sessionId = original.sessionId;
+        await first.rpc.sessions.save({ sessionId });
+        await original.disconnect();
+        await first.stop();
+
+        const secondService = new ImageService();
+        await using second = createClient({
+            requestHandler: secondService,
+            connection: RuntimeConnection.forStdio(),
+        });
+        await using resumed = await second.resumeSession(sessionId, {
+            onPermissionRequest: approveAll,
+            featureFlags: { IMAGE_GENERATION_TOOL: true },
+        });
+        expect(await imageToolOffered(resumed)).toBe(false);
+        const resumedResponse = await resumed.sendAndWait({
+            prompt: "Acknowledge again without using tools.",
+        });
+        expect(resumedResponse?.data.content).toBe("IMAGE_CONSENT_TURN_COMPLETE");
+        expect(secondService.chatToolNames.length).toBeGreaterThan(0);
+        expect(
+            secondService.chatToolNames.every((names) => !names.includes("image_generation"))
+        ).toBe(true);
+        await using optedIn = await second.resumeSession(sessionId, {
+            onPermissionRequest: approveAll,
+            imageGeneration: { enabled: true },
+            featureFlags: { IMAGE_GENERATION_TOOL: false },
+        });
+        expect(await imageToolOffered(optedIn)).toBe(true);
+    });
+
+    it.each(["anthropic-messages", "openai-responses", "openai-completions"] as const)(
+        "does not expose image generation for %s without CAPI image-model access",
+        async (backend) => {
+            const service = new ImageService(false);
+            await using client = createClient({ requestHandler: service });
+            await using session = await client.createSession(
+                withTestBackend(
+                    {
+                        model: "claude-sonnet-5",
+                        onPermissionRequest: approveAll,
+                        imageGeneration: { enabled: true },
+                        featureFlags: { IMAGE_GENERATION_TOOL: true },
+                    },
+                    backend,
+                    openAiEndpoint.url
+                )
+            );
+            expect(await imageToolOffered(session)).toBe(false);
+            expect(service.imageRequests).toEqual([]);
+        }
+    );
+});
diff --git a/nodejs/test/e2e/managed_permissions_limit_to.e2e.test.ts b/nodejs/test/e2e/managed_permissions_limit_to.e2e.test.ts
new file mode 100644
index 0000000000..1ec520429d
--- /dev/null
+++ b/nodejs/test/e2e/managed_permissions_limit_to.e2e.test.ts
@@ -0,0 +1,227 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { writeFile } from "node:fs/promises";
+import { createServer, type Server } from "node:http";
+import { join } from "node:path";
+import { describe, expect, it } from "vitest";
+import { createSdkTestContext } from "./harness/sdkTestContext.js";
+
+function closeServer(server: Server): Promise<void> {
+    server.closeAllConnections();
+    return new Promise((resolve, reject) => {
+        server.close((error) => (error ? reject(error) : resolve()));
+    });
+}
+
+describe("Managed permissions limitTo", async () => {
+    const { copilotClient: client, workDir } = await createSdkTestContext();
+
+    it("evaluates retained managed network policy without invoking the permission handler", async () => {
+        let permissionRequests = 0;
+        const session = await client.createSession({
+            managedSettings: {
+                permissions: {
+                    limitTo: ["Domain(*.example.com)"],
+                    deny: ["Domain(blocked.example.com)"],
+                    ask: ["Domain(prompt.example.com)"],
+                    allow: ["Domain(allowed.example.com)"],
+                },
+            },
+            onPermissionRequest: () => {
+                permissionRequests++;
+                return { kind: "approve-once" };
+            },
+        });
+        try {
+            const urls = [
+                "https://allowed.example.com/guide",
+                "https://prompt.example.com/",
+                "https://blocked.example.com/",
+                "https://outside.test/",
+                "http://allowed.example.com:8080/redirect",
+            ];
+            const snapshot = await session.rpc.managedSettings.get();
+            expect(snapshot.permissionsContext).toBeDefined();
+            const context = snapshot.permissionsContext!;
+            const operations = urls.map((url) => ({ kind: "url" as const, url }));
+            const result = await client.rpc.managedSettings.permissions.evaluate({
+                context,
+                operations,
+            });
+            expect(result).toEqual({
+                failClosed: false,
+                results: operations.map((operation, index) => ({
+                    operation,
+                    verdict: ["allow", "ask", "deny", "deny", "ask"][index],
+                })),
+            });
+            expect(permissionRequests).toBe(0);
+            await expect(
+                client.rpc.managedSettings.permissions.evaluate({
+                    context,
+                    operations: [{ kind: "url", url: "file:///secret" }],
+                })
+            ).rejects.toMatchObject({ code: -32602 });
+            expect(
+                await client.rpc.managedSettings.permissions.evaluate({ context, operations: [] })
+            ).toEqual({
+                failClosed: false,
+                results: [],
+            });
+            expect(snapshot.settings).not.toHaveProperty("sandbox");
+        } finally {
+            await session.disconnect();
+        }
+    });
+
+    it("evaluates an in-memory permissions context without creating a session", async () => {
+        await client.start();
+        const operations = [
+            { kind: "url" as const, url: "https://api.example.com/guide" },
+            { kind: "url" as const, url: "https://outside.test/" },
+        ];
+        const context = {
+            permissions: { limitTo: ["Domain(api.example.com)"] },
+            failClosed: false,
+        };
+        const result = await client.rpc.managedSettings.permissions.evaluate({
+            context,
+            operations,
+        });
+        expect(result).toEqual({
+            failClosed: false,
+            results: [
+                { operation: operations[0], verdict: "unmanaged" },
+                { operation: operations[1], verdict: "deny" },
+            ],
+        });
+        expect(
+            await client.rpc.managedSettings.permissions.evaluate({
+                context: { ...context, failClosed: true },
+                operations,
+            })
+        ).toEqual({
+            failClosed: true,
+            results: operations.map((operation) => ({ operation, verdict: "deny" })),
+        });
+    });
+
+    it("denies every URL for an empty managed boundary", async () => {
+        const session = await client.createSession({
+            managedSettings: { permissions: { limitTo: [] } },
+        });
+        try {
+            const snapshot = await session.rpc.managedSettings.get();
+            expect(snapshot.permissionsContext).toBeDefined();
+            expect(
+                await client.rpc.managedSettings.permissions.evaluate({
+                    context: snapshot.permissionsContext!,
+                    operations: [
+                        { kind: "url", url: "https://example.com/" },
+                        { kind: "url", url: "https://api.github.com/" },
+                    ],
+                })
+            ).toEqual({
+                failClosed: false,
+                results: [
+                    { operation: { kind: "url", url: "https://example.com/" }, verdict: "deny" },
+                    { operation: { kind: "url", url: "https://api.github.com/" }, verdict: "deny" },
+                ],
+            });
+        } finally {
+            await session.disconnect();
+        }
+    });
+
+    it.skipIf(process.platform !== "darwin")(
+        "admits only the configured dynamic loopback destination",
+        async () => {
+            const requestedHosts: string[] = [];
+            const server = createServer((request, response) => {
+                requestedHosts.push(request.headers.host?.split(":")[0] ?? "");
+                response.end("LIMIT_TO_SERVER_OK");
+            });
+            await new Promise<void>((resolve, reject) => {
+                server.once("error", reject);
+                server.listen(0, "0.0.0.0", () => {
+                    server.off("error", reject);
+                    resolve();
+                });
+            });
+            const address = server.address();
+            expect(address && typeof address !== "string").toBe(true);
+            const port = typeof address === "object" && address ? address.port : 0;
+
+            await writeFile(join(workDir, "limit-to-blocked-marker.txt"), "LIMIT_TO_BLOCKED_OK");
+            try {
+                const session = await client.createSession({
+                    managedSettings: {
+                        permissions: {
+                            limitTo: ["Domain(127.0.0.1)"],
+                        },
+                    },
+                    onPermissionRequest: () => ({ kind: "approve-once" }),
+                });
+                try {
+                    const update = await session.rpc.options.update({
+                        sandboxConfig: {
+                            enabled: true,
+                            failIfUnavailable: true,
+                            allowBypass: false,
+                            allowDevToolAccess: false,
+                            learningMode: "deny",
+                            sandboxMcpServers: true,
+                            sandboxLspServers: true,
+                            userPolicy: {
+                                network: {
+                                    allowLocalNetwork: true,
+                                    allowedHosts: ["127.0.0.1"],
+                                    blockedHosts: [],
+                                },
+                            },
+                        },
+                    });
+                    expect(update.success).toBe(true);
+                    await session.rpc.tools.initializeAndValidate();
+                    const admitted = await session.rpc.tools.execute({
+                        name: "bash",
+                        arguments: {
+                            command:
+                                `host=127.0.0.1; curl --disable --silent --show-error --fail --max-time 5 ` +
+                                `--proxy "$HTTP_PROXY" "http://$host:${port}/probe"`,
+                            description: "Probe the admitted dynamic loopback destination",
+                        },
+                        toolCallId: "limit-to-admitted",
+                    });
+                    expect(admitted).toMatchObject({
+                        resultType: "success",
+                        textResultForLlm: expect.stringContaining("LIMIT_TO_SERVER_OK"),
+                    });
+
+                    const blocked = await session.rpc.tools.execute({
+                        name: "bash",
+                        arguments: {
+                            command:
+                                `host=127.0.0.2; curl --disable --silent --show-error --fail --max-time 5 ` +
+                                `--noproxy "*" "http://$host:${port}/probe" || ` +
+                                "cat limit-to-blocked-marker.txt",
+                            description: "Probe a blocked dynamic loopback destination",
+                        },
+                        toolCallId: "limit-to-blocked",
+                    });
+                    expect(blocked).toMatchObject({
+                        resultType: "success",
+                        textResultForLlm: expect.stringContaining("LIMIT_TO_BLOCKED_OK"),
+                    });
+                    expect(requestedHosts).toEqual(["127.0.0.1"]);
+                } finally {
+                    await session.disconnect();
+                }
+            } finally {
+                await closeServer(server);
+            }
+        }
+    );
+});
diff --git a/nodejs/test/e2e/managed_plugin_progress.e2e.test.ts b/nodejs/test/e2e/managed_plugin_progress.e2e.test.ts
new file mode 100644
index 0000000000..aead2b874b
--- /dev/null
+++ b/nodejs/test/e2e/managed_plugin_progress.e2e.test.ts
@@ -0,0 +1,140 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { mkdirSync, writeFileSync } from "node:fs";
+import { execFileSync } from "node:child_process";
+import { join } from "node:path";
+import { pathToFileURL } from "node:url";
+import { describe, expect, it, onTestFinished, vi } from "vitest";
+import { CopilotClient, RuntimeConnection, type SessionEvent } from "../../src/index.js";
+import { createSdkTestContext, isInProcessTransport } from "./harness/sdkTestContext.js";
+
+const MARKETPLACE_NAME = "managed-progress-market";
+const PLUGIN_NAME = "managed-progress-plugin";
+const PLUGIN_SPEC = `${PLUGIN_NAME}@${MARKETPLACE_NAME}`;
+
+type ManagedPluginProgressEvent = Extract<
+    SessionEvent,
+    { type: "session.managed_plugin_progress" }
+>;
+
+describe("Managed plugin progress", async () => {
+    const { env, workDir } = await createSdkTestContext();
+
+    it.skipIf(isInProcessTransport)(
+        "emits presentation-neutral completion after installing required plugins",
+        { timeout: 120_000 },
+        async () => {
+            const marketplaceDir = join(workDir, "managed-progress-marketplace");
+            const pluginDir = join(marketplaceDir, "plugins", PLUGIN_NAME);
+            const marketplaceManifest = join(
+                marketplaceDir,
+                ".github",
+                "plugin",
+                "marketplace.json"
+            );
+            mkdirSync(join(marketplaceDir, ".github", "plugin"), { recursive: true });
+            mkdirSync(pluginDir, { recursive: true });
+            writeFileSync(
+                marketplaceManifest,
+                JSON.stringify({
+                    name: MARKETPLACE_NAME,
+                    owner: { name: "SDK E2E" },
+                    plugins: [{ name: PLUGIN_NAME, source: `./plugins/${PLUGIN_NAME}` }],
+                })
+            );
+            writeFileSync(
+                join(pluginDir, "plugin.json"),
+                JSON.stringify({ name: PLUGIN_NAME, version: "1.0.0" })
+            );
+            execFileSync("git", ["init", "--initial-branch=main"], { cwd: marketplaceDir });
+            execFileSync("git", ["config", "user.name", "SDK E2E"], { cwd: marketplaceDir });
+            execFileSync("git", ["config", "user.email", "sdk-e2e@example.invalid"], {
+                cwd: marketplaceDir,
+            });
+            execFileSync("git", ["add", "."], { cwd: marketplaceDir });
+            execFileSync("git", ["commit", "-m", "Publish managed plugin"], {
+                cwd: marketplaceDir,
+            });
+
+            const policyPath = join(workDir, "managed-progress-policy.json");
+            writeFileSync(
+                policyPath,
+                JSON.stringify({
+                    extraKnownMarketplaces: {
+                        [MARKETPLACE_NAME]: {
+                            source: {
+                                source: "git",
+                                url: pathToFileURL(marketplaceDir).toString(),
+                                ref: "main",
+                            },
+                        },
+                    },
+                    enabledPlugins: { [PLUGIN_SPEC]: true },
+                })
+            );
+
+            const home = join(workDir, "managed-progress-home");
+            mkdirSync(home, { recursive: true });
+            const client = new CopilotClient({
+                workingDirectory: workDir,
+                connection: RuntimeConnection.forStdio({
+                    path: process.env.COPILOT_LEGACY_CLI_PATH,
+                }),
+                useLoggedInUser: false,
+                env: {
+                    ...env,
+                    COPILOT_HOME: home,
+                    GH_CONFIG_DIR: home,
+                    XDG_CONFIG_HOME: home,
+                    XDG_STATE_HOME: home,
+                    GH_TOKEN: "",
+                    GITHUB_TOKEN: "",
+                    COPILOT_GITHUB_TOKEN: "",
+                    GITHUB_COPILOT_API_TOKEN: "",
+                    COPILOT_HMAC_KEY: "",
+                    CAPI_HMAC_KEY: "",
+                    COPILOT_E2E_TEST_HOOKS: "1",
+                    COPILOT_TEST_MANAGED_SETTINGS_FILE_PATH: policyPath,
+                },
+            });
+            onTestFinished(() => client.stop());
+            await client.start();
+
+            const observedEventTypes: string[] = [];
+            const progress: ManagedPluginProgressEvent[] = [];
+            const session = await client.createSession({
+                enableManagedSettings: true,
+                onEvent: (event) => {
+                    observedEventTypes.push(event.type);
+                    if (event.type === "session.managed_plugin_progress") {
+                        progress.push(event);
+                    }
+                },
+            });
+            try {
+                const managedSettings = await session.rpc.managedSettings.get();
+                expect(managedSettings.settings).toMatchObject({
+                    enabledPlugins: { [PLUGIN_SPEC]: true },
+                });
+                await vi.waitFor(
+                    () =>
+                        expect(
+                            progress.at(-1)?.data,
+                            `Observed event types: ${observedEventTypes.join(", ")}`
+                        ).toEqual({ phase: "complete", pluginSpecs: [] }),
+                    { timeout: 45_000 }
+                );
+
+                const installed = (await client.rpc.plugins.list()).plugins.find(
+                    (plugin) =>
+                        plugin.name === PLUGIN_NAME && plugin.marketplace === MARKETPLACE_NAME
+                );
+                expect(installed).toMatchObject({ enabled: false });
+            } finally {
+                await session.disconnect();
+            }
+        }
+    );
+});
diff --git a/nodejs/test/e2e/mcp_and_agents.e2e.test.ts b/nodejs/test/e2e/mcp_and_agents.e2e.test.ts
index 414e760ea2..443d5699f0 100644
--- a/nodejs/test/e2e/mcp_and_agents.e2e.test.ts
+++ b/nodejs/test/e2e/mcp_and_agents.e2e.test.ts
@@ -2,9 +2,11 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *--------------------------------------------------------------------------------------------*/
 
-import { dirname, resolve } from "path";
+import { createHash } from "node:crypto";
+import { readFile } from "node:fs/promises";
+import { dirname, join, resolve } from "path";
 import { fileURLToPath } from "url";
-import { describe, expect, it } from "vitest";
+import { describe, expect, it, onTestFinished } from "vitest";
 import { z } from "zod";
 import type {
     CopilotSession,
@@ -12,7 +14,7 @@ import type {
     MCPStdioServerConfig,
     MCPServerConfig,
 } from "../../src/index.js";
-import { approveAll, defineTool } from "../../src/index.js";
+import { approveAll, defineTool, RuntimeConnection } from "../../src/index.js";
 import { createSdkTestContext } from "./harness/sdkTestContext.js";
 
 const __filename = fileURLToPath(import.meta.url);
@@ -57,7 +59,12 @@ async function waitForMcpServerStatus(
 }
 
 describe("MCP Servers and Custom Agents", async () => {
-    const { copilotClient: client, openAiEndpoint } = await createSdkTestContext();
+    const {
+        copilotClient: client,
+        openAiEndpoint,
+        createClient,
+        workDir,
+    } = await createSdkTestContext();
 
     describe("MCP Servers", () => {
         it("should accept MCP server configuration on session create", async () => {
@@ -133,6 +140,18 @@ describe("MCP Servers and Custom Agents", async () => {
         });
 
         it("should pass literal env values to MCP server subprocess", async () => {
+            const telemetryPath = join(workDir, "mcp-telemetry.jsonl");
+            const telemetryClient = createClient({
+                connection: RuntimeConnection.forStdio(),
+                telemetry: {
+                    exporterType: "file",
+                    filePath: telemetryPath,
+                    captureContent: true,
+                },
+            });
+            onTestFinished(async () => {
+                expect(await telemetryClient.stop()).toEqual([]);
+            });
             const mcpServers: Record<string, MCPServerConfig> = {
                 "env-echo": {
                     type: "local",
@@ -144,20 +163,50 @@ describe("MCP Servers and Custom Agents", async () => {
                 } as MCPStdioServerConfig,
             };
 
-            const session = await client.createSession({
+            const session = await telemetryClient.createSession({
                 mcpServers,
                 onPermissionRequest: approveAll,
             });
-
-            expect(session.sessionId).toBeDefined();
-            await waitForMcpServerStatus(session, "env-echo");
-
-            const message = await session.sendAndWait({
-                prompt: "Use the env-echo/get_env tool to read the TEST_SECRET environment variable. Reply with just the value, nothing else.",
-            });
-            expect(message?.data.content).toContain("hunter2");
-
-            await session.disconnect();
+            try {
+                expect(session.sessionId).toBeDefined();
+                await waitForMcpServerStatus(session, "env-echo");
+
+                const message = await session.sendAndWait({
+                    prompt: "Use the env-echo/get_env tool to read the TEST_SECRET environment variable. Reply with just the value, nothing else.",
+                });
+                expect(message?.data.content).toContain("hunter2");
+            } finally {
+                await session.disconnect();
+            }
+            expect(await telemetryClient.stop()).toEqual([]);
+
+            const entries: Array<{ type: string; attributes?: Record<string, unknown> }> = (
+                await readFile(telemetryPath, "utf8")
+            )
+                .split(/\r?\n/)
+                .filter((line) => line.trim())
+                .map((line) => JSON.parse(line));
+            const mcpSpans = entries.filter(
+                (entry) =>
+                    entry.type === "span" &&
+                    entry.attributes?.["gen_ai.operation.name"] === "execute_tool" &&
+                    typeof entry.attributes[
+                        "github.copilot.tool.parameters.mcp_server_name_hash"
+                    ] === "string"
+            );
+            expect(mcpSpans.length).toBeGreaterThan(0);
+            for (const span of mcpSpans) {
+                expect(span.attributes).toMatchObject({
+                    "gen_ai.tool.type": "function",
+                    "github.copilot.tool.parameters.mcp_server_name_hash": createHash("sha256")
+                        .update("env-echo")
+                        .digest("hex"),
+                    "github.copilot.tool.parameters.mcp_server_name": "env-echo",
+                    "github.copilot.tool.parameters.mcp_tool_name": "get_env",
+                    "github.copilot.mcp.server.transport": "stdio",
+                    "github.copilot.mcp.server.source": "user",
+                });
+            }
         });
     });
 
diff --git a/nodejs/test/e2e/mcp_instruction_recovery.e2e.test.ts b/nodejs/test/e2e/mcp_instruction_recovery.e2e.test.ts
index 9861ad13e9..32fa3c6266 100644
--- a/nodejs/test/e2e/mcp_instruction_recovery.e2e.test.ts
+++ b/nodejs/test/e2e/mcp_instruction_recovery.e2e.test.ts
@@ -16,35 +16,47 @@ const RECONNECT_RESULT = "Catalog reconnected. Read both server records now.";
 describe("MCP catalog recovery", async () => {
     const { copilotClient: client, openAiEndpoint } = await createSdkTestContext();
 
-    it.each([
-        { serverName: "bluebird", surfaced: true, staleCall: false },
-        { serverName: "workiq", surfaced: false, staleCall: true },
-    ])(
-        "should recover $serverName instructions without withdrawing peer tools mid-turn",
-        { timeout: 120_000 },
-        async ({ serverName, surfaced, staleCall }) => {
-            const changing = await startCatalogServer("CATALOG_RECORD");
-            const healthy = await startCatalogServer("PEER_RECORD");
-            let session: CopilotSession;
-            let reconnects = 0;
-            const reconnect = async () => {
-                reconnects++;
+    async function checkRecovery({
+        serverName,
+        surfaced,
+        staleCall,
+        reconnectInHook = staleCall,
+        changeSchema = staleCall,
+    }: {
+        serverName: string;
+        surfaced: boolean;
+        staleCall: boolean;
+        reconnectInHook?: boolean;
+        changeSchema?: boolean;
+    }) {
+        const changing = await startCatalogServer("CATALOG_RECORD");
+        const healthy = await startCatalogServer("PEER_RECORD");
+        let session: CopilotSession;
+        let reconnects = 0;
+        const reconnect = async () => {
+            reconnects++;
+            if (!reconnectInHook || changeSchema) {
                 changing.instructions = REPLACEMENT_INSTRUCTIONS;
-                await session.rpc.mcp.restartServer({ serverName });
-                await waitForConnected(session, serverName);
-            };
-            session = await client.createSession({
-                onPermissionRequest: approveAll,
-                availableTools: [
-                    ...(!staleCall ? ["reconnect_catalog"] : []),
-                    `${serverName}-read_record`,
-                    "healthy-read_record",
-                ],
-                mcpServers: {
-                    [serverName]: { type: "http", url: changing.url, tools: ["*"] },
-                    healthy: { type: "http", url: healthy.url, tools: ["*"] },
-                },
-                hooks: staleCall
+            }
+            if (changeSchema) {
+                changing.schemaChanged = true;
+            }
+            await session.rpc.mcp.restartServer({ serverName });
+            await waitForConnected(session, serverName);
+        };
+        session = await client.createSession({
+            onPermissionRequest: approveAll,
+            availableTools: [
+                ...(!reconnectInHook ? ["reconnect_catalog"] : []),
+                `${serverName}-read_record`,
+                "healthy-read_record",
+            ],
+            mcpServers: {
+                [serverName]: { type: "http", url: changing.url, tools: ["*"] },
+                healthy: { type: "http", url: healthy.url, tools: ["*"] },
+            },
+            hooks: reconnectInHook
+                ? staleCall
                     ? {
                           onPreMcpToolCall: async (input) => {
                               if (
@@ -52,99 +64,157 @@ describe("MCP catalog recovery", async () => {
                                   input.toolName === "read_record" &&
                                   reconnects === 0
                               ) {
-                                  // Invalidate the selected catalog before its invocation dispatches.
                                   await reconnect();
                               }
                           },
                       }
-                    : undefined,
-                tools: staleCall
-                    ? []
-                    : [
-                          defineTool("reconnect_catalog", {
-                              description:
-                                  "Reconnect the changing catalog before reading either server.",
-                              parameters: z.object({}),
-                              handler: async () => {
+                    : {
+                          onPreToolUse: async (input) => {
+                              if (
+                                  input.toolName === `${serverName}-read_record` &&
+                                  reconnects === 0
+                              ) {
                                   await reconnect();
-                                  return RECONNECT_RESULT;
-                              },
-                          }),
-                      ],
-            });
-            onTestFinished(() => session.disconnect());
-            const events: SessionEvent[] = [];
-            session.on((event) => events.push(event));
-            await waitForConnected(session, serverName);
-            await waitForConnected(session, "healthy");
-
-            // The instructions change at an awaited tool boundary, not during setup or a new turn.
-            // Tool definitions stay identical, exercising the instruction-only refresh fast path.
-            const response = await session.sendAndWait({
-                prompt:
-                    (staleCall
-                        ? `Call read_record on ${serverName}. If it reports a changed tool catalog, retry it. `
-                        : `Call reconnect_catalog exactly once. After it returns, call read_record on ${serverName}. `) +
-                    "then call read_record on healthy. Do not use other tools or invent their outputs. " +
-                    "Finish by reporting both record values and CATALOG_RECOVERY_COMPLETE.",
-            });
-            expect(response?.data.content).toContain("CATALOG_RECOVERY_COMPLETE");
-            expect(response?.data.content).toContain("CATALOG_RECORD");
-            expect(response?.data.content).toContain("PEER_RECORD");
-            expect(reconnects).toBe(1);
-            expect(changing.calls).toBeGreaterThan(0);
-            expect(healthy.calls).toBeGreaterThan(0);
-            expect(changing.initializations).toBe(2);
-            expect(healthy.initializations).toBe(1);
-            if (staleCall) {
-                expect(
-                    events.some(
-                        (event) =>
-                            event.type === "tool.execution_complete" &&
-                            event.data.success &&
-                            event.data.result?.content.includes("CATALOG_RECORD")
-                    ),
-                    "the reconnected server must execute the offered tool"
-                ).toBe(true);
-                expect(changing.calls, "only one call may reach the reconnected MCP server").toBe(
-                    1
-                );
-            }
+                              }
+                          },
+                      }
+                : undefined,
+            tools: reconnectInHook
+                ? []
+                : [
+                      defineTool("reconnect_catalog", {
+                          description:
+                              "Reconnect the changing catalog before reading either server.",
+                          parameters: z.object({}),
+                          handler: async () => {
+                              await reconnect();
+                              return RECONNECT_RESULT;
+                          },
+                      }),
+                  ],
+        });
+        onTestFinished(() => session.disconnect());
+        const events: SessionEvent[] = [];
+        session.on((event) => events.push(event));
+        await waitForConnected(session, serverName);
+        await waitForConnected(session, "healthy");
 
-            const exchanges = await openAiEndpoint.getExchanges();
-            const initial = exchanges[0].request;
+        // Only a matching schema/instruction successor selected before MCP authorization may rebind.
+        // An unverified late replacement must still refuse the old call.
+        const response = await session.sendAndWait({
+            prompt:
+                (reconnectInHook
+                    ? `Call read_record on ${serverName}. If it reports a changed tool catalog, retry it. `
+                    : `Call reconnect_catalog exactly once. After it returns, call read_record on ${serverName}. `) +
+                "then call read_record on healthy. Do not use other tools or invent their outputs. " +
+                "Finish by reporting both record values and CATALOG_RECOVERY_COMPLETE.",
+        });
+        expect(response?.data.content).toContain("CATALOG_RECOVERY_COMPLETE");
+        expect(response?.data.content).toContain("CATALOG_RECORD");
+        expect(response?.data.content).toContain("PEER_RECORD");
+        expect(reconnects).toBe(1);
+        expect(changing.calls).toBeGreaterThan(0);
+        expect(healthy.calls).toBeGreaterThan(0);
+        expect(changing.initializations).toBe(2);
+        expect(healthy.initializations).toBe(1);
+        if (staleCall) {
             expect(
-                JSON.stringify(initial.messages.filter((message) => message.role === "system"))
-            ).not.toContain(REPLACEMENT_INSTRUCTIONS);
-            const afterReconnect = exchanges.filter(({ request }) =>
-                request.messages.some(
-                    (message) =>
-                        message.role === "tool" &&
-                        JSON.stringify(message.content).includes(
-                            staleCall ? "CATALOG_RECORD" : RECONNECT_RESULT
-                        )
-                )
+                events.some(
+                    (event) =>
+                        event.type === "tool.execution_complete" &&
+                        !event.data.success &&
+                        event.data.error?.message.includes("MCP tool catalog changed before tool")
+                ),
+                "the first stale call must be refused before dispatch"
+            ).toBe(true);
+            expect(changing.calls, "only the recovered call may reach the MCP server").toBe(1);
+        } else if (reconnectInHook) {
+            const starts = events
+                .filter((event) => event.type === "tool.execution_start")
+                .filter((event) => event.data.toolName === `${serverName}-read_record`);
+            expect(starts, "an equivalent successor must not require a model retry").toHaveLength(
+                1
             );
-            expect(
-                afterReconnect.length,
-                "the same turn must continue after reconnect"
-            ).toBeGreaterThan(0);
-            for (const { request } of afterReconnect) {
-                const toolNames = request.tools
-                    ?.filter((tool) => tool.type === "function")
-                    .map((tool) => tool.function.name);
-                expect(toolNames).toContain(`${serverName}-read_record`);
-                expect(toolNames).toContain("healthy-read_record");
-                const system = JSON.stringify(
-                    request.messages.filter((message) => message.role === "system")
-                );
-                if (surfaced) {
-                    expect(system).toContain(REPLACEMENT_INSTRUCTIONS);
-                } else {
-                    expect(system).not.toContain(REPLACEMENT_INSTRUCTIONS);
-                }
+            const completions = events
+                .filter((event) => event.type === "tool.execution_complete")
+                .filter((event) => event.data.toolCallId === starts[0].data.toolCallId);
+            expect(completions).toHaveLength(1);
+            expect(completions[0]).toMatchObject({ data: { success: true } });
+            expect(changing.calls, "rebinding must dispatch the original call exactly once").toBe(
+                1
+            );
+        }
+
+        const exchanges = await openAiEndpoint.getExchanges();
+        const initial = exchanges[0].request;
+        expect(
+            JSON.stringify(initial.messages.filter((message) => message.role === "system"))
+        ).not.toContain(REPLACEMENT_INSTRUCTIONS);
+        const afterReconnect = exchanges.filter(({ request }) =>
+            request.messages.some(
+                (message) =>
+                    message.role === "tool" &&
+                    JSON.stringify(message.content).includes(
+                        staleCall
+                            ? "MCP tool catalog changed before tool"
+                            : reconnectInHook
+                              ? "CATALOG_RECORD"
+                              : RECONNECT_RESULT
+                    )
+            )
+        );
+        expect(
+            afterReconnect.length,
+            "the same turn must continue after reconnect"
+        ).toBeGreaterThan(0);
+        for (const { request } of afterReconnect) {
+            const toolNames = request.tools
+                ?.filter((tool) => tool.type === "function")
+                .map((tool) => tool.function.name);
+            expect(toolNames).toContain(`${serverName}-read_record`);
+            expect(toolNames).toContain("healthy-read_record");
+            const system = JSON.stringify(
+                request.messages.filter((message) => message.role === "system")
+            );
+            if (surfaced) {
+                expect(system).toContain(REPLACEMENT_INSTRUCTIONS);
+            } else {
+                expect(system).not.toContain(REPLACEMENT_INSTRUCTIONS);
             }
         }
+    }
+
+    it.each([
+        { serverName: "bluebird", surfaced: true, staleCall: false },
+        { serverName: "workiq", surfaced: false, staleCall: true },
+    ])(
+        "should recover $serverName instructions without withdrawing peer tools mid-turn",
+        { timeout: 120_000 },
+        checkRecovery
+    );
+
+    it(
+        "should preserve workiq instructions through an equivalent successor without withdrawing peer tools mid-turn",
+        { timeout: 120_000 },
+        () =>
+            checkRecovery({
+                serverName: "workiq",
+                surfaced: false,
+                staleCall: false,
+                reconnectInHook: true,
+            })
+    );
+
+    it(
+        "should refuse an unverified late successor and recover without withdrawing peer tools mid-turn",
+        { timeout: 120_000 },
+        () =>
+            checkRecovery({
+                serverName: "workiq",
+                surfaced: false,
+                staleCall: true,
+                changeSchema: false,
+            })
     );
 });
 
@@ -162,7 +232,7 @@ async function waitForConnected(session: CopilotSession, serverName: string): Pr
 }
 
 async function startCatalogServer(record: string) {
-    const state = { instructions: "", calls: 0, initializations: 0, url: "" };
+    const state = { instructions: "", schemaChanged: false, calls: 0, initializations: 0, url: "" };
     const server = createServer(async (request, response) => {
         if (request.method === "DELETE") {
             response.writeHead(200).end();
@@ -203,7 +273,9 @@ async function startCatalogServer(record: string) {
                             description: "Read this server's current record.",
                             inputSchema: {
                                 type: "object",
-                                properties: {},
+                                properties: state.schemaChanged
+                                    ? { revision: { type: "string" } }
+                                    : {},
                                 additionalProperties: false,
                             },
                             annotations: { readOnlyHint: true },
diff --git a/nodejs/test/e2e/mcp_oauth.e2e.test.ts b/nodejs/test/e2e/mcp_oauth.e2e.test.ts
index 0ec14a5ada..8ce68ee70f 100644
--- a/nodejs/test/e2e/mcp_oauth.e2e.test.ts
+++ b/nodejs/test/e2e/mcp_oauth.e2e.test.ts
@@ -117,6 +117,16 @@ describe("MCP OAuth host auth", async () => {
             expect(tokenForm.get("redirect_uri")).toBe(redirectUri);
             expect(tokenForm.get("client_id")).toBe("sdk-e2e-client");
             expect(tokenForm.get("code_verifier")).toEqual(expect.any(String));
+            // This server issues neither a refresh token nor an account pin.
+            await expect(
+                session.rpc.mcp.oauth.authenticationStateChanged({
+                    serverName,
+                    refreshSessionToken: true,
+                })
+            ).rejects.toThrow("no refresh token or eligible saved Entra account");
+            const afterRefresh = await oauthServer.requests();
+            expect(afterRefresh.filter((request) => request.path === "/token")).toHaveLength(1);
+            expect(afterRefresh.filter((request) => request.path === "/register")).toHaveLength(0);
             expect(
                 requests.some((request) => request.authorization === `Bearer ${EXPECTED_TOKEN}`)
             ).toBe(true);
diff --git a/nodejs/test/e2e/mcp_remote_session_closure.e2e.test.ts b/nodejs/test/e2e/mcp_remote_session_closure.e2e.test.ts
index d782b86eb0..1878998d25 100644
--- a/nodejs/test/e2e/mcp_remote_session_closure.e2e.test.ts
+++ b/nodejs/test/e2e/mcp_remote_session_closure.e2e.test.ts
@@ -6,7 +6,7 @@ import { spawn } from "node:child_process";
 import { dirname, resolve } from "node:path";
 import { createInterface } from "node:readline";
 import { fileURLToPath } from "node:url";
-import { describe, expect, it, onTestFinished } from "vitest";
+import { describe, expect, it, onTestFailed, onTestFinished } from "vitest";
 import type { CopilotSession, MCPServerConfig } from "../../src/index.js";
 import { approveAll } from "../../src/index.js";
 import { createSdkTestContext } from "./harness/sdkTestContext.js";
@@ -24,10 +24,24 @@ interface McpServerStats {
     toolsListRequests: number;
     toolCalls: number;
     activeSessions: number;
+    pings: number;
+    expiredRequests: number;
+    expiredRequestLog: { method: string; elapsedMs: number }[];
+    protocolVersions: string[];
+    expiredSessionProbes: number;
+    recentRequests: Array<{
+        elapsedMs: number;
+        httpMethod: string;
+        sessionAttached: boolean;
+        expiredSession: boolean;
+        rpcMethods: string[];
+        status: number | null;
+    }>;
 }
 
 describe("MCP remote session closure", async () => {
     const { copilotClient: client } = await createSdkTestContext({
+        logLevel: "debug",
         copilotClientOptions: {
             env: {
                 COPILOT_MCP_APPS: "true",
@@ -41,6 +55,10 @@ describe("MCP remote session closure", async () => {
         { timeout: 180_000 },
         async () => {
             const remoteServer = await startSessionExpiryMcpServer();
+            let lastStats = await remoteServer.stats();
+            onTestFailed(() => {
+                console.error("Last MCP session-expiry observation:", JSON.stringify(lastStats));
+            });
             const serverName = "remote-server";
             const session = await client.createSession({
                 onPermissionRequest: approveAll,
@@ -62,14 +80,41 @@ describe("MCP remote session closure", async () => {
             expect((await remoteServer.stats()).initializations).toBe(1);
 
             // The server drops the session the way an idle Streamable HTTP endpoint
-            // expires one: every later request for it answers 404.
+            // expires one: every later request for it answers 404. Await an answered
+            // probe or reinitialization before budgeting recovery, not the idle delay.
             await remoteServer.expireSessions();
 
-            await waitForCondition(async () => (await remoteServer.stats()).initializations >= 2, {
-                timeoutMs: 120_000,
-                intervalMs: 250,
-                timeoutMessage: "remote MCP server was never re-initialized after session expiry",
-            });
+            await waitForCondition(
+                async () => {
+                    lastStats = await remoteServer.stats();
+                    return lastStats.expiredSessionProbes >= 1 || lastStats.initializations >= 2;
+                },
+                {
+                    timeoutMs: 120_000,
+                    intervalMs: 250,
+                    timeoutMessage:
+                        "remote MCP session expiry was neither probed nor re-initialized",
+                }
+            );
+            try {
+                await waitForCondition(
+                    async () => {
+                        lastStats = await remoteServer.stats();
+                        return lastStats.initializations >= 2;
+                    },
+                    {
+                        timeoutMs: 120_000,
+                        intervalMs: 250,
+                        timeoutMessage:
+                            "remote MCP server was never re-initialized after session expiry",
+                    }
+                );
+            } catch (error) {
+                const details = JSON.stringify(lastStats);
+                throw new Error(`MCP reconnection failed; last server stats: ${details}`, {
+                    cause: error,
+                });
+            }
             await waitForMcpServerStatus(session, serverName, "connected");
 
             const result = await session.rpc.mcp.apps.callTool({
@@ -91,20 +136,20 @@ async function waitForMcpServerStatus(
     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((entry) => entry.name === serverName);
-            lastStatus = server?.status ?? "<not listed>";
-            return server?.status === expectedStatus;
-        },
-        {
-            timeoutMs: 120_000,
-            intervalMs: 200,
-            timeoutMessage: `${serverName} did not reach ${expectedStatus}; last status was ${lastStatus}`,
-        }
-    );
+    await expect
+        .poll(
+            async () => {
+                const result = await session.rpc.mcp.list();
+                const server = result.servers.find((entry) => entry.name === serverName);
+                return server?.status ?? "<not listed>";
+            },
+            {
+                timeout: 120_000,
+                interval: 200,
+                message: `${serverName} did not reach ${expectedStatus}`,
+            }
+        )
+        .toBe(expectedStatus);
 }
 
 async function disconnectSession(session: CopilotSession): Promise<void> {
@@ -127,6 +172,9 @@ async function startSessionExpiryMcpServer(): Promise<{
 
     const stderr: string[] = [];
     child.stderr.on("data", (chunk) => stderr.push(String(chunk)));
+    onTestFailed(() => {
+        console.error("Session-expiry server stderr:", stderr.join("").slice(-16_384));
+    });
 
     const url = await new Promise<string>((resolvePromise, reject) => {
         const rl = createInterface({ input: child.stdout });
diff --git a/nodejs/test/e2e/mcp_scoped_sign_in.e2e.test.ts b/nodejs/test/e2e/mcp_scoped_sign_in.e2e.test.ts
new file mode 100644
index 0000000000..d067c2bcf2
--- /dev/null
+++ b/nodejs/test/e2e/mcp_scoped_sign_in.e2e.test.ts
@@ -0,0 +1,368 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { spawn } from "node:child_process";
+import { mkdtemp, readFile, rm } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { dirname, join, resolve } from "node:path";
+import { createInterface } from "node:readline";
+import { fileURLToPath } from "node:url";
+import { describe, expect, it, onTestFinished } from "vitest";
+import type { CopilotSession, MCPServerConfig, SessionEvent } from "../../src/index.js";
+import { approveAll } from "../../src/index.js";
+import { createSdkTestContext } from "./harness/sdkTestContext.js";
+import { stopChildProcess, waitForCondition } from "./harness/sdkTestHelper.js";
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const TEST_MCP_OAUTH_SERVER = resolve(__dirname, "../../../test/harness/test-mcp-oauth-server.mjs");
+const TEST_MCP_SERVER = resolve(__dirname, "../../../test/harness/test-mcp-server.mjs");
+const INITIAL_TOKEN = "sdk-scoped-sign-in-token";
+const ROTATED_TOKEN = `${INITIAL_TOKEN}-reauth`;
+const REDIRECT_URI = "https://agent.example.test/oauth/callback";
+const STEP_TIMEOUT_MS = 60_000;
+
+/**
+ * A sign-in for one MCP server, completed on a separate session that shares the token store
+ * (as the app's settings sign-in does), must reconnect only that server in a live session.
+ */
+describe("MCP sign-in for one server", async () => {
+    const { copilotClient: client } = await createSdkTestContext({
+        copilotClientOptions: { env: { COPILOT_DISABLE_KEYTAR: "1" } },
+    });
+
+    it(
+        "connects the signed-in server without restarting peers or cancelling another sign-in",
+        { timeout: 180_000 },
+        async () => {
+            const live = await startLiveSession();
+
+            await signInOnSeparateSession(live.bravoServer, "accepted-code", INITIAL_TOKEN);
+            await authenticationStateChanged(live.session, "bravo");
+            await waitForMcpServerStatus(live.session, "bravo", "connected");
+
+            expect(await live.alphaStarts()).toBe(1);
+            expect(live.statusChangesFor("alpha")).toEqual([]);
+            await completeHostedLogin(live.session, live.deltaAuthorizationId, "accepted-code");
+            await waitForMcpServerStatus(live.session, "delta", "connected");
+        }
+    );
+
+    it(
+        "reconnects a connected server onto credentials rotated by another sign-in",
+        { timeout: 180_000 },
+        async () => {
+            const live = await startLiveSession();
+            await signInOnSeparateSession(live.bravoServer, "accepted-code", INITIAL_TOKEN);
+            await authenticationStateChanged(live.session, "bravo");
+            await waitForMcpServerStatus(live.session, "bravo", "connected");
+
+            await signInOnSeparateSession(live.bravoServer, "accepted-code-reauth", ROTATED_TOKEN);
+            const rotationStart = (await live.bravoServer.requests()).length;
+            await authenticationStateChanged(live.session, "bravo");
+
+            await waitForInitializeWith(
+                live.bravoServer,
+                rotationStart,
+                ROTATED_TOKEN,
+                "bravo did not reinitialize with the rotated token"
+            );
+            await waitForMcpServerStatus(live.session, "bravo", "connected");
+            expect(await live.alphaStarts()).toBe(1);
+            expect(live.statusChangesFor("alpha")).toEqual([]);
+            await completeHostedLogin(live.session, live.deltaAuthorizationId, "accepted-code");
+            await waitForMcpServerStatus(live.session, "delta", "connected");
+        }
+    );
+
+    it(
+        "still restarts every server and cancels pending sign-ins on an explicit reload",
+        { timeout: 180_000 },
+        async () => {
+            const live = await startLiveSession();
+
+            await live.session.rpc.mcp.reload();
+            await waitForMcpServerStatus(live.session, "alpha", "connected");
+
+            expect(await live.alphaStarts()).toBe(2);
+            await expect(
+                completeHostedLogin(live.session, live.deltaAuthorizationId, "accepted-code")
+            ).rejects.toThrow();
+        }
+    );
+
+    /**
+     * Starts a live session with a plain stdio server (alpha), an OAuth server awaiting sign-in
+     * (bravo), and a second OAuth server (delta) with an in-progress hosted sign-in.
+     */
+    async function startLiveSession() {
+        const directory = await mkdtemp(join(tmpdir(), "mcp-scoped-sign-in-"));
+        onTestFinished(() => rm(directory, { recursive: true, force: true }));
+        const alphaMarker = join(directory, "alpha-starts.txt");
+        const bravoServer = await startOAuthMcpServer();
+        const deltaServer = await startOAuthMcpServer();
+        const events: SessionEvent[] = [];
+        const session = await client.createSession({
+            onPermissionRequest: approveAll,
+            onEvent: (event) => events.push(event),
+            mcpServers: {
+                alpha: {
+                    type: "local",
+                    command: process.execPath,
+                    args: [
+                        TEST_MCP_SERVER,
+                        "--server-name",
+                        "alpha",
+                        "--startup-marker",
+                        alphaMarker,
+                    ],
+                    tools: ["*"],
+                } as MCPServerConfig,
+                bravo: oauthServerConfig(bravoServer.url),
+                delta: oauthServerConfig(deltaServer.url),
+            },
+        });
+        onTestFinished(() => disconnectSession(session));
+        await waitForMcpServerStatus(session, "alpha", "connected");
+        await waitForMcpServerStatus(session, "bravo", "needs-auth");
+        await waitForMcpServerStatus(session, "delta", "needs-auth");
+        // Live status can precede delivery of its initial notification.
+        await waitForCondition(
+            () =>
+                events.some(
+                    (event) =>
+                        event.type === "session.mcp_server_status_changed" &&
+                        event.data.serverName === "alpha" &&
+                        event.data.status === "connected"
+                ),
+            {
+                timeoutMs: STEP_TIMEOUT_MS,
+                timeoutMessage: "alpha did not deliver its initial connected status",
+            }
+        );
+        const deltaLogin = await session.rpc.mcp.oauth.login({
+            serverName: "delta",
+            redirectUri: REDIRECT_URI,
+        });
+        expect(deltaLogin.authorizationId).toBeDefined();
+        // Live status can precede its asynchronous event, so observe startup before measuring peer changes.
+        await waitForCondition(
+            () =>
+                events.some(
+                    (event) =>
+                        event.type === "session.mcp_server_status_changed" &&
+                        event.data.serverName === "alpha" &&
+                        event.data.status === "connected"
+                ),
+            {
+                timeoutMs: STEP_TIMEOUT_MS,
+                timeoutMessage: "alpha's initial connected event did not arrive",
+            }
+        );
+        const baseline = events.length;
+
+        return {
+            session,
+            bravoServer,
+            deltaAuthorizationId: deltaLogin.authorizationId!,
+            alphaStarts: async () =>
+                (await readFile(alphaMarker, "utf8")).split("\n").filter(Boolean).length,
+            statusChangesFor: (serverName: string) =>
+                events
+                    .slice(baseline)
+                    .flatMap((event) =>
+                        event.type === "session.mcp_server_status_changed" &&
+                        event.data.serverName === serverName
+                            ? [event.data.status]
+                            : []
+                    ),
+        };
+    }
+
+    /**
+     * Completes a hosted sign-in for bravo on another session sharing the token store, then waits
+     * for that session to initialize with the issued token. Completing a login only delivers the
+     * callback, and the separate session may already be connected with an older shared token, so
+     * the initialize is what shows the issued token has been stored.
+     */
+    async function signInOnSeparateSession(
+        server: OAuthMcpServer,
+        code: string,
+        issuedToken: string
+    ): Promise<void> {
+        const session = await client.createSession({
+            onPermissionRequest: approveAll,
+            mcpServers: { bravo: oauthServerConfig(server.url) },
+        });
+        try {
+            const login = await session.rpc.mcp.oauth.login({
+                serverName: "bravo",
+                redirectUri: REDIRECT_URI,
+                forceReauth: true,
+            });
+            expect(login.authorizationId).toBeDefined();
+            const loginStart = (await server.requests()).length;
+            await completeHostedLogin(session, login.authorizationId!, code);
+            await waitForInitializeWith(
+                server,
+                loginStart,
+                issuedToken,
+                "the separate session did not initialize bravo with the issued token"
+            );
+            await waitForMcpServerStatus(session, "bravo", "connected");
+        } finally {
+            await disconnectSession(session);
+        }
+    }
+});
+
+/**
+ * Reports new credentials for one server. A server still awaiting sign-in hands off to
+ * background recovery and may report that it still requires authentication; callers then
+ * wait for the server's status.
+ */
+async function authenticationStateChanged(
+    session: CopilotSession,
+    serverName: string
+): Promise<void> {
+    try {
+        await session.rpc.mcp.oauth.authenticationStateChanged({ serverName });
+    } catch (error) {
+        expect(String(error)).toContain(`MCP server "${serverName}" still requires authentication`);
+    }
+}
+
+/**
+ * The configured client ID keys the shared token entry, so the rotation test also proves that
+ * the live session reads back the entry its token came from rather than the unkeyed one.
+ */
+function oauthServerConfig(url: string): MCPServerConfig {
+    return {
+        type: "http",
+        url: `${url}/mcp`,
+        tools: ["*"],
+        oauthClientId: "sdk-scoped-sign-in-client",
+        oauthPublicClient: true,
+    } as unknown as MCPServerConfig;
+}
+
+async function completeHostedLogin(
+    session: CopilotSession,
+    authorizationId: string,
+    code: string
+): Promise<void> {
+    const callbackUrl = new URL(REDIRECT_URI);
+    callbackUrl.searchParams.set("code", code);
+    callbackUrl.searchParams.set("state", authorizationId);
+    await session.rpc.mcp.oauth.complete({
+        authorizationId,
+        callbackUrl: callbackUrl.toString(),
+    });
+}
+
+async function waitForMcpServerStatus(
+    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((entry) => entry.name === serverName);
+            lastStatus = server?.status ?? "<not listed>";
+            return server?.status === expectedStatus;
+        },
+        {
+            timeoutMs: STEP_TIMEOUT_MS,
+            intervalMs: 200,
+            timeoutMessage: `${serverName} did not reach ${expectedStatus}; last status was ${lastStatus}`,
+        }
+    );
+}
+
+interface OAuthMcpServer {
+    url: string;
+    requests: () => Promise<
+        Array<{ authorization: string | null; body: string | null; path: string }>
+    >;
+}
+
+/** Waits for an MCP initialize request carrying `token` after the first `start` requests. */
+async function waitForInitializeWith(
+    server: OAuthMcpServer,
+    start: number,
+    token: string,
+    timeoutMessage: string
+): Promise<void> {
+    await waitForCondition(
+        async () =>
+            (await server.requests())
+                .slice(start)
+                .some(
+                    (request) =>
+                        request.path === "/mcp" &&
+                        request.authorization === `Bearer ${token}` &&
+                        request.body?.includes('"initialize"')
+                ),
+        { timeoutMs: STEP_TIMEOUT_MS, intervalMs: 200, timeoutMessage }
+    );
+}
+
+async function startOAuthMcpServer(): Promise<OAuthMcpServer> {
+    const child = spawn(process.execPath, [TEST_MCP_OAUTH_SERVER], {
+        env: { ...process.env, EXPECTED_TOKEN: INITIAL_TOKEN },
+        stdio: ["ignore", "pipe", "pipe"],
+    });
+    onTestFinished(() => stopChildProcess(child));
+
+    const stderr: string[] = [];
+    child.stderr.on("data", (chunk) => stderr.push(String(chunk)));
+
+    const url = await new Promise<string>((resolvePromise, reject) => {
+        const rl = createInterface({ input: child.stdout });
+        const timeout = setTimeout(() => {
+            rl.close();
+            reject(new Error(`Timed out waiting for OAuth MCP server. ${stderr.join("")}`));
+        }, 10_000);
+
+        child.once("exit", (code, signal) => {
+            clearTimeout(timeout);
+            rl.close();
+            reject(
+                new Error(
+                    `OAuth MCP server exited before listening. code=${code} signal=${signal} ${stderr.join("")}`
+                )
+            );
+        });
+
+        rl.on("line", (line) => {
+            const match = /^Listening: (.+)$/.exec(line);
+            if (!match) {
+                return;
+            }
+            clearTimeout(timeout);
+            rl.close();
+            resolvePromise(match[1]);
+        });
+    });
+
+    return {
+        url,
+        requests: async () => {
+            const response = await fetch(`${url}/__requests`);
+            if (!response.ok) {
+                throw new Error(`Failed to fetch OAuth MCP requests: ${response.status}`);
+            }
+            return response.json();
+        },
+    };
+}
+
+async function disconnectSession(session: CopilotSession): Promise<void> {
+    try {
+        await session.disconnect();
+    } catch {
+        // Best-effort cleanup.
+    }
+}
diff --git a/nodejs/test/e2e/memory_tool_overrides.e2e.test.ts b/nodejs/test/e2e/memory_tool_overrides.e2e.test.ts
new file mode 100644
index 0000000000..9bec5aad92
--- /dev/null
+++ b/nodejs/test/e2e/memory_tool_overrides.e2e.test.ts
@@ -0,0 +1,102 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { describe, expect, it } from "vitest";
+import { z } from "zod";
+import { defineTool } from "../../src/index.js";
+import type { PermissionRequest, SessionConfig, ToolInvocation } from "../../src/index.js";
+import { createSdkTestContext } from "./harness/sdkTestContext.js";
+
+describe("Memory tool overrides", async () => {
+    const { copilotClient: client } = await createSdkTestContext({ replayOnly: true });
+
+    it.each(["store_memory", "vote_memory"])(
+        "routes %s to the host with custom-tool permissions on create and resume",
+        async (name) => {
+            const invocations: ToolInvocation[] = [];
+            const permissions: PermissionRequest[] = [];
+            let approve = true;
+            const config = {
+                memory: { enabled: false },
+                onPermissionRequest: (request) => {
+                    permissions.push(request);
+                    return approve ? { kind: "approve-once" } : { kind: "reject" };
+                },
+                tools: [
+                    defineTool(name, {
+                        description: "Host-owned memory",
+                        parameters: z.object({ fact: z.string() }),
+                        overridesBuiltInTool: true,
+                        defer: "never",
+                        handler: (_args, invocation) => {
+                            invocations.push(invocation);
+                            return "HOST_MEMORY_HANDLED";
+                        },
+                    }),
+                ],
+            } satisfies SessionConfig;
+            let session = await client.createSession(config);
+            try {
+                for (const phase of ["create", "resume"]) {
+                    if (phase === "resume") {
+                        const sessionId = session.sessionId;
+                        await session.disconnect();
+                        session = await client.resumeSession(sessionId, config);
+                    }
+                    await session.rpc.tools.initializeAndValidate();
+                    const { tools } = await session.rpc.tools.getCurrentMetadata();
+                    expect(tools.filter((tool) => tool.name === name)).toEqual([
+                        expect.objectContaining({
+                            description: "Host-owned memory",
+                            input_schema: expect.objectContaining({ required: ["fact"] }),
+                        }),
+                    ]);
+                    const args = { fact: `Host-owned memory after ${phase}.` };
+                    const toolCallId = `memory-override-${phase}`;
+                    const result = await session.rpc.tools.execute({
+                        name,
+                        arguments: args,
+                        toolCallId,
+                    });
+
+                    expect(result, `${name} after ${phase}`).toMatchObject({
+                        resultType: "success",
+                        textResultForLlm: "HOST_MEMORY_HANDLED",
+                    });
+                    expect(invocations.at(-1)).toMatchObject({
+                        toolName: name,
+                        toolCallId,
+                        arguments: args,
+                    });
+                    expect(permissions.at(-1)).toMatchObject({
+                        kind: "custom-tool",
+                        toolName: name,
+                        toolCallId,
+                        args,
+                    });
+                }
+                expect(invocations).toHaveLength(2);
+                expect(permissions).toHaveLength(2);
+
+                approve = false;
+                const args = { fact: "A rejected memory." };
+                const rejected = await session.rpc.tools.execute({
+                    name,
+                    arguments: args,
+                    toolCallId: "memory-override-rejected",
+                });
+                expect(rejected.resultType).toBe("rejected");
+                expect(invocations).toHaveLength(2);
+                expect(permissions).toHaveLength(3);
+                expect(permissions.at(-1)).toMatchObject({
+                    kind: "custom-tool",
+                    toolName: name,
+                    args,
+                });
+            } finally {
+                await session.disconnect();
+            }
+        }
+    );
+});
diff --git a/nodejs/test/e2e/monthly_usage.e2e.test.ts b/nodejs/test/e2e/monthly_usage.e2e.test.ts
new file mode 100644
index 0000000000..b0704efa33
--- /dev/null
+++ b/nodejs/test/e2e/monthly_usage.e2e.test.ts
@@ -0,0 +1,229 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { createServer } from "node:http";
+import { mkdir, writeFile } from "node:fs/promises";
+import { join } from "node:path";
+import { expect, it, onTestFinished } from "vitest";
+import { approveAll, CopilotClient, RuntimeConnection } from "../../src/index.js";
+import { createSdkTestContext } from "./harness/sdkTestContext.js";
+
+const { env, workDir, openAiEndpoint } = await createSdkTestContext({
+    useStdio: true,
+    replayOnly: true,
+    copilotClientOptions: { useLoggedInUser: false, gitHubToken: undefined },
+});
+
+it("preserves monthly Microsoft 365 usage without treating it as session spend", async ({
+    signal,
+}) => {
+    const profile = join(workDir, "monthly-usage-profile");
+    await mkdir(profile);
+    let usage: Record<string, unknown> = {};
+    let quotaStatus = 200;
+    let invalidQuota = false;
+    const requests: string[] = [];
+    const server = createServer((request, response) => {
+        requests.push(`${request.method} ${request.url}`);
+        expect(request.headers.authorization).toBe("Bearer monthly-usage-token");
+        response.setHeader("Content-Type", "application/json");
+        if (request.url === "/models") {
+            response.end(
+                JSON.stringify({
+                    data: [{ id: "gpt-5-mini", name: "GPT-5 mini", model_picker_enabled: true }],
+                })
+            );
+        } else if (request.url === "/quota") {
+            if (quotaStatus !== 200) {
+                response
+                    .writeHead(quotaStatus)
+                    .end(JSON.stringify({ error: { code: "quota_read_failed" } }));
+                return;
+            }
+            if (invalidQuota) {
+                response.end("not JSON");
+                return;
+            }
+            response.end(
+                JSON.stringify({
+                    quotaSnapshots: {
+                        enterprise: {
+                            source: "enterprise",
+                            service: "GitHubCopilotApp",
+                            accessState: "allowed",
+                            capacityState: "available",
+                            hasQuota: true,
+                            entitledQuantity: 100,
+                            availableQuantity: 13,
+                            ...usage,
+                        },
+                    },
+                })
+            );
+        } else {
+            response.writeHead(404).end();
+        }
+    });
+    let client: CopilotClient | undefined;
+    const listening = new Promise<void>((resolve, reject) => {
+        server.once("error", reject);
+        server.listen(0, "127.0.0.1", resolve);
+    });
+    onTestFinished(async () => {
+        try {
+            await client?.stop();
+        } finally {
+            await listening;
+            server.closeAllConnections();
+            await new Promise<void>((resolve, reject) =>
+                server.close((error) => (error ? reject(error) : resolve()))
+            );
+        }
+    });
+    await listening;
+    signal.throwIfAborted();
+    const address = server.address();
+    if (!address || typeof address === "string") throw new Error("Expected a TCP quota fixture");
+    const host = `http://127.0.0.1:${address.port}`;
+    const baseId = "monthly-usage-base";
+    const emuToken = "ghu_monthly_usage_emu";
+    const account = { host, login: "monthly-user", kind: "loki", derivedFrom: baseId };
+    await openAiEndpoint.setCopilotUserByToken(emuToken, {
+        login: "monthly_emu",
+        is_staff: true,
+        copilot_plan: "business",
+        endpoints: { api: env.COPILOT_API_URL, telemetry: "https://localhost:1/telemetry" },
+    });
+    await writeFile(join(profile, "settings.json"), JSON.stringify({ storeTokenPlaintext: true }));
+    await writeFile(
+        join(profile, "config.json"),
+        JSON.stringify({
+            loggedInUsers: [
+                account,
+                {
+                    host: "https://github.com",
+                    login: "monthly_emu",
+                    kind: "entraEmu",
+                    derivedFrom: baseId,
+                },
+            ],
+            lastLoggedInUser: account,
+            authTokens: {
+                [`entra:${baseId}:entra`]: {
+                    token: JSON.stringify({ hostOwned: { account_id: baseId } }),
+                },
+                [`loki:${baseId}:loki`]: {
+                    token: "monthly-usage-token",
+                    expiresAt: "2099-01-01T00:00:00Z",
+                    accountType: "entra",
+                },
+                "https://github.com:monthly_emu:entra": {
+                    token: emuToken,
+                    expiresAt: "2099-01-01T00:00:00Z",
+                    accountType: "entra",
+                },
+            },
+        })
+    );
+    client = new CopilotClient({
+        workingDirectory: workDir,
+        useLoggedInUser: true,
+        connection: RuntimeConnection.forStdio({ path: process.env.COPILOT_CLI_PATH }),
+        env: {
+            ...env,
+            COPILOT_HOME: profile,
+            COPILOT_DISABLE_KEYTAR: "1",
+            GH_TOKEN: "",
+            GITHUB_TOKEN: "",
+            COPILOT_GITHUB_TOKEN: "",
+            COPILOT_SDK_AUTH_TOKEN: "",
+            GITHUB_COPILOT_API_TOKEN: "",
+            COPILOT_HMAC_KEY: "",
+            CAPI_HMAC_KEY: "",
+        },
+    });
+    await using session = await client.createSession({
+        configDirectory: profile,
+        onPermissionRequest: approveAll,
+    });
+    const before = await session.rpc.usage.getMetrics();
+    if (process.platform === "linux") {
+        expect(await session.rpc.gitHubAuth.getStatus()).toMatchObject({ isAuthenticated: false });
+        await expect(session.rpc.quota.refresh()).rejects.toThrow("Not authenticated");
+        expect((await session.rpc.quota.get()).providerQuotas).toBeUndefined();
+        expect((await session.rpc.usage.getMetrics()).totalNanoAiu).toBe(before.totalNanoAiu);
+        expect(requests).toEqual([]);
+        return;
+    }
+    const initial = await session.rpc.quota.refresh();
+    expect(
+        initial.providerQuotas?.find((state) => state.provider.kind === "loki")?.monthlyUsage
+    ).toBeUndefined();
+
+    for (const consumedQuantity of [0, 125.375]) {
+        usage = {
+            usageState: "available",
+            usageUnit: "ai_credits",
+            usageScope: "user",
+            consumedQuantity,
+            usageQueriedAt: "2026-10-08T12:00:00Z",
+            usageCycleStart: "2026-10-01T00:00:00Z",
+            usageResetOn: "2026-11-01T00:00:00Z",
+        };
+        const quota = await session.rpc.quota.refresh();
+        const state = quota.providerQuotas?.find((state) => state.provider.kind === "loki");
+        expect(state).toMatchObject({
+            accessState: "allowed",
+            capacityState: "available",
+            availableQuantity: 13,
+            quantityKind: "advisory_balance",
+            monthlyUsage: {
+                state: "available",
+                unit: "ai_credits",
+                scope: "user",
+                consumedQuantity,
+                queriedAt: "2026-10-08T12:00:00Z",
+                cycleStart: "2026-10-01T00:00:00Z",
+                resetOn: "2026-11-01T00:00:00Z",
+            },
+        });
+        expect((await session.rpc.quota.get()).providerQuotas).toEqual(quota.providerQuotas);
+        expect(await session.rpc.quota.takeWarnings()).toEqual([]);
+    }
+    for (const usageState of ["no_policy", "unavailable"]) {
+        usage = { usageState, usageUnit: "ai_credits", usageScope: "user" };
+        const quota = await session.rpc.quota.refresh();
+        expect(
+            quota.providerQuotas?.find((state) => state.provider.kind === "loki")?.monthlyUsage
+        ).toEqual({
+            state: usageState,
+            unit: "ai_credits",
+            scope: "user",
+        });
+    }
+    for (const status of [401, 403, 404, 429, 503]) {
+        quotaStatus = status;
+        const quota = await session.rpc.quota.refresh();
+        const state = quota.providerQuotas?.find((state) => state.provider.kind === "loki");
+        expect(state).toMatchObject({
+            httpStatus: status,
+            acquisitionStatus: status === 404 ? "unavailable" : "failed",
+        });
+        expect(state?.monthlyUsage).toBeUndefined();
+    }
+    quotaStatus = 200;
+    invalidQuota = true;
+    const invalid = await session.rpc.quota.refresh();
+    const invalidState = invalid.providerQuotas?.find((state) => state.provider.kind === "loki");
+    expect(invalidState).toMatchObject({
+        acquisitionStatus: "failed",
+        acquisitionError: "invalid_json",
+    });
+    expect(invalidState?.monthlyUsage).toBeUndefined();
+    expect((await session.rpc.usage.getMetrics()).totalNanoAiu).toBe(before.totalNanoAiu);
+    expect(requests.length).toBeGreaterThan(0);
+    expect(requests.every((request) => request === "GET /models" || request === "GET /quota")).toBe(
+        true
+    );
+});
diff --git a/nodejs/test/e2e/multi_provider_registry.e2e.test.ts b/nodejs/test/e2e/multi_provider_registry.e2e.test.ts
index cd0eb53169..49b4a3618c 100644
--- a/nodejs/test/e2e/multi_provider_registry.e2e.test.ts
+++ b/nodejs/test/e2e/multi_provider_registry.e2e.test.ts
@@ -137,7 +137,8 @@ describe("Multi-provider BYOK registry", async () => {
     async function assertRouting(
         selectionId: string,
         expectedWireModel: string,
-        expectedProviderHeader: string
+        expectedProviderHeader: string,
+        expectedOutputCap?: number
     ): Promise<void> {
         // Two OpenAI-compatible providers, both pointed at the replay proxy so
         // their /chat/completions traffic is captured. They are distinguished on
@@ -162,7 +163,12 @@ describe("Multi-provider BYOK registry", async () => {
             },
         ];
         const models: ProviderModelConfig[] = [
-            { id: "sonnet", provider: "alpha", wireModel: "byok-gpt-4o" },
+            {
+                id: "sonnet",
+                provider: "alpha",
+                wireModel: "byok-gpt-4o",
+                maxOutputTokens: 16_384,
+            },
             { id: "haiku", provider: "alpha", wireModel: "byok-gpt-4o-mini" },
             { id: "turbo", provider: "delta", wireModel: "byok-gpt-4-turbo" },
         ];
@@ -175,7 +181,8 @@ describe("Multi-provider BYOK registry", async () => {
         });
 
         try {
-            await session.sendAndWait({ prompt: "What is 5+5?" });
+            const response = await session.sendAndWait({ prompt: "What is 5+5?" });
+            expect(response?.data.content).toContain("10");
             const exchanges = await waitForExchanges();
             expect(exchanges.length).toBe(1);
             const exchange = exchanges[0];
@@ -183,6 +190,9 @@ describe("Multi-provider BYOK registry", async () => {
             // The wire model sent to the provider is the selected model's
             // wireModel, not its provider-qualified selection id.
             expect(exchange.request.model).toBe(expectedWireModel);
+            expect(exchange.request.max_tokens).toBe(expectedOutputCap);
+            expect(exchange.request.max_completion_tokens).toBeUndefined();
+            expect("max_output_tokens" in exchange.request).toBe(false);
 
             // The request carried the owning provider's custom header, proving
             // the turn was dispatched against the correct provider connection.
@@ -200,7 +210,7 @@ describe("Multi-provider BYOK registry", async () => {
     }
 
     it("should route alpha sonnet turn to its provider and wire model", async () => {
-        await assertRouting("alpha/sonnet", "byok-gpt-4o", "alpha");
+        await assertRouting("alpha/sonnet", "byok-gpt-4o", "alpha", 16_384);
     });
 
     it("should route alpha haiku turn to its provider and wire model", async () => {
diff --git a/nodejs/test/e2e/pending_work_resume.e2e.test.ts b/nodejs/test/e2e/pending_work_resume.e2e.test.ts
index 65ab9fccc9..ecb5294a59 100644
--- a/nodejs/test/e2e/pending_work_resume.e2e.test.ts
+++ b/nodejs/test/e2e/pending_work_resume.e2e.test.ts
@@ -140,7 +140,10 @@ function waitForPermissionRequest(session: CopilotSession): Promise<PermissionRe
 }
 
 describe("Pending work resume", async () => {
-    const { env, workDir, openAiEndpoint, createClient } = await createSdkTestContext();
+    const { env, workDir, openAiEndpoint, createClient } = await createSdkTestContext({
+        logLevel: "debug",
+        copilotClientOptions: { env: { RUST_LOG: "error,sdk_diagnostics=debug" } },
+    });
     const SHARED_TOKEN = "pending-work-resume-shared-test-token";
 
     function createTcpServer(): CopilotClient {
@@ -599,18 +602,30 @@ describe("Pending work resume", async () => {
                     .filter(Boolean)
                     .map((line) => JSON.parse(line) as SessionEvent);
             };
+            // Live SDK callbacks do not prove that both parallel boundaries reached the journal.
             await waitForCondition(
-                () =>
-                    readPersistedEvents().some(
-                        (event) =>
-                            event.type === "tool.execution_complete" &&
-                            event.data.toolCallId === toolA.data.toolCallId &&
-                            event.data.success &&
-                            event.data.result?.content === "PARALLEL_A_ALPHA"
-                    ),
+                () => {
+                    const persistedEvents = readPersistedEvents();
+                    return (
+                        persistedEvents.some(
+                            (event) =>
+                                event.type === "tool.execution_complete" &&
+                                event.data.toolCallId === toolA.data.toolCallId &&
+                                event.data.success &&
+                                event.data.result?.content === "PARALLEL_A_ALPHA"
+                        ) &&
+                        persistedEvents.some(
+                            (event) =>
+                                event.type === "external_tool.requested" &&
+                                event.data.requestId === toolB.data.requestId &&
+                                event.data.toolCallId === toolB.data.toolCallId
+                        )
+                    );
+                },
                 {
                     timeoutMs: PENDING_WORK_TIMEOUT_MS,
-                    timeoutMessage: "Tool A's result was not flushed to events.jsonl before B",
+                    timeoutMessage:
+                        "Tool A's result and tool B's pending request were not both flushed to events.jsonl before shutdown",
                 }
             );
             expect(
diff --git a/nodejs/test/e2e/plan_exit_mode_notice.e2e.test.ts b/nodejs/test/e2e/plan_exit_mode_notice.e2e.test.ts
new file mode 100644
index 0000000000..ee05abe7d5
--- /dev/null
+++ b/nodejs/test/e2e/plan_exit_mode_notice.e2e.test.ts
@@ -0,0 +1,368 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { createServer } from "node:http";
+import { text } from "node:stream/consumers";
+import { describe, expect, it, onTestFinished } from "vitest";
+import type {
+    CopilotSession,
+    NamedProviderConfig,
+    ProviderModelConfig,
+    SessionEvent,
+} from "../../src/index.js";
+import { approveAll } from "../../src/index.js";
+import { createSdkTestContext } from "./harness/sdkTestContext.js";
+
+const EVENT_TIMEOUT_MS = 30_000;
+const EXIT_ONLY_MARKER = "EXIT_ONLY_MODE_NOTICE_REPRO";
+const DEFERRED_MARKER = "DEFERRED_MODE_NOTICE_REPRO";
+const DEFERRED_AUTOPILOT_MARKER = "DEFERRED_AUTOPILOT_NOTICE_REPRO";
+const IMMEDIATE_MARKER = "IMMEDIATE_MODE_NOTICE_CONTROL";
+
+type ModelRequest = {
+    messages?: Array<{
+        role?: string;
+        content?: unknown;
+        tool_calls?: Array<{ function?: { name?: string } }>;
+    }>;
+};
+
+function waitForExitPlanModeRequest(
+    session: CopilotSession,
+    summary: string
+): Promise<Extract<SessionEvent, { type: "exit_plan_mode.requested" }>> {
+    return new Promise((resolve, reject) => {
+        let unsubscribe: () => void = () => {};
+        const timer = setTimeout(() => {
+            unsubscribe();
+            reject(new Error(`Timed out waiting for exit_plan_mode.requested for ${summary}`));
+        }, EVENT_TIMEOUT_MS);
+
+        unsubscribe = session.on((event) => {
+            if (event.type === "exit_plan_mode.requested" && event.data.summary === summary) {
+                clearTimeout(timer);
+                unsubscribe();
+                resolve(event);
+            } else if (event.type === "session.error") {
+                clearTimeout(timer);
+                unsubscribe();
+                reject(new Error(`${event.data.message}\n${event.data.stack ?? ""}`));
+            }
+        });
+    });
+}
+
+function waitForIdle(session: CopilotSession): Promise<void> {
+    return new Promise((resolve, reject) => {
+        let unsubscribe: () => void = () => {};
+        const timer = setTimeout(() => {
+            unsubscribe();
+            reject(new Error("Timed out waiting for session.idle"));
+        }, EVENT_TIMEOUT_MS);
+
+        unsubscribe = session.on((event) => {
+            if (event.type === "session.idle") {
+                clearTimeout(timer);
+                unsubscribe();
+                resolve();
+            } else if (event.type === "session.error") {
+                clearTimeout(timer);
+                unsubscribe();
+                reject(new Error(`${event.data.message}\n${event.data.stack ?? ""}`));
+            }
+        });
+    });
+}
+
+describe("Plan exit mode notices", async () => {
+    const { copilotClient: client, workDir } = await createSdkTestContext();
+
+    it("does not inject a mode notice after exit-only and deferred approvals", async () => {
+        const modelRequests: ModelRequest[] = [];
+        let modelFailure: Error | undefined;
+        const modelServer = createServer((request, response) => {
+            void (async () => {
+                const modelRequest = JSON.parse(await text(request)) as ModelRequest;
+                modelRequests.push(modelRequest);
+                const serializedMessages = JSON.stringify(modelRequest.messages ?? []);
+                const marker = [
+                    EXIT_ONLY_MARKER,
+                    DEFERRED_MARKER,
+                    DEFERRED_AUTOPILOT_MARKER,
+                    IMMEDIATE_MARKER,
+                ].find((candidate) => serializedMessages.includes(candidate));
+                if (!marker) {
+                    throw new Error(`Unexpected model request: ${serializedMessages}`);
+                }
+                const exitPlanModeCalled = modelRequest.messages?.some((message) =>
+                    message.tool_calls?.some(
+                        (toolCall) => toolCall.function?.name === "exit_plan_mode"
+                    )
+                );
+                const latestUserContent = JSON.stringify(
+                    modelRequest.messages?.findLast((message) => message.role === "user")
+                        ?.content ?? ""
+                );
+                const message = latestUserContent.includes(`${marker}_FOLLOW_UP`)
+                    ? { role: "assistant", content: `${marker}_FOLLOW_UP_ACK` }
+                    : marker === DEFERRED_AUTOPILOT_MARKER && exitPlanModeCalled
+                      ? {
+                            role: "assistant",
+                            content: null,
+                            tool_calls: [
+                                {
+                                    id: `${marker}-task-complete`,
+                                    type: "function",
+                                    function: {
+                                        name: "task_complete",
+                                        arguments: JSON.stringify({
+                                            summary: "Deferred Autopilot notice verified",
+                                        }),
+                                    },
+                                },
+                            ],
+                        }
+                      : exitPlanModeCalled
+                        ? { role: "assistant", content: `${marker}_ACK` }
+                        : {
+                              role: "assistant",
+                              content: null,
+                              tool_calls: [
+                                  {
+                                      id: `${marker}-exit-plan-mode`,
+                                      type: "function",
+                                      function: {
+                                          name: "exit_plan_mode",
+                                          arguments: JSON.stringify({ summary: marker }),
+                                      },
+                                  },
+                              ],
+                          };
+                response.writeHead(200, { "content-type": "application/json" });
+                response.end(
+                    JSON.stringify({
+                        id: `${marker}-${modelRequests.length}`,
+                        object: "chat.completion",
+                        created: 0,
+                        model: "test-model",
+                        choices: [
+                            {
+                                index: 0,
+                                message,
+                                finish_reason: "tool_calls" in message ? "tool_calls" : "stop",
+                            },
+                        ],
+                        usage: { prompt_tokens: 10, completion_tokens: 10, total_tokens: 20 },
+                    })
+                );
+            })().catch((error: unknown) => {
+                modelFailure = error instanceof Error ? error : new Error(String(error));
+                response.writeHead(500).end();
+            });
+        });
+        const sessions: CopilotSession[] = [];
+        let serverStart: Promise<void> | undefined;
+        onTestFinished(async () => {
+            const errors: unknown[] = [];
+            for (const session of sessions.toReversed()) {
+                try {
+                    await session.disconnect();
+                } catch (error) {
+                    errors.push(error);
+                }
+            }
+            if (serverStart) {
+                const [startup] = await Promise.allSettled([serverStart]);
+                if (startup.status === "rejected") {
+                    errors.push(startup.reason);
+                }
+            }
+            modelServer.closeAllConnections();
+            if (modelServer.listening) {
+                try {
+                    await new Promise<void>((resolve, reject) => {
+                        modelServer.close((error) => (error ? reject(error) : resolve()));
+                    });
+                } catch (error) {
+                    errors.push(error);
+                }
+            }
+            if (errors.length) {
+                throw new AggregateError(errors, "Plan exit mode notice fixture cleanup failed");
+            }
+        });
+        serverStart = new Promise<void>((resolve, reject) => {
+            modelServer.once("error", reject);
+            modelServer.listen(0, "127.0.0.1", resolve);
+        });
+        await serverStart;
+        const address = modelServer.address();
+        if (!address || typeof address === "string") {
+            throw new Error("Missing local model server address");
+        }
+
+        const providers: NamedProviderConfig[] = [
+            {
+                name: "local",
+                type: "openai",
+                baseUrl: `http://127.0.0.1:${address.port}`,
+                apiKey: "test",
+                wireApi: "completions",
+            },
+        ];
+        const models: ProviderModelConfig[] = [
+            { id: "model", provider: "local", modelId: "test-model", wireModel: "test-model" },
+        ];
+
+        const runScenario = async (
+            marker: string,
+            selectedAction: "exit_only" | "interactive",
+            deferImplementation: boolean,
+            expectsImmediateModelRound: boolean
+        ) => {
+            const session = await client.createSession({
+                onPermissionRequest: approveAll,
+                workingDirectory: workDir,
+                providers,
+                models,
+                model: "local/model",
+            });
+            sessions.push(session);
+            const interest = await session.rpc.eventLog.registerInterest({
+                eventType: "exit_plan_mode.requested",
+            });
+            try {
+                await session.rpc.mode.set({ mode: "plan" });
+                const requested = waitForExitPlanModeRequest(session, marker);
+                const send = session.sendAndWait({
+                    prompt: `Call exit_plan_mode with summary ${marker}.`,
+                });
+                const requestEvent = await requested;
+                const response = {
+                    approved: true,
+                    selectedAction,
+                    ...(deferImplementation ? ({ deferImplementation: true } as object) : {}),
+                };
+                const handled = await session.rpc.ui.handlePendingExitPlanMode({
+                    requestId: requestEvent.data.requestId,
+                    response,
+                });
+                expect(handled.success).toBe(true);
+                const finalResponse = await send;
+                if (expectsImmediateModelRound) {
+                    expect(finalResponse?.data.content).toBe(`${marker}_ACK`);
+                }
+
+                const immediateRequests = modelRequests.filter((request) =>
+                    JSON.stringify(request.messages ?? []).includes(marker)
+                );
+                expect(immediateRequests).toHaveLength(expectsImmediateModelRound ? 2 : 1);
+                const immediateUserMessage = immediateRequests[1]?.messages?.findLast(
+                    (message) => message.role === "user"
+                );
+                const followUpResponse = await session.sendAndWait({
+                    prompt: `${marker}_FOLLOW_UP`,
+                });
+                expect(followUpResponse?.data.content).toBe(`${marker}_FOLLOW_UP_ACK`);
+                const requestsAfterFollowUp = modelRequests.filter((request) =>
+                    JSON.stringify(request.messages ?? []).includes(marker)
+                );
+                expect(requestsAfterFollowUp).toHaveLength(expectsImmediateModelRound ? 3 : 2);
+                const followUpUserMessage = requestsAfterFollowUp
+                    .at(-1)
+                    ?.messages?.findLast((message) => message.role === "user");
+                return {
+                    immediate: JSON.stringify(immediateUserMessage?.content ?? ""),
+                    followUp: JSON.stringify(followUpUserMessage?.content ?? ""),
+                    immediateRequestCount: immediateRequests.length,
+                };
+            } finally {
+                await session.rpc.eventLog.releaseInterest({ handle: interest.handle });
+            }
+        };
+
+        const runDeferredAutopilotScenario = async () => {
+            const session = await client.createSession({
+                onPermissionRequest: approveAll,
+                workingDirectory: workDir,
+                providers,
+                models,
+                model: "local/model",
+            });
+            sessions.push(session);
+            const interest = await session.rpc.eventLog.registerInterest({
+                eventType: "exit_plan_mode.requested",
+            });
+            try {
+                await session.rpc.mode.set({ mode: "plan" });
+                const requested = waitForExitPlanModeRequest(session, DEFERRED_AUTOPILOT_MARKER);
+                const initialIdle = waitForIdle(session);
+                await session.send({
+                    prompt: `Call exit_plan_mode with summary ${DEFERRED_AUTOPILOT_MARKER}.`,
+                });
+                const requestEvent = await requested;
+                const handled = await session.rpc.ui.handlePendingExitPlanMode({
+                    requestId: requestEvent.data.requestId,
+                    response: {
+                        approved: true,
+                        selectedAction: "autopilot",
+                        ...({ deferImplementation: true } as object),
+                    },
+                });
+                expect(handled.success).toBe(true);
+                await initialIdle;
+
+                const immediateRequests = modelRequests.filter((request) =>
+                    JSON.stringify(request.messages ?? []).includes(DEFERRED_AUTOPILOT_MARKER)
+                );
+                expect(immediateRequests).toHaveLength(2);
+                const followUpUserMessage = immediateRequests
+                    .at(-1)
+                    ?.messages?.findLast((message) => message.role === "user");
+                return JSON.stringify(followUpUserMessage?.content ?? "");
+            } finally {
+                await session.rpc.eventLog.releaseInterest({ handle: interest.handle });
+            }
+        };
+
+        const [exitOnlyMessages, deferredMessages, deferredAutopilotFollowUp, immediateMessages] =
+            await Promise.all([
+                runScenario(EXIT_ONLY_MARKER, "exit_only", false, true),
+                runScenario(DEFERRED_MARKER, "interactive", true, false),
+                runDeferredAutopilotScenario(),
+                runScenario(IMMEDIATE_MARKER, "interactive", false, true),
+            ]);
+        expect
+            .soft(exitOnlyMessages.immediate, "exit-only immediate continuation")
+            .not.toContain("Plan mode is no longer active.");
+        expect
+            .soft(deferredMessages.immediate, "deferred immediate continuation")
+            .not.toContain("Plan mode is no longer active.");
+        expect
+            .soft(deferredMessages.immediateRequestCount, "deferred approval model rounds")
+            .toBe(1);
+        expect
+            .soft(exitOnlyMessages.followUp, "exit-only follow-up turn")
+            .toContain("Plan mode is no longer active.");
+        expect
+            .soft(deferredMessages.followUp, "deferred follow-up turn")
+            .toContain("Plan mode is no longer active.");
+        expect
+            .soft(deferredAutopilotFollowUp, "deferred Autopilot follow-up turn")
+            .toContain("Plan mode is no longer active.");
+        expect
+            .soft(deferredAutopilotFollowUp, "deferred Autopilot instructions")
+            .toContain("<autopilot_mode>");
+        expect
+            .soft(deferredAutopilotFollowUp, "deferred Autopilot continuation")
+            .toContain("You have not yet marked the task as complete");
+        expect
+            .soft(immediateMessages.immediate, "ordinary interactive continuation")
+            .toContain("Plan mode is no longer active.");
+
+        if (modelFailure) {
+            throw modelFailure;
+        }
+    });
+});
diff --git a/nodejs/test/e2e/plan_fleet_approval.e2e.test.ts b/nodejs/test/e2e/plan_fleet_approval.e2e.test.ts
new file mode 100644
index 0000000000..c4b02ebdf6
--- /dev/null
+++ b/nodejs/test/e2e/plan_fleet_approval.e2e.test.ts
@@ -0,0 +1,334 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { readFile } from "fs/promises";
+import { join } from "path";
+import { describe, expect, it } from "vitest";
+import type { CopilotSession, SessionEvent } from "../../src/index.js";
+import { approveAll } from "../../src/index.js";
+import type { ParsedHttpExchange } from "../../../test/harness/replayingCapiProxy.js";
+import { createSdkTestContext } from "./harness/sdkTestContext.js";
+import { isByokBackend } from "./harness/testBackend.js";
+
+// Planning and then implementing the plan takes several model turns, which
+// live recording runs against real models.
+const TEST_TIMEOUT_MS = 180_000;
+const FLOW_TIMEOUT_MS = 150_000;
+const SESSION_MODEL = "claude-haiku-4.5";
+const PLAN_MODEL = "claude-sonnet-5";
+const FLEET_PROMPT_OPENING = "You are now in fleet mode.";
+const FLEET_INSTRUCTIONS_TAG = "<fleet_mode_instructions>";
+
+type EventOf<T extends SessionEvent["type"]> = Extract<SessionEvent, { type: T }>;
+type RequestMessage = ParsedHttpExchange["request"]["messages"][number];
+
+// The replay proxy's path normalizer corrupts JSON escapes next to the work
+// directory in tool arguments, which sub-agent prompts and shell commands embed.
+// Without them the models implement with the create tool, which replays cleanly.
+const EXCLUDED_TOOLS = ["task", "bash", "powershell"];
+
+// Planning writes nothing, so the capture holds no per-run session-state path.
+function planPrompt(fileName: string, contents: string): string {
+    return (
+        `The plan is one step: create a file named ${fileName} in the current directory containing exactly the text ${contents}. ` +
+        "Do not write a plan file, create todos, or call any other tool first. " +
+        "Request approval right away with exit_plan_mode, setting recommendedAction to autopilot_fleet."
+    );
+}
+
+/** Records every session event from now on, rejecting waits on a session error. */
+function recordEvents(session: CopilotSession) {
+    const events: SessionEvent[] = [];
+    const waiters = new Set<() => void>();
+    let failure: Error | undefined;
+    const unsubscribe = session.on((event) => {
+        events.push(event);
+        if (event.type === "session.error") {
+            failure = new Error(`${event.data.message}\n${event.data.stack ?? ""}`);
+        }
+        for (const check of waiters) check();
+    });
+
+    function waitUntil(done: (events: SessionEvent[]) => boolean, description: string) {
+        return new Promise<void>((resolve, reject) => {
+            const finish = (error?: Error) => {
+                clearTimeout(timer);
+                waiters.delete(check);
+                if (error) reject(error);
+                else resolve();
+            };
+            const check = () => {
+                if (failure) finish(failure);
+                else if (done(events)) finish();
+            };
+            const timer = setTimeout(() => {
+                const seen = events.map((event) => event.type).join(", ");
+                finish(new Error(`Timed out waiting for ${description}. Events: ${seen}`));
+            }, FLOW_TIMEOUT_MS);
+            waiters.add(check);
+            check();
+        });
+    }
+
+    return { events, waitUntil, unsubscribe };
+}
+
+function mainAgent(events: SessionEvent[]): SessionEvent[] {
+    return events.filter((event) => event.agentId === undefined);
+}
+
+function isType<T extends SessionEvent["type"]>(type: T) {
+    return (event: SessionEvent): event is EventOf<T> => event.type === type;
+}
+
+/** The main agent's exit_plan_mode completion, or undefined before it arrives. */
+function exitPlanModeCompletion(events: SessionEvent[]) {
+    const main = mainAgent(events);
+    const start = main
+        .filter(isType("tool.execution_start"))
+        .find((event) => event.data.toolName === "exit_plan_mode");
+    return main
+        .filter(isType("tool.execution_complete"))
+        .find((event) => event.data.toolCallId === start?.data.toolCallId);
+}
+
+function fleetTurns(events: SessionEvent[]): EventOf<"user.message">[] {
+    return mainAgent(events)
+        .filter(isType("user.message"))
+        .filter((event) => event.data.source === "fleet");
+}
+
+function messageText(message: RequestMessage): string {
+    const { content } = message as { content?: unknown };
+    if (typeof content === "string") return content;
+    if (Array.isArray(content)) {
+        return content
+            .map((part) => (part as { text?: unknown }).text)
+            .filter((text): text is string => typeof text === "string")
+            .join("");
+    }
+    return "";
+}
+
+function userMessagesWith(exchange: ParsedHttpExchange, text: string): RequestMessage[] {
+    return exchange.request.messages.filter(
+        (message) => message.role === "user" && messageText(message).includes(text)
+    );
+}
+
+describe("Plan approval with fleet", async () => {
+    const { copilotClient: client, openAiEndpoint, workDir } = await createSdkTestContext();
+
+    it(
+        "should deliver fleet instructions with the approved plan tool result",
+        async () => {
+            const session = await client.createSession({
+                onPermissionRequest: approveAll,
+                excludedTools: EXCLUDED_TOOLS,
+                onExitPlanModeRequest: () => ({
+                    approved: true,
+                    selectedAction: "autopilot_fleet",
+                }),
+            });
+            const recorder = recordEvents(session);
+
+            try {
+                await session.send({
+                    prompt: planPrompt("fleet-alpha.txt", "alpha"),
+                    agentMode: "plan",
+                });
+                await recorder.waitUntil((events) => {
+                    const completion = exitPlanModeCompletion(events);
+                    return (
+                        completion !== undefined &&
+                        events
+                            .slice(events.indexOf(completion))
+                            .some((event) => event.type === "session.idle")
+                    );
+                }, "session.idle after the fleet plan approval");
+
+                const completion = exitPlanModeCompletion(recorder.events)!;
+                expect(completion.data.success).toBe(true);
+                const toolResult = completion.data.result?.content ?? "";
+                expect(toolResult).toContain("fleet-mode instructions below");
+                expect(toolResult).toContain(FLEET_INSTRUCTIONS_TAG);
+                expect(toolResult).toContain(FLEET_PROMPT_OPENING);
+
+                // The instructions arrive with the tool result, not as a queued turn.
+                expect(fleetTurns(recorder.events)).toEqual([]);
+                const prompts = mainAgent(recorder.events)
+                    .filter(isType("user.message"))
+                    .filter((event) => !event.data.isAutopilotContinuation);
+                expect(prompts).toHaveLength(1);
+
+                const exchanges = await openAiEndpoint.getExchanges();
+                expect(
+                    exchanges.some((exchange) =>
+                        exchange.request.messages.some(
+                            (message) =>
+                                message.role === "tool" &&
+                                messageText(message).includes(FLEET_INSTRUCTIONS_TAG)
+                        )
+                    )
+                ).toBe(true);
+                expect(
+                    exchanges.flatMap((exchange) =>
+                        userMessagesWith(exchange, FLEET_PROMPT_OPENING)
+                    )
+                ).toEqual([]);
+
+                expect((await readFile(join(workDir, "fleet-alpha.txt"), "utf-8")).trim()).toBe(
+                    "alpha"
+                );
+            } finally {
+                recorder.unsubscribe();
+                await session.disconnect();
+            }
+        },
+        TEST_TIMEOUT_MS
+    );
+
+    // The session model must be in this context's cached model list, so the
+    // deferred flow gets its own context.
+    describe("deferred approval (isolated to avoid models cache contamination)", async () => {
+        const {
+            copilotClient: deferredClient,
+            openAiEndpoint: deferredEndpoint,
+            workDir: deferredWorkDir,
+        } = await createSdkTestContext();
+
+        // Switches between two CAPI models; the BYOK matrix pins one provider model.
+        it.skipIf(isByokBackend)(
+            "should run one hidden fleet turn on the session model after a deferred approval",
+            async () => {
+                const session = await deferredClient.createSession({
+                    model: SESSION_MODEL,
+                    onPermissionRequest: approveAll,
+                    excludedTools: EXCLUDED_TOOLS,
+                });
+                const recorder = recordEvents(session);
+                // The runtime offers exit_plan_mode only when a consumer handles its approval event.
+                const interest = await session.rpc.eventLog.registerInterest({
+                    eventType: "exit_plan_mode.requested",
+                });
+
+                try {
+                    const enterPlan = await session.rpc.mode.set({
+                        mode: "plan",
+                        planModelConfigured: true,
+                        planModel: PLAN_MODEL,
+                    });
+                    expect(enterPlan).toMatchObject({ modelChanged: true });
+
+                    // Approve the way an interactive host does when the plan ran on its
+                    // own model: restore the session model first, then forward whether
+                    // the runtime wants implementation deferred to a fresh turn.
+                    const approval = new Promise<void>((resolve, reject) => {
+                        const unsubscribe = session.on("exit_plan_mode.requested", (event) => {
+                            unsubscribe();
+                            void (async () => {
+                                const leavePlan = await session.rpc.mode.set({
+                                    mode: "plan",
+                                    planModelConfigured: false,
+                                    restorePlanModel: true,
+                                    planExitAction: "autopilot_fleet",
+                                });
+                                expect(leavePlan).toMatchObject({
+                                    modelChanged: true,
+                                    deferImplementation: true,
+                                    armInteractiveContinuation: false,
+                                });
+                                const handled = await session.rpc.ui.handlePendingExitPlanMode({
+                                    requestId: event.data.requestId,
+                                    response: {
+                                        approved: true,
+                                        selectedAction: "autopilot_fleet",
+                                        deferImplementation: leavePlan.deferImplementation,
+                                    },
+                                });
+                                expect(handled.success).toBe(true);
+                            })().then(resolve, reject);
+                        });
+                    });
+
+                    await session.send({
+                        prompt: planPrompt("fleet-beta.txt", "beta"),
+                        agentMode: "plan",
+                    });
+                    await Promise.all([
+                        approval,
+                        recorder.waitUntil((events) => {
+                            const [fleetTurn] = fleetTurns(events);
+                            return (
+                                fleetTurn !== undefined &&
+                                events
+                                    .slice(events.indexOf(fleetTurn))
+                                    .some((event) => event.type === "session.idle")
+                            );
+                        }, "session.idle after the deferred fleet turn"),
+                    ]);
+
+                    const completion = exitPlanModeCompletion(recorder.events)!;
+                    const toolResult = completion.data.result?.content ?? "";
+                    expect(toolResult).toContain("End your turn now");
+                    expect(toolResult).not.toContain(FLEET_INSTRUCTIONS_TAG);
+                    expect(toolResult).not.toContain(FLEET_PROMPT_OPENING);
+
+                    // Exactly one fleet turn follows the plan turn. The runtime ends the
+                    // plan turn at the tool result, so nothing runs in between: no idle,
+                    // no other prompt such as an autopilot continuation, and no further
+                    // plan-model work.
+                    const fleet = fleetTurns(recorder.events);
+                    expect(fleet).toHaveLength(1);
+                    const between = recorder.events.slice(
+                        recorder.events.indexOf(completion) + 1,
+                        recorder.events.indexOf(fleet[0])
+                    );
+                    expect(
+                        between
+                            .filter(
+                                (event) =>
+                                    event.type === "session.idle" ||
+                                    (event.agentId === undefined &&
+                                        (event.type === "user.message" ||
+                                            event.type === "assistant.turn_start" ||
+                                            event.type === "assistant.message" ||
+                                            event.type === "tool.execution_start"))
+                            )
+                            .map((event) => event.type)
+                    ).toEqual([]);
+
+                    const exchanges = await deferredEndpoint.getExchanges();
+                    const planRequest = exchanges.find(
+                        (exchange) => userMessagesWith(exchange, "fleet-beta.txt").length > 0
+                    );
+                    expect(planRequest?.request.model).toBe(PLAN_MODEL);
+                    // Every request carrying the approval result belongs to the fleet
+                    // turn, so the plan model was never asked to act on it.
+                    const afterApproval = exchanges.filter((exchange) =>
+                        exchange.request.messages.some(
+                            (message) =>
+                                message.role === "tool" &&
+                                messageText(message).includes("End your turn now")
+                        )
+                    );
+                    expect(afterApproval.length).toBeGreaterThan(0);
+                    for (const exchange of afterApproval) {
+                        expect(exchange.request.model).toBe(SESSION_MODEL);
+                        expect(userMessagesWith(exchange, FLEET_PROMPT_OPENING)).toHaveLength(1);
+                    }
+
+                    expect(
+                        (await readFile(join(deferredWorkDir, "fleet-beta.txt"), "utf-8")).trim()
+                    ).toBe("beta");
+                } finally {
+                    recorder.unsubscribe();
+                    await session.rpc.eventLog.releaseInterest({ handle: interest.handle });
+                    await session.disconnect();
+                }
+            },
+            TEST_TIMEOUT_MS
+        );
+    });
+});
diff --git a/nodejs/test/e2e/provider_discovery.e2e.test.ts b/nodejs/test/e2e/provider_discovery.e2e.test.ts
new file mode 100644
index 0000000000..67d9eb51a5
--- /dev/null
+++ b/nodejs/test/e2e/provider_discovery.e2e.test.ts
@@ -0,0 +1,147 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+import { createServer } from "node:http";
+import { describe, expect, it, onTestFinished } from "vitest";
+import { CopilotClient, RuntimeConnection, approveAll } from "../../src/index.js";
+import { createSdkTestContext, DEFAULT_GITHUB_TOKEN } from "./harness/sdkTestContext.js";
+
+describe("Ollama provider discovery", async () => {
+    const { env, workDir } = await createSdkTestContext({ useStdio: true });
+
+    it("routes provider operations and reads OLLAMA_HOST in the runtime subprocess", async () => {
+        const requests: string[] = [];
+        const server = createServer((request, response) => {
+            const route = `${request.method} ${request.url}`;
+            requests.push(route);
+            response.setHeader("Content-Type", "application/json");
+            if (route === "GET /api/version") {
+                response.end(JSON.stringify({ version: "0.6.2" }));
+            } else if (route === "GET /api/tags") {
+                response.end(JSON.stringify({ models: [{ name: "test-chat:latest" }] }));
+            } else if (route === "POST /api/show") {
+                request.resume();
+                response.end(
+                    JSON.stringify({
+                        capabilities: ["completion", "tools"],
+                        model_info: {
+                            "general.architecture": "llama",
+                            "llama.context_length": 8192,
+                            "clip.context_length": 1024,
+                        },
+                    })
+                );
+            } else {
+                response.writeHead(404).end(JSON.stringify({ error: "unexpected route" }));
+            }
+        });
+        const clients: CopilotClient[] = [];
+        onTestFinished(async () => {
+            try {
+                await Promise.all(clients.map((client) => client.stop()));
+            } finally {
+                server.closeAllConnections();
+                if (server.listening) {
+                    await new Promise<void>((resolve, reject) =>
+                        server.close((error) => (error ? reject(error) : resolve()))
+                    );
+                }
+            }
+        });
+        await new Promise<void>((resolve, reject) => {
+            server.once("error", reject);
+            server.listen(0, "127.0.0.1", resolve);
+        });
+        const address = server.address();
+        if (!address || typeof address === "string") {
+            throw new Error("Expected an assigned loopback TCP port");
+        }
+        const endpoint = `http://127.0.0.1:${address.port}`;
+        function makeClient(ollamaHost: string) {
+            // Stdio keeps ambient environment inputs in a child, even in in-process CI jobs.
+            const client = new CopilotClient({
+                connection: RuntimeConnection.forStdio(),
+                workingDirectory: workDir,
+                gitHubToken: DEFAULT_GITHUB_TOKEN,
+                env: {
+                    ...env,
+                    GH_TOKEN: DEFAULT_GITHUB_TOKEN,
+                    GITHUB_TOKEN: DEFAULT_GITHUB_TOKEN,
+                    OLLAMA_HOST: ollamaHost,
+                },
+            });
+            clients.push(client);
+            return client;
+        }
+        const client = makeClient(endpoint);
+        const session = await client.createSession({ onPermissionRequest: approveAll });
+        const providers = session.rpc.providers;
+        const catalog = await providers.getCatalog();
+        const adapter = catalog.providers.find((provider) => provider.providerKind === "ollama");
+        expect(adapter).toBeDefined();
+        if (!adapter) throw new Error("Ollama adapter missing from the public catalog");
+        expect(requests).toEqual([]);
+
+        const discovered = await providers.discover({ adapterId: adapter.adapterId });
+        expect(discovered.outcome.code).toBe("success");
+        expect(discovered.instances).toHaveLength(1);
+        const instance = discovered.instances[0];
+        expect(instance.reference.managementEndpoint).toBe(endpoint);
+        const repeated = await providers.discover({ adapterId: adapter.adapterId });
+        expect(repeated.instances[0].reference).toEqual(instance.reference);
+        const status = await providers.getStatus({ instance: instance.reference });
+        expect(status).toMatchObject({
+            outcome: { code: "success" },
+            status: "healthy",
+            version: "0.6.2",
+        });
+        const inventory = await providers.models.list({ instance: instance.reference });
+        expect(inventory.outcome.code).toBe("success");
+        expect(inventory.models).toHaveLength(1);
+        const model = inventory.models[0];
+        expect(model.id).toBe("test-chat:latest");
+        expect(model.capabilities.limits?.max_context_window_tokens).toBe(8192);
+        const plan = await providers.models.prepareConfiguration({ instance, model });
+        expect(plan.provider).toMatchObject({ baseUrl: `${endpoint}/v1` });
+        expect(plan.model).toMatchObject({ id: model.id, maxContextWindowTokens: 8192 });
+        expect(plan.selectionId).toBe(`${plan.provider.name}/${model.id}`);
+        const unsafeInstance = {
+            ...instance,
+            reference: { ...instance.reference, id: "///", providerKind: "a/b" },
+        };
+        const cleanedPlan = await providers.models.prepareConfiguration({
+            instance: unsafeInstance,
+            model: { ...model, name: "  Test\n\u202Emodel\u200B " },
+        });
+        expect(cleanedPlan.provider.name).toBe("a-b");
+        expect(cleanedPlan.model.name).toBe("Test model");
+        expect(cleanedPlan.model.wireModel).toBe(model.id);
+        expect(cleanedPlan.selectionId).toBe(`a-b/${model.id}`);
+        expect(requests).toContain("POST /api/show");
+        expect(
+            requests.every((route) =>
+                ["GET /api/version", "GET /api/tags", "POST /api/show"].includes(route)
+            )
+        ).toBe(true);
+
+        // Port zero cannot be claimed by another local service.
+        const unreachableSession = await makeClient("http://127.0.0.1:0").createSession({
+            onPermissionRequest: approveAll,
+        });
+        const unreachableProviders = unreachableSession.rpc.providers;
+        const failure = await unreachableProviders.discover({ adapterId: adapter.adapterId });
+        expect(failure).toMatchObject({ outcome: { code: "unreachable" }, instances: [] });
+        const explicit = await unreachableProviders.discover({
+            adapterId: adapter.adapterId,
+            input: { endpoint },
+        });
+        expect(explicit.instances[0].reference).toEqual(instance.reference);
+        expect(explicit.outcome.code).toBe("success");
+        await expect(
+            providers.discover({
+                adapterId: adapter.adapterId,
+                input: { ollamaHost: endpoint },
+            })
+        ).rejects.toThrow(/invalid.*discovery.*input|does not match schema/i);
+    });
+});
diff --git a/nodejs/test/e2e/provider_model_metadata.e2e.test.ts b/nodejs/test/e2e/provider_model_metadata.e2e.test.ts
new file mode 100644
index 0000000000..88d60c5c09
--- /dev/null
+++ b/nodejs/test/e2e/provider_model_metadata.e2e.test.ts
@@ -0,0 +1,97 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { createServer } from "node:http";
+import { describe, it, onTestFinished } from "vitest";
+import { approveAll } from "../../src/index.js";
+import { createSdkTestContext } from "./harness/sdkTestContext.js";
+
+describe("Provider model metadata", async () => {
+    const { copilotClient: client } = await createSdkTestContext();
+
+    it("cleans prompt labels while sending the exact provider model ID", async ({ expect }) => {
+        const requests: { route: string; body: string }[] = [];
+        const server = createServer((request, response) => {
+            const chunks: Buffer[] = [];
+            request.on("data", (chunk: Buffer) => chunks.push(chunk));
+            request.on("end", () => {
+                requests.push({
+                    route: `${request.method} ${request.url}`,
+                    body: Buffer.concat(chunks).toString("utf8"),
+                });
+                // The outgoing request is the contract; reject it rather than invent an assistant response.
+                response.writeHead(400, { "Content-Type": "application/json" }).end(
+                    JSON.stringify({
+                        error: {
+                            type: "invalid_request_error",
+                            message: "MODEL_METADATA_PROBE_COMPLETE",
+                        },
+                    })
+                );
+            });
+        });
+        onTestFinished(async () => {
+            server.closeAllConnections();
+            if (server.listening) {
+                await new Promise<void>((resolve, reject) =>
+                    server.close((error) => (error ? reject(error) : resolve()))
+                );
+            }
+        });
+        await new Promise<void>((resolve, reject) => {
+            server.once("error", reject);
+            server.listen(0, "127.0.0.1", resolve);
+        });
+        const address = server.address();
+        if (!address || typeof address === "string") {
+            throw new Error("Expected an assigned loopback TCP port");
+        }
+
+        const rawId = `raw\n\u202Eid<&"${"é".repeat(100)}`;
+        const rawName = `  Display\r\n\u200Bname<&"${"名".repeat(100)}`;
+        const selectionId = `local/${rawId}`;
+        const expectedId = [...`local/raw id<&"${"é".repeat(100)}`].slice(0, 80).join("");
+        const expectedName = [...`Display name<&"${"名".repeat(100)}`].slice(0, 80).join("");
+        const escapeXml = (text: string) =>
+            text.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll('"', "&quot;");
+        const session = await client.createSession({
+            onPermissionRequest: approveAll,
+            model: selectionId,
+            providers: [
+                {
+                    name: "local",
+                    type: "openai",
+                    wireApi: "completions",
+                    baseUrl: `http://127.0.0.1:${address.port}/v1`,
+                },
+            ],
+            models: [{ id: rawId, provider: "local", wireModel: rawId, name: rawName }],
+        });
+        try {
+            await expect(session.sendAndWait({ prompt: "What is 2 + 2?" })).rejects.toThrow(
+                "MODEL_METADATA_PROBE_COMPLETE"
+            );
+            expect(requests).toHaveLength(1);
+            expect(requests[0].route).toBe("POST /v1/chat/completions");
+            const body = JSON.parse(requests[0].body);
+            expect(body.model).toBe(rawId);
+            const system = body.messages.find(
+                (message: { role: string }) => message.role === "system"
+            )?.content;
+            expect(system).toBeTypeOf("string");
+            expect(system).toContain(
+                `<model name="${escapeXml(expectedName)}" id="${escapeXml(expectedId)}" />`
+            );
+            const information = system.match(
+                /<model_information>([\s\S]*?)<\/model_information>/
+            )?.[1];
+            expect(information).toBeDefined();
+            expect(information).not.toContain(rawId);
+            expect(information).not.toContain(rawName);
+            expect(information).not.toMatch(/[\u200B\u202E\r]/);
+        } finally {
+            await session.disconnect();
+        }
+    });
+});
diff --git a/nodejs/test/e2e/rpc.e2e.test.ts b/nodejs/test/e2e/rpc.e2e.test.ts
index cd9887f002..579b570910 100644
--- a/nodejs/test/e2e/rpc.e2e.test.ts
+++ b/nodejs/test/e2e/rpc.e2e.test.ts
@@ -1,6 +1,10 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
 import { describe, expect, it, onTestFinished } from "vitest";
 import { CopilotClient, approveAll } from "../../src/index.js";
-import { createSdkTestContext } from "./harness/sdkTestContext.js";
+import { createSdkTestContext, DEFAULT_GITHUB_TOKEN } from "./harness/sdkTestContext.js";
 
 function onTestFinishedStop(client: CopilotClient) {
     onTestFinished(async () => {
@@ -12,7 +16,15 @@ function onTestFinishedStop(client: CopilotClient) {
     });
 }
 
-describe("RPC", () => {
+describe("RPC", async () => {
+    const { copilotClient: modelClient } = await createSdkTestContext({
+        copilotClientOptions: {
+            gitHubToken: DEFAULT_GITHUB_TOKEN,
+            useLoggedInUser: false,
+        },
+        modelNames: { "claude-sonnet-5": "RPC replay fixture model" },
+    });
+
     it("should call rpc.ping with typed params and result", async () => {
         const client = new CopilotClient();
         onTestFinishedStop(client);
@@ -27,22 +39,20 @@ describe("RPC", () => {
     });
 
     it("should call rpc.models.list with typed result", async () => {
-        const client = new CopilotClient();
-        onTestFinishedStop(client);
-
-        await client.start();
+        onTestFinishedStop(modelClient);
+        await modelClient.start();
 
-        const authStatus = await client.getAuthStatus();
-        if (!authStatus.isAuthenticated) {
-            await client.stop();
-            return;
-        }
-
-        const result = await client.rpc.models.list();
+        const result = await modelClient.rpc.models.list();
         expect(result.models).toBeDefined();
         expect(Array.isArray(result.models)).toBe(true);
-
-        await client.stop();
+        expect(result.models).toContainEqual(
+            expect.objectContaining({
+                id: "claude-sonnet-5",
+                name: "RPC replay fixture model",
+            })
+        );
+
+        await modelClient.stop();
     });
 
     // account.getQuota is defined in schema but not yet implemented in CLI
diff --git a/nodejs/test/e2e/rpc_extension_http_mcp.e2e.test.ts b/nodejs/test/e2e/rpc_extension_http_mcp.e2e.test.ts
new file mode 100644
index 0000000000..3afeccdcfa
--- /dev/null
+++ b/nodejs/test/e2e/rpc_extension_http_mcp.e2e.test.ts
@@ -0,0 +1,604 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { execFileSync } from "node:child_process";
+import { createHash, randomUUID } from "node:crypto";
+import {
+    copyFile,
+    mkdir,
+    mkdtemp,
+    open,
+    readFile,
+    readdir,
+    realpath,
+    rm,
+    stat,
+} from "node:fs/promises";
+import { createServer } from "node:http";
+import { dirname, join, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+import { describe, it, onTestFailed, onTestFinished } from "vitest";
+import { z } from "zod";
+import {
+    approveAll,
+    CopilotClient,
+    RuntimeConnection,
+    type CopilotSession,
+    type PermissionHandler,
+    type PermissionRequest,
+} from "../../src/index.js";
+import { resolvePreparedRuntimePath } from "../../scripts/prepare-runtime.js";
+import {
+    createSdkTestContext,
+    DEFAULT_GITHUB_TOKEN,
+    getLegacyCliPathForTests,
+} from "./harness/sdkTestContext.js";
+import { waitForCondition } from "./harness/sdkTestHelper.js";
+
+const directory = dirname(fileURLToPath(import.meta.url));
+const extensionFixture = join(directory, "fixtures", "http-mcp-extension.mjs");
+const extensionDigest = createHash("sha256")
+    .update(await readFile(extensionFixture))
+    .digest("hex");
+const sdkDirectory = resolve(directory, "../../dist");
+const nativeCliPath = await resolvePreparedRuntimePath({ option: "--print-path" });
+const cliDirectory = process.env.COPILOT_EXTENSION_SDK_PATH
+    ? dirname(process.env.COPILOT_EXTENSION_SDK_PATH)
+    : resolve(dirname(nativeCliPath), "../..");
+const stepTimeoutMs = process.platform === "win32" ? 60_000 : 30_000;
+const testTimeoutMs = process.platform === "win32" ? 180_000 : 90_000;
+const serverName = "extensionprobe";
+const directToolName = "extension_direct_probe";
+const httpToolName = "extensionprobe-http_probe";
+
+const rpcFrame = z.object({
+    jsonrpc: z.literal("2.0"),
+    id: z.union([z.string(), z.number()]).optional(),
+    method: z.string(),
+    params: z
+        .object({
+            name: z.string().optional(),
+            arguments: z.object({ marker: z.string() }).optional(),
+        })
+        .optional(),
+});
+const joinStatus = z.discriminatedUnion("state", [
+    z.object({
+        state: z.literal("joined"),
+        sessionId: z.string(),
+        sdkPath: z.string(),
+        mcpServers: z.object({
+            extensionprobe: z.object({
+                type: z.literal("http"),
+                url: z.string(),
+                tools: z.array(z.string()),
+                timeout: z.number(),
+            }),
+        }),
+    }),
+    z.object({ state: z.literal("failed"), error: z.string() }),
+]);
+
+async function readOwnedLogTails(directory: string) {
+    const files = (await readdir(directory, { withFileTypes: true }))
+        .filter((entry) => entry.isFile() && entry.name.endsWith(".log"))
+        .map((entry) => entry.name)
+        .sort();
+    const logs = [];
+    for (const file of files.slice(-8)) {
+        const handle = await open(join(directory, file), "r");
+        try {
+            const { size } = await handle.stat();
+            const offset = Math.max(0, size - 64 * 1024);
+            const buffer = Buffer.alloc(size - offset);
+            const { bytesRead } = await handle.read(buffer, 0, buffer.length, offset);
+            logs.push({
+                file,
+                size,
+                bytesRead,
+                truncated: offset > 0 || bytesRead < buffer.length,
+                tail: buffer.toString("utf8", 0, bytesRead),
+            });
+        } finally {
+            await handle.close();
+        }
+    }
+    return { omittedFiles: Math.max(0, files.length - logs.length), logs };
+}
+
+/** Stateless Streamable HTTP exercises the real connector without an MCP package or credentials. */
+function createHttpMcpFixture() {
+    const methods: string[] = [];
+    const requests: string[] = [];
+    const responses: Array<{ method: string; status: number; body: unknown }> = [];
+    const calls: Array<{ marker: string }> = [];
+    const errors: unknown[] = [];
+    const server = createServer((request, response) => {
+        if (request.url !== "/mcp") {
+            response.writeHead(404).end();
+            return;
+        }
+        if (request.method === "GET") {
+            response.writeHead(405, { Allow: "POST" }).end();
+            return;
+        }
+        if (request.method !== "POST") {
+            errors.push(new Error(`Unexpected HTTP method: ${request.method}`));
+            response.writeHead(405, { Allow: "POST" }).end();
+            return;
+        }
+        request.setEncoding("utf8");
+        let body = "";
+        request.on("data", (chunk: string) => {
+            body += chunk;
+        });
+        request.on("error", (error) => errors.push(error));
+        request.on("end", () => {
+            requests.push(body);
+            try {
+                const frame = rpcFrame.parse(JSON.parse(body));
+                methods.push(frame.method);
+                if (frame.id === undefined) {
+                    if (frame.method !== "notifications/initialized") {
+                        throw new Error(`Unexpected MCP notification: ${frame.method}`);
+                    }
+                    response.writeHead(202).end();
+                    return;
+                }
+                let result: unknown;
+                switch (frame.method) {
+                    case "server/discover": {
+                        // This ordinary MCP peer declines optional modern discovery.
+                        const unsupportedResponse = {
+                            jsonrpc: "2.0",
+                            id: frame.id,
+                            error: { code: -32601, message: "Method not found" },
+                        };
+                        responses.push({
+                            method: frame.method,
+                            status: 200,
+                            body: unsupportedResponse,
+                        });
+                        response
+                            .writeHead(200, { "Content-Type": "application/json" })
+                            .end(JSON.stringify(unsupportedResponse));
+                        return;
+                    }
+                    case "initialize":
+                        result = {
+                            protocolVersion: "2025-03-26",
+                            capabilities: { tools: {} },
+                            serverInfo: { name: "extension-http-probe", version: "1.0" },
+                        };
+                        break;
+                    case "tools/list":
+                        result = {
+                            tools: [
+                                {
+                                    name: "http_probe",
+                                    description:
+                                        "Record a marker on the HTTP server and return it.",
+                                    inputSchema: {
+                                        type: "object",
+                                        properties: { marker: { type: "string" } },
+                                        required: ["marker"],
+                                        additionalProperties: false,
+                                    },
+                                    annotations: { readOnlyHint: false },
+                                },
+                            ],
+                        };
+                        break;
+                    case "tools/call":
+                        if (frame.params?.name !== "http_probe" || !frame.params.arguments) {
+                            throw new Error(`Unexpected MCP tool call: ${body}`);
+                        }
+                        calls.push(frame.params.arguments);
+                        result = {
+                            content: [
+                                {
+                                    type: "text",
+                                    text: `EXTENSION_HTTP_REPLY_${frame.params.arguments.marker}`,
+                                },
+                            ],
+                            isError: false,
+                        };
+                        break;
+                    case "ping":
+                        result = {};
+                        break;
+                    default:
+                        throw new Error(`Unexpected MCP method: ${frame.method}`);
+                }
+                const reply = { jsonrpc: "2.0", id: frame.id, result };
+                responses.push({ method: frame.method, status: 200, body: reply });
+                response.writeHead(200, { "Content-Type": "application/json" });
+                response.end(JSON.stringify(reply));
+            } catch (error) {
+                errors.push(error);
+                response.writeHead(500).end(String(error));
+            }
+        });
+    });
+    server.on("error", (error) => errors.push(error));
+
+    return {
+        methods,
+        requests,
+        responses,
+        calls,
+        assertHealthy() {
+            if (errors.length) throw new AggregateError(errors, "HTTP MCP fixture failed");
+        },
+        async start() {
+            await new Promise<void>((resolve, reject) => {
+                server.once("error", reject);
+                server.listen(0, "127.0.0.1", () => {
+                    server.off("error", reject);
+                    resolve();
+                });
+            });
+            const address = server.address();
+            if (!address || typeof address === "string") {
+                throw new Error("HTTP MCP fixture did not bind a TCP port");
+            }
+            return `http://127.0.0.1:${address.port}/mcp`;
+        },
+        async close() {
+            server.closeAllConnections();
+            if (server.listening) {
+                await new Promise<void>((resolve, reject) => {
+                    server.close((error) => (error ? reject(error) : resolve()));
+                });
+            }
+        },
+    };
+}
+
+describe("Extension-provided HTTP MCP host parity", async () => {
+    const { env: harnessEnv, workDir } = await createSdkTestContext({
+        copilotClientOptions: { connection: RuntimeConnection.forStdio() },
+    });
+
+    it.for([
+        ["Node", false],
+        ["native", false],
+        ["Node", true],
+        ["native", true],
+    ] as const)(
+        "%s registers and invokes both tool sources (join after initialization: %s)",
+        { timeout: testTimeoutMs },
+        async ([host, joinAfterInitialization], { expect, signal, task }) => {
+            const fixture = createHttpMcpFixture();
+            const permissions: PermissionRequest[] = [];
+            const observations: Record<string, unknown> = {
+                host,
+                joinAfterInitialization,
+                extensionDigest,
+                stage: "preparation",
+            };
+            let client: CopilotClient | undefined;
+            let session: CopilotSession | undefined;
+            let creatingDirectory: Promise<string> | undefined;
+            let preparing: Promise<void> | undefined;
+            let starting: Promise<string> | undefined;
+            let logDirectory: string | undefined;
+            let failed = false;
+            onTestFailed(() => {
+                failed = true;
+                console.error(
+                    "Extension HTTP MCP stages:",
+                    JSON.stringify({
+                        ...observations,
+                        methods: fixture.methods,
+                        requests: fixture.requests,
+                        responses: fixture.responses,
+                        calls: fixture.calls,
+                    })
+                );
+            });
+            onTestFinished(async () => {
+                // Finished hooks can run before failure hooks; use the settled test result.
+                failed ||= task.result?.state === "fail";
+                const failures: unknown[] = [];
+                await Promise.allSettled(preparing ? [preparing] : []);
+                try {
+                    if (client) failures.push(...(await client.stop()));
+                } catch (error) {
+                    failures.push(error);
+                }
+                if (failed && logDirectory) {
+                    try {
+                        console.error(
+                            "Extension HTTP MCP shutdown logs:",
+                            JSON.stringify(await readOwnedLogTails(logDirectory))
+                        );
+                    } catch (error) {
+                        console.error("Could not retain extension HTTP MCP shutdown logs:", error);
+                    }
+                }
+                await Promise.allSettled(starting ? [starting] : []);
+                try {
+                    await fixture.close();
+                    fixture.assertHealthy();
+                } catch (error) {
+                    failures.push(error);
+                }
+                const [created] = await Promise.allSettled(
+                    creatingDirectory ? [creatingDirectory] : []
+                );
+                if (created?.status === "fulfilled") {
+                    try {
+                        await rm(created.value, { recursive: true, force: true });
+                    } catch (error) {
+                        failures.push(error);
+                    }
+                }
+                if (failures.length) {
+                    const error = new AggregateError(failures, "Extension HTTP MCP cleanup failed");
+                    if (failed) console.error(error);
+                    else throw error;
+                }
+            });
+
+            creatingDirectory = mkdtemp(join(workDir, "extension-http-mcp-"));
+            const ownedDirectory = await realpath(await creatingDirectory);
+            signal.throwIfAborted();
+            const home = join(ownedDirectory, "home");
+            logDirectory = join(home, "logs");
+            const extensionDirectory = join(home, "extensions", "http-probe");
+            const statusPath = join(ownedDirectory, "join-status.json");
+            const callsPath = join(ownedDirectory, "direct-calls.jsonl");
+            // Resolve the Node control only inside its case so native-only selectors need no legacy bundle.
+            const cliPath = host === "Node" ? await getLegacyCliPathForTests() : nativeCliPath;
+            signal.throwIfAborted();
+            if (host === "Node") expect(cliPath).not.toBe(nativeCliPath);
+            preparing = (async () => {
+                for (const path of [
+                    join(sdkDirectory, "index.js"),
+                    join(sdkDirectory, "extension.js"),
+                    join(cliDirectory, "preloads", "extension_bootstrap.mjs"),
+                    join(cliDirectory, "preloads", "extension_sdk_resolver.mjs"),
+                ]) {
+                    expect((await stat(path)).isFile(), `Missing prepared artifact: ${path}`).toBe(
+                        true
+                    );
+                }
+                execFileSync("git", ["init", "--quiet", ownedDirectory], { windowsHide: true });
+                await mkdir(extensionDirectory, { recursive: true });
+                const installedExtension = join(extensionDirectory, "extension.mjs");
+                await copyFile(extensionFixture, installedExtension);
+                expect(
+                    createHash("sha256")
+                        .update(await readFile(installedExtension))
+                        .digest("hex")
+                ).toBe(extensionDigest);
+            })();
+            await preparing;
+            signal.throwIfAborted();
+            starting = fixture.start();
+            const url = await starting;
+            signal.throwIfAborted();
+            client = new CopilotClient({
+                workingDirectory: ownedDirectory,
+                gitHubToken: DEFAULT_GITHUB_TOKEN,
+                logLevel: "debug",
+                connection: RuntimeConnection.forStdio({ path: cliPath }),
+                env: {
+                    ...harnessEnv,
+                    COPILOT_HOME: home,
+                    XDG_CONFIG_HOME: home,
+                    XDG_STATE_HOME: home,
+                    GH_CONFIG_DIR: home,
+                    GH_TOKEN: DEFAULT_GITHUB_TOKEN,
+                    GITHUB_TOKEN: DEFAULT_GITHUB_TOKEN,
+                    COPILOT_HMAC_KEY: "",
+                    CAPI_HMAC_KEY: "",
+                    COPILOT_CACHE_HOME: join(ownedDirectory, "cache"),
+                    COPILOT_PKG_CACHE_HOME: join(ownedDirectory, "package-cache"),
+                    COPILOT_DISABLE_KEYTAR: "1",
+                    COPILOT_CLI_ENABLED_FEATURE_FLAGS: "EXTENSIONS",
+                    TOOL_SEARCH_DISABLED: "1",
+                    COPILOT_MCP_TOOL_CACHE: "false",
+                    COPILOT_MCP_APPS: "false",
+                },
+                extensionLaunchProvider: {
+                    resolve: async (request) => {
+                        const launch = {
+                            executable: process.execPath,
+                            args: [join(cliDirectory, "preloads", "extension_bootstrap.mjs")],
+                            env: {
+                                COPILOT_CLI_DIST_DIR: cliDirectory,
+                                EXTENSION_PATH: request.modulePath,
+                                EXTENSION_HTTP_MCP_URL: url,
+                                EXTENSION_HTTP_MCP_STATUS: statusPath,
+                                EXTENSION_HTTP_MCP_CALLS: callsPath,
+                            },
+                        };
+                        observations.launch = {
+                            request,
+                            executable: launch.executable,
+                            args: launch.args,
+                        };
+                        return { launch };
+                    },
+                },
+            });
+            const onPermissionRequest: PermissionHandler = (request, invocation) => {
+                permissions.push(request);
+                return approveAll(request, invocation);
+            };
+            const config = {
+                enableConfigDiscovery: true,
+                extensionSdkPath: sdkDirectory,
+                disabledMcpServers: ["github-mcp-server"],
+                onPermissionRequest,
+            };
+            observations.stage = "session creation";
+            session = await client.createSession({
+                ...config,
+                requestExtensions: !joinAfterInitialization,
+            });
+            if (joinAfterInitialization) {
+                observations.stage = "initial tool graph without extensions";
+                await session.rpc.tools.initializeAndValidate();
+                expect((await session.rpc.tools.getCurrentMetadata()).tools).not.toBeNull();
+                expect(fixture.methods).toEqual([]);
+                observations.stage = "same-session resume with extensions";
+                session = await client.resumeSession(session.sessionId, {
+                    ...config,
+                    requestExtensions: true,
+                });
+            }
+            const activeSession = session;
+            observations.stage = "extension join";
+            await waitForCondition(
+                async () => {
+                    fixture.assertHealthy();
+                    const extensions = (await activeSession.rpc.extensions.list()).extensions;
+                    observations.extensions = extensions;
+                    const statusText = await readFile(statusPath, "utf8").catch(
+                        (error: NodeJS.ErrnoException) => {
+                            if (error.code === "ENOENT") return undefined;
+                            throw error;
+                        }
+                    );
+                    const status =
+                        statusText === undefined
+                            ? undefined
+                            : joinStatus.parse(JSON.parse(statusText));
+                    observations.join = status;
+                    if (status?.state === "failed") throw new Error(status.error);
+                    if (extensions.some((extension) => extension.status === "failed")) {
+                        throw new Error(
+                            `Extension launch failed: ${JSON.stringify(extensions)}; join status: ${statusText ?? "not written"}`
+                        );
+                    }
+                    if (status === undefined) return false;
+                    expect(status).toMatchObject({
+                        sessionId: activeSession.sessionId,
+                        sdkPath: sdkDirectory,
+                        mcpServers: {
+                            extensionprobe: {
+                                type: "http",
+                                url,
+                                tools: ["http_probe"],
+                                timeout: 5000,
+                            },
+                        },
+                    });
+                    return true;
+                },
+                {
+                    timeoutMs: stepTimeoutMs,
+                    timeoutMessage: "Extension did not acknowledge its join",
+                }
+            );
+            observations.stage = "configured inventory without reconciliation";
+            const configured = await activeSession.rpc.mcp.listConfigured();
+            observations.configuredBeforeInitialization = configured;
+            expect(configured.servers).toEqual(
+                expect.arrayContaining([
+                    expect.objectContaining({ name: serverName, enabled: true }),
+                ])
+            );
+            if (host === "native" && !joinAfterInitialization) {
+                // Observing accepted configuration must not eagerly connect a cold native graph.
+                expect(fixture.methods).toEqual([]);
+            }
+            if (!joinAfterInitialization) {
+                observations.stage = "cold tool initialization";
+                await activeSession.rpc.tools.initializeAndValidate();
+            }
+            observations.stage = "pure offered-tool catalog";
+            let metadata = (await activeSession.rpc.tools.getCurrentMetadata()).tools;
+            observations.metadata = metadata;
+            expect(metadata?.map((tool) => tool.name)).toContain(directToolName);
+            await waitForCondition(
+                async () => {
+                    fixture.assertHealthy();
+                    metadata = (await activeSession.rpc.tools.getCurrentMetadata()).tools;
+                    observations.metadata = metadata;
+                    return metadata?.some((tool) => tool.name === httpToolName) ?? false;
+                },
+                {
+                    timeoutMs: stepTimeoutMs,
+                    timeoutMessage: "Extension HTTP tool absent from the unreconciled catalog",
+                }
+            );
+            expect(fixture.methods).toContain("initialize");
+            expect(fixture.methods).toContain("tools/list");
+            expect(metadata).toEqual(
+                expect.arrayContaining([
+                    expect.objectContaining({
+                        name: httpToolName,
+                        mcpServerName: serverName,
+                        mcpToolName: "http_probe",
+                    }),
+                ])
+            );
+            const directMarker = randomUUID();
+            observations.stage = "direct callback invocation";
+            expect(
+                await activeSession.rpc.tools.execute({
+                    name: directToolName,
+                    arguments: { marker: directMarker },
+                    toolCallId: `direct-${directMarker}`,
+                })
+            ).toMatchObject({
+                resultType: "success",
+                textResultForLlm: `EXTENSION_DIRECT_REPLY_${directMarker}`,
+            });
+            expect(
+                (await readFile(callsPath, "utf8"))
+                    .trim()
+                    .split(/\r?\n/)
+                    .map((line) => JSON.parse(line))
+            ).toEqual([{ marker: directMarker }]);
+            expect(fixture.calls).toEqual([]);
+            const httpMarker = randomUUID();
+            observations.stage = "HTTP tool invocation";
+            expect(
+                await activeSession.rpc.tools.execute({
+                    name: httpToolName,
+                    arguments: { marker: httpMarker },
+                    toolCallId: `http-${httpMarker}`,
+                })
+            ).toMatchObject({
+                resultType: "success",
+                textResultForLlm: expect.stringContaining(`EXTENSION_HTTP_REPLY_${httpMarker}`),
+            });
+            expect(fixture.calls).toEqual([{ marker: httpMarker }]);
+            expect(permissions).toEqual(
+                expect.arrayContaining([
+                    expect.objectContaining({
+                        kind: "mcp",
+                        serverName,
+                        toolName: httpToolName,
+                        toolCallId: `http-${httpMarker}`,
+                        readOnly: false,
+                        args: { marker: httpMarker },
+                    }),
+                ])
+            );
+            fixture.assertHealthy();
+            observations.stage = "disconnect";
+            await activeSession.disconnect();
+            console.info(
+                "Extension HTTP MCP completed:",
+                JSON.stringify({
+                    host,
+                    joinAfterInitialization,
+                    configured,
+                    offeredNames: metadata?.map((tool) => tool.name),
+                    methods: fixture.methods,
+                    requests: fixture.requests,
+                    responses: fixture.responses,
+                    calls: fixture.calls,
+                    permissions,
+                })
+            );
+        }
+    );
+});
diff --git a/nodejs/test/e2e/rpc_extensions_loaded.e2e.test.ts b/nodejs/test/e2e/rpc_extensions_loaded.e2e.test.ts
index c2dd9f3931..5f3f4f89e4 100644
--- a/nodejs/test/e2e/rpc_extensions_loaded.e2e.test.ts
+++ b/nodejs/test/e2e/rpc_extensions_loaded.e2e.test.ts
@@ -191,7 +191,6 @@ it(
             const active = await client.createSession(config);
             try {
                 await waitForExtension(active, id, "running");
-                await client.rpc.user.settings.reload();
                 expect((await client.rpc.extensions.discover()).extensions).toEqual(
                     expect.arrayContaining([
                         expect.objectContaining({ id, enabled: true, source: "user" }),
diff --git a/nodejs/test/e2e/rpc_mcp_and_skills.e2e.test.ts b/nodejs/test/e2e/rpc_mcp_and_skills.e2e.test.ts
index 82f5afb685..593d6c215a 100644
--- a/nodejs/test/e2e/rpc_mcp_and_skills.e2e.test.ts
+++ b/nodejs/test/e2e/rpc_mcp_and_skills.e2e.test.ts
@@ -620,16 +620,12 @@ describe("Session MCP and skills RPC", async () => {
         }
     });
 
-    it("should report error when mcp host is not initialized", async () => {
+    it("should allow cold enablement while rejecting operations that require an MCP host", async () => {
         const session = await client.createSession({ onPermissionRequest: approveAll });
 
-        await expectFailure(
-            () => session.rpc.mcp.enable({ serverName: "missing-server" }),
-            "No MCP host initialized"
-        );
-        await expectFailure(
-            () => session.rpc.mcp.disable({ serverName: "missing-server" }),
-            "No MCP host initialized"
+        await expect(session.rpc.mcp.enable({ serverName: "missing-server" })).resolves.toEqual({});
+        await expect(session.rpc.mcp.disable({ serverName: "missing-server" })).resolves.toEqual(
+            {}
         );
         await expectFailure(() => session.rpc.mcp.reload(), "MCP config reload not available");
         await expectFailure(
@@ -689,6 +685,9 @@ describe("Session MCP and skills RPC", async () => {
             "Extensions not available"
         );
         await expectFailure(() => session.rpc.extensions.reload(), "Extensions not available");
+        await expect(session.rpc.extensions.reconcile()).rejects.toMatchObject({
+            data: { code: "extension_reconciliation_unavailable", lifecycleChangesApplied: false },
+        });
 
         await session.disconnect();
     });
diff --git a/nodejs/test/e2e/rpc_mcp_lifecycle.e2e.test.ts b/nodejs/test/e2e/rpc_mcp_lifecycle.e2e.test.ts
index 40f837434d..b47eed190d 100644
--- a/nodejs/test/e2e/rpc_mcp_lifecycle.e2e.test.ts
+++ b/nodejs/test/e2e/rpc_mcp_lifecycle.e2e.test.ts
@@ -86,6 +86,103 @@ describe("Session-scoped MCP lifecycle RPC", async () => {
         expect(message.toLowerCase()).not.toContain("unhandled method");
     }
 
+    async function offeredToolNames(session: CopilotSession): Promise<string[]> {
+        await session.rpc.tools.initializeAndValidate();
+        const { tools } = await session.rpc.tools.getCurrentMetadata();
+        if (tools === null) {
+            throw new Error("initializeAndValidate did not initialize session tools");
+        }
+        return tools.map((tool) => tool.name);
+    }
+
+    it("should start an ephemeral server from caller config and reuse its replacement", async () => {
+        const serverName = missingName("ephemeral");
+        const session = await client.createSession({ onPermissionRequest: approveAll });
+        try {
+            const persistedBefore = await client.rpc.mcp.config.list();
+            const initialConfig = {
+                type: "stdio" as const,
+                command: "node",
+                args: [TEST_MCP_SERVER, "--tool-name", "ephemeral_initial"],
+                cwd: TEST_HARNESS_DIR,
+                excludeTools: ["ephemeral_initial"],
+                disableToolCache: true,
+            };
+            await session.rpc.mcp.startServer({ serverName, config: initialConfig });
+            expect(
+                (await session.rpc.mcp.listTools({ serverName })).tools.map((tool) => tool.name)
+            ).toEqual(["ephemeral_initial"]);
+            expect(await offeredToolNames(session)).not.toContain(
+                `${serverName}-ephemeral_initial`
+            );
+            expect((await session.rpc.mcp.isServerRunning({ serverName })).running).toBe(true);
+
+            await session.rpc.mcp.restartServer({
+                serverName,
+                config: {
+                    ...initialConfig,
+                    args: [TEST_MCP_SERVER, "--tool-name", "ephemeral_replacement"],
+                },
+            });
+            expect(await offeredToolNames(session)).toContain(
+                `${serverName}-ephemeral_replacement`
+            );
+            await session.rpc.mcp.stopServer({ serverName });
+            expect((await session.rpc.mcp.isServerRunning({ serverName })).running).toBe(false);
+            await session.rpc.mcp.startServer({ serverName });
+            await session.rpc.mcp.restartServer({ serverName });
+            expect(
+                (await session.rpc.mcp.listTools({ serverName })).tools.map((tool) => tool.name)
+            ).toEqual(["ephemeral_replacement"]);
+            expect(await client.rpc.mcp.config.list()).toEqual(persistedBefore);
+        } finally {
+            await session.disconnect();
+        }
+        const nextSession = await client.createSession({ onPermissionRequest: approveAll });
+        try {
+            expect(
+                (await nextSession.rpc.mcp.listConfigured()).servers.some(
+                    (server) => server.name === serverName
+                )
+            ).toBe(false);
+        } finally {
+            await nextSession.disconnect();
+        }
+    });
+
+    it("should replace the registered config when restarting an installed server", async () => {
+        const serverName = "rpc-lifecycle-replace-server";
+        const session = await createSessionWithMcp(serverName);
+        try {
+            await waitForMcpServerStatus(session, serverName);
+            expect(
+                (await session.rpc.mcp.listTools({ serverName })).tools.map((tool) => tool.name)
+            ).toEqual(["get_env"]);
+            expect(await offeredToolNames(session)).toContain(`${serverName}-get_env`);
+            await session.rpc.mcp.restartServer({
+                serverName,
+                config: {
+                    type: "stdio",
+                    command: "node",
+                    args: [TEST_MCP_SERVER, "--tool-name", "installed_replacement"],
+                    cwd: TEST_HARNESS_DIR,
+                    tools: ["*"],
+                    excludeTools: ["installed_replacement"],
+                    disableToolCache: true,
+                },
+            });
+            expect(
+                (await session.rpc.mcp.listTools({ serverName })).tools.map((tool) => tool.name)
+            ).toEqual(["installed_replacement"]);
+            const offered = await offeredToolNames(session);
+            expect(offered).not.toContain(`${serverName}-installed_replacement`);
+            expect(offered).not.toContain(`${serverName}-get_env`);
+            expect((await session.rpc.mcp.isServerRunning({ serverName })).running).toBe(true);
+        } finally {
+            await session.disconnect();
+        }
+    });
+
     it(
         "should list tools and report running status for connected server",
         { timeout: 120_000 },
diff --git a/nodejs/test/e2e/rpc_server.e2e.test.ts b/nodejs/test/e2e/rpc_server.e2e.test.ts
index d89b2c3e1e..16e3d1411a 100644
--- a/nodejs/test/e2e/rpc_server.e2e.test.ts
+++ b/nodejs/test/e2e/rpc_server.e2e.test.ts
@@ -4,6 +4,7 @@
 
 import * as fs from "fs";
 import * as path from "path";
+import { execFileSync } from "node:child_process";
 import { randomUUID } from "node:crypto";
 import { describe, expect, it, onTestFinished } from "vitest";
 import { CopilotClient, RuntimeConnection } from "../../src/index.js";
@@ -110,7 +111,21 @@ describe("Server-scoped RPC", async () => {
 
     it.skipIf(isInProcessTransport)("should round trip sessionless managed settings", async () => {
         const policyPath = path.join(workDir, "managed-settings.json");
-        const policy = { model: "gpt-5.4", autoTier: "balance" };
+        const policy = {
+            model: "auto",
+            autoTier: "balance",
+            permissions: {
+                limitTo: ["Domain(*.example.com)"],
+                deny: ["Domain(blocked.example.com)"],
+                ask: ["Domain(prompt.example.com)"],
+                allow: ["Domain(allowed.example.com)"],
+            },
+        };
+        const concretePolicy = {
+            model: "gpt-5",
+            effortLevel: { overridable: "high" },
+            contextTier: "long_context",
+        };
         fs.writeFileSync(policyPath, JSON.stringify(policy));
         const policyClient = new CopilotClient({
             workingDirectory: workDir,
@@ -140,6 +155,10 @@ describe("Server-scoped RPC", async () => {
         expect(validated.valid).toBe(true);
         expect(validated.settings).toEqual(policy);
         expect(validated.diagnostics).toEqual([]);
+        const validatedConcrete = await api.validate({ content: concretePolicy });
+        expect(validatedConcrete.valid).toBe(true);
+        expect(validatedConcrete.settings).toEqual(concretePolicy);
+        expect(validatedConcrete.diagnostics).toEqual([]);
 
         const resolved = await api.resolve({});
         expect(resolved.account).toBeUndefined();
@@ -162,6 +181,136 @@ describe("Server-scoped RPC", async () => {
         ).rejects.toMatchObject({ code: -32602 });
         const absent = await api.compose({ layers: [{ source: "device" }] });
         expect(absent.resolved.source).toBe("none");
+
+        const permissionsContext = resolved.permissionsContext;
+        if (!permissionsContext) {
+            throw new Error("Runtime omitted the managed permission evaluation context");
+        }
+        expect(
+            await api.permissions.evaluate({
+                context: permissionsContext,
+                operations: [
+                    { kind: "url", url: "https://allowed.example.com/guide" },
+                    { kind: "url", url: "https://prompt.example.com/" },
+                    { kind: "url", url: "https://blocked.example.com/" },
+                    { kind: "url", url: "https://outside.test/" },
+                ],
+            })
+        ).toEqual({
+            failClosed: false,
+            results: [
+                {
+                    operation: { kind: "url", url: "https://allowed.example.com/guide" },
+                    verdict: "allow",
+                },
+                { operation: { kind: "url", url: "https://prompt.example.com/" }, verdict: "ask" },
+                {
+                    operation: { kind: "url", url: "https://blocked.example.com/" },
+                    verdict: "deny",
+                },
+                { operation: { kind: "url", url: "https://outside.test/" }, verdict: "deny" },
+            ],
+        });
+        await expect(
+            api.permissions.evaluate({
+                context: permissionsContext,
+                operations: [{ kind: "url", url: "not-a-url" }],
+            })
+        ).rejects.toMatchObject({ code: -32602 });
+        await expect(api.resolve({ selectionId: "missing-account" })).rejects.toThrow();
+
+        const managedSession = await policyClient.createSession({
+            enableManagedSettings: true,
+            model: "auto",
+        });
+        onTestFinished(() => managedSession.disconnect());
+        await expect
+            .poll(() => managedSession.rpc.model.getCurrent())
+            .toMatchObject({ modelId: "auto", autoTier: "balance" });
+
+        const explicitSession = await policyClient.createSession({
+            enableManagedSettings: true,
+            model: "auto",
+            capi: { autoTier: "fast" },
+        });
+        onTestFinished(() => explicitSession.disconnect());
+        await expect
+            .poll(() => explicitSession.rpc.model.getCurrent())
+            .toMatchObject({ modelId: "auto", autoTier: "fast" });
+
+        const concretePolicyPath = path.join(workDir, "managed-concrete-settings.json");
+        fs.writeFileSync(
+            concretePolicyPath,
+            JSON.stringify({
+                model: "gpt-5",
+                effortLevel: "high",
+                contextTier: "long_context",
+            })
+        );
+        const concretePolicyClient = new CopilotClient({
+            workingDirectory: workDir,
+            connection: RuntimeConnection.forStdio({ path: process.env.COPILOT_CLI_PATH }),
+            useLoggedInUser: false,
+            env: {
+                ...env,
+                GH_TOKEN: "",
+                GITHUB_TOKEN: "",
+                COPILOT_GITHUB_TOKEN: "",
+                GITHUB_COPILOT_API_TOKEN: "",
+                COPILOT_HMAC_KEY: "",
+                CAPI_HMAC_KEY: "",
+                COPILOT_E2E_TEST_HOOKS: "1",
+                COPILOT_TEST_MANAGED_SETTINGS_FILE_PATH: concretePolicyPath,
+            },
+        });
+        onTestFinished(() => concretePolicyClient.stop());
+        await concretePolicyClient.start();
+
+        const enforcedSession = await concretePolicyClient.createSession({
+            enableManagedSettings: true,
+            enforceManagedModelDefaults: true,
+            model: "gpt-5",
+        });
+        onTestFinished(() => enforcedSession.disconnect());
+        await expect(enforcedSession.rpc.managedSettings.get()).resolves.toMatchObject({
+            settings: {
+                model: "gpt-5",
+                effortLevel: "high",
+                contextTier: "long_context",
+            },
+        });
+        await expect
+            .poll(() => enforcedSession.rpc.model.getCurrent())
+            .toMatchObject({
+                modelId: "gpt-5",
+                reasoningEffort: "high",
+                contextTier: "long_context",
+            });
+        await expect(
+            enforcedSession.rpc.model.setReasoningEffort({ reasoningEffort: "low" })
+        ).rejects.toThrow(/reasoningEffort is locked to 'high'/);
+
+        const relaxedSession = await concretePolicyClient.resumeSession(enforcedSession.sessionId, {
+            enableManagedSettings: true,
+            enforceManagedModelDefaults: false,
+        });
+        onTestFinished(() => relaxedSession.disconnect());
+        await expect(
+            relaxedSession.rpc.model.setReasoningEffort({ reasoningEffort: "low" })
+        ).resolves.toMatchObject({ reasoningEffort: "low" });
+        await relaxedSession.rpc.model.setReasoningEffort({ reasoningEffort: "high" });
+
+        const reenforcedSession = await concretePolicyClient.resumeSession(
+            enforcedSession.sessionId,
+            {
+                enableManagedSettings: true,
+                enforceManagedModelDefaults: true,
+            }
+        );
+        onTestFinished(() => reenforcedSession.disconnect());
+        await expect(
+            reenforcedSession.rpc.model.setReasoningEffort({ reasoningEffort: "low" })
+        ).rejects.toThrow(/reasoningEffort is locked to 'high'/);
     });
 
     it("should reject llm inference response frames for missing request", async () => {
@@ -542,6 +691,37 @@ describe("Server-scoped RPC", async () => {
         );
     });
 
+    it("should discover all 128 custom agents including deeply nested definitions", async () => {
+        const projectPath = createUniqueWorkDirectory("server-rpc-agents");
+        execFileSync("git", ["init", "--quiet"], {
+            cwd: projectPath,
+            env,
+            windowsHide: true,
+        });
+        const agentsDirectory = path.join(projectPath, ".github", "agents");
+        const nestedDirectory = path.join(agentsDirectory, ...Array<string>(12).fill("d"));
+        fs.mkdirSync(nestedDirectory, { recursive: true });
+        const expectedNames = Array.from(
+            { length: 128 },
+            (_, index) => `agent-${index.toString().padStart(3, "0")}`
+        );
+        for (const [index, name] of expectedNames.entries()) {
+            const directory = index === 127 ? nestedDirectory : agentsDirectory;
+            fs.writeFileSync(
+                path.join(directory, `${name}.agent.md`),
+                `---\nname: ${name}\ndescription: Test agent.\n---\nAgent prompt.`
+            );
+        }
+
+        await client.start();
+        const result = await client.rpc.agents.discover({
+            projectPaths: [projectPath],
+            excludeHostAgents: true,
+        });
+
+        expect(result.agents.map((agent) => agent.name).sort()).toEqual(expectedNames);
+    });
+
     it("should discover server mcp and skills", async () => {
         await client.start();
 
diff --git a/nodejs/test/e2e/rpc_server_connectors.e2e.test.ts b/nodejs/test/e2e/rpc_server_connectors.e2e.test.ts
new file mode 100644
index 0000000000..5cf8fc465f
--- /dev/null
+++ b/nodejs/test/e2e/rpc_server_connectors.e2e.test.ts
@@ -0,0 +1,189 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { randomUUID } from "node:crypto";
+import { mkdirSync, rmSync } from "node:fs";
+import { createServer, type Server } from "node:http";
+import type { AddressInfo } from "node:net";
+import { join } from "node:path";
+import { describe, expect, it } from "vitest";
+import { CopilotClient, RuntimeConnection } from "../../src/index.js";
+import { createSdkTestContext } from "./harness/sdkTestContext.js";
+
+const CATALOG_PATH = "/copilot-connectors/api/v1/plugins";
+
+interface CatalogRequest {
+    token: string;
+    ifNoneMatch?: string;
+    statusCode: number;
+}
+
+/**
+ * Serves the GitHub API routes client-level Connector discovery needs: the
+ * Copilot-user lookup that resolves the SDK credential's login, and a Connector
+ * catalog that honors `If-None-Match` so conditional revalidation is observable.
+ */
+async function startGitHubApi(login: string, capiUrl: string, etag: string) {
+    const catalogRequests: CatalogRequest[] = [];
+    const server: Server = createServer((req, res) => {
+        const url = req.url ?? "/";
+        if (req.method === "GET" && url.startsWith("/copilot_internal/user")) {
+            res.writeHead(200, { "content-type": "application/json" });
+            res.end(
+                JSON.stringify({
+                    login,
+                    copilot_plan: "individual_pro",
+                    endpoints: { api: capiUrl, telemetry: "https://localhost:1/telemetry" },
+                    analytics_tracking_id: "connector-discovery-tracking-id",
+                })
+            );
+            return;
+        }
+        if (req.method === "GET" && url.startsWith(CATALOG_PATH)) {
+            const token = String(req.headers.authorization ?? "").replace(
+                /^(?:Bearer|token)\s+/i,
+                ""
+            );
+            const ifNoneMatch =
+                typeof req.headers["if-none-match"] === "string"
+                    ? req.headers["if-none-match"]
+                    : undefined;
+            const statusCode = ifNoneMatch === etag ? 304 : 200;
+            catalogRequests.push({
+                token,
+                ...(ifNoneMatch === undefined ? {} : { ifNoneMatch }),
+                statusCode,
+            });
+            if (statusCode === 304) {
+                res.writeHead(304, { etag });
+                res.end();
+                return;
+            }
+            res.writeHead(200, { "content-type": "application/json", etag });
+            res.end(
+                JSON.stringify({
+                    plugins: [
+                        {
+                            name: "mail",
+                            connection: { status: "not_connected" },
+                            metadata: { displayName: "Mail Connector" },
+                            mcpServers: {
+                                mcpServers: {
+                                    mail: { type: "http", url: "https://connector.invalid/mcp" },
+                                },
+                            },
+                        },
+                    ],
+                })
+            );
+            return;
+        }
+        res.writeHead(404, { "content-type": "application/json" });
+        res.end(JSON.stringify({ message: "Not Found" }));
+    });
+    await new Promise<void>((resolve, reject) => {
+        server.once("error", reject);
+        server.listen(0, "127.0.0.1", () => resolve());
+    });
+    const { port } = server.address() as AddressInfo;
+    return {
+        url: `http://127.0.0.1:${port}`,
+        catalogRequests,
+        close: () =>
+            new Promise<void>((resolve) => {
+                server.closeAllConnections();
+                server.close(() => resolve());
+            }),
+    };
+}
+
+describe("Client-level Connector discovery", async () => {
+    const { env, workDir } = await createSdkTestContext();
+
+    it(
+        "should discover and revalidate the Connector catalog without a session",
+        { timeout: 120_000 },
+        async () => {
+            const login = `connector-discovery-${randomUUID().replaceAll("-", "")}`;
+            const token = `connector-discovery-token-${randomUUID().replaceAll("-", "")}`;
+            const etag = 'W/"connector-discovery-v1"';
+            const gitHubApi = await startGitHubApi(login, env.COPILOT_API_URL, etag);
+            const home = join(workDir, `copilot-e2e-connectors-home-${randomUUID()}`);
+            mkdirSync(home, { recursive: true });
+            const client = new CopilotClient({
+                workingDirectory: workDir,
+                env: {
+                    ...env,
+                    COPILOT_HOME: home,
+                    GH_CONFIG_DIR: home,
+                    XDG_CONFIG_HOME: home,
+                    XDG_STATE_HOME: home,
+                    GH_TOKEN: "",
+                    GITHUB_TOKEN: "",
+                    COPILOT_DEBUG_GITHUB_API_URL: gitHubApi.url,
+                    COPILOT_EXP_COPILOT_CLI_MANAGED_MCP_SERVERS: "true",
+                },
+                logLevel: "error",
+                connection: RuntimeConnection.forStdio({ path: process.env.COPILOT_CLI_PATH }),
+                gitHubToken: token,
+            });
+            try {
+                await client.start();
+                expect(await client.listSessions()).toEqual([]);
+
+                const capabilities = await client.rpc.connectors.getCapabilities();
+                expect(capabilities).toEqual({
+                    apiVersion: 1,
+                    availability: "enabled",
+                    conditionalCache: true,
+                    opaqueAccountSelection: true,
+                });
+
+                const accounts = await client.rpc.connectors.getAccounts();
+                expect(accounts.availability).toBe("enabled");
+                const account = accounts.accounts.find(
+                    (candidate) => candidate.authInfo.login === login
+                );
+                expect(account).toBeDefined();
+                expect(account!.authInfo.host).toBe("https://github.com");
+                expect(Object.keys(account!).sort()).toEqual(["accountId", "authInfo"]);
+                expect(Object.keys(account!.authInfo).sort()).toEqual(["host", "login", "type"]);
+                expect(JSON.stringify(accounts)).not.toContain(token);
+                const accountId = account!.accountId;
+
+                await expect(
+                    client.rpc.connectors.list({ accountId: "unknown-discovery-account" })
+                ).rejects.toThrow(/account selection/i);
+
+                const catalog = await client.rpc.connectors.refresh({ accountId });
+                expect(catalog.accountId).toBe(accountId);
+                expect(catalog.revision).toBeGreaterThan(0);
+                expect(catalog.connectors).toEqual([
+                    { name: "mail", displayName: "Mail Connector", status: "not_connected" },
+                ]);
+                expect(JSON.stringify(catalog)).not.toContain("connector.invalid");
+
+                const revalidated = await client.rpc.connectors.refresh({ accountId });
+                expect(revalidated).toEqual(catalog);
+                expect(gitHubApi.catalogRequests).toEqual([
+                    { token, statusCode: 200 },
+                    { token, ifNoneMatch: etag, statusCode: 304 },
+                ]);
+
+                const cached = await client.rpc.connectors.list({ accountId });
+                expect(cached).toEqual(catalog);
+                expect(gitHubApi.catalogRequests).toHaveLength(2);
+                expect(await client.listSessions()).toEqual([]);
+            } finally {
+                try {
+                    await client.stop();
+                } catch {
+                    // Best-effort cleanup.
+                }
+                await gitHubApi.close();
+                rmSync(home, { recursive: true, force: true });
+            }
+        }
+    );
+});
diff --git a/nodejs/test/e2e/rpc_server_misc.e2e.test.ts b/nodejs/test/e2e/rpc_server_misc.e2e.test.ts
index 4f12e507a5..1ada908850 100644
--- a/nodejs/test/e2e/rpc_server_misc.e2e.test.ts
+++ b/nodejs/test/e2e/rpc_server_misc.e2e.test.ts
@@ -88,12 +88,6 @@ describe("Miscellaneous server-scoped RPC", async () => {
         }
     }
 
-    it("should reload user settings", { timeout: 120_000 }, async () => {
-        await client.start();
-
-        await client.rpc.user.settings.reload();
-    });
-
     it("should get set and clear user settings", { timeout: 120_000 }, async () => {
         const { client: isolatedClient, home } = await createIsolatedStartedClient();
         try {
@@ -111,12 +105,10 @@ describe("Miscellaneous server-scoped RPC", async () => {
             const [settingKey, setting] = entry!;
             const toggledValue = setting.value !== true;
 
-            const set = await isolatedClient.rpc.user.settings.set({
+            await isolatedClient.rpc.user.settings.set({
                 settings: { [settingKey]: toggledValue },
             });
-            expect(set.shadowedKeys).not.toContain(settingKey);
 
-            await isolatedClient.rpc.user.settings.reload();
             const afterSet = await isolatedClient.rpc.user.settings.get();
             expect(afterSet.settings[settingKey].isDefault).toBe(false);
             expect(afterSet.settings[settingKey].value).toBe(toggledValue);
@@ -124,7 +116,6 @@ describe("Miscellaneous server-scoped RPC", async () => {
             await isolatedClient.rpc.user.settings.set({
                 settings: { [settingKey]: null },
             });
-            await isolatedClient.rpc.user.settings.reload();
             const afterClear = await isolatedClient.rpc.user.settings.get();
             expect(afterClear.settings[settingKey].isDefault).toBe(true);
         } finally {
@@ -213,14 +204,14 @@ describe("Miscellaneous server-scoped RPC", async () => {
         const dedicatedClient = createClient({}, DEFAULT_GITHUB_TOKEN);
         try {
             await dedicatedClient.start();
-            await dedicatedClient.rpc.user.settings.reload();
+            await dedicatedClient.rpc.user.settings.get();
 
             await dedicatedClient.rpc.runtime.shutdown();
 
             await waitForCondition(
                 async () => {
                     try {
-                        await dedicatedClient.rpc.user.settings.reload();
+                        await dedicatedClient.rpc.user.settings.get();
                         return false;
                     } catch {
                         return true;
diff --git a/nodejs/test/e2e/rpc_server_plugins.e2e.test.ts b/nodejs/test/e2e/rpc_server_plugins.e2e.test.ts
index 20575a9114..2ce0800f4a 100644
--- a/nodejs/test/e2e/rpc_server_plugins.e2e.test.ts
+++ b/nodejs/test/e2e/rpc_server_plugins.e2e.test.ts
@@ -3,15 +3,25 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { randomUUID } from "node:crypto";
-import { mkdirSync, rmSync, writeFileSync } from "node:fs";
-import { join } from "node:path";
-import { describe, expect, it } from "vitest";
-import { CopilotClient, RuntimeConnection } from "../../src/index.js";
+import { mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
+import { join, dirname } from "node:path";
+import { fileURLToPath } from "node:url";
+import { describe, expect, it, onTestFinished } from "vitest";
+import {
+    approveAll,
+    CopilotClient,
+    RuntimeConnection,
+    type CopilotSession,
+} from "../../src/index.js";
 import { createSdkTestContext, DEFAULT_GITHUB_TOKEN } from "./harness/sdkTestContext.js";
+import { waitForCondition } from "./harness/sdkTestHelper.js";
 
 const MARKETPLACE_NAME = "csharp-e2e-marketplace";
 const PLUGIN_NAME = "csharp-e2e-plugin";
 const DIRECT_PLUGIN_NAME = "csharp-e2e-direct";
+const TEST_MCP_SERVER = fileURLToPath(
+    new URL("../../../test/harness/test-mcp-server.mjs", import.meta.url)
+);
 
 describe("Server-scoped plugin RPC", async () => {
     const { env, workDir } = await createSdkTestContext();
@@ -127,6 +137,110 @@ This skill exists so the plugin reports at least one installed skill.
         writeFileSync(join(pluginDir, "SKILL.md"), skill);
     }
 
+    it(
+        "keeps unrelated MCP servers running when Computer Use is toggled",
+        { timeout: 120_000 },
+        async ({ expect }) => {
+            const pluginDir = createUniqueDirectory("computer-use");
+            const { client, home } = await createIsolatedStartedClient();
+            let session: CopilotSession | undefined;
+            onTestFinished(async () => {
+                try {
+                    await session?.disconnect();
+                } finally {
+                    await disposeIsolated(client, home, pluginDir);
+                }
+            });
+            writeFileSync(
+                join(pluginDir, "plugin.json"),
+                JSON.stringify({
+                    name: "computer-use",
+                    version: "1.0.0",
+                    mcpServers: "./.mcp.json",
+                })
+            );
+            writeFileSync(
+                join(pluginDir, ".mcp.json"),
+                JSON.stringify({
+                    mcpServers: {
+                        "computer-use": {
+                            command: process.execPath,
+                            args: [TEST_MCP_SERVER, "--server-name", "computer-use"],
+                            cwd: dirname(TEST_MCP_SERVER),
+                            tools: ["*"],
+                        },
+                    },
+                })
+            );
+            await client.rpc.plugins.builtin.set({ paths: [pluginDir] });
+            const serverName = "unrelated-to-computer-use";
+            const startupMarker = join(home, "unrelated-mcp-starts.log");
+            const mcpSession = await client.createSession({
+                onPermissionRequest: approveAll,
+                mcpServers: {
+                    [serverName]: {
+                        type: "local",
+                        command: process.execPath,
+                        args: [
+                            TEST_MCP_SERVER,
+                            "--startup-marker",
+                            startupMarker,
+                            "--server-name",
+                            serverName,
+                        ],
+                        workingDirectory: dirname(TEST_MCP_SERVER),
+                        tools: ["*"],
+                    },
+                },
+            });
+            session = mcpSession;
+            const waitForConnected = (name: string) =>
+                waitForCondition(
+                    async () =>
+                        (await mcpSession.rpc.mcp.list()).servers.some(
+                            (server) => server.name === name && server.status === "connected"
+                        ),
+                    {
+                        timeoutMs: 60_000,
+                        intervalMs: 200,
+                        timeoutMessage: `${name} did not connect`,
+                    }
+                );
+            await waitForConnected(serverName);
+            expect(readFileSync(startupMarker, "utf8")).toBe(`${serverName}\n`);
+            const toolsBefore = await mcpSession.rpc.mcp.listTools({ serverName });
+            expect(toolsBefore.tools.map((tool) => tool.name)).toContain("get_env");
+            expect(
+                (await mcpSession.rpc.mcp.list()).servers.map((server) => server.name)
+            ).not.toContain("computer-use");
+
+            for (const enabled of [true, false, true, false]) {
+                if (enabled) {
+                    await client.rpc.plugins.enable({ names: ["computer-use"] });
+                    await waitForConnected("computer-use");
+                } else {
+                    await client.rpc.plugins.disable({ names: ["computer-use"] });
+                    await waitForCondition(
+                        async () =>
+                            !(await mcpSession.rpc.mcp.list()).servers.some(
+                                (server) => server.name === "computer-use"
+                            ),
+                        {
+                            timeoutMs: 60_000,
+                            intervalMs: 200,
+                            timeoutMessage: "Computer Use MCP server was not removed",
+                        }
+                    );
+                }
+                expect((await mcpSession.rpc.mcp.isServerRunning({ serverName })).running).toBe(
+                    true
+                );
+                expect(await mcpSession.rpc.mcp.listTools({ serverName })).toEqual(toolsBefore);
+                expect(readFileSync(startupMarker, "utf8")).toBe(`${serverName}\n`);
+            }
+        }
+    );
+
     it("should install and list plugin from local marketplace", { timeout: 120_000 }, async () => {
         const marketplaceDir = createLocalMarketplaceFixture();
         const { client, home } = await createIsolatedStartedClient();
diff --git a/nodejs/test/e2e/rpc_session_state.e2e.test.ts b/nodejs/test/e2e/rpc_session_state.e2e.test.ts
index aab08b3bc5..9efa6dfdc9 100644
--- a/nodejs/test/e2e/rpc_session_state.e2e.test.ts
+++ b/nodejs/test/e2e/rpc_session_state.e2e.test.ts
@@ -45,6 +45,7 @@ describe("Session-scoped RPC", async () => {
 
         const result = await session.rpc.model.getCurrent();
         expect(result.modelId).toBeTruthy();
+        expect("clearStartupSeed" in session.rpc.model).toBe(false);
 
         await session.disconnect();
     });
@@ -79,6 +80,13 @@ describe("Session-scoped RPC", async () => {
 
             expect(result.modelId).toBe("gpt-5.4");
             expect(after.modelId).toBe("gpt-5.4");
+            await expect(
+                session.rpc.model.switchTo({
+                    modelId: "gpt-5.4",
+                    providerId: "missing-provider",
+                })
+            ).rejects.toThrow("unavailable from the requested provider");
+            expect(await session.rpc.model.getCurrent()).toEqual(after);
 
             await session.disconnect();
         });
@@ -296,6 +304,60 @@ describe("Session-scoped RPC", async () => {
         }
     });
 
+    it("should read the reasoning-summaries policy for the current model", async () => {
+        const session = await client.createSession({
+            onPermissionRequest: approveAll,
+            model: "claude-sonnet-5",
+            // This policy needs the CAPI catalog; legacy BYOK sessions skip it.
+            // An explicit provider roster keeps the harness from replacing CAPI.
+            providers: [],
+        });
+
+        try {
+            // `ready` stays false until the session has resolved its model
+            // catalog, which only happens once something asks for it. Prime the
+            // session's model-list cache so the policy reports the real answer
+            // instead of the not-ready placeholder.
+            await session.rpc.model.list();
+
+            const policy = await session.rpc.model.getReasoningSummaries({});
+            expect(policy.ready).toBe(true);
+            expect(typeof policy.experimentSettled).toBe("boolean");
+            expect(typeof policy.modelDefaultShowsSummaries).toBe("boolean");
+            expect(typeof policy.showReasoningHeaders).toBe("boolean");
+            // No session-level reasoning-summary override, so the session
+            // follows the selected model's default.
+            expect(policy.sessionShowsSummaries).toBe(policy.modelDefaultShowsSummaries);
+
+            // A persisted setting decides visibility whatever the experiment
+            // assignment is, and one that restates the model default is
+            // reported as redundant.
+            const redundant = await session.rpc.model.getReasoningSummaries({
+                persistedShowReasoning: policy.modelDefaultShowsSummaries,
+            });
+            expect(redundant.visibility).toBe(policy.modelDefaultShowsSummaries);
+            expect(redundant.clearRedundantSetting).toBe(true);
+
+            const opposed = await session.rpc.model.getReasoningSummaries({
+                persistedShowReasoning: !policy.modelDefaultShowsSummaries,
+            });
+            expect(opposed.visibility).toBe(!policy.modelDefaultShowsSummaries);
+            expect(opposed.clearRedundantSetting).toBe(false);
+
+            // A visible view never asks for the "summaries are hidden" hint,
+            // and a pending experiment assignment never asks for it either.
+            const visible = await session.rpc.model.getReasoningSummaries({
+                summariesVisible: true,
+            });
+            expect(visible.showHiddenHint).toBe(false);
+            if (!policy.experimentSettled) {
+                expect(policy.showHiddenHint).toBe(false);
+            }
+        } finally {
+            await session.disconnect();
+        }
+    });
+
     it("should get and set session metadata", async () => {
         const session = await client.createSession({ onPermissionRequest: approveAll });
 
@@ -674,7 +736,30 @@ describe("Session-scoped RPC", async () => {
     it("should call session usage and permission rpcs", async () => {
         const session = await client.createSession({ onPermissionRequest: approveAll });
 
+        const quota = await session.rpc.quota.get();
+        expect(quota).toMatchObject({
+            snapshots: expect.any(Object),
+            isFreeUser: expect.any(Boolean),
+            isTbbUser: expect.any(Boolean),
+            planTier: expect.any(String),
+            dynamicWorkflowsEnabled: expect.any(Boolean),
+        });
+        const refreshedQuota = await session.rpc.quota.refresh();
+        expect(await session.rpc.quota.get()).toEqual(refreshedQuota);
+        const warnings = await session.rpc.quota.takeWarnings();
+        for (const warning of warnings) {
+            expect(warning).toMatchObject({
+                warningType: expect.any(String),
+                message: expect.any(String),
+            });
+        }
+        expect(await session.rpc.quota.takeWarnings()).toEqual([]);
+
         const metrics = await session.rpc.usage.getMetrics();
+        expect(metrics.providerModelMetrics).toEqual([]);
+        expect("setCodeChanges" in session.rpc.usage).toBe(false);
+        expect(metrics).not.toHaveProperty("usageAccountingWatermarks");
+        expect(metrics).not.toHaveProperty("accountingSnapshot");
         expect(Date.parse(metrics.sessionStartTime)).not.toBeNaN();
         if (metrics.totalNanoAiu !== undefined && metrics.totalNanoAiu !== null) {
             expect(metrics.totalNanoAiu).toBeGreaterThanOrEqual(0);
@@ -725,7 +810,16 @@ describe("Session-scoped RPC", async () => {
     });
 
     it("should compact session history after messages", async () => {
-        const session = await client.createSession({ onPermissionRequest: approveAll });
+        const session = await client.createSession({
+            onPermissionRequest: approveAll,
+            modelCapabilities: {
+                limits: {
+                    max_prompt_tokens: 128_000,
+                    max_context_window_tokens: 128_000,
+                    max_output_tokens: 32_000,
+                },
+            },
+        });
 
         expect((await session.rpc.metadata.isProcessing()).processing).toBe(false);
         await session.sendAndWait({ prompt: "What is 2+2?" });
@@ -739,10 +833,8 @@ describe("Session-scoped RPC", async () => {
         expect(contextInfo.contextInfo).not.toBeNull();
         if (contextInfo.contextInfo) {
             expect(contextInfo.contextInfo.modelName).toBe("claude-sonnet-5");
-            expect(contextInfo.contextInfo.promptTokenLimit).toBe(128_000);
-            expect(contextInfo.contextInfo.limit).toBeGreaterThanOrEqual(
-                contextInfo.contextInfo.promptTokenLimit
-            );
+            expect(contextInfo.contextInfo.promptTokenLimit).toBe(128_000 - 4_096);
+            expect(contextInfo.contextInfo.limit).toBe(128_000);
             expect(contextInfo.contextInfo.totalTokens).toBeGreaterThan(0);
             expect(contextInfo.contextInfo.systemTokens).toBeGreaterThan(0);
             expect(contextInfo.contextInfo.conversationTokens).toBeGreaterThan(0);
@@ -753,6 +845,14 @@ describe("Session-scoped RPC", async () => {
                     contextInfo.contextInfo.toolDefinitionsTokens
             );
         }
+        await expect(
+            session.rpc.metadata.contextInfo({
+                promptTokenLimit: 0,
+                outputTokenLimit: 0,
+                selectedModel: "claude-sonnet-5",
+                providerId: "unavailable-context-provider",
+            })
+        ).rejects.toThrow(/provider\/model pair is no longer available/);
 
         const recomputed = await session.rpc.metadata.recomputeContextTokens({
             modelId: "claude-sonnet-5",
@@ -763,10 +863,18 @@ describe("Session-scoped RPC", async () => {
             recomputed.systemTokenCount + recomputed.messagesTokenCount
         );
 
+        const effectiveContext = await session.rpc.metadata.contextInfo({
+            promptTokenLimit: 0,
+            outputTokenLimit: 0,
+        });
+        expect(effectiveContext.contextInfo).not.toBeNull();
         const result = await session.rpc.history.compact();
         expect(result.success).toBe(true);
         expect(result.messagesRemoved).toBeGreaterThanOrEqual(0);
         if (result.contextWindow) {
+            expect(result.contextWindow.tokenLimit).toBe(
+                effectiveContext.contextInfo?.promptTokenLimit
+            );
             expect(result.contextWindow.messagesLength).toBeGreaterThanOrEqual(0);
             expect(result.contextWindow.currentTokens).toBeGreaterThanOrEqual(0);
             if (result.contextWindow.conversationTokens != null) {
diff --git a/nodejs/test/e2e/rpc_settings.e2e.test.ts b/nodejs/test/e2e/rpc_settings.e2e.test.ts
new file mode 100644
index 0000000000..7d0ce82023
--- /dev/null
+++ b/nodejs/test/e2e/rpc_settings.e2e.test.ts
@@ -0,0 +1,138 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { spawn } from "node:child_process";
+import { once } from "node:events";
+import { mkdir, readFile, writeFile } from "node:fs/promises";
+import { join } from "node:path";
+import { describe, it, onTestFinished } from "vitest";
+import {
+    createMessageConnection,
+    StreamMessageReader,
+    StreamMessageWriter,
+} from "vscode-jsonrpc/node.js";
+import { createInternalServerRpc, createServerRpc } from "../../src/generated/rpc.js";
+import { createSdkTestContext, getLegacyCliPathForTests } from "./harness/sdkTestContext.js";
+import { stopChildProcess } from "./harness/sdkTestHelper.js";
+
+describe("Internal settings RPC through the CLI SDK server", async () => {
+    const { env, workDir } = await createSdkTestContext();
+
+    it("preserves settings semantics through the generated SDK methods", async ({ expect }) => {
+        const home = join(workDir, "settings-home");
+        const repoRoot = join(workDir, "repository");
+        await mkdir(home, { recursive: true });
+        await mkdir(join(repoRoot, ".github", "copilot"), { recursive: true });
+        const legacy = { model: "legacy-model", render_markdown: false };
+        await writeFile(join(home, "config.json"), JSON.stringify(legacy));
+
+        // These methods are internal, so use their generated projection over a real CLI transport.
+        const cliPath = await getLegacyCliPathForTests();
+        const args = ["--headless", "--stdio", "--no-auto-update", "--log-level", "error"];
+        const child = spawn(
+            cliPath.endsWith(".js") ? process.execPath : cliPath,
+            cliPath.endsWith(".js") ? [cliPath, ...args] : args,
+            { cwd: workDir, env: { ...env, COPILOT_HOME: home }, stdio: "pipe" }
+        );
+        let stderr = "";
+        child.stderr.on("data", (chunk) => {
+            stderr += String(chunk);
+        });
+        const connection = createMessageConnection(
+            new StreamMessageReader(child.stdout),
+            new StreamMessageWriter(child.stdin)
+        );
+        onTestFinished(async () => {
+            connection.dispose();
+            await stopChildProcess(child);
+        });
+        await once(child, "spawn");
+        connection.listen();
+        const rpc = createInternalServerRpc(connection);
+        expect(await rpc.connect({}), stderr).toMatchObject({
+            protocolVersion: expect.any(Number),
+        });
+
+        const paths = await rpc.user.settings.getPaths({ repoRoot });
+        expect(paths).toEqual({
+            userSettings: join(home, "settings.json"),
+            repoSettings: join(repoRoot, ".github", "copilot", "settings.json"),
+            repoLocalSettings: join(repoRoot, ".github", "copilot", "settings.local.json"),
+        });
+        expect((await rpc.user.settings.listGovernanceKeys()).repo).toContain("model");
+        expect(await rpc.user.settings.normalize({ settings: { render_markdown: true } })).toEqual({
+            settings: { renderMarkdown: true },
+        });
+        const problems = await rpc.user.settings.diagnoseProblems({
+            sources: [
+                {
+                    kind: "user",
+                    label: "User",
+                    filePath: paths.userSettings,
+                    config: { notASetting: true },
+                },
+            ],
+        });
+        expect(problems.problems).toEqual([
+            expect.objectContaining({ kind: "unknown-key", rawKey: "notASetting" }),
+        ]);
+
+        await rpc.user.settings.writeAll({ settings: { model: "initial-model", beep: true } });
+        expect(
+            await rpc.user.settings.edit({
+                canonicalPath: ["model"],
+                operation: "set",
+                value: "edited-model",
+            })
+        ).toEqual({ status: "changed" });
+        expect(
+            await rpc.user.settings.applyTopKey({
+                canonicalPath: ["model"],
+                topKey: "model",
+                value: null,
+            })
+        ).toMatchObject({ status: "validation-error" });
+        expect(
+            await rpc.user.settings.applyTopKey({
+                canonicalPath: ["model"],
+                topKey: "model",
+                value: "applied-model",
+            })
+        ).toEqual({ status: "ok" });
+        expect(JSON.parse(await readFile(paths.userSettings, "utf8"))).toEqual({
+            model: "applied-model",
+            beep: true,
+        });
+        await rpc.user.settings.writeAll({ settings: { model: "replacement-model" } });
+        expect(JSON.parse(await readFile(paths.userSettings, "utf8"))).toEqual({
+            model: "replacement-model",
+        });
+        const loaded = await createServerRpc(connection).user.settings.get();
+        expect(loaded.settings.model.value).toBe("replacement-model");
+
+        const repoPath = join(repoRoot, ".github", "copilot", "settings.json");
+        await writeFile(repoPath, '{"custom":{"items":[true,null,12.5]}}');
+        const target = { repoRoot, scope: "repo" };
+        await rpc.repo.settings.writeKey({ ...target, key: "model", value: "repo-model" });
+        expect(await rpc.repo.settings.readRaw(target)).toEqual({
+            config: { custom: { items: [true, null, 12.5] }, model: "repo-model" },
+            invalid: false,
+        });
+        await rpc.repo.settings.writeAll({ ...target, settings: {} });
+        expect(await rpc.repo.settings.readRaw(target)).toEqual({
+            config: { custom: { items: [true, null, 12.5] } },
+            invalid: false,
+        });
+        await writeFile(repoPath, "{ invalid");
+        expect(await rpc.repo.settings.readRaw(target)).toEqual({ config: {}, invalid: true });
+        await expect(
+            rpc.repo.settings.writeKey({
+                ...target,
+                key: "model",
+                value: "must-not-replace-invalid-file",
+            })
+        ).rejects.toThrow();
+        expect(await readFile(repoPath, "utf8")).toBe("{ invalid");
+    });
+});
diff --git a/nodejs/test/e2e/rpc_shell_and_fleet.e2e.test.ts b/nodejs/test/e2e/rpc_shell_and_fleet.e2e.test.ts
index 521a4b0c1b..51e5855e13 100644
--- a/nodejs/test/e2e/rpc_shell_and_fleet.e2e.test.ts
+++ b/nodejs/test/e2e/rpc_shell_and_fleet.e2e.test.ts
@@ -11,10 +11,15 @@ import { z } from "zod";
 import { approveAll, defineTool } from "../../src/index.js";
 import type { CopilotSession, SessionEvent } from "../../src/index.js";
 import { createSdkTestContext } from "./harness/sdkTestContext.js";
-import { waitForCondition } from "./harness/sdkTestHelper.js";
+import { waitForCondition, waitForFileText } from "./harness/sdkTestHelper.js";
 
 describe("Shell and fleet RPC", async () => {
-    const { copilotClient: client, workDir } = await createSdkTestContext();
+    const { copilotClient: client, workDir } = await createSdkTestContext({
+        logLevel: "debug",
+        copilotClientOptions: {
+            env: { RUST_LOG: "error,sdk_diagnostics=debug" },
+        },
+    });
 
     function createWriteFileCommand(markerPath: string, marker: string): string {
         if (os.platform() === "win32") {
@@ -23,24 +28,10 @@ describe("Shell and fleet RPC", async () => {
         return `sh -c "printf '%s' '${marker}' > '${markerPath}'"`;
     }
 
-    async function waitForFileText(
-        filePath: string,
-        expected: string,
-        timeoutMs = 30_000
-    ): Promise<void> {
-        const deadline = Date.now() + timeoutMs;
-        while (Date.now() < deadline) {
-            if (fs.existsSync(filePath)) {
-                const content = fs.readFileSync(filePath, "utf8");
-                if (content.includes(expected)) {
-                    return;
-                }
-            }
-            await new Promise((resolve) => setTimeout(resolve, 100));
-        }
-        throw new Error(
-            `Timed out waiting for shell command to write '${expected}' to '${filePath}'.`
-        );
+    function createWindowsBatchCommand(command: string): string {
+        const filename = `shell-command-${randomUUID()}.cmd`;
+        fs.writeFileSync(path.join(workDir, filename), `@echo off\r\n${command}\r\n`);
+        return `cmd.exe /d /c ${filename}`;
     }
 
     async function waitForMessages(
@@ -160,7 +151,9 @@ describe("Shell and fleet RPC", async () => {
             const timeout = os.platform() === "win32" ? 10_000 : 1_000;
             const command =
                 os.platform() === "win32"
-                    ? `echo started>"${started}" & ping.exe -n 31 127.0.0.1 >nul & echo completed>"${completed}"`
+                    ? createWindowsBatchCommand(
+                          `echo started>"${started}" & ping.exe -n 31 127.0.0.1 >nul & echo completed>"${completed}"`
+                      )
                     : `printf started > '${started}'; sleep 30; printf completed > '${completed}'`;
             try {
                 const result = await session.rpc.shell.exec({ command, cwd: workDir, timeout });
@@ -180,13 +173,120 @@ describe("Shell and fleet RPC", async () => {
         }
     );
 
+    it.skipIf(os.platform() === "win32")(
+        "should release post-root-exit shell pipes and rewind admission at timeout",
+        async ({ onTestFailed }) => {
+            const cwd = fs.mkdtempSync(path.join(workDir, "post-exit-shell-"));
+            let phase = "creating session";
+            let rootPid: number | undefined;
+            let rootExited = false;
+            let lastRewindState:
+                | Awaited<ReturnType<CopilotSession["rpc"]["history"]["listRewindPoints"]>>
+                | undefined;
+            onTestFailed(() => {
+                console.error("Post-root-exit shell timeout diagnostic:", {
+                    phase,
+                    rootPid,
+                    rootExited,
+                    lastRewindState,
+                    descendantReady: fs.existsSync(path.join(cwd, "descendant.ready")),
+                    terminated: fs.existsSync(path.join(cwd, "terminated")),
+                });
+            });
+            const session = await client.createSession({
+                enableFileChangeTracking: true,
+                onPermissionRequest: approveAll,
+            });
+            let processId: string | undefined;
+            function processExists(pid: number): boolean {
+                try {
+                    process.kill(pid, 0);
+                    return true;
+                } catch (error) {
+                    if ((error as NodeJS.ErrnoException).code === "ESRCH") {
+                        return false;
+                    }
+                    throw error;
+                }
+            }
+            try {
+                phase = "waiting for rewind tracking initialization";
+                await waitForCondition(
+                    async () => {
+                        lastRewindState = await session.rpc.history.listRewindPoints();
+                        return lastRewindState.fileChangeTrackingEnabled;
+                    },
+                    { timeoutMessage: "Rewind tracking did not initialize" }
+                );
+                phase = "launching post-exit shell";
+                // Reader teardown must not SIGPIPE the fixture before its TERM trap records termination.
+                const result = await session.rpc.shell.exec({
+                    command:
+                        `sh -c 'trap "" PIPE; trap "printf terminated > terminated; exit 0" TERM; ` +
+                        `printf ready > descendant.ready; sleep 60' & ` +
+                        `echo $$ > root.pending; mv root.pending root.pid; exit 7`,
+                    cwd,
+                    timeout: 10_000,
+                });
+                processId = result.processId;
+                expect(processId).toBeTruthy();
+                phase = "waiting for root reap and descendant readiness";
+                await waitForCondition(
+                    () => {
+                        if (
+                            !fs.existsSync(path.join(cwd, "root.pid")) ||
+                            !fs.existsSync(path.join(cwd, "descendant.ready"))
+                        ) {
+                            return false;
+                        }
+                        rootPid = Number(fs.readFileSync(path.join(cwd, "root.pid"), "utf8"));
+                        expect(Number.isInteger(rootPid) && rootPid > 1).toBe(true);
+                        rootExited = !processExists(rootPid);
+                        return rootExited;
+                    },
+                    { timeoutMessage: "Fixture root did not exit with a ready pipe holder" }
+                );
+                phase = "checking retained rewind lease";
+                expect(fs.existsSync(path.join(cwd, "terminated"))).toBe(false);
+                lastRewindState = await session.rpc.history.listRewindPoints();
+                expect(lastRewindState.unavailableReason).toBe("session-busy");
+
+                // Neither poll sends a kill: the configured timeout must end the
+                // descendant and release the production sink's operation lease.
+                phase = "waiting for rewind admission after timeout";
+                await waitForCondition(
+                    async () => {
+                        lastRewindState = await session.rpc.history.listRewindPoints();
+                        return (
+                            lastRewindState.fileChangeTrackingEnabled &&
+                            lastRewindState.unavailableReason === undefined
+                        );
+                    },
+                    { timeoutMessage: "Post-exit timeout left rewind admission session-busy" }
+                );
+                phase = "waiting for automatic descendant termination";
+                await waitForFileText(path.join(cwd, "terminated"), "terminated");
+                phase = "checking registry cleanup";
+                expect((await session.rpc.shell.kill({ processId })).killed).toBe(false);
+            } finally {
+                try {
+                    if (processId) {
+                        await session.rpc.shell.kill({ processId, signal: "SIGKILL" });
+                    }
+                } finally {
+                    await session.disconnect();
+                }
+            }
+        }
+    );
+
     it("should accept a missing shell command and clean up after it exits", async () => {
         const session = await client.createSession({ onPermissionRequest: approveAll });
         const marker = path.join(workDir, `shell-missing-${randomUUID()}.txt`);
         const missingCommand = `not-a-command-${randomUUID()}`;
         const command =
             os.platform() === "win32"
-                ? `${missingCommand} & echo done>"${marker}" & exit /b 1`
+                ? createWindowsBatchCommand(`${missingCommand} & echo done>"${marker}" & exit /b 1`)
                 : `${missingCommand}; code=$?; printf done > '${marker}'; exit $code`;
         try {
             const result = await session.rpc.shell.exec({ command, cwd: workDir });
@@ -207,18 +307,41 @@ describe("Shell and fleet RPC", async () => {
         async (outputKind) => {
             const session = await client.createSession({ onPermissionRequest: approveAll });
             const marker = path.join(workDir, `shell-${outputKind}-${randomUUID()}.txt`);
+            const outputFile = path.join(workDir, `shell-output-${randomUUID()}.txt`);
+            const started = `${marker}.started`;
+            const phase = `${marker}.phase`;
+            const recordPhase = (value: string) => `echo ${value}>"${phase}"`;
+            // Run cmd syntax in an owned batch even when the RPC selects PowerShell.
+            const publishMarker =
+                `${recordPhase("output-written")} & ` +
+                `echo done>"${marker}.pending" & ` +
+                `${recordPhase("marker-written")} & ` +
+                `move /y "${marker}.pending" "${marker}" >nul & ` +
+                recordPhase("marker-published");
             const command =
                 outputKind === "stderr"
                     ? os.platform() === "win32"
-                        ? `powershell -NoLogo -NoProfile -Command "[Console]::Error.WriteLine('boom'); Set-Content -LiteralPath '${marker}' -Value done; exit 2"`
-                        : `echo boom 1>&2; printf done > '${marker}'; exit 2`
+                        ? createWindowsBatchCommand(
+                              `${recordPhase("started")} & echo boom 1>&2 & ${publishMarker} & exit /b 2`
+                          )
+                        : `printf started > '${started}'; echo boom 1>&2; printf done > '${marker}'; exit 2`
                     : os.platform() === "win32"
-                      ? `powershell -NoLogo -NoProfile -Command "Write-Host ('x' * 71680); Set-Content -LiteralPath '${marker}' -Value done"`
-                      : `printf '%71680s' '' | tr ' ' '='; printf done > '${marker}'`;
+                      ? createWindowsBatchCommand(
+                            `${recordPhase("started")} & type "${outputFile}" & ${publishMarker}`
+                        )
+                      : `printf started > '${started}'; printf '%71680s' '' | tr ' ' '='; printf done > '${marker}'`;
             try {
+                if (outputKind === "large-stdout" && os.platform() === "win32") {
+                    fs.writeFileSync(outputFile, "x".repeat(71680));
+                }
                 const result = await session.rpc.shell.exec({ command, cwd: workDir });
                 expect(result.processId).toBeTruthy();
-                await waitForFileText(marker, "done");
+                await waitForFileText(
+                    marker,
+                    "done",
+                    30_000,
+                    os.platform() === "win32" ? [phase, `${marker}.pending`] : [started]
+                );
                 // The process map is updated after the output stream closes.
                 await new Promise((resolve) => setTimeout(resolve, 2_000));
                 expect((await session.rpc.shell.kill({ processId: result.processId })).killed).toBe(
diff --git a/nodejs/test/e2e/rpc_surface_coverage.e2e.test.ts b/nodejs/test/e2e/rpc_surface_coverage.e2e.test.ts
index 2a8f34a7d2..30f4793d31 100644
--- a/nodejs/test/e2e/rpc_surface_coverage.e2e.test.ts
+++ b/nodejs/test/e2e/rpc_surface_coverage.e2e.test.ts
@@ -327,7 +327,52 @@ describe("Generated RPC surface coverage", () => {
             ...collectRuntimeFunctions(session.rpc, "session"),
         ]);
 
-        expect(inventory).toHaveLength(394);
+        expect(inventory).toHaveLength(410);
+        expect(
+            inventory.filter(
+                (method) => method.wireMethod === "session.model.getReasoningSummaries"
+            )
+        ).toEqual([
+            expect.objectContaining({
+                scope: "session",
+                path: "model.getReasoningSummaries",
+                parameterCount: 1,
+                returnType: "Promise<ModelGetReasoningSummariesResult>",
+            }),
+        ]);
+        expect(inventory.filter((method) => method.wireMethod === "host.listSessions")).toEqual([
+            expect.objectContaining({ scope: "server", path: "host.listSessions" }),
+        ]);
+        expect(
+            inventory.filter(
+                (method) => method.wireMethod === "managedSettings.permissions.evaluate"
+            )
+        ).toEqual([
+            expect.objectContaining({
+                scope: "server",
+                path: "managedSettings.permissions.evaluate",
+                parameterCount: 1,
+            }),
+        ]);
+        expect(inventory.some((method) => method.wireMethod === "user.settings.reload")).toBe(
+            false
+        );
+        expect(
+            inventory.find((method) => method.wireMethod === "session.extensions.reconcile")
+        ).toMatchObject({
+            scope: "session",
+            path: "extensions.reconcile",
+            parameterCount: 0,
+        });
+        expect(
+            inventory.filter((method) => method.wireMethod === "session.plugins.retryManaged")
+        ).toEqual([
+            expect.objectContaining({
+                scope: "session",
+                path: "plugins.retryManaged",
+                parameterCount: 1,
+            }),
+        ]);
         const sessionProviderMethods = [
             "providers.getCatalog",
             "providers.discover",
@@ -342,6 +387,13 @@ describe("Generated RPC surface coverage", () => {
                 `Missing generated session RPC ${wireMethod}`
             ).toEqual([expect.objectContaining({ scope: "session", path })]);
         }
+        for (const path of ["quota.get", "quota.refresh", "quota.takeWarnings"]) {
+            const wireMethod = `session.${path}`;
+            expect(
+                inventory.filter((method) => method.wireMethod === wireMethod),
+                `Missing generated session RPC ${wireMethod}`
+            ).toEqual([expect.objectContaining({ scope: "session", path })]);
+        }
         const boundInstallationMethods = [
             "mcp.prepareInstall",
             "mcp.applyInstall",
@@ -447,6 +499,7 @@ describe("Generated RPC surface coverage", () => {
         expect((await session.rpc.customizations.reload()).outcomes).toEqual([
             { subsystem: "instructions", status: "reloaded" },
         ]);
+        await session.rpc.plugins.retryManaged();
 
         await expect(
             client.rpc.ping({ message: "error", __forceError: true } as never)
@@ -476,5 +529,20 @@ describe("Generated RPC surface coverage", () => {
                 { method: wireMethod, params: { sessionId: "rpc-surface-session" } },
             ]);
         }
+        expect(
+            captured.filter((request) => request.method === "session.plugins.retryManaged")
+        ).toEqual([
+            {
+                method: "session.plugins.retryManaged",
+                params: {
+                    __coveragePath: "session.plugins.retryManaged",
+                    sessionId: "rpc-surface-session",
+                },
+            },
+            {
+                method: "session.plugins.retryManaged",
+                params: { sessionId: "rpc-surface-session" },
+            },
+        ]);
     });
 });
diff --git a/nodejs/test/e2e/rpc_tasks_and_handlers.e2e.test.ts b/nodejs/test/e2e/rpc_tasks_and_handlers.e2e.test.ts
index c2e62d3bcd..e6e6a18c8f 100644
--- a/nodejs/test/e2e/rpc_tasks_and_handlers.e2e.test.ts
+++ b/nodejs/test/e2e/rpc_tasks_and_handlers.e2e.test.ts
@@ -4,14 +4,53 @@
 
 import { describe, expect, it } from "vitest";
 import { z } from "zod";
-import { approveAll } from "../../src/index.js";
-import type { SessionEvent, CopilotSession } from "../../src/index.js";
+import { approveAll, CopilotRequestHandler } from "../../src/index.js";
+import type { SessionEvent, CopilotRequestContext, CopilotSession } from "../../src/index.js";
 import { createSdkTestContext } from "./harness/sdkTestContext.js";
-import { waitForCondition } from "./harness/sdkTestHelper.js";
+import { getNextEventOfType, waitForCondition } from "./harness/sdkTestHelper.js";
 import { isByokBackend } from "./harness/testBackend";
 
 const capiIt = it.skipIf(isByokBackend);
 
+class ModelRequestRecorder extends CopilotRequestHandler {
+    readonly requests: Array<{
+        sessionId?: string;
+        agentId?: string;
+        body: { model?: string; reasoning_effort?: string };
+    }> = [];
+
+    protected override async sendRequest(
+        request: Request,
+        context: CopilotRequestContext
+    ): Promise<Response> {
+        const pathname = new URL(request.url).pathname;
+        if (["/chat/completions", "/responses", "/v1/messages"].includes(pathname)) {
+            const body = z
+                .object({
+                    model: z.string(),
+                    reasoning_effort: z.string().optional(),
+                    reasoning: z.object({ effort: z.string().optional() }).optional(),
+                    output_config: z.object({ effort: z.string().optional() }).optional(),
+                })
+                .parse(await request.clone().json());
+            this.requests.push({
+                sessionId: context.sessionId,
+                agentId: context.agentId,
+                body: {
+                    model: body.model,
+                    reasoning_effort:
+                        pathname === "/responses"
+                            ? body.reasoning?.effort
+                            : pathname === "/v1/messages"
+                              ? body.output_config?.effort
+                              : body.reasoning_effort,
+                },
+            });
+        }
+        return super.sendRequest(request, context);
+    }
+}
+
 describe("Session tasks RPC and pending handlers", async () => {
     const {
         copilotClient: client,
@@ -21,28 +60,6 @@ describe("Session tasks RPC and pending handlers", async () => {
         modelNames: { "claude-sonnet-5": "Claude Sonnet 5" },
     });
 
-    async function modelRequestsForPrompt(promptEnding: string) {
-        return (await openAiEndpoint.getRequests())
-            .filter(({ method, url }) => method === "POST" && url.includes("/chat/completions"))
-            .map(({ body }) =>
-                z
-                    .object({
-                        messages: z.array(z.object({ role: z.string(), content: z.unknown() })),
-                        model: z.string(),
-                        reasoning_effort: z.string().optional(),
-                    })
-                    .parse(JSON.parse(body))
-            )
-            .filter((request) =>
-                request.messages.some(
-                    (message) =>
-                        message.role === "user" &&
-                        typeof message.content === "string" &&
-                        message.content.trim().endsWith(promptEnding)
-                )
-            );
-    }
-
     async function getAgentTask(session: CopilotSession, agentId: string) {
         const task = (await session.rpc.tasks.list()).tasks.find((entry) => entry.id === agentId);
         if (task && task.type !== "agent") {
@@ -309,11 +326,102 @@ describe("Session tasks RPC and pending handlers", async () => {
         }
     });
 
-    capiIt(
+    // Shell IDs count up per runtime process, so each attached-shell test owns its
+    // client: the recorded `shellId: 0` then holds regardless of test order.
+    async function withRunningAttachedShell(
+        run: (
+            session: CopilotSession,
+            shellId: string,
+            eventTypes: SessionEvent["type"][],
+            replies: string[]
+        ) => Promise<void>
+    ): Promise<void> {
+        const shellClient = createClient();
+        try {
+            const session = await shellClient.createSession({ onPermissionRequest: approveAll });
+            const eventTypes: SessionEvent["type"][] = [];
+            const replies: string[] = [];
+            const unsubscribe = session.on((event) => {
+                eventTypes.push(event.type);
+                if (event.type === "assistant.message") {
+                    replies.push(event.data.content ?? "");
+                }
+            });
+            try {
+                const assistantIdle = getNextEventOfType(session, "assistant.idle");
+                await session.send({
+                    prompt: "Use your shell tool to run `sleep 600` in async mode without detaching. Do not read its output or wait for it. Then reply with exactly SHELL_STARTED.",
+                });
+                await assistantIdle;
+                expect(replies.at(-1)).toContain("SHELL_STARTED");
+
+                const shell = (await session.rpc.tasks.list()).tasks.find(
+                    (task) => task.type === "shell" && task.status === "running"
+                );
+                expect(shell).toMatchObject({ attachmentMode: "attached" });
+                await run(session, shell!.id, eventTypes, replies);
+            } finally {
+                unsubscribe();
+                await session.disconnect();
+            }
+        } finally {
+            await shellClient.stop();
+        }
+    }
+
+    it(
+        "should emit session idle after cancelling a running attached shell",
+        { timeout: 120_000 },
+        async () => {
+            await withRunningAttachedShell(async (session, shellId, eventTypes) => {
+                // The running attached shell holds the turn's session.idle.
+                expect(eventTypes).not.toContain("session.idle");
+
+                expect((await session.rpc.tasks.cancel({ id: shellId })).cancelled).toBe(true);
+                await waitForCondition(() => eventTypes.includes("session.idle"), {
+                    timeoutMessage: `session.idle never followed cancelling shell ${shellId}`,
+                });
+            });
+        }
+    );
+
+    it(
+        "should run a queued message after cancelling a running attached shell",
+        { timeout: 120_000 },
+        async () => {
+            await withRunningAttachedShell(async (session, shellId, eventTypes, replies) => {
+                // The running attached shell holds idle, so an enqueued message waits behind it.
+                await session.send({ prompt: "Reply with exactly QUEUED_DONE.", mode: "enqueue" });
+                await waitForCondition(
+                    async () =>
+                        (await session.rpc.queue.pendingItems()).items.some((item) =>
+                            item.displayText.includes("QUEUED_DONE")
+                        ),
+                    { timeoutMessage: "The enqueued message was not parked behind the shell" }
+                );
+                expect(replies.some((reply) => reply.includes("QUEUED_DONE"))).toBe(false);
+                expect(eventTypes).not.toContain("session.idle");
+
+                expect((await session.rpc.tasks.cancel({ id: shellId })).cancelled).toBe(true);
+                await waitForCondition(
+                    () => replies.some((reply) => reply.includes("QUEUED_DONE")),
+                    {
+                        timeoutMessage: `The queued message never ran after cancelling shell ${shellId}`,
+                    }
+                );
+                await waitForCondition(() => eventTypes.includes("session.idle"), {
+                    timeoutMessage: "session.idle never followed the queued message",
+                });
+            });
+        }
+    );
+
+    it(
         "should apply a custom agent's composed model and effort when started over RPC",
         { timeout: 240_000 },
         async () => {
-            const recordingClient = createClient();
+            const requestRecorder = new ModelRequestRecorder();
+            const recordingClient = createClient({ requestHandler: requestRecorder });
             try {
                 const session = await recordingClient.createSession({
                     onPermissionRequest: approveAll,
@@ -331,10 +439,14 @@ describe("Session tasks RPC and pending handlers", async () => {
                     model: string;
                     reasoningEffort?: string;
                 }> = [];
+                const lifecycleEvents: SessionEvent[] = [];
                 const unsubscribe = session.on((event) => {
                     if (event.type === "subagent.configured") {
                         configurations.push({ agentId: event.agentId, ...event.data });
                     }
+                    if (event.type.startsWith("subagent.") || event.type === "session.shutdown") {
+                        lifecycleEvents.push(event);
+                    }
                 });
                 try {
                     const started = await session.rpc.tasks.startAgent({
@@ -372,9 +484,9 @@ describe("Session tasks RPC and pending handlers", async () => {
                             timeoutMessage: `Agent ${started.agentId} never completed`,
                         }
                     );
-                    const requests = await modelRequestsForPrompt(
-                        "Reply with SDK_COMPOSED_AGENT_DONE exactly."
-                    );
+                    const requests = requestRecorder.requests
+                        .filter((request) => request.agentId === started.agentId)
+                        .map((request) => request.body);
                     expect(requests.length).toBeGreaterThan(0);
                     for (const request of requests) {
                         expect(request).toMatchObject({
@@ -382,6 +494,26 @@ describe("Session tasks RPC and pending handlers", async () => {
                             reasoning_effort: "high",
                         });
                     }
+                    await waitForCondition(
+                        () =>
+                            lifecycleEvents.some(
+                                (event) =>
+                                    event.type === "subagent.completed" &&
+                                    event.agentId === started.agentId
+                            ),
+                        { timeoutMessage: `Agent ${started.agentId} never emitted its completion` }
+                    );
+                    const completions = lifecycleEvents.filter(
+                        (event) => event.type === "subagent.completed"
+                    );
+                    expect(completions).toHaveLength(1);
+                    expect(completions[0].data.cancelled).not.toBe(true);
+                    const beforeStop = [...lifecycleEvents];
+                    expect(await recordingClient.stop()).toEqual([]);
+                    expect(
+                        lifecycleEvents.filter((event) => event.type.startsWith("subagent."))
+                    ).toEqual(beforeStop);
+                    expect(lifecycleEvents.at(-1)?.type).toBe("session.shutdown");
                 } finally {
                     unsubscribe();
                 }
@@ -391,100 +523,118 @@ describe("Session tasks RPC and pending handlers", async () => {
         }
     );
 
-    capiIt(
-        "should preserve a composed display-name effort in a model-issued task",
-        async () => {
-            const taskArguments: unknown[] = [];
-            const recordingClient = createClient();
-            try {
-                const session = await recordingClient.createSession({
-                    model: "claude-sonnet-5",
-                    reasoningEffort: "medium",
-                    onPermissionRequest: approveAll,
-                    hooks: {
-                        onPreToolUse: async (input) => {
-                            if (input.toolName === "task") {
-                                taskArguments.push(input.toolArgs);
-                            }
-                            return { permissionDecision: "allow" };
-                        },
+    it("should preserve a composed display-name effort in a model-issued task", async () => {
+        const taskArguments: unknown[] = [];
+        const requestRecorder = new ModelRequestRecorder();
+        const recordingClient = createClient({ requestHandler: requestRecorder });
+        try {
+            const session = await recordingClient.createSession({
+                model: "claude-sonnet-5",
+                reasoningEffort: "medium",
+                onPermissionRequest: approveAll,
+                hooks: {
+                    onPreToolUse: async (input) => {
+                        if (input.toolName === "task") {
+                            taskArguments.push(input.toolArgs);
+                        }
+                        return { permissionDecision: "allow" };
                     },
-                    customAgents: [
-                        {
-                            name: "sdk-display-model-agent",
-                            description: "SDK display-name model coverage",
-                            prompt: "Reply with SDK_DISPLAY_AGENT_DONE exactly.",
-                            model: "Claude Sonnet 5:defaultReasoningEffort=high",
-                        },
-                    ],
-                });
+                },
+                customAgents: [
+                    {
+                        name: "sdk-display-model-agent",
+                        description: "SDK display-name model coverage",
+                        prompt: "Reply with SDK_DISPLAY_AGENT_DONE exactly.",
+                        // BYOK requires explicit IDs; CAPI also resolves its catalog's display names.
+                        model: `${isByokBackend ? "claude-sonnet-5" : "Claude Sonnet 5"}:defaultReasoningEffort=high`,
+                    },
+                ],
+            });
+            if (!isByokBackend) {
                 const modelList = await session.rpc.model.list();
                 expect(modelList.list).toEqual(
                     expect.arrayContaining([
                         expect.objectContaining({ id: "claude-sonnet-5", name: "Claude Sonnet 5" }),
                     ])
                 );
-                const configurations: Array<{
-                    agentId?: string;
-                    model: string;
-                    reasoningEffort?: string;
-                }> = [];
-                const unsubscribe = session.on((event) => {
-                    if (event.type === "subagent.configured") {
-                        configurations.push({ agentId: event.agentId, ...event.data });
-                    }
+            }
+            const configurations: Array<{
+                agentId?: string;
+                model: string;
+                reasoningEffort?: string;
+            }> = [];
+            const lifecycleEvents: SessionEvent[] = [];
+            const unsubscribe = session.on((event) => {
+                if (event.type === "subagent.configured") {
+                    configurations.push({ agentId: event.agentId, ...event.data });
+                }
+                if (event.type.startsWith("subagent.") || event.type === "session.shutdown") {
+                    lifecycleEvents.push(event);
+                }
+            });
+            try {
+                const reply = await session.sendAndWait(
+                    {
+                        prompt:
+                            'Use the task tool with agent_type "sdk-display-model-agent", mode "sync", and prompt "Reply with SDK_DISPLAY_AGENT_DONE exactly.". ' +
+                            "Do not specify model or reasoning_effort in the task arguments. " +
+                            "After it completes, reply with SDK_DISPLAY_PARENT_DONE exactly.",
+                    },
+                    120_000
+                );
+                expect(reply?.data.content).toContain("SDK_DISPLAY_PARENT_DONE");
+                expect(taskArguments).toHaveLength(1);
+                expect(taskArguments[0]).toMatchObject({
+                    agent_type: "sdk-display-model-agent",
+                    mode: "sync",
                 });
-                try {
-                    const reply = await session.sendAndWait(
-                        {
-                            prompt:
-                                'Use the task tool with agent_type "sdk-display-model-agent", mode "sync", and prompt "Reply with SDK_DISPLAY_AGENT_DONE exactly.". ' +
-                                "Do not specify model or reasoning_effort in the task arguments. " +
-                                "After it completes, reply with SDK_DISPLAY_PARENT_DONE exactly.",
-                        },
-                        120_000
-                    );
-                    expect(reply?.data.content).toContain("SDK_DISPLAY_PARENT_DONE");
-                    expect(taskArguments).toHaveLength(1);
-                    expect(taskArguments[0]).toMatchObject({
-                        agent_type: "sdk-display-model-agent",
-                        mode: "sync",
-                    });
-                    expect(taskArguments[0]).not.toHaveProperty("model");
-                    expect(taskArguments[0]).not.toHaveProperty("reasoning_effort");
-                    expect(configurations).toHaveLength(1);
-                    const configuration = configurations[0];
-                    expect(configuration).toMatchObject({
+                expect(taskArguments[0]).not.toHaveProperty("model");
+                expect(taskArguments[0]).not.toHaveProperty("reasoning_effort");
+                expect(configurations).toHaveLength(1);
+                const configuration = configurations[0];
+                expect(configuration).toMatchObject({
+                    model: "claude-sonnet-5",
+                    reasoningEffort: "high",
+                });
+                expect(configuration.agentId).toBeTruthy();
+                const requests = requestRecorder.requests
+                    .filter((request) => request.agentId === configuration.agentId)
+                    .map((request) => request.body);
+                expect(requests.length).toBeGreaterThan(0);
+                for (const request of requests) {
+                    expect(request).toMatchObject({
                         model: "claude-sonnet-5",
-                        reasoningEffort: "high",
+                        reasoning_effort: "high",
                     });
-                    expect(configuration.agentId).toBeTruthy();
-                    const requests = await modelRequestsForPrompt(
-                        "Reply with SDK_DISPLAY_AGENT_DONE exactly."
-                    );
-                    expect(requests.length).toBeGreaterThan(0);
-                    for (const request of requests) {
-                        expect(request).toMatchObject({
-                            model: "claude-sonnet-5",
-                            reasoning_effort: "high",
-                        });
-                    }
-                    const parentRequests = await modelRequestsForPrompt(
-                        "After it completes, reply with SDK_DISPLAY_PARENT_DONE exactly."
-                    );
-                    expect(parentRequests.length).toBeGreaterThan(0);
-                    for (const request of parentRequests) {
-                        expect(request.reasoning_effort).toBe("medium");
-                    }
-                } finally {
-                    unsubscribe();
                 }
+                const parentRequests = requestRecorder.requests.filter(
+                    (request) =>
+                        request.sessionId === session.sessionId &&
+                        request.agentId !== configuration.agentId
+                );
+                expect(parentRequests.length).toBeGreaterThan(0);
+                for (const request of parentRequests) {
+                    expect(request.body.reasoning_effort).toBe("medium");
+                }
+                const completions = lifecycleEvents.filter(
+                    (event) => event.type === "subagent.completed"
+                );
+                expect(completions).toHaveLength(1);
+                expect(completions[0].agentId).toBe(configuration.agentId);
+                expect(completions[0].data.cancelled).not.toBe(true);
+                const beforeDisconnect = [...lifecycleEvents];
+                await session.disconnect();
+                expect(
+                    lifecycleEvents.filter((event) => event.type.startsWith("subagent."))
+                ).toEqual(beforeDisconnect);
+                expect(lifecycleEvents.at(-1)?.type).toBe("session.shutdown");
             } finally {
-                await recordingClient.stop();
+                unsubscribe();
             }
-        },
-        240_000
-    );
+        } finally {
+            await recordingClient.stop();
+        }
+    }, 240_000);
 
     it("should return expected results for missing pending handler requestIds", async () => {
         const session = await client.createSession({ onPermissionRequest: approveAll });
diff --git a/nodejs/test/e2e/runtime_host.e2e.test.ts b/nodejs/test/e2e/runtime_host.e2e.test.ts
index b1b8a1d9d2..5d97f1e1d7 100644
--- a/nodejs/test/e2e/runtime_host.e2e.test.ts
+++ b/nodejs/test/e2e/runtime_host.e2e.test.ts
@@ -15,6 +15,8 @@ import {
     ToolCallContributorKind,
     ToolResultContentType,
     TurnState,
+    sessionReducer,
+    type SessionAction,
     type ChatState,
     type SessionState,
 } from "@microsoft/agent-host-protocol-v09";
@@ -31,6 +33,7 @@ import {
     type CopilotSession,
 } from "../../src/index.js";
 import { createSdkTestContext } from "./harness/sdkTestContext.js";
+import { connectRawAhp } from "./harness/rawAhpClient.js";
 import {
     assertHostStopped as assertHostStoppedWithPid,
     assertProcessStopped,
@@ -153,10 +156,13 @@ describe.skipIf(!enabled)("Runtime-supervised AHP host", async () => {
         const tool = vi.fn(({ seed }: { seed: string }) => `MAGIC_${seed}_42`);
         const released = vi.fn();
         let original: CopilotSession | undefined;
+        let requestedSessionId: string | undefined;
         await using host = await owner.startAhpHost({
             localServer: {},
             createSession: async ({ config, signal }) => {
                 expect(signal.aborted).toBe(false);
+                expect(config.sessionId).toBeTruthy();
+                requestedSessionId = config.sessionId;
                 original = await owner.createSession({
                     ...config,
                     onPermissionRequest: approveAll,
@@ -176,7 +182,8 @@ describe.skipIf(!enabled)("Runtime-supervised AHP host", async () => {
         const ahp = await connectAhp(host);
         try {
             const session = await createAhpSession(ahp, ctx.workDir, ctx.env.GITHUB_TOKEN);
-            expect(original?.sessionId).toBe(session.sessionId);
+            expect(original?.sessionId).toBe(requestedSessionId);
+            expect(original?.sessionId).not.toBe(session.sessionId);
             await assertRuntimeListener(host, runtimeDetails().pid, artifacts);
             const response = await streamedTurn(
                 ahp.client,
@@ -184,8 +191,10 @@ describe.skipIf(!enabled)("Runtime-supervised AHP host", async () => {
                 session.subscription,
                 "Use the magic_number tool with seed 'hello' and tell me the result"
             );
-            expect(tool).toHaveBeenCalledOnce();
-            expect(tool.mock.calls[0]?.[0]).toEqual({ seed: "hello" });
+            expect(tool).toHaveBeenCalledExactlyOnceWith(
+                { seed: "hello" },
+                expect.objectContaining({ sessionId: requestedSessionId, toolName: "magic_number" })
+            );
             // Validate the final assistant response arrived (guards against truncated captures).
             expect(response.text).toContain("MAGIC_hello_42");
             expect(response.deltas).toBeGreaterThan(0);
@@ -229,9 +238,12 @@ describe.skipIf(!enabled)("Runtime-supervised AHP host", async () => {
             ({ country }: { country: string }) => `COUNTRY_${country.toUpperCase()}`
         );
         let original: CopilotSession | undefined;
+        let requestedSessionId: string | undefined;
         await using host = await owner.startAhpHost({
             localServer: {},
             createSession: async ({ config }) => {
+                expect(config.sessionId).toBeTruthy();
+                requestedSessionId = config.sessionId;
                 original = await owner.createSession({
                     ...config,
                     onPermissionRequest: approveAll,
@@ -259,7 +271,8 @@ describe.skipIf(!enabled)("Runtime-supervised AHP host", async () => {
                     },
                 },
             ]);
-            expect(original?.sessionId).toBe(session.sessionId);
+            expect(original?.sessionId).toBe(requestedSessionId);
+            expect(original?.sessionId).not.toBe(session.sessionId);
             const clientCalls = new Set<string>();
             const response = await streamedTurn(
                 ahp.client,
@@ -298,8 +311,10 @@ describe.skipIf(!enabled)("Runtime-supervised AHP host", async () => {
                     }
                 }
             );
-            expect(appTool).toHaveBeenCalledOnce();
-            expect(appTool.mock.calls[0]?.[0]).toEqual({ city: "Paris" });
+            expect(appTool).toHaveBeenCalledExactlyOnceWith(
+                { city: "Paris" },
+                expect.objectContaining({ sessionId: requestedSessionId, toolName: "lookup_city" })
+            );
             expect(clientTool).toHaveBeenCalledExactlyOnceWith({ country: "France" });
             expect(clientCalls.size).toBe(1);
             expect(response.text).toContain("CITY_PARIS");
@@ -445,6 +460,8 @@ describe.skipIf(!enabled)("Runtime-supervised AHP host", async () => {
         let sessionUri = "";
         let sessionId = "";
         const create = vi.fn(async ({ config }: AhpSessionCreateRequest) => {
+            expect(config.sessionId).toBeTruthy();
+            sessionId = config.sessionId!;
             original = await firstOwner.createSession({
                 ...config,
                 onPermissionRequest: approveAll,
@@ -462,9 +479,9 @@ describe.skipIf(!enabled)("Runtime-supervised AHP host", async () => {
                 clientEchoTool,
             ]);
             sessionUri = session.sessionUri;
-            sessionId = session.sessionId;
             expect(create).toHaveBeenCalledOnce();
             expect(original?.sessionId).toBe(sessionId);
+            expect(sessionId).not.toBe(session.sessionId);
             await assertRuntimeListener(first, runtimeDetails(firstOwner).pid, artifacts);
             expect(
                 (
@@ -617,6 +634,8 @@ describe.skipIf(!enabled)("Runtime-supervised AHP host", async () => {
         await using first = await owner.startAhpHost({
             localServer: {},
             createSession: async ({ config }) => {
+                expect(config.sessionId).toBeTruthy();
+                sessionId = config.sessionId!;
                 original = await owner.createSession({
                     ...config,
                     onPermissionRequest: approveAll,
@@ -629,8 +648,8 @@ describe.skipIf(!enabled)("Runtime-supervised AHP host", async () => {
         try {
             const session = await createAhpSession(firstAhp, ctx.workDir, ctx.env.GITHUB_TOKEN);
             sessionUri = session.sessionUri;
-            sessionId = session.sessionId;
             expect(original?.sessionId).toBe(sessionId);
+            expect(sessionId).not.toBe(session.sessionId);
             expect(
                 (
                     await streamedTurn(
@@ -687,7 +706,12 @@ describe.skipIf(!enabled)("Runtime-supervised AHP host", async () => {
             await expect(resumedOriginal!.getEvents()).resolves.toEqual(expect.any(Array));
             await replacement.dispose();
             expect(resumedReleased).toHaveBeenCalledOnce();
-            const retainedResume = vi.fn(async () => resumedOriginal!);
+            const retainedResume = vi.fn(
+                async ({ sessionId: requestedId }: AhpSessionResumeRequest) => {
+                    expect(requestedId).toBe(sessionId);
+                    return resumedOriginal!;
+                }
+            );
             const retainedReleased = vi.fn();
             await using retainedHost = await owner.startAhpHost({
                 localServer: {},
@@ -771,6 +795,469 @@ describe.skipIf(!enabled)("Runtime-supervised AHP host", async () => {
         }
     });
 
+    // Catalog-only flow: no model turn or replay capture is required.
+    it("lists saved publications after hosting stops without restarting a listener", async () => {
+        const baseDirectory = join(ctx.env.COPILOT_HOME, "offline-catalog");
+        await mkdir(baseDirectory, { recursive: true });
+        const offlineOwner = ctx.createClient({ baseDirectory });
+        try {
+            await offlineOwner.start();
+            expect((await offlineOwner.rpc.host.listSessions({})).sessions).toEqual([]);
+            await using session = await offlineOwner.createSession({
+                onPermissionRequest: approveAll,
+            });
+            await using host = await offlineOwner.startAhpHost({ localServer: {} });
+            const ahp = await connectAhp(host);
+            const runtimePid = runtimeDetails(offlineOwner).pid;
+            try {
+                const publication = await host.publishSession(session.sessionId);
+                const live = (await host.listSessions()).sessions;
+                expect(live).toHaveLength(1);
+                expect(live[0]?.resource).toBe(publication.sessionUri);
+                await expect(offlineOwner.rpc.host.listSessions({})).rejects.toThrow(
+                    /catalog.*in use/i
+                );
+                await host.dispose();
+                await assertHostStopped(host, ahp, runtimePid);
+                const saved = (await offlineOwner.rpc.host.listSessions({})).sessions;
+                expect(saved).toHaveLength(1);
+                expect(saved[0]).toMatchObject({
+                    resource: live[0]!.resource,
+                    title: live[0]!.title,
+                    createdAt: live[0]!.createdAt,
+                    modifiedAt: live[0]!.modifiedAt,
+                });
+                await assertHostStopped(host, ahp, runtimePid);
+                expect((await offlineOwner.rpc.host.listSessions({})).sessions).toEqual(saved);
+            } finally {
+                await host.dispose();
+                await ahp.client.shutdown();
+            }
+        } finally {
+            await offlineOwner.stop();
+        }
+    });
+
+    it("projects publication creation and metadata deltas to simultaneous 0.9 and 1.0 observers", async () => {
+        if (process.env.GITHUB_ACTIONS !== "true") {
+            throw new Error("Set GITHUB_ACTIONS=true to use fixture-only authentication");
+        }
+        await using session = await owner.createSession({
+            onPermissionRequest: approveAll,
+        });
+        const initialTitle = `publication wire ${randomUUID()}`;
+        await session.rpc.name.set({ name: initialTitle });
+        await using host = await owner.startAhpHost({ localServer: {}, computeId: randomUUID() });
+        await using legacy = await connectRawAhp(host, "0.9.0", ctx.env.GITHUB_TOKEN);
+        await using native = await connectRawAhp(host, "1.0.0", ctx.env.GITHUB_TOKEN);
+        const publication = await host.publishSession(session.sessionId);
+        type Summary = {
+            resource: string;
+            title: string;
+            createdAt: string;
+            modifiedAt: string;
+            chats?: { resource: string; title: string }[];
+            defaultChat?: string;
+        };
+        function checkTopology(summary: Partial<Summary>, version: string) {
+            if (version === "1.0.0") {
+                expect(summary.defaultChat).toEqual(expect.any(String));
+                expect(summary.chats).toHaveLength(1);
+                expect(summary.chats![0]).toMatchObject({
+                    resource: summary.defaultChat,
+                    title: summary.title,
+                });
+            } else {
+                expect(summary).not.toHaveProperty("chats");
+                expect(summary).not.toHaveProperty("defaultChat");
+            }
+        }
+        const observers = [
+            { version: "0.9.0", client: legacy },
+            { version: "1.0.0", client: native },
+        ];
+        const created = new Map<string, Summary>();
+        for (const { version, client } of observers) {
+            const added = await client.notification(
+                "root/sessionAdded",
+                (params) => (params.summary as Summary).resource === publication.sessionUri
+            );
+            const summary = added.summary as Summary;
+            expect(summary).toMatchObject({
+                resource: publication.sessionUri,
+                title: initialTitle,
+            });
+            checkTopology(summary, version);
+            const listed = await client.request("listSessions", { channel: "ahp-root://" });
+            expect(
+                (listed.items as Summary[]).find((entry) => entry.resource === summary.resource)
+            ).toEqual(summary);
+            created.set(version, summary);
+        }
+        const renamed = `publication updated ${randomUUID()}`;
+        await session.rpc.name.set({ name: renamed });
+        for (const { version, client } of observers) {
+            const changed = await client.notification(
+                "root/sessionSummaryChanged",
+                (params) =>
+                    params.session === publication.sessionUri &&
+                    (params.changes as Partial<Summary>).title === renamed
+            );
+            const changes = changed.changes as Partial<Summary>;
+            expect(changes).not.toHaveProperty("createdAt");
+            checkTopology(changes, version);
+            const listed = await client.request("listSessions", { channel: "ahp-root://" });
+            const summary = (listed.items as Summary[]).find(
+                (entry) => entry.resource === publication.sessionUri
+            );
+            expect(summary).toMatchObject({
+                ...created.get(version),
+                ...changes,
+                title: renamed,
+            });
+            checkTopology(summary!, version);
+        }
+        const [canonical] = (await host.listSessions()).sessions;
+        expect(canonical).toMatchObject({
+            resource: publication.sessionUri,
+            title: renamed,
+        });
+        // Publication/list/root observation must not cold-resume the session or
+        // manufacture an inference turn just to produce the metadata delta.
+        expect((await session.getEvents()).some((event) => event.type === "user.message")).toBe(
+            false
+        );
+    });
+
+    it("lists published session metadata without subscribing or stopping the host", async () => {
+        await configureReplay();
+        const title = `host catalog ${randomUUID()}`;
+        const createdBefore = Date.now();
+        await using session = await owner.createSession({
+            model: "claude-sonnet-5",
+            onPermissionRequest: approveAll,
+        });
+        const host = await owner.startAhpHost({ localServer: {}, computeId: randomUUID() });
+        const otherOwner = new CopilotClient({
+            connection: RuntimeConnection.forUri(`localhost:${runtimeDetails().port}`, {
+                connectionToken,
+            }),
+        });
+        const changedTitles: string[] = [];
+        const removeTitleListener = session.on("session.title_changed", (event) => {
+            changedTitles.push(event.data.title);
+        });
+        try {
+            const publication = await host.publishSession(session.sessionId);
+            const initial = (await host.listSessions()).sessions.find(
+                (entry) => entry.resource === publication.sessionUri
+            );
+            expect(initial).toBeDefined();
+            expect(initial!.title.length).toBeGreaterThan(0);
+            expect((await session.getEvents()).some((event) => event.type === "user.message")).toBe(
+                false
+            );
+            expect((await session.sendAndWait({ prompt: "What is 2+2?" }))?.data.content).toContain(
+                "4"
+            );
+            await vi.waitFor(
+                async () => {
+                    const { name } = await session.rpc.name.get();
+                    expect(name).toBeTruthy();
+                    expect(name).not.toBe(initial!.title);
+                    expect(name).not.toBe(session.sessionId);
+                    const events = await session.getEvents();
+                    expect(events).toEqual(
+                        expect.arrayContaining([
+                            expect.objectContaining({
+                                type: "user.message",
+                                data: expect.objectContaining({ content: "What is 2+2?" }),
+                            }),
+                        ])
+                    );
+                    expect(changedTitles).toContain(name);
+                    const updated = (await host.listSessions()).sessions.find(
+                        (entry) => entry.resource === publication.sessionUri
+                    );
+                    expect(updated).toMatchObject({ title: name, createdAt: initial!.createdAt });
+                    expect(Date.parse(updated!.modifiedAt)).toBeGreaterThan(
+                        Date.parse(initial!.modifiedAt)
+                    );
+                },
+                { timeout: 15_000 }
+            );
+
+            await session.rpc.name.set({ name: title });
+            await expect(session.rpc.name.get()).resolves.toMatchObject({ name: title });
+            const listed = await host.listSessions();
+            const summary = listed.sessions.find(
+                (entry) => entry.resource === publication.sessionUri
+            );
+            expect(summary).toBeDefined();
+            expect(summary).toMatchObject({
+                resource: publication.sessionUri,
+                title,
+                createdAt: initial!.createdAt,
+            });
+            expect(Date.parse(summary!.modifiedAt)).toBeGreaterThanOrEqual(
+                Date.parse(initial!.modifiedAt)
+            );
+            await expect(
+                session.rpc.name.setAuto({ summary: "Ignored automatic rename" })
+            ).resolves.toEqual({ applied: false });
+            await expect(host.listSessions()).resolves.toMatchObject({
+                sessions: expect.arrayContaining([
+                    expect.objectContaining({ resource: publication.sessionUri, title }),
+                ]),
+            });
+            expect(Number.isSafeInteger(summary!.status)).toBe(true);
+            expect(summary!.status).toBeGreaterThanOrEqual(0);
+            for (const timestamp of [summary!.createdAt, summary!.modifiedAt]) {
+                expect(Number.isFinite(Date.parse(timestamp))).toBe(true);
+                expect(timestamp).toMatch(/^\d{4}-\d{2}-\d{2}T/);
+                expect(Date.parse(timestamp)).toBeGreaterThanOrEqual(createdBefore - 60_000);
+                expect(Date.parse(timestamp)).toBeLessThanOrEqual(Date.now() + 60_000);
+            }
+            if (summary!.activity !== undefined) {
+                expect(typeof summary!.activity).toBe("string");
+            }
+
+            await otherOwner.start();
+            await expect(
+                otherOwner.rpc.host.listSessions({ hostId: host.hostId })
+            ).rejects.toThrow();
+            await otherOwner.stop();
+
+            // Listing must leave both the published session and its listener usable.
+            await expect(session.getEvents()).resolves.toEqual(expect.any(Array));
+            await expect(host.listSessions()).resolves.toMatchObject({
+                sessions: expect.arrayContaining([
+                    expect.objectContaining({ resource: publication.sessionUri }),
+                ]),
+            });
+            await assertRuntimeListener(host, runtimeDetails().pid, artifacts);
+
+            await host.dispose();
+            await expect(host.listSessions()).rejects.toThrow();
+            await expect(session.getEvents()).resolves.toEqual(expect.any(Array));
+        } finally {
+            removeTitleListener();
+            await host.dispose();
+            await otherOwner.stop();
+        }
+    });
+
+    it("retains a compute-scoped catalog across process restart and restores application tools", async () => {
+        if (process.env.GITHUB_ACTIONS !== "true") {
+            throw new Error("Set GITHUB_ACTIONS=true to use fixture-only authentication");
+        }
+        const computeId = randomUUID();
+        const title = `durable catalog ${randomUUID()}`;
+        const home = join(ctx.workDir, "durable-catalog-home");
+        await mkdir(home);
+        const clientOptions = {
+            connection: RuntimeConnection.forTcp({
+                path: artifacts.runtimePath,
+                connectionToken,
+            }),
+            workingDirectory: ctx.workDir,
+            gitHubToken: ctx.env.GITHUB_TOKEN,
+            env: { ...ctx.env, ...artifacts.env, COPILOT_HOME: home },
+        };
+        const first = new CopilotClient(clientOptions);
+        try {
+            const record = await (async () => {
+                await using session = await first.createSession({
+                    model: "claude-sonnet-5",
+                    onPermissionRequest: approveAll,
+                });
+                await using host = await first.startAhpHost({ computeId, localServer: {} });
+                const publication = await host.publishSession(session.sessionId);
+                await session.rpc.name.set({ name: title });
+                const summary = (await host.listSessions()).sessions.find(
+                    (entry) => entry.resource === publication.sessionUri
+                );
+                expect(summary).toMatchObject({ resource: publication.sessionUri, title });
+                await host.dispose();
+                await expect(host.listSessions()).rejects.toThrow();
+                await expect(session.getEvents()).resolves.toEqual(expect.any(Array));
+
+                await using replacement = await first.startAhpHost({ computeId, localServer: {} });
+                expect((await replacement.listSessions()).sessions).toContainEqual(summary);
+                await session.disconnect();
+                const saved = (await replacement.listSessions()).sessions.find(
+                    (entry) => entry.resource === publication.sessionUri
+                );
+                expect(saved).toMatchObject({
+                    resource: publication.sessionUri,
+                    title,
+                    createdAt: summary!.createdAt,
+                });
+                expect(Date.parse(saved!.modifiedAt)).toBeGreaterThanOrEqual(
+                    Date.parse(summary!.modifiedAt)
+                );
+                await using isolated = await first.startAhpHost({
+                    computeId: randomUUID(),
+                    localServer: {},
+                });
+                expect((await isolated.listSessions()).sessions).toEqual([]);
+                return { sessionId: session.sessionId, summary: saved! };
+            })();
+            const firstPid = runtimeDetails(first).pid;
+            expect(await first.stop()).toEqual([]);
+            await assertProcessStopped(firstPid, "Original catalog runtime");
+
+            const restarted = new CopilotClient(clientOptions);
+            let restored: CopilotSession | undefined;
+            try {
+                const toolHandler = vi.fn(({ value }: { value: string }) => `RESTORED_${value}`);
+                const resume = vi.fn(async ({ sessionId, config }: AhpSessionResumeRequest) => {
+                    expect(sessionId).toBe(record.sessionId);
+                    expect(config.continuePendingWork).toBe(false);
+                    restored = await restarted.resumeSession(sessionId, {
+                        ...config,
+                        model: "claude-sonnet-5",
+                        onPermissionRequest: approveAll,
+                        tools: [
+                            defineTool("durable_catalog_marker", {
+                                description: "Proves the application restored its tool handler",
+                                parameters: z.object({ value: z.string() }),
+                                handler: toolHandler,
+                            }),
+                        ],
+                    });
+                    await restored.rpc.tools.initializeAndValidate();
+                    return restored;
+                });
+                await using host = await restarted.startAhpHost({
+                    computeId,
+                    localServer: {},
+                    resumeSession: resume,
+                });
+                expect(runtimeDetails(restarted).pid).not.toBe(firstPid);
+                expect((await host.listSessions()).sessions).toContainEqual(record.summary);
+                expect(resume).not.toHaveBeenCalled();
+                await using isolated = await restarted.startAhpHost({
+                    computeId: randomUUID(),
+                    localServer: {},
+                });
+                expect((await isolated.listSessions()).sessions).toEqual([]);
+                const isolatedAhp = await connectAhp(isolated);
+                try {
+                    await authenticateAhp(isolatedAhp, ctx.env.GITHUB_TOKEN);
+                    const catalog = await isolatedAhp.client.request("listSessions", {
+                        channel: "ahp-root://",
+                    });
+                    expect(catalog.items.map((item) => item.resource)).not.toContain(
+                        record.summary.resource
+                    );
+                } finally {
+                    await isolatedAhp.client.shutdown();
+                }
+
+                const ahp = await connectAhp(host);
+                try {
+                    await authenticateAhp(ahp, ctx.env.GITHUB_TOKEN);
+                    const catalog = await ahp.client.request("listSessions", {
+                        channel: "ahp-root://",
+                    });
+                    expect(catalog.items).toEqual(
+                        expect.arrayContaining([
+                            expect.objectContaining({ resource: record.summary.resource, title }),
+                        ])
+                    );
+                    expect(resume).not.toHaveBeenCalled();
+                    const { result, subscription } = await ahp.client
+                        .subscribe(record.summary.resource)
+                        .catch(async (error: unknown) => {
+                            for (const call of resume.mock.results) {
+                                if (call.type === "return") await call.value;
+                            }
+                            throw error;
+                        });
+                    const state = result.snapshot?.state as SessionState | undefined;
+                    expect(state?.lifecycle).toBe("ready");
+                    if (!result.snapshot)
+                        throw new Error("AHP resume returned no session snapshot");
+                    let initialized = state!;
+                    const actions: string[] = [];
+                    const hasMarker = () =>
+                        initialized.serverTools?.some(
+                            (tool) => tool.name === "durable_catalog_marker"
+                        );
+                    try {
+                        await withDeadline(
+                            (async () => {
+                                if (hasMarker()) return;
+                                for await (const event of subscription) {
+                                    if (event.type !== "action") continue;
+                                    actions.push(event.params.action.type);
+                                    if (event.params.rejectionReason)
+                                        throw new Error(event.params.rejectionReason);
+                                    initialized = sessionReducer(
+                                        initialized,
+                                        event.params.action as SessionAction
+                                    );
+                                    if (hasMarker()) return;
+                                }
+                                throw new Error(
+                                    "AHP session stream closed before marker tools arrived"
+                                );
+                            })(),
+                            "AHP serverTools projection",
+                            10_000
+                        );
+                    } catch (error) {
+                        throw new Error(
+                            `AHP marker tools missing; actions=${JSON.stringify(actions)}, serverTools=${JSON.stringify(initialized.serverTools)}, lifecycle=${initialized.lifecycle}`,
+                            { cause: error }
+                        );
+                    } finally {
+                        await subscription.return();
+                    }
+                    expect(initialized.serverTools).toEqual(
+                        expect.arrayContaining([
+                            expect.objectContaining({ name: "durable_catalog_marker" }),
+                        ])
+                    );
+                    expect(resume).toHaveBeenCalledOnce();
+                    if (!restored)
+                        throw new Error("AHP subscribe did not invoke the resume factory");
+                    expect(restored.sessionId).toBe(record.sessionId);
+                    const metadata = await restored.rpc.tools.getCurrentMetadata();
+                    expect(metadata.tools?.map((tool) => tool.name)).toContain(
+                        "durable_catalog_marker"
+                    );
+                    // Exercise the restored handler directly, without starting a model turn.
+                    const executed = await restored.rpc.tools.execute({
+                        name: "durable_catalog_marker",
+                        arguments: { value: "fixture" },
+                    });
+                    expect(
+                        typeof executed === "string" ? executed : executed.textResultForLlm
+                    ).toBe("RESTORED_fixture");
+                    if (typeof executed !== "string") {
+                        expect(executed.resultType).toBe("success");
+                    }
+                    expect(toolHandler).toHaveBeenCalledOnce();
+                    expect(toolHandler.mock.calls[0]?.[0]).toEqual({ value: "fixture" });
+                    expect(await ctx.openAiEndpoint.getExchanges()).toEqual([]);
+                    await host.dispose();
+                    await assertHostStopped(host, ahp, runtimeDetails(restarted).pid);
+                    await expect(restored.getEvents()).resolves.toEqual(expect.any(Array));
+                } finally {
+                    await host.dispose();
+                    await ahp.client.shutdown();
+                }
+            } finally {
+                await restored?.disconnect();
+                expect(await restarted.stop()).toEqual([]);
+            }
+        } finally {
+            expect(await first.stop()).toEqual([]);
+        }
+    });
+
     function exitObserver() {
         const exits: AhpHostExit[] = [];
         let resolve!: (exit: AhpHostExit) => void;
@@ -1117,6 +1604,9 @@ describe.skipIf(!enabled)("Runtime-supervised AHP host", async () => {
             onPermissionRequest: approveAll,
             streaming: true,
         });
+        const previousRuntimeIds = new Set(
+            (await owner.listSessions()).map((item) => item.sessionId)
+        );
         await using host = await owner.startAhpHost({ localServer: {} });
         const ahp = await connectAhp(host);
         try {
@@ -1130,12 +1620,28 @@ describe.skipIf(!enabled)("Runtime-supervised AHP host", async () => {
             expect(response.deltas).toBeGreaterThan(0);
             expect(sdkResponse?.data.content).toContain("4");
 
-            const runtimeSessions = (await owner.listSessions()).map((item) => item.sessionId);
+            const runtimeSessions = await vi.waitFor(
+                async () => {
+                    const ids = (await owner.listSessions()).map((item) => item.sessionId);
+                    expect(ids).toContain(sdkSession.sessionId);
+                    expect(
+                        ids.filter(
+                            (id) => id !== sdkSession.sessionId && !previousRuntimeIds.has(id)
+                        )
+                    ).toHaveLength(1);
+                    return ids;
+                },
+                { timeout: 10_000 }
+            );
             expect(runtimeSessions).toContain(sdkSession.sessionId);
-            expect(runtimeSessions).toContain(session.sessionId);
-            await using observer = await owner.resumeSession(session.sessionId, {
+            const [ahpRuntimeSessionId] = runtimeSessions.filter(
+                (id) => id !== sdkSession.sessionId && !previousRuntimeIds.has(id)
+            );
+            expect(ahpRuntimeSessionId).not.toBe(session.sessionId);
+            await using observer = await owner.resumeSession(ahpRuntimeSessionId, {
                 onPermissionRequest: approveAll,
             });
+            expect(observer.sessionId).toBe(ahpRuntimeSessionId);
             expect(
                 (await observer.getEvents()).some(
                     (event) =>
diff --git a/nodejs/test/e2e/sandbox_mcp_failure.e2e.test.ts b/nodejs/test/e2e/sandbox_mcp_failure.e2e.test.ts
new file mode 100644
index 0000000000..9d7dfbf985
--- /dev/null
+++ b/nodejs/test/e2e/sandbox_mcp_failure.e2e.test.ts
@@ -0,0 +1,85 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { describe, it } from "vitest";
+import { approveAll } from "../../src/index.js";
+import { createSdkTestContext } from "./harness/sdkTestContext.js";
+
+describe("Sandboxed MCP connection failures", async () => {
+    if (process.platform !== "darwin") {
+        // The SDK sandbox suite currently has a backend only on macOS.
+        it.skip("preserves sandbox context in MCP failures", () => undefined);
+        return;
+    }
+
+    const { copilotClient: client, workDir } = await createSdkTestContext({
+        copilotClientOptions: {
+            env: { COPILOT_CLI_ENABLED_FEATURE_FLAGS: "SANDBOX" },
+        },
+    });
+
+    for (const { enabled, sandboxMcpServers } of [
+        { enabled: true, sandboxMcpServers: true },
+        { enabled: false, sandboxMcpServers: true },
+        { enabled: true, sandboxMcpServers: false },
+    ]) {
+        it(
+            `reports an early server exit with enabled=${enabled}, sandboxMcpServers=${sandboxMcpServers}`,
+            { timeout: 120_000 },
+            async ({ expect }) => {
+                await using session = await client.createSession({
+                    onPermissionRequest: approveAll,
+                    workingDirectory: workDir,
+                    disabledMcpServers: ["exiting"],
+                    mcpServers: {
+                        exiting: {
+                            type: "local",
+                            command: "/bin/sh",
+                            args: ["-c", "printf 'MCP_STARTUP_DIAGNOSTIC\\n' >&2; exit 42"],
+                            workingDirectory: workDir,
+                            tools: ["*"],
+                        },
+                    },
+                });
+                const update = await session.rpc.options.update({
+                    sandboxConfig: {
+                        enabled,
+                        sandboxMcpServers,
+                        addCurrentWorkingDirectory: true,
+                        userPolicy: { network: { allowOutbound: false } },
+                    },
+                });
+                expect(update.success).toBe(true);
+                // Enable waits for any pending sandbox restart before starting this server.
+                await session.rpc.mcp.enable({ serverName: "exiting" });
+
+                await expect
+                    .poll(
+                        async () => {
+                            const server = (await session.rpc.mcp.list()).servers.find(
+                                (server) => server.name === "exiting"
+                            );
+                            return {
+                                status: server?.status,
+                                error: server?.error,
+                                sandboxContext: server?.error?.includes("inside the sandbox."),
+                                routingAdvice: server?.error?.includes(
+                                    '"sandbox.sandboxMcpServers": false'
+                                ),
+                                transportTypeLeak: server?.error?.includes("rmcp::"),
+                            };
+                        },
+                        { timeout: 60_000 }
+                    )
+                    .toMatchObject({
+                        status: "failed",
+                        error: expect.stringContaining("MCP_STARTUP_DIAGNOSTIC"),
+                        sandboxContext: enabled && sandboxMcpServers,
+                        routingAdvice: enabled && sandboxMcpServers,
+                        transportTypeLeak: false,
+                    });
+            }
+        );
+    }
+});
diff --git a/nodejs/test/e2e/sandbox_network.e2e.test.ts b/nodejs/test/e2e/sandbox_network.e2e.test.ts
new file mode 100644
index 0000000000..0a78088696
--- /dev/null
+++ b/nodejs/test/e2e/sandbox_network.e2e.test.ts
@@ -0,0 +1,139 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { createServer } from "node:http";
+import { describe, it } from "vitest";
+import type { CopilotSession } from "../../src/index.js";
+import { getRuntimePlatform } from "../../src/runtimeArtifacts.js";
+import { createSdkTestContext } from "./harness/sdkTestContext.js";
+
+const TEST_NAME =
+    "grants loopback through a restrictive host allowlist and preserves explicit blocks";
+
+describe("Sandbox network", async () => {
+    const { copilotClient: client } = await createSdkTestContext({
+        copilotClientOptions: {
+            env: { COPILOT_CLI_ENABLED_FEATURE_FLAGS: "SANDBOX" },
+        },
+    });
+
+    it("reports the shipped platform's sandbox support and refusal", async ({ expect }) => {
+        await client.start();
+        const support = await client.rpc.sandbox.getHostSupport();
+        if (getRuntimePlatform().startsWith("linuxmusl-")) {
+            expect(support).toEqual({
+                supported: false,
+                reason: "Sandboxed shell execution is not supported on Alpine Linux/musl.",
+                capabilities: [],
+            });
+        } else if (support.supported) {
+            expect(support.reason).toBeUndefined();
+            expect(support.capabilities).toContainEqual({ name: "shell", supported: true });
+        } else {
+            expect(support.reason).toEqual(expect.any(String));
+            expect(support.reason).not.toBe("");
+            expect(support.capabilities).toEqual([]);
+        }
+    });
+
+    it(TEST_NAME, async ({ expect, onTestFinished, skip }) => {
+        await client.start();
+        const support = await client.rpc.sandbox.getHostSupport();
+        if (
+            !support.supported ||
+            !support.capabilities.some(
+                (capability) => capability.name === "network_filtering" && capability.supported
+            )
+        ) {
+            skip(`Host lacks sandbox proxy support: ${JSON.stringify(support)}`);
+            return;
+        }
+
+        const requests: string[] = [];
+        const server = createServer((request, response) => {
+            requests.push(request.headers.host ?? "");
+            response.end("SANDBOX_LOOPBACK_REACHED");
+        });
+        let session: CopilotSession | undefined;
+        onTestFinished(async () => {
+            try {
+                await session?.disconnect();
+            } finally {
+                server.closeAllConnections();
+                if (server.listening) {
+                    await new Promise<void>((resolve, reject) => {
+                        server.close((error) => (error ? reject(error) : resolve()));
+                    });
+                }
+            }
+        });
+        await new Promise<void>((resolve, reject) => {
+            server.once("error", reject);
+            server.listen(0, "127.0.0.1", () => {
+                server.off("error", reject);
+                resolve();
+            });
+        });
+        const address = server.address();
+        if (!address || typeof address === "string") {
+            throw new Error("Expected a TCP listener address");
+        }
+        session = await client.createSession({
+            onPermissionRequest: (request) =>
+                request.kind === "shell" && !request.requestSandboxBypass
+                    ? { kind: "approve-once" }
+                    : { kind: "reject" },
+        });
+        const blockedHosts: string[] = [];
+        const sandboxConfig = {
+            enabled: true,
+            failIfUnavailable: true,
+            allowBypass: false,
+            allowDevToolAccess: false,
+            userPolicy: {
+                network: {
+                    allowOutbound: true,
+                    allowLocalNetwork: true,
+                    allowedHosts: ["example.test"],
+                    blockedHosts,
+                },
+            },
+        };
+        expect((await session.rpc.options.update({ sandboxConfig })).success).toBe(true);
+        await session.rpc.tools.initializeAndValidate();
+        const shell = process.platform === "win32" ? "powershell" : "bash";
+        const curl = process.platform === "win32" ? "curl.exe" : "curl";
+        const proxy = process.platform === "win32" ? "$env:HTTP_PROXY" : "$HTTP_PROXY";
+        const suffix = process.platform === "win32" ? "; exit $LASTEXITCODE" : "";
+
+        for (const host of ["localhost", "127.0.0.1"]) {
+            const result = await session.rpc.tools.execute({
+                name: shell,
+                arguments: {
+                    command: `${curl} --disable --silent --show-error --fail --max-time 5 --proxy "${proxy}" http://${host}:${address.port}/${suffix}`,
+                    description: "Reach the host loopback server through the sandbox proxy",
+                },
+                toolCallId: `loopback-${host}`,
+            });
+            expect(result).toMatchObject({
+                resultType: "success",
+                textResultForLlm: expect.stringContaining("SANDBOX_LOOPBACK_REACHED"),
+            });
+        }
+        expect(requests).toEqual([`localhost:${address.port}`, `127.0.0.1:${address.port}`]);
+
+        blockedHosts.push("localhost");
+        expect((await session.rpc.options.update({ sandboxConfig })).success).toBe(true);
+        const blocked = await session.rpc.tools.execute({
+            name: shell,
+            arguments: {
+                command: `${curl} --disable --silent --show-error --max-time 5 --proxy "${proxy}" http://localhost:${address.port}/${suffix}`,
+                description: "Check that an explicit host block still wins",
+            },
+            toolCallId: "loopback-blocked",
+        });
+        expect(blocked.textResultForLlm).toContain("Sandbox host policy denied the destination");
+        expect(requests).toHaveLength(2);
+    });
+});
diff --git a/nodejs/test/e2e/sandbox_proxy.e2e.test.ts b/nodejs/test/e2e/sandbox_proxy.e2e.test.ts
new file mode 100644
index 0000000000..019baa983b
--- /dev/null
+++ b/nodejs/test/e2e/sandbox_proxy.e2e.test.ts
@@ -0,0 +1,122 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { createServer } from "node:http";
+import { describe, it } from "vitest";
+import type { PermissionRequest } from "../../src/index.js";
+import { createSdkTestContext, DEFAULT_GITHUB_TOKEN } from "./harness/sdkTestContext.js";
+
+// Policy tests inject host capabilities; these tests check real OS network enforcement through the SDK.
+describe("Sandbox proxy host filtering", async () => {
+    const { copilotClient: client } = await createSdkTestContext({
+        copilotClientOptions: {
+            gitHubToken: DEFAULT_GITHUB_TOKEN,
+            env: {
+                COPILOT_CLI_ENABLED_FEATURE_FLAGS: "SANDBOX",
+                GH_TOKEN: DEFAULT_GITHUB_TOKEN,
+                GITHUB_TOKEN: DEFAULT_GITHUB_TOKEN,
+            },
+        },
+    });
+
+    for (const { name, rules, blockedHost } of [
+        { name: "allowlist", rules: { allowedHosts: ["127.0.0.1"] }, blockedHost: "127.0.0.2" },
+        { name: "blocklist", rules: { blockedHosts: ["localhost"] }, blockedHost: "localhost" },
+    ]) {
+        it(`enforces the ${name} and blocks direct sockets`, async ({
+            expect,
+            skip,
+            onTestFinished,
+        }) => {
+            await client.start();
+            const support = await client.rpc.sandbox.getHostSupport();
+            if (
+                !support.supported ||
+                !support.capabilities.some(
+                    (capability) => capability.name === "network_filtering" && capability.supported
+                )
+            ) {
+                skip(`Host lacks sandbox proxy support: ${JSON.stringify(support)}`);
+                return;
+            }
+
+            const requests: string[] = [];
+            const server = createServer((request, response) => {
+                requests.push(request.url ?? "");
+                response.end("SANDBOX_FILTER_ALLOWED");
+            });
+            onTestFinished(async () => {
+                server.closeAllConnections();
+                if (server.listening) {
+                    await new Promise<void>((resolve, reject) => {
+                        server.close((error) => (error ? reject(error) : resolve()));
+                    });
+                }
+            });
+            await new Promise<void>((resolve, reject) => {
+                server.once("error", reject);
+                server.listen(0, "127.0.0.1", resolve);
+            });
+            const address = server.address();
+            if (!address || typeof address === "string") {
+                throw new Error("Expected a TCP listener address");
+            }
+            const bypassRequests: PermissionRequest[] = [];
+            const session = await client.createSession({
+                onPermissionRequest: (request) => {
+                    if ("requestSandboxBypass" in request && request.requestSandboxBypass) {
+                        bypassRequests.push(request);
+                        return { kind: "reject" };
+                    }
+                    return { kind: "approve-once" };
+                },
+            });
+            try {
+                const update = await session.rpc.options.update({
+                    sandboxConfig: {
+                        enabled: true,
+                        allowBypass: false,
+                        addCurrentWorkingDirectory: true,
+                        auth: { git: false, gh: false },
+                        userPolicy: {
+                            network: {
+                                allowOutbound: true,
+                                allowLocalNetwork: true,
+                                ...rules,
+                            },
+                        },
+                    },
+                });
+                expect(update.success).toBe(true);
+
+                const curl = process.platform === "win32" ? "curl.exe" : "curl";
+                const suffix = process.platform === "win32" ? "; exit $LASTEXITCODE" : "";
+                const allowed = await session.rpc.shell.executeUserRequested({
+                    requestId: `${name}-allowed`,
+                    command: `${curl} --disable --silent --show-error --fail --max-time 5 http://127.0.0.1:${address.port}/allowed${suffix}`,
+                });
+                expect(allowed.success, allowed.output).toBe(true);
+                expect(allowed.exitCode, allowed.output).toBe(0);
+                expect(allowed.output).toContain("SANDBOX_FILTER_ALLOWED");
+
+                const blocked = await session.rpc.shell.executeUserRequested({
+                    requestId: `${name}-blocked`,
+                    command: `${curl} --disable --silent --show-error --fail --max-time 5 http://${blockedHost}:${address.port}/blocked${suffix}`,
+                });
+                expect(blocked.exitCode, blocked.output).toBe(22);
+                expect(blocked.output).toContain("403");
+
+                const direct = await session.rpc.shell.executeUserRequested({
+                    requestId: `${name}-direct`,
+                    command: `${curl} --disable --silent --show-error --fail --noproxy '*' --max-time 2 http://127.0.0.1:${address.port}/direct${suffix}`,
+                });
+                expect([7, 28], direct.output).toContain(direct.exitCode);
+                expect(requests).toEqual(["/allowed"]);
+                expect(bypassRequests).toEqual([]);
+            } finally {
+                await session.disconnect();
+            }
+        });
+    }
+});
diff --git a/nodejs/test/e2e/scenario_testing_permissions.e2e.test.ts b/nodejs/test/e2e/scenario_testing_permissions.e2e.test.ts
index 577c1bef58..c2083ba714 100644
--- a/nodejs/test/e2e/scenario_testing_permissions.e2e.test.ts
+++ b/nodejs/test/e2e/scenario_testing_permissions.e2e.test.ts
@@ -34,4 +34,50 @@ describe("Scenario permission mode RPC", async () => {
             await session.disconnect();
         }
     });
+
+    it("refuses Assisted Permissions when managed policy disables it", async () => {
+        const session = await client.createSession({
+            onPermissionRequest: approveAll,
+            featureFlags: { AUTO_APPROVAL: true },
+            managedSettings: {
+                permissions: {
+                    disableAssistedPermissionsMode: true,
+                },
+            },
+        });
+        let enforcement:
+            | {
+                  escalation?: string;
+                  setting: string;
+                  failClosed: boolean;
+              }
+            | undefined;
+        session.on((event) => {
+            if (event.type === "session.managed_settings_enforced") {
+                enforcement = event.data;
+            }
+        });
+
+        try {
+            expect((await session.rpc.permissions.getMode()).mode).toBe("manual");
+            await expect(
+                session.rpc.permissions.setMode({
+                    mode: "assisted",
+                    assistedApprovalModel: "gpt-5.5",
+                    source: "rpc",
+                })
+            ).resolves.toMatchObject({ success: false, mode: "manual" });
+            expect((await session.rpc.permissions.getMode()).mode).toBe("manual");
+            // RPC completion does not drain the independently delivered session events.
+            await expect
+                .poll(() => enforcement, { timeout: 30_000 })
+                .toMatchObject({
+                    escalation: "assisted_approval",
+                    setting: "permissions.disableAssistedPermissionsMode",
+                    failClosed: false,
+                });
+        } finally {
+            await session.disconnect();
+        }
+    });
 });
diff --git a/nodejs/test/e2e/scenario_testing_server_control.e2e.test.ts b/nodejs/test/e2e/scenario_testing_server_control.e2e.test.ts
index 0bef912e0e..7fca6fff84 100644
--- a/nodejs/test/e2e/scenario_testing_server_control.e2e.test.ts
+++ b/nodejs/test/e2e/scenario_testing_server_control.e2e.test.ts
@@ -138,7 +138,7 @@ describe("Scenario server control generated RPC", async () => {
         }
     );
 
-    it("should observe page and cancel factory run", async () => {
+    it("should observe page and cancel workflow run", async () => {
         await withFakeCli(async (client, requests) => {
             const session = await client.createSession({});
             const runs = await session.rpc.workflow.listRuns({
diff --git a/nodejs/test/e2e/session.e2e.test.ts b/nodejs/test/e2e/session.e2e.test.ts
index 10f3b49f8a..33dc34f027 100644
--- a/nodejs/test/e2e/session.e2e.test.ts
+++ b/nodejs/test/e2e/session.e2e.test.ts
@@ -4,6 +4,7 @@ import { ParsedHttpExchange } from "../../../test/harness/replayingCapiProxy.js"
 import { CopilotClient, approveAll, defineTool, RuntimeConnection } from "../../src/index.js";
 import { createSdkTestContext, DEFAULT_GITHUB_TOKEN, isCI } from "./harness/sdkTestContext.js";
 import { withFinalAssistantMessage, getNextEventOfType, retry } from "./harness/sdkTestHelper.js";
+import { isByokBackend } from "./harness/testBackend.js";
 
 const {
     copilotClient: client,
@@ -121,9 +122,31 @@ describe("Sessions", () => {
             onPermissionRequest: approveAll,
             model: "claude-sonnet-4.5",
         });
-        await session.sendAndWait({
+        const initialResponse = await session.sendAndWait({
             prompt: `Please remember this exact secret marker for later - ${marker}. Reply with only the single word "Acknowledged".`,
         });
+        // Legacy single-provider SDK configuration has no stable provider reference.
+        const expectedProvider = isByokBackend
+            ? null
+            : { id: "copilot", kind: "copilot", label: "GitHub Copilot" };
+        expect(initialResponse?.data.content).toContain("Acknowledged");
+        expect(initialResponse?.data.providerId).toBe(expectedProvider?.id);
+        const initialEvents = await session.getEvents();
+        const initialMessage = initialEvents
+            .filter((event) => event.type === "assistant.message")
+            .find((event) => event.data.messageId === initialResponse?.data.messageId);
+        expect(initialMessage).toBeDefined();
+        expect(initialMessage?.data.providerId).toBe(expectedProvider?.id);
+        const recordedUsage = await session.rpc.usage.getMetrics();
+        expect(recordedUsage.aiCreditsStatus).toBe("unavailable");
+        const recordedModel = recordedUsage.providerModelMetrics?.find(
+            (row) => row.modelId === "claude-sonnet-4.5"
+        );
+        expect(recordedModel?.provider).toEqual(expectedProvider);
+        expect(recordedModel?.metrics.requests.count).toBeGreaterThan(0);
+        expect((await session.getEvents()).map((event) => event.type)).not.toContain(
+            "session.usage_record"
+        );
         await session.disconnect();
         await firstClient.stop();
 
@@ -144,11 +167,21 @@ describe("Sessions", () => {
             onPermissionRequest: approveAll,
             model: "claude-sonnet-4.5",
         });
+        const restoredUsage = await resumedSession.rpc.usage.getMetrics();
+        expect(restoredUsage.aiCreditsStatus).toBe(recordedUsage.aiCreditsStatus);
+        const resumedMessage = (await resumedSession.getEvents())
+            .filter((event) => event.type === "assistant.message")
+            .find((event) => event.data.messageId === initialResponse?.data.messageId);
+        expect(resumedMessage).toBeDefined();
+        expect(resumedMessage?.data.providerId).toBe(expectedProvider?.id);
+        expect(restoredUsage.providerModelMetrics).toEqual(recordedUsage.providerModelMetrics);
+        expect(restoredUsage.totalNanoAiu).toBe(recordedUsage.totalNanoAiu);
         const response = await resumedSession.sendAndWait({
             prompt: "What was the exact secret marker I asked you to remember earlier? Reply with only that marker value and nothing else.",
         });
 
         expect(response?.data.content).toContain(marker);
+        expect(response?.data.providerId).toBe(expectedProvider?.id);
         await resumedSession.disconnect();
         await secondClient.stop();
     });
diff --git a/nodejs/test/e2e/session_extension_reconciliation.e2e.test.ts b/nodejs/test/e2e/session_extension_reconciliation.e2e.test.ts
new file mode 100644
index 0000000000..c68ce5a79b
--- /dev/null
+++ b/nodejs/test/e2e/session_extension_reconciliation.e2e.test.ts
@@ -0,0 +1,87 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { execFileSync } from "node:child_process";
+import { existsSync, readFileSync } from "node:fs";
+import { mkdir, readFile, writeFile } from "node:fs/promises";
+import { dirname, join, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+import { expect, it } from "vitest";
+import { approveAll, RuntimeConnection } from "../../src/index.js";
+import { createSdkTestContext, getLegacyCliPathForTests } from "./harness/sdkTestContext.js";
+import { retry } from "./harness/sdkTestHelper.js";
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const DIST_DIR = resolve(__dirname, "..", "..", "dist");
+
+const { copilotClient, env, workDir } = await createSdkTestContext({
+    copilotClientOptions: {
+        connection: RuntimeConnection.forStdio({ path: await getLegacyCliPathForTests() }),
+        env: { COPILOT_CLI_ENABLED_FEATURE_FLAGS: "EXTENSIONS" },
+    },
+});
+
+async function writeExtension(extensionDir: string, readyFile: string): Promise<void> {
+    await mkdir(extensionDir, { recursive: true });
+    await writeFile(
+        join(extensionDir, "extension.mjs"),
+        `
+import { writeFileSync } from "node:fs";
+import { joinSession } from "@github/copilot-sdk/extension";
+
+await joinSession({});
+writeFileSync(${JSON.stringify(readyFile)}, "joined");
+setInterval(() => {}, 60_000);
+`
+    );
+}
+
+it("reconciles session extensions without persisting preferences", async () => {
+    const copilotHome = env.COPILOT_HOME!;
+    const readyFile = join(workDir, "project-probe-joined");
+    await writeExtension(join(workDir, ".github", "extensions", "probe"), readyFile);
+    await writeExtension(
+        join(copilotHome, "extensions", "explicitly-disabled"),
+        join(workDir, "disabled-probe-joined")
+    );
+    const settingsPath = join(copilotHome, "settings.json");
+    const settings = '{"extensions":{"disabledExtensions":["user:explicitly-disabled"]}}';
+    await writeFile(settingsPath, settings);
+    execFileSync("git", ["init", "--quiet"], { cwd: workDir });
+
+    await using session = await copilotClient.createSession({
+        requestExtensions: true,
+        extensionSdkPath: DIST_DIR,
+        onPermissionRequest: approveAll,
+    });
+    await retry(
+        "wait for the project extension to join the session",
+        async () => {
+            expect(existsSync(readyFile) && readFileSync(readyFile, "utf-8")).toBe("joined");
+        },
+        300,
+        100
+    );
+    const listed = await session.rpc.extensions.list();
+    const project = listed.extensions.find(({ id }) => id === "project:probe");
+    expect(project).toMatchObject({ source: "project", status: "running" });
+    expect(project?.pid).toBeTypeOf("number");
+    const configPath = join(copilotHome, "config.json");
+    const configBefore = existsSync(configPath) ? await readFile(configPath, "utf-8") : undefined;
+
+    const reconciled = await session.rpc.extensions.reconcile();
+
+    expect(reconciled.extensions).toEqual(
+        expect.arrayContaining([
+            project,
+            expect.objectContaining({ id: "user:explicitly-disabled", status: "disabled" }),
+        ])
+    );
+    expect(existsSync(join(workDir, "disabled-probe-joined"))).toBe(false);
+    expect(await readFile(settingsPath, "utf-8")).toBe(settings);
+    expect(existsSync(configPath) ? await readFile(configPath, "utf-8") : undefined).toBe(
+        configBefore
+    );
+    expect((await session.rpc.extensions.list()).extensions).toEqual(reconciled.extensions);
+});
diff --git a/nodejs/test/e2e/session_fs.e2e.test.ts b/nodejs/test/e2e/session_fs.e2e.test.ts
index a987127965..963f80aae9 100644
--- a/nodejs/test/e2e/session_fs.e2e.test.ts
+++ b/nodejs/test/e2e/session_fs.e2e.test.ts
@@ -4,12 +4,16 @@
 
 import { SessionCompactionCompleteEvent } from "@github/copilot/sdk";
 import { MemoryProvider, VirtualProvider } from "@platformatic/vfs";
-import { createHash } from "crypto";
+import { createHash, randomUUID } from "crypto";
 import { existsSync, mkdtempSync, realpathSync } from "fs";
+import { mkdir, readFile, readdir, rm, writeFile } from "fs/promises";
+import { createServer } from "http";
 import { tmpdir } from "os";
 import { join } from "path";
-import { describe, expect, it, onTestFinished } from "vitest";
+import { fileURLToPath } from "url";
+import { describe, expect, it, onTestFinished, vi } from "vitest";
 import { CopilotClient } from "../../src/client.js";
+import { getRuntimePlatform } from "../../src/runtimeArtifacts.js";
 import { createSessionFsAdapter, RuntimeConnection } from "../../src/index.js";
 import type { SessionFsReaddirWithTypesEntry } from "../../src/generated/rpc.js";
 import {
@@ -20,6 +24,7 @@ import {
     type SessionFsConfig,
     type SessionFsProvider,
     type SessionFsFileInfo,
+    type PermissionRequestResult,
 } from "../../src/index.js";
 import { createSdkTestContext } from "./harness/sdkTestContext.js";
 
@@ -47,6 +52,7 @@ describe("Session Fs", async () => {
         createClient,
         env,
         openAiEndpoint,
+        workDir,
     } = await createSdkTestContext({
         copilotClientOptions: { sessionFs: sessionFsConfig },
     });
@@ -175,6 +181,131 @@ describe("Session Fs", async () => {
         expect(msg2?.data.content).toContain("300");
     });
 
+    it("should roll context through native tools.execute from an active SDK handler", async () => {
+        await openAiEndpoint.updateConfig({
+            filePath: fileURLToPath(
+                new URL(
+                    "../../../test/snapshots/session_fs/should_route_file_operations_through_the_session_fs_provider.yaml",
+                    import.meta.url
+                )
+            ),
+            workDir,
+            replayOnly: true,
+        });
+        const original = await client.createSession({
+            onPermissionRequest: approveAll,
+            createSessionFsProvider,
+            featureFlags: { CONTEXT_MANAGEMENT_TOOLS: false },
+        });
+        const sessionId = original.sessionId;
+        try {
+            expect(
+                (await original.sendAndWait({ prompt: "What is 100 + 200?" }))?.data.content
+            ).toContain("300");
+        } finally {
+            await original.disconnect();
+        }
+
+        // Resume a valid large user event so a fresh window can reclaim context.
+        const request: SessionEvent = {
+            id: randomUUID(),
+            timestamp: new Date().toISOString(),
+            parentId: null,
+            type: "user.message",
+            data: {
+                content:
+                    "Preserve SDK rollover state. " + "Rollover fixture context. ".repeat(3_000),
+                source: "user",
+            },
+        };
+        await provider.appendFile(
+            p(sessionId, `${sessionStatePath}/events.jsonl`),
+            JSON.stringify(request) + "\n"
+        );
+
+        let resumed: CopilotSession;
+        let innerResult: Awaited<ReturnType<CopilotSession["rpc"]["tools"]["execute"]>> | undefined;
+        resumed = await client.resumeSession(sessionId, {
+            onPermissionRequest: approveAll,
+            createSessionFsProvider,
+            featureFlags: { CONTEXT_MANAGEMENT_TOOLS: true },
+            continuePendingWork: false,
+            tools: [
+                defineTool("sdk_context_rollover", {
+                    description: "Roll context from an active SDK tool handler",
+                    isTerminal: true,
+                    defer: "never",
+                    handler: async () => {
+                        innerResult = await resumed.rpc.tools.execute({
+                            name: "new_context",
+                            arguments: {},
+                            toolCallId: "sdk-context-rollover-native",
+                        });
+                        return JSON.stringify(innerResult);
+                    },
+                }),
+            ],
+        });
+        try {
+            await resumed.rpc.tools.initializeAndValidate();
+            expect((await resumed.rpc.tools.getCurrentMetadata()).tools).toEqual(
+                expect.arrayContaining([expect.objectContaining({ name: "new_context" })])
+            );
+            const remaining = await resumed.rpc.tools.execute({
+                name: "get_context_remaining",
+                arguments: {},
+            });
+            expect(remaining, JSON.stringify(remaining)).toMatchObject({ resultType: "success" });
+            expect(JSON.parse(remaining.textResultForLlm)).toMatchObject({
+                context_window: { number: 1, previous_window_id: null },
+            });
+            const checkpoint = await resumed.rpc.tools.execute({
+                name: "session_artifacts",
+                arguments: {
+                    operation: "append",
+                    path: "checkpoint.md",
+                    content: "\nPreserve SDK rollover state.",
+                },
+            });
+            expect(checkpoint, JSON.stringify(checkpoint)).toMatchObject({ resultType: "success" });
+
+            const outerResult = await resumed.rpc.tools.execute({
+                name: "sdk_context_rollover",
+                arguments: {},
+                toolCallId: "sdk-context-rollover-handler",
+            });
+            expect(outerResult, JSON.stringify(outerResult)).toMatchObject({
+                resultType: "success",
+            });
+            expect(innerResult, JSON.stringify(innerResult)).toMatchObject({
+                resultType: "success",
+            });
+            await expect
+                .poll(async () =>
+                    (await resumed.getEvents()).filter(
+                        (event) => event.type === "session.context_cleared"
+                    )
+                )
+                .toEqual([
+                    expect.objectContaining({
+                        data: expect.objectContaining({
+                            initialMessage: expect.stringContaining("Preserve SDK rollover state."),
+                        }),
+                    }),
+                ]);
+            const next = await resumed.rpc.tools.execute({
+                name: "get_context_remaining",
+                arguments: {},
+            });
+            expect(next, JSON.stringify(next)).toMatchObject({ resultType: "success" });
+            expect(JSON.parse(next.textResultForLlm)).toMatchObject({
+                context_window: { number: 2, previous_window_id: expect.any(String) },
+            });
+        } finally {
+            await resumed.disconnect();
+        }
+    });
+
     it("should reject setProvider when sessions already exist", async () => {
         const tcpConnectionToken = "session-fs-test-token";
         const client = new CopilotClient({
@@ -303,6 +434,1093 @@ describe("Session Fs", async () => {
     });
 });
 
+describe("Session Fs native plan edits", async () => {
+    const { createClient, workDir } = await createSdkTestContext();
+
+    it.each(["interactive", "plan"] as const)(
+        "keeps native edits and write failures in the provider in %s mode",
+        async (mode) => {
+            const statePath = join(workDir, `provider-state-${mode}`);
+            const planPath = join(statePath, "plan.md");
+            const provider = new MemoryProvider();
+            const writes: string[] = [];
+            let rejectWrites = false;
+            const client = createClient({
+                mode: "empty",
+                sessionFs: {
+                    initialCwd: workDir,
+                    sessionStatePath: statePath,
+                    conventions: process.platform === "win32" ? "windows" : "posix",
+                },
+            });
+            onTestFinished(() => client.stop());
+            const session = await client.createSession({
+                onPermissionRequest: approveAll,
+                availableTools: ["edit"],
+                createSessionFsProvider: (session) => {
+                    const handler = createTestSessionFsHandler(session, provider);
+                    return {
+                        ...handler,
+                        async writeFile(path, content) {
+                            if (path === planPath) {
+                                writes.push(content);
+                                if (rejectWrites) {
+                                    throw new Error("provider write denied");
+                                }
+                            }
+                            return handler.writeFile(path, content);
+                        },
+                    };
+                },
+            });
+            await session.rpc.mode.set({ mode });
+            await session.rpc.plan.update({ content: "# Provider plan\n" });
+            expect(await session.rpc.plan.read()).toMatchObject({
+                path: planPath,
+                content: "# Provider plan\n",
+            });
+
+            // A writable host parent makes an accidental host write succeed.
+            await mkdir(statePath, { recursive: true });
+            expect(await readdir(statePath)).toEqual([]);
+            const edit = (old_str: string, new_str: string) =>
+                session.rpc.tools.execute({
+                    name: "edit",
+                    arguments: { path: planPath, old_str, new_str },
+                });
+            await expect(edit("Provider plan", "Native update")).resolves.toMatchObject({
+                resultType: "success",
+            });
+            expect((await session.rpc.plan.read()).content).toBe("# Native update\n");
+            expect(writes).toEqual(["# Provider plan\n", "# Native update\n"]);
+            expect(await readdir(statePath)).toEqual([]);
+
+            await writeFile(planPath, "host-only content\n");
+            await expect(edit("Native update", "Second update")).resolves.toMatchObject({
+                resultType: "success",
+            });
+            expect((await session.rpc.plan.read()).content).toBe("# Second update\n");
+            expect(await readFile(planPath, "utf8")).toBe("host-only content\n");
+
+            rejectWrites = true;
+            const failed = await edit("Second update", "Rejected update");
+            expect(failed.resultType).toBe("failure");
+            expect(failed.textResultForLlm).toContain("provider write denied");
+            expect((await session.rpc.plan.read()).content).toBe("# Second update\n");
+            expect(writes).toEqual([
+                "# Provider plan\n",
+                "# Native update\n",
+                "# Second update\n",
+                "# Rejected update\n",
+            ]);
+            expect(await readFile(planPath, "utf8")).toBe("host-only content\n");
+            expect(await readdir(statePath)).toEqual(["plan.md"]);
+        }
+    );
+});
+
+describe("Session Fs remembered approvals", async () => {
+    const workingDirectory = "/workspace";
+    const otherDirectory = "/provider-dir";
+    const permissionsPath = `${sessionStatePath}/permissions.json`;
+    const {
+        copilotClient: client,
+        env,
+        openAiEndpoint,
+    } = await createSdkTestContext({
+        copilotClientOptions: {
+            mode: "empty",
+            sessionFs: { ...sessionFsConfig, initialCwd: workingDirectory },
+        },
+    });
+
+    function createApprovalProvider() {
+        const provider = new MemoryProvider();
+        const reads: string[] = [];
+        const writes: string[] = [];
+        return {
+            provider,
+            reads,
+            writes,
+            createSessionFsProvider(session: CopilotSession) {
+                const handler = createTestSessionFsHandler(session, provider, "approvals");
+                return {
+                    ...handler,
+                    async readFile(path: string) {
+                        reads.push(path);
+                        return handler.readFile(path);
+                    },
+                    async writeFile(path: string, content: string) {
+                        writes.push(path);
+                        return handler.writeFile(path, content);
+                    },
+                    async rename(src: string, dest: string) {
+                        writes.push(dest);
+                        return handler.rename(src, dest);
+                    },
+                };
+            },
+            async readPermissions(): Promise<string> {
+                return (await provider.readFile(`/approvals${permissionsPath}`, "utf8")) as string;
+            },
+        };
+    }
+
+    async function expectCommands(session: CopilotSession, directory: string, commands: string[]) {
+        const location = await session.rpc.permissions.locations.resolve({
+            workingDirectory: directory,
+        });
+        const applied = await session.rpc.permissions.locations.apply({
+            workingDirectory: directory,
+        });
+        expect(applied.locationKey).toBe(location.locationKey);
+        expect(applied.locationType).toBe(location.locationType);
+        expect(applied.appliedRules).toEqual(
+            commands.map((argument) => ({ kind: "shell", argument }))
+        );
+        return applied;
+    }
+
+    async function addCommand(session: CopilotSession, directory: string, command: string) {
+        const location = await session.rpc.permissions.locations.resolve({
+            workingDirectory: directory,
+        });
+        const result = await session.rpc.permissions.locations.addToolApproval({
+            locationKey: location.locationKey,
+            approval: { kind: "commands", commandIdentifiers: [command] },
+        });
+        expect(result.success).toBe(true);
+        return location.locationKey;
+    }
+
+    async function seedHostPermissions() {
+        const path = join(env.COPILOT_HOME, "permissions-config.json");
+        const content = Buffer.from(
+            JSON.stringify(
+                {
+                    locations: Object.fromEntries(
+                        [workingDirectory, otherDirectory].map((locationKey) => [
+                            locationKey,
+                            {
+                                tool_approvals: [
+                                    { kind: "commands", commandIdentifiers: ["host-only"] },
+                                ],
+                            },
+                        ])
+                    ),
+                },
+                null,
+                2
+            ) + "\n"
+        );
+        await writeFile(path, content);
+        onTestFinished(() => rm(path, { force: true }));
+        return async () => expect(await readFile(path)).toEqual(content);
+    }
+
+    it("isolates location approvals by provider namespace and shares grants in the same file", async () => {
+        const expectHostUnchanged = await seedHostPermissions();
+        const a = createApprovalProvider();
+        const b = createApprovalProvider();
+        const sessionA = await client.createSession({
+            availableTools: [],
+            createSessionFsProvider: a.createSessionFsProvider,
+        });
+        const sessionB = await client.createSession({
+            availableTools: [],
+            createSessionFsProvider: b.createSessionFsProvider,
+        });
+
+        for (const session of [sessionA, sessionB]) {
+            await expectCommands(session, workingDirectory, []);
+            await expectCommands(session, otherDirectory, []);
+        }
+        const workingLocation = await addCommand(sessionA, workingDirectory, "session-a");
+        const otherLocation = await addCommand(sessionA, otherDirectory, "session-a-other");
+        expect([workingLocation, otherLocation]).toEqual([workingDirectory, otherDirectory]);
+        await expectCommands(sessionA, workingDirectory, ["session-a"]);
+        await expectCommands(sessionA, otherDirectory, ["session-a-other"]);
+        await expectCommands(sessionB, workingDirectory, []);
+
+        await addCommand(sessionB, workingDirectory, "session-b");
+        await expectCommands(sessionB, workingDirectory, ["session-b"]);
+        const persistedA = await a.readPermissions();
+        expect(JSON.parse(persistedA)).toEqual({
+            locations: {
+                [workingLocation]: {
+                    tool_approvals: [{ kind: "commands", commandIdentifiers: ["session-a"] }],
+                },
+                [otherLocation]: {
+                    tool_approvals: [{ kind: "commands", commandIdentifiers: ["session-a-other"] }],
+                },
+            },
+        });
+        const persistedB = await b.readPermissions();
+        expect(persistedB).not.toContain("session-a");
+        expect(
+            (await sessionB.rpc.permissions.resetSessionApprovals({ includeLocation: true }))
+                .success
+        ).toBe(true);
+        expect(await b.readPermissions()).toBe(persistedB);
+        const reloaded = await expectCommands(sessionB, workingDirectory, ["session-b"]);
+        expect(reloaded.appliedRuleCount).toBe(1);
+        await sessionB.rpc.commands.invoke({ name: "reset-allowed-tools" });
+        await expectCommands(sessionB, workingDirectory, []);
+        expect(await a.readPermissions()).toBe(persistedA);
+        await expectCommands(sessionA, workingDirectory, ["session-a"]);
+        await expectHostUnchanged();
+
+        // No-turn sessions have no transcript writer. Save the actual runtime events
+        // through the fixture so approval resume can be tested without model inference.
+        const events = await sessionA.getEvents();
+        expect(events.some((event) => event.type === "session.start")).toBe(true);
+        await a.provider.writeFile(
+            `/approvals${sessionStatePath}/events.jsonl`,
+            events.map((event) => JSON.stringify(event)).join("\n") + "\n"
+        );
+        await sessionA.disconnect();
+        a.reads.length = 0;
+        const resumed = await client.resumeSession(sessionA.sessionId, {
+            availableTools: [],
+            createSessionFsProvider: a.createSessionFsProvider,
+        });
+        await expectCommands(resumed, workingDirectory, ["session-a"]);
+        await expectCommands(resumed, otherDirectory, ["session-a-other"]);
+        for (const operations of [a.reads, a.writes, b.reads, b.writes]) {
+            expect(operations).toContainEqual(expect.stringMatching(/\/permissions\.json$/));
+        }
+
+        await resumed.disconnect();
+        const fresh = await client.createSession({
+            availableTools: [],
+            createSessionFsProvider: a.createSessionFsProvider,
+        });
+        expect(fresh.sessionId).not.toBe(sessionA.sessionId);
+        await expectCommands(fresh, workingDirectory, ["session-a"]);
+        await expectCommands(fresh, otherDirectory, ["session-a-other"]);
+        await sessionB.disconnect();
+        await fresh.disconnect();
+        await expectHostUnchanged();
+        expect(
+            (await openAiEndpoint.getRequests()).filter((request) =>
+                /\/(chat\/completions|responses|messages)$/.test(request.url)
+            )
+        ).toEqual([]);
+    });
+
+    it("does not serialize approval writes across separate session provider endpoints", async () => {
+        const a = createApprovalProvider();
+        const b = createApprovalProvider();
+        let handlerA: SessionFsProvider;
+        const sessionA = await client.createSession({
+            availableTools: [],
+            createSessionFsProvider(session) {
+                handlerA = a.createSessionFsProvider(session);
+                return handlerA;
+            },
+        });
+        const sessionB = await client.createSession({
+            availableTools: [],
+            createSessionFsProvider: b.createSessionFsProvider,
+        });
+        const location = await sessionA.rpc.permissions.locations.resolve({ workingDirectory });
+        let readStarted!: () => void;
+        const readingA = new Promise<void>((resolve) => {
+            readStarted = resolve;
+        });
+        let releaseA!: () => void;
+        const waitForRelease = new Promise<void>((resolve) => {
+            releaseA = resolve;
+        });
+        onTestFinished(() => releaseA());
+        let aPaused = false;
+        const readA = handlerA!.readFile.bind(handlerA!);
+        vi.spyOn(handlerA!, "readFile").mockImplementation(async (path) => {
+            if (path === permissionsPath) {
+                aPaused = true;
+                readStarted();
+                await waitForRelease;
+                aPaused = false;
+            }
+            return readA(path);
+        });
+        const pendingA = sessionA.rpc.permissions.locations.addToolApproval({
+            locationKey: location.locationKey,
+            approval: { kind: "commands", commandIdentifiers: ["session-a"] },
+        });
+        try {
+            await Promise.race([
+                readingA,
+                pendingA.then(() => {
+                    throw new Error("Session A completed without reaching its paused read");
+                }),
+            ]);
+            expect(await addCommand(sessionB, workingDirectory, "session-b")).toBe(
+                location.locationKey
+            );
+            expect(aPaused).toBe(true);
+        } finally {
+            releaseA();
+        }
+        expect((await pendingA).success).toBe(true);
+        for (const [storage, command] of [
+            [a, "session-a"],
+            [b, "session-b"],
+        ] as const) {
+            expect(storage.reads).toContain(permissionsPath);
+            expect(JSON.parse(await storage.readPermissions())).toEqual({
+                locations: {
+                    [location.locationKey]: {
+                        tool_approvals: [{ kind: "commands", commandIdentifiers: [command] }],
+                    },
+                },
+            });
+        }
+        await expectCommands(sessionA, workingDirectory, ["session-a"]);
+        await expectCommands(sessionB, workingDirectory, ["session-b"]);
+        await sessionA.disconnect();
+        await sessionB.disconnect();
+    });
+
+    it.each(["read", "write"] as const)(
+        "does not fall back to host approvals when the provider fails to %s",
+        async (operation) => {
+            const expectHostUnchanged = await seedHostPermissions();
+            const storage = createApprovalProvider();
+            let handler: SessionFsProvider;
+            const session = await client.createSession({
+                availableTools: [],
+                createSessionFsProvider(created) {
+                    handler = storage.createSessionFsProvider(created);
+                    return handler;
+                },
+            });
+            await expectCommands(session, workingDirectory, []);
+            const error = Object.assign(new Error(`permission ${operation} denied`), {
+                code: "EACCES",
+            });
+            if (operation === "read") {
+                const original = handler!.readFile.bind(handler!);
+                vi.spyOn(handler!, "readFile").mockImplementation((path) => {
+                    if (path.endsWith("/permissions.json")) {
+                        throw error;
+                    }
+                    return original(path);
+                });
+                await expect(
+                    session.rpc.permissions.locations.apply({
+                        workingDirectory: otherDirectory,
+                    })
+                ).rejects.toThrow(/permission read denied/);
+            } else {
+                const location = await session.rpc.permissions.locations.resolve({
+                    workingDirectory,
+                });
+                const original = handler!.writeFile.bind(handler!);
+                vi.spyOn(handler!, "writeFile").mockImplementation((path, content) => {
+                    if (/\/permissions\.json(?:\.tmp\..*)?$/.test(path)) {
+                        throw error;
+                    }
+                    return original(path, content);
+                });
+                await expect(
+                    session.rpc.permissions.locations.addToolApproval({
+                        locationKey: location.locationKey,
+                        approval: { kind: "commands", commandIdentifiers: ["not-persisted"] },
+                    })
+                ).rejects.toThrow(/permission write denied/);
+                await expectCommands(session, workingDirectory, []);
+            }
+            await expectHostUnchanged();
+            await session.disconnect();
+        }
+    );
+});
+
+describe.each(["empty", "copilot-cli"] as const)(
+    "Session Fs additional approvals in %s mode",
+    async (mode) => {
+        const { createClient, env, openAiEndpoint } = await createSdkTestContext({
+            copilotClientOptions: { env: { COPILOT_WEB_FETCH_ALLOW_LOCALHOST: "1" } },
+        });
+        const statePath = (name: string) => `/approvals${sessionStatePath}/${name}`;
+
+        function setup() {
+            const client = createClient({
+                mode,
+                sessionFs: { ...sessionFsConfig, initialCwd: "/workspace" },
+            });
+            onTestFinished(() => client.stop());
+            function createNamespace() {
+                const provider = new MemoryProvider();
+                const handlers = new Map<string, SessionFsProvider>();
+                const config = {
+                    availableTools: ["builtin:web_fetch"],
+                    createSessionFsProvider(session: CopilotSession) {
+                        const handler = createTestSessionFsHandler(session, provider, "approvals");
+                        handlers.set(session.sessionId, handler);
+                        return handler;
+                    },
+                };
+                return {
+                    client,
+                    provider,
+                    handlers,
+                    config,
+                    createNamespace,
+                    async readState(name: string) {
+                        return JSON.parse(
+                            (await provider.readFile(statePath(name), "utf8")) as string
+                        );
+                    },
+                    async resume(session: CopilotSession) {
+                        // Direct RPCs do not start the transcript writer. Preserve only
+                        // actual runtime events, not fabricated permission decisions.
+                        const events = await session.getEvents();
+                        await provider.writeFile(
+                            statePath("events.jsonl"),
+                            events.map((event) => JSON.stringify(event)).join("\n") + "\n"
+                        );
+                        await session.disconnect();
+                        return client.resumeSession(session.sessionId, config);
+                    },
+                };
+            }
+            return createNamespace();
+        }
+
+        async function seedHostState(allowedUrl = "http://127.0.0.1") {
+            const files = {
+                "settings.json": {
+                    allowedUrls: [allowedUrl],
+                    sandbox: { enabled: false },
+                    approval_test_sentinel: "settings-unchanged",
+                },
+                "config.json": {
+                    trustedFolders: ["/workspace", "/host-only"],
+                    approval_test_sentinel: "config-unchanged",
+                },
+            };
+            const contents = Object.entries(files).map(([name, value]) => ({
+                path: join(env.COPILOT_HOME, name),
+                content: JSON.stringify(value, null, 2) + "\n",
+            }));
+            for (const { path, content } of contents) {
+                await writeFile(path, content);
+            }
+            return async () => {
+                for (const { path, content } of contents) {
+                    expect(await readFile(path, "utf8")).toBe(content);
+                }
+            };
+        }
+
+        it.each([false, true])(
+            "loads existing-format provider grants while ignoring legacy config URLs=%s on create and resume",
+            async (legacyConfigUrls) => {
+                const endpoint = await createPermissionEndpoint();
+                const hostUnchanged = await seedHostState();
+                const storage = setup();
+                const files = {
+                    "permissions.json": {
+                        locations: {
+                            "/workspace": {
+                                tool_approvals: [
+                                    { kind: "commands", commandIdentifiers: ["imported-command"] },
+                                ],
+                                allowed_directories: ["/imported-directory"],
+                            },
+                        },
+                    },
+                    "settings.json": {
+                        allowedUrls: [endpoint.origin],
+                        sandbox: { enabled: false },
+                    },
+                    "config.json": {
+                        trustedFolders: ["/imported-directory"],
+                        ...(legacyConfigUrls ? { allowedUrls: ["https://legacy.example"] } : {}),
+                    },
+                };
+                await storage.provider.mkdir(statePath(""), { recursive: true });
+                await storage.provider.mkdir("/approvals/imported-directory", { recursive: true });
+                for (const [name, value] of Object.entries(files)) {
+                    await storage.provider.writeFile(statePath(name), JSON.stringify(value) + "\n");
+                }
+                const session = await storage.client.createSession(storage.config);
+                async function expectImportedGrants(session: CopilotSession) {
+                    const applied = await session.rpc.permissions.locations.apply({
+                        workingDirectory: "/workspace",
+                    });
+                    expect(applied.appliedRules).toEqual([
+                        { kind: "shell", argument: "imported-command" },
+                    ]);
+                    await expect(
+                        session.rpc.permissions.paths.isPathWithinAllowedDirectories({
+                            path: "/imported-directory/child",
+                        })
+                    ).resolves.toEqual({ allowed: true });
+                    await expect(fetchUrl(session, endpoint.url)).resolves.toMatchObject({
+                        resultType: "success",
+                    });
+                    await expect(
+                        session.rpc.permissions.folderTrust.isTrusted({
+                            path: "/imported-directory/child",
+                        })
+                    ).resolves.toEqual({ trusted: true });
+                    await expect(
+                        session.rpc.commands.invoke({ name: "sandbox", input: "status" })
+                    ).resolves.toMatchObject({
+                        kind: "text",
+                        text: expect.stringMatching(/disabled/i),
+                    });
+                    await session.rpc.options.update({ sandboxConfig: { enabled: true } });
+                    await expect(
+                        session.rpc.commands.invoke({ name: "sandbox", input: "status" })
+                    ).resolves.toMatchObject({
+                        kind: "text",
+                        text: expect.stringContaining("Current sandbox status: enabled"),
+                    });
+                }
+                await expectImportedGrants(session);
+                const resumed = await storage.resume(session);
+                await expectImportedGrants(resumed);
+                expect(endpoint.requests).toHaveLength(2);
+                for (const [name, value] of Object.entries(files)) {
+                    expect(await storage.provider.readFile(statePath(name), "utf8")).toBe(
+                        JSON.stringify(value) + "\n"
+                    );
+                }
+                await hostUnchanged();
+                expect(
+                    (await openAiEndpoint.getRequests()).filter((request) =>
+                        /\/(chat\/completions|responses|messages)$/.test(request.url)
+                    )
+                ).toEqual([]);
+            }
+        );
+
+        it("routes permanent URL consent through provider namespaces across live and resumed sessions", async () => {
+            const endpoint = await createPermissionEndpoint();
+            const hostUnchanged = await seedHostState(endpoint.origin);
+            const storage = setup();
+            const isolated = storage.createNamespace();
+            const config = {
+                allowedUrls: ["https://legacy.example"],
+                trustedFolders: ["/workspace/project"],
+            };
+            await storage.provider.mkdir(statePath(""), { recursive: true });
+            await storage.provider.writeFile(statePath("config.json"), JSON.stringify(config));
+            const a = await storage.client.createSession(storage.config);
+            const b = await storage.client.createSession(isolated.config);
+            for (const session of [a, b]) {
+                await session.rpc.permissions.configure({
+                    approveAllReadPermissionRequests: false,
+                    urls: { unrestricted: false, initialAllowed: [] },
+                });
+            }
+
+            await decideUrl(a, endpoint.url, {
+                kind: "approve-permanently",
+                domain: endpoint.origin,
+            });
+            expect(endpoint.requests).toHaveLength(1);
+            expect(await storage.readState("settings.json")).toEqual({
+                allowedUrls: [endpoint.origin],
+            });
+            expect(await storage.readState("config.json")).toEqual(config);
+            await expect(fetchUrl(a, endpoint.url)).resolves.toMatchObject({
+                resultType: "success",
+            });
+            await decideUrl(b, endpoint.url, { kind: "reject" });
+            expect(endpoint.requests).toHaveLength(2);
+
+            await a.rpc.permissions.configure({
+                rules: { approved: [], denied: [{ kind: "url", argument: endpoint.origin }] },
+            });
+            await expect(fetchUrl(a, endpoint.url)).resolves.toMatchObject({
+                resultType: "denied",
+            });
+            expect(endpoint.requests).toHaveLength(2);
+            await a.rpc.permissions.configure({ rules: { approved: [], denied: [] } });
+
+            const resumed = await storage.resume(a);
+            await expect(fetchUrl(resumed, endpoint.url)).resolves.toMatchObject({
+                resultType: "success",
+            });
+            await resumed.disconnect();
+            const fresh = await storage.client.createSession(storage.config);
+            await expect(fetchUrl(fresh, endpoint.url)).resolves.toMatchObject({
+                resultType: "success",
+            });
+            expect(endpoint.requests).toHaveLength(4);
+            await decideUrl(b, endpoint.url, {
+                kind: "approve-for-session",
+                domain: endpoint.origin,
+            });
+            await expect(fetchUrl(b, endpoint.url)).resolves.toMatchObject({
+                resultType: "success",
+            });
+            expect(endpoint.requests).toHaveLength(6);
+            const bEvents = await b.getEvents();
+            expect(bEvents.some((event) => event.type === "permission.completed")).toBe(true);
+            expect(await isolated.provider.exists(statePath("settings.json"))).toBe(false);
+            await hostUnchanged();
+            expect(
+                (await openAiEndpoint.getRequests()).filter((request) =>
+                    /\/(chat\/completions|responses|messages)$/.test(request.url)
+                )
+            ).toEqual([]);
+        });
+
+        it("isolates lexical folder trust by provider namespace and restores it on resume", async () => {
+            const hostUnchanged = await seedHostState();
+            const storage = setup();
+            const isolated = storage.createNamespace();
+            const a = await storage.client.createSession(storage.config);
+            const b = await storage.client.createSession(isolated.config);
+            const trusted = (session: CopilotSession, path: string) =>
+                session.rpc.permissions.folderTrust.isTrusted({ path });
+            for (const session of [a, b]) {
+                await expect(trusted(session, "/workspace")).resolves.toEqual({ trusted: false });
+                await expect(trusted(session, "/host-only")).resolves.toEqual({ trusted: false });
+            }
+            expect(
+                (await a.rpc.permissions.folderTrust.addTrusted({ path: "/workspace/./project" }))
+                    .success
+            ).toBe(true);
+            expect(await storage.readState("config.json")).toEqual({
+                trustedFolders: ["/workspace/project"],
+            });
+            await expect(trusted(a, "/workspace/project/nested")).resolves.toEqual({
+                trusted: true,
+            });
+            for (const path of ["/workspace/project-other", "/workspace/project/../outside"]) {
+                await expect(trusted(a, path)).resolves.toEqual({ trusted: false });
+            }
+            await expect(trusted(b, "/workspace/project/nested")).resolves.toEqual({
+                trusted: false,
+            });
+            const resumed = await storage.resume(a);
+            await expect(trusted(resumed, "/workspace/project/nested")).resolves.toEqual({
+                trusted: true,
+            });
+            await resumed.disconnect();
+            const fresh = await storage.client.createSession(storage.config);
+            await expect(trusted(fresh, "/workspace/project")).resolves.toEqual({
+                trusted: true,
+            });
+            await hostUnchanged();
+        });
+
+        it("stores sandbox command overrides in provider settings and restores them on resume", async () => {
+            const hostUnchanged = await seedHostState();
+            const storage = setup();
+            const isolated = storage.createNamespace();
+            // No process is launched: configuring enabled state works even on
+            // hosts without a sandbox backend, unlike the enable command.
+            const sandboxConfig = { enabled: true };
+            const a = await storage.client.createSession(storage.config);
+            const b = await storage.client.createSession(isolated.config);
+            await a.rpc.options.update({ sandboxConfig });
+            await b.rpc.options.update({ sandboxConfig });
+            await expect(
+                a.rpc.commands.invoke({ name: "sandbox", input: "status" })
+            ).resolves.toMatchObject({ kind: "text", text: expect.stringMatching(/enabled/i) });
+            await a.rpc.commands.invoke({ name: "sandbox", input: "disable" });
+            expect(await storage.readState("settings.json")).toEqual({
+                sandbox: { enabled: false },
+            });
+            await a.rpc.options.update({ sandboxConfig });
+            await expect(
+                a.rpc.commands.invoke({ name: "sandbox", input: "status" })
+            ).resolves.toMatchObject({
+                kind: "text",
+                text: expect.stringContaining("Current sandbox status: enabled"),
+            });
+            expect(await storage.readState("settings.json")).toEqual({
+                sandbox: { enabled: false },
+            });
+            expect(await isolated.provider.exists(statePath("settings.json"))).toBe(false);
+            await expect(
+                b.rpc.commands.invoke({ name: "sandbox", input: "status" })
+            ).resolves.toMatchObject({ kind: "text", text: expect.stringMatching(/enabled/i) });
+            const resumed = await storage.resume(a);
+            expect((await storage.readState("settings.json")).sandbox).toEqual({
+                enabled: false,
+            });
+            await expect(
+                resumed.rpc.commands.invoke({ name: "sandbox", input: "status" })
+            ).resolves.toMatchObject({ kind: "text", text: expect.stringMatching(/disabled/i) });
+            if ((await storage.client.rpc.sandbox.getHostSupport()).supported) {
+                const baseDirectory = join(env.COPILOT_HOME, "sandbox-host-defaults");
+                await mkdir(baseDirectory);
+                await writeFile(
+                    join(baseDirectory, "settings.json"),
+                    JSON.stringify({ sandbox: { enabled: false } })
+                );
+                const hostClient = createClient({ mode, baseDirectory });
+                onTestFinished(() => hostClient.stop());
+                const hostSession = await hostClient.createSession({ availableTools: [] });
+                await hostSession.rpc.commands.invoke({ name: "sandbox", input: "enable" });
+                const hostSettings = JSON.parse(
+                    await readFile(join(baseDirectory, "settings.json"), "utf8")
+                );
+                expect(hostSettings.sandbox.enabled).toBe(true);
+                await resumed.rpc.commands.invoke({ name: "sandbox", input: "enable" });
+                expect((await storage.readState("settings.json")).sandbox).toEqual(
+                    hostSettings.sandbox
+                );
+                const enabledResume = await storage.resume(resumed);
+                await expect(
+                    enabledResume.rpc.commands.invoke({ name: "sandbox", input: "status" })
+                ).resolves.toMatchObject({
+                    kind: "text",
+                    text: expect.stringMatching(/enabled/i),
+                });
+                await enabledResume.disconnect();
+                await expect(
+                    b.rpc.commands.invoke({ name: "sandbox", input: "status" })
+                ).resolves.toMatchObject({
+                    kind: "text",
+                    text: expect.stringMatching(/enabled/i),
+                });
+            }
+            await hostUnchanged();
+        });
+
+        for (const enabled of [false, true]) {
+            // Empty-mode initialization constructs shell descriptors, which
+            // reject an enabled sandbox on musl before the session can open.
+            it.skipIf(enabled && mode === "empty" && getRuntimePlatform().startsWith("linuxmusl-"))(
+                `honors explicit sandbox updates without changing the saved enabled=${enabled} preference`,
+                async () => {
+                    const hostUnchanged = await seedHostState();
+                    const storage = setup();
+                    const settings = JSON.stringify({ sandbox: { enabled } });
+                    await storage.provider.mkdir(statePath(""), { recursive: true });
+                    await storage.provider.writeFile(statePath("settings.json"), settings);
+                    const session = await storage.client.createSession(storage.config);
+                    const expectStatus = (session: CopilotSession, enabled: boolean) =>
+                        expect(
+                            session.rpc.commands.invoke({ name: "sandbox", input: "status" })
+                        ).resolves.toMatchObject({
+                            kind: "text",
+                            text: expect.stringContaining(
+                                `Current sandbox status: ${enabled ? "enabled" : "disabled"}`
+                            ),
+                        });
+
+                    await expectStatus(session, enabled);
+                    await session.rpc.options.update({ sandboxConfig: { enabled: !enabled } });
+                    await expectStatus(session, !enabled);
+                    expect(
+                        await storage.provider.readFile(statePath("settings.json"), "utf8")
+                    ).toBe(settings);
+
+                    const resident = await storage.client.resumeSession(
+                        session.sessionId,
+                        storage.config
+                    );
+                    await expectStatus(resident, enabled);
+                    await resident.rpc.options.update({ sandboxConfig: { enabled: !enabled } });
+                    await expectStatus(resident, !enabled);
+
+                    const resumed = await storage.resume(resident);
+                    await expectStatus(resumed, enabled);
+                    await resumed.rpc.options.update({ sandboxConfig: { enabled: !enabled } });
+                    await expectStatus(resumed, !enabled);
+                    expect(
+                        await storage.provider.readFile(statePath("settings.json"), "utf8")
+                    ).toBe(settings);
+                    await hostUnchanged();
+                }
+            );
+        }
+
+        it.each(["read", "write"] as const)(
+            "does not fall back to host folder or sandbox state after a provider %s failure",
+            async (operation) => {
+                const hostUnchanged = await seedHostState();
+                const storage = setup();
+                const session = await storage.client.createSession(storage.config);
+                const handler = storage.handlers.get(session.sessionId)!;
+                const error = Object.assign(new Error(`approval ${operation} denied`), {
+                    code: "EACCES",
+                });
+                if (operation === "read") {
+                    const original = handler.readFile.bind(handler);
+                    vi.spyOn(handler, "readFile").mockImplementation((path) => {
+                        if (/\/(?:config|settings)\.json$/.test(path)) {
+                            throw error;
+                        }
+                        return original(path);
+                    });
+                    await expect(
+                        session.rpc.permissions.folderTrust.isTrusted({ path: "/host-only" })
+                    ).rejects.toThrow(/approval read denied/);
+                } else {
+                    const original = handler.writeFile.bind(handler);
+                    vi.spyOn(handler, "writeFile").mockImplementation((path, content) => {
+                        if (/\/(?:config|settings)\.json(?:\.tmp\..*)?$/.test(path)) {
+                            throw error;
+                        }
+                        return original(path, content);
+                    });
+                }
+                await expect(
+                    session.rpc.permissions.folderTrust.addTrusted({ path: "/workspace/project" })
+                ).rejects.toThrow(`approval ${operation} denied`);
+                await expect(
+                    session.rpc.commands.invoke({ name: "sandbox", input: "disable" })
+                ).rejects.toThrow(`approval ${operation} denied`);
+                await hostUnchanged();
+            }
+        );
+
+        it.each(["read", "write"] as const)(
+            "does not fall back to host URL consent after a provider %s failure",
+            async (operation) => {
+                const endpoint = await createPermissionEndpoint();
+                const hostUnchanged = await seedHostState(endpoint.origin);
+                const storage = setup();
+                const session = await storage.client.createSession(storage.config);
+                await session.rpc.permissions.configure({
+                    approveAllReadPermissionRequests: false,
+                    urls: { unrestricted: false, initialAllowed: [] },
+                });
+                await session.rpc.permissions.setRequired({ required: true });
+                const handler = storage.handlers.get(session.sessionId)!;
+                const error = Object.assign(new Error(`URL ${operation} denied`), {
+                    code: "EACCES",
+                });
+                if (operation === "read") {
+                    const original = handler.readFile.bind(handler);
+                    vi.spyOn(handler, "readFile").mockImplementation((path) => {
+                        if (path.endsWith("/settings.json")) {
+                            throw error;
+                        }
+                        return original(path);
+                    });
+                    await expect(fetchUrl(session, endpoint.url)).resolves.toMatchObject({
+                        resultType: "failure",
+                        textResultForLlm: expect.stringContaining("URL read denied"),
+                    });
+                } else {
+                    const original = handler.writeFile.bind(handler);
+                    const failure = vi
+                        .spyOn(handler, "writeFile")
+                        .mockImplementation((path, content) => {
+                            if (/\/settings\.json(?:\.tmp\..*)?$/.test(path)) {
+                                throw error;
+                            }
+                            return original(path, content);
+                        });
+                    const execution = fetchUrl(session, endpoint.url);
+                    void execution.catch(() => {});
+                    await expect
+                        .poll(async () => (await session.rpc.permissions.pendingRequests()).items)
+                        .toHaveLength(1);
+                    const [pending] = (await session.rpc.permissions.pendingRequests()).items;
+                    expect(
+                        (
+                            await session.rpc.permissions.handlePendingPermissionRequest({
+                                requestId: pending.requestId,
+                                result: { kind: "approve-permanently", domain: endpoint.origin },
+                            })
+                        ).success
+                    ).toBe(true);
+                    await expect(execution).resolves.toMatchObject({
+                        resultType: "failure",
+                        textResultForLlm: expect.stringContaining("URL write denied"),
+                    });
+                    failure.mockRestore();
+                    await decideUrl(session, endpoint.url, { kind: "reject" });
+                }
+                expect(endpoint.requests).toEqual([]);
+                await hostUnchanged();
+            }
+        );
+    }
+);
+
+describe("SDK remembered approvals without Session Fs", async () => {
+    const { createClient, workDir, env } = await createSdkTestContext({
+        copilotClientOptions: { env: { COPILOT_WEB_FETCH_ALLOW_LOCALHOST: "1" } },
+    });
+
+    it.each(["empty", "copilot-cli"] as const)(
+        "preserves host location approvals across new SDK sessions in %s mode",
+        async (mode) => {
+            const workingDirectory = join(workDir, mode);
+            await mkdir(workingDirectory);
+            const baseDirectory = join(env.COPILOT_HOME, mode);
+            await mkdir(baseDirectory);
+            const firstClient = createClient({ mode, baseDirectory });
+            onTestFinished(() => firstClient.stop());
+            const first = await firstClient.createSession({
+                availableTools: [],
+                workingDirectory,
+                onPermissionRequest: approveAll,
+            });
+            const location = await first.rpc.permissions.locations.resolve({ workingDirectory });
+            expect(
+                (await first.rpc.permissions.locations.apply({ workingDirectory })).appliedRules
+            ).toEqual([]);
+            const approval = {
+                kind: "commands" as const,
+                commandIdentifiers: ["host-sdk-persisted"],
+            };
+            expect(
+                (
+                    await first.rpc.permissions.locations.addToolApproval({
+                        locationKey: location.locationKey,
+                        approval,
+                    })
+                ).success
+            ).toBe(true);
+            const hostPermissions = JSON.parse(
+                await readFile(join(baseDirectory, "permissions-config.json"), "utf8")
+            );
+            expect(hostPermissions.locations[location.locationKey].tool_approvals).toContainEqual(
+                approval
+            );
+            await first.disconnect();
+            await firstClient.stop();
+
+            const secondClient = createClient({ mode, baseDirectory });
+            onTestFinished(() => secondClient.stop());
+            const second = await secondClient.createSession({
+                availableTools: [],
+                workingDirectory,
+                onPermissionRequest: approveAll,
+            });
+            expect(second.sessionId).not.toBe(first.sessionId);
+            const applied = await second.rpc.permissions.locations.apply({ workingDirectory });
+            expect(applied.locationKey).toBe(location.locationKey);
+            expect(applied.appliedRules).toEqual([
+                { kind: "shell", argument: "host-sdk-persisted" },
+            ]);
+            await second.disconnect();
+        }
+    );
+
+    it.each(["empty", "copilot-cli"] as const)(
+        "preserves host URL consent, folder trust, and sandbox settings in %s mode",
+        async (mode) => {
+            const baseDirectory = join(env.COPILOT_HOME, `additional-${mode}`);
+            await mkdir(baseDirectory);
+            const folder = join(workDir, `trusted-${mode}`);
+            await mkdir(folder);
+            const endpoint = await createPermissionEndpoint();
+            const firstClient = createClient({ mode, baseDirectory });
+            onTestFinished(() => firstClient.stop());
+            const first = await firstClient.createSession({
+                availableTools: ["builtin:web_fetch"],
+            });
+            await decideUrl(first, endpoint.url, {
+                kind: "approve-permanently",
+                domain: endpoint.origin,
+            });
+            await expect(
+                first.rpc.permissions.folderTrust.isTrusted({ path: folder })
+            ).resolves.toEqual({ trusted: false });
+            expect(
+                (await first.rpc.permissions.folderTrust.addTrusted({ path: folder })).success
+            ).toBe(true);
+            await first.rpc.commands.invoke({ name: "sandbox", input: "disable" });
+            const settings = JSON.parse(
+                await readFile(join(baseDirectory, "settings.json"), "utf8")
+            );
+            expect(settings.allowedUrls).toContain(endpoint.origin);
+            expect(settings.sandbox.enabled).toBe(false);
+            const savedSettings = await readFile(join(baseDirectory, "settings.json"), "utf8");
+            // Host config is JSONC and canonicalizes aliases such as Windows 8.3
+            // names; the public query below also verifies trust after restart.
+            const config = await readFile(join(baseDirectory, "config.json"), "utf8");
+            expect(config).toContain(JSON.stringify(realpathSync.native(folder)));
+            await first.disconnect();
+            await firstClient.stop();
+            const secondClient = createClient({ mode, baseDirectory });
+            onTestFinished(() => secondClient.stop());
+            const second = await secondClient.createSession({
+                availableTools: ["builtin:web_fetch"],
+            });
+            // SDK sessions do not automatically import the host URL allowlist.
+            // Permanent consent saves host settings and grants the live manager only.
+            await decideUrl(second, endpoint.url, { kind: "approve-once" });
+            expect(endpoint.requests).toHaveLength(2);
+            expect(await readFile(join(baseDirectory, "settings.json"), "utf8")).toBe(
+                savedSettings
+            );
+            await expect(
+                second.rpc.permissions.folderTrust.isTrusted({ path: folder })
+            ).resolves.toEqual({ trusted: true });
+            await expect(
+                second.rpc.commands.invoke({ name: "sandbox", input: "status" })
+            ).resolves.toMatchObject({ kind: "text", text: expect.stringMatching(/disabled/i) });
+        }
+    );
+});
+
+async function createPermissionEndpoint() {
+    const requests: string[] = [];
+    const server = createServer((request, response) => {
+        requests.push(request.url ?? "");
+        response.writeHead(200, { "Content-Type": "text/html" });
+        response.end("<html><body>SESSIONFS_URL_CONSENT_CONFIRMED</body></html>");
+    });
+    onTestFinished(
+        () =>
+            new Promise<void>((resolve, reject) => {
+                server.close((error) => (error ? reject(error) : resolve()));
+                server.closeAllConnections();
+            })
+    );
+    await new Promise<void>((resolve, reject) => {
+        server.once("error", reject);
+        server.listen(0, "127.0.0.1", resolve);
+    });
+    const address = server.address();
+    if (!address || typeof address === "string") {
+        throw new Error("URL approval fixture did not acquire a TCP port");
+    }
+    const origin = `http://127.0.0.1:${address.port}`;
+    return { origin, url: `${origin}/consent`, requests };
+}
+
+async function fetchUrl(session: CopilotSession, url: string) {
+    await session.rpc.permissions.setRequired({ required: true });
+    await session.rpc.tools.initializeAndValidate();
+    return session.rpc.tools.execute({ name: "web_fetch", arguments: { url, raw: true } });
+}
+
+async function decideUrl(
+    session: CopilotSession,
+    url: string,
+    decision: Exclude<PermissionRequestResult, { kind: "no-result" }>
+) {
+    await session.rpc.permissions.setRequired({ required: true });
+    const execution = fetchUrl(session, url);
+    // Observe errors immediately while waiting for the permission event.
+    void execution.catch(() => {});
+    await expect
+        .poll(async () => (await session.rpc.permissions.pendingRequests()).items)
+        .toHaveLength(1);
+    const [pending] = (await session.rpc.permissions.pendingRequests()).items;
+    expect(
+        (
+            await session.rpc.permissions.handlePendingPermissionRequest({
+                requestId: pending.requestId,
+                result: decision,
+            })
+        ).success
+    ).toBe(true);
+    const result = await execution;
+    expect(result).toMatchObject({
+        resultType: decision.kind === "reject" ? "rejected" : "success",
+    });
+}
+
 describe("Session Fs Adapter", () => {
     it("should map all sessionFs handler operations", async () => {
         const provider = new MemoryProvider();
@@ -623,9 +1841,10 @@ function escapeRegExp(value: string): string {
 
 function createTestSessionFsHandler(
     session: CopilotSession,
-    provider: VirtualProvider
+    provider: VirtualProvider,
+    namespace = session.sessionId
 ): SessionFsProvider {
-    const sp = (path: string) => `/${session.sessionId}${path.startsWith("/") ? path : "/" + path}`;
+    const sp = (path: string) => `/${namespace}${path.startsWith("/") ? path : "/" + path}`;
 
     return {
         async readFile(path: string): Promise<string> {
diff --git a/nodejs/test/e2e/skill_provider.e2e.test.ts b/nodejs/test/e2e/skill_provider.e2e.test.ts
new file mode 100644
index 0000000000..e8f2560625
--- /dev/null
+++ b/nodejs/test/e2e/skill_provider.e2e.test.ts
@@ -0,0 +1,533 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { execFileSync } from "child_process";
+import * as fs from "fs";
+import * as path from "path";
+import { fileURLToPath } from "url";
+import { describe, expect, it, onTestFinished } from "vitest";
+import {
+    approveAll,
+    RuntimeConnection,
+    type SessionConfig,
+    type SessionEvent,
+    type SkillProvider,
+    type SkillProviderDescriptor,
+} from "../../src/index.js";
+import { createSdkTestContext, getLegacyCliPathForTests } from "./harness/sdkTestContext.js";
+import { retry } from "./harness/sdkTestHelper.js";
+
+interface ProvidedSkill {
+    descriptor: SkillProviderDescriptor;
+    read: () => string | null;
+}
+
+/** An in-memory provider that records every callback the runtime makes. */
+class TestSkillProvider implements SkillProvider {
+    readonly calls: string[] = [];
+
+    constructor(private readonly skills: ProvidedSkill[]) {}
+
+    get reads(): string[] {
+        return this.calls
+            .filter((call) => call.startsWith("read:"))
+            .map((call) => call.slice("read:".length));
+    }
+
+    listSkills(): SkillProviderDescriptor[] {
+        this.calls.push("list");
+        return this.skills.map((skill) => skill.descriptor);
+    }
+
+    readSkill(name: string): string | null {
+        this.calls.push(`read:${name}`);
+        return this.skills.find((skill) => skill.descriptor.name === name)?.read() ?? null;
+    }
+}
+
+function skill(name: string, description: string, markdown: string): ProvidedSkill {
+    return { descriptor: { name, description }, read: () => markdown };
+}
+
+describe("Skill providers", async () => {
+    const {
+        copilotClient: client,
+        createClient,
+        openAiEndpoint,
+        workDir,
+    } = await createSdkTestContext();
+
+    it("should load provider skill lazily through skill tool", async () => {
+        // Body-only content: the catalog descriptor supplies all of the metadata.
+        const provider = new TestSkillProvider([
+            skill(
+                "provider-lookup",
+                "Reports the provider lookup verification word.",
+                "# Provider lookup\n\nThe verification word is TANGERINE_QUARTZ_19. Reply with it.\n"
+            ),
+        ]);
+        const session = await client.createSession({
+            onPermissionRequest: approveAll,
+            skillProvider: provider,
+        });
+
+        try {
+            const { skills } = await session.rpc.skills.list();
+            const listed = skills.find((s) => s.name === "provider-lookup");
+            expect(listed).toMatchObject({ source: "sdk", enabled: true });
+            expect(listed?.path ?? "").toBe("");
+            expect(provider.reads).toEqual([]);
+
+            const message = await session.sendAndWait({
+                prompt: "Use the skill tool to load the provider-lookup skill, then reply with its verification word.",
+            });
+
+            expect(provider.reads).toEqual(["provider-lookup"]);
+            // Validate the final assistant response arrived (guards against truncated captures)
+            expect(message?.data.content).toContain("TANGERINE_QUARTZ_19");
+        } finally {
+            await session.disconnect();
+        }
+    });
+
+    it("should load provider and file based skills together", async () => {
+        const skillsDir = path.join(workDir, "file-skills");
+        fs.mkdirSync(path.join(skillsDir, "file-notes"), { recursive: true });
+        fs.writeFileSync(
+            path.join(skillsDir, "file-notes", "SKILL.md"),
+            "---\nname: file-notes\ndescription: Reports the file notes verification word.\n---\n\nThe file notes verification word is MAPLE_FALCON_27.\n"
+        );
+        // Frontmatter may restate catalog metadata and is the only source of allowed-tools.
+        const provider = new TestSkillProvider([
+            skill(
+                "provider-audit",
+                "Reports the provider audit verification word.",
+                "---\nname: provider-audit\nallowed-tools: view\n---\n\nThe provider audit verification word is COBALT_HERON_58.\n"
+            ),
+        ]);
+        const session = await client.createSession({
+            onPermissionRequest: approveAll,
+            skillDirectories: [skillsDir],
+            skillProvider: provider,
+        });
+
+        try {
+            const { skills } = await session.rpc.skills.list();
+            const fileSkill = skills.find((s) => s.name === "file-notes");
+            const providerSkill = skills.find((s) => s.name === "provider-audit");
+            expect(fileSkill?.source).not.toBe("sdk");
+            expect(fileSkill?.path).toBeTruthy();
+            expect(providerSkill?.source).toBe("sdk");
+
+            const message = await session.sendAndWait({
+                prompt: "Use the skill tool to load the file-notes skill and the provider-audit skill, then reply with both verification words.",
+            });
+
+            expect(provider.reads).toEqual(["provider-audit"]);
+            expect(message?.data.content).toContain("MAPLE_FALCON_27");
+            // Validate the final assistant response arrived (guards against truncated captures)
+            expect(message?.data.content).toContain("COBALT_HERON_58");
+        } finally {
+            await session.disconnect();
+        }
+    });
+
+    it("should rebind skill provider on resume", async () => {
+        const original = new TestSkillProvider([
+            skill(
+                "rebind-check",
+                "Reports the rebind verification word.",
+                "The rebind verification word is AMBER_ALPHA_11.\n"
+            ),
+        ]);
+        const replacement = new TestSkillProvider([
+            skill(
+                "rebind-check",
+                "Reports the rebind verification word.",
+                "The rebind verification word is BRONZE_BETA_22.\n"
+            ),
+        ]);
+        const first = await client.createSession({
+            onPermissionRequest: approveAll,
+            skillProvider: original,
+        });
+        const sessionId = first.sessionId;
+        // A completed turn persists the session so that it can be resumed after disconnecting.
+        await first.sendAndWait({
+            prompt: "Without using any tools or skills, reply with exactly REBIND_READY.",
+        });
+        await first.disconnect();
+        expect(original.reads).toEqual([]);
+        const originalCallsBeforeResume = original.calls.length;
+
+        const session = await client.resumeSession(sessionId, {
+            onPermissionRequest: approveAll,
+            skillProvider: replacement,
+        });
+
+        try {
+            const message = await session.sendAndWait({
+                prompt: "Use the skill tool to load the rebind-check skill, then reply with its verification word.",
+            });
+
+            expect(replacement.reads).toEqual(["rebind-check"]);
+            expect(original.calls.length).toBe(originalCallsBeforeResume);
+            // Validate the final assistant response arrived (guards against truncated captures)
+            expect(message?.data.content).toContain("BRONZE_BETA_22");
+            expect(message?.data.content).not.toContain("AMBER_ALPHA_11");
+        } finally {
+            await session.disconnect();
+        }
+    });
+
+    it("should preserve skill prompt bytes across cold resume with reordered discovery", async () => {
+        const directories = ["custom-b", "custom-a"].map((name) => {
+            const directory = path.join(workDir, name);
+            fs.mkdirSync(directory, { recursive: true });
+            fs.writeFileSync(
+                path.join(directory, "SKILL.md"),
+                `---\nname: ${name}\ndescription: An ordering fixture.\n---\nOrdering fixture.\n`
+            );
+            return directory;
+        });
+        const provided = ["provider-c", "provider-a", "provider-b"].map((name) =>
+            skill(name, "An ordering fixture.", "Ordering fixture.\n")
+        );
+        const config = {
+            model: "claude-sonnet-5",
+            onPermissionRequest: approveAll,
+            availableTools: ["skill"],
+            enableConfigDiscovery: false,
+            includedBuiltinSkills: [],
+            skipCustomInstructions: true,
+            skipEmbeddingRetrieval: true,
+        } satisfies SessionConfig;
+        const first = createClient({ connection: RuntimeConnection.forStdio() });
+        onTestFinished(() => first.stop());
+        const session = await first.createSession({
+            ...config,
+            skillProvider: new TestSkillProvider(provided),
+            skillDirectories: directories,
+        });
+        const response = await session.sendAndWait({
+            prompt: "Without using tools, reply with exactly SKILL_ORDER_INITIAL_OK.",
+        });
+        // Validate the final assistant response arrived (guards against truncated captures)
+        expect(response?.data.content).toContain("SKILL_ORDER_INITIAL_OK");
+        const beforeRequests = await openAiEndpoint.getRequests();
+        const beforeBlocks = beforeRequests.flatMap(
+            (request) =>
+                request.body.match(/<available_skills>\\n[\s\S]*?<\/available_skills>/g) ?? []
+        );
+        expect(beforeBlocks.length).toBeGreaterThan(0);
+        for (const block of beforeBlocks) {
+            for (const name of [
+                ...provided.map((entry) => entry.descriptor.name),
+                "custom-a",
+                "custom-b",
+            ]) {
+                expect(block).toContain(`<name>${name}</name>`);
+            }
+            expect(block.indexOf("<name>provider-c</name>")).toBeLessThan(
+                block.indexOf("<name>custom-a</name>")
+            );
+        }
+        await session.disconnect();
+        expect(await first.stop()).toHaveLength(0);
+
+        const second = createClient({ connection: RuntimeConnection.forStdio() });
+        onTestFinished(() => second.stop());
+        const resumed = await second.resumeSession(session.sessionId, {
+            ...config,
+            skillProvider: new TestSkillProvider([provided[2], provided[0], provided[1]]),
+            skillDirectories: [...directories].reverse(),
+        });
+        const resumedResponse = await resumed.sendAndWait({
+            prompt: "Without using tools, reply with exactly SKILL_ORDER_RESUMED_OK.",
+        });
+        // Validate the final assistant response arrived (guards against truncated captures)
+        expect(resumedResponse?.data.content).toContain("SKILL_ORDER_RESUMED_OK");
+        const afterBlocks = (await openAiEndpoint.getRequests())
+            .slice(beforeRequests.length)
+            .flatMap(
+                (request) =>
+                    request.body.match(/<available_skills>\\n[\s\S]*?<\/available_skills>/g) ?? []
+            );
+        expect(afterBlocks).toEqual(beforeBlocks);
+        await resumed.disconnect();
+    });
+
+    it("should report provider read failure without leaking details", async () => {
+        const secret = "PROVIDER_SECRET_7F3A9C";
+        const provider = new TestSkillProvider([
+            {
+                descriptor: {
+                    name: "broken-lookup",
+                    description: "Reports the broken lookup verification word.",
+                },
+                read: () => {
+                    throw new Error(`database unavailable: ${secret}`);
+                },
+            },
+        ]);
+        const events: SessionEvent[] = [];
+        const session = await client.createSession({
+            onPermissionRequest: approveAll,
+            skillProvider: provider,
+            onEvent: (event) => events.push(event),
+        });
+
+        try {
+            const message = await session.sendAndWait({
+                prompt: "Use the skill tool to load the broken-lookup skill. If loading fails, reply with exactly LOAD_FAILED.",
+            });
+
+            expect(provider.reads).toContain("broken-lookup");
+            const failures = events.filter(
+                (event) => event.type === "tool.execution_complete" && !event.data.success
+            );
+            expect(failures).toHaveLength(1);
+            expect(JSON.stringify(events)).not.toContain(secret);
+            // Validate the final assistant response arrived (guards against truncated captures)
+            expect(message?.data.content).toContain("LOAD_FAILED");
+        } finally {
+            await session.disconnect();
+        }
+    });
+
+    it("should report missing provider skill as not found", async () => {
+        const provider = new TestSkillProvider([
+            {
+                descriptor: {
+                    name: "vanished-lookup",
+                    description: "Reports the vanished lookup verification word.",
+                },
+                read: () => null,
+            },
+        ]);
+        const events: SessionEvent[] = [];
+        const session = await client.createSession({
+            onPermissionRequest: approveAll,
+            skillProvider: provider,
+            onEvent: (event) => events.push(event),
+        });
+
+        try {
+            const message = await session.sendAndWait({
+                prompt: "Use the skill tool to load the vanished-lookup skill. If loading fails, reply with exactly LOAD_FAILED.",
+            });
+
+            expect(provider.reads).toContain("vanished-lookup");
+            const failures = events.filter(
+                (event) => event.type === "tool.execution_complete" && !event.data.success
+            );
+            expect(failures).toHaveLength(1);
+            expect(JSON.stringify(failures[0])).toMatch(/not found/i);
+            // Validate the final assistant response arrived (guards against truncated captures)
+            expect(message?.data.content).toContain("LOAD_FAILED");
+        } finally {
+            await session.disconnect();
+        }
+    });
+
+    it("should keep provider dormant when skills disabled", async () => {
+        const provider = new TestSkillProvider([
+            skill("dormant-lookup", "Never listed.", "Never read.\n"),
+        ]);
+        const session = await client.createSession({
+            onPermissionRequest: approveAll,
+            enableSkills: false,
+            skillProvider: provider,
+        });
+
+        try {
+            await session.rpc.skills.ensureLoaded();
+            const { skills } = await session.rpc.skills.list();
+
+            expect(skills.filter((s) => s.source === "sdk")).toEqual([]);
+            expect(provider.calls).toEqual([]);
+        } finally {
+            await session.disconnect();
+        }
+    });
+
+    it("should unbind provider when resumed without one", async () => {
+        const provider = new TestSkillProvider([
+            skill("unbound-lookup", "Reports the unbound lookup word.", "Unbound.\n"),
+        ]);
+        const first = await client.createSession({
+            onPermissionRequest: approveAll,
+            skillProvider: provider,
+        });
+        const before = await first.rpc.skills.list();
+        expect(before.skills.some((s) => s.name === "unbound-lookup")).toBe(true);
+        const callsBeforeResume = provider.calls.length;
+
+        // Resume while the provider is still bound so the unbind is observable.
+        const session = await client.resumeSession(first.sessionId, {
+            onPermissionRequest: approveAll,
+        });
+
+        try {
+            await session.rpc.skills.reload();
+            const { skills } = await session.rpc.skills.list();
+
+            expect(skills.filter((s) => s.source === "sdk")).toEqual([]);
+            expect(provider.calls.length).toBe(callsBeforeResume);
+        } finally {
+            await session.disconnect();
+        }
+    });
+
+    it("should cancel a blocked provider call when the session disconnects", async () => {
+        let entered!: () => void;
+        const started = new Promise<void>((resolve) => (entered = resolve));
+        let cancelled!: () => void;
+        const aborted = new Promise<void>((resolve) => (cancelled = resolve));
+        const provider: SkillProvider = {
+            listSkills: ({ signal }) =>
+                new Promise<never>((_resolve, reject) => {
+                    signal.addEventListener(
+                        "abort",
+                        () => {
+                            cancelled();
+                            reject(signal.reason);
+                        },
+                        { once: true }
+                    );
+                    entered();
+                }),
+            readSkill: () => null,
+        };
+        const session = await client.createSession({
+            onPermissionRequest: approveAll,
+            skillProvider: provider,
+        });
+
+        // The list RPC fails once the binding is removed; only the provider's
+        // cancellation matters here.
+        void session.rpc.skills.list().catch(() => {});
+        await started;
+        await session.disconnect();
+
+        let timer: NodeJS.Timeout | undefined;
+        await Promise.race([
+            aborted,
+            new Promise<never>((_resolve, reject) => {
+                timer = setTimeout(
+                    () => reject(new Error("provider signal was not aborted after disconnect")),
+                    10_000
+                );
+            }),
+        ]).finally(() => clearTimeout(timer));
+    });
+
+    it("should reject skill provider for cloud sessions", async () => {
+        const provider = new TestSkillProvider([
+            skill("cloud-lookup", "Never listed.", "Never read.\n"),
+        ]);
+
+        await expect(
+            client.createSession({
+                onPermissionRequest: approveAll,
+                cloud: {},
+                skillProvider: provider,
+            })
+        ).rejects.toThrow("Skill providers are not supported for cloud sessions.");
+
+        expect(provider.calls).toEqual([]);
+    });
+});
+
+describe("Skill providers with extensions", async () => {
+    const cliDistDirectory = process.env.COPILOT_EXTENSION_SDK_PATH
+        ? path.dirname(process.env.COPILOT_EXTENSION_SDK_PATH)
+        : path.dirname(await getLegacyCliPathForTests());
+    const sdkDistDirectory = path.resolve(
+        path.dirname(fileURLToPath(import.meta.url)),
+        "..",
+        "..",
+        "dist"
+    );
+    // Runs on the default runtime, which is the native runtime in CI.
+    const { copilotClient: client, workDir } = await createSdkTestContext({
+        copilotClientOptions: {
+            connection: RuntimeConnection.forStdio(),
+            env: { COPILOT_CLI_ENABLED_FEATURE_FLAGS: "EXTENSIONS" },
+            extensionLaunchProvider: {
+                resolve: async (request) => ({
+                    launch: {
+                        executable: "node",
+                        args: [path.join(cliDistDirectory, "preloads", "extension_bootstrap.mjs")],
+                        env: {
+                            COPILOT_CLI_DIST_DIR: cliDistDirectory,
+                            EXTENSION_PATH: request.modulePath,
+                        },
+                    },
+                }),
+            },
+        },
+    });
+
+    it(
+        "should keep provider skills when an extension joins the session",
+        { timeout: 120_000 },
+        async () => {
+            execFileSync("git", ["init", "--quiet"], { cwd: workDir });
+            const provider = new TestSkillProvider([
+                skill("extension-safe-lookup", "Reports the extension-safe word.", "Safe.\n"),
+            ]);
+            const session = await client.createSession({
+                onPermissionRequest: approveAll,
+                requestExtensions: true,
+                extensionSdkPath: sdkDistDirectory,
+                skillProvider: provider,
+            });
+
+            try {
+                const before = await session.rpc.skills.list();
+                expect(before.skills.filter((s) => s.source === "sdk").map((s) => s.name)).toEqual([
+                    "extension-safe-lookup",
+                ]);
+
+                const extensionDir = path.join(
+                    workDir,
+                    ".github",
+                    "extensions",
+                    "provider-observer"
+                );
+                const joinedFile = path.join(extensionDir, "joined");
+                fs.mkdirSync(extensionDir, { recursive: true });
+                fs.writeFileSync(
+                    path.join(extensionDir, "extension.mjs"),
+                    `import { writeFileSync } from "node:fs";
+import { joinSession } from "@github/copilot-sdk/extension";
+await joinSession({});
+writeFileSync(new URL("./joined", import.meta.url), "joined");
+setInterval(() => {}, 60_000);
+`
+                );
+                await session.rpc.extensions.reload();
+                // An extension joins by resuming the session, which must not
+                // unbind the owner's provider.
+                await retry(
+                    "wait for the extension to join the session",
+                    async () => {
+                        expect(fs.existsSync(joinedFile)).toBe(true);
+                    },
+                    300,
+                    100
+                );
+                await session.rpc.skills.reload();
+                const { skills } = await session.rpc.skills.list();
+
+                expect(skills.filter((s) => s.source === "sdk").map((s) => s.name)).toEqual([
+                    "extension-safe-lookup",
+                ]);
+            } finally {
+                await session.disconnect();
+            }
+        }
+    );
+});
diff --git a/nodejs/test/e2e/skills.e2e.test.ts b/nodejs/test/e2e/skills.e2e.test.ts
index 422e681368..db58035351 100644
--- a/nodejs/test/e2e/skills.e2e.test.ts
+++ b/nodejs/test/e2e/skills.e2e.test.ts
@@ -49,6 +49,8 @@ IMPORTANT: You MUST include the exact text "${SKILL_MARKER}" somewhere in EVERY
             const session = await client.createSession({
                 onPermissionRequest: approveAll,
                 enableConfigDiscovery: false,
+                // Reload must introduce the first skill, including its tool.
+                includedBuiltinSkills: [],
                 skillDirectories: [lateSkillsDir],
                 hooks: {
                     onPostToolUse: (input) => {
@@ -66,6 +68,7 @@ IMPORTANT: You MUST include the exact text "${SKILL_MARKER}" somewhere in EVERY
             });
 
             try {
+                expect((await session.rpc.skills.list()).skills).toEqual([]);
                 const first = await session.sendAndWait({ prompt: "Reply with READY." });
                 expect(first?.data.content).toContain("READY");
                 expect(skillResults).toEqual([]);
diff --git a/nodejs/test/e2e/sse_terminals.e2e.test.ts b/nodejs/test/e2e/sse_terminals.e2e.test.ts
new file mode 100644
index 0000000000..77793b7608
--- /dev/null
+++ b/nodejs/test/e2e/sse_terminals.e2e.test.ts
@@ -0,0 +1,162 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import http from "node:http";
+import { afterAll, describe, expect, it } from "vitest";
+import { approveAll, type SessionEvent } from "../../src/index.js";
+import { withTestCleanup } from "../helpers/withTestCleanup.js";
+import { createSdkTestContext, DEFAULT_GITHUB_TOKEN } from "./harness/sdkTestContext.js";
+import { createCompletedResponse } from "./harness/webSocketResponsesServer.js";
+
+const FINAL_OUTPUT = "SSE_INCOMPLETE_TERMINAL_DONE";
+const pollOptions = { timeout: 10_000 };
+
+describe("SSE incomplete terminals", async () => {
+    const release = Promise.withResolvers<void>();
+    const responses: http.ServerResponse[] = [];
+    const errors: unknown[] = [];
+    // Native responses_transport tests own the envelope/output matrix. This case
+    // proves the held-open HTTP stream crosses the subprocess SDK boundary.
+    const server = http.createServer((req, res) => {
+        void (async () => {
+            if (req.method !== "POST" || req.url !== "/v1/responses") {
+                throw new Error(`Unexpected provider request: ${req.method} ${req.url}`);
+            }
+            req.setEncoding("utf8");
+            let body = "";
+            for await (const chunk of req) body += chunk;
+            const request: unknown = JSON.parse(body);
+            if (typeof request !== "object" || request === null) {
+                throw new Error("Expected a Responses request object.");
+            }
+            if (!("stream" in request) || request.stream !== true) {
+                res.writeHead(200, {
+                    "content-type": "application/json",
+                    "x-content-type-options": "nosniff",
+                });
+                res.end(JSON.stringify(createCompletedResponse("Test session", "resp-title")));
+                return;
+            }
+            responses.push(res);
+            res.on("error", (error) => errors.push(error));
+            res.writeHead(200, { "content-type": "text/event-stream" });
+            res.write(
+                `data: ${JSON.stringify({
+                    type: "response.created",
+                    response: { id: "resp-incomplete", status: "in_progress", output: [] },
+                })}\n\n`
+            );
+            await release.promise;
+            res.write(
+                `data: ${JSON.stringify({
+                    type: "response.completed",
+                    response: {
+                        ...createCompletedResponse(FINAL_OUTPUT, "resp-incomplete"),
+                        status: "incomplete",
+                        // Isolate draining from the existing length-continuation policy.
+                        incomplete_details: { reason: "content_filter" },
+                    },
+                })}\n\n`
+            );
+            // Neither [DONE] nor res.end(): only the runtime can retire this stream.
+        })().catch((error: unknown) => {
+            errors.push(error);
+            res.destroy(error instanceof Error ? error : new Error(String(error)));
+        });
+    });
+    await new Promise<void>((resolve, reject) => {
+        server.once("error", reject);
+        server.listen(0, "127.0.0.1", resolve);
+    });
+    afterAll(async () => {
+        release.resolve();
+        server.closeAllConnections();
+        await new Promise<void>((resolve, reject) =>
+            server.close((error) => (error ? reject(error) : resolve()))
+        );
+        if (errors.length > 0) throw new AggregateError(errors, "SSE provider fixture failed.");
+    });
+    const address = server.address();
+    if (address === null || typeof address === "string") {
+        throw new Error("Expected a bound TCP address for the SSE provider.");
+    }
+    const { copilotClient: client } = await createSdkTestContext({
+        useStdio: true,
+        copilotClientOptions: { gitHubToken: DEFAULT_GITHUB_TOKEN },
+    });
+
+    it("finishes a completed-envelope incomplete response without waiting for peer EOF", async () => {
+        const session = await client.createSession({
+            model: "gpt-5-responses",
+            streaming: true,
+            provider: {
+                type: "openai",
+                baseUrl: `http://127.0.0.1:${address.port}/v1`,
+                apiKey: "test-provider-key",
+                wireApi: "responses",
+                transport: "http",
+            },
+            onPermissionRequest: approveAll,
+        });
+        const events: SessionEvent[] = [];
+        const unsubscribe = session.on((event) => events.push(event));
+        await withTestCleanup(
+            async () => {
+                await session.send({ prompt: "Return the controlled partial answer." });
+                await expect
+                    .poll(
+                        () => ({
+                            requests: responses.length,
+                            errors: events
+                                .filter((event) => event.type === "session.error")
+                                .map((event) => event.data.message),
+                        }),
+                        pollOptions
+                    )
+                    .toEqual({ requests: 1, errors: [] });
+                expect(responses[0].writableEnded).toBe(false);
+                expect(events.filter((event) => event.type === "assistant.message")).toEqual([]);
+                await session.rpc.mode.get();
+                release.resolve();
+
+                await expect
+                    .poll(
+                        () =>
+                            events.filter((event) => event.type === "assistant.message").at(-1)
+                                ?.data.content,
+                        pollOptions
+                    )
+                    .toBe(FINAL_OUTPUT);
+                await expect
+                    .poll(() => {
+                        const finalMessage = events.findLastIndex(
+                            (event) =>
+                                event.type === "assistant.message" &&
+                                event.data.content === FINAL_OUTPUT
+                        );
+                        return (
+                            finalMessage !== -1 &&
+                            events
+                                .slice(finalMessage + 1)
+                                .some((event) => event.type === "session.idle")
+                        );
+                    }, pollOptions)
+                    .toBe(true);
+                expect(responses).toHaveLength(1);
+                expect(responses[0].writableEnded).toBe(false);
+                await expect.poll(() => responses[0].destroyed, pollOptions).toBe(true);
+                expect(events.filter((event) => event.type === "session.error")).toEqual([]);
+            },
+            () => release.resolve(),
+            unsubscribe,
+            () => session.disconnect(),
+            async () => {
+                const errors = await client.stop();
+                if (errors.length > 0) {
+                    throw new AggregateError(errors, "SSE client cleanup failed");
+                }
+            }
+        );
+    });
+});
diff --git a/nodejs/test/e2e/startup_policy.e2e.test.ts b/nodejs/test/e2e/startup_policy.e2e.test.ts
new file mode 100644
index 0000000000..330cf3c44b
--- /dev/null
+++ b/nodejs/test/e2e/startup_policy.e2e.test.ts
@@ -0,0 +1,33 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { describe, expect, it } from "vitest";
+import { createSdkTestContext } from "./harness/sdkTestContext.js";
+
+describe("Sandbox proxy CA policy", async () => {
+    const { copilotClient: client } = await createSdkTestContext();
+
+    it("reports relevance without installation or caller config changes", async () => {
+        await client.start();
+        const configured = { sandboxConfig: { enabled: true, auth: { gh: true } } };
+        const before = structuredClone(configured);
+        expect(await client.rpc.sandbox.proxyCa.checkRelevance(configured)).toBe(true);
+        expect(configured).toEqual(before);
+        expect(
+            await client.rpc.sandbox.proxyCa.checkRelevance({
+                sandboxConfig: { enabled: false, auth: { gh: true } },
+            })
+        ).toBe(false);
+        expect(await client.rpc.sandbox.proxyCa.checkRelevance({})).toBe(false);
+    });
+
+    it("reports installation support without an elevation prompt", async () => {
+        await client.start();
+        const supported = await client.rpc.sandbox.proxyCa.checkInstallationSupport();
+        expect(typeof supported).toBe("boolean");
+        if (process.platform !== "win32") {
+            expect(supported).toBe(true);
+        }
+    });
+});
diff --git a/nodejs/test/e2e/structured_output.e2e.test.ts b/nodejs/test/e2e/structured_output.e2e.test.ts
index e92125507f..fbc84ab261 100644
--- a/nodejs/test/e2e/structured_output.e2e.test.ts
+++ b/nodejs/test/e2e/structured_output.e2e.test.ts
@@ -44,7 +44,7 @@ describe("Structured output", async () => {
     it("infers_typed_result_after_custom_tool", async () => {
         let calls = 0;
         const schema = z.object({ count: z.number().int(), color: z.string() });
-        const session = await client.createSession({
+        await using session = await client.createSession({
             model,
             provider,
             onPermissionRequest: approveAll,
@@ -89,8 +89,7 @@ describe("Structured output", async () => {
     it("typed_result_after_terminal_tool_and_steering", async () => {
         const events: SessionEvent[] = [];
         let calls = 0;
-        let session: CopilotSession;
-        session = await client.createSession({
+        await using session: CopilotSession = await client.createSession({
             model,
             provider,
             onPermissionRequest: approveAll,
@@ -146,7 +145,7 @@ describe("Structured output", async () => {
         let calls = 0;
         let stops = 0;
         const replies: AssistantMessageEvent[] = [];
-        const session = await client.createSession({
+        await using session = await client.createSession({
             model,
             provider,
             onPermissionRequest: approveAll,
@@ -204,9 +203,15 @@ describe("Structured output", async () => {
 
     it("rejects_unsupported_or_oversized_schemas_before_admission", async () => {
         for (const model of ["gpt-4.1", "hydrafusion"]) {
-            const session = await client.createSession({
+            await using session = await client.createSession({
                 model,
                 provider,
+                ...(model === "hydrafusion"
+                    ? {
+                          enableExperimentalMode: true,
+                          featureFlags: { HYDRAFUSION: true, HYDRAFUSION_ROLLOUT: true },
+                      }
+                    : {}),
                 onPermissionRequest: approveAll,
                 availableTools: [],
             });
@@ -252,7 +257,7 @@ describe("Structured output", async () => {
         const hookReleased = new Promise<void>((resolve) => {
             releaseHook = resolve;
         });
-        const session = await client.createSession({
+        await using session = await client.createSession({
             model,
             provider,
             onPermissionRequest: approveAll,
@@ -273,14 +278,20 @@ describe("Structured output", async () => {
             },
         });
         const replies: AssistantMessageEvent[] = [];
-        const errors: string[] = [];
+        const errors: "session.error"[] = [];
+        let errorCount = 0;
+        const startedAt = Date.now();
+        const progress: { type: SessionEvent["type"]; elapsedMs: number }[] = [];
         let idle = false;
         const unsubscribe = session.on((event) => {
             if (event.agentId) return;
+            progress.push({ type: event.type, elapsedMs: Date.now() - startedAt });
+            if (progress.length > 20) progress.shift();
             if (event.type === "assistant.message") {
                 replies.push(event);
             } else if (event.type === "session.error") {
-                errors.push(event.data.message);
+                errorCount++;
+                if (errors.length === 0) errors.push("session.error");
             } else if (event.type === "session.idle") {
                 idle = true;
             }
@@ -314,6 +325,24 @@ describe("Structured output", async () => {
             expect(replies.some((event) => event.data.toolRequests?.length)).toBe(true);
             expect(reply.data.toolRequests ?? []).toEqual([]);
             expect(replies.at(-1)).toBe(reply);
+        } catch (error) {
+            console.error(
+                "Structured-output stop-hook diagnostics:",
+                JSON.stringify({
+                    sessionId: session.sessionId,
+                    hookEntered,
+                    idle,
+                    errorCount,
+                    errorCategories: errors,
+                    progress,
+                    replies: replies.slice(-20).map((reply) => ({
+                        originatingMessageId: reply.data.originatingMessageId,
+                        toolRequestCount: reply.data.toolRequests?.length ?? 0,
+                        contentLength: reply.data.content.length,
+                    })),
+                })
+            );
+            throw error;
         } finally {
             releaseHook();
             unsubscribe();
@@ -324,7 +353,7 @@ describe("Structured output", async () => {
         let stops = 0;
         const replies: AssistantMessageEvent[] = [];
         const schema = z.object({ answer: z.number().int() });
-        const session = await client.createSession({
+        await using session = await client.createSession({
             model,
             provider,
             onPermissionRequest: approveAll,
@@ -364,10 +393,9 @@ describe("Structured output", async () => {
     it("typed_wait_returns_late_steering_response", async () => {
         let stops = 0;
         let steeringId: string | undefined;
-        let session: CopilotSession;
         const replies: AssistantMessageEvent[] = [];
         const schema = z.object({ answer: z.number().int() });
-        session = await client.createSession({
+        await using session: CopilotSession = await client.createSession({
             model,
             provider,
             onPermissionRequest: approveAll,
@@ -417,7 +445,7 @@ describe("Structured output", async () => {
         const toolReleased = new Promise<void>((resolve) => {
             releaseTool = resolve;
         });
-        const session = await client.createSession({
+        await using session = await client.createSession({
             model,
             provider,
             onPermissionRequest: approveAll,
@@ -474,7 +502,7 @@ describe("Structured output", async () => {
     });
 
     it("sends_explicit_schema_for_message_and_batch", async () => {
-        const session = await client.createSession({
+        await using session = await client.createSession({
             model,
             provider,
             onPermissionRequest: approveAll,
diff --git a/nodejs/test/e2e/subagent_hooks.e2e.test.ts b/nodejs/test/e2e/subagent_hooks.e2e.test.ts
index a892d62c84..818560bd7f 100644
--- a/nodejs/test/e2e/subagent_hooks.e2e.test.ts
+++ b/nodejs/test/e2e/subagent_hooks.e2e.test.ts
@@ -16,8 +16,8 @@ import type {
     SubagentStopHookInput,
 } from "../../src/index.js";
 import { approveAll, CopilotRequestHandler } from "../../src/index.js";
-import { responsesApiRequestToChatCompletion } from "../../../test/harness/responsesApiAdapter.js";
 import { createSdkTestContext, isCI } from "./harness/sdkTestContext.js";
+import { childUserPrompts } from "./harness/childUserPrompts.js";
 
 const CHILD_CONTEXT = "Subagent start hook verified: read the requested file.";
 const CHILD_CONTEXT_PREFIX = `${CHILD_CONTEXT}\n\n`;
@@ -47,45 +47,15 @@ class RecordingRequestHandler extends CopilotRequestHandler {
             interactionType: ctx.interactionType,
         });
         if (isInferenceUrl(request.url)) {
-            const rawBody = await request.clone().text();
-            const body = JSON.parse(
-                request.url.endsWith("/responses")
-                    ? responsesApiRequestToChatCompletion(rawBody)
-                    : rawBody
-            ) as {
-                messages?: { role: string; content?: unknown }[];
-                input?: { role?: string; content?: unknown }[];
-            };
+            const body = await request.clone().text();
             if (ctx.parentAgentId) {
-                // Responses uses input/input_text instead of messages/text.
-                for (const message of body.messages ?? body.input ?? []) {
-                    if (
-                        message.role === "user" &&
-                        (typeof message.content === "string" || Array.isArray(message.content))
-                    ) {
-                        const parts =
-                            typeof message.content === "string"
-                                ? [message.content]
-                                : message.content
-                                      .filter(
-                                          (
-                                              part
-                                          ): part is {
-                                              type: "text" | "input_text";
-                                              text: string;
-                                          } =>
-                                              (part?.type === "text" ||
-                                                  part?.type === "input_text") &&
-                                              typeof part.text === "string"
-                                      )
-                                      .map((part) => part.text);
-                        this.childPromptsWithHookContext.push(
-                            ...parts.filter((part) => part.includes(CHILD_CONTEXT_PREFIX))
-                        );
-                    }
-                }
-            } else if (JSON.stringify(body).includes(STOP_RESPONSE_PREFIX)) {
-                this.parentRequestsWithModifiedResponse.push(JSON.stringify(body));
+                this.childPromptsWithHookContext.push(
+                    ...childUserPrompts(request.url, body, ctx).filter((part) =>
+                        part.includes(CHILD_CONTEXT_PREFIX)
+                    )
+                );
+            } else if (body.includes(STOP_RESPONSE_PREFIX)) {
+                this.parentRequestsWithModifiedResponse.push(body);
             }
         }
         return super.sendRequest(request, ctx);
diff --git a/nodejs/test/e2e/subagent_prompt_resume.e2e.test.ts b/nodejs/test/e2e/subagent_prompt_resume.e2e.test.ts
index 2e82470012..62faad1221 100644
--- a/nodejs/test/e2e/subagent_prompt_resume.e2e.test.ts
+++ b/nodejs/test/e2e/subagent_prompt_resume.e2e.test.ts
@@ -2,7 +2,7 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *--------------------------------------------------------------------------------------------*/
 
-import { writeFile } from "node:fs/promises";
+import { readFile, writeFile } from "node:fs/promises";
 import { dirname, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import { describe, expect, it } from "vitest";
@@ -11,19 +11,24 @@ import type {
     CopilotSession,
     CustomAgentConfig,
     MCPStdioServerConfig,
+    SessionEvent,
 } from "../../src/index.js";
 import { approveAll, CopilotRequestHandler } from "../../src/index.js";
 import { createSdkTestContext } from "./harness/sdkTestContext.js";
 import { waitForCondition } from "./harness/sdkTestHelper.js";
+import { isByokBackend } from "./harness/testBackend.js";
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 const TEST_MCP_SERVER = resolve(__dirname, "../../../test/harness/test-mcp-server.mjs");
 const TEST_HARNESS_DIR = dirname(TEST_MCP_SERVER);
+const capiIt = it.skipIf(isByokBackend);
 
 interface InferenceRequest {
     agentId?: string;
     parentAgentId?: string;
+    model: string;
+    reasoningEffort?: string;
     systemPrompt: string;
     toolNames: string[];
 }
@@ -37,9 +42,16 @@ class RecordingRequestHandler extends CopilotRequestHandler {
     ): Promise<Response> {
         const body = request.body ? await request.text() : "";
         if (isInferenceUrl(request.url)) {
+            const inference = JSON.parse(body) as {
+                model: string;
+                reasoning_effort?: string;
+                reasoning?: { effort?: string };
+            };
             this.inferenceRequests.push({
                 agentId: ctx.agentId,
                 parentAgentId: ctx.parentAgentId,
+                model: inference.model,
+                reasoningEffort: inference.reasoning_effort ?? inference.reasoning?.effort,
                 systemPrompt: systemPromptFromRequest(request.url, body),
                 toolNames: toolNamesFromRequest(body),
             });
@@ -122,6 +134,32 @@ function bootstrapResponse(url: string): Response {
                         },
                     },
                 },
+                {
+                    id: "gpt-5.4-mini",
+                    name: "GPT-5.4 Mini",
+                    object: "model",
+                    vendor: "OpenAI",
+                    version: "1",
+                    preview: false,
+                    model_picker_enabled: true,
+                    supported_endpoints: ["/chat/completions"],
+                    capabilities: {
+                        type: "chat",
+                        family: "gpt-5.4-mini",
+                        tokenizer: "o200k_base",
+                        limits: {
+                            max_context_window_tokens: 200000,
+                            max_output_tokens: 8192,
+                        },
+                        supports: {
+                            streaming: true,
+                            tool_calls: true,
+                            parallel_tool_calls: true,
+                            vision: true,
+                            reasoning_effort: ["low", "medium", "high"],
+                        },
+                    },
+                },
             ],
         });
     }
@@ -211,7 +249,11 @@ describe("Subagent prompt resume", async () => {
     const { copilotClient: client, env } = await createSdkTestContext({
         copilotClientOptions: {
             requestHandler,
-            env: { COPILOT_EXP_COPILOT_CLI_SESSION_BASED_SUBAGENTS: "true" },
+            env: {
+                COPILOT_EXP_COPILOT_CLI_SESSION_BASED_SUBAGENTS: "true",
+                STABILITY_ORDERED_SYSTEM_PROMPT_V2: "false",
+                COPILOT_EXP_COPILOT_CLI_STABILITY_ORDERED_SYSTEM_PROMPT_V2: "false",
+            },
         },
     });
 
@@ -225,14 +267,22 @@ describe("Subagent prompt resume", async () => {
             },
             { timeoutMessage: `Agent ${agentId} did not become idle.` }
         );
+        const task = (await session.rpc.tasks.list()).tasks.find(
+            (candidate) => candidate.id === agentId
+        );
+        if (task?.type !== "agent") {
+            throw new Error(`Agent task ${agentId} is missing or has the wrong type.`);
+        }
+        expect(task.latestResponse ?? task.result).toContain("SUBAGENT_TURN_COMPLETE");
     }
 
     async function runResumeScenario(
         trigger: (session: CopilotSession) => Promise<void>,
         createOptions: Parameters<typeof client.createSession>[0] = {},
         beforeAgentStart: (session: CopilotSession) => Promise<void> = async () => {},
-        agentType = "explore"
-    ): Promise<[InferenceRequest, InferenceRequest]> {
+        agentType = "explore",
+        agentModel: string | null = "claude-sonnet-5"
+    ): Promise<[InferenceRequest, InferenceRequest, string]> {
         await writeFile(join(env.COPILOT_HOME, "settings.json"), "{}");
         const requestBaseline = requestHandler.inferenceRequests.length;
         const session = await client.createSession({
@@ -248,7 +298,7 @@ describe("Subagent prompt resume", async () => {
                 prompt: "Reply with exactly SUBAGENT_TURN_COMPLETE.",
                 name: "prompt-resume",
                 description: "Exercise an idle subagent follow-up.",
-                model: "claude-sonnet-5",
+                ...(agentModel ? { model: agentModel } : {}),
             });
             await waitForIdleAgent(session, agentId);
 
@@ -270,12 +320,13 @@ describe("Subagent prompt resume", async () => {
                 },
                 { timeoutMessage: "Agent did not complete its follow-up turn." }
             );
+            await waitForIdleAgent(session, agentId);
 
             const childRequests = requestHandler.inferenceRequests
                 .slice(requestBaseline)
                 .filter((request) => request.agentId === agentId && request.parentAgentId);
             expect(childRequests).toHaveLength(2);
-            return [childRequests[0]!, childRequests[1]!];
+            return [childRequests[0]!, childRequests[1]!, session.sessionId];
         } finally {
             const tasks = await session.rpc.tasks.list();
             for (const task of tasks.tasks) {
@@ -311,12 +362,155 @@ describe("Subagent prompt resume", async () => {
     }
 
     it("preserves the adapted prompt on an ordinary idle-agent wake", async () => {
-        const [initial, resumed] = await runResumeScenario(async () => {});
+        const [initial, resumed, sessionId] = await runResumeScenario(async () => {});
 
         expectAdaptedExplorePrompt(initial.systemPrompt);
         expect(resumed.systemPrompt).toBe(initial.systemPrompt);
+        const journal = await readFile(
+            join(env.COPILOT_HOME, "session-state", sessionId, "events.jsonl"),
+            "utf8"
+        );
+        const events = journal
+            .trim()
+            .split("\n")
+            .map((line) => JSON.parse(line) as SessionEvent);
+        const childEvents = events.filter((event) => event.agentId === initial.agentId);
+        const childPrompts = childEvents.filter((event) => event.type === "system.message");
+        expect(childPrompts).toHaveLength(1);
+        expect(
+            childEvents
+                .filter((event) => event.type === "assistant.message")
+                .map((event) => event.data.content)
+        ).toEqual(["SUBAGENT_TURN_COMPLETE", "SUBAGENT_TURN_COMPLETE"]);
+        const ids = new Set(events.map((event) => event.id));
+        for (const event of events) {
+            if (event.parentId) {
+                expect(ids.has(event.parentId), `Missing parent of ${event.id}`).toBe(true);
+            }
+        }
+        await using reopened = await client.resumeSession(sessionId, {
+            model: "claude-sonnet-5",
+            onPermissionRequest: approveAll,
+        });
+        const history = await reopened.getEvents();
+        expect(history.find((event) => event.id === childPrompts[0]!.id)).toEqual(childPrompts[0]);
+    });
+
+    it("keeps legacy prompt blocks live while persisting only their reconstructible content", async () => {
+        const content =
+            "shared<environment_limitations>limits</environment_limitations>\n\nper-user instructions";
+        const systemMessage = {
+            mode: "replace" as const,
+            content,
+            contentBlocks: [
+                {
+                    content: "shared<environment_limitations>limits</environment_limitations>",
+                    isStatic: true,
+                },
+                { content: "per-user instructions" },
+            ],
+        };
+        await using session = await client.createSession({
+            model: "claude-sonnet-5",
+            systemMessage,
+            onPermissionRequest: approveAll,
+        });
+        const livePrompts: SessionEvent[] = [];
+        const unsubscribe = session.on("system.message", (event) => livePrompts.push(event));
+        try {
+            const response = await session.sendAndWait({
+                prompt: "Reply with exactly SUBAGENT_TURN_COMPLETE.",
+            });
+            expect(response?.data.content).toBe("SUBAGENT_TURN_COMPLETE");
+        } finally {
+            unsubscribe();
+        }
+        await session.disconnect();
+        const live = livePrompts.find((event) => event.type === "system.message");
+        expect(live?.type).toBe("system.message");
+        if (live?.type !== "system.message") {
+            throw new Error("Expected a live system prompt.");
+        }
+        expect(live.data.content).toBe(content);
+        expect(live.data.contentBlocks).toEqual(systemMessage.contentBlocks);
+        const journal = await readFile(
+            join(env.COPILOT_HOME, "session-state", session.sessionId, "events.jsonl"),
+            "utf8"
+        );
+        const persisted = journal
+            .trim()
+            .split("\n")
+            .map((line) => JSON.parse(line) as SessionEvent)
+            .find((event) => event.id === live.id);
+        expect(persisted?.type).toBe("system.message");
+        if (persisted?.type !== "system.message") {
+            throw new Error("Expected the persisted system prompt.");
+        }
+        expect(persisted.data.content).toBe(content);
+        expect(persisted.data.contentBlocks).toBeUndefined();
+        await using reopened = await client.resumeSession(session.sessionId, {
+            model: "claude-sonnet-5",
+            onPermissionRequest: approveAll,
+        });
+        const history = await reopened.getEvents();
+        expect(history.find((event) => event.id === live.id)).toEqual(persisted);
     });
 
+    capiIt.each(["minimal", "max", "xhigh", "none", "high"])(
+        "reconciles a concrete child's composed %s effort on its first and resumed requests",
+        async (effort) => {
+            const [initial, resumed] = await runResumeScenario(
+                async () => {},
+                {
+                    customAgents: [
+                        {
+                            name: "composed-effort",
+                            prompt: "Reply with exactly SUBAGENT_TURN_COMPLETE.",
+                            model: `gpt-5.4-mini:defaultReasoningEffort=${effort}`,
+                            tools: [],
+                        },
+                    ],
+                },
+                async () => {},
+                "composed-effort",
+                null
+            );
+
+            for (const request of [initial, resumed]) {
+                expect(request.model).toBe("gpt-5.4-mini");
+                expect(request.reasoningEffort).toBe(effort === "high" ? "high" : "medium");
+            }
+        }
+    );
+
+    capiIt(
+        "reconciles an independently declared child effort without changing its model",
+        async () => {
+            const [initial, resumed] = await runResumeScenario(
+                async () => {},
+                {
+                    customAgents: [
+                        {
+                            name: "declared-effort",
+                            prompt: "Reply with exactly SUBAGENT_TURN_COMPLETE.",
+                            model: "gpt-5.4-mini",
+                            reasoningEffort: "max",
+                            tools: [],
+                        },
+                    ],
+                },
+                async () => {},
+                "declared-effort",
+                null
+            );
+
+            for (const request of [initial, resumed]) {
+                expect(request.model).toBe("gpt-5.4-mini");
+                expect(request.reasoningEffort).toBe("medium");
+            }
+        }
+    );
+
     it("preserves the adapted prompt after persisted settings rebuild the child context", async () => {
         const [initial, resumed] = await runResumeScenario(changePersistedSettings);
 
diff --git a/nodejs/test/e2e/telemetry-skills.e2e.test.ts b/nodejs/test/e2e/telemetry-skills.e2e.test.ts
index 92dbc80f64..813f0cefc8 100644
--- a/nodejs/test/e2e/telemetry-skills.e2e.test.ts
+++ b/nodejs/test/e2e/telemetry-skills.e2e.test.ts
@@ -83,34 +83,87 @@ for (const captureContent of [false, true]) {
                 });
                 const root = await createSkill(workDir);
                 await writeFile(join(workDir, "policy.txt"), "OTEL_UNRELATED_POLICY");
+                const permissionKinds: string[] = [];
+                const hookTools: string[] = [];
                 const session = await client.createSession({
                     enableConfigDiscovery: false,
                     skillDirectories: [join(workDir, "skills")],
-                    onPermissionRequest: approveAll,
+                    onPermissionRequest: (request, invocation) => {
+                        permissionKinds.push(request.kind);
+                        return approveAll(request, invocation);
+                    },
+                    hooks: {
+                        onPreToolUse: async (input) => {
+                            hookTools.push(input.toolName);
+                            return {};
+                        },
+                    },
                 });
                 const calls: { id: string; tool: string }[] = [];
+                const completions = new Map<string, boolean>();
+                const sessionErrors: string[] = [];
                 const exits = new Map<string, number>();
+                let startLogs: (() => void) | undefined;
+                const toolsStarted = new Promise<void>((resolve) => {
+                    startLogs = resolve;
+                });
                 session.on("tool.execution_start", (event) => {
                     calls.push({ id: event.data.toolCallId, tool: event.data.toolName });
+                    startLogs?.();
                 });
                 session.on("tool.execution_complete", (event) => {
+                    completions.set(event.data.toolCallId, event.data.success);
                     const exit = event.data.shellExecution?.exitCode;
                     if (exit !== undefined) {
                         exits.set(event.data.toolCallId, exit);
                     }
                 });
-                const response = await session.sendAndWait(
-                    {
-                        prompt:
-                            "Use the skill tool to load review. Then use view to read skills/review/references/policy.txt. " +
-                            "Then use the shell tool in sync mode to run exactly: node './skills/review/scripts/check.cjs'. " +
-                            "Then use view to read policy.txt in the working directory, outside the skill. " +
-                            "Then use view to read skills/review/SKILL.md, and use view to list the skills/review directory. " +
-                            "After all six calls finish, reply with exactly OTEL_SKILL_FLOW_DONE.",
-                    },
-                    90_000
+                session.on("session.error", (event) => {
+                    sessionErrors.push(event.data.message);
+                });
+                // The Rust regression pins the lock interleaving; this covers
+                // native event delivery and permission/hook wiring under traffic.
+                let stopLogs = false;
+                let acknowledgedLogs = 0;
+                const logTraffic = Promise.allSettled(
+                    Array.from({ length: 4 }, async (_, producer) => {
+                        await toolsStarted;
+                        for (let index = 0; index < 64 && !stopLogs; index++) {
+                            await session.rpc.log({
+                                message: `concurrent telemetry event ${producer}:${index}`,
+                                ephemeral: true,
+                            });
+                            acknowledgedLogs++;
+                        }
+                    })
                 );
+                let response: Awaited<ReturnType<typeof session.sendAndWait>>;
+                let logResults: Awaited<typeof logTraffic>;
+                try {
+                    response = await session.sendAndWait(
+                        {
+                            prompt:
+                                "Use the skill tool to load review. Then use view to read skills/review/references/policy.txt. " +
+                                "Then use the shell tool in sync mode to run exactly: node './skills/review/scripts/check.cjs'. " +
+                                "Then use view to read policy.txt in the working directory, outside the skill. " +
+                                "Then use view to read skills/review/SKILL.md, and use view to list the skills/review directory. " +
+                                "After all six calls finish, reply with exactly OTEL_SKILL_FLOW_DONE.",
+                        },
+                        90_000
+                    );
+                } finally {
+                    stopLogs = true;
+                    startLogs?.();
+                    logResults = await logTraffic;
+                }
                 expect(response?.data.content).toContain("OTEL_SKILL_FLOW_DONE");
+                expect(logResults.filter((result) => result.status === "rejected")).toEqual([]);
+                expect(acknowledgedLogs).toBeGreaterThan(0);
+                expect(calls).toHaveLength(6);
+                expect(calls.map((call) => completions.get(call.id))).toEqual(Array(6).fill(true));
+                expect(hookTools.toSorted()).toEqual(calls.map((call) => call.tool).toSorted());
+                expect(permissionKinds.length).toBeGreaterThan(0);
+                expect(sessionErrors).toEqual([]);
                 await session.disconnect();
                 expect(await client.stop()).toEqual([]);
 
@@ -221,7 +274,12 @@ for (const captureContent of [false, true]) {
                     enableConfigDiscovery: false,
                     skillDirectories: [join(workDir, "skills")],
                     onPermissionRequest: approveAll,
+                    // The unknown-skill capture lists only this fixture's custom skill.
+                    includedBuiltinSkills: [],
                 });
+                expect((await session.rpc.skills.list()).skills.map((skill) => skill.name)).toEqual(
+                    ["review"]
+                );
                 const exits = new Map<string, number>();
                 session.on("tool.execution_complete", (event) => {
                     const exit = event.data.shellExecution?.exitCode;
diff --git a/nodejs/test/e2e/telemetry.e2e.test.ts b/nodejs/test/e2e/telemetry.e2e.test.ts
index 49d7e66a26..3c6aecda89 100644
--- a/nodejs/test/e2e/telemetry.e2e.test.ts
+++ b/nodejs/test/e2e/telemetry.e2e.test.ts
@@ -60,7 +60,9 @@ describe("Telemetry export", async () => {
         createClient,
         workDir,
     } = await createSdkTestContext({
+        logLevel: "debug",
         copilotClientOptions: {
+            env: { RUST_LOG: "error,sdk_diagnostics=debug" },
             gitHubToken: DEFAULT_GITHUB_TOKEN,
             // Telemetry is lowered to environment variables the native runtime reads, which
             // the in-process transport cannot carry per-client (the runtime runs in the shared
@@ -184,6 +186,11 @@ describe("Telemetry export", async () => {
             `{"value":"${marker}"}`
         );
         expect(getStringAttribute(toolSpan!, "gen_ai.tool.call.result")).toBe(marker);
+        expect(toolSpan!.attributes).not.toHaveProperty(
+            "github.copilot.tool.parameters.mcp_server_name_hash"
+        );
+        expect(toolSpan!.attributes).not.toHaveProperty("github.copilot.mcp.server.transport");
+        expect(toolSpan!.attributes).not.toHaveProperty("github.copilot.mcp.server.source");
     });
 
     it("should export per request subagent chat spans", { timeout: 90_000 }, async () => {
diff --git a/nodejs/test/e2e/telemetry_http.e2e.test.ts b/nodejs/test/e2e/telemetry_http.e2e.test.ts
new file mode 100644
index 0000000000..7ffc613899
--- /dev/null
+++ b/nodejs/test/e2e/telemetry_http.e2e.test.ts
@@ -0,0 +1,257 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { randomUUID } from "node:crypto";
+import { createServer } from "node:http";
+import type { Server } from "node:http";
+import { join } from "node:path";
+import { describe, it } from "vitest";
+import { z } from "zod";
+import { approveAll, defineTool, RuntimeConnection } from "../../src/index.js";
+import type { CopilotClient } from "../../src/index.js";
+import { createSdkTestContext } from "./harness/sdkTestContext.js";
+
+const attribute = z.object({
+    key: z.string(),
+    value: z.object({ stringValue: z.string().optional() }).passthrough(),
+});
+const tracePayload = z.object({
+    resourceSpans: z.array(
+        z.object({
+            scopeSpans: z.array(
+                z.object({
+                    scope: z.object({ name: z.string() }),
+                    spans: z.array(
+                        z
+                            .object({
+                                traceId: z.string(),
+                                spanId: z.string(),
+                                attributes: z.array(attribute),
+                            })
+                            .passthrough()
+                    ),
+                })
+            ),
+        })
+    ),
+});
+const metricPayload = z.object({
+    resourceMetrics: z.array(
+        z.object({
+            scopeMetrics: z.array(
+                z.object({
+                    scope: z.object({ name: z.string() }),
+                    metrics: z.array(z.object({ name: z.string() }).passthrough()),
+                })
+            ),
+        })
+    ),
+});
+const exportRecord = z.object({ path: z.string(), payload: z.unknown() });
+type ExportRecord = z.infer<typeof exportRecord>;
+
+async function closeServer(server: Server): Promise<void> {
+    server.closeAllConnections();
+    await new Promise<void>((resolve, reject) =>
+        server.close((error) => (error ? reject(error) : resolve()))
+    );
+}
+
+describe("HTTP telemetry export", async () => {
+    // The KDC workflow runs this same public SDK scenario through real Squid
+    // authentication. Ordinary SDK CI uses a test-owned loopback collector.
+    const proxy = process.env.COPILOT_KDC_PROXY_URL;
+    const collectorUrl = process.env.COPILOT_KDC_COLLECTOR_URL;
+    const ca = process.env.COPILOT_KDC_CA_PATH;
+    if (proxy && (!collectorUrl || !ca)) {
+        throw new Error("KDC telemetry E2E requires collector URL and CA path");
+    }
+    const caseId = randomUUID();
+    const harness = await createSdkTestContext({
+        copilotClientOptions: {
+            connection: RuntimeConnection.forStdio(),
+            env: {
+                OTEL_EXPORTER_OTLP_TRACES_ENDPOINT: "",
+                OTEL_EXPORTER_OTLP_METRICS_ENDPOINT: "",
+                OTEL_EXPORTER_OTLP_TRACES_PROTOCOL: "",
+                OTEL_EXPORTER_OTLP_METRICS_PROTOCOL: "",
+                OTEL_EXPORTER_OTLP_CERTIFICATE: "",
+                OTEL_EXPORTER_OTLP_TRACES_CERTIFICATE: "",
+                OTEL_EXPORTER_OTLP_METRICS_CERTIFICATE: "",
+                OTEL_EXPORTER_OTLP_CLIENT_CERTIFICATE: "",
+                OTEL_EXPORTER_OTLP_TRACES_CLIENT_CERTIFICATE: "",
+                OTEL_EXPORTER_OTLP_METRICS_CLIENT_CERTIFICATE: "",
+                OTEL_EXPORTER_OTLP_CLIENT_KEY: "",
+                OTEL_EXPORTER_OTLP_TRACES_CLIENT_KEY: "",
+                OTEL_EXPORTER_OTLP_METRICS_CLIENT_KEY: "",
+                OTEL_EXPORTER_OTLP_TIMEOUT: "10000",
+                OTEL_EXPORTER_OTLP_TRACES_TIMEOUT: "",
+                OTEL_EXPORTER_OTLP_METRICS_TIMEOUT: "",
+                OTEL_EXPORTER_OTLP_TRACES_HEADERS: `x-test-case=${caseId}`,
+                OTEL_EXPORTER_OTLP_METRICS_HEADERS: `x-test-case=${caseId}`,
+                OTEL_EXPORTER_OTLP_HEADERS: `x-test-case=${caseId}`,
+                NO_PROXY: "127.0.0.1,localhost,::1",
+                no_proxy: "127.0.0.1,localhost,::1",
+                ...(proxy
+                    ? {
+                          HTTP_PROXY: proxy,
+                          http_proxy: proxy,
+                          HTTPS_PROXY: proxy,
+                          https_proxy: proxy,
+                          NODE_EXTRA_CA_CERTS: ca,
+                          SSL_CERT_FILE: ca,
+                          CURL_CA_BUNDLE: ca,
+                          COPILOT_PROXY_KERBEROS_SPN: "HTTP/proxy.example.test",
+                      }
+                    : {}),
+            },
+        },
+    });
+
+    it(
+        "exports completed SDK turns as OTLP traces and metrics",
+        { timeout: 90_000 },
+        async ({ expect, onTestFinished }) => {
+            const received: ExportRecord[] = [];
+            const failures: Error[] = [];
+            let client: CopilotClient | undefined;
+            let startingServer: Promise<Server> | undefined;
+            onTestFinished(async () => {
+                try {
+                    if (client) {
+                        expect(await client.stop()).toEqual([]);
+                    }
+                } finally {
+                    const [startup] = await Promise.allSettled(
+                        startingServer ? [startingServer] : []
+                    );
+                    if (startup?.status === "fulfilled") {
+                        await closeServer(startup.value);
+                    }
+                }
+            });
+            let endpoint = "https://kerberos-proxy-test.invalid:8443";
+            if (!proxy) {
+                const server = createServer((request, response) => {
+                    void (async () => {
+                        expect(request.headers["x-test-case"]).toBe(caseId);
+                        const chunks: Buffer[] = [];
+                        for await (const chunk of request) {
+                            chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
+                        }
+                        received.push({
+                            path: request.url ?? "",
+                            payload: JSON.parse(Buffer.concat(chunks).toString("utf8")),
+                        });
+                        response.setHeader("content-type", "application/json");
+                        response.end("{}");
+                    })().catch((error: Error) => {
+                        failures.push(error);
+                        response.writeHead(500).end();
+                    });
+                });
+                startingServer = new Promise<Server>((resolve, reject) => {
+                    server.once("error", reject);
+                    server.listen(0, "127.0.0.1", () => resolve(server));
+                });
+                await startingServer;
+                const address = server.address();
+                if (!address || typeof address === "string") {
+                    throw new Error("OTLP collector did not bind a TCP address");
+                }
+                endpoint = `http://127.0.0.1:${address.port}`;
+            }
+
+            // Reuse the existing telemetry turn capture, unchanged: the transport
+            // test does not need another model sample or handcrafted response.
+            await harness.openAiEndpoint.updateConfig({
+                filePath: join(
+                    import.meta.dirname,
+                    "..",
+                    "..",
+                    "..",
+                    "test",
+                    "snapshots",
+                    "telemetry",
+                    "should_export_file_telemetry_for_sdk_interactions.yaml"
+                ),
+                workDir: harness.workDir,
+            });
+            const sourceName = "ts-sdk-telemetry-e2e";
+            client = harness.createClient({
+                telemetry: {
+                    exporterType: "otlp-http",
+                    otlpEndpoint: endpoint,
+                    otlpProtocol: "http/json",
+                    sourceName,
+                    captureContent: true,
+                },
+            });
+            const session = await client.createSession({
+                onPermissionRequest: approveAll,
+                tools: [
+                    defineTool("echo_telemetry_marker", {
+                        description: "Echoes a marker string for telemetry validation.",
+                        parameters: z.object({ value: z.string() }),
+                        handler: ({ value }) => value,
+                    }),
+                ],
+            });
+            const assistant = await session.sendAndWait(
+                {
+                    prompt: "Use the echo_telemetry_marker tool with value 'copilot-sdk-telemetry-e2e', then respond with TELEMETRY_E2E_DONE.",
+                },
+                90_000
+            );
+            expect(assistant?.data.content).toContain("TELEMETRY_E2E_DONE");
+            await session.disconnect();
+            expect(await client.stop()).toEqual([]);
+
+            if (proxy) {
+                const response = await fetch(`${collectorUrl}/exports/${caseId}`);
+                expect(response.ok).toBe(true);
+                received.push(...z.array(exportRecord).parse(await response.json()));
+            }
+            expect(failures).toEqual([]);
+            const traces = received
+                .filter(({ path }) => path === "/v1/traces")
+                .flatMap(({ payload }) => tracePayload.parse(payload).resourceSpans)
+                .flatMap(({ scopeSpans }) => scopeSpans);
+            const metrics = received
+                .filter(({ path }) => path === "/v1/metrics")
+                .flatMap(({ payload }) => metricPayload.parse(payload).resourceMetrics)
+                .flatMap(({ scopeMetrics }) => scopeMetrics);
+            expect(traces.length).toBeGreaterThan(0);
+            expect(metrics.length).toBeGreaterThan(0);
+            expect(traces.every(({ scope }) => scope.name === sourceName)).toBe(true);
+            expect(metrics.every(({ scope }) => scope.name === sourceName)).toBe(true);
+            const spans = traces.flatMap(({ spans }) => spans);
+            expect(
+                spans.some(({ attributes }) =>
+                    attributes.some(
+                        ({ key, value }) =>
+                            key === "gen_ai.conversation.id" &&
+                            value.stringValue === session.sessionId
+                    )
+                )
+            ).toBe(true);
+            expect(
+                spans.some(({ attributes }) =>
+                    attributes.some(
+                        ({ key, value }) =>
+                            key === "gen_ai.output.messages" &&
+                            value.stringValue?.includes("TELEMETRY_E2E_DONE")
+                    )
+                )
+            ).toBe(true);
+            expect(
+                spans.every(
+                    ({ traceId, spanId }) =>
+                        /^[0-9a-f]{32}$/i.test(traceId) && /^[0-9a-f]{16}$/i.test(spanId)
+                )
+            ).toBe(true);
+            expect(metrics.flatMap(({ metrics }) => metrics).length).toBeGreaterThan(0);
+        }
+    );
+});
diff --git a/nodejs/test/e2e/telemetry_preparation.e2e.test.ts b/nodejs/test/e2e/telemetry_preparation.e2e.test.ts
new file mode 100644
index 0000000000..8c8f79c5a1
--- /dev/null
+++ b/nodejs/test/e2e/telemetry_preparation.e2e.test.ts
@@ -0,0 +1,170 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { readFile, writeFile } from "node:fs/promises";
+import { join } from "node:path";
+import { describe, it, onTestFinished } from "vitest";
+import { z } from "zod";
+import {
+    type CopilotSession,
+    defineTool,
+    type PermissionRequestResult,
+    RuntimeConnection,
+    type SessionEvent,
+} from "../../src/index.js";
+import {
+    createSdkTestContext,
+    DEFAULT_GITHUB_TOKEN,
+    getLegacyCliPathForTests,
+} from "./harness/sdkTestContext.js";
+
+async function telemetryWarnings(session: CopilotSession) {
+    return (await session.getEvents()).filter(
+        (event) => event.type === "session.warning" && event.data.warningType === "telemetry"
+    );
+}
+
+describe.each(["native", "legacy"] as const)("Telemetry preparation (%s)", async (host) => {
+    const policyFile = "managed-telemetry-policy.json";
+    const telemetryFile = "session-telemetry.jsonl";
+    const harness = await createSdkTestContext({
+        copilotClientOptions: {
+            connection: RuntimeConnection.forStdio(),
+            env: {
+                COPILOT_E2E_TEST_HOOKS: "1",
+                COPILOT_TEST_MANAGED_SETTINGS_FILE_PATH: policyFile,
+                COPILOT_MANAGED_SETTINGS_CACHE: "false",
+            },
+        },
+    });
+
+    it("keeps create and resume usable after exporter failure", async ({ expect }) => {
+        await writeFile(
+            join(harness.workDir, policyFile),
+            JSON.stringify({
+                telemetry: {
+                    enabled: true,
+                    endpoint: "ftp://collector.example",
+                    headers: { "x-routing-key": "managed-value" },
+                },
+            })
+        );
+        const options = {
+            gitHubToken: DEFAULT_GITHUB_TOKEN,
+            connection: RuntimeConnection.forStdio({
+                path:
+                    host === "legacy"
+                        ? await getLegacyCliPathForTests()
+                        : process.env.COPILOT_CLI_PATH,
+            }),
+            telemetry: {
+                exporterType: "file" as const,
+                filePath: telemetryFile,
+                sourceName: "ts-sdk-telemetry-e2e",
+                captureContent: true,
+            },
+        };
+        const client = harness.createClient(options);
+        onTestFinished(() => client.stop());
+        const receivedWarnings: SessionEvent[] = [];
+        const sessionOptions = {
+            enableManagedSettings: true,
+            onEvent: (event: SessionEvent) => {
+                if (event.type === "session.warning" && event.data.warningType === "telemetry") {
+                    receivedWarnings.push(event);
+                }
+            },
+            onPermissionRequest: (): PermissionRequestResult => ({ kind: "approve-once" }),
+            tools: [
+                defineTool("echo_telemetry_marker", {
+                    description: "Echoes a marker string for telemetry validation.",
+                    parameters: z.object({ value: z.string() }),
+                    handler: ({ value }) => value,
+                }),
+            ],
+        };
+        const session = await client.createSession(sessionOptions);
+        const failedSessionId = session.sessionId;
+        const initialWarnings = await telemetryWarnings(session);
+        expect(initialWarnings).toMatchObject([
+            {
+                data: {
+                    warningType: "telemetry",
+                    message:
+                        "OpenTelemetry could not be initialized and is disabled for this session. You can continue using the session.",
+                },
+            },
+        ]);
+        const replay = {
+            filePath: join(
+                import.meta.dirname,
+                "..",
+                "..",
+                "..",
+                "test",
+                "snapshots",
+                "telemetry",
+                "should_export_file_telemetry_for_sdk_interactions.yaml"
+            ),
+            workDir: harness.workDir,
+        };
+        const prompt =
+            "Use the echo_telemetry_marker tool with value 'copilot-sdk-telemetry-e2e', then respond with TELEMETRY_E2E_DONE.";
+        await harness.openAiEndpoint.updateConfig(replay);
+        const assistant = await session.sendAndWait({ prompt }, 90_000);
+        expect(assistant?.data.content).toContain("TELEMETRY_E2E_DONE");
+        expect(receivedWarnings.map((event) => event.id)).toEqual(
+            initialWarnings.map((event) => event.id)
+        );
+        await client.rpc.sessions.save({ sessionId: failedSessionId });
+        const resident = await client.resumeSession(failedSessionId, sessionOptions);
+        expect(resident.sessionId).toBe(failedSessionId);
+        await expect(resident.rpc.model.getCurrent()).resolves.toHaveProperty("modelId");
+        expect(await telemetryWarnings(resident)).toHaveLength(1);
+        await resident.disconnect();
+        await session.disconnect();
+        expect(await client.stop()).toEqual([]);
+
+        const resumedClient = harness.createClient(options);
+        onTestFinished(() => resumedClient.stop());
+        const cold = await resumedClient.resumeSession(failedSessionId, sessionOptions);
+        expect(cold.sessionId).toBe(failedSessionId);
+        await expect(cold.rpc.model.getCurrent()).resolves.toHaveProperty("modelId");
+        expect(await telemetryWarnings(cold)).toHaveLength(1);
+        await cold.disconnect();
+
+        await writeFile(join(harness.workDir, policyFile), "{}");
+        let healthyClient = resumedClient;
+        if (host === "legacy") {
+            // The legacy host retains its startup device policy until the next process.
+            expect(await resumedClient.stop()).toEqual([]);
+            healthyClient = harness.createClient(options);
+            onTestFinished(() => healthyClient.stop());
+        }
+        const healthy = await healthyClient.createSession(sessionOptions);
+        await harness.openAiEndpoint.updateConfig(replay);
+        const healthyAssistant = await healthy.sendAndWait({ prompt }, 90_000);
+        expect(healthyAssistant?.data.content).toContain("TELEMETRY_E2E_DONE");
+        expect(await telemetryWarnings(healthy)).toEqual([]);
+        await healthy.disconnect();
+        expect(await healthyClient.stop()).toEqual([]);
+
+        const entries: Array<{ attributes?: Record<string, unknown> }> = (
+            await readFile(join(harness.workDir, telemetryFile), "utf8")
+        )
+            .split(/\r?\n/)
+            .filter(Boolean)
+            .map((line) => JSON.parse(line));
+        expect(
+            entries.some(
+                (entry) => entry.attributes?.["gen_ai.conversation.id"] === healthy.sessionId
+            )
+        ).toBe(true);
+        expect(
+            entries.some(
+                (entry) => entry.attributes?.["gen_ai.conversation.id"] === failedSessionId
+            )
+        ).toBe(false);
+    });
+});
diff --git a/nodejs/test/e2e/tools_anthropic_updates.e2e.test.ts b/nodejs/test/e2e/tools_anthropic_updates.e2e.test.ts
index 721b432ae1..71985070d7 100644
--- a/nodejs/test/e2e/tools_anthropic_updates.e2e.test.ts
+++ b/nodejs/test/e2e/tools_anthropic_updates.e2e.test.ts
@@ -2,15 +2,19 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *--------------------------------------------------------------------------------------------*/
 
+import { writeFile } from "node:fs/promises";
+import { join } from "node:path";
 import { describe, expect, it } from "vitest";
 import {
     approveAll,
     CopilotRequestHandler,
     defineTool,
     type CopilotRequestContext,
+    type SessionConfig,
 } from "../../src/index.js";
 import { createSdkTestContext } from "./harness/sdkTestContext.js";
 import { waitForCondition } from "./harness/sdkTestHelper.js";
+import { mcpTestServerConfig } from "./harness/mcpTestServer.js";
 
 interface AnthropicRequest {
     system: unknown;
@@ -110,7 +114,11 @@ class AnthropicToolUpdateHandler extends CopilotRequestHandler {
     readonly requests: Array<{ body: AnthropicRequest; beta: string | null }> = [];
 
     constructor(
-        private readonly rejectPositionedUpdate: false | "before-output" | "after-output" = false
+        private readonly rejectPositionedUpdate: false | "before-output" | "after-output" = false,
+        private readonly addedTool: { name: string; input: Record<string, unknown> } = {
+            name: "sdk_epoch_added",
+            input: {},
+        }
     ) {
         super();
     }
@@ -119,7 +127,28 @@ class AnthropicToolUpdateHandler extends CopilotRequestHandler {
         request: Request,
         ctx: CopilotRequestContext
     ): Promise<Response> {
-        if (new URL(request.url).hostname !== "api.anthropic.com") {
+        const url = new URL(request.url);
+        if (url.pathname === "/models") {
+            return Response.json({
+                data: [
+                    {
+                        id: "claude-opus-5.5",
+                        name: "Claude Opus 5.5",
+                        vendor: "Anthropic",
+                        model_picker_enabled: true,
+                        supported_endpoints: ["/v1/messages"],
+                        capabilities: {
+                            type: "chat",
+                            family: "claude-opus-5.5",
+                            tokenizer: "o200k_base",
+                            limits: { max_context_window_tokens: 200000, max_output_tokens: 32000 },
+                            supports: { streaming: true, tool_calls: true },
+                        },
+                    },
+                ],
+            });
+        }
+        if (!url.pathname.endsWith("/messages")) {
             return super.sendRequest(request, ctx);
         }
         const body = (await request.json()) as AnthropicRequest;
@@ -133,6 +162,27 @@ class AnthropicToolUpdateHandler extends CopilotRequestHandler {
         }
         this.requests.push({ body, beta: request.headers.get("anthropic-beta") });
 
+        if (
+            body.messages.some(
+                (message) =>
+                    message.role !== "system" &&
+                    Array.isArray(message.content) &&
+                    message.content.some((block: { type?: string }) =>
+                        ["tool_addition", "tool_removal"].includes(block.type ?? "")
+                    )
+            )
+        ) {
+            return Response.json(
+                {
+                    error: {
+                        type: "invalid_request_error",
+                        message: "tool_addition/tool_removal require role: system",
+                    },
+                },
+                { status: 400 }
+            );
+        }
+
         if (serialized.includes("SDK_ANTHROPIC_FOLLOW_UP")) {
             return streamResponse({ type: "text", text: "SDK_ANTHROPIC_LEGACY_OK" }, "end_turn");
         }
@@ -167,7 +217,7 @@ class AnthropicToolUpdateHandler extends CopilotRequestHandler {
                 );
             }
             return streamResponse(
-                { type: "tool_use", id: "toolu_sdk_added", name: "sdk_epoch_added", input: {} },
+                { type: "tool_use", id: "toolu_sdk_added", ...this.addedTool },
                 "tool_use"
             );
         }
@@ -181,6 +231,426 @@ describe("SDK tool updates on direct Anthropic Messages", async () => {
         copilotClientOptions: { requestHandler: handler },
     });
 
+    describe("MCP tool updates on direct Anthropic Messages", async () => {
+        const toolName = "a_server-get_env";
+        const handler = new AnthropicToolUpdateHandler(false, {
+            name: toolName,
+            input: { name: "CACHE_TEST_RESULT" },
+        });
+        const { copilotClient: client, workDir } = await createSdkTestContext({
+            copilotClientOptions: { requestHandler: handler },
+        });
+
+        const routes: Array<{ name: string; config: Partial<SessionConfig> }> = [
+            {
+                name: "direct BYOK",
+                config: {
+                    provider: {
+                        type: "anthropic",
+                        baseUrl: "https://api.anthropic.com",
+                        apiKey: "synthetic-provider-key",
+                        modelId: "claude-opus-5.5",
+                        wireModel: "claude-opus-5.5",
+                    },
+                },
+            },
+            {
+                name: "compatible BYOK proxy",
+                config: {
+                    provider: {
+                        type: "anthropic",
+                        baseUrl: "https://messages.example.test",
+                        apiKey: "synthetic-provider-key",
+                        modelId: "claude-opus-5.5",
+                        wireModel: "claude-opus-5.5",
+                    },
+                },
+            },
+            { name: "CAPI", config: {} },
+        ];
+        for (const route of routes) {
+            it(`keeps the serialized prefix on ${route.name} when enabling an MCP server adds tools before existing ones`, async () => {
+                const config = mcpTestServerConfig("SDK_ADDED_TOOL_RESULT");
+                const beforeRequests = handler.requests.length;
+                const session = await client.createSession({
+                    model: "claude-opus-5.5",
+                    toolSearch: { enabled: false },
+                    onPermissionRequest: approveAll,
+                    ...route.config,
+                    mcpServers: { z_server: config, a_server: config },
+                    disabledMcpServers: ["a_server"],
+                });
+                try {
+                    await session.rpc.tools.initializeAndValidate();
+                    expect(
+                        (await session.rpc.tools.getCurrentMetadata()).tools.map(
+                            (tool) => tool.name
+                        )
+                    ).toContain("z_server-get_env");
+                    expect(
+                        (await session.rpc.tools.getCurrentMetadata()).tools.map(
+                            (tool) => tool.name
+                        )
+                    ).not.toContain(toolName);
+                    const first = await session.sendAndWait({ prompt: "SDK_ANTHROPIC_FIRST" });
+                    expect(first?.data.content).toContain("SDK_ANTHROPIC_FIRST_OK");
+
+                    await session.rpc.mcp.setEnvValueMode({ mode: "direct" });
+                    await session.rpc.mcp.enable({ serverName: "a_server" });
+                    await session.rpc.tools.initializeAndValidate();
+                    expect(
+                        (await session.rpc.tools.getCurrentMetadata()).tools.map(
+                            (tool) => tool.name
+                        )
+                    ).toContain(toolName);
+                    const second = await session.sendAndWait({
+                        prompt: `SDK_ANTHROPIC_AFTER: call ${toolName}.`,
+                    });
+                    expect(second?.data.content).toContain("SDK_ANTHROPIC_TOOL_OK");
+
+                    const requests = handler.requests.slice(beforeRequests);
+                    expect(requests).toHaveLength(3);
+                    const [before, update, afterTool] = requests;
+                    expect(before.body.tools).toEqual(
+                        expect.arrayContaining([
+                            expect.objectContaining({ name: "z_server-get_env" }),
+                        ])
+                    );
+                    expect(JSON.stringify(before.body.tools)).not.toContain(`"name":"${toolName}"`);
+                    for (const request of [update, afterTool]) {
+                        expect(JSON.stringify(request.body.system)).toBe(
+                            JSON.stringify(before.body.system)
+                        );
+                        expect(JSON.stringify(request.body.tools)).toBe(
+                            JSON.stringify(before.body.tools)
+                        );
+                    }
+                    expect(update.body.messages).toContainEqual(
+                        expect.objectContaining({
+                            role: "system",
+                            content: [
+                                expect.objectContaining({
+                                    type: "tool_addition",
+                                    tool: expect.objectContaining({
+                                        type: "tool_definition",
+                                        definition: expect.objectContaining({ name: toolName }),
+                                    }),
+                                }),
+                            ],
+                        })
+                    );
+                    expect(update.beta).toContain("inline-tools-2026-09-15");
+                    expect(JSON.stringify(afterTool.body.messages)).toContain(
+                        "SDK_ADDED_TOOL_RESULT"
+                    );
+                    expect(
+                        (await session.rpc.tools.getCurrentMetadata()).tools.map(
+                            (tool) => tool.name
+                        )
+                    ).toEqual(expect.arrayContaining(["a_server-get_env", "z_server-get_env"]));
+                } finally {
+                    await session.disconnect();
+                }
+            });
+        }
+
+        describe("CAPI Messages compatibility", async () => {
+            const handler = new AnthropicToolUpdateHandler();
+            const { copilotClient: client } = await createSdkTestContext({
+                copilotClientOptions: { requestHandler: handler },
+            });
+            it("preserves the prefix across CAPI reordering, removal and restoration without a rejected attempt", async () => {
+                let addedCalls = 0;
+                const original = {
+                    name: "sdk_epoch_original",
+                    description: "Original SDK tool",
+                    parameters: { type: "object", properties: {} },
+                    defer: "never",
+                } as const;
+                const added = {
+                    ...original,
+                    name: "sdk_epoch_added",
+                    description: "Added SDK tool",
+                };
+                const session = await client.createSession({
+                    model: "claude-opus-5.5",
+                    toolSearch: { enabled: false },
+                    onPermissionRequest: approveAll,
+                    availableTools: [original.name, added.name],
+                    tools: [
+                        defineTool(original.name, {
+                            description: original.description,
+                            handler: () => "original",
+                        }),
+                        defineTool(added.name, {
+                            description: added.description,
+                            handler: () => {
+                                addedCalls++;
+                                return "SDK_ADDED_TOOL_RESULT";
+                            },
+                        }),
+                    ],
+                });
+                try {
+                    await session.rpc.tools.initializeAndValidate();
+                    await session.rpc.tools.set({ tools: [original, added] });
+                    expect(
+                        (await session.sendAndWait({ prompt: "SDK_ANTHROPIC_FIRST" }))?.data.content
+                    ).toContain("SDK_ANTHROPIC_FIRST_OK");
+                    await session.rpc.tools.set({ tools: [added, original] });
+                    expect(
+                        (await session.sendAndWait({ prompt: "SDK_ANTHROPIC_FIRST_REORDERED" }))
+                            ?.data.content
+                    ).toContain("SDK_ANTHROPIC_FIRST_OK");
+                    await session.rpc.tools.set({ tools: [original] });
+                    expect(
+                        (await session.sendAndWait({ prompt: "SDK_ANTHROPIC_FIRST_REMOVED" }))?.data
+                            .content
+                    ).toContain("SDK_ANTHROPIC_FIRST_OK");
+                    await session.rpc.tools.set({ tools: [added, original] });
+                    expect(
+                        (
+                            await session.sendAndWait({
+                                prompt: "SDK_ANTHROPIC_AFTER: call sdk_epoch_added.",
+                            })
+                        )?.data.content
+                    ).toContain("SDK_ANTHROPIC_TOOL_OK");
+                    expect(addedCalls).toBe(1);
+                    expect(handler.requests).toHaveLength(5);
+                    const [before, reordered, removed, restored, afterTool] = handler.requests;
+                    expect(JSON.stringify(reordered.body.tools)).toBe(
+                        JSON.stringify(before.body.tools)
+                    );
+                    expect(removed.body.messages).toContainEqual({
+                        role: "system",
+                        content: [
+                            {
+                                type: "tool_removal",
+                                tool: { type: "tool_reference", name: added.name },
+                            },
+                        ],
+                    });
+                    expect(removed.beta).toContain("mid-conversation-tool-changes-2026-07-01");
+                    expect(restored.body.messages).toContainEqual(
+                        expect.objectContaining({
+                            role: "system",
+                            content: [
+                                expect.objectContaining({
+                                    type: "tool_addition",
+                                    tool: expect.objectContaining({
+                                        definition: expect.objectContaining({ name: added.name }),
+                                    }),
+                                }),
+                            ],
+                        })
+                    );
+                    expect(restored.beta).toContain("inline-tools-2026-09-15");
+                    expect(JSON.stringify(afterTool.body.messages)).toContain(
+                        "SDK_ADDED_TOOL_RESULT"
+                    );
+                    for (const request of handler.requests) {
+                        expect(JSON.stringify(request.body.system)).toBe(
+                            JSON.stringify(before.body.system)
+                        );
+                        expect(JSON.stringify(request.body.tools)).toBe(
+                            JSON.stringify(before.body.tools)
+                        );
+                    }
+                } finally {
+                    await session.disconnect();
+                }
+            });
+        });
+
+        it.each(routes)(
+            "keeps the prefix across MCP removal and restoration on $name and executes the restored tool",
+            async (route) => {
+                const config = mcpTestServerConfig("SDK_ADDED_TOOL_RESULT");
+                const beforeRequests = handler.requests.length;
+                const session = await client.createSession({
+                    model: "claude-opus-5.5",
+                    toolSearch: { enabled: false },
+                    onPermissionRequest: approveAll,
+                    availableTools: [toolName, "z_server-get_env"],
+                    ...route.config,
+                    mcpServers: { a_server: config, z_server: config },
+                });
+                try {
+                    await session.rpc.mcp.setEnvValueMode({ mode: "direct" });
+                    await session.rpc.tools.initializeAndValidate();
+                    expect(
+                        (await session.rpc.tools.getCurrentMetadata()).tools.map(
+                            (tool) => tool.name
+                        )
+                    ).toEqual(expect.arrayContaining([toolName, "z_server-get_env"]));
+                    expect(
+                        (await session.sendAndWait({ prompt: "SDK_ANTHROPIC_FIRST" }))?.data.content
+                    ).toContain("SDK_ANTHROPIC_FIRST_OK");
+
+                    await session.rpc.mcp.disable({ serverName: "a_server" });
+                    await session.rpc.tools.initializeAndValidate();
+                    // Tool metadata includes the previous request; the host reports live availability.
+                    const disabled = await session.rpc.mcp.list();
+                    expect(disabled.host?.disabledServers).toContain("a_server");
+                    expect(disabled.host?.disabledServers).not.toContain("z_server");
+                    expect(disabled.servers).toContainEqual(
+                        expect.objectContaining({ name: "a_server", status: "disabled" })
+                    );
+                    expect(
+                        (await session.sendAndWait({ prompt: "SDK_ANTHROPIC_FIRST_REMOVED" }))?.data
+                            .content
+                    ).toContain("SDK_ANTHROPIC_FIRST_OK");
+
+                    await session.rpc.mcp.enable({ serverName: "a_server" });
+                    await session.rpc.tools.initializeAndValidate();
+                    expect(
+                        (await session.rpc.tools.getCurrentMetadata()).tools.map(
+                            (tool) => tool.name
+                        )
+                    ).toContain(toolName);
+                    expect(
+                        (
+                            await session.sendAndWait({
+                                prompt: `SDK_ANTHROPIC_AFTER: call ${toolName}.`,
+                            })
+                        )?.data.content
+                    ).toContain("SDK_ANTHROPIC_TOOL_OK");
+
+                    const requests = handler.requests.slice(beforeRequests);
+                    expect(requests).toHaveLength(4);
+                    const [before, removed, restored, afterTool] = requests;
+                    expect(before.body.tools).toEqual(
+                        expect.arrayContaining([expect.objectContaining({ name: toolName })])
+                    );
+                    for (const request of [removed, restored, afterTool]) {
+                        expect(JSON.stringify(request.body.system)).toBe(
+                            JSON.stringify(before.body.system)
+                        );
+                        expect(JSON.stringify(request.body.tools)).toBe(
+                            JSON.stringify(before.body.tools)
+                        );
+                    }
+                    const blocks = (request: AnthropicRequest) =>
+                        request.messages.flatMap((message) =>
+                            Array.isArray(message.content) ? message.content : []
+                        );
+                    expect(blocks(removed.body)).toContainEqual({
+                        type: "tool_removal",
+                        tool: { type: "tool_reference", name: toolName },
+                    });
+                    expect(removed.beta).toContain("mid-conversation-tool-changes-2026-07-01");
+                    expect(restored.beta).toContain("inline-tools-2026-09-15");
+                    expect(
+                        blocks(restored.body)
+                            .filter((block) =>
+                                ["tool_removal", "tool_addition"].includes(block.type)
+                            )
+                            .map((block) => block.type)
+                    ).toEqual(["tool_removal", "tool_addition"]);
+                    expect(blocks(restored.body)).toContainEqual(
+                        expect.objectContaining({
+                            type: "tool_addition",
+                            tool: expect.objectContaining({
+                                definition: expect.objectContaining({ name: toolName }),
+                            }),
+                        })
+                    );
+                    expect(JSON.stringify(afterTool.body.messages)).toContain(
+                        "SDK_ADDED_TOOL_RESULT"
+                    );
+                } finally {
+                    await session.disconnect();
+                }
+            }
+        );
+
+        it.each(routes)(
+            "replaces a refreshed MCP definition inline on $name and executes the restarted server",
+            async (route) => {
+                const descriptionFile = join(workDir, `tool-description-${route.name}.txt`);
+                await writeFile(descriptionFile, "MCP_ORIGINAL_DESCRIPTION");
+                const beforeRequests = handler.requests.length;
+                const session = await client.createSession({
+                    model: "claude-opus-5.5",
+                    toolSearch: { enabled: false },
+                    onPermissionRequest: approveAll,
+                    ...route.config,
+                    mcpServers: {
+                        a_server: mcpTestServerConfig("SDK_ADDED_TOOL_RESULT", descriptionFile),
+                    },
+                });
+                try {
+                    await session.rpc.mcp.setEnvValueMode({ mode: "direct" });
+                    await session.rpc.tools.initializeAndValidate();
+                    expect(
+                        (await session.rpc.tools.getCurrentMetadata()).tools.find(
+                            (tool) => tool.name === toolName
+                        )?.description
+                    ).toContain("MCP_ORIGINAL_DESCRIPTION");
+                    expect(
+                        (await session.sendAndWait({ prompt: "SDK_ANTHROPIC_FIRST" }))?.data.content
+                    ).toContain("SDK_ANTHROPIC_FIRST_OK");
+
+                    await writeFile(descriptionFile, "MCP_REPLACEMENT_DESCRIPTION");
+                    await session.rpc.mcp.restartServer({ serverName: "a_server" });
+                    await session.rpc.tools.initializeAndValidate();
+                    expect(
+                        (await session.rpc.tools.getCurrentMetadata()).tools.find(
+                            (tool) => tool.name === toolName
+                        )?.description
+                    ).toContain("MCP_REPLACEMENT_DESCRIPTION");
+                    expect(
+                        (
+                            await session.sendAndWait({
+                                prompt: `SDK_ANTHROPIC_AFTER: call ${toolName}.`,
+                            })
+                        )?.data.content
+                    ).toContain("SDK_ANTHROPIC_TOOL_OK");
+
+                    const requests = handler.requests.slice(beforeRequests);
+                    expect(requests).toHaveLength(3);
+                    const [before, update, afterTool] = requests;
+                    expect(before.body.tools).toEqual(
+                        expect.arrayContaining([
+                            expect.objectContaining({
+                                name: toolName,
+                                description: expect.stringContaining("MCP_ORIGINAL_DESCRIPTION"),
+                            }),
+                        ])
+                    );
+                    for (const request of [update, afterTool]) {
+                        expect(JSON.stringify(request.body.system)).toBe(
+                            JSON.stringify(before.body.system)
+                        );
+                        expect(JSON.stringify(request.body.tools)).toBe(
+                            JSON.stringify(before.body.tools)
+                        );
+                    }
+                    const additions = update.body.messages
+                        .flatMap((message) =>
+                            Array.isArray(message.content) ? message.content : []
+                        )
+                        .filter((block) => block.type === "tool_addition");
+                    expect(additions).toHaveLength(1);
+                    expect(additions[0]).toMatchObject({
+                        tool: {
+                            definition: {
+                                name: toolName,
+                                description: expect.stringContaining("MCP_REPLACEMENT_DESCRIPTION"),
+                            },
+                        },
+                    });
+                    expect(update.beta).toContain("inline-tools-2026-09-15");
+                    expect(JSON.stringify(afterTool.body.messages)).toContain(
+                        "SDK_ADDED_TOOL_RESULT"
+                    );
+                } finally {
+                    await session.disconnect();
+                }
+            }
+        );
+    });
+
     it("keeps the top-level prefix and executes a newly added inline tool", async () => {
         let addedToolCalls = 0;
         const session = await client.createSession({
@@ -263,149 +733,169 @@ describe("SDK tool updates on direct Anthropic Messages", async () => {
     });
 });
 
-describe("SDK tool updates on direct Anthropic Messages", async () => {
-    const rejectingHandler = new AnthropicToolUpdateHandler("before-output");
-    const { copilotClient: retryClient } = await createSdkTestContext({
-        copilotClientOptions: { requestHandler: rejectingHandler },
-    });
-
-    it("retries a rejected inline update once with the full current tools", async () => {
-        const original = {
-            name: "sdk_epoch_original",
-            description: "Original SDK tool",
-            parameters: { type: "object", properties: {} },
-            defer: "never",
-        } as const;
-        const added = {
-            name: "sdk_epoch_added",
-            description: "Added SDK tool",
-            parameters: { type: "object", properties: {} },
-            defer: "never",
-        } as const;
-        const session = await retryClient.createSession({
-            model: "claude-opus-5.5",
-            toolSearch: { enabled: false },
-            onPermissionRequest: approveAll,
-            provider: {
-                type: "anthropic",
-                baseUrl: "https://api.anthropic.com",
-                apiKey: "synthetic-provider-key",
-                modelId: "claude-opus-5.5",
-                wireModel: "claude-opus-5.5",
-            },
-            tools: [
-                defineTool(original.name, {
-                    description: original.description,
-                    handler: () => "original",
-                }),
-                defineTool(added.name, { description: added.description, handler: () => "added" }),
-            ],
+describe.each(["BYOK", "CAPI"])(
+    "SDK tool update recovery on %s Anthropic Messages",
+    async (route) => {
+        const rejectingHandler = new AnthropicToolUpdateHandler("before-output");
+        const { copilotClient: retryClient } = await createSdkTestContext({
+            copilotClientOptions: { requestHandler: rejectingHandler },
         });
-        try {
-            await session.rpc.tools.initializeAndValidate();
-            await session.rpc.tools.set({ tools: [original] });
-            const first = await session.sendAndWait({ prompt: "SDK_ANTHROPIC_FIRST" });
-            expect(first?.data.content).toContain("SDK_ANTHROPIC_FIRST_OK");
 
-            await session.rpc.tools.set({ tools: [original, added] });
-            const recovered = await session.sendAndWait({
-                prompt: "SDK_ANTHROPIC_AFTER: add a tool.",
+        it("retries a rejected inline update once with the full current tools", async () => {
+            const original = {
+                name: "sdk_epoch_original",
+                description: "Original SDK tool",
+                parameters: { type: "object", properties: {} },
+                defer: "never",
+            } as const;
+            const added = {
+                name: "sdk_epoch_added",
+                description: "Added SDK tool",
+                parameters: { type: "object", properties: {} },
+                defer: "never",
+            } as const;
+            const session = await retryClient.createSession({
+                model: "claude-opus-5.5",
+                toolSearch: { enabled: false },
+                onPermissionRequest: approveAll,
+                provider:
+                    route === "BYOK"
+                        ? {
+                              type: "anthropic",
+                              baseUrl: "https://api.anthropic.com",
+                              apiKey: "synthetic-provider-key",
+                              modelId: "claude-opus-5.5",
+                              wireModel: "claude-opus-5.5",
+                          }
+                        : undefined,
+                tools: [
+                    defineTool(original.name, {
+                        description: original.description,
+                        handler: () => "original",
+                    }),
+                    defineTool(added.name, {
+                        description: added.description,
+                        handler: () => "added",
+                    }),
+                ],
             });
-            expect(recovered?.data.content).toContain("SDK_ANTHROPIC_RECOVERED");
-            expect(rejectingHandler.requests).toHaveLength(3);
-            const [before, rejected, retry] = rejectingHandler.requests;
-            expect(rejected.body.system).toEqual(before.body.system);
-            expect(rejected.body.tools).toEqual(before.body.tools);
-            expect(JSON.stringify(rejected.body.messages)).toContain('"type":"tool_addition"');
-            expect(rejected.beta).toContain("inline-tools-2026-09-15");
-            expect(retry.body.system).toEqual(before.body.system);
-            expect((retry.body.tools as Array<{ name: string }>).map((tool) => tool.name)).toEqual(
-                expect.arrayContaining([original.name, added.name])
-            );
-            expect(JSON.stringify(retry.body.messages)).not.toContain('"type":"tool_addition"');
-            expect(retry.beta).not.toContain("inline-tools-2026-09-15");
-        } finally {
-            await session.disconnect();
-        }
-    });
-});
-
-describe("SDK tool updates after a streamed Anthropic rejection", async () => {
-    const handler = new AnthropicToolUpdateHandler("after-output");
-    const { copilotClient: client } = await createSdkTestContext({
-        copilotClientOptions: { requestHandler: handler },
-    });
+            try {
+                await session.rpc.tools.initializeAndValidate();
+                await session.rpc.tools.set({ tools: [original] });
+                const first = await session.sendAndWait({ prompt: "SDK_ANTHROPIC_FIRST" });
+                expect(first?.data.content).toContain("SDK_ANTHROPIC_FIRST_OK");
 
-    it("disables the rejected epoch without replaying output and uses full tools next turn", async () => {
-        const original = {
-            name: "sdk_epoch_original",
-            description: "Original SDK tool",
-            parameters: { type: "object", properties: {} },
-            defer: "never",
-        } as const;
-        const added = {
-            name: "sdk_epoch_added",
-            description: "Added SDK tool",
-            parameters: { type: "object", properties: {} },
-            defer: "never",
-        } as const;
-        const session = await client.createSession({
-            model: "claude-opus-5.5",
-            toolSearch: { enabled: false },
-            onPermissionRequest: approveAll,
-            provider: {
-                type: "anthropic",
-                baseUrl: "https://api.anthropic.com",
-                apiKey: "synthetic-provider-key",
-                modelId: "claude-opus-5.5",
-                wireModel: "claude-opus-5.5",
-            },
-            tools: [
-                defineTool(original.name, {
-                    description: original.description,
-                    handler: () => "original",
-                }),
-                defineTool(added.name, { description: added.description, handler: () => "added" }),
-            ],
-        });
-        let failedTurnIdle = false;
-        const unsubscribe = session.on((event) => {
-            if (event.type === "session.idle" && !event.agentId) {
-                failedTurnIdle = true;
+                await session.rpc.tools.set({ tools: [original, added] });
+                const recovered = await session.sendAndWait({
+                    prompt: "SDK_ANTHROPIC_AFTER: add a tool.",
+                });
+                expect(recovered?.data.content).toContain("SDK_ANTHROPIC_RECOVERED");
+                expect(rejectingHandler.requests).toHaveLength(3);
+                const [before, rejected, retry] = rejectingHandler.requests;
+                expect(rejected.body.system).toEqual(before.body.system);
+                expect(rejected.body.tools).toEqual(before.body.tools);
+                expect(JSON.stringify(rejected.body.messages)).toContain('"type":"tool_addition"');
+                expect(rejected.beta).toContain("inline-tools-2026-09-15");
+                expect(retry.body.system).toEqual(before.body.system);
+                expect(
+                    (retry.body.tools as Array<{ name: string }>).map((tool) => tool.name)
+                ).toEqual(expect.arrayContaining([original.name, added.name]));
+                expect(JSON.stringify(retry.body.messages)).not.toContain('"type":"tool_addition"');
+                expect(retry.beta).not.toContain("inline-tools-2026-09-15");
+            } finally {
+                await session.disconnect();
             }
         });
-        try {
-            await session.rpc.tools.initializeAndValidate();
-            await session.rpc.tools.set({ tools: [original] });
-            const first = await session.sendAndWait({ prompt: "SDK_ANTHROPIC_FIRST" });
-            expect(first?.data.content).toContain("SDK_ANTHROPIC_FIRST_OK");
-            failedTurnIdle = false;
+    }
+);
 
-            await session.rpc.tools.set({ tools: [original, added] });
-            await expect(
-                session.sendAndWait({ prompt: "SDK_ANTHROPIC_AFTER: add a tool." })
-            ).rejects.toThrow(/invalid tool_addition/);
-            await waitForCondition(() => failedTurnIdle, {
-                timeoutMessage: "Rejected SDK tool update did not reach session.idle",
+describe.each(["BYOK", "CAPI"])(
+    "SDK tool updates after a streamed %s Anthropic rejection",
+    async (route) => {
+        const handler = new AnthropicToolUpdateHandler("after-output");
+        const { copilotClient: client } = await createSdkTestContext({
+            copilotClientOptions: { requestHandler: handler },
+        });
+
+        it("disables the rejected epoch without replaying output and uses full tools next turn", async () => {
+            const original = {
+                name: "sdk_epoch_original",
+                description: "Original SDK tool",
+                parameters: { type: "object", properties: {} },
+                defer: "never",
+            } as const;
+            const added = {
+                name: "sdk_epoch_added",
+                description: "Added SDK tool",
+                parameters: { type: "object", properties: {} },
+                defer: "never",
+            } as const;
+            const session = await client.createSession({
+                model: "claude-opus-5.5",
+                toolSearch: { enabled: false },
+                onPermissionRequest: approveAll,
+                provider:
+                    route === "BYOK"
+                        ? {
+                              type: "anthropic",
+                              baseUrl: "https://api.anthropic.com",
+                              apiKey: "synthetic-provider-key",
+                              modelId: "claude-opus-5.5",
+                              wireModel: "claude-opus-5.5",
+                          }
+                        : undefined,
+                tools: [
+                    defineTool(original.name, {
+                        description: original.description,
+                        handler: () => "original",
+                    }),
+                    defineTool(added.name, {
+                        description: added.description,
+                        handler: () => "added",
+                    }),
+                ],
             });
-            expect(handler.requests).toHaveLength(2);
-            const [before, rejected] = handler.requests;
-            expect(rejected.body.system).toEqual(before.body.system);
-            expect(rejected.body.tools).toEqual(before.body.tools);
-            expect(JSON.stringify(rejected.body.messages)).toContain('"type":"tool_addition"');
-
-            const followUp = await session.sendAndWait({ prompt: "SDK_ANTHROPIC_FOLLOW_UP" });
-            expect(followUp?.data.content).toContain("SDK_ANTHROPIC_LEGACY_OK");
-            expect(handler.requests).toHaveLength(3);
-            const request = handler.requests[2];
-            expect(
-                (request.body.tools as Array<{ name: string }>).map((tool) => tool.name)
-            ).toEqual(expect.arrayContaining([original.name, added.name]));
-            expect(JSON.stringify(request.body.messages)).not.toContain('"type":"tool_addition"');
-            expect(request.beta).not.toContain("inline-tools-2026-09-15");
-        } finally {
-            unsubscribe();
-            await session.disconnect();
-        }
-    });
-});
+            let failedTurnIdle = false;
+            const unsubscribe = session.on((event) => {
+                if (event.type === "session.idle" && !event.agentId) {
+                    failedTurnIdle = true;
+                }
+            });
+            try {
+                await session.rpc.tools.initializeAndValidate();
+                await session.rpc.tools.set({ tools: [original] });
+                const first = await session.sendAndWait({ prompt: "SDK_ANTHROPIC_FIRST" });
+                expect(first?.data.content).toContain("SDK_ANTHROPIC_FIRST_OK");
+                failedTurnIdle = false;
+
+                await session.rpc.tools.set({ tools: [original, added] });
+                await expect(
+                    session.sendAndWait({ prompt: "SDK_ANTHROPIC_AFTER: add a tool." })
+                ).rejects.toThrow(/invalid tool_addition/);
+                await waitForCondition(() => failedTurnIdle, {
+                    timeoutMessage: "Rejected SDK tool update did not reach session.idle",
+                });
+                expect(handler.requests).toHaveLength(2);
+                const [before, rejected] = handler.requests;
+                expect(rejected.body.system).toEqual(before.body.system);
+                expect(rejected.body.tools).toEqual(before.body.tools);
+                expect(JSON.stringify(rejected.body.messages)).toContain('"type":"tool_addition"');
+
+                const followUp = await session.sendAndWait({ prompt: "SDK_ANTHROPIC_FOLLOW_UP" });
+                expect(followUp?.data.content).toContain("SDK_ANTHROPIC_LEGACY_OK");
+                expect(handler.requests).toHaveLength(3);
+                const request = handler.requests[2];
+                expect(
+                    (request.body.tools as Array<{ name: string }>).map((tool) => tool.name)
+                ).toEqual(expect.arrayContaining([original.name, added.name]));
+                expect(JSON.stringify(request.body.messages)).not.toContain(
+                    '"type":"tool_addition"'
+                );
+                expect(request.beta).not.toContain("inline-tools-2026-09-15");
+            } finally {
+                unsubscribe();
+                await session.disconnect();
+            }
+        });
+    }
+);
diff --git a/nodejs/test/e2e/user_settings_edit.e2e.test.ts b/nodejs/test/e2e/user_settings_edit.e2e.test.ts
new file mode 100644
index 0000000000..857a1bfdcf
--- /dev/null
+++ b/nodejs/test/e2e/user_settings_edit.e2e.test.ts
@@ -0,0 +1,63 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { join } from "node:path";
+import { describe, expect, it } from "vitest";
+import { editUserSettings } from "../../examples/internal-user-settings.js";
+import { createSdkTestContext } from "./harness/sdkTestContext.js";
+
+describe("Internal user settings edit contract", async () => {
+    const { copilotClient: client, workDir, env } = await createSdkTestContext();
+
+    it("runs the edit example and preserves settings-only reads and safe writes", async () => {
+        await client.start();
+        // These host-only methods deliberately stay off the public SDK surface.
+        const settings = client["internalRpc"].user.settings;
+        const home = env.COPILOT_HOME;
+        writeFileSync(join(home, "config.json"), '{"voice":{"enabled":false}}');
+        writeFileSync(join(home, "settings.json"), '{"voice":{"selectedModel":"local"}}');
+
+        expect(await settings.loadForEdit()).toEqual({
+            status: "ok",
+            settings: { voice: { selectedModel: "local" } },
+        });
+
+        const configDir = join(workDir, "example-config");
+        mkdirSync(configDir);
+        const result = await editUserSettings(settings, configDir);
+        expect(result).toEqual({ value: { enabled: true, selectedModel: null } });
+        expect(JSON.parse(readFileSync(join(configDir, "settings.json"), "utf8"))).toEqual({
+            voice: result.value,
+        });
+        console.log("Internal settings example:", JSON.stringify(result));
+
+        await settings.update({
+            key: "voice",
+            value: { enabled: false },
+            configDir,
+            subDir: "profile",
+        });
+        expect(JSON.parse(readFileSync(join(configDir, "settings/profile.json"), "utf8"))).toEqual({
+            voice: { enabled: false },
+        });
+        await expect(
+            settings.update({
+                key: "voice",
+                value: { enabled: false },
+                configDir,
+                subDir: "../../outside",
+            })
+        ).rejects.toThrow("`subDir` must be a single path component");
+
+        const file = join(configDir, "settings.json");
+        const original = "{ invalid settings";
+        writeFileSync(file, original);
+        await expect(
+            settings.update({ key: "voice", value: { enabled: false }, configDir })
+        ).rejects.toThrow("refusing to overwrite settings.json");
+        expect(readFileSync(file, "utf8")).toBe(original);
+        expect(await settings.validate({ topKey: "voice", delete: true })).toEqual({ ok: true });
+    });
+});
diff --git a/nodejs/test/e2e/websocket_fallback_recovery.e2e.test.ts b/nodejs/test/e2e/websocket_fallback_recovery.e2e.test.ts
new file mode 100644
index 0000000000..671c7549bd
--- /dev/null
+++ b/nodejs/test/e2e/websocket_fallback_recovery.e2e.test.ts
@@ -0,0 +1,277 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import http from "node:http";
+import { afterAll, describe, expect, it } from "vitest";
+import { WebSocketServer } from "ws";
+import { approveAll, defineTool, type SessionEvent } from "../../src/index.js";
+import { withTestCleanup } from "../helpers/withTestCleanup.js";
+import { createSdkTestContext, DEFAULT_GITHUB_TOKEN } from "./harness/sdkTestContext.js";
+
+const FINAL_TEXT = "WS_FALLBACK_RECOVERY_DONE";
+const TOOL_NAME = "fallback_recovery_step";
+
+type Transport = "ws" | "http";
+type ProviderRequest = { transport: Transport; connectionId?: number; body: ProviderBody };
+type ProviderBody = {
+    input?: Array<{ type?: string; call_id?: string; output?: unknown }>;
+    previous_response_id?: string;
+    stream?: boolean;
+};
+
+/**
+ * Scripts one agent loop: two tool rounds, then a final answer. The reply depends
+ * only on how many tool results the request carries, so either transport can
+ * serve any step and the assertions observe which transport the runtime chose.
+ */
+function responseEvents(body: ProviderBody, id: string): Array<Record<string, unknown>> {
+    const toolResults = (body.input ?? []).filter((item) => item.type === "function_call_output");
+    const created = {
+        type: "response.created",
+        response: { id, object: "response", status: "in_progress", output: [] },
+    };
+    if (toolResults.length < 2) {
+        const call = {
+            type: "function_call",
+            id: `fc-${toolResults.length + 1}`,
+            call_id: `call-${toolResults.length + 1}`,
+            name: TOOL_NAME,
+            arguments: JSON.stringify({ step: toolResults.length + 1 }),
+            status: "completed",
+        };
+        return [
+            created,
+            { type: "response.output_item.added", output_index: 0, item: call },
+            { type: "response.output_item.done", output_index: 0, item: call },
+            {
+                type: "response.completed",
+                response: { id, object: "response", status: "completed", output: [call] },
+            },
+        ];
+    }
+    const message = {
+        id: "msg-final",
+        type: "message",
+        role: "assistant",
+        content: [{ type: "output_text", text: FINAL_TEXT, annotations: [] }],
+    };
+    return [
+        created,
+        {
+            type: "response.output_item.added",
+            output_index: 0,
+            item: { ...message, content: [] },
+        },
+        {
+            type: "response.content_part.added",
+            output_index: 0,
+            content_index: 0,
+            part: { type: "output_text", text: "" },
+        },
+        {
+            type: "response.output_text.delta",
+            output_index: 0,
+            content_index: 0,
+            delta: FINAL_TEXT,
+        },
+        { type: "response.output_text.done", output_index: 0, content_index: 0, text: FINAL_TEXT },
+        { type: "response.output_item.done", output_index: 0, item: message },
+        {
+            type: "response.completed",
+            response: { id, object: "response", status: "completed", output: [message] },
+        },
+    ];
+}
+
+/** An OpenAI-compatible provider whose first WebSocket request fails before any output. */
+async function startProvider() {
+    const requests: ProviderRequest[] = [];
+    const errors: unknown[] = [];
+    let connectionCount = 0;
+    let wsRequestCount = 0;
+    const server = http.createServer((req, res) => {
+        void (async () => {
+            if (req.method !== "POST" || req.url !== "/v1/responses") {
+                throw new Error(`Unexpected provider request: ${req.method} ${req.url}`);
+            }
+            req.setEncoding("utf8");
+            let raw = "";
+            for await (const chunk of req) raw += chunk;
+            const body = JSON.parse(raw) as ProviderBody;
+            if (body.stream !== true) {
+                // Session title generation is a one-shot request outside the agent loop.
+                res.writeHead(200, { "content-type": "application/json" });
+                res.end(
+                    JSON.stringify({
+                        id: "resp-title",
+                        object: "response",
+                        status: "completed",
+                        output: [
+                            {
+                                id: "msg-title",
+                                type: "message",
+                                role: "assistant",
+                                content: [{ type: "output_text", text: "Title", annotations: [] }],
+                            },
+                        ],
+                    })
+                );
+                return;
+            }
+            requests.push({ transport: "http", body });
+            res.writeHead(200, { "content-type": "text/event-stream" });
+            for (const event of responseEvents(body, `resp-http-${requests.length}`)) {
+                res.write(`data: ${JSON.stringify(event)}\n\n`);
+            }
+            res.end();
+        })().catch((error: unknown) => {
+            errors.push(error);
+            res.destroy(error instanceof Error ? error : new Error(String(error)));
+        });
+    });
+    const sockets = new WebSocketServer({ server, path: "/v1/responses" });
+    sockets.on("connection", (socket) => {
+        const connectionId = ++connectionCount;
+        socket.on("error", (error) => errors.push(error));
+        socket.on("message", (raw) => {
+            const body = JSON.parse(raw.toString()) as ProviderBody;
+            requests.push({ transport: "ws", connectionId, body });
+            const events =
+                ++wsRequestCount === 1
+                    ? [
+                          {
+                              type: "error",
+                              error: {
+                                  code: "service_unavailable",
+                                  type: "websocket_error",
+                                  message: "Controlled transient WebSocket failure",
+                              },
+                          },
+                      ]
+                    : responseEvents(body, `resp-ws-${wsRequestCount}`);
+            for (const event of events) socket.send(JSON.stringify(event));
+        });
+    });
+    await new Promise<void>((resolve, reject) => {
+        server.once("error", reject);
+        server.listen(0, "127.0.0.1", resolve);
+    });
+    const address = server.address();
+    if (address === null || typeof address === "string") {
+        throw new Error("Expected a bound TCP address for the provider.");
+    }
+    return {
+        baseUrl: `http://127.0.0.1:${address.port}/v1`,
+        requests,
+        connectionCount: () => connectionCount,
+        async stop() {
+            for (const socket of sockets.clients) socket.terminate();
+            await new Promise<void>((resolve) => sockets.close(() => resolve()));
+            server.closeAllConnections();
+            await new Promise<void>((resolve, reject) =>
+                server.close((error) => (error ? reject(error) : resolve()))
+            );
+            if (errors.length > 0) throw new AggregateError(errors, "Provider fixture failed.");
+        },
+    };
+}
+
+// The dispatcher's fallback state lives for one run (one user message's agent
+// loop), so recovery is only observable across the model calls of one send.
+describe.each([
+    { recovery: true, transports: ["ws", "http", "http", "ws"] },
+    { recovery: false, transports: ["ws", "http", "http", "http"] },
+])("WebSocket fallback recovery=$recovery", async ({ recovery, transports }) => {
+    const provider = await startProvider();
+    // Register first so the SDK context stops its client before this provider.
+    afterAll(() => provider.stop());
+    const flag = String(recovery);
+    const { copilotClient: client } = await createSdkTestContext({
+        useStdio: true,
+        copilotClientOptions: {
+            gitHubToken: DEFAULT_GITHUB_TOKEN,
+            env: {
+                COPILOT_CLI_DISABLE_WEBSOCKET_RESPONSES: "false",
+                WEBSOCKET_FALLBACK_RECOVERY: flag,
+                COPILOT_EXP_COPILOT_CLI_WEBSOCKET_FALLBACK_RECOVERY: flag,
+            },
+        },
+    });
+
+    it(`${recovery ? "returns to" : "stays off"} the socket after a transient failure within one run`, async () => {
+        const toolCalls: number[] = [];
+        const session = await client.createSession({
+            model: "gpt-5-responses",
+            streaming: true,
+            provider: {
+                type: "openai",
+                baseUrl: provider.baseUrl,
+                apiKey: "test-provider-key",
+                wireApi: "responses",
+                transport: "websockets",
+            },
+            tools: [
+                defineTool<{ step: number }>(TOOL_NAME, {
+                    description: "Records one step of the controlled agent loop",
+                    parameters: {
+                        type: "object",
+                        properties: { step: { type: "number" } },
+                        required: ["step"],
+                    },
+                    defer: "never",
+                    handler: ({ step }) => {
+                        toolCalls.push(step);
+                        return `STEP_${step}_RESULT`;
+                    },
+                }),
+            ],
+            onPermissionRequest: approveAll,
+        });
+        const events: SessionEvent[] = [];
+        const unsubscribe = session.on((event) => events.push(event));
+        await withTestCleanup(
+            async () => {
+                const answer = await session.sendAndWait({ prompt: "Run the two steps." });
+                // Validate the final assistant response arrived (guards against truncated captures)
+                expect(answer?.data.content).toBe(FINAL_TEXT);
+
+                const { requests } = provider;
+                expect(requests.map((request) => request.transport)).toEqual(transports);
+                // The failed socket request is replayed once over HTTP, then each
+                // tool runs exactly once whichever transport carried its turn.
+                expect(toolCalls).toEqual([1, 2]);
+                expect(events.filter((event) => event.type === "session.error")).toEqual([]);
+                const deltas = events.flatMap((event) =>
+                    event.type === "assistant.message_delta" ? [event.data.deltaContent] : []
+                );
+                expect(deltas.join("")).toBe(FINAL_TEXT);
+
+                const last = requests.at(-1)!;
+                const results = (last.body.input ?? []).filter(
+                    (item) => item.type === "function_call_output"
+                );
+                expect(results.map((item) => item.call_id)).toEqual(["call-1", "call-2"]);
+                expect(JSON.stringify(results)).toContain("STEP_1_RESULT");
+                expect(JSON.stringify(results)).toContain("STEP_2_RESULT");
+                if (recovery) {
+                    // A fresh socket carries the full history, not a continuation
+                    // of the response it never produced.
+                    expect(last.connectionId).toBe(2);
+                    expect(last.body.previous_response_id).toBeUndefined();
+                    expect(provider.connectionCount()).toBe(2);
+                } else {
+                    expect(provider.connectionCount()).toBe(1);
+                }
+            },
+            unsubscribe,
+            () => session.disconnect(),
+            async () => {
+                const errors = await client.stop();
+                if (errors.length > 0) {
+                    throw new AggregateError(errors, "Client cleanup failed");
+                }
+            }
+        );
+    });
+});
diff --git a/nodejs/test/e2e/websocket_http_fallback.e2e.test.ts b/nodejs/test/e2e/websocket_http_fallback.e2e.test.ts
new file mode 100644
index 0000000000..d8cd382285
--- /dev/null
+++ b/nodejs/test/e2e/websocket_http_fallback.e2e.test.ts
@@ -0,0 +1,143 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { afterAll, describe, expect, it } from "vitest";
+import { z } from "zod";
+import { approveAll, defineTool, type SessionEvent } from "../../src/index.js";
+import { withTestCleanup } from "../helpers/withTestCleanup.js";
+import { createSdkTestContext, DEFAULT_GITHUB_TOKEN } from "./harness/sdkTestContext.js";
+import {
+    createCompletedResponse,
+    startWebSocketResponsesServer,
+} from "./harness/webSocketResponsesServer.js";
+
+const TOOL_NAME = "ws_fallback_marker";
+const TOOL_RESULT = "WS_FALLBACK_TOOL_RESULT";
+const FINAL = "WS_FALLBACK_FINAL_ANSWER";
+const usage = {
+    input_tokens: 10,
+    output_tokens: 5,
+    total_tokens: 15,
+    input_tokens_details: { cached_tokens: 0 },
+    output_tokens_details: { reasoning_tokens: 0 },
+};
+
+describe("WebSocket to HTTP fallback telemetry", async () => {
+    const upstream = await startWebSocketResponsesServer();
+    // Register first so the SDK context stops its client and proxy before this provider.
+    afterAll(() => upstream.stop());
+    const { copilotClient: client, openAiEndpoint } = await createSdkTestContext({
+        useStdio: true,
+        copilotClientOptions: {
+            gitHubToken: DEFAULT_GITHUB_TOKEN,
+            env: {
+                COPILOT_API_URL: upstream.baseUrl,
+                COPILOT_CLI_DISABLE_WEBSOCKET_RESPONSES: "false",
+            },
+        },
+    });
+    upstream.forwardHttpTo(openAiEndpoint.url);
+
+    it("describes the WebSocket failure on the downgrading call and keeps it sticky", async () => {
+        const { state } = upstream;
+        state.responses.push({
+            type: "error",
+            error: {
+                code: "service_unavailable",
+                type: "websocket_error",
+                message: "controlled WebSocket outage",
+            },
+        });
+        state.httpResponses.push(
+            [
+                {
+                    type: "response.completed",
+                    response: {
+                        ...createCompletedResponse("", "resp-http-tool"),
+                        output: [
+                            {
+                                type: "function_call",
+                                id: "fc-1",
+                                call_id: "call-1",
+                                name: TOOL_NAME,
+                                arguments: JSON.stringify({ input: "ping" }),
+                                status: "completed",
+                            },
+                        ],
+                        output_text: "",
+                        usage,
+                    },
+                },
+            ],
+            [
+                {
+                    type: "response.completed",
+                    response: { ...createCompletedResponse(FINAL, "resp-http-final"), usage },
+                },
+            ]
+        );
+        const session = await client.createSession({
+            model: "gpt-5-responses",
+            onPermissionRequest: approveAll,
+            tools: [
+                defineTool(TOOL_NAME, {
+                    description: "Returns a fixed marker",
+                    parameters: z.object({ input: z.string() }),
+                    handler: () => TOOL_RESULT,
+                }),
+            ],
+        });
+        const events: SessionEvent[] = [];
+        const unsubscribe = session.on((event) => events.push(event));
+        await withTestCleanup(
+            async () => {
+                const answer = await session.sendAndWait({ prompt: "Use the marker tool." });
+                // Validate the final assistant response arrived (guards against truncated captures)
+                expect(answer?.data.content).toBe(FINAL);
+
+                expect(state.messages).toHaveLength(1);
+                expect(state.httpResponseRequestPaths).toHaveLength(2);
+                expect(state.httpResponses).toHaveLength(0);
+                expect(
+                    events.some(
+                        (event) =>
+                            event.type === "tool.execution_complete" &&
+                            JSON.stringify(event.data).includes(TOOL_RESULT)
+                    )
+                ).toBe(true);
+
+                const usages = events.flatMap((event) =>
+                    event.type === "assistant.usage" ? [event.data] : []
+                );
+                expect(usages).toHaveLength(2);
+                const descriptors = {
+                    websocketFallbackReason: "api_error",
+                    websocketFallbackErrorKind: "http_status",
+                    websocketFallbackStatusCode: 503,
+                    websocketFallbackReconnectAttempted: false,
+                };
+                expect(usages[0]).toMatchObject({
+                    ...descriptors,
+                    websocketFallbackStartedThisCall: true,
+                });
+                expect(usages[0].websocketFallbackCloseCode).toBeUndefined();
+                expect(usages[1]).toMatchObject({
+                    ...descriptors,
+                    websocketFallbackStartedThisCall: false,
+                });
+                expect(
+                    usages.every((data) => typeof data.websocketFallbackAfterMs === "number")
+                ).toBe(true);
+            },
+            unsubscribe,
+            () => session.disconnect(),
+            async () => {
+                const errors = await client.stop();
+                if (errors.length > 0) {
+                    throw new AggregateError(errors, "WebSocket fallback client cleanup failed");
+                }
+            }
+        );
+    });
+});
diff --git a/nodejs/test/e2e/websocket_terminals.e2e.test.ts b/nodejs/test/e2e/websocket_terminals.e2e.test.ts
new file mode 100644
index 0000000000..f94052c5d4
--- /dev/null
+++ b/nodejs/test/e2e/websocket_terminals.e2e.test.ts
@@ -0,0 +1,262 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { afterAll, describe, expect, it } from "vitest";
+import { approveAll, type SessionEvent } from "../../src/index.js";
+import { withTestCleanup } from "../helpers/withTestCleanup.js";
+import { createSdkTestContext, DEFAULT_GITHUB_TOKEN } from "./harness/sdkTestContext.js";
+import {
+    createCompletedResponse,
+    startWebSocketResponsesServer,
+    type WebSocketEnvelope,
+} from "./harness/webSocketResponsesServer.js";
+
+const WARMUP = "WS_TERMINAL_WARMUP_DONE";
+const RECOVERED = "WS_TERMINAL_RECOVERY_DONE";
+const QUEUED = "WS_TERMINAL_QUEUED_WORK_DONE";
+const FAILURE = "Controlled terminal provider failure";
+const REJECTED_OUTPUT = "THIS_FAILED_RESPONSE_IS_NOT_SUCCESS";
+const shellToolName = process.platform === "win32" ? "powershell" : "bash";
+const pollOptions = { timeout: 10_000 };
+
+describe.each(["failed", "incomplete"] as const)(
+    "WebSocket response.%s terminals",
+    async (terminalType) => {
+        const upstream = await startWebSocketResponsesServer();
+        // Register first so the SDK context stops its client and proxy before this provider.
+        afterAll(() => upstream.stop());
+        const { copilotClient: client, openAiEndpoint } = await createSdkTestContext({
+            // This regression exercises the supported subprocess SDK boundary.
+            useStdio: true,
+            copilotClientOptions: {
+                gitHubToken: DEFAULT_GITHUB_TOKEN,
+                env: {
+                    COPILOT_API_URL: upstream.baseUrl,
+                    COPILOT_CLI_DISABLE_WEBSOCKET_RESPONSES: "false",
+                    WEBSOCKET_RESPONSES_PERSISTENT: "true",
+                    COPILOT_EXP_COPILOT_CLI_WEBSOCKET_RESPONSES_PERSISTENT: "true",
+                },
+            },
+        });
+        upstream.forwardHttpTo(openAiEndpoint.url);
+
+        it("retires a reused socket without peer EOF and resumes subsequent or queued work", async () => {
+            const { state } = upstream;
+            const terminal = Promise.withResolvers<WebSocketEnvelope>();
+            state.responses.push(
+                {
+                    type: "response.completed",
+                    response: createCompletedResponse(WARMUP, "resp-warmup"),
+                },
+                () => terminal.promise,
+                {
+                    type: "response.completed",
+                    response: createCompletedResponse(RECOVERED, "resp-recovered"),
+                }
+            );
+            if (terminalType === "incomplete") {
+                state.responses.push({
+                    type: "response.completed",
+                    response: createCompletedResponse(QUEUED, "resp-queued"),
+                });
+            }
+            const session = await client.createSession({
+                model: "gpt-5-responses",
+                onPermissionRequest: approveAll,
+            });
+            const events: SessionEvent[] = [];
+            const unsubscribe = session.on((event) => events.push(event));
+            await withTestCleanup(
+                async () => {
+                    const warmup = await session.sendAndWait({
+                        prompt: "Return the warmup response.",
+                    });
+                    expect(warmup?.data.content).toBe(WARMUP);
+                    await expect
+                        .poll(
+                            () => events.filter((event) => event.type === "session.idle").length,
+                            pollOptions
+                        )
+                        .toBe(1);
+                    const interruptedMessageId = await session.send({
+                        prompt: "Exercise the controlled terminal response.",
+                    });
+                    let recoveryMessageId = interruptedMessageId;
+                    let queuedMessageId: string | undefined;
+                    const queuedPrompt = "Run the queued follow-up.";
+                    await expect.poll(() => state.messages.length, pollOptions).toBe(2);
+                    expect(state.messageConnectionIds).toEqual([1, 1]);
+                    expect(state.messages[1].previous_response_id).toBe("resp-warmup");
+                    expect(state.openConnectionIds.has(1)).toBe(true);
+                    await session.rpc.mode.get();
+                    if (terminalType === "incomplete") {
+                        queuedMessageId = await session.send({
+                            prompt: queuedPrompt,
+                            mode: "enqueue",
+                        });
+                        expect(state.messages).toHaveLength(2);
+                    }
+
+                    // Release only the terminal envelope; the peer stays open until the runtime retires it.
+                    terminal.resolve(
+                        terminalType === "failed"
+                            ? {
+                                  type: "response.failed",
+                                  response: {
+                                      ...createCompletedResponse(REJECTED_OUTPUT, "resp-failed"),
+                                      status: "failed",
+                                      error: FAILURE,
+                                      code: "invalid_prompt",
+                                      param: "input",
+                                      request_id: "terminal-request",
+                                  },
+                              }
+                            : {
+                                  type: "response.incomplete",
+                                  response: {
+                                      ...createCompletedResponse("", "resp-incomplete"),
+                                      status: "incomplete",
+                                      incomplete_details: { reason: "max_output_tokens" },
+                                      output: [
+                                          {
+                                              type: "function_call",
+                                              id: "fc-partial",
+                                              call_id: "call-partial",
+                                              name: shellToolName,
+                                              arguments: JSON.stringify({
+                                                  command: "echo WS_PARTIAL_TOOL_MUST_NOT_EXECUTE",
+                                                  description: "Print a controlled test marker",
+                                              }),
+                                              status: "incomplete",
+                                          },
+                                      ],
+                                  },
+                              }
+                    );
+
+                    if (terminalType === "failed") {
+                        await expect
+                            .poll(
+                                () =>
+                                    events.some(
+                                        (event) =>
+                                            event.type === "session.error" &&
+                                            event.data.message.includes(FAILURE)
+                                    ),
+                                pollOptions
+                            )
+                            .toBe(true);
+                        await expect
+                            .poll(
+                                () =>
+                                    events.filter((event) => event.type === "session.idle").length,
+                                pollOptions
+                            )
+                            .toBe(2);
+                        expect(state.messages).toHaveLength(2);
+                        recoveryMessageId = await session.send({
+                            prompt: "Recover after the provider error.",
+                        });
+                    }
+                    // Validate the final assistant response arrived (guards against truncated captures)
+                    if (terminalType === "incomplete") {
+                        await expect
+                            .poll(
+                                () =>
+                                    events
+                                        .filter((event) => event.type === "assistant.message")
+                                        .at(-1)?.data.content,
+                                pollOptions
+                            )
+                            .toBe(QUEUED);
+                    }
+                    await expect
+                        .poll(
+                            () =>
+                                events.some(
+                                    (event) =>
+                                        event.type === "assistant.message" &&
+                                        event.data.content === RECOVERED &&
+                                        event.data.originatingMessageId === recoveryMessageId
+                                ),
+                            pollOptions
+                        )
+                        .toBe(true);
+                    await expect
+                        .poll(() => {
+                            const finalMessage = events.findLastIndex(
+                                (event) =>
+                                    event.type === "assistant.message" &&
+                                    event.data.content ===
+                                        (terminalType === "failed" ? RECOVERED : QUEUED)
+                            );
+                            return (
+                                finalMessage !== -1 &&
+                                events
+                                    .slice(finalMessage + 1)
+                                    .some((event) => event.type === "session.idle")
+                            );
+                        }, pollOptions)
+                        .toBe(true);
+                    expect(state.messageConnectionIds).toEqual(
+                        terminalType === "failed" ? [1, 1, 2] : [1, 1, 2, 2]
+                    );
+                    await expect.poll(() => state.closedConnectionCount, pollOptions).toBe(1);
+                    expect(state.openConnectionIds.has(1)).toBe(false);
+                    expect(state.messages[2].previous_response_id).toBeUndefined();
+                    expect(state.responses).toHaveLength(0);
+                    expect(events.filter((event) => event.type === "tool.execution_start")).toEqual(
+                        []
+                    );
+                    expect(
+                        events.some(
+                            (event) =>
+                                event.type === "assistant.message" &&
+                                event.data.content === REJECTED_OUTPUT
+                        )
+                    ).toBe(false);
+                    expect(JSON.stringify(state.messages[2].input)).not.toContain(REJECTED_OUTPUT);
+                    const recovered = events.find(
+                        (event) =>
+                            event.type === "assistant.message" && event.data.content === RECOVERED
+                    );
+                    expect(recovered).toMatchObject({
+                        data: { originatingMessageId: recoveryMessageId },
+                    });
+                    if (terminalType === "failed") {
+                        expect(
+                            events.filter((event) => event.type === "model.call_failure")
+                        ).toHaveLength(1);
+                    } else {
+                        expect(events.filter((event) => event.type === "session.error")).toEqual(
+                            []
+                        );
+                        expect(JSON.stringify(state.messages[2].input)).not.toContain(
+                            "call-partial"
+                        );
+                        expect(JSON.stringify(state.messages[2].input)).not.toContain(queuedPrompt);
+                        expect(
+                            JSON.stringify(state.messages[3].input).split(queuedPrompt)
+                        ).toHaveLength(2);
+                        expect(
+                            events.find(
+                                (event) =>
+                                    event.type === "assistant.message" &&
+                                    event.data.content === QUEUED
+                            )
+                        ).toMatchObject({ data: { originatingMessageId: queuedMessageId } });
+                    }
+                },
+                unsubscribe,
+                () => session.disconnect(),
+                async () => {
+                    const errors = await client.stop();
+                    if (errors.length > 0) {
+                        throw new AggregateError(errors, "WebSocket client cleanup failed");
+                    }
+                }
+            );
+        });
+    }
+);
diff --git a/nodejs/test/e2e/workflow.e2e.test.ts b/nodejs/test/e2e/workflow.e2e.test.ts
index 093654d79a..5d2673ea40 100644
--- a/nodejs/test/e2e/workflow.e2e.test.ts
+++ b/nodejs/test/e2e/workflow.e2e.test.ts
@@ -1,9 +1,14 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
 import { execFileSync } from "node:child_process";
 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, vi } from "vitest";
+import type { CopilotSession } from "../../src/index.js";
 import {
     createSdkTestContext,
     DEFAULT_GITHUB_TOKEN,
@@ -21,11 +26,13 @@ const { approveAll, RuntimeConnection } = (await import(
 const cliPath = process.env.COPILOT_CLI_PATH ?? (await getLegacyCliPathForTests());
 const cliDistDirectory = process.env.COPILOT_EXTENSION_SDK_PATH
     ? dirname(process.env.COPILOT_EXTENSION_SDK_PATH)
-    : dirname(cliPath);
+    : dirname(await getLegacyCliPathForTests());
 const workflowTestContext = await createSdkTestContext({
+    logLevel: "debug",
     copilotClientOptions: {
         connection: RuntimeConnection.forStdio({ path: cliPath }),
         env: {
+            RUST_LOG: "error,sdk_diagnostics=debug",
             COPILOT_CLI_ENABLED_FEATURE_FLAGS: "EXTENSIONS",
         },
         extensionLaunchProvider: {
@@ -43,6 +50,33 @@ const workflowTestContext = await createSdkTestContext({
     },
 });
 
+function workflowCopilotUser(tokenBasedBilling: boolean) {
+    return {
+        login: "workflow-e2e-user",
+        copilot_plan: "individual_pro",
+        token_based_billing: tokenBasedBilling,
+        is_mcp_enabled: true,
+        endpoints: {
+            api: workflowTestContext.openAiEndpoint.url,
+            telemetry: "https://localhost:1/telemetry",
+        },
+        analytics_tracking_id: "workflow-e2e-tracking-id",
+    };
+}
+
+async function setWorkflowEligibility(session: CopilotSession, eligible: boolean) {
+    const token = eligible ? "workflow-eligible-e2e-token" : "workflow-ineligible-e2e-token";
+    await workflowTestContext.openAiEndpoint.setCopilotUserByToken(
+        token,
+        workflowCopilotUser(eligible)
+    );
+    await expect(
+        session.rpc.gitHubAuth.setCredentials({
+            credentials: { type: "token", host: "https://github.com", token },
+        })
+    ).resolves.toMatchObject({ success: true, copilotUserResolved: true });
+}
+
 async function setupWorkflowExtension(workDir: string, onPermissionRequest = approveAll) {
     const { copilotClient, openAiEndpoint } = workflowTestContext;
     const extensionDir = join(workDir, ".github", "extensions", "workflow-smoke");
@@ -55,17 +89,7 @@ async function setupWorkflowExtension(workDir: string, onPermissionRequest = app
     );
     execFileSync("git", ["init", "--quiet"], { cwd: workDir });
 
-    await openAiEndpoint.setCopilotUserByToken(DEFAULT_GITHUB_TOKEN, {
-        login: "workflow-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: "workflow-e2e-tracking-id",
-    });
+    await openAiEndpoint.setCopilotUserByToken(DEFAULT_GITHUB_TOKEN, workflowCopilotUser(true));
 
     const session = await copilotClient.createSession({
         requestExtensions: true,
@@ -234,6 +258,135 @@ it("pages workflow runs and returns cursor metadata", async () => {
     });
 });
 
+it("observes an empty workflow registry without execution eligibility", async () => {
+    const { workDir } = workflowTestContext;
+    await using session = await setupWorkflowExtension(workDir);
+    await setWorkflowEligibility(session, false);
+
+    await expect(session.workflow.listRuns()).resolves.toEqual([]);
+    await expect(session.workflow.listRuns({ limit: 1 })).resolves.toEqual({
+        runs: [],
+        oldestSeq: null,
+        newestSeq: null,
+        hasMoreNewer: false,
+        omittedOlder: 0,
+    });
+    await expect(
+        session.workflow.getRun("00000000-0000-0000-0000-000000000000")
+    ).rejects.toMatchObject({
+        data: { code: "workflow_run_not_found" },
+    });
+    await expect(session.workflow.run("argument-echo")).rejects.toMatchObject({
+        code: -32601,
+        data: { code: "dynamic_workflows_unavailable" },
+    });
+});
+
+it("observes and settles an admitted workflow across eligibility loss and restoration", async () => {
+    const { workDir } = workflowTestContext;
+    const extensionDir = join(workDir, ".github", "extensions", "workflow-smoke");
+    await using session = await setupWorkflowExtension(workDir);
+    const completed = await session.workflow.run("phased", { notifyOnComplete: false });
+    expect(completed.status).toBe("completed");
+    const failed = await session.workflow.run("fails-once", { notifyOnComplete: false });
+    expect(failed.status).toBe("error");
+    const admitted = await session.rpc.workflow.run({
+        name: "parked",
+        args: {},
+        options: { notifyOnComplete: false },
+    });
+
+    try {
+        await retry(
+            "wait for the admitted workflow provider to park",
+            async () => {
+                expect(existsSync(join(extensionDir, "entered"))).toBe(true);
+            },
+            100,
+            100
+        );
+        await expect(session.workflow.getRun(admitted.runId)).resolves.toMatchObject({
+            status: "running",
+        });
+        await setWorkflowEligibility(session, false);
+
+        const page = await session.workflow.listRuns({ limit: 1 });
+        expect(page.runs).toHaveLength(2);
+        expect(page.runs).toEqual(
+            expect.arrayContaining([
+                expect.objectContaining({ runId: admitted.runId, status: "running" }),
+                expect.objectContaining({ runId: failed.runId, status: "error" }),
+            ])
+        );
+        await expect(session.workflow.getRun(admitted.runId)).resolves.toMatchObject({
+            runId: admitted.runId,
+            status: "running",
+        });
+        await expect(session.workflow.getRunDetail(admitted.runId)).resolves.toMatchObject({
+            runId: admitted.runId,
+            status: "running",
+        });
+        await expect(session.workflow.getRunProgress(admitted.runId)).resolves.toMatchObject({
+            records: [],
+        });
+        await expect(session.workflow.getRun(completed.runId)).resolves.toMatchObject({
+            status: "completed",
+            result: "finished",
+        });
+        const history = await session.workflow.getRunDetail(completed.runId);
+        expect(history.progress.records).toEqual(
+            expect.arrayContaining([expect.objectContaining({ kind: "log", text: "Summarized" })])
+        );
+        const progress = await session.workflow.getRunProgress(completed.runId);
+        expect(progress.records).toEqual(history.progress.records);
+
+        const unavailable = { code: -32601, data: { code: "dynamic_workflows_unavailable" } };
+        await expect(session.workflow.run("argument-echo")).rejects.toMatchObject(unavailable);
+        await expect(session.workflow.resume(failed.runId)).rejects.toMatchObject(unavailable);
+        await expect(session.workflow.pause(admitted.runId)).rejects.toMatchObject(unavailable);
+        await expect(session.workflow.cancel(admitted.runId)).rejects.toMatchObject(unavailable);
+        await expect(session.workflow.getRun(admitted.runId)).resolves.toMatchObject({
+            status: "running",
+        });
+
+        const settlement = session.workflow.waitForRun(admitted.runId);
+        writeFileSync(join(extensionDir, "release"), "release");
+        await expect(settlement).resolves.toMatchObject({
+            runId: admitted.runId,
+            status: "completed",
+            result: "released",
+        });
+        await expect(session.workflow.getRun(admitted.runId)).resolves.toMatchObject({
+            status: "completed",
+            result: "released",
+        });
+
+        await setWorkflowEligibility(session, true);
+        await expect(
+            session.workflow.resume(failed.runId, { notifyOnComplete: false })
+        ).resolves.toMatchObject({
+            runId: failed.runId,
+            status: "completed",
+            result: "resumed",
+        });
+        await expect(
+            session.workflow.run("argument-echo", {
+                args: { afterRestoration: true },
+                notifyOnComplete: false,
+            })
+        ).resolves.toMatchObject({
+            status: "completed",
+            result: { afterRestoration: true },
+        });
+        await expect(session.workflow.getRunDetail(admitted.runId)).resolves.toMatchObject({
+            runId: admitted.runId,
+            status: "completed",
+        });
+    } finally {
+        writeFileSync(join(extensionDir, "release"), "release");
+    }
+}, 60_000);
+
 it("runs a workflow when its session denies every permission request", async () => {
     const { workDir } = workflowTestContext;
     const denyPermissions = vi.fn(() => ({ kind: "reject" as const }));
@@ -274,43 +427,50 @@ it("pauses a running workflow through the session API", async () => {
     const extensionDir = join(workDir, ".github", "extensions", "workflow-smoke");
     await using session = await setupWorkflowExtension(workDir);
 
-    const execution = session.workflow.run("externally-paused", {
-        notifyOnComplete: false,
-    });
-    await retry(
-        "wait for the externally paused workflow to enter its body",
-        async () => {
-            expect(existsSync(join(extensionDir, "external-pause-entered"))).toBe(true);
-        },
-        100,
-        100
-    );
+    // Acknowledge admission before owning a cancellable wait; a failed entry
+    // assertion must not leave workflow.run polling a disposed session.
+    const started = await session.rpc.workflow.run({
+        name: "externally-paused",
+        args: {},
+        options: { notifyOnComplete: false },
+    });
+    expect(started).toMatchObject({ status: "running" });
+    const controller = new AbortController();
+    const execution = Promise.allSettled([
+        session.workflow.waitForRun(started.runId, { signal: controller.signal }),
+    ]);
+    try {
+        await retry(
+            "wait for the externally paused workflow to enter its body",
+            async () => {
+                const run = await session.workflow.getRun(started.runId);
+                const state = {
+                    run,
+                    entered: existsSync(join(extensionDir, "external-pause-entered")),
+                };
+                expect(state, `Workflow entry state: ${JSON.stringify(state)}`).toMatchObject({
+                    run: { status: "running" },
+                    entered: true,
+                });
+            },
+            100,
+            100
+        );
 
-    let runId: string | undefined;
-    await retry(
-        "find the running workflow before pausing it",
-        async () => {
-            const running = (await session.workflow.listRuns()).find(
-                (run) => run.workflowName === "externally-paused" && run.status === "running"
-            );
-            expect(running).toBeDefined();
-            runId = running?.runId;
-        },
-        100,
-        100
-    );
-    if (!runId) {
-        throw new Error("Running workflow did not expose a run ID");
+        await expect(session.workflow.pause(started.runId)).resolves.toMatchObject({
+            runId: started.runId,
+            status: "paused",
+        });
+        await expect(execution).resolves.toMatchObject([
+            {
+                status: "fulfilled",
+                value: { runId: started.runId, status: "paused" },
+            },
+        ]);
+    } finally {
+        controller.abort();
+        await execution;
     }
-
-    await expect(session.workflow.pause(runId)).resolves.toMatchObject({
-        runId,
-        status: "paused",
-    });
-    await expect(execution).resolves.toMatchObject({
-        runId,
-        status: "paused",
-    });
 });
 
 it("pauses once at a durable checkpoint and continues after resume", async () => {
@@ -372,39 +532,56 @@ it("allows a module-level extension watcher to start a workflow while another bo
     const extensionDir = join(workDir, ".github", "extensions", "workflow-smoke");
     await using session = await setupWorkflowExtension(workDir);
 
-    const parked = session.workflow.run("parked", { notifyOnComplete: false });
-    await retry(
-        "wait for the parked workflow to enter its body",
-        async () => {
-            expect(existsSync(join(extensionDir, "entered"))).toBe(true);
-        },
-        100,
-        100
-    );
+    // Admission must finish before starting the body-entry deadline.
+    const parked = await session.rpc.workflow.run({
+        name: "parked",
+        args: {},
+        options: { notifyOnComplete: false },
+    });
+    const completion = Promise.allSettled([session.workflow.waitForRun(parked.runId)]);
+    try {
+        expect(parked.status).toBe("running");
+        await retry(
+            "wait for the parked workflow to enter its body",
+            async () => {
+                expect(existsSync(join(extensionDir, "entered"))).toBe(true);
+            },
+            100,
+            100
+        );
 
-    writeFileSync(join(extensionDir, "start-b"), "start");
-    const bResultFile = join(extensionDir, "b-result");
-    await retry(
-        "wait for the module-level watcher workflow run to succeed",
-        async () => {
-            expect(existsSync(bResultFile)).toBe(true);
-            expect(JSON.parse(readFileSync(bResultFile, "utf8"))).toMatchObject({
-                status: "success",
-                result: {
-                    status: "completed",
-                    result: { source: "module-watcher" },
-                },
-            });
+        writeFileSync(join(extensionDir, "start-b"), "start");
+        const bResultFile = join(extensionDir, "b-result");
+        await retry(
+            "wait for the module-level watcher workflow run to succeed",
+            async () => {
+                expect(existsSync(bResultFile)).toBe(true);
+                expect(JSON.parse(readFileSync(bResultFile, "utf8"))).toMatchObject({
+                    status: "success",
+                    result: {
+                        status: "completed",
+                        result: { source: "module-watcher" },
+                    },
+                });
+            },
+            100,
+            100
+        );
+    } finally {
+        writeFileSync(join(extensionDir, "release"), "release");
+        const [outcome] = await completion;
+        if (outcome.status === "rejected") {
+            console.error("Parked workflow failed during cleanup:", outcome.reason);
+        } else if (outcome.value.status !== "completed") {
+            console.error("Parked workflow did not complete during cleanup:", outcome.value);
+        }
+    }
+    await expect(completion).resolves.toMatchObject([
+        {
+            status: "fulfilled",
+            value: { status: "completed", result: "released" },
         },
-        100,
-        100
-    );
-
-    writeFileSync(join(extensionDir, "release"), "release");
-    await expect(parked).resolves.toMatchObject({
-        status: "completed",
-        result: "released",
-    });
+    ]);
 }, 60_000);
 
 it("returns an array result from an extension-authored workflow", async () => {
diff --git a/nodejs/test/e2e/workiq_discovery.e2e.test.ts b/nodejs/test/e2e/workiq_discovery.e2e.test.ts
new file mode 100644
index 0000000000..1d30226112
--- /dev/null
+++ b/nodejs/test/e2e/workiq_discovery.e2e.test.ts
@@ -0,0 +1,450 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { mkdir, readFile, readdir, writeFile } from "node:fs/promises";
+import { randomUUID } from "node:crypto";
+import { join } from "node:path";
+import { describe, expect, it, onTestFinished } from "vitest";
+import { approveAll, RuntimeConnection, CopilotClient } from "../../src/index.js";
+import { createSdkTestContext } from "./harness/sdkTestContext.js";
+import { waitForCondition } from "./harness/sdkTestHelper.js";
+import { ConnectProxy } from "../../../test/harness/connectProxy.js";
+import { createE2eRequestHandler } from "../../../test/harness/mockHandlers.js";
+
+describe("account-derived WorkIQ", async () => {
+    const { env, workDir, openAiEndpoint } = await createSdkTestContext();
+
+    it("discovers WorkIQ only on supported platforms without requesting authentication or persisting a server", async () => {
+        const profile = join(workDir, "workiq-profile");
+        await mkdir(profile, { recursive: true });
+        await writeFile(
+            join(profile, "config.json"),
+            JSON.stringify({
+                loggedInUsers: [
+                    {
+                        host: "https://substrate.office.com",
+                        login: "workiq-test-account",
+                        kind: "loki",
+                        derivedFrom: "entra:workiq-account-a",
+                    },
+                ],
+            })
+        );
+        const client = new CopilotClient({
+            connection: RuntimeConnection.forStdio({ path: process.env.COPILOT_CLI_PATH }),
+            workingDirectory: workDir,
+            env: { ...env, COPILOT_HOME: profile, COPILOT_DISABLE_KEYTAR: "1" },
+        });
+        onTestFinished(() => client.stop());
+        let authenticationRequests = 0;
+        const session = await client.createSession({
+            configDirectory: profile,
+            onPermissionRequest: approveAll,
+            onMcpAuthRequest: async () => {
+                authenticationRequests++;
+                return { kind: "cancelled" };
+            },
+        });
+        const accounts = await session.rpc.accounts.enumerate({ query: { kind: "accounts" } });
+        expect(accounts.items).toEqual(
+            expect.arrayContaining([
+                expect.objectContaining({ kind: "entra", selectionId: "entra:workiq-account-a" }),
+            ])
+        );
+        const discovered = await session.rpc.mcp.list();
+        const expected =
+            process.platform === "linux"
+                ? []
+                : [
+                      expect.objectContaining({
+                          name: "WorkIQ",
+                          source: "account",
+                          status: "disabled",
+                          url: "https://workiq.svc.cloud.microsoft/mcp",
+                      }),
+                  ];
+        expect(discovered.servers.filter((server) => server.name === "WorkIQ")).toEqual(expected);
+        expect(discovered).not.toHaveProperty("accountServerConfigs");
+        // Gating off WorkIQ can leave this fixture with no MCP configuration to reload.
+        if (discovered.servers.length === 0) {
+            await expect(session.rpc.mcp.reload()).rejects.toThrow(
+                "MCP config reload not available"
+            );
+        } else {
+            await session.rpc.mcp.reload();
+        }
+        const reloaded = await session.rpc.mcp.list();
+        expect(reloaded.servers.filter((server) => server.name === "WorkIQ")).toEqual(expected);
+        expect(authenticationRequests).toBe(0);
+        await expect(readFile(join(profile, "mcp-config.json"))).rejects.toMatchObject({
+            code: "ENOENT",
+        });
+    });
+
+    it("preserves an explicitly configured WorkIQ alias instead of adding another server", async () => {
+        const profile = join(workDir, "workiq-override-profile");
+        await mkdir(profile, { recursive: true });
+        await writeFile(
+            join(profile, "config.json"),
+            JSON.stringify({
+                loggedInUsers: [
+                    {
+                        host: "https://substrate.office.com",
+                        login: "workiq-test-account",
+                        kind: "loki",
+                        derivedFrom: "entra:workiq-account-a",
+                    },
+                ],
+            })
+        );
+        const client = new CopilotClient({
+            connection: RuntimeConnection.forStdio({ path: process.env.COPILOT_CLI_PATH }),
+            workingDirectory: workDir,
+            env: { ...env, COPILOT_HOME: profile, COPILOT_DISABLE_KEYTAR: "1" },
+        });
+        onTestFinished(() => client.stop());
+        const session = await client.createSession({
+            configDirectory: profile,
+            onPermissionRequest: approveAll,
+            mcpServers: {
+                "my-workiq": {
+                    type: "http",
+                    url: "https://workiq.svc.cloud.microsoft/mcp",
+                    tools: ["chosen-tool"],
+                },
+                "my-sse": {
+                    type: "sse",
+                    url: "https://example.test/events",
+                    tools: ["*"],
+                },
+                "my-local": {
+                    type: "stdio",
+                    command: "unused-while-disabled",
+                    tools: ["*"],
+                },
+            },
+            disabledMcpServers: ["my-workiq", "my-sse", "my-local"],
+        });
+        const result = await session.rpc.mcp.list();
+        expect(result.servers.some((server) => server.name === "WorkIQ")).toBe(false);
+        expect(result.servers).toEqual(
+            expect.arrayContaining([
+                expect.objectContaining({
+                    name: "my-workiq",
+                    status: "disabled",
+                    url: "https://workiq.svc.cloud.microsoft/mcp",
+                }),
+                expect.objectContaining({
+                    name: "my-sse",
+                    status: "disabled",
+                    url: "https://example.test/events",
+                }),
+                expect.objectContaining({ name: "my-local", status: "disabled" }),
+            ])
+        );
+        expect(result.servers.find((server) => server.name === "my-local")).not.toHaveProperty(
+            "url"
+        );
+        expect(result).not.toHaveProperty("accountServerConfigs");
+    });
+
+    it.skipIf(process.platform === "linux").each(["silent", "browser"] as const)(
+        "authenticates through %s, persists renewal, and disconnects on parent logout",
+        async (authentication) => {
+            const profile = join(workDir, `workiq-${authentication}-profile`);
+            await mkdir(profile, { recursive: true });
+            const objectId = "workiq-object";
+            const tenantId = randomUUID();
+            const parent = `entra:${objectId}@${tenantId}`;
+            await writeFile(
+                join(profile, "config.json"),
+                JSON.stringify({
+                    loggedInUsers: [
+                        {
+                            host: "https://substrate.office.com",
+                            login: "workiq-test-account",
+                            kind: "loki",
+                            derivedFrom: parent,
+                        },
+                    ],
+                    authTokens: {
+                        [`entra:${parent}:entra`]: {
+                            token: JSON.stringify({ web: { refresh_token: "parent-refresh" } }),
+                        },
+                    },
+                })
+            );
+            const resource = "fdcc1f02-fc51-4226-8753-f668596af7f7";
+            const scope = `${resource}/access`;
+            const requests: Array<{ host: string; path: string }> = [];
+            const grants: URLSearchParams[] = [];
+            let browserScopes: string[] = [];
+            let initializeRequests = 0;
+            const fallback = createE2eRequestHandler({ capiProxyUrl: openAiEndpoint.url });
+            const proxy = new ConnectProxy(
+                async (req, res, host) => {
+                    if (
+                        host !== "workiq.svc.cloud.microsoft" &&
+                        host !== "login.microsoftonline.com"
+                    ) {
+                        return fallback(req, res, host);
+                    }
+                    const path = req.url ?? "/";
+                    requests.push({ host, path });
+                    const reply = (status: number, value: unknown) => {
+                        res.writeHead(status, { "content-type": "application/json" });
+                        res.end(JSON.stringify(value));
+                        return true;
+                    };
+                    if (path.includes(".well-known/oauth-protected-resource")) {
+                        return reply(200, {
+                            resource: "https://workiq.svc.cloud.microsoft/mcp",
+                            authorization_servers: [
+                                "https://login.microsoftonline.com/organizations/v2.0",
+                            ],
+                            scopes_supported: [scope],
+                        });
+                    }
+                    if (host === "login.microsoftonline.com" && path.includes(".well-known")) {
+                        return reply(200, {
+                            issuer: "https://login.microsoftonline.com/organizations/v2.0",
+                            authorization_endpoint:
+                                "https://login.microsoftonline.com/organizations/oauth2/v2.0/authorize",
+                            token_endpoint:
+                                "https://login.microsoftonline.com/organizations/oauth2/v2.0/token",
+                            response_types_supported: ["code"],
+                            code_challenge_methods_supported: ["S256"],
+                        });
+                    }
+                    let body = "";
+                    for await (const chunk of req) body += chunk.toString();
+                    if (host === "login.microsoftonline.com" && path.endsWith("/token")) {
+                        const grant = new URLSearchParams(body);
+                        grants.push(grant);
+                        if (
+                            authentication === "browser" &&
+                            grant.get("refresh_token") === "parent-refresh"
+                        ) {
+                            return reply(400, {
+                                error: "invalid_grant",
+                                error_description: "Interaction required",
+                            });
+                        }
+                        // Entra emits oid only when the browser request includes profile.
+                        const claims = {
+                            sub: "workiq-client-subject",
+                            tid: tenantId,
+                            ...(browserScopes.includes("profile") ? { oid: objectId } : {}),
+                        };
+                        return reply(200, {
+                            access_token: "workiq-service-token",
+                            token_type: "Bearer",
+                            expires_in: 3600,
+                            scope,
+                            ...(grant.get("grant_type") === "authorization_code"
+                                ? {
+                                      id_token: `e30.${Buffer.from(JSON.stringify(claims)).toString("base64url")}.fixture`,
+                                      ...(browserScopes.includes("offline_access")
+                                          ? { refresh_token: "workiq-browser-refresh" }
+                                          : {}),
+                                  }
+                                : {}),
+                        });
+                    }
+                    if (host === "workiq.svc.cloud.microsoft") {
+                        if (req.headers.authorization !== "Bearer workiq-service-token") {
+                            res.setHeader(
+                                "www-authenticate",
+                                `Bearer resource_metadata="https://workiq.svc.cloud.microsoft/.well-known/oauth-protected-resource", scope="${scope}"`
+                            );
+                            return reply(401, { error: "invalid_token" });
+                        }
+                        if (req.method !== "POST") return reply(405, {});
+                        const message = JSON.parse(body);
+                        if (message.method === "initialize") initializeRequests++;
+                        if (message.id === undefined) {
+                            res.writeHead(202);
+                            res.end();
+                            return true;
+                        }
+                        const result =
+                            message.method === "initialize"
+                                ? {
+                                      protocolVersion: "2024-11-05",
+                                      capabilities: { tools: {} },
+                                      serverInfo: { name: "workiq-fixture", version: "1" },
+                                  }
+                                : message.method === "tools/list"
+                                  ? {
+                                        tools: [
+                                            {
+                                                name: "whoami",
+                                                description: "Return the linked fixture identity",
+                                                inputSchema: { type: "object", properties: {} },
+                                            },
+                                        ],
+                                    }
+                                  : message.method === "tools/call"
+                                    ? { content: [{ type: "text", text: parent }] }
+                                    : {};
+                        return reply(200, { jsonrpc: "2.0", id: message.id, result });
+                    }
+                    return reply(404, {});
+                },
+                {
+                    interceptDomains: [
+                        "workiq.svc.cloud.microsoft",
+                        "login.microsoftonline.com",
+                        "api.githubcopilot.com",
+                        "api.github.com",
+                        "github.com",
+                        "api.mcp.github.com",
+                    ],
+                }
+            );
+            let client: CopilotClient | undefined;
+            const starting = proxy.start();
+            onTestFinished(async () => {
+                try {
+                    await client?.stop();
+                } finally {
+                    await starting;
+                    await proxy.stop();
+                }
+            });
+            await starting;
+            const clientOptions = {
+                connection: RuntimeConnection.forStdio({ path: process.env.COPILOT_CLI_PATH }),
+                workingDirectory: workDir,
+                env: {
+                    ...env,
+                    COPILOT_HOME: profile,
+                    COPILOT_DISABLE_KEYTAR: "1",
+                    HTTPS_PROXY: proxy.proxyUrl,
+                    HTTP_PROXY: proxy.proxyUrl,
+                    https_proxy: proxy.proxyUrl,
+                    http_proxy: proxy.proxyUrl,
+                    NODE_EXTRA_CA_CERTS: proxy.caFilePath,
+                    SSL_CERT_FILE: proxy.caFilePath,
+                },
+            };
+            client = new CopilotClient(clientOptions);
+            let session = await client.createSession({
+                configDirectory: profile,
+                mcpOAuthTokenStorage: "persistent",
+                onPermissionRequest: approveAll,
+            });
+            expect(
+                (await session.rpc.mcp.list()).servers.find((server) => server.name === "WorkIQ")
+                    ?.status
+            ).toBe("disabled");
+            expect(requests).toHaveLength(0);
+            await session.rpc.mcp.enable({ serverName: "WorkIQ" });
+            if (authentication === "browser") {
+                await waitForCondition(
+                    async () =>
+                        (await session.rpc.mcp.list()).servers.some(
+                            (server) => server.name === "WorkIQ" && server.status === "needs-auth"
+                        ),
+                    { timeoutMessage: "WorkIQ did not request browser authentication" }
+                );
+                const redirectUri = "https://example.test/workiq-callback";
+                const login = await session.rpc.mcp.oauth.login({
+                    serverName: "WorkIQ",
+                    forceReauth: true,
+                    redirectUri,
+                });
+                expect(login.authorizationUrl).toBeDefined();
+                expect(login.authorizationId).toBeDefined();
+                const authorizationUrl = new URL(login.authorizationUrl!);
+                browserScopes = authorizationUrl.searchParams.get("scope")?.split(" ") ?? [];
+                const callbackUrl = new URL(redirectUri);
+                callbackUrl.searchParams.set("code", "accepted-code");
+                callbackUrl.searchParams.set("state", login.authorizationId!);
+                await session.rpc.mcp.oauth.complete({
+                    authorizationId: login.authorizationId!,
+                    callbackUrl: callbackUrl.toString(),
+                });
+                expect(browserScopes).toEqual(
+                    expect.arrayContaining([scope, "openid", "profile", "offline_access"])
+                );
+            }
+            await waitForCondition(
+                async () =>
+                    (await session.rpc.mcp.list()).servers.some(
+                        (server) => server.name === "WorkIQ" && server.status === "connected"
+                    ),
+                { timeoutMessage: "WorkIQ did not connect after enablement" }
+            );
+            const initialGrantCount = authentication === "browser" ? 2 : 1;
+            expect(grants).toHaveLength(initialGrantCount);
+            expect(grants[0].get("client_id")).toBe("ba081686-5d24-4bc6-a0d6-d034ecffed87");
+            expect(grants[0].get("refresh_token")).toBe("parent-refresh");
+            expect(grants[0].get("scope")).toContain(scope);
+            expect(
+                (await session.rpc.mcp.listTools({ serverName: "WorkIQ" })).tools.map(
+                    (tool) => tool.name
+                )
+            ).toContain("whoami");
+
+            const connectedInitializeRequests = initializeRequests;
+            expect(connectedInitializeRequests).toBeGreaterThan(0);
+            for (let attempt = 0; attempt < 2; attempt++) {
+                await session.rpc.mcp.enable({ serverName: "WorkIQ" });
+                expect(initializeRequests).toBe(connectedInitializeRequests);
+                expect(
+                    (await session.rpc.mcp.list()).servers.find(
+                        (server) => server.name === "WorkIQ"
+                    )?.status
+                ).toBe("connected");
+            }
+            const preferences = JSON.parse(await readFile(join(profile, "config.json"), "utf8"));
+            expect(preferences.accountMcpEnablement[JSON.stringify([parent, "WorkIQ"])]).toBe(true);
+            expect(grants).toHaveLength(initialGrantCount);
+
+            await session.rpc.mcp.oauth.authenticationStateChanged({
+                serverName: "WorkIQ",
+                refreshSessionToken: true,
+            });
+            expect(grants).toHaveLength(initialGrantCount + 1);
+            expect(grants.at(-1)?.get("refresh_token")).toBe(
+                authentication === "browser" ? "workiq-browser-refresh" : "parent-refresh"
+            );
+            const tokenFiles = (await readdir(join(profile, "mcp-oauth-config"))).filter((name) =>
+                name.endsWith(".tokens.json")
+            );
+            const saved = await Promise.all(
+                tokenFiles.map(async (name) =>
+                    JSON.parse(await readFile(join(profile, "mcp-oauth-config", name), "utf8"))
+                )
+            );
+            expect(saved.length).toBeGreaterThan(0);
+            expect(saved.every((record) => record.accountId === parent)).toBe(true);
+            expect(saved.every((record) => record.parentAccountId === undefined)).toBe(true);
+            expect(saved.every((record) => record.parentAccount === undefined)).toBe(true);
+            expect(saved.every((record) => record.brokerAccountId === undefined)).toBe(true);
+            await client.stop();
+            client = new CopilotClient(clientOptions);
+            session = await client.createSession({
+                configDirectory: profile,
+                mcpOAuthTokenStorage: "persistent",
+                onPermissionRequest: approveAll,
+            });
+            await session.rpc.mcp.reload();
+            await waitForCondition(
+                async () =>
+                    (await session.rpc.mcp.list()).servers.some(
+                        (server) => server.name === "WorkIQ" && server.status === "connected"
+                    ),
+                { timeoutMessage: "Persisted WorkIQ authentication did not reconnect" }
+            );
+            expect(grants).toHaveLength(initialGrantCount + 1);
+            await session.rpc.accounts.set({ command: { kind: "logout", selectionId: parent } });
+            expect(
+                (await session.rpc.mcp.list()).servers.some((server) => server.name === "WorkIQ")
+            ).toBe(false);
+            await expect(session.rpc.mcp.listTools({ serverName: "WorkIQ" })).rejects.toThrow();
+        }
+    );
+});
diff --git a/nodejs/test/extension.test.ts b/nodejs/test/extension.test.ts
index 676f6dff2b..132f5a8fc7 100644
--- a/nodejs/test/extension.test.ts
+++ b/nodejs/test/extension.test.ts
@@ -1,6 +1,6 @@
 import { afterEach, describe, expect, it, vi } from "vitest";
 import { CopilotClient } from "../src/client.js";
-import { approveAll } from "../src/index.js";
+import { approveAll, type CopilotSession } from "../src/index.js";
 import { createCanvas, defineWorkflow, joinSession } from "../src/extension.js";
 import { defaultJoinSessionPermissionHandler } from "../src/types.js";
 
@@ -80,6 +80,20 @@ describe("joinSession", () => {
         expect(resumeForExtension.mock.calls[1]![3]).toBeUndefined();
     });
 
+    it("strips a skill provider, which only the session's owning client may supply", async () => {
+        process.env.SESSION_ID = "session-123";
+        const resumeForExtension = vi
+            .spyOn(CopilotClient.prototype, "resumeSessionForExtension")
+            .mockResolvedValue({} as any);
+        const skillProvider = { listSkills: () => [], readSkill: () => null };
+
+        // Untyped callers can still pass the field that JoinSessionConfig omits.
+        await joinSession({ tools: [], skillProvider } as Parameters<typeof joinSession>[0]);
+
+        const [, config] = resumeForExtension.mock.calls[0]!;
+        expect(config).not.toHaveProperty("skillProvider");
+    });
+
     it("forwards workflow contributions independently", async () => {
         process.env.SESSION_ID = "session-123";
         const resumeForExtension = vi
@@ -97,6 +111,22 @@ describe("joinSession", () => {
         });
     });
 
+    it.each([true, false])(
+        "strips image generation consent (%s) from extension joins",
+        async (enabled) => {
+            process.env.SESSION_ID = "session-123";
+            const resumeForExtension = vi
+                .spyOn(CopilotClient.prototype, "resumeSessionForExtension")
+                .mockResolvedValue({} as CopilotSession);
+
+            const config = { tools: [], imageGeneration: { enabled } };
+            await joinSession(config);
+
+            const [, forwarded] = resumeForExtension.mock.calls[0]!;
+            expect(forwarded).not.toHaveProperty("imageGeneration");
+        }
+    );
+
     it("exports the canvas helper from the extension surface", () => {
         const canvas = createCanvas({
             id: "counter",
diff --git a/nodejs/test/ffiRuntimeHost.test.ts b/nodejs/test/ffiRuntimeHost.test.ts
index b5badfb27c..f7e19686fd 100644
--- a/nodejs/test/ffiRuntimeHost.test.ts
+++ b/nodejs/test/ffiRuntimeHost.test.ts
@@ -109,6 +109,18 @@ describe("FfiRuntimeHost callback cleanup", () => {
         vi.useRealTimers();
     });
 
+    it("forwards the CLI login sync integration without a CLI entrypoint", async () => {
+        const host = FfiRuntimeHost.create("runtime.node", undefined, undefined, [
+            "--cli-login-sync-integration-id=github/github-app",
+        ]);
+        await host.start();
+
+        const argv = JSON.parse(ffi.hostStart.async.mock.calls[0][0].toString()) as string[];
+        expect(argv).toEqual(["--cli-login-sync-integration-id=github/github-app"]);
+
+        await host.dispose();
+    });
+
     it("finishes disposal after a false close while retaining resources for the detached retry", async () => {
         ffi.connectionClose.async.mockImplementationOnce((_id, callback) => callback(null, false));
         const host = FfiRuntimeHost.create("runtime.node", undefined, undefined, []);
diff --git a/nodejs/test/force-stop.test.ts b/nodejs/test/force-stop.test.ts
new file mode 100644
index 0000000000..0b220e4f6b
--- /dev/null
+++ b/nodejs/test/force-stop.test.ts
@@ -0,0 +1,298 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { createServer, type Socket } from "node:net";
+import { setImmediate } from "node:timers/promises";
+import { queryObjects } from "node:v8";
+import { describe, expect, it, onTestFinished } from "vitest";
+import {
+    createMessageConnection,
+    type MessageConnection,
+    StreamMessageReader,
+    StreamMessageWriter,
+} from "vscode-jsonrpc/node.js";
+import { approveAll, CopilotClient, RuntimeConnection } from "../src/index.js";
+import type { SessionConfig } from "../src/index.js";
+import { SDK_PROTOCOL_VERSION } from "../src/sdkProtocolVersion.js";
+
+async function connectedClient(expectedSends: number, beforeDetach?: () => Promise<void>) {
+    const sockets = new Set<Socket>();
+    const connections = new Set<MessageConnection>();
+    let sent = 0;
+    let detachRequests = 0;
+    let markSent!: () => void;
+    const sendsReceived = new Promise<void>((resolve) => {
+        markSent = resolve;
+    });
+
+    const server = createServer((socket) => {
+        sockets.add(socket);
+        const connection = createMessageConnection(
+            new StreamMessageReader(socket),
+            new StreamMessageWriter(socket)
+        );
+        connections.add(connection);
+        connection.onRequest("connect", () => ({
+            ok: true,
+            protocolVersion: SDK_PROTOCOL_VERSION,
+            version: "force-stop-test",
+        }));
+        connection.onRequest("ping", () => ({
+            message: "pong",
+            timestamp: "2026-01-01T00:00:00Z",
+            protocolVersion: SDK_PROTOCOL_VERSION,
+        }));
+        connection.onRequest("session.create", (params: { sessionId: string }) => ({
+            sessionId: params.sessionId,
+        }));
+        connection.onRequest("session.eventLog.registerInterest", (params) => {
+            expect(params).toMatchObject({
+                eventType: "mcp.oauth_required",
+            });
+            return { success: true };
+        });
+        connection.onRequest("session.send", () => {
+            sent++;
+            if (sent === expectedSends) markSent();
+            return { messageId: `message-${sent}` };
+        });
+        connection.onRequest("session.detach", async () => {
+            detachRequests++;
+            await beforeDetach?.();
+            return { success: true };
+        });
+        connection.onRequest((method) => {
+            throw new Error(`Unexpected RPC: ${method}`);
+        });
+        connection.listen();
+    });
+    let client: CopilotClient | undefined;
+    onTestFinished(async () => {
+        try {
+            await client?.forceStop();
+        } finally {
+            for (const connection of connections) connection.dispose();
+            for (const socket of sockets) socket.destroy();
+            if (server.listening) {
+                await new Promise<void>((resolve, reject) => {
+                    server.close((error) => (error ? reject(error) : resolve()));
+                });
+            }
+        }
+    });
+    await new Promise<void>((resolve, reject) => {
+        server.once("error", reject);
+        server.listen(0, "127.0.0.1", () => {
+            server.off("error", reject);
+            resolve();
+        });
+    });
+    const address = server.address();
+    if (!address || typeof address === "string") {
+        throw new Error("Expected a TCP listening address");
+    }
+    client = new CopilotClient({
+        connection: RuntimeConnection.forUri(`127.0.0.1:${address.port}`),
+    });
+    await client.start();
+    return { client, sendsReceived, detachRequests: () => detachRequests };
+}
+
+describe("forceStop response retirement", () => {
+    it.each([1, 2])(
+        "rejects %i acknowledged plain waits without waiting for idle",
+        async (count) => {
+            const peer = await connectedClient(count);
+            const session = await peer.client.createSession({
+                sessionId: "retirement-session",
+                onPermissionRequest: approveAll,
+            });
+            const waits = Array.from({ length: count }, () =>
+                session.sendAndWait({ prompt: "hold the response" }, 1000)
+            );
+            const rejected = waits.map((wait) =>
+                expect(wait).rejects.toThrow(/Session disconnected while waiting for a response/)
+            );
+            await peer.sendsReceived;
+            // An ordered RPC reply proves the earlier send acknowledgments were received.
+            await peer.client.ping();
+
+            await peer.client.forceStop();
+
+            await Promise.all(rejected);
+            await session.disconnect();
+            expect(peer.detachRequests()).toBe(0);
+            expect(() => session.on(() => {})).toThrow("Session is disconnected");
+            expect(() => session.on("session.idle", () => {})).toThrow("Session is disconnected");
+        }
+    );
+});
+
+type CapturedRegistration = "hooks" | "mcp" | "bearer" | "transforms";
+
+function capturedConfig(
+    kind: CapturedRegistration,
+    Capture: new () => { read(): string }
+): SessionConfig {
+    const capture = new Capture();
+    switch (kind) {
+        case "hooks":
+            return {
+                onPermissionRequest: approveAll,
+                hooks: { onSessionStart: () => ({ additionalContext: capture.read() }) },
+            };
+        case "mcp":
+            return {
+                onPermissionRequest: approveAll,
+                onMcpAuthRequest: () => {
+                    capture.read();
+                    return null;
+                },
+            };
+        case "bearer":
+            return {
+                onPermissionRequest: approveAll,
+                model: "test-model",
+                provider: {
+                    baseUrl: "http://127.0.0.1",
+                    bearerTokenProvider: async () => capture.read(),
+                },
+            };
+        case "transforms":
+            return {
+                onPermissionRequest: approveAll,
+                systemMessage: {
+                    mode: "customize",
+                    sections: {
+                        task_instructions: {
+                            action: (content) => capture.read() + content,
+                        },
+                    },
+                },
+            };
+    }
+}
+
+describe("forceStop callback ownership", () => {
+    it.each(["hooks", "mcp", "bearer", "transforms"] satisfies CapturedRegistration[])(
+        "releases a retained session's %s capture",
+        async (kind) => {
+            class Capture {
+                read() {
+                    return "owned-capture";
+                }
+            }
+            const peer = await connectedClient(0);
+            const session = await peer.client.createSession(capturedConfig(kind, Capture));
+            await setImmediate();
+            expect(queryObjects(Capture, { format: "count" })).toBe(1);
+
+            await peer.client.forceStop();
+            await setImmediate();
+
+            expect(queryObjects(Capture, { format: "count" })).toBe(0);
+            expect(session.sessionId).toBeTruthy();
+        }
+    );
+
+    it("preserves caller-owned hook and transform configuration", async () => {
+        const peer = await connectedClient(0);
+        const session = await peer.client.createSession({ onPermissionRequest: approveAll });
+        const hook = () => ({ additionalContext: "caller-owned" });
+        const hooks = { onSessionStart: hook };
+        const transform = (content: string) => content;
+        const transforms = new Map([["task_instructions", transform]]);
+        session.registerHooks(hooks);
+        session.registerTransformCallbacks(transforms);
+
+        await peer.client.forceStop();
+
+        expect(hooks.onSessionStart).toBe(hook);
+        expect(transforms.get("task_instructions")).toBe(transform);
+    });
+
+    it("rejects retired callback registration and dispatch", async () => {
+        const peer = await connectedClient(0);
+        const session = await peer.client.createSession({ onPermissionRequest: approveAll });
+        await peer.client.forceStop();
+        const registrations = [
+            () => session.registerTools(),
+            () => session.registerCanvases(),
+            () => session.registerWorkflows(),
+            () => session.registerBearerTokenProviders(),
+            () => session.registerCommands(),
+            () => session.registerElicitationHandler(),
+            () => session.registerExitPlanModeHandler(),
+            () => session.registerAutoModeSwitchHandler(),
+            () => session.registerPermissionHandler(),
+            () => session.registerUserInputHandler(),
+            () => session.registerSkillProvider(),
+            () => session.registerHooks(),
+            () => session.registerTransformCallbacks(),
+        ];
+        for (const register of registrations) {
+            expect(register).toThrow("Session is disconnected");
+        }
+        await expect(session._handleHooksInvoke("sessionStart", {})).rejects.toThrow(
+            "Session is disconnected"
+        );
+        await expect(
+            session._handleSystemMessageTransform({
+                task_instructions: { content: "unchanged" },
+            })
+        ).rejects.toThrow("Session is disconnected");
+        await expect(session._handleSkillProviderList()).rejects.toThrow("Session is disconnected");
+    });
+
+    it("keeps hooks available through ordinary detach acknowledgement", async () => {
+        let markDetach!: () => void;
+        const detachStarted = new Promise<void>((resolve) => {
+            markDetach = resolve;
+        });
+        let releaseDetach!: () => void;
+        const detachAllowed = new Promise<void>((resolve) => {
+            releaseDetach = resolve;
+        });
+        const peer = await connectedClient(0, () => {
+            markDetach();
+            return detachAllowed;
+        });
+        const hookCalls: string[] = [];
+        const session = await peer.client.createSession({
+            onPermissionRequest: approveAll,
+            hooks: {
+                onSessionEnd: () => {
+                    hookCalls.push("detach-hook");
+                },
+            },
+        });
+        const disconnect = session.disconnect();
+        let bodyFailure: unknown;
+        try {
+            await detachStarted;
+            await session._handleHooksInvoke("sessionEnd", {});
+            expect(hookCalls).toEqual(["detach-hook"]);
+        } catch (error) {
+            bodyFailure = error;
+        } finally {
+            releaseDetach();
+            try {
+                await disconnect;
+            } catch (cleanupError) {
+                bodyFailure =
+                    bodyFailure === undefined
+                        ? cleanupError
+                        : new AggregateError(
+                              [bodyFailure, cleanupError],
+                              "Detach hook test and cleanup failed"
+                          );
+            }
+        }
+        if (bodyFailure !== undefined) throw bodyFailure;
+        await expect(session._handleHooksInvoke("sessionEnd", {})).rejects.toThrow(
+            "Session is disconnected"
+        );
+        expect(hookCalls).toEqual(["detach-hook"]);
+    });
+});
diff --git a/nodejs/test/helpers/withTestCleanup.ts b/nodejs/test/helpers/withTestCleanup.ts
new file mode 100644
index 0000000000..49e9d312db
--- /dev/null
+++ b/nodejs/test/helpers/withTestCleanup.ts
@@ -0,0 +1,43 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+/** Attempt every cleanup without hiding the test-body failure or accepting failed teardown. */
+export async function withTestCleanup<T>(
+    run: () => Promise<T>,
+    ...cleanups: Array<() => void | Promise<void>>
+): Promise<T> {
+    const outcome = await Promise.resolve()
+        .then(run)
+        .then(
+            (value) => ({ value }),
+            (error: unknown) => ({ error })
+        );
+    const cleanupErrors: unknown[] = [];
+    for (const cleanup of cleanups) {
+        try {
+            await cleanup();
+        } catch (error) {
+            cleanupErrors.push(error);
+        }
+    }
+    if ("error" in outcome) {
+        if (cleanupErrors.length > 0) {
+            throw new AggregateError(
+                [outcome.error, ...cleanupErrors],
+                "Test body and cleanup failed",
+                {
+                    cause: outcome.error,
+                }
+            );
+        }
+        throw outcome.error;
+    }
+    if (cleanupErrors.length === 1) {
+        throw cleanupErrors[0];
+    }
+    if (cleanupErrors.length > 1) {
+        throw new AggregateError(cleanupErrors, "Test cleanup failed");
+    }
+    return outcome.value;
+}
diff --git a/nodejs/test/host-client.test.ts b/nodejs/test/host-client.test.ts
index 98d2f48e28..6d68d8bd8f 100644
--- a/nodejs/test/host-client.test.ts
+++ b/nodejs/test/host-client.test.ts
@@ -60,7 +60,11 @@ describe("CopilotClient.startAhpHost", () => {
     it.each([false, true])(
         "forwards GitHub hosting with optional local transport (%s)",
         async (local) => {
-            const githubEnvironment = { name: "Application", computeId: "stable-installation-id" };
+            const githubEnvironment = {
+                name: "Application",
+                computeId: "stable-installation-id",
+                requireConnectionBinding: false,
+            };
             const start = vi.fn(({ hostId }: HostStartRequest) => ({
                 hostId,
                 environmentId: "environment-1",
@@ -68,6 +72,7 @@ describe("CopilotClient.startAhpHost", () => {
             }));
             const client = await fixture((rpc) => rpc.onRequest("host.start", start));
             const options = {
+                computeId: githubEnvironment.computeId,
                 githubEnvironment,
                 ...(local ? { localServer: {} } : {}),
             };
@@ -80,6 +85,20 @@ describe("CopilotClient.startAhpHost", () => {
         }
     );
 
+    it.each([undefined, "", "stable-local-compute"])(
+        "forwards local compute identity without supplying SDK defaults (%s)",
+        async (computeId) => {
+            const start = vi.fn(({ hostId }: HostStartRequest) => info(hostId));
+            const client = await fixture((rpc) => rpc.onRequest("host.start", start));
+            await client.startAhpHost({ localServer: {}, computeId });
+            expect(start.mock.calls[0]?.[0]).toEqual({
+                hostId: expect.any(String),
+                localServer: {},
+                ...(computeId === undefined ? {} : { computeId }),
+            });
+        }
+    );
+
     it("snapshots factories and release callbacks at startup", async () => {
         let rpc!: MessageConnection;
         const client = await fixture((connection) => {
@@ -433,9 +452,11 @@ describe("CopilotClient.startAhpHost", () => {
             sessionId,
             sessionUri: `copilot:/${sessionId}`,
         }));
+        const listSessions = vi.fn((_params: { hostId: string }) => ({ sessions: [] }));
         const client = await fixture((rpc) => {
             rpc.onRequest("host.start", ({ hostId }: HostStartRequest) => info(hostId));
             rpc.onRequest("host.publishSession", publish);
+            rpc.onRequest("host.listSessions", listSessions);
         });
         const host = await client.startAhpHost({ localServer: {} });
         await expect(host.publishSession("existing")).resolves.toEqual({
@@ -443,6 +464,9 @@ describe("CopilotClient.startAhpHost", () => {
             sessionUri: "copilot:/existing",
         });
         expect(publish.mock.calls[0][0]).toEqual({ hostId: host.hostId, sessionId: "existing" });
+        await expect(host.listSessions()).resolves.toEqual({ sessions: [] });
+        expect(listSessions).toHaveBeenCalledOnce();
+        expect(listSessions.mock.calls[0]?.[0]).toEqual({ hostId: host.hostId });
     });
     it("allows the owner callback to create a session while host.start is still pending", async () => {
         const client = await fixture((rpc) => {
diff --git a/nodejs/test/host.test.ts b/nodejs/test/host.test.ts
index 36549de70b..7b02669353 100644
--- a/nodejs/test/host.test.ts
+++ b/nodejs/test/host.test.ts
@@ -18,6 +18,7 @@ describe("AhpHost", () => {
     it("keeps generated listener options optional but nonnullable", () => {
         expectTypeOf<HostStartRequest>().toEqualTypeOf<{
             hostId: string;
+            computeId?: string;
             localServer?: HostLocalServerOptions;
             githubEnvironment?: HostGitHubEnvironmentOptions;
             sessionFactory?: boolean;
@@ -37,7 +38,7 @@ describe("AhpHost", () => {
 
     it("exposes connection information without starting a process or exposing closed", () => {
         const dispose = vi.fn();
-        const host = new AhpHost(info, dispose, vi.fn());
+        const host = new AhpHost(info, dispose, vi.fn(), vi.fn());
 
         expect(host.hostId).toBe(info.hostId);
         expect(host.url).toBe(info.url);
@@ -48,7 +49,7 @@ describe("AhpHost", () => {
     });
 
     it("preserves an optional legacy separate host process ID", () => {
-        const host = new AhpHost({ ...info, pid: 1234 }, vi.fn(), vi.fn());
+        const host = new AhpHost({ ...info, pid: 1234 }, vi.fn(), vi.fn(), vi.fn());
         expect(host.pid).toBe(1234);
     });
 
@@ -56,6 +57,7 @@ describe("AhpHost", () => {
         const host = new AhpHost(
             { hostId: "remote", environmentId: "environment-1" },
             vi.fn(),
+            vi.fn(),
             vi.fn()
         );
         expect(host.environmentId).toBe("environment-1");
@@ -66,13 +68,13 @@ describe("AhpHost", () => {
 
     it("supports a listener without a connection token", () => {
         const { token: _token, ...withoutToken } = info;
-        const host = new AhpHost(withoutToken, vi.fn(), vi.fn());
+        const host = new AhpHost(withoutToken, vi.fn(), vi.fn(), vi.fn());
         expect(host.token).toBeUndefined();
     });
 
     it("forwards concurrent, repeated, and async disposal calls independently", async () => {
         const dispose = vi.fn(async () => {});
-        const host = new AhpHost(info, dispose, vi.fn());
+        const host = new AhpHost(info, dispose, vi.fn(), vi.fn());
 
         await Promise.all([host.dispose(), host.dispose()]);
         await host.dispose();
@@ -83,7 +85,7 @@ describe("AhpHost", () => {
     it("returns the disposal promise without handling or retrying failures", async () => {
         const failure = Promise.reject(new Error("connection write failed"));
         const dispose = vi.fn(() => failure);
-        const host = new AhpHost(info, dispose, vi.fn());
+        const host = new AhpHost(info, dispose, vi.fn(), vi.fn());
 
         expect(host.dispose()).toBe(failure);
         await expect(failure).rejects.toThrow("connection write failed");
@@ -93,8 +95,16 @@ describe("AhpHost", () => {
     it("forwards existing session publication without creating or copying a session", async () => {
         const result = { sessionId: "resident", sessionUri: "copilot:/resident" };
         const publish = vi.fn(async () => result);
-        const host = new AhpHost(info, vi.fn(), publish);
+        const host = new AhpHost(info, vi.fn(), publish, vi.fn());
         await expect(host.publishSession("resident")).resolves.toBe(result);
         expect(publish).toHaveBeenCalledExactlyOnceWith("resident");
     });
+
+    it("forwards host session listing to the owning RPC", async () => {
+        const result = { sessions: [] };
+        const listSessions = vi.fn(async () => result);
+        const host = new AhpHost(info, vi.fn(), vi.fn(), listSessions);
+        await expect(host.listSessions()).resolves.toBe(result);
+        expect(listSessions).toHaveBeenCalledOnce();
+    });
 });
diff --git a/nodejs/test/image-generation.test.ts b/nodejs/test/image-generation.test.ts
new file mode 100644
index 0000000000..93e5a4d71b
--- /dev/null
+++ b/nodejs/test/image-generation.test.ts
@@ -0,0 +1,78 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+
+import { once } from "node:events";
+import { createServer } from "node:net";
+import { describe, expect, it, onTestFinished } from "vitest";
+import {
+    createMessageConnection,
+    StreamMessageReader,
+    StreamMessageWriter,
+    type MessageConnection,
+} from "vscode-jsonrpc/node.js";
+import {
+    approveAll,
+    CopilotClient,
+    RuntimeConnection,
+    type ImageGenerationConfig,
+} from "../src/index.js";
+import { getSdkProtocolVersion } from "../src/sdkProtocolVersion.js";
+
+describe("image generation request serialization", () => {
+    it.each([undefined, {}, { enabled: true }, { enabled: false }] satisfies (
+        | ImageGenerationConfig
+        | undefined
+    )[])("forwards %j on create and resume", async (imageGeneration) => {
+        const requests = new Map<string, Record<string, unknown>>();
+        const connections: MessageConnection[] = [];
+        const server = createServer((socket) => {
+            const connection = createMessageConnection(
+                new StreamMessageReader(socket),
+                new StreamMessageWriter(socket)
+            );
+            connections.push(connection);
+            connection.onRequest((method, params) => {
+                if (method === "connect") {
+                    return { ok: true, protocolVersion: getSdkProtocolVersion(), version: "test" };
+                }
+                if (method === "session.create" || method === "session.resume") {
+                    const payload = params as Record<string, unknown>;
+                    requests.set(method, payload);
+                    return { sessionId: payload.sessionId };
+                }
+                return {};
+            });
+            connection.listen();
+        });
+        onTestFinished(async () => {
+            for (const connection of connections) connection.dispose();
+            await new Promise<void>((resolve, reject) =>
+                server.close((error) => (error ? reject(error) : resolve()))
+            );
+        });
+        server.listen(0, "127.0.0.1");
+        await once(server, "listening");
+        const address = server.address();
+        if (!address || typeof address === "string") throw new Error("Missing TCP address");
+        const client = new CopilotClient({
+            connection: RuntimeConnection.forUri(`127.0.0.1:${address.port}`),
+        });
+        onTestFinished(() => client.forceStop());
+        const session = await client.createSession({
+            onPermissionRequest: approveAll,
+            imageGeneration,
+        });
+        await client.resumeSession(session.sessionId, {
+            onPermissionRequest: approveAll,
+            imageGeneration,
+        });
+        for (const method of ["session.create", "session.resume"]) {
+            const payload = requests.get(method);
+            expect(payload).toBeDefined();
+            if (imageGeneration === undefined) {
+                expect(payload).not.toHaveProperty("imageGeneration");
+            } else {
+                expect(payload?.imageGeneration).toEqual(imageGeneration);
+            }
+        }
+    });
+});
diff --git a/nodejs/test/java-codegen.test.ts b/nodejs/test/java-codegen.test.ts
index d44fb039a5..28db7fe54a 100644
--- a/nodejs/test/java-codegen.test.ts
+++ b/nodejs/test/java-codegen.test.ts
@@ -1,6 +1,11 @@
+import type { JSONSchema7 } from "json-schema";
 import { describe, expect, it } from "vitest";
 
-import { renderRpcTypes, renderRpcWrappers } from "../../java/scripts/codegen/java.ts";
+import {
+    generateRpcClass,
+    renderRpcTypes,
+    renderRpcWrappers,
+} from "../../java/scripts/codegen/java.ts";
 
 function rpcSource(files: Map<string, string>, name: string): string {
     const source = files.get(
@@ -10,6 +15,126 @@ function rpcSource(files: Map<string, string>, name: string): string {
     return source!;
 }
 
+describe("java RPC primitive results", () => {
+    it.each([
+        ["boolean", "Boolean"],
+        ["integer", "Long"],
+        ["number", "Double"],
+        ["string", "String"],
+    ] as const)("preserves inline and referenced %s results", async (type, javaType) => {
+        const schema = {
+            server: {
+                sample: {
+                    inline: {
+                        rpcMethod: "sample.inline",
+                        params: null,
+                        result: { type },
+                    },
+                    referenced: {
+                        rpcMethod: "sample.referenced",
+                        visibility: "internal",
+                        params: null,
+                        result: { $ref: "#/definitions/ScalarResult" },
+                    },
+                    empty: { rpcMethod: "sample.empty", params: null, result: null },
+                },
+            },
+            definitions: { ScalarResult: { type } },
+        } satisfies Parameters<typeof renderRpcWrappers>[0];
+        const code = rpcSource(await renderRpcWrappers(schema), "ServerSampleApi");
+
+        expect(code).toContain(`CompletableFuture<${javaType}> inline()`);
+        expect(code).toContain(`"sample.inline", java.util.Map.of(), ${javaType}.class`);
+        expect(code).toContain(`CompletableFuture<${javaType}> referenced()`);
+        expect(code).toContain(`"sample.referenced", java.util.Map.of(), ${javaType}.class`);
+        expect(code).toContain("CompletableFuture<Void> empty()");
+        expect(code).toContain('"sample.empty", java.util.Map.of(), Void.class');
+    });
+});
+
+it("preserves boolean-map RPC results without widening them to JsonNode", async () => {
+    const files = await renderRpcWrappers({
+        server: {
+            sample: {
+                flags: {
+                    rpcMethod: "sample.flags",
+                    params: null,
+                    result: { type: "object", additionalProperties: { type: "boolean" } },
+                },
+                document: {
+                    rpcMethod: "sample.document",
+                    params: null,
+                    result: { type: "object", additionalProperties: true },
+                },
+            },
+        },
+    });
+    const source = rpcSource(files, "ServerSampleApi");
+    expect(source).toContain("import java.util.Map;");
+    expect(source).toContain("CompletableFuture<Map<String, Boolean>> flags()");
+    expect(source).toContain("constructMapType(Map.class, String.class, Boolean.class)");
+    expect(source).toContain("CompletableFuture<JsonNode> document()");
+});
+
+describe("Java required opaque JSON parameters", () => {
+    it.each([
+        ["user", "applyTopKey"],
+        ["repo", "writeKey"],
+    ])("preserves optional value presence in %s.settings.%s", async (namespace, action) => {
+        const rpcMethod = `${namespace}.settings.${action}`;
+        const files = await renderRpcWrappers({
+            server: {
+                [namespace]: {
+                    settings: {
+                        [action]: {
+                            rpcMethod,
+                            params: {
+                                type: "object",
+                                properties: {
+                                    value: { "x-opaque-json": true } as JSONSchema7,
+                                    delete: { type: "boolean" },
+                                },
+                            },
+                            result: null,
+                        },
+                    },
+                },
+            },
+        });
+        const source = rpcSource(
+            files,
+            `Server${namespace === "user" ? "User" : "Repo"}SettingsApi`
+        );
+        expect(source).toContain(`return caller.invoke("${rpcMethod}", params, Void.class);`);
+        expect(source).not.toContain('putNull("value")');
+    });
+
+    it("preserves a required JSON null without emitting absent optional fields", () => {
+        const opaque = { "x-opaque-json": true } as JSONSchema7;
+        const { code } = generateRpcClass(
+            "SettingsUpdateParams",
+            {
+                type: "object",
+                required: ["value"],
+                properties: {
+                    value: opaque,
+                    optionalValue: opaque,
+                },
+            },
+            new Map(),
+            "com.github.copilot.generated.rpc",
+            "internal",
+            true
+        );
+        expect(code).toContain(
+            '@JsonInclude(JsonInclude.Include.ALWAYS)\n    @JsonProperty("value") Object value'
+        );
+        expect(code).not.toContain(
+            '@JsonInclude(JsonInclude.Include.ALWAYS)\n    @JsonProperty("optionalValue")'
+        );
+    });
+});
+
 describe("java RPC codegen visibility", () => {
     const schema = {
         server: {
diff --git a/nodejs/test/mcp-list.test.ts b/nodejs/test/mcp-list.test.ts
new file mode 100644
index 0000000000..a0b9dee64f
--- /dev/null
+++ b/nodejs/test/mcp-list.test.ts
@@ -0,0 +1,85 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { PassThrough } from "node:stream";
+import { createMessageConnection } from "vscode-jsonrpc/node.js";
+import { describe, expect, it, vi } from "vitest";
+import { createSessionRpc } from "../src/generated/rpc.js";
+
+describe("session MCP wire contracts", () => {
+    it("uses parameterless list endpoints with the wrapper session", async () => {
+        const input = new PassThrough();
+        const output = new PassThrough();
+        const connection = createMessageConnection(input, output);
+        const sendRequest = vi.spyOn(connection, "sendRequest").mockResolvedValue({ servers: [] });
+        try {
+            const mcp = createSessionRpc(connection, "wrapper-session").mcp;
+            await mcp.list();
+            await mcp.listConfigured();
+            expect(sendRequest.mock.calls).toEqual([
+                ["session.mcp.list", { sessionId: "wrapper-session" }],
+                ["session.mcp.listConfigured", { sessionId: "wrapper-session" }],
+            ]);
+        } finally {
+            connection.dispose();
+            input.destroy();
+            output.destroy();
+        }
+    });
+
+    it("keeps the wrapper session authoritative over a supplied sessionId", async () => {
+        const input = new PassThrough();
+        const output = new PassThrough();
+        const connection = createMessageConnection(input, output);
+        const sendRequest = vi.spyOn(connection, "sendRequest").mockResolvedValue(undefined);
+        try {
+            const mcp = createSessionRpc(connection, "wrapper-session").mcp;
+            const params = { serverName: "test-server", sessionId: "forged-session" };
+            await mcp.enable(params);
+            expect(sendRequest.mock.calls).toEqual([
+                ["session.mcp.enable", { serverName: "test-server", sessionId: "wrapper-session" }],
+            ]);
+        } finally {
+            connection.dispose();
+            input.destroy();
+            output.destroy();
+        }
+    });
+
+    it("returns required runtime lifecycle independently of configuration enablement", async () => {
+        const input = new PassThrough();
+        const output = new PassThrough();
+        const connection = createMessageConnection(input, output);
+        const servers = [
+            { name: "cold", enabled: true, live: { status: "not_configured" } },
+            { name: "old-connection", enabled: false, live: { status: "connected" } },
+            { name: "auth", enabled: true, live: { status: "needs-auth" } },
+            { name: "stopped", enabled: true, live: { status: "stopped" } },
+            {
+                name: "failed",
+                enabled: true,
+                live: { status: "failed", error: "connection failed" },
+            },
+        ];
+        vi.spyOn(connection, "sendRequest").mockResolvedValue({ servers });
+        try {
+            const result = await createSessionRpc(
+                connection,
+                "wrapper-session"
+            ).mcp.listConfigured();
+            expect(result.servers).toEqual(servers);
+            expect(result.servers.map((server) => server.live.status)).toEqual([
+                "not_configured",
+                "connected",
+                "needs-auth",
+                "stopped",
+                "failed",
+            ]);
+        } finally {
+            connection.dispose();
+            input.destroy();
+            output.destroy();
+        }
+    });
+});
diff --git a/nodejs/test/python-codegen.test.ts b/nodejs/test/python-codegen.test.ts
index 2fdc6ffa3a..36cb7e3133 100644
--- a/nodejs/test/python-codegen.test.ts
+++ b/nodejs/test/python-codegen.test.ts
@@ -43,6 +43,43 @@ describe("Python RPC projection compatibility", () => {
         "utf8"
     );
 
+    it("deserializes usage results shared with session events", () => {
+        expect(code).toContain(
+            'return UsageGetMetricsResult.from_dict(await self._client.request("session.usage.getMetrics"'
+        );
+    });
+
+    it("returns typed quota warning projections", () => {
+        expect(code).toContain(
+            "async def take_warnings(self, *, timeout: float | None = None) -> list[QuotaWarningProjection]:"
+        );
+        expect(code).toContain(
+            'return from_list(QuotaWarningProjection.from_dict, await self._client.request("session.quota.takeWarnings"'
+        );
+    });
+
+    it.each([
+        "account.getAllUsers",
+        "sessions.getClientMetadata",
+        "session.gitHubAuth.getAllAuthAvailable",
+        "session.gitHubAuth.lastAuthErrors",
+    ])("preserves the published dictionary-array result for %s", (method) => {
+        expect(code).toContain(`return list(await self._client.request("${method}"`);
+    });
+
+    it("keeps the managed permission discriminator independent of MCP URL kinds", () => {
+        expect(code).toContain("class ManagedPermissionOperationKind(Enum):");
+        const operation = code
+            .split("class ManagedPermissionOperation:")[1]
+            ?.split("\n\n@dataclass")[0];
+        expect(operation).toContain("kind: ManagedPermissionOperationKind");
+        expect(operation).toContain('kind = ManagedPermissionOperationKind(obj.get("kind"))');
+        expect(operation).toContain(
+            'result["kind"] = to_enum(ManagedPermissionOperationKind, self.kind)'
+        );
+        expect(operation).not.toContain("MCPServerCardURLKind");
+    });
+
     it("preserves the existing Workflow checkpoint result API", () => {
         const result = "SessionWorkflowPauseAtCheckpointResult";
         expect(code).toContain(`class ${result}:`);
@@ -262,6 +299,20 @@ describe("Python append-last RPC fields", () => {
 describe("Python append-last fields for a selected schema", () => {
     const fields = [["Request", "addedField"]] as const;
 
+    it("appends Auto metadata without shifting model-list positional arguments", () => {
+        expect(
+            pythonAppendLastFieldsPresentIn({
+                SessionModelList: {
+                    type: "object",
+                    properties: {
+                        list: { type: "array", items: {} },
+                        auto: { type: "object" },
+                    },
+                },
+            })
+        ).toEqual([["SessionModelList", "auto"]]);
+    });
+
     it("keeps an entry whose property the schema declares", () => {
         expect(
             pythonAppendLastFieldsPresentIn(
@@ -271,6 +322,45 @@ describe("Python append-last fields for a selected schema", () => {
         ).toEqual(fields);
     });
 
+    it("includes fields marked append-last by the contract schema", () => {
+        expect(
+            pythonAppendLastFieldsPresentIn({
+                Response: {
+                    type: "object",
+                    properties: {
+                        stableField: { type: "string" },
+                        addedField: {
+                            type: "string",
+                            "x-copilot-sdk-append-last": true,
+                        },
+                    },
+                },
+            })
+        ).toContainEqual(["Response", "addedField"]);
+    });
+
+    it.each(["anyOf", "oneOf"] as const)(
+        "includes marked fields in inline %s variants once",
+        (keyword) => {
+            expect(
+                pythonAppendLastFieldsPresentIn({
+                    Response: {
+                        [keyword]: ["first", "second"].map((kind) => ({
+                            type: "object",
+                            properties: {
+                                kind: { const: kind },
+                                addedField: {
+                                    type: "string",
+                                    "x-copilot-sdk-append-last": true,
+                                },
+                            },
+                        })),
+                    },
+                })
+            ).toEqual([["Response", "addedField"]]);
+        }
+    );
+
     it("skips an entry for a legacy request or a schema without the definition", () => {
         expect(
             pythonAppendLastFieldsPresentIn(
diff --git a/nodejs/test/reasoning-summaries-types.test.ts b/nodejs/test/reasoning-summaries-types.test.ts
new file mode 100644
index 0000000000..556b6765b4
--- /dev/null
+++ b/nodejs/test/reasoning-summaries-types.test.ts
@@ -0,0 +1,19 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { expectTypeOf, it } from "vitest";
+import type {
+    CopilotSession,
+    ModelGetReasoningSummariesRequest,
+    ModelGetReasoningSummariesResult,
+} from "../src/index.js";
+
+it("exports reasoning-summary request and result types from the package root", () => {
+    expectTypeOf<ModelGetReasoningSummariesRequest>().toEqualTypeOf<
+        Parameters<CopilotSession["rpc"]["model"]["getReasoningSummaries"]>[0]
+    >();
+    expectTypeOf<ModelGetReasoningSummariesResult>().toEqualTypeOf<
+        Awaited<ReturnType<CopilotSession["rpc"]["model"]["getReasoningSummaries"]>>
+    >();
+});
diff --git a/nodejs/test/rust-codegen.test.ts b/nodejs/test/rust-codegen.test.ts
index 17fc4eea47..ce3ee6b426 100644
--- a/nodejs/test/rust-codegen.test.ts
+++ b/nodejs/test/rust-codegen.test.ts
@@ -17,6 +17,80 @@ import {
 import { legacyRequestSchema } from "./legacy-parameters-fixture.ts";
 
 describe("Rust API type codegen", () => {
+    it("reuses the named managed operation and kind in request and result fields", () => {
+        const code = generateApiTypesCode({
+            definitions: {
+                ManagedPermissionOperation: {
+                    anyOf: [
+                        {
+                            type: "object",
+                            properties: {
+                                kind: { type: "string", const: "url" },
+                                url: { type: "string" },
+                            },
+                            required: ["kind", "url"],
+                        },
+                    ],
+                },
+                ManagedPermissionsEvaluateRequest: {
+                    type: "object",
+                    properties: {
+                        operations: {
+                            type: "array",
+                            items: { $ref: "#/definitions/ManagedPermissionOperation" },
+                        },
+                    },
+                    required: ["operations"],
+                },
+                ManagedPermissionEvaluation: {
+                    type: "object",
+                    properties: { operation: { $ref: "#/definitions/ManagedPermissionOperation" } },
+                    required: ["operation"],
+                },
+            },
+        } as ApiSchema);
+        expect(code).toContain("pub operations: Vec<ManagedPermissionOperation>,");
+        expect(code).toContain("pub operation: ManagedPermissionOperation,");
+        expect(code).toContain("pub kind: ManagedPermissionOperationKind,");
+        expect(code).not.toContain("ManagedPermissionsEvaluateRequestOperationsItem");
+        expect(code).not.toContain("ManagedPermissionEvaluationOperation");
+    });
+
+    it("keeps every noncanonical open identifier distinct from the default sentinel", () => {
+        const code = generateApiTypesCode(
+            postProcessSchema({
+                definitions: {
+                    AutoTier: {
+                        type: "string",
+                        "x-extensible-enum": ["balance", "fast"],
+                    },
+                    RecommendedAutoTier: {
+                        type: "string",
+                        "x-extensible-enum": ["balance"],
+                    },
+                },
+            } as JSONSchema7) as ApiSchema
+        );
+        expect(code).toContain("Custom(String),");
+        expect(code).toContain("_ => Self::Custom(value),");
+        expect(code).not.toContain('"Unknown" => Self::Unknown,');
+    });
+
+    it("does not emit MCP list request types for a parameterless endpoint", () => {
+        const code = generateApiTypesCode({
+            session: {
+                mcp: {
+                    list: {
+                        rpcMethod: "session.mcp.list",
+                        params: null,
+                    },
+                },
+            },
+        });
+        expect(code).not.toContain("SessionMcpListParams");
+        expect(code).not.toContain("McpListRequest");
+    });
+
     it.each([
         {
             sentinel: { type: "null" },
@@ -747,6 +821,42 @@ pub enum ${name} {
 });
 
 describe("Rust x-legacy-parameters", () => {
+    it.each(["server", "session"] as const)(
+        "serializes unrelated %s requests and options by value",
+        (scope) => {
+            const { schema } = legacyRequestSchema(1, scope);
+            const rpc = generateRpcCode(schema);
+            expect(rpc.match(/serde_json::to_value\(params\)\?/g)).toHaveLength(2);
+            expect(rpc).not.toContain("serde_json::to_value(&params)");
+        }
+    );
+
+    it("preserves optional settings value presence without inserting null", () => {
+        const rpc = generateRpcCode({
+            server: {
+                user: {
+                    settings: {
+                        applyTopKey: {
+                            rpcMethod: "user.settings.applyTopKey",
+                            params: {
+                                type: "object",
+                                properties: {
+                                    topKey: { type: "string" },
+                                    value: { "x-opaque-json": true } as JSONSchema7,
+                                    delete: { type: "boolean" },
+                                },
+                                required: ["topKey"],
+                            },
+                            result: { type: "object" },
+                        },
+                    },
+                },
+            },
+        });
+        expect(rpc).toContain("let wire_params = serde_json::to_value(params)?;");
+        expect(rpc).not.toContain('_obj.insert("value"');
+    });
+
     const render = (additions: 0 | 1 | 2, scope: "server" | "session" = "server") => {
         const { schema } = legacyRequestSchema(additions, scope);
         const types = generateApiTypesCode(schema);
diff --git a/nodejs/test/set-tools.test.ts b/nodejs/test/set-tools.test.ts
index 689f2d52ce..9f9ea02569 100644
--- a/nodejs/test/set-tools.test.ts
+++ b/nodejs/test/set-tools.test.ts
@@ -46,6 +46,46 @@ async function requestTool(session: CopilotSession, requestId: string, toolName:
 }
 
 describe("CopilotSession.setTools", () => {
+    it("rejects replacements on a retired session without dispatching an RPC", async () => {
+        const { session, sendRequest, toolsSetCalls } = sessionWithPendingToolsSet();
+        sendRequest.mockResolvedValue({});
+        session._markDisconnected();
+
+        await expect(session.setTools([labelTool("new_tool", () => "new")])).rejects.toThrow(
+            "Session is disconnected"
+        );
+
+        expect(toolsSetCalls()).toHaveLength(0);
+        expect(session.getToolHandler("new_tool")).toBeUndefined();
+    });
+
+    it.each(["accepted", "rejected"] as const)(
+        "does not dispatch a queued replacement after retirement when the earlier RPC is %s",
+        async (outcome) => {
+            const { session, sendRequest, pending, toolsSetCalls } = sessionWithPendingToolsSet();
+            const first = session.setTools([labelTool("first_tool", () => "first")]);
+            const second = session.setTools([labelTool("second_tool", () => "second")]);
+            const firstRejected = expect(first).rejects.toThrow(
+                outcome === "accepted" ? "Session is disconnected" : "Replacement rejected"
+            );
+            const secondRejected = expect(second).rejects.toThrow("Session is disconnected");
+            await vi.waitFor(() => expect(pending).toHaveLength(1));
+
+            session._markDisconnected();
+            sendRequest.mockResolvedValue({});
+            if (outcome === "accepted") {
+                pending[0].resolve({});
+            } else {
+                pending[0].reject(new Error("Replacement rejected"));
+            }
+            await Promise.all([firstRejected, secondRejected]);
+
+            expect(toolsSetCalls()).toHaveLength(1);
+            expect(session.getToolHandler("first_tool")).toBeUndefined();
+            expect(session.getToolHandler("second_tool")).toBeUndefined();
+        }
+    );
+
     it("sends the complete tool set and switches handlers once the runtime accepts", async () => {
         const { session, pending, toolsSetCalls } = sessionWithPendingToolsSet();
         const oldHandler = vi.fn(() => "old");
diff --git a/nodejs/test/shared-codegen.test.ts b/nodejs/test/shared-codegen.test.ts
index 91e29d07d0..a4698ac549 100644
--- a/nodejs/test/shared-codegen.test.ts
+++ b/nodejs/test/shared-codegen.test.ts
@@ -18,6 +18,7 @@ import {
     rewriteSharedDefinitionReferences,
     resolveCopilotSchemaPaths,
 } from "../../scripts/codegen/utils.ts";
+import { postProcessSchema } from "../../scripts/codegen/utils.ts";
 
 describe("codegen entrypoints", () => {
     it("recognizes Windows entrypoint paths case-insensitively", () => {
@@ -52,6 +53,25 @@ describe("codegen entrypoints", () => {
 });
 
 describe("shared schema definition codegen utilities", () => {
+    it("shares open tier definitions across raw RPC and processed event schemas", () => {
+        const tier = {
+            type: "string",
+            minLength: 1,
+            pattern: "^[^\\s]+$",
+            "x-extensible-enum": ["balance", "fast"],
+        };
+        const api = { definitions: { AutoTier: tier } };
+        const events = postProcessSchema(structuredClone(api) as JSONSchema7);
+        expect([...findSharedSchemaDefinitions(api, events as Record<string, unknown>)]).toEqual([
+            "AutoTier",
+        ]);
+        expect(api.definitions.AutoTier).not.toHaveProperty("enum");
+        const different = { definitions: { AutoTier: { ...tier, pattern: "^[a-z]+$" } } };
+        expect(findSharedSchemaDefinitions(different, events as Record<string, unknown>).size).toBe(
+            0
+        );
+    });
+
     it.each(["typescript", "python", "go", "csharp"])(
         "runs the %s generator through a linked entrypoint",
         async (language) => {
diff --git a/nodejs/test/skill-provider.test.ts b/nodejs/test/skill-provider.test.ts
new file mode 100644
index 0000000000..3037e3b621
--- /dev/null
+++ b/nodejs/test/skill-provider.test.ts
@@ -0,0 +1,559 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import { PassThrough } from "node:stream";
+import {
+    CancellationTokenSource,
+    createMessageConnection,
+    type MessageConnection,
+    ResponseError,
+    StreamMessageReader,
+    StreamMessageWriter,
+} from "vscode-jsonrpc/node.js";
+import { describe, expect, it, onTestFinished, vi } from "vitest";
+import {
+    approveAll,
+    CopilotClient,
+    RuntimeConnection,
+    type CopilotClientOptions,
+    type SkillProvider,
+    type SkillProviderCallOptions,
+    type SkillProviderDescriptor,
+} from "../src/index.js";
+
+interface RecordedRequest {
+    method: string;
+    params: any;
+}
+
+type RuntimeRequestHandler = (
+    method: string,
+    params: any,
+    runtime: MessageConnection
+) => Promise<unknown> | unknown;
+
+interface Harness {
+    client: CopilotClient;
+    runtime: MessageConnection;
+    requests: RecordedRequest[];
+}
+
+/**
+ * Starts a client over an in-memory JSON-RPC pipe. The `runtime` end records
+ * every request and can call the client's reverse-RPC handlers.
+ */
+async function startClient(
+    options: Partial<CopilotClientOptions> = {},
+    onRuntimeRequest?: RuntimeRequestHandler
+): Promise<Harness> {
+    const clientToRuntime = new PassThrough();
+    const runtimeToClient = new PassThrough();
+    const clientConnection = createMessageConnection(
+        new StreamMessageReader(runtimeToClient),
+        new StreamMessageWriter(clientToRuntime)
+    );
+    const runtime = createMessageConnection(
+        new StreamMessageReader(clientToRuntime),
+        new StreamMessageWriter(runtimeToClient)
+    );
+    const requests: RecordedRequest[] = [];
+    runtime.onRequest(async (method: string, params: any) => {
+        requests.push({ method, params });
+        const custom = await onRuntimeRequest?.(method, params, runtime);
+        if (custom !== undefined) {
+            return custom;
+        }
+        if (method === "session.create" || method === "session.resume") {
+            return { sessionId: params.sessionId };
+        }
+        if (method === "session.detach") {
+            return { success: true };
+        }
+        return {};
+    });
+    runtime.listen();
+
+    const client = new CopilotClient({
+        connection: RuntimeConnection.forUri("localhost:1234"),
+        ...options,
+    });
+    vi.spyOn(client as any, "connectToServer").mockImplementation(async () => {
+        (client as any).connection = clientConnection;
+        (client as any).attachConnectionHandlers();
+        clientConnection.listen();
+    });
+    vi.spyOn(client as any, "verifyProtocolVersion").mockResolvedValue(undefined);
+    onTestFinished(async () => {
+        await client.forceStop();
+        clientConnection.dispose();
+        runtime.dispose();
+    });
+
+    await client.start();
+    return { client, runtime, requests };
+}
+
+function payload(requests: RecordedRequest[], method: string): any {
+    const request = requests.find((r) => r.method === method);
+    expect(request, `${method} was not sent`).toBeDefined();
+    return request!.params;
+}
+
+async function rejection(promise: Promise<unknown>): Promise<ResponseError<any>> {
+    const error = await promise.then(
+        () => undefined,
+        (e: unknown) => e
+    );
+    expect(error).toBeInstanceOf(ResponseError);
+    return error as ResponseError<any>;
+}
+
+const reviewSkill: SkillProviderDescriptor = {
+    name: "review",
+    description: "Reviews code",
+};
+
+function recordingProvider(
+    skills: SkillProviderDescriptor[] | null = [reviewSkill],
+    markdown: Record<string, string> = { review: "Review carefully." }
+): SkillProvider & { calls: string[] } {
+    const calls: string[] = [];
+    return {
+        calls,
+        listSkills: () => {
+            calls.push("list");
+            return skills as SkillProviderDescriptor[];
+        },
+        readSkill: (name) => {
+            calls.push(`read:${name}`);
+            return markdown[name] ?? null;
+        },
+    };
+}
+
+describe("skill providers", () => {
+    describe("session payloads", () => {
+        it("leaves create and resume payloads unchanged without a provider", async () => {
+            const { client, requests } = await startClient();
+
+            const session = await client.createSession({ onPermissionRequest: approveAll });
+            await client.resumeSession(session.sessionId, { onPermissionRequest: approveAll });
+
+            expect(payload(requests, "session.create")).not.toHaveProperty("hasSkillProvider");
+            expect(payload(requests, "session.resume")).not.toHaveProperty("hasSkillProvider");
+        });
+
+        it("flags create and resume payloads when a provider is supplied", async () => {
+            const { client, requests } = await startClient();
+            const provider = recordingProvider();
+
+            const session = await client.createSession({
+                onPermissionRequest: approveAll,
+                skillProvider: provider,
+            });
+            await client.resumeSession(session.sessionId, {
+                onPermissionRequest: approveAll,
+                skillProvider: provider,
+            });
+
+            const create = payload(requests, "session.create");
+            expect(create.hasSkillProvider).toBe(true);
+            expect(create).not.toHaveProperty("skillProvider");
+            expect(create.enableSkills).toBeUndefined();
+            const resume = payload(requests, "session.resume");
+            expect(resume.hasSkillProvider).toBe(true);
+            expect(resume).not.toHaveProperty("skillProvider");
+            expect(provider.calls).toEqual([]);
+        });
+
+        it("keeps empty mode's enableSkills default when a provider is supplied", async () => {
+            const { client, requests } = await startClient({
+                mode: "empty",
+                baseDirectory: "/tmp/copilot-test",
+            });
+
+            await client.createSession({
+                onPermissionRequest: approveAll,
+                availableTools: [],
+                skillProvider: recordingProvider(),
+            });
+
+            const create = payload(requests, "session.create");
+            expect(create.enableSkills).toBe(false);
+            expect(create.hasSkillProvider).toBe(true);
+        });
+
+        it.each(["session.create", "session.resume"] as const)(
+            "serves callbacks the runtime makes while handling %s",
+            async (openMethod) => {
+                let earlyList: unknown;
+                const { client } = await startClient({}, async (method, params, runtime) => {
+                    if (method === openMethod) {
+                        earlyList = await runtime.sendRequest("skillProvider.list", {
+                            sessionId: params.sessionId,
+                        });
+                        return { sessionId: params.sessionId };
+                    }
+                    return undefined;
+                });
+                const provider = recordingProvider();
+                const config = { onPermissionRequest: approveAll, skillProvider: provider };
+
+                if (openMethod === "session.create") {
+                    await client.createSession(config);
+                } else {
+                    await client.resumeSession("existing-session", config);
+                }
+
+                expect(earlyList).toEqual({ skills: [reviewSkill] });
+            }
+        );
+    });
+
+    describe("cloud sessions", () => {
+        it("rejects a provider before starting the client or sending anything", async () => {
+            const client = new CopilotClient({
+                connection: RuntimeConnection.forUri("localhost:1234"),
+            });
+            const start = vi.spyOn(client, "start");
+            const provider = recordingProvider();
+
+            await expect(
+                client.createSession({
+                    onPermissionRequest: approveAll,
+                    cloud: {},
+                    skillProvider: provider,
+                })
+            ).rejects.toThrow("Skill providers are not supported for cloud sessions.");
+
+            expect(start).not.toHaveBeenCalled();
+            expect(provider.calls).toEqual([]);
+        });
+    });
+
+    describe("dispatch", () => {
+        it.each([
+            ["synchronous", (value: any) => value],
+            ["asynchronous", (value: any) => Promise.resolve(value)],
+        ])("serves list and read from a %s provider", async (_kind, wrap) => {
+            const { client, runtime } = await startClient();
+            const descriptors: SkillProviderDescriptor[] = [
+                reviewSkill,
+                {
+                    name: "deploy",
+                    description: "Deploys the service",
+                    userInvocable: false,
+                    disableModelInvocation: true,
+                    argumentHint: "[environment]",
+                },
+            ];
+            const reads: string[] = [];
+            const session = await client.createSession({
+                onPermissionRequest: approveAll,
+                skillProvider: {
+                    listSkills: () => wrap(descriptors),
+                    readSkill: (name) => {
+                        reads.push(name);
+                        return wrap(`# ${name}`);
+                    },
+                },
+            });
+
+            await expect(
+                runtime.sendRequest("skillProvider.list", { sessionId: session.sessionId })
+            ).resolves.toEqual({ skills: descriptors });
+            await expect(
+                runtime.sendRequest("skillProvider.read", {
+                    sessionId: session.sessionId,
+                    name: "deploy",
+                })
+            ).resolves.toEqual({ markdown: "# deploy" });
+            expect(reads).toEqual(["deploy"]);
+        });
+
+        it("omits unset optional descriptor fields", async () => {
+            const { client, runtime } = await startClient();
+            const session = await client.createSession({
+                onPermissionRequest: approveAll,
+                skillProvider: recordingProvider([
+                    { name: "review", description: "Reviews code", argumentHint: undefined },
+                ]),
+            });
+
+            const result: any = await runtime.sendRequest("skillProvider.list", {
+                sessionId: session.sessionId,
+            });
+
+            expect(Object.keys(result.skills[0])).toEqual(["name", "description"]);
+        });
+
+        it("answers a null catalog with an empty list", async () => {
+            const { client, runtime } = await startClient();
+            const session = await client.createSession({
+                onPermissionRequest: approveAll,
+                skillProvider: recordingProvider(null),
+            });
+
+            await expect(
+                runtime.sendRequest("skillProvider.list", { sessionId: session.sessionId })
+            ).resolves.toEqual({ skills: [] });
+        });
+
+        it.each([null, undefined])("answers a %s read with null markdown", async (missing) => {
+            const { client, runtime } = await startClient();
+            const session = await client.createSession({
+                onPermissionRequest: approveAll,
+                skillProvider: { listSkills: () => [reviewSkill], readSkill: () => missing },
+            });
+
+            await expect(
+                runtime.sendRequest("skillProvider.read", {
+                    sessionId: session.sessionId,
+                    name: "review",
+                })
+            ).resolves.toEqual({ markdown: null });
+        });
+
+        it.each(["listSkills", "readSkill"] as const)(
+            "reports a %s failure generically without forwarding its message",
+            async (failing) => {
+                const { client, runtime } = await startClient();
+                const consoleError = vi.spyOn(console, "error").mockImplementation(() => {});
+                onTestFinished(() => consoleError.mockRestore());
+                const secret = "db-password-in-error";
+                const providerError = new Error(secret);
+                const session = await client.createSession({
+                    onPermissionRequest: approveAll,
+                    skillProvider: {
+                        listSkills: () => {
+                            if (failing === "listSkills") throw providerError;
+                            return [reviewSkill];
+                        },
+                        readSkill: async () => {
+                            throw providerError;
+                        },
+                    },
+                });
+
+                const error = await rejection(
+                    failing === "listSkills"
+                        ? runtime.sendRequest("skillProvider.list", {
+                              sessionId: session.sessionId,
+                          })
+                        : runtime.sendRequest("skillProvider.read", {
+                              sessionId: session.sessionId,
+                              name: "review",
+                          })
+                );
+
+                expect(error.code).toBe(-32603);
+                expect(error.data).toBeUndefined();
+                expect(error.message).not.toContain(secret);
+                expect(consoleError).toHaveBeenCalledWith(`Skill provider ${failing} failed`, {
+                    sessionId: session.sessionId,
+                    error: providerError,
+                });
+            }
+        );
+
+        it.each(["listSkills", "readSkill"] as const)(
+            "aborts a %s call when the runtime cancels it",
+            async (operation) => {
+                const { client, runtime } = await startClient();
+                const consoleError = vi.spyOn(console, "error").mockImplementation(() => {});
+                onTestFinished(() => consoleError.mockRestore());
+                let entered!: () => void;
+                const started = new Promise<void>((resolve) => (entered = resolve));
+                const block = ({ signal }: SkillProviderCallOptions) =>
+                    new Promise<never>((_resolve, reject) => {
+                        signal.addEventListener("abort", () => reject(signal.reason), {
+                            once: true,
+                        });
+                        entered();
+                    });
+                const session = await client.createSession({
+                    onPermissionRequest: approveAll,
+                    skillProvider: {
+                        listSkills: (options) => block(options),
+                        readSkill: (_name, options) => block(options),
+                    },
+                });
+                const cancellation = new CancellationTokenSource();
+
+                const pending = rejection(
+                    operation === "listSkills"
+                        ? runtime.sendRequest(
+                              "skillProvider.list",
+                              { sessionId: session.sessionId },
+                              cancellation.token
+                          )
+                        : runtime.sendRequest(
+                              "skillProvider.read",
+                              { sessionId: session.sessionId, name: "review" },
+                              cancellation.token
+                          )
+                );
+                await started;
+                cancellation.cancel();
+
+                expect((await pending).code).toBe(-32800);
+                expect(consoleError).not.toHaveBeenCalled();
+            }
+        );
+
+        it("rejects a request for an unknown session", async () => {
+            const { runtime } = await startClient();
+
+            await rejection(runtime.sendRequest("skillProvider.list", { sessionId: "missing" }));
+        });
+
+        it("rejects a request for a session without a provider", async () => {
+            const { client, runtime } = await startClient();
+            const session = await client.createSession({ onPermissionRequest: approveAll });
+
+            await rejection(
+                runtime.sendRequest("skillProvider.read", {
+                    sessionId: session.sessionId,
+                    name: "review",
+                })
+            );
+        });
+    });
+
+    describe("teardown", () => {
+        it("stops calling the provider after the session disconnects", async () => {
+            const { client, runtime } = await startClient();
+            const provider = recordingProvider();
+            const session = await client.createSession({
+                onPermissionRequest: approveAll,
+                skillProvider: provider,
+            });
+            const sessionId = session.sessionId;
+
+            await session.disconnect();
+            await rejection(runtime.sendRequest("skillProvider.list", { sessionId }));
+
+            expect(provider.calls).toEqual([]);
+        });
+
+        it("keeps a session that failed to open from serving its provider", async () => {
+            const provider = recordingProvider();
+            let sessionId: string | undefined;
+            const { client, runtime } = await startClient({}, (method, params) => {
+                if (method === "session.create") {
+                    sessionId = params.sessionId;
+                    throw new Error("create failed");
+                }
+                return undefined;
+            });
+
+            await expect(
+                client.createSession({ onPermissionRequest: approveAll, skillProvider: provider })
+            ).rejects.toThrow("create failed");
+            await rejection(runtime.sendRequest("skillProvider.list", { sessionId: sessionId! }));
+
+            expect(provider.calls).toEqual([]);
+        });
+
+        it("keeps the resident provider when a resume fails validation", async () => {
+            const { client, runtime, requests } = await startClient({
+                mode: "empty",
+                baseDirectory: "/tmp/copilot-test",
+            });
+            const resident = recordingProvider();
+            const replacement = recordingProvider();
+            const session = await client.createSession({
+                onPermissionRequest: approveAll,
+                availableTools: [],
+                skillProvider: resident,
+            });
+
+            await expect(
+                client.resumeSession(session.sessionId, {
+                    onPermissionRequest: approveAll,
+                    skillProvider: replacement,
+                })
+            ).rejects.toThrow("availableTools");
+            await runtime.sendRequest("skillProvider.list", { sessionId: session.sessionId });
+
+            expect(requests.map((r) => r.method)).not.toContain("session.resume");
+            expect(resident.calls).toEqual(["list"]);
+            expect(replacement.calls).toEqual([]);
+        });
+
+        it("restores the resident provider when the runtime rejects a resume", async () => {
+            const { client, runtime } = await startClient({}, (method) => {
+                if (method === "session.resume") {
+                    throw new Error("resume failed");
+                }
+                return undefined;
+            });
+            const resident = recordingProvider();
+            const replacement = recordingProvider();
+            const session = await client.createSession({
+                onPermissionRequest: approveAll,
+                skillProvider: resident,
+            });
+
+            await expect(
+                client.resumeSession(session.sessionId, {
+                    onPermissionRequest: approveAll,
+                    skillProvider: replacement,
+                })
+            ).rejects.toThrow("resume failed");
+            await runtime.sendRequest("skillProvider.list", { sessionId: session.sessionId });
+
+            expect(resident.calls).toEqual(["list"]);
+            expect(replacement.calls).toEqual([]);
+        });
+
+        it.each(["create", "resume"] as const)(
+            "does not register a provider when session-FS setup fails on %s",
+            async (open) => {
+                const { client, runtime, requests } = await startClient({
+                    sessionFs: {
+                        initialCwd: "/workspace",
+                        sessionStatePath: "/state",
+                        conventions: "posix",
+                    },
+                });
+                const provider = recordingProvider();
+                const config = {
+                    onPermissionRequest: approveAll,
+                    sessionId: "fs-failure",
+                    skillProvider: provider,
+                };
+
+                await expect(
+                    open === "create"
+                        ? client.createSession(config)
+                        : client.resumeSession("fs-failure", config)
+                ).rejects.toThrow("createSessionFsProvider is required");
+                await rejection(
+                    runtime.sendRequest("skillProvider.list", { sessionId: "fs-failure" })
+                );
+
+                expect(requests.map((r) => r.method)).not.toContain(`session.${open}`);
+                expect(provider.calls).toEqual([]);
+            }
+        );
+
+        it("serves the resumed provider instead of the original one", async () => {
+            const { client, runtime } = await startClient();
+            const original = recordingProvider();
+            const replacement = recordingProvider();
+            const session = await client.createSession({
+                onPermissionRequest: approveAll,
+                skillProvider: original,
+            });
+            await session.disconnect();
+
+            await client.resumeSession(session.sessionId, {
+                onPermissionRequest: approveAll,
+                skillProvider: replacement,
+            });
+            await runtime.sendRequest("skillProvider.list", { sessionId: session.sessionId });
+
+            expect(original.calls).toEqual([]);
+            expect(replacement.calls).toEqual(["list"]);
+        });
+    });
+});
diff --git a/nodejs/test/tool-invocation-identity.test.ts b/nodejs/test/tool-invocation-identity.test.ts
new file mode 100644
index 0000000000..251df61508
--- /dev/null
+++ b/nodejs/test/tool-invocation-identity.test.ts
@@ -0,0 +1,59 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import { expect, it, vi } from "vitest";
+import { CopilotSession } from "../src/session.js";
+import type { ToolInvocation } from "../src/types.js";
+
+it("names the sub-agent and request behind a tool invocation", async () => {
+    const sendRequest = vi.fn().mockResolvedValue(undefined);
+    const session = new CopilotSession("session-1", { sendRequest } as never);
+    const invocations: ToolInvocation[] = [];
+    (session as any).toolHandlers.set("calc", async (_args: unknown, context: ToolInvocation) => {
+        invocations.push(context);
+        return "ok";
+    });
+
+    (session as any)._handleBroadcastEvent({
+        type: "external_tool.requested",
+        agentId: "task-agent-1",
+        data: {
+            requestId: "req-sub-agent",
+            sessionId: "session-1",
+            toolCallId: "tc-sub-agent",
+            toolName: "calc",
+            arguments: {},
+        },
+    });
+    (session as any)._handleBroadcastEvent({
+        type: "external_tool.requested",
+        data: {
+            requestId: "req-root",
+            sessionId: "session-1",
+            toolCallId: "tc-root",
+            toolName: "calc",
+            arguments: {},
+        },
+    });
+    (session as any)._handleBroadcastEvent({
+        type: "external_tool.requested",
+        agentId: "",
+        data: {
+            requestId: "req-blank-agent",
+            sessionId: "session-1",
+            toolCallId: "tc-blank-agent",
+            toolName: "calc",
+            arguments: {},
+        },
+    });
+    await vi.waitFor(() => expect(invocations).toHaveLength(3));
+
+    const [subAgentCall, rootCall, blankAgentCall] = invocations;
+    expect(subAgentCall).toMatchObject({
+        agentId: "task-agent-1",
+        requestId: "req-sub-agent",
+        toolCallId: "tc-sub-agent",
+    });
+    expect(rootCall.agentId).toBeUndefined();
+    expect(rootCall.requestId).toBe("req-root");
+    expect(blankAgentCall.agentId).toBeUndefined();
+    expect(blankAgentCall.requestId).toBe("req-blank-agent");
+});
diff --git a/nodejs/test/toolSet.test.ts b/nodejs/test/toolSet.test.ts
index b77b797072..eba35de989 100644
--- a/nodejs/test/toolSet.test.ts
+++ b/nodejs/test/toolSet.test.ts
@@ -498,6 +498,27 @@ describe("Empty-mode safe defaults", () => {
         expect(payload.enableSkills).toBe(true);
     });
 
+    it("passes the create-time session name through on create", async () => {
+        const { client, spy } = await setupClient();
+        await client.createSession({
+            onPermissionRequest: approveAll,
+            availableTools: new ToolSet().addBuiltIn(BuiltInTools.Isolated),
+            name: "named at create",
+        });
+        const payload = createPayload(spy);
+        expect(payload.name).toBe("named at create");
+    });
+
+    it("omits the session name on create when it is not set", async () => {
+        const { client, spy } = await setupClient();
+        await client.createSession({
+            onPermissionRequest: approveAll,
+            availableTools: new ToolSet().addBuiltIn(BuiltInTools.Isolated),
+        });
+        const payload = createPayload(spy);
+        expect(payload.name).toBeUndefined();
+    });
+
     it("passes organizationCustomInstructions through on create", async () => {
         const { client, spy } = await setupClient();
         await client.createSession({
diff --git a/nodejs/test/unified-release.test.ts b/nodejs/test/unified-release.test.ts
index 0463b2d201..d636757975 100644
--- a/nodejs/test/unified-release.test.ts
+++ b/nodejs/test/unified-release.test.ts
@@ -358,14 +358,18 @@ describe("matched SDK release planning", () => {
             "java",
         ]);
         expect(selectedSdks("unstable", "public")).toEqual(selectedSdks("latest", "public"));
-        expect(publicationSdks("unstable", "public", "internal")).toEqual(["nodejs"]);
-        expect(publicationSdks("latest", "public", "internal")).toEqual(["nodejs", "dotnet"]);
-        expect(publicationSdks("unstable", "public", "public")).toEqual([
-            "nodejs",
-            "dotnet",
-            "rust",
-            "java",
-        ]);
+        for (const channel of ["latest", "prerelease", "unstable"]) {
+            expect(publicationSdks(channel, "public", "internal")).toEqual(
+                channel === "unstable" ? ["nodejs"] : ["nodejs", "python", "dotnet"]
+            );
+            expect(publicationSdks(channel, "public", "public")).toEqual([
+                "nodejs",
+                "dotnet",
+                "rust",
+                "java",
+            ]);
+        }
+        expect(publicationSdks("unstable", "internal", "internal")).toEqual(["nodejs"]);
         expect(packagedSdks("unstable", "public")).toContain("python");
         expect(selectedSdks("unstable", "internal")).toEqual(["nodejs"]);
         expect(() => selectedSdks("latest", "internal")).toThrow("must be unstable");
@@ -984,7 +988,14 @@ describe("same-run SDK artifacts", () => {
                 ])
             );
             expect(args.filter((arg) => arg.startsWith("-Dcopilot.native.external."))).toHaveLength(
-                6
+                7
+            );
+            expect(args).toEqual(
+                expect.arrayContaining([
+                    expect.stringContaining(
+                        "-Dcopilot.native.external.linuxmusl.arm64.classifier.path="
+                    ),
+                ])
             );
             expect(env?.COPILOT_CLI_RELEASE_TARBALL).toBe(runtime);
             expect(env?.COPILOT_CLI_RELEASE_SHA256).toBe(sha256(runtime));
@@ -999,14 +1010,18 @@ describe("same-run SDK artifacts", () => {
         expect(commands.filter((command) => command[0] === "bash")).toHaveLength(1);
     });
 
-    it.each(["prerelease", "unstable"] as const)(
+    it.each(["latest", "prerelease", "unstable"] as const)(
         "creates immutable %s source tags and announces only normal releases",
         async (channel) => {
             const release = {
                 ...identity,
                 channel,
                 sdkVersion:
-                    channel === "unstable" ? "0.4.0-unstable.123.gaaaaaaa" : identity.sdkVersion,
+                    channel === "unstable"
+                        ? "0.4.0-unstable.123.gaaaaaaa"
+                        : channel === "latest"
+                          ? "0.4.0"
+                          : identity.sdkVersion,
             };
             const snapshot = "b".repeat(40);
             const requests: string[][] = [];
@@ -1018,17 +1033,29 @@ describe("same-run SDK artifacts", () => {
                 if (args[0] === "api" && args[1].includes("/releases/tags/")) {
                     throw Object.assign(new Error("not found"), { stderr: "(HTTP 404)" });
                 }
-                if (args.includes("--slurp")) {
-                    return JSON.stringify([
-                        [
-                            {
-                                tag_name: "v0.3.0",
-                                draft: false,
-                                prerelease: false,
-                                published_at: "2026-09-20T00:00:00Z",
-                            },
-                        ],
-                    ]);
+                if (args[1] === "repos/github/copilot-sdk/releases/latest") {
+                    return JSON.stringify({
+                        tag_name: "v0.3.0",
+                        draft: false,
+                        prerelease: false,
+                        published_at: "2026-09-20T00:00:00Z",
+                    });
+                }
+                if (args.includes("--paginate")) {
+                    return [
+                        JSON.stringify({
+                            tag_name: "runtime-1.0.89-unstable.1",
+                            draft: false,
+                            prerelease: true,
+                            published_at: "2026-09-22T00:00:00Z",
+                        }),
+                        JSON.stringify({
+                            tag_name: "v0.3.0",
+                            draft: false,
+                            prerelease: false,
+                            published_at: "2026-09-20T00:00:00Z",
+                        }),
+                    ].join("\n");
                 }
                 return "{}";
             };
@@ -1047,7 +1074,20 @@ describe("same-run SDK artifacts", () => {
                     )
                 ).toBe(true);
             } else {
-                expect(requests.at(-1)).toContain("--latest=false");
+                expect(requests.at(-2)).toEqual([
+                    "api",
+                    ...(channel === "latest"
+                        ? ["repos/github/copilot-sdk/releases/latest"]
+                        : [
+                              "--paginate",
+                              "--jq",
+                              ".[] | {tag_name, draft, prerelease, published_at}",
+                              "repos/github/copilot-sdk/releases?per_page=100",
+                          ]),
+                ]);
+                expect(requests.at(-1)).toContain(
+                    channel === "latest" ? "--latest" : "--latest=false"
+                );
                 expect(requests.at(-1)).toEqual(
                     expect.arrayContaining(["--generate-notes", "--notes-start-tag", "v0.3.0"])
                 );
diff --git a/nodejs/test/webSocketResponsesServer.test.ts b/nodejs/test/webSocketResponsesServer.test.ts
new file mode 100644
index 0000000000..2778f156ab
--- /dev/null
+++ b/nodejs/test/webSocketResponsesServer.test.ts
@@ -0,0 +1,239 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import http from "node:http";
+import { describe, expect, it } from "vitest";
+import { WebSocket } from "ws";
+import { startWebSocketResponsesServer } from "./e2e/harness/webSocketResponsesServer.js";
+import { withTestCleanup } from "./helpers/withTestCleanup.js";
+
+async function listen(server: http.Server) {
+    await new Promise<void>((resolve, reject) => {
+        server.once("error", reject);
+        server.listen(0, "127.0.0.1", resolve);
+    });
+    const address = server.address();
+    if (address === null || typeof address === "string") {
+        throw new Error("Expected a bound TCP address for the test upstream.");
+    }
+    return `http://127.0.0.1:${address.port}`;
+}
+
+async function close(server: http.Server) {
+    if (!server.listening) return;
+    server.closeAllConnections();
+    await new Promise<void>((resolve, reject) =>
+        server.close((error) => (error ? reject(error) : resolve()))
+    );
+}
+
+describe("WebSocket provider HTTP forwarding", () => {
+    it.each([false, true])(
+        "closes the upstream with response headers sent: %s",
+        async (sendHeaders) => {
+            const accepted = Promise.withResolvers<void>();
+            const receivedBody = Promise.withResolvers<void>();
+            const openSockets = new Set<http.IncomingMessage["socket"]>();
+            const configured = http.createServer((req, res) => {
+                openSockets.add(req.socket);
+                req.socket.once("close", () => openSockets.delete(req.socket));
+                accepted.resolve();
+                if (sendHeaders) res.write("held upstream body");
+            });
+            let provider: Awaited<ReturnType<typeof startWebSocketResponsesServer>> | undefined;
+            let request: http.ClientRequest | undefined;
+            await withTestCleanup(
+                async () => {
+                    const configuredUrl = await listen(configured);
+                    provider = await startWebSocketResponsesServer();
+                    provider.forwardHttpTo(configuredUrl);
+                    request = http.get(`${provider.baseUrl}/held`, (response) => {
+                        response.on("error", () => response.destroy());
+                        response.once("data", () => receivedBody.resolve());
+                        response.resume();
+                    });
+                    request.on("error", () => request?.destroy());
+                    await accepted.promise;
+                    if (sendHeaders) await receivedBody.promise;
+                    const stopping = provider.stop();
+                    provider = undefined;
+                    await stopping;
+                    await expect.poll(() => openSockets.size).toBe(0);
+                },
+                () => {
+                    request?.destroy();
+                },
+                () => provider?.stop(),
+                () => close(configured)
+            );
+        }
+    );
+
+    it("reports an upstream response reset and closes the downstream", async () => {
+        const receivedBody = Promise.withResolvers<void>();
+        const downstreamClosed = Promise.withResolvers<void>();
+        let upstreamSocket: http.IncomingMessage["socket"] | undefined;
+        const configured = http.createServer((req, res) => {
+            upstreamSocket = req.socket;
+            res.write("partial body");
+        });
+        let provider: Awaited<ReturnType<typeof startWebSocketResponsesServer>> | undefined;
+        let request: http.ClientRequest | undefined;
+        await withTestCleanup(
+            async () => {
+                const configuredUrl = await listen(configured);
+                provider = await startWebSocketResponsesServer();
+                provider.forwardHttpTo(configuredUrl);
+                request = http.get(`${provider.baseUrl}/reset`, (response) => {
+                    response.on("error", () => response.destroy());
+                    response.once("data", () => receivedBody.resolve());
+                    response.once("close", () => downstreamClosed.resolve());
+                    response.resume();
+                });
+                request.on("error", () => request?.destroy());
+                await receivedBody.promise;
+                upstreamSocket?.destroy();
+                await downstreamClosed.promise;
+                const stopping = provider.stop();
+                provider = undefined;
+                await expect(stopping).rejects.toMatchObject({
+                    message: "WebSocket provider fixture failed.",
+                    errors: [expect.objectContaining({ code: "ECONNRESET" })],
+                });
+            },
+            () => {
+                request?.destroy();
+            },
+            () => provider?.stop(),
+            () => close(configured)
+        );
+    });
+
+    it("keeps the destination fixed while forwarding request paths, methods, and bodies", async () => {
+        const configured = http.createServer((req, res) => {
+            req.setEncoding("utf8");
+            let body = "";
+            req.on("data", (chunk: string) => (body += chunk));
+            req.on("end", () => {
+                res.writeHead(200, {
+                    "content-type": "application/json; charset=utf-8",
+                    "x-content-type-options": "nosniff",
+                });
+                res.end(
+                    JSON.stringify({
+                        server: "configured",
+                        path: req.url,
+                        method: req.method,
+                        host: req.headers.host,
+                        body,
+                    })
+                );
+            });
+        });
+        let alternateRequests = 0;
+        const alternate = http.createServer((_req, res) => {
+            alternateRequests++;
+            res.end(JSON.stringify({ server: "alternate" }));
+        });
+        let provider: Awaited<ReturnType<typeof startWebSocketResponsesServer>> | undefined;
+        await withTestCleanup(
+            async () => {
+                const configuredUrl = await listen(configured);
+                const alternateUrl = await listen(alternate);
+                const upstream = await startWebSocketResponsesServer();
+                provider = upstream;
+                upstream.forwardHttpTo(configuredUrl);
+                const paths = [
+                    "/copilot_internal/user?include_quota=true",
+                    `${alternateUrl}/absolute-target`,
+                    `//${new URL(alternateUrl).host}/network-target`,
+                ];
+                for (const path of paths) {
+                    const body = JSON.stringify({
+                        forwarded: path,
+                        content: "<span>fixture input</span>",
+                    });
+                    const response = await new Promise<{
+                        body: string;
+                        headers: http.IncomingHttpHeaders;
+                    }>((resolve, reject) => {
+                        const request = http.request(
+                            upstream.baseUrl,
+                            {
+                                path,
+                                method: "POST",
+                                headers: { "content-type": "application/json" },
+                            },
+                            (res) => {
+                                res.setEncoding("utf8");
+                                let text = "";
+                                res.on("data", (chunk: string) => (text += chunk));
+                                res.on("error", reject);
+                                res.on("end", () => resolve({ body: text, headers: res.headers }));
+                            }
+                        );
+                        request.on("error", reject);
+                        request.end(body);
+                    });
+                    expect(response.headers["content-type"]).toBe(
+                        "application/json; charset=utf-8"
+                    );
+                    expect(response.headers["x-content-type-options"]).toBe("nosniff");
+                    expect(JSON.parse(response.body)).toEqual({
+                        server: "configured",
+                        path,
+                        method: "POST",
+                        host: new URL(configuredUrl).host,
+                        body,
+                    });
+                }
+                expect(alternateRequests).toBe(0);
+            },
+            () => provider?.stop(),
+            () => close(configured),
+            () => close(alternate)
+        );
+    });
+});
+
+describe("WebSocket provider message failures", () => {
+    it.each(["malformed JSON", "synchronous reply failure"])(
+        "reports %s through cleanup",
+        async (failure) => {
+            const provider = await startWebSocketResponsesServer();
+            let stopped = false;
+            const socket = new WebSocket(provider.baseUrl.replace("http:", "ws:"));
+            await withTestCleanup(
+                async () => {
+                    await new Promise<void>((resolve, reject) => {
+                        socket.once("open", resolve);
+                        socket.once("error", reject);
+                    });
+                    const replyError = new Error("reply failed synchronously");
+                    provider.state.responses.push(() => {
+                        throw replyError;
+                    });
+                    socket.send(
+                        failure === "malformed JSON"
+                            ? "{"
+                            : JSON.stringify({ type: "response.create" })
+                    );
+                    await expect.poll(() => socket.readyState).toBe(WebSocket.CLOSED);
+                    const stopping = provider.stop();
+                    stopped = true;
+                    await expect(stopping).rejects.toMatchObject({
+                        message: "WebSocket provider fixture failed.",
+                        errors: [
+                            failure === "malformed JSON" ? expect.any(SyntaxError) : replyError,
+                        ],
+                    });
+                },
+                () => socket.terminate(),
+                async () => {
+                    if (!stopped) await provider.stop();
+                }
+            );
+        }
+    );
+});
diff --git a/nodejs/test/withTestCleanup.test.ts b/nodejs/test/withTestCleanup.test.ts
new file mode 100644
index 0000000000..2f195ada5a
--- /dev/null
+++ b/nodejs/test/withTestCleanup.test.ts
@@ -0,0 +1,80 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { describe, expect, it, vi } from "vitest";
+import { withTestCleanup } from "./helpers/withTestCleanup.js";
+
+describe("withTestCleanup", () => {
+    it("returns the body result after every cleanup", async () => {
+        const first = vi.fn();
+        const second = vi.fn();
+        await expect(withTestCleanup(async () => 42, first, second)).resolves.toBe(42);
+        expect(first).toHaveBeenCalledOnce();
+        expect(second).toHaveBeenCalledOnce();
+    });
+
+    it("preserves the original failure when cleanup succeeds", async () => {
+        const failure = new Error("original assertion");
+        const cleanup = vi.fn();
+        await expect(
+            withTestCleanup(async () => {
+                throw failure;
+            }, cleanup)
+        ).rejects.toBe(failure);
+        expect(cleanup).toHaveBeenCalledOnce();
+    });
+
+    it("preserves body and all teardown failures in order", async () => {
+        const failure = new Error("original assertion");
+        const first = new Error("server teardown");
+        const second = new Error("directory teardown");
+        await expect(
+            withTestCleanup(
+                async () => {
+                    throw failure;
+                },
+                () => {
+                    throw first;
+                },
+                async () => {
+                    throw second;
+                }
+            )
+        ).rejects.toMatchObject({
+            errors: [failure, first, second],
+            cause: failure,
+        });
+    });
+
+    it("fails an otherwise-passing test when teardown fails, without skipping later cleanup", async () => {
+        const failure = new Error("server teardown");
+        const last = vi.fn();
+        await expect(
+            withTestCleanup(
+                async () => undefined,
+                () => {
+                    throw failure;
+                },
+                last
+            )
+        ).rejects.toBe(failure);
+        expect(last).toHaveBeenCalledOnce();
+    });
+
+    it("aggregates multiple teardown failures without inventing a body failure", async () => {
+        const first = new Error("server teardown");
+        const second = new Error("directory teardown");
+        await expect(
+            withTestCleanup(
+                async () => undefined,
+                () => {
+                    throw first;
+                },
+                () => {
+                    throw second;
+                }
+            )
+        ).rejects.toMatchObject({ errors: [first, second] });
+    });
+});
diff --git a/nodejs/tsconfig.test.json b/nodejs/tsconfig.test.json
index 6f8ef72510..f6f04f3548 100644
--- a/nodejs/tsconfig.test.json
+++ b/nodejs/tsconfig.test.json
@@ -13,6 +13,7 @@
         "test/ffiRuntimeHost.test.ts",
         "test/session-event-types.test.ts",
         "test/session-config-types.test.ts",
+        "test/reasoning-summaries-types.test.ts",
         "test/sandbox-config.test.ts",
         "test/message-source.test.ts",
         "test/legacy-request-compatibility.test.ts"
diff --git a/nodejs/vitest.config.ts b/nodejs/vitest.config.ts
index 10a9ac4515..d9da632555 100644
--- a/nodejs/vitest.config.ts
+++ b/nodejs/vitest.config.ts
@@ -52,6 +52,7 @@ const inProcessBlockedE2E = [
     "**/test/e2e/system_message_transform.e2e.test.ts",
     "**/test/e2e/tool_results.e2e.test.ts",
     "**/test/e2e/tools.e2e.test.ts",
+    "**/test/e2e/tools_anthropic_updates.e2e.test.ts",
 ];
 
 // These suites own their provider or CAPI auth/request-handler setup. They run
@@ -69,6 +70,9 @@ const selfConfiguredBackendE2E = [
     "**/test/e2e/per_session_auth.e2e.test.ts",
     "**/test/e2e/provider_endpoint.e2e.test.ts",
     "**/test/e2e/subagent_prompt_resume.e2e.test.ts",
+    "**/test/e2e/tools_anthropic_updates.e2e.test.ts",
+    "**/test/e2e/websocket_http_fallback.e2e.test.ts",
+    "**/test/e2e/websocket_terminals.e2e.test.ts",
 ];
 
 export default defineConfig({
diff --git a/python/README.md b/python/README.md
index 04cefd38f4..91f433dc9c 100644
--- a/python/README.md
+++ b/python/README.md
@@ -79,6 +79,12 @@ Select `local_server=HostLocalServerOptions()` for a local listener,
 for Mission Control/WPS, or both. Import the transport types from `copilot.rpc`.
 At least one transport is required. GitHub-only hosts have no `url` or `token`;
 `host.environment_id` exposes their Mission Control identity.
+Call `await host.list_sessions()` to read the complete advertised catalog of live
+and dormant sessions.
+Set top-level `compute_id` to reuse the durable catalog across local and Mission
+Control hosting; it must agree with `github_environment.compute_id` when both are
+supplied. The runtime persists an omitted local-only identity. Publication
+survives host shutdown; dormant application sessions require your resume callback.
 See [runtime-supervised AHP hosting](../docs/runtime-supervised-host.md) for creation
 and resume callbacks, resident-session publication, ownership, and shared-snapshot E2Es.
 
@@ -155,6 +161,9 @@ shutdown, close stdin, and wait up to 10 seconds for the process to finish host
 cleanup, including telemetry flushing. A process that does not exit is terminated,
 then killed if necessary, with bounded waits. `force_stop()` skips graceful cleanup;
 externally managed runtimes are not shut down.
+It disconnects retained sessions locally, releases their registered callbacks, and
+fails pending `send_and_wait()` calls without waiting for idle or their response timeout.
+Disconnected sessions reject new event subscriptions.
 
 ```python
 import asyncio
@@ -205,6 +214,58 @@ asyncio.run(main())
 - ✅ Async/await native
 - ✅ Async context manager support for automatic resource cleanup
 
+### Skill providers (experimental)
+
+Skill providers let a session serve skills from SDK-owned storage instead of
+`SKILL.md` files on disk. Implement `SkillProvider`, return generated
+`SkillProviderDescriptor` values from `list_skills()`, and return the skill
+markdown from `read_skill(name)`. Both methods can be sync or async; keep sync
+providers fast because they run on the event loop.
+
+```python
+import asyncio
+
+from copilot import CopilotClient, SkillProvider, SkillProviderDescriptor
+
+
+class MemorySkills(SkillProvider):
+    def list_skills(self):
+        return [
+            SkillProviderDescriptor(
+                name="release-notes",
+                description="Draft release notes from recent changes",
+            )
+        ]
+
+    async def read_skill(self, name: str) -> str | None:
+        if name != "release-notes":
+            return None
+        return "Draft concise release notes with highlights and migration notes."
+
+
+async def main():
+    async with CopilotClient(mode="empty", base_directory="./.copilot-empty") as client:
+        async with await client.create_session(
+            available_tools=[],
+            enable_skills=True,
+            skill_provider=MemorySkills(),
+        ) as session:
+            await session.send("Use /release-notes for this change set")
+
+
+asyncio.run(main())
+```
+
+In `"empty"` mode, set `enable_skills=True`; otherwise the provider is bound but
+dormant. Providers are ephemeral and are not persisted, so pass `skill_provider=`
+again to `resume_session()`. Cloud sessions do not support skill providers.
+Providers must be safe for concurrent calls because the runtime may list or read
+skills from multiple agent paths at the same time. When the runtime cancels a
+call, for example after its 30-second limit or when the session disconnects, an
+async provider's task is cancelled and receives `asyncio.CancelledError`. Closing
+the connection or force-stopping the client doesn't cancel a running call; it
+continues until it returns.
+
 ## API Reference
 
 ### CopilotClient
diff --git a/python/copilot/__init__.py b/python/copilot/__init__.py
index bb26e4b9c5..ae3aa7e7ac 100644
--- a/python/copilot/__init__.py
+++ b/python/copilot/__init__.py
@@ -110,6 +110,7 @@
     PermissionDecisionOutcome,
     PermissionDecisionSurface,
     PermissionResponseCapability,
+    SkillProviderDescriptor,
 )
 from .generated.session_events import (
     AutoTierSwitchFailureReason,
@@ -156,6 +157,7 @@
     ExitPlanModeRequest,
     ExitPlanModeResult,
     GitHubMcpToolConfig,
+    ImageGenerationConfig,
     InfiniteSessionConfig,
     InputOptions,
     LargeToolOutputConfig,
@@ -209,6 +211,7 @@
     SessionStartHookOutput,
     SessionUiApi,
     SessionUiCapabilities,
+    SkillProvider,
     SubagentStartHandler,
     SubagentStartHookInput,
     SubagentStartHookOutput,
@@ -440,6 +443,8 @@
     "SessionStartHandler",
     "SessionStartHookInput",
     "SessionStartHookOutput",
+    "SkillProvider",
+    "SkillProviderDescriptor",
     "SessionUiApi",
     "SessionUiCapabilities",
     "SessionUpdatedEvent",
@@ -460,6 +465,7 @@
     "ToolResult",
     "ToolResultType",
     "ToolSearchConfig",
+    "ImageGenerationConfig",
     "ToolSet",
     "UriRuntimeConnection",
     "UserInputHandler",
diff --git a/python/copilot/_jsonrpc.py b/python/copilot/_jsonrpc.py
index 48c19be98f..60af2a2074 100644
--- a/python/copilot/_jsonrpc.py
+++ b/python/copilot/_jsonrpc.py
@@ -36,6 +36,10 @@ class ProcessExitedError(Exception):
     pass
 
 
+class _RequestCancelledError(Exception):
+    """Raised when the peer cancels an incoming request."""
+
+
 RequestHandler = Callable[[dict], dict | Awaitable[dict]]
 RawRequestHandler = Callable[[dict], None | Awaitable[None]]
 
@@ -117,6 +121,7 @@ def __init__(self, process):
         self.notification_handler: Callable[[str, dict], None] | None = None
         self.notification_method_handlers: dict[str, Callable[[dict], Any]] = {}
         self.request_handlers: dict[str, RequestHandler] = {}
+        self._cancellable_request_methods: set[str] = set()
         self.raw_request_handlers: dict[str, RawRequestHandler] = {}
         self._incoming_request_cancellations: dict[int, _IncomingRequestCancellation] = {}
         self._running = False
@@ -294,11 +299,23 @@ def set_notification_method_handler(self, method: str, handler: Callable[[dict],
         else:
             self.notification_method_handlers[method] = handler
 
-    def set_request_handler(self, method: str, handler: RequestHandler):
+    def set_request_handler(
+        self, method: str, handler: RequestHandler | None, *, cancellable: bool = False
+    ):
+        """Register a handler for incoming requests of ``method``.
+
+        When ``cancellable`` is true, a ``$/cancelRequest`` for a pending request
+        cancels the handler's task and fails the request with code -32800.
+        """
         if handler is None:
             self.request_handlers.pop(method, None)
+            self._cancellable_request_methods.discard(method)
         else:
             self.request_handlers[method] = handler
+            if cancellable:
+                self._cancellable_request_methods.add(method)
+            else:
+                self._cancellable_request_methods.discard(method)
 
     def set_raw_request_handler(self, method: str, handler: RawRequestHandler | None):
         """Register a request handler that receives the full JSON-RPC message.
@@ -550,7 +567,12 @@ def _handle_request(self, message: dict):
         if not self._loop:
             return
         asyncio.run_coroutine_threadsafe(
-            self._dispatch_request(message, handler, cancellation_id),
+            self._dispatch_request(
+                message,
+                handler,
+                cancellation_id,
+                cancellable=method in self._cancellable_request_methods,
+            ),
             self._loop,
         )
 
@@ -602,13 +624,21 @@ async def _dispatch_raw_request(
                     self._incoming_request_cancellations.pop(cancellation_id, None)
 
     async def _dispatch_request(
-        self, message: dict, handler: RequestHandler, cancellation_id: int | None
+        self,
+        message: dict,
+        handler: RequestHandler,
+        cancellation_id: int | None,
+        *,
+        cancellable: bool = False,
     ):
         try:
             params = message.get("params", {})
             outcome = handler(params)
             if inspect.isawaitable(outcome):
-                outcome = await outcome
+                if cancellable and cancellation_id is not None:
+                    outcome = await self._await_cancellable(outcome, cancellation_id)
+                else:
+                    outcome = await outcome
             if outcome is not None and not isinstance(
                 outcome, dict | list | str | int | float | bool
             ):
@@ -617,6 +647,9 @@ async def _dispatch_request(
                     f"got {type(outcome).__name__}"
                 )
             await self._send_response(message["id"], outcome)
+        except _RequestCancelledError:
+            logger.debug("JSON-RPC method %s cancelled", message.get("method", ""))
+            await self._send_error_response(message["id"], -32800, "Request cancelled", None)
         except JsonRpcError as exc:
             logger.debug(
                 "Error handling JSON-RPC method %s: %s", message.get("method", ""), exc.message
@@ -635,6 +668,27 @@ async def _dispatch_request(
                 with self._pending_lock:
                     self._incoming_request_cancellations.pop(cancellation_id, None)
 
+    async def _await_cancellable(self, outcome: Awaitable[Any], cancellation_id: int) -> Any:
+        """Await ``outcome``, cancelling it if the peer cancels the request."""
+        with self._pending_lock:
+            signal = self._incoming_request_cancellations.get(cancellation_id)
+        if signal is None or self._loop is None:
+            return await outcome
+        task = asyncio.ensure_future(outcome)
+        waiter = asyncio.ensure_future(signal.bind_event(self._loop).wait())
+        try:
+            await asyncio.wait({task, waiter}, return_when=asyncio.FIRST_COMPLETED)
+        except BaseException:
+            task.cancel()
+            raise
+        finally:
+            waiter.cancel()
+        if task.done():
+            return task.result()
+        task.cancel()
+        await asyncio.wait({task})
+        raise _RequestCancelledError()
+
     async def _send_response(self, request_id: str, result: Any):
         response = {
             "jsonrpc": "2.0",
diff --git a/python/copilot/client.py b/python/copilot/client.py
index 5f6f69cb4f..b1f7947e0c 100644
--- a/python/copilot/client.py
+++ b/python/copilot/client.py
@@ -114,6 +114,7 @@
     ElicitationHandler,
     ExitPlanModeHandler,
     GitHubMcpToolConfig,
+    ImageGenerationConfig,
     InfiniteSessionConfig,
     LargeToolOutputConfig,
     McpAuthHandler,
@@ -129,6 +130,7 @@
     SessionFsConfig,
     SessionHooks,
     SessionLimitsConfig,
+    SkillProvider,
     SystemMessageConfig,
     ToolSearchConfig,
     TranscriptRecoveryReport,
@@ -186,6 +188,14 @@ class GitHubTokenCancelledResult(TypedDict):
 ambient authentication.
 """
 
+
+def _required_string_param(params: dict, name: str) -> str:
+    value = params.get(name) if isinstance(params, dict) else None
+    if not isinstance(value, str):
+        raise JsonRpcError(-32602, "Invalid params")
+    return value
+
+
 # ============================================================================
 # Connection Types
 # ============================================================================
@@ -359,6 +369,16 @@ class ManagedSettingsPermissions:
     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."""
+    limit_to: list[str] | None = None
+    """Closed-world host boundary expressed as ``Domain(hostname)``,
+    ``Domain(IP)``, or ``Domain(*.example.com)`` rules. Schemes, ports, paths,
+    queries, and fragments are rejected. Multiple managed layers intersect
+    their lists; an empty list denies all hosts. Sent on the wire as
+    ``limitTo``."""
+    disable_assisted_permissions_mode: bool | None = None
+    """When true, prevents Assisted Permissions from being activated. Omit or
+    set to false to impose no restriction. Sent on the wire as
+    ``disableAssistedPermissionsMode``."""
 
 
 @dataclass
@@ -386,12 +406,16 @@ def _managed_settings_to_dict(settings: ManagedSettings) -> dict[str, Any]:
         perms: dict[str, Any] = {}
         if permissions.disable_bypass_permissions_mode is not None:
             perms["disableBypassPermissionsMode"] = permissions.disable_bypass_permissions_mode
+        if permissions.disable_assisted_permissions_mode is not None:
+            perms["disableAssistedPermissionsMode"] = permissions.disable_assisted_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)
+        if permissions.limit_to is not None:
+            perms["limitTo"] = list(permissions.limit_to)
         wire["permissions"] = perms
     return wire
 
@@ -1728,6 +1752,9 @@ def __init__(
         self._ffi_host: FfiRuntimeHost | None = None
         self._inprocess_runtime_path: str | None = None
         self._inprocess_cli_entrypoint: str | None = None
+        self._cli_login_sync_integration_id = (
+            os.environ.get("GITHUB_COPILOT_INTEGRATION_ID", "").strip() or None
+        )
 
         if isinstance(connection, UriRuntimeConnection):
             if connection.connection_token is not None and len(connection.connection_token) == 0:
@@ -1784,6 +1811,7 @@ def __init__(
         self._start_lock = asyncio.Lock()
         self._sessions: dict[str, CopilotSession] = {}
         self._sessions_lock = threading.Lock()
+        self._session_admission_closed = False
         self._ahp_hosts = _AhpHostManager(
             self._get_session, self.create_session, self.resume_session
         )
@@ -2035,6 +2063,8 @@ async def _start(self) -> None:
             if self._request_handler is not None:
                 await self._set_llm_inference_provider()
 
+            with self._sessions_lock:
+                self._session_admission_closed = False
             self._state = "connected"
             log_timing(
                 logger,
@@ -2109,6 +2139,7 @@ async def stop(self) -> None:
         # Atomically take ownership of all sessions and clear the dict
         # so no other thread can access them
         with self._sessions_lock:
+            self._session_admission_closed = True
             sessions_to_destroy = list(self._sessions.values())
             self._sessions.clear()
 
@@ -2260,6 +2291,7 @@ async def force_stop(self) -> None:
 
         # Clear sessions immediately without trying to destroy them
         with self._sessions_lock:
+            self._session_admission_closed = True
             sessions = list(self._sessions.values())
             self._sessions.clear()
         for session in sessions:
@@ -2323,6 +2355,7 @@ async def create_session(
         on_permission_request: _PermissionHandlerFn | None = None,
         model: str | None = None,
         session_id: str | None = None,
+        name: str | None = None,
         client_name: str | None = None,
         reasoning_effort: ReasoningEffort | None = None,
         reasoning_summary: ReasoningSummary | None = None,
@@ -2331,6 +2364,7 @@ async def create_session(
         tools: list[Tool] | None = None,
         system_message: SystemMessageConfig | None = None,
         tool_search: ToolSearchConfig | None = None,
+        image_generation: ImageGenerationConfig | None = None,
         available_tools: list[str] | ToolSet | None = None,
         excluded_tools: list[str] | ToolSet | None = None,
         on_user_input_request: UserInputHandler | None = None,
@@ -2374,6 +2408,9 @@ async def create_session(
         enable_skills: bool | None = None,
         included_builtin_skills: list[str] | None = None,
         skill_directories: list[str] | None = None,
+        skill_provider: SkillProvider | None = None,
+        agent_directories: list[str] | None = None,
+        hook_directories: list[str] | None = None,
         plugin_directories: list[str] | None = None,
         instruction_directories: list[str] | None = None,
         disabled_skills: list[str] | None = None,
@@ -2403,6 +2440,7 @@ async def create_session(
         feature_flags: dict[str, bool] | None = None,
         exp_assignments: CopilotExpAssignmentResponse | None = None,
         enable_managed_settings: bool | None = None,
+        enforce_managed_model_defaults: bool | None = None,
         github_mcp_tool_config: GitHubMcpToolConfig | None = None,
         managed_settings: ManagedSettings | None = None,
     ) -> CopilotSession:
@@ -2419,6 +2457,12 @@ async def create_session(
                 for the consumer to resolve via the pending permission RPC.
             model: The model to use for the session (e.g. ``"gpt-4"``).
             session_id: Optional session ID. If not provided, a UUID is generated.
+            name: Names the session at creation, as ``session.name.set`` would, and
+                is validated the same way: non-empty, no leading or trailing whitespace,
+                at most 100 UTF-16 units, no control characters, and no double quotes.
+                A name also makes the session persist from the start, so it can be listed
+                and resumed without ever running a turn. Local sessions only: cloud
+                creation rejects it.
             client_name: Optional client name for identification.
             reasoning_effort: Reasoning effort level for the model.
             reasoning_summary: Reasoning summary mode for supported models.
@@ -2519,13 +2563,32 @@ async def create_session(
             organization_custom_instructions: Organization-level custom instructions.
             enable_on_demand_instruction_discovery: Enables on-demand instruction file
                 discovery.
-            enable_file_hooks: Enables file-based hooks from ``.github/hooks/``.
+            enable_file_hooks: Enables repository-origin file hooks from ``.github/hooks/``
+                and trusted repository-configured roots, not explicit hook_directories
+                or callback hooks.
             enable_host_git_operations: Enables git operations on the host filesystem.
             enable_session_store: Enables the cross-session store.
             enable_skills: Enables skill loading.
-            skill_directories: Directories to search for skills.
-            instruction_directories: Additional directories to search for custom
-                instruction files.
+            skill_directories: Explicit discovery-only skill roots. No general filesystem
+                grant. Available without enable_config_discovery, subject to skill/managed
+                disables. Relative paths resolve once when supplied against the request's
+                effective working_directory; retained roots do not move on cwd changes.
+                None and omission are equivalent; [] clears only the explicit SDK roots.
+            skill_provider: **Experimental.** Session-scoped provider for SDK-owned
+                skills. Providers are not persisted; re-supply the provider when
+                resuming the session. Synchronous providers run on the event loop,
+                so keep them fast or make them async. Not supported for cloud
+                sessions.
+            agent_directories: Explicit discovery-only agent roots, separate from
+                custom_agents. Same path and clearing rules as skill_directories. Available
+                without enable_config_discovery, subject to source/managed disables.
+            hook_directories: Explicit discovery-only file-hook roots, separate from callback
+                hooks. Same path and clearing rules as skill_directories. Available without
+                enable_config_discovery or enable_file_hooks (repository-origin hooks only);
+                hook and managed disables still apply.
+            instruction_directories: Explicit discovery-only instruction roots using existing
+                SDK formats. Same path and clearing rules as skill_directories. Available
+                without enable_config_discovery, subject to instruction/managed disables.
             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
@@ -2533,6 +2596,8 @@ async def create_session(
                 already running. This does not change global MCP settings.
             infinite_sessions: Infinite session configuration.
             memory: Session memory configuration.
+            image_generation: **Experimental.** Image generation opt-in. Not persisted; re-supply
+                after runtime restart. See :class:`ImageGenerationConfig`.
             cloud: Creates a remote session in the cloud instead of a local
                 session. Optionally associates repository metadata with the
                 cloud session.
@@ -2577,6 +2642,10 @@ async def create_session(
                 expected to reject session creation (fail-closed). When unset,
                 behaves exactly as before. Sent on the wire as
                 ``enableManagedSettings``.
+            enforce_managed_model_defaults: When ``True``, locked managed model
+                controls are enforced for this session. Conflicting model changes
+                are rejected, while overridable managed defaults remain mutable.
+                Sent on the wire as ``enforceManagedModelDefaults``.
             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
@@ -2598,6 +2667,11 @@ async def create_session(
         Raises:
             ValueError: If ``on_permission_request`` is provided but not callable.
 
+        Note:
+            A session retained by the filesystem factory is retired if initialization
+            or the create RPC fails or is cancelled. Cancelling an accepted cloud
+            creation does not delete its remote session.
+
         Example:
             >>> session = await client.create_session(
             ...     on_permission_request=PermissionHandler.approve_all,
@@ -2616,6 +2690,8 @@ async def create_session(
             raise ValueError("github_token and github_token_provider are mutually exclusive")
         if ask_user_variant not in (None, "legacy", "elicitation"):
             raise ValueError('ask_user_variant must be "legacy" or "elicitation"')
+        if cloud is not None and skill_provider is not None:
+            raise ValueError("Skill providers are not supported for cloud sessions.")
         if not self._client:
             await self.start()
 
@@ -2669,6 +2745,8 @@ async def create_session(
 
         if tool_search is not None:
             payload["toolSearch"] = _tool_search_to_wire(tool_search)
+        if image_generation is not None:
+            payload["imageGeneration"] = dict(image_generation)
 
         if available_tools is not None:
             payload["availableTools"] = available_tools
@@ -2728,6 +2806,8 @@ async def create_session(
         # Opt the runtime into self-fetching enterprise managed settings
         if enable_managed_settings is not None:
             payload["enableManagedSettings"] = enable_managed_settings
+        if enforce_managed_model_defaults is not None:
+            payload["enforceManagedModelDefaults"] = enforce_managed_model_defaults
 
         # Host-injected managed settings (permissions-only contract)
         if managed_settings is not None:
@@ -2839,10 +2919,16 @@ async def create_session(
             payload["enableSessionStore"] = enable_session_store
         if enable_skills is not None:
             payload["enableSkills"] = enable_skills
+        if skill_provider is not None:
+            payload["hasSkillProvider"] = True
 
         # Add skill directories configuration if provided
-        if skill_directories:
+        if skill_directories is not None:
             payload["skillDirectories"] = skill_directories
+        if agent_directories is not None:
+            payload["agentDirectories"] = agent_directories
+        if hook_directories is not None:
+            payload["hookDirectories"] = hook_directories
 
         # Add plugin directories configuration if provided
         if plugin_directories:
@@ -2895,6 +2981,7 @@ async def create_session(
         if not self._client:
             raise RuntimeError("Client not connected")
 
+        rpc_client = self._client
         total_start = time.perf_counter()
         # For cloud sessions, let the CLI/server assign the session id and
         # register the session lazily once the response arrives. For non-cloud
@@ -2909,6 +2996,8 @@ async def create_session(
         )
         if local_session_id is not None:
             payload["sessionId"] = local_session_id
+        if name is not None:
+            payload["name"] = name
         github_token_provider_registration_id = self._register_github_token_provider(
             github_token_provider, local_session_id
         )
@@ -2919,8 +3008,17 @@ async def create_session(
         trace_ctx = get_trace_context()
         payload.update(trace_ctx)
 
+        event_loop = asyncio.get_running_loop()
+        event_loop_thread = threading.get_ident()
+
+        def _retire_unreturned_session(s: CopilotSession) -> None:
+            if threading.get_ident() == event_loop_thread:
+                s._mark_disconnected()
+            else:
+                event_loop.call_soon_threadsafe(s._mark_disconnected)
+
         def _initialize_session(sid: str) -> CopilotSession:
-            """Create the session, wire up handlers, and register it.
+            """Create the session and wire up handlers.
 
             Invoked from the reader thread the instant the session.create
             response arrives (synchronously, before the next message is
@@ -2930,7 +3028,7 @@ def _initialize_session(sid: str) -> CopilotSession:
             setup_start = time.perf_counter()
             s = CopilotSession(
                 sid,
-                self._client,
+                rpc_client,
                 workspace_path=None,
                 managed_settings_enabled=enable_managed_settings is True
                 or managed_settings is not None,
@@ -2942,54 +3040,59 @@ def _initialize_session(sid: str) -> CopilotSession:
                     )
                 ),
             )
-            if self._session_fs_config:
-                if create_session_fs_handler is None:
-                    raise ValueError(
-                        "create_session_fs_handler is required in session config when "
-                        "session_fs is enabled in client options."
-                    )
-                fs_provider: SessionFsProvider = create_session_fs_handler(s)
-                caps = self._session_fs_config.get("capabilities")
-                if caps and caps.get("sqlite"):
-                    from .session_fs_provider import SessionFsSqliteProvider
-
-                    if not isinstance(fs_provider, SessionFsSqliteProvider):
+            try:
+                if self._session_fs_config:
+                    if create_session_fs_handler is None:
                         raise ValueError(
-                            "SessionFs capabilities declare SQLite support but the provider "
-                            "does not implement SessionFsSqliteProvider"
+                            "create_session_fs_handler is required in session config when "
+                            "session_fs is enabled in client options."
                         )
-                if caps and caps.get("binary"):
-                    from .session_fs_provider import SessionFsBinaryProvider
+                    fs_provider: SessionFsProvider = create_session_fs_handler(s)
+                    caps = self._session_fs_config.get("capabilities")
+                    if caps and caps.get("sqlite"):
+                        from .session_fs_provider import SessionFsSqliteProvider
+
+                        if not isinstance(fs_provider, SessionFsSqliteProvider):
+                            raise ValueError(
+                                "SessionFs capabilities declare SQLite support but the provider "
+                                "does not implement SessionFsSqliteProvider"
+                            )
+                    if caps and caps.get("binary"):
+                        from .session_fs_provider import SessionFsBinaryProvider
 
-                    if not isinstance(fs_provider, SessionFsBinaryProvider):
-                        raise ValueError(
-                            "SessionFs capabilities declare binary support but the provider "
-                            "does not implement SessionFsBinaryProvider"
-                        )
-                s._client_session_apis.session_fs = create_session_fs_adapter(fs_provider)
-            s._register_tools(tools)
-            s._register_commands(commands)
-            s._register_permission_handler(on_permission_request)
-            s._register_mcp_auth_handler(on_mcp_auth_request)
-            if on_user_input_request:
-                s._register_user_input_handler(on_user_input_request)
-            if on_elicitation_request:
-                s._register_elicitation_handler(on_elicitation_request)
-            if on_exit_plan_mode_request:
-                s._register_exit_plan_mode_handler(on_exit_plan_mode_request)
-            if on_auto_mode_switch_request:
-                s._register_auto_mode_switch_handler(on_auto_mode_switch_request)
-            if canvas_handler is not None:
-                s._register_canvas_handler(canvas_handler)
-            s._register_bearer_token_providers(_collect_bearer_token_callbacks(provider, providers))
-            if hooks:
-                s._register_hooks(hooks)
-            if transform_callbacks:
-                s._register_transform_callbacks(transform_callbacks)
-            if on_event:
-                s.on(on_event)
-            with self._sessions_lock:
-                self._sessions[sid] = s
+                        if not isinstance(fs_provider, SessionFsBinaryProvider):
+                            raise ValueError(
+                                "SessionFs capabilities declare binary support but the provider "
+                                "does not implement SessionFsBinaryProvider"
+                            )
+                    s._client_session_apis.session_fs = create_session_fs_adapter(fs_provider)
+                s._register_tools(tools)
+                s._register_commands(commands)
+                s._register_skill_provider(skill_provider)
+                s._register_permission_handler(on_permission_request)
+                s._register_mcp_auth_handler(on_mcp_auth_request)
+                if on_user_input_request:
+                    s._register_user_input_handler(on_user_input_request)
+                if on_elicitation_request:
+                    s._register_elicitation_handler(on_elicitation_request)
+                if on_exit_plan_mode_request:
+                    s._register_exit_plan_mode_handler(on_exit_plan_mode_request)
+                if on_auto_mode_switch_request:
+                    s._register_auto_mode_switch_handler(on_auto_mode_switch_request)
+                if canvas_handler is not None:
+                    s._register_canvas_handler(canvas_handler)
+                s._register_bearer_token_providers(
+                    _collect_bearer_token_callbacks(provider, providers)
+                )
+                if hooks:
+                    s._register_hooks(hooks)
+                if transform_callbacks:
+                    s._register_transform_callbacks(transform_callbacks)
+                if on_event:
+                    s.on(on_event)
+            except BaseException:
+                _retire_unreturned_session(s)
+                raise
             log_timing(
                 logger,
                 logging.DEBUG,
@@ -3007,7 +3110,6 @@ def _initialize_session(sid: str) -> CopilotSession:
         server_assigned_session_id: str | None = None
         inline_state_lock = threading.Lock()
         request_failed = False
-        event_loop = asyncio.get_running_loop()
 
         async def _delete_uninitialized_session(sid: str) -> None:
             try:
@@ -3026,8 +3128,11 @@ async def _delete_uninitialized_session(sid: str) -> None:
         if local_session_id is not None:
             try:
                 session = _initialize_session(local_session_id)
+                self._register_session(session)
                 registered_session_id = local_session_id
             except BaseException:
+                if session is not None:
+                    session._mark_disconnected()
                 self._unregister_github_token_provider(github_token_provider_registration_id)
                 raise
 
@@ -3071,13 +3176,17 @@ def _register_inline(raw_response: Any) -> None:
                     with inline_state_lock:
                         late_success = request_failed
                         if not late_success:
+                            try:
+                                self._register_session(initialized)
+                            except BaseException:
+                                _retire_unreturned_session(initialized)
+                                raise
                             session = initialized
                             registered_session_id = sid
                     if late_success:
-                        with self._sessions_lock:
-                            self._sessions.pop(sid, None)
+                        _retire_unreturned_session(initialized)
 
-            response = await self._client.request(
+            response = await rpc_client.request(
                 "session.create", payload, on_response_inline=_register_inline
             )
             log_timing(
@@ -3098,7 +3207,7 @@ def _register_inline(raw_response: Any) -> None:
                 github_token_provider_registration_id, session.session_id
             )
             if on_mcp_auth_request is not None:
-                await self._client.request(
+                await rpc_client.request(
                     "session.eventLog.registerInterest",
                     {"sessionId": session.session_id, "eventType": "mcp.oauth_required"},
                 )
@@ -3110,9 +3219,13 @@ def _register_inline(raw_response: Any) -> None:
                 request_failed = True
                 registered_id = registered_session_id
                 orphaned_id = server_assigned_session_id
+                failed_session = session
+            if failed_session is not None:
+                failed_session._mark_disconnected()
             if registered_id is not None:
                 with self._sessions_lock:
-                    self._sessions.pop(registered_id, None)
+                    if self._sessions.get(registered_id) is failed_session:
+                        del self._sessions[registered_id]
             if orphaned_id is not None:
                 await _delete_uninitialized_session(orphaned_id)
             self._unregister_github_token_provider(github_token_provider_registration_id)
@@ -3164,6 +3277,7 @@ async def resume_session(
         tools: list[Tool] | None = None,
         system_message: SystemMessageConfig | None = None,
         tool_search: ToolSearchConfig | None = None,
+        image_generation: ImageGenerationConfig | None = None,
         available_tools: list[str] | ToolSet | None = None,
         excluded_tools: list[str] | ToolSet | None = None,
         on_user_input_request: UserInputHandler | None = None,
@@ -3206,6 +3320,9 @@ async def resume_session(
         enable_skills: bool | None = None,
         included_builtin_skills: list[str] | None = None,
         skill_directories: list[str] | None = None,
+        skill_provider: SkillProvider | None = None,
+        agent_directories: list[str] | None = None,
+        hook_directories: list[str] | None = None,
         plugin_directories: list[str] | None = None,
         instruction_directories: list[str] | None = None,
         disabled_skills: list[str] | None = None,
@@ -3238,6 +3355,7 @@ async def resume_session(
         feature_flags: dict[str, bool] | None = None,
         exp_assignments: CopilotExpAssignmentResponse | None = None,
         enable_managed_settings: bool | None = None,
+        enforce_managed_model_defaults: bool | None = None,
         github_mcp_tool_config: GitHubMcpToolConfig | None = None,
         managed_settings: ManagedSettings | None = None,
     ) -> CopilotSession:
@@ -3349,13 +3467,31 @@ async def resume_session(
             organization_custom_instructions: Organization-level custom instructions.
             enable_on_demand_instruction_discovery: Enables on-demand instruction file
                 discovery.
-            enable_file_hooks: Enables file-based hooks from ``.github/hooks/``.
+            enable_file_hooks: Enables repository-origin file hooks from ``.github/hooks/``
+                and trusted repository-configured roots, not explicit hook_directories
+                or callback hooks.
             enable_host_git_operations: Enables git operations on the host filesystem.
             enable_session_store: Enables the cross-session store.
             enable_skills: Enables skill loading.
-            skill_directories: Directories to search for skills.
-            instruction_directories: Additional directories to search for custom
-                instruction files.
+            skill_directories: Explicit discovery-only skill roots. No general filesystem
+                grant. Available without enable_config_discovery, subject to skill/managed
+                disables. Relative paths resolve once when supplied against the request's
+                effective working_directory; retained roots do not move on cwd changes.
+                None and omission are equivalent; [] clears only the explicit SDK roots.
+            skill_provider: **Experimental.** Session-scoped provider for SDK-owned
+                skills. Providers are not persisted; callers must re-supply the
+                provider on resume. Synchronous providers run on the event loop,
+                so keep them fast or make them async.
+            agent_directories: Explicit discovery-only agent roots, separate from
+                custom_agents. Same path and clearing rules as skill_directories. Available
+                without enable_config_discovery, subject to source/managed disables.
+            hook_directories: Explicit discovery-only file-hook roots, separate from callback
+                hooks. Same path and clearing rules as skill_directories. Available without
+                enable_config_discovery or enable_file_hooks (repository-origin hooks only);
+                hook and managed disables still apply.
+            instruction_directories: Explicit discovery-only instruction roots using existing
+                SDK formats. Same path and clearing rules as skill_directories. Available
+                without enable_config_discovery, subject to instruction/managed disables.
             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
@@ -3363,6 +3499,8 @@ async def resume_session(
                 already running. This does not change global MCP settings.
             infinite_sessions: Infinite session configuration.
             memory: Session memory configuration.
+            image_generation: **Experimental.** Image generation opt-in. Omission preserves a
+                resident session's setting; re-supply after runtime restart.
             on_event: Callback for session events.
             enable_mcp_apps: **Experimental.** Opt into MCP Apps (SEP-1865) UI
                 passthrough on resume. This parameter is part of an experimental
@@ -3414,6 +3552,10 @@ async def resume_session(
                 expected to reject session creation (fail-closed). When unset,
                 behaves exactly as before. Sent on the wire as
                 ``enableManagedSettings``.
+            enforce_managed_model_defaults: When ``True``, locked managed model
+                controls are enforced after resume. Conflicting model changes are
+                rejected, while overridable managed defaults remain mutable. Sent
+                on the wire as ``enforceManagedModelDefaults``.
             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
@@ -3431,6 +3573,11 @@ async def resume_session(
             RuntimeError: If the session does not exist or the client is not connected.
             ValueError: If ``on_permission_request`` is not a valid callable.
 
+        Note:
+            A session retained by the filesystem factory is retired if initialization
+            or the resume RPC fails or is cancelled. A failed resume preserves the
+            previously registered session.
+
         Example:
             >>> session = await client.resume_session(
             ...     "session-123",
@@ -3499,6 +3646,8 @@ async def resume_session(
             payload["systemMessage"] = wire_system_message
         if tool_search is not None:
             payload["toolSearch"] = _tool_search_to_wire(tool_search)
+        if image_generation is not None:
+            payload["imageGeneration"] = dict(image_generation)
         if available_tools is not None:
             payload["availableTools"] = available_tools
         if excluded_tools is not None:
@@ -3585,6 +3734,8 @@ async def resume_session(
         # Opt the runtime into self-fetching enterprise managed settings
         if enable_managed_settings is not None:
             payload["enableManagedSettings"] = enable_managed_settings
+        if enforce_managed_model_defaults is not None:
+            payload["enforceManagedModelDefaults"] = enforce_managed_model_defaults
 
         # Host-injected managed settings (permissions-only contract)
         if managed_settings is not None:
@@ -3612,6 +3763,8 @@ async def resume_session(
             payload["enableSessionStore"] = enable_session_store
         if enable_skills is not None:
             payload["enableSkills"] = enable_skills
+        if skill_provider is not None:
+            payload["hasSkillProvider"] = True
 
         if continue_pending_work is not None:
             payload["continuePendingWork"] = continue_pending_work
@@ -3649,8 +3802,12 @@ async def resume_session(
 
         if agent:
             payload["agent"] = agent
-        if skill_directories:
+        if skill_directories is not None:
             payload["skillDirectories"] = skill_directories
+        if agent_directories is not None:
+            payload["agentDirectories"] = agent_directories
+        if hook_directories is not None:
+            payload["hookDirectories"] = hook_directories
         if plugin_directories:
             payload["pluginDirectories"] = plugin_directories
         if instruction_directories is not None:
@@ -3698,6 +3855,7 @@ async def resume_session(
         if not self._client:
             raise RuntimeError("Client not connected")
 
+        rpc_client = self._client
         total_start = time.perf_counter()
         # Propagate W3C Trace Context to CLI if OpenTelemetry is active
         trace_ctx = get_trace_context()
@@ -3708,38 +3866,43 @@ async def resume_session(
         setup_start = time.perf_counter()
         session = CopilotSession(
             session_id,
-            self._client,
+            rpc_client,
             workspace_path=None,
             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:
-                raise ValueError(
-                    "create_session_fs_handler is required in session config when "
-                    "session_fs is enabled in client options."
-                )
-            fs_provider: SessionFsProvider = create_session_fs_handler(session)
-            caps = self._session_fs_config.get("capabilities")
-            if caps and caps.get("sqlite"):
-                from .session_fs_provider import SessionFsSqliteProvider
-
-                if not isinstance(fs_provider, SessionFsSqliteProvider):
+        try:
+            if self._session_fs_config:
+                if create_session_fs_handler is None:
                     raise ValueError(
-                        "SessionFs capabilities declare SQLite support but the provider "
-                        "does not implement SessionFsSqliteProvider"
+                        "create_session_fs_handler is required in session config when "
+                        "session_fs is enabled in client options."
                     )
-            if caps and caps.get("binary"):
-                from .session_fs_provider import SessionFsBinaryProvider
+                fs_provider: SessionFsProvider = create_session_fs_handler(session)
+                caps = self._session_fs_config.get("capabilities")
+                if caps and caps.get("sqlite"):
+                    from .session_fs_provider import SessionFsSqliteProvider
 
-                if not isinstance(fs_provider, SessionFsBinaryProvider):
-                    raise ValueError(
-                        "SessionFs capabilities declare binary support but the provider "
-                        "does not implement SessionFsBinaryProvider"
-                    )
-            session._client_session_apis.session_fs = create_session_fs_adapter(fs_provider)
+                    if not isinstance(fs_provider, SessionFsSqliteProvider):
+                        raise ValueError(
+                            "SessionFs capabilities declare SQLite support but the provider "
+                            "does not implement SessionFsSqliteProvider"
+                        )
+                if caps and caps.get("binary"):
+                    from .session_fs_provider import SessionFsBinaryProvider
+
+                    if not isinstance(fs_provider, SessionFsBinaryProvider):
+                        raise ValueError(
+                            "SessionFs capabilities declare binary support but the provider "
+                            "does not implement SessionFsBinaryProvider"
+                        )
+                session._client_session_apis.session_fs = create_session_fs_adapter(fs_provider)
+        except BaseException:
+            session._mark_disconnected()
+            raise
         session._register_tools(tools)
         session._register_commands(commands)
+        session._register_skill_provider(skill_provider)
         session._register_permission_handler(on_permission_request)
         session._register_mcp_auth_handler(on_mcp_auth_request)
         if on_user_input_request:
@@ -3761,8 +3924,11 @@ async def resume_session(
             session._register_transform_callbacks(transform_callbacks)
         if on_event:
             session.on(on_event)
-        with self._sessions_lock:
-            self._sessions[session_id] = session
+        try:
+            replaced_session = self._register_session(session)
+        except BaseException:
+            session._mark_disconnected()
+            raise
         log_timing(
             logger,
             logging.DEBUG,
@@ -3786,7 +3952,7 @@ async def resume_session(
 
         try:
             rpc_start = time.perf_counter()
-            response = await self._client.request("session.resume", payload)
+            response = await rpc_client.request("session.resume", payload)
             log_timing(
                 logger,
                 logging.DEBUG,
@@ -3810,13 +3976,20 @@ async def resume_session(
                     [OpenCanvasInstance.from_dict(inst) for inst in open_canvases_raw]
                 )
             if on_mcp_auth_request is not None:
-                await self._client.request(
+                await rpc_client.request(
                     "session.eventLog.registerInterest",
                     {"sessionId": session.session_id, "eventType": "mcp.oauth_required"},
                 )
         except BaseException as exc:
+            # The runtime keeps the resident session's bindings when a resume
+            # fails, so its callbacks must keep reaching the replaced session.
             with self._sessions_lock:
-                self._sessions.pop(session_id, None)
+                if self._sessions.get(session_id) is session:
+                    if replaced_session is not None:
+                        self._sessions[session_id] = replaced_session
+                    else:
+                        del self._sessions[session_id]
+            session._mark_disconnected()
             self._unregister_github_token_provider(github_token_provider_registration_id)
             if not isinstance(exc, asyncio.CancelledError):
                 log_timing(
@@ -4077,6 +4250,7 @@ async def delete_session(self, session_id: str) -> None:
         with self._sessions_lock:
             session = self._sessions.pop(session_id, None)
         if session is not None:
+            session._clear_skill_provider()
             session._run_disconnect_callback()
 
     async def get_last_session_id(self) -> str | None:
@@ -4438,6 +4612,8 @@ def _convert_custom_agent_to_wire_format(
             The custom agent configuration in camelCase wire format.
         """
         wire_agent: dict[str, Any] = {"name": agent.get("name"), "prompt": agent.get("prompt")}
+        if "hooks" in agent:
+            wire_agent["hooks"] = agent["hooks"]
         if "display_name" in agent:
             wire_agent["displayName"] = agent["display_name"]
         if "description" in agent:
@@ -4689,6 +4865,8 @@ async def _start_inprocess_ffi(self) -> None:
             args.extend(["--session-idle-timeout", str(opts.session_idle_timeout_seconds)])
         if opts.enable_remote_sessions:
             args.append("--remote")
+        if self._cli_login_sync_integration_id is not None:
+            args.append(f"--cli-login-sync-integration-id={self._cli_login_sync_integration_id}")
 
         environment: dict[str, str] = {}
         if opts.github_token:
@@ -4791,6 +4969,7 @@ def handle_notification(method: str, params: dict):
         self._client.set_request_handler(
             "systemMessage.transform", self._handle_system_message_transform
         )
+        self._register_session_scoped_request_handlers()
         register_client_session_api_handlers(self._client, self._get_client_session_handlers)
         self._register_client_global_handlers()
 
@@ -4910,6 +5089,7 @@ def handle_notification(method: str, params: dict):
         self._client.set_request_handler(
             "systemMessage.transform", self._handle_system_message_transform
         )
+        self._register_session_scoped_request_handlers()
         register_client_session_api_handlers(self._client, self._get_client_session_handlers)
         self._register_client_global_handlers()
 
@@ -5046,9 +5226,12 @@ def _handle_connection_close(self) -> None:
         if self._installation_confirmation_adapter is not None:
             self._installation_confirmation_adapter.close_connection()
         with self._sessions_lock:
+            self._session_admission_closed = True
             sessions = list(self._sessions.values())
         with self._github_token_providers_lock:
             self._github_token_providers.clear()
+        for session in sessions:
+            session._clear_skill_provider()
         client = self._client
         llm_inference_adapter = self._llm_inference_adapter
         loop = client._loop if client is not None else None
@@ -5095,10 +5278,33 @@ def _commit_github_token_provider(self, session_id: str, registration_id: str |
                     registration.session_id = session_id
                     registration.committed = True
 
+    def _register_session(self, session: CopilotSession) -> CopilotSession | None:
+        with self._sessions_lock:
+            if (
+                self._session_admission_closed
+                or self._client is None
+                or self._client is not session._client
+            ):
+                raise RuntimeError("Client not connected")
+            previous = self._sessions.get(session.session_id)
+            self._sessions[session.session_id] = session
+            return previous
+
     def _get_session(self, session_id: str) -> CopilotSession | None:
         with self._sessions_lock:
             return self._sessions.get(session_id)
 
+    def _register_session_scoped_request_handlers(self) -> None:
+        if not self._client:
+            return
+        # Cancellable so a runtime ``$/cancelRequest`` cancels an async provider's task.
+        self._client.set_request_handler(
+            "skillProvider.list", self._handle_skill_provider_list, cancellable=True
+        )
+        self._client.set_request_handler(
+            "skillProvider.read", self._handle_skill_provider_read, cancellable=True
+        )
+
     async def _set_llm_inference_provider(self) -> None:
         if self._request_handler is None or self._rpc is None:
             return
@@ -5111,6 +5317,21 @@ def _get_client_session_handlers(self, session_id: str) -> ClientSessionApiHandl
             raise ValueError(f"unknown session {session_id}")
         return session._client_session_apis
 
+    async def _handle_skill_provider_list(self, params: dict) -> dict:
+        session_id = _required_string_param(params, "sessionId")
+        session = self._get_session(session_id)
+        if session is None:
+            raise JsonRpcError(-32603, f"Session not found: {session_id}")
+        return await session._handle_skill_provider_list()
+
+    async def _handle_skill_provider_read(self, params: dict) -> dict:
+        session_id = _required_string_param(params, "sessionId")
+        name = _required_string_param(params, "name")
+        session = self._get_session(session_id)
+        if session is None:
+            raise JsonRpcError(-32603, f"Session not found: {session_id}")
+        return await session._handle_skill_provider_read(name)
+
     async def _handle_user_input_request(self, params: dict) -> dict:
         """
         Handle a user input request from the CLI server.
diff --git a/python/copilot/generated/rpc.py b/python/copilot/generated/rpc.py
index e30e815dea..e08198249b 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, AgentModelPolicy, Attachment, AutoTier, ContextTier, EmbeddedBlobResourceContents, EmbeddedTextResourceContents, IndexedSearchState, ManagedSettingsResolvedSource, McpOauthHttpResponse, McpOauthWWWAuthenticateParams, McpServerMetadata, McpServerSource, McpServerStatus, ModelChangeSource, PermissionDecisionSource, PermissionMode, PermissionPromptRequest, PermissionRule, ReasoningSummary, RemediationAction, SessionEvent, SessionLimitsConfig, SessionMode, ShutdownType, SkillSource, TaskBlocker, TaskCompletionOutcome, UserToolSessionApproval, Verbosity, _load_Attachment, _load_PermissionPromptRequest, _load_UserToolSessionApproval
+from .session_events import AbortReason, AgentModelPolicy, Attachment, AutoTier, ContextTier, EmbeddedBlobResourceContents, EmbeddedTextResourceContents, IndexedSearchState, ManagedPermissionsContext, ManagedSettingsResolvedSource, McpOauthHttpResponse, McpOauthWWWAuthenticateParams, McpServerMetadata, McpServerSource, McpServerStatus, ModelChangeSource, ModelProviderKind, ModelProviderRef, PermissionDecisionSource, PermissionMode, PermissionPromptRequest, PermissionRule, ProviderQuotaState, ReasoningSummary, RemediationAction, SessionEvent, SessionLimitsConfig, SessionMode, ShutdownType, SkillSource, TaskBlocker, TaskCompletionOutcome, UsageGetMetricsResult, UserToolSessionApproval, Verbosity, _load_Attachment, _load_PermissionPromptRequest, _load_UserToolSessionApproval
 
 if TYPE_CHECKING:
     from .._jsonrpc import JsonRpcClient
@@ -22,6 +22,7 @@
 
 T = TypeVar("T")
 EnumT = TypeVar("EnumT", bound=Enum)
+UNSET_SENTINEL = object()
 
 
 def from_str(x: Any) -> str:
@@ -305,6 +306,7 @@ class AuthInfoType(Enum):
 
     Authentication type.
     """
+    ACCOUNT = "account"
     API_KEY = "api-key"
     COPILOT_API_TOKEN = "copilot-api-token"
     ENV = "env"
@@ -347,6 +349,34 @@ def to_dict(self) -> dict:
             result["token"] = from_union([from_str, from_none], self.token)
         return result
 
+class AccountAuthInfoType(Enum):
+    ACCOUNT = "account"
+
+# 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 _AccountDescribeAuthInfoResult:
+    """The wording the runtime uses for an authentication identity."""
+
+    description: str
+    """One-line description of the identity, suitable after a verb such as "Switched to"."""
+
+    message: str
+    """Sign-in banner announcing the authenticated user."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_AccountDescribeAuthInfoResult':
+        assert isinstance(obj, dict)
+        description = from_str(obj.get("description"))
+        message = from_str(obj.get("message"))
+        return _AccountDescribeAuthInfoResult(description, message)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["description"] = from_str(self.description)
+        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 AccountGetCurrentAuthResult:
@@ -373,6 +403,38 @@ def to_dict(self) -> dict:
             result["authInfo"] = from_union([lambda x: (x).to_dict(), from_none], self.auth_info)
         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 _AccountGetGistSupportResult:
+    """Whether the identity can create gists, and why not when it cannot."""
+
+    supported: bool
+    """True when the identity can create gists."""
+
+    kind: str | None = None
+    """Machine-readable reason category when unsupported."""
+
+    reason: str | None = None
+    """Human-readable explanation to show where the gist action would have been."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_AccountGetGistSupportResult':
+        assert isinstance(obj, dict)
+        supported = from_bool(obj.get("supported"))
+        kind = from_union([from_str, from_none], obj.get("kind"))
+        reason = from_union([from_str, from_none], obj.get("reason"))
+        return _AccountGetGistSupportResult(supported, kind, reason)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["supported"] = from_bool(self.supported)
+        if self.kind is not None:
+            result["kind"] = from_union([from_str, from_none], self.kind)
+        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 AccountGetQuotaRequest:
@@ -456,12 +518,57 @@ def to_dict(self) -> dict:
             result["resetDate"] = from_union([from_str, from_none], self.reset_date)
         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 _AccountGetTokenEnvVarResult:
+    """The environment variable supplying a classic personal access token, when one is set."""
+
+    name: str | None = None
+    """Variable name, for example `GH_TOKEN`. Absent when no classic token is present in the
+    environment.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_AccountGetTokenEnvVarResult':
+        assert isinstance(obj, dict)
+        name = from_union([from_str, from_none], obj.get("name"))
+        return _AccountGetTokenEnvVarResult(name)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        if self.name is not None:
+            result["name"] = from_union([from_str, from_none], self.name)
+        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 _AccountGetWebURLResult:
+    """An absolute URL on the identity's GitHub host."""
+
+    url: str
+    """Absolute URL for the requested path."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_AccountGetWebURLResult':
+        assert isinstance(obj, dict)
+        url = from_str(obj.get("url"))
+        return _AccountGetWebURLResult(url)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["url"] = from_str(self.url)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 class AccountKind(Enum):
     """The provider kind stamped on a signed-in account.
 
     The provider kind of this account.
 
+    Provider kind that owns this account choice.
+
     The neutral provider kind.
 
     A provider a consumer may interactively sign in with.
@@ -733,11 +840,81 @@ def to_dict(self) -> dict:
         result["name"] = from_str(self.name)
         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 _AgentsCustomAgentInitialModelDecisionParams:
+    """The models a custom agent asks for, and the models actually available."""
+
+    agent_models_json: str
+    """The agent's declared `model:` entry, serialized. A single name or an ordered list of
+    acceptable names.
+    """
+    available_models_json: str
+    """The models available to this session, serialized in the shape the model list carries."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_AgentsCustomAgentInitialModelDecisionParams':
+        assert isinstance(obj, dict)
+        agent_models_json = from_str(obj.get("agentModelsJson"))
+        available_models_json = from_str(obj.get("availableModelsJson"))
+        return _AgentsCustomAgentInitialModelDecisionParams(agent_models_json, available_models_json)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["agentModelsJson"] = from_str(self.agent_models_json)
+        result["availableModelsJson"] = from_str(self.available_models_json)
+        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 _AgentsCustomAgentInitialModelDecisionResult:
+    """The model to switch to, and the warning to show when the agent's preference could not be
+    met.
+    """
+    reasoning_effort: str | None = None
+    """The reasoning effort attached to the selected model preference. Absent when that
+    preference does not specify an effort.
+    """
+    target_model: str | None = None
+    """The first available model that matches the agent's preferences. Absent when none of the
+    requested models is available.
+    """
+    warning: str | None = None
+    """What to tell the user about an unmet preference. Absent when the preference was met. A
+    warning with no `targetModel` means the agent's models are all unavailable.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_AgentsCustomAgentInitialModelDecisionResult':
+        assert isinstance(obj, dict)
+        reasoning_effort = from_union([from_str, from_none], obj.get("reasoningEffort"))
+        target_model = from_union([from_str, from_none], obj.get("targetModel"))
+        warning = from_union([from_str, from_none], obj.get("warning"))
+        return _AgentsCustomAgentInitialModelDecisionResult(reasoning_effort, target_model, warning)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        if self.reasoning_effort is not None:
+            result["reasoningEffort"] = from_union([from_str, from_none], self.reasoning_effort)
+        if self.target_model is not None:
+            result["targetModel"] = from_union([from_str, from_none], self.target_model)
+        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 AgentsDiscoverRequest:
     """Optional project paths to include in agent discovery."""
 
+    agent_directories: list[str] | None = field(default=None, kw_only=True)
+    """Explicit discovery-only agent roots, separate from customAgents and filesystem grants.
+    Available without ambient discovery, subject to managed/source disables. Relative paths
+    resolve against the request's effective working directory when supplied. Null and
+    omission are equivalent; an empty array contributes no explicit roots.
+    """
     exclude_host_agents: bool | None = None
     """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.
@@ -750,23 +927,221 @@ class AgentsDiscoverRequest:
     @staticmethod
     def from_dict(obj: Any) -> 'AgentsDiscoverRequest':
         assert isinstance(obj, dict)
+        agent_directories = from_union([lambda x: from_list(from_str, x), from_none], obj.get("agentDirectories"))
         exclude_host_agents = from_union([from_bool, from_none], obj.get("excludeHostAgents"))
         project_paths = from_union([lambda x: from_list(from_str, x), from_none], obj.get("projectPaths"))
-        return AgentsDiscoverRequest(exclude_host_agents, project_paths)
+        return AgentsDiscoverRequest(exclude_host_agents, project_paths, agent_directories=agent_directories)
 
     def to_dict(self) -> dict:
         result: dict = {}
+        if self.agent_directories is not None:
+            result["agentDirectories"] = from_union([lambda x: from_list(from_str, x), from_none], self.agent_directories)
         if self.exclude_host_agents is not None:
             result["excludeHostAgents"] = from_union([from_bool, from_none], self.exclude_host_agents)
         if self.project_paths is not None:
             result["projectPaths"] = from_union([lambda x: from_list(from_str, x), from_none], self.project_paths)
         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 _AgentsGetAvailableBuiltinsRequest:
+    """The feature flags to evaluate shipped agents against."""
+
+    context: str | None = None
+    """The surface asking, which gates agents that only apply to one client. Omit or pass null
+    to apply no client filter.
+    """
+    feature_flags: dict[str, Any] | None = None
+    """Feature flag values keyed by name, evaluated with the runtime's truthiness rules. Omit or
+    pass null for no flags.
+    """
+    overrides: dict[str, Any] | None = None
+    """Flag overrides keyed by name. A null entry uses the corresponding base flag; false
+    explicitly disables it. Omit or pass null for no overrides.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_AgentsGetAvailableBuiltinsRequest':
+        assert isinstance(obj, dict)
+        context = from_union([from_none, from_str], obj.get("context"))
+        feature_flags = from_union([lambda x: from_dict(lambda x: x, x), from_none], obj.get("featureFlags"))
+        overrides = from_union([lambda x: from_dict(lambda x: x, x), from_none], obj.get("overrides"))
+        return _AgentsGetAvailableBuiltinsRequest(context, feature_flags, overrides)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        if self.context is not None:
+            result["context"] = from_union([from_none, from_str], self.context)
+        if self.feature_flags is not None:
+            result["featureFlags"] = from_union([lambda x: from_dict(lambda x: x, x), from_none], self.feature_flags)
+        if self.overrides is not None:
+            result["overrides"] = from_union([lambda x: from_dict(lambda x: x, x), from_none], self.overrides)
+        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 _BuiltinAgentSummary:
+    """A shipped agent, named and described."""
+
+    description: str
+    """One-line description of what the agent does."""
+
+    name: str
+    """The agent name, as it appears in `getBuiltins`."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_BuiltinAgentSummary':
+        assert isinstance(obj, dict)
+        description = from_str(obj.get("description"))
+        name = from_str(obj.get("name"))
+        return _BuiltinAgentSummary(description, name)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["description"] = from_str(self.description)
+        result["name"] = from_str(self.name)
+        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 _AgentsGetBuiltinDefinitionRequest:
+    """The shipped agent whose definition to load."""
+
+    name: str
+    """The agent name, which must be one of `getBuiltins`'s `yamlBasedNames`. A name outside
+    that list is special-cased in code and has no definition, and is reported as an error
+    rather than as an empty definition.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_AgentsGetBuiltinDefinitionRequest':
+        assert isinstance(obj, dict)
+        name = from_str(obj.get("name"))
+        return _AgentsGetBuiltinDefinitionRequest(name)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["name"] = from_str(self.name)
+        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 _AgentsGetBuiltinDefinitionResult:
+    """One shipped agent's definition."""
+
+    definition_json: str
+    """The agent's definition, serialized as JSON. It carries the authored keys plus the
+    runtime's projected `__nativeCustomAgent` view of the same agent. It is a string rather
+    than an object because the runtime parses it with the agent schema's tolerant shape,
+    which accepts keys this contract does not name.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_AgentsGetBuiltinDefinitionResult':
+        assert isinstance(obj, dict)
+        definition_json = from_str(obj.get("definitionJson"))
+        return _AgentsGetBuiltinDefinitionResult(definition_json)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["definitionJson"] = from_str(self.definition_json)
+        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 _AgentsGetBuiltinListingDefinitionRequest:
+    """The shipped agent whose listing entry to load."""
+
+    name: str
+    """The agent name, taken from `getAvailableBuiltins`. Unlike `getBuiltinDefinition`, the
+    agent that `getBuiltins` reports as special-cased rather than YAML-based is answered here
+    too, from its in-code definition.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_AgentsGetBuiltinListingDefinitionRequest':
+        assert isinstance(obj, dict)
+        name = from_str(obj.get("name"))
+        return _AgentsGetBuiltinListingDefinitionRequest(name)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["name"] = from_str(self.name)
+        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 _AgentsGetBuiltinListingDefinitionResult:
+    """One shipped agent, projected for a listing."""
+
+    definition_json: str
+    """The agent projected as a custom agent, serialized as JSON. It is a string rather than an
+    object for the same reason as `getBuiltinDefinition`: the runtime parses the underlying
+    definition with the agent schema's tolerant shape, which accepts keys this contract does
+    not name.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_AgentsGetBuiltinListingDefinitionResult':
+        assert isinstance(obj, dict)
+        definition_json = from_str(obj.get("definitionJson"))
+        return _AgentsGetBuiltinListingDefinitionResult(definition_json)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["definitionJson"] = from_str(self.definition_json)
+        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 _AgentsGetBuiltinsResult:
+    """The agents this runtime ships, named so a consumer can tell them apart from authored ones."""
+
+    disableable_names: list[str]
+    """The subset of `names` a user is allowed to turn off. A shipped agent outside this list is
+    always active and a client should not offer a toggle for it.
+    """
+    names: list[str]
+    """Every agent name this runtime ships."""
+
+    yaml_based_names: list[str]
+    """The subset of `names` defined by a shipped YAML definition. The remainder are
+    special-cased in code and have no definition to load.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_AgentsGetBuiltinsResult':
+        assert isinstance(obj, dict)
+        disableable_names = from_list(from_str, obj.get("disableableNames"))
+        names = from_list(from_str, obj.get("names"))
+        yaml_based_names = from_list(from_str, obj.get("yamlBasedNames"))
+        return _AgentsGetBuiltinsResult(disableable_names, names, yaml_based_names)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["disableableNames"] = from_list(from_str, self.disableable_names)
+        result["names"] = from_list(from_str, self.names)
+        result["yamlBasedNames"] = from_list(from_str, self.yaml_based_names)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class AgentsGetDiscoveryPathsRequest:
     """Optional project paths to include when enumerating agent discovery directories."""
 
+    agent_directories: list[str] | None = field(default=None, kw_only=True)
+    """Explicit discovery-only agent roots to enumerate, including configured missing
+    directories. Relative paths resolve against the request's effective working directory
+    when supplied. These are not filesystem grants or preferred creation targets. Null and
+    omission are equivalent.
+    """
     exclude_host_agents: bool | None = None
     """When true, omit the host's user-level agent directory, leaving only project directories.
     For multitenant deployments (mirrors `discover`'s `excludeHostAgents`).
@@ -779,12 +1154,15 @@ class AgentsGetDiscoveryPathsRequest:
     @staticmethod
     def from_dict(obj: Any) -> 'AgentsGetDiscoveryPathsRequest':
         assert isinstance(obj, dict)
+        agent_directories = from_union([lambda x: from_list(from_str, x), from_none], obj.get("agentDirectories"))
         exclude_host_agents = from_union([from_bool, from_none], obj.get("excludeHostAgents"))
         project_paths = from_union([lambda x: from_list(from_str, x), from_none], obj.get("projectPaths"))
-        return AgentsGetDiscoveryPathsRequest(exclude_host_agents, project_paths)
+        return AgentsGetDiscoveryPathsRequest(exclude_host_agents, project_paths, agent_directories=agent_directories)
 
     def to_dict(self) -> dict:
         result: dict = {}
+        if self.agent_directories is not None:
+            result["agentDirectories"] = from_union([lambda x: from_list(from_str, x), from_none], self.agent_directories)
         if self.exclude_host_agents is not None:
             result["excludeHostAgents"] = from_union([from_bool, from_none], self.exclude_host_agents)
         if self.project_paths is not None:
@@ -843,12 +1221,13 @@ class AuthLoginStepKind(Enum):
 
 # Experimental: this type is part of an experimental API and may change or be removed.
 class AuthLoginResultStatus(Enum):
-    """Terminal disposition of the login.
+    """Current disposition of the login, including pending user decisions.
 
-    Terminal disposition of a login persistence attempt.
+    Disposition of a login attempt, including pending user decisions.
     """
     COMPLETED = "completed"
     DECLINED = "declined"
+    NEEDS_ACCOUNT_SELECTION = "needs-account-selection"
     NEEDS_PLAINTEXT_CONSENT = "needs-plaintext-consent"
 
 # Experimental: this type is part of an experimental API and may change or be removed.
@@ -966,6 +1345,39 @@ def to_dict(self) -> dict:
             result["moreUsers"] = from_union([from_bool, from_none], self.more_users)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class AutoTierStatus:
+    """Current account-specific availability.
+
+    Availability of a server-advertised routing preference.
+    """
+    enabled: bool
+    """Whether the provider permits selecting this preference."""
+
+    message: str | None = None
+    """Human-readable explanation of availability."""
+
+    reason: str | None = None
+    """Extensible machine-readable unavailability reason."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'AutoTierStatus':
+        assert isinstance(obj, dict)
+        enabled = from_bool(obj.get("enabled"))
+        message = from_union([from_str, from_none], obj.get("message"))
+        reason = from_union([from_str, from_none], obj.get("reason"))
+        return AutoTierStatus(enabled, message, reason)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["enabled"] = from_bool(self.enabled)
+        if self.message is not None:
+            result["message"] = from_union([from_str, from_none], self.message)
+        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 AutopilotObjectiveCreditLimit:
@@ -2389,6 +2801,8 @@ class ConnectorCatalogStatus(Enum):
     """Current authoritative service connection state.
 
     Authoritative service connection state for one Connector.
+
+    Status.
     """
     CONNECTED = "connected"
     ERROR = "error"
@@ -2476,6 +2890,25 @@ def to_dict(self) -> dict:
         result["pollIntervalMs"] = from_int(self.poll_interval_ms)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class ConnectorDiscoveryAccountRequest:
+    """Selected account."""
+
+    account_id: str
+    """Opaque account ID."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'ConnectorDiscoveryAccountRequest':
+        assert isinstance(obj, dict)
+        account_id = from_str(obj.get("accountId"))
+        return ConnectorDiscoveryAccountRequest(account_id)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["accountId"] = from_str(self.account_id)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class ConnectorReconcileRequest:
@@ -2908,6 +3341,13 @@ class CurrentModel:
     no plan override has captured a base model. Persistent agent model requirements apply to
     this model rather than the temporary plan model.
     """
+    plan_base_provider_id: str | None = None
+    """Provider of planBaseModelId, when that saved selection is provider-qualified."""
+
+    provider_id: str | None = None
+    """Provider selected for this model. Together with modelId, identifies a catalog entry even
+    when providers serve the same model. Omitted for unattributed legacy selections.
+    """
     reasoning_effort: str | None = None
     """Reasoning effort level currently applied to the active model, when one is set. Reads
     `Session.getReasoningEffort()` synchronously after `getSelectedModel()` resolves so the
@@ -2923,8 +3363,10 @@ def from_dict(obj: Any) -> 'CurrentModel':
         model_id = from_union([from_str, from_none], obj.get("modelId"))
         pending_auto_tier = from_union([AutoTier, from_none], obj.get("pendingAutoTier"))
         plan_base_model_id = from_union([from_str, from_none], obj.get("planBaseModelId"))
+        plan_base_provider_id = from_union([from_str, from_none], obj.get("planBaseProviderId"))
+        provider_id = from_union([from_str, from_none], obj.get("providerId"))
         reasoning_effort = from_union([from_str, from_none], obj.get("reasoningEffort"))
-        return CurrentModel(activating_auto_tier, auto_tier, context_tier, model_id, pending_auto_tier, plan_base_model_id, reasoning_effort)
+        return CurrentModel(activating_auto_tier, auto_tier, context_tier, model_id, pending_auto_tier, plan_base_model_id, plan_base_provider_id, provider_id, reasoning_effort)
 
     def to_dict(self) -> dict:
         result: dict = {}
@@ -2940,6 +3382,10 @@ def to_dict(self) -> dict:
             result["pendingAutoTier"] = from_union([lambda x: to_enum(AutoTier, x), from_none], self.pending_auto_tier)
         if self.plan_base_model_id is not None:
             result["planBaseModelId"] = from_union([from_str, from_none], self.plan_base_model_id)
+        if self.plan_base_provider_id is not None:
+            result["planBaseProviderId"] = from_union([from_str, from_none], self.plan_base_provider_id)
+        if self.provider_id is not None:
+            result["providerId"] = from_union([from_str, from_none], self.provider_id)
         if self.reasoning_effort is not None:
             result["reasoningEffort"] = from_union([from_str, from_none], self.reasoning_effort)
         return result
@@ -3815,6 +4261,180 @@ class ExternalToolTextResultForLlmContentTerminalType(Enum):
 class KindEnum(Enum):
     TEXT = "text"
 
+# 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 _FeatureFlagAvailability(Enum):
+    """The population a feature flag is declared for, before overrides.
+
+    The population the flag is declared for before any environment or user-settings override
+    is applied.
+    """
+    EXPERIMENTAL = "experimental"
+    OFF = "off"
+    ON = "on"
+    STAFF = "staff"
+    STAFF_AND_EXPERIMENTAL = "staff-and-experimental"
+    STAFF_GITHUB = "staff-github"
+    STAFF_MICROSOFT = "staff-microsoft"
+    STAFF_OR_EXPERIMENTAL = "staff-or-experimental"
+    TEAM = "team"
+
+# 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 _FeatureFlagsResolveRequest:
+    """Caller population and overrides for static feature-flag resolution, independent of
+    experiment assignments and active runtime state.
+    """
+    is_experimental: bool
+    """Whether the caller is in an experimental population."""
+
+    is_staff: bool
+    """Whether the caller is GitHub or Microsoft staff."""
+
+    is_team: bool
+    """Whether the caller belongs to the team population used by feature availability."""
+
+    base_flags: dict[str, bool] | None = None
+    """Resolve against this already-computed flag set rather than each flag's declared
+    availability. Keyed by flag name.
+    """
+    config: Any = None
+    """User settings to apply, including `enabledFeatureFlags`, legacy `feature_flags.enabled`,
+    and supported convenience settings.
+    """
+    environment: dict[str, str] | None = None
+    """Environment for direct feature-flag overrides and `COPILOT_CLI_ENABLED_FEATURE_FLAGS`.
+    Does not apply `COPILOT_EXP_*` experiment assignments. Defaults to this runtime process's
+    own environment.
+    """
+    flag_overrides: dict[str, bool] | None = None
+    """Flags forced to a value after every other layer, keyed by flag name."""
+
+    is_staff_github: bool | None = None
+    """GitHub-staff membership. Omit when it was never recorded: a legacy staff account then
+    counts as both staff populations and keeps every staff feature.
+    """
+    is_staff_microsoft: bool | None = None
+    """Microsoft-staff membership. Omitted the same way as `isStaffGitHub`."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_FeatureFlagsResolveRequest':
+        assert isinstance(obj, dict)
+        is_experimental = from_bool(obj.get("isExperimental"))
+        is_staff = from_bool(obj.get("isStaff"))
+        is_team = from_bool(obj.get("isTeam"))
+        base_flags = from_union([lambda x: from_dict(from_bool, x), from_none], obj.get("baseFlags"))
+        config = obj.get("config")
+        environment = from_union([lambda x: from_dict(from_str, x), from_none], obj.get("environment"))
+        flag_overrides = from_union([lambda x: from_dict(from_bool, x), from_none], obj.get("flagOverrides"))
+        is_staff_github = from_union([from_bool, from_none], obj.get("isStaffGithub"))
+        is_staff_microsoft = from_union([from_bool, from_none], obj.get("isStaffMicrosoft"))
+        return _FeatureFlagsResolveRequest(is_experimental, is_staff, is_team, base_flags, config, environment, flag_overrides, is_staff_github, is_staff_microsoft)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["isExperimental"] = from_bool(self.is_experimental)
+        result["isStaff"] = from_bool(self.is_staff)
+        result["isTeam"] = from_bool(self.is_team)
+        if self.base_flags is not None:
+            result["baseFlags"] = from_union([lambda x: from_dict(from_bool, x), from_none], self.base_flags)
+        if self.config is not None:
+            result["config"] = self.config
+        if self.environment is not None:
+            result["environment"] = from_union([lambda x: from_dict(from_str, x), from_none], self.environment)
+        if self.flag_overrides is not None:
+            result["flagOverrides"] = from_union([lambda x: from_dict(from_bool, x), from_none], self.flag_overrides)
+        if self.is_staff_github is not None:
+            result["isStaffGithub"] = from_union([from_bool, from_none], self.is_staff_github)
+        if self.is_staff_microsoft is not None:
+            result["isStaffMicrosoft"] = from_union([from_bool, from_none], self.is_staff_microsoft)
+        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 _FeatureFlagsResolveStartupGatesRequest:
+    """Caller population and startup inputs to resolve named online-experiment gates for.
+    Carries no account: the runtime resolves the assignment for the authentication it already
+    holds.
+    """
+    flags: list[str]
+    """The feature flags to resolve. A name this runtime does not declare is reported as an
+    error rather than as a disabled flag.
+    """
+    is_experimental: bool
+    """Whether the caller is in an experimental population."""
+
+    is_staff: bool
+    """Whether the caller is GitHub or Microsoft staff."""
+
+    is_team: bool
+    """Whether the caller belongs to a team plan."""
+
+    refresh_without_session: bool
+    """Whether the runtime may refresh the cached assignment over the network without an active
+    session. The refresh never blocks this call: the answer comes from the cache either way,
+    so a refresh only affects a later launch.
+    """
+    streamer_mode: bool
+    """Whether streamer mode is on, which withholds the populations an experiment would
+    otherwise segment on.
+    """
+    config: Any = None
+    """User settings document whose `featureFlags` block is layered on top of the resolved set."""
+
+    environment: dict[str, str] | None = None
+    """Environment to read flag overrides from. Defaults to this runtime process's own
+    environment.
+    """
+    first_launch_at_millis: float | None = None
+    """When this installation first launched, in milliseconds since the Unix epoch. Experiments
+    that segment on installation age read it. Omit when the first launch was never recorded.
+    """
+    is_staff_github: bool | None = None
+    """GitHub-staff membership. Omit when it was never recorded: a legacy staff account then
+    counts as both staff populations and keeps every staff feature.
+    """
+    is_staff_microsoft: bool | None = None
+    """Microsoft-staff membership. Omitted the same way as `isStaffGitHub`."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_FeatureFlagsResolveStartupGatesRequest':
+        assert isinstance(obj, dict)
+        flags = from_list(from_str, obj.get("flags"))
+        is_experimental = from_bool(obj.get("isExperimental"))
+        is_staff = from_bool(obj.get("isStaff"))
+        is_team = from_bool(obj.get("isTeam"))
+        refresh_without_session = from_bool(obj.get("refreshWithoutSession"))
+        streamer_mode = from_bool(obj.get("streamerMode"))
+        config = obj.get("config")
+        environment = from_union([lambda x: from_dict(from_str, x), from_none], obj.get("environment"))
+        first_launch_at_millis = from_union([from_float, from_none], obj.get("firstLaunchAtMillis"))
+        is_staff_github = from_union([from_bool, from_none], obj.get("isStaffGithub"))
+        is_staff_microsoft = from_union([from_bool, from_none], obj.get("isStaffMicrosoft"))
+        return _FeatureFlagsResolveStartupGatesRequest(flags, is_experimental, is_staff, is_team, refresh_without_session, streamer_mode, config, environment, first_launch_at_millis, is_staff_github, is_staff_microsoft)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["flags"] = from_list(from_str, self.flags)
+        result["isExperimental"] = from_bool(self.is_experimental)
+        result["isStaff"] = from_bool(self.is_staff)
+        result["isTeam"] = from_bool(self.is_team)
+        result["refreshWithoutSession"] = from_bool(self.refresh_without_session)
+        result["streamerMode"] = from_bool(self.streamer_mode)
+        if self.config is not None:
+            result["config"] = self.config
+        if self.environment is not None:
+            result["environment"] = from_union([lambda x: from_dict(from_str, x), from_none], self.environment)
+        if self.first_launch_at_millis is not None:
+            result["firstLaunchAtMillis"] = from_union([to_float, from_none], self.first_launch_at_millis)
+        if self.is_staff_github is not None:
+            result["isStaffGithub"] = from_union([from_bool, from_none], self.is_staff_github)
+        if self.is_staff_microsoft is not None:
+            result["isStaffMicrosoft"] = from_union([from_bool, from_none], self.is_staff_microsoft)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class FleetStartRequest:
@@ -3935,9 +4555,299 @@ def to_dict(self) -> dict:
         result["trusted"] = from_bool(self.trusted)
         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 _FolderTrustIsTrustedParams:
+    """A folder to check against a persisted trusted-folders list, and the configuration
+    directory holding that list.
+    """
+    path: str
+    """Folder to check. A folder counts as trusted when it is itself listed, when an ancestor is
+    listed, or when its git root is listed.
+    """
+    config_dir: str | None = None
+    """Configuration directory to read the trusted-folders list from. Omit it to read the
+    default location; supply it when the host has redirected its configuration, or the check
+    answers from a list the host is not using.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_FolderTrustIsTrustedParams':
+        assert isinstance(obj, dict)
+        path = from_str(obj.get("path"))
+        config_dir = from_union([from_str, from_none], obj.get("configDir"))
+        return _FolderTrustIsTrustedParams(path, config_dir)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["path"] = from_str(self.path)
+        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.
+# Internal: this type is an internal SDK API and is not part of the public surface.
+@dataclass
+class _ForceLoginOrgsDecision:
+    """The verdict of the `forceLoginOrgs` enterprise sign-in pin for one credential. A managed
+    device may pin Copilot to an approved set of GitHub organizations so a developer cannot
+    sign in with a personal — or another enterprise's — account and escape every control that
+    keys off the signed-in identity. A host must refuse to proceed when `allowed` is false;
+    the remaining fields explain the refusal rather than qualifying it.
+
+    The enterprise sign-in verdict for the credential this resolution ran against, evaluated
+    over the effective policy so a server-delivered pin is honored alongside a device one.
+    Computed on every resolution, including one that was not retained, so a host that
+    declines to apply policy still cannot proceed past a pin.
+    """
+    allowed: bool
+    """Whether the client may proceed. True whenever no pin is in force, so an unmanaged host is
+    never blocked.
+    """
+    enforced: bool
+    """Whether a pin applies at all. Distinguishes "allowed because unmanaged" from "allowed
+    because the account is approved", which a diagnostics surface needs and which also
+    decides whether a bring-your-own-key provider may serve inference.
+    """
+    policy_diagnostics: list[str]
+    """Error-level detail from managed-policy discovery — which file failed to load, which field
+    failed validation. Carried on the decision rather than left to the log because a refusal
+    can exit the process before a log sink exists, which would discard the only actionable
+    diagnostic a misconfigured managed device produces.
+    """
+    required_orgs: list[str]
+    """The approved organization logins, as configured. Enterprise configuration rather than
+    user data, so it is safe to name in a message or a log line.
+    """
+    denial: str | None = None
+    """A stable kebab-case reason code when refused: `org-not-approved`,
+    `unverifiable-credential`, `policy-undetermined`, `policy-invalid`, `not-signed-in`, or
+    `membership-unknown`. Omitted when allowed. Treat an unrecognized code as a refusal
+    rather than mapping it to an allow: a code this host has not been taught about still
+    denied the credential.
+    """
+    matched_org: str | None = None
+    """The approved organization the account matched, when allowed under a pin."""
+
+    message: str | None = None
+    """A developer-facing explanation of the refusal. Omitted when allowed."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_ForceLoginOrgsDecision':
+        assert isinstance(obj, dict)
+        allowed = from_bool(obj.get("allowed"))
+        enforced = from_bool(obj.get("enforced"))
+        policy_diagnostics = from_list(from_str, obj.get("policyDiagnostics"))
+        required_orgs = from_list(from_str, obj.get("requiredOrgs"))
+        denial = from_union([from_str, from_none], obj.get("denial"))
+        matched_org = from_union([from_str, from_none], obj.get("matchedOrg"))
+        message = from_union([from_str, from_none], obj.get("message"))
+        return _ForceLoginOrgsDecision(allowed, enforced, policy_diagnostics, required_orgs, denial, matched_org, message)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["allowed"] = from_bool(self.allowed)
+        result["enforced"] = from_bool(self.enforced)
+        result["policyDiagnostics"] = from_list(from_str, self.policy_diagnostics)
+        result["requiredOrgs"] = from_list(from_str, self.required_orgs)
+        if self.denial is not None:
+            result["denial"] = from_union([from_str, from_none], self.denial)
+        if self.matched_org is not None:
+            result["matchedOrg"] = from_union([from_str, from_none], self.matched_org)
+        if self.message is not None:
+            result["message"] = from_union([from_str, from_none], self.message)
+        return result
+
 class GhCLIAuthInfoType(Enum):
     GH_CLI = "gh-cli"
 
+# 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 _GitCurrentBranchRemoteResult:
+    """The remote the checked-out branch tracks."""
+
+    remote: str
+    """Name of the tracked remote. Reports `origin` whenever the working tree has no tracking
+    configuration to read, including on a detached HEAD, so this is never null and never
+    empty.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_GitCurrentBranchRemoteResult':
+        assert isinstance(obj, dict)
+        remote = from_str(obj.get("remote"))
+        return _GitCurrentBranchRemoteResult(remote)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["remote"] = from_str(self.remote)
+        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 _GitCwdRequest:
+    """Working-tree path a git query applies to."""
+
+    cwd: str
+    """Absolute path to a directory inside the git working tree to query."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_GitCwdRequest':
+        assert isinstance(obj, dict)
+        cwd = from_str(obj.get("cwd"))
+        return _GitCwdRequest(cwd)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["cwd"] = from_str(self.cwd)
+        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 _GitHubOwnerOption:
+    """A GitHub login the authenticated user may act as: their own account, or an organization
+    they belong to.
+    """
+    login: str
+    """The owner's GitHub login."""
+
+    type: str
+    """Which kind of owner this is. The authenticated user's own account is always reported as
+    `user`.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_GitHubOwnerOption':
+        assert isinstance(obj, dict)
+        login = from_str(obj.get("login"))
+        type = from_str(obj.get("type"))
+        return _GitHubOwnerOption(login, type)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["login"] = from_str(self.login)
+        result["type"] = from_str(self.type)
+        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 _GitHubOwnersCancelRequest:
+    """The owner listing to abandon."""
+
+    request_id: int
+    """Request id the listing was started with."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_GitHubOwnersCancelRequest':
+        assert isinstance(obj, dict)
+        request_id = from_int(obj.get("requestId"))
+        return _GitHubOwnersCancelRequest(request_id)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["requestId"] = from_int(self.request_id)
+        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 _GitHubOwnersCancelResult:
+    """Whether the id named a running owner listing."""
+
+    canceled: bool
+    """True when a listing with the id was running and the cancel stopped it. False when the id
+    was never registered, was registered but unused, was released after being abandoned, or
+    its listing had ended. An unused id is released and cannot start a later listing.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_GitHubOwnersCancelResult':
+        assert isinstance(obj, dict)
+        canceled = from_bool(obj.get("canceled"))
+        return _GitHubOwnersCancelResult(canceled)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["canceled"] = from_bool(self.canceled)
+        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 _GitHubOwnersListRequest:
+    """Credential to list owners under, and the request id that makes the listing cancellable."""
+
+    auth_info: Any
+    """The credential the listing runs under, carried opaquely because its shape is the host's
+    own and the runtime only resolves a token and a GitHub host from it. No credential
+    travels: this selects one the runtime already holds.
+    """
+    request_id: int
+    """Request id from `gitHubOwners.nextRequestId`. An id that was never registered, canceled
+    before use, released after being abandoned, or already used is refused rather than
+    silently running uncancellable.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_GitHubOwnersListRequest':
+        assert isinstance(obj, dict)
+        auth_info = obj.get("authInfo")
+        request_id = from_int(obj.get("requestId"))
+        return _GitHubOwnersListRequest(auth_info, request_id)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["authInfo"] = self.auth_info
+        result["requestId"] = from_int(self.request_id)
+        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 _GitHubOwnersRequestIDResult:
+    """A freshly registered request id. Registering it before the listing starts is what lets a
+    cancel that races the request still find the owner listing slot. The id serves one
+    listing only. Long-abandoned unused ids can be released by later allocations.
+    """
+    request_id: int
+    """Request id to pass to `gitHubOwners.list` and, to abandon it, `gitHubOwners.cancel`."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_GitHubOwnersRequestIDResult':
+        assert isinstance(obj, dict)
+        request_id = from_int(obj.get("requestId"))
+        return _GitHubOwnersRequestIDResult(request_id)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["requestId"] = from_int(self.request_id)
+        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 _GitHubRepositoryAtPathRequest:
+    """Working-tree path whose owning GitHub repository should be resolved."""
+
+    path: str
+    """Absolute path to a directory inside the git working tree to resolve."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_GitHubRepositoryAtPathRequest':
+        assert isinstance(obj, dict)
+        path = from_str(obj.get("path"))
+        return _GitHubRepositoryAtPathRequest(path)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["path"] = from_str(self.path)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class GitHubTelemetryClientInfo:
@@ -4031,6 +4941,132 @@ class GitHubTokenAcquireResultKind(Enum):
     CANCELLED = "cancelled"
     TOKEN = "token"
 
+# 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 _GitRemoteRepository:
+    """A GitHub repository one of a working tree's remotes points at."""
+
+    host: str
+    """GitHub host serving the repository, which is not `github.com` for a GitHub Enterprise
+    remote.
+    """
+    name: str
+    """Repository name, without the owner."""
+
+    owner: str
+    """Account or organization owning the repository."""
+
+    remote_name: str
+    """Name of the first remote that produced this distinct repository entry, such as `origin`
+    or `upstream`.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_GitRemoteRepository':
+        assert isinstance(obj, dict)
+        host = from_str(obj.get("host"))
+        name = from_str(obj.get("name"))
+        owner = from_str(obj.get("owner"))
+        remote_name = from_str(obj.get("remoteName"))
+        return _GitRemoteRepository(host, name, owner, remote_name)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["host"] = from_str(self.host)
+        result["name"] = from_str(self.name)
+        result["owner"] = from_str(self.owner)
+        result["remoteName"] = from_str(self.remote_name)
+        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 _GitReposFromRemotesRequest:
+    """Git working tree whose GitHub remotes should be listed."""
+
+    git_root: str
+    """Absolute path to the root of the git working tree."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_GitReposFromRemotesRequest':
+        assert isinstance(obj, dict)
+        git_root = from_str(obj.get("gitRoot"))
+        return _GitReposFromRemotesRequest(git_root)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["gitRoot"] = from_str(self.git_root)
+        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 _GlobalStateLoadForConfigDirRequest:
+    """Selects the configuration directory whose machine-wide state to read."""
+
+    config_dir: str | None = None
+    """Copilot configuration directory to read the state document from, taking precedence over
+    the server's own `COPILOT_HOME` and default home. Omit it, or pass an empty string, to
+    read the directory the server resolved for itself.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_GlobalStateLoadForConfigDirRequest':
+        assert isinstance(obj, dict)
+        config_dir = from_union([from_str, from_none], obj.get("configDir"))
+        return _GlobalStateLoadForConfigDirRequest(config_dir)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        if self.config_dir is not None:
+            result["configDir"] = from_union([from_str, from_none], self.config_dir)
+        return result
+
+class InstalledPluginSourceURLSource(Enum):
+    GITHUB = "github"
+    LOCAL = "local"
+    URL = "url"
+
+# 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 _GlobalStateWriteKeyRequest:
+    """A single top-level key to record in the host's machine-wide state. The write replaces
+    only that key and leaves the rest of the document untouched, so two writers recording
+    different one-off flags do not overwrite each other. The stored credential keys cannot be
+    written through this method.
+    """
+    key: str
+    """Top-level key to write, named as it appears in the result of `globalState.load`. It must
+    be one of the writable keys that `globalState.writeKey` lists.
+    """
+    config_dir: str | None = None
+    """Copilot configuration directory to write the state document in, taking precedence over
+    the server's own `COPILOT_HOME` and default home. Omit it, or pass an empty string, to
+    write the directory the server resolved for itself. Mirrors
+    `globalState.loadForConfigDir`, so a caller can read and write the same directory.
+    """
+    value: Any = None
+    """Value to store for the key. Omit it, or pass null, to remove the key instead."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_GlobalStateWriteKeyRequest':
+        assert isinstance(obj, dict)
+        key = from_str(obj.get("key"))
+        config_dir = from_union([from_str, from_none], obj.get("configDir"))
+        value = obj.get("value")
+        return _GlobalStateWriteKeyRequest(key, config_dir, value)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["key"] = from_str(self.key)
+        if self.config_dir is not None:
+            result["configDir"] = from_union([from_str, from_none], self.config_dir)
+        if self.value is not None:
+            result["value"] = self.value
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class HandlePendingToolCallResult:
@@ -4446,6 +5482,13 @@ class HooksDiscoverRequest:
     still contribute to each remaining row's effective enabled state. This filters sources
     rather than simulating a host with no settings.
     """
+    hook_directories: list[str] | None = field(default=None, kw_only=True)
+    """Explicit discovery-only file-hook roots, separate from callback hooks and filesystem
+    grants. Available without ambient discovery or repository file-hook enablement, subject
+    to managed/hook disables. Relative paths resolve against the request's effective working
+    directory when supplied. Null and omission are equivalent; an empty array contributes no
+    explicit roots.
+    """
     project_paths: list[str] | None = None
     """Optional project directory paths whose trusted repository and project-expanded plugin
     hooks should be discovered. When omitted or empty, user, managed-policy, and globally
@@ -4456,13 +5499,16 @@ class HooksDiscoverRequest:
     def from_dict(obj: Any) -> 'HooksDiscoverRequest':
         assert isinstance(obj, dict)
         exclude_host_hooks = from_union([from_bool, from_none], obj.get("excludeHostHooks"))
+        hook_directories = from_union([lambda x: from_list(from_str, x), from_none], obj.get("hookDirectories"))
         project_paths = from_union([lambda x: from_list(from_str, x), from_none], obj.get("projectPaths"))
-        return HooksDiscoverRequest(exclude_host_hooks, project_paths)
+        return HooksDiscoverRequest(exclude_host_hooks, project_paths, hook_directories=hook_directories)
 
     def to_dict(self) -> dict:
         result: dict = {}
         if self.exclude_host_hooks is not None:
             result["excludeHostHooks"] = from_union([from_bool, from_none], self.exclude_host_hooks)
+        if self.hook_directories is not None:
+            result["hookDirectories"] = from_union([lambda x: from_list(from_str, x), from_none], self.hook_directories)
         if self.project_paths is not None:
             result["projectPaths"] = from_union([lambda x: from_list(from_str, x), from_none], self.project_paths)
         return result
@@ -4483,17 +5529,27 @@ class HostGitHubEnvironmentOptions:
     name: str
     """Human-readable environment display name."""
 
+    require_connection_binding: bool | None = None
+    """Require sealed, connection-bound authentication (default true), independent of listener
+    address. False permits unsealed direct credentials and unbound sealed relay credentials;
+    use only when the caller fully controls and trusts the direct transport. Relay token
+    encryption remains mandatory.
+    """
+
     @staticmethod
     def from_dict(obj: Any) -> 'HostGitHubEnvironmentOptions':
         assert isinstance(obj, dict)
         compute_id = from_str(obj.get("computeId"))
         name = from_str(obj.get("name"))
-        return HostGitHubEnvironmentOptions(compute_id, name)
+        require_connection_binding = from_union([from_bool, from_none], obj.get("requireConnectionBinding"))
+        return HostGitHubEnvironmentOptions(compute_id, name, require_connection_binding)
 
     def to_dict(self) -> dict:
         result: dict = {}
         result["computeId"] = from_str(self.compute_id)
         result["name"] = from_str(self.name)
+        if self.require_connection_binding is not None:
+            result["requireConnectionBinding"] = from_union([from_bool, from_none], self.require_connection_binding)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
@@ -4599,6 +5655,7 @@ def to_dict(self) -> dict:
         result["token"] = from_str(self.token)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
 class HostExitReason(Enum):
     """Cause of termination."""
 
@@ -4607,6 +5664,74 @@ class HostExitReason(Enum):
     OWNER_DISCONNECTED = "ownerDisconnected"
     RUNTIME_SHUTDOWN = "runtimeShutdown"
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class HostListSessionsRequest:
+    """Reads a running host's catalog or the runtime's saved default catalog."""
+
+    host_id: str | None = None
+    """Listener UUID returned by host.start; the caller must own it. Omit to read
+    the saved default compute-identity catalog without starting a listener.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'HostListSessionsRequest':
+        assert isinstance(obj, dict)
+        host_id = from_union([from_str, from_none], obj.get("hostId"))
+        return HostListSessionsRequest(host_id)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        if self.host_id is not None:
+            result["hostId"] = from_union([from_str, from_none], self.host_id)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class HostSessionSummary:
+    """Metadata advertised by the AHP host, not a guarantee that history can be resumed."""
+
+    created_at: str
+    """Session creation time as an ISO 8601 timestamp."""
+
+    modified_at: str
+    """Last modification time as an ISO 8601 timestamp."""
+
+    resource: str
+    """Stable AHP resource URI identifying the session on this host."""
+
+    status: int
+    """Unsigned 32-bit AHP session status bitset (0..=4294967295); unknown bits must be
+    preserved.
+    """
+    title: str
+    """Authoritative title advertised by the host."""
+
+    activity: str | None = None
+    """Optional activity description advertised by the host."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'HostSessionSummary':
+        assert isinstance(obj, dict)
+        created_at = from_str(obj.get("createdAt"))
+        modified_at = from_str(obj.get("modifiedAt"))
+        resource = from_str(obj.get("resource"))
+        status = from_int(obj.get("status"))
+        title = from_str(obj.get("title"))
+        activity = from_union([from_str, from_none], obj.get("activity"))
+        return HostSessionSummary(created_at, modified_at, resource, status, title, activity)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["createdAt"] = from_str(self.created_at)
+        result["modifiedAt"] = from_str(self.modified_at)
+        result["resource"] = from_str(self.resource)
+        result["status"] = from_int(self.status)
+        result["title"] = from_str(self.title)
+        if self.activity is not None:
+            result["activity"] = from_union([from_str, from_none], self.activity)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class HostLocalServerOptions:
@@ -4727,6 +5852,7 @@ def to_dict(self) -> dict:
             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 HostRegisterSessionRequest:
     """Listener-scoped registration, not a copy or durable adoption of a session."""
@@ -4812,6 +5938,7 @@ def to_dict(self) -> dict:
         result["handoffId"] = from_str(self.handoff_id)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class HostSessionReleasedNotification:
     """Releases the original application session object retained for one handoff."""
@@ -5246,11 +6373,6 @@ class InstallationDecision(Enum):
     CONFIRM = "confirm"
     DECLINE = "decline"
 
-class InstalledPluginSourceURLSource(Enum):
-    GITHUB = "github"
-    LOCAL = "local"
-    URL = "url"
-
 class PurpleSource(Enum):
     GITHUB = "github"
 
@@ -5280,6 +6402,63 @@ class InstructionSourceType(Enum):
     REPO = "repo"
     VSCODE = "vscode"
 
+# 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 _InstructionsDiscoverRepoSourcesRequest:
+    """Explicit discovery arguments for one location, supplied by the caller rather than derived
+    from a session.
+    """
+    location: str
+    """Repository location to discover. An empty string selects no repository scope; cwdPath can
+    still supply working-directory sources.
+    """
+    additional_dirs: list[str] | None = None
+    """Extra directories to scan alongside instruction directories configured in the runtime
+    environment.
+    """
+    config_dir: str | None = None
+    """Copilot configuration directory for user-level sources. An omitted or empty value uses
+    the server's configuration home.
+    """
+    cwd_path: str | None = None
+    """Working directory whose instruction sources should also be included. Omission adds no
+    separate working-directory scope.
+    """
+    enable_child_instructions: bool | None = None
+    """When true, also discover instruction files nested below the location."""
+
+    is_cli: bool | None = None
+    """When true, include the sources a command-line host reads. Hosts that are not the CLI omit
+    it.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_InstructionsDiscoverRepoSourcesRequest':
+        assert isinstance(obj, dict)
+        location = from_str(obj.get("location"))
+        additional_dirs = from_union([lambda x: from_list(from_str, x), from_none], obj.get("additionalDirs"))
+        config_dir = from_union([from_str, from_none], obj.get("configDir"))
+        cwd_path = from_union([from_str, from_none], obj.get("cwdPath"))
+        enable_child_instructions = from_union([from_bool, from_none], obj.get("enableChildInstructions"))
+        is_cli = from_union([from_bool, from_none], obj.get("isCli"))
+        return _InstructionsDiscoverRepoSourcesRequest(location, additional_dirs, config_dir, cwd_path, enable_child_instructions, is_cli)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["location"] = from_str(self.location)
+        if self.additional_dirs is not None:
+            result["additionalDirs"] = from_union([lambda x: from_list(from_str, x), from_none], self.additional_dirs)
+        if self.config_dir is not None:
+            result["configDir"] = from_union([from_str, from_none], self.config_dir)
+        if self.cwd_path is not None:
+            result["cwdPath"] = from_union([from_str, from_none], self.cwd_path)
+        if self.enable_child_instructions is not None:
+            result["enableChildInstructions"] = from_union([from_bool, from_none], self.enable_child_instructions)
+        if self.is_cli is not None:
+            result["isCli"] = from_union([from_bool, from_none], self.is_cli)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class InstructionsDiscoverRequest:
@@ -5289,6 +6468,12 @@ class 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.
     """
+    instruction_directories: list[str] | None = field(default=None, kw_only=True)
+    """Explicit discovery-only instruction roots using existing SDK instruction formats, not
+    filesystem grants. Available without ambient discovery, subject to instruction/managed
+    disables. Relative paths resolve against the request's effective working directory when
+    supplied. Null and omission are equivalent; an empty array contributes no explicit roots.
+    """
     project_paths: list[str] | None = None
     """Optional list of project directory paths to scan for repository/working-directory
     instruction sources. When omitted or empty, only user-level and plugin instruction
@@ -5299,13 +6484,16 @@ class InstructionsDiscoverRequest:
     def from_dict(obj: Any) -> 'InstructionsDiscoverRequest':
         assert isinstance(obj, dict)
         exclude_host_instructions = from_union([from_bool, from_none], obj.get("excludeHostInstructions"))
+        instruction_directories = from_union([lambda x: from_list(from_str, x), from_none], obj.get("instructionDirectories"))
         project_paths = from_union([lambda x: from_list(from_str, x), from_none], obj.get("projectPaths"))
-        return InstructionsDiscoverRequest(exclude_host_instructions, project_paths)
+        return InstructionsDiscoverRequest(exclude_host_instructions, project_paths, instruction_directories=instruction_directories)
 
     def to_dict(self) -> dict:
         result: dict = {}
         if self.exclude_host_instructions is not None:
             result["excludeHostInstructions"] = from_union([from_bool, from_none], self.exclude_host_instructions)
+        if self.instruction_directories is not None:
+            result["instructionDirectories"] = from_union([lambda x: from_list(from_str, x), from_none], self.instruction_directories)
         if self.project_paths is not None:
             result["projectPaths"] = from_union([lambda x: from_list(from_str, x), from_none], self.project_paths)
         return result
@@ -5319,6 +6507,12 @@ class InstructionsGetDiscoveryPathsRequest:
     """When true, omit the host's user-level instruction targets, leaving only repository
     targets. For multitenant deployments (mirrors `discover`'s `excludeHostInstructions`).
     """
+    instruction_directories: list[str] | None = field(default=None, kw_only=True)
+    """Explicit discovery-only instruction roots to enumerate, including configured missing
+    directories. Relative paths resolve against the request's effective working directory
+    when supplied. These are not filesystem grants or preferred creation targets. Null and
+    omission are equivalent.
+    """
     project_paths: list[str] | None = None
     """Optional list of project directory paths. When omitted or empty, only the user-level
     targets are returned.
@@ -5328,17 +6522,40 @@ class InstructionsGetDiscoveryPathsRequest:
     def from_dict(obj: Any) -> 'InstructionsGetDiscoveryPathsRequest':
         assert isinstance(obj, dict)
         exclude_host_instructions = from_union([from_bool, from_none], obj.get("excludeHostInstructions"))
+        instruction_directories = from_union([lambda x: from_list(from_str, x), from_none], obj.get("instructionDirectories"))
         project_paths = from_union([lambda x: from_list(from_str, x), from_none], obj.get("projectPaths"))
-        return InstructionsGetDiscoveryPathsRequest(exclude_host_instructions, project_paths)
+        return InstructionsGetDiscoveryPathsRequest(exclude_host_instructions, project_paths, instruction_directories=instruction_directories)
 
     def to_dict(self) -> dict:
         result: dict = {}
         if self.exclude_host_instructions is not None:
             result["excludeHostInstructions"] = from_union([from_bool, from_none], self.exclude_host_instructions)
+        if self.instruction_directories is not None:
+            result["instructionDirectories"] = from_union([lambda x: from_list(from_str, x), from_none], self.instruction_directories)
         if self.project_paths is not None:
             result["projectPaths"] = from_union([lambda x: from_list(from_str, x), from_none], self.project_paths)
         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 _InstructionsInitPromptResult:
+    """The prompt the init command runs."""
+
+    prompt: str
+    """Prompt text authoring repository instructions."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_InstructionsInitPromptResult':
+        assert isinstance(obj, dict)
+        prompt = from_str(obj.get("prompt"))
+        return _InstructionsInitPromptResult(prompt)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["prompt"] = from_str(self.prompt)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class InterruptMainTurnRequest:
@@ -5661,6 +6878,26 @@ class HostType(Enum):
     ADO = "ado"
     GITHUB = "github"
 
+# 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 _LocationPermissionsCleanupResult:
+    """Which stored location permissions were dropped because their directory is gone."""
+
+    removed_location_keys: list[str]
+    """Location keys whose grants were removed. Empty when every stored location still exists."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_LocationPermissionsCleanupResult':
+        assert isinstance(obj, dict)
+        removed_location_keys = from_list(from_str, obj.get("removedLocationKeys"))
+        return _LocationPermissionsCleanupResult(removed_location_keys)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["removedLocationKeys"] = from_list(from_str, self.removed_location_keys)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 class SessionLogLevel(Enum):
     """Log severity level. Determines how the message is displayed in the timeline. Defaults to
@@ -5768,6 +7005,33 @@ def to_dict(self) -> dict:
             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.
+class ManagedPermissionVerdict(Enum):
+    """Managed-policy decision only; never bypasses user permissions or other security
+    controls.
+
+    Managed-policy verdict only: deny blocks the URL, ask requires approval, allow approves
+    under managed policy, and unmanaged leaves the normal consumer permission flow in effect.
+    No verdict bypasses other security controls.
+    """
+    ALLOW = "allow"
+    ASK = "ask"
+    DENY = "deny"
+    UNMANAGED = "unmanaged"
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+class ManagedPluginRetryStatus(Enum):
+    """What the retry did for this plugin.
+
+    What retrying did for one plugin required by managed settings.
+    """
+    ALREADY_PRESENT = "already_present"
+    DEFERRED = "deferred"
+    FAILED = "failed"
+    INSTALLED = "installed"
+    NOT_REQUIRED = "not_required"
+    UPDATED = "updated"
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class ManagedSettingMeta:
@@ -5775,6 +7039,10 @@ class ManagedSettingMeta:
 
     Lock state and provenance of `values.autoTier`.
 
+    Lock state and provenance of `values.contextTier`.
+
+    Lock state and provenance of `values.effortLevel`.
+
     Lock state and provenance of `values.model`.
     """
     overridable: bool
@@ -5786,20 +7054,107 @@ class ManagedSettingMeta:
     `server`, or `policyHelper`. These scalar defaults select one winning channel, not a
     mixed source. Treat unknown values as additional channels; more may be added.
     """
+    requested: str | None = None
+    """Original managed value when the runtime adjusted it to a supported effective value.
+    Omitted when no adjustment was needed.
+    """
 
     @staticmethod
     def from_dict(obj: Any) -> 'ManagedSettingMeta':
         assert isinstance(obj, dict)
         overridable = from_bool(obj.get("overridable"))
         source = from_str(obj.get("source"))
-        return ManagedSettingMeta(overridable, source)
+        requested = from_union([from_str, from_none], obj.get("requested"))
+        return ManagedSettingMeta(overridable, source, requested)
 
     def to_dict(self) -> dict:
         result: dict = {}
         result["overridable"] = from_bool(self.overridable)
         result["source"] = from_str(self.source)
+        if self.requested is not None:
+            result["requested"] = from_union([from_str, from_none], self.requested)
+        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 _ManagedSettingsApplyControlsParams:
+    """A user settings document and the effective managed policy whose controlled entries should
+    be stamped onto it.
+    """
+    settings: Any
+    """The user settings document to stamp. Entries the managed layer does not name are returned
+    exactly as supplied.
+    """
+    managed: Any = None
+    """The effective managed policy, as composed by `managedSettings.resolveEffectiveValue`.
+    Omit it on an unmanaged host: the settings then come back unchanged.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_ManagedSettingsApplyControlsParams':
+        assert isinstance(obj, dict)
+        settings = obj.get("settings")
+        managed = obj.get("managed")
+        return _ManagedSettingsApplyControlsParams(settings, managed)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["settings"] = self.settings
+        if self.managed is not None:
+            result["managed"] = self.managed
         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 _ManagedSettingsApplyControlsResult:
+    """The user settings with the managed layer's controlled entries stamped on."""
+
+    settings_json: Any
+    """The resulting settings document."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_ManagedSettingsApplyControlsResult':
+        assert isinstance(obj, dict)
+        settings_json = obj.get("settingsJson")
+        return _ManagedSettingsApplyControlsResult(settings_json)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["settingsJson"] = self.settings_json
+        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 _ManagedSettingsBypassDisableSource(Enum):
+    """Which layer disabled bypass-permissions mode. The layer matters because only a
+    server-delivered disable is pinned to an account and can later be lifted by signing in
+    elsewhere.
+
+    Which layer currently disables bypass mode. Omit it when nothing does.
+
+    Which layer disables bypass mode after this resolution. Omitted when none does, which is
+    what a lifted disable looks like.
+    """
+    MANAGED = "managed"
+    MDM = "mdm"
+    USER = "user"
+
+# 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 _ManagedSettingsBypassPolicyResolution(Enum):
+    """What the managed-policy resolution said about bypass-permissions mode. `unknown` is a
+    third answer rather than a missing one, and the caller must send it explicitly when it
+    has no verdict.
+
+    What the resolution said about bypass mode. Send `unknown` rather than omitting the field
+    when there is no verdict.
+    """
+    ALLOWED = "allowed"
+    DISABLED = "disabled"
+    UNKNOWN = "unknown"
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 class ManagedSettingsChannel(Enum):
     """A channel accepted by managedSettings.compose.
@@ -5864,16 +7219,18 @@ class ManagedSettingsResolvedData:
     shape as `session.managedSettings.get`, excluding session-local injection.
     """
     bypass_permissions_disabled: bool
-    """Whether enterprise policy disables bypass-permissions ("yolo") mode for this session.
-    Deny-wins across layers, and forced on when `failClosed` is true.
+    """Whether an explicit enterprise policy restriction disables bypass-permissions ("yolo")
+    mode for this session. Deny-wins across layers; an unresolved policy does not force this
+    on by itself.
     """
     device_managed: bool
     """Whether an actual device MDM/plist/registry/file managed-settings layer was present"""
 
     fail_closed: 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.
+    """Whether managed policy could not be determined (e.g. a failed server fetch) and
+    unresolved-policy safeguards remain active. This does not by itself disable
+    bypass-permissions; `bypassPermissionsDisabled` reports only an explicit policy
+    restriction.
     """
     managed_keys: list[str]
     """The setting keys under enterprise management in the effective managed settings (e.g.
@@ -5894,6 +7251,11 @@ class ManagedSettingsResolvedData:
     """Whether at least two managed sources supplied permission allowlists, so enforcement
     intersects them and the flattened settings payload omits `permissions.allow`.
     """
+    permissions_context: ManagedPermissionsContext | None = None
+    """Reusable retained managed permission policy for managedSettings.permissions.evaluate,
+    including source composition and session-local injection. Provided by live session
+    snapshots; absent in older events. Refresh the context when managed policy changes.
+    """
     policy_helper_managed: bool | None = None
     """Whether the policy-helper managed-settings layer was present. The policy helper is the
     weakest channel: it fills keys no enterprise source set and can never replace one.
@@ -5920,10 +7282,11 @@ def from_dict(obj: Any) -> 'ManagedSettingsResolvedData':
         source = ManagedSettingsResolvedSource(obj.get("source"))
         client_managed = from_union([from_bool, from_none], obj.get("clientManaged"))
         permissions_allow_intersected = from_union([from_bool, from_none], obj.get("permissionsAllowIntersected"))
+        permissions_context = from_union([ManagedPermissionsContext.from_dict, from_none], obj.get("permissionsContext"))
         policy_helper_managed = from_union([from_bool, from_none], obj.get("policyHelperManaged"))
         sandbox_enabled_by_undetermined_policy = from_union([from_bool, from_none], obj.get("sandboxEnabledByUndeterminedPolicy"))
         settings = obj.get("settings")
-        return ManagedSettingsResolvedData(bypass_permissions_disabled, device_managed, fail_closed, managed_keys, server_managed, source, client_managed, permissions_allow_intersected, policy_helper_managed, sandbox_enabled_by_undetermined_policy, settings)
+        return ManagedSettingsResolvedData(bypass_permissions_disabled, device_managed, fail_closed, managed_keys, server_managed, source, client_managed, permissions_allow_intersected, permissions_context, policy_helper_managed, sandbox_enabled_by_undetermined_policy, settings)
 
     def to_dict(self) -> dict:
         result: dict = {}
@@ -5937,6 +7300,8 @@ def to_dict(self) -> dict:
             result["clientManaged"] = from_union([from_bool, from_none], self.client_managed)
         if self.permissions_allow_intersected is not None:
             result["permissionsAllowIntersected"] = from_union([from_bool, from_none], self.permissions_allow_intersected)
+        if self.permissions_context is not None:
+            result["permissionsContext"] = from_union([lambda x: to_class(ManagedPermissionsContext, x), from_none], self.permissions_context)
         if self.policy_helper_managed is not None:
             result["policyHelperManaged"] = from_union([from_bool, from_none], self.policy_helper_managed)
         if self.sandbox_enabled_by_undetermined_policy is not None:
@@ -5961,26 +7326,220 @@ class ManagedSettingsValues:
     auto_tier: AutoTier | None = None
     """Managed Auto routing preference, used when the selected model is `auto`."""
 
+    context_tier: ContextTier | None = None
+    """Managed context-tier default for the managed concrete model."""
+
+    effort_level: str | None = None
+    """Managed reasoning-effort default for the managed concrete model. The runtime clamps it to
+    an entitled effort when model availability is known.
+    """
     model: str | None = None
-    """Managed default model identifier, as configured. New sessions start with it; it can name
-    a model the account cannot use, so hosts match it against the listed models.
+    """Managed default model identifier. When model availability was resolved, aliases and
+    family names are projected to a concrete available model ID; otherwise the configured
+    value is returned.
     """
 
     @staticmethod
     def from_dict(obj: Any) -> 'ManagedSettingsValues':
         assert isinstance(obj, dict)
         auto_tier = from_union([AutoTier, from_none], obj.get("autoTier"))
+        context_tier = from_union([ContextTier, from_none], obj.get("contextTier"))
+        effort_level = from_union([from_str, from_none], obj.get("effortLevel"))
         model = from_union([from_str, from_none], obj.get("model"))
-        return ManagedSettingsValues(auto_tier, model)
+        return ManagedSettingsValues(auto_tier, context_tier, effort_level, model)
 
     def to_dict(self) -> dict:
         result: dict = {}
         if self.auto_tier is not None:
             result["autoTier"] = from_union([lambda x: to_enum(AutoTier, x), from_none], self.auto_tier)
+        if self.context_tier is not None:
+            result["contextTier"] = from_union([lambda x: to_enum(ContextTier, x), from_none], self.context_tier)
+        if self.effort_level is not None:
+            result["effortLevel"] = from_union([from_str, from_none], self.effort_level)
         if self.model is not None:
             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.
+# Internal: this type is an internal SDK API and is not part of the public surface.
+class _ManagedSettingsPolicyHelperReason(Enum):
+    """The policy-helper invocation reason. Defaults to sessionStart.
+
+    The operation that requires a policy-helper response.
+    """
+    PLUGIN_ACTIVATION = "pluginActivation"
+    SESSION_START = "sessionStart"
+
+# 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 _ManagedSettingsServerPolicyCacheMode(Enum):
+    """How this ingestion may use the on-disk server-policy cache. Defaults to the runtime's own
+    policy when omitted.
+
+    How an ingestion may use the on-disk server-policy cache.
+
+    How this resolution may use the on-disk server-policy cache. Defaults to the runtime's
+    own policy when omitted. Rejected when combined with `bypassCacheRead`, because the two
+    express the same decision and accepting both would leave the caller unsure which one the
+    runtime honored.
+    """
+    CACHE_ONLY = "cacheOnly"
+    DISABLED = "disabled"
+    FALLBACK_ONLY = "fallbackOnly"
+    PREFER_FRESH = "preferFresh"
+
+# 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 _ManagedSettingsLogLevel(Enum):
+    """Severity of this diagnostic.
+
+    Severity of a diagnostic emitted while ingesting managed settings.
+    """
+    DEBUG = "debug"
+    ERROR = "error"
+    INFO = "info"
+    WARNING = "warning"
+
+# 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 _ManagedSettingsPolicyHelperAuthority(Enum):
+    """Which channel registered the policy helper that produced the helper layer.
+
+    Which channel registered the policy helper that produced a helper layer.
+    """
+    DEVICE = "device"
+    SERVER = "server"
+
+# 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 _ManagedSettingsServerPolicyResolution(Enum):
+    """How the server layer was resolved.
+
+    How the server layer of an ingestion was resolved.
+
+    How the current runtime resolved the server layer.
+    """
+    CACHE_MISS = "cacheMiss"
+    FAIL_CLOSED = "failClosed"
+    FAIL_OPEN = "failOpen"
+    FALLBACK_CACHE = "fallbackCache"
+    FRESH_CACHE = "freshCache"
+    LIVE = "live"
+    SKIPPED_NO_TOKEN = "skippedNoToken"
+
+# 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 _ManagedSettingsLoadRemoteControlResult:
+    """The managed remote-control policy in force for an account, if any. An absent policy means
+    the account is unmanaged for this capability, which a host reads as allowed — so absence
+    here is a positive statement that no policy applies, never a stand-in for a resolution
+    that failed. A resolution that cannot be completed is rejected instead.
+    """
+    remote_control: Any = None
+    """The account's `remoteControl` policy document. Absent when no managed policy governs
+    remote control for this account. Reported as an explicit disabled policy, rather than as
+    absence, when the service refused to deliver a policy this client is too old to enforce.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_ManagedSettingsLoadRemoteControlResult':
+        assert isinstance(obj, dict)
+        remote_control = obj.get("remoteControl")
+        return _ManagedSettingsLoadRemoteControlResult(remote_control)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        if self.remote_control is not None:
+            result["remoteControl"] = self.remote_control
+        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 _ManagedSettingsParseClientValueParams:
+    """The client-supplied managed settings to validate and normalize. Omitting them is valid
+    and yields no policy.
+    """
+    settings: Any = None
+    """The managed settings a client is supplying for a session it is about to open. Omit them
+    when the client is imposing no policy of its own.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_ManagedSettingsParseClientValueParams':
+        assert isinstance(obj, dict)
+        settings = obj.get("settings")
+        return _ManagedSettingsParseClientValueParams(settings)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        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.
+# Internal: this type is an internal SDK API and is not part of the public surface.
+@dataclass
+class _ManagedSettingsParseClientValueResult:
+    """The accepted managed settings, reduced to the keys a client is allowed to set."""
+
+    settings_json: Any = None
+    """The normalized settings. Omitted when the client supplied none. An accepted document that
+    sets nothing comes back as an empty object, which is distinct from omission.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_ManagedSettingsParseClientValueResult':
+        assert isinstance(obj, dict)
+        settings_json = obj.get("settingsJson")
+        return _ManagedSettingsParseClientValueResult(settings_json)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        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.
+# Internal: this type is an internal SDK API and is not part of the public surface.
+@dataclass
+class _ManagedSettingsReadDeviceResult:
+    """The device-managed settings layer, with the sandbox floor and the load outcome a host
+    needs to compose it into an effective policy.
+    """
+    load_failed: bool
+    """Whether discovery or validation failed. A host must treat this as "policy unknown" rather
+    than "no policy": absent settings with this set false mean the device genuinely has none.
+    """
+    sandbox_floor: Any = None
+    """Sandbox floor read from the discovered document before validation, so a document that is
+    otherwise rejected can still raise the floor it declared.
+    """
+    settings: Any = None
+    """Validated, canonical device-managed settings. Omitted when no device policy was
+    discovered, when the discovered document failed validation, or when it validated to an
+    empty object — an empty document carries no policy, and reporting it as present would
+    outrank layers that do.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_ManagedSettingsReadDeviceResult':
+        assert isinstance(obj, dict)
+        load_failed = from_bool(obj.get("loadFailed"))
+        sandbox_floor = obj.get("sandboxFloor")
+        settings = obj.get("settings")
+        return _ManagedSettingsReadDeviceResult(load_failed, sandbox_floor, settings)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["loadFailed"] = from_bool(self.load_failed)
+        if self.sandbox_floor is not None:
+            result["sandboxFloor"] = self.sandbox_floor
+        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 ManagedSettingsReadResult:
@@ -6009,6 +7568,105 @@ def to_dict(self) -> dict:
             result["settingsJson"] = self.settings_json
         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 _ManagedSettingsResolveDeviceForceLoginOrgsGateParams:
+    """The credential and environment to evaluate the device-channel sign-in pin against."""
+
+    environment: Any
+    """The host's environment variables. Read for the variables that would make an identity's
+    membership snapshot forgeable, so a credential whose provenance cannot be trusted is
+    refused rather than accepted.
+    """
+    auth_info: Any = None
+    """The authenticated identity to judge. Omitted when signed out, which is the case the
+    device channel exists to serve: it can refuse a first sign-in before any credential
+    exists.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_ManagedSettingsResolveDeviceForceLoginOrgsGateParams':
+        assert isinstance(obj, dict)
+        environment = obj.get("environment")
+        auth_info = obj.get("authInfo")
+        return _ManagedSettingsResolveDeviceForceLoginOrgsGateParams(environment, auth_info)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["environment"] = self.environment
+        if self.auth_info is not None:
+            result["authInfo"] = self.auth_info
+        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 _ManagedSettingsResolveEffectiveValueParams:
+    """The managed-settings layers to compose into an effective policy. Every layer is optional;
+    omitting all of them yields no effective policy.
+    """
+    device_sandbox_floor: Any = None
+    """The device sandbox floor, folded into the device layer under `sandbox` before composition."""
+
+    mdm: Any = None
+    """The device layer: native MDM and managed-file settings describing the machine rather than
+    the account.
+    """
+    policy_helper: Any = None
+    """The policy-helper layer, an enforced channel sourced from a platform policy helper
+    process.
+    """
+    server: Any = None
+    """The account's server-delivered org policy, as returned by a managed-settings fetch.
+    Omitted before sign-in or when the fetch has not landed.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_ManagedSettingsResolveEffectiveValueParams':
+        assert isinstance(obj, dict)
+        device_sandbox_floor = obj.get("deviceSandboxFloor")
+        mdm = obj.get("mdm")
+        policy_helper = obj.get("policyHelper")
+        server = obj.get("server")
+        return _ManagedSettingsResolveEffectiveValueParams(device_sandbox_floor, mdm, policy_helper, server)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        if self.device_sandbox_floor is not None:
+            result["deviceSandboxFloor"] = self.device_sandbox_floor
+        if self.mdm is not None:
+            result["mdm"] = self.mdm
+        if self.policy_helper is not None:
+            result["policyHelper"] = self.policy_helper
+        if self.server is not None:
+            result["server"] = self.server
+        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 _ManagedSettingsResolveEffectiveValueResult:
+    """The effective managed policy composed from the supplied layers."""
+
+    settings_json: Any = None
+    """The composed effective managed settings. Omitted when no layer sets anything, so an
+    unmanaged host locks nothing. Carries `sandboxAdvisoryFloorDeclined: true` when an
+    advisory server force-on was dropped because this host cannot run the sandbox.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_ManagedSettingsResolveEffectiveValueResult':
+        assert isinstance(obj, dict)
+        settings_json = obj.get("settingsJson")
+        return _ManagedSettingsResolveEffectiveValueResult(settings_json)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        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 ManagedSettingsResolveRequest:
@@ -6024,6 +7682,10 @@ class ManagedSettingsResolveRequest:
     """Opaque account identifier returned by `account.getAllUsers`. When omitted, the current
     account is used, or device policy only when no account is signed in.
     """
+    working_directory: str | None = None
+    """Working directory used to run an organization policy helper. When omitted, sessionless
+    resolution does not run the helper.
+    """
 
     @staticmethod
     def from_dict(obj: Any) -> 'ManagedSettingsResolveRequest':
@@ -6031,7 +7693,8 @@ def from_dict(obj: Any) -> 'ManagedSettingsResolveRequest':
         client_name = from_union([from_str, from_none], obj.get("clientName"))
         git_hub_token = from_union([from_str, from_none], obj.get("gitHubToken"))
         selection_id = from_union([from_str, from_none], obj.get("selectionId"))
-        return ManagedSettingsResolveRequest(client_name, git_hub_token, selection_id)
+        working_directory = from_union([from_str, from_none], obj.get("workingDirectory"))
+        return ManagedSettingsResolveRequest(client_name, git_hub_token, selection_id, working_directory)
 
     def to_dict(self) -> dict:
         result: dict = {}
@@ -6041,6 +7704,121 @@ def to_dict(self) -> dict:
             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)
+        if self.working_directory is not None:
+            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.
+# Internal: this type is an internal SDK API and is not part of the public surface.
+@dataclass
+class _ManagedSettingsRetainPolicyParams:
+    """The managed layers to retain as this process's startup policy, with the outcome of
+    fetching each one.
+    """
+    device_load_failed: bool
+    """Whether the device load failed. Report it honestly, for the same reason as
+    `serverFetchFailed`.
+    """
+    device_sandbox_undetermined: bool
+    """Whether the device sandbox intent is unreadable independently of its other settings."""
+
+    device_source_found: bool
+    """Whether a device policy source demonstrably exists. This, not a read error, is the
+    evidence a device is managed, so a fail-closed policy gates on it.
+    """
+    managed_policy_present: bool
+    """Whether any managed policy source exists, independently of fetch failures."""
+
+    permission_policy_undetermined: bool
+    """Whether permission policy is undetermined. Sandbox-only uncertainty does not imply this
+    flag.
+    """
+    preserve_server_state: bool
+    """Preserve the retained server layer during a device-only resolution."""
+
+    sandbox_enabled_by_undetermined_policy: bool
+    """Whether uncertainty alone enabled the shared sandbox floor."""
+
+    sandbox_floor_undetermined: bool
+    """Whether the shared sandbox policy is undetermined. Diagnostic errors alone do not imply
+    this flag.
+    """
+    server_fetch_failed: bool
+    """Whether the server fetch failed. Report it honestly: true keeps the already-retained
+    server layer rather than replacing it with an absent one.
+    """
+    server_forced_refresh_failure: bool
+    """Whether a required fresh server-policy confirmation failed."""
+
+    server_source_found: bool
+    """Whether the server policy source exists, even when its response is unavailable."""
+
+    device_response: Any = None
+    """The device/MDM policy layer."""
+
+    device_sandbox_floor: Any = None
+    """Sandbox floor declared by the device layer, carried separately so a document that failed
+    validation can still raise the floor.
+    """
+    policy_helper_response: Any = None
+    """The policy helper's response: the third managed layer that a process owning its startup
+    policy resolves. It is retained with the other two so that every ambient read in this
+    process, including the mutation guards and the governed marketplace allowlist that the
+    `plugins.*` handlers derive, sees the whole policy the process fetched. A session-owning
+    process omits it, because it resolves a helper per session against that session's working
+    directory.
+    """
+    server_response: Any = None
+    """The resolved server policy. A known source can lack a response after a forced-refresh
+    failure.
+    """
+    shared_sandbox_floor: Any = None
+    """Shared server/device sandbox floor, excluding session-local helper policy."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_ManagedSettingsRetainPolicyParams':
+        assert isinstance(obj, dict)
+        device_load_failed = from_bool(obj.get("deviceLoadFailed"))
+        device_sandbox_undetermined = from_bool(obj.get("deviceSandboxUndetermined"))
+        device_source_found = from_bool(obj.get("deviceSourceFound"))
+        managed_policy_present = from_bool(obj.get("managedPolicyPresent"))
+        permission_policy_undetermined = from_bool(obj.get("permissionPolicyUndetermined"))
+        preserve_server_state = from_bool(obj.get("preserveServerState"))
+        sandbox_enabled_by_undetermined_policy = from_bool(obj.get("sandboxEnabledByUndeterminedPolicy"))
+        sandbox_floor_undetermined = from_bool(obj.get("sandboxFloorUndetermined"))
+        server_fetch_failed = from_bool(obj.get("serverFetchFailed"))
+        server_forced_refresh_failure = from_bool(obj.get("serverForcedRefreshFailure"))
+        server_source_found = from_bool(obj.get("serverSourceFound"))
+        device_response = obj.get("deviceResponse")
+        device_sandbox_floor = obj.get("deviceSandboxFloor")
+        policy_helper_response = obj.get("policyHelperResponse")
+        server_response = obj.get("serverResponse")
+        shared_sandbox_floor = obj.get("sharedSandboxFloor")
+        return _ManagedSettingsRetainPolicyParams(device_load_failed, device_sandbox_undetermined, device_source_found, managed_policy_present, permission_policy_undetermined, preserve_server_state, sandbox_enabled_by_undetermined_policy, sandbox_floor_undetermined, server_fetch_failed, server_forced_refresh_failure, server_source_found, device_response, device_sandbox_floor, policy_helper_response, server_response, shared_sandbox_floor)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["deviceLoadFailed"] = from_bool(self.device_load_failed)
+        result["deviceSandboxUndetermined"] = from_bool(self.device_sandbox_undetermined)
+        result["deviceSourceFound"] = from_bool(self.device_source_found)
+        result["managedPolicyPresent"] = from_bool(self.managed_policy_present)
+        result["permissionPolicyUndetermined"] = from_bool(self.permission_policy_undetermined)
+        result["preserveServerState"] = from_bool(self.preserve_server_state)
+        result["sandboxEnabledByUndeterminedPolicy"] = from_bool(self.sandbox_enabled_by_undetermined_policy)
+        result["sandboxFloorUndetermined"] = from_bool(self.sandbox_floor_undetermined)
+        result["serverFetchFailed"] = from_bool(self.server_fetch_failed)
+        result["serverForcedRefreshFailure"] = from_bool(self.server_forced_refresh_failure)
+        result["serverSourceFound"] = from_bool(self.server_source_found)
+        if self.device_response is not None:
+            result["deviceResponse"] = self.device_response
+        if self.device_sandbox_floor is not None:
+            result["deviceSandboxFloor"] = self.device_sandbox_floor
+        if self.policy_helper_response is not None:
+            result["policyHelperResponse"] = self.policy_helper_response
+        if self.server_response is not None:
+            result["serverResponse"] = self.server_response
+        if self.shared_sandbox_floor is not None:
+            result["sharedSandboxFloor"] = self.shared_sandbox_floor
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
@@ -6548,7 +8326,7 @@ def to_dict(self) -> dict:
 # 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 MCPConfigureGitHubRequest:
+class _MCPConfigureGitHubRequest:
     """Credential-free authentication identity used to configure GitHub MCP."""
 
     auth_info: Any
@@ -6557,10 +8335,10 @@ class MCPConfigureGitHubRequest:
     """
 
     @staticmethod
-    def from_dict(obj: Any) -> 'MCPConfigureGitHubRequest':
+    def from_dict(obj: Any) -> '_MCPConfigureGitHubRequest':
         assert isinstance(obj, dict)
         auth_info = obj.get("authInfo")
-        return MCPConfigureGitHubRequest(auth_info)
+        return _MCPConfigureGitHubRequest(auth_info)
 
     def to_dict(self) -> dict:
         result: dict = {}
@@ -6586,6 +8364,34 @@ def to_dict(self) -> dict:
         result["changed"] = from_bool(self.changed)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class MCPConfiguredServerState:
+    """Observed state from an already materialized matching server. Omitted when no live graph
+    has this configured server; it never determines configuration enablement.
+
+    Observational state for a matching already materialized MCP server.
+    """
+    status: McpServerStatus
+    """Observed connection status. This is not a configuration or readiness guarantee."""
+
+    error: str | None = None
+    """Observed connection error, when the materialized server failed."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'MCPConfiguredServerState':
+        assert isinstance(obj, dict)
+        status = McpServerStatus(obj.get("status"))
+        error = from_union([from_str, from_none], obj.get("error"))
+        return MCPConfiguredServerState(status, error)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["status"] = to_enum(McpServerStatus, self.status)
+        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 MCPDisableRequest:
@@ -6942,6 +8748,28 @@ def to_dict(self) -> dict:
         result["running"] = from_bool(self.running)
         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 _MCPListBuiltinServerNamesResult:
+    """Names of the MCP servers the runtime supplies itself."""
+
+    names: list[str]
+    """Every built-in server name. A host disabling the built-ins wholesale suppresses exactly
+    this set.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_MCPListBuiltinServerNamesResult':
+        assert isinstance(obj, dict)
+        names = from_list(from_str, obj.get("names"))
+        return _MCPListBuiltinServerNamesResult(names)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["names"] = from_list(from_str, self.names)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class MCPListToolsRequest:
@@ -7507,6 +9335,94 @@ def to_dict(self) -> dict:
             result["cursor"] = from_union([from_str, from_none], self.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 _MCPRegistryCancelRequest:
+    """Registry search to abandon."""
+
+    request_id: int
+    """Request ID from `mcp.registry.allocateRequestId` that the search uses."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_MCPRegistryCancelRequest':
+        assert isinstance(obj, dict)
+        request_id = from_int(obj.get("requestId"))
+        return _MCPRegistryCancelRequest(request_id)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["requestId"] = from_int(self.request_id)
+        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 _MCPRegistryCancelResult:
+    """Whether the cancel reached a live search."""
+
+    canceled: bool
+    """True when the cancel stopped a running search. False for unknown or reclaimed IDs,
+    completed or canceled searches, and unused reservations. The cancel releases an unused
+    reservation.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_MCPRegistryCancelResult':
+        assert isinstance(obj, dict)
+        canceled = from_bool(obj.get("canceled"))
+        return _MCPRegistryCancelResult(canceled)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["canceled"] = from_bool(self.canceled)
+        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 _MCPRegistryRequestIDResult:
+    """Request id naming a cancellable registry search."""
+
+    request_id: int
+    """Request ID for `mcp.registry.search` and `mcp.registry.cancel`. It serves one search.
+    Allocation can reclaim unused IDs at the 1,024-ID reservation limit.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_MCPRegistryRequestIDResult':
+        assert isinstance(obj, dict)
+        request_id = from_int(obj.get("requestId"))
+        return _MCPRegistryRequestIDResult(request_id)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["requestId"] = from_int(self.request_id)
+        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 _MCPRegistrySearchResult:
+    """Servers selected from the registry response."""
+
+    servers: Any
+    """The server objects, carried opaquely. The runtime follows pages, keeps the newest entry
+    per server name, cuts the list to `limit`, and sorts an empty-query result by GitHub
+    stars. Each server object remains unchanged because the registry owns that shape.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_MCPRegistrySearchResult':
+        assert isinstance(obj, dict)
+        servers = obj.get("servers")
+        return _MCPRegistrySearchResult(servers)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["servers"] = self.servers
+        return result
+
 class MCPServerConfigType(Enum):
     """Local transport type. Defaults to stdio when omitted.
 
@@ -7525,7 +9441,7 @@ class MCPServerConfigType(Enum):
 # 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 MCPReloadWithConfigRequest:
+class _MCPReloadWithConfigRequest:
     """Opaque MCP reload configuration."""
 
     config: Any
@@ -7534,10 +9450,10 @@ class MCPReloadWithConfigRequest:
     """
 
     @staticmethod
-    def from_dict(obj: Any) -> 'MCPReloadWithConfigRequest':
+    def from_dict(obj: Any) -> '_MCPReloadWithConfigRequest':
         assert isinstance(obj, dict)
         config = obj.get("config")
-        return MCPReloadWithConfigRequest(config)
+        return _MCPReloadWithConfigRequest(config)
 
     def to_dict(self) -> dict:
         result: dict = {}
@@ -7659,7 +9575,7 @@ class MCPServerConfigHTTPType(Enum):
 
 # 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):
+class _MCPServerConfigMemoryType(Enum):
     """In-process MCP transport type."""
 
     MEMORY = "memory"
@@ -7691,6 +9607,38 @@ class MCPSetEnvValueModeDetails(Enum):
     DIRECT = "direct"
     INDIRECT = "indirect"
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+class OptionsUpdateToolFilterPrecedence(Enum):
+    """Controls how availableTools (allowlist) and excludedTools (denylist) combine when both
+    are set.
+    """
+    AVAILABLE = "available"
+    EXCLUDED = "excluded"
+
+# 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 _MCPShouldExcludeGitHubToolsResult:
+    """Whether the gh-replaceable GitHub MCP tools may be clipped for the session described by
+    the request.
+    """
+    exclude_gh_replaceable_tools: bool
+    """True only when both halves hold: the session's filters still reach the platform shell
+    tool, and the host actually has the `gh` those tools would be replaced by. Feed it
+    straight back as the `excludeGhReplaceableTools` build option.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_MCPShouldExcludeGitHubToolsResult':
+        assert isinstance(obj, dict)
+        exclude_gh_replaceable_tools = from_bool(obj.get("excludeGhReplaceableTools"))
+        return _MCPShouldExcludeGitHubToolsResult(exclude_gh_replaceable_tools)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["excludeGhReplaceableTools"] = from_bool(self.exclude_gh_replaceable_tools)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class MCPStopServerRequest:
@@ -7741,17 +9689,17 @@ def to_dict(self) -> dict:
 # 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 MCPUnregisterExternalClientRequest:
+class _MCPUnregisterExternalClientRequest:
     """Server name identifying the external client to remove."""
 
     server_name: str
     """Server name of the external client to unregister"""
 
     @staticmethod
-    def from_dict(obj: Any) -> 'MCPUnregisterExternalClientRequest':
+    def from_dict(obj: Any) -> '_MCPUnregisterExternalClientRequest':
         assert isinstance(obj, dict)
         server_name = from_str(obj.get("serverName"))
-        return MCPUnregisterExternalClientRequest(server_name)
+        return _MCPUnregisterExternalClientRequest(server_name)
 
     def to_dict(self) -> dict:
         result: dict = {}
@@ -7785,7 +9733,7 @@ class Categories:
     `totalTokens`.
     """
     buffer: int
-    """Output reserve plus post-blocking-threshold buffer."""
+    """Overlapping output reservation plus post-blocking-threshold buffer."""
 
     custom_instructions: int
     """Custom-instructions tokens (0 when none are configured)."""
@@ -7925,8 +9873,9 @@ class SessionContextInfo:
     """Token-usage breakdown for the session's current context window"""
 
     buffer_tokens: int
-    """Output reserve plus tokens after the buffer-exhaustion blocking threshold (default 95%)"""
-
+    """Output reservation overlapping the displayed prompt allowance plus tokens after the
+    effective input budget's buffer-exhaustion blocking threshold (default 95%).
+    """
     compaction_threshold: int
     """Token count at which background compaction starts (configurable percentage of
     promptTokenLimit)
@@ -7935,8 +9884,9 @@ class SessionContextInfo:
     """Tokens consumed by user/assistant/tool messages"""
 
     limit: int
-    """Prompt token limit plus the model's full output token limit."""
-
+    """Advertised prompt allowance for the selected context tier, without adding output tokens.
+    The denominator for context-usage displays.
+    """
     mcp_tools_tokens: int
     """Tokens consumed by MCP tool definitions (subset of toolDefinitionsTokens, excludes
     deferred tools)
@@ -7945,8 +9895,10 @@ class SessionContextInfo:
     """The model used for token counting"""
 
     prompt_token_limit: int
-    """Maximum prompt tokens allowed by the model (or DEFAULT_TOKEN_LIMIT if unspecified)"""
-
+    """Effective input budget: the selected tier's prompt allowance bounded by the combined
+    context ceiling minus the requested output allowance. Uses DEFAULT_TOKEN_LIMIT when
+    limits are unspecified.
+    """
     system_tokens: int
     """Tokens consumed by the system prompt"""
 
@@ -7956,6 +9908,15 @@ class SessionContextInfo:
     total_tokens: int
     """Sum of system, conversation and tool-definition tokens"""
 
+    display_model_name: str | None = None
+    """Provider-owned model display label, or the Auto routing label. Presentation only;
+    modelName remains the tokenization identity.
+    """
+    provider: ModelProviderRef | None = None
+    """Provider whose catalog supplies this context window. Omitted when provider identity is
+    unavailable.
+    """
+
     @staticmethod
     def from_dict(obj: Any) -> 'SessionContextInfo':
         assert isinstance(obj, dict)
@@ -7969,7 +9930,9 @@ def from_dict(obj: Any) -> 'SessionContextInfo':
         system_tokens = from_int(obj.get("systemTokens"))
         tool_definitions_tokens = from_int(obj.get("toolDefinitionsTokens"))
         total_tokens = from_int(obj.get("totalTokens"))
-        return SessionContextInfo(buffer_tokens, compaction_threshold, conversation_tokens, limit, mcp_tools_tokens, model_name, prompt_token_limit, system_tokens, tool_definitions_tokens, total_tokens)
+        display_model_name = from_union([from_str, from_none], obj.get("displayModelName"))
+        provider = from_union([ModelProviderRef.from_dict, from_none], obj.get("provider"))
+        return SessionContextInfo(buffer_tokens, compaction_threshold, conversation_tokens, limit, mcp_tools_tokens, model_name, prompt_token_limit, system_tokens, tool_definitions_tokens, total_tokens, display_model_name, provider)
 
     def to_dict(self) -> dict:
         result: dict = {}
@@ -7983,6 +9946,10 @@ def to_dict(self) -> dict:
         result["systemTokens"] = from_int(self.system_tokens)
         result["toolDefinitionsTokens"] = from_int(self.tool_definitions_tokens)
         result["totalTokens"] = from_int(self.total_tokens)
+        if self.display_model_name is not None:
+            result["displayModelName"] = from_union([from_str, from_none], self.display_model_name)
+        if self.provider is not None:
+            result["provider"] = from_union([lambda x: to_class(ModelProviderRef, x), from_none], self.provider)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
@@ -8490,6 +10457,131 @@ def to_dict(self) -> dict:
             result["supported_media_types"] = from_union([lambda x: from_list(from_str, x), from_none], self.supported_media_types)
         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 _ModelClearStartupSeedRequest:
+    expected_model: str
+    expected_provider_id: str | None = None
+    """Provider captured with the startup seed; omission matches only an unqualified seed."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_ModelClearStartupSeedRequest':
+        assert isinstance(obj, dict)
+        expected_model = from_str(obj.get("expectedModel"))
+        expected_provider_id = from_union([from_str, from_none], obj.get("expectedProviderId"))
+        return _ModelClearStartupSeedRequest(expected_model, expected_provider_id)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["expectedModel"] = from_str(self.expected_model)
+        if self.expected_provider_id is not None:
+            result["expectedProviderId"] = from_union([from_str, from_none], self.expected_provider_id)
+        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 _ModelClearStartupSeedResult:
+    cleared: bool
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_ModelClearStartupSeedResult':
+        assert isinstance(obj, dict)
+        cleared = from_bool(obj.get("cleared"))
+        return _ModelClearStartupSeedResult(cleared)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["cleared"] = from_bool(self.cleared)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class ModelGetReasoningSummariesResult:
+    """Reasoning-summaries presentation policy for the session's current model."""
+
+    clear_redundant_setting: bool
+    """Whether the supplied `persistedShowReasoning` setting only restates the model default.
+    This reports a redundancy, not a standing instruction to delete the setting: it stays
+    true for as long as the setting and the model default agree, including for a user who
+    later chose that value deliberately. It exists for a one-time migration of a legacy
+    setting written before the model default made it redundant, so a host that acts on it
+    owns the cleanup and must gate it behind its own persisted `done` marker, delete only a
+    setting whose value still matches the one it read, and never repeat the deletion on a
+    later launch. Under an off-by-default reasoning-summaries experiment an explicit
+    `showReasoning: true` opt-in also reads as redundant on a summary-producing model, so an
+    ungated host would keep deleting that opt-in and hide summaries again on every launch.
+    """
+    experiment_settled: bool
+    """Whether the session's reasoning-summaries experiment assignment has settled. False means
+    this read does not wait for a pending assignment and reports the experiment-derived
+    fields conservatively: `showHiddenHint` is false and `visibility` falls back to
+    `persistedShowReasoning`, or is omitted when none was supplied. A host that wants the
+    assigned answer re-reads until this is true.
+    """
+    model_default_shows_summaries: bool
+    """Whether the selected model shows reasoning summaries by default."""
+
+    ready: bool
+    """False until the session has a model catalog and a selected model. This read never
+    resolves the catalog itself, and the runtime emits no readiness notification, so
+    repeating this call alone leaves `ready` false indefinitely on a session that has neither
+    listed models nor run a turn. `session.model.list` is the prerequisite and the signal: it
+    resolves and caches the catalog for the session, so a successful return means the next
+    read is ready. The exception is a session that resolves models without a Copilot catalog,
+    that is a BYOK registry or an alternate provider: `session.model.list` returns an empty
+    list without caching a catalog, so `ready` stays false and this policy is unavailable
+    there. While false, every model-policy field is false and `visibility` is omitted;
+    `experimentSettled` is independent of readiness and still reports the assignment state.
+    """
+    session_shows_summaries: bool
+    """Whether turns on this session produce reasoning summaries, honouring an explicit session
+    reasoning-summary override.
+    """
+    show_hidden_hint: bool
+    """Whether to show the hint that reasoning summaries are hidden. Always false while
+    `experimentSettled` is false.
+    """
+    show_reasoning_headers: bool
+    """Whether the selected model emits reasoning headers."""
+
+    visibility: bool | None = None
+    """Default reasoning visibility, and only meaningful once `ready` is true: false when the
+    session produces no summaries, else the persisted setting, else the experiment's default.
+    While `ready` is true it is omitted only when all three are unavailable, that is when the
+    session produces summaries, no `persistedShowReasoning` was supplied, and
+    `experimentSettled` is false. While `ready` is false there is no model policy to report
+    and this field is always omitted, so an absent value alone does not imply a pending
+    experiment.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'ModelGetReasoningSummariesResult':
+        assert isinstance(obj, dict)
+        clear_redundant_setting = from_bool(obj.get("clearRedundantSetting"))
+        experiment_settled = from_bool(obj.get("experimentSettled"))
+        model_default_shows_summaries = from_bool(obj.get("modelDefaultShowsSummaries"))
+        ready = from_bool(obj.get("ready"))
+        session_shows_summaries = from_bool(obj.get("sessionShowsSummaries"))
+        show_hidden_hint = from_bool(obj.get("showHiddenHint"))
+        show_reasoning_headers = from_bool(obj.get("showReasoningHeaders"))
+        visibility = from_union([from_bool, from_none], obj.get("visibility"))
+        return ModelGetReasoningSummariesResult(clear_redundant_setting, experiment_settled, model_default_shows_summaries, ready, session_shows_summaries, show_hidden_hint, show_reasoning_headers, visibility)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["clearRedundantSetting"] = from_bool(self.clear_redundant_setting)
+        result["experimentSettled"] = from_bool(self.experiment_settled)
+        result["modelDefaultShowsSummaries"] = from_bool(self.model_default_shows_summaries)
+        result["ready"] = from_bool(self.ready)
+        result["sessionShowsSummaries"] = from_bool(self.session_shows_summaries)
+        result["showHiddenHint"] = from_bool(self.show_hidden_hint)
+        result["showReasoningHeaders"] = from_bool(self.show_reasoning_headers)
+        if self.visibility is not None:
+            result["visibility"] = from_union([from_bool, from_none], self.visibility)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 class ModelProviderAutomaticDiscoveryMode(Enum):
     """Whether automatic discovery is allowed, limited to configured providers, or
@@ -9059,14 +11151,6 @@ class OptionsUpdateContextTier(Enum):
     DEFAULT = "default"
     LONG_CONTEXT = "long_context"
 
-# Experimental: this type is part of an experimental API and may change or be removed.
-class OptionsUpdateToolFilterPrecedence(Enum):
-    """Controls how availableTools (allowlist) and excludedTools (denylist) combine when both
-    are set.
-    """
-    AVAILABLE = "available"
-    EXCLUDED = "excluded"
-
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class PendingPermissionRequest:
@@ -9594,6 +11678,62 @@ 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.
+# Internal: this type is an internal SDK API and is not part of the public surface.
+@dataclass
+class _PermissionsEvaluateManagedPolicyParams:
+    """The verbatim managed `permissions` slice to interpret."""
+
+    permissions: Any = None
+    """The `permissions` object from a managed settings layer, for example
+    `{"disableBypassPermissionsMode":"disable"}`. Omitted or null means no managed policy
+    applies.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_PermissionsEvaluateManagedPolicyParams':
+        assert isinstance(obj, dict)
+        permissions = obj.get("permissions")
+        return _PermissionsEvaluateManagedPolicyParams(permissions)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        if self.permissions is not None:
+            result["permissions"] = self.permissions
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class PermissionsEvaluateManagedPolicyResult:
+    """The policy questions a host asks before granting elevated permissions."""
+
+    bypass_permissions_disabled: bool
+    """True when managed policy forbids bypass-permissions mode, so allow-all style flags must
+    not take effect.
+    """
+    permission_rules_active: bool
+    """True when the managed layer supplies permission rules that the session must enforce."""
+
+    policy_undetermined: bool
+    """True when a managed policy exists but this build could not determine its meaning. Hosts
+    fail closed on it rather than assuming permission was granted.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'PermissionsEvaluateManagedPolicyResult':
+        assert isinstance(obj, dict)
+        bypass_permissions_disabled = from_bool(obj.get("bypassPermissionsDisabled"))
+        permission_rules_active = from_bool(obj.get("permissionRulesActive"))
+        policy_undetermined = from_bool(obj.get("policyUndetermined"))
+        return PermissionsEvaluateManagedPolicyResult(bypass_permissions_disabled, permission_rules_active, policy_undetermined)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["bypassPermissionsDisabled"] = from_bool(self.bypass_permissions_disabled)
+        result["permissionRulesActive"] = from_bool(self.permission_rules_active)
+        result["policyUndetermined"] = from_bool(self.policy_undetermined)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class PermissionsFolderTrustAddTrustedResult:
@@ -9922,6 +12062,66 @@ 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 PersistenceWriteRawJSONLockedRequest:
+    """A complete JSON snapshot to write under the runtime's per-path file lock."""
+
+    data_json: str
+    """The serialized JSON document to write. It replaces the file's contents entirely; nothing
+    is merged.
+    """
+    path: str
+    """Absolute path of the file to replace. Parent directories are created when missing."""
+
+    file_header: str | None = None
+    """Comment lines to emit above the document, for a format that tolerates them. Omit for
+    strict JSON.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'PersistenceWriteRawJSONLockedRequest':
+        assert isinstance(obj, dict)
+        data_json = from_str(obj.get("dataJson"))
+        path = from_str(obj.get("path"))
+        file_header = from_union([from_none, from_str], obj.get("fileHeader"))
+        return PersistenceWriteRawJSONLockedRequest(data_json, path, file_header)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["dataJson"] = from_str(self.data_json)
+        result["path"] = from_str(self.path)
+        if self.file_header is not None:
+            result["fileHeader"] = from_union([from_none, from_str], self.file_header)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class PersistenceWriteRawJSONLockedResult:
+    """The outcome of a locked snapshot write."""
+
+    success: bool
+    """Whether the file now holds the requested contents."""
+
+    error: str | None = None
+    """Why the write failed. Absent when `success` is true. A lock the runtime could not acquire
+    in time reports here rather than raising.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'PersistenceWriteRawJSONLockedResult':
+        assert isinstance(obj, dict)
+        success = from_bool(obj.get("success"))
+        error = from_union([from_none, from_str], obj.get("error"))
+        return PersistenceWriteRawJSONLockedResult(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_none, from_str], self.error)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class PingRequest:
@@ -11264,6 +13464,38 @@ def to_dict(self) -> dict:
         result["handled"] = self.handled
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class QuotaWarningProjection:
+    """Pending warnings returned and cleared by session.quota.takeWarnings.
+
+    A pending session quota warning, consumed once by takeWarnings.
+    """
+    message: str
+    """User-facing warning text."""
+
+    warning_type: str
+    """Existing warning category."""
+
+    url: str | None = None
+    """Related account or upgrade link."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'QuotaWarningProjection':
+        assert isinstance(obj, dict)
+        message = from_str(obj.get("message"))
+        warning_type = from_str(obj.get("warningType"))
+        url = from_union([from_str, from_none], obj.get("url"))
+        return QuotaWarningProjection(message, warning_type, url)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["message"] = from_str(self.message)
+        result["warningType"] = from_str(self.warning_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 RegisterEventInterestParams:
@@ -11602,9 +13834,182 @@ 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.
+# Internal: this type is an internal SDK API and is not part of the public surface.
+class _SettingsEditOperation(Enum):
+    """Set a scalar, add or remove a string list item, or remove the setting. The handler
+    rejects a missing or incompatible value.
+
+    One atomic settings mutation.
+    """
+    ADD_ITEM = "add-item"
+    REMOVE = "remove"
+    REMOVE_ITEM = "remove-item"
+    SET = "set"
+
+# 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 _RepoSettingsEditScope(Enum):
+    """Shared or local repository settings file.
+
+    Which repository settings file to edit.
+    """
+    LOCAL = "local"
+    REPO = "repo"
+
+# 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 _RepoSettingsReadRawRequest:
+    """Which repository settings file to read."""
+
+    repo_root: str
+    """Absolute path of the repository root."""
+
+    scope: str
+    """Use repo for shared settings or local for settings.local.json. Other scopes are rejected."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_RepoSettingsReadRawRequest':
+        assert isinstance(obj, dict)
+        repo_root = from_str(obj.get("repoRoot"))
+        scope = from_str(obj.get("scope"))
+        return _RepoSettingsReadRawRequest(repo_root, scope)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["repoRoot"] = from_str(self.repo_root)
+        result["scope"] = from_str(self.scope)
+        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 _RepoSettingsReadRawResult:
+    """Parsed repository settings without normalization or layering."""
+
+    config: Any
+    """Stored JSON values after the existing JSONC parser and prototype-safety checks. Empty
+    when the file is missing, blank, or invalid.
+    """
+    invalid: bool
+    """True when the file exists but did not parse, so `config` is empty for that reason rather
+    than because nothing is set.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_RepoSettingsReadRawResult':
+        assert isinstance(obj, dict)
+        config = obj.get("config")
+        invalid = from_bool(obj.get("invalid"))
+        return _RepoSettingsReadRawResult(config, invalid)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["config"] = self.config
+        result["invalid"] = from_bool(self.invalid)
+        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 _RepoSettingsWriteAllRequest:
+    """The complete set of repository-overridable settings to store."""
+
+    repo_root: str
+    """Absolute path of the repository root."""
+
+    scope: str
+    """Use repo for shared settings or local for settings.local.json. Other scopes are rejected."""
+
+    settings: Any
+    """Object of allowed settings to store. Missing allowlisted keys are removed. Other input
+    keys are ignored, while unknown stored keys are preserved.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_RepoSettingsWriteAllRequest':
+        assert isinstance(obj, dict)
+        repo_root = from_str(obj.get("repoRoot"))
+        scope = from_str(obj.get("scope"))
+        settings = obj.get("settings")
+        return _RepoSettingsWriteAllRequest(repo_root, scope, settings)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["repoRoot"] = from_str(self.repo_root)
+        result["scope"] = from_str(self.scope)
+        result["settings"] = self.settings
+        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 _RepoSettingsWriteKeyRequest:
+    """One key to write or remove in a repository settings file."""
+
+    key: str
+    """Canonical top-level key permitted by the repository settings allowlist."""
+
+    repo_root: str
+    """Absolute path of the repository root."""
+
+    scope: str
+    """Use repo for shared settings or local for settings.local.json. Other scopes are rejected."""
+
+    delete: bool | None = None
+    """True to remove the key instead of writing it."""
+
+    value: Any = UNSET_SENTINEL
+    """Value to validate and write. Required unless delete is true; a null value is validated,
+    not treated as deletion.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_RepoSettingsWriteKeyRequest':
+        assert isinstance(obj, dict)
+        key = from_str(obj.get("key"))
+        repo_root = from_str(obj.get("repoRoot"))
+        scope = from_str(obj.get("scope"))
+        delete = from_union([from_bool, from_none], obj.get("delete"))
+        value = obj["value"] if "value" in obj else UNSET_SENTINEL
+        return _RepoSettingsWriteKeyRequest(key, repo_root, scope, delete, value)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["key"] = from_str(self.key)
+        result["repoRoot"] = from_str(self.repo_root)
+        result["scope"] = from_str(self.scope)
+        if self.delete is not None:
+            result["delete"] = from_union([from_bool, from_none], self.delete)
+        if self.value is not UNSET_SENTINEL:
+            result["value"] = self.value
+        return result
+
 class ResponseFormatType(Enum):
     JSON_SCHEMA = "json_schema"
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class SandboxApplyDefaultsRequest:
+    """The stored sandbox settings to resolve against the defaults."""
+
+    stored: Any
+    """The sandbox settings as stored in the settings file. An empty object resolves to the
+    defaults alone.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'SandboxApplyDefaultsRequest':
+        assert isinstance(obj, dict)
+        stored = obj.get("stored")
+        return SandboxApplyDefaultsRequest(stored)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["stored"] = self.stored
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class SandboxConfigAuth:
@@ -11814,6 +14219,34 @@ class SandboxConfigSource(Enum):
     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 SandboxCredentialSuggestion:
+    """A possible secret-bearing environment variable and optional locally suggested HTTPS
+    injection hosts. This is a draft for user review, not an active grant.
+    """
+    name: str
+    """Environment variable name. The secret value is never returned."""
+
+    suggested_inject_hosts: list[str]
+    """HTTPS hostnames suggested by a local known-provider mapping. An empty list requires the
+    user to supply injection hosts before adding a masking entry. These suggestions do not
+    allow network access.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'SandboxCredentialSuggestion':
+        assert isinstance(obj, dict)
+        name = from_str(obj.get("name"))
+        suggested_inject_hosts = from_list(from_str, obj.get("suggestedInjectHosts"))
+        return SandboxCredentialSuggestion(name, suggested_inject_hosts)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["name"] = from_str(self.name)
+        result["suggestedInjectHosts"] = from_list(from_str, self.suggested_inject_hosts)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class SandboxDisableForSessionResult:
@@ -11838,6 +14271,102 @@ 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 SandboxDocsURLResult:
+    """The documentation URL a host cites when it declines or downgrades a sandbox setting."""
+
+    url: str
+    """Documentation URL describing the sandbox and the settings that control it."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'SandboxDocsURLResult':
+        assert isinstance(obj, dict)
+        url = from_str(obj.get("url"))
+        return SandboxDocsURLResult(url)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["url"] = from_str(self.url)
+        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 _SandboxEffectiveForOptionalParams:
+    """A sandbox config and the per-feature routing flag to resolve it for."""
+
+    routing_flag: str
+    """The routing flag naming the feature being launched, such as `sandboxMcpServers` or
+    `sandboxLspServers`.
+    """
+    sandbox: Any = None
+    """The session's resolved `sandbox` slice. Omitted when the host has none, which yields a
+    disabled sandbox rather than an error.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_SandboxEffectiveForOptionalParams':
+        assert isinstance(obj, dict)
+        routing_flag = from_str(obj.get("routingFlag"))
+        sandbox = obj.get("sandbox")
+        return _SandboxEffectiveForOptionalParams(routing_flag, sandbox)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["routingFlag"] = from_str(self.routing_flag)
+        if self.sandbox is not None:
+            result["sandbox"] = self.sandbox
+        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 _SandboxEffectiveForOptionalResult:
+    """The sandbox a named feature actually launches under."""
+
+    sandbox_json: Any
+    """The effective sandbox config for the requested feature, or a disabled sandbox when the
+    feature is routed out of it.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_SandboxEffectiveForOptionalResult':
+        assert isinstance(obj, dict)
+        sandbox_json = obj.get("sandboxJson")
+        return _SandboxEffectiveForOptionalResult(sandbox_json)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["sandboxJson"] = self.sandbox_json
+        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 _SandboxEnforcementCommandAllowedParams:
+    """One slash command, as typed, to test against the enforcement-block allowlist."""
+
+    args: list[str]
+    """The command's arguments, in order. Pass an empty array for a bare command: several
+    entries in the allowlist admit the bare form and refuse every argument.
+    """
+    command_name: str
+    """The command name as the user typed it, with or without its leading slash."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_SandboxEnforcementCommandAllowedParams':
+        assert isinstance(obj, dict)
+        args = from_list(from_str, obj.get("args"))
+        command_name = from_str(obj.get("commandName"))
+        return _SandboxEnforcementCommandAllowedParams(args, command_name)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["args"] = from_list(from_str, self.args)
+        result["commandName"] = from_str(self.command_name)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class SandboxEnforcementStatus:
@@ -11868,6 +14397,54 @@ 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.
+# Internal: this type is an internal SDK API and is not part of the public surface.
+@dataclass
+class _SandboxPickerCandidate:
+    """One file-picker suggestion offered up for the sandbox filesystem check."""
+
+    is_directory: bool
+    """Whether the suggestion is a directory. A directory the policy does not itself allow may
+    still be needed as a waypoint to an allowed subtree.
+    """
+    path: str
+    """Absolute path the suggestion would attach."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_SandboxPickerCandidate':
+        assert isinstance(obj, dict)
+        is_directory = from_bool(obj.get("isDirectory"))
+        path = from_str(obj.get("path"))
+        return _SandboxPickerCandidate(is_directory, path)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["isDirectory"] = from_bool(self.is_directory)
+        result["path"] = from_str(self.path)
+        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 _SandboxFilterPickerCandidatesResult:
+    """Per-candidate allow decisions, positionally aligned with the request."""
+
+    allowed: list[bool]
+    """One decision per candidate, in the same order. Always the same length as the request's
+    `candidates`.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_SandboxFilterPickerCandidatesResult':
+        assert isinstance(obj, dict)
+        allowed = from_list(from_bool, obj.get("allowed"))
+        return _SandboxFilterPickerCandidatesResult(allowed)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["allowed"] = from_list(from_bool, self.allowed)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class SandboxGrantPathForRequestResult:
@@ -11903,12 +14480,15 @@ class SandboxHostCapability:
     tooling for Bubblewrap's private network namespace, such as slirp4netns),
     `network_filtering` (host rules and the sandbox proxy; on Linux this needs the same
     tooling as `network`; on Windows it needs Process Security Environment 1.1 host-loopback
-    support, and a policy that uses it must also set `network.allowLocalNetwork`),
-    `denied_paths` (native enforcement of `filesystem.deniedPaths`), `shell` (shell commands
-    inside the sandbox), and `filesystem_enumeration` (enumerate-only filesystem grants; on
-    Windows this needs Process Security Environment 1.1 filesystem enumeration support, and
-    without it sandboxed PowerShell still runs but cannot resolve its current location; other
-    platforms always report it).
+    support or MXC's PSEC 1.0-only proxy-loopback compatibility capability, and a policy that
+    uses it must also set `network.allowLocalNetwork`; compatibility applies only to an
+    explicit identity-less runtime proxy, not general host-loopback access, and other policy
+    restrictions still apply), `denied_paths` (native enforcement of
+    `filesystem.deniedPaths`), `shell` (shell commands inside the sandbox), and
+    `filesystem_enumeration` (enumerate-only filesystem grants; on Windows this needs Process
+    Security Environment 1.1 filesystem enumeration support, and without it sandboxed
+    PowerShell still runs but cannot resolve its current location; other platforms always
+    report it).
     """
     supported: bool
     """Whether this host can run the feature."""
@@ -11934,6 +14514,58 @@ 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.
+# Internal: this type is an internal SDK API and is not part of the public surface.
+@dataclass
+class _SandboxPreparePickerPolicyParams:
+    """The working directory and sandbox settings to build a file-picker policy from."""
+
+    cwd: str
+    """The session's working directory. Git discovery and grant canonicalization are resolved
+    against it.
+    """
+    sandbox: Any = None
+    """The session's resolved `sandbox` slice. Omitted, or disabled, yields no policy and every
+    candidate is kept.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_SandboxPreparePickerPolicyParams':
+        assert isinstance(obj, dict)
+        cwd = from_str(obj.get("cwd"))
+        sandbox = obj.get("sandbox")
+        return _SandboxPreparePickerPolicyParams(cwd, sandbox)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["cwd"] = from_str(self.cwd)
+        if self.sandbox is not None:
+            result["sandbox"] = self.sandbox
+        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 _SandboxPreparePickerPolicyResult:
+    """The prepared file-picker policy, or none when the sandbox is disabled."""
+
+    sandbox_json: Any = None
+    """The prepared policy to pass back to `sandbox.filterPickerCandidates`. Absent when the
+    sandbox is disabled or absent, in which case filtering keeps every candidate.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_SandboxPreparePickerPolicyResult':
+        assert isinstance(obj, dict)
+        sandbox_json = obj.get("sandboxJson")
+        return _SandboxPreparePickerPolicyResult(sandbox_json)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        if self.sandbox_json is not None:
+            result["sandboxJson"] = self.sandbox_json
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class SandboxProxyCACreateResult:
@@ -11964,6 +14596,148 @@ class SandboxProxyCAState(Enum):
     NOT_INSTALLED = "notInstalled"
     UNSUPPORTED = "unsupported"
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class SandboxProxySecretGetResult:
+    """The stored sandbox proxy password, if one is present."""
+
+    value: str | None = None
+    """The stored password. Absent when no entry exists in either the keychain or the on-disk
+    fallback store.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'SandboxProxySecretGetResult':
+        assert isinstance(obj, dict)
+        value = from_union([from_str, from_none], obj.get("value"))
+        return SandboxProxySecretGetResult(value)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        if self.value is not None:
+            result["value"] = from_union([from_str, from_none], self.value)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class SandboxProxySecretLocation:
+    """Where this runtime keeps the sandbox proxy password."""
+
+    config_dir: str
+    """Absolute path of the credential store holding the sandbox proxy password. The proxy
+    password belongs to no MCP server, so it is kept in its own directory rather than in the
+    MCP secret store.
+    """
+    secret_id: str
+    """Identifier of the proxy password entry within that store. Derived from the configuration
+    directory, so two Copilot homes on one machine never share an entry. Use it to recognize
+    a `${secret:…}` reference in stored settings as this runtime's own proxy password.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'SandboxProxySecretLocation':
+        assert isinstance(obj, dict)
+        config_dir = from_str(obj.get("configDir"))
+        secret_id = from_str(obj.get("secretId"))
+        return SandboxProxySecretLocation(config_dir, secret_id)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["configDir"] = from_str(self.config_dir)
+        result["secretId"] = from_str(self.secret_id)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class SandboxProxySecretSaveRequest:
+    """The sandbox proxy password to store."""
+
+    value: str
+    """The password to store for the sandbox proxy."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'SandboxProxySecretSaveRequest':
+        assert isinstance(obj, dict)
+        value = from_str(obj.get("value"))
+        return SandboxProxySecretSaveRequest(value)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        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 SandboxProxySecretSaveResult:
+    """Where the sandbox proxy password was stored."""
+
+    stored_in_keychain: bool
+    """Whether the OS keychain accepted the value. False means it was written to the on-disk
+    fallback store instead, which is still readable by `sandbox.proxySecret.get`.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'SandboxProxySecretSaveResult':
+        assert isinstance(obj, dict)
+        stored_in_keychain = from_bool(obj.get("storedInKeychain"))
+        return SandboxProxySecretSaveResult(stored_in_keychain)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["storedInKeychain"] = from_bool(self.stored_in_keychain)
+        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 _SandboxResolveFlooredConfigParams:
+    """The user's sandbox settings and the managed sandbox floor to raise them to."""
+
+    managed_sandbox: Any = None
+    """The effective managed `sandbox` slice acting as a floor. Omitted when no administrator
+    policy applies, in which case the user's own settings stand unchanged.
+    """
+    user_sandbox: Any = None
+    """The user's own `sandbox` settings slice. Omitted when the user has configured none, which
+    still yields the managed floor rather than a disabled sandbox.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_SandboxResolveFlooredConfigParams':
+        assert isinstance(obj, dict)
+        managed_sandbox = obj.get("managedSandbox")
+        user_sandbox = obj.get("userSandbox")
+        return _SandboxResolveFlooredConfigParams(managed_sandbox, user_sandbox)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        if self.managed_sandbox is not None:
+            result["managedSandbox"] = self.managed_sandbox
+        if self.user_sandbox is not None:
+            result["userSandbox"] = self.user_sandbox
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class SandboxResolveFlooredConfigResult:
+    """The user's sandbox settings raised to the managed floor."""
+
+    sandbox_json: Any
+    """The floored sandbox config, normalized through the declared sandbox shape so only
+    declared fields in a fixed order are present.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'SandboxResolveFlooredConfigResult':
+        assert isinstance(obj, dict)
+        sandbox_json = obj.get("sandboxJson")
+        return SandboxResolveFlooredConfigResult(sandbox_json)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["sandboxJson"] = self.sandbox_json
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 class SandboxSessionChange(Enum):
     """A session-scoped sandbox transition applied while handling a slash command
@@ -11975,6 +14749,63 @@ class SandboxSessionChange(Enum):
     DISABLED = "disabled"
     RESTORED = "restored"
 
+# 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 _SandboxUnsupportedStartupNoticeParams:
+    """The managed sandbox policy in force, which selects which remedy the notice offers."""
+
+    enabled_by_undetermined_policy: bool | None = None
+    """True when the sandbox stayed on only because the managed policy could not be determined.
+    Distinguishes a policy that positively enforces the sandbox from one that merely failed
+    to resolve, which is the difference between telling the user to contact an administrator
+    and telling them to wait. Defaults to false.
+    """
+    managed_sandbox: Any = None
+    """The managed `sandbox` slice, when a policy supplies one. The notice treats the sandbox as
+    enforced only when this both enables it and sets `failIfUnavailable`, because a managed
+    sandbox that tolerates being unavailable still leaves the user able to turn it off.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_SandboxUnsupportedStartupNoticeParams':
+        assert isinstance(obj, dict)
+        enabled_by_undetermined_policy = from_union([from_bool, from_none], obj.get("enabledByUndeterminedPolicy"))
+        managed_sandbox = obj.get("managedSandbox")
+        return _SandboxUnsupportedStartupNoticeParams(enabled_by_undetermined_policy, managed_sandbox)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        if self.enabled_by_undetermined_policy is not None:
+            result["enabledByUndeterminedPolicy"] = from_union([from_bool, from_none], self.enabled_by_undetermined_policy)
+        if self.managed_sandbox is not None:
+            result["managedSandbox"] = self.managed_sandbox
+        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 _SandboxUnsupportedStartupNoticeResult:
+    """The startup warning, absent when the machine can run a sandbox."""
+
+    notice: str | None = None
+    """The user-facing warning, carrying the platform remedy and the recovery the policy in
+    force actually allows. Absent when this machine supports a sandbox, so a host can call
+    unconditionally and print only what it gets.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_SandboxUnsupportedStartupNoticeResult':
+        assert isinstance(obj, dict)
+        notice = from_union([from_str, from_none], obj.get("notice"))
+        return _SandboxUnsupportedStartupNoticeResult(notice)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        if self.notice is not None:
+            result["notice"] = from_union([from_str, from_none], self.notice)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class ScheduleAddAtRequest:
@@ -12691,6 +15522,30 @@ def to_dict(self) -> dict:
             result["includeSkills"] = from_union([from_bool, from_none], self.include_skills)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class SessionConnectedIDEInfo:
+    """The IDE a host is connected to, as reported to the session."""
+
+    ide_name: str
+    """Display name of the connected IDE, for example `VS Code`."""
+
+    workspace_folder: str
+    """Absolute path of the workspace folder the IDE has open."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'SessionConnectedIDEInfo':
+        assert isinstance(obj, dict)
+        ide_name = from_str(obj.get("ideName"))
+        workspace_folder = from_str(obj.get("workspaceFolder"))
+        return SessionConnectedIDEInfo(ide_name, workspace_folder)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["ideName"] = from_str(self.ide_name)
+        result["workspaceFolder"] = from_str(self.workspace_folder)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class SessionFSAppendFileRequest:
@@ -13366,6 +16221,11 @@ class SessionManagedPermissions:
     deny: list[str] | None = None
     """Permission rules that block matching operations. Deny has highest precedence."""
 
+    disable_assisted_permissions_mode: bool | None = None
+    """When true, prevents Assisted Permissions from being activated. An actively Assisted
+    session falls back to Manual Approval while the policy is in force. Omit the key or set
+    it to false to impose no restriction.
+    """
     disable_bypass_permissions_mode: str | None = None
     """When set to `disable`, prevents bypass/allow-all permission modes. Advisory auto-approval
     remains available because normal prompt paths stay active. Any other value is accepted
@@ -13373,6 +16233,12 @@ class SessionManagedPermissions:
     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.
     """
+    limit_to: list[str] | None = None
+    """Closed-world host boundary expressed as `Domain(hostname)`, `Domain(IP)`, or
+    `Domain(*.example.com)` rules. Schemes, ports, paths, queries, and fragments are rejected
+    because every network request must be enforceable at host-level egress. Multiple managed
+    sources intersect their lists; an empty list denies all hosts.
+    """
 
     @staticmethod
     def from_dict(obj: Any) -> 'SessionManagedPermissions':
@@ -13380,8 +16246,10 @@ def from_dict(obj: Any) -> 'SessionManagedPermissions':
         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_assisted_permissions_mode = from_union([from_bool, from_none], obj.get("disableAssistedPermissionsMode"))
         disable_bypass_permissions_mode = from_union([from_str, from_none], obj.get("disableBypassPermissionsMode"))
-        return SessionManagedPermissions(allow, ask, deny, disable_bypass_permissions_mode)
+        limit_to = from_union([lambda x: from_list(from_str, x), from_none], obj.get("limitTo"))
+        return SessionManagedPermissions(allow, ask, deny, disable_assisted_permissions_mode, disable_bypass_permissions_mode, limit_to)
 
     def to_dict(self) -> dict:
         result: dict = {}
@@ -13391,8 +16259,12 @@ def to_dict(self) -> dict:
             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_assisted_permissions_mode is not None:
+            result["disableAssistedPermissionsMode"] = from_union([from_bool, from_none], self.disable_assisted_permissions_mode)
         if self.disable_bypass_permissions_mode is not None:
             result["disableBypassPermissionsMode"] = from_union([from_str, from_none], self.disable_bypass_permissions_mode)
+        if self.limit_to is not None:
+            result["limitTo"] = from_union([lambda x: from_list(from_str, x), from_none], self.limit_to)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
@@ -13487,6 +16359,45 @@ def to_dict(self) -> dict:
         result["loginId"] = from_str(self.login_id)
         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 SessionModelClearStartupSeedRequest:
+    expected_model: str
+    expected_provider_id: str | None = None
+    """Provider captured with the startup seed; omission matches only an unqualified seed."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'SessionModelClearStartupSeedRequest':
+        assert isinstance(obj, dict)
+        expected_model = from_str(obj.get("expectedModel"))
+        expected_provider_id = from_union([from_str, from_none], obj.get("expectedProviderId"))
+        return SessionModelClearStartupSeedRequest(expected_model, expected_provider_id)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["expectedModel"] = from_str(self.expected_model)
+        if self.expected_provider_id is not None:
+            result["expectedProviderId"] = from_union([from_str, from_none], self.expected_provider_id)
+        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 SessionModelClearStartupSeedResult:
+    cleared: bool
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'SessionModelClearStartupSeedResult':
+        assert isinstance(obj, dict)
+        cleared = from_bool(obj.get("cleared"))
+        return SessionModelClearStartupSeedResult(cleared)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["cleared"] = from_bool(self.cleared)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class SessionModelListRequest:
@@ -13716,6 +16627,26 @@ def to_dict(self) -> dict:
             result["reloadMcp"] = from_union([from_bool, from_none], self.reload_mcp)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class SessionPluginsRetryManagedRequest:
+    plugins: list[str] | None = None
+    """"plugin@marketplace" specs to retry. Omit to retry every plugin the session's managed
+    settings require.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'SessionPluginsRetryManagedRequest':
+        assert isinstance(obj, dict)
+        plugins = from_union([lambda x: from_list(from_str, x), from_none], obj.get("plugins"))
+        return SessionPluginsRetryManagedRequest(plugins)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        if self.plugins is not None:
+            result["plugins"] = from_union([lambda x: from_list(from_str, x), from_none], self.plugins)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class SessionPruneResult:
@@ -13756,7 +16687,128 @@ def to_dict(self) -> dict:
         result["skipped"] = from_list(from_str, self.skipped)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class SessionQuotaDelegateWarning:
+    """Existing delegation guidance for an account without delegation access.
+
+    Existing delegation warning for a free account.
+    """
+    text: str
+    """User-facing guidance."""
+
+    url: str
+    """Link to upgrade the account."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'SessionQuotaDelegateWarning':
+        assert isinstance(obj, dict)
+        text = from_str(obj.get("text"))
+        url = from_str(obj.get("url"))
+        return SessionQuotaDelegateWarning(text, url)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["text"] = from_str(self.text)
+        result["url"] = from_str(self.url)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+class SessionQuotaPlanTier(Enum):
+    """Resolved Copilot plan tier.
+
+    Copilot plan tier used by the session quota projection.
+    """
+    BUSINESS = "business"
+    EDU = "edu"
+    ENTERPRISE = "enterprise"
+    FREE = "free"
+    MAX = "max"
+    PRO = "pro"
+    PRO_PLUS = "pro_plus"
+    UNKNOWN = "unknown"
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class SessionQuotaSnapshot:
+    """Session quota snapshot, preserving the incumbent numeric units and reset metadata."""
+
+    entitlement_requests: float
+    """Entitled quantity in this quota's units."""
+
+    is_unlimited_entitlement: bool
+    """Whether the entitlement is unlimited."""
+
+    overage: float
+    """Additional usage in this quota's units."""
+
+    overage_allowed_with_exhausted_quota: bool
+    """Whether additional usage is allowed after quota exhaustion."""
+
+    remaining_percentage: float
+    """Percentage of the entitlement remaining."""
+
+    usage_allowed_with_exhausted_quota: bool
+    """Whether usage is allowed after quota exhaustion."""
+
+    used_requests: float
+    """Consumed quantity in this quota's units."""
+
+    has_quota: bool | None = None
+    """Whether the provider reports available quota."""
+
+    overage_entitlement: float | None = None
+    """Additional-usage budget cap, when provided."""
+
+    reset_date_epoch_ms: float | None = None
+    """Quota reset time in milliseconds since the Unix epoch, when known."""
+
+    reset_date_estimated: bool | None = None
+    """Whether the reset time is estimated."""
+
+    token_based_billing: bool | None = None
+    """Whether this quota uses token-based billing."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'SessionQuotaSnapshot':
+        assert isinstance(obj, dict)
+        entitlement_requests = from_float(obj.get("entitlementRequests"))
+        is_unlimited_entitlement = from_bool(obj.get("isUnlimitedEntitlement"))
+        overage = from_float(obj.get("overage"))
+        overage_allowed_with_exhausted_quota = from_bool(obj.get("overageAllowedWithExhaustedQuota"))
+        remaining_percentage = from_float(obj.get("remainingPercentage"))
+        usage_allowed_with_exhausted_quota = from_bool(obj.get("usageAllowedWithExhaustedQuota"))
+        used_requests = from_float(obj.get("usedRequests"))
+        has_quota = from_union([from_bool, from_none], obj.get("hasQuota"))
+        overage_entitlement = from_union([from_float, from_none], obj.get("overageEntitlement"))
+        reset_date_epoch_ms = from_union([from_float, from_none], obj.get("resetDateEpochMs"))
+        reset_date_estimated = from_union([from_bool, from_none], obj.get("resetDateEstimated"))
+        token_based_billing = from_union([from_bool, from_none], obj.get("tokenBasedBilling"))
+        return SessionQuotaSnapshot(entitlement_requests, is_unlimited_entitlement, overage, overage_allowed_with_exhausted_quota, remaining_percentage, usage_allowed_with_exhausted_quota, used_requests, has_quota, overage_entitlement, reset_date_epoch_ms, reset_date_estimated, token_based_billing)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["entitlementRequests"] = to_float(self.entitlement_requests)
+        result["isUnlimitedEntitlement"] = from_bool(self.is_unlimited_entitlement)
+        result["overage"] = to_float(self.overage)
+        result["overageAllowedWithExhaustedQuota"] = from_bool(self.overage_allowed_with_exhausted_quota)
+        result["remainingPercentage"] = to_float(self.remaining_percentage)
+        result["usageAllowedWithExhaustedQuota"] = from_bool(self.usage_allowed_with_exhausted_quota)
+        result["usedRequests"] = to_float(self.used_requests)
+        if self.has_quota is not None:
+            result["hasQuota"] = from_union([from_bool, from_none], self.has_quota)
+        if self.overage_entitlement is not None:
+            result["overageEntitlement"] = from_union([to_float, from_none], self.overage_entitlement)
+        if self.reset_date_epoch_ms is not None:
+            result["resetDateEpochMs"] = from_union([to_float, from_none], self.reset_date_epoch_ms)
+        if self.reset_date_estimated is not None:
+            result["resetDateEstimated"] = from_union([from_bool, from_none], self.reset_date_estimated)
+        if self.token_based_billing is not None:
+            result["tokenBasedBilling"] = from_union([from_bool, from_none], self.token_based_billing)
+        return result
+
 class SettableAuthInfoType(Enum):
+    ACCOUNT = "account"
     API_KEY = "api-key"
     COPILOT_API_TOKEN = "copilot-api-token"
     ENV = "env"
@@ -14129,6 +17181,37 @@ def to_dict(self) -> dict:
             result["pluginHookCount"] = from_union([from_int, from_none], self.plugin_hook_count)
         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 SessionUsageSetCodeChangesRequest:
+    """Internal absolute code-change totals reported by the owning host."""
+
+    lines_added: float
+    """Absolute added-line total, replacing the previous reading."""
+
+    lines_removed: float
+    """Absolute removed-line total, replacing the previous reading."""
+
+    files_count: float | None = None
+    """Absolute changed-file count; omission preserves the previous count."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'SessionUsageSetCodeChangesRequest':
+        assert isinstance(obj, dict)
+        lines_added = from_float(obj.get("linesAdded"))
+        lines_removed = from_float(obj.get("linesRemoved"))
+        files_count = from_union([from_float, from_none], obj.get("filesCount"))
+        return SessionUsageSetCodeChangesRequest(lines_added, lines_removed, files_count)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["linesAdded"] = to_float(self.lines_added)
+        result["linesRemoved"] = to_float(self.lines_removed)
+        if self.files_count is not None:
+            result["filesCount"] = from_union([to_float, from_none], self.files_count)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 class SessionVisibilityStatus(Enum):
     """Sharing status for a synced session. "repo" makes the session visible to anyone with read
@@ -14147,6 +17230,77 @@ class SessionVisibilityStatus(Enum):
     REPO = "repo"
     UNSHARED = "unshared"
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class SessionWorkingDirectoryContextWithClient:
+    """Starting working-directory context. The record keeps `cwd`, `gitRoot`, `repository`,
+    `hostType`, `branch`, and `clientName`. Other fields, including `repositoryHost`,
+    `headCommit`, and `baseCommit`, are ignored. `hostType` must be `github` or `ado`.
+
+    A working-directory context together with the client that produced it.
+    """
+    cwd: str
+    """Current working directory path"""
+
+    base_commit: str | None = None
+    """Merge-base commit SHA"""
+
+    branch: str | None = None
+    """Current git branch name"""
+
+    client_name: str | None = None
+    """Name of the client that created the session"""
+
+    git_root: str | None = None
+    """Root directory of the git repository"""
+
+    head_commit: str | None = None
+    """Head commit of the current git branch"""
+
+    host_type: str | None = None
+    """Hosting platform type of the repository"""
+
+    repository: str | None = None
+    """Repository identifier derived from the git remote URL"""
+
+    repository_host: str | None = None
+    """Raw host string from the git remote URL"""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'SessionWorkingDirectoryContextWithClient':
+        assert isinstance(obj, dict)
+        cwd = from_str(obj.get("cwd"))
+        base_commit = from_union([from_str, from_none], obj.get("baseCommit"))
+        branch = from_union([from_str, from_none], obj.get("branch"))
+        client_name = from_union([from_str, from_none], obj.get("clientName"))
+        git_root = from_union([from_str, from_none], obj.get("gitRoot"))
+        head_commit = from_union([from_str, from_none], obj.get("headCommit"))
+        host_type = from_union([from_str, from_none], obj.get("hostType"))
+        repository = from_union([from_str, from_none], obj.get("repository"))
+        repository_host = from_union([from_str, from_none], obj.get("repositoryHost"))
+        return SessionWorkingDirectoryContextWithClient(cwd, base_commit, branch, client_name, git_root, head_commit, host_type, repository, repository_host)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["cwd"] = from_str(self.cwd)
+        if self.base_commit is not None:
+            result["baseCommit"] = from_union([from_str, from_none], self.base_commit)
+        if self.branch is not None:
+            result["branch"] = from_union([from_str, from_none], self.branch)
+        if self.client_name is not None:
+            result["clientName"] = from_union([from_str, from_none], self.client_name)
+        if self.git_root is not None:
+            result["gitRoot"] = from_union([from_str, from_none], self.git_root)
+        if self.head_commit is not None:
+            result["headCommit"] = from_union([from_str, from_none], self.head_commit)
+        if self.host_type is not None:
+            result["hostType"] = from_union([from_str, from_none], self.host_type)
+        if self.repository is not None:
+            result["repository"] = from_union([from_str, from_none], self.repository)
+        if self.repository_host is not None:
+            result["repositoryHost"] = from_union([from_str, from_none], self.repository_host)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class SessionsBulkDeleteRequest:
@@ -14248,6 +17402,25 @@ 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 SessionsCreateWorkspaceResult:
+    """The workspace record that was written."""
+
+    workspace_json: str
+    """The created workspace record, as JSON"""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'SessionsCreateWorkspaceResult':
+        assert isinstance(obj, dict)
+        workspace_json = from_str(obj.get("workspaceJson"))
+        return SessionsCreateWorkspaceResult(workspace_json)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["workspaceJson"] = from_str(self.workspace_json)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class SessionsDeleteRequest:
@@ -14656,6 +17829,51 @@ def to_dict(self) -> dict:
         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 SessionsLoadWorkspaceRequest:
+    """Where the session's state lives, as a root directory and the session ID under it."""
+
+    session_id: str
+    """Session ID naming the state directory under the sessions home. Rejected when it is
+    absolute or contains a parent component, so it cannot escape the sessions home.
+    """
+    sessions_home: str
+    """Root directory every session's state directory sits under"""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'SessionsLoadWorkspaceRequest':
+        assert isinstance(obj, dict)
+        session_id = from_str(obj.get("sessionId"))
+        sessions_home = from_str(obj.get("sessionsHome"))
+        return SessionsLoadWorkspaceRequest(session_id, sessions_home)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["sessionId"] = from_str(self.session_id)
+        result["sessionsHome"] = from_str(self.sessions_home)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class SessionsLoadWorkspaceResult:
+    """The workspace record on disk, omitted when the session has none."""
+
+    workspace_json: str | None = None
+    """The workspace record, as JSON. Omitted when the record does not exist."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'SessionsLoadWorkspaceResult':
+        assert isinstance(obj, dict)
+        workspace_json = from_union([from_str, from_none], obj.get("workspaceJson"))
+        return SessionsLoadWorkspaceResult(workspace_json)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        if self.workspace_json is not None:
+            result["workspaceJson"] = from_union([from_str, from_none], self.workspace_json)
+        return result
+
 class SessionsOpenAttachKind(Enum):
     ATTACH = "attach"
 
@@ -14914,6 +18132,21 @@ def to_dict(self) -> dict:
             result["expectedFromSessionId"] = from_union([from_str, from_none], self.expected_from_session_id)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class SessionsUpdateWorkspaceFieldsResult:
+    """The merge completed. The record carries the supplied workspace-schema fields, but a
+    stored `fork_count` stays.
+    """
+    @staticmethod
+    def from_dict(obj: Any) -> 'SessionsUpdateWorkspaceFieldsResult':
+        assert isinstance(obj, dict)
+        return SessionsUpdateWorkspaceFieldsResult()
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        return result
+
 class SettableTokenAuthInfoType(Enum):
     TOKEN = "token"
 
@@ -15133,8 +18366,8 @@ class SkillInstallationManagementOutcomeKind(Enum):
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class SkillProviderDescriptor:
-    """Catalog-only metadata for one SDK-provided skill. The complete SKILL.md is fetched
-    separately and lazily.
+    """Authoritative catalog metadata for one SDK-provided skill. The skill's SKILL.md text is
+    fetched separately and lazily.
     """
     description: str
     """Description used in skill catalogs without fetching content."""
@@ -15221,21 +18454,25 @@ def to_dict(self) -> dict:
 # Internal: this type is an internal SDK API and is not part of the public surface.
 @dataclass
 class _SkillProviderReadResult:
-    """Complete text-only SKILL.md content returned by an SDK session's skill provider. Related
-    files and assets are not supported.
+    """Text-only SKILL.md content returned by an SDK session's skill provider. YAML frontmatter
+    is optional: fields it omits come from the catalog descriptor, fields it declares must
+    match the descriptor, and `allowed-tools` is read only from frontmatter. Related files
+    and assets are not supported.
+    """
+    markdown: str | None = None
+    """SKILL.md text, with or without YAML frontmatter, or null when the provider has no skill
+    with the requested name. The runtime enforces a 1 MiB UTF-8 byte limit.
     """
-    markdown: str
-    """Complete SKILL.md text. The runtime enforces a 1 MiB UTF-8 byte limit."""
 
     @staticmethod
     def from_dict(obj: Any) -> '_SkillProviderReadResult':
         assert isinstance(obj, dict)
-        markdown = from_str(obj.get("markdown"))
+        markdown = from_union([from_none, from_str], obj.get("markdown"))
         return _SkillProviderReadResult(markdown)
 
     def to_dict(self) -> dict:
         result: dict = {}
-        result["markdown"] = from_str(self.markdown)
+        result["markdown"] = from_union([from_none, from_str], self.markdown)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
@@ -15298,7 +18535,11 @@ class SkillsDiscoverRequest:
     """Optional list of project directory paths to scan for project-scoped skills"""
 
     skill_directories: list[str] | None = None
-    """Optional list of additional skill directory paths to include"""
+    """Explicit discovery-only skill roots, not filesystem grants. Available without ambient
+    discovery, subject to skill/managed disables. Relative paths resolve against the
+    request's effective working directory when supplied. Null and omission are equivalent; an
+    empty array contributes no explicit roots.
+    """
 
     @staticmethod
     def from_dict(obj: Any) -> 'SkillsDiscoverRequest':
@@ -15356,6 +18597,12 @@ class SkillsGetDiscoveryPathsRequest:
     """Optional list of project directory paths. When omitted or empty, only personal and custom
     directories are returned.
     """
+    skill_directories: list[str] | None = field(default=None, kw_only=True)
+    """Explicit discovery-only skill roots to enumerate, including configured missing
+    directories. Relative paths resolve against the request's effective working directory
+    when supplied. These are not filesystem grants or preferred creation targets. Null and
+    omission are equivalent.
+    """
 
     @staticmethod
     def from_dict(obj: Any) -> 'SkillsGetDiscoveryPathsRequest':
@@ -15363,7 +18610,8 @@ def from_dict(obj: Any) -> 'SkillsGetDiscoveryPathsRequest':
         exclude_host_skills = from_union([from_bool, from_none], obj.get("excludeHostSkills"))
         ignored_skills_locations = from_union([lambda x: from_list(from_str, x), from_none], obj.get("ignoredSkillsLocations"))
         project_paths = from_union([lambda x: from_list(from_str, x), from_none], obj.get("projectPaths"))
-        return SkillsGetDiscoveryPathsRequest(exclude_host_skills, ignored_skills_locations, project_paths)
+        skill_directories = from_union([lambda x: from_list(from_str, x), from_none], obj.get("skillDirectories"))
+        return SkillsGetDiscoveryPathsRequest(exclude_host_skills, ignored_skills_locations, project_paths, skill_directories=skill_directories)
 
     def to_dict(self) -> dict:
         result: dict = {}
@@ -15373,6 +18621,8 @@ def to_dict(self) -> dict:
             result["ignoredSkillsLocations"] = from_union([lambda x: from_list(from_str, x), from_none], self.ignored_skills_locations)
         if self.project_paths is not None:
             result["projectPaths"] = from_union([lambda x: from_list(from_str, x), from_none], self.project_paths)
+        if self.skill_directories is not None:
+            result["skillDirectories"] = from_union([lambda x: from_list(from_str, x), from_none], self.skill_directories)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
@@ -15502,6 +18752,28 @@ class SlashCommandSetPlanModelResultKind(Enum):
 class SlashCommandShowDialogResultKind(Enum):
     SHOW_DIALOG = "show-dialog"
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+class StaffLogLevelMigrationStatus(Enum):
+    """What the one-time staff log-level migration did.
+
+    What the migration did. Only `refreshed` can have changed the persisted settings.
+    """
+    CURRENT = "current"
+    INELIGIBLE = "ineligible"
+    REFRESHED = "refreshed"
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+class StaffUpdateChannelMigrationStatus(Enum):
+    """What the one-time staff update-channel migration did.
+
+    What the migration did. Only `migrated` means the persisted settings changed.
+    """
+    COMPLETED = "completed"
+    CURRENT = "current"
+    EXCLUDED_EXPERIMENTAL = "excluded-experimental"
+    INELIGIBLE = "ineligible"
+    MIGRATED = "migrated"
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 class SubagentSettingsEntryContextTier(Enum):
     """Context tier override for matching subagents"""
@@ -16196,6 +19468,21 @@ 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 ToolsListPendingRequestsRequest:
+    """No parameters; returns the external tool calls of the session and its sub-agents that are
+    still waiting for a result.
+    """
+    @staticmethod
+    def from_dict(obj: Any) -> 'ToolsListPendingRequestsRequest':
+        assert isinstance(obj, dict)
+        return ToolsListPendingRequestsRequest()
+
+    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 ToolsListRequest:
@@ -16600,172 +19887,889 @@ 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 UsageMetricsModelMetricRequests:
-    """Request count and cost metrics for this model"""
+class _UsageSetCodeChangesRequest:
+    """Internal absolute code-change totals reported by the owning host."""
 
-    cost: float
-    """User-initiated premium request cost (with multiplier applied)"""
+    lines_added: float
+    """Absolute added-line total, replacing the previous reading."""
 
-    count: int
-    """Number of API requests made with this model"""
+    lines_removed: float
+    """Absolute removed-line total, replacing the previous reading."""
+
+    files_count: float | None = None
+    """Absolute changed-file count; omission preserves the previous count."""
 
     @staticmethod
-    def from_dict(obj: Any) -> 'UsageMetricsModelMetricRequests':
+    def from_dict(obj: Any) -> '_UsageSetCodeChangesRequest':
         assert isinstance(obj, dict)
-        cost = from_float(obj.get("cost"))
-        count = from_int(obj.get("count"))
-        return UsageMetricsModelMetricRequests(cost, count)
+        lines_added = from_float(obj.get("linesAdded"))
+        lines_removed = from_float(obj.get("linesRemoved"))
+        files_count = from_union([from_float, from_none], obj.get("filesCount"))
+        return _UsageSetCodeChangesRequest(lines_added, lines_removed, files_count)
 
     def to_dict(self) -> dict:
         result: dict = {}
-        result["cost"] = to_float(self.cost)
-        result["count"] = from_int(self.count)
+        result["linesAdded"] = to_float(self.lines_added)
+        result["linesRemoved"] = to_float(self.lines_removed)
+        if self.files_count is not None:
+            result["filesCount"] = from_union([to_float, from_none], self.files_count)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
-class UsageMetricsModelMetricTokenDetail:
-    """Per-model token-detail entry containing the accumulated token count for one token type."""
+class UserSettingMetadata:
+    """A single user setting's effective value alongside its default, so consumers can render
+    settings left at their default.
+    """
+    default: Any
+    """The centrally-known default for this setting (null when no default is registered)."""
 
-    token_count: int
-    """Accumulated token count for this token type"""
+    is_default: bool
+    """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.
+    """
+    value: Any
+    """The effective value: the user's value if set, otherwise the default."""
 
     @staticmethod
-    def from_dict(obj: Any) -> 'UsageMetricsModelMetricTokenDetail':
+    def from_dict(obj: Any) -> 'UserSettingMetadata':
         assert isinstance(obj, dict)
-        token_count = from_int(obj.get("tokenCount"))
-        return UsageMetricsModelMetricTokenDetail(token_count)
+        default = obj.get("default")
+        is_default = from_bool(obj.get("isDefault"))
+        value = obj.get("value")
+        return UserSettingMetadata(default, is_default, value)
 
     def to_dict(self) -> dict:
         result: dict = {}
-        result["tokenCount"] = from_int(self.token_count)
+        result["default"] = self.default
+        result["isDefault"] = from_bool(self.is_default)
+        result["value"] = self.value
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
-class UsageMetricsModelMetricUsage:
-    """Token usage metrics for this model"""
+class UserSettingsApplyTopKeyRequest:
+    """A single top-level setting subtree to validate and write."""
 
-    cache_read_tokens: int
-    """Total tokens read from prompt cache"""
+    canonical_path: list[str]
+    """Canonical path of the setting the caller is editing. Currently informational only."""
 
-    cache_write_tokens: int
-    """Total tokens written to prompt cache"""
+    top_key: str
+    """Top-level setting name to write."""
 
-    input_tokens: int
-    """Total input tokens consumed"""
+    complete_staff_update_channel_migration: bool | None = None
+    """Records that the user chose an update channel explicitly, so the one-time staff channel
+    migration stops reapplying. Honored only for the `autoUpdatesChannel` key.
+    """
+    delete: bool | None = None
+    """True to remove the top-level key instead of writing it."""
 
-    output_tokens: int
-    """Total output tokens produced"""
+    value: Any = UNSET_SENTINEL
+    """Value to write for the whole top-level key. Omitted when `delete` is true. Explicit null
+    is preserved and validated as null.
+    """
 
-    reasoning_tokens: int | None = None
-    """Total output tokens used for reasoning"""
+    @staticmethod
+    def from_dict(obj: Any) -> 'UserSettingsApplyTopKeyRequest':
+        assert isinstance(obj, dict)
+        canonical_path = from_list(from_str, obj.get("canonicalPath"))
+        top_key = from_str(obj.get("topKey"))
+        complete_staff_update_channel_migration = from_union([from_bool, from_none], obj.get("completeStaffUpdateChannelMigration"))
+        delete = from_union([from_bool, from_none], obj.get("delete"))
+        value = obj["value"] if "value" in obj else UNSET_SENTINEL
+        return UserSettingsApplyTopKeyRequest(canonical_path, top_key, complete_staff_update_channel_migration, delete, value)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["canonicalPath"] = from_list(from_str, self.canonical_path)
+        result["topKey"] = from_str(self.top_key)
+        if self.complete_staff_update_channel_migration is not None:
+            result["completeStaffUpdateChannelMigration"] = from_union([from_bool, from_none], self.complete_staff_update_channel_migration)
+        if self.delete is not None:
+            result["delete"] = from_union([from_bool, from_none], self.delete)
+        if self.value is not UNSET_SENTINEL:
+            result["value"] = self.value
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class UserSettingsValidationIssue:
+    """One problem found while validating a setting value."""
+
+    message: str
+    """Human-readable description of the problem."""
+
+    path: list[Any]
+    """Where in the settings tree the problem sits, as object keys and array indices. The first
+    element is the top-level key; a whole-value problem is reported as that single key.
+    """
 
     @staticmethod
-    def from_dict(obj: Any) -> 'UsageMetricsModelMetricUsage':
+    def from_dict(obj: Any) -> 'UserSettingsValidationIssue':
         assert isinstance(obj, dict)
-        cache_read_tokens = from_int(obj.get("cacheReadTokens"))
-        cache_write_tokens = from_int(obj.get("cacheWriteTokens"))
-        input_tokens = from_int(obj.get("inputTokens"))
-        output_tokens = from_int(obj.get("outputTokens"))
-        reasoning_tokens = from_union([from_int, from_none], obj.get("reasoningTokens"))
-        return UsageMetricsModelMetricUsage(cache_read_tokens, cache_write_tokens, input_tokens, output_tokens, reasoning_tokens)
+        message = from_str(obj.get("message"))
+        path = from_list(lambda x: x, obj.get("path"))
+        return UserSettingsValidationIssue(message, path)
 
     def to_dict(self) -> dict:
         result: dict = {}
-        result["cacheReadTokens"] = from_int(self.cache_read_tokens)
-        result["cacheWriteTokens"] = from_int(self.cache_write_tokens)
-        result["inputTokens"] = from_int(self.input_tokens)
-        result["outputTokens"] = from_int(self.output_tokens)
-        if self.reasoning_tokens is not None:
-            result["reasoningTokens"] = from_union([from_int, from_none], self.reasoning_tokens)
+        result["message"] = from_str(self.message)
+        result["path"] = from_list(lambda x: x, self.path)
         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 UsageMetricsCodeChanges:
-    """Aggregated code change metrics"""
+class _UserSettingsBuildRuntimeRequest:
+    """The overrides and host context to resolve effective runtime settings from."""
 
-    files_modified: list[str]
-    """Distinct file paths modified during the session"""
+    environment: dict[str, str]
+    """The environment to read settings-bearing variables from. Passed explicitly rather than
+    read from the server process so a host can resolve settings for an environment it is
+    about to create rather than the one it runs in.
+    """
+    platform: str
+    """The platform to apply platform-specific defaults for, in the same spelling the host's own
+    runtime reports.
+    """
+    working_directory: str
+    """The directory the settings are being resolved for. This selects the repository-scoped
+    document, so a host resolving settings for a directory other than its own process working
+    directory must pass that directory here.
+    """
+    overrides: dict[str, Any] | None = None
+    """Settings that take precedence over every document and environment layer, such as the
+    values a host derived from its own command line. Keyed by setting name, with each value
+    carried verbatim, so a host may pass keys this runtime does not recognize. Absent when
+    the host contributes no overrides of its own.
+    """
 
-    files_modified_count: int
-    """Number of distinct files modified"""
+    @staticmethod
+    def from_dict(obj: Any) -> '_UserSettingsBuildRuntimeRequest':
+        assert isinstance(obj, dict)
+        environment = from_dict(from_str, obj.get("environment"))
+        platform = from_str(obj.get("platform"))
+        working_directory = from_str(obj.get("workingDirectory"))
+        overrides = from_union([lambda x: from_dict(lambda x: x, x), from_none], obj.get("overrides"))
+        return _UserSettingsBuildRuntimeRequest(environment, platform, working_directory, overrides)
 
-    lines_added: int
-    """Total lines of code added"""
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["environment"] = from_dict(from_str, self.environment)
+        result["platform"] = from_str(self.platform)
+        result["workingDirectory"] = from_str(self.working_directory)
+        if self.overrides is not None:
+            result["overrides"] = from_union([lambda x: from_dict(lambda x: x, x), from_none], self.overrides)
+        return result
 
-    lines_removed: int
-    """Total lines of code removed"""
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class UserSettingsGetPathsRequest:
+    """Selects which settings file paths to resolve."""
+
+    repo_root: str | None = None
+    """Absolute path of a repository root. Supply it to also resolve that repository's two
+    settings file paths; omit it to resolve only the user path.
+    """
 
     @staticmethod
-    def from_dict(obj: Any) -> 'UsageMetricsCodeChanges':
+    def from_dict(obj: Any) -> 'UserSettingsGetPathsRequest':
         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)
+        repo_root = from_union([from_str, from_none], obj.get("repoRoot"))
+        return UserSettingsGetPathsRequest(repo_root)
 
     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)
+        if self.repo_root is not None:
+            result["repoRoot"] = from_union([from_str, from_none], self.repo_root)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class UserSettingsGetPathsResult:
+    """On-disk locations of the settings files this runtime reads. A path is reported whether or
+    not the file exists.
+    """
+    user_settings: str
+    """The user settings file: `settings.json` under the resolved Copilot home. This is the file
+    `user.settings.get`, `user.settings.load`, and `user.settings.set` read and write.
+    """
+    repo_local_settings: str | None = None
+    """The repository's local, untracked settings file, or null when no repository root was
+    supplied.
+    """
+    repo_settings: str | None = None
+    """The repository's checked-in settings file, or null when no repository root was supplied."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'UserSettingsGetPathsResult':
+        assert isinstance(obj, dict)
+        user_settings = from_str(obj.get("userSettings"))
+        repo_local_settings = from_union([from_none, from_str], obj.get("repoLocalSettings"))
+        repo_settings = from_union([from_none, from_str], obj.get("repoSettings"))
+        return UserSettingsGetPathsResult(user_settings, repo_local_settings, repo_settings)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["userSettings"] = from_str(self.user_settings)
+        if self.repo_local_settings is not None:
+            result["repoLocalSettings"] = from_union([from_none, from_str], self.repo_local_settings)
+        if self.repo_settings is not None:
+            result["repoSettings"] = from_union([from_none, from_str], self.repo_settings)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
-class UsageMetricsTokenDetail:
-    """Session-wide token-detail entry containing the accumulated token count for one token type."""
+class UserSettingsGovernanceKeysResult:
+    """Top-level user-setting keys grouped by who may govern them."""
+
+    claude_repo: list[str]
+    """Top-level keys a repository may override through a Claude-compatible repository config."""
+
+    managed: list[str]
+    """Top-level keys an enterprise policy may fix through managed settings."""
 
-    token_count: int
-    """Accumulated token count for this token type"""
+    repo: list[str]
+    """Top-level keys a repository may override through `.github/copilot/settings.json` or
+    `.github/copilot/settings.local.json`.
+    """
 
     @staticmethod
-    def from_dict(obj: Any) -> 'UsageMetricsTokenDetail':
+    def from_dict(obj: Any) -> 'UserSettingsGovernanceKeysResult':
         assert isinstance(obj, dict)
-        token_count = from_int(obj.get("tokenCount"))
-        return UsageMetricsTokenDetail(token_count)
+        claude_repo = from_list(from_str, obj.get("claudeRepo"))
+        managed = from_list(from_str, obj.get("managed"))
+        repo = from_list(from_str, obj.get("repo"))
+        return UserSettingsGovernanceKeysResult(claude_repo, managed, repo)
 
     def to_dict(self) -> dict:
         result: dict = {}
-        result["tokenCount"] = from_int(self.token_count)
+        result["claudeRepo"] = from_list(from_str, self.claude_repo)
+        result["managed"] = from_list(from_str, self.managed)
+        result["repo"] = from_list(from_str, self.repo)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
-class UserSettingMetadata:
-    """A single user setting's effective value alongside its default, so consumers can render
-    settings left at their default.
+class UserSettingsHostContext:
+    """The filesystem and environment facts a user-settings file is resolved from. Passed
+    explicitly rather than read from the runtime's own process, so a host whose configuration
+    directory differs from its process environment resolves the file it means.
+
+    The configuration directory, home directory and environment to resolve the settings and
+    global-state documents from. A host that scopes a session to its own Copilot home must
+    pass that directory here, or the migration is evaluated against the server's own home
+    instead.
+
+    The configuration directory, home directory and environment to resolve the settings and
+    global-state documents from. A host that scopes a session to its own Copilot home must
+    pass that directory here, or the reset is evaluated against the server's own home
+    instead.
+
+    The configuration directory, home directory and environment to resolve the settings
+    document from. A host that scopes a session to its own Copilot home must pass that
+    directory here, or the server's own home is inspected instead.
+    """
+    environment: dict[str, Any]
+    """The host's environment variables. `COPILOT_HOME` is read from here, as are the variables
+    a settings hook may expand.
+    """
+    home_directory: str
+    """The user's home directory, used when neither a configuration directory nor `COPILOT_HOME`
+    is set.
+    """
+    config_dir: str | None = None
+    """The Copilot configuration directory, when the host set one. Takes precedence over
+    `COPILOT_HOME` and the home directory.
     """
-    default: Any
-    """The centrally-known default for this setting (null when no default is registered)."""
 
-    is_default: bool
-    """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.
+    @staticmethod
+    def from_dict(obj: Any) -> 'UserSettingsHostContext':
+        assert isinstance(obj, dict)
+        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 UserSettingsHostContext(environment, home_directory, config_dir)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        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.
+# Internal: this type is an internal SDK API and is not part of the public surface.
+@dataclass
+class _UserSettingsLoadAndMergeRepoRequest:
+    """A repository to read settings from, and the user layer they are merged over."""
+
+    repo_root: str
+    """Absolute path of the repository root whose settings to read. When this is the user's home
+    directory, the Claude-compatible configuration is skipped, so a home-directory session
+    does not inherit a personal config as if it were repository policy.
+    """
+    user_settings: dict[str, Any]
+    """The user's own settings, keyed by setting name. The repository layer is merged over this;
+    a repository may only add to the collection settings it is allowed to influence, so a
+    user setting it does not name survives unchanged.
     """
-    value: Any
-    """The effective value: the user's value if set, otherwise the default."""
 
     @staticmethod
-    def from_dict(obj: Any) -> 'UserSettingMetadata':
+    def from_dict(obj: Any) -> '_UserSettingsLoadAndMergeRepoRequest':
         assert isinstance(obj, dict)
-        default = obj.get("default")
-        is_default = from_bool(obj.get("isDefault"))
-        value = obj.get("value")
-        return UserSettingMetadata(default, is_default, value)
+        repo_root = from_str(obj.get("repoRoot"))
+        user_settings = from_dict(lambda x: x, obj.get("userSettings"))
+        return _UserSettingsLoadAndMergeRepoRequest(repo_root, user_settings)
 
     def to_dict(self) -> dict:
         result: dict = {}
-        result["default"] = self.default
-        result["isDefault"] = from_bool(self.is_default)
-        result["value"] = self.value
+        result["repoRoot"] = from_str(self.repo_root)
+        result["userSettings"] = from_dict(lambda x: x, self.user_settings)
+        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 _UserSettingsLoadAndMergeRepoResult:
+    """The settings a consumer should act on inside a repository, together with any diagnostic
+    raised while reading the repository layer.
+    """
+    settings: dict[str, Any]
+    """The merged settings document, keyed by setting name. Equals the supplied user layer when
+    the repository declares no settings.
+    """
+    warning: str | None = None
+    """Why part of the repository document was ignored, as a single human-readable string
+    joining every diagnostic with `; `. Null when it loaded cleanly. The settings that did
+    load are still merged, so a consumer should surface this and continue rather than treat
+    it as a failure.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_UserSettingsLoadAndMergeRepoResult':
+        assert isinstance(obj, dict)
+        settings = from_dict(lambda x: x, obj.get("settings"))
+        warning = from_union([from_none, from_str], obj.get("warning"))
+        return _UserSettingsLoadAndMergeRepoResult(settings, warning)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["settings"] = from_dict(lambda x: x, self.settings)
+        if self.warning is not None:
+            result["warning"] = from_union([from_none, from_str], self.warning)
+        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 _UserSettingsLoadForConfigDirRequest:
+    """Selects the configuration directory whose user settings to read."""
+
+    config_dir: str | None = None
+    """Copilot configuration directory to read the settings document from, taking precedence
+    over the server's own `COPILOT_HOME` and default home. Omit it, or pass an empty string,
+    to read the directory the server resolved for itself.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_UserSettingsLoadForConfigDirRequest':
+        assert isinstance(obj, dict)
+        config_dir = from_union([from_str, from_none], obj.get("configDir"))
+        return _UserSettingsLoadForConfigDirRequest(config_dir)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        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 UserSettingsLoadForEditResult:
+    """Contents of settings.json as stored, for a caller about to rewrite it."""
+
+    status: str
+    """`ok` when the file parsed, `missing` when there is no file yet, `invalid` when the file
+    exists but will not parse.
+    """
+    settings: Any = None
+    """Parsed contents, present only when `status` is `ok`."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'UserSettingsLoadForEditResult':
+        assert isinstance(obj, dict)
+        status = from_str(obj.get("status"))
+        settings = obj.get("settings")
+        return UserSettingsLoadForEditResult(status, settings)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["status"] = from_str(self.status)
+        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 UserSettingsLoadRepoRequest:
+    """Selects the repository whose checked-in settings to read."""
+
+    repo_root: str
+    """Absolute path of the repository root whose settings to read. When this is the user's home
+    directory, the Claude-compatible configuration is skipped, so a home-directory session
+    does not inherit a personal config as if it were repository policy.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'UserSettingsLoadRepoRequest':
+        assert isinstance(obj, dict)
+        repo_root = from_str(obj.get("repoRoot"))
+        return UserSettingsLoadRepoRequest(repo_root)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["repoRoot"] = from_str(self.repo_root)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class UserSettingsLoadRepoResult:
+    """A repository's settings as stored, together with any diagnostic raised while reading them."""
+
+    settings: dict[str, Any] | None = None
+    """The repository's settings document, keyed by setting name, with each value carried
+    verbatim. Null when the repository declares no settings.
+    """
+    warning: str | None = None
+    """Why part of the document was ignored, as a single human-readable string joining every
+    diagnostic with `; `. Null when the document loaded cleanly. The settings that did load
+    are still reported, so a consumer should surface this and continue rather than treat it
+    as a failure.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'UserSettingsLoadRepoResult':
+        assert isinstance(obj, dict)
+        settings = from_union([lambda x: from_dict(lambda x: x, x), from_none], obj.get("settings"))
+        warning = from_union([from_none, from_str], obj.get("warning"))
+        return UserSettingsLoadRepoResult(settings, warning)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        if self.settings is not None:
+            result["settings"] = from_union([lambda x: from_dict(lambda x: x, x), from_none], self.settings)
+        if self.warning is not None:
+            result["warning"] = from_union([from_none, from_str], self.warning)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class UserSettingsLoadWithWarningResult:
+    """The user's stored settings, together with any diagnostic raised while reading them."""
+
+    settings: dict[str, Any]
+    """The stored user settings document, keyed by setting name, with each value carried
+    verbatim. Empty when the file could not be read at all.
+    """
+    warning: str | None = None
+    """Why part of the document was ignored, phrased for display to the user. Null when the
+    document loaded cleanly. The settings that did load are still reported, so a consumer may
+    surface this and continue rather than treat it as a failure.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'UserSettingsLoadWithWarningResult':
+        assert isinstance(obj, dict)
+        settings = from_dict(lambda x: x, obj.get("settings"))
+        warning = from_union([from_none, from_str], obj.get("warning"))
+        return UserSettingsLoadWithWarningResult(settings, warning)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["settings"] = from_dict(lambda x: x, self.settings)
+        if self.warning is not None:
+            result["warning"] = from_union([from_none, from_str], self.warning)
+        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 _UserSettingsMergeManagedAndUserParams:
+    """The managed (enterprise policy) layer and the user layer to fold together. The field
+    names carry the layer identity: nothing about a settings object identifies which layer
+    produced it, so a generic base/override pair would let a caller transpose them and
+    silently resolve the governance keys in the user's favour.
+    """
+    managed: Any = None
+    """The managed layer. Its governance keys win, and the per-entry `enabledPlugins` and
+    `extraKnownMarketplaces` control maps are stamped back from it after the union. Omitted
+    when the host is unmanaged.
+    """
+    user: Any = None
+    """The user's own settings layer. Wins on every key the managed layer does not govern.
+    Omitted when the user has no settings yet.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_UserSettingsMergeManagedAndUserParams':
+        assert isinstance(obj, dict)
+        managed = obj.get("managed")
+        user = obj.get("user")
+        return _UserSettingsMergeManagedAndUserParams(managed, user)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        if self.managed is not None:
+            result["managed"] = self.managed
+        if self.user is not None:
+            result["user"] = self.user
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class UserSettingsMergeManagedAndUserResult:
+    """The user layer folded over the managed layer."""
+
+    settings_json: Any
+    """The merged settings. An empty object when neither layer was supplied, so an unmanaged
+    host with no user settings governs nothing.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'UserSettingsMergeManagedAndUserResult':
+        assert isinstance(obj, dict)
+        settings_json = obj.get("settingsJson")
+        return UserSettingsMergeManagedAndUserResult(settings_json)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["settingsJson"] = self.settings_json
+        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 _UserSettingsMergeRepoValueParams:
+    """The user layer and the repository layer to fold together."""
+
+    repo_settings: Any
+    """The repository's checked-in settings layer."""
+
+    user_settings: Any
+    """The user's settings, already resolved against any managed layer."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_UserSettingsMergeRepoValueParams':
+        assert isinstance(obj, dict)
+        repo_settings = obj.get("repoSettings")
+        user_settings = obj.get("userSettings")
+        return _UserSettingsMergeRepoValueParams(repo_settings, user_settings)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["repoSettings"] = self.repo_settings
+        result["userSettings"] = self.user_settings
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class UserSettingsMergeRepoValueResult:
+    """The repository layer folded into the user layer."""
+
+    settings_json: Any
+    """The merged settings, with the per-entry managed control maps re-stamped from the
+    runtime's ambient managed policy.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'UserSettingsMergeRepoValueResult':
+        assert isinstance(obj, dict)
+        settings_json = obj.get("settingsJson")
+        return UserSettingsMergeRepoValueResult(settings_json)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["settingsJson"] = self.settings_json
+        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 _UserSettingsMigrateObsoleteOnDiskRequest:
+    """Selects the configuration directory whose settings document to clean."""
+
+    config_dir: str | None = None
+    """The configuration directory holding the settings document to clean. A host that scopes a
+    session to its own Copilot home passes that directory here; omit it to clean the document
+    under the home the server resolved for itself. The home directory and environment are
+    deliberately not caller-supplied: they decide only the settings path root and the two
+    hook-parsing flags, and those describe the process doing the reading rather than the
+    caller.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_UserSettingsMigrateObsoleteOnDiskRequest':
+        assert isinstance(obj, dict)
+        config_dir = from_union([from_str, from_none], obj.get("configDir"))
+        return _UserSettingsMigrateObsoleteOnDiskRequest(config_dir)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        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.
+# Internal: this type is an internal SDK API and is not part of the public surface.
+class _UserSettingsMigrateObsoleteOnDiskStatus(Enum):
+    """What the cleanup did. Only `changed` rewrote the document. The cleaned settings are not
+    returned here: the document is written before this replies, so `user.settings.load` reads
+    it authoritatively.
+
+    What the one-time obsolete-settings cleanup did to the document.
+    """
+    CHANGED = "changed"
+    INVALID = "invalid"
+    MISSING = "missing"
+    UNCHANGED = "unchanged"
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class UserSettingsNormalizeRequest:
+    """Settings object whose key names should be canonicalized."""
+
+    settings: Any
+    """Free-form settings object, possibly using legacy or snake_case key names."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'UserSettingsNormalizeRequest':
+        assert isinstance(obj, dict)
+        settings = obj.get("settings")
+        return UserSettingsNormalizeRequest(settings)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["settings"] = self.settings
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class UserSettingsNormalizeResult:
+    """Settings object with canonical key names."""
+
+    settings: Any
+    """The same settings with every legacy or snake_case key renamed to its canonical spelling."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'UserSettingsNormalizeResult':
+        assert isinstance(obj, dict)
+        settings = obj.get("settings")
+        return UserSettingsNormalizeResult(settings)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["settings"] = self.settings
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class UserSettingsPathResult:
+    """The on-disk location of the user's settings document."""
+
+    path: str
+    """Absolute path to the settings file this runtime reads and writes. Normally
+    `settings.json` under the Copilot configuration directory; an extensionless legacy
+    `settings` file is reported instead when it exists and `settings.json` does not.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'UserSettingsPathResult':
+        assert isinstance(obj, dict)
+        path = from_str(obj.get("path"))
+        return UserSettingsPathResult(path)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["path"] = from_str(self.path)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class UserSettingsProblemLocation:
+    """The settings layer the problem was found in.
+
+    The settings layer a problem was found in.
+    """
+    file_path: str
+    """Absolute path of the file backing this layer."""
+
+    kind: str
+    """Which layer this is: `user`, `repo`, or `local`."""
+
+    label: str
+    """The caller-supplied display label for the layer."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'UserSettingsProblemLocation':
+        assert isinstance(obj, dict)
+        file_path = from_str(obj.get("filePath"))
+        kind = from_str(obj.get("kind"))
+        label = from_str(obj.get("label"))
+        return UserSettingsProblemLocation(file_path, kind, label)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["filePath"] = from_str(self.file_path)
+        result["kind"] = from_str(self.kind)
+        result["label"] = from_str(self.label)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class UserSettingsProblemSource:
+    """One already-loaded settings layer to diagnose."""
+
+    file_path: str
+    """Absolute path of the file backing this layer."""
+
+    kind: str
+    """Which layer this is: `user`, `repo`, or `local`."""
+
+    label: str
+    """Caller-chosen display label for the layer, echoed back on each problem so a caller can
+    group by layer without re-deriving its own naming.
+    """
+    config: dict[str, Any] | None = None
+    """The layer's settings exactly as loaded, unnormalized. Empty when the file is missing or
+    failed to parse.
+    """
+    invalid: bool | None = None
+    """True when the file itself failed to parse, so its keys could not be read at all."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'UserSettingsProblemSource':
+        assert isinstance(obj, dict)
+        file_path = from_str(obj.get("filePath"))
+        kind = from_str(obj.get("kind"))
+        label = from_str(obj.get("label"))
+        config = from_union([lambda x: from_dict(lambda x: x, x), from_none], obj.get("config"))
+        invalid = from_union([from_bool, from_none], obj.get("invalid"))
+        return UserSettingsProblemSource(file_path, kind, label, config, invalid)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["filePath"] = from_str(self.file_path)
+        result["kind"] = from_str(self.kind)
+        result["label"] = from_str(self.label)
+        if self.config is not None:
+            result["config"] = from_union([lambda x: from_dict(lambda x: x, x), from_none], self.config)
+        if self.invalid is not None:
+            result["invalid"] = from_union([from_bool, from_none], self.invalid)
+        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 _UserSettingsResetStaffModelSelectionOnceResult:
+    """The outcome of the one-time staff model-selection reset."""
+
+    cutoff: str
+    """The cutoff this reset is gated on, as an ISO-8601 timestamp. A recorded timestamp at or
+    after it means the reset is already done.
+    """
+    did_reset: bool
+    """Whether the persisted model selection was cleared. Only `true` means the settings
+    document changed and the host should adopt the returned settings.
+    """
+    reset_at: str | None = None
+    """The timestamp the host should now record, as an ISO-8601 timestamp. Carries the caller's
+    own value back unchanged when nothing was reset.
+    """
+    settings: dict[str, Any] | None = None
+    """The settings document as it stands after the reset, keyed by setting name. Present only
+    when `didReset` is true.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_UserSettingsResetStaffModelSelectionOnceResult':
+        assert isinstance(obj, dict)
+        cutoff = from_str(obj.get("cutoff"))
+        did_reset = from_bool(obj.get("didReset"))
+        reset_at = from_union([from_str, from_none], obj.get("resetAt"))
+        settings = from_union([lambda x: from_dict(lambda x: x, x), from_none], obj.get("settings"))
+        return _UserSettingsResetStaffModelSelectionOnceResult(cutoff, did_reset, reset_at, settings)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["cutoff"] = from_str(self.cutoff)
+        result["didReset"] = from_bool(self.did_reset)
+        if self.reset_at is not None:
+            result["resetAt"] = from_union([from_str, from_none], self.reset_at)
+        if self.settings is not None:
+            result["settings"] = from_union([lambda x: from_dict(lambda x: x, x), from_none], self.settings)
+        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 _UserSettingsSetHookDisabledRequest:
+    """One hook to disable or re-enable."""
+
+    disabled: bool
+    """True adds the key to `disabledHooks`, false removes it."""
+
+    disable_key: str
+    """Durable content-hash key of the hook, as `hooks.loadResources` reports it."""
+
+    settings_path: str
+    """Path of the settings.json to rewrite."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_UserSettingsSetHookDisabledRequest':
+        assert isinstance(obj, dict)
+        disabled = from_bool(obj.get("disabled"))
+        disable_key = from_str(obj.get("disableKey"))
+        settings_path = from_str(obj.get("settingsPath"))
+        return _UserSettingsSetHookDisabledRequest(disabled, disable_key, settings_path)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["disabled"] = from_bool(self.disabled)
+        result["disableKey"] = from_str(self.disable_key)
+        result["settingsPath"] = from_str(self.settings_path)
+        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 _UserSettingsSetHookDisabledResult:
+    """Outcome of rewriting the `disabledHooks` setting."""
+
+    status: str
+    """`ok` when the setting was written, `invalid` when settings.json could not be parsed and
+    was left alone, `error` when the write itself failed.
+    """
+    error_message: str | None = None
+    """Why the write failed. Absent when the status is `ok`."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_UserSettingsSetHookDisabledResult':
+        assert isinstance(obj, dict)
+        status = from_str(obj.get("status"))
+        error_message = from_union([from_str, from_none], obj.get("errorMessage"))
+        return _UserSettingsSetHookDisabledResult(status, error_message)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["status"] = from_str(self.status)
+        if self.error_message is not None:
+            result["errorMessage"] = from_union([from_str, from_none], self.error_message)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
@@ -16789,25 +20793,147 @@ 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 UserSettingsSetResult:
-    """Outcome of writing user settings."""
+class _UserSettingsUnknownKeysWarningResult:
+    """The unrecognized top-level keys found in the user settings document, already phrased for
+    display.
+    """
+    warning: str | None = None
+    """The warning to show the user, naming the unrecognized keys and the file they were found
+    in. Absent when every top-level key is recognized, and also when the document is missing
+    or could not be read, because an unknown-key list taken from a document the runtime could
+    not load would name keys that may not be there.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_UserSettingsUnknownKeysWarningResult':
+        assert isinstance(obj, dict)
+        warning = from_union([from_str, from_none], obj.get("warning"))
+        return _UserSettingsUnknownKeysWarningResult(warning)
 
-    shadowed_keys: list[str]
-    """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.
+    def to_dict(self) -> dict:
+        result: dict = {}
+        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.
+# Internal: this type is an internal SDK API and is not part of the public surface.
+@dataclass
+class _UserSettingsUpdateRequest:
+    """Names the user setting to merge into, and the partial object to merge."""
+
+    key: str
+    """Top-level user-setting key to merge into, such as `extensions`."""
+
+    value: Any
+    """Value to store for `key`. When both the stored value and this value are objects, their
+    fields are shallow-merged and fields this object does not name are preserved. Otherwise
+    this value replaces the stored value.
+    """
+    config_dir: str | None = None
+    """Copilot configuration directory to write the settings document in, taking precedence over
+    the server's own `COPILOT_HOME` and default home. Omit it, or pass an empty string, to
+    use the directory the server resolved for itself.
+    """
+    sub_dir: str | None = None
+    """Single-component name for the settings document at `<configDir>/settings/<subDir>.json`;
+    path separators, `.` and `..` are rejected. Omit it, or pass an empty string, to use the
+    main settings document.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_UserSettingsUpdateRequest':
+        assert isinstance(obj, dict)
+        key = from_str(obj.get("key"))
+        value = obj.get("value")
+        config_dir = from_union([from_str, from_none], obj.get("configDir"))
+        sub_dir = from_union([from_str, from_none], obj.get("subDir"))
+        return _UserSettingsUpdateRequest(key, value, config_dir, sub_dir)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["key"] = from_str(self.key)
+        result["value"] = self.value
+        if self.config_dir is not None:
+            result["configDir"] = from_union([from_str, from_none], self.config_dir)
+        if self.sub_dir is not None:
+            result["subDir"] = from_union([from_str, from_none], self.sub_dir)
+        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 _UserSettingsUpdateResult:
+    """The stored value of the user setting after the merge."""
+
+    value: Any
+    """The key's stored value after the write: the merged object when both the stored value and
+    the supplied value are objects, otherwise the supplied value.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_UserSettingsUpdateResult':
+        assert isinstance(obj, dict)
+        value = obj.get("value")
+        return _UserSettingsUpdateResult(value)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["value"] = self.value
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class UserSettingsValidateRequest:
+    """A single top-level setting subtree to validate."""
+
+    top_key: str
+    """Top-level setting name to validate."""
+
+    delete: bool | None = None
+    """True to validate a removal of this key. The current settings file is not read."""
+
+    value: Any = None
+    """Value to validate. Omitted when `delete` is true."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'UserSettingsValidateRequest':
+        assert isinstance(obj, dict)
+        top_key = from_str(obj.get("topKey"))
+        delete = from_union([from_bool, from_none], obj.get("delete"))
+        value = obj.get("value")
+        return UserSettingsValidateRequest(top_key, delete, value)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["topKey"] = from_str(self.top_key)
+        if self.delete is not None:
+            result["delete"] = from_union([from_bool, from_none], self.delete)
+        if self.value is not None:
+            result["value"] = self.value
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class UserSettingsWriteAllRequest:
+    """The whole content to store in the user settings file."""
+
+    settings: Any
+    """The settings object to store. It replaces the file's entire content, so a key absent here
+    is removed.
     """
 
     @staticmethod
-    def from_dict(obj: Any) -> 'UserSettingsSetResult':
+    def from_dict(obj: Any) -> 'UserSettingsWriteAllRequest':
         assert isinstance(obj, dict)
-        shadowed_keys = from_list(from_str, obj.get("shadowedKeys"))
-        return UserSettingsSetResult(shadowed_keys)
+        settings = obj.get("settings")
+        return UserSettingsWriteAllRequest(settings)
 
     def to_dict(self) -> dict:
         result: dict = {}
-        result["shadowedKeys"] = from_list(from_str, self.shadowed_keys)
+        result["settings"] = self.settings
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
@@ -17400,6 +21526,40 @@ def to_dict(self) -> dict:
             result["timeoutSeconds"] = from_union([from_none, to_float], self.timeout_seconds)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class WorkspaceDiffContents:
+    """Complete text used to generate one session diff. These are display contents, with the
+    same text decoding as the patch, not a file-restore contract.
+
+    Full text used for this patch, only when includeContents was requested for session mode.
+    Omitted for binary, oversized or unavailable contents, and for fallback results. Read
+    isFallback and isTruncated before treating an absent value as a missing file.
+    """
+    after: str | None = None
+    """Complete current text read when computing the diff. Omitted for a deleted file; an empty
+    string represents an existing empty file.
+    """
+    before: str | None = None
+    """Complete text before the session first changed the file. Omitted when the file did not
+    exist; an empty string represents an existing empty file.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'WorkspaceDiffContents':
+        assert isinstance(obj, dict)
+        after = from_union([from_str, from_none], obj.get("after"))
+        before = from_union([from_str, from_none], obj.get("before"))
+        return WorkspaceDiffContents(after, before)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        if self.after is not None:
+            result["after"] = from_union([from_str, from_none], self.after)
+        if self.before is not None:
+            result["before"] = from_union([from_str, from_none], self.before)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 class WorkspaceDiffFileChangeType(Enum):
     """Type of change represented by this file diff."""
@@ -17905,6 +22065,16 @@ def to_dict(self) -> dict:
         result["operation"] = from_str(self.operation)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+class ConnectorDiscoveryAvailability(Enum):
+    "Availability."
+    # Enabled.
+    ENABLED = "enabled"
+    # Disabled.
+    DISABLED = "disabled"
+    # Unavailable.
+    UNAVAILABLE = "unavailable"
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class AuthIdentityMetadata:
@@ -18026,6 +22196,10 @@ class AccountStatus:
     selection_id: str
     """Opaque selection id used to switch to, or log out, this account."""
 
+    auth_source: str | None = None
+    """Human-readable credential source used to authenticate this account, such as `gh` or
+    `GITHUB_TOKEN`.
+    """
     derived_from: str | None = None
     """Opaque id of the account this one was derived from (e.g. an EMU account's base Entra
     identity); absent for a root account. Matches the base identity account's selectionId,
@@ -18040,8 +22214,9 @@ def from_dict(obj: Any) -> 'AccountStatus':
         kind = AccountKind(obj.get("kind"))
         login = from_str(obj.get("login"))
         selection_id = from_str(obj.get("selectionId"))
+        auth_source = from_union([from_str, from_none], obj.get("authSource"))
         derived_from = from_union([from_str, from_none], obj.get("derivedFrom"))
-        return AccountStatus(active, host, kind, login, selection_id, derived_from)
+        return AccountStatus(active, host, kind, login, selection_id, auth_source, derived_from)
 
     def to_dict(self) -> dict:
         result: dict = {}
@@ -18050,6 +22225,8 @@ def to_dict(self) -> dict:
         result["kind"] = to_enum(AccountKind, self.kind)
         result["login"] = from_str(self.login)
         result["selectionId"] = from_str(self.selection_id)
+        if self.auth_source is not None:
+            result["authSource"] = from_union([from_str, from_none], self.auth_source)
         if self.derived_from is not None:
             result["derivedFrom"] = from_union([from_str, from_none], self.derived_from)
         return result
@@ -18070,6 +22247,10 @@ class ItemElement:
     active: bool | None = None
     """Whether this is the active account."""
 
+    auth_source: str | None = None
+    """Human-readable credential source used to authenticate this account, such as `gh` or
+    `GITHUB_TOKEN`.
+    """
     derived_from: str | None = None
     """Opaque id of the account this one was derived from (e.g. an EMU account's base Entra
     identity); absent for a root account. Matches the base identity account's selectionId,
@@ -18095,19 +22276,22 @@ def from_dict(obj: Any) -> 'ItemElement':
         assert isinstance(obj, dict)
         kind = AccountKind(obj.get("kind"))
         active = from_union([from_bool, from_none], obj.get("active"))
+        auth_source = from_union([from_str, from_none], obj.get("authSource"))
         derived_from = from_union([from_str, from_none], obj.get("derivedFrom"))
         host = from_union([from_str, from_none], obj.get("host"))
         login = from_union([from_str, from_none], obj.get("login"))
         selection_id = from_union([from_str, from_none], obj.get("selectionId"))
         available = from_union([from_bool, from_none], obj.get("available"))
         label = from_union([from_str, from_none], obj.get("label"))
-        return ItemElement(kind, active, derived_from, host, login, selection_id, available, label)
+        return ItemElement(kind, active, auth_source, derived_from, host, login, selection_id, available, label)
 
     def to_dict(self) -> dict:
         result: dict = {}
         result["kind"] = to_enum(AccountKind, self.kind)
         if self.active is not None:
             result["active"] = from_union([from_bool, from_none], self.active)
+        if self.auth_source is not None:
+            result["authSource"] = from_union([from_str, from_none], self.auth_source)
         if self.derived_from is not None:
             result["derivedFrom"] = from_union([from_str, from_none], self.derived_from)
         if self.host is not None:
@@ -18122,19 +22306,6 @@ def to_dict(self) -> dict:
             result["label"] = from_union([from_str, from_none], self.label)
         return result
 
-# Experimental: this type is part of an experimental API and may change or be removed.
-class ModelProviderKind(Enum):
-    """The provider kind.
-
-    The neutral kind of a model provider — the model analog of `AccountKind`. A model
-    provider is the live, entitled source a model came from; central code never branches on
-    this beyond a single dispatch.
-
-    The neutral provider kind.
-    """
-    COPILOT = "copilot"
-    LOKI = "loki"
-
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class AuthEnumerateQuery:
@@ -18467,6 +22638,26 @@ def to_dict(self) -> dict:
             result["field"] = from_union([lambda x: to_enum(AgentRegistrySpawnValidationErrorField, x), from_none], self.field)
         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 _AgentsGetAvailableBuiltinsResult:
+    """The shipped agents available under the requested flags."""
+
+    agents: list[_BuiltinAgentSummary]
+    """Available shipped agents, in the runtime's own order."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_AgentsGetAvailableBuiltinsResult':
+        assert isinstance(obj, dict)
+        agents = from_list(_BuiltinAgentSummary.from_dict, obj.get("agents"))
+        return _AgentsGetAvailableBuiltinsResult(agents)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["agents"] = from_list(lambda x: to_class(_BuiltinAgentSummary, x), self.agents)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class AuthLoginBeginRequest:
@@ -18515,6 +22706,45 @@ def to_dict(self) -> dict:
         result["label"] = from_str(self.label)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class AutoTierDescriptor:
+    """A server-advertised routing preference. Identifiers and execution types are extensible."""
+
+    description: str
+    """Description displayed beside the preference."""
+
+    display_name: str
+    """Human-readable label, not a routing identifier."""
+
+    id: str
+    """Opaque routing identifier transmitted unchanged to the provider."""
+
+    status: AutoTierStatus
+    """Current account-specific availability."""
+
+    type: str
+    """Execution kind; this client supports `auto` preferences on the Auto model."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'AutoTierDescriptor':
+        assert isinstance(obj, dict)
+        description = from_str(obj.get("description"))
+        display_name = from_str(obj.get("displayName"))
+        id = from_str(obj.get("id"))
+        status = AutoTierStatus.from_dict(obj.get("status"))
+        type = from_str(obj.get("type"))
+        return AutoTierDescriptor(description, display_name, id, status, type)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["description"] = from_str(self.description)
+        result["displayName"] = from_str(self.display_name)
+        result["id"] = from_str(self.id)
+        result["status"] = to_class(AutoTierStatus, self.status)
+        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 AutopilotObjectiveState:
@@ -20309,35 +24539,65 @@ def to_dict(self) -> dict:
 
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
-class AuthLoginResultDto:
-    """The terminal login result.
-
-    Terminal result of an interactive login flow.
+class AccountAuthInfo:
+    """An interactive account whose model provider owns its credentials. It carries no GitHub
+    credential.
     """
-    status: AuthLoginResultStatus
-    """Terminal disposition of the login."""
+    host: str
+    """Host coordinate owned by the account's model provider."""
 
-    host: str | None = None
-    """Host that was signed in, when completed."""
+    login: str
+    """Login identifying the provider-owned account."""
 
-    login: str | None = None
-    """Login that was signed in, when completed."""
+    type: ClassVar[str] = "account"
+    """Provider-owned account authentication."""
 
     @staticmethod
-    def from_dict(obj: Any) -> 'AuthLoginResultDto':
+    def from_dict(obj: Any) -> 'AccountAuthInfo':
         assert isinstance(obj, dict)
-        status = AuthLoginResultStatus(obj.get("status"))
-        host = from_union([from_str, from_none], obj.get("host"))
-        login = from_union([from_str, from_none], obj.get("login"))
-        return AuthLoginResultDto(status, host, login)
+        host = from_str(obj.get("host"))
+        login = from_str(obj.get("login"))
+        return AccountAuthInfo(host, login)
 
     def to_dict(self) -> dict:
         result: dict = {}
-        result["status"] = to_enum(AuthLoginResultStatus, self.status)
-        if self.host is not None:
-            result["host"] = from_union([from_str, from_none], self.host)
-        if self.login is not None:
-            result["login"] = from_union([from_str, from_none], self.login)
+        result["host"] = from_str(self.host)
+        result["login"] = from_str(self.login)
+        result["type"] = self.type
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class AuthLoginAccount:
+    """A credential-free account choice after sign-in."""
+
+    host: str
+    """Host coordinate owned by the selected account's provider."""
+
+    kind: AccountKind
+    """Provider kind that owns this account choice."""
+
+    login: str
+    """Human-readable login for the account choice."""
+
+    selection_id: str
+    """Opaque identifier supplied to the next login step to select this account."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'AuthLoginAccount':
+        assert isinstance(obj, dict)
+        host = from_str(obj.get("host"))
+        kind = AccountKind(obj.get("kind"))
+        login = from_str(obj.get("login"))
+        selection_id = from_str(obj.get("selectionId"))
+        return AuthLoginAccount(host, kind, login, selection_id)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["host"] = from_str(self.host)
+        result["kind"] = to_enum(AccountKind, self.kind)
+        result["login"] = from_str(self.login)
+        result["selectionId"] = from_str(self.selection_id)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
@@ -20517,6 +24777,35 @@ def to_dict(self) -> 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 ConnectorDiscoveryAuthInfo:
+    """Account metadata."""
+
+    host: str
+    """Host."""
+
+    login: str
+    """Login."""
+
+    type: AuthInfoType
+    """Authentication type."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'ConnectorDiscoveryAuthInfo':
+        assert isinstance(obj, dict)
+        host = from_str(obj.get("host"))
+        login = from_str(obj.get("login"))
+        type = AuthInfoType(obj.get("type"))
+        return ConnectorDiscoveryAuthInfo(host, login, type)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["host"] = from_str(self.host)
+        result["login"] = from_str(self.login)
+        result["type"] = to_enum(AuthInfoType, self.type)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class EnvironmentCapabilities:
@@ -20556,6 +24845,77 @@ def to_dict(self) -> dict:
             result["maxSessions"] = from_union([from_int, from_none], self.max_sessions)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class GitHubRepositoryIdentity:
+    """Owner, name, and host of a GitHub repository, as resolved from a git remote URL."""
+
+    host: str
+    """Host the remote points at, for example `github.com` or a GitHub Enterprise hostname."""
+
+    name: str
+    """Repository name, without the owner prefix or the `.git` suffix."""
+
+    owner: str
+    """Repository owner login (user or organization)."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'GitHubRepositoryIdentity':
+        assert isinstance(obj, dict)
+        host = from_str(obj.get("host"))
+        name = from_str(obj.get("name"))
+        owner = from_str(obj.get("owner"))
+        return GitHubRepositoryIdentity(host, name, owner)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["host"] = from_str(self.host)
+        result["name"] = from_str(self.name)
+        result["owner"] = from_str(self.owner)
+        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 _LoggedInUser:
+    """Account used for the most recent sign-in.
+
+    An account the host has signed in to, identified by the server it lives on and the login
+    it uses there. The same person can appear more than once when they use both github.com
+    and an Enterprise server.
+    """
+    host: str
+    """Host the account belongs to, such as `github.com` or an Enterprise server."""
+
+    login: str
+    """Account login on that host."""
+
+    derived_from: str | None = None
+    """Source account this account was derived from, when one was recorded."""
+
+    kind: str | None = None
+    """Account kind, when the host recorded one. Consumers must tolerate new strings."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_LoggedInUser':
+        assert isinstance(obj, dict)
+        host = from_str(obj.get("host"))
+        login = from_str(obj.get("login"))
+        derived_from = from_union([from_str, from_none], obj.get("derivedFrom"))
+        kind = from_union([from_str, from_none], obj.get("kind"))
+        return _LoggedInUser(host, login, derived_from, kind)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["host"] = from_str(self.host)
+        result["login"] = from_str(self.login)
+        if self.derived_from is not None:
+            result["derivedFrom"] = from_union([from_str, from_none], self.derived_from)
+        if self.kind is not None:
+            result["kind"] = from_union([from_str, from_none], self.kind)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class HostSessionCreateCallback:
     """Application callback routed over its existing SDK connection."""
@@ -20601,6 +24961,10 @@ class HostSessionCreateRequest:
     handoff_id: str
     """Unique identity for this participation, independent of the session lifetime."""
 
+    prefer_resident: bool | None = None
+    """For an explicit publication, borrow an existing owning-connection resident
+    instead of invoking the resume factory. Cold sessions still use the factory.
+    """
     resume: bool | None = None
     """Resume an app-owned durable session instead of creating a new session."""
 
@@ -20609,13 +24973,16 @@ def from_dict(obj: Any) -> 'HostSessionCreateRequest':
         assert isinstance(obj, dict)
         config = from_dict(lambda x: x, obj.get("config"))
         handoff_id = from_str(obj.get("handoffId"))
+        prefer_resident = from_union([from_bool, from_none], obj.get("preferResident"))
         resume = from_union([from_bool, from_none], obj.get("resume"))
-        return HostSessionCreateRequest(config, handoff_id, resume)
+        return HostSessionCreateRequest(config, handoff_id, prefer_resident, resume)
 
     def to_dict(self) -> dict:
         result: dict = {}
         result["config"] = from_dict(lambda x: x, self.config)
         result["handoffId"] = from_str(self.handoff_id)
+        if self.prefer_resident is not None:
+            result["preferResident"] = from_union([from_bool, from_none], self.prefer_resident)
         if self.resume is not None:
             result["resume"] = from_union([from_bool, from_none], self.resume)
         return result
@@ -20647,6 +25014,32 @@ def to_dict(self) -> dict:
         result["callbackUrl"] = from_str(self.callback_url)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class ModelGetReasoningSummariesRequest:
+    """Host presentation state the reasoning-summaries policy depends on."""
+
+    persisted_show_reasoning: bool | None = None
+    """The host's persisted `showReasoning` user setting, omitted when unset."""
+
+    summaries_visible: bool | None = None
+    """Whether the host is currently showing reasoning summaries. Defaults to false."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'ModelGetReasoningSummariesRequest':
+        assert isinstance(obj, dict)
+        persisted_show_reasoning = from_union([from_bool, from_none], obj.get("persistedShowReasoning"))
+        summaries_visible = from_union([from_bool, from_none], obj.get("summariesVisible"))
+        return ModelGetReasoningSummariesRequest(persisted_show_reasoning, summaries_visible)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        if self.persisted_show_reasoning is not None:
+            result["persistedShowReasoning"] = from_union([from_bool, from_none], self.persisted_show_reasoning)
+        if self.summaries_visible is not None:
+            result["summariesVisible"] = from_union([from_bool, from_none], self.summaries_visible)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class ModelSetAllowedModelsRequest:
@@ -21914,6 +26307,106 @@ 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.
+# Internal: this type is an internal SDK API and is not part of the public surface.
+@dataclass
+class _FeatureFlagMetadata:
+    """The declared shape of one feature flag, independent of any caller population."""
+
+    availability: _FeatureFlagAvailability
+    """The population the flag is declared for before any environment or user-settings override
+    is applied.
+    """
+    capi_sanity: bool
+    """Whether the flag participates in the CAPI sanity suite."""
+
+    name: str
+    """The flag's name, matching the key it is listed under."""
+
+    experimental_description: str | None = None
+    """Text shown to a user choosing whether to turn the flag on in experimental mode. Absent
+    when the flag is not user-facing.
+    """
+    exp_flag: str | None = None
+    """The online-experiment (ExP) flag this maps to, when the flag is assigned by an experiment
+    rather than declared statically.
+    """
+    exp_flag_env_var: str | None = None
+    """Environment variable that overrides this flag's experiment assignment locally in the
+    experiment service, not in `featureFlags.resolve`. Present exactly when `expFlag` is, and
+    derived from it, so a caller reads a local override without reproducing the naming rule.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_FeatureFlagMetadata':
+        assert isinstance(obj, dict)
+        availability = _FeatureFlagAvailability(obj.get("availability"))
+        capi_sanity = from_bool(obj.get("capiSanity"))
+        name = from_str(obj.get("name"))
+        experimental_description = from_union([from_str, from_none], obj.get("experimentalDescription"))
+        exp_flag = from_union([from_str, from_none], obj.get("expFlag"))
+        exp_flag_env_var = from_union([from_str, from_none], obj.get("expFlagEnvVar"))
+        return _FeatureFlagMetadata(availability, capi_sanity, name, experimental_description, exp_flag, exp_flag_env_var)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["availability"] = to_enum(_FeatureFlagAvailability, self.availability)
+        result["capiSanity"] = from_bool(self.capi_sanity)
+        result["name"] = from_str(self.name)
+        if self.experimental_description is not None:
+            result["experimentalDescription"] = from_union([from_str, from_none], self.experimental_description)
+        if self.exp_flag is not None:
+            result["expFlag"] = from_union([from_str, from_none], self.exp_flag)
+        if self.exp_flag_env_var is not None:
+            result["expFlagEnvVar"] = from_union([from_str, from_none], self.exp_flag_env_var)
+        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 _GitHubOwnersListResult:
+    """Outcome of an owner listing. Exactly one of `owners` and `message` is present, except
+    that `throwError` reports a failure the caller is expected to raise rather than render.
+    """
+    message: str | None = None
+    """Why no owners could be listed, phrased for a user. Present when the listing failed in a
+    way the caller should render rather than raise.
+    """
+    owners: list[_GitHubOwnerOption] | None = None
+    """The owners, on success: the authenticated user first, then the organizations they belong
+    to.
+    """
+    throw_error: str | None = None
+    """A malformed request or an unreadable credential, which the caller raises instead of
+    rendering. Kept a field rather than a dispatch error so it stays distinct from `message`,
+    which the caller renders.
+    """
+    warning: str | None = None
+    """A line the caller should log. Present only alongside `message`, and only for failures
+    worth recording.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_GitHubOwnersListResult':
+        assert isinstance(obj, dict)
+        message = from_union([from_str, from_none], obj.get("message"))
+        owners = from_union([lambda x: from_list(_GitHubOwnerOption.from_dict, x), from_none], obj.get("owners"))
+        throw_error = from_union([from_str, from_none], obj.get("throwError"))
+        warning = from_union([from_str, from_none], obj.get("warning"))
+        return _GitHubOwnersListResult(message, owners, throw_error, warning)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        if self.message is not None:
+            result["message"] = from_union([from_str, from_none], self.message)
+        if self.owners is not None:
+            result["owners"] = from_union([lambda x: from_list(lambda x: to_class(_GitHubOwnerOption, x), x), from_none], self.owners)
+        if self.throw_error is not None:
+            result["throwError"] = from_union([from_str, from_none], self.throw_error)
+        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 GitHubTokenAcquireRequest:
@@ -22024,6 +26517,155 @@ def to_dict(self) -> dict:
             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.
+# Internal: this type is an internal SDK API and is not part of the public surface.
+@dataclass
+class _GitReposFromRemotesResult:
+    """The GitHub repositories a working tree's remotes point at."""
+
+    repositories: list[_GitRemoteRepository]
+    """One entry per distinct GitHub repository, in the order git reports the first remote for
+    each repository. Empty when no remote points at a GitHub host, which a caller should read
+    as `not connected to GitHub`. Failing to read the remotes is an error, not an empty list.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_GitReposFromRemotesResult':
+        assert isinstance(obj, dict)
+        repositories = from_list(_GitRemoteRepository.from_dict, obj.get("repositories"))
+        return _GitReposFromRemotesResult(repositories)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["repositories"] = from_list(lambda x: to_class(_GitRemoteRepository, x), self.repositories)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class InstalledPluginSource:
+    """Source descriptor for a direct GitHub plugin install, with `owner/repo`, optional ref or
+    full commit SHA, and optional subpath.
+
+    Source descriptor for a direct URL plugin install, with URL, optional ref or full commit
+    SHA, and optional subpath.
+
+    Source descriptor for a direct local plugin install, with a local filesystem path.
+    """
+    source: InstalledPluginSourceURLSource
+    """Constant value. Always "github".
+
+    Constant value. Always "url".
+
+    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 = 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"))
+        sha = from_union([from_str, from_none], obj.get("sha"))
+        url = from_union([from_str, from_none], obj.get("url"))
+        return InstalledPluginSource(source, path, ref, repo, sha, url)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        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:
+            result["ref"] = from_union([from_str, from_none], self.ref)
+        if self.repo is not None:
+            result["repo"] = from_union([from_str, from_none], self.repo)
+        if self.sha is not None:
+            result["sha"] = from_union([from_str, from_none], self.sha)
+        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 SessionInstalledPluginSource:
+    """Source descriptor for a direct GitHub plugin install, with `owner/repo`, optional ref or
+    full commit SHA, and optional subpath.
+
+    Source descriptor for a direct URL plugin install, with URL, optional ref or full commit
+    SHA, and optional subpath.
+
+    Source descriptor for a direct local plugin install, with a local filesystem path.
+    """
+    source: InstalledPluginSourceURLSource
+    """Constant value. Always "github".
+
+    Constant value. Always "url".
+
+    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 = 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"))
+        sha = from_union([from_str, from_none], obj.get("sha"))
+        url = from_union([from_str, from_none], obj.get("url"))
+        return SessionInstalledPluginSource(source, path, ref, repo, sha, url)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        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:
+            result["ref"] = from_union([from_str, from_none], self.ref)
+        if self.repo is not None:
+            result["repo"] = from_union([from_str, from_none], self.repo)
+        if self.sha is not None:
+            result["sha"] = from_union([from_str, from_none], self.sha)
+        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 HistoryCompactResult:
@@ -22225,6 +26867,7 @@ def to_dict(self) -> dict:
             result["localServer"] = from_union([lambda x: to_class(HostLocalServerConfiguration, x), from_none], self.local_server)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class HostExitedNotification:
     """Reports a supervised listener's hosting-task termination and cleanup outcome."""
@@ -22260,6 +26903,25 @@ def to_dict(self) -> dict:
             result["exitCode"] = from_union([from_int, from_none], self.exit_code)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class HostListSessionsResult:
+    """The complete live and dormant advertised catalog, without subscribing to sessions."""
+
+    sessions: list[HostSessionSummary]
+    """Complete advertised session summaries, in the host's catalog order."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'HostListSessionsResult':
+        assert isinstance(obj, dict)
+        sessions = from_list(HostSessionSummary.from_dict, obj.get("sessions"))
+        return HostListSessionsResult(sessions)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["sessions"] = from_list(lambda x: to_class(HostSessionSummary, x), self.sessions)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class HostStartRequest:
@@ -22268,6 +26930,10 @@ class HostStartRequest:
     host_id: str
     """Caller-generated UUID identifying this connection-owned listener."""
 
+    compute_id: str | None = field(default=None, kw_only=True)
+    """Stable application identity selecting its durable host catalog. Defaults to the persisted
+    runtime compute GUID; must agree with githubEnvironment.computeId when both are supplied.
+    """
     github_environment: HostGitHubEnvironmentOptions | None = None
     """Registers a GitHub Mission Control environment and enables its relay transport."""
 
@@ -22284,15 +26950,18 @@ class HostStartRequest:
     def from_dict(obj: Any) -> 'HostStartRequest':
         assert isinstance(obj, dict)
         host_id = from_str(obj.get("hostId"))
+        compute_id = from_union([from_str, from_none], obj.get("computeId"))
         github_environment = from_union([HostGitHubEnvironmentOptions.from_dict, from_none], obj.get("githubEnvironment"))
         local_server = from_union([HostLocalServerOptions.from_dict, from_none], obj.get("localServer"))
         resume_factory = from_union([from_bool, from_none], obj.get("resumeFactory"))
         session_factory = from_union([from_bool, from_none], obj.get("sessionFactory"))
-        return HostStartRequest(host_id, github_environment, local_server, resume_factory, session_factory)
+        return HostStartRequest(host_id, github_environment, local_server, resume_factory, session_factory, compute_id=compute_id)
 
     def to_dict(self) -> dict:
         result: dict = {}
         result["hostId"] = from_str(self.host_id)
+        if self.compute_id is not None:
+            result["computeId"] = from_union([from_str, from_none], self.compute_id)
         if self.github_environment is not None:
             result["githubEnvironment"] = from_union([lambda x: to_class(HostGitHubEnvironmentOptions, x), from_none], self.github_environment)
         if self.local_server is not None:
@@ -22700,132 +27369,6 @@ def to_dict(self) -> dict:
         result["reviewFingerprint"] = from_str(self.review_fingerprint)
         return result
 
-# Experimental: this type is part of an experimental API and may change or be removed.
-@dataclass
-class InstalledPluginSource:
-    """Source descriptor for a direct GitHub plugin install, with `owner/repo`, optional ref or
-    full commit SHA, and optional subpath.
-
-    Source descriptor for a direct URL plugin install, with URL, optional ref or full commit
-    SHA, and optional subpath.
-
-    Source descriptor for a direct local plugin install, with a local filesystem path.
-    """
-    source: InstalledPluginSourceURLSource
-    """Constant value. Always "github".
-
-    Constant value. Always "url".
-
-    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 = 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"))
-        sha = from_union([from_str, from_none], obj.get("sha"))
-        url = from_union([from_str, from_none], obj.get("url"))
-        return InstalledPluginSource(source, path, ref, repo, sha, url)
-
-    def to_dict(self) -> dict:
-        result: dict = {}
-        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:
-            result["ref"] = from_union([from_str, from_none], self.ref)
-        if self.repo is not None:
-            result["repo"] = from_union([from_str, from_none], self.repo)
-        if self.sha is not None:
-            result["sha"] = from_union([from_str, from_none], self.sha)
-        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 SessionInstalledPluginSource:
-    """Source descriptor for a direct GitHub plugin install, with `owner/repo`, optional ref or
-    full commit SHA, and optional subpath.
-
-    Source descriptor for a direct URL plugin install, with URL, optional ref or full commit
-    SHA, and optional subpath.
-
-    Source descriptor for a direct local plugin install, with a local filesystem path.
-    """
-    source: InstalledPluginSourceURLSource
-    """Constant value. Always "github".
-
-    Constant value. Always "url".
-
-    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 = 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"))
-        sha = from_union([from_str, from_none], obj.get("sha"))
-        url = from_union([from_str, from_none], obj.get("url"))
-        return SessionInstalledPluginSource(source, path, ref, repo, sha, url)
-
-    def to_dict(self) -> dict:
-        result: dict = {}
-        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:
-            result["ref"] = from_union([from_str, from_none], self.ref)
-        if self.repo is not None:
-            result["repo"] = from_union([from_str, from_none], self.repo)
-        if self.sha is not None:
-            result["sha"] = from_union([from_str, from_none], self.sha)
-        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 InstalledPluginSourceGitHub:
@@ -23453,6 +27996,91 @@ 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.
+# Internal: this type is an internal SDK API and is not part of the public surface.
+@dataclass
+class _ManagedSettingsResolveBypassDisableTransitionResult:
+    """The bypass-permissions state a host should hold after the resolution, and what it must do
+    to get there.
+    """
+    suppress_runtime_allow_all: bool
+    """Whether a bypass-permissions session already running must be turned off. True only when
+    this resolution newly disables bypass mode, so a host that is already compliant is not
+    interrupted.
+    """
+    managed_identity: str | None = None
+    """The account the returned `managed` source is pinned to. Store it alongside `source`; the
+    next call needs it to decide whether an account switch lifts the disable.
+    """
+    set_disabled_state: bool | None = None
+    """The value to store in the host's own bypass-disabled flag. Omitted means leave it exactly
+    as it is, which is not the same as being told to store `false`.
+    """
+    source: _ManagedSettingsBypassDisableSource | None = None
+    """Which layer disables bypass mode after this resolution. Omitted when none does, which is
+    what a lifted disable looks like.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_ManagedSettingsResolveBypassDisableTransitionResult':
+        assert isinstance(obj, dict)
+        suppress_runtime_allow_all = from_bool(obj.get("suppressRuntimeAllowAll"))
+        managed_identity = from_union([from_str, from_none], obj.get("managedIdentity"))
+        set_disabled_state = from_union([from_bool, from_none], obj.get("setDisabledState"))
+        source = from_union([_ManagedSettingsBypassDisableSource, from_none], obj.get("source"))
+        return _ManagedSettingsResolveBypassDisableTransitionResult(suppress_runtime_allow_all, managed_identity, set_disabled_state, source)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["suppressRuntimeAllowAll"] = from_bool(self.suppress_runtime_allow_all)
+        if self.managed_identity is not None:
+            result["managedIdentity"] = from_union([from_str, from_none], self.managed_identity)
+        if self.set_disabled_state is not None:
+            result["setDisabledState"] = from_union([from_bool, from_none], self.set_disabled_state)
+        if self.source is not None:
+            result["source"] = from_union([lambda x: to_enum(_ManagedSettingsBypassDisableSource, x), from_none], self.source)
+        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 _ManagedSettingsResolveBypassDisableTransitionParams:
+    """The bypass-permissions state a host holds today, the account now signed in, and what the
+    managed-policy resolution said.
+    """
+    active_identity: str
+    """The account signed in now. A `managed` disable pinned to a different account is lifted."""
+
+    policy: _ManagedSettingsBypassPolicyResolution
+    """What the resolution said about bypass mode. Send `unknown` rather than omitting the field
+    when there is no verdict.
+    """
+    current_managed_identity: str | None = None
+    """The account a `managed` disable is pinned to. Omit it when the current source is not
+    `managed`; it is ignored for the other sources.
+    """
+    current_source: _ManagedSettingsBypassDisableSource | None = None
+    """Which layer currently disables bypass mode. Omit it when nothing does."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_ManagedSettingsResolveBypassDisableTransitionParams':
+        assert isinstance(obj, dict)
+        active_identity = from_str(obj.get("activeIdentity"))
+        policy = _ManagedSettingsBypassPolicyResolution(obj.get("policy"))
+        current_managed_identity = from_union([from_str, from_none], obj.get("currentManagedIdentity"))
+        current_source = from_union([_ManagedSettingsBypassDisableSource, from_none], obj.get("currentSource"))
+        return _ManagedSettingsResolveBypassDisableTransitionParams(active_identity, policy, current_managed_identity, current_source)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["activeIdentity"] = from_str(self.active_identity)
+        result["policy"] = to_enum(_ManagedSettingsBypassPolicyResolution, self.policy)
+        if self.current_managed_identity is not None:
+            result["currentManagedIdentity"] = from_union([from_str, from_none], self.current_managed_identity)
+        if self.current_source is not None:
+            result["currentSource"] = from_union([lambda x: to_enum(_ManagedSettingsBypassDisableSource, x), from_none], self.current_source)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class ManagedSettingsComposeLayer:
@@ -23524,6 +28152,12 @@ class ManagedSettingsMeta:
     auto_tier: ManagedSettingMeta | None = None
     """Lock state and provenance of `values.autoTier`."""
 
+    context_tier: ManagedSettingMeta | None = None
+    """Lock state and provenance of `values.contextTier`."""
+
+    effort_level: ManagedSettingMeta | None = None
+    """Lock state and provenance of `values.effortLevel`."""
+
     model: ManagedSettingMeta | None = None
     """Lock state and provenance of `values.model`."""
 
@@ -23531,17 +28165,517 @@ class ManagedSettingsMeta:
     def from_dict(obj: Any) -> 'ManagedSettingsMeta':
         assert isinstance(obj, dict)
         auto_tier = from_union([ManagedSettingMeta.from_dict, from_none], obj.get("autoTier"))
+        context_tier = from_union([ManagedSettingMeta.from_dict, from_none], obj.get("contextTier"))
+        effort_level = from_union([ManagedSettingMeta.from_dict, from_none], obj.get("effortLevel"))
         model = from_union([ManagedSettingMeta.from_dict, from_none], obj.get("model"))
-        return ManagedSettingsMeta(auto_tier, model)
+        return ManagedSettingsMeta(auto_tier, context_tier, effort_level, model)
 
     def to_dict(self) -> dict:
         result: dict = {}
         if self.auto_tier is not None:
             result["autoTier"] = from_union([lambda x: to_class(ManagedSettingMeta, x), from_none], self.auto_tier)
+        if self.context_tier is not None:
+            result["contextTier"] = from_union([lambda x: to_class(ManagedSettingMeta, x), from_none], self.context_tier)
+        if self.effort_level is not None:
+            result["effortLevel"] = from_union([lambda x: to_class(ManagedSettingMeta, x), from_none], self.effort_level)
         if self.model is not None:
             result["model"] = from_union([lambda x: to_class(ManagedSettingMeta, x), from_none], self.model)
         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 _ManagedSettingsLoadRemoteControlParams:
+    """Inputs describing the host and account whose managed remote-control policy should be
+    resolved. Mirrors `managedSettings.ingest`, and deliberately carries no retention
+    decision: reading this gate never becomes this runtime process's startup policy.
+    """
+    environment: Any
+    """The host's environment variables, read for cache location and policy overrides."""
+
+    home_directory: str
+    """The host's home directory, used to resolve cache and managed-file locations."""
+
+    platform: str
+    """The host's platform, in Node's `process.platform` spelling, used to locate
+    platform-specific cache and policy paths.
+    """
+    user_agent: str
+    """User agent to send with the policy fetch."""
+
+    auth_info: Any = None
+    """The authenticated identity to resolve policy for. Omitted before sign-in, in which case
+    no server layer is fetched.
+    """
+    client_name: str | None = None
+    """Name of the embedding client, reported to the managed-settings service as `client_id` so
+    it can refuse to deliver a policy this client is too old to enforce. That refusal is
+    exactly what turns into an explicit `disabled` below, so a host that omits this field
+    forfeits the protection.
+    """
+    device_response: Any = None
+    """A device layer supplied by the host instead of discovered from the machine. Pair it with
+    `hasDeviceResponse` so an explicit absence is distinguishable from an omitted override.
+    """
+    has_device_response: bool | None = None
+    """Whether `deviceResponse` is an override at all. True with a null `deviceResponse` asserts
+    the device layer is empty; false discovers it from the machine.
+    """
+    policy_helper_enabled: bool | None = None
+    """Whether a configured platform policy helper may be run to produce an enforced helper
+    layer.
+    """
+    policy_helper_reason: _ManagedSettingsPolicyHelperReason | None = None
+    """The policy-helper invocation reason. Defaults to sessionStart."""
+
+    self_fetch: bool | None = None
+    """Whether to run ingestion. Omit or set false to return an empty result without discovering
+    or fetching policy.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_ManagedSettingsLoadRemoteControlParams':
+        assert isinstance(obj, dict)
+        environment = obj.get("environment")
+        home_directory = from_str(obj.get("homeDirectory"))
+        platform = from_str(obj.get("platform"))
+        user_agent = from_str(obj.get("userAgent"))
+        auth_info = obj.get("authInfo")
+        client_name = from_union([from_str, from_none], obj.get("clientName"))
+        device_response = obj.get("deviceResponse")
+        has_device_response = from_union([from_bool, from_none], obj.get("hasDeviceResponse"))
+        policy_helper_enabled = from_union([from_bool, from_none], obj.get("policyHelperEnabled"))
+        policy_helper_reason = from_union([_ManagedSettingsPolicyHelperReason, from_none], obj.get("policyHelperReason"))
+        self_fetch = from_union([from_bool, from_none], obj.get("selfFetch"))
+        return _ManagedSettingsLoadRemoteControlParams(environment, home_directory, platform, user_agent, auth_info, client_name, device_response, has_device_response, policy_helper_enabled, policy_helper_reason, self_fetch)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["environment"] = self.environment
+        result["homeDirectory"] = from_str(self.home_directory)
+        result["platform"] = from_str(self.platform)
+        result["userAgent"] = from_str(self.user_agent)
+        if self.auth_info is not None:
+            result["authInfo"] = self.auth_info
+        if self.client_name is not None:
+            result["clientName"] = from_union([from_str, from_none], self.client_name)
+        if self.device_response is not None:
+            result["deviceResponse"] = self.device_response
+        if self.has_device_response is not None:
+            result["hasDeviceResponse"] = from_union([from_bool, from_none], self.has_device_response)
+        if self.policy_helper_enabled is not None:
+            result["policyHelperEnabled"] = from_union([from_bool, from_none], self.policy_helper_enabled)
+        if self.policy_helper_reason is not None:
+            result["policyHelperReason"] = from_union([lambda x: to_enum(_ManagedSettingsPolicyHelperReason, x), from_none], self.policy_helper_reason)
+        if self.self_fetch is not None:
+            result["selfFetch"] = from_union([from_bool, from_none], self.self_fetch)
+        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 _ManagedSettingsIngestParams:
+    """Inputs describing the host and account an ingestion should resolve managed policy for."""
+
+    environment: Any
+    """The host's environment variables, read for cache location and policy overrides. Supplied
+    by the host rather than read from the runtime process so a command that selected its own
+    configuration home is honored.
+    """
+    home_directory: str
+    """The host's home directory, used to resolve cache and managed-file locations."""
+
+    platform: str
+    """The host's platform, in Node's `process.platform` spelling, used to locate
+    platform-specific cache and policy paths.
+    """
+    user_agent: str
+    """User agent to send with the policy fetch."""
+
+    auth_info: Any = None
+    """The authenticated identity to resolve policy for. Omitted before sign-in, in which case
+    no server layer is fetched.
+    """
+    bypass_cache_read: bool | None = None
+    """Whether to ignore a cached server policy when reading, forcing the resolution to come
+    from a live fetch.
+    """
+    client_name: str | None = None
+    """Name of the embedding client, reported to the managed-settings service as `client_id` so
+    it can refuse to deliver a policy this client is too old to enforce. Omit it and the
+    runtime reports a generic identity; the runtime version sent alongside is the gate that
+    actually matters.
+    """
+    device_response: Any = None
+    """A device layer supplied by the host instead of discovered from the machine. Pair it with
+    `hasDeviceResponse` so an explicit absence is distinguishable from an omitted override.
+    """
+    has_device_response: bool | None = None
+    """Whether `deviceResponse` is an override at all. True with a null `deviceResponse` asserts
+    the device layer is empty; false discovers it from the machine.
+    """
+    policy_helper_enabled: bool | None = None
+    """Whether a configured platform policy helper may be run to produce an enforced helper
+    layer.
+    """
+    policy_helper_reason: _ManagedSettingsPolicyHelperReason | None = None
+    """The policy-helper invocation reason. Defaults to sessionStart."""
+
+    policy_helper_working_directory: str | None = None
+    """Directory the policy helper runs in when this ingestion is not owned by a registered
+    session. A host resolving policy before its session exists must pass this, or a
+    directory-sensitive helper judges the wrong repository.
+    """
+    self_fetch: bool | None = None
+    """Whether to run ingestion. Omit or set false to return an empty result without discovering
+    or fetching policy.
+    """
+    server_policy_cache_mode: _ManagedSettingsServerPolicyCacheMode | None = None
+    """How this ingestion may use the on-disk server-policy cache. Defaults to the runtime's own
+    policy when omitted.
+    """
+    session_id: str | None = None
+    """The session whose credential store and working directory the policy helper should use.
+    Omit it when no session exists yet and the process-wide store applies.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_ManagedSettingsIngestParams':
+        assert isinstance(obj, dict)
+        environment = obj.get("environment")
+        home_directory = from_str(obj.get("homeDirectory"))
+        platform = from_str(obj.get("platform"))
+        user_agent = from_str(obj.get("userAgent"))
+        auth_info = obj.get("authInfo")
+        bypass_cache_read = from_union([from_bool, from_none], obj.get("bypassCacheRead"))
+        client_name = from_union([from_str, from_none], obj.get("clientName"))
+        device_response = obj.get("deviceResponse")
+        has_device_response = from_union([from_bool, from_none], obj.get("hasDeviceResponse"))
+        policy_helper_enabled = from_union([from_bool, from_none], obj.get("policyHelperEnabled"))
+        policy_helper_reason = from_union([_ManagedSettingsPolicyHelperReason, from_none], obj.get("policyHelperReason"))
+        policy_helper_working_directory = from_union([from_str, from_none], obj.get("policyHelperWorkingDirectory"))
+        self_fetch = from_union([from_bool, from_none], obj.get("selfFetch"))
+        server_policy_cache_mode = from_union([_ManagedSettingsServerPolicyCacheMode, from_none], obj.get("serverPolicyCacheMode"))
+        session_id = from_union([from_str, from_none], obj.get("sessionId"))
+        return _ManagedSettingsIngestParams(environment, home_directory, platform, user_agent, auth_info, bypass_cache_read, client_name, device_response, has_device_response, policy_helper_enabled, policy_helper_reason, policy_helper_working_directory, self_fetch, server_policy_cache_mode, session_id)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["environment"] = self.environment
+        result["homeDirectory"] = from_str(self.home_directory)
+        result["platform"] = from_str(self.platform)
+        result["userAgent"] = from_str(self.user_agent)
+        if self.auth_info is not None:
+            result["authInfo"] = self.auth_info
+        if self.bypass_cache_read is not None:
+            result["bypassCacheRead"] = from_union([from_bool, from_none], self.bypass_cache_read)
+        if self.client_name is not None:
+            result["clientName"] = from_union([from_str, from_none], self.client_name)
+        if self.device_response is not None:
+            result["deviceResponse"] = self.device_response
+        if self.has_device_response is not None:
+            result["hasDeviceResponse"] = from_union([from_bool, from_none], self.has_device_response)
+        if self.policy_helper_enabled is not None:
+            result["policyHelperEnabled"] = from_union([from_bool, from_none], self.policy_helper_enabled)
+        if self.policy_helper_reason is not None:
+            result["policyHelperReason"] = from_union([lambda x: to_enum(_ManagedSettingsPolicyHelperReason, x), from_none], self.policy_helper_reason)
+        if self.policy_helper_working_directory is not None:
+            result["policyHelperWorkingDirectory"] = from_union([from_str, from_none], self.policy_helper_working_directory)
+        if self.self_fetch is not None:
+            result["selfFetch"] = from_union([from_bool, from_none], self.self_fetch)
+        if self.server_policy_cache_mode is not None:
+            result["serverPolicyCacheMode"] = from_union([lambda x: to_enum(_ManagedSettingsServerPolicyCacheMode, x), from_none], self.server_policy_cache_mode)
+        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.
+# Internal: this type is an internal SDK API and is not part of the public surface.
+@dataclass
+class _ManagedSettingsResolveStartupPolicyParams:
+    """Inputs describing the host and account a startup policy resolution should run for.
+    Mirrors `managedSettings.ingest`, and adds the decision of whether the resolved policy is
+    retained for this runtime process.
+    """
+    environment: Any
+    """The host's environment variables, read for cache location, policy overrides, and the
+    variables that would make a membership snapshot forgeable.
+    """
+    home_directory: str
+    """The host's home directory, used to resolve cache and managed-file locations."""
+
+    platform: str
+    """The host's platform, in Node's `process.platform` spelling, used to locate
+    platform-specific cache and policy paths.
+    """
+    retain_and_apply: bool
+    """Whether to retain the resolved policy as this runtime process's startup policy, so later
+    work in the process enforces it. Set false to resolve without side effects, which is what
+    a protocol host wants before session creation: its sessions apply the complete policy
+    through the normal lifecycle, and retaining here would let a readiness credential affect
+    unrelated sessions. The returned verdict is identical either way — this decides only
+    whether the process keeps it.
+    """
+    user_agent: str
+    """User agent to send with the policy fetch."""
+
+    auth_info: Any = None
+    """The authenticated identity to resolve policy for. Omitted before sign-in, in which case
+    no server layer is fetched and the sign-in pin is evaluated against no credential.
+    """
+    bypass_cache_read: bool | None = None
+    """Whether to ignore a cached server policy when reading, forcing the resolution to come
+    from a live fetch.
+    """
+    client_name: str | None = None
+    """Name of the embedding client, reported to the managed-settings service as `client_id` so
+    it can refuse to deliver a policy this client is too old to enforce.
+    """
+    device_response: Any = None
+    """A device layer supplied by the host instead of discovered from the machine. Pair it with
+    `hasDeviceResponse` so an explicit absence is distinguishable from an omitted override.
+    """
+    has_device_response: bool | None = None
+    """Whether `deviceResponse` is an override at all. True with a null `deviceResponse` asserts
+    the device layer is empty; false discovers it from the machine.
+    """
+    policy_helper_enabled: bool | None = None
+    """Whether a configured platform policy helper may be run to produce an enforced helper
+    layer.
+    """
+    policy_helper_reason: _ManagedSettingsPolicyHelperReason | None = None
+    """The policy-helper invocation reason. Defaults to sessionStart."""
+
+    policy_helper_working_directory: str | None = None
+    """Directory the policy helper runs in when this resolution is not owned by a registered
+    session. A host resolving policy before its session exists must pass this, or a
+    directory-sensitive helper judges the wrong repository.
+    """
+    self_fetch: bool | None = None
+    """Whether to run ingestion. Omit or set false to return an empty result without discovering
+    or fetching policy.
+    """
+    server_policy_cache_mode: _ManagedSettingsServerPolicyCacheMode | None = None
+    """How this resolution may use the on-disk server-policy cache. Defaults to the runtime's
+    own policy when omitted. Rejected when combined with `bypassCacheRead`, because the two
+    express the same decision and accepting both would leave the caller unsure which one the
+    runtime honored.
+    """
+    session_id: str | None = None
+    """The session whose credential store, working directory and client kind the resolution
+    should use. Omit it when no session exists yet and the process-wide store applies. A
+    resolution whose session names a credential other than `authInfo` is returned but not
+    retained, so a stale sign-in cannot apply policy for an account that has already been
+    switched away from.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_ManagedSettingsResolveStartupPolicyParams':
+        assert isinstance(obj, dict)
+        environment = obj.get("environment")
+        home_directory = from_str(obj.get("homeDirectory"))
+        platform = from_str(obj.get("platform"))
+        retain_and_apply = from_bool(obj.get("retainAndApply"))
+        user_agent = from_str(obj.get("userAgent"))
+        auth_info = obj.get("authInfo")
+        bypass_cache_read = from_union([from_bool, from_none], obj.get("bypassCacheRead"))
+        client_name = from_union([from_str, from_none], obj.get("clientName"))
+        device_response = obj.get("deviceResponse")
+        has_device_response = from_union([from_bool, from_none], obj.get("hasDeviceResponse"))
+        policy_helper_enabled = from_union([from_bool, from_none], obj.get("policyHelperEnabled"))
+        policy_helper_reason = from_union([_ManagedSettingsPolicyHelperReason, from_none], obj.get("policyHelperReason"))
+        policy_helper_working_directory = from_union([from_str, from_none], obj.get("policyHelperWorkingDirectory"))
+        self_fetch = from_union([from_bool, from_none], obj.get("selfFetch"))
+        server_policy_cache_mode = from_union([_ManagedSettingsServerPolicyCacheMode, from_none], obj.get("serverPolicyCacheMode"))
+        session_id = from_union([from_str, from_none], obj.get("sessionId"))
+        return _ManagedSettingsResolveStartupPolicyParams(environment, home_directory, platform, retain_and_apply, user_agent, auth_info, bypass_cache_read, client_name, device_response, has_device_response, policy_helper_enabled, policy_helper_reason, policy_helper_working_directory, self_fetch, server_policy_cache_mode, session_id)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["environment"] = self.environment
+        result["homeDirectory"] = from_str(self.home_directory)
+        result["platform"] = from_str(self.platform)
+        result["retainAndApply"] = from_bool(self.retain_and_apply)
+        result["userAgent"] = from_str(self.user_agent)
+        if self.auth_info is not None:
+            result["authInfo"] = self.auth_info
+        if self.bypass_cache_read is not None:
+            result["bypassCacheRead"] = from_union([from_bool, from_none], self.bypass_cache_read)
+        if self.client_name is not None:
+            result["clientName"] = from_union([from_str, from_none], self.client_name)
+        if self.device_response is not None:
+            result["deviceResponse"] = self.device_response
+        if self.has_device_response is not None:
+            result["hasDeviceResponse"] = from_union([from_bool, from_none], self.has_device_response)
+        if self.policy_helper_enabled is not None:
+            result["policyHelperEnabled"] = from_union([from_bool, from_none], self.policy_helper_enabled)
+        if self.policy_helper_reason is not None:
+            result["policyHelperReason"] = from_union([lambda x: to_enum(_ManagedSettingsPolicyHelperReason, x), from_none], self.policy_helper_reason)
+        if self.policy_helper_working_directory is not None:
+            result["policyHelperWorkingDirectory"] = from_union([from_str, from_none], self.policy_helper_working_directory)
+        if self.self_fetch is not None:
+            result["selfFetch"] = from_union([from_bool, from_none], self.self_fetch)
+        if self.server_policy_cache_mode is not None:
+            result["serverPolicyCacheMode"] = from_union([lambda x: to_enum(_ManagedSettingsServerPolicyCacheMode, x), from_none], self.server_policy_cache_mode)
+        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.
+# Internal: this type is an internal SDK API and is not part of the public surface.
+@dataclass
+class _ManagedSettingsLogMessage:
+    """One diagnostic emitted while ingesting managed settings. Returned rather than logged by
+    the runtime so the host decides where ingestion diagnostics go, which matters because an
+    ingestion runs before a session exists to carry a log sink.
+    """
+    level: _ManagedSettingsLogLevel
+    """Severity of this diagnostic."""
+
+    message: str
+    """Human-readable diagnostic text."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_ManagedSettingsLogMessage':
+        assert isinstance(obj, dict)
+        level = _ManagedSettingsLogLevel(obj.get("level"))
+        message = from_str(obj.get("message"))
+        return _ManagedSettingsLogMessage(level, message)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["level"] = to_enum(_ManagedSettingsLogLevel, self.level)
+        result["message"] = from_str(self.message)
+        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 _ManagedSettingsResolveStartupPolicyResult:
+    """The startup policy a resolution composed, the per-layer outcome flags a host needs to
+    decide how much to trust it, and the enterprise sign-in verdict for the credential it ran
+    against. The flags are reported rather than folded into the settings because a host must
+    distinguish an unmanaged device from a managed device whose policy could not be
+    confirmed, and apply its fail-closed gates in the second case.
+    """
+    device_load_failed: bool
+    """The device layer could not be read, so it is unconfirmed rather than known-absent."""
+
+    force_login_orgs: _ForceLoginOrgsDecision
+    """The enterprise sign-in verdict for the credential this resolution ran against, evaluated
+    over the effective policy so a server-delivered pin is honored alongside a device one.
+    Computed on every resolution, including one that was not retained, so a host that
+    declines to apply policy still cannot proceed past a pin.
+    """
+    managed_policy_present: bool
+    """A managed policy is known to apply to this host, from a discovered source or a resolved
+    document.
+    """
+    permission_policy_undetermined: bool
+    """The permissions layer specifically could not be confirmed, so permission gates apply
+    their fail-closed posture.
+    """
+    policy_helper_load_failed: bool
+    """The policy helper was configured but could not be run, or its output could not be read."""
+
+    policy_undetermined: bool
+    """Some layer of the policy could not be confirmed, so its absence must not be read as
+    permission. Folds in a failed server fetch as well as an unreadable device layer.
+    """
+    sandbox_enabled_by_undetermined_policy: bool
+    """The sandbox was enabled because policy could not be confirmed rather than because an
+    administrator asked for it. Lets a host explain a sandbox the user did not configure.
+    """
+    server_fetch_failed: bool
+    """The server fetch failed and no cached entry stood in for it, so the server layer is
+    unconfirmed and fail-closed gates apply.
+    """
+    server_resolution: _ManagedSettingsServerPolicyResolution
+    """How the current runtime resolved the server layer."""
+
+    telemetry: Any
+    """Telemetry describing which layers answered and how, for the host to report alongside its
+    own startup events.
+    """
+    warnings: list[str]
+    """Warnings raised while resolving, in the order they occurred."""
+
+    client_update_requested: str | None = None
+    """Advisory minimum client version from a successful server response."""
+
+    client_update_required: str | None = None
+    """The server refused to deliver a policy because this client is too old to enforce it,
+    carrying the user-facing sentence describing the refusal. No retry will help; the remedy
+    is a client update.
+    """
+    device_response: Any = None
+    """The device layer discovered from the machine, when one exists."""
+
+    device_sandbox_floor: Any = None
+    """The sandbox floor contributed by the device layer."""
+
+    policy_helper_response: Any = None
+    """The layer produced by the platform policy helper, when one ran."""
+
+    sandbox_floor: Any = None
+    """The effective sandbox floor composed across every layer, which a host must apply rather
+    than its own default.
+    """
+    server_response: Any = None
+    """The account's server-delivered policy, when one was resolved."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_ManagedSettingsResolveStartupPolicyResult':
+        assert isinstance(obj, dict)
+        device_load_failed = from_bool(obj.get("deviceLoadFailed"))
+        force_login_orgs = _ForceLoginOrgsDecision.from_dict(obj.get("forceLoginOrgs"))
+        managed_policy_present = from_bool(obj.get("managedPolicyPresent"))
+        permission_policy_undetermined = from_bool(obj.get("permissionPolicyUndetermined"))
+        policy_helper_load_failed = from_bool(obj.get("policyHelperLoadFailed"))
+        policy_undetermined = from_bool(obj.get("policyUndetermined"))
+        sandbox_enabled_by_undetermined_policy = from_bool(obj.get("sandboxEnabledByUndeterminedPolicy"))
+        server_fetch_failed = from_bool(obj.get("serverFetchFailed"))
+        server_resolution = _ManagedSettingsServerPolicyResolution(obj.get("serverResolution"))
+        telemetry = obj.get("telemetry")
+        warnings = from_list(from_str, obj.get("warnings"))
+        client_update_requested = from_union([from_str, from_none], obj.get("clientUpdateRequested"))
+        client_update_required = from_union([from_str, from_none], obj.get("clientUpdateRequired"))
+        device_response = obj.get("deviceResponse")
+        device_sandbox_floor = obj.get("deviceSandboxFloor")
+        policy_helper_response = obj.get("policyHelperResponse")
+        sandbox_floor = obj.get("sandboxFloor")
+        server_response = obj.get("serverResponse")
+        return _ManagedSettingsResolveStartupPolicyResult(device_load_failed, force_login_orgs, managed_policy_present, permission_policy_undetermined, policy_helper_load_failed, policy_undetermined, sandbox_enabled_by_undetermined_policy, server_fetch_failed, server_resolution, telemetry, warnings, client_update_requested, client_update_required, device_response, device_sandbox_floor, policy_helper_response, sandbox_floor, server_response)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["deviceLoadFailed"] = from_bool(self.device_load_failed)
+        result["forceLoginOrgs"] = to_class(_ForceLoginOrgsDecision, self.force_login_orgs)
+        result["managedPolicyPresent"] = from_bool(self.managed_policy_present)
+        result["permissionPolicyUndetermined"] = from_bool(self.permission_policy_undetermined)
+        result["policyHelperLoadFailed"] = from_bool(self.policy_helper_load_failed)
+        result["policyUndetermined"] = from_bool(self.policy_undetermined)
+        result["sandboxEnabledByUndeterminedPolicy"] = from_bool(self.sandbox_enabled_by_undetermined_policy)
+        result["serverFetchFailed"] = from_bool(self.server_fetch_failed)
+        result["serverResolution"] = to_enum(_ManagedSettingsServerPolicyResolution, self.server_resolution)
+        result["telemetry"] = self.telemetry
+        result["warnings"] = from_list(from_str, self.warnings)
+        if self.client_update_requested is not None:
+            result["clientUpdateRequested"] = from_union([from_str, from_none], self.client_update_requested)
+        if self.client_update_required is not None:
+            result["clientUpdateRequired"] = from_union([from_str, from_none], self.client_update_required)
+        if self.device_response is not None:
+            result["deviceResponse"] = self.device_response
+        if self.device_sandbox_floor is not None:
+            result["deviceSandboxFloor"] = self.device_sandbox_floor
+        if self.policy_helper_response is not None:
+            result["policyHelperResponse"] = self.policy_helper_response
+        if self.sandbox_floor is not None:
+            result["sandboxFloor"] = self.sandbox_floor
+        if self.server_response is not None:
+            result["serverResponse"] = self.server_response
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class MarketplaceListResult:
@@ -24490,6 +29624,98 @@ def to_dict(self) -> dict:
         result["mode"] = to_enum(MCPSetEnvValueModeDetails, self.mode)
         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 _MCPShouldExcludeGitHubToolsRequest:
+    """The session tool filters that decide whether the session still has a shell to run `gh`
+    with.
+    """
+    available_tools: list[str] | None = None
+    """The session's tool allowlist, when it set one. Omitted means the session constrains
+    nothing this way.
+    """
+    excluded_tools: list[str] | None = None
+    """The session's tool denylist, when it set one. Omitted means the session constrains
+    nothing this way.
+    """
+    tool_filter_precedence: OptionsUpdateToolFilterPrecedence | None = None
+    """How the allowlist and denylist combine when both are set. Omitted means the default every
+    session gets, so a caller that never chose a precedence is answered as its sessions
+    behave.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_MCPShouldExcludeGitHubToolsRequest':
+        assert isinstance(obj, dict)
+        available_tools = from_union([lambda x: from_list(from_str, x), from_none], obj.get("availableTools"))
+        excluded_tools = from_union([lambda x: from_list(from_str, x), from_none], obj.get("excludedTools"))
+        tool_filter_precedence = from_union([from_none, OptionsUpdateToolFilterPrecedence], obj.get("toolFilterPrecedence"))
+        return _MCPShouldExcludeGitHubToolsRequest(available_tools, excluded_tools, tool_filter_precedence)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        if self.available_tools is not None:
+            result["availableTools"] = from_union([lambda x: from_list(from_str, x), from_none], self.available_tools)
+        if self.excluded_tools is not None:
+            result["excludedTools"] = from_union([lambda x: from_list(from_str, x), from_none], self.excluded_tools)
+        if self.tool_filter_precedence is not None:
+            result["toolFilterPrecedence"] = from_union([from_none, lambda x: to_enum(OptionsUpdateToolFilterPrecedence, x)], self.tool_filter_precedence)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class ConnectorDiscoveryCatalogEntry:
+    """Entry."""
+
+    display_name: str
+    """Display name."""
+
+    name: str
+    """Name."""
+
+    status: ConnectorCatalogStatus
+    """Status."""
+
+    description: str | None = None
+    """Description."""
+
+    logo: str | None = None
+    """Logo."""
+
+    release_tag: str | None = None
+    """Release tag."""
+
+    tier: str | None = None
+    """Tier."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'ConnectorDiscoveryCatalogEntry':
+        assert isinstance(obj, dict)
+        display_name = from_str(obj.get("displayName"))
+        name = from_str(obj.get("name"))
+        status = ConnectorCatalogStatus(obj.get("status"))
+        description = from_union([from_str, from_none], obj.get("description"))
+        logo = from_union([from_str, from_none], obj.get("logo"))
+        release_tag = from_union([from_str, from_none], obj.get("releaseTag"))
+        tier = from_union([from_str, from_none], obj.get("tier"))
+        return ConnectorDiscoveryCatalogEntry(display_name, name, status, description, logo, release_tag, tier)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["displayName"] = from_str(self.display_name)
+        result["name"] = from_str(self.name)
+        result["status"] = to_enum(ConnectorCatalogStatus, self.status)
+        if self.description is not None:
+            result["description"] = from_union([from_str, from_none], self.description)
+        if self.logo is not None:
+            result["logo"] = from_union([from_str, from_none], self.logo)
+        if self.release_tag is not None:
+            result["releaseTag"] = from_union([from_str, from_none], self.release_tag)
+        if self.tier is not None:
+            result["tier"] = from_union([from_str, from_none], self.tier)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 class DebugCollectLogsEntryKind(Enum):
     """Kind of source path to include.
@@ -24510,7 +29736,8 @@ class SessionContextAttribution:
     individual messages are available separately via `metadata.getContextHeaviestMessages`.
     """
     buffer_tokens: int
-    """Output reserve plus the tokens past the buffer-exhaustion blocking threshold. Mirrors
+    """Output reservation overlapping the displayed prompt allowance plus the tokens past the
+    effective input budget's buffer-exhaustion blocking threshold. Mirrors
     `SessionContextInfo.bufferTokens`.
     """
     categories: Categories
@@ -24531,9 +29758,9 @@ class SessionContextAttribution:
     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`.
+    """Advertised prompt allowance for the selected context tier: the denominator for
+    context-usage displays and capacity for `categories.freeSpace` and `categories.buffer`.
+    Mirrors `SessionContextInfo.limit`.
     """
     model_id: str
     """The concrete model id the entire breakdown was tokenized against (feeds the per-model
@@ -24547,8 +29774,8 @@ class SessionContextAttribution:
     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`.
+    """Effective input budget after reserving requested output against the combined context
+    ceiling. Mirrors `SessionContextInfo.promptTokenLimit`.
     """
     total_tokens: int
     """Total token count of the current context window the entries are measured against (system
@@ -26584,6 +31811,36 @@ def to_dict(self) -> dict:
             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 ManagedPluginRetryEntry:
+    """Retry outcome for one plugin required by managed settings."""
+
+    spec: str
+    """Plugin spec in "plugin@marketplace" form."""
+
+    status: ManagedPluginRetryStatus
+    """What the retry did for this plugin."""
+
+    error: str | None = None
+    """Why the plugin was not prepared. Present when `status` is `failed` or `deferred`."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'ManagedPluginRetryEntry':
+        assert isinstance(obj, dict)
+        spec = from_str(obj.get("spec"))
+        status = ManagedPluginRetryStatus(obj.get("status"))
+        error = from_union([from_str, from_none], obj.get("error"))
+        return ManagedPluginRetryEntry(spec, status, error)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["spec"] = from_str(self.spec)
+        result["status"] = to_enum(ManagedPluginRetryStatus, self.status)
+        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 MarketplacePluginInfo:
@@ -26609,6 +31866,62 @@ def to_dict(self) -> dict:
             result["description"] = from_union([from_str, from_none], self.description)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class MCPConfiguredServer:
+    """Effective MCP configuration entry. Configuration enablement is distinct from the optional
+    live observation.
+    """
+    enabled: bool
+    """Whether this configured server is enabled after session configuration and policy
+    filtering.
+    """
+    live: MCPConfiguredServerState
+    """Observed state from an already materialized matching server. Omitted when no live graph
+    has this configured server; it never determines configuration enablement.
+    """
+    name: str
+    """Server name (config key)"""
+
+    display_name: str | None = None
+    """Human-readable display name supplied by configuration."""
+
+    source: McpServerSource | None = None
+    """Configuration provenance: user, workspace, plugin, builtin, or managed."""
+
+    source_plugin: str | None = None
+    """Plugin name that provided this server, when source is plugin."""
+
+    source_plugin_version: str | None = None
+    """Plugin version that provided this server, when source is plugin."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'MCPConfiguredServer':
+        assert isinstance(obj, dict)
+        enabled = from_bool(obj.get("enabled"))
+        live = MCPConfiguredServerState.from_dict(obj.get("live"))
+        name = from_str(obj.get("name"))
+        display_name = from_union([from_str, from_none], obj.get("displayName"))
+        source = from_union([McpServerSource, from_none], obj.get("source"))
+        source_plugin = from_union([from_str, from_none], obj.get("sourcePlugin"))
+        source_plugin_version = from_union([from_str, from_none], obj.get("sourcePluginVersion"))
+        return MCPConfiguredServer(enabled, live, name, display_name, source, source_plugin, source_plugin_version)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["enabled"] = from_bool(self.enabled)
+        result["live"] = to_class(MCPConfiguredServerState, self.live)
+        result["name"] = from_str(self.name)
+        if self.display_name is not None:
+            result["displayName"] = from_union([from_str, from_none], self.display_name)
+        if self.source is not None:
+            result["source"] = from_union([lambda x: to_enum(McpServerSource, x), from_none], self.source)
+        if self.source_plugin is not None:
+            result["sourcePlugin"] = from_union([from_str, from_none], self.source_plugin)
+        if self.source_plugin_version is not None:
+            result["sourcePluginVersion"] = from_union([from_str, from_none], self.source_plugin_version)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class MCPServer:
@@ -26646,6 +31959,11 @@ class MCPServer:
     source_plugin_version: str | None = None
     """Plugin version that provided this server, when source is plugin."""
 
+    url: str | None = field(default=None, kw_only=True)
+    """Configured URL for an HTTP/SSE server, regardless of configuration source. Omitted for
+    local and in-memory servers.
+    """
+
     @staticmethod
     def from_dict(obj: Any) -> 'MCPServer':
         assert isinstance(obj, dict)
@@ -26658,7 +31976,8 @@ def from_dict(obj: Any) -> 'MCPServer':
         source = from_union([McpServerSource, from_none], obj.get("source"))
         source_plugin = from_union([from_str, from_none], obj.get("sourcePlugin"))
         source_plugin_version = from_union([from_str, from_none], obj.get("sourcePluginVersion"))
-        return MCPServer(name, status, display_name, error, server_metadata, source, source_plugin, source_plugin_version, owned=owned)
+        url = from_union([from_str, from_none], obj.get("url"))
+        return MCPServer(name, status, display_name, error, server_metadata, source, source_plugin, source_plugin_version, url=url, owned=owned)
 
     def to_dict(self) -> dict:
         result: dict = {}
@@ -26678,6 +31997,8 @@ def to_dict(self) -> dict:
             result["sourcePlugin"] = from_union([from_str, from_none], self.source_plugin)
         if self.source_plugin_version is not None:
             result["sourcePluginVersion"] = from_union([from_str, from_none], self.source_plugin_version)
+        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.
@@ -27085,6 +32406,9 @@ class ModeSetRequest:
     plan_model_configured: bool | None = None
     """Whether a dedicated plan model is configured."""
 
+    plan_model_provider_id: str | None = None
+    """Provider owning planModel. Omit for legacy bare-model selection."""
+
     plan_reasoning_effort: str | None = None
     """Reasoning effort to use with the dedicated plan model."""
 
@@ -27104,9 +32428,10 @@ def from_dict(obj: Any) -> 'ModeSetRequest':
         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_model_provider_id = from_union([from_str, from_none], obj.get("planModelProviderId"))
         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, expected_mode, 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)
+        return ModeSetRequest(mode, compaction_decision, expected_mode, inherit_plan_base_from_session_id, persist_plan_selection, picker_settings_context, plan_context_tier, plan_exit_action, plan_model, plan_model_configured, plan_model_provider_id, plan_reasoning_effort, restore_plan_model)
 
     def to_dict(self) -> dict:
         result: dict = {}
@@ -27129,6 +32454,8 @@ def to_dict(self) -> dict:
             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_model_provider_id is not None:
+            result["planModelProviderId"] = from_union([from_str, from_none], self.plan_model_provider_id)
         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:
@@ -28161,6 +33488,91 @@ def to_dict(self) -> dict:
             result["mode"] = from_union([lambda x: to_enum(RemoteSessionMode, x), from_none], self.mode)
         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 _UserSettingsEditRequest:
+    """One atomic edit of a canonical setting in settings.json."""
+
+    canonical_path: list[str]
+    """Nonempty canonical path segments of the setting to edit, starting with its top-level key."""
+
+    operation: _SettingsEditOperation
+    """Set a scalar, add or remove a string list item, or remove the setting. The handler
+    rejects a missing or incompatible value.
+    """
+    config_dir: str | None = None
+    """Configuration directory to edit. Omitted or empty resolves the server's own home, as in
+    `user.settings.loadForConfigDir`.
+    """
+    value: Any = UNSET_SENTINEL
+    """Required boolean, string or number for set, required string for add-item and remove-item,
+    and forbidden for remove. The runtime rejects all other JSON values.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_UserSettingsEditRequest':
+        assert isinstance(obj, dict)
+        canonical_path = from_list(from_str, obj.get("canonicalPath"))
+        operation = _SettingsEditOperation(obj.get("operation"))
+        config_dir = from_union([from_str, from_none], obj.get("configDir"))
+        value = obj["value"] if "value" in obj else UNSET_SENTINEL
+        return _UserSettingsEditRequest(canonical_path, operation, config_dir, value)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["canonicalPath"] = from_list(from_str, self.canonical_path)
+        result["operation"] = to_enum(_SettingsEditOperation, self.operation)
+        if self.config_dir is not None:
+            result["configDir"] = from_union([from_str, from_none], self.config_dir)
+        if self.value is not UNSET_SENTINEL:
+            result["value"] = self.value
+        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 _RepoSettingsEditRequest:
+    """One atomic edit of an allowed top-level repository setting."""
+
+    key: str
+    """One canonical top-level repository setting that the allowlist permits."""
+
+    operation: _SettingsEditOperation
+    """Set a scalar, add or remove a string list item, or remove the setting. The handler
+    rejects a missing or incompatible value.
+    """
+    repo_root: str
+    """Absolute path of the repository root."""
+
+    scope: _RepoSettingsEditScope
+    """Shared or local repository settings file."""
+
+    value: Any = None
+    """Required boolean, string or number for set, required string for add-item and remove-item,
+    and forbidden for remove. The runtime rejects all other JSON values.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_RepoSettingsEditRequest':
+        assert isinstance(obj, dict)
+        key = from_str(obj.get("key"))
+        operation = _SettingsEditOperation(obj.get("operation"))
+        repo_root = from_str(obj.get("repoRoot"))
+        scope = _RepoSettingsEditScope(obj.get("scope"))
+        value = obj.get("value")
+        return _RepoSettingsEditRequest(key, operation, repo_root, scope, value)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["key"] = from_str(self.key)
+        result["operation"] = to_enum(_SettingsEditOperation, self.operation)
+        result["repoRoot"] = from_str(self.repo_root)
+        result["scope"] = to_enum(_RepoSettingsEditScope, self.scope)
+        if self.value is not None:
+            result["value"] = self.value
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class ResponseFormat:
@@ -28303,6 +33715,59 @@ def to_dict(self) -> dict:
             result["proxy"] = from_union([lambda x: to_class(SandboxConfigUserPolicyNetworkProxy, x), from_none], self.proxy)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class SandboxCredentialSuggestionsResult:
+    """Possible unconfigured secrets in the sandbox shell environment, sorted by variable name,
+    with no secret values.
+    """
+    suggestions: list[SandboxCredentialSuggestion]
+    """Candidates for user review. Empty when sandboxing is disabled or no unconfigured
+    candidates are present.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'SandboxCredentialSuggestionsResult':
+        assert isinstance(obj, dict)
+        suggestions = from_list(SandboxCredentialSuggestion.from_dict, obj.get("suggestions"))
+        return SandboxCredentialSuggestionsResult(suggestions)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["suggestions"] = from_list(lambda x: to_class(SandboxCredentialSuggestion, x), self.suggestions)
+        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 _SandboxFilterPickerCandidatesParams:
+    """A batch of file-picker candidates to check against a prepared policy."""
+
+    candidates: list[_SandboxPickerCandidate]
+    """The candidates to check, in the order the answers are returned."""
+
+    cwd: str
+    """The session's working directory, matching the one the policy was prepared from."""
+
+    sandbox: Any = None
+    """The policy returned by `sandbox.preparePickerPolicy`. Omitted keeps every candidate."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_SandboxFilterPickerCandidatesParams':
+        assert isinstance(obj, dict)
+        candidates = from_list(_SandboxPickerCandidate.from_dict, obj.get("candidates"))
+        cwd = from_str(obj.get("cwd"))
+        sandbox = obj.get("sandbox")
+        return _SandboxFilterPickerCandidatesParams(candidates, cwd, sandbox)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["candidates"] = from_list(lambda x: to_class(_SandboxPickerCandidate, x), self.candidates)
+        result["cwd"] = from_str(self.cwd)
+        if self.sandbox is not None:
+            result["sandbox"] = self.sandbox
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class SandboxHostSupport:
@@ -28518,6 +33983,28 @@ def to_dict(self) -> dict:
             result["errors"] = from_union([lambda x: from_list(from_str, x), from_none], self.errors)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class SessionMCPSetConnectedIDEInfoParams:
+    """Records which IDE the host is connected to, or clears it."""
+
+    ide: SessionConnectedIDEInfo | None = None
+    """The connected IDE. Null or omitted clears the recorded IDE, which is how a host reports
+    that it is disconnected.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'SessionMCPSetConnectedIDEInfoParams':
+        assert isinstance(obj, dict)
+        ide = from_union([SessionConnectedIDEInfo.from_dict, from_none], obj.get("ide"))
+        return SessionMCPSetConnectedIDEInfoParams(ide)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        if self.ide is not None:
+            result["ide"] = from_union([lambda x: to_class(SessionConnectedIDEInfo, x), from_none], self.ide)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class SessionFSError:
@@ -28914,6 +34401,252 @@ def to_dict(self) -> dict:
             result["message"] = from_union([from_str, from_none], self.message)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class SessionQuotaGetResult:
+    """The incumbent session-owned quota and account projection."""
+
+    can_signup_for_copilot_free: bool
+    """Whether the account can sign up for Copilot Free."""
+
+    delegate_available: bool
+    """Whether the account can delegate tasks to GitHub."""
+
+    dynamic_workflows_enabled: bool
+    """Whether dynamic workflows are enabled for the active account."""
+
+    dynamic_workflows_ui_visible: bool
+    """Whether dynamic workflows are visible under the session's feature flags."""
+
+    is_free_user: bool
+    """Whether the account uses the free limited Copilot plan."""
+
+    is_tbb_user: bool
+    """Whether the account uses token-based billing."""
+
+    model_cost_column_visible: bool
+    """Whether model cost columns should be shown."""
+
+    plan_tier: SessionQuotaPlanTier
+    """Resolved Copilot plan tier."""
+
+    premium_requests_billable: bool
+    """Whether premium-request costs are billable."""
+
+    snapshots: dict[str, SessionQuotaSnapshot]
+    """Known quota snapshots, keyed by the provider's quota type."""
+
+    delegate_warning: SessionQuotaDelegateWarning | None = None
+    """Existing delegation warning for a free account."""
+
+    provider_quotas: list[ProviderQuotaState] | None = None
+    """Provider-owned account quota state, including snapshots without numeric balances."""
+
+    upgrade_url: str | None = None
+    """Upgrade link for a free account."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'SessionQuotaGetResult':
+        assert isinstance(obj, dict)
+        can_signup_for_copilot_free = from_bool(obj.get("canSignupForCopilotFree"))
+        delegate_available = from_bool(obj.get("delegateAvailable"))
+        dynamic_workflows_enabled = from_bool(obj.get("dynamicWorkflowsEnabled"))
+        dynamic_workflows_ui_visible = from_bool(obj.get("dynamicWorkflowsUiVisible"))
+        is_free_user = from_bool(obj.get("isFreeUser"))
+        is_tbb_user = from_bool(obj.get("isTbbUser"))
+        model_cost_column_visible = from_bool(obj.get("modelCostColumnVisible"))
+        plan_tier = SessionQuotaPlanTier(obj.get("planTier"))
+        premium_requests_billable = from_bool(obj.get("premiumRequestsBillable"))
+        snapshots = from_dict(SessionQuotaSnapshot.from_dict, obj.get("snapshots"))
+        delegate_warning = from_union([SessionQuotaDelegateWarning.from_dict, from_none], obj.get("delegateWarning"))
+        provider_quotas = from_union([lambda x: from_list(ProviderQuotaState.from_dict, x), from_none], obj.get("providerQuotas"))
+        upgrade_url = from_union([from_str, from_none], obj.get("upgradeUrl"))
+        return SessionQuotaGetResult(can_signup_for_copilot_free, delegate_available, dynamic_workflows_enabled, dynamic_workflows_ui_visible, is_free_user, is_tbb_user, model_cost_column_visible, plan_tier, premium_requests_billable, snapshots, delegate_warning, provider_quotas, upgrade_url)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["canSignupForCopilotFree"] = from_bool(self.can_signup_for_copilot_free)
+        result["delegateAvailable"] = from_bool(self.delegate_available)
+        result["dynamicWorkflowsEnabled"] = from_bool(self.dynamic_workflows_enabled)
+        result["dynamicWorkflowsUiVisible"] = from_bool(self.dynamic_workflows_ui_visible)
+        result["isFreeUser"] = from_bool(self.is_free_user)
+        result["isTbbUser"] = from_bool(self.is_tbb_user)
+        result["modelCostColumnVisible"] = from_bool(self.model_cost_column_visible)
+        result["planTier"] = to_enum(SessionQuotaPlanTier, self.plan_tier)
+        result["premiumRequestsBillable"] = from_bool(self.premium_requests_billable)
+        result["snapshots"] = from_dict(lambda x: to_class(SessionQuotaSnapshot, x), self.snapshots)
+        if self.delegate_warning is not None:
+            result["delegateWarning"] = from_union([lambda x: to_class(SessionQuotaDelegateWarning, x), from_none], self.delegate_warning)
+        if self.provider_quotas is not None:
+            result["providerQuotas"] = from_union([lambda x: from_list(lambda x: to_class(ProviderQuotaState, x), x), from_none], self.provider_quotas)
+        if self.upgrade_url is not None:
+            result["upgradeUrl"] = from_union([from_str, from_none], self.upgrade_url)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class SessionQuotaProjection:
+    """The incumbent session-owned quota and account projection."""
+
+    can_signup_for_copilot_free: bool
+    """Whether the account can sign up for Copilot Free."""
+
+    delegate_available: bool
+    """Whether the account can delegate tasks to GitHub."""
+
+    dynamic_workflows_enabled: bool
+    """Whether dynamic workflows are enabled for the active account."""
+
+    dynamic_workflows_ui_visible: bool
+    """Whether dynamic workflows are visible under the session's feature flags."""
+
+    is_free_user: bool
+    """Whether the account uses the free limited Copilot plan."""
+
+    is_tbb_user: bool
+    """Whether the account uses token-based billing."""
+
+    model_cost_column_visible: bool
+    """Whether model cost columns should be shown."""
+
+    plan_tier: SessionQuotaPlanTier
+    """Resolved Copilot plan tier."""
+
+    premium_requests_billable: bool
+    """Whether premium-request costs are billable."""
+
+    snapshots: dict[str, SessionQuotaSnapshot]
+    """Known quota snapshots, keyed by the provider's quota type."""
+
+    delegate_warning: SessionQuotaDelegateWarning | None = None
+    """Existing delegation warning for a free account."""
+
+    provider_quotas: list[ProviderQuotaState] | None = None
+    """Provider-owned account quota state, including snapshots without numeric balances."""
+
+    upgrade_url: str | None = None
+    """Upgrade link for a free account."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'SessionQuotaProjection':
+        assert isinstance(obj, dict)
+        can_signup_for_copilot_free = from_bool(obj.get("canSignupForCopilotFree"))
+        delegate_available = from_bool(obj.get("delegateAvailable"))
+        dynamic_workflows_enabled = from_bool(obj.get("dynamicWorkflowsEnabled"))
+        dynamic_workflows_ui_visible = from_bool(obj.get("dynamicWorkflowsUiVisible"))
+        is_free_user = from_bool(obj.get("isFreeUser"))
+        is_tbb_user = from_bool(obj.get("isTbbUser"))
+        model_cost_column_visible = from_bool(obj.get("modelCostColumnVisible"))
+        plan_tier = SessionQuotaPlanTier(obj.get("planTier"))
+        premium_requests_billable = from_bool(obj.get("premiumRequestsBillable"))
+        snapshots = from_dict(SessionQuotaSnapshot.from_dict, obj.get("snapshots"))
+        delegate_warning = from_union([SessionQuotaDelegateWarning.from_dict, from_none], obj.get("delegateWarning"))
+        provider_quotas = from_union([lambda x: from_list(ProviderQuotaState.from_dict, x), from_none], obj.get("providerQuotas"))
+        upgrade_url = from_union([from_str, from_none], obj.get("upgradeUrl"))
+        return SessionQuotaProjection(can_signup_for_copilot_free, delegate_available, dynamic_workflows_enabled, dynamic_workflows_ui_visible, is_free_user, is_tbb_user, model_cost_column_visible, plan_tier, premium_requests_billable, snapshots, delegate_warning, provider_quotas, upgrade_url)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["canSignupForCopilotFree"] = from_bool(self.can_signup_for_copilot_free)
+        result["delegateAvailable"] = from_bool(self.delegate_available)
+        result["dynamicWorkflowsEnabled"] = from_bool(self.dynamic_workflows_enabled)
+        result["dynamicWorkflowsUiVisible"] = from_bool(self.dynamic_workflows_ui_visible)
+        result["isFreeUser"] = from_bool(self.is_free_user)
+        result["isTbbUser"] = from_bool(self.is_tbb_user)
+        result["modelCostColumnVisible"] = from_bool(self.model_cost_column_visible)
+        result["planTier"] = to_enum(SessionQuotaPlanTier, self.plan_tier)
+        result["premiumRequestsBillable"] = from_bool(self.premium_requests_billable)
+        result["snapshots"] = from_dict(lambda x: to_class(SessionQuotaSnapshot, x), self.snapshots)
+        if self.delegate_warning is not None:
+            result["delegateWarning"] = from_union([lambda x: to_class(SessionQuotaDelegateWarning, x), from_none], self.delegate_warning)
+        if self.provider_quotas is not None:
+            result["providerQuotas"] = from_union([lambda x: from_list(lambda x: to_class(ProviderQuotaState, x), x), from_none], self.provider_quotas)
+        if self.upgrade_url is not None:
+            result["upgradeUrl"] = from_union([from_str, from_none], self.upgrade_url)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class SessionQuotaRefreshResult:
+    """The incumbent session-owned quota and account projection."""
+
+    can_signup_for_copilot_free: bool
+    """Whether the account can sign up for Copilot Free."""
+
+    delegate_available: bool
+    """Whether the account can delegate tasks to GitHub."""
+
+    dynamic_workflows_enabled: bool
+    """Whether dynamic workflows are enabled for the active account."""
+
+    dynamic_workflows_ui_visible: bool
+    """Whether dynamic workflows are visible under the session's feature flags."""
+
+    is_free_user: bool
+    """Whether the account uses the free limited Copilot plan."""
+
+    is_tbb_user: bool
+    """Whether the account uses token-based billing."""
+
+    model_cost_column_visible: bool
+    """Whether model cost columns should be shown."""
+
+    plan_tier: SessionQuotaPlanTier
+    """Resolved Copilot plan tier."""
+
+    premium_requests_billable: bool
+    """Whether premium-request costs are billable."""
+
+    snapshots: dict[str, SessionQuotaSnapshot]
+    """Known quota snapshots, keyed by the provider's quota type."""
+
+    delegate_warning: SessionQuotaDelegateWarning | None = None
+    """Existing delegation warning for a free account."""
+
+    provider_quotas: list[ProviderQuotaState] | None = None
+    """Provider-owned account quota state, including snapshots without numeric balances."""
+
+    upgrade_url: str | None = None
+    """Upgrade link for a free account."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'SessionQuotaRefreshResult':
+        assert isinstance(obj, dict)
+        can_signup_for_copilot_free = from_bool(obj.get("canSignupForCopilotFree"))
+        delegate_available = from_bool(obj.get("delegateAvailable"))
+        dynamic_workflows_enabled = from_bool(obj.get("dynamicWorkflowsEnabled"))
+        dynamic_workflows_ui_visible = from_bool(obj.get("dynamicWorkflowsUiVisible"))
+        is_free_user = from_bool(obj.get("isFreeUser"))
+        is_tbb_user = from_bool(obj.get("isTbbUser"))
+        model_cost_column_visible = from_bool(obj.get("modelCostColumnVisible"))
+        plan_tier = SessionQuotaPlanTier(obj.get("planTier"))
+        premium_requests_billable = from_bool(obj.get("premiumRequestsBillable"))
+        snapshots = from_dict(SessionQuotaSnapshot.from_dict, obj.get("snapshots"))
+        delegate_warning = from_union([SessionQuotaDelegateWarning.from_dict, from_none], obj.get("delegateWarning"))
+        provider_quotas = from_union([lambda x: from_list(ProviderQuotaState.from_dict, x), from_none], obj.get("providerQuotas"))
+        upgrade_url = from_union([from_str, from_none], obj.get("upgradeUrl"))
+        return SessionQuotaRefreshResult(can_signup_for_copilot_free, delegate_available, dynamic_workflows_enabled, dynamic_workflows_ui_visible, is_free_user, is_tbb_user, model_cost_column_visible, plan_tier, premium_requests_billable, snapshots, delegate_warning, provider_quotas, upgrade_url)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["canSignupForCopilotFree"] = from_bool(self.can_signup_for_copilot_free)
+        result["delegateAvailable"] = from_bool(self.delegate_available)
+        result["dynamicWorkflowsEnabled"] = from_bool(self.dynamic_workflows_enabled)
+        result["dynamicWorkflowsUiVisible"] = from_bool(self.dynamic_workflows_ui_visible)
+        result["isFreeUser"] = from_bool(self.is_free_user)
+        result["isTbbUser"] = from_bool(self.is_tbb_user)
+        result["modelCostColumnVisible"] = from_bool(self.model_cost_column_visible)
+        result["planTier"] = to_enum(SessionQuotaPlanTier, self.plan_tier)
+        result["premiumRequestsBillable"] = from_bool(self.premium_requests_billable)
+        result["snapshots"] = from_dict(lambda x: to_class(SessionQuotaSnapshot, x), self.snapshots)
+        if self.delegate_warning is not None:
+            result["delegateWarning"] = from_union([lambda x: to_class(SessionQuotaDelegateWarning, x), from_none], self.delegate_warning)
+        if self.provider_quotas is not None:
+            result["providerQuotas"] = from_union([lambda x: from_list(lambda x: to_class(ProviderQuotaState, x), x), from_none], self.provider_quotas)
+        if self.upgrade_url is not None:
+            result["upgradeUrl"] = from_union([from_str, from_none], self.upgrade_url)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class SessionSettingsJobSnapshot:
@@ -29091,6 +34824,52 @@ def to_dict(self) -> dict:
             result["status"] = from_union([lambda x: to_enum(SessionVisibilityStatus, x), from_none], self.status)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class SessionsCreateWorkspaceRequest:
+    """Identity, state location and starting context for a workspace record."""
+
+    convention: str
+    """`windows` (any letter case) selects Windows path rules. Any other value selects POSIX
+    path rules.
+    """
+    session_id: str
+    """Session ID the workspace record belongs to"""
+
+    session_state_path: str
+    """Directory the session's state is written under when no session filesystem provider is
+    configured. Ignored when a provider is configured; the provider's session state path is
+    used instead.
+    """
+    context: SessionWorkingDirectoryContextWithClient | None = None
+    """Starting working-directory context. The record keeps `cwd`, `gitRoot`, `repository`,
+    `hostType`, `branch`, and `clientName`. Other fields, including `repositoryHost`,
+    `headCommit`, and `baseCommit`, are ignored. `hostType` must be `github` or `ado`.
+    """
+    name: str | None = None
+    """User-supplied display name for the workspace"""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'SessionsCreateWorkspaceRequest':
+        assert isinstance(obj, dict)
+        convention = from_str(obj.get("convention"))
+        session_id = from_str(obj.get("sessionId"))
+        session_state_path = from_str(obj.get("sessionStatePath"))
+        context = from_union([SessionWorkingDirectoryContextWithClient.from_dict, from_none], obj.get("context"))
+        name = from_union([from_str, from_none], obj.get("name"))
+        return SessionsCreateWorkspaceRequest(convention, session_id, session_state_path, context, name)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["convention"] = from_str(self.convention)
+        result["sessionId"] = from_str(self.session_id)
+        result["sessionStatePath"] = from_str(self.session_state_path)
+        if self.context is not None:
+            result["context"] = from_union([lambda x: to_class(SessionWorkingDirectoryContextWithClient, x), from_none], self.context)
+        if self.name is not None:
+            result["name"] = from_union([from_str, from_none], self.name)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class SessionsClientMetadataEntry:
@@ -29213,6 +34992,9 @@ class AgentInfo:
     disable_model_invocation: bool | None = None
     """Whether model-driven invocation is disabled for this agent."""
 
+    hooks: dict[str, list[Any]] | None = None
+    """Declarative hook actions keyed by event name, executed only while this agent is active."""
+
     mcp_servers: dict[str, Any] | None = None
     """MCP server configurations attached to this agent, keyed by server name. Server config
     shape mirrors the MCP `mcpServers` schema.
@@ -29262,6 +35044,7 @@ def from_dict(obj: Any) -> 'AgentInfo':
         id = from_str(obj.get("id"))
         name = from_str(obj.get("name"))
         disable_model_invocation = from_union([from_bool, from_none], obj.get("disableModelInvocation"))
+        hooks = from_union([lambda x: from_dict(lambda x: from_list(lambda x: x, x), x), from_none], obj.get("hooks"))
         mcp_servers = from_union([lambda x: from_dict(lambda x: x, x), from_none], obj.get("mcpServers"))
         model = from_union([from_str, from_none], obj.get("model"))
         model_policy = from_union([AgentModelPolicy, from_none], obj.get("modelPolicy"))
@@ -29273,7 +35056,7 @@ def from_dict(obj: Any) -> 'AgentInfo':
         source = from_union([AgentInfoSource, from_none], obj.get("source"))
         tools = from_union([lambda x: from_list(from_str, x), from_none], obj.get("tools"))
         user_invocable = from_union([from_bool, from_none], obj.get("userInvocable"))
-        return AgentInfo(description, display_name, id, name, disable_model_invocation, mcp_servers, model, model_policy, models, path, prompt, reasoning_effort, skills, source, tools, user_invocable)
+        return AgentInfo(description, display_name, id, name, disable_model_invocation, hooks, mcp_servers, model, model_policy, models, path, prompt, reasoning_effort, skills, source, tools, user_invocable)
 
     def to_dict(self) -> dict:
         result: dict = {}
@@ -29283,6 +35066,8 @@ def to_dict(self) -> dict:
         result["name"] = from_str(self.name)
         if self.disable_model_invocation is not None:
             result["disableModelInvocation"] = from_union([from_bool, from_none], self.disable_model_invocation)
+        if self.hooks is not None:
+            result["hooks"] = from_union([lambda x: from_dict(lambda x: from_list(lambda x: x, x), x), from_none], self.hooks)
         if self.mcp_servers is not None:
             result["mcpServers"] = from_union([lambda x: from_dict(lambda x: x, x), from_none], self.mcp_servers)
         if self.model is not None:
@@ -29882,6 +35667,69 @@ 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.
+# Internal: this type is an internal SDK API and is not part of the public surface.
+@dataclass
+class _UserSettingsMigrateStaffLogLevelOnceResult:
+    """The outcome of the one-time staff log-level migration."""
+
+    status: StaffLogLevelMigrationStatus
+    """What the migration did. Only `refreshed` can have changed the persisted settings."""
+
+    completed_at: str | None = None
+    """When the migration was recorded as done, as an ISO-8601 timestamp. Absent only for
+    `ineligible`, which records nothing.
+    """
+    settings: dict[str, Any] | None = None
+    """The settings document as it stands after the migration, keyed by setting name. Present
+    only for `refreshed`, and only when the document could be re-read cleanly.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_UserSettingsMigrateStaffLogLevelOnceResult':
+        assert isinstance(obj, dict)
+        status = StaffLogLevelMigrationStatus(obj.get("status"))
+        completed_at = from_union([from_str, from_none], obj.get("completedAt"))
+        settings = from_union([lambda x: from_dict(lambda x: x, x), from_none], obj.get("settings"))
+        return _UserSettingsMigrateStaffLogLevelOnceResult(status, completed_at, settings)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["status"] = to_enum(StaffLogLevelMigrationStatus, self.status)
+        if self.completed_at is not None:
+            result["completedAt"] = from_union([from_str, from_none], self.completed_at)
+        if self.settings is not None:
+            result["settings"] = from_union([lambda x: from_dict(lambda x: x, x), from_none], self.settings)
+        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 _UserSettingsMigrateStaffUpdateChannelOnceResult:
+    """The outcome of the one-time staff update-channel migration."""
+
+    status: StaffUpdateChannelMigrationStatus
+    """What the migration did. Only `migrated` means the persisted settings changed."""
+
+    completed_at: str | None = None
+    """When the migration was recorded as done, as an ISO-8601 timestamp. Absent only for
+    `ineligible`, which records nothing.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_UserSettingsMigrateStaffUpdateChannelOnceResult':
+        assert isinstance(obj, dict)
+        status = StaffUpdateChannelMigrationStatus(obj.get("status"))
+        completed_at = from_union([from_str, from_none], obj.get("completedAt"))
+        return _UserSettingsMigrateStaffUpdateChannelOnceResult(status, completed_at)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["status"] = to_enum(StaffUpdateChannelMigrationStatus, self.status)
+        if self.completed_at is not None:
+            result["completedAt"] = from_union([from_str, from_none], self.completed_at)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class TaskAgentProgress:
@@ -30787,69 +36635,269 @@ def to_dict(self) -> dict:
 
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
-class UsageMetricsModelMetric:
-    """Per-model usage metrics, including request counts/costs, token usage, nano-AI units, and
-    per-token-type details.
+class UserSettingsGetResult:
+    """Per-key metadata for every known user setting in settings.json, including settings left
+    at their default. Excludes repository- and enterprise-managed overrides.
+    """
+    settings: dict[str, UserSettingMetadata]
+    """Every known user setting keyed by setting name, each with its effective value, default,
+    and whether it is at the default.
     """
-    requests: UsageMetricsModelMetricRequests
-    """Request count and cost metrics for this model"""
 
-    usage: UsageMetricsModelMetricUsage
-    """Token usage metrics for this model"""
+    @staticmethod
+    def from_dict(obj: Any) -> 'UserSettingsGetResult':
+        assert isinstance(obj, dict)
+        settings = from_dict(UserSettingMetadata.from_dict, obj.get("settings"))
+        return UserSettingsGetResult(settings)
 
-    cache_expires_at: datetime | None = None
-    """Latest known prompt-cache expiration for this model. A timestamp in the past indicates
-    that the observed cache has expired.
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["settings"] = from_dict(lambda x: to_class(UserSettingMetadata, x), self.settings)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class UserSettingsApplyTopKeyResult:
+    """Outcome of validating and writing one top-level setting subtree."""
+
+    status: str
+    """`ok` when the value was written, `validation-error` when it was rejected before any
+    write, `write-error` when validation passed but the write failed.
     """
-    token_details: dict[str, UsageMetricsModelMetricTokenDetail] | None = None
-    """Token count details per type"""
+    error: str | None = None
+    """Why the write failed, present only when `status` is `write-error`."""
 
-    total_nano_aiu: float | None = None
-    """Accumulated nano-AI units cost for this model"""
+    issues: list[UserSettingsValidationIssue] | None = None
+    """Problems found, present only when `status` is `validation-error`."""
 
     @staticmethod
-    def from_dict(obj: Any) -> 'UsageMetricsModelMetric':
+    def from_dict(obj: Any) -> 'UserSettingsApplyTopKeyResult':
         assert isinstance(obj, dict)
-        requests = UsageMetricsModelMetricRequests.from_dict(obj.get("requests"))
-        usage = UsageMetricsModelMetricUsage.from_dict(obj.get("usage"))
-        cache_expires_at = from_union([from_datetime, from_none], obj.get("cacheExpiresAt"))
-        token_details = from_union([lambda x: from_dict(UsageMetricsModelMetricTokenDetail.from_dict, x), from_none], obj.get("tokenDetails"))
-        total_nano_aiu = from_union([from_float, from_none], obj.get("totalNanoAiu"))
-        return UsageMetricsModelMetric(requests, usage, cache_expires_at, token_details, total_nano_aiu)
+        status = from_str(obj.get("status"))
+        error = from_union([from_none, from_str], obj.get("error"))
+        issues = from_union([lambda x: from_list(UserSettingsValidationIssue.from_dict, x), from_none], obj.get("issues"))
+        return UserSettingsApplyTopKeyResult(status, error, issues)
 
     def to_dict(self) -> dict:
         result: dict = {}
-        result["requests"] = to_class(UsageMetricsModelMetricRequests, self.requests)
-        result["usage"] = to_class(UsageMetricsModelMetricUsage, self.usage)
-        if self.cache_expires_at is not None:
-            result["cacheExpiresAt"] = from_union([lambda x: x.isoformat(), from_none], self.cache_expires_at)
-        if self.token_details is not None:
-            result["tokenDetails"] = from_union([lambda x: from_dict(lambda x: to_class(UsageMetricsModelMetricTokenDetail, 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["status"] = from_str(self.status)
+        if self.error is not None:
+            result["error"] = from_union([from_none, from_str], self.error)
+        if self.issues is not None:
+            result["issues"] = from_union([lambda x: from_list(lambda x: to_class(UserSettingsValidationIssue, x), x), from_none], self.issues)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
-class UserSettingsGetResult:
-    """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.
+class UserSettingsValidateResult:
+    """Outcome of validating one top-level setting subtree."""
+
+    ok: bool
+    """True when the subtree is valid."""
+
+    issues: list[UserSettingsValidationIssue] | None = None
+    """Problems found, empty when `ok` is true."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'UserSettingsValidateResult':
+        assert isinstance(obj, dict)
+        ok = from_bool(obj.get("ok"))
+        issues = from_union([lambda x: from_list(UserSettingsValidationIssue.from_dict, x), from_none], obj.get("issues"))
+        return UserSettingsValidateResult(ok, issues)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["ok"] = from_bool(self.ok)
+        if self.issues is not None:
+            result["issues"] = from_union([lambda x: from_list(lambda x: to_class(UserSettingsValidationIssue, x), x), from_none], self.issues)
+        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 _UserSettingsMigrateStaffLogLevelOnceRequest:
+    """Selects the configuration directory to run the one-time staff log-level migration
+    against, and supplies the caller's record of whether it has already run.
     """
-    settings: dict[str, UserSettingMetadata]
-    """Every known user setting keyed by setting name, each with its effective value, default,
-    and whether it is at the default.
+    context: UserSettingsHostContext
+    """The configuration directory, home directory and environment to resolve the settings and
+    global-state documents from. A host that scopes a session to its own Copilot home must
+    pass that directory here, or the migration is evaluated against the server's own home
+    instead.
+    """
+    cached_completed_at: str | None = None
+    """When the caller last recorded this migration, as an ISO-8601 timestamp. Supplying it lets
+    the runtime answer `current` without re-running the evaluation.
     """
 
     @staticmethod
-    def from_dict(obj: Any) -> 'UserSettingsGetResult':
+    def from_dict(obj: Any) -> '_UserSettingsMigrateStaffLogLevelOnceRequest':
         assert isinstance(obj, dict)
-        settings = from_dict(UserSettingMetadata.from_dict, obj.get("settings"))
-        return UserSettingsGetResult(settings)
+        context = UserSettingsHostContext.from_dict(obj.get("context"))
+        cached_completed_at = from_union([from_str, from_none], obj.get("cachedCompletedAt"))
+        return _UserSettingsMigrateStaffLogLevelOnceRequest(context, cached_completed_at)
 
     def to_dict(self) -> dict:
         result: dict = {}
-        result["settings"] = from_dict(lambda x: to_class(UserSettingMetadata, x), self.settings)
+        result["context"] = to_class(UserSettingsHostContext, self.context)
+        if self.cached_completed_at is not None:
+            result["cachedCompletedAt"] = from_union([from_str, from_none], self.cached_completed_at)
+        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 _UserSettingsResetStaffModelSelectionOnceRequest:
+    """Selects the configuration directory to run the one-time staff model-selection reset
+    against, and supplies the caller's record of whether it has already run.
+    """
+    context: UserSettingsHostContext
+    """The configuration directory, home directory and environment to resolve the settings and
+    global-state documents from. A host that scopes a session to its own Copilot home must
+    pass that directory here, or the reset is evaluated against the server's own home instead.
+    """
+    staff: bool | None = None
+    """Whether the signed-in account is a staff account. The reset applies only to staff, so
+    anything other than `true` returns `didReset: false` without touching the settings
+    document.
+    """
+    staff_model_reset_at: str | None = None
+    """When the caller last recorded this reset, as an ISO-8601 timestamp. A timestamp at or
+    after the cutoff means the reset already ran and is returned unchanged.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_UserSettingsResetStaffModelSelectionOnceRequest':
+        assert isinstance(obj, dict)
+        context = UserSettingsHostContext.from_dict(obj.get("context"))
+        staff = from_union([from_bool, from_none], obj.get("staff"))
+        staff_model_reset_at = from_union([from_str, from_none], obj.get("staffModelResetAt"))
+        return _UserSettingsResetStaffModelSelectionOnceRequest(context, staff, staff_model_reset_at)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["context"] = to_class(UserSettingsHostContext, self.context)
+        if self.staff is not None:
+            result["staff"] = from_union([from_bool, from_none], self.staff)
+        if self.staff_model_reset_at is not None:
+            result["staffModelResetAt"] = from_union([from_str, from_none], self.staff_model_reset_at)
+        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 _UserSettingsUnknownKeysWarningRequest:
+    """Selects the configuration directory whose user settings document should be inspected for
+    unrecognized top-level keys.
+    """
+    context: UserSettingsHostContext
+    """The configuration directory, home directory and environment to resolve the settings
+    document from. A host that scopes a session to its own Copilot home must pass that
+    directory here, or the server's own home is inspected instead.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_UserSettingsUnknownKeysWarningRequest':
+        assert isinstance(obj, dict)
+        context = UserSettingsHostContext.from_dict(obj.get("context"))
+        return _UserSettingsUnknownKeysWarningRequest(context)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["context"] = to_class(UserSettingsHostContext, self.context)
+        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 _UserSettingsMigrateObsoleteOnDiskResult:
+    """The outcome of the one-time obsolete-settings cleanup."""
+
+    status: _UserSettingsMigrateObsoleteOnDiskStatus
+    """What the cleanup did. Only `changed` rewrote the document. The cleaned settings are not
+    returned here: the document is written before this replies, so `user.settings.load` reads
+    it authoritatively.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_UserSettingsMigrateObsoleteOnDiskResult':
+        assert isinstance(obj, dict)
+        status = _UserSettingsMigrateObsoleteOnDiskStatus(obj.get("status"))
+        return _UserSettingsMigrateObsoleteOnDiskResult(status)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["status"] = to_enum(_UserSettingsMigrateObsoleteOnDiskStatus, self.status)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class UserSettingsProblem:
+    """One setting that will not take effect, and why."""
+
+    category: str
+    """Coarse grouping for the problem, for a caller that presents problems in sections."""
+
+    explanation: str
+    """Why the setting will not take effect. Never contains the setting's value, which may be a
+    token or another secret.
+    """
+    id: str
+    """Stable identifier for this problem within the reported set, so a caller can track a
+    selection across refreshes.
+    """
+    kind: str
+    """What is wrong in machine-readable form, for a caller that wants to branch rather than
+    display.
+    """
+    source: UserSettingsProblemLocation
+    """The settings layer the problem was found in."""
+
+    raw_key: str | None = None
+    """The offending key as written in the file, when the problem is attributable to a single
+    key. Absent when the whole file is at fault.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'UserSettingsProblem':
+        assert isinstance(obj, dict)
+        category = from_str(obj.get("category"))
+        explanation = from_str(obj.get("explanation"))
+        id = from_str(obj.get("id"))
+        kind = from_str(obj.get("kind"))
+        source = UserSettingsProblemLocation.from_dict(obj.get("source"))
+        raw_key = from_union([from_str, from_none], obj.get("rawKey"))
+        return UserSettingsProblem(category, explanation, id, kind, source, raw_key)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["category"] = from_str(self.category)
+        result["explanation"] = from_str(self.explanation)
+        result["id"] = from_str(self.id)
+        result["kind"] = from_str(self.kind)
+        result["source"] = to_class(UserSettingsProblemLocation, self.source)
+        if self.raw_key is not None:
+            result["rawKey"] = from_union([from_str, from_none], self.raw_key)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class UserSettingsProblemsRequest:
+    """The settings layers to diagnose."""
+
+    sources: list[UserSettingsProblemSource] | None = None
+    """Layers to diagnose, in the precedence order the caller applies them."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'UserSettingsProblemsRequest':
+        assert isinstance(obj, dict)
+        sources = from_union([lambda x: from_list(UserSettingsProblemSource.from_dict, x), from_none], obj.get("sources"))
+        return UserSettingsProblemsRequest(sources)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        if self.sources is not None:
+            result["sources"] = from_union([lambda x: from_list(lambda x: to_class(UserSettingsProblemSource, x), x), from_none], self.sources)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
@@ -31219,6 +37267,11 @@ class WorkspaceDiffFileChange:
     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).
     """
+    contents: WorkspaceDiffContents | None = field(default=None, kw_only=True)
+    """Full text used for this patch, only when includeContents was requested for session mode.
+    Omitted for binary, oversized or unavailable contents, and for fallback results. Read
+    isFallback and isTruncated before treating an absent value as a missing file.
+    """
     is_truncated: bool | None = None
     """Whether the diff content was omitted because it exceeded the per-file size limit."""
 
@@ -31231,15 +37284,18 @@ def from_dict(obj: Any) -> 'WorkspaceDiffFileChange':
         change_type = WorkspaceDiffFileChangeType(obj.get("changeType"))
         diff = from_str(obj.get("diff"))
         path = from_str(obj.get("path"))
+        contents = from_union([WorkspaceDiffContents.from_dict, from_none], obj.get("contents"))
         is_truncated = from_union([from_bool, from_none], obj.get("isTruncated"))
         old_path = from_union([from_str, from_none], obj.get("oldPath"))
-        return WorkspaceDiffFileChange(change_type, diff, path, is_truncated, old_path)
+        return WorkspaceDiffFileChange(change_type, diff, path, is_truncated, old_path, contents=contents)
 
     def to_dict(self) -> dict:
         result: dict = {}
         result["changeType"] = to_enum(WorkspaceDiffFileChangeType, self.change_type)
         result["diff"] = from_str(self.diff)
         result["path"] = from_str(self.path)
+        if self.contents is not None:
+            result["contents"] = from_union([lambda x: to_class(WorkspaceDiffContents, x), from_none], self.contents)
         if self.is_truncated is not None:
             result["isTruncated"] = from_union([from_bool, from_none], self.is_truncated)
         if self.old_path is not None:
@@ -31257,18 +37313,28 @@ class WorkspacesDiffRequest:
     ignore_whitespace: bool | None = None
     """When true, ignore whitespace-only changes (git `--ignore-all-space`). Defaults to false."""
 
+    include_contents: bool | None = field(default=None, kw_only=True)
+    """Include the full before/after text used to compute each session diff. Defaults to false;
+    true is accepted only for session mode. Existing capture/read limits still apply, and
+    binary or unavailable contents are not returned. This can substantially increase response
+    size.
+    """
+
     @staticmethod
     def from_dict(obj: Any) -> 'WorkspacesDiffRequest':
         assert isinstance(obj, dict)
         mode = WorkspaceDiffMode(obj.get("mode"))
         ignore_whitespace = from_union([from_bool, from_none], obj.get("ignoreWhitespace"))
-        return WorkspacesDiffRequest(mode, ignore_whitespace)
+        include_contents = from_union([from_bool, from_none], obj.get("includeContents"))
+        return WorkspacesDiffRequest(mode, ignore_whitespace, include_contents=include_contents)
 
     def to_dict(self) -> dict:
         result: dict = {}
         result["mode"] = to_enum(WorkspaceDiffMode, self.mode)
         if self.ignore_whitespace is not None:
             result["ignoreWhitespace"] = from_union([from_bool, from_none], self.ignore_whitespace)
+        if self.include_contents is not None:
+            result["includeContents"] = from_union([from_bool, from_none], self.include_contents)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
@@ -31294,63 +37360,60 @@ def to_dict(self) -> dict:
 
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
-class ConnectorSessionAccount:
-    """Session account selection."""
+class ConnectorDiscoveryCapabilities:
+    """Feature availability."""
 
-    account_id: str
-    """Opaque session-scoped account selection ID."""
+    api_version: int
+    """API version."""
 
-    auth_info: AuthIdentityMetadata
-    """Credential-free identity metadata."""
+    availability: ConnectorDiscoveryAvailability
+    """Availability."""
+
+    conditional_cache: bool
+    """Whether results are cached."""
+
+    opaque_account_selection: bool
+    """Whether accounts are selected by opaque ID."""
 
     @staticmethod
-    def from_dict(obj: Any) -> 'ConnectorSessionAccount':
+    def from_dict(obj: Any) -> 'ConnectorDiscoveryCapabilities':
         assert isinstance(obj, dict)
-        account_id = from_str(obj.get("accountId"))
-        auth_info = AuthIdentityMetadata.from_dict(obj.get("authInfo"))
-        return ConnectorSessionAccount(account_id, auth_info)
+        api_version = from_int(obj.get("apiVersion"))
+        availability = ConnectorDiscoveryAvailability(obj.get("availability"))
+        conditional_cache = from_bool(obj.get("conditionalCache"))
+        opaque_account_selection = from_bool(obj.get("opaqueAccountSelection"))
+        return ConnectorDiscoveryCapabilities(api_version, availability, conditional_cache, opaque_account_selection)
 
     def to_dict(self) -> dict:
         result: dict = {}
-        result["accountId"] = from_str(self.account_id)
-        result["authInfo"] = to_class(AuthIdentityMetadata, self.auth_info)
+        result["apiVersion"] = from_int(self.api_version)
+        result["availability"] = to_enum(ConnectorDiscoveryAvailability, self.availability)
+        result["conditionalCache"] = from_bool(self.conditional_cache)
+        result["opaqueAccountSelection"] = from_bool(self.opaque_account_selection)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
-class AuthReadValue:
-    """The read result, keyed by the same selector as the query."""
-
-    kind: AuthReadQueryKind
-    """Account read-datum variant discriminator."""
-
-    account: AccountStatus | None = None
-    """The active account, or absent when not logged in."""
+class ConnectorSessionAccount:
+    """Session account selection."""
 
-    status: AuthStatusDto | None = None
-    """The neutral authentication status summary."""
+    account_id: str
+    """Opaque session-scoped account selection ID."""
 
-    errors: list[AuthValidationError] | None = None
-    """Validation errors from the most recent authentication attempt."""
+    auth_info: AuthIdentityMetadata
+    """Credential-free identity metadata."""
 
     @staticmethod
-    def from_dict(obj: Any) -> 'AuthReadValue':
+    def from_dict(obj: Any) -> 'ConnectorSessionAccount':
         assert isinstance(obj, dict)
-        kind = AuthReadQueryKind(obj.get("kind"))
-        account = from_union([AccountStatus.from_dict, from_none], obj.get("account"))
-        status = from_union([AuthStatusDto.from_dict, from_none], obj.get("status"))
-        errors = from_union([lambda x: from_list(AuthValidationError.from_dict, x), from_none], obj.get("errors"))
-        return AuthReadValue(kind, account, status, errors)
+        account_id = from_str(obj.get("accountId"))
+        auth_info = AuthIdentityMetadata.from_dict(obj.get("authInfo"))
+        return ConnectorSessionAccount(account_id, auth_info)
 
     def to_dict(self) -> dict:
         result: dict = {}
-        result["kind"] = to_enum(AuthReadQueryKind, self.kind)
-        if self.account is not None:
-            result["account"] = from_union([lambda x: to_class(AccountStatus, x), from_none], self.account)
-        if self.status is not None:
-            result["status"] = from_union([lambda x: to_class(AuthStatusDto, x), from_none], self.status)
-        if self.errors is not None:
-            result["errors"] = from_union([lambda x: from_list(lambda x: to_class(AuthValidationError, x), x), from_none], self.errors)
+        result["accountId"] = from_str(self.account_id)
+        result["authInfo"] = to_class(AuthIdentityMetadata, self.auth_info)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
@@ -31521,6 +37584,38 @@ def to_dict(self) -> dict:
         result["ordering"] = from_int(self.ordering)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class AutoTierMetadata:
+    """Account-bound discovery metadata for the virtual `auto` model.
+
+    Ordered Auto routing preferences discovered for this session's account.
+    """
+    default_tier: str
+    """Provider-default preference, used only when no explicit preference exists."""
+
+    tiers: list[AutoTierDescriptor]
+    """Routing preferences in the server's presentation order."""
+
+    provider_id: str | None = None
+    """Provider that supplied this metadata, when the catalog is provider-attributed."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'AutoTierMetadata':
+        assert isinstance(obj, dict)
+        default_tier = from_str(obj.get("defaultTier"))
+        tiers = from_list(AutoTierDescriptor.from_dict, obj.get("tiers"))
+        provider_id = from_union([from_str, from_none], obj.get("providerId"))
+        return AutoTierMetadata(default_tier, tiers, provider_id)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["defaultTier"] = from_str(self.default_tier)
+        result["tiers"] = from_list(lambda x: to_class(AutoTierDescriptor, x), self.tiers)
+        if self.provider_id is not None:
+            result["providerId"] = from_union([from_str, from_none], self.provider_id)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class AutopilotObjectiveGetStateResult:
@@ -31621,6 +37716,57 @@ def to_dict(self) -> dict:
             result["visibility"] = from_union([lambda x: from_list(lambda x: to_enum(MCPToolUIVisibility, x), x), from_none], self.visibility)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class PendingExternalToolRequest:
+    """External tool call of the session or one of its sub-agents that is still waiting for
+    session.tools.handlePendingToolCall.
+    """
+    request_id: str
+    """Request ID to pass to session.tools.handlePendingToolCall"""
+
+    tool_call_id: str
+    """Tool call ID assigned to this external tool invocation"""
+
+    tool_name: str
+    """Name of the external tool to invoke"""
+
+    agent_id: str | None = None
+    """Sub-agent instance identifier (the envelope agentId of its events) of the agent that
+    issued the call; absent for calls issued by the root agent
+    """
+    arguments: Any = None
+    """Arguments to pass to the external tool"""
+
+    provider_id: str | None = None
+    """Stable identity of the provider that offered the tool, for hosts that route
+    extension-owned tools by provider
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'PendingExternalToolRequest':
+        assert isinstance(obj, dict)
+        request_id = from_str(obj.get("requestId"))
+        tool_call_id = from_str(obj.get("toolCallId"))
+        tool_name = from_str(obj.get("toolName"))
+        agent_id = from_union([from_str, from_none], obj.get("agentId"))
+        arguments = obj.get("arguments")
+        provider_id = from_union([from_str, from_none], obj.get("providerId"))
+        return PendingExternalToolRequest(request_id, tool_call_id, tool_name, agent_id, arguments, provider_id)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["requestId"] = from_str(self.request_id)
+        result["toolCallId"] = from_str(self.tool_call_id)
+        result["toolName"] = from_str(self.tool_name)
+        if self.agent_id is not None:
+            result["agentId"] = from_union([from_str, from_none], self.agent_id)
+        if self.arguments is not None:
+            result["arguments"] = self.arguments
+        if self.provider_id is not None:
+            result["providerId"] = from_union([from_str, from_none], self.provider_id)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class PermissionLocationAddToolApprovalParams:
@@ -32358,52 +38504,41 @@ def to_dict(self) -> dict:
 
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
-class AuthLoginStep:
-    """The first step of the flow.
+class AuthLoginResultDto:
+    """Login result. When status is needs-plaintext-consent or needs-account-selection, advance
+    with the user's decision to continue.
 
-    One step in an interactive login flow. The consumer acts on the step and calls advance to
-    proceed. Browser-open is encoded as two distinct steps by design: `open-url` is
-    CONSUMER-driven (the provider surfaces the authorize URL and the consumer opens it —
-    github.com/GHEC web), while `needs-interaction` is PROVIDER-driven (the provider opens
-    the browser or broker UI itself and does not surface a URL — Entra).
+    Result of an interactive login flow. Pending consent or account selection is not terminal.
     """
-    kind: AuthLoginStepKind
-    """Login flow step variant discriminator."""
-
-    url: str | None = None
-    """Authorize URL the consumer should open in a browser (consumer-driven browser-open)."""
-
-    prompt: str | None = None
-    """Prompt for the value the provider needs; the consumer supplies it as advance input (e.g.
-    a GitHub Enterprise Cloud host, *.ghe.com).
+    status: AuthLoginResultStatus
+    """Current disposition of the login, including pending user decisions."""
+    host: str | None = None
+    """Host that was signed in, when completed."""
+    login: str | None = None
+    """Login that was signed in, when completed."""
+    accounts: list[AuthLoginAccount] | None = None
+    """Available accounts when sign-in is awaiting account selection, ordered with Microsoft 365
+    first.
     """
-    result: AuthLoginResultDto | None = None
-    """The terminal login result."""
-
-    message: str | None = None
-    """Human-readable failure message."""
 
     @staticmethod
-    def from_dict(obj: Any) -> 'AuthLoginStep':
+    def from_dict(obj: Any) -> 'AuthLoginResultDto':
         assert isinstance(obj, dict)
-        kind = AuthLoginStepKind(obj.get("kind"))
-        url = from_union([from_str, from_none], obj.get("url"))
-        prompt = from_union([from_str, from_none], obj.get("prompt"))
-        result = from_union([AuthLoginResultDto.from_dict, from_none], obj.get("result"))
-        message = from_union([from_str, from_none], obj.get("message"))
-        return AuthLoginStep(kind, url, prompt, result, message)
+        status = AuthLoginResultStatus(obj.get("status"))
+        accounts = from_union([lambda x: from_list(AuthLoginAccount.from_dict, x), from_none], obj.get("accounts"))
+        host = from_union([from_str, from_none], obj.get("host"))
+        login = from_union([from_str, from_none], obj.get("login"))
+        return AuthLoginResultDto(status, host, login, accounts)
 
     def to_dict(self) -> dict:
         result: dict = {}
-        result["kind"] = to_enum(AuthLoginStepKind, self.kind)
-        if self.url is not None:
-            result["url"] = from_union([from_str, from_none], self.url)
-        if self.prompt is not None:
-            result["prompt"] = from_union([from_str, from_none], self.prompt)
-        if self.result is not None:
-            result["result"] = from_union([lambda x: to_class(AuthLoginResultDto, x), from_none], self.result)
-        if self.message is not None:
-            result["message"] = from_union([from_str, from_none], self.message)
+        result["status"] = to_enum(AuthLoginResultStatus, self.status)
+        if self.accounts is not None:
+            result["accounts"] = from_union([lambda x: from_list(lambda x: to_class(AuthLoginAccount, x), x), from_none], self.accounts)
+        if self.host is not None:
+            result["host"] = from_union([from_str, from_none], self.host)
+        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.
@@ -32606,6 +38741,30 @@ def to_dict(self) -> dict:
             result["trust"] = from_union([lambda x: (x).to_dict(), from_none], self.trust)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class ConnectorDiscoveryAccount:
+    """Eligible account."""
+
+    account_id: str
+    """Opaque account ID."""
+
+    auth_info: ConnectorDiscoveryAuthInfo
+    """Account metadata."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'ConnectorDiscoveryAccount':
+        assert isinstance(obj, dict)
+        account_id = from_str(obj.get("accountId"))
+        auth_info = ConnectorDiscoveryAuthInfo.from_dict(obj.get("authInfo"))
+        return ConnectorDiscoveryAccount(account_id, auth_info)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["accountId"] = from_str(self.account_id)
+        result["authInfo"] = to_class(ConnectorDiscoveryAuthInfo, self.auth_info)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class GitHubEnvironment:
@@ -32678,6 +38837,28 @@ def to_dict(self) -> dict:
             result["ownerType"] = from_union([from_str, from_none], self.owner_type)
         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 _GitHubRepositoryAtPathResult:
+    """The GitHub repository that owns the requested path, when the selected remote (`origin`,
+    else the first) is on a GitHub host.
+    """
+    repository: GitHubRepositoryIdentity | None = None
+    """Resolved repository identity, or null when the selected remote resolves to no GitHub host."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_GitHubRepositoryAtPathResult':
+        assert isinstance(obj, dict)
+        repository = from_union([GitHubRepositoryIdentity.from_dict, from_none], obj.get("repository"))
+        return _GitHubRepositoryAtPathResult(repository)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        if self.repository is not None:
+            result["repository"] = from_union([lambda x: to_class(GitHubRepositoryIdentity, x), from_none], self.repository)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class CustomizationsReloadResult:
@@ -33426,6 +39607,26 @@ def to_dict(self) -> dict:
             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.
+# Internal: this type is an internal SDK API and is not part of the public surface.
+@dataclass
+class _FeatureFlagsMetadataResult:
+    """Every feature flag this runtime declares, with the shape each one was declared with."""
+
+    flags: dict[str, _FeatureFlagMetadata]
+    """Declared feature flags keyed by flag name."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_FeatureFlagsMetadataResult':
+        assert isinstance(obj, dict)
+        flags = from_dict(_FeatureFlagMetadata.from_dict, obj.get("flags"))
+        return _FeatureFlagsMetadataResult(flags)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["flags"] = from_dict(lambda x: to_class(_FeatureFlagMetadata, x), self.flags)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class MCPOauthHandlePendingRequest:
@@ -33450,6 +39651,152 @@ def to_dict(self) -> dict:
         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 InstalledPlugin:
+    """Installed plugin record from global state, with marketplace, version, install time,
+    enabled state, cache path, and source.
+    """
+    enabled: bool
+    """Whether the plugin is currently enabled"""
+
+    installed_at: str
+    """Installation timestamp"""
+
+    marketplace: str
+    """Marketplace the plugin came from (empty string for direct repo installs)"""
+
+    name: str
+    """Plugin name"""
+
+    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)"""
+
+    source_sha: str | None = None
+    """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.
+    """
+    version: str | None = None
+    """Version installed (if available)"""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'InstalledPlugin':
+        assert isinstance(obj, dict)
+        enabled = from_bool(obj.get("enabled"))
+        installed_at = from_str(obj.get("installed_at"))
+        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, installed_from, source, source_sha, version)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["enabled"] = from_bool(self.enabled)
+        result["installed_at"] = from_str(self.installed_at)
+        result["marketplace"] = from_str(self.marketplace)
+        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:
+            result["source_sha"] = from_union([from_str, from_none], self.source_sha)
+        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 SessionInstalledPlugin:
+    """Installed plugin record for a session, with marketplace, version, install time, enabled
+    state, cache path, and source.
+    """
+    enabled: bool
+    """Whether the plugin is currently enabled"""
+
+    installed_at: str
+    """Installation timestamp (ISO-8601)"""
+
+    marketplace: str
+    """Marketplace the plugin came from (empty string for direct repo installs)"""
+
+    name: str
+    """Plugin name"""
+
+    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)"""
+
+    source_sha: str | None = None
+    """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.
+    """
+    version: str | None = None
+    """Installed version, if known"""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'SessionInstalledPlugin':
+        assert isinstance(obj, dict)
+        enabled = from_bool(obj.get("enabled"))
+        installed_at = from_str(obj.get("installed_at"))
+        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, installed_from, source, source_sha, version)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["enabled"] = from_bool(self.enabled)
+        result["installed_at"] = from_str(self.installed_at)
+        result["marketplace"] = from_str(self.marketplace)
+        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:
+            result["source_sha"] = from_union([from_str, from_none], self.source_sha)
+        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 HistoryRewindResult:
@@ -33663,152 +40010,6 @@ def to_dict(self) -> dict:
             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.
-@dataclass
-class InstalledPlugin:
-    """Installed plugin record from global state, with marketplace, version, install time,
-    enabled state, cache path, and source.
-    """
-    enabled: bool
-    """Whether the plugin is currently enabled"""
-
-    installed_at: str
-    """Installation timestamp"""
-
-    marketplace: str
-    """Marketplace the plugin came from (empty string for direct repo installs)"""
-
-    name: str
-    """Plugin name"""
-
-    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)"""
-
-    source_sha: str | None = None
-    """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.
-    """
-    version: str | None = None
-    """Version installed (if available)"""
-
-    @staticmethod
-    def from_dict(obj: Any) -> 'InstalledPlugin':
-        assert isinstance(obj, dict)
-        enabled = from_bool(obj.get("enabled"))
-        installed_at = from_str(obj.get("installed_at"))
-        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, installed_from, source, source_sha, version)
-
-    def to_dict(self) -> dict:
-        result: dict = {}
-        result["enabled"] = from_bool(self.enabled)
-        result["installed_at"] = from_str(self.installed_at)
-        result["marketplace"] = from_str(self.marketplace)
-        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:
-            result["source_sha"] = from_union([from_str, from_none], self.source_sha)
-        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 SessionInstalledPlugin:
-    """Installed plugin record for a session, with marketplace, version, install time, enabled
-    state, cache path, and source.
-    """
-    enabled: bool
-    """Whether the plugin is currently enabled"""
-
-    installed_at: str
-    """Installation timestamp (ISO-8601)"""
-
-    marketplace: str
-    """Marketplace the plugin came from (empty string for direct repo installs)"""
-
-    name: str
-    """Plugin name"""
-
-    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)"""
-
-    source_sha: str | None = None
-    """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.
-    """
-    version: str | None = None
-    """Installed version, if known"""
-
-    @staticmethod
-    def from_dict(obj: Any) -> 'SessionInstalledPlugin':
-        assert isinstance(obj, dict)
-        enabled = from_bool(obj.get("enabled"))
-        installed_at = from_str(obj.get("installed_at"))
-        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, installed_from, source, source_sha, version)
-
-    def to_dict(self) -> dict:
-        result: dict = {}
-        result["enabled"] = from_bool(self.enabled)
-        result["installed_at"] = from_str(self.installed_at)
-        result["marketplace"] = from_str(self.marketplace)
-        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:
-            result["source_sha"] = from_union([from_str, from_none], self.source_sha)
-        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 InstructionsGetSourcesResult:
@@ -34200,6 +40401,40 @@ def to_dict(self) -> dict:
             result["user_named"] = from_union([from_bool, from_none], self.user_named)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class SessionsUpdateWorkspaceFieldsRequest:
+    """Where the session's state lives, plus workspace-schema fields to merge into its workspace
+    record. Stored keys outside the schema are not preserved, and a stored `fork_count` is
+    never replaced.
+    """
+    fields_json: str
+    """Workspace-schema fields to merge into the record, as a JSON object. Fields the object
+    omits keep their stored values, except stored keys outside the schema are not preserved
+    and a stored `fork_count` is never replaced.
+    """
+    session_id: str
+    """Session ID naming the state directory under the sessions home. Rejected when it is
+    absolute or contains a parent component, so it cannot escape the sessions home.
+    """
+    sessions_home: str
+    """Root directory every session's state directory sits under"""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'SessionsUpdateWorkspaceFieldsRequest':
+        assert isinstance(obj, dict)
+        fields_json = from_str(obj.get("fieldsJson"))
+        session_id = from_str(obj.get("sessionId"))
+        sessions_home = from_str(obj.get("sessionsHome"))
+        return SessionsUpdateWorkspaceFieldsRequest(fields_json, session_id, sessions_home)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["fieldsJson"] = from_str(self.fields_json)
+        result["sessionId"] = from_str(self.session_id)
+        result["sessionsHome"] = from_str(self.sessions_home)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class WorkspacesCheckpoints:
@@ -34413,6 +40648,12 @@ class ManagedSettingsResolveResult:
     meta: ManagedSettingsMeta | None = None
     """Per-key lock state and provenance for the entries in `values`, using the same key names."""
 
+    permissions_context: ManagedPermissionsContext | None = None
+    """Reusable source-composed permission policy for managedSettings.permissions.evaluate.
+    Unlike resolved.settings.permissions, this retains every source's allowlist and
+    default-prompt semantics. Refresh through resolve when account/device policy changes.
+    Absent on runtimes that do not support permission evaluation.
+    """
     values: ManagedSettingsValues | None = None
     """Typed effective values of managed settings, keyed like the managed-settings schema and
     already resolved across channels, with the `{ "overridable": ... }` wrapper removed.
@@ -34428,8 +40669,9 @@ def from_dict(obj: Any) -> 'ManagedSettingsResolveResult':
         resolved = ManagedSettingsResolvedData.from_dict(obj.get("resolved"))
         account = from_union([from_str, from_none], obj.get("account"))
         meta = from_union([ManagedSettingsMeta.from_dict, from_none], obj.get("meta"))
+        permissions_context = from_union([ManagedPermissionsContext.from_dict, from_none], obj.get("permissionsContext"))
         values = from_union([ManagedSettingsValues.from_dict, from_none], obj.get("values"))
-        return ManagedSettingsResolveResult(diagnostics, layers, resolved, account, meta, values)
+        return ManagedSettingsResolveResult(diagnostics, layers, resolved, account, meta, permissions_context, values)
 
     def to_dict(self) -> dict:
         result: dict = {}
@@ -34440,10 +40682,191 @@ def to_dict(self) -> dict:
             result["account"] = from_union([from_str, from_none], self.account)
         if self.meta is not None:
             result["meta"] = from_union([lambda x: to_class(ManagedSettingsMeta, x), from_none], self.meta)
+        if self.permissions_context is not None:
+            result["permissionsContext"] = from_union([lambda x: to_class(ManagedPermissionsContext, x), from_none], self.permissions_context)
         if self.values is not None:
             result["values"] = from_union([lambda x: to_class(ManagedSettingsValues, x), from_none], self.values)
         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 _ManagedSettingsIngestResult:
+    """The managed policy layers an ingestion resolved, together with the per-layer outcome
+    flags a host needs to decide how much to trust the result. The flags are reported rather
+    than folded into the settings because a host must be able to distinguish an unmanaged
+    device from a managed device whose policy could not be confirmed, and apply its
+    fail-closed gates in the second case.
+    """
+    device_load_failed: bool
+    """The device layer could not be read, so it is unconfirmed rather than known-absent."""
+
+    device_sandbox_undetermined: bool
+    """Whether the device layer's sandbox intent could not be determined, so a consumer must not
+    read its absence as permission to run unsandboxed.
+    """
+    device_source_found: bool
+    """A device-managed policy is known to exist."""
+
+    log_messages: list[_ManagedSettingsLogMessage]
+    """Diagnostics emitted while resolving the layers, in the order they occurred."""
+
+    policy_helper_configured: bool
+    """A policy helper is configured for this host."""
+
+    policy_helper_fail_closed: bool
+    """The policy helper's failure must be treated as fail-closed rather than ignored."""
+
+    policy_helper_load_failed: bool
+    """The policy helper was configured but could not be run or its output could not be read."""
+
+    server_cache_fallback: bool
+    """A live fetch failed but a recent cached entry was served in its place, so
+    `serverFetchFailed` stays false. Lets a consumer distinguish a clean fetch from a
+    cache-backed fallback.
+    """
+    server_fetch_failed: bool
+    """The server fetch failed and no cached entry stood in for it, so the server layer is
+    unconfirmed and fail-closed gates apply.
+    """
+    server_forced_refresh_failure: bool
+    """The server fetch failed while a policy demanded a fresh confirmation, which is the strict
+    posture an enterprise opted into rather than an ordinary transient failure.
+    """
+    server_resolution: _ManagedSettingsServerPolicyResolution
+    """How the server layer was resolved."""
+
+    server_retryable_failure: bool
+    """The server fetch failed in a way a later retry could succeed at, as opposed to a refusal
+    that no retry will change.
+    """
+    server_source_found: bool
+    """A server-managed policy is known to exist even though `serverResponse` is intentionally
+    unset. Consumers should OR this with the presence of `serverResponse` when deciding
+    whether the device is managed, so a fresh start during an outage still applies the
+    fail-closed gates instead of treating the device as unmanaged.
+    """
+    server_token_unavailable: bool
+    """No usable token was available, so no server fetch was attempted."""
+
+    device_response: Any = None
+    """The device layer discovered from the machine, when one exists."""
+
+    device_sandbox_floor: Any = None
+    """The sandbox floor contributed by the device layer."""
+
+    permissions: Any = None
+    """The effective managed permissions layer, when the resolved policy carries one."""
+
+    policy_helper_authority: _ManagedSettingsPolicyHelperAuthority | None = None
+    """Which channel registered the policy helper that produced the helper layer."""
+
+    policy_helper_response: Any = None
+    """The layer produced by the platform policy helper, when one ran."""
+
+    server_client_update_requested: str | None = None
+    """Minimum client version requested by a successful response. Advisory only; the delivered
+    policy remains active.
+    """
+    server_client_update_required: str | None = None
+    """The server refused to deliver a policy because this client is too old to enforce it,
+    carrying the user-facing sentence describing the refusal. No retry will help; the remedy
+    is a client update. Gates that exist only because of managed policy should deny on this
+    rather than falling back to their unmanaged default.
+    """
+    server_fetch_error: str | None = None
+    """The error that made the server fetch fail, when one did."""
+
+    server_permissions_floor: Any = None
+    """The synthesized fail-closed permissions layer applied in place of a policy a refused
+    client may not enforce.
+    """
+    server_response: Any = None
+    """The account's server-delivered policy, when one was resolved."""
+
+    server_sandbox_floor: Any = None
+    """The sandbox object from a cached server policy that a forced refresh declined to serve in
+    full. Folded back into the effective sandbox layer so an outage during a forced refresh
+    still synthesizes the fail-closed sandbox floor from the administrator's known intent.
+    """
+    settings: Any = None
+    """The effective managed settings composed from every resolved layer. Omitted when no layer
+    set anything, so an unmanaged host locks nothing.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_ManagedSettingsIngestResult':
+        assert isinstance(obj, dict)
+        device_load_failed = from_bool(obj.get("deviceLoadFailed"))
+        device_sandbox_undetermined = from_bool(obj.get("deviceSandboxUndetermined"))
+        device_source_found = from_bool(obj.get("deviceSourceFound"))
+        log_messages = from_list(_ManagedSettingsLogMessage.from_dict, obj.get("logMessages"))
+        policy_helper_configured = from_bool(obj.get("policyHelperConfigured"))
+        policy_helper_fail_closed = from_bool(obj.get("policyHelperFailClosed"))
+        policy_helper_load_failed = from_bool(obj.get("policyHelperLoadFailed"))
+        server_cache_fallback = from_bool(obj.get("serverCacheFallback"))
+        server_fetch_failed = from_bool(obj.get("serverFetchFailed"))
+        server_forced_refresh_failure = from_bool(obj.get("serverForcedRefreshFailure"))
+        server_resolution = _ManagedSettingsServerPolicyResolution(obj.get("serverResolution"))
+        server_retryable_failure = from_bool(obj.get("serverRetryableFailure"))
+        server_source_found = from_bool(obj.get("serverSourceFound"))
+        server_token_unavailable = from_bool(obj.get("serverTokenUnavailable"))
+        device_response = obj.get("deviceResponse")
+        device_sandbox_floor = obj.get("deviceSandboxFloor")
+        permissions = obj.get("permissions")
+        policy_helper_authority = from_union([_ManagedSettingsPolicyHelperAuthority, from_none], obj.get("policyHelperAuthority"))
+        policy_helper_response = obj.get("policyHelperResponse")
+        server_client_update_requested = from_union([from_str, from_none], obj.get("serverClientUpdateRequested"))
+        server_client_update_required = from_union([from_str, from_none], obj.get("serverClientUpdateRequired"))
+        server_fetch_error = from_union([from_str, from_none], obj.get("serverFetchError"))
+        server_permissions_floor = obj.get("serverPermissionsFloor")
+        server_response = obj.get("serverResponse")
+        server_sandbox_floor = obj.get("serverSandboxFloor")
+        settings = obj.get("settings")
+        return _ManagedSettingsIngestResult(device_load_failed, device_sandbox_undetermined, device_source_found, log_messages, policy_helper_configured, policy_helper_fail_closed, policy_helper_load_failed, server_cache_fallback, server_fetch_failed, server_forced_refresh_failure, server_resolution, server_retryable_failure, server_source_found, server_token_unavailable, device_response, device_sandbox_floor, permissions, policy_helper_authority, policy_helper_response, server_client_update_requested, server_client_update_required, server_fetch_error, server_permissions_floor, server_response, server_sandbox_floor, settings)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["deviceLoadFailed"] = from_bool(self.device_load_failed)
+        result["deviceSandboxUndetermined"] = from_bool(self.device_sandbox_undetermined)
+        result["deviceSourceFound"] = from_bool(self.device_source_found)
+        result["logMessages"] = from_list(lambda x: to_class(_ManagedSettingsLogMessage, x), self.log_messages)
+        result["policyHelperConfigured"] = from_bool(self.policy_helper_configured)
+        result["policyHelperFailClosed"] = from_bool(self.policy_helper_fail_closed)
+        result["policyHelperLoadFailed"] = from_bool(self.policy_helper_load_failed)
+        result["serverCacheFallback"] = from_bool(self.server_cache_fallback)
+        result["serverFetchFailed"] = from_bool(self.server_fetch_failed)
+        result["serverForcedRefreshFailure"] = from_bool(self.server_forced_refresh_failure)
+        result["serverResolution"] = to_enum(_ManagedSettingsServerPolicyResolution, self.server_resolution)
+        result["serverRetryableFailure"] = from_bool(self.server_retryable_failure)
+        result["serverSourceFound"] = from_bool(self.server_source_found)
+        result["serverTokenUnavailable"] = from_bool(self.server_token_unavailable)
+        if self.device_response is not None:
+            result["deviceResponse"] = self.device_response
+        if self.device_sandbox_floor is not None:
+            result["deviceSandboxFloor"] = self.device_sandbox_floor
+        if self.permissions is not None:
+            result["permissions"] = self.permissions
+        if self.policy_helper_authority is not None:
+            result["policyHelperAuthority"] = from_union([lambda x: to_enum(_ManagedSettingsPolicyHelperAuthority, x), from_none], self.policy_helper_authority)
+        if self.policy_helper_response is not None:
+            result["policyHelperResponse"] = self.policy_helper_response
+        if self.server_client_update_requested is not None:
+            result["serverClientUpdateRequested"] = from_union([from_str, from_none], self.server_client_update_requested)
+        if self.server_client_update_required is not None:
+            result["serverClientUpdateRequired"] = from_union([from_str, from_none], self.server_client_update_required)
+        if self.server_fetch_error is not None:
+            result["serverFetchError"] = from_union([from_str, from_none], self.server_fetch_error)
+        if self.server_permissions_floor is not None:
+            result["serverPermissionsFloor"] = self.server_permissions_floor
+        if self.server_response is not None:
+            result["serverResponse"] = self.server_response
+        if self.server_sandbox_floor is not None:
+            result["serverSandboxFloor"] = self.server_sandbox_floor
+        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 MCPAppsHostContext:
@@ -34684,6 +41107,40 @@ def to_dict(self) -> dict:
             result["description"] = from_union([from_str, from_none], self.description)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class ConnectorDiscoveryCatalogResult:
+    """Entries for the selected account."""
+
+    account_id: str
+    """Opaque account ID."""
+
+    connectors: list[ConnectorDiscoveryCatalogEntry]
+    """Entries."""
+
+    refreshed_at_ms: int
+    """Refresh time in Unix epoch milliseconds."""
+
+    revision: int
+    """Revision."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'ConnectorDiscoveryCatalogResult':
+        assert isinstance(obj, dict)
+        account_id = from_str(obj.get("accountId"))
+        connectors = from_list(ConnectorDiscoveryCatalogEntry.from_dict, obj.get("connectors"))
+        refreshed_at_ms = from_int(obj.get("refreshedAtMs"))
+        revision = from_int(obj.get("revision"))
+        return ConnectorDiscoveryCatalogResult(account_id, connectors, refreshed_at_ms, revision)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["accountId"] = from_str(self.account_id)
+        result["connectors"] = from_list(lambda x: to_class(ConnectorDiscoveryCatalogEntry, x), self.connectors)
+        result["refreshedAtMs"] = from_int(self.refreshed_at_ms)
+        result["revision"] = from_int(self.revision)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class DebugCollectLogsEntry:
@@ -35430,6 +41887,27 @@ def to_dict(self) -> dict:
         result["plugins"] = from_list(lambda x: to_class(InstalledPluginInfo, x), self.plugins)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class SessionPluginsRetryManagedResult:
+    """Per-plugin outcomes of retrying the plugins required by the session's managed settings."""
+
+    plugins: list[ManagedPluginRetryEntry]
+    """One entry per requested plugin, in request order. When no plugins were requested, one
+    entry per plugin the managed settings require.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'SessionPluginsRetryManagedResult':
+        assert isinstance(obj, dict)
+        plugins = from_list(ManagedPluginRetryEntry.from_dict, obj.get("plugins"))
+        return SessionPluginsRetryManagedResult(plugins)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["plugins"] = from_list(lambda x: to_class(ManagedPluginRetryEntry, x), self.plugins)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class MarketplaceBrowseResult:
@@ -35449,6 +41927,26 @@ def to_dict(self) -> dict:
         result["plugins"] = from_list(lambda x: to_class(MarketplacePluginInfo, x), self.plugins)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class MCPConfiguredServerList:
+    """Effective MCP configuration with optional live observations from matching already
+    materialized servers.
+    """
+    servers: list[MCPConfiguredServer]
+    """Effective configured MCP servers."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'MCPConfiguredServerList':
+        assert isinstance(obj, dict)
+        servers = from_list(MCPConfiguredServer.from_dict, obj.get("servers"))
+        return MCPConfiguredServerList(servers)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["servers"] = from_list(lambda x: to_class(MCPConfiguredServer, x), self.servers)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class MCPServerList:
@@ -37616,47 +44114,22 @@ def to_dict(self) -> dict:
 
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
-class UsageMetricsAgentMetric:
-    """Usage attributed to one agent instance, including its identity, API duration, AI units,
-    and per-model breakdown.
-    """
-    model_metrics: dict[str, UsageMetricsModelMetric]
-    """Per-model usage for this agent, keyed by model identifier"""
-
-    total_api_duration_ms: int
-    """Time spent in model API calls by this agent, in milliseconds"""
+class UserSettingsProblemsResult:
+    """The settings that will not take effect across the given layers."""
 
-    total_nano_aiu: float
-    """Accumulated nano-AI units cost for this agent"""
-
-    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"""
+    problems: list[UserSettingsProblem] | None = None
+    """Each setting that will not take effect, and why. Empty when every layer is healthy."""
 
     @staticmethod
-    def from_dict(obj: Any) -> 'UsageMetricsAgentMetric':
+    def from_dict(obj: Any) -> 'UserSettingsProblemsResult':
         assert isinstance(obj, dict)
-        model_metrics = from_dict(UsageMetricsModelMetric.from_dict, obj.get("modelMetrics"))
-        total_api_duration_ms = from_int(obj.get("totalApiDurationMs"))
-        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)
+        problems = from_union([lambda x: from_list(UserSettingsProblem.from_dict, x), from_none], obj.get("problems"))
+        return UserSettingsProblemsResult(problems)
 
     def to_dict(self) -> dict:
         result: dict = {}
-        result["modelMetrics"] = from_dict(lambda x: to_class(UsageMetricsModelMetric, x), self.model_metrics)
-        result["totalApiDurationMs"] = from_int(self.total_api_duration_ms)
-        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)
+        if self.problems is not None:
+            result["problems"] = from_union([lambda x: from_list(lambda x: to_class(UserSettingsProblem, x), x), from_none], self.problems)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
@@ -37841,19 +44314,24 @@ class SessionModelList:
     """
     quota_snapshots: dict[str, Any] | None = None
     """Per-quota snapshots returned alongside the model list, keyed by quota type."""
+    auto: AutoTierMetadata | None = None
+    """Ordered Auto routing preferences discovered for this session's account."""
 
     @staticmethod
     def from_dict(obj: Any) -> 'SessionModelList':
         assert isinstance(obj, dict)
         list = from_list(lambda x: x, obj.get("list"))
+        auto = from_union([AutoTierMetadata.from_dict, from_none], obj.get("auto"))
         model_price_categories = from_union([lambda x: from_list(SessionModelPriceCategory.from_dict, x), from_none], obj.get("modelPriceCategories"))
         providers = from_union([lambda x: from_list(ModelProviderDescriptor.from_dict, x), from_none], obj.get("providers"))
         quota_snapshots = from_union([lambda x: from_dict(lambda x: x, x), from_none], obj.get("quotaSnapshots"))
-        return SessionModelList(list, model_price_categories, providers, quota_snapshots)
+        return SessionModelList(list, model_price_categories, providers, quota_snapshots, auto)
 
     def to_dict(self) -> dict:
         result: dict = {}
         result["list"] = from_list(lambda x: x, self.list)
+        if self.auto is not None:
+            result["auto"] = from_union([lambda x: to_class(AutoTierMetadata, x), from_none], self.auto)
         if self.model_price_categories is not None:
             result["modelPriceCategories"] = from_union([lambda x: from_list(lambda x: to_class(SessionModelPriceCategory, x), x), from_none], self.model_price_categories)
         if self.providers is not None:
@@ -38502,6 +44980,30 @@ 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 PendingExternalToolRequestList:
+    """External tool calls still waiting for a result."""
+
+    items: list[PendingExternalToolRequest]
+    """External tool calls of the session and its sub-agents that
+    session.tools.handlePendingToolCall would still accept, in the order they were requested.
+    Includes calls that were pending when the session was last suspended and resumed with
+    pending work continued, so a host that did not observe the original
+    external_tool.requested event can answer them.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'PendingExternalToolRequestList':
+        assert isinstance(obj, dict)
+        items = from_list(PendingExternalToolRequest.from_dict, obj.get("items"))
+        return PendingExternalToolRequestList(items)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["items"] = from_list(lambda x: to_class(PendingExternalToolRequest, x), self.items)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class ToolsGetBuiltinDescriptorsRequest:
@@ -38883,26 +45385,53 @@ def to_dict(self) -> dict:
 
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
-class AuthLoginBegun:
-    """A started login flow: its opaque id and first step."""
+class AuthLoginStep:
+    """The first step of the flow.
 
-    flow_id: str
-    """Opaque flow id used to advance or cancel this login."""
+    One step in an interactive login flow. The consumer acts on the step and calls advance to
+    proceed. Browser-open is encoded as two distinct steps by design: `open-url` is
+    CONSUMER-driven (the provider surfaces the authorize URL and the consumer opens it —
+    github.com/GHEC web), while `needs-interaction` is PROVIDER-driven (the provider opens
+    the browser or broker UI itself and does not surface a URL — Entra).
+    """
+    kind: AuthLoginStepKind
+    """Login flow step variant discriminator."""
 
-    step: AuthLoginStep
-    """The first step of the flow."""
+    url: str | None = None
+    """Authorize URL the consumer should open in a browser (consumer-driven browser-open)."""
+
+    prompt: str | None = None
+    """Prompt for the value the provider needs; the consumer supplies it as advance input (e.g.
+    a GitHub Enterprise Cloud host, *.ghe.com).
+    """
+    result: AuthLoginResultDto | None = None
+    """Login result. When status is needs-plaintext-consent or needs-account-selection, advance
+    with the user's decision to continue.
+    """
+    message: str | None = None
+    """Human-readable failure message."""
 
     @staticmethod
-    def from_dict(obj: Any) -> 'AuthLoginBegun':
+    def from_dict(obj: Any) -> 'AuthLoginStep':
         assert isinstance(obj, dict)
-        flow_id = from_str(obj.get("flowId"))
-        step = AuthLoginStep.from_dict(obj.get("step"))
-        return AuthLoginBegun(flow_id, step)
+        kind = AuthLoginStepKind(obj.get("kind"))
+        url = from_union([from_str, from_none], obj.get("url"))
+        prompt = from_union([from_str, from_none], obj.get("prompt"))
+        result = from_union([AuthLoginResultDto.from_dict, from_none], obj.get("result"))
+        message = from_union([from_str, from_none], obj.get("message"))
+        return AuthLoginStep(kind, url, prompt, result, message)
 
     def to_dict(self) -> dict:
         result: dict = {}
-        result["flowId"] = from_str(self.flow_id)
-        result["step"] = to_class(AuthLoginStep, self.step)
+        result["kind"] = to_enum(AuthLoginStepKind, self.kind)
+        if self.url is not None:
+            result["url"] = from_union([from_str, from_none], self.url)
+        if self.prompt is not None:
+            result["prompt"] = from_union([from_str, from_none], self.prompt)
+        if self.result is not None:
+            result["result"] = from_union([lambda x: to_class(AuthLoginResultDto, x), from_none], self.result)
+        if self.message is not None:
+            result["message"] = from_union([from_str, from_none], self.message)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
@@ -39060,6 +45589,30 @@ 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 ConnectorDiscoveryAccountList:
+    """Eligible accounts."""
+
+    accounts: list[ConnectorDiscoveryAccount]
+    """Eligible accounts."""
+
+    availability: ConnectorDiscoveryAvailability
+    """Availability."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'ConnectorDiscoveryAccountList':
+        assert isinstance(obj, dict)
+        accounts = from_list(ConnectorDiscoveryAccount.from_dict, obj.get("accounts"))
+        availability = ConnectorDiscoveryAvailability(obj.get("availability"))
+        return ConnectorDiscoveryAccountList(accounts, availability)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["accounts"] = from_list(lambda x: to_class(ConnectorDiscoveryAccount, x), self.accounts)
+        result["availability"] = to_enum(ConnectorDiscoveryAvailability, self.availability)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class EnvironmentsGetResult:
@@ -39292,6 +45845,160 @@ 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 _GlobalStateLoadResult:
+    """The host's machine-wide state. Every field is optional because a fresh install has
+    recorded nothing yet, so a reader must treat an absent field as `not yet`, never as a
+    negative answer. Stored credentials are deliberately absent from this shape.
+    """
+    app_tip_shown: bool | None = None
+    """Whether the app tip has been shown."""
+
+    asked_setup_terminals: list[str] | None = None
+    """Terminals the user has already been asked to set up, so the host does not ask twice."""
+
+    auto_feedback_last_prompted_at: str | None = None
+    """When the Auto-feedback hint was last shown, as an ISO 8601 timestamp. It enforces the
+    once-per-day cap for non-staff users across restarts.
+    """
+    first_launch_at: str | None = None
+    """When the host first ran on this machine."""
+
+    installed_plugins: list[InstalledPlugin] | None = None
+    """Plugins installed on this machine."""
+
+    last_logged_in_user: _LoggedInUser | None = None
+    """Account used for the most recent sign-in."""
+
+    logged_in_users: list[_LoggedInUser] | None = None
+    """Every account the host has signed in to on this machine."""
+
+    reasoning_summaries_cleanup_done: bool | None = None
+    """Whether the one-off cleanup of stored reasoning summaries has run."""
+
+    recent_model_ids: list[str] | None = None
+    """Models the user selected recently, most recent first."""
+
+    sandbox_credential_proxy_ca_declined: bool | None = None
+    """Whether the user declined to trust the sandbox credential proxy CA."""
+
+    sandbox_onboarding_shown: bool | None = None
+    """Whether the sandbox onboarding has been shown."""
+
+    staff: bool | None = None
+    """Whether the user is a GitHub or Microsoft staff member, which unlocks internal-only
+    behavior.
+    """
+    staff_github: bool | None = None
+    """Whether the user was recognized as GitHub staff."""
+
+    staff_log_level_migration_at: str | None = None
+    """When the staff-only log level migration last ran."""
+
+    staff_microsoft: bool | None = None
+    """Whether the user was recognized as Microsoft staff."""
+
+    staff_model_reset_at: str | None = None
+    """When the staff-only model reset last ran."""
+
+    staff_update_channel_migration_at: str | None = None
+    """When the staff-only update channel migration last ran."""
+
+    suppress_init_folders: list[str] | None = None
+    """Folders where the user declined the init prompt, so it stays hidden there."""
+
+    trusted_folders: list[str] | None = None
+    """Folders the user has marked as trusted."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_GlobalStateLoadResult':
+        assert isinstance(obj, dict)
+        app_tip_shown = from_union([from_bool, from_none], obj.get("appTipShown"))
+        asked_setup_terminals = from_union([lambda x: from_list(from_str, x), from_none], obj.get("askedSetupTerminals"))
+        auto_feedback_last_prompted_at = from_union([from_str, from_none], obj.get("autoFeedbackLastPromptedAt"))
+        first_launch_at = from_union([from_str, from_none], obj.get("firstLaunchAt"))
+        installed_plugins = from_union([lambda x: from_list(InstalledPlugin.from_dict, x), from_none], obj.get("installedPlugins"))
+        last_logged_in_user = from_union([_LoggedInUser.from_dict, from_none], obj.get("lastLoggedInUser"))
+        logged_in_users = from_union([lambda x: from_list(_LoggedInUser.from_dict, x), from_none], obj.get("loggedInUsers"))
+        reasoning_summaries_cleanup_done = from_union([from_bool, from_none], obj.get("reasoningSummariesCleanupDone"))
+        recent_model_ids = from_union([lambda x: from_list(from_str, x), from_none], obj.get("recentModelIds"))
+        sandbox_credential_proxy_ca_declined = from_union([from_bool, from_none], obj.get("sandboxCredentialProxyCaDeclined"))
+        sandbox_onboarding_shown = from_union([from_bool, from_none], obj.get("sandboxOnboardingShown"))
+        staff = from_union([from_bool, from_none], obj.get("staff"))
+        staff_github = from_union([from_bool, from_none], obj.get("staffGithub"))
+        staff_log_level_migration_at = from_union([from_str, from_none], obj.get("staffLogLevelMigrationAt"))
+        staff_microsoft = from_union([from_bool, from_none], obj.get("staffMicrosoft"))
+        staff_model_reset_at = from_union([from_str, from_none], obj.get("staffModelResetAt"))
+        staff_update_channel_migration_at = from_union([from_str, from_none], obj.get("staffUpdateChannelMigrationAt"))
+        suppress_init_folders = from_union([lambda x: from_list(from_str, x), from_none], obj.get("suppressInitFolders"))
+        trusted_folders = from_union([lambda x: from_list(from_str, x), from_none], obj.get("trustedFolders"))
+        return _GlobalStateLoadResult(app_tip_shown, asked_setup_terminals, auto_feedback_last_prompted_at, first_launch_at, installed_plugins, last_logged_in_user, logged_in_users, reasoning_summaries_cleanup_done, recent_model_ids, sandbox_credential_proxy_ca_declined, sandbox_onboarding_shown, staff, staff_github, staff_log_level_migration_at, staff_microsoft, staff_model_reset_at, staff_update_channel_migration_at, suppress_init_folders, trusted_folders)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        if self.app_tip_shown is not None:
+            result["appTipShown"] = from_union([from_bool, from_none], self.app_tip_shown)
+        if self.asked_setup_terminals is not None:
+            result["askedSetupTerminals"] = from_union([lambda x: from_list(from_str, x), from_none], self.asked_setup_terminals)
+        if self.auto_feedback_last_prompted_at is not None:
+            result["autoFeedbackLastPromptedAt"] = from_union([from_str, from_none], self.auto_feedback_last_prompted_at)
+        if self.first_launch_at is not None:
+            result["firstLaunchAt"] = from_union([from_str, from_none], self.first_launch_at)
+        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.last_logged_in_user is not None:
+            result["lastLoggedInUser"] = from_union([lambda x: to_class(_LoggedInUser, x), from_none], self.last_logged_in_user)
+        if self.logged_in_users is not None:
+            result["loggedInUsers"] = from_union([lambda x: from_list(lambda x: to_class(_LoggedInUser, x), x), from_none], self.logged_in_users)
+        if self.reasoning_summaries_cleanup_done is not None:
+            result["reasoningSummariesCleanupDone"] = from_union([from_bool, from_none], self.reasoning_summaries_cleanup_done)
+        if self.recent_model_ids is not None:
+            result["recentModelIds"] = from_union([lambda x: from_list(from_str, x), from_none], self.recent_model_ids)
+        if self.sandbox_credential_proxy_ca_declined is not None:
+            result["sandboxCredentialProxyCaDeclined"] = from_union([from_bool, from_none], self.sandbox_credential_proxy_ca_declined)
+        if self.sandbox_onboarding_shown is not None:
+            result["sandboxOnboardingShown"] = from_union([from_bool, from_none], self.sandbox_onboarding_shown)
+        if self.staff is not None:
+            result["staff"] = from_union([from_bool, from_none], self.staff)
+        if self.staff_github is not None:
+            result["staffGithub"] = from_union([from_bool, from_none], self.staff_github)
+        if self.staff_log_level_migration_at is not None:
+            result["staffLogLevelMigrationAt"] = from_union([from_str, from_none], self.staff_log_level_migration_at)
+        if self.staff_microsoft is not None:
+            result["staffMicrosoft"] = from_union([from_bool, from_none], self.staff_microsoft)
+        if self.staff_model_reset_at is not None:
+            result["staffModelResetAt"] = from_union([from_str, from_none], self.staff_model_reset_at)
+        if self.staff_update_channel_migration_at is not None:
+            result["staffUpdateChannelMigrationAt"] = from_union([from_str, from_none], self.staff_update_channel_migration_at)
+        if self.suppress_init_folders is not None:
+            result["suppressInitFolders"] = from_union([lambda x: from_list(from_str, x), from_none], self.suppress_init_folders)
+        if self.trusted_folders is not None:
+            result["trustedFolders"] = from_union([lambda x: from_list(from_str, x), from_none], self.trusted_folders)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class SessionsSetAdditionalPluginsRequest:
+    """Manager-wide additional plugins to register; replaces any previously-configured set."""
+
+    plugins: list[InstalledPlugin]
+    """Manager-wide additional plugins to register. Replaces any previously-configured set. Pass
+    an empty array to clear.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'SessionsSetAdditionalPluginsRequest':
+        assert isinstance(obj, dict)
+        plugins = from_list(InstalledPlugin.from_dict, obj.get("plugins"))
+        return SessionsSetAdditionalPluginsRequest(plugins)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["plugins"] = from_list(lambda x: to_class(InstalledPlugin, x), self.plugins)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class WorkflowRunTerminal:
@@ -39404,27 +46111,6 @@ def to_dict(self) -> dict:
             result["snapshot"] = self.snapshot
         return result
 
-# Experimental: this type is part of an experimental API and may change or be removed.
-@dataclass
-class SessionsSetAdditionalPluginsRequest:
-    """Manager-wide additional plugins to register; replaces any previously-configured set."""
-
-    plugins: list[InstalledPlugin]
-    """Manager-wide additional plugins to register. Replaces any previously-configured set. Pass
-    an empty array to clear.
-    """
-
-    @staticmethod
-    def from_dict(obj: Any) -> 'SessionsSetAdditionalPluginsRequest':
-        assert isinstance(obj, dict)
-        plugins = from_list(InstalledPlugin.from_dict, obj.get("plugins"))
-        return SessionsSetAdditionalPluginsRequest(plugins)
-
-    def to_dict(self) -> dict:
-        result: dict = {}
-        result["plugins"] = from_list(lambda x: to_class(InstalledPlugin, x), self.plugins)
-        return result
-
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class SessionEnrichMetadataResult:
@@ -41107,87 +47793,6 @@ def to_dict(self) -> dict:
             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 UsageGetMetricsResult:
-    """Accumulated session usage metrics, including premium request cost, token counts, model
-    breakdown, and code-change totals.
-    """
-    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"""
-
-    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) -> 'UsageGetMetricsResult':
-        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"))
-        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["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 MCPConfigAddRequest:
@@ -41440,6 +48045,30 @@ def to_dict(self) -> dict:
         result["status"] = to_class(ConnectorStatus, self.status)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class AuthLoginBegun:
+    """A started login flow: its opaque id and first step."""
+
+    flow_id: str
+    """Opaque flow id used to advance or cancel this login."""
+
+    step: AuthLoginStep
+    """The first step of the flow."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'AuthLoginBegun':
+        assert isinstance(obj, dict)
+        flow_id = from_str(obj.get("flowId"))
+        step = AuthLoginStep.from_dict(obj.get("step"))
+        return AuthLoginBegun(flow_id, step)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["flowId"] = from_str(self.flow_id)
+        result["step"] = to_class(AuthLoginStep, self.step)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class WorkflowRunSummary:
@@ -41739,6 +48368,13 @@ class SessionUpdateOptionsParams:
     agent_context: str | None = None
     """Runtime context discriminator (e.g., `cli`, `actions`)."""
 
+    agent_directories: list[str] | None = None
+    """Explicit discovery-only agent roots, separate from customAgents and filesystem grants.
+    Available without enableConfigDiscovery, subject to managed/source disables. Relative SDK
+    paths resolve once when supplied against the request's effective workingDirectory;
+    retained roots do not move on cwd changes. Null and omission are equivalent; [] clears
+    only the explicit SDK contribution.
+    """
     allow_all_mcp_server_instructions: bool | None = None
     """Whether to include instructions from every MCP server in the system prompt instead of
     only allowlisted servers.
@@ -41779,8 +48415,9 @@ class SessionUpdateOptionsParams:
     """Skill IDs that should be excluded from this session."""
 
     enable_file_hooks: bool | None = None
-    """Whether to enable loading of `.github/hooks/` filesystem hooks. Separate from the SDK
-    callback hook mechanism.
+    """Whether to enable repository-origin file hooks from `.github/hooks/` and trusted
+    repository-configured roots. Does not control explicit hookDirectories or SDK callback
+    hooks.
     """
     enable_host_git_operations: bool | None = None
     """Whether to enable host git operations (context resolution, child repo scanning, git info
@@ -41801,9 +48438,10 @@ class SessionUpdateOptionsParams:
     """Whether to enable cross-session store writes and reads."""
 
     enable_skills: bool | None = None
-    """Whether skill loading is enabled. Explicit false disables every source, including a bound
-    SDK provider; changing the value invalidates the loaded skill snapshot. When omitted,
-    creation falls back to enableConfigDiscovery unless an SDK skill provider is registered.
+    """Whether skill loading is enabled. Explicit false disables every source, including
+    explicit SDK roots and a bound SDK provider; changing the value invalidates the loaded
+    skill snapshot. When omitted, creation falls back to enableConfigDiscovery unless
+    explicit SDK skill roots or an SDK skill provider are supplied.
     """
     enable_streaming: bool | None = None
     """Whether to stream model responses."""
@@ -41830,6 +48468,14 @@ class SessionUpdateOptionsParams:
     feature_flags: dict[str, bool] | None = None
     """Map of feature-flag IDs to their boolean enabled state."""
 
+    hook_directories: list[str] | None = None
+    """Explicit discovery-only file-hook roots, separate from callback hooks and filesystem
+    grants. Available without enableConfigDiscovery or enableFileHooks, which controls
+    repository-origin hooks only; hook/managed disables still apply. Relative SDK paths
+    resolve once when supplied against the request's effective workingDirectory; retained
+    roots do not move on cwd changes. Null and omission are equivalent; [] clears only the
+    explicit SDK contribution.
+    """
     ignored_skills_locations: list[str] | None = None
     """Skill scan directories and descendants excluded from discovery. Supports `~`-relative
     paths.
@@ -41848,6 +48494,13 @@ class SessionUpdateOptionsParams:
     """Full set of installed plugins for the session. Replaces the existing list; the runtime
     invalidates the skills cache only when the list materially changes.
     """
+    instruction_directories: list[str] | None = None
+    """Explicit discovery-only instruction roots using existing SDK instruction formats, not
+    filesystem grants. Available without enableConfigDiscovery, subject to
+    instruction/managed disables. Relative SDK paths resolve once when supplied against the
+    request's effective workingDirectory; retained roots do not move on cwd changes. Null and
+    omission are equivalent; [] clears only the explicit SDK contribution.
+    """
     integration_id: str | None = None
     """Stable integration identifier used for analytics and rate-limit attribution."""
 
@@ -41921,8 +48574,12 @@ class SessionUpdateOptionsParams:
     """PowerShell process flags applied to built-in and user-requested shell commands."""
 
     skill_directories: list[str] | None = None
-    """Additional directories to search for skills."""
-
+    """Explicit discovery-only skill roots, not filesystem grants. Available without
+    enableConfigDiscovery, subject to skill/managed disables. Relative SDK paths resolve once
+    when supplied against the request's effective workingDirectory; retained roots do not
+    move on cwd changes. Null and omission are equivalent; [] clears only the explicit SDK
+    contribution.
+    """
     skip_custom_instructions: bool | None = None
     """Whether to skip loading custom instruction sources."""
 
@@ -41952,6 +48609,7 @@ def from_dict(obj: Any) -> 'SessionUpdateOptionsParams':
         assert isinstance(obj, dict)
         additional_content_exclusion_policies = from_union([lambda x: from_list(OptionsUpdateAdditionalContentExclusionPolicy.from_dict, x), from_none], obj.get("additionalContentExclusionPolicies"))
         agent_context = from_union([from_str, from_none], obj.get("agentContext"))
+        agent_directories = from_union([lambda x: from_list(from_str, x), from_none], obj.get("agentDirectories"))
         allow_all_mcp_server_instructions = from_union([from_bool, from_none], obj.get("allowAllMcpServerInstructions"))
         ask_user_disabled = from_union([from_bool, from_none], obj.get("askUserDisabled"))
         available_tools = from_union([lambda x: from_list(from_str, x), from_none], obj.get("availableTools"))
@@ -41978,10 +48636,12 @@ def from_dict(obj: Any) -> 'SessionUpdateOptionsParams':
         excluded_builtin_agents = from_union([lambda x: from_list(from_str, x), from_none], obj.get("excludedBuiltinAgents"))
         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"))
+        hook_directories = from_union([lambda x: from_list(from_str, x), from_none], obj.get("hookDirectories"))
         ignored_skills_locations = from_union([lambda x: from_list(from_str, x), from_none], obj.get("ignoredSkillsLocations"))
         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"))
+        instruction_directories = from_union([lambda x: from_list(from_str, x), from_none], obj.get("instructionDirectories"))
         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"))
@@ -42006,11 +48666,11 @@ def from_dict(obj: Any) -> 'SessionUpdateOptionsParams':
         skip_custom_instructions = from_union([from_bool, from_none], obj.get("skipCustomInstructions"))
         skip_embedding_retrieval = from_union([from_bool, from_none], obj.get("skipEmbeddingRetrieval"))
         suppress_custom_agent_prompt = from_union([from_bool, from_none], obj.get("suppressCustomAgentPrompt"))
-        tool_filter_precedence = from_union([OptionsUpdateToolFilterPrecedence, from_none], obj.get("toolFilterPrecedence"))
+        tool_filter_precedence = from_union([from_none, OptionsUpdateToolFilterPrecedence], obj.get("toolFilterPrecedence"))
         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, ignored_skills_locations, 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)
+        return SessionUpdateOptionsParams(additional_content_exclusion_policies, agent_context, agent_directories, 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, hook_directories, ignored_skills_locations, included_builtin_agents, included_builtin_skills, installed_plugins, instruction_directories, 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 = {}
@@ -42018,6 +48678,8 @@ def to_dict(self) -> dict:
             result["additionalContentExclusionPolicies"] = from_union([lambda x: from_list(lambda x: to_class(OptionsUpdateAdditionalContentExclusionPolicy, x), x), from_none], self.additional_content_exclusion_policies)
         if self.agent_context is not None:
             result["agentContext"] = from_union([from_str, from_none], self.agent_context)
+        if self.agent_directories is not None:
+            result["agentDirectories"] = from_union([lambda x: from_list(from_str, x), from_none], self.agent_directories)
         if self.allow_all_mcp_server_instructions is not None:
             result["allowAllMcpServerInstructions"] = from_union([from_bool, from_none], self.allow_all_mcp_server_instructions)
         if self.ask_user_disabled is not None:
@@ -42070,6 +48732,8 @@ def to_dict(self) -> dict:
             result["excludedTools"] = from_union([lambda x: from_list(from_str, x), from_none], self.excluded_tools)
         if self.feature_flags is not None:
             result["featureFlags"] = from_union([lambda x: from_dict(from_bool, x), from_none], self.feature_flags)
+        if self.hook_directories is not None:
+            result["hookDirectories"] = from_union([lambda x: from_list(from_str, x), from_none], self.hook_directories)
         if self.ignored_skills_locations is not None:
             result["ignoredSkillsLocations"] = from_union([lambda x: from_list(from_str, x), from_none], self.ignored_skills_locations)
         if self.included_builtin_agents is not None:
@@ -42078,6 +48742,8 @@ def to_dict(self) -> dict:
             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.instruction_directories is not None:
+            result["instructionDirectories"] = from_union([lambda x: from_list(from_str, x), from_none], self.instruction_directories)
         if self.integration_id is not None:
             result["integrationId"] = from_union([from_str, from_none], self.integration_id)
         if self.is_experimental_mode is not None:
@@ -42127,7 +48793,7 @@ def to_dict(self) -> dict:
         if self.suppress_custom_agent_prompt is not None:
             result["suppressCustomAgentPrompt"] = from_union([from_bool, from_none], self.suppress_custom_agent_prompt)
         if self.tool_filter_precedence is not None:
-            result["toolFilterPrecedence"] = from_union([lambda x: to_enum(OptionsUpdateToolFilterPrecedence, x), from_none], self.tool_filter_precedence)
+            result["toolFilterPrecedence"] = from_union([from_none, lambda x: to_enum(OptionsUpdateToolFilterPrecedence, x)], self.tool_filter_precedence)
         if self.trajectory_file is not None:
             result["trajectoryFile"] = from_union([from_str, from_none], self.trajectory_file)
         if self.verbosity is not None:
@@ -43021,6 +49687,134 @@ def to_dict(self) -> dict:
             result["token_based_billing"] = from_union([from_bool, from_none], self.token_based_billing)
         return result
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class AuthIdentity:
+    """Identity to describe.
+
+    Credential-free authentication identity safe to expose to hosts and user interfaces.
+
+    Identity to evaluate.
+
+    Identity whose host the path resolves against. Omit to resolve against the public
+    github.com host.
+
+    Credential-free identity metadata for the active account, including resolved Copilot user
+    information when available.
+    """
+    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.
+# Internal: this type is an internal SDK API and is not part of the public surface.
+@dataclass
+class _AccountDescribeAuthInfoRequest:
+    """The authentication identity whose shared wording should be rendered."""
+
+    identity: AuthIdentity
+    """Identity to describe."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_AccountDescribeAuthInfoRequest':
+        assert isinstance(obj, dict)
+        identity = AuthIdentity.from_dict(obj.get("identity"))
+        return _AccountDescribeAuthInfoRequest(identity)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["identity"] = to_class(AuthIdentity, self.identity)
+        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 _AccountGetGistSupportRequest:
+    """The authentication identity whose gist support should be reported."""
+
+    identity: AuthIdentity
+    """Identity to evaluate."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_AccountGetGistSupportRequest':
+        assert isinstance(obj, dict)
+        identity = AuthIdentity.from_dict(obj.get("identity"))
+        return _AccountGetGistSupportRequest(identity)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["identity"] = to_class(AuthIdentity, self.identity)
+        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 _AccountGetWebURLRequest:
+    """A path to resolve against the GitHub host an identity is signed in to."""
+
+    path: str
+    """Host-relative path, without a leading slash, for example `settings/copilot/features`."""
+
+    identity: AuthIdentity | None = None
+    """Identity whose host the path resolves against. Omit to resolve against the public
+    github.com host.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_AccountGetWebURLRequest':
+        assert isinstance(obj, dict)
+        path = from_str(obj.get("path"))
+        identity = from_union([AuthIdentity.from_dict, from_none], obj.get("identity"))
+        return _AccountGetWebURLRequest(path, identity)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["path"] = from_str(self.path)
+        if self.identity is not None:
+            result["identity"] = from_union([lambda x: to_class(AuthIdentity, x), from_none], self.identity)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class AgentRegistryLiveTargetEntry:
@@ -43281,52 +50075,43 @@ def to_dict(self) -> dict:
 
 # 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"""
+class AuthReadValue:
+    """The read result, keyed by the same selector as the query."""
 
-    registration_id: str | None = None
-    """Opaque SDK GitHub credential registration backing this identity. Routing metadata only;
-    never a credential.
+    kind: AuthReadQueryKind
+    """Account read-datum variant discriminator."""
+    account: AccountStatus | None = None
+    """The active account, or absent when not logged in."""
+    status: AuthStatusDto | None = None
+    """The neutral authentication status summary."""
+    errors: list[AuthValidationError] | None = None
+    """Validation errors from the most recent authentication attempt."""
+    auth_info: AuthIdentity | None = None
+    """Credential-free identity metadata for the active account, including resolved Copilot user
+    information when available.
     """
 
     @staticmethod
-    def from_dict(obj: Any) -> 'AuthIdentity':
+    def from_dict(obj: Any) -> 'AuthReadValue':
         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)
+        kind = AuthReadQueryKind(obj.get("kind"))
+        account = from_union([AccountStatus.from_dict, from_none], obj.get("account"))
+        auth_info = from_union([AuthIdentity.from_dict, from_none], obj.get("authInfo"))
+        status = from_union([AuthStatusDto.from_dict, from_none], obj.get("status"))
+        errors = from_union([lambda x: from_list(AuthValidationError.from_dict, x), from_none], obj.get("errors"))
+        return AuthReadValue(kind, account, status, errors, auth_info)
 
     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)
+        result["kind"] = to_enum(AuthReadQueryKind, self.kind)
+        if self.account is not None:
+            result["account"] = from_union([lambda x: to_class(AccountStatus, x), from_none], self.account)
+        if self.auth_info is not None:
+            result["authInfo"] = from_union([lambda x: to_class(AuthIdentity, x), from_none], self.auth_info)
+        if self.status is not None:
+            result["status"] = from_union([lambda x: to_class(AuthStatusDto, x), from_none], self.status)
+        if self.errors is not None:
+            result["errors"] = from_union([lambda x: from_list(lambda x: to_class(AuthValidationError, x), x), from_none], self.errors)
         return result
 
 # Experimental: this type is part of an experimental API and may change or be removed.
@@ -43969,6 +50754,99 @@ 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 ManagedPermissionOperation:
+    """Original input operation associated with this verdict."""
+
+    kind: ManagedPermissionOperationKind
+    url: str
+    """Absolute HTTP(S) URL with a host. Invalid URLs reject the entire evaluation batch."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'ManagedPermissionOperation':
+        assert isinstance(obj, dict)
+        kind = ManagedPermissionOperationKind(obj.get("kind"))
+        url = from_str(obj.get("url"))
+        return ManagedPermissionOperation(kind, url)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["kind"] = to_enum(ManagedPermissionOperationKind, 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 ManagedPermissionEvaluation:
+    operation: ManagedPermissionOperation
+    """Original input operation associated with this verdict."""
+
+    verdict: ManagedPermissionVerdict
+    """Managed-policy decision only; never bypasses user permissions or other security controls."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'ManagedPermissionEvaluation':
+        assert isinstance(obj, dict)
+        operation = ManagedPermissionOperation.from_dict(obj.get("operation"))
+        verdict = ManagedPermissionVerdict(obj.get("verdict"))
+        return ManagedPermissionEvaluation(operation, verdict)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["operation"] = to_class(ManagedPermissionOperation, self.operation)
+        result["verdict"] = to_enum(ManagedPermissionVerdict, self.verdict)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class ManagedPermissionsEvaluateRequest:
+    """Managed policy context and ordered operations for pure, sessionless evaluation."""
+
+    context: ManagedPermissionsContext
+    """Trusted, reusable managed permission policy snapshot; no policy is discovered during
+    evaluation.
+    """
+    operations: list[ManagedPermissionOperation]
+    """Operations to evaluate, preserving input order and duplicates. An empty batch is valid."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'ManagedPermissionsEvaluateRequest':
+        assert isinstance(obj, dict)
+        context = ManagedPermissionsContext.from_dict(obj.get("context"))
+        operations = from_list(ManagedPermissionOperation.from_dict, obj.get("operations"))
+        return ManagedPermissionsEvaluateRequest(context, operations)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["context"] = to_class(ManagedPermissionsContext, self.context)
+        result["operations"] = from_list(lambda x: to_class(ManagedPermissionOperation, x), self.operations)
+        return result
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class ManagedPermissionsEvaluateResult:
+    """Ordered managed permission verdicts and the supplied policy's fail-closed posture."""
+
+    fail_closed: bool
+    """Managed permission policy could not be determined; every operation is denied."""
+
+    results: list[ManagedPermissionEvaluation]
+    """One verdict per input operation, in the same order, including duplicates."""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'ManagedPermissionsEvaluateResult':
+        assert isinstance(obj, dict)
+        fail_closed = from_bool(obj.get("failClosed"))
+        results = from_list(ManagedPermissionEvaluation.from_dict, obj.get("results"))
+        return ManagedPermissionsEvaluateResult(fail_closed, results)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["failClosed"] = from_bool(self.fail_closed)
+        result["results"] = from_list(lambda x: to_class(ManagedPermissionEvaluation, x), self.results)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class ManagedSettingsSchemaResult:
@@ -44112,7 +50990,7 @@ def to_dict(self) -> dict:
 # 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 MCPRegisterExternalClientRequest:
+class _MCPRegisterExternalClientRequest:
     """Registration parameters for an external MCP client."""
 
     client: Any
@@ -44132,13 +51010,13 @@ class MCPRegisterExternalClientRequest:
     """
 
     @staticmethod
-    def from_dict(obj: Any) -> 'MCPRegisterExternalClientRequest':
+    def from_dict(obj: Any) -> '_MCPRegisterExternalClientRequest':
         assert isinstance(obj, dict)
         client = obj.get("client")
         config = obj.get("config")
         server_name = from_str(obj.get("serverName"))
         transport = obj.get("transport")
-        return MCPRegisterExternalClientRequest(client, config, server_name, transport)
+        return _MCPRegisterExternalClientRequest(client, config, server_name, transport)
 
     def to_dict(self) -> dict:
         result: dict = {}
@@ -44148,6 +51026,57 @@ 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.
+# Internal: this type is an internal SDK API and is not part of the public surface.
+@dataclass
+class _MCPRegistrySearchRequest:
+    """Registry search terms, the credential to search under, and the request id that makes the
+    search cancellable.
+    """
+    auth_info: Any
+    """The credential the search runs under, carried opaquely. Hosts usually send
+    credential-free `AuthIdentity`; a `token` identity can be resolved only when it embeds a
+    token, while `env` and `gh-cli` identities can use a token embedded in the request first.
+    """
+    limit: int
+    """Maximum number of servers to return."""
+
+    request_id: int
+    """Request ID from `mcp.registry.allocateRequestId`. The search refuses unknown, reclaimed,
+    or canceled IDs and IDs that another search or request already uses.
+    """
+    query: str | None = None
+    """Free-text query. Omitted or empty asks the registry for its top servers rather than
+    searching. A value that is not a string is refused.
+    """
+    repository: str | None = None
+    """Repository used for the policy lookup, as `owner/name`. The policy selects the registry
+    URL and whether the user token goes to the registry. The registry receives this
+    repository only when the policy entry lists it as required context. A value that is not a
+    string is refused.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_MCPRegistrySearchRequest':
+        assert isinstance(obj, dict)
+        auth_info = obj.get("authInfo")
+        limit = from_int(obj.get("limit"))
+        request_id = from_int(obj.get("requestId"))
+        query = from_union([from_str, from_none], obj.get("query"))
+        repository = from_union([from_str, from_none], obj.get("repository"))
+        return _MCPRegistrySearchRequest(auth_info, limit, request_id, query, repository)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["authInfo"] = self.auth_info
+        result["limit"] = from_int(self.limit)
+        result["requestId"] = from_int(self.request_id)
+        if self.query is not None:
+            result["query"] = from_union([from_str, from_none], self.query)
+        if self.repository is not None:
+            result["repository"] = from_union([from_str, from_none], self.repository)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class MCPServerConfig:
@@ -44397,7 +51326,7 @@ def to_dict(self) -> dict:
 # 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:
+class _MCPReloadConfig:
     """In-process MCP reload configuration."""
 
     mcp_servers: dict[str, MCPServerConfig]
@@ -44417,7 +51346,7 @@ class MCPReloadConfig:
     use_cached_tool_snapshots: bool | None = None
 
     @staticmethod
-    def from_dict(obj: Any) -> 'MCPReloadConfig':
+    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"))
@@ -44432,7 +51361,7 @@ def from_dict(obj: Any) -> 'MCPReloadConfig':
         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)
+        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 = {}
@@ -44701,13 +51630,13 @@ def to_dict(self) -> dict:
 # 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:
+class _MCPServerConfigMemory:
     """In-process MCP server configuration used by embedded SDK clients."""
 
     server_instance: Any
     """In-process MCP server instance. This value cannot cross a JSON-RPC boundary."""
 
-    type: MCPServerConfigMemoryType
+    type: _MCPServerConfigMemoryType
     config_warnings: list[str] | None = None
     """Configuration warnings recorded while loading the server."""
 
@@ -44771,10 +51700,10 @@ class MCPServerConfigMemory:
     """Tools to include. Defaults to all tools if not specified."""
 
     @staticmethod
-    def from_dict(obj: Any) -> 'MCPServerConfigMemory':
+    def from_dict(obj: Any) -> '_MCPServerConfigMemory':
         assert isinstance(obj, dict)
         server_instance = obj.get("serverInstance")
-        type = MCPServerConfigMemoryType(obj.get("type"))
+        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"))
@@ -44795,12 +51724,12 @@ def from_dict(obj: Any) -> 'MCPServerConfigMemory':
         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, slow_connection_threshold_ms, source, source_path, source_plugin, source_plugin_spec, source_plugin_version, timeout, 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, slow_connection_threshold_ms, 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)
+        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:
@@ -44849,11 +51778,17 @@ class MetadataContextInfoRequest:
     """Model identifier and token limits used to compute the context-info breakdown."""
 
     output_token_limit: int
-    """Maximum output tokens allowed by the target model. Pass 0 if unknown."""
-
+    """Requested output allowance to reserve against the combined context ceiling. Pass 0 to
+    resolve the session's request cap, falling back to the model's advertised output limit.
+    """
     prompt_token_limit: int
-    """Maximum prompt tokens allowed by the target model. Pass 0 to use the runtime default."""
-
+    """Advertised prompt allowance. Pass 0 to resolve the selected model and context tier from
+    the session.
+    """
+    provider_id: str | None = None
+    """Provider owning selectedModel. Omit to use the current provider for the current model, or
+    deterministic legacy lookup for a different model.
+    """
     selected_model: str | None = None
     """Model identifier used for tokenization. Omit to use the session default. Used both for
     token counting and to compute display values.
@@ -44864,13 +51799,16 @@ def from_dict(obj: Any) -> 'MetadataContextInfoRequest':
         assert isinstance(obj, dict)
         output_token_limit = from_int(obj.get("outputTokenLimit"))
         prompt_token_limit = from_int(obj.get("promptTokenLimit"))
+        provider_id = from_union([from_str, from_none], obj.get("providerId"))
         selected_model = from_union([from_str, from_none], obj.get("selectedModel"))
-        return MetadataContextInfoRequest(output_token_limit, prompt_token_limit, selected_model)
+        return MetadataContextInfoRequest(output_token_limit, prompt_token_limit, provider_id, selected_model)
 
     def to_dict(self) -> dict:
         result: dict = {}
         result["outputTokenLimit"] = from_int(self.output_token_limit)
         result["promptTokenLimit"] = from_int(self.prompt_token_limit)
+        if self.provider_id is not None:
+            result["providerId"] = from_union([from_str, from_none], self.provider_id)
         if self.selected_model is not None:
             result["selectedModel"] = from_union([from_str, from_none], self.selected_model)
         return result
@@ -44904,46 +51842,6 @@ class ModelPickerCategory(Enum):
     POWERFUL = "powerful"
     VERSATILE = "versatile"
 
-# Experimental: this type is part of an experimental API and may change or be removed.
-@dataclass
-class ModelProviderRef:
-    """The model provider that produced this model, as a neutral reference (opaque id,
-    human-readable label, and provider kind). Present on models returned by
-    `session.model.list`, which resolves provider attribution from the session's account
-    roster; absent on the flat `server.models.list`, which does not resolve a session roster.
-    The model picker groups by this reference.
-
-    A neutral reference to the model provider that produced a model: an opaque id, a
-    human-readable label, and the provider kind. Carried on each enumerated Model so
-    consumers can group by provider without reaching into a provider-shaped internal type.
-    """
-    id: str
-    """Opaque, stable id of the provider that produced this model. Matches the enumerated
-    `ModelProviderDescriptor.id`.
-    """
-    kind: ModelProviderKind
-    """The provider kind."""
-
-    label: str
-    """Human-readable provider label, owned by the runtime so every consumer renders identical
-    text.
-    """
-
-    @staticmethod
-    def from_dict(obj: Any) -> 'ModelProviderRef':
-        assert isinstance(obj, dict)
-        id = from_str(obj.get("id"))
-        kind = ModelProviderKind(obj.get("kind"))
-        label = from_str(obj.get("label"))
-        return ModelProviderRef(id, kind, label)
-
-    def to_dict(self) -> dict:
-        result: dict = {}
-        result["id"] = from_str(self.id)
-        result["kind"] = to_enum(ModelProviderKind, self.kind)
-        result["label"] = from_str(self.label)
-        return result
-
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class Model:
@@ -45000,6 +51898,12 @@ class Model:
     supported_reasoning_efforts: list[str] | None = None
     """Supported reasoning effort levels (only present if model supports reasoning effort)"""
 
+    vendor: str | None = None
+    """Model vendor as the Copilot API reports it, for example "Anthropic" or "Azure OpenAI".
+    Open vocabulary, passed through unchanged. It can name the vendor that serves the model
+    instead of the one that built it, or a label that is not a vendor, such as
+    "Experimental". Absent when the Copilot API reports no vendor.
+    """
     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;
@@ -45026,9 +51930,10 @@ def from_dict(obj: Any) -> 'Model':
         provider = from_union([ModelProviderRef.from_dict, from_none], obj.get("provider"))
         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"))
+        vendor = from_union([from_str, from_none], obj.get("vendor"))
         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, metadata, model_picker_category, model_picker_price_category, policy, provider, supported_context_tiers, supported_reasoning_efforts, warning_messages, warning_text)
+        return Model(capabilities, id, name, billing, default_reasoning_effort, info_messages, metadata, model_picker_category, model_picker_price_category, policy, provider, supported_context_tiers, supported_reasoning_efforts, vendor, warning_messages, warning_text)
 
     def to_dict(self) -> dict:
         result: dict = {}
@@ -45055,6 +51960,8 @@ def to_dict(self) -> dict:
             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.vendor is not None:
+            result["vendor"] = from_union([from_str, from_none], self.vendor)
         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:
@@ -45104,6 +52011,10 @@ class ModelApplyStartupOverlayRequest:
     repo_model: str | None = None
     """Model selected by repository settings, when configured."""
 
+    repo_model_provider_id: str | None = None
+    """Provider owning the repository-selected model. Omitted repository provider identity
+    retains legacy bare-model behavior.
+    """
     repo_reasoning_effort: str | None = None
     """Reasoning effort selected by repository settings, when configured."""
 
@@ -45123,9 +52034,10 @@ def from_dict(obj: Any) -> 'ModelApplyStartupOverlayRequest':
         repo_auto_tier = from_union([from_str, from_none], obj.get("repoAutoTier"))
         repo_context_tier = from_union([from_str, from_none], obj.get("repoContextTier"))
         repo_model = from_union([from_str, from_none], obj.get("repoModel"))
+        repo_model_provider_id = from_union([from_str, from_none], obj.get("repoModelProviderId"))
         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(auto_tier, cli_model, deferred_resume, device_managed_model, managed_context_tier, managed_reasoning_effort, policy_helper_model, repo_auto_tier, repo_context_tier, repo_model, repo_reasoning_effort, server_managed_model)
+        return ModelApplyStartupOverlayRequest(auto_tier, cli_model, deferred_resume, device_managed_model, managed_context_tier, managed_reasoning_effort, policy_helper_model, repo_auto_tier, repo_context_tier, repo_model, repo_model_provider_id, repo_reasoning_effort, server_managed_model)
 
     def to_dict(self) -> dict:
         result: dict = {}
@@ -45149,6 +52061,8 @@ def to_dict(self) -> dict:
             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_model_provider_id is not None:
+            result["repoModelProviderId"] = from_union([from_str, from_none], self.repo_model_provider_id)
         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:
@@ -45351,9 +52265,10 @@ class ModelSwitchToRequest:
     context tier.
     """
     model_id: str
-    """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.
+    """Model id to switch to, as returned by `list`. Include providerId to select an exact
+    catalog entry when providers share the id. Without providerId, a bare id retains
+    incumbent selection behavior; a registry-qualified id (`provider/id`, e.g.
+    `acme/claude-sonnet`) targets a BYOK model.
     """
     auto_tier: AutoTier | None = None
     """Optional Auto routing preference to stage atomically with selecting `auto`. Pass null to
@@ -45384,6 +52299,11 @@ class ModelSwitchToRequest:
     picker_persistence: ModelPickerPersistenceRequest | None = None
     """Optional settings context and explicit-override flags used to persist a picker selection."""
 
+    provider_id: str | None = field(default=None, kw_only=True)
+    """Provider id from the selected list entry's provider reference. Selects this exact
+    provider/model pair; an unavailable pair fails rather than using another provider. Omit
+    for deterministic legacy bare-model 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
@@ -45420,6 +52340,7 @@ def from_dict(obj: Any) -> 'ModelSwitchToRequest':
         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"))
+        provider_id = from_union([from_str, from_none], obj.get("providerId"))
         reasoning_effort = from_union([from_none, from_str], obj.get("reasoningEffort"))
         reasoning_summary = from_union([ReasoningSummary, from_none], obj.get("reasoningSummary"))
         repo_scope = from_union([from_str, from_none], obj.get("repoScope"))
@@ -45427,7 +52348,7 @@ def from_dict(obj: Any) -> 'ModelSwitchToRequest':
         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, auto_tier, 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)
+        return ModelSwitchToRequest(model_id, auto_tier, 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, provider_id=provider_id)
 
     def to_dict(self) -> dict:
         result: dict = {}
@@ -45446,6 +52367,8 @@ def to_dict(self) -> dict:
             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.provider_id is not None:
+            result["providerId"] = from_union([from_str, from_none], self.provider_id)
         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:
@@ -45818,6 +52741,13 @@ class SessionOpenOptions:
     agent_context: str | None = None
     """Runtime context discriminator for agent filtering."""
 
+    agent_directories: list[str] | None = None
+    """Explicit discovery-only agent roots, separate from customAgents and filesystem grants.
+    Available without enableConfigDiscovery, subject to managed/source disables. Relative SDK
+    paths resolve once when supplied against the request's effective workingDirectory;
+    retained roots do not move on cwd changes. Null and omission are equivalent; [] clears
+    only the explicit SDK contribution.
+    """
     allow_all_mcp_server_instructions: bool | None = None
     """Whether to include instructions from every MCP server in the system prompt instead of
     only allowlisted servers.
@@ -45831,6 +52761,12 @@ class SessionOpenOptions:
     auth_info: AuthInfo | None = None
     """Initial authentication info for the session."""
 
+    # Internal: this field is an internal SDK API and is not part of the public surface.
+    auto_tier_is_explicit: bool | None = None
+    """Whether a CLI host explicitly requested the initial Auto preference. False preserves a
+    settings-derived preference without validating availability during creation; execution
+    still validates it. Defaults to true and is ignored for non-CLI callers.
+    """
     available_tools: list[str] | None = None
     """Allowlist of available tool names."""
 
@@ -45912,12 +52848,17 @@ class SessionOpenOptions:
     """Whether shell-script safety heuristics are enabled."""
 
     enable_skills: bool | None = None
-    """Whether skill loading is enabled. When omitted, an SDK skill provider enables skills by
-    default.
+    """Whether skill loading is enabled. When omitted, explicit SDK skill roots or an SDK skill
+    provider enable skills independently of enableConfigDiscovery.
     """
     enable_streaming: bool | None = None
     """Whether model responses stream as delta events."""
 
+    enforce_managed_model_defaults: bool | None = None
+    """Opt in to enforcing non-overridable managed model controls on session model, Auto-tier,
+    reasoning-effort, and context-tier changes. Managed defaults still apply when omitted;
+    this option only turns conflicting changes into errors.
+    """
     env_value_mode: MCPSetEnvValueModeDetails | None = None
     """How MCP server environment values are interpreted."""
 
@@ -45953,6 +52894,14 @@ class SessionOpenOptions:
     sessions.open flows reject it because they cannot safely pre-register the callback
     handler.
     """
+    hook_directories: list[str] | None = None
+    """Explicit discovery-only file-hook roots, separate from callback hooks and filesystem
+    grants. Available without enableConfigDiscovery or enableFileHooks, which controls
+    repository-origin hooks only; hook/managed disables still apply. Relative SDK paths
+    resolve once when supplied against the request's effective workingDirectory; retained
+    roots do not move on cwd changes. Null and omission are equivalent; [] clears only the
+    explicit SDK contribution.
+    """
     ignored_skills_locations: list[str] | None = None
     """Skill scan directories and descendants excluded from discovery. Supports `~`-relative
     paths.
@@ -45970,6 +52919,13 @@ class SessionOpenOptions:
     installed_plugins: list[InstalledPlugin] | None = None
     """Installed plugins visible to the session."""
 
+    instruction_directories: list[str] | None = None
+    """Explicit discovery-only instruction roots using existing SDK instruction formats, not
+    filesystem grants. Available without enableConfigDiscovery, subject to
+    instruction/managed disables. Relative SDK paths resolve once when supplied against the
+    request's effective workingDirectory; retained roots do not move on cwd changes. Null and
+    omission are equivalent; [] clears only the explicit SDK contribution.
+    """
     integration_id: str | None = None
     """Stable integration identifier for analytics."""
 
@@ -46070,8 +53026,12 @@ class SessionOpenOptions:
     """PowerShell process flags applied to built-in and user-requested shell commands."""
 
     skill_directories: list[str] | None = None
-    """Additional directories to search for skills."""
-
+    """Explicit discovery-only skill roots, not filesystem grants. Available without
+    enableConfigDiscovery, subject to skill/managed disables. Relative SDK paths resolve once
+    when supplied against the request's effective workingDirectory; retained roots do not
+    move on cwd changes. Null and omission are equivalent; [] clears only the explicit SDK
+    contribution.
+    """
     skip_custom_instructions: bool | None = None
     """Whether to skip custom instruction sources."""
 
@@ -46093,10 +53053,12 @@ def from_dict(obj: Any) -> 'SessionOpenOptions':
         additional_content_exclusion_policies = from_union([lambda x: from_list(SessionOpenOptionsAdditionalContentExclusionPolicy.from_dict, x), from_none], obj.get("additionalContentExclusionPolicies"))
         additional_directories = from_union([lambda x: from_list(from_str, x), from_none], obj.get("additionalDirectories"))
         agent_context = from_union([from_str, from_none], obj.get("agentContext"))
+        agent_directories = from_union([lambda x: from_list(from_str, x), from_none], obj.get("agentDirectories"))
         allow_all_mcp_server_instructions = from_union([from_bool, from_none], obj.get("allowAllMcpServerInstructions"))
         ask_user_disabled = from_union([from_bool, from_none], obj.get("askUserDisabled"))
         auth_client_id_metadata_url = from_union([from_str, from_none], obj.get("authClientIdMetadataUrl"))
         auth_info = from_union([_load_AuthInfo, from_none], obj.get("authInfo"))
+        auto_tier_is_explicit = from_union([from_bool, from_none], obj.get("autoTierIsExplicit"))
         available_tools = from_union([lambda x: from_list(from_str, x), from_none], obj.get("availableTools"))
         capi = from_union([CapiSessionOptions.from_dict, from_none], obj.get("capi"))
         client_kind = from_union([from_str, from_none], obj.get("clientKind"))
@@ -46118,6 +53080,7 @@ def from_dict(obj: Any) -> 'SessionOpenOptions':
         enable_script_safety = from_union([from_bool, from_none], obj.get("enableScriptSafety"))
         enable_skills = from_union([from_bool, from_none], obj.get("enableSkills"))
         enable_streaming = from_union([from_bool, from_none], obj.get("enableStreaming"))
+        enforce_managed_model_defaults = from_union([from_bool, from_none], obj.get("enforceManagedModelDefaults"))
         env_value_mode = from_union([MCPSetEnvValueModeDetails, from_none], obj.get("envValueMode"))
         events_log_directory = from_union([from_str, from_none], obj.get("eventsLogDirectory"))
         events_log_includes_subagents = from_union([from_bool, from_none], obj.get("eventsLogIncludesSubagents"))
@@ -46126,10 +53089,12 @@ 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"))
         has_skill_provider = from_union([from_bool, from_none], obj.get("hasSkillProvider"))
+        hook_directories = from_union([lambda x: from_list(from_str, x), from_none], obj.get("hookDirectories"))
         ignored_skills_locations = from_union([lambda x: from_list(from_str, x), from_none], obj.get("ignoredSkillsLocations"))
         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"))
+        instruction_directories = from_union([lambda x: from_list(from_str, x), from_none], obj.get("instructionDirectories"))
         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"))
@@ -46165,7 +53130,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_client_id_metadata_url, 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_skills, enable_streaming, env_value_mode, events_log_directory, events_log_includes_subagents, excluded_builtin_agents, excluded_tools, exp_assignments, feature_flags, has_skill_provider, ignored_skills_locations, included_builtin_agents, included_builtin_skills, installed_plugins, integration_id, is_experimental_mode, log_interactive_shells, lsp_client_name, managed_mcp_servers, managed_settings, max_inline_binary_bytes, memory, model, model_capabilities_overrides, models, name, provider, providers, reasoning_effort, reasoning_summary, refresh_custom_instructions, 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)
+        return SessionOpenOptions(additional_content_exclusion_policies, additional_directories, agent_context, agent_directories, allow_all_mcp_server_instructions, ask_user_disabled, auth_client_id_metadata_url, auth_info, auto_tier_is_explicit, 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_skills, enable_streaming, enforce_managed_model_defaults, env_value_mode, events_log_directory, events_log_includes_subagents, excluded_builtin_agents, excluded_tools, exp_assignments, feature_flags, has_skill_provider, hook_directories, ignored_skills_locations, included_builtin_agents, included_builtin_skills, installed_plugins, instruction_directories, integration_id, is_experimental_mode, log_interactive_shells, lsp_client_name, managed_mcp_servers, managed_settings, max_inline_binary_bytes, memory, model, model_capabilities_overrides, models, name, provider, providers, reasoning_effort, reasoning_summary, refresh_custom_instructions, 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 = {}
@@ -46175,6 +53140,8 @@ def to_dict(self) -> dict:
             result["additionalDirectories"] = from_union([lambda x: from_list(from_str, x), from_none], self.additional_directories)
         if self.agent_context is not None:
             result["agentContext"] = from_union([from_str, from_none], self.agent_context)
+        if self.agent_directories is not None:
+            result["agentDirectories"] = from_union([lambda x: from_list(from_str, x), from_none], self.agent_directories)
         if self.allow_all_mcp_server_instructions is not None:
             result["allowAllMcpServerInstructions"] = from_union([from_bool, from_none], self.allow_all_mcp_server_instructions)
         if self.ask_user_disabled is not None:
@@ -46183,6 +53150,8 @@ def to_dict(self) -> dict:
             result["authClientIdMetadataUrl"] = from_union([from_str, from_none], self.auth_client_id_metadata_url)
         if self.auth_info is not None:
             result["authInfo"] = from_union([lambda x: (x).to_dict(), from_none], self.auth_info)
+        if self.auto_tier_is_explicit is not None:
+            result["autoTierIsExplicit"] = from_union([from_bool, from_none], self.auto_tier_is_explicit)
         if self.available_tools is not None:
             result["availableTools"] = from_union([lambda x: from_list(from_str, x), from_none], self.available_tools)
         if self.capi is not None:
@@ -46225,6 +53194,8 @@ def to_dict(self) -> dict:
             result["enableSkills"] = from_union([from_bool, from_none], self.enable_skills)
         if self.enable_streaming is not None:
             result["enableStreaming"] = from_union([from_bool, from_none], self.enable_streaming)
+        if self.enforce_managed_model_defaults is not None:
+            result["enforceManagedModelDefaults"] = from_union([from_bool, from_none], self.enforce_managed_model_defaults)
         if self.env_value_mode is not None:
             result["envValueMode"] = from_union([lambda x: to_enum(MCPSetEnvValueModeDetails, x), from_none], self.env_value_mode)
         if self.events_log_directory is not None:
@@ -46241,6 +53212,8 @@ def to_dict(self) -> dict:
             result["featureFlags"] = from_union([lambda x: from_dict(from_bool, x), from_none], self.feature_flags)
         if self.has_skill_provider is not None:
             result["hasSkillProvider"] = from_union([from_bool, from_none], self.has_skill_provider)
+        if self.hook_directories is not None:
+            result["hookDirectories"] = from_union([lambda x: from_list(from_str, x), from_none], self.hook_directories)
         if self.ignored_skills_locations is not None:
             result["ignoredSkillsLocations"] = from_union([lambda x: from_list(from_str, x), from_none], self.ignored_skills_locations)
         if self.included_builtin_agents is not None:
@@ -46249,6 +53222,8 @@ def to_dict(self) -> dict:
             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.instruction_directories is not None:
+            result["instructionDirectories"] = from_union([lambda x: from_list(from_str, x), from_none], self.instruction_directories)
         if self.integration_id is not None:
             result["integrationId"] = from_union([from_str, from_none], self.integration_id)
         if self.is_experimental_mode is not None:
@@ -46764,6 +53739,40 @@ 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.
+# Internal: this type is an internal SDK API and is not part of the public surface.
+class _SettingsEditStatus(Enum):
+    """Changed, unchanged or invalid existing file. Rejected input, validation failures and I/O
+    errors remain RPC errors.
+
+    Whether one atomic settings edit changed a file.
+    """
+    CHANGED = "changed"
+    INVALID = "invalid"
+    UNCHANGED = "unchanged"
+
+# 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 _SettingsEditResult:
+    """Outcome of an atomic user or repository settings edit."""
+
+    status: _SettingsEditStatus
+    """Changed, unchanged or invalid existing file. Rejected input, validation failures and I/O
+    errors remain RPC errors.
+    """
+
+    @staticmethod
+    def from_dict(obj: Any) -> '_SettingsEditResult':
+        assert isinstance(obj, dict)
+        status = _SettingsEditStatus(obj.get("status"))
+        return _SettingsEditResult(status)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["status"] = to_enum(_SettingsEditStatus, self.status)
+        return result
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class ShellExecRequest:
@@ -47421,16 +54430,30 @@ def to_dict(self) -> dict:
         result["terminal"] = from_union([lambda x: to_class(WorkflowRunTerminal, x), from_none], self.terminal)
         return result
 
+def rpc_from_dict(s: Any) -> RPC:
+    return RPC.from_dict(s)
+
+def rpc_to_dict(x: RPC) -> Any:
+    return to_class(RPC, x)
+
 @dataclass
 class RPC:
     abort_request: AbortRequest
     abort_result: AbortResult
     accepted_enqueue_command_result: AcceptedEnqueueCommandResult
     account_all_users: AccountAllUsers
+    account_auth_info: AccountAuthInfo
+    account_describe_auth_info_request: _AccountDescribeAuthInfoRequest
+    account_describe_auth_info_result: _AccountDescribeAuthInfoResult
     account_get_all_users_result: list[AccountAllUsers]
     account_get_current_auth_result: AccountGetCurrentAuthResult
+    account_get_gist_support_request: _AccountGetGistSupportRequest
+    account_get_gist_support_result: _AccountGetGistSupportResult
     account_get_quota_request: AccountGetQuotaRequest
     account_get_quota_result: AccountGetQuotaResult
+    account_get_token_env_var_result: _AccountGetTokenEnvVarResult
+    account_get_web_url_request: _AccountGetWebURLRequest
+    account_get_web_url_result: _AccountGetWebURLResult
     account_kind: AccountKind
     account_login_request: AccountLoginRequest
     account_login_result: AccountLoginResult
@@ -47467,10 +54490,19 @@ class RPC:
     agent_registry_spawn_validation_error_field: AgentRegistrySpawnValidationErrorField
     agent_registry_spawn_validation_error_reason: AgentRegistrySpawnValidationErrorReason
     agent_reload_result: AgentReloadResult
+    agents_custom_agent_initial_model_decision_params: _AgentsCustomAgentInitialModelDecisionParams
+    agents_custom_agent_initial_model_decision_result: _AgentsCustomAgentInitialModelDecisionResult
     agents_discover_request: AgentsDiscoverRequest
     agent_select_request: AgentSelectRequest
     agent_select_result: AgentSelectResult
     agent_set_prompt_request: AgentSetPromptRequest
+    agents_get_available_builtins_request: _AgentsGetAvailableBuiltinsRequest
+    agents_get_available_builtins_result: _AgentsGetAvailableBuiltinsResult
+    agents_get_builtin_definition_request: _AgentsGetBuiltinDefinitionRequest
+    agents_get_builtin_definition_result: _AgentsGetBuiltinDefinitionResult
+    agents_get_builtin_listing_definition_request: _AgentsGetBuiltinListingDefinitionRequest
+    agents_get_builtin_listing_definition_result: _AgentsGetBuiltinListingDefinitionResult
+    agents_get_builtins_result: _AgentsGetBuiltinsResult
     agents_get_discovery_paths_request: AgentsGetDiscoveryPathsRequest
     api_key_auth_info: APIKeyAuthInfo
     auth_enumerate_query: AuthEnumerateQuery
@@ -47479,6 +54511,7 @@ class RPC:
     auth_identity_metadata: AuthIdentityMetadata
     auth_info: AuthInfo
     auth_info_type: AuthInfoType
+    auth_login_account: AuthLoginAccount
     auth_login_advance_request: AuthLoginAdvanceRequest
     auth_login_begin_request: AuthLoginBeginRequest
     auth_login_begun: AuthLoginBegun
@@ -47497,6 +54530,10 @@ class RPC:
     autopilot_objective_get_state_result: AutopilotObjectiveGetStateResult
     autopilot_objective_state: AutopilotObjectiveState
     autopilot_objective_status: AutopilotObjectiveStatus
+    auto_tier_descriptor: AutoTierDescriptor
+    auto_tier_metadata: AutoTierMetadata
+    auto_tier_status: AutoTierStatus
+    builtin_agent_summary: _BuiltinAgentSummary
     built_in_model_catalog: BuiltInModelCatalog
     built_in_model_catalog_entry: BuiltInModelCatalogEntry
     builtin_tool_descriptor: BuiltinToolDescriptor
@@ -47653,6 +54690,14 @@ class RPC:
     connector_connect_result: ConnectorConnectResult
     connector_continue_request: ConnectorContinueRequest
     connector_disconnect_result: ConnectorDisconnectResult
+    connector_discovery_account: ConnectorDiscoveryAccount
+    connector_discovery_account_list: ConnectorDiscoveryAccountList
+    connector_discovery_account_request: ConnectorDiscoveryAccountRequest
+    connector_discovery_auth_info: ConnectorDiscoveryAuthInfo
+    connector_discovery_availability: ConnectorDiscoveryAvailability
+    connector_discovery_capabilities: ConnectorDiscoveryCapabilities
+    connector_discovery_catalog_entry: ConnectorDiscoveryCatalogEntry
+    connector_discovery_catalog_result: ConnectorDiscoveryCatalogResult
     connector_mcp_status: ConnectorMCPStatus
     connector_reconcile_request: ConnectorReconcileRequest
     connector_runtime_status: ConnectorRuntimeStatus
@@ -47759,20 +54804,46 @@ class RPC:
     external_tool_text_result_for_llm_content_shell_exit: ExternalToolTextResultForLlmContentShellExit
     external_tool_text_result_for_llm_content_terminal: ExternalToolTextResultForLlmContentTerminal
     external_tool_text_result_for_llm_content_text: ExternalToolTextResultForLlmContentText
+    feature_flag_availability: _FeatureFlagAvailability
+    feature_flag_metadata: _FeatureFlagMetadata
+    feature_flags_metadata_result: _FeatureFlagsMetadataResult
+    feature_flags_resolve_request: _FeatureFlagsResolveRequest
+    feature_flags_resolve_result: dict[str, bool]
+    feature_flags_resolve_startup_gates_request: _FeatureFlagsResolveStartupGatesRequest
+    feature_flags_resolve_startup_gates_result: dict[str, bool]
     filter_mapping: dict[str, ContentFilterMode] | ContentFilterMode
     fleet_start_request: FleetStartRequest
     fleet_start_result: FleetStartResult
     folder_trust_add_params: FolderTrustAddParams
     folder_trust_check_params: FolderTrustCheckParams
     folder_trust_check_result: FolderTrustCheckResult
+    folder_trust_is_trusted_params: _FolderTrustIsTrustedParams
+    force_login_orgs_decision: _ForceLoginOrgsDecision
     gh_cli_auth_info: GhCLIAuthInfo
+    git_current_branch_remote_result: _GitCurrentBranchRemoteResult
+    git_cwd_request: _GitCwdRequest
     git_hub_environment: GitHubEnvironment
+    git_hub_owner_option: _GitHubOwnerOption
+    git_hub_owners_cancel_request: _GitHubOwnersCancelRequest
+    git_hub_owners_cancel_result: _GitHubOwnersCancelResult
+    git_hub_owners_list_request: _GitHubOwnersListRequest
+    git_hub_owners_list_result: _GitHubOwnersListResult
+    git_hub_owners_request_id_result: _GitHubOwnersRequestIDResult
+    git_hub_repository_at_path_request: _GitHubRepositoryAtPathRequest
+    git_hub_repository_at_path_result: _GitHubRepositoryAtPathResult
+    git_hub_repository_identity: GitHubRepositoryIdentity
     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
+    git_remote_repository: _GitRemoteRepository
+    git_repos_from_remotes_request: _GitReposFromRemotesRequest
+    git_repos_from_remotes_result: _GitReposFromRemotesResult
+    global_state_load_for_config_dir_request: _GlobalStateLoadForConfigDirRequest
+    global_state_load_result: _GlobalStateLoadResult
+    global_state_write_key_request: _GlobalStateWriteKeyRequest
     handle_pending_tool_call_request: HandlePendingToolCallRequest
     handle_pending_tool_call_result: HandlePendingToolCallResult
     history_abort_manual_compaction_result: HistoryAbortManualCompactionResult
@@ -47812,6 +54883,8 @@ class RPC:
     host_exited_notification: HostExitedNotification
     host_exit_reason: HostExitReason
     host_git_hub_environment_options: HostGitHubEnvironmentOptions
+    host_list_sessions_request: HostListSessionsRequest
+    host_list_sessions_result: HostListSessionsResult
     host_local_server_configuration: HostLocalServerConfiguration
     host_local_server_options: HostLocalServerOptions
     host_publish_session_request: HostPublishSessionRequest
@@ -47823,6 +54896,7 @@ class RPC:
     host_session_create_result: HostSessionCreateResult
     host_session_released_notification: HostSessionReleasedNotification
     host_session_release_request: HostSessionReleaseRequest
+    host_session_summary: HostSessionSummary
     host_start_request: HostStartRequest
     host_start_result: HostStartResult
     installation_catalogue_identity: InstallationCatalogueIdentity
@@ -47840,9 +54914,11 @@ class RPC:
     instruction_discovery_path_kind: DebugCollectLogsEntryKind
     instruction_discovery_path_list: InstructionDiscoveryPathList
     instruction_discovery_path_location: InstructionLocation
+    instructions_discover_repo_sources_request: _InstructionsDiscoverRepoSourcesRequest
     instructions_discover_request: InstructionsDiscoverRequest
     instructions_get_discovery_paths_request: InstructionsGetDiscoveryPathsRequest
     instructions_get_sources_result: InstructionsGetSourcesResult
+    instructions_init_prompt_result: _InstructionsInitPromptResult
     instruction_source: InstructionSource
     instruction_source_location: InstructionLocation
     instruction_source_type: InstructionSourceType
@@ -47862,25 +54938,60 @@ class RPC:
     llm_inference_http_response_start_result: LlmInferenceHTTPResponseStartResult
     llm_inference_set_provider_result: LlmInferenceSetProviderResult
     local_session_metadata_value: LocalSessionMetadataValue
+    location_permissions_cleanup_result: _LocationPermissionsCleanupResult
+    logged_in_user: _LoggedInUser
     login_provider_kind: LoginProviderKind
     log_request: LogRequest
     log_result: LogResult
     lsp_initialize_request: LspInitializeRequest
     managed_mcp_server_config: ManagedMCPServerConfig
+    managed_permission_evaluation: ManagedPermissionEvaluation
+    managed_permission_operation: ManagedPermissionOperation
+    managed_permission_operation_kind: ManagedPermissionOperationKind
+    managed_permissions_evaluate_request: ManagedPermissionsEvaluateRequest
+    managed_permissions_evaluate_result: ManagedPermissionsEvaluateResult
+    managed_permission_verdict: ManagedPermissionVerdict
+    managed_plugin_retry_entry: ManagedPluginRetryEntry
+    managed_plugin_retry_status: ManagedPluginRetryStatus
     managed_setting_meta: ManagedSettingMeta
+    managed_settings_apply_controls_params: _ManagedSettingsApplyControlsParams
+    managed_settings_apply_controls_result: _ManagedSettingsApplyControlsResult
+    managed_settings_bypass_disable_source: _ManagedSettingsBypassDisableSource
+    managed_settings_bypass_policy_resolution: _ManagedSettingsBypassPolicyResolution
     managed_settings_channel: ManagedSettingsChannel
     managed_settings_compose_layer: ManagedSettingsComposeLayer
     managed_settings_compose_request: ManagedSettingsComposeRequest
     managed_settings_compose_result: ManagedSettingsComposeResult
     managed_settings_diagnostic: ManagedSettingsDiagnostic
     managed_settings_diagnostic_severity: ManagedSettingsDiagnosticSeverity
+    managed_settings_ingest_params: _ManagedSettingsIngestParams
+    managed_settings_ingest_result: _ManagedSettingsIngestResult
     managed_settings_layer: ManagedSettingsLayer
+    managed_settings_load_remote_control_params: _ManagedSettingsLoadRemoteControlParams
+    managed_settings_load_remote_control_result: _ManagedSettingsLoadRemoteControlResult
+    managed_settings_log_level: _ManagedSettingsLogLevel
+    managed_settings_log_message: _ManagedSettingsLogMessage
     managed_settings_meta: ManagedSettingsMeta
+    managed_settings_parse_client_value_params: _ManagedSettingsParseClientValueParams
+    managed_settings_parse_client_value_result: _ManagedSettingsParseClientValueResult
+    managed_settings_policy_helper_authority: _ManagedSettingsPolicyHelperAuthority
+    managed_settings_policy_helper_reason: _ManagedSettingsPolicyHelperReason
+    managed_settings_read_device_result: _ManagedSettingsReadDeviceResult
     managed_settings_read_result: ManagedSettingsReadResult
+    managed_settings_resolve_bypass_disable_transition_params: _ManagedSettingsResolveBypassDisableTransitionParams
+    managed_settings_resolve_bypass_disable_transition_result: _ManagedSettingsResolveBypassDisableTransitionResult
     managed_settings_resolved_data: ManagedSettingsResolvedData
+    managed_settings_resolve_device_force_login_orgs_gate_params: _ManagedSettingsResolveDeviceForceLoginOrgsGateParams
+    managed_settings_resolve_effective_value_params: _ManagedSettingsResolveEffectiveValueParams
+    managed_settings_resolve_effective_value_result: _ManagedSettingsResolveEffectiveValueResult
     managed_settings_resolve_request: ManagedSettingsResolveRequest
     managed_settings_resolve_result: ManagedSettingsResolveResult
+    managed_settings_resolve_startup_policy_params: _ManagedSettingsResolveStartupPolicyParams
+    managed_settings_resolve_startup_policy_result: _ManagedSettingsResolveStartupPolicyResult
+    managed_settings_retain_policy_params: _ManagedSettingsRetainPolicyParams
     managed_settings_schema_result: ManagedSettingsSchemaResult
+    managed_settings_server_policy_cache_mode: _ManagedSettingsServerPolicyCacheMode
+    managed_settings_server_policy_resolution: _ManagedSettingsServerPolicyResolution
     managed_settings_validate_request: ManagedSettingsValidateRequest
     managed_settings_validate_result: ManagedSettingsValidateResult
     managed_settings_values: ManagedSettingsValues
@@ -47925,7 +55036,10 @@ class RPC:
     mcp_config_list: MCPConfigList
     mcp_config_remove_request: MCPConfigRemoveRequest
     mcp_config_update_request: MCPConfigUpdateRequest
-    mcp_configure_git_hub_request: MCPConfigureGitHubRequest
+    mcp_configured_server: MCPConfiguredServer
+    mcp_configured_server_list: MCPConfiguredServerList
+    mcp_configured_server_state: MCPConfiguredServerState
+    mcp_configure_git_hub_request: _MCPConfigureGitHubRequest
     mcp_configure_git_hub_result: MCPConfigureGitHubResult
     mcp_diagnostic_details: MCPDiagnosticDetails
     mcp_diagnostic_direction: MCPDiagnosticDirection
@@ -47963,6 +55077,7 @@ class RPC:
     mcp_install_plan: MCPInstallPlan
     mcp_is_server_running_request: MCPIsServerRunningRequest
     mcp_is_server_running_result: MCPIsServerRunningResult
+    mcp_list_builtin_server_names_result: _MCPListBuiltinServerNamesResult
     mcp_list_tools_request: MCPListToolsRequest
     mcp_list_tools_result: MCPListToolsResult
     mcp_oauth_authentication_state_changed_request: MCPOauthAuthenticationStateChangedRequest
@@ -48029,9 +55144,14 @@ class RPC:
     mcp_prompts_get_result: MCPPromptsGetResult
     mcp_prompts_list_request: MCPPromptsListRequest
     mcp_prompts_list_result: MCPPromptsListResult
-    mcp_register_external_client_request: MCPRegisterExternalClientRequest
-    mcp_reload_config: MCPReloadConfig
-    mcp_reload_with_config_request: MCPReloadWithConfigRequest
+    mcp_register_external_client_request: _MCPRegisterExternalClientRequest
+    mcp_registry_cancel_request: _MCPRegistryCancelRequest
+    mcp_registry_cancel_result: _MCPRegistryCancelResult
+    mcp_registry_request_id_result: _MCPRegistryRequestIDResult
+    mcp_registry_search_request: _MCPRegistrySearchRequest
+    mcp_registry_search_result: _MCPRegistrySearchResult
+    mcp_reload_config: _MCPReloadConfig
+    mcp_reload_with_config_request: _MCPReloadWithConfigRequest
     mcp_remove_git_hub_result: MCPRemoveGitHubResult
     mcp_resource: MCPResource
     mcp_resource_annotations: MCPResourceAnnotations
@@ -48064,8 +55184,8 @@ class RPC:
     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_memory: _MCPServerConfigMemory
+    mcp_server_config_memory_type: _MCPServerConfigMemoryType
     mcp_server_config_stdio: MCPServerConfigStdio
     mcp_server_config_stdio_type: MCPServerConfigStdioType
     mcp_server_failure_info: MCPServerFailureInfo
@@ -48075,6 +55195,8 @@ class RPC:
     mcp_set_env_value_mode_details: MCPSetEnvValueModeDetails
     mcp_set_env_value_mode_params: MCPSetEnvValueModeParams
     mcp_set_env_value_mode_result: MCPSetEnvValueModeResult
+    mcp_should_exclude_git_hub_tools_request: _MCPShouldExcludeGitHubToolsRequest
+    mcp_should_exclude_git_hub_tools_result: _MCPShouldExcludeGitHubToolsResult
     mcp_source_file: MCPSourceFile
     mcp_source_plugin: MCPSourcePlugin
     mcp_source_ref: MCPSourceRef
@@ -48086,7 +55208,7 @@ class RPC:
     mcp_tool_ui: MCPToolUI
     mcp_tool_ui_visibility: MCPToolUIVisibility
     mcp_uninstall_plan: MCPUninstallPlan
-    mcp_unregister_external_client_request: MCPUnregisterExternalClientRequest
+    mcp_unregister_external_client_request: _MCPUnregisterExternalClientRequest
     memory_configuration: MemoryConfiguration
     metadata_context_attribution_result: MetadataContextAttributionResult
     metadata_context_heaviest_messages_request: MetadataContextHeaviestMessagesRequest
@@ -48120,6 +55242,10 @@ class RPC:
     model_capabilities_override_limits_vision: ModelCapabilitiesOverrideLimitsVision
     model_capabilities_override_supports: ModelCapabilitiesOverrideSupports
     model_capabilities_supports: ModelCapabilitiesSupports
+    model_clear_startup_seed_request: _ModelClearStartupSeedRequest
+    model_clear_startup_seed_result: _ModelClearStartupSeedResult
+    model_get_reasoning_summaries_request: ModelGetReasoningSummariesRequest
+    model_get_reasoning_summaries_result: ModelGetReasoningSummariesResult
     model_list: ModelList
     model_list_request: Any
     model_message: ModelMessage
@@ -48144,14 +55270,12 @@ class RPC:
     model_provider_get_status_request: ModelProviderGetStatusRequest
     model_provider_instance: ModelProviderInstance
     model_provider_instance_reference: ModelProviderInstanceReference
-    model_provider_kind: ModelProviderKind
     model_provider_models_list_request: ModelProviderModelsListRequest
     model_provider_operation_outcome: ModelProviderOperationOutcome
     model_provider_operation_outcome_code: ModelProviderOperationOutcomeCode
     model_provider_prepare_configuration_request: ModelProviderPrepareConfigurationRequest
     model_provider_provenance: ModelProviderProvenance
     model_provider_provenance_source: ModelProviderProvenanceSource
-    model_provider_ref: ModelProviderRef
     model_provider_status: ModelProviderStatus
     model_provider_warning: ModelProviderWarning
     model_set_allowed_models_request: ModelSetAllowedModelsRequest
@@ -48183,6 +55307,8 @@ class RPC:
     options_update_env_value_mode: MCPSetEnvValueModeDetails
     options_update_reasoning_summary: ReasoningSummary
     options_update_tool_filter_precedence: OptionsUpdateToolFilterPrecedence
+    pending_external_tool_request: PendingExternalToolRequest
+    pending_external_tool_request_list: PendingExternalToolRequestList
     pending_permission_request: PendingPermissionRequest
     pending_permission_request_list: PendingPermissionRequestList
     permission_decision: PermissionDecision
@@ -48255,6 +55381,8 @@ class RPC:
     permissions_configure_additional_content_exclusion_policy_scope: AdditionalContentExclusionPolicyScope
     permissions_configure_params: PermissionsConfigureParams
     permissions_configure_result: PermissionsConfigureResult
+    permissions_evaluate_managed_policy_params: _PermissionsEvaluateManagedPolicyParams
+    permissions_evaluate_managed_policy_result: PermissionsEvaluateManagedPolicyResult
     permissions_folder_trust_add_trusted_result: PermissionsFolderTrustAddTrustedResult
     permissions_get_mode_request: PermissionsGetModeRequest
     permissions_get_mode_result: PermissionsGetModeResult
@@ -48291,6 +55419,8 @@ class RPC:
     permissions_urls_set_unrestricted_mode_result: PermissionsUrlsSetUnrestrictedModeResult
     permission_urls_config: PermissionUrlsConfig
     permission_urls_set_unrestricted_mode_params: PermissionUrlsSetUnrestrictedModeParams
+    persistence_write_raw_json_locked_request: PersistenceWriteRawJSONLockedRequest
+    persistence_write_raw_json_locked_result: PersistenceWriteRawJSONLockedResult
     ping_request: PingRequest
     ping_result: PingResult
     plan_read_result: PlanReadResult
@@ -48409,6 +55539,8 @@ class RPC:
     queue_update_text_result: QueueUpdateTextResult
     queue_withdraw_message_request: QueueWithdrawMessageRequest
     queue_withdraw_message_result: QueueWithdrawMessageResult
+    quota_take_warnings_result: list[QuotaWarningProjection]
+    quota_warning_projection: QuotaWarningProjection
     register_event_interest_params: RegisterEventInterestParams
     register_event_interest_result: RegisterEventInterestResult
     release_event_interest_params: ReleaseEventInterestParams
@@ -48433,7 +55565,17 @@ class RPC:
     remote_session_metadata_value: RemoteSessionMetadataValue
     remote_session_mode: RemoteSessionMode
     remote_session_repository: RemoteSessionRepository
+    repo_settings_edit_request: _RepoSettingsEditRequest
+    repo_settings_edit_scope: _RepoSettingsEditScope
+    repo_settings_read_raw_request: _RepoSettingsReadRawRequest
+    repo_settings_read_raw_result: _RepoSettingsReadRawResult
+    repo_settings_write_all_request: _RepoSettingsWriteAllRequest
+    repo_settings_write_key_request: _RepoSettingsWriteKeyRequest
     response_format: ResponseFormat
+    sandbox_apply_defaults_request: SandboxApplyDefaultsRequest
+    sandbox_check_enforcement_command_result: bool
+    sandbox_check_platform_support_result: bool
+    sandbox_check_windows_host_loopback_support_result: bool
     sandbox_config: SandboxConfig
     sandbox_config_auth: SandboxConfigAuth
     sandbox_config_source: SandboxConfigSource
@@ -48445,20 +55587,44 @@ class RPC:
     sandbox_config_user_policy_network_proxy: SandboxConfigUserPolicyNetworkProxy
     sandbox_config_user_policy_seatbelt: SandboxConfigUserPolicySeatbelt
     sandbox_credentials_config: SandboxCredentialsConfig
+    sandbox_credential_suggestion: SandboxCredentialSuggestion
+    sandbox_credential_suggestions_result: SandboxCredentialSuggestionsResult
     sandbox_disable_for_session_request: SandboxDisableForSessionRequest
     sandbox_disable_for_session_result: SandboxDisableForSessionResult
+    sandbox_docs_url_result: SandboxDocsURLResult
+    sandbox_effective_for_optional_params: _SandboxEffectiveForOptionalParams
+    sandbox_effective_for_optional_result: _SandboxEffectiveForOptionalResult
+    sandbox_enforcement_command_allowed_params: _SandboxEnforcementCommandAllowedParams
     sandbox_enforcement_status: SandboxEnforcementStatus
+    sandbox_filter_picker_candidates_params: _SandboxFilterPickerCandidatesParams
+    sandbox_filter_picker_candidates_result: _SandboxFilterPickerCandidatesResult
+    sandbox_get_unsupported_message_result: str
+    sandbox_get_unsupported_setting_disabled_notice_result: str
     sandbox_grant_path_for_request_request: SandboxGrantPathForRequestRequest
     sandbox_grant_path_for_request_result: SandboxGrantPathForRequestResult
     sandbox_host_capability: SandboxHostCapability
     sandbox_host_capability_name: str
     sandbox_host_support: SandboxHostSupport
     sandbox_masked_env_var: SandboxMaskedEnvVar
+    sandbox_picker_candidate: _SandboxPickerCandidate
+    sandbox_prepare_picker_policy_params: _SandboxPreparePickerPolicyParams
+    sandbox_prepare_picker_policy_result: _SandboxPreparePickerPolicyResult
+    sandbox_proxy_ca_check_installation_support_result: bool
+    sandbox_proxy_ca_check_relevance_result: bool
     sandbox_proxy_ca_create_result: SandboxProxyCACreateResult
     sandbox_proxy_ca_request: SandboxProxyCARequest
     sandbox_proxy_ca_state: SandboxProxyCAState
     sandbox_proxy_ca_status: SandboxProxyCAStatus
+    sandbox_proxy_secret_get_result: SandboxProxySecretGetResult
+    sandbox_proxy_secret_location: SandboxProxySecretLocation
+    sandbox_proxy_secret_save_request: SandboxProxySecretSaveRequest
+    sandbox_proxy_secret_save_result: SandboxProxySecretSaveResult
+    sandbox_resolve_floored_config_params: _SandboxResolveFlooredConfigParams
+    sandbox_resolve_floored_config_result: SandboxResolveFlooredConfigResult
     sandbox_session_change: SandboxSessionChange
+    sandbox_settings_apply_defaults_result: dict[str, Any]
+    sandbox_unsupported_startup_notice_params: _SandboxUnsupportedStartupNoticeParams
+    sandbox_unsupported_startup_notice_result: _SandboxUnsupportedStartupNoticeResult
     schedule_add_at_request: ScheduleAddAtRequest
     schedule_add_cron_request: ScheduleAddCronRequest
     schedule_add_request: ScheduleAddRequest
@@ -48496,6 +55662,7 @@ class RPC:
     session_capability: SessionCapability
     session_commands_list_request: SessionCommandsListRequest
     session_completion_item: SessionCompletionItem
+    session_connected_ide_info: SessionConnectedIDEInfo
     session_context: SessionContext
     session_context_host_type: HostType
     session_enrich_metadata_result: SessionEnrichMetadataResult
@@ -48566,8 +55733,11 @@ class RPC:
     session_mcp_oauth_cancel_login_result: SessionMCPOauthCancelLoginResult
     session_mcp_oauth_prepare_login_request: SessionMCPOauthPrepareLoginRequest
     session_mcp_oauth_prepare_login_result: SessionMCPOauthPrepareLoginResult
+    session_mcp_set_connected_ide_info_params: SessionMCPSetConnectedIDEInfoParams
     session_metadata_snapshot: SessionMetadataSnapshot
     session_mode: SessionMode
+    session_model_clear_startup_seed_request: SessionModelClearStartupSeedRequest
+    session_model_clear_startup_seed_result: SessionModelClearStartupSeedResult
     session_model_list: SessionModelList
     session_model_list_request: SessionModelListRequest
     session_model_price_category: SessionModelPriceCategory
@@ -48585,14 +55755,25 @@ class RPC:
     session_plugins_install_request: SessionPluginsInstallRequest
     session_plugins_marketplaces_refresh_request: SessionPluginsMarketplacesRefreshRequest
     session_plugins_reload_request: SessionPluginsReloadRequest
+    session_plugins_retry_managed_request: SessionPluginsRetryManagedRequest
+    session_plugins_retry_managed_result: SessionPluginsRetryManagedResult
     session_provider_get_endpoint_request: SessionProviderGetEndpointRequest
     session_prune_result: SessionPruneResult
+    session_quota_delegate_warning: SessionQuotaDelegateWarning
+    session_quota_get_result: SessionQuotaGetResult
+    session_quota_plan_tier: SessionQuotaPlanTier
+    session_quota_projection: SessionQuotaProjection
+    session_quota_refresh_result: SessionQuotaRefreshResult
+    session_quota_snapshot: SessionQuotaSnapshot
+    session_quota_take_warnings_result: list[QuotaWarningProjection]
     sessions_bulk_delete_request: SessionsBulkDeleteRequest
     sessions_check_in_use_request: SessionsCheckInUseRequest
     sessions_check_in_use_result: SessionsCheckInUseResult
     sessions_client_metadata_entry: SessionsClientMetadataEntry
     sessions_close_request: SessionsCloseRequest
     sessions_close_result: SessionsCloseResult
+    sessions_create_workspace_request: SessionsCreateWorkspaceRequest
+    sessions_create_workspace_result: SessionsCreateWorkspaceResult
     sessions_delete_request: SessionsDeleteRequest
     sessions_enrich_metadata_request: SessionsEnrichMetadataRequest
     session_set_credentials_params: SessionSetCredentialsParams
@@ -48630,6 +55811,8 @@ class RPC:
     sessions_list_non_empty_session_ids_result: SessionsListNonEmptySessionIDSResult
     sessions_list_request: SessionsListRequest
     sessions_load_deferred_repo_hooks_request: SessionsLoadDeferredRepoHooksRequest
+    sessions_load_workspace_request: SessionsLoadWorkspaceRequest
+    sessions_load_workspace_result: SessionsLoadWorkspaceResult
     sessions_open_attach: SessionsOpenAttach
     sessions_open_cloud: SessionsOpenCloud
     sessions_open_create: SessionsOpenCreate
@@ -48657,15 +55840,22 @@ class RPC:
     sessions_start_remote_control_request: SessionsStartRemoteControlRequest
     sessions_stop_remote_control_request: SessionsStopRemoteControlRequest
     sessions_transfer_remote_control_request: SessionsTransferRemoteControlRequest
+    sessions_update_workspace_fields_request: SessionsUpdateWorkspaceFieldsRequest
+    sessions_update_workspace_fields_result: SessionsUpdateWorkspaceFieldsResult
     session_telemetry_engagement: SessionTelemetryEngagement
     session_update_options_params: SessionUpdateOptionsParams
     session_update_options_result: SessionUpdateOptionsResult
+    session_usage_set_code_changes_request: SessionUsageSetCodeChangesRequest
     session_visibility_status: SessionVisibilityStatus
     session_workflow_pause_at_checkpoint_result: SessionWorkflowPauseAtCheckpointResult
     session_working_directory_context: SessionWorkingDirectoryContext
     session_working_directory_context_host_type: HostType
+    session_working_directory_context_with_client: SessionWorkingDirectoryContextWithClient
     settable_auth_info: SettableAuthInfo
     settable_token_auth_info: SettableTokenAuthInfo
+    settings_edit_operation: _SettingsEditOperation
+    settings_edit_result: _SettingsEditResult
+    settings_edit_status: _SettingsEditStatus
     shell_cancel_user_requested_request: ShellCancelUserRequestedRequest
     shell_credentials: ShellCredentials
     shell_exec_request: ShellExecRequest
@@ -48738,6 +55928,8 @@ class RPC:
     slash_command_show_dialog_result: SlashCommandShowDialogResult
     slash_command_text_result: SlashCommandTextResult
     slash_command_timeline_entry: SlashCommandTimelineEntry
+    staff_log_level_migration_status: StaffLogLevelMigrationStatus
+    staff_update_channel_migration_status: StaffUpdateChannelMigrationStatus
     subagent_settings_entry: SubagentSettingsEntry
     subagent_settings_entry_context_tier: SubagentSettingsEntryContextTier
     system_message_block: SystemMessageBlock
@@ -48798,6 +55990,7 @@ class RPC:
     tools_get_builtin_descriptors_result: ToolsGetBuiltinDescriptorsResult
     tools_get_current_metadata_result: ToolsGetCurrentMetadataResult
     tools_initialize_and_validate_result: ToolsInitializeAndValidateResult
+    tools_list_pending_requests_request: ToolsListPendingRequestsRequest
     tools_list_request: ToolsListRequest
     tools_set_request: ToolsSetRequest
     tools_set_result: ToolsSetResult
@@ -48847,19 +56040,59 @@ class RPC:
     unsupported_enqueue_command_result: UnsupportedEnqueueCommandResult
     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
-    usage_metrics_model_metric_token_detail: UsageMetricsModelMetricTokenDetail
-    usage_metrics_model_metric_usage: UsageMetricsModelMetricUsage
-    usage_metrics_token_detail: UsageMetricsTokenDetail
+    usage_set_code_changes_request: _UsageSetCodeChangesRequest
     user_auth_info: UserAuthInfo
     user_requested_shell_command_result: UserRequestedShellCommandResult
     user_setting_metadata: UserSettingMetadata
+    user_settings_apply_top_key_request: UserSettingsApplyTopKeyRequest
+    user_settings_apply_top_key_result: UserSettingsApplyTopKeyResult
+    user_settings_build_runtime_request: _UserSettingsBuildRuntimeRequest
+    user_settings_build_runtime_result: dict[str, Any]
+    user_settings_edit_request: _UserSettingsEditRequest
+    user_settings_get_paths_request: UserSettingsGetPathsRequest
+    user_settings_get_paths_result: UserSettingsGetPathsResult
     user_settings_get_result: UserSettingsGetResult
+    user_settings_governance_keys_result: UserSettingsGovernanceKeysResult
+    user_settings_host_context: UserSettingsHostContext
+    user_settings_load_and_merge_repo_request: _UserSettingsLoadAndMergeRepoRequest
+    user_settings_load_and_merge_repo_result: _UserSettingsLoadAndMergeRepoResult
+    user_settings_load_for_config_dir_request: _UserSettingsLoadForConfigDirRequest
+    user_settings_load_for_config_dir_result: dict[str, Any]
+    user_settings_load_for_edit_result: UserSettingsLoadForEditResult
+    user_settings_load_repo_request: UserSettingsLoadRepoRequest
+    user_settings_load_repo_result: UserSettingsLoadRepoResult
+    user_settings_load_with_warning_result: UserSettingsLoadWithWarningResult
+    user_settings_merge_managed_and_user_params: _UserSettingsMergeManagedAndUserParams
+    user_settings_merge_managed_and_user_result: UserSettingsMergeManagedAndUserResult
+    user_settings_merge_repo_value_params: _UserSettingsMergeRepoValueParams
+    user_settings_merge_repo_value_result: UserSettingsMergeRepoValueResult
+    user_settings_migrate_obsolete_on_disk_request: _UserSettingsMigrateObsoleteOnDiskRequest
+    user_settings_migrate_obsolete_on_disk_result: _UserSettingsMigrateObsoleteOnDiskResult
+    user_settings_migrate_obsolete_on_disk_status: _UserSettingsMigrateObsoleteOnDiskStatus
+    user_settings_migrate_staff_log_level_once_request: _UserSettingsMigrateStaffLogLevelOnceRequest
+    user_settings_migrate_staff_log_level_once_result: _UserSettingsMigrateStaffLogLevelOnceResult
+    user_settings_migrate_staff_update_channel_once_result: _UserSettingsMigrateStaffUpdateChannelOnceResult
+    user_settings_normalize_request: UserSettingsNormalizeRequest
+    user_settings_normalize_result: UserSettingsNormalizeResult
+    user_settings_path_result: UserSettingsPathResult
+    user_settings_problem: UserSettingsProblem
+    user_settings_problem_location: UserSettingsProblemLocation
+    user_settings_problem_source: UserSettingsProblemSource
+    user_settings_problems_request: UserSettingsProblemsRequest
+    user_settings_problems_result: UserSettingsProblemsResult
+    user_settings_reset_staff_model_selection_once_request: _UserSettingsResetStaffModelSelectionOnceRequest
+    user_settings_reset_staff_model_selection_once_result: _UserSettingsResetStaffModelSelectionOnceResult
+    user_settings_set_hook_disabled_request: _UserSettingsSetHookDisabledRequest
+    user_settings_set_hook_disabled_result: _UserSettingsSetHookDisabledResult
     user_settings_set_request: UserSettingsSetRequest
-    user_settings_set_result: UserSettingsSetResult
+    user_settings_unknown_keys_warning_request: _UserSettingsUnknownKeysWarningRequest
+    user_settings_unknown_keys_warning_result: _UserSettingsUnknownKeysWarningResult
+    user_settings_update_request: _UserSettingsUpdateRequest
+    user_settings_update_result: _UserSettingsUpdateResult
+    user_settings_validate_request: UserSettingsValidateRequest
+    user_settings_validate_result: UserSettingsValidateResult
+    user_settings_validation_issue: UserSettingsValidationIssue
+    user_settings_write_all_request: UserSettingsWriteAllRequest
     visibility_get_result: VisibilityGetResult
     visibility_set_request: VisibilitySetRequest
     visibility_set_result: VisibilitySetResult
@@ -48910,6 +56143,7 @@ class RPC:
     workflow_tool_resume_request: _WorkflowToolResumeRequest
     workflow_tool_run_options: _WorkflowToolRunOptions
     workflow_tool_run_request: _WorkflowToolRunRequest
+    workspace_diff_contents: WorkspaceDiffContents
     workspace_diff_file_change: WorkspaceDiffFileChange
     workspace_diff_file_change_type: WorkspaceDiffFileChangeType
     workspace_diff_mode: WorkspaceDiffMode
@@ -48958,10 +56192,18 @@ def from_dict(obj: Any) -> 'RPC':
         abort_result = AbortResult.from_dict(obj.get("AbortResult"))
         accepted_enqueue_command_result = AcceptedEnqueueCommandResult.from_dict(obj.get("AcceptedEnqueueCommandResult"))
         account_all_users = AccountAllUsers.from_dict(obj.get("AccountAllUsers"))
+        account_auth_info = AccountAuthInfo.from_dict(obj.get("AccountAuthInfo"))
+        account_describe_auth_info_request = _AccountDescribeAuthInfoRequest.from_dict(obj.get("AccountDescribeAuthInfoRequest"))
+        account_describe_auth_info_result = _AccountDescribeAuthInfoResult.from_dict(obj.get("AccountDescribeAuthInfoResult"))
         account_get_all_users_result = from_list(AccountAllUsers.from_dict, obj.get("AccountGetAllUsersResult"))
         account_get_current_auth_result = AccountGetCurrentAuthResult.from_dict(obj.get("AccountGetCurrentAuthResult"))
+        account_get_gist_support_request = _AccountGetGistSupportRequest.from_dict(obj.get("AccountGetGistSupportRequest"))
+        account_get_gist_support_result = _AccountGetGistSupportResult.from_dict(obj.get("AccountGetGistSupportResult"))
         account_get_quota_request = AccountGetQuotaRequest.from_dict(obj.get("AccountGetQuotaRequest"))
         account_get_quota_result = AccountGetQuotaResult.from_dict(obj.get("AccountGetQuotaResult"))
+        account_get_token_env_var_result = _AccountGetTokenEnvVarResult.from_dict(obj.get("AccountGetTokenEnvVarResult"))
+        account_get_web_url_request = _AccountGetWebURLRequest.from_dict(obj.get("AccountGetWebUrlRequest"))
+        account_get_web_url_result = _AccountGetWebURLResult.from_dict(obj.get("AccountGetWebUrlResult"))
         account_kind = AccountKind(obj.get("AccountKind"))
         account_login_request = AccountLoginRequest.from_dict(obj.get("AccountLoginRequest"))
         account_login_result = AccountLoginResult.from_dict(obj.get("AccountLoginResult"))
@@ -48998,10 +56240,19 @@ def from_dict(obj: Any) -> 'RPC':
         agent_registry_spawn_validation_error_field = AgentRegistrySpawnValidationErrorField(obj.get("AgentRegistrySpawnValidationErrorField"))
         agent_registry_spawn_validation_error_reason = AgentRegistrySpawnValidationErrorReason(obj.get("AgentRegistrySpawnValidationErrorReason"))
         agent_reload_result = AgentReloadResult.from_dict(obj.get("AgentReloadResult"))
+        agents_custom_agent_initial_model_decision_params = _AgentsCustomAgentInitialModelDecisionParams.from_dict(obj.get("AgentsCustomAgentInitialModelDecisionParams"))
+        agents_custom_agent_initial_model_decision_result = _AgentsCustomAgentInitialModelDecisionResult.from_dict(obj.get("AgentsCustomAgentInitialModelDecisionResult"))
         agents_discover_request = AgentsDiscoverRequest.from_dict(obj.get("AgentsDiscoverRequest"))
         agent_select_request = AgentSelectRequest.from_dict(obj.get("AgentSelectRequest"))
         agent_select_result = AgentSelectResult.from_dict(obj.get("AgentSelectResult"))
         agent_set_prompt_request = AgentSetPromptRequest.from_dict(obj.get("AgentSetPromptRequest"))
+        agents_get_available_builtins_request = _AgentsGetAvailableBuiltinsRequest.from_dict(obj.get("AgentsGetAvailableBuiltinsRequest"))
+        agents_get_available_builtins_result = _AgentsGetAvailableBuiltinsResult.from_dict(obj.get("AgentsGetAvailableBuiltinsResult"))
+        agents_get_builtin_definition_request = _AgentsGetBuiltinDefinitionRequest.from_dict(obj.get("AgentsGetBuiltinDefinitionRequest"))
+        agents_get_builtin_definition_result = _AgentsGetBuiltinDefinitionResult.from_dict(obj.get("AgentsGetBuiltinDefinitionResult"))
+        agents_get_builtin_listing_definition_request = _AgentsGetBuiltinListingDefinitionRequest.from_dict(obj.get("AgentsGetBuiltinListingDefinitionRequest"))
+        agents_get_builtin_listing_definition_result = _AgentsGetBuiltinListingDefinitionResult.from_dict(obj.get("AgentsGetBuiltinListingDefinitionResult"))
+        agents_get_builtins_result = _AgentsGetBuiltinsResult.from_dict(obj.get("AgentsGetBuiltinsResult"))
         agents_get_discovery_paths_request = AgentsGetDiscoveryPathsRequest.from_dict(obj.get("AgentsGetDiscoveryPathsRequest"))
         api_key_auth_info = APIKeyAuthInfo.from_dict(obj.get("ApiKeyAuthInfo"))
         auth_enumerate_query = AuthEnumerateQuery.from_dict(obj.get("AuthEnumerateQuery"))
@@ -49010,6 +56261,7 @@ def from_dict(obj: Any) -> 'RPC':
         auth_identity_metadata = AuthIdentityMetadata.from_dict(obj.get("AuthIdentityMetadata"))
         auth_info = _load_AuthInfo(obj.get("AuthInfo"))
         auth_info_type = AuthInfoType(obj.get("AuthInfoType"))
+        auth_login_account = AuthLoginAccount.from_dict(obj.get("AuthLoginAccount"))
         auth_login_advance_request = AuthLoginAdvanceRequest.from_dict(obj.get("AuthLoginAdvanceRequest"))
         auth_login_begin_request = AuthLoginBeginRequest.from_dict(obj.get("AuthLoginBeginRequest"))
         auth_login_begun = AuthLoginBegun.from_dict(obj.get("AuthLoginBegun"))
@@ -49028,6 +56280,10 @@ def from_dict(obj: Any) -> 'RPC':
         autopilot_objective_get_state_result = AutopilotObjectiveGetStateResult.from_dict(obj.get("AutopilotObjectiveGetStateResult"))
         autopilot_objective_state = AutopilotObjectiveState.from_dict(obj.get("AutopilotObjectiveState"))
         autopilot_objective_status = AutopilotObjectiveStatus(obj.get("AutopilotObjectiveStatus"))
+        auto_tier_descriptor = AutoTierDescriptor.from_dict(obj.get("AutoTierDescriptor"))
+        auto_tier_metadata = AutoTierMetadata.from_dict(obj.get("AutoTierMetadata"))
+        auto_tier_status = AutoTierStatus.from_dict(obj.get("AutoTierStatus"))
+        builtin_agent_summary = _BuiltinAgentSummary.from_dict(obj.get("BuiltinAgentSummary"))
         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"))
@@ -49184,6 +56440,14 @@ def from_dict(obj: Any) -> 'RPC':
         connector_connect_result = ConnectorConnectResult.from_dict(obj.get("ConnectorConnectResult"))
         connector_continue_request = ConnectorContinueRequest.from_dict(obj.get("ConnectorContinueRequest"))
         connector_disconnect_result = ConnectorDisconnectResult.from_dict(obj.get("ConnectorDisconnectResult"))
+        connector_discovery_account = ConnectorDiscoveryAccount.from_dict(obj.get("ConnectorDiscoveryAccount"))
+        connector_discovery_account_list = ConnectorDiscoveryAccountList.from_dict(obj.get("ConnectorDiscoveryAccountList"))
+        connector_discovery_account_request = ConnectorDiscoveryAccountRequest.from_dict(obj.get("ConnectorDiscoveryAccountRequest"))
+        connector_discovery_auth_info = ConnectorDiscoveryAuthInfo.from_dict(obj.get("ConnectorDiscoveryAuthInfo"))
+        connector_discovery_availability = ConnectorDiscoveryAvailability(obj.get("ConnectorDiscoveryAvailability"))
+        connector_discovery_capabilities = ConnectorDiscoveryCapabilities.from_dict(obj.get("ConnectorDiscoveryCapabilities"))
+        connector_discovery_catalog_entry = ConnectorDiscoveryCatalogEntry.from_dict(obj.get("ConnectorDiscoveryCatalogEntry"))
+        connector_discovery_catalog_result = ConnectorDiscoveryCatalogResult.from_dict(obj.get("ConnectorDiscoveryCatalogResult"))
         connector_mcp_status = ConnectorMCPStatus(obj.get("ConnectorMcpStatus"))
         connector_reconcile_request = ConnectorReconcileRequest.from_dict(obj.get("ConnectorReconcileRequest"))
         connector_runtime_status = ConnectorRuntimeStatus.from_dict(obj.get("ConnectorRuntimeStatus"))
@@ -49290,20 +56554,46 @@ def from_dict(obj: Any) -> 'RPC':
         external_tool_text_result_for_llm_content_shell_exit = ExternalToolTextResultForLlmContentShellExit.from_dict(obj.get("ExternalToolTextResultForLlmContentShellExit"))
         external_tool_text_result_for_llm_content_terminal = ExternalToolTextResultForLlmContentTerminal.from_dict(obj.get("ExternalToolTextResultForLlmContentTerminal"))
         external_tool_text_result_for_llm_content_text = ExternalToolTextResultForLlmContentText.from_dict(obj.get("ExternalToolTextResultForLlmContentText"))
+        feature_flag_availability = _FeatureFlagAvailability(obj.get("FeatureFlagAvailability"))
+        feature_flag_metadata = _FeatureFlagMetadata.from_dict(obj.get("FeatureFlagMetadata"))
+        feature_flags_metadata_result = _FeatureFlagsMetadataResult.from_dict(obj.get("FeatureFlagsMetadataResult"))
+        feature_flags_resolve_request = _FeatureFlagsResolveRequest.from_dict(obj.get("FeatureFlagsResolveRequest"))
+        feature_flags_resolve_result = from_dict(from_bool, obj.get("FeatureFlagsResolveResult"))
+        feature_flags_resolve_startup_gates_request = _FeatureFlagsResolveStartupGatesRequest.from_dict(obj.get("FeatureFlagsResolveStartupGatesRequest"))
+        feature_flags_resolve_startup_gates_result = from_dict(from_bool, obj.get("FeatureFlagsResolveStartupGatesResult"))
         filter_mapping = from_union([lambda x: from_dict(ContentFilterMode, x), ContentFilterMode], obj.get("FilterMapping"))
         fleet_start_request = FleetStartRequest.from_dict(obj.get("FleetStartRequest"))
         fleet_start_result = FleetStartResult.from_dict(obj.get("FleetStartResult"))
         folder_trust_add_params = FolderTrustAddParams.from_dict(obj.get("FolderTrustAddParams"))
         folder_trust_check_params = FolderTrustCheckParams.from_dict(obj.get("FolderTrustCheckParams"))
         folder_trust_check_result = FolderTrustCheckResult.from_dict(obj.get("FolderTrustCheckResult"))
+        folder_trust_is_trusted_params = _FolderTrustIsTrustedParams.from_dict(obj.get("FolderTrustIsTrustedParams"))
+        force_login_orgs_decision = _ForceLoginOrgsDecision.from_dict(obj.get("ForceLoginOrgsDecision"))
         gh_cli_auth_info = GhCLIAuthInfo.from_dict(obj.get("GhCliAuthInfo"))
+        git_current_branch_remote_result = _GitCurrentBranchRemoteResult.from_dict(obj.get("GitCurrentBranchRemoteResult"))
+        git_cwd_request = _GitCwdRequest.from_dict(obj.get("GitCwdRequest"))
         git_hub_environment = GitHubEnvironment.from_dict(obj.get("GitHubEnvironment"))
+        git_hub_owner_option = _GitHubOwnerOption.from_dict(obj.get("GitHubOwnerOption"))
+        git_hub_owners_cancel_request = _GitHubOwnersCancelRequest.from_dict(obj.get("GitHubOwnersCancelRequest"))
+        git_hub_owners_cancel_result = _GitHubOwnersCancelResult.from_dict(obj.get("GitHubOwnersCancelResult"))
+        git_hub_owners_list_request = _GitHubOwnersListRequest.from_dict(obj.get("GitHubOwnersListRequest"))
+        git_hub_owners_list_result = _GitHubOwnersListResult.from_dict(obj.get("GitHubOwnersListResult"))
+        git_hub_owners_request_id_result = _GitHubOwnersRequestIDResult.from_dict(obj.get("GitHubOwnersRequestIdResult"))
+        git_hub_repository_at_path_request = _GitHubRepositoryAtPathRequest.from_dict(obj.get("GitHubRepositoryAtPathRequest"))
+        git_hub_repository_at_path_result = _GitHubRepositoryAtPathResult.from_dict(obj.get("GitHubRepositoryAtPathResult"))
+        git_hub_repository_identity = GitHubRepositoryIdentity.from_dict(obj.get("GitHubRepositoryIdentity"))
         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"))
+        git_remote_repository = _GitRemoteRepository.from_dict(obj.get("GitRemoteRepository"))
+        git_repos_from_remotes_request = _GitReposFromRemotesRequest.from_dict(obj.get("GitReposFromRemotesRequest"))
+        git_repos_from_remotes_result = _GitReposFromRemotesResult.from_dict(obj.get("GitReposFromRemotesResult"))
+        global_state_load_for_config_dir_request = _GlobalStateLoadForConfigDirRequest.from_dict(obj.get("GlobalStateLoadForConfigDirRequest"))
+        global_state_load_result = _GlobalStateLoadResult.from_dict(obj.get("GlobalStateLoadResult"))
+        global_state_write_key_request = _GlobalStateWriteKeyRequest.from_dict(obj.get("GlobalStateWriteKeyRequest"))
         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"))
@@ -49343,6 +56633,8 @@ def from_dict(obj: Any) -> 'RPC':
         host_exited_notification = HostExitedNotification.from_dict(obj.get("HostExitedNotification"))
         host_exit_reason = HostExitReason(obj.get("HostExitReason"))
         host_git_hub_environment_options = HostGitHubEnvironmentOptions.from_dict(obj.get("HostGitHubEnvironmentOptions"))
+        host_list_sessions_request = HostListSessionsRequest.from_dict(obj.get("HostListSessionsRequest"))
+        host_list_sessions_result = HostListSessionsResult.from_dict(obj.get("HostListSessionsResult"))
         host_local_server_configuration = HostLocalServerConfiguration.from_dict(obj.get("HostLocalServerConfiguration"))
         host_local_server_options = HostLocalServerOptions.from_dict(obj.get("HostLocalServerOptions"))
         host_publish_session_request = HostPublishSessionRequest.from_dict(obj.get("HostPublishSessionRequest"))
@@ -49354,6 +56646,7 @@ def from_dict(obj: Any) -> 'RPC':
         host_session_create_result = HostSessionCreateResult.from_dict(obj.get("HostSessionCreateResult"))
         host_session_released_notification = HostSessionReleasedNotification.from_dict(obj.get("HostSessionReleasedNotification"))
         host_session_release_request = HostSessionReleaseRequest.from_dict(obj.get("HostSessionReleaseRequest"))
+        host_session_summary = HostSessionSummary.from_dict(obj.get("HostSessionSummary"))
         host_start_request = HostStartRequest.from_dict(obj.get("HostStartRequest"))
         host_start_result = HostStartResult.from_dict(obj.get("HostStartResult"))
         installation_catalogue_identity = InstallationCatalogueIdentity.from_dict(obj.get("InstallationCatalogueIdentity"))
@@ -49371,9 +56664,11 @@ def from_dict(obj: Any) -> 'RPC':
         instruction_discovery_path_kind = DebugCollectLogsEntryKind(obj.get("InstructionDiscoveryPathKind"))
         instruction_discovery_path_list = InstructionDiscoveryPathList.from_dict(obj.get("InstructionDiscoveryPathList"))
         instruction_discovery_path_location = InstructionLocation(obj.get("InstructionDiscoveryPathLocation"))
+        instructions_discover_repo_sources_request = _InstructionsDiscoverRepoSourcesRequest.from_dict(obj.get("InstructionsDiscoverRepoSourcesRequest"))
         instructions_discover_request = InstructionsDiscoverRequest.from_dict(obj.get("InstructionsDiscoverRequest"))
         instructions_get_discovery_paths_request = InstructionsGetDiscoveryPathsRequest.from_dict(obj.get("InstructionsGetDiscoveryPathsRequest"))
         instructions_get_sources_result = InstructionsGetSourcesResult.from_dict(obj.get("InstructionsGetSourcesResult"))
+        instructions_init_prompt_result = _InstructionsInitPromptResult.from_dict(obj.get("InstructionsInitPromptResult"))
         instruction_source = InstructionSource.from_dict(obj.get("InstructionSource"))
         instruction_source_location = InstructionLocation(obj.get("InstructionSourceLocation"))
         instruction_source_type = InstructionSourceType(obj.get("InstructionSourceType"))
@@ -49393,25 +56688,60 @@ def from_dict(obj: Any) -> 'RPC':
         llm_inference_http_response_start_result = LlmInferenceHTTPResponseStartResult.from_dict(obj.get("LlmInferenceHttpResponseStartResult"))
         llm_inference_set_provider_result = LlmInferenceSetProviderResult.from_dict(obj.get("LlmInferenceSetProviderResult"))
         local_session_metadata_value = LocalSessionMetadataValue.from_dict(obj.get("LocalSessionMetadataValue"))
+        location_permissions_cleanup_result = _LocationPermissionsCleanupResult.from_dict(obj.get("LocationPermissionsCleanupResult"))
+        logged_in_user = _LoggedInUser.from_dict(obj.get("LoggedInUser"))
         login_provider_kind = LoginProviderKind(obj.get("LoginProviderKind"))
         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_mcp_server_config = ManagedMCPServerConfig.from_dict(obj.get("ManagedMcpServerConfig"))
+        managed_permission_evaluation = ManagedPermissionEvaluation.from_dict(obj.get("ManagedPermissionEvaluation"))
+        managed_permission_operation = ManagedPermissionOperation.from_dict(obj.get("ManagedPermissionOperation"))
+        managed_permission_operation_kind = ManagedPermissionOperationKind(obj.get("ManagedPermissionOperationKind"))
+        managed_permissions_evaluate_request = ManagedPermissionsEvaluateRequest.from_dict(obj.get("ManagedPermissionsEvaluateRequest"))
+        managed_permissions_evaluate_result = ManagedPermissionsEvaluateResult.from_dict(obj.get("ManagedPermissionsEvaluateResult"))
+        managed_permission_verdict = ManagedPermissionVerdict(obj.get("ManagedPermissionVerdict"))
+        managed_plugin_retry_entry = ManagedPluginRetryEntry.from_dict(obj.get("ManagedPluginRetryEntry"))
+        managed_plugin_retry_status = ManagedPluginRetryStatus(obj.get("ManagedPluginRetryStatus"))
         managed_setting_meta = ManagedSettingMeta.from_dict(obj.get("ManagedSettingMeta"))
+        managed_settings_apply_controls_params = _ManagedSettingsApplyControlsParams.from_dict(obj.get("ManagedSettingsApplyControlsParams"))
+        managed_settings_apply_controls_result = _ManagedSettingsApplyControlsResult.from_dict(obj.get("ManagedSettingsApplyControlsResult"))
+        managed_settings_bypass_disable_source = _ManagedSettingsBypassDisableSource(obj.get("ManagedSettingsBypassDisableSource"))
+        managed_settings_bypass_policy_resolution = _ManagedSettingsBypassPolicyResolution(obj.get("ManagedSettingsBypassPolicyResolution"))
         managed_settings_channel = ManagedSettingsChannel(obj.get("ManagedSettingsChannel"))
         managed_settings_compose_layer = ManagedSettingsComposeLayer.from_dict(obj.get("ManagedSettingsComposeLayer"))
         managed_settings_compose_request = ManagedSettingsComposeRequest.from_dict(obj.get("ManagedSettingsComposeRequest"))
         managed_settings_compose_result = ManagedSettingsComposeResult.from_dict(obj.get("ManagedSettingsComposeResult"))
         managed_settings_diagnostic = ManagedSettingsDiagnostic.from_dict(obj.get("ManagedSettingsDiagnostic"))
         managed_settings_diagnostic_severity = ManagedSettingsDiagnosticSeverity(obj.get("ManagedSettingsDiagnosticSeverity"))
+        managed_settings_ingest_params = _ManagedSettingsIngestParams.from_dict(obj.get("ManagedSettingsIngestParams"))
+        managed_settings_ingest_result = _ManagedSettingsIngestResult.from_dict(obj.get("ManagedSettingsIngestResult"))
         managed_settings_layer = ManagedSettingsLayer.from_dict(obj.get("ManagedSettingsLayer"))
+        managed_settings_load_remote_control_params = _ManagedSettingsLoadRemoteControlParams.from_dict(obj.get("ManagedSettingsLoadRemoteControlParams"))
+        managed_settings_load_remote_control_result = _ManagedSettingsLoadRemoteControlResult.from_dict(obj.get("ManagedSettingsLoadRemoteControlResult"))
+        managed_settings_log_level = _ManagedSettingsLogLevel(obj.get("ManagedSettingsLogLevel"))
+        managed_settings_log_message = _ManagedSettingsLogMessage.from_dict(obj.get("ManagedSettingsLogMessage"))
         managed_settings_meta = ManagedSettingsMeta.from_dict(obj.get("ManagedSettingsMeta"))
+        managed_settings_parse_client_value_params = _ManagedSettingsParseClientValueParams.from_dict(obj.get("ManagedSettingsParseClientValueParams"))
+        managed_settings_parse_client_value_result = _ManagedSettingsParseClientValueResult.from_dict(obj.get("ManagedSettingsParseClientValueResult"))
+        managed_settings_policy_helper_authority = _ManagedSettingsPolicyHelperAuthority(obj.get("ManagedSettingsPolicyHelperAuthority"))
+        managed_settings_policy_helper_reason = _ManagedSettingsPolicyHelperReason(obj.get("ManagedSettingsPolicyHelperReason"))
+        managed_settings_read_device_result = _ManagedSettingsReadDeviceResult.from_dict(obj.get("ManagedSettingsReadDeviceResult"))
         managed_settings_read_result = ManagedSettingsReadResult.from_dict(obj.get("ManagedSettingsReadResult"))
+        managed_settings_resolve_bypass_disable_transition_params = _ManagedSettingsResolveBypassDisableTransitionParams.from_dict(obj.get("ManagedSettingsResolveBypassDisableTransitionParams"))
+        managed_settings_resolve_bypass_disable_transition_result = _ManagedSettingsResolveBypassDisableTransitionResult.from_dict(obj.get("ManagedSettingsResolveBypassDisableTransitionResult"))
         managed_settings_resolved_data = ManagedSettingsResolvedData.from_dict(obj.get("ManagedSettingsResolvedData"))
+        managed_settings_resolve_device_force_login_orgs_gate_params = _ManagedSettingsResolveDeviceForceLoginOrgsGateParams.from_dict(obj.get("ManagedSettingsResolveDeviceForceLoginOrgsGateParams"))
+        managed_settings_resolve_effective_value_params = _ManagedSettingsResolveEffectiveValueParams.from_dict(obj.get("ManagedSettingsResolveEffectiveValueParams"))
+        managed_settings_resolve_effective_value_result = _ManagedSettingsResolveEffectiveValueResult.from_dict(obj.get("ManagedSettingsResolveEffectiveValueResult"))
         managed_settings_resolve_request = ManagedSettingsResolveRequest.from_dict(obj.get("ManagedSettingsResolveRequest"))
         managed_settings_resolve_result = ManagedSettingsResolveResult.from_dict(obj.get("ManagedSettingsResolveResult"))
+        managed_settings_resolve_startup_policy_params = _ManagedSettingsResolveStartupPolicyParams.from_dict(obj.get("ManagedSettingsResolveStartupPolicyParams"))
+        managed_settings_resolve_startup_policy_result = _ManagedSettingsResolveStartupPolicyResult.from_dict(obj.get("ManagedSettingsResolveStartupPolicyResult"))
+        managed_settings_retain_policy_params = _ManagedSettingsRetainPolicyParams.from_dict(obj.get("ManagedSettingsRetainPolicyParams"))
         managed_settings_schema_result = ManagedSettingsSchemaResult.from_dict(obj.get("ManagedSettingsSchemaResult"))
+        managed_settings_server_policy_cache_mode = _ManagedSettingsServerPolicyCacheMode(obj.get("ManagedSettingsServerPolicyCacheMode"))
+        managed_settings_server_policy_resolution = _ManagedSettingsServerPolicyResolution(obj.get("ManagedSettingsServerPolicyResolution"))
         managed_settings_validate_request = ManagedSettingsValidateRequest.from_dict(obj.get("ManagedSettingsValidateRequest"))
         managed_settings_validate_result = ManagedSettingsValidateResult.from_dict(obj.get("ManagedSettingsValidateResult"))
         managed_settings_values = ManagedSettingsValues.from_dict(obj.get("ManagedSettingsValues"))
@@ -49456,7 +56786,10 @@ def from_dict(obj: Any) -> 'RPC':
         mcp_config_list = MCPConfigList.from_dict(obj.get("McpConfigList"))
         mcp_config_remove_request = MCPConfigRemoveRequest.from_dict(obj.get("McpConfigRemoveRequest"))
         mcp_config_update_request = MCPConfigUpdateRequest.from_dict(obj.get("McpConfigUpdateRequest"))
-        mcp_configure_git_hub_request = MCPConfigureGitHubRequest.from_dict(obj.get("McpConfigureGitHubRequest"))
+        mcp_configured_server = MCPConfiguredServer.from_dict(obj.get("McpConfiguredServer"))
+        mcp_configured_server_list = MCPConfiguredServerList.from_dict(obj.get("McpConfiguredServerList"))
+        mcp_configured_server_state = MCPConfiguredServerState.from_dict(obj.get("McpConfiguredServerState"))
+        mcp_configure_git_hub_request = _MCPConfigureGitHubRequest.from_dict(obj.get("McpConfigureGitHubRequest"))
         mcp_configure_git_hub_result = MCPConfigureGitHubResult.from_dict(obj.get("McpConfigureGitHubResult"))
         mcp_diagnostic_details = MCPDiagnosticDetails.from_dict(obj.get("McpDiagnosticDetails"))
         mcp_diagnostic_direction = MCPDiagnosticDirection(obj.get("McpDiagnosticDirection"))
@@ -49494,6 +56827,7 @@ def from_dict(obj: Any) -> 'RPC':
         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_builtin_server_names_result = _MCPListBuiltinServerNamesResult.from_dict(obj.get("McpListBuiltinServerNamesResult"))
         mcp_list_tools_request = MCPListToolsRequest.from_dict(obj.get("McpListToolsRequest"))
         mcp_list_tools_result = MCPListToolsResult.from_dict(obj.get("McpListToolsResult"))
         mcp_oauth_authentication_state_changed_request = MCPOauthAuthenticationStateChangedRequest.from_dict(obj.get("McpOauthAuthenticationStateChangedRequest"))
@@ -49560,9 +56894,14 @@ def from_dict(obj: Any) -> 'RPC':
         mcp_prompts_get_result = MCPPromptsGetResult.from_dict(obj.get("McpPromptsGetResult"))
         mcp_prompts_list_request = MCPPromptsListRequest.from_dict(obj.get("McpPromptsListRequest"))
         mcp_prompts_list_result = MCPPromptsListResult.from_dict(obj.get("McpPromptsListResult"))
-        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_register_external_client_request = _MCPRegisterExternalClientRequest.from_dict(obj.get("McpRegisterExternalClientRequest"))
+        mcp_registry_cancel_request = _MCPRegistryCancelRequest.from_dict(obj.get("McpRegistryCancelRequest"))
+        mcp_registry_cancel_result = _MCPRegistryCancelResult.from_dict(obj.get("McpRegistryCancelResult"))
+        mcp_registry_request_id_result = _MCPRegistryRequestIDResult.from_dict(obj.get("McpRegistryRequestIdResult"))
+        mcp_registry_search_request = _MCPRegistrySearchRequest.from_dict(obj.get("McpRegistrySearchRequest"))
+        mcp_registry_search_result = _MCPRegistrySearchResult.from_dict(obj.get("McpRegistrySearchResult"))
+        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"))
         mcp_resource_annotations = MCPResourceAnnotations.from_dict(obj.get("McpResourceAnnotations"))
@@ -49595,8 +56934,8 @@ def from_dict(obj: Any) -> 'RPC':
         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_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"))
@@ -49606,6 +56945,8 @@ def from_dict(obj: Any) -> 'RPC':
         mcp_set_env_value_mode_details = MCPSetEnvValueModeDetails(obj.get("McpSetEnvValueModeDetails"))
         mcp_set_env_value_mode_params = MCPSetEnvValueModeParams.from_dict(obj.get("McpSetEnvValueModeParams"))
         mcp_set_env_value_mode_result = MCPSetEnvValueModeResult.from_dict(obj.get("McpSetEnvValueModeResult"))
+        mcp_should_exclude_git_hub_tools_request = _MCPShouldExcludeGitHubToolsRequest.from_dict(obj.get("McpShouldExcludeGitHubToolsRequest"))
+        mcp_should_exclude_git_hub_tools_result = _MCPShouldExcludeGitHubToolsResult.from_dict(obj.get("McpShouldExcludeGitHubToolsResult"))
         mcp_source_file = MCPSourceFile.from_dict(obj.get("McpSourceFile"))
         mcp_source_plugin = MCPSourcePlugin.from_dict(obj.get("McpSourcePlugin"))
         mcp_source_ref = MCPSourceRef.from_dict(obj.get("McpSourceRef"))
@@ -49617,7 +56958,7 @@ def from_dict(obj: Any) -> 'RPC':
         mcp_tool_ui = MCPToolUI.from_dict(obj.get("McpToolUi"))
         mcp_tool_ui_visibility = MCPToolUIVisibility(obj.get("McpToolUiVisibility"))
         mcp_uninstall_plan = MCPUninstallPlan.from_dict(obj.get("McpUninstallPlan"))
-        mcp_unregister_external_client_request = MCPUnregisterExternalClientRequest.from_dict(obj.get("McpUnregisterExternalClientRequest"))
+        mcp_unregister_external_client_request = _MCPUnregisterExternalClientRequest.from_dict(obj.get("McpUnregisterExternalClientRequest"))
         memory_configuration = MemoryConfiguration.from_dict(obj.get("MemoryConfiguration"))
         metadata_context_attribution_result = MetadataContextAttributionResult.from_dict(obj.get("MetadataContextAttributionResult"))
         metadata_context_heaviest_messages_request = MetadataContextHeaviestMessagesRequest.from_dict(obj.get("MetadataContextHeaviestMessagesRequest"))
@@ -49651,6 +56992,10 @@ def from_dict(obj: Any) -> 'RPC':
         model_capabilities_override_limits_vision = ModelCapabilitiesOverrideLimitsVision.from_dict(obj.get("ModelCapabilitiesOverrideLimitsVision"))
         model_capabilities_override_supports = ModelCapabilitiesOverrideSupports.from_dict(obj.get("ModelCapabilitiesOverrideSupports"))
         model_capabilities_supports = ModelCapabilitiesSupports.from_dict(obj.get("ModelCapabilitiesSupports"))
+        model_clear_startup_seed_request = _ModelClearStartupSeedRequest.from_dict(obj.get("ModelClearStartupSeedRequest"))
+        model_clear_startup_seed_result = _ModelClearStartupSeedResult.from_dict(obj.get("ModelClearStartupSeedResult"))
+        model_get_reasoning_summaries_request = ModelGetReasoningSummariesRequest.from_dict(obj.get("ModelGetReasoningSummariesRequest"))
+        model_get_reasoning_summaries_result = ModelGetReasoningSummariesResult.from_dict(obj.get("ModelGetReasoningSummariesResult"))
         model_list = ModelList.from_dict(obj.get("ModelList"))
         model_list_request = obj.get("ModelListRequest")
         model_message = ModelMessage.from_dict(obj.get("ModelMessage"))
@@ -49675,14 +57020,12 @@ def from_dict(obj: Any) -> 'RPC':
         model_provider_get_status_request = ModelProviderGetStatusRequest.from_dict(obj.get("ModelProviderGetStatusRequest"))
         model_provider_instance = ModelProviderInstance.from_dict(obj.get("ModelProviderInstance"))
         model_provider_instance_reference = ModelProviderInstanceReference.from_dict(obj.get("ModelProviderInstanceReference"))
-        model_provider_kind = ModelProviderKind(obj.get("ModelProviderKind"))
         model_provider_models_list_request = ModelProviderModelsListRequest.from_dict(obj.get("ModelProviderModelsListRequest"))
         model_provider_operation_outcome = ModelProviderOperationOutcome.from_dict(obj.get("ModelProviderOperationOutcome"))
         model_provider_operation_outcome_code = ModelProviderOperationOutcomeCode(obj.get("ModelProviderOperationOutcomeCode"))
         model_provider_prepare_configuration_request = ModelProviderPrepareConfigurationRequest.from_dict(obj.get("ModelProviderPrepareConfigurationRequest"))
         model_provider_provenance = ModelProviderProvenance.from_dict(obj.get("ModelProviderProvenance"))
         model_provider_provenance_source = ModelProviderProvenanceSource(obj.get("ModelProviderProvenanceSource"))
-        model_provider_ref = ModelProviderRef.from_dict(obj.get("ModelProviderRef"))
         model_provider_status = ModelProviderStatus.from_dict(obj.get("ModelProviderStatus"))
         model_provider_warning = ModelProviderWarning.from_dict(obj.get("ModelProviderWarning"))
         model_set_allowed_models_request = ModelSetAllowedModelsRequest.from_dict(obj.get("ModelSetAllowedModelsRequest"))
@@ -49714,6 +57057,8 @@ def from_dict(obj: Any) -> 'RPC':
         options_update_env_value_mode = MCPSetEnvValueModeDetails(obj.get("OptionsUpdateEnvValueMode"))
         options_update_reasoning_summary = ReasoningSummary(obj.get("OptionsUpdateReasoningSummary"))
         options_update_tool_filter_precedence = OptionsUpdateToolFilterPrecedence(obj.get("OptionsUpdateToolFilterPrecedence"))
+        pending_external_tool_request = PendingExternalToolRequest.from_dict(obj.get("PendingExternalToolRequest"))
+        pending_external_tool_request_list = PendingExternalToolRequestList.from_dict(obj.get("PendingExternalToolRequestList"))
         pending_permission_request = PendingPermissionRequest.from_dict(obj.get("PendingPermissionRequest"))
         pending_permission_request_list = PendingPermissionRequestList.from_dict(obj.get("PendingPermissionRequestList"))
         permission_decision = _load_PermissionDecision(obj.get("PermissionDecision"))
@@ -49786,6 +57131,8 @@ def from_dict(obj: Any) -> 'RPC':
         permissions_configure_additional_content_exclusion_policy_scope = AdditionalContentExclusionPolicyScope(obj.get("PermissionsConfigureAdditionalContentExclusionPolicyScope"))
         permissions_configure_params = PermissionsConfigureParams.from_dict(obj.get("PermissionsConfigureParams"))
         permissions_configure_result = PermissionsConfigureResult.from_dict(obj.get("PermissionsConfigureResult"))
+        permissions_evaluate_managed_policy_params = _PermissionsEvaluateManagedPolicyParams.from_dict(obj.get("PermissionsEvaluateManagedPolicyParams"))
+        permissions_evaluate_managed_policy_result = PermissionsEvaluateManagedPolicyResult.from_dict(obj.get("PermissionsEvaluateManagedPolicyResult"))
         permissions_folder_trust_add_trusted_result = PermissionsFolderTrustAddTrustedResult.from_dict(obj.get("PermissionsFolderTrustAddTrustedResult"))
         permissions_get_mode_request = PermissionsGetModeRequest.from_dict(obj.get("PermissionsGetModeRequest"))
         permissions_get_mode_result = PermissionsGetModeResult.from_dict(obj.get("PermissionsGetModeResult"))
@@ -49822,6 +57169,8 @@ def from_dict(obj: Any) -> 'RPC':
         permissions_urls_set_unrestricted_mode_result = PermissionsUrlsSetUnrestrictedModeResult.from_dict(obj.get("PermissionsUrlsSetUnrestrictedModeResult"))
         permission_urls_config = PermissionUrlsConfig.from_dict(obj.get("PermissionUrlsConfig"))
         permission_urls_set_unrestricted_mode_params = PermissionUrlsSetUnrestrictedModeParams.from_dict(obj.get("PermissionUrlsSetUnrestrictedModeParams"))
+        persistence_write_raw_json_locked_request = PersistenceWriteRawJSONLockedRequest.from_dict(obj.get("PersistenceWriteRawJsonLockedRequest"))
+        persistence_write_raw_json_locked_result = PersistenceWriteRawJSONLockedResult.from_dict(obj.get("PersistenceWriteRawJsonLockedResult"))
         ping_request = PingRequest.from_dict(obj.get("PingRequest"))
         ping_result = PingResult.from_dict(obj.get("PingResult"))
         plan_read_result = PlanReadResult.from_dict(obj.get("PlanReadResult"))
@@ -49940,6 +57289,8 @@ def from_dict(obj: Any) -> 'RPC':
         queue_update_text_result = QueueUpdateTextResult.from_dict(obj.get("QueueUpdateTextResult"))
         queue_withdraw_message_request = QueueWithdrawMessageRequest.from_dict(obj.get("QueueWithdrawMessageRequest"))
         queue_withdraw_message_result = QueueWithdrawMessageResult.from_dict(obj.get("QueueWithdrawMessageResult"))
+        quota_take_warnings_result = from_list(QuotaWarningProjection.from_dict, obj.get("QuotaTakeWarningsResult"))
+        quota_warning_projection = QuotaWarningProjection.from_dict(obj.get("QuotaWarningProjection"))
         register_event_interest_params = RegisterEventInterestParams.from_dict(obj.get("RegisterEventInterestParams"))
         register_event_interest_result = RegisterEventInterestResult.from_dict(obj.get("RegisterEventInterestResult"))
         release_event_interest_params = ReleaseEventInterestParams.from_dict(obj.get("ReleaseEventInterestParams"))
@@ -49964,7 +57315,17 @@ def from_dict(obj: Any) -> 'RPC':
         remote_session_metadata_value = RemoteSessionMetadataValue.from_dict(obj.get("RemoteSessionMetadataValue"))
         remote_session_mode = RemoteSessionMode(obj.get("RemoteSessionMode"))
         remote_session_repository = RemoteSessionRepository.from_dict(obj.get("RemoteSessionRepository"))
+        repo_settings_edit_request = _RepoSettingsEditRequest.from_dict(obj.get("RepoSettingsEditRequest"))
+        repo_settings_edit_scope = _RepoSettingsEditScope(obj.get("RepoSettingsEditScope"))
+        repo_settings_read_raw_request = _RepoSettingsReadRawRequest.from_dict(obj.get("RepoSettingsReadRawRequest"))
+        repo_settings_read_raw_result = _RepoSettingsReadRawResult.from_dict(obj.get("RepoSettingsReadRawResult"))
+        repo_settings_write_all_request = _RepoSettingsWriteAllRequest.from_dict(obj.get("RepoSettingsWriteAllRequest"))
+        repo_settings_write_key_request = _RepoSettingsWriteKeyRequest.from_dict(obj.get("RepoSettingsWriteKeyRequest"))
         response_format = ResponseFormat.from_dict(obj.get("ResponseFormat"))
+        sandbox_apply_defaults_request = SandboxApplyDefaultsRequest.from_dict(obj.get("SandboxApplyDefaultsRequest"))
+        sandbox_check_enforcement_command_result = from_bool(obj.get("SandboxCheckEnforcementCommandResult"))
+        sandbox_check_platform_support_result = from_bool(obj.get("SandboxCheckPlatformSupportResult"))
+        sandbox_check_windows_host_loopback_support_result = from_bool(obj.get("SandboxCheckWindowsHostLoopbackSupportResult"))
         sandbox_config = SandboxConfig.from_dict(obj.get("SandboxConfig"))
         sandbox_config_auth = SandboxConfigAuth.from_dict(obj.get("SandboxConfigAuth"))
         sandbox_config_source = SandboxConfigSource(obj.get("SandboxConfigSource"))
@@ -49976,20 +57337,44 @@ def from_dict(obj: Any) -> 'RPC':
         sandbox_config_user_policy_network_proxy = SandboxConfigUserPolicyNetworkProxy.from_dict(obj.get("SandboxConfigUserPolicyNetworkProxy"))
         sandbox_config_user_policy_seatbelt = SandboxConfigUserPolicySeatbelt.from_dict(obj.get("SandboxConfigUserPolicySeatbelt"))
         sandbox_credentials_config = SandboxCredentialsConfig.from_dict(obj.get("SandboxCredentialsConfig"))
+        sandbox_credential_suggestion = SandboxCredentialSuggestion.from_dict(obj.get("SandboxCredentialSuggestion"))
+        sandbox_credential_suggestions_result = SandboxCredentialSuggestionsResult.from_dict(obj.get("SandboxCredentialSuggestionsResult"))
         sandbox_disable_for_session_request = SandboxDisableForSessionRequest.from_dict(obj.get("SandboxDisableForSessionRequest"))
         sandbox_disable_for_session_result = SandboxDisableForSessionResult.from_dict(obj.get("SandboxDisableForSessionResult"))
+        sandbox_docs_url_result = SandboxDocsURLResult.from_dict(obj.get("SandboxDocsUrlResult"))
+        sandbox_effective_for_optional_params = _SandboxEffectiveForOptionalParams.from_dict(obj.get("SandboxEffectiveForOptionalParams"))
+        sandbox_effective_for_optional_result = _SandboxEffectiveForOptionalResult.from_dict(obj.get("SandboxEffectiveForOptionalResult"))
+        sandbox_enforcement_command_allowed_params = _SandboxEnforcementCommandAllowedParams.from_dict(obj.get("SandboxEnforcementCommandAllowedParams"))
         sandbox_enforcement_status = SandboxEnforcementStatus.from_dict(obj.get("SandboxEnforcementStatus"))
+        sandbox_filter_picker_candidates_params = _SandboxFilterPickerCandidatesParams.from_dict(obj.get("SandboxFilterPickerCandidatesParams"))
+        sandbox_filter_picker_candidates_result = _SandboxFilterPickerCandidatesResult.from_dict(obj.get("SandboxFilterPickerCandidatesResult"))
+        sandbox_get_unsupported_message_result = from_str(obj.get("SandboxGetUnsupportedMessageResult"))
+        sandbox_get_unsupported_setting_disabled_notice_result = from_str(obj.get("SandboxGetUnsupportedSettingDisabledNoticeResult"))
         sandbox_grant_path_for_request_request = SandboxGrantPathForRequestRequest.from_dict(obj.get("SandboxGrantPathForRequestRequest"))
         sandbox_grant_path_for_request_result = SandboxGrantPathForRequestResult.from_dict(obj.get("SandboxGrantPathForRequestResult"))
         sandbox_host_capability = SandboxHostCapability.from_dict(obj.get("SandboxHostCapability"))
         sandbox_host_capability_name = from_str(obj.get("SandboxHostCapabilityName"))
         sandbox_host_support = SandboxHostSupport.from_dict(obj.get("SandboxHostSupport"))
         sandbox_masked_env_var = SandboxMaskedEnvVar.from_dict(obj.get("SandboxMaskedEnvVar"))
+        sandbox_picker_candidate = _SandboxPickerCandidate.from_dict(obj.get("SandboxPickerCandidate"))
+        sandbox_prepare_picker_policy_params = _SandboxPreparePickerPolicyParams.from_dict(obj.get("SandboxPreparePickerPolicyParams"))
+        sandbox_prepare_picker_policy_result = _SandboxPreparePickerPolicyResult.from_dict(obj.get("SandboxPreparePickerPolicyResult"))
+        sandbox_proxy_ca_check_installation_support_result = from_bool(obj.get("SandboxProxyCaCheckInstallationSupportResult"))
+        sandbox_proxy_ca_check_relevance_result = from_bool(obj.get("SandboxProxyCaCheckRelevanceResult"))
         sandbox_proxy_ca_create_result = SandboxProxyCACreateResult.from_dict(obj.get("SandboxProxyCaCreateResult"))
         sandbox_proxy_ca_request = SandboxProxyCARequest.from_dict(obj.get("SandboxProxyCaRequest"))
         sandbox_proxy_ca_state = SandboxProxyCAState(obj.get("SandboxProxyCaState"))
         sandbox_proxy_ca_status = SandboxProxyCAStatus.from_dict(obj.get("SandboxProxyCaStatus"))
+        sandbox_proxy_secret_get_result = SandboxProxySecretGetResult.from_dict(obj.get("SandboxProxySecretGetResult"))
+        sandbox_proxy_secret_location = SandboxProxySecretLocation.from_dict(obj.get("SandboxProxySecretLocation"))
+        sandbox_proxy_secret_save_request = SandboxProxySecretSaveRequest.from_dict(obj.get("SandboxProxySecretSaveRequest"))
+        sandbox_proxy_secret_save_result = SandboxProxySecretSaveResult.from_dict(obj.get("SandboxProxySecretSaveResult"))
+        sandbox_resolve_floored_config_params = _SandboxResolveFlooredConfigParams.from_dict(obj.get("SandboxResolveFlooredConfigParams"))
+        sandbox_resolve_floored_config_result = SandboxResolveFlooredConfigResult.from_dict(obj.get("SandboxResolveFlooredConfigResult"))
         sandbox_session_change = SandboxSessionChange(obj.get("SandboxSessionChange"))
+        sandbox_settings_apply_defaults_result = from_dict(lambda x: x, obj.get("SandboxSettingsApplyDefaultsResult"))
+        sandbox_unsupported_startup_notice_params = _SandboxUnsupportedStartupNoticeParams.from_dict(obj.get("SandboxUnsupportedStartupNoticeParams"))
+        sandbox_unsupported_startup_notice_result = _SandboxUnsupportedStartupNoticeResult.from_dict(obj.get("SandboxUnsupportedStartupNoticeResult"))
         schedule_add_at_request = ScheduleAddAtRequest.from_dict(obj.get("ScheduleAddAtRequest"))
         schedule_add_cron_request = ScheduleAddCronRequest.from_dict(obj.get("ScheduleAddCronRequest"))
         schedule_add_request = ScheduleAddRequest.from_dict(obj.get("ScheduleAddRequest"))
@@ -50027,6 +57412,7 @@ def from_dict(obj: Any) -> 'RPC':
         session_capability = SessionCapability(obj.get("SessionCapability"))
         session_commands_list_request = SessionCommandsListRequest.from_dict(obj.get("SessionCommandsListRequest"))
         session_completion_item = SessionCompletionItem.from_dict(obj.get("SessionCompletionItem"))
+        session_connected_ide_info = SessionConnectedIDEInfo.from_dict(obj.get("SessionConnectedIdeInfo"))
         session_context = SessionContext.from_dict(obj.get("SessionContext"))
         session_context_host_type = HostType(obj.get("SessionContextHostType"))
         session_enrich_metadata_result = SessionEnrichMetadataResult.from_dict(obj.get("SessionEnrichMetadataResult"))
@@ -50097,8 +57483,11 @@ def from_dict(obj: Any) -> 'RPC':
         session_mcp_oauth_cancel_login_result = SessionMCPOauthCancelLoginResult.from_dict(obj.get("SessionMcpOauthCancelLoginResult"))
         session_mcp_oauth_prepare_login_request = SessionMCPOauthPrepareLoginRequest.from_dict(obj.get("SessionMcpOauthPrepareLoginRequest"))
         session_mcp_oauth_prepare_login_result = SessionMCPOauthPrepareLoginResult.from_dict(obj.get("SessionMcpOauthPrepareLoginResult"))
+        session_mcp_set_connected_ide_info_params = SessionMCPSetConnectedIDEInfoParams.from_dict(obj.get("SessionMcpSetConnectedIdeInfoParams"))
         session_metadata_snapshot = SessionMetadataSnapshot.from_dict(obj.get("SessionMetadataSnapshot"))
         session_mode = SessionMode(obj.get("SessionMode"))
+        session_model_clear_startup_seed_request = SessionModelClearStartupSeedRequest.from_dict(obj.get("SessionModelClearStartupSeedRequest"))
+        session_model_clear_startup_seed_result = SessionModelClearStartupSeedResult.from_dict(obj.get("SessionModelClearStartupSeedResult"))
         session_model_list = SessionModelList.from_dict(obj.get("SessionModelList"))
         session_model_list_request = SessionModelListRequest.from_dict(obj.get("SessionModelListRequest"))
         session_model_price_category = SessionModelPriceCategory.from_dict(obj.get("SessionModelPriceCategory"))
@@ -50116,14 +57505,25 @@ def from_dict(obj: Any) -> 'RPC':
         session_plugins_install_request = SessionPluginsInstallRequest.from_dict(obj.get("SessionPluginsInstallRequest"))
         session_plugins_marketplaces_refresh_request = SessionPluginsMarketplacesRefreshRequest.from_dict(obj.get("SessionPluginsMarketplacesRefreshRequest"))
         session_plugins_reload_request = SessionPluginsReloadRequest.from_dict(obj.get("SessionPluginsReloadRequest"))
+        session_plugins_retry_managed_request = SessionPluginsRetryManagedRequest.from_dict(obj.get("SessionPluginsRetryManagedRequest"))
+        session_plugins_retry_managed_result = SessionPluginsRetryManagedResult.from_dict(obj.get("SessionPluginsRetryManagedResult"))
         session_provider_get_endpoint_request = SessionProviderGetEndpointRequest.from_dict(obj.get("SessionProviderGetEndpointRequest"))
         session_prune_result = SessionPruneResult.from_dict(obj.get("SessionPruneResult"))
+        session_quota_delegate_warning = SessionQuotaDelegateWarning.from_dict(obj.get("SessionQuotaDelegateWarning"))
+        session_quota_get_result = SessionQuotaGetResult.from_dict(obj.get("SessionQuotaGetResult"))
+        session_quota_plan_tier = SessionQuotaPlanTier(obj.get("SessionQuotaPlanTier"))
+        session_quota_projection = SessionQuotaProjection.from_dict(obj.get("SessionQuotaProjection"))
+        session_quota_refresh_result = SessionQuotaRefreshResult.from_dict(obj.get("SessionQuotaRefreshResult"))
+        session_quota_snapshot = SessionQuotaSnapshot.from_dict(obj.get("SessionQuotaSnapshot"))
+        session_quota_take_warnings_result = from_list(QuotaWarningProjection.from_dict, obj.get("SessionQuotaTakeWarningsResult"))
         sessions_bulk_delete_request = SessionsBulkDeleteRequest.from_dict(obj.get("SessionsBulkDeleteRequest"))
         sessions_check_in_use_request = SessionsCheckInUseRequest.from_dict(obj.get("SessionsCheckInUseRequest"))
         sessions_check_in_use_result = SessionsCheckInUseResult.from_dict(obj.get("SessionsCheckInUseResult"))
         sessions_client_metadata_entry = SessionsClientMetadataEntry.from_dict(obj.get("SessionsClientMetadataEntry"))
         sessions_close_request = SessionsCloseRequest.from_dict(obj.get("SessionsCloseRequest"))
         sessions_close_result = SessionsCloseResult.from_dict(obj.get("SessionsCloseResult"))
+        sessions_create_workspace_request = SessionsCreateWorkspaceRequest.from_dict(obj.get("SessionsCreateWorkspaceRequest"))
+        sessions_create_workspace_result = SessionsCreateWorkspaceResult.from_dict(obj.get("SessionsCreateWorkspaceResult"))
         sessions_delete_request = SessionsDeleteRequest.from_dict(obj.get("SessionsDeleteRequest"))
         sessions_enrich_metadata_request = SessionsEnrichMetadataRequest.from_dict(obj.get("SessionsEnrichMetadataRequest"))
         session_set_credentials_params = SessionSetCredentialsParams.from_dict(obj.get("SessionSetCredentialsParams"))
@@ -50161,6 +57561,8 @@ def from_dict(obj: Any) -> 'RPC':
         sessions_list_non_empty_session_ids_result = SessionsListNonEmptySessionIDSResult.from_dict(obj.get("SessionsListNonEmptySessionIdsResult"))
         sessions_list_request = SessionsListRequest.from_dict(obj.get("SessionsListRequest"))
         sessions_load_deferred_repo_hooks_request = SessionsLoadDeferredRepoHooksRequest.from_dict(obj.get("SessionsLoadDeferredRepoHooksRequest"))
+        sessions_load_workspace_request = SessionsLoadWorkspaceRequest.from_dict(obj.get("SessionsLoadWorkspaceRequest"))
+        sessions_load_workspace_result = SessionsLoadWorkspaceResult.from_dict(obj.get("SessionsLoadWorkspaceResult"))
         sessions_open_attach = SessionsOpenAttach.from_dict(obj.get("SessionsOpenAttach"))
         sessions_open_cloud = SessionsOpenCloud.from_dict(obj.get("SessionsOpenCloud"))
         sessions_open_create = SessionsOpenCreate.from_dict(obj.get("SessionsOpenCreate"))
@@ -50188,15 +57590,22 @@ def from_dict(obj: Any) -> 'RPC':
         sessions_start_remote_control_request = SessionsStartRemoteControlRequest.from_dict(obj.get("SessionsStartRemoteControlRequest"))
         sessions_stop_remote_control_request = SessionsStopRemoteControlRequest.from_dict(obj.get("SessionsStopRemoteControlRequest"))
         sessions_transfer_remote_control_request = SessionsTransferRemoteControlRequest.from_dict(obj.get("SessionsTransferRemoteControlRequest"))
+        sessions_update_workspace_fields_request = SessionsUpdateWorkspaceFieldsRequest.from_dict(obj.get("SessionsUpdateWorkspaceFieldsRequest"))
+        sessions_update_workspace_fields_result = SessionsUpdateWorkspaceFieldsResult.from_dict(obj.get("SessionsUpdateWorkspaceFieldsResult"))
         session_telemetry_engagement = SessionTelemetryEngagement.from_dict(obj.get("SessionTelemetryEngagement"))
         session_update_options_params = SessionUpdateOptionsParams.from_dict(obj.get("SessionUpdateOptionsParams"))
         session_update_options_result = SessionUpdateOptionsResult.from_dict(obj.get("SessionUpdateOptionsResult"))
+        session_usage_set_code_changes_request = SessionUsageSetCodeChangesRequest.from_dict(obj.get("SessionUsageSetCodeChangesRequest"))
         session_visibility_status = SessionVisibilityStatus(obj.get("SessionVisibilityStatus"))
         session_workflow_pause_at_checkpoint_result = SessionWorkflowPauseAtCheckpointResult.from_dict(obj.get("SessionWorkflowPauseAtCheckpointResult"))
         session_working_directory_context = SessionWorkingDirectoryContext.from_dict(obj.get("SessionWorkingDirectoryContext"))
         session_working_directory_context_host_type = HostType(obj.get("SessionWorkingDirectoryContextHostType"))
+        session_working_directory_context_with_client = SessionWorkingDirectoryContextWithClient.from_dict(obj.get("SessionWorkingDirectoryContextWithClient"))
         settable_auth_info = _load_SettableAuthInfo(obj.get("SettableAuthInfo"))
         settable_token_auth_info = SettableTokenAuthInfo.from_dict(obj.get("SettableTokenAuthInfo"))
+        settings_edit_operation = _SettingsEditOperation(obj.get("SettingsEditOperation"))
+        settings_edit_result = _SettingsEditResult.from_dict(obj.get("SettingsEditResult"))
+        settings_edit_status = _SettingsEditStatus(obj.get("SettingsEditStatus"))
         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"))
@@ -50269,6 +57678,8 @@ def from_dict(obj: Any) -> 'RPC':
         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"))
+        staff_log_level_migration_status = StaffLogLevelMigrationStatus(obj.get("StaffLogLevelMigrationStatus"))
+        staff_update_channel_migration_status = StaffUpdateChannelMigrationStatus(obj.get("StaffUpdateChannelMigrationStatus"))
         subagent_settings_entry = SubagentSettingsEntry.from_dict(obj.get("SubagentSettingsEntry"))
         subagent_settings_entry_context_tier = SubagentSettingsEntryContextTier(obj.get("SubagentSettingsEntryContextTier"))
         system_message_block = SystemMessageBlock.from_dict(obj.get("SystemMessageBlock"))
@@ -50329,6 +57740,7 @@ def from_dict(obj: Any) -> 'RPC':
         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_pending_requests_request = ToolsListPendingRequestsRequest.from_dict(obj.get("ToolsListPendingRequestsRequest"))
         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"))
@@ -50378,19 +57790,59 @@ def from_dict(obj: Any) -> 'RPC':
         unsupported_enqueue_command_result = UnsupportedEnqueueCommandResult.from_dict(obj.get("UnsupportedEnqueueCommandResult"))
         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"))
-        usage_metrics_model_metric_token_detail = UsageMetricsModelMetricTokenDetail.from_dict(obj.get("UsageMetricsModelMetricTokenDetail"))
-        usage_metrics_model_metric_usage = UsageMetricsModelMetricUsage.from_dict(obj.get("UsageMetricsModelMetricUsage"))
-        usage_metrics_token_detail = UsageMetricsTokenDetail.from_dict(obj.get("UsageMetricsTokenDetail"))
+        usage_set_code_changes_request = _UsageSetCodeChangesRequest.from_dict(obj.get("UsageSetCodeChangesRequest"))
         user_auth_info = UserAuthInfo.from_dict(obj.get("UserAuthInfo"))
         user_requested_shell_command_result = UserRequestedShellCommandResult.from_dict(obj.get("UserRequestedShellCommandResult"))
         user_setting_metadata = UserSettingMetadata.from_dict(obj.get("UserSettingMetadata"))
+        user_settings_apply_top_key_request = UserSettingsApplyTopKeyRequest.from_dict(obj.get("UserSettingsApplyTopKeyRequest"))
+        user_settings_apply_top_key_result = UserSettingsApplyTopKeyResult.from_dict(obj.get("UserSettingsApplyTopKeyResult"))
+        user_settings_build_runtime_request = _UserSettingsBuildRuntimeRequest.from_dict(obj.get("UserSettingsBuildRuntimeRequest"))
+        user_settings_build_runtime_result = from_dict(lambda x: x, obj.get("UserSettingsBuildRuntimeResult"))
+        user_settings_edit_request = _UserSettingsEditRequest.from_dict(obj.get("UserSettingsEditRequest"))
+        user_settings_get_paths_request = UserSettingsGetPathsRequest.from_dict(obj.get("UserSettingsGetPathsRequest"))
+        user_settings_get_paths_result = UserSettingsGetPathsResult.from_dict(obj.get("UserSettingsGetPathsResult"))
         user_settings_get_result = UserSettingsGetResult.from_dict(obj.get("UserSettingsGetResult"))
+        user_settings_governance_keys_result = UserSettingsGovernanceKeysResult.from_dict(obj.get("UserSettingsGovernanceKeysResult"))
+        user_settings_host_context = UserSettingsHostContext.from_dict(obj.get("UserSettingsHostContext"))
+        user_settings_load_and_merge_repo_request = _UserSettingsLoadAndMergeRepoRequest.from_dict(obj.get("UserSettingsLoadAndMergeRepoRequest"))
+        user_settings_load_and_merge_repo_result = _UserSettingsLoadAndMergeRepoResult.from_dict(obj.get("UserSettingsLoadAndMergeRepoResult"))
+        user_settings_load_for_config_dir_request = _UserSettingsLoadForConfigDirRequest.from_dict(obj.get("UserSettingsLoadForConfigDirRequest"))
+        user_settings_load_for_config_dir_result = from_dict(lambda x: x, obj.get("UserSettingsLoadForConfigDirResult"))
+        user_settings_load_for_edit_result = UserSettingsLoadForEditResult.from_dict(obj.get("UserSettingsLoadForEditResult"))
+        user_settings_load_repo_request = UserSettingsLoadRepoRequest.from_dict(obj.get("UserSettingsLoadRepoRequest"))
+        user_settings_load_repo_result = UserSettingsLoadRepoResult.from_dict(obj.get("UserSettingsLoadRepoResult"))
+        user_settings_load_with_warning_result = UserSettingsLoadWithWarningResult.from_dict(obj.get("UserSettingsLoadWithWarningResult"))
+        user_settings_merge_managed_and_user_params = _UserSettingsMergeManagedAndUserParams.from_dict(obj.get("UserSettingsMergeManagedAndUserParams"))
+        user_settings_merge_managed_and_user_result = UserSettingsMergeManagedAndUserResult.from_dict(obj.get("UserSettingsMergeManagedAndUserResult"))
+        user_settings_merge_repo_value_params = _UserSettingsMergeRepoValueParams.from_dict(obj.get("UserSettingsMergeRepoValueParams"))
+        user_settings_merge_repo_value_result = UserSettingsMergeRepoValueResult.from_dict(obj.get("UserSettingsMergeRepoValueResult"))
+        user_settings_migrate_obsolete_on_disk_request = _UserSettingsMigrateObsoleteOnDiskRequest.from_dict(obj.get("UserSettingsMigrateObsoleteOnDiskRequest"))
+        user_settings_migrate_obsolete_on_disk_result = _UserSettingsMigrateObsoleteOnDiskResult.from_dict(obj.get("UserSettingsMigrateObsoleteOnDiskResult"))
+        user_settings_migrate_obsolete_on_disk_status = _UserSettingsMigrateObsoleteOnDiskStatus(obj.get("UserSettingsMigrateObsoleteOnDiskStatus"))
+        user_settings_migrate_staff_log_level_once_request = _UserSettingsMigrateStaffLogLevelOnceRequest.from_dict(obj.get("UserSettingsMigrateStaffLogLevelOnceRequest"))
+        user_settings_migrate_staff_log_level_once_result = _UserSettingsMigrateStaffLogLevelOnceResult.from_dict(obj.get("UserSettingsMigrateStaffLogLevelOnceResult"))
+        user_settings_migrate_staff_update_channel_once_result = _UserSettingsMigrateStaffUpdateChannelOnceResult.from_dict(obj.get("UserSettingsMigrateStaffUpdateChannelOnceResult"))
+        user_settings_normalize_request = UserSettingsNormalizeRequest.from_dict(obj.get("UserSettingsNormalizeRequest"))
+        user_settings_normalize_result = UserSettingsNormalizeResult.from_dict(obj.get("UserSettingsNormalizeResult"))
+        user_settings_path_result = UserSettingsPathResult.from_dict(obj.get("UserSettingsPathResult"))
+        user_settings_problem = UserSettingsProblem.from_dict(obj.get("UserSettingsProblem"))
+        user_settings_problem_location = UserSettingsProblemLocation.from_dict(obj.get("UserSettingsProblemLocation"))
+        user_settings_problem_source = UserSettingsProblemSource.from_dict(obj.get("UserSettingsProblemSource"))
+        user_settings_problems_request = UserSettingsProblemsRequest.from_dict(obj.get("UserSettingsProblemsRequest"))
+        user_settings_problems_result = UserSettingsProblemsResult.from_dict(obj.get("UserSettingsProblemsResult"))
+        user_settings_reset_staff_model_selection_once_request = _UserSettingsResetStaffModelSelectionOnceRequest.from_dict(obj.get("UserSettingsResetStaffModelSelectionOnceRequest"))
+        user_settings_reset_staff_model_selection_once_result = _UserSettingsResetStaffModelSelectionOnceResult.from_dict(obj.get("UserSettingsResetStaffModelSelectionOnceResult"))
+        user_settings_set_hook_disabled_request = _UserSettingsSetHookDisabledRequest.from_dict(obj.get("UserSettingsSetHookDisabledRequest"))
+        user_settings_set_hook_disabled_result = _UserSettingsSetHookDisabledResult.from_dict(obj.get("UserSettingsSetHookDisabledResult"))
         user_settings_set_request = UserSettingsSetRequest.from_dict(obj.get("UserSettingsSetRequest"))
-        user_settings_set_result = UserSettingsSetResult.from_dict(obj.get("UserSettingsSetResult"))
+        user_settings_unknown_keys_warning_request = _UserSettingsUnknownKeysWarningRequest.from_dict(obj.get("UserSettingsUnknownKeysWarningRequest"))
+        user_settings_unknown_keys_warning_result = _UserSettingsUnknownKeysWarningResult.from_dict(obj.get("UserSettingsUnknownKeysWarningResult"))
+        user_settings_update_request = _UserSettingsUpdateRequest.from_dict(obj.get("UserSettingsUpdateRequest"))
+        user_settings_update_result = _UserSettingsUpdateResult.from_dict(obj.get("UserSettingsUpdateResult"))
+        user_settings_validate_request = UserSettingsValidateRequest.from_dict(obj.get("UserSettingsValidateRequest"))
+        user_settings_validate_result = UserSettingsValidateResult.from_dict(obj.get("UserSettingsValidateResult"))
+        user_settings_validation_issue = UserSettingsValidationIssue.from_dict(obj.get("UserSettingsValidationIssue"))
+        user_settings_write_all_request = UserSettingsWriteAllRequest.from_dict(obj.get("UserSettingsWriteAllRequest"))
         visibility_get_result = VisibilityGetResult.from_dict(obj.get("VisibilityGetResult"))
         visibility_set_request = VisibilitySetRequest.from_dict(obj.get("VisibilitySetRequest"))
         visibility_set_result = VisibilitySetResult.from_dict(obj.get("VisibilitySetResult"))
@@ -50441,6 +57893,7 @@ def from_dict(obj: Any) -> 'RPC':
         workflow_tool_resume_request = _WorkflowToolResumeRequest.from_dict(obj.get("WorkflowToolResumeRequest"))
         workflow_tool_run_options = _WorkflowToolRunOptions.from_dict(obj.get("WorkflowToolRunOptions"))
         workflow_tool_run_request = _WorkflowToolRunRequest.from_dict(obj.get("WorkflowToolRunRequest"))
+        workspace_diff_contents = WorkspaceDiffContents.from_dict(obj.get("WorkspaceDiffContents"))
         workspace_diff_file_change = WorkspaceDiffFileChange.from_dict(obj.get("WorkspaceDiffFileChange"))
         workspace_diff_file_change_type = WorkspaceDiffFileChangeType(obj.get("WorkspaceDiffFileChangeType"))
         workspace_diff_mode = WorkspaceDiffMode(obj.get("WorkspaceDiffMode"))
@@ -50481,7 +57934,7 @@ def from_dict(obj: Any) -> 'RPC':
         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, accepted_enqueue_command_result, account_all_users, account_get_all_users_result, account_get_current_auth_result, account_get_quota_request, account_get_quota_result, account_kind, account_login_request, account_login_result, account_logout_request, account_logout_result, account_quota_snapshot, accounts_enumerate_request, accounts_get_request, accounts_set_request, account_status, 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_enumerate_query, auth_enumerate_value, auth_identity, auth_identity_metadata, auth_info, auth_info_type, auth_login_advance_request, auth_login_begin_request, auth_login_begun, auth_login_cancel_request, auth_login_result_dto, auth_login_result_status, auth_login_step, auth_read_query, auth_read_value, auth_status_dto, auth_validation_error, auth_validation_errors, auth_write, auth_write_result, autopilot_objective_credit_limit, autopilot_objective_get_state_result, autopilot_objective_state, autopilot_objective_status, 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_agent_plugin_candidate, catalog_agent_plugin_candidate_kind, catalog_agent_plugin_candidate_provenance, catalog_agent_plugin_compatibility_tag, catalog_agent_plugin_media_type, catalog_ai_skill_candidate, catalog_ai_skill_candidate_kind, catalog_ai_skill_candidate_provenance, catalog_ai_skill_installability, catalog_ai_skill_media_type, 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_kind, 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_plugin_repository_source, catalog_policy_rejected_error, catalog_resource_identity, catalog_resource_version, catalog_search_page, catalog_search_pagination, catalog_search_request, catalog_search_result, catalog_search_succeeded, catalog_search_total_count_relation, catalog_selection_cancelled, catalog_selection_decision, catalog_selection_declined, catalog_selection_foreign, catalog_selection_invalid, catalog_selection_replayed, catalog_selection_request, catalog_selection_result, catalog_selection_selected, catalog_selection_stale, catalog_selection_timed_out, catalog_selection_wrong_kind, catalog_trust_eligibility, catalog_trust_provenance, catalog_trust_snapshot, catalog_trust_snapshot_absent, catalog_trust_snapshot_absent_status, catalog_trust_snapshot_current, catalog_trust_snapshot_current_status, catalog_trust_snapshot_downgraded, catalog_trust_snapshot_downgraded_status, catalog_trust_snapshot_malformed, catalog_trust_snapshot_malformed_status, catalog_trust_snapshot_revoked, catalog_trust_snapshot_revoked_status, catalog_trust_snapshot_schema_version, catalog_trust_snapshot_stale, catalog_trust_snapshot_stale_status, catalog_trust_snapshot_unsupported, catalog_trust_snapshot_unsupported_status, catalog_trust_source, catalog_trust_tier, 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, client_metadata, client_task_cancel_reason, client_task_cancel_request, client_task_cancel_result, 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, connector_account_request, connector_authorization_requirement, connector_authorization_scope, connector_availability, connector_capabilities, connector_catalog_entry, connector_catalog_result, connector_catalog_status, connector_connect_request, connector_connect_result, connector_continue_request, connector_disconnect_result, connector_mcp_status, connector_reconcile_request, connector_runtime_status, connector_session_account, connector_status, 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, customization_reload_outcome, customization_reload_status, customization_reload_subsystem, customizations_reload_result, 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, diagnostic_cursor_status, diagnostic_entry, diagnostic_log_level, diagnostics_configuration, diagnostics_configure_request, diagnostic_severity, diagnostic_source, diagnostic_sources_configuration, diagnostics_read_request, diagnostics_read_result, discovered_canvas, discovered_extension, discovered_extension_mode, discovered_extension_plugin, discovered_extensions, discovered_extensions_disable_request, discovered_extensions_enable_request, discovered_extension_source, discovered_hook, discovered_mcp_server, discovered_mcp_server_type, discovered_model, discovered_model_list, enqueue_command_params, enqueue_command_result, env_auth_info, environment_capabilities, environment_kind, environments_delete_request, environments_delete_result, environments_get_request, environments_get_result, environments_list_request, environments_list_result, 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, 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_environment, 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_origin, hooks_discover_request, hooks_discover_result, hook_type, host_configuration, host_dispose_request, host_empty_result, host_environment_credentials, host_exited_notification, host_exit_reason, host_git_hub_environment_options, host_local_server_configuration, host_local_server_options, host_publish_session_request, host_publish_session_result, host_ready_request, host_register_session_request, host_session_create_callback, host_session_create_request, host_session_create_result, host_session_released_notification, host_session_release_request, host_start_request, host_start_result, installation_catalogue_identity, installation_confirmation_request, installation_confirmation_response, installation_decision, installation_review, 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, json_schema_response_format, 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, login_provider_kind, log_request, log_result, lsp_initialize_request, managed_mcp_server_config, managed_setting_meta, managed_settings_channel, managed_settings_compose_layer, managed_settings_compose_request, managed_settings_compose_result, managed_settings_diagnostic, managed_settings_diagnostic_severity, managed_settings_layer, managed_settings_meta, managed_settings_read_result, managed_settings_resolved_data, managed_settings_resolve_request, managed_settings_resolve_result, managed_settings_schema_result, managed_settings_validate_request, managed_settings_validate_result, managed_settings_values, 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_apply_install_request, mcp_apply_uninstall_request, 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_diagnostic_details, mcp_diagnostic_direction, mcp_diagnostic_kind, mcp_diagnostic_source_configuration, 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_installation_failure_reason, mcp_installation_input, mcp_installation_management_outcome, mcp_installation_management_result, mcp_installation_operation_request, mcp_installation_operation_status, mcp_installation_outcome, mcp_installation_remote_configuration, mcp_installation_result, mcp_installation_review, mcp_installation_secret, mcp_installation_secret_storage, mcp_installations_request, mcp_installation_state, mcp_installation_summary, 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_cancel_login_request, mcp_oauth_cancel_login_result, mcp_oauth_complete_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_prepare_login_request, mcp_oauth_prepare_login_result, mcp_oauth_probe_needs_auth_reason, mcp_oauth_probe_request, mcp_oauth_probe_result, mcp_oauth_respond_request, mcp_oauth_respond_result, mcp_owned_oauth_login_status, 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_uninstall_request, mcp_plan_value_category, mcp_prepared_install, mcp_prepare_install_request, mcp_prompt, mcp_prompt_argument, mcp_prompt_icon, mcp_prompt_message, mcp_prompt_role, mcp_prompts_get_request, mcp_prompts_get_result, mcp_prompts_list_request, mcp_prompts_list_result, 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_server_ownership, mcp_set_env_value_mode_details, mcp_set_env_value_mode_params, mcp_set_env_value_mode_result, mcp_source_file, mcp_source_plugin, mcp_source_ref, 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_uninstall_plan, 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, metadata_update_client_metadata_request, model, model_apply_startup_overlay_request, model_artifact_details, 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_provider_adapter_catalog, model_provider_adapter_descriptor, model_provider_adapter_operation_descriptor, model_provider_attribution, model_provider_automatic_discovery_mode, model_provider_automatic_discovery_policy, model_provider_configuration_disposition, model_provider_configuration_plan, model_provider_descriptor, model_provider_discover_request, model_provider_discover_result, model_provider_discovery_network_scope, model_provider_get_status_request, model_provider_instance, model_provider_instance_reference, model_provider_kind, model_provider_models_list_request, model_provider_operation_outcome, model_provider_operation_outcome_code, model_provider_prepare_configuration_request, model_provider_provenance, model_provider_provenance_source, model_provider_ref, model_provider_status, model_provider_warning, model_set_allowed_models_request, model_set_allowed_models_result, model_set_reasoning_effort_request, model_set_reasoning_effort_result, models_list_request, model_switch_auto_tier_request, model_switch_auto_tier_result, model_switch_auto_tier_status, 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_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_workflow, 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_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_workflow, permission_decision_approve_for_session_approval_write, permission_decision_approve_once, permission_decision_approve_permanently, permission_decision_approve_read_only_for_session, 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_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_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_workflow, 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_install_staging_mode, 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_append_mode, protocol_customize_mode, protocol_external_tool_defer, protocol_external_tool_definition, protocol_marker_section_override, protocol_replace_mode, protocol_section_override, protocol_static_section_action, protocol_static_section_override, protocol_system_message_append_config, protocol_system_message_config, protocol_system_message_customize_config, protocol_system_message_replace_config, provider_add_request, provider_add_result, provider_config, provider_config_azure, provider_config_model_provider, provider_config_transport, provider_config_type, provider_config_wire_api, provider_descriptor, provider_endpoint, provider_endpoint_transport, provider_endpoint_type, provider_endpoint_wire_api, provider_get_endpoint_request, provider_model_config, provider_session_token, provider_sync_request, provider_sync_result, provider_token_acquire_request, provider_token_acquire_result, provider_withdraw_request, provider_withdraw_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_append_steering_request, 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, queue_withdraw_message_request, queue_withdraw_message_result, register_event_interest_params, register_event_interest_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, response_format, 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, sandbox_credentials_config, sandbox_disable_for_session_request, sandbox_disable_for_session_result, sandbox_enforcement_status, sandbox_grant_path_for_request_request, sandbox_grant_path_for_request_result, sandbox_host_capability, sandbox_host_capability_name, sandbox_host_support, sandbox_masked_env_var, sandbox_proxy_ca_create_result, sandbox_proxy_ca_request, sandbox_proxy_ca_state, sandbox_proxy_ca_status, sandbox_session_change, 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_bytes_request, session_fs_read_file_bytes_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_bytes_request, 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_mcp_oauth_cancel_login_request, session_mcp_oauth_cancel_login_result, session_mcp_oauth_prepare_login_request, session_mcp_oauth_prepare_login_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_disable_request, session_plugins_enable_request, session_plugins_install_request, session_plugins_marketplaces_refresh_request, 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_client_metadata_entry, 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_client_metadata_request, sessions_get_client_metadata_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_read_persisted_events_request, 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_workflow_pause_at_checkpoint_result, 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_apply_install_request, skill_apply_uninstall_request, skill_discovery_path, skill_discovery_path_list, skill_discovery_scope, skill_installation_failure_reason, skill_installation_file_review, skill_installation_location, skill_installation_management_outcome, skill_installation_management_result, skill_installation_operation_request, skill_installation_operation_status, skill_installation_outcome, skill_installation_ownership_state, skill_installation_result, skill_installation_review, skill_installation_scope, skill_installation_session_state, skill_installation_source, skill_installations_request, skill_installation_summary, skill_install_plan, skill_list, skill_plan_install_request, skill_plan_uninstall_request, skill_provider_descriptor, skill_provider_list_request, skill_provider_list_result, skill_provider_read_request, skill_provider_read_result, skills_config_set_disabled_skills_request, skills_config_set_skill_disabled_request, skills_disable_request, skills_discover_request, skills_enable_request, skill_set_enabled_request, skills_get_discovery_paths_request, skills_get_invoked_result, skills_invoked_skill, skills_load_diagnostics, skill_uninstall_plan, 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, system_message_block, task_agent_info, task_agent_progress, task_client_active_status, task_client_execution_mode, task_client_info, task_client_owner, task_client_owner_kind, task_client_owner_presence, task_client_progress, task_client_status, task_client_type, task_client_update, task_complete_data, task_completion_decision, task_execution_mode, task_info, task_kind, 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_register_request, tasks_register_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_update_request, tasks_update_result, 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, unsupported_enqueue_command_result, 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, workflow_abort_request, workflow_ack_result, workflow_agent_options, workflow_agent_request, workflow_agent_result, workflow_agent_summary, workflow_cancel_request, workflow_current_phase, workflow_declared_limits, workflow_durable_operation, workflow_execute_request, workflow_execute_result, workflow_get_run_progress_request, workflow_get_run_request, workflow_journal_get_request, workflow_journal_get_result, workflow_journal_put_request, workflow_list_runs_request, workflow_list_runs_result, workflow_log_line, workflow_log_line_kind, workflow_log_request, workflow_pause_checkpoint_action, workflow_pause_checkpoint_request, workflow_pause_checkpoint_result, workflow_pause_info, workflow_pause_request, workflow_phase_observation, workflow_phase_status, workflow_progress_line, workflow_progress_page, workflow_resume_request, workflow_resume_result, workflow_run_consumed, workflow_run_detail, workflow_run_failure, workflow_run_failure_kind, workflow_run_limits, workflow_run_options, workflow_run_request, workflow_run_result, workflow_run_status, workflow_run_summary, workflow_run_terminal, workflow_tool_resume_request, workflow_tool_run_options, workflow_tool_run_request, 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_directory_request, 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_remove_path_request, workspaces_rename_path_request, workspaces_save_large_paste_request, workspaces_save_large_paste_result, workspaces_stat_file_request, workspaces_stat_file_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, connector_session_account_result, session_auth_info_result, session_context_attribution, session_context_info, subagent_settings, task_progress, workspace_summary)
+        return RPC(abort_request, abort_result, accepted_enqueue_command_result, account_all_users, account_auth_info, account_describe_auth_info_request, account_describe_auth_info_result, account_get_all_users_result, account_get_current_auth_result, account_get_gist_support_request, account_get_gist_support_result, account_get_quota_request, account_get_quota_result, account_get_token_env_var_result, account_get_web_url_request, account_get_web_url_result, account_kind, account_login_request, account_login_result, account_logout_request, account_logout_result, account_quota_snapshot, accounts_enumerate_request, accounts_get_request, accounts_set_request, account_status, 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_custom_agent_initial_model_decision_params, agents_custom_agent_initial_model_decision_result, agents_discover_request, agent_select_request, agent_select_result, agent_set_prompt_request, agents_get_available_builtins_request, agents_get_available_builtins_result, agents_get_builtin_definition_request, agents_get_builtin_definition_result, agents_get_builtin_listing_definition_request, agents_get_builtin_listing_definition_result, agents_get_builtins_result, agents_get_discovery_paths_request, api_key_auth_info, auth_enumerate_query, auth_enumerate_value, auth_identity, auth_identity_metadata, auth_info, auth_info_type, auth_login_account, auth_login_advance_request, auth_login_begin_request, auth_login_begun, auth_login_cancel_request, auth_login_result_dto, auth_login_result_status, auth_login_step, auth_read_query, auth_read_value, auth_status_dto, auth_validation_error, auth_validation_errors, auth_write, auth_write_result, autopilot_objective_credit_limit, autopilot_objective_get_state_result, autopilot_objective_state, autopilot_objective_status, auto_tier_descriptor, auto_tier_metadata, auto_tier_status, builtin_agent_summary, 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_agent_plugin_candidate, catalog_agent_plugin_candidate_kind, catalog_agent_plugin_candidate_provenance, catalog_agent_plugin_compatibility_tag, catalog_agent_plugin_media_type, catalog_ai_skill_candidate, catalog_ai_skill_candidate_kind, catalog_ai_skill_candidate_provenance, catalog_ai_skill_installability, catalog_ai_skill_media_type, 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_kind, 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_plugin_repository_source, catalog_policy_rejected_error, catalog_resource_identity, catalog_resource_version, catalog_search_page, catalog_search_pagination, catalog_search_request, catalog_search_result, catalog_search_succeeded, catalog_search_total_count_relation, catalog_selection_cancelled, catalog_selection_decision, catalog_selection_declined, catalog_selection_foreign, catalog_selection_invalid, catalog_selection_replayed, catalog_selection_request, catalog_selection_result, catalog_selection_selected, catalog_selection_stale, catalog_selection_timed_out, catalog_selection_wrong_kind, catalog_trust_eligibility, catalog_trust_provenance, catalog_trust_snapshot, catalog_trust_snapshot_absent, catalog_trust_snapshot_absent_status, catalog_trust_snapshot_current, catalog_trust_snapshot_current_status, catalog_trust_snapshot_downgraded, catalog_trust_snapshot_downgraded_status, catalog_trust_snapshot_malformed, catalog_trust_snapshot_malformed_status, catalog_trust_snapshot_revoked, catalog_trust_snapshot_revoked_status, catalog_trust_snapshot_schema_version, catalog_trust_snapshot_stale, catalog_trust_snapshot_stale_status, catalog_trust_snapshot_unsupported, catalog_trust_snapshot_unsupported_status, catalog_trust_source, catalog_trust_tier, 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, client_metadata, client_task_cancel_reason, client_task_cancel_request, client_task_cancel_result, 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, connector_account_request, connector_authorization_requirement, connector_authorization_scope, connector_availability, connector_capabilities, connector_catalog_entry, connector_catalog_result, connector_catalog_status, connector_connect_request, connector_connect_result, connector_continue_request, connector_disconnect_result, connector_discovery_account, connector_discovery_account_list, connector_discovery_account_request, connector_discovery_auth_info, connector_discovery_availability, connector_discovery_capabilities, connector_discovery_catalog_entry, connector_discovery_catalog_result, connector_mcp_status, connector_reconcile_request, connector_runtime_status, connector_session_account, connector_status, 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, customization_reload_outcome, customization_reload_status, customization_reload_subsystem, customizations_reload_result, 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, diagnostic_cursor_status, diagnostic_entry, diagnostic_log_level, diagnostics_configuration, diagnostics_configure_request, diagnostic_severity, diagnostic_source, diagnostic_sources_configuration, diagnostics_read_request, diagnostics_read_result, discovered_canvas, discovered_extension, discovered_extension_mode, discovered_extension_plugin, discovered_extensions, discovered_extensions_disable_request, discovered_extensions_enable_request, discovered_extension_source, discovered_hook, discovered_mcp_server, discovered_mcp_server_type, discovered_model, discovered_model_list, enqueue_command_params, enqueue_command_result, env_auth_info, environment_capabilities, environment_kind, environments_delete_request, environments_delete_result, environments_get_request, environments_get_result, environments_list_request, environments_list_result, 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, feature_flag_availability, feature_flag_metadata, feature_flags_metadata_result, feature_flags_resolve_request, feature_flags_resolve_result, feature_flags_resolve_startup_gates_request, feature_flags_resolve_startup_gates_result, filter_mapping, fleet_start_request, fleet_start_result, folder_trust_add_params, folder_trust_check_params, folder_trust_check_result, folder_trust_is_trusted_params, force_login_orgs_decision, gh_cli_auth_info, git_current_branch_remote_result, git_cwd_request, git_hub_environment, git_hub_owner_option, git_hub_owners_cancel_request, git_hub_owners_cancel_result, git_hub_owners_list_request, git_hub_owners_list_result, git_hub_owners_request_id_result, git_hub_repository_at_path_request, git_hub_repository_at_path_result, git_hub_repository_identity, 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, git_remote_repository, git_repos_from_remotes_request, git_repos_from_remotes_result, global_state_load_for_config_dir_request, global_state_load_result, global_state_write_key_request, 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_origin, hooks_discover_request, hooks_discover_result, hook_type, host_configuration, host_dispose_request, host_empty_result, host_environment_credentials, host_exited_notification, host_exit_reason, host_git_hub_environment_options, host_list_sessions_request, host_list_sessions_result, host_local_server_configuration, host_local_server_options, host_publish_session_request, host_publish_session_result, host_ready_request, host_register_session_request, host_session_create_callback, host_session_create_request, host_session_create_result, host_session_released_notification, host_session_release_request, host_session_summary, host_start_request, host_start_result, installation_catalogue_identity, installation_confirmation_request, installation_confirmation_response, installation_decision, installation_review, 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_repo_sources_request, instructions_discover_request, instructions_get_discovery_paths_request, instructions_get_sources_result, instructions_init_prompt_result, instruction_source, instruction_source_location, instruction_source_type, interrupt_main_turn_request, interrupt_main_turn_result, json_schema_response_format, 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, location_permissions_cleanup_result, logged_in_user, login_provider_kind, log_request, log_result, lsp_initialize_request, managed_mcp_server_config, managed_permission_evaluation, managed_permission_operation, managed_permission_operation_kind, managed_permissions_evaluate_request, managed_permissions_evaluate_result, managed_permission_verdict, managed_plugin_retry_entry, managed_plugin_retry_status, managed_setting_meta, managed_settings_apply_controls_params, managed_settings_apply_controls_result, managed_settings_bypass_disable_source, managed_settings_bypass_policy_resolution, managed_settings_channel, managed_settings_compose_layer, managed_settings_compose_request, managed_settings_compose_result, managed_settings_diagnostic, managed_settings_diagnostic_severity, managed_settings_ingest_params, managed_settings_ingest_result, managed_settings_layer, managed_settings_load_remote_control_params, managed_settings_load_remote_control_result, managed_settings_log_level, managed_settings_log_message, managed_settings_meta, managed_settings_parse_client_value_params, managed_settings_parse_client_value_result, managed_settings_policy_helper_authority, managed_settings_policy_helper_reason, managed_settings_read_device_result, managed_settings_read_result, managed_settings_resolve_bypass_disable_transition_params, managed_settings_resolve_bypass_disable_transition_result, managed_settings_resolved_data, managed_settings_resolve_device_force_login_orgs_gate_params, managed_settings_resolve_effective_value_params, managed_settings_resolve_effective_value_result, managed_settings_resolve_request, managed_settings_resolve_result, managed_settings_resolve_startup_policy_params, managed_settings_resolve_startup_policy_result, managed_settings_retain_policy_params, managed_settings_schema_result, managed_settings_server_policy_cache_mode, managed_settings_server_policy_resolution, managed_settings_validate_request, managed_settings_validate_result, managed_settings_values, 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_apply_install_request, mcp_apply_uninstall_request, 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_configured_server, mcp_configured_server_list, mcp_configured_server_state, mcp_configure_git_hub_request, mcp_configure_git_hub_result, mcp_diagnostic_details, mcp_diagnostic_direction, mcp_diagnostic_kind, mcp_diagnostic_source_configuration, 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_installation_failure_reason, mcp_installation_input, mcp_installation_management_outcome, mcp_installation_management_result, mcp_installation_operation_request, mcp_installation_operation_status, mcp_installation_outcome, mcp_installation_remote_configuration, mcp_installation_result, mcp_installation_review, mcp_installation_secret, mcp_installation_secret_storage, mcp_installations_request, mcp_installation_state, mcp_installation_summary, mcp_install_plan, mcp_is_server_running_request, mcp_is_server_running_result, mcp_list_builtin_server_names_result, mcp_list_tools_request, mcp_list_tools_result, mcp_oauth_authentication_state_changed_request, mcp_oauth_cancel_login_request, mcp_oauth_cancel_login_result, mcp_oauth_complete_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_prepare_login_request, mcp_oauth_prepare_login_result, mcp_oauth_probe_needs_auth_reason, mcp_oauth_probe_request, mcp_oauth_probe_result, mcp_oauth_respond_request, mcp_oauth_respond_result, mcp_owned_oauth_login_status, 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_uninstall_request, mcp_plan_value_category, mcp_prepared_install, mcp_prepare_install_request, mcp_prompt, mcp_prompt_argument, mcp_prompt_icon, mcp_prompt_message, mcp_prompt_role, mcp_prompts_get_request, mcp_prompts_get_result, mcp_prompts_list_request, mcp_prompts_list_result, mcp_register_external_client_request, mcp_registry_cancel_request, mcp_registry_cancel_result, mcp_registry_request_id_result, mcp_registry_search_request, mcp_registry_search_result, 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_server_ownership, mcp_set_env_value_mode_details, mcp_set_env_value_mode_params, mcp_set_env_value_mode_result, mcp_should_exclude_git_hub_tools_request, mcp_should_exclude_git_hub_tools_result, mcp_source_file, mcp_source_plugin, mcp_source_ref, 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_uninstall_plan, 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, metadata_update_client_metadata_request, model, model_apply_startup_overlay_request, model_artifact_details, 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_clear_startup_seed_request, model_clear_startup_seed_result, model_get_reasoning_summaries_request, model_get_reasoning_summaries_result, 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_provider_adapter_catalog, model_provider_adapter_descriptor, model_provider_adapter_operation_descriptor, model_provider_attribution, model_provider_automatic_discovery_mode, model_provider_automatic_discovery_policy, model_provider_configuration_disposition, model_provider_configuration_plan, model_provider_descriptor, model_provider_discover_request, model_provider_discover_result, model_provider_discovery_network_scope, model_provider_get_status_request, model_provider_instance, model_provider_instance_reference, model_provider_models_list_request, model_provider_operation_outcome, model_provider_operation_outcome_code, model_provider_prepare_configuration_request, model_provider_provenance, model_provider_provenance_source, model_provider_status, model_provider_warning, model_set_allowed_models_request, model_set_allowed_models_result, model_set_reasoning_effort_request, model_set_reasoning_effort_result, models_list_request, model_switch_auto_tier_request, model_switch_auto_tier_result, model_switch_auto_tier_status, 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_external_tool_request, pending_external_tool_request_list, 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_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_workflow, 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_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_workflow, permission_decision_approve_for_session_approval_write, permission_decision_approve_once, permission_decision_approve_permanently, permission_decision_approve_read_only_for_session, 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_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_evaluate_managed_policy_params, permissions_evaluate_managed_policy_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_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_workflow, 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, persistence_write_raw_json_locked_request, persistence_write_raw_json_locked_result, 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_install_staging_mode, 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_append_mode, protocol_customize_mode, protocol_external_tool_defer, protocol_external_tool_definition, protocol_marker_section_override, protocol_replace_mode, protocol_section_override, protocol_static_section_action, protocol_static_section_override, protocol_system_message_append_config, protocol_system_message_config, protocol_system_message_customize_config, protocol_system_message_replace_config, provider_add_request, provider_add_result, provider_config, provider_config_azure, provider_config_model_provider, provider_config_transport, provider_config_type, provider_config_wire_api, provider_descriptor, provider_endpoint, provider_endpoint_transport, provider_endpoint_type, provider_endpoint_wire_api, provider_get_endpoint_request, provider_model_config, provider_session_token, provider_sync_request, provider_sync_result, provider_token_acquire_request, provider_token_acquire_result, provider_withdraw_request, provider_withdraw_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_append_steering_request, 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, queue_withdraw_message_request, queue_withdraw_message_result, quota_take_warnings_result, quota_warning_projection, register_event_interest_params, register_event_interest_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, repo_settings_edit_request, repo_settings_edit_scope, repo_settings_read_raw_request, repo_settings_read_raw_result, repo_settings_write_all_request, repo_settings_write_key_request, response_format, sandbox_apply_defaults_request, sandbox_check_enforcement_command_result, sandbox_check_platform_support_result, sandbox_check_windows_host_loopback_support_result, 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, sandbox_credentials_config, sandbox_credential_suggestion, sandbox_credential_suggestions_result, sandbox_disable_for_session_request, sandbox_disable_for_session_result, sandbox_docs_url_result, sandbox_effective_for_optional_params, sandbox_effective_for_optional_result, sandbox_enforcement_command_allowed_params, sandbox_enforcement_status, sandbox_filter_picker_candidates_params, sandbox_filter_picker_candidates_result, sandbox_get_unsupported_message_result, sandbox_get_unsupported_setting_disabled_notice_result, sandbox_grant_path_for_request_request, sandbox_grant_path_for_request_result, sandbox_host_capability, sandbox_host_capability_name, sandbox_host_support, sandbox_masked_env_var, sandbox_picker_candidate, sandbox_prepare_picker_policy_params, sandbox_prepare_picker_policy_result, sandbox_proxy_ca_check_installation_support_result, sandbox_proxy_ca_check_relevance_result, sandbox_proxy_ca_create_result, sandbox_proxy_ca_request, sandbox_proxy_ca_state, sandbox_proxy_ca_status, sandbox_proxy_secret_get_result, sandbox_proxy_secret_location, sandbox_proxy_secret_save_request, sandbox_proxy_secret_save_result, sandbox_resolve_floored_config_params, sandbox_resolve_floored_config_result, sandbox_session_change, sandbox_settings_apply_defaults_result, sandbox_unsupported_startup_notice_params, sandbox_unsupported_startup_notice_result, 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_connected_ide_info, 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_bytes_request, session_fs_read_file_bytes_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_bytes_request, 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_mcp_oauth_cancel_login_request, session_mcp_oauth_cancel_login_result, session_mcp_oauth_prepare_login_request, session_mcp_oauth_prepare_login_result, session_mcp_set_connected_ide_info_params, session_metadata_snapshot, session_mode, session_model_clear_startup_seed_request, session_model_clear_startup_seed_result, 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_disable_request, session_plugins_enable_request, session_plugins_install_request, session_plugins_marketplaces_refresh_request, session_plugins_reload_request, session_plugins_retry_managed_request, session_plugins_retry_managed_result, session_provider_get_endpoint_request, session_prune_result, session_quota_delegate_warning, session_quota_get_result, session_quota_plan_tier, session_quota_projection, session_quota_refresh_result, session_quota_snapshot, session_quota_take_warnings_result, sessions_bulk_delete_request, sessions_check_in_use_request, sessions_check_in_use_result, sessions_client_metadata_entry, sessions_close_request, sessions_close_result, sessions_create_workspace_request, sessions_create_workspace_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_client_metadata_request, sessions_get_client_metadata_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_load_workspace_request, sessions_load_workspace_result, 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_read_persisted_events_request, 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, sessions_update_workspace_fields_request, sessions_update_workspace_fields_result, session_telemetry_engagement, session_update_options_params, session_update_options_result, session_usage_set_code_changes_request, session_visibility_status, session_workflow_pause_at_checkpoint_result, session_working_directory_context, session_working_directory_context_host_type, session_working_directory_context_with_client, settable_auth_info, settable_token_auth_info, settings_edit_operation, settings_edit_result, settings_edit_status, 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_apply_install_request, skill_apply_uninstall_request, skill_discovery_path, skill_discovery_path_list, skill_discovery_scope, skill_installation_failure_reason, skill_installation_file_review, skill_installation_location, skill_installation_management_outcome, skill_installation_management_result, skill_installation_operation_request, skill_installation_operation_status, skill_installation_outcome, skill_installation_ownership_state, skill_installation_result, skill_installation_review, skill_installation_scope, skill_installation_session_state, skill_installation_source, skill_installations_request, skill_installation_summary, skill_install_plan, skill_list, skill_plan_install_request, skill_plan_uninstall_request, skill_provider_descriptor, skill_provider_list_request, skill_provider_list_result, skill_provider_read_request, skill_provider_read_result, skills_config_set_disabled_skills_request, skills_config_set_skill_disabled_request, skills_disable_request, skills_discover_request, skills_enable_request, skill_set_enabled_request, skills_get_discovery_paths_request, skills_get_invoked_result, skills_invoked_skill, skills_load_diagnostics, skill_uninstall_plan, 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, staff_log_level_migration_status, staff_update_channel_migration_status, subagent_settings_entry, subagent_settings_entry_context_tier, system_message_block, task_agent_info, task_agent_progress, task_client_active_status, task_client_execution_mode, task_client_info, task_client_owner, task_client_owner_kind, task_client_owner_presence, task_client_progress, task_client_status, task_client_type, task_client_update, task_complete_data, task_completion_decision, task_execution_mode, task_info, task_kind, 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_register_request, tasks_register_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_update_request, tasks_update_result, 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_pending_requests_request, 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, unsupported_enqueue_command_result, update_subagent_settings_request, usage_get_metrics_result, usage_set_code_changes_request, user_auth_info, user_requested_shell_command_result, user_setting_metadata, user_settings_apply_top_key_request, user_settings_apply_top_key_result, user_settings_build_runtime_request, user_settings_build_runtime_result, user_settings_edit_request, user_settings_get_paths_request, user_settings_get_paths_result, user_settings_get_result, user_settings_governance_keys_result, user_settings_host_context, user_settings_load_and_merge_repo_request, user_settings_load_and_merge_repo_result, user_settings_load_for_config_dir_request, user_settings_load_for_config_dir_result, user_settings_load_for_edit_result, user_settings_load_repo_request, user_settings_load_repo_result, user_settings_load_with_warning_result, user_settings_merge_managed_and_user_params, user_settings_merge_managed_and_user_result, user_settings_merge_repo_value_params, user_settings_merge_repo_value_result, user_settings_migrate_obsolete_on_disk_request, user_settings_migrate_obsolete_on_disk_result, user_settings_migrate_obsolete_on_disk_status, user_settings_migrate_staff_log_level_once_request, user_settings_migrate_staff_log_level_once_result, user_settings_migrate_staff_update_channel_once_result, user_settings_normalize_request, user_settings_normalize_result, user_settings_path_result, user_settings_problem, user_settings_problem_location, user_settings_problem_source, user_settings_problems_request, user_settings_problems_result, user_settings_reset_staff_model_selection_once_request, user_settings_reset_staff_model_selection_once_result, user_settings_set_hook_disabled_request, user_settings_set_hook_disabled_result, user_settings_set_request, user_settings_unknown_keys_warning_request, user_settings_unknown_keys_warning_result, user_settings_update_request, user_settings_update_result, user_settings_validate_request, user_settings_validate_result, user_settings_validation_issue, user_settings_write_all_request, visibility_get_result, visibility_set_request, visibility_set_result, workflow_abort_request, workflow_ack_result, workflow_agent_options, workflow_agent_request, workflow_agent_result, workflow_agent_summary, workflow_cancel_request, workflow_current_phase, workflow_declared_limits, workflow_durable_operation, workflow_execute_request, workflow_execute_result, workflow_get_run_progress_request, workflow_get_run_request, workflow_journal_get_request, workflow_journal_get_result, workflow_journal_put_request, workflow_list_runs_request, workflow_list_runs_result, workflow_log_line, workflow_log_line_kind, workflow_log_request, workflow_pause_checkpoint_action, workflow_pause_checkpoint_request, workflow_pause_checkpoint_result, workflow_pause_info, workflow_pause_request, workflow_phase_observation, workflow_phase_status, workflow_progress_line, workflow_progress_page, workflow_resume_request, workflow_resume_result, workflow_run_consumed, workflow_run_detail, workflow_run_failure, workflow_run_failure_kind, workflow_run_limits, workflow_run_options, workflow_run_request, workflow_run_result, workflow_run_status, workflow_run_summary, workflow_run_terminal, workflow_tool_resume_request, workflow_tool_run_options, workflow_tool_run_request, workspace_diff_contents, 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_directory_request, 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_remove_path_request, workspaces_rename_path_request, workspaces_save_large_paste_request, workspaces_save_large_paste_result, workspaces_stat_file_request, workspaces_stat_file_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, connector_session_account_result, session_auth_info_result, session_context_attribution, session_context_info, subagent_settings, task_progress, workspace_summary)
 
     def to_dict(self) -> dict:
         result: dict = {}
@@ -50489,10 +57942,18 @@ def to_dict(self) -> dict:
         result["AbortResult"] = to_class(AbortResult, self.abort_result)
         result["AcceptedEnqueueCommandResult"] = to_class(AcceptedEnqueueCommandResult, self.accepted_enqueue_command_result)
         result["AccountAllUsers"] = to_class(AccountAllUsers, self.account_all_users)
+        result["AccountAuthInfo"] = to_class(AccountAuthInfo, self.account_auth_info)
+        result["AccountDescribeAuthInfoRequest"] = to_class(_AccountDescribeAuthInfoRequest, self.account_describe_auth_info_request)
+        result["AccountDescribeAuthInfoResult"] = to_class(_AccountDescribeAuthInfoResult, self.account_describe_auth_info_result)
         result["AccountGetAllUsersResult"] = from_list(lambda x: to_class(AccountAllUsers, x), self.account_get_all_users_result)
         result["AccountGetCurrentAuthResult"] = to_class(AccountGetCurrentAuthResult, self.account_get_current_auth_result)
+        result["AccountGetGistSupportRequest"] = to_class(_AccountGetGistSupportRequest, self.account_get_gist_support_request)
+        result["AccountGetGistSupportResult"] = to_class(_AccountGetGistSupportResult, self.account_get_gist_support_result)
         result["AccountGetQuotaRequest"] = to_class(AccountGetQuotaRequest, self.account_get_quota_request)
         result["AccountGetQuotaResult"] = to_class(AccountGetQuotaResult, self.account_get_quota_result)
+        result["AccountGetTokenEnvVarResult"] = to_class(_AccountGetTokenEnvVarResult, self.account_get_token_env_var_result)
+        result["AccountGetWebUrlRequest"] = to_class(_AccountGetWebURLRequest, self.account_get_web_url_request)
+        result["AccountGetWebUrlResult"] = to_class(_AccountGetWebURLResult, self.account_get_web_url_result)
         result["AccountKind"] = to_enum(AccountKind, self.account_kind)
         result["AccountLoginRequest"] = to_class(AccountLoginRequest, self.account_login_request)
         result["AccountLoginResult"] = to_class(AccountLoginResult, self.account_login_result)
@@ -50529,10 +57990,19 @@ def to_dict(self) -> dict:
         result["AgentRegistrySpawnValidationErrorField"] = to_enum(AgentRegistrySpawnValidationErrorField, self.agent_registry_spawn_validation_error_field)
         result["AgentRegistrySpawnValidationErrorReason"] = to_enum(AgentRegistrySpawnValidationErrorReason, self.agent_registry_spawn_validation_error_reason)
         result["AgentReloadResult"] = to_class(AgentReloadResult, self.agent_reload_result)
+        result["AgentsCustomAgentInitialModelDecisionParams"] = to_class(_AgentsCustomAgentInitialModelDecisionParams, self.agents_custom_agent_initial_model_decision_params)
+        result["AgentsCustomAgentInitialModelDecisionResult"] = to_class(_AgentsCustomAgentInitialModelDecisionResult, self.agents_custom_agent_initial_model_decision_result)
         result["AgentsDiscoverRequest"] = to_class(AgentsDiscoverRequest, self.agents_discover_request)
         result["AgentSelectRequest"] = to_class(AgentSelectRequest, self.agent_select_request)
         result["AgentSelectResult"] = to_class(AgentSelectResult, self.agent_select_result)
         result["AgentSetPromptRequest"] = to_class(AgentSetPromptRequest, self.agent_set_prompt_request)
+        result["AgentsGetAvailableBuiltinsRequest"] = to_class(_AgentsGetAvailableBuiltinsRequest, self.agents_get_available_builtins_request)
+        result["AgentsGetAvailableBuiltinsResult"] = to_class(_AgentsGetAvailableBuiltinsResult, self.agents_get_available_builtins_result)
+        result["AgentsGetBuiltinDefinitionRequest"] = to_class(_AgentsGetBuiltinDefinitionRequest, self.agents_get_builtin_definition_request)
+        result["AgentsGetBuiltinDefinitionResult"] = to_class(_AgentsGetBuiltinDefinitionResult, self.agents_get_builtin_definition_result)
+        result["AgentsGetBuiltinListingDefinitionRequest"] = to_class(_AgentsGetBuiltinListingDefinitionRequest, self.agents_get_builtin_listing_definition_request)
+        result["AgentsGetBuiltinListingDefinitionResult"] = to_class(_AgentsGetBuiltinListingDefinitionResult, self.agents_get_builtin_listing_definition_result)
+        result["AgentsGetBuiltinsResult"] = to_class(_AgentsGetBuiltinsResult, self.agents_get_builtins_result)
         result["AgentsGetDiscoveryPathsRequest"] = to_class(AgentsGetDiscoveryPathsRequest, self.agents_get_discovery_paths_request)
         result["ApiKeyAuthInfo"] = to_class(APIKeyAuthInfo, self.api_key_auth_info)
         result["AuthEnumerateQuery"] = to_class(AuthEnumerateQuery, self.auth_enumerate_query)
@@ -50541,6 +58011,7 @@ def to_dict(self) -> dict:
         result["AuthIdentityMetadata"] = to_class(AuthIdentityMetadata, self.auth_identity_metadata)
         result["AuthInfo"] = (self.auth_info).to_dict()
         result["AuthInfoType"] = to_enum(AuthInfoType, self.auth_info_type)
+        result["AuthLoginAccount"] = to_class(AuthLoginAccount, self.auth_login_account)
         result["AuthLoginAdvanceRequest"] = to_class(AuthLoginAdvanceRequest, self.auth_login_advance_request)
         result["AuthLoginBeginRequest"] = to_class(AuthLoginBeginRequest, self.auth_login_begin_request)
         result["AuthLoginBegun"] = to_class(AuthLoginBegun, self.auth_login_begun)
@@ -50559,6 +58030,10 @@ def to_dict(self) -> dict:
         result["AutopilotObjectiveGetStateResult"] = to_class(AutopilotObjectiveGetStateResult, self.autopilot_objective_get_state_result)
         result["AutopilotObjectiveState"] = to_class(AutopilotObjectiveState, self.autopilot_objective_state)
         result["AutopilotObjectiveStatus"] = to_enum(AutopilotObjectiveStatus, self.autopilot_objective_status)
+        result["AutoTierDescriptor"] = to_class(AutoTierDescriptor, self.auto_tier_descriptor)
+        result["AutoTierMetadata"] = to_class(AutoTierMetadata, self.auto_tier_metadata)
+        result["AutoTierStatus"] = to_class(AutoTierStatus, self.auto_tier_status)
+        result["BuiltinAgentSummary"] = to_class(_BuiltinAgentSummary, self.builtin_agent_summary)
         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)
@@ -50715,6 +58190,14 @@ def to_dict(self) -> dict:
         result["ConnectorConnectResult"] = to_class(ConnectorConnectResult, self.connector_connect_result)
         result["ConnectorContinueRequest"] = to_class(ConnectorContinueRequest, self.connector_continue_request)
         result["ConnectorDisconnectResult"] = to_class(ConnectorDisconnectResult, self.connector_disconnect_result)
+        result["ConnectorDiscoveryAccount"] = to_class(ConnectorDiscoveryAccount, self.connector_discovery_account)
+        result["ConnectorDiscoveryAccountList"] = to_class(ConnectorDiscoveryAccountList, self.connector_discovery_account_list)
+        result["ConnectorDiscoveryAccountRequest"] = to_class(ConnectorDiscoveryAccountRequest, self.connector_discovery_account_request)
+        result["ConnectorDiscoveryAuthInfo"] = to_class(ConnectorDiscoveryAuthInfo, self.connector_discovery_auth_info)
+        result["ConnectorDiscoveryAvailability"] = to_enum(ConnectorDiscoveryAvailability, self.connector_discovery_availability)
+        result["ConnectorDiscoveryCapabilities"] = to_class(ConnectorDiscoveryCapabilities, self.connector_discovery_capabilities)
+        result["ConnectorDiscoveryCatalogEntry"] = to_class(ConnectorDiscoveryCatalogEntry, self.connector_discovery_catalog_entry)
+        result["ConnectorDiscoveryCatalogResult"] = to_class(ConnectorDiscoveryCatalogResult, self.connector_discovery_catalog_result)
         result["ConnectorMcpStatus"] = to_enum(ConnectorMCPStatus, self.connector_mcp_status)
         result["ConnectorReconcileRequest"] = to_class(ConnectorReconcileRequest, self.connector_reconcile_request)
         result["ConnectorRuntimeStatus"] = to_class(ConnectorRuntimeStatus, self.connector_runtime_status)
@@ -50821,20 +58304,46 @@ def to_dict(self) -> dict:
         result["ExternalToolTextResultForLlmContentShellExit"] = to_class(ExternalToolTextResultForLlmContentShellExit, self.external_tool_text_result_for_llm_content_shell_exit)
         result["ExternalToolTextResultForLlmContentTerminal"] = to_class(ExternalToolTextResultForLlmContentTerminal, self.external_tool_text_result_for_llm_content_terminal)
         result["ExternalToolTextResultForLlmContentText"] = to_class(ExternalToolTextResultForLlmContentText, self.external_tool_text_result_for_llm_content_text)
+        result["FeatureFlagAvailability"] = to_enum(_FeatureFlagAvailability, self.feature_flag_availability)
+        result["FeatureFlagMetadata"] = to_class(_FeatureFlagMetadata, self.feature_flag_metadata)
+        result["FeatureFlagsMetadataResult"] = to_class(_FeatureFlagsMetadataResult, self.feature_flags_metadata_result)
+        result["FeatureFlagsResolveRequest"] = to_class(_FeatureFlagsResolveRequest, self.feature_flags_resolve_request)
+        result["FeatureFlagsResolveResult"] = from_dict(from_bool, self.feature_flags_resolve_result)
+        result["FeatureFlagsResolveStartupGatesRequest"] = to_class(_FeatureFlagsResolveStartupGatesRequest, self.feature_flags_resolve_startup_gates_request)
+        result["FeatureFlagsResolveStartupGatesResult"] = from_dict(from_bool, self.feature_flags_resolve_startup_gates_result)
         result["FilterMapping"] = from_union([lambda x: from_dict(lambda x: to_enum(ContentFilterMode, x), x), lambda x: to_enum(ContentFilterMode, x)], self.filter_mapping)
         result["FleetStartRequest"] = to_class(FleetStartRequest, self.fleet_start_request)
         result["FleetStartResult"] = to_class(FleetStartResult, self.fleet_start_result)
         result["FolderTrustAddParams"] = to_class(FolderTrustAddParams, self.folder_trust_add_params)
         result["FolderTrustCheckParams"] = to_class(FolderTrustCheckParams, self.folder_trust_check_params)
         result["FolderTrustCheckResult"] = to_class(FolderTrustCheckResult, self.folder_trust_check_result)
+        result["FolderTrustIsTrustedParams"] = to_class(_FolderTrustIsTrustedParams, self.folder_trust_is_trusted_params)
+        result["ForceLoginOrgsDecision"] = to_class(_ForceLoginOrgsDecision, self.force_login_orgs_decision)
         result["GhCliAuthInfo"] = to_class(GhCLIAuthInfo, self.gh_cli_auth_info)
+        result["GitCurrentBranchRemoteResult"] = to_class(_GitCurrentBranchRemoteResult, self.git_current_branch_remote_result)
+        result["GitCwdRequest"] = to_class(_GitCwdRequest, self.git_cwd_request)
         result["GitHubEnvironment"] = to_class(GitHubEnvironment, self.git_hub_environment)
+        result["GitHubOwnerOption"] = to_class(_GitHubOwnerOption, self.git_hub_owner_option)
+        result["GitHubOwnersCancelRequest"] = to_class(_GitHubOwnersCancelRequest, self.git_hub_owners_cancel_request)
+        result["GitHubOwnersCancelResult"] = to_class(_GitHubOwnersCancelResult, self.git_hub_owners_cancel_result)
+        result["GitHubOwnersListRequest"] = to_class(_GitHubOwnersListRequest, self.git_hub_owners_list_request)
+        result["GitHubOwnersListResult"] = to_class(_GitHubOwnersListResult, self.git_hub_owners_list_result)
+        result["GitHubOwnersRequestIdResult"] = to_class(_GitHubOwnersRequestIDResult, self.git_hub_owners_request_id_result)
+        result["GitHubRepositoryAtPathRequest"] = to_class(_GitHubRepositoryAtPathRequest, self.git_hub_repository_at_path_request)
+        result["GitHubRepositoryAtPathResult"] = to_class(_GitHubRepositoryAtPathResult, self.git_hub_repository_at_path_result)
+        result["GitHubRepositoryIdentity"] = to_class(GitHubRepositoryIdentity, self.git_hub_repository_identity)
         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["GitRemoteRepository"] = to_class(_GitRemoteRepository, self.git_remote_repository)
+        result["GitReposFromRemotesRequest"] = to_class(_GitReposFromRemotesRequest, self.git_repos_from_remotes_request)
+        result["GitReposFromRemotesResult"] = to_class(_GitReposFromRemotesResult, self.git_repos_from_remotes_result)
+        result["GlobalStateLoadForConfigDirRequest"] = to_class(_GlobalStateLoadForConfigDirRequest, self.global_state_load_for_config_dir_request)
+        result["GlobalStateLoadResult"] = to_class(_GlobalStateLoadResult, self.global_state_load_result)
+        result["GlobalStateWriteKeyRequest"] = to_class(_GlobalStateWriteKeyRequest, self.global_state_write_key_request)
         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)
@@ -50874,6 +58383,8 @@ def to_dict(self) -> dict:
         result["HostExitedNotification"] = to_class(HostExitedNotification, self.host_exited_notification)
         result["HostExitReason"] = to_enum(HostExitReason, self.host_exit_reason)
         result["HostGitHubEnvironmentOptions"] = to_class(HostGitHubEnvironmentOptions, self.host_git_hub_environment_options)
+        result["HostListSessionsRequest"] = to_class(HostListSessionsRequest, self.host_list_sessions_request)
+        result["HostListSessionsResult"] = to_class(HostListSessionsResult, self.host_list_sessions_result)
         result["HostLocalServerConfiguration"] = to_class(HostLocalServerConfiguration, self.host_local_server_configuration)
         result["HostLocalServerOptions"] = to_class(HostLocalServerOptions, self.host_local_server_options)
         result["HostPublishSessionRequest"] = to_class(HostPublishSessionRequest, self.host_publish_session_request)
@@ -50885,6 +58396,7 @@ def to_dict(self) -> dict:
         result["HostSessionCreateResult"] = to_class(HostSessionCreateResult, self.host_session_create_result)
         result["HostSessionReleasedNotification"] = to_class(HostSessionReleasedNotification, self.host_session_released_notification)
         result["HostSessionReleaseRequest"] = to_class(HostSessionReleaseRequest, self.host_session_release_request)
+        result["HostSessionSummary"] = to_class(HostSessionSummary, self.host_session_summary)
         result["HostStartRequest"] = to_class(HostStartRequest, self.host_start_request)
         result["HostStartResult"] = to_class(HostStartResult, self.host_start_result)
         result["InstallationCatalogueIdentity"] = to_class(InstallationCatalogueIdentity, self.installation_catalogue_identity)
@@ -50902,9 +58414,11 @@ def to_dict(self) -> dict:
         result["InstructionDiscoveryPathKind"] = to_enum(DebugCollectLogsEntryKind, self.instruction_discovery_path_kind)
         result["InstructionDiscoveryPathList"] = to_class(InstructionDiscoveryPathList, self.instruction_discovery_path_list)
         result["InstructionDiscoveryPathLocation"] = to_enum(InstructionLocation, self.instruction_discovery_path_location)
+        result["InstructionsDiscoverRepoSourcesRequest"] = to_class(_InstructionsDiscoverRepoSourcesRequest, self.instructions_discover_repo_sources_request)
         result["InstructionsDiscoverRequest"] = to_class(InstructionsDiscoverRequest, self.instructions_discover_request)
         result["InstructionsGetDiscoveryPathsRequest"] = to_class(InstructionsGetDiscoveryPathsRequest, self.instructions_get_discovery_paths_request)
         result["InstructionsGetSourcesResult"] = to_class(InstructionsGetSourcesResult, self.instructions_get_sources_result)
+        result["InstructionsInitPromptResult"] = to_class(_InstructionsInitPromptResult, self.instructions_init_prompt_result)
         result["InstructionSource"] = to_class(InstructionSource, self.instruction_source)
         result["InstructionSourceLocation"] = to_enum(InstructionLocation, self.instruction_source_location)
         result["InstructionSourceType"] = to_enum(InstructionSourceType, self.instruction_source_type)
@@ -50924,25 +58438,60 @@ def to_dict(self) -> dict:
         result["LlmInferenceHttpResponseStartResult"] = to_class(LlmInferenceHTTPResponseStartResult, self.llm_inference_http_response_start_result)
         result["LlmInferenceSetProviderResult"] = to_class(LlmInferenceSetProviderResult, self.llm_inference_set_provider_result)
         result["LocalSessionMetadataValue"] = to_class(LocalSessionMetadataValue, self.local_session_metadata_value)
+        result["LocationPermissionsCleanupResult"] = to_class(_LocationPermissionsCleanupResult, self.location_permissions_cleanup_result)
+        result["LoggedInUser"] = to_class(_LoggedInUser, self.logged_in_user)
         result["LoginProviderKind"] = to_enum(LoginProviderKind, self.login_provider_kind)
         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["ManagedMcpServerConfig"] = to_class(ManagedMCPServerConfig, self.managed_mcp_server_config)
+        result["ManagedPermissionEvaluation"] = to_class(ManagedPermissionEvaluation, self.managed_permission_evaluation)
+        result["ManagedPermissionOperation"] = to_class(ManagedPermissionOperation, self.managed_permission_operation)
+        result["ManagedPermissionOperationKind"] = to_enum(ManagedPermissionOperationKind, self.managed_permission_operation_kind)
+        result["ManagedPermissionsEvaluateRequest"] = to_class(ManagedPermissionsEvaluateRequest, self.managed_permissions_evaluate_request)
+        result["ManagedPermissionsEvaluateResult"] = to_class(ManagedPermissionsEvaluateResult, self.managed_permissions_evaluate_result)
+        result["ManagedPermissionVerdict"] = to_enum(ManagedPermissionVerdict, self.managed_permission_verdict)
+        result["ManagedPluginRetryEntry"] = to_class(ManagedPluginRetryEntry, self.managed_plugin_retry_entry)
+        result["ManagedPluginRetryStatus"] = to_enum(ManagedPluginRetryStatus, self.managed_plugin_retry_status)
         result["ManagedSettingMeta"] = to_class(ManagedSettingMeta, self.managed_setting_meta)
+        result["ManagedSettingsApplyControlsParams"] = to_class(_ManagedSettingsApplyControlsParams, self.managed_settings_apply_controls_params)
+        result["ManagedSettingsApplyControlsResult"] = to_class(_ManagedSettingsApplyControlsResult, self.managed_settings_apply_controls_result)
+        result["ManagedSettingsBypassDisableSource"] = to_enum(_ManagedSettingsBypassDisableSource, self.managed_settings_bypass_disable_source)
+        result["ManagedSettingsBypassPolicyResolution"] = to_enum(_ManagedSettingsBypassPolicyResolution, self.managed_settings_bypass_policy_resolution)
         result["ManagedSettingsChannel"] = to_enum(ManagedSettingsChannel, self.managed_settings_channel)
         result["ManagedSettingsComposeLayer"] = to_class(ManagedSettingsComposeLayer, self.managed_settings_compose_layer)
         result["ManagedSettingsComposeRequest"] = to_class(ManagedSettingsComposeRequest, self.managed_settings_compose_request)
         result["ManagedSettingsComposeResult"] = to_class(ManagedSettingsComposeResult, self.managed_settings_compose_result)
         result["ManagedSettingsDiagnostic"] = to_class(ManagedSettingsDiagnostic, self.managed_settings_diagnostic)
         result["ManagedSettingsDiagnosticSeverity"] = to_enum(ManagedSettingsDiagnosticSeverity, self.managed_settings_diagnostic_severity)
+        result["ManagedSettingsIngestParams"] = to_class(_ManagedSettingsIngestParams, self.managed_settings_ingest_params)
+        result["ManagedSettingsIngestResult"] = to_class(_ManagedSettingsIngestResult, self.managed_settings_ingest_result)
         result["ManagedSettingsLayer"] = to_class(ManagedSettingsLayer, self.managed_settings_layer)
+        result["ManagedSettingsLoadRemoteControlParams"] = to_class(_ManagedSettingsLoadRemoteControlParams, self.managed_settings_load_remote_control_params)
+        result["ManagedSettingsLoadRemoteControlResult"] = to_class(_ManagedSettingsLoadRemoteControlResult, self.managed_settings_load_remote_control_result)
+        result["ManagedSettingsLogLevel"] = to_enum(_ManagedSettingsLogLevel, self.managed_settings_log_level)
+        result["ManagedSettingsLogMessage"] = to_class(_ManagedSettingsLogMessage, self.managed_settings_log_message)
         result["ManagedSettingsMeta"] = to_class(ManagedSettingsMeta, self.managed_settings_meta)
+        result["ManagedSettingsParseClientValueParams"] = to_class(_ManagedSettingsParseClientValueParams, self.managed_settings_parse_client_value_params)
+        result["ManagedSettingsParseClientValueResult"] = to_class(_ManagedSettingsParseClientValueResult, self.managed_settings_parse_client_value_result)
+        result["ManagedSettingsPolicyHelperAuthority"] = to_enum(_ManagedSettingsPolicyHelperAuthority, self.managed_settings_policy_helper_authority)
+        result["ManagedSettingsPolicyHelperReason"] = to_enum(_ManagedSettingsPolicyHelperReason, self.managed_settings_policy_helper_reason)
+        result["ManagedSettingsReadDeviceResult"] = to_class(_ManagedSettingsReadDeviceResult, self.managed_settings_read_device_result)
         result["ManagedSettingsReadResult"] = to_class(ManagedSettingsReadResult, self.managed_settings_read_result)
+        result["ManagedSettingsResolveBypassDisableTransitionParams"] = to_class(_ManagedSettingsResolveBypassDisableTransitionParams, self.managed_settings_resolve_bypass_disable_transition_params)
+        result["ManagedSettingsResolveBypassDisableTransitionResult"] = to_class(_ManagedSettingsResolveBypassDisableTransitionResult, self.managed_settings_resolve_bypass_disable_transition_result)
         result["ManagedSettingsResolvedData"] = to_class(ManagedSettingsResolvedData, self.managed_settings_resolved_data)
+        result["ManagedSettingsResolveDeviceForceLoginOrgsGateParams"] = to_class(_ManagedSettingsResolveDeviceForceLoginOrgsGateParams, self.managed_settings_resolve_device_force_login_orgs_gate_params)
+        result["ManagedSettingsResolveEffectiveValueParams"] = to_class(_ManagedSettingsResolveEffectiveValueParams, self.managed_settings_resolve_effective_value_params)
+        result["ManagedSettingsResolveEffectiveValueResult"] = to_class(_ManagedSettingsResolveEffectiveValueResult, self.managed_settings_resolve_effective_value_result)
         result["ManagedSettingsResolveRequest"] = to_class(ManagedSettingsResolveRequest, self.managed_settings_resolve_request)
         result["ManagedSettingsResolveResult"] = to_class(ManagedSettingsResolveResult, self.managed_settings_resolve_result)
+        result["ManagedSettingsResolveStartupPolicyParams"] = to_class(_ManagedSettingsResolveStartupPolicyParams, self.managed_settings_resolve_startup_policy_params)
+        result["ManagedSettingsResolveStartupPolicyResult"] = to_class(_ManagedSettingsResolveStartupPolicyResult, self.managed_settings_resolve_startup_policy_result)
+        result["ManagedSettingsRetainPolicyParams"] = to_class(_ManagedSettingsRetainPolicyParams, self.managed_settings_retain_policy_params)
         result["ManagedSettingsSchemaResult"] = to_class(ManagedSettingsSchemaResult, self.managed_settings_schema_result)
+        result["ManagedSettingsServerPolicyCacheMode"] = to_enum(_ManagedSettingsServerPolicyCacheMode, self.managed_settings_server_policy_cache_mode)
+        result["ManagedSettingsServerPolicyResolution"] = to_enum(_ManagedSettingsServerPolicyResolution, self.managed_settings_server_policy_resolution)
         result["ManagedSettingsValidateRequest"] = to_class(ManagedSettingsValidateRequest, self.managed_settings_validate_request)
         result["ManagedSettingsValidateResult"] = to_class(ManagedSettingsValidateResult, self.managed_settings_validate_result)
         result["ManagedSettingsValues"] = to_class(ManagedSettingsValues, self.managed_settings_values)
@@ -50987,7 +58536,10 @@ def to_dict(self) -> dict:
         result["McpConfigList"] = to_class(MCPConfigList, self.mcp_config_list)
         result["McpConfigRemoveRequest"] = to_class(MCPConfigRemoveRequest, self.mcp_config_remove_request)
         result["McpConfigUpdateRequest"] = to_class(MCPConfigUpdateRequest, self.mcp_config_update_request)
-        result["McpConfigureGitHubRequest"] = to_class(MCPConfigureGitHubRequest, self.mcp_configure_git_hub_request)
+        result["McpConfiguredServer"] = to_class(MCPConfiguredServer, self.mcp_configured_server)
+        result["McpConfiguredServerList"] = to_class(MCPConfiguredServerList, self.mcp_configured_server_list)
+        result["McpConfiguredServerState"] = to_class(MCPConfiguredServerState, self.mcp_configured_server_state)
+        result["McpConfigureGitHubRequest"] = to_class(_MCPConfigureGitHubRequest, self.mcp_configure_git_hub_request)
         result["McpConfigureGitHubResult"] = to_class(MCPConfigureGitHubResult, self.mcp_configure_git_hub_result)
         result["McpDiagnosticDetails"] = to_class(MCPDiagnosticDetails, self.mcp_diagnostic_details)
         result["McpDiagnosticDirection"] = to_enum(MCPDiagnosticDirection, self.mcp_diagnostic_direction)
@@ -51025,6 +58577,7 @@ def to_dict(self) -> dict:
         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["McpListBuiltinServerNamesResult"] = to_class(_MCPListBuiltinServerNamesResult, self.mcp_list_builtin_server_names_result)
         result["McpListToolsRequest"] = to_class(MCPListToolsRequest, self.mcp_list_tools_request)
         result["McpListToolsResult"] = to_class(MCPListToolsResult, self.mcp_list_tools_result)
         result["McpOauthAuthenticationStateChangedRequest"] = to_class(MCPOauthAuthenticationStateChangedRequest, self.mcp_oauth_authentication_state_changed_request)
@@ -51091,9 +58644,14 @@ def to_dict(self) -> dict:
         result["McpPromptsGetResult"] = to_class(MCPPromptsGetResult, self.mcp_prompts_get_result)
         result["McpPromptsListRequest"] = to_class(MCPPromptsListRequest, self.mcp_prompts_list_request)
         result["McpPromptsListResult"] = to_class(MCPPromptsListResult, self.mcp_prompts_list_result)
-        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["McpRegisterExternalClientRequest"] = to_class(_MCPRegisterExternalClientRequest, self.mcp_register_external_client_request)
+        result["McpRegistryCancelRequest"] = to_class(_MCPRegistryCancelRequest, self.mcp_registry_cancel_request)
+        result["McpRegistryCancelResult"] = to_class(_MCPRegistryCancelResult, self.mcp_registry_cancel_result)
+        result["McpRegistryRequestIdResult"] = to_class(_MCPRegistryRequestIDResult, self.mcp_registry_request_id_result)
+        result["McpRegistrySearchRequest"] = to_class(_MCPRegistrySearchRequest, self.mcp_registry_search_request)
+        result["McpRegistrySearchResult"] = to_class(_MCPRegistrySearchResult, self.mcp_registry_search_result)
+        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)
         result["McpResourceAnnotations"] = to_class(MCPResourceAnnotations, self.mcp_resource_annotations)
@@ -51126,8 +58684,8 @@ def to_dict(self) -> dict:
         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["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)
@@ -51137,6 +58695,8 @@ def to_dict(self) -> dict:
         result["McpSetEnvValueModeDetails"] = to_enum(MCPSetEnvValueModeDetails, self.mcp_set_env_value_mode_details)
         result["McpSetEnvValueModeParams"] = to_class(MCPSetEnvValueModeParams, self.mcp_set_env_value_mode_params)
         result["McpSetEnvValueModeResult"] = to_class(MCPSetEnvValueModeResult, self.mcp_set_env_value_mode_result)
+        result["McpShouldExcludeGitHubToolsRequest"] = to_class(_MCPShouldExcludeGitHubToolsRequest, self.mcp_should_exclude_git_hub_tools_request)
+        result["McpShouldExcludeGitHubToolsResult"] = to_class(_MCPShouldExcludeGitHubToolsResult, self.mcp_should_exclude_git_hub_tools_result)
         result["McpSourceFile"] = to_class(MCPSourceFile, self.mcp_source_file)
         result["McpSourcePlugin"] = to_class(MCPSourcePlugin, self.mcp_source_plugin)
         result["McpSourceRef"] = to_class(MCPSourceRef, self.mcp_source_ref)
@@ -51148,7 +58708,7 @@ def to_dict(self) -> dict:
         result["McpToolUi"] = to_class(MCPToolUI, self.mcp_tool_ui)
         result["McpToolUiVisibility"] = to_enum(MCPToolUIVisibility, self.mcp_tool_ui_visibility)
         result["McpUninstallPlan"] = to_class(MCPUninstallPlan, self.mcp_uninstall_plan)
-        result["McpUnregisterExternalClientRequest"] = to_class(MCPUnregisterExternalClientRequest, self.mcp_unregister_external_client_request)
+        result["McpUnregisterExternalClientRequest"] = to_class(_MCPUnregisterExternalClientRequest, self.mcp_unregister_external_client_request)
         result["MemoryConfiguration"] = to_class(MemoryConfiguration, self.memory_configuration)
         result["MetadataContextAttributionResult"] = to_class(MetadataContextAttributionResult, self.metadata_context_attribution_result)
         result["MetadataContextHeaviestMessagesRequest"] = to_class(MetadataContextHeaviestMessagesRequest, self.metadata_context_heaviest_messages_request)
@@ -51182,6 +58742,10 @@ def to_dict(self) -> dict:
         result["ModelCapabilitiesOverrideLimitsVision"] = to_class(ModelCapabilitiesOverrideLimitsVision, self.model_capabilities_override_limits_vision)
         result["ModelCapabilitiesOverrideSupports"] = to_class(ModelCapabilitiesOverrideSupports, self.model_capabilities_override_supports)
         result["ModelCapabilitiesSupports"] = to_class(ModelCapabilitiesSupports, self.model_capabilities_supports)
+        result["ModelClearStartupSeedRequest"] = to_class(_ModelClearStartupSeedRequest, self.model_clear_startup_seed_request)
+        result["ModelClearStartupSeedResult"] = to_class(_ModelClearStartupSeedResult, self.model_clear_startup_seed_result)
+        result["ModelGetReasoningSummariesRequest"] = to_class(ModelGetReasoningSummariesRequest, self.model_get_reasoning_summaries_request)
+        result["ModelGetReasoningSummariesResult"] = to_class(ModelGetReasoningSummariesResult, self.model_get_reasoning_summaries_result)
         result["ModelList"] = to_class(ModelList, self.model_list)
         result["ModelListRequest"] = self.model_list_request
         result["ModelMessage"] = to_class(ModelMessage, self.model_message)
@@ -51206,14 +58770,12 @@ def to_dict(self) -> dict:
         result["ModelProviderGetStatusRequest"] = to_class(ModelProviderGetStatusRequest, self.model_provider_get_status_request)
         result["ModelProviderInstance"] = to_class(ModelProviderInstance, self.model_provider_instance)
         result["ModelProviderInstanceReference"] = to_class(ModelProviderInstanceReference, self.model_provider_instance_reference)
-        result["ModelProviderKind"] = to_enum(ModelProviderKind, self.model_provider_kind)
         result["ModelProviderModelsListRequest"] = to_class(ModelProviderModelsListRequest, self.model_provider_models_list_request)
         result["ModelProviderOperationOutcome"] = to_class(ModelProviderOperationOutcome, self.model_provider_operation_outcome)
         result["ModelProviderOperationOutcomeCode"] = to_enum(ModelProviderOperationOutcomeCode, self.model_provider_operation_outcome_code)
         result["ModelProviderPrepareConfigurationRequest"] = to_class(ModelProviderPrepareConfigurationRequest, self.model_provider_prepare_configuration_request)
         result["ModelProviderProvenance"] = to_class(ModelProviderProvenance, self.model_provider_provenance)
         result["ModelProviderProvenanceSource"] = to_enum(ModelProviderProvenanceSource, self.model_provider_provenance_source)
-        result["ModelProviderRef"] = to_class(ModelProviderRef, self.model_provider_ref)
         result["ModelProviderStatus"] = to_class(ModelProviderStatus, self.model_provider_status)
         result["ModelProviderWarning"] = to_class(ModelProviderWarning, self.model_provider_warning)
         result["ModelSetAllowedModelsRequest"] = to_class(ModelSetAllowedModelsRequest, self.model_set_allowed_models_request)
@@ -51245,6 +58807,8 @@ def to_dict(self) -> dict:
         result["OptionsUpdateEnvValueMode"] = to_enum(MCPSetEnvValueModeDetails, self.options_update_env_value_mode)
         result["OptionsUpdateReasoningSummary"] = to_enum(ReasoningSummary, self.options_update_reasoning_summary)
         result["OptionsUpdateToolFilterPrecedence"] = to_enum(OptionsUpdateToolFilterPrecedence, self.options_update_tool_filter_precedence)
+        result["PendingExternalToolRequest"] = to_class(PendingExternalToolRequest, self.pending_external_tool_request)
+        result["PendingExternalToolRequestList"] = to_class(PendingExternalToolRequestList, self.pending_external_tool_request_list)
         result["PendingPermissionRequest"] = to_class(PendingPermissionRequest, self.pending_permission_request)
         result["PendingPermissionRequestList"] = to_class(PendingPermissionRequestList, self.pending_permission_request_list)
         result["PermissionDecision"] = (self.permission_decision).to_dict()
@@ -51317,6 +58881,8 @@ def to_dict(self) -> dict:
         result["PermissionsConfigureAdditionalContentExclusionPolicyScope"] = to_enum(AdditionalContentExclusionPolicyScope, self.permissions_configure_additional_content_exclusion_policy_scope)
         result["PermissionsConfigureParams"] = to_class(PermissionsConfigureParams, self.permissions_configure_params)
         result["PermissionsConfigureResult"] = to_class(PermissionsConfigureResult, self.permissions_configure_result)
+        result["PermissionsEvaluateManagedPolicyParams"] = to_class(_PermissionsEvaluateManagedPolicyParams, self.permissions_evaluate_managed_policy_params)
+        result["PermissionsEvaluateManagedPolicyResult"] = to_class(PermissionsEvaluateManagedPolicyResult, self.permissions_evaluate_managed_policy_result)
         result["PermissionsFolderTrustAddTrustedResult"] = to_class(PermissionsFolderTrustAddTrustedResult, self.permissions_folder_trust_add_trusted_result)
         result["PermissionsGetModeRequest"] = to_class(PermissionsGetModeRequest, self.permissions_get_mode_request)
         result["PermissionsGetModeResult"] = to_class(PermissionsGetModeResult, self.permissions_get_mode_result)
@@ -51353,6 +58919,8 @@ def to_dict(self) -> dict:
         result["PermissionsUrlsSetUnrestrictedModeResult"] = to_class(PermissionsUrlsSetUnrestrictedModeResult, self.permissions_urls_set_unrestricted_mode_result)
         result["PermissionUrlsConfig"] = to_class(PermissionUrlsConfig, self.permission_urls_config)
         result["PermissionUrlsSetUnrestrictedModeParams"] = to_class(PermissionUrlsSetUnrestrictedModeParams, self.permission_urls_set_unrestricted_mode_params)
+        result["PersistenceWriteRawJsonLockedRequest"] = to_class(PersistenceWriteRawJSONLockedRequest, self.persistence_write_raw_json_locked_request)
+        result["PersistenceWriteRawJsonLockedResult"] = to_class(PersistenceWriteRawJSONLockedResult, self.persistence_write_raw_json_locked_result)
         result["PingRequest"] = to_class(PingRequest, self.ping_request)
         result["PingResult"] = to_class(PingResult, self.ping_result)
         result["PlanReadResult"] = to_class(PlanReadResult, self.plan_read_result)
@@ -51471,6 +59039,8 @@ def to_dict(self) -> dict:
         result["QueueUpdateTextResult"] = to_class(QueueUpdateTextResult, self.queue_update_text_result)
         result["QueueWithdrawMessageRequest"] = to_class(QueueWithdrawMessageRequest, self.queue_withdraw_message_request)
         result["QueueWithdrawMessageResult"] = to_class(QueueWithdrawMessageResult, self.queue_withdraw_message_result)
+        result["QuotaTakeWarningsResult"] = from_list(lambda x: to_class(QuotaWarningProjection, x), self.quota_take_warnings_result)
+        result["QuotaWarningProjection"] = to_class(QuotaWarningProjection, self.quota_warning_projection)
         result["RegisterEventInterestParams"] = to_class(RegisterEventInterestParams, self.register_event_interest_params)
         result["RegisterEventInterestResult"] = to_class(RegisterEventInterestResult, self.register_event_interest_result)
         result["ReleaseEventInterestParams"] = to_class(ReleaseEventInterestParams, self.release_event_interest_params)
@@ -51495,7 +59065,17 @@ def to_dict(self) -> dict:
         result["RemoteSessionMetadataValue"] = to_class(RemoteSessionMetadataValue, self.remote_session_metadata_value)
         result["RemoteSessionMode"] = to_enum(RemoteSessionMode, self.remote_session_mode)
         result["RemoteSessionRepository"] = to_class(RemoteSessionRepository, self.remote_session_repository)
+        result["RepoSettingsEditRequest"] = to_class(_RepoSettingsEditRequest, self.repo_settings_edit_request)
+        result["RepoSettingsEditScope"] = to_enum(_RepoSettingsEditScope, self.repo_settings_edit_scope)
+        result["RepoSettingsReadRawRequest"] = to_class(_RepoSettingsReadRawRequest, self.repo_settings_read_raw_request)
+        result["RepoSettingsReadRawResult"] = to_class(_RepoSettingsReadRawResult, self.repo_settings_read_raw_result)
+        result["RepoSettingsWriteAllRequest"] = to_class(_RepoSettingsWriteAllRequest, self.repo_settings_write_all_request)
+        result["RepoSettingsWriteKeyRequest"] = to_class(_RepoSettingsWriteKeyRequest, self.repo_settings_write_key_request)
         result["ResponseFormat"] = to_class(ResponseFormat, self.response_format)
+        result["SandboxApplyDefaultsRequest"] = to_class(SandboxApplyDefaultsRequest, self.sandbox_apply_defaults_request)
+        result["SandboxCheckEnforcementCommandResult"] = from_bool(self.sandbox_check_enforcement_command_result)
+        result["SandboxCheckPlatformSupportResult"] = from_bool(self.sandbox_check_platform_support_result)
+        result["SandboxCheckWindowsHostLoopbackSupportResult"] = from_bool(self.sandbox_check_windows_host_loopback_support_result)
         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)
@@ -51507,20 +59087,44 @@ def to_dict(self) -> dict:
         result["SandboxConfigUserPolicyNetworkProxy"] = to_class(SandboxConfigUserPolicyNetworkProxy, self.sandbox_config_user_policy_network_proxy)
         result["SandboxConfigUserPolicySeatbelt"] = to_class(SandboxConfigUserPolicySeatbelt, self.sandbox_config_user_policy_seatbelt)
         result["SandboxCredentialsConfig"] = to_class(SandboxCredentialsConfig, self.sandbox_credentials_config)
+        result["SandboxCredentialSuggestion"] = to_class(SandboxCredentialSuggestion, self.sandbox_credential_suggestion)
+        result["SandboxCredentialSuggestionsResult"] = to_class(SandboxCredentialSuggestionsResult, self.sandbox_credential_suggestions_result)
         result["SandboxDisableForSessionRequest"] = to_class(SandboxDisableForSessionRequest, self.sandbox_disable_for_session_request)
         result["SandboxDisableForSessionResult"] = to_class(SandboxDisableForSessionResult, self.sandbox_disable_for_session_result)
+        result["SandboxDocsUrlResult"] = to_class(SandboxDocsURLResult, self.sandbox_docs_url_result)
+        result["SandboxEffectiveForOptionalParams"] = to_class(_SandboxEffectiveForOptionalParams, self.sandbox_effective_for_optional_params)
+        result["SandboxEffectiveForOptionalResult"] = to_class(_SandboxEffectiveForOptionalResult, self.sandbox_effective_for_optional_result)
+        result["SandboxEnforcementCommandAllowedParams"] = to_class(_SandboxEnforcementCommandAllowedParams, self.sandbox_enforcement_command_allowed_params)
         result["SandboxEnforcementStatus"] = to_class(SandboxEnforcementStatus, self.sandbox_enforcement_status)
+        result["SandboxFilterPickerCandidatesParams"] = to_class(_SandboxFilterPickerCandidatesParams, self.sandbox_filter_picker_candidates_params)
+        result["SandboxFilterPickerCandidatesResult"] = to_class(_SandboxFilterPickerCandidatesResult, self.sandbox_filter_picker_candidates_result)
+        result["SandboxGetUnsupportedMessageResult"] = from_str(self.sandbox_get_unsupported_message_result)
+        result["SandboxGetUnsupportedSettingDisabledNoticeResult"] = from_str(self.sandbox_get_unsupported_setting_disabled_notice_result)
         result["SandboxGrantPathForRequestRequest"] = to_class(SandboxGrantPathForRequestRequest, self.sandbox_grant_path_for_request_request)
         result["SandboxGrantPathForRequestResult"] = to_class(SandboxGrantPathForRequestResult, self.sandbox_grant_path_for_request_result)
         result["SandboxHostCapability"] = to_class(SandboxHostCapability, self.sandbox_host_capability)
         result["SandboxHostCapabilityName"] = from_str(self.sandbox_host_capability_name)
         result["SandboxHostSupport"] = to_class(SandboxHostSupport, self.sandbox_host_support)
         result["SandboxMaskedEnvVar"] = to_class(SandboxMaskedEnvVar, self.sandbox_masked_env_var)
+        result["SandboxPickerCandidate"] = to_class(_SandboxPickerCandidate, self.sandbox_picker_candidate)
+        result["SandboxPreparePickerPolicyParams"] = to_class(_SandboxPreparePickerPolicyParams, self.sandbox_prepare_picker_policy_params)
+        result["SandboxPreparePickerPolicyResult"] = to_class(_SandboxPreparePickerPolicyResult, self.sandbox_prepare_picker_policy_result)
+        result["SandboxProxyCaCheckInstallationSupportResult"] = from_bool(self.sandbox_proxy_ca_check_installation_support_result)
+        result["SandboxProxyCaCheckRelevanceResult"] = from_bool(self.sandbox_proxy_ca_check_relevance_result)
         result["SandboxProxyCaCreateResult"] = to_class(SandboxProxyCACreateResult, self.sandbox_proxy_ca_create_result)
         result["SandboxProxyCaRequest"] = to_class(SandboxProxyCARequest, self.sandbox_proxy_ca_request)
         result["SandboxProxyCaState"] = to_enum(SandboxProxyCAState, self.sandbox_proxy_ca_state)
         result["SandboxProxyCaStatus"] = to_class(SandboxProxyCAStatus, self.sandbox_proxy_ca_status)
+        result["SandboxProxySecretGetResult"] = to_class(SandboxProxySecretGetResult, self.sandbox_proxy_secret_get_result)
+        result["SandboxProxySecretLocation"] = to_class(SandboxProxySecretLocation, self.sandbox_proxy_secret_location)
+        result["SandboxProxySecretSaveRequest"] = to_class(SandboxProxySecretSaveRequest, self.sandbox_proxy_secret_save_request)
+        result["SandboxProxySecretSaveResult"] = to_class(SandboxProxySecretSaveResult, self.sandbox_proxy_secret_save_result)
+        result["SandboxResolveFlooredConfigParams"] = to_class(_SandboxResolveFlooredConfigParams, self.sandbox_resolve_floored_config_params)
+        result["SandboxResolveFlooredConfigResult"] = to_class(SandboxResolveFlooredConfigResult, self.sandbox_resolve_floored_config_result)
         result["SandboxSessionChange"] = to_enum(SandboxSessionChange, self.sandbox_session_change)
+        result["SandboxSettingsApplyDefaultsResult"] = from_dict(lambda x: x, self.sandbox_settings_apply_defaults_result)
+        result["SandboxUnsupportedStartupNoticeParams"] = to_class(_SandboxUnsupportedStartupNoticeParams, self.sandbox_unsupported_startup_notice_params)
+        result["SandboxUnsupportedStartupNoticeResult"] = to_class(_SandboxUnsupportedStartupNoticeResult, self.sandbox_unsupported_startup_notice_result)
         result["ScheduleAddAtRequest"] = to_class(ScheduleAddAtRequest, self.schedule_add_at_request)
         result["ScheduleAddCronRequest"] = to_class(ScheduleAddCronRequest, self.schedule_add_cron_request)
         result["ScheduleAddRequest"] = to_class(ScheduleAddRequest, self.schedule_add_request)
@@ -51558,6 +59162,7 @@ def to_dict(self) -> dict:
         result["SessionCapability"] = to_enum(SessionCapability, self.session_capability)
         result["SessionCommandsListRequest"] = to_class(SessionCommandsListRequest, self.session_commands_list_request)
         result["SessionCompletionItem"] = to_class(SessionCompletionItem, self.session_completion_item)
+        result["SessionConnectedIdeInfo"] = to_class(SessionConnectedIDEInfo, self.session_connected_ide_info)
         result["SessionContext"] = to_class(SessionContext, self.session_context)
         result["SessionContextHostType"] = to_enum(HostType, self.session_context_host_type)
         result["SessionEnrichMetadataResult"] = to_class(SessionEnrichMetadataResult, self.session_enrich_metadata_result)
@@ -51628,8 +59233,11 @@ def to_dict(self) -> dict:
         result["SessionMcpOauthCancelLoginResult"] = to_class(SessionMCPOauthCancelLoginResult, self.session_mcp_oauth_cancel_login_result)
         result["SessionMcpOauthPrepareLoginRequest"] = to_class(SessionMCPOauthPrepareLoginRequest, self.session_mcp_oauth_prepare_login_request)
         result["SessionMcpOauthPrepareLoginResult"] = to_class(SessionMCPOauthPrepareLoginResult, self.session_mcp_oauth_prepare_login_result)
+        result["SessionMcpSetConnectedIdeInfoParams"] = to_class(SessionMCPSetConnectedIDEInfoParams, self.session_mcp_set_connected_ide_info_params)
         result["SessionMetadataSnapshot"] = to_class(SessionMetadataSnapshot, self.session_metadata_snapshot)
         result["SessionMode"] = to_enum(SessionMode, self.session_mode)
+        result["SessionModelClearStartupSeedRequest"] = to_class(SessionModelClearStartupSeedRequest, self.session_model_clear_startup_seed_request)
+        result["SessionModelClearStartupSeedResult"] = to_class(SessionModelClearStartupSeedResult, self.session_model_clear_startup_seed_result)
         result["SessionModelList"] = to_class(SessionModelList, self.session_model_list)
         result["SessionModelListRequest"] = to_class(SessionModelListRequest, self.session_model_list_request)
         result["SessionModelPriceCategory"] = to_class(SessionModelPriceCategory, self.session_model_price_category)
@@ -51647,14 +59255,25 @@ def to_dict(self) -> dict:
         result["SessionPluginsInstallRequest"] = to_class(SessionPluginsInstallRequest, self.session_plugins_install_request)
         result["SessionPluginsMarketplacesRefreshRequest"] = to_class(SessionPluginsMarketplacesRefreshRequest, self.session_plugins_marketplaces_refresh_request)
         result["SessionPluginsReloadRequest"] = to_class(SessionPluginsReloadRequest, self.session_plugins_reload_request)
+        result["SessionPluginsRetryManagedRequest"] = to_class(SessionPluginsRetryManagedRequest, self.session_plugins_retry_managed_request)
+        result["SessionPluginsRetryManagedResult"] = to_class(SessionPluginsRetryManagedResult, self.session_plugins_retry_managed_result)
         result["SessionProviderGetEndpointRequest"] = to_class(SessionProviderGetEndpointRequest, self.session_provider_get_endpoint_request)
         result["SessionPruneResult"] = to_class(SessionPruneResult, self.session_prune_result)
+        result["SessionQuotaDelegateWarning"] = to_class(SessionQuotaDelegateWarning, self.session_quota_delegate_warning)
+        result["SessionQuotaGetResult"] = to_class(SessionQuotaGetResult, self.session_quota_get_result)
+        result["SessionQuotaPlanTier"] = to_enum(SessionQuotaPlanTier, self.session_quota_plan_tier)
+        result["SessionQuotaProjection"] = to_class(SessionQuotaProjection, self.session_quota_projection)
+        result["SessionQuotaRefreshResult"] = to_class(SessionQuotaRefreshResult, self.session_quota_refresh_result)
+        result["SessionQuotaSnapshot"] = to_class(SessionQuotaSnapshot, self.session_quota_snapshot)
+        result["SessionQuotaTakeWarningsResult"] = from_list(lambda x: to_class(QuotaWarningProjection, x), self.session_quota_take_warnings_result)
         result["SessionsBulkDeleteRequest"] = to_class(SessionsBulkDeleteRequest, self.sessions_bulk_delete_request)
         result["SessionsCheckInUseRequest"] = to_class(SessionsCheckInUseRequest, self.sessions_check_in_use_request)
         result["SessionsCheckInUseResult"] = to_class(SessionsCheckInUseResult, self.sessions_check_in_use_result)
         result["SessionsClientMetadataEntry"] = to_class(SessionsClientMetadataEntry, self.sessions_client_metadata_entry)
         result["SessionsCloseRequest"] = to_class(SessionsCloseRequest, self.sessions_close_request)
         result["SessionsCloseResult"] = to_class(SessionsCloseResult, self.sessions_close_result)
+        result["SessionsCreateWorkspaceRequest"] = to_class(SessionsCreateWorkspaceRequest, self.sessions_create_workspace_request)
+        result["SessionsCreateWorkspaceResult"] = to_class(SessionsCreateWorkspaceResult, self.sessions_create_workspace_result)
         result["SessionsDeleteRequest"] = to_class(SessionsDeleteRequest, self.sessions_delete_request)
         result["SessionsEnrichMetadataRequest"] = to_class(SessionsEnrichMetadataRequest, self.sessions_enrich_metadata_request)
         result["SessionSetCredentialsParams"] = to_class(SessionSetCredentialsParams, self.session_set_credentials_params)
@@ -51692,6 +59311,8 @@ def to_dict(self) -> dict:
         result["SessionsListNonEmptySessionIdsResult"] = to_class(SessionsListNonEmptySessionIDSResult, self.sessions_list_non_empty_session_ids_result)
         result["SessionsListRequest"] = to_class(SessionsListRequest, self.sessions_list_request)
         result["SessionsLoadDeferredRepoHooksRequest"] = to_class(SessionsLoadDeferredRepoHooksRequest, self.sessions_load_deferred_repo_hooks_request)
+        result["SessionsLoadWorkspaceRequest"] = to_class(SessionsLoadWorkspaceRequest, self.sessions_load_workspace_request)
+        result["SessionsLoadWorkspaceResult"] = to_class(SessionsLoadWorkspaceResult, self.sessions_load_workspace_result)
         result["SessionsOpenAttach"] = to_class(SessionsOpenAttach, self.sessions_open_attach)
         result["SessionsOpenCloud"] = to_class(SessionsOpenCloud, self.sessions_open_cloud)
         result["SessionsOpenCreate"] = to_class(SessionsOpenCreate, self.sessions_open_create)
@@ -51719,15 +59340,22 @@ def to_dict(self) -> dict:
         result["SessionsStartRemoteControlRequest"] = to_class(SessionsStartRemoteControlRequest, self.sessions_start_remote_control_request)
         result["SessionsStopRemoteControlRequest"] = to_class(SessionsStopRemoteControlRequest, self.sessions_stop_remote_control_request)
         result["SessionsTransferRemoteControlRequest"] = to_class(SessionsTransferRemoteControlRequest, self.sessions_transfer_remote_control_request)
+        result["SessionsUpdateWorkspaceFieldsRequest"] = to_class(SessionsUpdateWorkspaceFieldsRequest, self.sessions_update_workspace_fields_request)
+        result["SessionsUpdateWorkspaceFieldsResult"] = to_class(SessionsUpdateWorkspaceFieldsResult, self.sessions_update_workspace_fields_result)
         result["SessionTelemetryEngagement"] = to_class(SessionTelemetryEngagement, self.session_telemetry_engagement)
         result["SessionUpdateOptionsParams"] = to_class(SessionUpdateOptionsParams, self.session_update_options_params)
         result["SessionUpdateOptionsResult"] = to_class(SessionUpdateOptionsResult, self.session_update_options_result)
+        result["SessionUsageSetCodeChangesRequest"] = to_class(SessionUsageSetCodeChangesRequest, self.session_usage_set_code_changes_request)
         result["SessionVisibilityStatus"] = to_enum(SessionVisibilityStatus, self.session_visibility_status)
         result["SessionWorkflowPauseAtCheckpointResult"] = to_class(SessionWorkflowPauseAtCheckpointResult, self.session_workflow_pause_at_checkpoint_result)
         result["SessionWorkingDirectoryContext"] = to_class(SessionWorkingDirectoryContext, self.session_working_directory_context)
         result["SessionWorkingDirectoryContextHostType"] = to_enum(HostType, self.session_working_directory_context_host_type)
+        result["SessionWorkingDirectoryContextWithClient"] = to_class(SessionWorkingDirectoryContextWithClient, self.session_working_directory_context_with_client)
         result["SettableAuthInfo"] = (self.settable_auth_info).to_dict()
         result["SettableTokenAuthInfo"] = to_class(SettableTokenAuthInfo, self.settable_token_auth_info)
+        result["SettingsEditOperation"] = to_enum(_SettingsEditOperation, self.settings_edit_operation)
+        result["SettingsEditResult"] = to_class(_SettingsEditResult, self.settings_edit_result)
+        result["SettingsEditStatus"] = to_enum(_SettingsEditStatus, self.settings_edit_status)
         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)
@@ -51800,6 +59428,8 @@ def to_dict(self) -> dict:
         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["StaffLogLevelMigrationStatus"] = to_enum(StaffLogLevelMigrationStatus, self.staff_log_level_migration_status)
+        result["StaffUpdateChannelMigrationStatus"] = to_enum(StaffUpdateChannelMigrationStatus, self.staff_update_channel_migration_status)
         result["SubagentSettingsEntry"] = to_class(SubagentSettingsEntry, self.subagent_settings_entry)
         result["SubagentSettingsEntryContextTier"] = to_enum(SubagentSettingsEntryContextTier, self.subagent_settings_entry_context_tier)
         result["SystemMessageBlock"] = to_class(SystemMessageBlock, self.system_message_block)
@@ -51860,6 +59490,7 @@ def to_dict(self) -> dict:
         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["ToolsListPendingRequestsRequest"] = to_class(ToolsListPendingRequestsRequest, self.tools_list_pending_requests_request)
         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)
@@ -51909,19 +59540,59 @@ def to_dict(self) -> dict:
         result["UnsupportedEnqueueCommandResult"] = to_class(UnsupportedEnqueueCommandResult, self.unsupported_enqueue_command_result)
         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)
-        result["UsageMetricsModelMetricTokenDetail"] = to_class(UsageMetricsModelMetricTokenDetail, self.usage_metrics_model_metric_token_detail)
-        result["UsageMetricsModelMetricUsage"] = to_class(UsageMetricsModelMetricUsage, self.usage_metrics_model_metric_usage)
-        result["UsageMetricsTokenDetail"] = to_class(UsageMetricsTokenDetail, self.usage_metrics_token_detail)
+        result["UsageSetCodeChangesRequest"] = to_class(_UsageSetCodeChangesRequest, self.usage_set_code_changes_request)
         result["UserAuthInfo"] = to_class(UserAuthInfo, self.user_auth_info)
         result["UserRequestedShellCommandResult"] = to_class(UserRequestedShellCommandResult, self.user_requested_shell_command_result)
         result["UserSettingMetadata"] = to_class(UserSettingMetadata, self.user_setting_metadata)
+        result["UserSettingsApplyTopKeyRequest"] = to_class(UserSettingsApplyTopKeyRequest, self.user_settings_apply_top_key_request)
+        result["UserSettingsApplyTopKeyResult"] = to_class(UserSettingsApplyTopKeyResult, self.user_settings_apply_top_key_result)
+        result["UserSettingsBuildRuntimeRequest"] = to_class(_UserSettingsBuildRuntimeRequest, self.user_settings_build_runtime_request)
+        result["UserSettingsBuildRuntimeResult"] = from_dict(lambda x: x, self.user_settings_build_runtime_result)
+        result["UserSettingsEditRequest"] = to_class(_UserSettingsEditRequest, self.user_settings_edit_request)
+        result["UserSettingsGetPathsRequest"] = to_class(UserSettingsGetPathsRequest, self.user_settings_get_paths_request)
+        result["UserSettingsGetPathsResult"] = to_class(UserSettingsGetPathsResult, self.user_settings_get_paths_result)
         result["UserSettingsGetResult"] = to_class(UserSettingsGetResult, self.user_settings_get_result)
+        result["UserSettingsGovernanceKeysResult"] = to_class(UserSettingsGovernanceKeysResult, self.user_settings_governance_keys_result)
+        result["UserSettingsHostContext"] = to_class(UserSettingsHostContext, self.user_settings_host_context)
+        result["UserSettingsLoadAndMergeRepoRequest"] = to_class(_UserSettingsLoadAndMergeRepoRequest, self.user_settings_load_and_merge_repo_request)
+        result["UserSettingsLoadAndMergeRepoResult"] = to_class(_UserSettingsLoadAndMergeRepoResult, self.user_settings_load_and_merge_repo_result)
+        result["UserSettingsLoadForConfigDirRequest"] = to_class(_UserSettingsLoadForConfigDirRequest, self.user_settings_load_for_config_dir_request)
+        result["UserSettingsLoadForConfigDirResult"] = from_dict(lambda x: x, self.user_settings_load_for_config_dir_result)
+        result["UserSettingsLoadForEditResult"] = to_class(UserSettingsLoadForEditResult, self.user_settings_load_for_edit_result)
+        result["UserSettingsLoadRepoRequest"] = to_class(UserSettingsLoadRepoRequest, self.user_settings_load_repo_request)
+        result["UserSettingsLoadRepoResult"] = to_class(UserSettingsLoadRepoResult, self.user_settings_load_repo_result)
+        result["UserSettingsLoadWithWarningResult"] = to_class(UserSettingsLoadWithWarningResult, self.user_settings_load_with_warning_result)
+        result["UserSettingsMergeManagedAndUserParams"] = to_class(_UserSettingsMergeManagedAndUserParams, self.user_settings_merge_managed_and_user_params)
+        result["UserSettingsMergeManagedAndUserResult"] = to_class(UserSettingsMergeManagedAndUserResult, self.user_settings_merge_managed_and_user_result)
+        result["UserSettingsMergeRepoValueParams"] = to_class(_UserSettingsMergeRepoValueParams, self.user_settings_merge_repo_value_params)
+        result["UserSettingsMergeRepoValueResult"] = to_class(UserSettingsMergeRepoValueResult, self.user_settings_merge_repo_value_result)
+        result["UserSettingsMigrateObsoleteOnDiskRequest"] = to_class(_UserSettingsMigrateObsoleteOnDiskRequest, self.user_settings_migrate_obsolete_on_disk_request)
+        result["UserSettingsMigrateObsoleteOnDiskResult"] = to_class(_UserSettingsMigrateObsoleteOnDiskResult, self.user_settings_migrate_obsolete_on_disk_result)
+        result["UserSettingsMigrateObsoleteOnDiskStatus"] = to_enum(_UserSettingsMigrateObsoleteOnDiskStatus, self.user_settings_migrate_obsolete_on_disk_status)
+        result["UserSettingsMigrateStaffLogLevelOnceRequest"] = to_class(_UserSettingsMigrateStaffLogLevelOnceRequest, self.user_settings_migrate_staff_log_level_once_request)
+        result["UserSettingsMigrateStaffLogLevelOnceResult"] = to_class(_UserSettingsMigrateStaffLogLevelOnceResult, self.user_settings_migrate_staff_log_level_once_result)
+        result["UserSettingsMigrateStaffUpdateChannelOnceResult"] = to_class(_UserSettingsMigrateStaffUpdateChannelOnceResult, self.user_settings_migrate_staff_update_channel_once_result)
+        result["UserSettingsNormalizeRequest"] = to_class(UserSettingsNormalizeRequest, self.user_settings_normalize_request)
+        result["UserSettingsNormalizeResult"] = to_class(UserSettingsNormalizeResult, self.user_settings_normalize_result)
+        result["UserSettingsPathResult"] = to_class(UserSettingsPathResult, self.user_settings_path_result)
+        result["UserSettingsProblem"] = to_class(UserSettingsProblem, self.user_settings_problem)
+        result["UserSettingsProblemLocation"] = to_class(UserSettingsProblemLocation, self.user_settings_problem_location)
+        result["UserSettingsProblemSource"] = to_class(UserSettingsProblemSource, self.user_settings_problem_source)
+        result["UserSettingsProblemsRequest"] = to_class(UserSettingsProblemsRequest, self.user_settings_problems_request)
+        result["UserSettingsProblemsResult"] = to_class(UserSettingsProblemsResult, self.user_settings_problems_result)
+        result["UserSettingsResetStaffModelSelectionOnceRequest"] = to_class(_UserSettingsResetStaffModelSelectionOnceRequest, self.user_settings_reset_staff_model_selection_once_request)
+        result["UserSettingsResetStaffModelSelectionOnceResult"] = to_class(_UserSettingsResetStaffModelSelectionOnceResult, self.user_settings_reset_staff_model_selection_once_result)
+        result["UserSettingsSetHookDisabledRequest"] = to_class(_UserSettingsSetHookDisabledRequest, self.user_settings_set_hook_disabled_request)
+        result["UserSettingsSetHookDisabledResult"] = to_class(_UserSettingsSetHookDisabledResult, self.user_settings_set_hook_disabled_result)
         result["UserSettingsSetRequest"] = to_class(UserSettingsSetRequest, self.user_settings_set_request)
-        result["UserSettingsSetResult"] = to_class(UserSettingsSetResult, self.user_settings_set_result)
+        result["UserSettingsUnknownKeysWarningRequest"] = to_class(_UserSettingsUnknownKeysWarningRequest, self.user_settings_unknown_keys_warning_request)
+        result["UserSettingsUnknownKeysWarningResult"] = to_class(_UserSettingsUnknownKeysWarningResult, self.user_settings_unknown_keys_warning_result)
+        result["UserSettingsUpdateRequest"] = to_class(_UserSettingsUpdateRequest, self.user_settings_update_request)
+        result["UserSettingsUpdateResult"] = to_class(_UserSettingsUpdateResult, self.user_settings_update_result)
+        result["UserSettingsValidateRequest"] = to_class(UserSettingsValidateRequest, self.user_settings_validate_request)
+        result["UserSettingsValidateResult"] = to_class(UserSettingsValidateResult, self.user_settings_validate_result)
+        result["UserSettingsValidationIssue"] = to_class(UserSettingsValidationIssue, self.user_settings_validation_issue)
+        result["UserSettingsWriteAllRequest"] = to_class(UserSettingsWriteAllRequest, self.user_settings_write_all_request)
         result["VisibilityGetResult"] = to_class(VisibilityGetResult, self.visibility_get_result)
         result["VisibilitySetRequest"] = to_class(VisibilitySetRequest, self.visibility_set_request)
         result["VisibilitySetResult"] = to_class(VisibilitySetResult, self.visibility_set_result)
@@ -51972,6 +59643,7 @@ def to_dict(self) -> dict:
         result["WorkflowToolResumeRequest"] = to_class(_WorkflowToolResumeRequest, self.workflow_tool_resume_request)
         result["WorkflowToolRunOptions"] = to_class(_WorkflowToolRunOptions, self.workflow_tool_run_options)
         result["WorkflowToolRunRequest"] = to_class(_WorkflowToolRunRequest, self.workflow_tool_run_request)
+        result["WorkspaceDiffContents"] = to_class(WorkspaceDiffContents, self.workspace_diff_contents)
         result["WorkspaceDiffFileChange"] = to_class(WorkspaceDiffFileChange, self.workspace_diff_file_change)
         result["WorkspaceDiffFileChangeType"] = to_enum(WorkspaceDiffFileChangeType, self.workspace_diff_file_change_type)
         result["WorkspaceDiffMode"] = to_enum(WorkspaceDiffMode, self.workspace_diff_mode)
@@ -52014,11 +59686,10 @@ def to_dict(self) -> dict:
         result["WorkspaceSummary"] = from_union([lambda x: to_class(WorkspaceSummary, x), from_none], self.workspace_summary)
         return result
 
-def rpc_from_dict(s: Any) -> RPC:
-    return RPC.from_dict(s)
-
-def rpc_to_dict(x: RPC) -> Any:
-    return to_class(RPC, x)
+# Experimental: this type is part of an experimental API and may change or be removed.
+class ManagedPermissionOperationKind(Enum):
+    "Operation to evaluate. Currently only url is supported."
+    URL = "url"
 
 # Outcome of an agentRegistry.spawn call.
 AgentRegistrySpawnResult = AgentRegistrySpawnSpawned | AgentRegistrySpawnError | AgentRegistrySpawnRegistryTimeout | AgentRegistrySpawnValidationError
@@ -52034,7 +59705,7 @@ def _load_AgentRegistrySpawnResult(obj: Any) -> "AgentRegistrySpawnResult":
         case _: raise ValueError(f"Unknown AgentRegistrySpawnResult kind: {kind!r}")
 
 # Authentication credentials accepted only at native protocol ingress. Runtime outputs use credential-free `AuthIdentity` metadata.
-AuthInfo = HMACAuthInfo | EnvAuthInfo | TokenAuthInfo | TokenProviderAuthInfo | CopilotAPITokenAuthInfo | UserAuthInfo | GhCLIAuthInfo | APIKeyAuthInfo
+AuthInfo = HMACAuthInfo | EnvAuthInfo | TokenAuthInfo | TokenProviderAuthInfo | CopilotAPITokenAuthInfo | UserAuthInfo | AccountAuthInfo | GhCLIAuthInfo | APIKeyAuthInfo
 
 def _load_AuthInfo(obj: Any) -> "AuthInfo":
     assert isinstance(obj, dict)
@@ -52046,6 +59717,7 @@ def _load_AuthInfo(obj: Any) -> "AuthInfo":
         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 "account": return AccountAuthInfo.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}")
@@ -52372,7 +60044,7 @@ def _load_SessionOpenParams(obj: Any) -> "SessionOpenParams":
         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
+SettableAuthInfo = HMACAuthInfo | EnvAuthInfo | SettableTokenAuthInfo | CopilotAPITokenAuthInfo | UserAuthInfo | AccountAuthInfo | GhCLIAuthInfo | APIKeyAuthInfo
 
 def _load_SettableAuthInfo(obj: Any) -> "SettableAuthInfo":
     assert isinstance(obj, dict)
@@ -52383,6 +60055,7 @@ def _load_SettableAuthInfo(obj: Any) -> "SettableAuthInfo":
         case "token": return SettableTokenAuthInfo.from_dict(obj)
         case "copilot-api-token": return CopilotAPITokenAuthInfo.from_dict(obj)
         case "user": return UserAuthInfo.from_dict(obj)
+        case "account": return AccountAuthInfo.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}")
@@ -52434,6 +60107,8 @@ def _load_TaskInfo(obj: Any) -> "TaskInfo":
 EventsCursorStatus = CursorStatus
 ExternalToolResult = ExternalToolTextResultForLlm
 ExternalToolTextResultForLlmContentResourceLinkIconTheme = Theme
+FeatureFlagsResolveResult = dict
+FeatureFlagsResolveStartupGatesResult = dict
 FilterMapping = dict
 HistoryCompactRequest = Any
 InstructionDiscoveryPathKind = DebugCollectLogsEntryKind
@@ -52477,8 +60152,17 @@ def _load_TaskInfo(obj: Any) -> "TaskInfo":
 ProviderEndpointType = ProviderType
 ProviderEndpointWireApi = ProviderWireAPI
 ProviderGetEndpointRequest = Any
+QuotaTakeWarningsResult = list
 RemoteSessionMetadataTaskType = TaskType
+SandboxCheckEnforcementCommandResult = bool
+SandboxCheckPlatformSupportResult = bool
+SandboxCheckWindowsHostLoopbackSupportResult = bool
+SandboxGetUnsupportedMessageResult = str
+SandboxGetUnsupportedSettingDisabledNoticeResult = str
 SandboxHostCapabilityName = str
+SandboxProxyCaCheckInstallationSupportResult = bool
+SandboxProxyCaCheckRelevanceResult = bool
+SandboxSettingsApplyDefaultsResult = dict
 SessionAuthInfoResult = AuthIdentity | None
 SessionCancelAllBackgroundAgentsResult = int
 SessionContextHostType = HostType
@@ -52491,12 +60175,15 @@ def _load_TaskInfo(obj: Any) -> "TaskInfo":
 SessionOpenOptionsAdditionalContentExclusionPolicyScope = AdditionalContentExclusionPolicyScope
 SessionOpenOptionsEnvValueMode = MCPSetEnvValueModeDetails
 SessionOpenOptionsReasoningSummary = ReasoningSummary
+SessionQuotaTakeWarningsResult = list
 SessionsGetClientMetadataResult = list
 SessionsOpenHandoffTaskType = TaskType
 SessionWorkingDirectoryContextHostType = HostType
 TaskInfoExecutionMode = TaskExecutionMode
 TaskInfoStatus = TaskStatus
 ToolResult = ToolResultExpanded
+UserSettingsBuildRuntimeResult = dict
+UserSettingsLoadForConfigDirResult = dict
 WorkspaceSummaryHostType = HostType
 WorkspacesWorkspaceDetailsHostType = HostType
 
@@ -52528,6 +60215,123 @@ def _patch_model_capabilities(data: dict) -> dict:
     return data
 
 
+# Experimental: this API group is experimental and may change or be removed.
+class ServerSandboxProxyCaApi:
+    def __init__(self, client: "JsonRpcClient"):
+        self._client = client
+
+    async def check_installation_support(self, *, timeout: float | None = None) -> bool:
+        "Reports whether this runtime process can offer installing the sandbox credential-proxy certificate authority into OS trust.\n\nReturns:\n    True when this process can offer installing the sandbox credential-proxy certificate authority into OS trust."
+        return bool(await self._client.request("sandbox.proxyCa.checkInstallationSupport", {}, **_timeout_kwargs(timeout)))
+
+    async def check_relevance(self, params: SandboxProxyCARequest, *, timeout: float | None = None) -> bool:
+        "Reports whether this sandbox configuration uses the credential proxy and can need certificate-authority setup.\n\nArgs:\n    params: Identifies the credential hosts that the persistent certificate authority of the sandbox credential proxy must cover. The runtime always adds the hosts from the saved user settings.\n\nReturns:\n    True when the sandbox configuration uses the credential proxy and can need certificate-authority setup."
+        params_dict = {k: v for k, v in params.to_dict().items() if v is not None}
+        return bool(await self._client.request("sandbox.proxyCa.checkRelevance", params_dict, **_timeout_kwargs(timeout)))
+
+    async def get_status(self, params: SandboxProxyCARequest, *, timeout: float | None = None) -> SandboxProxyCAStatus:
+        "Reports whether the persistent certificate authority of the sandbox credential proxy exists, whether OS trust includes it, and whether it must be rotated. Changes nothing.\n\nArgs:\n    params: Identifies the credential hosts that the persistent certificate authority of the sandbox credential proxy must cover. The runtime always adds the hosts from the saved user settings.\n\nReturns:\n    Status of the persistent certificate authority of the sandbox credential proxy."
+        params_dict = {k: v for k, v in params.to_dict().items() if v is not None}
+        return SandboxProxyCAStatus.from_dict(await self._client.request("sandbox.proxyCa.getStatus", params_dict, **_timeout_kwargs(timeout)))
+
+    async def create(self, params: SandboxProxyCARequest, *, timeout: float | None = None) -> SandboxProxyCACreateResult:
+        "Creates the persistent certificate authority of the sandbox credential proxy if none is stored, without changing OS trust, and returns the path of its public certificate. Keeps an existing certificate authority, even one that must be rotated. Fails where OS trust is unsupported. Trust it with sandbox.proxyCa.trust: the CLI trusts only the hosts in the saved user settings, so it refuses a certificate authority that also covers hosts from sandboxConfig.\n\nArgs:\n    params: Identifies the credential hosts that the persistent certificate authority of the sandbox credential proxy must cover. The runtime always adds the hosts from the saved user settings.\n\nReturns:\n    Result of creating the persistent certificate authority of the sandbox credential proxy."
+        params_dict = {k: v for k, v in params.to_dict().items() if v is not None}
+        return SandboxProxyCACreateResult.from_dict(await self._client.request("sandbox.proxyCa.create", params_dict, **_timeout_kwargs(timeout)))
+
+    async def rotate(self, params: SandboxProxyCARequest, *, timeout: float | None = None) -> SandboxProxyCAStatus:
+        "Replaces the persistent certificate authority of the sandbox credential proxy with a new one for the current credential hosts. If OS trust included the old one, removes it and trusts the new one, which can show an OS authentication prompt. Running sandboxed tools keep the old certificate authority until they restart.\n\nArgs:\n    params: Identifies the credential hosts that the persistent certificate authority of the sandbox credential proxy must cover. The runtime always adds the hosts from the saved user settings.\n\nReturns:\n    Status of the persistent certificate authority of the sandbox credential proxy."
+        params_dict = {k: v for k, v in params.to_dict().items() if v is not None}
+        return SandboxProxyCAStatus.from_dict(await self._client.request("sandbox.proxyCa.rotate", params_dict, **_timeout_kwargs(timeout)))
+
+    async def trust(self, params: SandboxProxyCARequest, *, timeout: float | None = None) -> SandboxProxyCAStatus:
+        "Adds the persistent certificate authority of the sandbox credential proxy to OS trust, so sandboxed clients that read only OS trust accept the proxy. Call create first. Refuses a certificate authority that is not constrained to the current credential hosts. Can show an OS authentication prompt.\n\nArgs:\n    params: Identifies the credential hosts that the persistent certificate authority of the sandbox credential proxy must cover. The runtime always adds the hosts from the saved user settings.\n\nReturns:\n    Status of the persistent certificate authority of the sandbox credential proxy."
+        params_dict = {k: v for k, v in params.to_dict().items() if v is not None}
+        return SandboxProxyCAStatus.from_dict(await self._client.request("sandbox.proxyCa.trust", params_dict, **_timeout_kwargs(timeout)))
+
+    async def remove(self, *, timeout: float | None = None) -> SandboxProxyCAStatus:
+        "Removes the persistent certificate authority of the sandbox credential proxy from OS trust. Keeps the stored certificate authority. Can show an OS authentication prompt. Sandboxed clients that read only OS trust then reject the proxy; clients that read the per-process certificate bundle continue to work.\n\nReturns:\n    Status of the persistent certificate authority of the sandbox credential proxy."
+        return SandboxProxyCAStatus.from_dict(await self._client.request("sandbox.proxyCa.remove", {}, **_timeout_kwargs(timeout)))
+
+
+# Experimental: this API group is experimental and may change or be removed.
+class ServerSandboxApi:
+    def __init__(self, client: "JsonRpcClient"):
+        self._client = client
+        self.proxy_ca = ServerSandboxProxyCaApi(client)
+
+    async def get_host_support(self, *, timeout: float | None = None) -> SandboxHostSupport:
+        "Reports whether the host running this runtime can run the command sandbox, without starting a session or spawning a sandboxed command.\n\nReturns:\n    Whether the host running this runtime can run the command sandbox. The runtime checks `supported` once per process. A capability answer can change while the process runs, for example after the user installs a missing package."
+        return SandboxHostSupport.from_dict(await self._client.request("sandbox.getHostSupport", {}, **_timeout_kwargs(timeout)))
+
+
+# Experimental: this API group is experimental and may change or be removed.
+class ServerUserSettingsApi:
+    def __init__(self, client: "JsonRpcClient"):
+        self._client = client
+
+    async def get(self, *, timeout: float | None = None) -> UserSettingsGetResult:
+        "Lists every known user setting from settings.json, each with its effective value, its default, and whether it is at the default — so settings the user has never set still appear with their default value. Does not include repository- or enterprise-managed overrides that the runtime layers on top at session time.\n\nReturns:\n    Per-key metadata for every known user setting in settings.json, including settings left at their default. Excludes repository- and enterprise-managed overrides."
+        return UserSettingsGetResult.from_dict(await self._client.request("user.settings.get", {}, **_timeout_kwargs(timeout)))
+
+    async def set(self, params: UserSettingsSetRequest, *, timeout: float | None = None) -> None:
+        "Writes one or more user settings to settings.json, replacing each provided top-level key. A key whose value is null is removed.\n\nArgs:\n    params: 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."
+        params_dict = {k: v for k, v in params.to_dict().items() if v is not None}
+        await self._client.request("user.settings.set", params_dict, **_timeout_kwargs(timeout))
+
+
+# Experimental: this API group is experimental and may change or be removed.
+class ServerUserApi:
+    def __init__(self, client: "JsonRpcClient"):
+        self._client = client
+        self.settings = ServerUserSettingsApi(client)
+
+
+# Experimental: this API group is experimental and may change or be removed.
+class ServerManagedSettingsPermissionsApi:
+    def __init__(self, client: "JsonRpcClient"):
+        self._client = client
+
+    async def evaluate(self, params: ManagedPermissionsEvaluateRequest, *, timeout: float | None = None) -> ManagedPermissionsEvaluateResult:
+        "Pure, sessionless evaluation of operations against a supplied permissionsContext. Performs no policy discovery, I/O, prompting, navigation, permission grants, or sandbox changes. Obtain the context from managedSettings.resolve or session.managedSettings.get, or reuse an in-memory context. Results preserve input order and duplicates. Consumers must block deny, obtain approval for ask, and use their normal permission flow for unmanaged. Unknown policy returns failClosed with every operation denied. This is not a substitute for user permissions or other security controls.\n\nArgs:\n    params: Managed policy context and ordered operations for pure, sessionless evaluation.\n\nReturns:\n    Ordered managed permission verdicts and the supplied policy's fail-closed posture."
+        params_dict = {k: v for k, v in params.to_dict().items() if v is not None}
+        return ManagedPermissionsEvaluateResult.from_dict(await self._client.request("managedSettings.permissions.evaluate", params_dict, **_timeout_kwargs(timeout)))
+
+
+# Experimental: this API group is experimental and may change or be removed.
+class ServerManagedSettingsApi:
+    def __init__(self, client: "JsonRpcClient"):
+        self._client = client
+        self.permissions = ServerManagedSettingsPermissionsApi(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. `managedSettings.resolve` returns the same device settings together with the account's server policy.\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)))
+
+    async def clear_cache(self, *, timeout: float | None = None) -> None:
+        "Force-refreshes enterprise managed settings for every account: wipes the persistent server-policy cache (the whole `<cacheHome>/managed-settings` directory) and drops this runtime process's in-memory retained server policy. It does not itself fetch policy — the effect is that the next time a session resolves managed settings for an account, that resolution re-fetches the account's org policy from the network instead of serving a cached response. Note that `managedSettings.read` returns only device/MDM settings and never triggers the account server-policy fetch, so a host implementing \"sync account policy\" should call `managedSettings.resolve` or start a fresh session resolution rather than treat a subsequent `managedSettings.read` as the refreshed org policy. Mirrors the invalidation a sign-out performs, broadened from the one signing-out account to all of them; device/MDM layers describe the machine, not the account, and are left untouched. Rejects if the on-disk cache cannot be removed."
+        await self._client.request("managedSettings.clearCache", {}, **_timeout_kwargs(timeout))
+
+    async def resolve(self, params: ManagedSettingsResolveRequest, *, timeout: float | None = None) -> ManagedSettingsResolveResult:
+        "Resolves the effective enterprise managed settings without a session, from the device channel and, when an account is available, the account's server policy through the same per-account cache sessions use. A cached server policy less than an hour old is used without a fetch; otherwise the policy is fetched, and when the fetch fails a cached policy up to 24 hours old is used instead, unless `forceRemoteSettingsRefresh` requires a live fetch. With no account requested or signed in, it reports device policy only; signing out removes the account's cached policy. It can fetch server policy over the network when the cache is stale, so call it off latency-critical paths such as startup rather than before listing models. The policy helper is not run. `layers` lists each channel's document before merging, and `values` and `meta` carry typed effective values and their lock state for the keys typed so far.\n\nArgs:\n    params: Optional opaque account selection or GitHub token whose managed settings are resolved.\n\nReturns:\n    Effective enterprise managed settings for an account, resolved without a session."
+        params_dict = {k: v for k, v in params.to_dict().items() if v is not None}
+        return ManagedSettingsResolveResult.from_dict(await self._client.request("managedSettings.resolve", params_dict, **_timeout_kwargs(timeout)))
+
+    async def schema(self, *, timeout: float | None = None) -> ManagedSettingsSchemaResult:
+        "Returns the managed-settings authoring JSON schema with descriptive `x-composition` annotations aligned with the shared settings-engine vocabulary. These annotations are not a complete runtime composition contract: model, effortLevel, and contextTier remain coupled. Use `managedSettings.compose` for the runtime's effective result. Performs no I/O.\n\nReturns:\n    The authoring JSON schema for managed settings recognized by this runtime."
+        return ManagedSettingsSchemaResult.from_dict(await self._client.request("managedSettings.schema", {}, **_timeout_kwargs(timeout)))
+
+    async def validate(self, params: ManagedSettingsValidateRequest, *, timeout: float | None = None) -> ManagedSettingsValidateResult:
+        "Validates a candidate managed-settings document the way the runtime validates delivered policy, without applying it. Reports errors that would reject the document, warnings for content the runtime ignores, and the canonical document it would apply. Document text nested more than 64 levels deep is rejected. Performs no I/O.\n\nArgs:\n    params: A candidate managed-settings document to validate without applying it.\n\nReturns:\n    Result of validating a managed-settings document."
+        params_dict = {k: v for k, v in params.to_dict().items() if v is not None}
+        return ManagedSettingsValidateResult.from_dict(await self._client.request("managedSettings.validate", params_dict, **_timeout_kwargs(timeout)))
+
+    async def compose(self, params: ManagedSettingsComposeRequest, *, timeout: float | None = None) -> ManagedSettingsComposeResult:
+        "Merges candidate managed-settings documents for the device, server, and policy-helper channels into the effective settings the runtime would enforce on this host, using the same precedence and composition rules as live resolution, without applying them. Like live resolution, a server's advisory sandbox force-enable is declined on a host that cannot run the sandbox. Does not fetch policy or read policy files, but may perform blocking OS or subprocess probes for sandbox support. Preview documents are limited to 1 MiB and 64 levels of nesting.\n\nArgs:\n    params: Candidate managed-settings documents to merge without applying them.\n\nReturns:\n    The effective managed settings the runtime would enforce for the given documents, in the same shape `managedSettings.resolve` returns."
+        params_dict = {k: v for k, v in params.to_dict().items() if v is not None}
+        return ManagedSettingsComposeResult.from_dict(await self._client.request("managedSettings.compose", params_dict, **_timeout_kwargs(timeout)))
+
+
 # Experimental: this API group is experimental and may change or be removed.
 class ServerEnvironmentsApi:
     def __init__(self, client: "JsonRpcClient"):
@@ -52559,6 +60363,11 @@ async def publish_session(self, params: HostPublishSessionRequest, *, timeout: f
         params_dict = {k: v for k, v in params.to_dict().items() if v is not None}
         return HostPublishSessionResult.from_dict(await self._client.request("host.publishSession", params_dict, **_timeout_kwargs(timeout)))
 
+    async def list_sessions(self, params: HostListSessionsRequest, *, timeout: float | None = None) -> HostListSessionsResult:
+        "Reads the complete advertised live and dormant session catalog of an existing host owned by this connection. Does not start hosting, subscribe to sessions, or guarantee resumability.\n\nArgs:\n    params: Reads a running host's catalog or the runtime's saved default catalog.\n\nReturns:\n    The complete live and dormant advertised catalog, without subscribing to sessions."
+        params_dict = {k: v for k, v in params.to_dict().items() if v is not None}
+        return HostListSessionsResult.from_dict(await self._client.request("host.listSessions", params_dict, **_timeout_kwargs(timeout)))
+
     async def start(self, params: HostStartRequest, *, timeout: float | None = None) -> HostStartResult:
         "Starts a connection-owned AHP host with explicit localServer and/or githubEnvironment transports as a supervised SDK participant.\n\nArgs:\n    params: Starts a supervised AHP host with at least one explicitly selected transport.\n\nReturns:\n    Listener readiness, returned only after binding and the supervised participant's SDK handshake."
         params_dict = {k: v for k, v in params.to_dict().items() if v is not None}
@@ -52596,47 +60405,6 @@ async def get_built_in_catalog(self, *, timeout: float | None = None) -> BuiltIn
         return BuiltInModelCatalog.from_dict(await self._client.request("models.getBuiltInCatalog", {}, **_timeout_kwargs(timeout)))
 
 
-# Experimental: this API group is experimental and may change or be removed.
-class ServerSandboxProxyCaApi:
-    def __init__(self, client: "JsonRpcClient"):
-        self._client = client
-
-    async def get_status(self, params: SandboxProxyCARequest, *, timeout: float | None = None) -> SandboxProxyCAStatus:
-        "Reports whether the persistent certificate authority of the sandbox credential proxy exists, whether OS trust includes it, and whether it must be rotated. Changes nothing.\n\nArgs:\n    params: Identifies the credential hosts that the persistent certificate authority of the sandbox credential proxy must cover. The runtime always adds the hosts from the saved user settings.\n\nReturns:\n    Status of the persistent certificate authority of the sandbox credential proxy."
-        params_dict = {k: v for k, v in params.to_dict().items() if v is not None}
-        return SandboxProxyCAStatus.from_dict(await self._client.request("sandbox.proxyCa.getStatus", params_dict, **_timeout_kwargs(timeout)))
-
-    async def create(self, params: SandboxProxyCARequest, *, timeout: float | None = None) -> SandboxProxyCACreateResult:
-        "Creates the persistent certificate authority of the sandbox credential proxy if none is stored, without changing OS trust, and returns the path of its public certificate. Keeps an existing certificate authority, even one that must be rotated. Fails where OS trust is unsupported. Trust it with sandbox.proxyCa.trust: the CLI trusts only the hosts in the saved user settings, so it refuses a certificate authority that also covers hosts from sandboxConfig.\n\nArgs:\n    params: Identifies the credential hosts that the persistent certificate authority of the sandbox credential proxy must cover. The runtime always adds the hosts from the saved user settings.\n\nReturns:\n    Result of creating the persistent certificate authority of the sandbox credential proxy."
-        params_dict = {k: v for k, v in params.to_dict().items() if v is not None}
-        return SandboxProxyCACreateResult.from_dict(await self._client.request("sandbox.proxyCa.create", params_dict, **_timeout_kwargs(timeout)))
-
-    async def rotate(self, params: SandboxProxyCARequest, *, timeout: float | None = None) -> SandboxProxyCAStatus:
-        "Replaces the persistent certificate authority of the sandbox credential proxy with a new one for the current credential hosts. If OS trust included the old one, removes it and trusts the new one, which can show an OS authentication prompt. Running sandboxed tools keep the old certificate authority until they restart.\n\nArgs:\n    params: Identifies the credential hosts that the persistent certificate authority of the sandbox credential proxy must cover. The runtime always adds the hosts from the saved user settings.\n\nReturns:\n    Status of the persistent certificate authority of the sandbox credential proxy."
-        params_dict = {k: v for k, v in params.to_dict().items() if v is not None}
-        return SandboxProxyCAStatus.from_dict(await self._client.request("sandbox.proxyCa.rotate", params_dict, **_timeout_kwargs(timeout)))
-
-    async def trust(self, params: SandboxProxyCARequest, *, timeout: float | None = None) -> SandboxProxyCAStatus:
-        "Adds the persistent certificate authority of the sandbox credential proxy to OS trust, so sandboxed clients that read only OS trust accept the proxy. Call create first. Refuses a certificate authority that is not constrained to the current credential hosts. Can show an OS authentication prompt.\n\nArgs:\n    params: Identifies the credential hosts that the persistent certificate authority of the sandbox credential proxy must cover. The runtime always adds the hosts from the saved user settings.\n\nReturns:\n    Status of the persistent certificate authority of the sandbox credential proxy."
-        params_dict = {k: v for k, v in params.to_dict().items() if v is not None}
-        return SandboxProxyCAStatus.from_dict(await self._client.request("sandbox.proxyCa.trust", params_dict, **_timeout_kwargs(timeout)))
-
-    async def remove(self, *, timeout: float | None = None) -> SandboxProxyCAStatus:
-        "Removes the persistent certificate authority of the sandbox credential proxy from OS trust. Keeps the stored certificate authority. Can show an OS authentication prompt. Sandboxed clients that read only OS trust then reject the proxy; clients that read the per-process certificate bundle continue to work.\n\nReturns:\n    Status of the persistent certificate authority of the sandbox credential proxy."
-        return SandboxProxyCAStatus.from_dict(await self._client.request("sandbox.proxyCa.remove", {}, **_timeout_kwargs(timeout)))
-
-
-# Experimental: this API group is experimental and may change or be removed.
-class ServerSandboxApi:
-    def __init__(self, client: "JsonRpcClient"):
-        self._client = client
-        self.proxy_ca = ServerSandboxProxyCaApi(client)
-
-    async def get_host_support(self, *, timeout: float | None = None) -> SandboxHostSupport:
-        "Reports whether the host running this runtime can run the command sandbox, without starting a session or spawning a sandboxed command.\n\nReturns:\n    Whether the host running this runtime can run the command sandbox. The runtime checks `supported` once per process. A capability answer can change while the process runs, for example after the user installs a missing package."
-        return SandboxHostSupport.from_dict(await self._client.request("sandbox.getHostSupport", {}, **_timeout_kwargs(timeout)))
-
-
 # Experimental: this API group is experimental and may change or be removed.
 class ServerToolsApi:
     def __init__(self, client: "JsonRpcClient"):
@@ -52811,6 +60579,22 @@ 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 ServerInstructionsApi:
+    def __init__(self, client: "JsonRpcClient"):
+        self._client = client
+
+    async def discover(self, params: InstructionsDiscoverRequest, *, timeout: float | None = None) -> ServerInstructionSourceList:
+        "Discovers instruction sources across user, repository, and plugin sources.\n\nArgs:\n    params: Optional project paths to include in instruction discovery.\n\nReturns:\n    Instruction sources discovered across user, repository, and plugin sources."
+        params_dict = {k: v for k, v in params.to_dict().items() if v is not None}
+        return ServerInstructionSourceList.from_dict(await self._client.request("instructions.discover", params_dict, **_timeout_kwargs(timeout)))
+
+    async def get_discovery_paths(self, params: InstructionsGetDiscoveryPathsRequest, *, timeout: float | None = None) -> InstructionDiscoveryPathList:
+        "Returns the canonical files and directories where a client may create custom instructions that the runtime will recognize, including ones that do not exist yet. Repository targets become active once created.\n\nArgs:\n    params: Optional project paths to include when enumerating instruction discovery targets.\n\nReturns:\n    Canonical files and directories where custom instructions can be created so the runtime will recognize them."
+        params_dict = {k: v for k, v in params.to_dict().items() if v is not None}
+        return InstructionDiscoveryPathList.from_dict(await self._client.request("instructions.getDiscoveryPaths", params_dict, **_timeout_kwargs(timeout)))
+
+
 # Experimental: this API group is experimental and may change or be removed.
 class ServerSkillsInstallationsApi:
     def __init__(self, client: "JsonRpcClient"):
@@ -53010,22 +60794,6 @@ async def get_discovery_paths(self, params: AgentsGetDiscoveryPathsRequest, *, t
         return AgentDiscoveryPathList.from_dict(await self._client.request("agents.getDiscoveryPaths", params_dict, **_timeout_kwargs(timeout)))
 
 
-# Experimental: this API group is experimental and may change or be removed.
-class ServerInstructionsApi:
-    def __init__(self, client: "JsonRpcClient"):
-        self._client = client
-
-    async def discover(self, params: InstructionsDiscoverRequest, *, timeout: float | None = None) -> ServerInstructionSourceList:
-        "Discovers instruction sources across user, repository, and plugin sources.\n\nArgs:\n    params: Optional project paths to include in instruction discovery.\n\nReturns:\n    Instruction sources discovered across user, repository, and plugin sources."
-        params_dict = {k: v for k, v in params.to_dict().items() if v is not None}
-        return ServerInstructionSourceList.from_dict(await self._client.request("instructions.discover", params_dict, **_timeout_kwargs(timeout)))
-
-    async def get_discovery_paths(self, params: InstructionsGetDiscoveryPathsRequest, *, timeout: float | None = None) -> InstructionDiscoveryPathList:
-        "Returns the canonical files and directories where a client may create custom instructions that the runtime will recognize, including ones that do not exist yet. Repository targets become active once created.\n\nArgs:\n    params: Optional project paths to include when enumerating instruction discovery targets.\n\nReturns:\n    Canonical files and directories where custom instructions can be created so the runtime will recognize them."
-        params_dict = {k: v for k, v in params.to_dict().items() if v is not None}
-        return InstructionDiscoveryPathList.from_dict(await self._client.request("instructions.getDiscoveryPaths", params_dict, **_timeout_kwargs(timeout)))
-
-
 # Experimental: this API group is experimental and may change or be removed.
 class ServerCommandsApi:
     def __init__(self, client: "JsonRpcClient"):
@@ -53036,65 +60804,6 @@ async def list(self, *, timeout: float | None = None) -> CommandList:
         return CommandList.from_dict(await self._client.request("commands.list", {}, **_timeout_kwargs(timeout)))
 
 
-# Experimental: this API group is experimental and may change or be removed.
-class ServerUserSettingsApi:
-    def __init__(self, client: "JsonRpcClient"):
-        self._client = client
-
-    async def reload(self, *, timeout: float | None = None) -> None:
-        "Drops this runtime process's in-memory user settings cache so the next settings read observes disk."
-        await self._client.request("user.settings.reload", {}, **_timeout_kwargs(timeout))
-
-    async def get(self, *, timeout: float | None = None) -> UserSettingsGetResult:
-        "Lists every known user setting (settings.json overlaid with the legacy config.json, config.json wins), each with its effective value, its default, and whether it is at the default — so settings the user has never set still appear with their default value. Does not include repository- or enterprise-managed overrides that the runtime layers on top at session time.\n\nReturns:\n    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."
-        return UserSettingsGetResult.from_dict(await self._client.request("user.settings.get", {}, **_timeout_kwargs(timeout)))
-
-    async def set(self, params: UserSettingsSetRequest, *, timeout: float | None = None) -> UserSettingsSetResult:
-        "Writes one or more user settings to settings.json, replacing each provided top-level key. A key whose value is null is removed. Returns the keys whose new value is shadowed by a legacy config.json entry (config.json wins on read), which the runtime leaves in place — such writes do not take effect until the legacy value is removed.\n\nArgs:\n    params: 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.\n\nReturns:\n    Outcome of writing user settings."
-        params_dict = {k: v for k, v in params.to_dict().items() if v is not None}
-        return UserSettingsSetResult.from_dict(await self._client.request("user.settings.set", params_dict, **_timeout_kwargs(timeout)))
-
-
-# Experimental: this API group is experimental and may change or be removed.
-class ServerUserApi:
-    def __init__(self, client: "JsonRpcClient"):
-        self._client = client
-        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. `managedSettings.resolve` returns the same device settings together with the account's server policy.\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)))
-
-    async def clear_cache(self, *, timeout: float | None = None) -> None:
-        "Force-refreshes enterprise managed settings for every account: wipes the persistent server-policy cache (the whole `<cacheHome>/managed-settings` directory) and drops this runtime process's in-memory retained server policy. It does not itself fetch policy — the effect is that the next time a session resolves managed settings for an account, that resolution re-fetches the account's org policy from the network instead of serving a cached response. Note that `managedSettings.read` returns only device/MDM settings and never triggers the account server-policy fetch, so a host implementing \"sync account policy\" should call `managedSettings.resolve` or start a fresh session resolution rather than treat a subsequent `managedSettings.read` as the refreshed org policy. Mirrors the invalidation a sign-out performs, broadened from the one signing-out account to all of them; device/MDM layers describe the machine, not the account, and are left untouched. Rejects if the on-disk cache cannot be removed."
-        await self._client.request("managedSettings.clearCache", {}, **_timeout_kwargs(timeout))
-
-    async def resolve(self, params: ManagedSettingsResolveRequest, *, timeout: float | None = None) -> ManagedSettingsResolveResult:
-        "Resolves the effective enterprise managed settings without a session, from the device channel and, when an account is available, the account's server policy through the same per-account cache sessions use. A cached server policy less than an hour old is used without a fetch; otherwise the policy is fetched, and when the fetch fails a cached policy up to 24 hours old is used instead, unless `forceRemoteSettingsRefresh` requires a live fetch. With no account requested or signed in, it reports device policy only; signing out removes the account's cached policy. It can fetch server policy over the network when the cache is stale, so call it off latency-critical paths such as startup rather than before listing models. The policy helper is not run. `layers` lists each channel's document before merging, and `values` and `meta` carry typed effective values and their lock state for the keys typed so far.\n\nArgs:\n    params: Optional opaque account selection or GitHub token whose managed settings are resolved.\n\nReturns:\n    Effective enterprise managed settings for an account, resolved without a session."
-        params_dict = {k: v for k, v in params.to_dict().items() if v is not None}
-        return ManagedSettingsResolveResult.from_dict(await self._client.request("managedSettings.resolve", params_dict, **_timeout_kwargs(timeout)))
-
-    async def schema(self, *, timeout: float | None = None) -> ManagedSettingsSchemaResult:
-        "Returns the managed-settings authoring JSON schema with descriptive `x-composition` annotations aligned with the shared settings-engine vocabulary. These annotations are not a complete runtime composition contract: model, effortLevel, and contextTier remain coupled. Use `managedSettings.compose` for the runtime's effective result. Performs no I/O.\n\nReturns:\n    The authoring JSON schema for managed settings recognized by this runtime."
-        return ManagedSettingsSchemaResult.from_dict(await self._client.request("managedSettings.schema", {}, **_timeout_kwargs(timeout)))
-
-    async def validate(self, params: ManagedSettingsValidateRequest, *, timeout: float | None = None) -> ManagedSettingsValidateResult:
-        "Validates a candidate managed-settings document the way the runtime validates delivered policy, without applying it. Reports errors that would reject the document, warnings for content the runtime ignores, and the canonical document it would apply. Document text nested more than 64 levels deep is rejected. Performs no I/O.\n\nArgs:\n    params: A candidate managed-settings document to validate without applying it.\n\nReturns:\n    Result of validating a managed-settings document."
-        params_dict = {k: v for k, v in params.to_dict().items() if v is not None}
-        return ManagedSettingsValidateResult.from_dict(await self._client.request("managedSettings.validate", params_dict, **_timeout_kwargs(timeout)))
-
-    async def compose(self, params: ManagedSettingsComposeRequest, *, timeout: float | None = None) -> ManagedSettingsComposeResult:
-        "Merges candidate managed-settings documents for the device, server, and policy-helper channels into the effective settings the runtime would enforce on this host, using the same precedence and composition rules as live resolution, without applying them. Like live resolution, a server's advisory sandbox force-enable is declined on a host that cannot run the sandbox. Does not fetch policy or read policy files, but may perform blocking OS or subprocess probes for sandbox support. Preview documents are limited to 1 MiB and 64 levels of nesting.\n\nArgs:\n    params: Candidate managed-settings documents to merge without applying them.\n\nReturns:\n    The effective managed settings the runtime would enforce for the given documents, in the same shape `managedSettings.resolve` returns."
-        params_dict = {k: v for k, v in params.to_dict().items() if v is not None}
-        return ManagedSettingsComposeResult.from_dict(await self._client.request("managedSettings.compose", params_dict, **_timeout_kwargs(timeout)))
-
-
 # Experimental: this API group is experimental and may change or be removed.
 class ServerRuntimeApi:
     def __init__(self, client: "JsonRpcClient"):
@@ -53276,33 +60985,58 @@ async def spawn(self, params: AgentRegistrySpawnRequest, *, timeout: float | Non
         return _load_AgentRegistrySpawnResult(await self._client.request("agentRegistry.spawn", params_dict, **_timeout_kwargs(timeout)))
 
 
+# Experimental: this API group is experimental and may change or be removed.
+class ServerConnectorsApi:
+    def __init__(self, client: "JsonRpcClient"):
+        self._client = client
+
+    async def get_capabilities(self, *, timeout: float | None = None) -> ConnectorDiscoveryCapabilities:
+        "Returns feature availability.\n\nReturns:\n    Feature availability."
+        return ConnectorDiscoveryCapabilities.from_dict(await self._client.request("connectors.getCapabilities", {}, **_timeout_kwargs(timeout)))
+
+    async def get_accounts(self, *, timeout: float | None = None) -> ConnectorDiscoveryAccountList:
+        "Returns eligible accounts.\n\nReturns:\n    Eligible accounts."
+        return ConnectorDiscoveryAccountList.from_dict(await self._client.request("connectors.getAccounts", {}, **_timeout_kwargs(timeout)))
+
+    async def list(self, params: ConnectorDiscoveryAccountRequest, *, timeout: float | None = None) -> ConnectorDiscoveryCatalogResult:
+        "Lists entries for the selected account.\n\nArgs:\n    params: Selected account.\n\nReturns:\n    Entries for the selected account."
+        params_dict = {k: v for k, v in params.to_dict().items() if v is not None}
+        return ConnectorDiscoveryCatalogResult.from_dict(await self._client.request("connectors.list", params_dict, **_timeout_kwargs(timeout)))
+
+    async def refresh(self, params: ConnectorDiscoveryAccountRequest, *, timeout: float | None = None) -> ConnectorDiscoveryCatalogResult:
+        "Refreshes entries for the selected account.\n\nArgs:\n    params: Selected account.\n\nReturns:\n    Entries for the selected account."
+        params_dict = {k: v for k, v in params.to_dict().items() if v is not None}
+        return ConnectorDiscoveryCatalogResult.from_dict(await self._client.request("connectors.refresh", params_dict, **_timeout_kwargs(timeout)))
+
+
 class ServerRpc:
     """Typed server-scoped RPC methods."""
     def __init__(self, client: "JsonRpcClient"):
         self._client = client
+        self.sandbox = ServerSandboxApi(client)
+        self.user = ServerUserApi(client)
+        self.managed_settings = ServerManagedSettingsApi(client)
         self.environments = ServerEnvironmentsApi(client)
         self.host = ServerHostApi(client)
         self.hooks = ServerHooksApi(client)
         self.models = ServerModelsApi(client)
-        self.sandbox = ServerSandboxApi(client)
         self.tools = ServerToolsApi(client)
         self.account = ServerAccountApi(client)
         self.secrets = ServerSecretsApi(client)
         self.mcp = ServerMcpApi(client)
         self.extensions = ServerExtensionsApi(client)
+        self.instructions = ServerInstructionsApi(client)
         self.skills = ServerSkillsApi(client)
         self.catalog = ServerCatalogApi(client)
         self.plugins = ServerPluginsApi(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)
         self.sessions = ServerSessionsApi(client)
         self.agent_registry = ServerAgentRegistryApi(client)
+        self.connectors = ServerConnectorsApi(client)
 
     async def ping(self, params: PingRequest, *, timeout: float | None = None) -> PingResult:
         "Checks server responsiveness and returns protocol information.\n\nArgs:\n    params: Optional message to echo back to the caller.\n\nReturns:\n    Server liveness response, including the echoed message, current server timestamp, and protocol version.\n\n.. warning:: This API is experimental and may change or be removed in future versions."
@@ -53314,6 +61048,380 @@ async def register_extension_launch_provider(self, *, timeout: float | None = No
         await self._client.request("registerExtensionLaunchProvider", {}, **_timeout_kwargs(timeout))
 
 
+# Experimental: this API group is experimental and may change or be removed.
+class _InternalServerSandboxProxySecretApi:
+    def __init__(self, client: "JsonRpcClient"):
+        self._client = client
+
+    async def _get_location(self, *, timeout: float | None = None) -> SandboxProxySecretLocation:
+        "Reports where this runtime keeps the sandbox proxy password: the credential store directory and the entry identifier within it. Both are derived from the configuration directory this runtime was started with, so a host does not resolve them itself. Read this to recognize a `${secret:…}` value in stored sandbox settings as this runtime's own proxy password rather than a reference the user wrote by hand. Marked internal because it exists to carry a CLI call site off the napi boundary onto the SDK contract.\n\nReturns:\n    Where this runtime keeps the sandbox proxy password.\n\n:meta private:\n\nInternal SDK API; not part of the public surface."
+        return SandboxProxySecretLocation.from_dict(await self._client.request("sandbox.proxySecret.getLocation", {}, **_timeout_kwargs(timeout)))
+
+    async def _get(self, *, timeout: float | None = None) -> SandboxProxySecretGetResult:
+        "Reads the stored sandbox proxy password from the credential store `sandbox.proxySecret.getLocation` names, preferring the OS keychain and falling back to the on-disk store. Reports an absent value rather than failing when no entry exists. Marked internal because it exists to carry a CLI call site off the napi boundary onto the SDK contract.\n\nReturns:\n    The stored sandbox proxy password, if one is present.\n\n:meta private:\n\nInternal SDK API; not part of the public surface."
+        return SandboxProxySecretGetResult.from_dict(await self._client.request("sandbox.proxySecret.get", {}, **_timeout_kwargs(timeout)))
+
+    async def _save(self, params: SandboxProxySecretSaveRequest, *, timeout: float | None = None) -> SandboxProxySecretSaveResult:
+        "Stores the sandbox proxy password in the credential store `sandbox.proxySecret.getLocation` names, replacing any existing entry. Reports whether the OS keychain accepted it or it fell back to the on-disk store. Marked internal because it exists to carry a CLI call site off the napi boundary onto the SDK contract.\n\nArgs:\n    params: The sandbox proxy password to store.\n\nReturns:\n    Where the sandbox proxy password was stored.\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 SandboxProxySecretSaveResult.from_dict(await self._client.request("sandbox.proxySecret.save", params_dict, **_timeout_kwargs(timeout)))
+
+    async def _delete(self, *, timeout: float | None = None) -> None:
+        "Removes the stored sandbox proxy password from the credential store `sandbox.proxySecret.getLocation` names. Succeeds when no entry exists, so it is safe to call while clearing a proxy password whose origin is unknown. Marked internal because it exists to carry a CLI call site off the napi boundary onto the SDK contract.\n\n:meta private:\n\nInternal SDK API; not part of the public surface."
+        await self._client.request("sandbox.proxySecret.delete", {}, **_timeout_kwargs(timeout))
+
+
+# Experimental: this API group is experimental and may change or be removed.
+class _InternalServerSandboxSettingsApi:
+    def __init__(self, client: "JsonRpcClient"):
+        self._client = client
+
+    async def _apply_defaults(self, params: SandboxApplyDefaultsRequest, *, timeout: float | None = None) -> dict:
+        "Resolves a stored sandbox settings object into the effective one, filling every value the user left unset with its default. Read this to render or reason about the sandbox configuration a session would actually run under, rather than the sparse document the user wrote.\n\nArgs:\n    params: The stored sandbox settings to resolve against the defaults.\n\nReturns:\n    The effective sandbox settings, with every unset value resolved to its default.\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 dict(await self._client.request("sandbox.settings.applyDefaults", params_dict, **_timeout_kwargs(timeout)))
+
+
+# Experimental: this API group is experimental and may change or be removed.
+class _InternalServerSandboxApi:
+    def __init__(self, client: "JsonRpcClient"):
+        self._client = client
+        self.proxy_secret = _InternalServerSandboxProxySecretApi(client)
+        self.settings = _InternalServerSandboxSettingsApi(client)
+
+    async def _resolve_floored_config(self, params: _SandboxResolveFlooredConfigParams, *, timeout: float | None = None) -> SandboxResolveFlooredConfigResult:
+        "Raises a user's sandbox settings to an administrator's managed sandbox floor and returns the result a session should actually run under. The floor can only tighten: an enterprise force-on is reflected even when the user's own `enabled` is false, and a user cannot lower a setting the floor raised. The result is normalized through the declared sandbox shape, so a key reorder or an undeclared passthrough key is not mistaken for a policy change by callers that diff two results. A host must call this rather than merge the two layers itself, because reimplementing the direction of the fold is what turns an administrator's floor into a suggestion.\n\nArgs:\n    params: The user's sandbox settings and the managed sandbox floor to raise them to.\n\nReturns:\n    The user's sandbox settings raised to the managed floor.\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 SandboxResolveFlooredConfigResult.from_dict(await self._client.request("sandbox.resolveFlooredConfig", params_dict, **_timeout_kwargs(timeout)))
+
+    async def _prepare_picker_policy(self, params: _SandboxPreparePickerPolicyParams, *, timeout: float | None = None) -> _SandboxPreparePickerPolicyResult:
+        "Builds the effective filesystem policy one `@`-file picker checks its suggestions against, so Git discovery and grant canonicalization run once for the picker's lifetime instead of on every debounced keystroke. Returns no policy when the sandbox is absent or disabled, which the paired filter reads as \"keep every candidate\". A host must pair this with `sandbox.filterPickerCandidates` rather than resolve a grant list itself, because the picker's grants are narrower than a file tool's — the same path a built-in tool may read can be one the picker must not offer.\n\nArgs:\n    params: The working directory and sandbox settings to build a file-picker policy from.\n\nReturns:\n    The prepared file-picker policy, or none when the sandbox is disabled.\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 _SandboxPreparePickerPolicyResult.from_dict(await self._client.request("sandbox.preparePickerPolicy", params_dict, **_timeout_kwargs(timeout)))
+
+    async def _filter_picker_candidates(self, params: _SandboxFilterPickerCandidatesParams, *, timeout: float | None = None) -> _SandboxFilterPickerCandidatesResult:
+        "Checks a batch of `@`-file picker suggestions against a policy prepared by `sandbox.preparePickerPolicy` and returns one allow decision per candidate, positionally aligned with the request. Batched deliberately: each check canonicalizes a path component-by-component through the real filesystem, so one call amortizes that over a single hop rather than dozens while the user types. A directory the policy does not itself allow can still be kept as a waypoint to an allowed subtree. An absent policy keeps every candidate.\n\nArgs:\n    params: A batch of file-picker candidates to check against a prepared policy.\n\nReturns:\n    Per-candidate allow decisions, positionally aligned with the request.\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 _SandboxFilterPickerCandidatesResult.from_dict(await self._client.request("sandbox.filterPickerCandidates", params_dict, **_timeout_kwargs(timeout)))
+
+    async def _resolve_for_optional(self, params: _SandboxEffectiveForOptionalParams, *, timeout: float | None = None) -> _SandboxEffectiveForOptionalResult:
+        "The sandbox a single named feature actually launches under, which is not the same as the session's sandbox. A feature is routed out of the sandbox by its own flag — `sandboxMcpServers`, `sandboxLspServers` — so an enabled session can still start one server confined and another free. Returns a disabled sandbox rather than an error when the host has no sandbox slice at all, so an absent config and an opted-out feature read alike at the launch site. A host must ask per feature rather than reuse the session config, because reading only `enabled` confines a server the user opted out of, or reports as sandboxed one that is not.\n\nArgs:\n    params: A sandbox config and the per-feature routing flag to resolve it for.\n\nReturns:\n    The sandbox a named feature actually launches under.\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 _SandboxEffectiveForOptionalResult.from_dict(await self._client.request("sandbox.resolveForOptional", params_dict, **_timeout_kwargs(timeout)))
+
+    async def _check_platform_support(self, *, timeout: float | None = None) -> bool:
+        "Reports whether this machine can run an OS-level command sandbox at all. A host must ask before it offers sandboxing, because the answer is a property of the machine rather than of any setting: on Linux it depends on bubblewrap being installed, and on Windows on the OS build supporting BaseContainer. Probing it requires spawning a process the first time, so the answer is cached for the life of the runtime. A host that assumes support and enables the sandbox anyway produces a session in which every shell command fails.\n\nReturns:\n    True when an OS-level sandbox can run on this host.\n\n:meta private:\n\nInternal SDK API; not part of the public surface."
+        return bool(await self._client.request("sandbox.checkPlatformSupport", {}, **_timeout_kwargs(timeout)))
+
+    async def _check_windows_host_loopback_support(self, *, timeout: float | None = None) -> bool:
+        "Reports whether this Windows host's BaseContainer implementation can reach the host's loopback interface directly, which is what a local-network policy needs to avoid routing through the egress proxy. Like `sandbox.checkPlatformSupport`, the answer is a property of the machine's OS build rather than of any setting, and resolving it the first time spawns a platform probe. A host that offers the direct local-network option on a machine that lacks the capability produces a session whose sandboxed commands cannot reach local services. Always false off Windows.\n\nReturns:\n    True when the sandbox on this host can reach host loopback directly.\n\n:meta private:\n\nInternal SDK API; not part of the public surface."
+        return bool(await self._client.request("sandbox.checkWindowsHostLoopbackSupport", {}, **_timeout_kwargs(timeout)))
+
+    async def _get_unsupported_message(self, *, timeout: float | None = None) -> str:
+        "The explanation a host shows when it refuses an explicit request to turn the sandbox on for a machine that cannot run one. Carries the platform-specific remedy — install bubblewrap, update Windows — and the documentation link, so a host that got `false` from `sandbox.checkPlatformSupport` does not have to compose its own reason and cannot describe the same machine differently from the runtime's own spawn path.\n\nReturns:\n    The user-facing refusal, including the platform remedy and the documentation link.\n\n:meta private:\n\nInternal SDK API; not part of the public surface."
+        return str(await self._client.request("sandbox.getUnsupportedMessage", {}, **_timeout_kwargs(timeout)))
+
+    async def _get_unsupported_setting_disabled_notice(self, *, timeout: float | None = None) -> str:
+        "The notice a host shows when a stored `sandbox` setting is being ignored for this session because the machine cannot enforce it. Distinct from `sandbox.getUnsupportedMessage`, which refuses an explicit request: this one reports that a setting the user already saved is inert, states that commands will run unsandboxed, and confirms the stored setting itself is left alone. A host that stays silent here leaves the user believing a sandbox is active.\n\nReturns:\n    The user-facing notice that a saved sandbox setting is inert for this session.\n\n:meta private:\n\nInternal SDK API; not part of the public surface."
+        return str(await self._client.request("sandbox.getUnsupportedSettingDisabledNotice", {}, **_timeout_kwargs(timeout)))
+
+    async def _get_unsupported_startup_notice(self, params: _SandboxUnsupportedStartupNoticeParams, *, timeout: float | None = None) -> _SandboxUnsupportedStartupNoticeResult:
+        "The warning a host prints at startup when a session asked for a sandbox on a machine that cannot run one. The third of the unsupported notices, and the only one that depends on the policy in force: it names the remedy the reader can actually act on, which is the stored setting for an unmanaged host, an administrator for a managed one, and waiting for the policy to resolve when the sandbox stayed on only because the policy could not be determined. Returns no notice when the machine does support a sandbox, so a host can call it unconditionally on the startup path. A host that composes its own warning tells a managed user to change a setting their policy will overwrite.\n\nArgs:\n    params: The managed sandbox policy in force, which selects which remedy the notice offers.\n\nReturns:\n    The startup warning, absent when the machine can run a sandbox.\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 _SandboxUnsupportedStartupNoticeResult.from_dict(await self._client.request("sandbox.getUnsupportedStartupNotice", params_dict, **_timeout_kwargs(timeout)))
+
+    async def _check_enforcement_command(self, params: _SandboxEnforcementCommandAllowedParams, *, timeout: float | None = None) -> bool:
+        "Whether one slash command stays reachable while sandbox enforcement is unavailable and the session is otherwise blocked. The permitted set is deliberately narrow — commands that only report state, and the few that let the user repair or leave the situation — and it is keyed on the arguments as well as the name, so `/sandbox status` is admitted where `/sandbox enable` is not. A host must ask rather than keep its own list: a command this returns false for is one the runtime would refuse anyway, and a divergent list either strands the user with no way out or admits a command that acts on an unenforced session.\n\nArgs:\n    params: One slash command, as typed, to test against the enforcement-block allowlist.\n\nReturns:\n    True when the command stays available while enforcement is blocked.\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 bool(await self._client.request("sandbox.checkEnforcementCommand", params_dict, **_timeout_kwargs(timeout)))
+
+    async def _get_docs_url(self, *, timeout: float | None = None) -> SandboxDocsURLResult:
+        "Returns the documentation URL a host should point a user at when it declines or downgrades a sandbox setting. The runtime owns the address so every surface cites the same page and a host does not hard-code a link that later moves.\n\nReturns:\n    The documentation URL a host cites when it declines or downgrades a sandbox setting.\n\n:meta private:\n\nInternal SDK API; not part of the public surface."
+        return SandboxDocsURLResult.from_dict(await self._client.request("sandbox.getDocsUrl", {}, **_timeout_kwargs(timeout)))
+
+
+# Experimental: this API group is experimental and may change or be removed.
+class _InternalServerPersistenceApi:
+    def __init__(self, client: "JsonRpcClient"):
+        self._client = client
+
+    async def _write_raw_json_locked(self, params: PersistenceWriteRawJSONLockedRequest, *, timeout: float | None = None) -> PersistenceWriteRawJSONLockedResult:
+        "Atomically replaces a JSON file's entire contents while holding the runtime's per-path lock. The lock lives in the runtime process, so a host that writes these files itself takes no part in it and can tear a concurrent runtime write; route the write here instead. Unlike a merging write this never reads or parses the existing file, so a previously corrupted snapshot is replaced wholesale rather than failing every later write. Use it only for callers that always persist a complete snapshot.\n\nArgs:\n    params: A complete JSON snapshot to write under the runtime's per-path file lock.\n\nReturns:\n    The outcome of a locked snapshot write.\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 PersistenceWriteRawJSONLockedResult.from_dict(await self._client.request("persistence.writeRawJsonLocked", params_dict, **_timeout_kwargs(timeout)))
+
+
+# Experimental: this API group is experimental and may change or be removed.
+class _InternalServerUserSettingsApi:
+    def __init__(self, client: "JsonRpcClient"):
+        self._client = client
+
+    async def _set_hook_disabled(self, params: _UserSettingsSetHookDisabledRequest, *, timeout: float | None = None) -> _UserSettingsSetHookDisabledResult:
+        "Adds or removes one hook key in the user `disabledHooks` setting, rewriting settings.json in place and leaving every other setting untouched. Reports a typed outcome rather than failing the call, so a host can tell an unparseable settings file apart from a write that could not complete.\n\nArgs:\n    params: One hook to disable or re-enable.\n\nReturns:\n    Outcome of rewriting the `disabledHooks` setting.\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 _UserSettingsSetHookDisabledResult.from_dict(await self._client.request("user.settings.setHookDisabled", params_dict, **_timeout_kwargs(timeout)))
+
+    async def _load_for_config_dir(self, params: _UserSettingsLoadForConfigDirRequest, *, timeout: float | None = None) -> dict:
+        "Reads the user's settings document exactly as `user.settings.load` does, but from a caller-supplied configuration directory instead of the one the server resolved for itself. Use this when a consumer scopes a session to its own Copilot home — the SDK's per-session `configDir` override — so the settings read match the directory that session actually uses. An absent or empty `configDir` resolves the server's own home, making this identical to `user.settings.load`. Hook-validation relaxations are deliberately not caller-supplied: they continue to come from the server's environment, so a consumer cannot widen the host's hook policy through this method.\n\nArgs:\n    params: Selects the configuration directory whose user settings to read.\n\nReturns:\n    The stored user settings document, keyed by setting name.\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 dict(await self._client.request("user.settings.loadForConfigDir", params_dict, **_timeout_kwargs(timeout)))
+
+    async def _load_repo(self, params: UserSettingsLoadRepoRequest, *, timeout: float | None = None) -> UserSettingsLoadRepoResult:
+        "Reads a repository's checked-in settings document as stored, normalized, together with any diagnostic raised while reading it. This is the repository half of the layering `user.settings.get` reports: `user.settings.load` reads the user's own document, and this reads the one a repository checks in to govern the keys `user.settings.governanceKeys` lists as repo-governable. A document that fails to parse, or that sets a key a repository may not govern, is reported through `warning` while the settings that did load are still returned, so a consumer surfaces the diagnostic and continues rather than failing the session. When `repoRoot` is the user's home directory the Claude-compatible configuration is skipped, so a home-directory session does not inherit a personal config as repository policy.\n\nArgs:\n    params: Selects the repository whose checked-in settings to read.\n\nReturns:\n    A repository's settings as stored, together with any diagnostic raised while reading them.\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 UserSettingsLoadRepoResult.from_dict(await self._client.request("user.settings.loadRepo", params_dict, **_timeout_kwargs(timeout)))
+
+    async def _load_and_merge_repo(self, params: _UserSettingsLoadAndMergeRepoRequest, *, timeout: float | None = None) -> _UserSettingsLoadAndMergeRepoResult:
+        "Reads a repository's settings and merges them over a supplied user layer in one step, returning the settings a consumer should act on inside that repository. Use this rather than reading the two layers separately: the merge is per setting and collection-aware, so a repository adds to the collections it is allowed to influence without replacing the user's own entries, and a whole-document overlay would get that wrong. Any diagnostic raised while reading the repository layer is returned rather than printed, so the consumer decides how to surface it; the settings that did load are merged regardless.\n\nArgs:\n    params: A repository to read settings from, and the user layer they are merged over.\n\nReturns:\n    The settings a consumer should act on inside a repository, together with any diagnostic raised while reading the repository layer.\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 _UserSettingsLoadAndMergeRepoResult.from_dict(await self._client.request("user.settings.loadAndMergeRepo", params_dict, **_timeout_kwargs(timeout)))
+
+    async def _get_path(self, *, timeout: float | None = None) -> UserSettingsPathResult:
+        "Reports the on-disk path of the settings document `user.settings.load` and `user.settings.set` read and write. Resolved the same way those methods resolve it, so a host that shows or opens the settings file names the file the runtime actually uses, including the extensionless legacy `settings` file when that is what is present.\n\nReturns:\n    The on-disk location of the user's settings document.\n\n:meta private:\n\nInternal SDK API; not part of the public surface."
+        return UserSettingsPathResult.from_dict(await self._client.request("user.settings.getPath", {}, **_timeout_kwargs(timeout)))
+
+    async def _load_with_warning(self, *, timeout: float | None = None) -> UserSettingsLoadWithWarningResult:
+        "Reads the user's stored settings together with the diagnostic raised while reading them. This is `user.settings.load` plus the reason part of the document was ignored: that one answers the document alone, so a caller cannot tell a clean read from a salvaged one. Read this when the caller is about to write the file back, where accepting a partial parse would discard every value the loader could not read. The settings that did load are still reported alongside the warning, so a consumer may surface it and continue instead of failing.\n\nReturns:\n    The user's stored settings, together with any diagnostic raised while reading them.\n\n:meta private:\n\nInternal SDK API; not part of the public surface."
+        return UserSettingsLoadWithWarningResult.from_dict(await self._client.request("user.settings.loadWithWarning", {}, **_timeout_kwargs(timeout)))
+
+    async def _merge_managed_and_user(self, params: _UserSettingsMergeManagedAndUserParams, *, timeout: float | None = None) -> UserSettingsMergeManagedAndUserResult:
+        "Folds a user settings layer over a managed (enterprise policy) layer and returns the merged settings. The managed layer's governance keys win, `autoTier` resolves through its overridable form, and the two per-entry control maps (`enabledPlugins`, `extraKnownMarketplaces`) union across the layers and are then stamped back from the managed layer, so each entry an administrator declares wins while the user keeps control of the rest. The parameters are named for their layers rather than being a generic base/override pair: nothing about a settings object identifies which layer produced it, so the runtime cannot detect a transposed call, and transposing one resolves the governance keys in the user's favour instead of the administrator's. Supplying only one layer returns it unchanged, and supplying neither returns an empty object. Rejects a managed `autoTier` that is neither a user-configurable tier nor a single-key overridable form, rather than silently dropping it.\n\nArgs:\n    params: The managed (enterprise policy) layer and the user layer to fold together. The field names carry the layer identity: nothing about a settings object identifies which layer produced it, so a generic base/override pair would let a caller transpose them and silently resolve the governance keys in the user's favour.\n\nReturns:\n    The user layer folded over the managed layer.\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 UserSettingsMergeManagedAndUserResult.from_dict(await self._client.request("user.settings.mergeManagedAndUser", params_dict, **_timeout_kwargs(timeout)))
+
+    async def _merge_repo_value(self, params: _UserSettingsMergeRepoValueParams, *, timeout: float | None = None) -> UserSettingsMergeRepoValueResult:
+        "Folds a repository's settings layer into the user layer. Each repo-overridable key carries a directional policy chosen so a repository can only add restrictions and never relax the user's own. The two per-entry managed control maps are the exception those directional rules cannot express — a repository may legitimately enable plugins and declare marketplaces — so they are re-stamped afterwards from the runtime's ambient managed policy. That makes the result depend on the runtime process's managed state and not on the arguments alone: a host must call this rather than reimplement the fold, or a repository could relax a restriction the administrator imposed. Rejects when either layer is not a JSON object.\n\nArgs:\n    params: The user layer and the repository layer to fold together.\n\nReturns:\n    The repository layer folded into the user layer.\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 UserSettingsMergeRepoValueResult.from_dict(await self._client.request("user.settings.mergeRepoValue", params_dict, **_timeout_kwargs(timeout)))
+
+    async def _migrate_staff_update_channel_once(self, params: UserSettingsHostContext, *, timeout: float | None = None) -> _UserSettingsMigrateStaffUpdateChannelOnceResult:
+        "Runs the one-time migration that moves a staff account's update channel to stable, and records that it ran. Idempotent and self-gating: it takes a lock over the global-state file, re-reads the completion stamp inside it, and returns `current` rather than migrating twice, so two hosts racing at startup cannot both migrate. Only a `migrated` status means the persisted settings changed and the caller should reload them. An account on the experimental channel is deliberately left alone and reported as `excluded-experimental`.\n\nArgs:\n    params: The filesystem and environment facts a user-settings file is resolved from. Passed explicitly rather than read from the runtime's own process, so a host whose configuration directory differs from its process environment resolves the file it means.\n\nReturns:\n    The outcome of the one-time staff update-channel migration.\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 _UserSettingsMigrateStaffUpdateChannelOnceResult.from_dict(await self._client.request("user.settings.migrateStaffUpdateChannelOnce", params_dict, **_timeout_kwargs(timeout)))
+
+    async def _reset_staff_model_selection_once(self, params: _UserSettingsResetStaffModelSelectionOnceRequest, *, timeout: float | None = None) -> _UserSettingsResetStaffModelSelectionOnceResult:
+        "Runs the one-time reset that clears a staff account's pinned model selection, and reports the timestamp the host should record. Idempotent and self-gating: the reset is gated on a fixed cutoff, so a caller that passes back the timestamp it recorded gets `didReset: false` rather than a second reset. It applies to staff accounts only; any other account is reported as not reset without the settings document being opened. Only `didReset: true` means the persisted settings changed, and only then are the updated settings returned for the host to adopt.\n\nArgs:\n    params: Selects the configuration directory to run the one-time staff model-selection reset against, and supplies the caller's record of whether it has already run.\n\nReturns:\n    The outcome of the one-time staff model-selection reset.\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 _UserSettingsResetStaffModelSelectionOnceResult.from_dict(await self._client.request("user.settings.resetStaffModelSelectionOnce", params_dict, **_timeout_kwargs(timeout)))
+
+    async def _get_unknown_keys_warning(self, params: _UserSettingsUnknownKeysWarningRequest, *, timeout: float | None = None) -> _UserSettingsUnknownKeysWarningResult:
+        "Reports the top-level keys in the user settings document that the runtime does not recognize, phrased for display to the user. This is a separate question from the warning `user.settings.loadWithWarning` returns: that one describes parts of the document the loader had to ignore to load the rest, whereas an unknown key parses cleanly and is simply not a setting, so a host that surfaces only the load warning silently accepts a misspelled key that will never take effect. Nothing is reported when the document is absent, unreadable, or failed to load, because an unknown-key list derived from a document the runtime could not read would be misleading rather than helpful. Inspection never modifies the document.\n\nArgs:\n    params: Selects the configuration directory whose user settings document should be inspected for unrecognized top-level keys.\n\nReturns:\n    The unrecognized top-level keys found in the user settings document, already phrased for display.\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 _UserSettingsUnknownKeysWarningResult.from_dict(await self._client.request("user.settings.getUnknownKeysWarning", params_dict, **_timeout_kwargs(timeout)))
+
+    async def _build_runtime(self, params: _UserSettingsBuildRuntimeRequest, *, timeout: float | None = None) -> dict:
+        "Resolves the effective runtime settings for a host that is about to start a session, layering the given overrides over the settings documents, the environment and the platform defaults. A host cannot assemble this itself: the precedence between a user document, a repository document, the managed layers and the environment is the runtime's own rule, and a host that re-implements it drifts from the server it is configuring. The working directory, environment and platform are taken as arguments rather than read from the server process, so a host resolving settings for a directory other than its own gets that directory's answer. Nothing is written; this only computes.\n\nArgs:\n    params: The overrides and host context to resolve effective runtime settings from.\n\nReturns:\n    The effective runtime settings, keyed by setting name. Keys this runtime does not recognize are preserved rather than dropped, so a caller reading a document written by a newer runtime keeps every value.\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 dict(await self._client.request("user.settings.buildRuntime", params_dict, **_timeout_kwargs(timeout)))
+
+    async def _migrate_staff_log_level_once(self, params: _UserSettingsMigrateStaffLogLevelOnceRequest, *, timeout: float | None = None) -> _UserSettingsMigrateStaffLogLevelOnceResult:
+        "Runs the one-time migration that moves a staff account's log level to the current default, and records that it ran. Idempotent and self-gating: it takes a lock over the global-state file and re-reads the completion stamp inside it, so two hosts racing at startup cannot both migrate. Only `refreshed` can have changed the persisted settings, and the settings it returns are the document re-read after the write, so a host should adopt them rather than reloading separately and racing the next writer.\n\nArgs:\n    params: Selects the configuration directory to run the one-time staff log-level migration against, and supplies the caller's record of whether it has already run.\n\nReturns:\n    The outcome of the one-time staff log-level migration.\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 _UserSettingsMigrateStaffLogLevelOnceResult.from_dict(await self._client.request("user.settings.migrateStaffLogLevelOnce", params_dict, **_timeout_kwargs(timeout)))
+
+    async def _migrate_obsolete_on_disk(self, params: _UserSettingsMigrateObsoleteOnDiskRequest, *, timeout: float | None = None) -> _UserSettingsMigrateObsoleteOnDiskResult:
+        "Runs the one-time cleanup that removes obsolete CLI-owned settings and legacy rubber-duck keys from the user's settings document, and reports what it did. Idempotent and safe to call on every startup: with nothing obsolete left it reports `unchanged` and writes nothing. The cleanup preserves every key it does not recognize, so a setting written by a newer host is never dropped by an older one, and a document that fails to parse is reported `invalid` and left untouched rather than rewritten from a partial read. The cleaned document is not returned: it is written before this replies, so `user.settings.load` reads it authoritatively. A host that surfaces unrecognized keys through `user.settings.unknownKeys` wants this first, because the keys this retires would otherwise be shown to the user as if they were misspelled settings.\n\nArgs:\n    params: Selects the configuration directory whose settings document to clean.\n\nReturns:\n    The outcome of the one-time obsolete-settings cleanup.\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 _UserSettingsMigrateObsoleteOnDiskResult.from_dict(await self._client.request("user.settings.migrateObsoleteOnDisk", params_dict, **_timeout_kwargs(timeout)))
+
+    async def _get_paths(self, params: UserSettingsGetPathsRequest, *, timeout: float | None = None) -> UserSettingsGetPathsResult:
+        "Resolves the on-disk locations of the settings files this runtime reads, so a consumer can show or open them. The user path is the same file `user.settings.get`, `user.settings.load`, and `user.settings.set` operate on. Supply `repoRoot` to also resolve that repository's checked-in and local settings paths. A path is reported whether or not the file exists.\n\nArgs:\n    params: Selects which settings file paths to resolve.\n\nReturns:\n    On-disk locations of the settings files this runtime reads. A path is reported whether or not the file exists.\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 UserSettingsGetPathsResult.from_dict(await self._client.request("user.settings.getPaths", params_dict, **_timeout_kwargs(timeout)))
+
+    async def _list_governance_keys(self, *, timeout: float | None = None) -> UserSettingsGovernanceKeysResult:
+        "Lists the top-level user-setting keys by who is allowed to govern them: `repo` keys a repository may override through `.github/copilot/settings.json`, `claudeRepo` keys a repository may override through a Claude-compatible config, and `managed` keys an enterprise policy may fix. The lists are static for a given runtime build and fail closed: a key absent from a list cannot be governed that way.\n\nReturns:\n    Top-level user-setting keys grouped by who may govern them.\n\n:meta private:\n\nInternal SDK API; not part of the public surface."
+        return UserSettingsGovernanceKeysResult.from_dict(await self._client.request("user.settings.listGovernanceKeys", {}, **_timeout_kwargs(timeout)))
+
+    async def _edit(self, params: _UserSettingsEditRequest, *, timeout: float | None = None) -> _SettingsEditResult:
+        "Atomically edits one canonical user setting inside its settings-file lock. Reads, canonicalizes touched aliases, applies the edit, validates the resulting top-level setting and writes before releasing the lock. An explicit autoUpdatesChannel set completes the staff migration in the same transaction. Only a malformed existing file returns `invalid`; refused keys, invalid values and I/O errors reject the call.\n\nArgs:\n    params: One atomic edit of a canonical setting in settings.json.\n\nReturns:\n    Outcome of an atomic user or repository settings edit.\n\n:meta private:\n\nInternal SDK API; not part of the public surface."
+        params_dict = params.to_dict()
+        return _SettingsEditResult.from_dict(await self._client.request("user.settings.edit", params_dict, **_timeout_kwargs(timeout)))
+
+    async def _normalize(self, params: UserSettingsNormalizeRequest, *, timeout: float | None = None) -> UserSettingsNormalizeResult:
+        "Rewrites legacy and snake_case setting names in a settings object to their canonical spelling. A caller editing settings.json must normalize before writing: a legacy key left in place survives the write, is re-normalized on the next load, and silently shadows the canonical value the write just stored.\n\nArgs:\n    params: Settings object whose key names should be canonicalized.\n\nReturns:\n    Settings object with canonical key names.\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 UserSettingsNormalizeResult.from_dict(await self._client.request("user.settings.normalize", params_dict, **_timeout_kwargs(timeout)))
+
+    async def _diagnose_problems(self, params: UserSettingsProblemsRequest, *, timeout: float | None = None) -> UserSettingsProblemsResult:
+        "Diagnoses a set of already-loaded settings layers, reporting each key that will not take effect and why. Settings load tolerantly so that one bad key does not stop a session from starting; this method surfaces what was dropped so a caller can report it instead of silently ignoring the user's intent. Takes the layers as given rather than reading them, so a caller can diagnose exactly the content it is showing, including unsaved edits. Never echoes a setting's value, because a value may be a token or another secret. Marked internal because it exists to carry a CLI call site off the native addon, not to serve a consumer-facing need; it becomes public once an SDK consumer needs to inspect settings health itself.\n\nArgs:\n    params: The settings layers to diagnose.\n\nReturns:\n    The settings that will not take effect across the given layers.\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 UserSettingsProblemsResult.from_dict(await self._client.request("user.settings.diagnoseProblems", params_dict, **_timeout_kwargs(timeout)))
+
+    async def _apply_top_key(self, params: UserSettingsApplyTopKeyRequest, *, timeout: float | None = None) -> UserSettingsApplyTopKeyResult:
+        "Validates one top-level setting subtree and writes just that key to settings.json as a single step. Doing both here closes the race a caller cannot close itself: between a separate preflight read and the write, the file may change. Rewriting only the touched key keeps legacy siblings out of settings.json. Answers a status rather than failing, so a validation problem and a write problem stay distinguishable.\n\nArgs:\n    params: A single top-level setting subtree to validate and write.\n\nReturns:\n    Outcome of validating and writing one top-level setting subtree.\n\n:meta private:\n\nInternal SDK API; not part of the public surface."
+        params_dict = params.to_dict()
+        return UserSettingsApplyTopKeyResult.from_dict(await self._client.request("user.settings.applyTopKey", params_dict, **_timeout_kwargs(timeout)))
+
+    async def _write_all(self, params: UserSettingsWriteAllRequest, *, timeout: float | None = None) -> None:
+        "Replaces the user settings file's entire content in one write. A key absent from `settings` is removed, which is what distinguishes this from `user.settings.set`: that one merges, so it can never clear a key the caller has dropped. For a caller saving the result of a raw edit, a merge would silently resurrect every key the user deleted. Records the same one-time mutation marks a per-key write records, so a setting the user has now chosen explicitly stops being migrated for them.\n\nArgs:\n    params: The whole content to store in the user settings file.\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}
+        await self._client.request("user.settings.writeAll", params_dict, **_timeout_kwargs(timeout))
+
+    async def _update(self, params: _UserSettingsUpdateRequest, *, timeout: float | None = None) -> _UserSettingsUpdateResult:
+        "Merges a partial object into one top-level user setting, re-reading the stored value inside this runtime process's settings.json write lock so that concurrent writers in this process to different sub-fields of the same key do not clobber each other. Unlike `user.settings.set`, which replaces a key's whole value with what the caller last read, this keeps sub-fields the caller did not name when both the stored value and supplied value are objects; otherwise the supplied value replaces the stored value. Use it whenever two independent surfaces own different sub-fields of one setting. Returns the key's stored value after the write, in `value`.\n\nArgs:\n    params: Names the user setting to merge into, and the partial object to merge.\n\nReturns:\n    The stored value of the user setting after the merge.\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 _UserSettingsUpdateResult.from_dict(await self._client.request("user.settings.update", params_dict, **_timeout_kwargs(timeout)))
+
+    async def _load_for_edit(self, *, timeout: float | None = None) -> UserSettingsLoadForEditResult:
+        "Reads settings.json as stored for a caller that is about to edit it. Unlike `user.settings.get`, this returns file values rather than per-key metadata and defaults. Reports `missing` for an absent file and `invalid` when the existing file will not parse. Retired config.json and extensionless files are not read.\n\nReturns:\n    Contents of settings.json as stored, for a caller about to rewrite it.\n\n:meta private:\n\nInternal SDK API; not part of the public surface."
+        return UserSettingsLoadForEditResult.from_dict(await self._client.request("user.settings.loadForEdit", {}, **_timeout_kwargs(timeout)))
+
+    async def _validate(self, params: UserSettingsValidateRequest, *, timeout: float | None = None) -> UserSettingsValidateResult:
+        "Validates one top-level setting subtree without writing it, reporting each problem with the path it applies to. Scoped to a single top-level key on purpose: validating the whole file would reject an edit whenever an unrelated pre-existing field is malformed, locking the user out of the very tool that could fix it.\n\nArgs:\n    params: A single top-level setting subtree to validate.\n\nReturns:\n    Outcome of validating one top-level setting subtree.\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 UserSettingsValidateResult.from_dict(await self._client.request("user.settings.validate", params_dict, **_timeout_kwargs(timeout)))
+
+
+# Experimental: this API group is experimental and may change or be removed.
+class _InternalServerUserApi:
+    def __init__(self, client: "JsonRpcClient"):
+        self._client = client
+        self.settings = _InternalServerUserSettingsApi(client)
+
+
+# Experimental: this API group is experimental and may change or be removed.
+class _InternalServerRepoSettingsApi:
+    def __init__(self, client: "JsonRpcClient"):
+        self._client = client
+
+    async def _edit(self, params: _RepoSettingsEditRequest, *, timeout: float | None = None) -> _SettingsEditResult:
+        "Atomically edits one allowed top-level repository setting. Reads the raw file, preserves unrelated keys, applies one scalar or list edit, validates the result and writes under one file lock, so concurrent sibling or list edits are not lost. A malformed or unsafe existing file returns `invalid` without a write; rejected keys, invalid values and I/O errors reject the call.\n\nArgs:\n    params: One atomic edit of an allowed top-level repository setting.\n\nReturns:\n    Outcome of an atomic user or repository settings edit.\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 _SettingsEditResult.from_dict(await self._client.request("repo.settings.edit", params_dict, **_timeout_kwargs(timeout)))
+
+    async def _read_raw(self, params: _RepoSettingsReadRawRequest, *, timeout: float | None = None) -> _RepoSettingsReadRawResult:
+        "Reads one repository settings file without settings normalization or layering. The existing JSONC parser accepts comments and trailing commas and applies its prototype-safety rules. Missing or blank files return an empty valid config. Invalid files return an empty config with invalid=true; other read failures reject.\n\nArgs:\n    params: Which repository settings file to read.\n\nReturns:\n    Parsed repository settings without normalization or layering.\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 _RepoSettingsReadRawResult.from_dict(await self._client.request("repo.settings.readRaw", params_dict, **_timeout_kwargs(timeout)))
+
+    async def _write_key(self, params: _RepoSettingsWriteKeyRequest, *, timeout: float | None = None) -> None:
+        "Writes or removes one allowed top-level repository setting through the existing validator and file lock. Preserves unrelated stored keys. Invalid keys, values, existing documents, and I/O errors reject without replacing the file. Deletion requires delete=true; otherwise value must be present.\n\nArgs:\n    params: One key to write or remove in a repository settings file.\n\n:meta private:\n\nInternal SDK API; not part of the public surface."
+        params_dict = params.to_dict()
+        await self._client.request("repo.settings.writeKey", params_dict, **_timeout_kwargs(timeout))
+
+    async def _write_all(self, params: _RepoSettingsWriteAllRequest, *, timeout: float | None = None) -> None:
+        "Replaces the repository-overridable settings in one locked write. Allowed keys present in settings are validated and written; allowed keys absent from settings are removed. Other input keys are ignored, and unknown keys already stored in the file remain unchanged. Invalid values or an invalid existing file reject without a partial write.\n\nArgs:\n    params: The complete set of repository-overridable settings to store.\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}
+        await self._client.request("repo.settings.writeAll", params_dict, **_timeout_kwargs(timeout))
+
+
+# Experimental: this API group is experimental and may change or be removed.
+class _InternalServerRepoApi:
+    def __init__(self, client: "JsonRpcClient"):
+        self._client = client
+        self.settings = _InternalServerRepoSettingsApi(client)
+
+
+# Experimental: this API group is experimental and may change or be removed.
+class _InternalServerFeatureFlagsApi:
+    def __init__(self, client: "JsonRpcClient"):
+        self._client = client
+
+    async def _resolve_startup_gates(self, params: _FeatureFlagsResolveStartupGatesRequest, *, timeout: float | None = None) -> dict:
+        "Resolves named gates against this installation's cached online-experiment assignment, for the account the runtime is already authenticated as. Unlike `featureFlags.resolve`, which layers static availability with the populations supplied, this reads the experiment assignment the runtime cached for its own current authentication, so a launch can honor a rollout before any session exists. The account is never taken from the request: naming one would read another account's cached assignments. The cached assignment answers immediately and any network refresh happens behind it, so this call does not wait on the network. Not available to an extension, which cannot carry the user's consent to read their assignment.\n\nArgs:\n    params: Caller population and startup inputs to resolve named online-experiment gates for. Carries no account: the runtime resolves the assignment for the authentication it already holds.\n\nReturns:\n    The resolved gates, keyed by flag name.\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 dict(await self._client.request("featureFlags.resolveStartupGates", params_dict, **_timeout_kwargs(timeout)))
+
+    async def _list_metadata(self, *, timeout: float | None = None) -> _FeatureFlagsMetadataResult:
+        "Lists every feature flag this runtime declares, with the population each one is declared for, its experimental description, and the online-experiment flag it maps to. This is the static catalog: it describes how each flag is defined, not whether it is on for anyone. Use `featureFlags.resolve` for static values with caller overrides, not active runtime values or experiment assignments.\n\nReturns:\n    Every feature flag this runtime declares, with the shape each one was declared with.\n\n:meta private:\n\nInternal SDK API; not part of the public surface."
+        return _FeatureFlagsMetadataResult.from_dict(await self._client.request("featureFlags.listMetadata", {}, **_timeout_kwargs(timeout)))
+
+    async def _resolve(self, params: _FeatureFlagsResolveRequest, *, timeout: float | None = None) -> dict:
+        "Computes static feature flags from the supplied population and overrides without changing runtime state or verifying audience membership. Starts from declared availability, then applies direct feature-flag environment values, user settings, and explicit `flagOverrides`. It does not apply `COPILOT_EXP_*` experiment assignments, authenticated startup gates, or active runtime state. Settings include `enabledFeatureFlags`, the legacy `feature_flags.enabled` list, and supported convenience settings. Supply `baseFlags` to use an existing flag set instead of declared availability. Omit `isStaffGitHub` or `isStaffMicrosoft` when membership was never recorded: a legacy staff account then counts as both populations.\n\nArgs:\n    params: Caller population and overrides for static feature-flag resolution, independent of experiment assignments and active runtime state.\n\nReturns:\n    The resolved feature flags, keyed by flag name.\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 dict(await self._client.request("featureFlags.resolve", params_dict, **_timeout_kwargs(timeout)))
+
+
+# Experimental: this API group is experimental and may change or be removed.
+class _InternalServerPermissionsLocationsApi:
+    def __init__(self, client: "JsonRpcClient"):
+        self._client = client
+
+    async def _cleanup_orphaned(self, *, timeout: float | None = None) -> _LocationPermissionsCleanupResult:
+        "Drops stored per-location permission grants whose directory no longer exists, and reports which location keys were removed. Runs against the permission store under the runtime's own Copilot home, the same store `session.permissions.locations.resolve` reads. Marked internal because it exists to carry a CLI call site off the napi boundary onto the SDK contract; it is migration plumbing, not a surface consumers are meant to depend on. It can become public once an SDK consumer needs to prune its own permission store.\n\nReturns:\n    Which stored location permissions were dropped because their directory is gone.\n\n:meta private:\n\nInternal SDK API; not part of the public surface."
+        return _LocationPermissionsCleanupResult.from_dict(await self._client.request("permissions.locations.cleanupOrphaned", {}, **_timeout_kwargs(timeout)))
+
+
+# Experimental: this API group is experimental and may change or be removed.
+class _InternalServerPermissionsFolderTrustApi:
+    def __init__(self, client: "JsonRpcClient"):
+        self._client = client
+
+    async def _check_trust(self, params: _FolderTrustIsTrustedParams, *, timeout: float | None = None) -> FolderTrustCheckResult:
+        "Reports whether a folder is trusted, reading the persisted trusted-folders list directly rather than through a session. Use this from a host that has no session yet, such as a one-shot command deciding whether to honor a checkout's own settings. It differs from the session-scoped check in two ways that matter: it takes the configuration directory to read the list from, instead of inheriting the session's, and it answers only from the persisted list, so trust a user granted for the lifetime of one session is not visible here. A host that has a session should prefer the session-scoped check, which also covers session-only trust.\n\nArgs:\n    params: A folder to check against a persisted trusted-folders list, and the configuration directory holding that list.\n\nReturns:\n    Folder trust check result.\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 FolderTrustCheckResult.from_dict(await self._client.request("permissions.folderTrust.checkTrust", params_dict, **_timeout_kwargs(timeout)))
+
+
+# Experimental: this API group is experimental and may change or be removed.
+class _InternalServerPermissionsApi:
+    def __init__(self, client: "JsonRpcClient"):
+        self._client = client
+        self.locations = _InternalServerPermissionsLocationsApi(client)
+        self.folder_trust = _InternalServerPermissionsFolderTrustApi(client)
+
+    async def _evaluate_managed_policy(self, params: _PermissionsEvaluateManagedPolicyParams, *, timeout: float | None = None) -> PermissionsEvaluateManagedPolicyResult:
+        "Interprets a verbatim managed `permissions` slice into the three policy questions a host asks before granting elevated permissions: whether bypass-permissions mode is forbidden, whether a policy exists that this build could not determine, and whether the layer supplies permission rules the session must enforce. An absent or empty slice means no managed policy applies. The runtime and its permission service share one policy type, so a new managed permission setting is interpreted in exactly one place; a host that reimplements the reading would silently diverge the first time that set grows. Hosts must fail closed on an undetermined policy rather than treating it as permission granted.\n\nArgs:\n    params: The verbatim managed `permissions` slice to interpret.\n\nReturns:\n    The policy questions a host asks before granting elevated permissions.\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 PermissionsEvaluateManagedPolicyResult.from_dict(await self._client.request("permissions.evaluateManagedPolicy", params_dict, **_timeout_kwargs(timeout)))
+
+
+# Experimental: this API group is experimental and may change or be removed.
+class _InternalServerManagedSettingsApi:
+    def __init__(self, client: "JsonRpcClient"):
+        self._client = client
+
+    async def _read_device(self, *, timeout: float | None = None) -> _ManagedSettingsReadDeviceResult:
+        "Discovers device-managed settings the way the runtime's own device layer does, and reports the sandbox floor and the load outcome alongside the validated document. This differs from `managedSettings.read` in three ways a policy-enforcing host depends on: a document that validates to an empty object is reported as absent rather than as an empty policy, a discovery error does not suppress a document that still validates, and a failure is reported as a flag rather than only as error text. Hosts that compose the device layer into an effective policy use this, because `managedSettings.read` cannot distinguish \"no device policy\" from \"device policy could not be read\" and would silently hand the user's own layer the win.\n\nReturns:\n    The device-managed settings layer, with the sandbox floor and the load outcome a host needs to compose it into an effective policy.\n\n:meta private:\n\nInternal SDK API; not part of the public surface."
+        return _ManagedSettingsReadDeviceResult.from_dict(await self._client.request("managedSettings.readDevice", {}, **_timeout_kwargs(timeout)))
+
+    async def _retain_policy(self, params: _ManagedSettingsRetainPolicyParams, *, timeout: float | None = None) -> None:
+        "Retains the supplied managed layers as this runtime process's startup policy and re-applies the result to every live session. Hosts that own their own short-lived process policy use this, so a guarded mutation is checked against the policy the host actually fetched. Retaining is a whole-process replacement rather than a merge, so a host that already resolved a good policy must not retain a partial one over it. The failure flags are honest inputs rather than assumptions: reporting a fetch or load that failed keeps the layers already retained, and the interim fail-closed state, instead of clearing them.\n\nArgs:\n    params: The managed layers to retain as this process's startup policy, with the outcome of fetching each one.\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}
+        await self._client.request("managedSettings.retainPolicy", params_dict, **_timeout_kwargs(timeout))
+
+    async def _apply_controls(self, params: _ManagedSettingsApplyControlsParams, *, timeout: float | None = None) -> _ManagedSettingsApplyControlsResult:
+        "Stamps an effective managed policy's individually-controlled entries onto a user settings document, returning the settings a host should actually act on. The managed layer wins on every plugin spec and marketplace name it names, and leaves everything it does not name as the user wrote it. Hosts use this rather than merging the two documents themselves, because the merge is per entry rather than per document and a whole-document overlay would either discard the user's unmanaged entries or let a user entry outrank a managed one. Omitting the managed layer returns the settings unchanged, which is what an unmanaged host wants. Rejects when either document is present but is not a JSON object rather than treating it as absent, since silently dropping a malformed policy hands the user's layer the win on exactly the entries the policy exists to control.\n\nArgs:\n    params: A user settings document and the effective managed policy whose controlled entries should be stamped onto it.\n\nReturns:\n    The user settings with the managed layer's controlled entries stamped on.\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 _ManagedSettingsApplyControlsResult.from_dict(await self._client.request("managedSettings.applyControls", params_dict, **_timeout_kwargs(timeout)))
+
+    async def _parse_client_value(self, params: _ManagedSettingsParseClientValueParams, *, timeout: float | None = None) -> _ManagedSettingsParseClientValueResult:
+        "Validates the managed settings a client is supplying for a session it is about to open, and returns them reduced to the keys a client is allowed to set. A client-supplied policy is not the same thing as an administrator's: it may only narrow permissions, so this accepts `permissions` and rejects every other key outright rather than ignoring it. Rejecting is the point — a host that silently dropped an unsupported key would report a policy as applied while running without it. Hosts call this before opening the session rather than letting the open fail, so a malformed policy is reported against the request that carried it. The runtime applies the same rule again when the session starts, so this cannot be used to smuggle a wider document past it. An accepted document that sets nothing comes back as an empty object, which is distinct from supplying nothing at all.\n\nArgs:\n    params: The client-supplied managed settings to validate and normalize. Omitting them is valid and yields no policy.\n\nReturns:\n    The accepted managed settings, reduced to the keys a client is allowed to set.\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 _ManagedSettingsParseClientValueResult.from_dict(await self._client.request("managedSettings.parseClientValue", params_dict, **_timeout_kwargs(timeout)))
+
+    async def _resolve_effective_value(self, params: _ManagedSettingsResolveEffectiveValueParams, *, timeout: float | None = None) -> _ManagedSettingsResolveEffectiveValueResult:
+        "Composes the supplied server, device/MDM, device sandbox floor and policy-helper layers into the single effective managed policy a host should enforce, resolving each key across the layers by the runtime's own precedence rules. Hosts that assemble managed layers themselves use this so their precedence matches the runtime's exactly instead of reimplementing it. The composition is not a pure function of its inputs: an advisory sandbox force-on that arrived over the server channel is declined when this host cannot run a sandbox, so the result reflects the runtime host's capabilities, and the returned settings carry `sandboxAdvisoryFloorDeclined: true` when that happened. Enforced channels (device/MDM and policy helper) are never declined, and a server force-on carrying `failIfUnavailable` is preserved so the session fails loudly instead of quietly running unsandboxed. Rejects when a supplied layer is present but is not a JSON object, rather than treating it as unmanaged, because silently dropping a malformed policy would hand the user's own layer the win on exactly the keys the policy exists to control.\n\nArgs:\n    params: The managed-settings layers to compose into an effective policy. Every layer is optional; omitting all of them yields no effective policy.\n\nReturns:\n    The effective managed policy composed from the supplied layers.\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 _ManagedSettingsResolveEffectiveValueResult.from_dict(await self._client.request("managedSettings.resolveEffectiveValue", params_dict, **_timeout_kwargs(timeout)))
+
+    async def _resolve_bypass_disable_transition(self, params: _ManagedSettingsResolveBypassDisableTransitionParams, *, timeout: float | None = None) -> _ManagedSettingsResolveBypassDisableTransitionResult:
+        "Decides what a host must do to its bypass-permissions state after a managed-policy resolution lands, given the state already in force and the account now signed in. A host holds two pieces of state — which layer disabled bypass mode, and for a server-delivered disable, the account it was pinned to — and cannot decide the next step from the new policy alone. Three rules make that so, and each one is a control rather than a preference. A device/MDM disable outranks the account, so a later server answer never lifts it. An unknown policy, which is what a failed fetch or a refusal this build cannot enforce yields, preserves whatever is in force instead of reverting to permissive. And a server disable is lifted only when the account it was pinned to is no longer the signed-in one, which is what makes signing in to an unrestricted account recover without a restart while a reconnect on the same restricted account does not. Hosts call this rather than reimplementing it because getting the pinning backwards either strands a disable on an account that never carried one or drops one that still applies. `setDisabledState` is omitted when the host must leave its stored flag untouched, which is distinct from being told to set it to false.\n\nArgs:\n    params: The bypass-permissions state a host holds today, the account now signed in, and what the managed-policy resolution said.\n\nReturns:\n    The bypass-permissions state a host should hold after the resolution, and what it must do to get there.\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 _ManagedSettingsResolveBypassDisableTransitionResult.from_dict(await self._client.request("managedSettings.resolveBypassDisableTransition", params_dict, **_timeout_kwargs(timeout)))
+
+    async def _ingest(self, params: _ManagedSettingsIngestParams, *, timeout: float | None = None) -> _ManagedSettingsIngestResult:
+        "Resolves managed (enterprise policy) settings for a host from every layer at once: the account's server-delivered policy, the device/MDM layer, and a platform policy helper. Hosts use this instead of fetching and composing the layers themselves, because the per-layer precedence and the fail-closed rules that apply when a layer cannot be confirmed are the runtime's own and must match the policy a session will later enforce. It does not retain or apply anything to process-global policy state, so a host may call it before any session exists — which is the point, since plugin activation and one-shot commands resolve policy before a session is available to carry it. The returned per-layer outcome flags are load-bearing rather than diagnostic: a host must distinguish an unmanaged device from a managed device whose policy could not be confirmed, and apply its fail-closed gates in the second case. Reports its diagnostics in `logMessages` rather than logging them, so a host that runs before a log sink exists still sees them.\n\nArgs:\n    params: Inputs describing the host and account an ingestion should resolve managed policy for.\n\nReturns:\n    The managed policy layers an ingestion resolved, together with the per-layer outcome flags a host needs to decide how much to trust the result. The flags are reported rather than folded into the settings because a host must be able to distinguish an unmanaged device from a managed device whose policy could not be confirmed, and apply its fail-closed gates in the second case.\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 _ManagedSettingsIngestResult.from_dict(await self._client.request("managedSettings.ingest", params_dict, **_timeout_kwargs(timeout)))
+
+    async def _resolve_startup_policy(self, params: _ManagedSettingsResolveStartupPolicyParams, *, timeout: float | None = None) -> _ManagedSettingsResolveStartupPolicyResult:
+        "Resolves the managed (enterprise policy) settings a host must enforce from startup, and judges the account against the enterprise sign-in pin in the same pass. This composes the layers the way `managedSettings.ingest` does and then answers the two questions a host cannot answer for itself: which fail-closed floors apply when a layer could not be confirmed, and whether this credential is allowed to sign in at all. The sign-in verdict is the reason a host must not assemble this itself from `managedSettings.ingest` — a pinned organization is an access control, and a host that composed the layers but skipped the pin would let a developer sign in with a personal or another enterprise's account and escape every control that keys off the signed-in identity. The verdict is computed on every resolution, including one that is not retained, so declining to apply policy never widens access. Set `retainAndApply` to keep the resolved policy as this runtime process's startup policy; leave it false to resolve without side effects.\n\nArgs:\n    params: Inputs describing the host and account a startup policy resolution should run for. Mirrors `managedSettings.ingest`, and adds the decision of whether the resolved policy is retained for this runtime process.\n\nReturns:\n    The startup policy a resolution composed, the per-layer outcome flags a host needs to decide how much to trust it, and the enterprise sign-in verdict for the credential it ran against. The flags are reported rather than folded into the settings because a host must distinguish an unmanaged device from a managed device whose policy could not be confirmed, and apply its fail-closed gates in the second case.\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 _ManagedSettingsResolveStartupPolicyResult.from_dict(await self._client.request("managedSettings.resolveStartupPolicy", params_dict, **_timeout_kwargs(timeout)))
+
+    async def _load_remote_control(self, params: _ManagedSettingsLoadRemoteControlParams, *, timeout: float | None = None) -> _ManagedSettingsLoadRemoteControlResult:
+        "Resolves the managed `remoteControl` policy for an account on its own, for a host deciding whether a remote-control session may start. Composes the same layers as `managedSettings.ingest` and returns only that one key, so a host does not have to know which layer won. An absent policy means the account is unmanaged for this capability and the host may proceed; that default is safe only while absence really does mean \"no policy\", so a service refusal that says an account policy exists which this client is too old to enforce resolves to an explicit disabled policy instead of to absence. A resolution that cannot be completed is rejected rather than answered as absence, for the same reason.\n\nArgs:\n    params: Inputs describing the host and account whose managed remote-control policy should be resolved. Mirrors `managedSettings.ingest`, and deliberately carries no retention decision: reading this gate never becomes this runtime process's startup policy.\n\nReturns:\n    The managed remote-control policy in force for an account, if any. An absent policy means the account is unmanaged for this capability, which a host reads as allowed — so absence here is a positive statement that no policy applies, never a stand-in for a resolution that failed. A resolution that cannot be completed is rejected instead.\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 _ManagedSettingsLoadRemoteControlResult.from_dict(await self._client.request("managedSettings.loadRemoteControl", params_dict, **_timeout_kwargs(timeout)))
+
+    async def _resolve_device_force_login_orgs_gate(self, params: _ManagedSettingsResolveDeviceForceLoginOrgsGateParams, *, timeout: float | None = None) -> _ForceLoginOrgsDecision:
+        "Evaluates the device-channel enterprise sign-in pin (MDM plist, registry, or managed-settings file) against a credential, without resolving any server-delivered policy. This is the gate an entry point runs before it branches, and the only one that can refuse a developer's first sign-in: it is local, needs no credential, and a server-delivered pin only ever reaches accounts already inside the organization. It fails closed by construction — a discovery that cannot determine whether a pin exists refuses rather than allows, because a control that fails open under a triggerable condition is not a control. Hosts that also want the server channel should call `managedSettings.resolveStartupPolicy`, which folds both channels into one verdict.\n\nArgs:\n    params: The credential and environment to evaluate the device-channel sign-in pin against.\n\nReturns:\n    The verdict of the `forceLoginOrgs` enterprise sign-in pin for one credential. A managed device may pin Copilot to an approved set of GitHub organizations so a developer cannot sign in with a personal — or another enterprise's — account and escape every control that keys off the signed-in identity. A host must refuse to proceed when `allowed` is false; the remaining fields explain the refusal rather than qualifying it.\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 _ForceLoginOrgsDecision.from_dict(await self._client.request("managedSettings.resolveDeviceForceLoginOrgsGate", params_dict, **_timeout_kwargs(timeout)))
+
+
 # Experimental: this API group is experimental and may change or be removed.
 class _InternalServerHostApi:
     def __init__(self, client: "JsonRpcClient"):
@@ -53343,6 +61451,188 @@ async def _ready(self, params: HostReadyRequest, *, timeout: float | None = None
         return HostEmptyResult.from_dict(await self._client.request("host.ready", params_dict, **_timeout_kwargs(timeout)))
 
 
+# Experimental: this API group is experimental and may change or be removed.
+class _InternalServerAccountApi:
+    def __init__(self, client: "JsonRpcClient"):
+        self._client = client
+
+    async def _describe_auth_info(self, params: _AccountDescribeAuthInfoRequest, *, timeout: float | None = None) -> _AccountDescribeAuthInfoResult:
+        "Renders the sign-in banner and the one-line account description the runtime uses for an authentication identity. The runtime words these in several places for its own callers, so a host that announces a sign-in or an account switch should render them from here rather than composing its own, which would let the two spellings drift apart.\n\nArgs:\n    params: The authentication identity whose shared wording should be rendered.\n\nReturns:\n    The wording the runtime uses for an authentication identity.\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 _AccountDescribeAuthInfoResult.from_dict(await self._client.request("account.describeAuthInfo", params_dict, **_timeout_kwargs(timeout)))
+
+    async def _get_gist_support(self, params: _AccountGetGistSupportRequest, *, timeout: float | None = None) -> _AccountGetGistSupportResult:
+        "Reports whether the supplied identity can create gists. Gists are unavailable on GitHub Enterprise Cloud with data residency, and to Enterprise Managed Users on github.com, so a host that offers gist actions should hide or disable them when this reports no support.\n\nArgs:\n    params: The authentication identity whose gist support should be reported.\n\nReturns:\n    Whether the identity can create gists, and why not when it cannot.\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 _AccountGetGistSupportResult.from_dict(await self._client.request("account.getGistSupport", params_dict, **_timeout_kwargs(timeout)))
+
+    async def _get_web_url(self, params: _AccountGetWebURLRequest, *, timeout: float | None = None) -> _AccountGetWebURLResult:
+        "Resolves a path on the identity's GitHub host into an absolute URL, so a host can link to settings or documentation on the enterprise instance the user is signed in to rather than to github.com. Falls back to the public host when no identity is supplied.\n\nArgs:\n    params: A path to resolve against the GitHub host an identity is signed in to.\n\nReturns:\n    An absolute URL on the identity's GitHub host.\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 _AccountGetWebURLResult.from_dict(await self._client.request("account.getWebUrl", params_dict, **_timeout_kwargs(timeout)))
+
+    async def _get_token_env_var(self, *, timeout: float | None = None) -> _AccountGetTokenEnvVarResult:
+        "Names the environment variable supplying a classic personal access token, if one is set. A classic token cannot be upgraded in place, so a host that finds one should tell the user which variable to unset rather than starting an interactive sign-in that the variable would override.\n\nReturns:\n    The environment variable supplying a classic personal access token, when one is set.\n\n:meta private:\n\nInternal SDK API; not part of the public surface."
+        return _AccountGetTokenEnvVarResult.from_dict(await self._client.request("account.getTokenEnvVar", {}, **_timeout_kwargs(timeout)))
+
+
+# Experimental: this API group is experimental and may change or be removed.
+class _InternalServerMcpRegistryApi:
+    def __init__(self, client: "JsonRpcClient"):
+        self._client = client
+
+    async def _allocate_request_id(self, *, timeout: float | None = None) -> _MCPRegistryRequestIDResult:
+        "Allocates an ID for one cancellable MCP registry search. The ID exists before the search starts, so callers can cancel before it starts. The networking stack supplies the cancellation namespace. The runtime retains at most 1,024 unused IDs. At capacity, another allocation can reclaim an unused ID. Active searches retain their IDs until they finish.\n\nReturns:\n    Request id naming a cancellable registry search.\n\n:meta private:\n\nInternal SDK API; not part of the public surface."
+        return _MCPRegistryRequestIDResult.from_dict(await self._client.request("mcp.registry.allocateRequestId", {}, **_timeout_kwargs(timeout)))
+
+    async def _search(self, params: _MCPRegistrySearchRequest, *, timeout: float | None = None) -> _MCPRegistrySearchResult:
+        "Searches the MCP registry the supplied credential may read, resolving the registry endpoint from policy first. Hosts usually send credential-free `AuthIdentity`; a `token` identity can be resolved only when it embeds a token, while `env` and `gh-cli` identities can use a token embedded in the request first. The runtime follows registry pages, keeps the newest entry per server name, cuts the list to `limit`, and sorts an empty-query result by GitHub stars. Each server object is carried opaquely.\n\nArgs:\n    params: Registry search terms, the credential to search under, and the request id that makes the search cancellable.\n\nReturns:\n    Servers selected from the registry response.\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 _MCPRegistrySearchResult.from_dict(await self._client.request("mcp.registry.search", params_dict, **_timeout_kwargs(timeout)))
+
+    async def _cancel(self, params: _MCPRegistryCancelRequest, *, timeout: float | None = None) -> _MCPRegistryCancelResult:
+        "Abandons the registry search that uses the given request ID. It acts only on IDs from `mcp.registry.allocateRequestId`, so it never cancels another component's request. Answers `canceled: true` when it stops a running search. Answers `canceled: false` for unknown or reclaimed IDs, completed or canceled searches, and unused reservations. It releases an unused reservation, so a later search with that ID is refused.\n\nArgs:\n    params: Registry search to abandon.\n\nReturns:\n    Whether the cancel reached a live search.\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 _MCPRegistryCancelResult.from_dict(await self._client.request("mcp.registry.cancel", params_dict, **_timeout_kwargs(timeout)))
+
+
+# Experimental: this API group is experimental and may change or be removed.
+class _InternalServerMcpApi:
+    def __init__(self, client: "JsonRpcClient"):
+        self._client = client
+        self.registry = _InternalServerMcpRegistryApi(client)
+
+    async def _list_builtin_server_names(self, *, timeout: float | None = None) -> _MCPListBuiltinServerNamesResult:
+        "Lists the MCP servers the runtime supplies itself, so a host that disables the built-ins wholesale suppresses exactly the set the runtime would otherwise add. The names are fixed for a build and depend on no configuration, session or account.\n\nReturns:\n    Names of the MCP servers the runtime supplies itself.\n\n:meta private:\n\nInternal SDK API; not part of the public surface."
+        return _MCPListBuiltinServerNamesResult.from_dict(await self._client.request("mcp.listBuiltinServerNames", {}, **_timeout_kwargs(timeout)))
+
+    async def _should_exclude_git_hub_tools(self, params: _MCPShouldExcludeGitHubToolsRequest, *, timeout: float | None = None) -> _MCPShouldExcludeGitHubToolsResult:
+        "Reports whether the gh-replaceable GitHub MCP tools may be clipped for a session, which a host feeds back as the `excludeGhReplaceableTools` build option. The tools are redundant only when the session can reach a shell *and* the host has the `gh` that would replace them, so both halves are decided here. The shell half runs the platform shell tool through the runtime's own tool-filter matcher, so entry forms like `builtin:bash` and `builtin:*` behave exactly as they do when a session builds its tool catalog. The host half probes for `gh`, and is skipped entirely when the filters already rule the shell out. Host presence alone is not enough: a session restricted to, say, `view` would otherwise lose the built-in issue-read fallback while having no shell to replace it with. The answer describes the host the runtime runs on, so it is never forwarded to a remote engine.\n\nArgs:\n    params: The session tool filters that decide whether the session still has a shell to run `gh` with.\n\nReturns:\n    Whether the gh-replaceable GitHub MCP tools may be clipped for the session described by the request.\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 _MCPShouldExcludeGitHubToolsResult.from_dict(await self._client.request("mcp.shouldExcludeGitHubTools", params_dict, **_timeout_kwargs(timeout)))
+
+
+# Experimental: this API group is experimental and may change or be removed.
+class _InternalServerInstructionsApi:
+    def __init__(self, client: "JsonRpcClient"):
+        self._client = client
+
+    async def _get_init_prompt(self, *, timeout: float | None = None) -> _InstructionsInitPromptResult:
+        "Returns the prompt the `init` command runs to author repository instructions. A host offering its own initialize action sends this text so the instructions it produces match the ones the CLI produces. The text is fixed for a build and depends on no configuration, session or repository.\n\nReturns:\n    The prompt the init command runs.\n\n:meta private:\n\nInternal SDK API; not part of the public surface."
+        return _InstructionsInitPromptResult.from_dict(await self._client.request("instructions.getInitPrompt", {}, **_timeout_kwargs(timeout)))
+
+    async def _discover_repo_sources(self, params: _InstructionsDiscoverRepoSourcesRequest, *, timeout: float | None = None) -> ServerInstructionSourceList:
+        "Discovers the instruction sources for one caller-named location and returns them in the order the runtime applies them. `discover` answers for a set of project paths and derives the rest of its scope itself; this one instead takes every argument from the caller — the extra directories to scan and whether to descend into nested instruction files — and honors them as given. It also includes instruction directories from trusted repository settings, matching native repository discovery. Use it when the caller knows its own scope and no session exists to derive that scope from, such as a host reporting how many instruction files a directory contributes before any session starts. Marked internal because it exists to carry a CLI call site off the napi boundary onto the SDK contract; it is migration plumbing, not a surface consumers are meant to depend on.\n\nArgs:\n    params: Explicit discovery arguments for one location, supplied by the caller rather than derived from a session.\n\nReturns:\n    Instruction sources discovered across user, repository, and plugin sources.\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 ServerInstructionSourceList.from_dict(await self._client.request("instructions.discoverRepoSources", params_dict, **_timeout_kwargs(timeout)))
+
+    async def _clear_cache(self, *, timeout: float | None = None) -> None:
+        "Drops the runtime's in-memory cache of discovered custom instructions so the next discovery reads them from disk again. A host calls this after it changes instruction files, or after it trusts a folder whose instructions an earlier discovery skipped, so that a session started afterwards sees the current files instead of a cached earlier answer. The call performs no I/O of its own and removes nothing from disk; it only invalidates, so the cost lands on the next discovery.         Returns once the cache is clear, which is what lets a caller order a session start after it. Marked internal because it exists to carry a CLI call site off the napi boundary onto the SDK contract; it is migration plumbing, not a surface consumers are meant to depend on.\n\n:meta private:\n\nInternal SDK API; not part of the public surface."
+        await self._client.request("instructions.clearCache", {}, **_timeout_kwargs(timeout))
+
+
+# Experimental: this API group is experimental and may change or be removed.
+class _InternalServerAgentsApi:
+    def __init__(self, client: "JsonRpcClient"):
+        self._client = client
+
+    async def _get_builtins(self, *, timeout: float | None = None) -> _AgentsGetBuiltinsResult:
+        "Lists the agents this runtime ships, by name. A consumer separating shipped agents from ones the user or a plugin authored should compare against these names rather than against `AgentInfo.source`: an authored agent may carry the `builtin` source while not being one of these, and the runtime treats the two as separate questions. `disableableNames` is the subset a user may turn off, which a client needs to decide whether to offer a toggle. `yamlBasedNames` is the subset backed by a shipped YAML definition, which a client needs before asking the runtime to load one.\n\nReturns:\n    The agents this runtime ships, named so a consumer can tell them apart from authored ones.\n\n:meta private:\n\nInternal SDK API; not part of the public surface."
+        return _AgentsGetBuiltinsResult.from_dict(await self._client.request("agents.getBuiltins", {}, **_timeout_kwargs(timeout)))
+
+    async def _get_available_builtins(self, params: _AgentsGetAvailableBuiltinsRequest, *, timeout: float | None = None) -> _AgentsGetAvailableBuiltinsResult:
+        "Lists the shipped agents a client should offer right now, filtered by the feature flags it passes. `getBuiltins` names every agent the runtime knows about; some of those are gated, so a client rendering a picker wants this narrower list together with the description to show beside each name.\n\nArgs:\n    params: The feature flags to evaluate shipped agents against.\n\nReturns:\n    The shipped agents available under the requested flags.\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 _AgentsGetAvailableBuiltinsResult.from_dict(await self._client.request("agents.getAvailableBuiltins", params_dict, **_timeout_kwargs(timeout)))
+
+    async def _get_builtin_definition(self, params: _AgentsGetBuiltinDefinitionRequest, *, timeout: float | None = None) -> _AgentsGetBuiltinDefinitionResult:
+        "Loads one shipped agent's YAML definition, for a client that needs what the agent declares rather than only its name. `getBuiltins` reports which names have a definition to load: a name outside its `yamlBasedNames` is special-cased in code and has none. The definition crosses as its own JSON rather than as contract-typed fields, because the runtime parses it with the agent schema's tolerant shape and re-typing it here would drop the keys that shape accepts and this one does not. The projected `__nativeCustomAgent` view the runtime derives is included, so a caller reading the declared model and a caller rendering the agent see the same definition.\n\nArgs:\n    params: The shipped agent whose definition to load.\n\nReturns:\n    One shipped agent's definition.\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 _AgentsGetBuiltinDefinitionResult.from_dict(await self._client.request("agents.getBuiltinDefinition", params_dict, **_timeout_kwargs(timeout)))
+
+    async def _get_builtin_listing_definition(self, params: _AgentsGetBuiltinListingDefinitionRequest, *, timeout: float | None = None) -> _AgentsGetBuiltinListingDefinitionResult:
+        "Projects one shipped agent the way a picker lists it, reading only the metadata at the head of the definition file and stopping before the prompt body. `getBuiltinDefinition` answers the whole definition instead, so a client listing every shipped agent should prefer this one: the cost of a listing grows with the number of agents, and the prompt body is the part a listing never shows. The two also differ in shape. This returns the projected custom agent on its own, whereas `getBuiltinDefinition` returns the authored definition with that projection nested under `__nativeCustomAgent`.\n\nArgs:\n    params: The shipped agent whose listing entry to load.\n\nReturns:\n    One shipped agent, projected for a listing.\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 _AgentsGetBuiltinListingDefinitionResult.from_dict(await self._client.request("agents.getBuiltinListingDefinition", params_dict, **_timeout_kwargs(timeout)))
+
+    async def _custom_agent_initial_model_decision(self, params: _AgentsCustomAgentInitialModelDecisionParams, *, timeout: float | None = None) -> _AgentsCustomAgentInitialModelDecisionResult:
+        "Resolves the model a custom agent asks for against the models actually available, and answers both the model to switch to and the warning a user should see when the agent's preference cannot be met. A custom agent may name several acceptable models in preference order, so the decision is a match rather than a lookup, and an agent whose preference is unavailable is a normal outcome that produces a warning rather than an error. A host must call this rather than pick the first available name itself, because the preference order and the wording of the warning are what keep one installation's agent selection the same as another's.\n\nArgs:\n    params: The models a custom agent asks for, and the models actually available.\n\nReturns:\n    The model to switch to, and the warning to show when the agent's preference could not be met.\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 _AgentsCustomAgentInitialModelDecisionResult.from_dict(await self._client.request("agents.customAgentInitialModelDecision", params_dict, **_timeout_kwargs(timeout)))
+
+
+# Experimental: this API group is experimental and may change or be removed.
+class _InternalServerGlobalStateApi:
+    def __init__(self, client: "JsonRpcClient"):
+        self._client = client
+
+    async def _load(self, *, timeout: float | None = None) -> _GlobalStateLoadResult:
+        "Reads the host's machine-wide state: which plugins are installed and the one-off flags and timestamps that record what the user has already been shown or migrated. This is the state that outlives a single session and a single workspace, so a host reads it to decide whether to run a first-launch step, offer an onboarding prompt, or skip one it has already completed. The stored credentials are deliberately not part of this result; a caller that needs an authenticated identity asks the account methods for it instead. Reading is non-destructive and every field is optional, because a fresh install has recorded nothing yet.\n\nReturns:\n    The host's machine-wide state. Every field is optional because a fresh install has recorded nothing yet, so a reader must treat an absent field as `not yet`, never as a negative answer. Stored credentials are deliberately absent from this shape.\n\n:meta private:\n\nInternal SDK API; not part of the public surface."
+        return _GlobalStateLoadResult.from_dict(await self._client.request("globalState.load", {}, **_timeout_kwargs(timeout)))
+
+    async def _load_for_config_dir(self, params: _GlobalStateLoadForConfigDirRequest, *, timeout: float | None = None) -> _GlobalStateLoadResult:
+        "Reads the host's machine-wide state exactly as `globalState.load` does, but from a caller-supplied configuration directory instead of the one the server resolved for itself. Use this when a consumer scopes a session to its own Copilot home — the SDK's per-session `configDir` override — so the state read matches the directory that session actually uses. An absent or empty `configDir` resolves the server's own home, making this identical to `globalState.load`. The stored credentials are omitted here for the same reason they are omitted from `globalState.load`: a caller that needs an authenticated identity asks the account methods instead, so pointing this at another directory cannot be used to read the credentials kept in it.\n\nArgs:\n    params: Selects the configuration directory whose machine-wide state to read.\n\nReturns:\n    The host's machine-wide state. Every field is optional because a fresh install has recorded nothing yet, so a reader must treat an absent field as `not yet`, never as a negative answer. Stored credentials are deliberately absent from this shape.\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 _GlobalStateLoadResult.from_dict(await self._client.request("globalState.loadForConfigDir", params_dict, **_timeout_kwargs(timeout)))
+
+    async def _write_key(self, params: _GlobalStateWriteKeyRequest, *, timeout: float | None = None) -> None:
+        "Records one top-level key in the host's machine-wide state, the counterpart to `globalState.load`. A host calls this to remember that it has shown an onboarding step, asked a one-off question, or completed a migration, so the next run can skip it. Only the named key is replaced and the rest of the document is preserved, which lets two writers record different flags without overwriting each other; passing no value removes the key instead. Only the keys a host records itself are writable: `appTipShown`, `askedSetupTerminals`, `autoFeedbackLastPromptedAt`, `firstLaunchAt`, `recentModelIds`, `sandboxCredentialProxyCaDeclined` and `sandboxOnboardingShown`. Every other key is refused, including `installedPlugins`, the stored credentials, `trustedFolders`, the staff flags and the signed-in accounts. Plugin enablement must use the plugin APIs, which apply repository and managed-policy checks.\n\nArgs:\n    params: A single top-level key to record in the host's machine-wide state. The write replaces only that key and leaves the rest of the document untouched, so two writers recording different one-off flags do not overwrite each other. The stored credential keys cannot be written through this method.\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}
+        await self._client.request("globalState.writeKey", params_dict, **_timeout_kwargs(timeout))
+
+
+# Experimental: this API group is experimental and may change or be removed.
+class _InternalServerGitHubRepositoryApi:
+    def __init__(self, client: "JsonRpcClient"):
+        self._client = client
+
+    async def _at_path(self, params: _GitHubRepositoryAtPathRequest, *, timeout: float | None = None) -> _GitHubRepositoryAtPathResult:
+        "Resolves the GitHub repository that owns a working-tree path by reading the selected git remote configured for it, preferring `origin`. Returns a null `repository` when the path is inside a git working tree but that selected remote does not resolve to a GitHub host. Fails when the path is not inside a git working tree at all, so a caller can tell 'not a repository' apart from 'a repository with no GitHub remote'.\n\nArgs:\n    params: Working-tree path whose owning GitHub repository should be resolved.\n\nReturns:\n    The GitHub repository that owns the requested path, when the selected remote (`origin`, else the first) is on a GitHub host.\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 _GitHubRepositoryAtPathResult.from_dict(await self._client.request("gitHubRepository.atPath", params_dict, **_timeout_kwargs(timeout)))
+
+
+# Experimental: this API group is experimental and may change or be removed.
+class _InternalServerGitHubOwnersApi:
+    def __init__(self, client: "JsonRpcClient"):
+        self._client = client
+
+    async def _next_request_id(self, *, timeout: float | None = None) -> _GitHubOwnersRequestIDResult:
+        "Registers a cancellable owner listing and returns its request id. Separate from `gitHubOwners.list` so the id exists before the listing starts: a caller that abandons the listing the moment it begins would otherwise have nothing to name in `gitHubOwners.cancel`. The id serves one listing only. Long-abandoned unused ids can be released by later allocations.\n\nReturns:\n    A freshly registered request id. Registering it before the listing starts is what lets a cancel that races the request still find the owner listing slot. The id serves one listing only. Long-abandoned unused ids can be released by later allocations.\n\n:meta private:\n\nInternal SDK API; not part of the public surface."
+        return _GitHubOwnersRequestIDResult.from_dict(await self._client.request("gitHubOwners.nextRequestId", {}, **_timeout_kwargs(timeout)))
+
+    async def _list(self, params: _GitHubOwnersListRequest, *, timeout: float | None = None) -> _GitHubOwnersListResult:
+        "Lists the logins the authenticated user may act as — their own account first, then the organizations they belong to — by asking the GitHub API under the supplied credential. No credential travels in the request: `authInfo` selects one the runtime already holds, and the runtime resolves the token and the GitHub host from it. A failure the caller should render arrives as `message`; one it should raise arrives as `throwError`.\n\nArgs:\n    params: Credential to list owners under, and the request id that makes the listing cancellable.\n\nReturns:\n    Outcome of an owner listing. Exactly one of `owners` and `message` is present, except that `throwError` reports a failure the caller is expected to raise rather than render.\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 _GitHubOwnersListResult.from_dict(await self._client.request("gitHubOwners.list", params_dict, **_timeout_kwargs(timeout)))
+
+    async def _cancel(self, params: _GitHubOwnersCancelRequest, *, timeout: float | None = None) -> _GitHubOwnersCancelResult:
+        "Abandons an owner listing started with the given request id. Answers `canceled: true` while a listing with that id is running. Answers `canceled: false` when the id was never registered, was registered but not used, was released after being abandoned, or its listing has ended. Canceling an unused id releases it, and a later `list` with that id is refused. The cancel acts only on owner listings and never reaches another request of the host.\n\nArgs:\n    params: The owner listing to abandon.\n\nReturns:\n    Whether the id named a running owner listing.\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 _GitHubOwnersCancelResult.from_dict(await self._client.request("gitHubOwners.cancel", params_dict, **_timeout_kwargs(timeout)))
+
+
+# Experimental: this API group is experimental and may change or be removed.
+class _InternalServerGitApi:
+    def __init__(self, client: "JsonRpcClient"):
+        self._client = client
+
+    async def _current_branch_remote(self, params: _GitCwdRequest, *, timeout: float | None = None) -> _GitCurrentBranchRemoteResult:
+        "Reads the remote that the branch checked out in a working tree tracks, as `branch.<name>.remote` configures it. Reports `origin` rather than failing whenever there is no tracking configuration to read — on a detached HEAD, on a branch with no upstream, or when git itself fails — because a caller asking which remote to talk to needs an answer it can act on, not an error. Marked internal because it exists to carry a CLI call site off the napi boundary onto the SDK contract; it is migration plumbing, not a surface consumers are meant to depend on.\n\nArgs:\n    params: Working-tree path a git query applies to.\n\nReturns:\n    The remote the checked-out branch tracks.\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 _GitCurrentBranchRemoteResult.from_dict(await self._client.request("git.currentBranchRemote", params_dict, **_timeout_kwargs(timeout)))
+
+    async def _working_directory_context(self, params: _GitCwdRequest, *, timeout: float | None = None) -> SessionWorkingDirectoryContext:
+        "Collects the repository context of a working directory in one call: working tree root, repository identifier and host, current branch, and the HEAD and base commits. Every repository field is omitted when the path is not inside a git working tree, and the requested path is echoed back as `cwd`. The answer is the same `SessionWorkingDirectoryContext` that `session.metadata.recordContextChange` accepts, so a caller polling for a context change can forward the result unchanged. Marked internal because it exists to carry a CLI call site off the napi boundary onto the SDK contract; it is migration plumbing, not a surface consumers are meant to depend on. It can become public once an SDK consumer needs to derive session context from a directory itself.\n\nArgs:\n    params: Working-tree path a git query applies to.\n\nReturns:\n    Updated working directory and git context. Emitted as the new payload of `session.context_changed`.\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 SessionWorkingDirectoryContext.from_dict(await self._client.request("git.workingDirectoryContext", params_dict, **_timeout_kwargs(timeout)))
+
+    async def _repos_from_remotes(self, params: _GitReposFromRemotesRequest, *, timeout: float | None = None) -> _GitReposFromRemotesResult:
+        "Lists the GitHub repositories a working tree's remotes point at, one entry per distinct repository, so a caller can resolve a base and head repository without parsing remote URLs itself. When several remotes name the same repository, only the first is listed, and the entry keeps that remote name. Remotes pointing at no GitHub host are left out, so an empty list means the tree reaches GitHub through no remote. Failing to read the remotes is reported as an error rather than as an empty list, because the two mean different things to a caller. Marked internal because it exists to carry a CLI call site off the napi boundary onto the SDK contract; it is migration plumbing, not a surface consumers are meant to depend on.\n\nArgs:\n    params: Git working tree whose GitHub remotes should be listed.\n\nReturns:\n    The GitHub repositories a working tree's remotes point at.\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 _GitReposFromRemotesResult.from_dict(await self._client.request("git.reposFromRemotes", params_dict, **_timeout_kwargs(timeout)))
+
+
 # Experimental: this API group is experimental and may change or be removed.
 class _InternalServerSessionsApi:
     def __init__(self, client: "JsonRpcClient"):
@@ -53373,6 +61663,21 @@ async def _delete(self, params: SessionsDeleteRequest, *, timeout: float | None
         params_dict = {k: v for k, v in params.to_dict().items() if v is not None}
         await self._client.request("sessions.delete", params_dict, **_timeout_kwargs(timeout))
 
+    async def _create_workspace(self, params: SessionsCreateWorkspaceRequest, *, timeout: float | None = None) -> SessionsCreateWorkspaceResult:
+        "Creates the workspace record for a session that has not been opened yet. A host that hands a session off to another application — writing the record and then launching that application against the session ID — needs the record on disk before any session exists to carry it, which the session-scoped workspace methods cannot do. Replaces any existing record and resets the checkpoint index. When writing to the local filesystem, a stored `fork_count` survives on disk. Returns the record it built, so a surviving stored `fork_count` can differ from the answer.\n\nArgs:\n    params: Identity, state location and starting context for a workspace record.\n\nReturns:\n    The workspace record that was written.\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 SessionsCreateWorkspaceResult.from_dict(await self._client.request("sessions.createWorkspace", params_dict, **_timeout_kwargs(timeout)))
+
+    async def _load_workspace(self, params: SessionsLoadWorkspaceRequest, *, timeout: float | None = None) -> SessionsLoadWorkspaceResult:
+        "Reads a session's workspace record straight from disk, without opening the session. Resuming by session ID has to know where the session lives before it can connect, so the lookup cannot come from the session-scoped workspace methods, which resolve their location from a live session's context. Returns no record when the file is absent.\n\nArgs:\n    params: Where the session's state lives, as a root directory and the session ID under it.\n\nReturns:\n    The workspace record on disk, omitted when the session has none.\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 SessionsLoadWorkspaceResult.from_dict(await self._client.request("sessions.loadWorkspace", params_dict, **_timeout_kwargs(timeout)))
+
+    async def _update_workspace_fields(self, params: SessionsUpdateWorkspaceFieldsRequest, *, timeout: float | None = None) -> SessionsUpdateWorkspaceFieldsResult:
+        "Merges fields into a session's workspace record on disk, creating the record when it is absent. The counterpart to `sessions.loadWorkspace`, for the same before-the-session-exists case. It preserves stored workspace-schema fields the request does not supply, does not preserve stored keys outside the workspace schema, and never replaces a stored `fork_count`.\n\nArgs:\n    params: Where the session's state lives, plus workspace-schema fields to merge into its workspace record. Stored keys outside the schema are not preserved, and a stored `fork_count` is never replaced.\n\nReturns:\n    The merge completed. The record carries the supplied workspace-schema fields, but a stored `fork_count` stays.\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 SessionsUpdateWorkspaceFieldsResult.from_dict(await self._client.request("sessions.updateWorkspaceFields", params_dict, **_timeout_kwargs(timeout)))
+
     async def _get_board_entry_count(self, params: SessionsGetBoardEntryCountRequest, *, timeout: float | None = None) -> SessionsGetBoardEntryCountResult:
         "Gets the dynamic-context board entry count associated with a session, when available. Internal: this exists solely so CLI telemetry events (`rem_spawn_gate`, `rem_consolidation_complete`) can pair START / END board counts around the detached rem-agent spawn. \"Dynamic context board\" is a runtime-internal concept that is not part of the public SDK contract; the long-term plan is to relocate the telemetry emission into the runtime so this method can be deleted entirely.\n\nArgs:\n    params: Session ID whose board entry count should be returned.\n\nReturns:\n    Dynamic-context board entry count, when available.\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}
@@ -53388,7 +61693,22 @@ class _InternalServerRpc:
     """Internal SDK server-scoped RPC methods. Not part of the public API."""
     def __init__(self, client: "JsonRpcClient"):
         self._client = client
+        self.sandbox = _InternalServerSandboxApi(client)
+        self.persistence = _InternalServerPersistenceApi(client)
+        self.user = _InternalServerUserApi(client)
+        self.repo = _InternalServerRepoApi(client)
+        self.feature_flags = _InternalServerFeatureFlagsApi(client)
+        self.permissions = _InternalServerPermissionsApi(client)
+        self.managed_settings = _InternalServerManagedSettingsApi(client)
         self.host = _InternalServerHostApi(client)
+        self.account = _InternalServerAccountApi(client)
+        self.mcp = _InternalServerMcpApi(client)
+        self.instructions = _InternalServerInstructionsApi(client)
+        self.agents = _InternalServerAgentsApi(client)
+        self.global_state = _InternalServerGlobalStateApi(client)
+        self.git_hub_repository = _InternalServerGitHubRepositoryApi(client)
+        self.git_hub_owners = _InternalServerGitHubOwnersApi(client)
+        self.git = _InternalServerGitApi(client)
         self.sessions = _InternalServerSessionsApi(client)
 
     async def _connect(self, params: _ConnectRequest, *, timeout: float | None = None) -> _ConnectResult:
@@ -53450,6 +61770,10 @@ async def get_enforcement_status(self, *, timeout: float | None = None) -> Sandb
         "Returns whether managed policy requires sandbox enforcement and whether an enforcement failure has permanently blocked the session.\n\nReturns:\n    Managed sandbox enforcement state for a session."
         return SandboxEnforcementStatus.from_dict(await self._client.request("session.sandbox.getEnforcementStatus", {"sessionId": self._session_id}, **_timeout_kwargs(timeout)))
 
+    async def get_credential_suggestions(self, *, timeout: float | None = None) -> SandboxCredentialSuggestionsResult:
+        "Lists possible secret-bearing environment variables available to new sandboxed shells that are not already covered by credential masking. Uses local name rules and known-provider host suggestions, never returns secret values, and changes no settings or network permissions. Returns no suggestions while the session is not sandboxed.\n\nReturns:\n    Possible unconfigured secrets in the sandbox shell environment, sorted by variable name, with no secret values."
+        return SandboxCredentialSuggestionsResult.from_dict(await self._client.request("session.sandbox.getCredentialSuggestions", {"sessionId": self._session_id}, **_timeout_kwargs(timeout)))
+
     async def disable_for_session(self, params: SandboxDisableForSessionRequest, *, timeout: float | None = None) -> SandboxDisableForSessionResult:
         "Disables sandboxing for the remainder of the current session and approves the referenced pending sandbox-bypass permission request. The request is rejected unless the exact request is still pending and the effective sandbox policy permits bypass.\n\nArgs:\n    params: Request to disable sandboxing for the current session while resolving an active sandbox-bypass permission prompt.\n\nReturns:\n    Result of attempting to disable sandboxing for the current session."
         params_dict: dict[str, Any] = {k: v for k, v in params.to_dict().items() if v is not None}
@@ -53706,6 +62030,12 @@ async def set_reasoning_effort(self, params: ModelSetReasoningEffortRequest, *,
         params_dict["sessionId"] = self._session_id
         return ModelSetReasoningEffortResult.from_dict(await self._client.request("session.model.setReasoningEffort", params_dict, **_timeout_kwargs(timeout)))
 
+    async def get_reasoning_summaries(self, params: ModelGetReasoningSummariesRequest, *, timeout: float | None = None) -> ModelGetReasoningSummariesResult:
+        "Computes whether the session's current model shows reasoning summaries and how a host should present them: the default Ctrl+T visibility, reasoning headers, the hidden-summaries hint, and whether a persisted `showReasoning` setting is redundant. The runtime folds in the session's model catalog, selection and reasoning-summaries experiment assignment; the host supplies only its own persisted setting and current visibility. This method reads the session's resolved model catalog rather than resolving it, so call `session.model.list` first on a session that has not listed models or run a turn; until then the result is `ready: false`. A session that resolves models without a Copilot catalog, that is a BYOK registry or an alternate provider, never caches one and stays `ready: false`.\n\nArgs:\n    params: Host presentation state the reasoning-summaries policy depends on.\n\nReturns:\n    Reasoning-summaries presentation policy for the session's current model."
+        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 ModelGetReasoningSummariesResult.from_dict(await self._client.request("session.model.getReasoningSummaries", params_dict, **_timeout_kwargs(timeout)))
+
     async def list(self, params: SessionModelListRequest | None = None, *, timeout: float | None = None) -> SessionModelList:
         "Lists models available to this session using its own auth and integration context. Connected hosts (CLI TUI, GitHub App) should call this through the session client so remote sessions return the remote CLI's available models rather than the caller's.\n\nArgs:\n    params: Optional listing options.\n\nReturns:\n    The list of models available to this session."
         params_dict: dict[str, Any] = {k: v for k, v in params.to_dict().items() if v is not None} if params is not None else {}
@@ -54276,9 +62606,13 @@ def __init__(self, client: "JsonRpcClient", session_id: str):
         self.prompts = McpPromptsApi(client, session_id)
 
     async def list(self, *, timeout: float | None = None) -> MCPServerList:
-        "Lists MCP servers configured for the session, their connection status, and host-level state. The host-level state (disabled/filtered servers, failed/needs-auth/pending connections, mcp3p policy, full config) is empty/zero when no MCP host has been initialized for the session.\n\nReturns:\n    MCP servers configured for the session, with their connection status and host-level state."
+        "Lists materialized MCP servers and their connection status. Cache misses may start and wait for MCP servers.\n\nReturns:\n    MCP servers configured for the session, with their connection status and host-level state."
         return MCPServerList.from_dict(await self._client.request("session.mcp.list", {"sessionId": self._session_id}, **_timeout_kwargs(timeout)))
 
+    async def list_configured(self, *, timeout: float | None = None) -> MCPConfiguredServerList:
+        "Lists effective MCP configuration without starting, restarting, authenticating, or waiting for servers. An optional live observation is from an already materialized matching server; this is not a readiness guarantee.\n\nReturns:\n    Effective MCP configuration with optional live observations from matching already materialized servers."
+        return MCPConfiguredServerList.from_dict(await self._client.request("session.mcp.listConfigured", {"sessionId": self._session_id}, **_timeout_kwargs(timeout)))
+
     async def list_tools(self, params: MCPListToolsRequest, *, timeout: float | None = None) -> MCPListToolsResult:
         "Lists the tools exposed by a connected MCP server on this session's host. This performs a live `tools/list` request. Tool UI metadata is returned independently of whether MCP Apps rendering is enabled for the session.\n\nArgs:\n    params: Server name whose tool list should be returned.\n\nReturns:\n    Tools exposed by the connected MCP server. Throws when the server is not connected."
         params_dict: dict[str, Any] = {k: v for k, v in params.to_dict().items() if v is not None}
@@ -54526,6 +62860,12 @@ async def reload(self, params: SessionPluginsReloadRequest | None = None, *, tim
         params_dict["sessionId"] = self._session_id
         await self._client.request("session.plugins.reload", params_dict, **_timeout_kwargs(timeout))
 
+    async def retry_managed(self, params: SessionPluginsRetryManagedRequest | None = None, *, timeout: float | None = None) -> SessionPluginsRetryManagedResult:
+        "Installs or updates the plugins the session's managed settings require now, without waiting for the next automatic attempt after a failure, then reloads plugins. Reports progress and failures with the same `session.info` and `session.warning` events as automatic preparation. Fails when the runtime does not prepare managed plugins for the session.\n\nArgs:\n    params: Plugins required by the session's managed settings to install or update again.\n\nReturns:\n    Per-plugin outcomes of retrying the plugins required by the session's managed settings."
+        params_dict: dict[str, Any] = {k: v for k, v in params.to_dict().items() if v is not None} if params is not None else {}
+        params_dict["sessionId"] = self._session_id
+        return SessionPluginsRetryManagedResult.from_dict(await self._client.request("session.plugins.retryManaged", params_dict, **_timeout_kwargs(timeout)))
+
 
 # Experimental: this API group is experimental and may change or be removed.
 class ProviderApi:
@@ -54595,13 +62935,13 @@ async def list(self, *, timeout: float | None = None) -> ExtensionList:
         return ExtensionList.from_dict(await self._client.request("session.extensions.list", {"sessionId": self._session_id}, **_timeout_kwargs(timeout)))
 
     async def enable(self, params: ExtensionsEnableRequest, *, timeout: float | None = None) -> None:
-        "Enables an extension for the session.\n\nArgs:\n    params: Source-qualified extension identifier to enable for the session."
+        "Enables an extension for the session and persists the preference when the session has a settings store. Hosts synchronizing effective membership should use extensions.reconcile instead.\n\nArgs:\n    params: Source-qualified extension identifier to enable 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
         await self._client.request("session.extensions.enable", params_dict, **_timeout_kwargs(timeout))
 
     async def disable(self, params: ExtensionsDisableRequest, *, timeout: float | None = None) -> None:
-        "Disables an extension for the session.\n\nArgs:\n    params: Source-qualified extension identifier to disable for the session."
+        "Disables an extension for the session and persists the preference when the session has a settings store. Hosts synchronizing effective membership should use extensions.reconcile instead.\n\nArgs:\n    params: Source-qualified extension identifier to disable 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
         await self._client.request("session.extensions.disable", params_dict, **_timeout_kwargs(timeout))
@@ -54610,6 +62950,10 @@ async def reload(self, *, timeout: float | None = None) -> None:
         "Reloads extension definitions and processes for the session."
         await self._client.request("session.extensions.reload", {"sessionId": self._session_id}, **_timeout_kwargs(timeout))
 
+    async def reconcile(self, *, timeout: float | None = None) -> ExtensionList:
+        "Host-only reconciliation of authoritative session-effective extension membership and enablement. Refreshes runtime-owned discovery and preferences without persisting settings, installing plugins, or restarting unchanged activations. Returns ExtensionList only after required starts and process/contribution cleanup settle. Takes no caller inventory or overrides. Missing controllers, unready/incomplete discovery, unavailable workspaces, superseded inputs, and lifecycle failures are errors, not empty membership. Independently proven revocations may be applied before an error; retry converges without restarting healthy activations. Error data contains lifecycleChangesApplied and code: extension_reconciliation_host_required, extension_reconciliation_unavailable, extension_reconciliation_not_ready, extension_reconciliation_discovery_failed, extension_reconciliation_workspace_unavailable, extension_reconciliation_superseded, or extension_reconciliation_lifecycle_failed. Mark host reconciliation state applied only on success. On older runtimes, method-not-found must not fall back to global discovery and persistent extension disables.\n\nReturns:\n    Extensions discovered for the session, with their current status."
+        return ExtensionList.from_dict(await self._client.request("session.extensions.reconcile", {"sessionId": self._session_id}, **_timeout_kwargs(timeout)))
+
     async def send_attachments_to_message(self, params: SendAttachmentsToMessageParams, *, timeout: float | None = None) -> None:
         "Push attachments into the next user-message turn from an extension. The host should surface them as composer pills and forward them via the next session.send call. Callable only by extension-owned connections.\n\nArgs:\n    params: Parameters for session.extensions.sendAttachmentsToMessage."
         params_dict: dict[str, Any] = {k: v for k, v in params.to_dict().items() if v is not None}
@@ -54647,6 +62991,10 @@ async def handle_pending_tool_call(self, params: HandlePendingToolCallRequest, *
         params_dict["sessionId"] = self._session_id
         return HandlePendingToolCallResult.from_dict(await self._client.request("session.tools.handlePendingToolCall", params_dict, **_timeout_kwargs(timeout)))
 
+    async def list_pending_requests(self, *, timeout: float | None = None) -> PendingExternalToolRequestList:
+        "Lists the external tool calls of the session and its sub-agents that are still waiting for session.tools.handlePendingToolCall.\n\nReturns:\n    External tool calls still waiting for a result."
+        return PendingExternalToolRequestList.from_dict(await self._client.request("session.tools.listPendingRequests", {"sessionId": self._session_id}, **_timeout_kwargs(timeout)))
+
     async def initialize_and_validate(self, *, timeout: float | None = None) -> ToolsInitializeAndValidateResult:
         "Resolves, builds, and validates the runtime tool list for the session.\n\nReturns:\n    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."
         return ToolsInitializeAndValidateResult.from_dict(await self._client.request("session.tools.initializeAndValidate", {"sessionId": self._session_id}, **_timeout_kwargs(timeout)))
@@ -55225,6 +63573,25 @@ async def get_metrics(self, *, timeout: float | None = None) -> UsageGetMetricsR
         return UsageGetMetricsResult.from_dict(await self._client.request("session.usage.getMetrics", {"sessionId": self._session_id}, **_timeout_kwargs(timeout)))
 
 
+# Experimental: this API group is experimental and may change or be removed.
+class QuotaApi:
+    def __init__(self, client: "JsonRpcClient", session_id: str):
+        self._client = client
+        self._session_id = session_id
+
+    async def get(self, *, timeout: float | None = None) -> SessionQuotaGetResult:
+        "Gets the session's current quota and account projection without making a network request.\n\nReturns:\n    The incumbent session-owned quota and account projection."
+        return SessionQuotaGetResult.from_dict(await self._client.request("session.quota.get", {"sessionId": self._session_id}, **_timeout_kwargs(timeout)))
+
+    async def refresh(self, *, timeout: float | None = None) -> SessionQuotaRefreshResult:
+        "Refreshes the session's provider model catalog bypassing its cache, folds quota snapshots into session state, and returns the updated projection. Failures leave the last known quota intact.\n\nReturns:\n    The incumbent session-owned quota and account projection."
+        return SessionQuotaRefreshResult.from_dict(await self._client.request("session.quota.refresh", {"sessionId": self._session_id}, **_timeout_kwargs(timeout)))
+
+    async def take_warnings(self, *, timeout: float | None = None) -> list[QuotaWarningProjection]:
+        "Returns and clears the session's pending quota warnings. Reading or refreshing quota does not drain warnings.\n\nReturns:\n    Pending warnings returned and cleared by session.quota.takeWarnings."
+        return from_list(QuotaWarningProjection.from_dict, await self._client.request("session.quota.takeWarnings", {"sessionId": self._session_id}, **_timeout_kwargs(timeout)))
+
+
 # Experimental: this API group is experimental and may change or be removed.
 class LimitPredictionApi:
     def __init__(self, client: "JsonRpcClient", session_id: str):
@@ -55341,6 +63708,7 @@ def __init__(self, client: "JsonRpcClient", session_id: str):
         self.queue = QueueApi(client, session_id)
         self.event_log = EventLogApi(client, session_id)
         self.usage = UsageApi(client, session_id)
+        self.quota = QuotaApi(client, session_id)
         self.limit_prediction = LimitPredictionApi(client, session_id)
         self.remote = RemoteApi(client, session_id)
         self.visibility = VisibilityApi(client, session_id)
@@ -55502,6 +63870,12 @@ async def _apply_startup_overlay(self, params: ModelApplyStartupOverlayRequest,
         params_dict["sessionId"] = self._session_id
         return ModelSwitchToResult.from_dict(await self._client.request("session.model.applyStartupOverlay", params_dict, **_timeout_kwargs(timeout)))
 
+    async def _clear_startup_seed(self, params: SessionModelClearStartupSeedRequest, *, timeout: float | None = None) -> SessionModelClearStartupSeedResult:
+        "Clears an unchanged startup model/provider seed before default-model resolution. Never clears a resumed or user-selected model.\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 SessionModelClearStartupSeedResult.from_dict(await self._client.request("session.model.clearStartupSeed", params_dict, **_timeout_kwargs(timeout)))
+
 
 # Experimental: this API group is experimental and may change or be removed.
 class _InternalMcpApi:
@@ -55509,25 +63883,31 @@ def __init__(self, client: "JsonRpcClient", session_id: str):
         self._client = client
         self._session_id = session_id
 
-    async def _reload_with_config(self, params: MCPReloadWithConfigRequest, *, timeout: float | None = None) -> MCPStartServersResult:
+    async def _set_connected_ide_info(self, params: SessionMCPSetConnectedIDEInfoParams, *, timeout: float | None = None) -> None:
+        "Records the IDE the host is connected to, so the agent's system prompt can name it and its workspace folder. Null or an omitted `ide` clears the recorded value, which is how a host reports that it is disconnected; there is no separate clear method. Both `ideName` and `workspaceFolder` are required together, because half a state cannot be attributed to a project.\n\nArgs:\n    params: Records which IDE the host is connected to, or clears it.\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.mcp.setConnectedIdeInfo", params_dict, **_timeout_kwargs(timeout))
+
+    async def _reload_with_config(self, params: _MCPReloadWithConfigRequest, *, timeout: float | None = None) -> MCPStartServersResult:
         "Reloads MCP server connections for the session with an explicit host-provided configuration.\n\nArgs:\n    params: Opaque MCP reload configuration.\n\nReturns:\n    MCP server startup filtering result.\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 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:
+    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: 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)))
 
-    async def _register_external_client(self, params: MCPRegisterExternalClientRequest, *, timeout: float | None = None) -> None:
+    async def _register_external_client(self, params: _MCPRegisterExternalClientRequest, *, timeout: float | None = None) -> None:
         "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.\n\nArgs:\n    params: Registration parameters for an external MCP client.\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.mcp.registerExternalClient", params_dict, **_timeout_kwargs(timeout))
 
-    async def _unregister_external_client(self, params: MCPUnregisterExternalClientRequest, *, timeout: float | None = None) -> None:
+    async def _unregister_external_client(self, params: _MCPUnregisterExternalClientRequest, *, timeout: float | None = None) -> None:
         "Unregisters a previously registered external MCP client by server name. Marked internal as the paired companion of `registerExternalClient`: only in-process callers that registered a client this way can meaningfully unregister it. Disappears alongside `registerExternalClient`: once external clients are described to the runtime as config rather than handed in as instances, lifecycle (including deregistration) is owned entirely by the runtime.\n\nArgs:\n    params: Server name identifying the external client to remove.\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
@@ -55653,6 +64033,19 @@ async def _process(self, *, timeout: float | None = None) -> None:
         await self._client.request("session.queue.process", {"sessionId": self._session_id}, **_timeout_kwargs(timeout))
 
 
+# Experimental: this API group is experimental and may change or be removed.
+class _InternalUsageApi:
+    def __init__(self, client: "JsonRpcClient", session_id: str):
+        self._client = client
+        self._session_id = session_id
+
+    async def _set_code_changes(self, params: SessionUsageSetCodeChangesRequest, *, timeout: float | None = None) -> None:
+        "Internal host-only replacement of absolute code-change totals reported by a relay host.\n\nArgs:\n    params: Internal absolute code-change totals reported by the owning host.\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.usage.setCodeChanges", params_dict, **_timeout_kwargs(timeout))
+
+
 # Experimental: this API group is experimental and may change or be removed.
 class _InternalScheduleApi:
     def __init__(self, client: "JsonRpcClient", session_id: str):
@@ -55713,6 +64106,7 @@ def __init__(self, client: "JsonRpcClient", session_id: str):
         self.ui = _InternalUiApi(client, session_id)
         self.settings = _InternalSettingsApi(client, session_id)
         self.queue = _InternalQueueApi(client, session_id)
+        self.usage = _InternalUsageApi(client, session_id)
         self.schedule = _InternalScheduleApi(client, session_id)
 
     async def _send_system_notification(self, params: SendSystemNotificationRequest, *, timeout: float | None = None) -> None:
@@ -56145,6 +64539,8 @@ async def handle_installations_confirm(params: dict) -> dict | None:
     "AbortResult",
     "AcceptedEnqueueCommandResult",
     "AccountAllUsers",
+    "AccountAuthInfo",
+    "AccountAuthInfoType",
     "AccountGetAllUsersResult",
     "AccountGetCurrentAuthResult",
     "AccountGetQuotaRequest",
@@ -56208,6 +64604,7 @@ async def handle_installations_confirm(params: dict) -> dict | None:
     "AuthIdentityMetadata",
     "AuthInfo",
     "AuthInfoType",
+    "AuthLoginAccount",
     "AuthLoginAdvanceRequest",
     "AuthLoginBeginRequest",
     "AuthLoginBegun",
@@ -56225,6 +64622,9 @@ async def handle_installations_confirm(params: dict) -> dict | None:
     "AuthWrite",
     "AuthWriteKind",
     "AuthWriteResult",
+    "AutoTierDescriptor",
+    "AutoTierMetadata",
+    "AutoTierStatus",
     "AutopilotObjectiveApi",
     "AutopilotObjectiveCreditLimit",
     "AutopilotObjectiveGetStateResult",
@@ -56428,6 +64828,14 @@ async def handle_installations_confirm(params: dict) -> dict | None:
     "ConnectorConnectResultKind",
     "ConnectorContinueRequest",
     "ConnectorDisconnectResult",
+    "ConnectorDiscoveryAccount",
+    "ConnectorDiscoveryAccountList",
+    "ConnectorDiscoveryAccountRequest",
+    "ConnectorDiscoveryAuthInfo",
+    "ConnectorDiscoveryAvailability",
+    "ConnectorDiscoveryCapabilities",
+    "ConnectorDiscoveryCatalogEntry",
+    "ConnectorDiscoveryCatalogResult",
     "ConnectorMCPStatus",
     "ConnectorReconcileRequest",
     "ConnectorRuntimeStatus",
@@ -56553,6 +64961,8 @@ async def handle_installations_confirm(params: dict) -> dict | None:
     "ExternalToolTextResultForLlmContentTerminalType",
     "ExternalToolTextResultForLlmContentText",
     "ExternalToolTextResultForLlmContentType",
+    "FeatureFlagsResolveResult",
+    "FeatureFlagsResolveStartupGatesResult",
     "FilterMapping",
     "FleetApi",
     "FleetStartRequest",
@@ -56565,6 +64975,7 @@ async def handle_installations_confirm(params: dict) -> dict | None:
     "GhCLIAuthInfoType",
     "GitHubAuthApi",
     "GitHubEnvironment",
+    "GitHubRepositoryIdentity",
     "GitHubTelemetryClientInfo",
     "GitHubTelemetryEvent",
     "GitHubTelemetryHandler",
@@ -56616,6 +65027,8 @@ async def handle_installations_confirm(params: dict) -> dict | None:
     "HostExitedNotification",
     "HostGitHubEnvironmentOptions",
     "HostHandler",
+    "HostListSessionsRequest",
+    "HostListSessionsResult",
     "HostLocalServerConfiguration",
     "HostLocalServerOptions",
     "HostPublishSessionRequest",
@@ -56627,6 +65040,7 @@ async def handle_installations_confirm(params: dict) -> dict | None:
     "HostSessionCreateResult",
     "HostSessionReleaseRequest",
     "HostSessionReleasedNotification",
+    "HostSessionSummary",
     "HostStartRequest",
     "HostStartResult",
     "HostType",
@@ -56708,8 +65122,10 @@ async def handle_installations_confirm(params: dict) -> dict | None:
     "MCPConfigList",
     "MCPConfigRemoveRequest",
     "MCPConfigUpdateRequest",
-    "MCPConfigureGitHubRequest",
     "MCPConfigureGitHubResult",
+    "MCPConfiguredServer",
+    "MCPConfiguredServerList",
+    "MCPConfiguredServerState",
     "MCPDiagnosticDetails",
     "MCPDiagnosticDirection",
     "MCPDiagnosticKind",
@@ -56822,9 +65238,6 @@ async def handle_installations_confirm(params: dict) -> dict | None:
     "MCPPromptsGetResult",
     "MCPPromptsListRequest",
     "MCPPromptsListResult",
-    "MCPRegisterExternalClientRequest",
-    "MCPReloadConfig",
-    "MCPReloadWithConfigRequest",
     "MCPRemoveGitHubResult",
     "MCPResource",
     "MCPResourceAnnotations",
@@ -56855,8 +65268,6 @@ async def handle_installations_confirm(params: dict) -> dict | None:
     "MCPServerConfigDeferTools",
     "MCPServerConfigHTTP",
     "MCPServerConfigHTTPType",
-    "MCPServerConfigMemory",
-    "MCPServerConfigMemoryType",
     "MCPServerConfigStdio",
     "MCPServerConfigStdioType",
     "MCPServerConfigType",
@@ -56878,8 +65289,15 @@ async def handle_installations_confirm(params: dict) -> dict | None:
     "MCPToolUIVisibility",
     "MCPTools",
     "MCPUninstallPlan",
-    "MCPUnregisterExternalClientRequest",
     "ManagedMCPServerConfig",
+    "ManagedPermissionEvaluation",
+    "ManagedPermissionOperation",
+    "ManagedPermissionOperationKind",
+    "ManagedPermissionVerdict",
+    "ManagedPermissionsEvaluateRequest",
+    "ManagedPermissionsEvaluateResult",
+    "ManagedPluginRetryEntry",
+    "ManagedPluginRetryStatus",
     "ManagedSettingMeta",
     "ManagedSettingsApi",
     "ManagedSettingsChannel",
@@ -56972,6 +65390,8 @@ async def handle_installations_confirm(params: dict) -> dict | None:
     "ModelCapabilitiesOverrideLimitsVision",
     "ModelCapabilitiesOverrideSupports",
     "ModelCapabilitiesSupports",
+    "ModelGetReasoningSummariesRequest",
+    "ModelGetReasoningSummariesResult",
     "ModelList",
     "ModelListRequest",
     "ModelMessage",
@@ -56996,14 +65416,12 @@ async def handle_installations_confirm(params: dict) -> dict | None:
     "ModelProviderGetStatusRequest",
     "ModelProviderInstance",
     "ModelProviderInstanceReference",
-    "ModelProviderKind",
     "ModelProviderModelsListRequest",
     "ModelProviderOperationOutcome",
     "ModelProviderOperationOutcomeCode",
     "ModelProviderPrepareConfigurationRequest",
     "ModelProviderProvenance",
     "ModelProviderProvenanceSource",
-    "ModelProviderRef",
     "ModelProviderStatus",
     "ModelProviderWarning",
     "ModelSetAllowedModelsRequest",
@@ -57039,6 +65457,8 @@ async def handle_installations_confirm(params: dict) -> dict | None:
     "OptionsUpdateToolFilterPrecedence",
     "PauseInfoClass",
     "PauseInfoType",
+    "PendingExternalToolRequest",
+    "PendingExternalToolRequestList",
     "PendingPermissionRequest",
     "PendingPermissionRequestList",
     "PermissionDecision",
@@ -57139,6 +65559,7 @@ async def handle_installations_confirm(params: dict) -> dict | None:
     "PermissionsConfigureAdditionalContentExclusionPolicyScope",
     "PermissionsConfigureParams",
     "PermissionsConfigureResult",
+    "PermissionsEvaluateManagedPolicyResult",
     "PermissionsFolderTrustAddTrustedResult",
     "PermissionsFolderTrustApi",
     "PermissionsGetModeRequest",
@@ -57177,6 +65598,8 @@ async def handle_installations_confirm(params: dict) -> dict | None:
     "PermissionsSetRequiredResult",
     "PermissionsUrlsApi",
     "PermissionsUrlsSetUnrestrictedModeResult",
+    "PersistenceWriteRawJSONLockedRequest",
+    "PersistenceWriteRawJSONLockedResult",
     "Phase",
     "PingRequest",
     "PingResult",
@@ -57325,6 +65748,9 @@ async def handle_installations_confirm(params: dict) -> dict | None:
     "QueuedCommandHandled",
     "QueuedCommandNotHandled",
     "QueuedCommandResult",
+    "QuotaApi",
+    "QuotaTakeWarningsResult",
+    "QuotaWarningProjection",
     "RPC",
     "RegisterEventInterestParams",
     "RegisterEventInterestResult",
@@ -57361,6 +65787,10 @@ async def handle_installations_confirm(params: dict) -> dict | None:
     "ResponseFormatType",
     "ReviewClass",
     "SandboxApi",
+    "SandboxApplyDefaultsRequest",
+    "SandboxCheckEnforcementCommandResult",
+    "SandboxCheckPlatformSupportResult",
+    "SandboxCheckWindowsHostLoopbackSupportResult",
     "SandboxConfig",
     "SandboxConfigAuth",
     "SandboxConfigSource",
@@ -57371,10 +65801,15 @@ async def handle_installations_confirm(params: dict) -> dict | None:
     "SandboxConfigUserPolicyNetwork",
     "SandboxConfigUserPolicyNetworkProxy",
     "SandboxConfigUserPolicySeatbelt",
+    "SandboxCredentialSuggestion",
+    "SandboxCredentialSuggestionsResult",
     "SandboxCredentialsConfig",
     "SandboxDisableForSessionRequest",
     "SandboxDisableForSessionResult",
+    "SandboxDocsURLResult",
     "SandboxEnforcementStatus",
+    "SandboxGetUnsupportedMessageResult",
+    "SandboxGetUnsupportedSettingDisabledNoticeResult",
     "SandboxGrantPathForRequestRequest",
     "SandboxGrantPathForRequestResult",
     "SandboxHostCapability",
@@ -57385,7 +65820,15 @@ async def handle_installations_confirm(params: dict) -> dict | None:
     "SandboxProxyCARequest",
     "SandboxProxyCAState",
     "SandboxProxyCAStatus",
+    "SandboxProxyCaCheckInstallationSupportResult",
+    "SandboxProxyCaCheckRelevanceResult",
+    "SandboxProxySecretGetResult",
+    "SandboxProxySecretLocation",
+    "SandboxProxySecretSaveRequest",
+    "SandboxProxySecretSaveResult",
+    "SandboxResolveFlooredConfigResult",
     "SandboxSessionChange",
+    "SandboxSettingsApplyDefaultsResult",
     "Saved",
     "ScheduleAddAtRequest",
     "ScheduleAddCronRequest",
@@ -57416,6 +65859,7 @@ async def handle_installations_confirm(params: dict) -> dict | None:
     "ServerAgentsApi",
     "ServerCatalogApi",
     "ServerCommandsApi",
+    "ServerConnectorsApi",
     "ServerEnvironmentsApi",
     "ServerExtensionsApi",
     "ServerHooksApi",
@@ -57424,6 +65868,7 @@ async def handle_installations_confirm(params: dict) -> dict | None:
     "ServerInstructionsApi",
     "ServerLlmInferenceApi",
     "ServerManagedSettingsApi",
+    "ServerManagedSettingsPermissionsApi",
     "ServerMcpApi",
     "ServerMcpConfigApi",
     "ServerMcpInstallationsApi",
@@ -57458,6 +65903,7 @@ async def handle_installations_confirm(params: dict) -> dict | None:
     "SessionCapability",
     "SessionCommandsListRequest",
     "SessionCompletionItem",
+    "SessionConnectedIDEInfo",
     "SessionContext",
     "SessionContextAttribution",
     "SessionContextHostType",
@@ -57529,10 +65975,13 @@ async def handle_installations_confirm(params: dict) -> dict | None:
     "SessionMCPOauthCancelLoginResult",
     "SessionMCPOauthPrepareLoginRequest",
     "SessionMCPOauthPrepareLoginResult",
+    "SessionMCPSetConnectedIDEInfoParams",
     "SessionManagedPermissions",
     "SessionManagedSettings",
     "SessionMcpAppsCallToolResult",
     "SessionMetadataSnapshot",
+    "SessionModelClearStartupSeedRequest",
+    "SessionModelClearStartupSeedResult",
     "SessionModelList",
     "SessionModelListRequest",
     "SessionModelPriceCategory",
@@ -57551,8 +66000,17 @@ async def handle_installations_confirm(params: dict) -> dict | None:
     "SessionPluginsInstallRequest",
     "SessionPluginsMarketplacesRefreshRequest",
     "SessionPluginsReloadRequest",
+    "SessionPluginsRetryManagedRequest",
+    "SessionPluginsRetryManagedResult",
     "SessionProviderGetEndpointRequest",
     "SessionPruneResult",
+    "SessionQuotaDelegateWarning",
+    "SessionQuotaGetResult",
+    "SessionQuotaPlanTier",
+    "SessionQuotaProjection",
+    "SessionQuotaRefreshResult",
+    "SessionQuotaSnapshot",
+    "SessionQuotaTakeWarningsResult",
     "SessionRpc",
     "SessionSetCredentialsParams",
     "SessionSetCredentialsResult",
@@ -57571,10 +66029,12 @@ async def handle_installations_confirm(params: dict) -> dict | None:
     "SessionTelemetryEngagement",
     "SessionUpdateOptionsParams",
     "SessionUpdateOptionsResult",
+    "SessionUsageSetCodeChangesRequest",
     "SessionVisibilityStatus",
     "SessionWorkflowPauseAtCheckpointResult",
     "SessionWorkingDirectoryContext",
     "SessionWorkingDirectoryContextHostType",
+    "SessionWorkingDirectoryContextWithClient",
     "SessionsBulkDeleteRequest",
     "SessionsCheckInUseRequest",
     "SessionsCheckInUseResult",
@@ -57582,6 +66042,8 @@ async def handle_installations_confirm(params: dict) -> dict | None:
     "SessionsClientMetadataEntryStatus",
     "SessionsCloseRequest",
     "SessionsCloseResult",
+    "SessionsCreateWorkspaceRequest",
+    "SessionsCreateWorkspaceResult",
     "SessionsDeleteRequest",
     "SessionsEnrichMetadataRequest",
     "SessionsFindByPrefixRequest",
@@ -57606,6 +66068,8 @@ async def handle_installations_confirm(params: dict) -> dict | None:
     "SessionsListNonEmptySessionIDSResult",
     "SessionsListRequest",
     "SessionsLoadDeferredRepoHooksRequest",
+    "SessionsLoadWorkspaceRequest",
+    "SessionsLoadWorkspaceResult",
     "SessionsOpenAttach",
     "SessionsOpenAttachKind",
     "SessionsOpenCloud",
@@ -57638,6 +66102,8 @@ async def handle_installations_confirm(params: dict) -> dict | None:
     "SessionsStartRemoteControlRequest",
     "SessionsStopRemoteControlRequest",
     "SessionsTransferRemoteControlRequest",
+    "SessionsUpdateWorkspaceFieldsRequest",
+    "SessionsUpdateWorkspaceFieldsResult",
     "SettableAuthInfo",
     "SettableAuthInfoType",
     "SettableTokenAuthInfo",
@@ -57724,6 +66190,8 @@ async def handle_installations_confirm(params: dict) -> dict | None:
     "SlashCommandTextResult",
     "SlashCommandTimelineEntry",
     "SourceClass",
+    "StaffLogLevelMigrationStatus",
+    "StaffUpdateChannelMigrationStatus",
     "SubagentSettings",
     "SubagentSettingsEntry",
     "SubagentSettingsEntryContextTier",
@@ -57798,6 +66266,7 @@ async def handle_installations_confirm(params: dict) -> dict | None:
     "ToolsGetBuiltinDescriptorsResult",
     "ToolsGetCurrentMetadataResult",
     "ToolsInitializeAndValidateResult",
+    "ToolsListPendingRequestsRequest",
     "ToolsListRequest",
     "ToolsSetRequest",
     "ToolsSetResult",
@@ -57847,24 +66316,42 @@ async def handle_installations_confirm(params: dict) -> dict | None:
     "UIUnregisterDirectAutoModeSwitchHandlerRequest",
     "UIUnregisterDirectAutoModeSwitchHandlerResult",
     "UIUserInputResponse",
+    "UNSET_SENTINEL",
     "UiApi",
     "UnsupportedEnqueueCommandResult",
     "UpdateSubagentSettingsRequest",
     "UsageApi",
-    "UsageGetMetricsResult",
-    "UsageMetricsAgentMetric",
-    "UsageMetricsCodeChanges",
-    "UsageMetricsModelMetric",
-    "UsageMetricsModelMetricRequests",
-    "UsageMetricsModelMetricTokenDetail",
-    "UsageMetricsModelMetricUsage",
-    "UsageMetricsTokenDetail",
     "UserAuthInfo",
     "UserRequestedShellCommandResult",
     "UserSettingMetadata",
+    "UserSettingsApplyTopKeyRequest",
+    "UserSettingsApplyTopKeyResult",
+    "UserSettingsBuildRuntimeResult",
+    "UserSettingsGetPathsRequest",
+    "UserSettingsGetPathsResult",
     "UserSettingsGetResult",
+    "UserSettingsGovernanceKeysResult",
+    "UserSettingsHostContext",
+    "UserSettingsLoadForConfigDirResult",
+    "UserSettingsLoadForEditResult",
+    "UserSettingsLoadRepoRequest",
+    "UserSettingsLoadRepoResult",
+    "UserSettingsLoadWithWarningResult",
+    "UserSettingsMergeManagedAndUserResult",
+    "UserSettingsMergeRepoValueResult",
+    "UserSettingsNormalizeRequest",
+    "UserSettingsNormalizeResult",
+    "UserSettingsPathResult",
+    "UserSettingsProblem",
+    "UserSettingsProblemLocation",
+    "UserSettingsProblemSource",
+    "UserSettingsProblemsRequest",
+    "UserSettingsProblemsResult",
     "UserSettingsSetRequest",
-    "UserSettingsSetResult",
+    "UserSettingsValidateRequest",
+    "UserSettingsValidateResult",
+    "UserSettingsValidationIssue",
+    "UserSettingsWriteAllRequest",
     "VisibilityApi",
     "VisibilityGetResult",
     "VisibilitySetRequest",
@@ -57918,6 +66405,7 @@ async def handle_installations_confirm(params: dict) -> dict | None:
     "WorkflowRunSummary",
     "WorkflowRunTerminal",
     "Workspace",
+    "WorkspaceDiffContents",
     "WorkspaceDiffFileChange",
     "WorkspaceDiffFileChangeType",
     "WorkspaceDiffMode",
diff --git a/python/copilot/generated/session_events.py b/python/copilot/generated/session_events.py
index bec6e669ef..9291f489a5 100644
--- a/python/copilot/generated/session_events.py
+++ b/python/copilot/generated/session_events.py
@@ -154,6 +154,8 @@ class SessionEventType(Enum):
     SESSION_SNAPSHOT_REWIND = "session.snapshot_rewind"
     SESSION_SHUTDOWN = "session.shutdown"
     SESSION_USAGE_CHECKPOINT = "session.usage_checkpoint"
+    # Experimental: this event is part of an experimental API and may change or be removed.
+    SESSION_QUOTA_OBSERVATION = "session.quota_observation"
     SESSION_CONTEXT_CHANGED = "session.context_changed"
     SESSION_USAGE_INFO = "session.usage_info"
     SESSION_CONTEXT_CLEARED = "session.context_cleared"
@@ -269,6 +271,8 @@ class SessionEventType(Enum):
     # Experimental: this event is part of an experimental API and may change or be removed.
     SESSION_AUTO_MODE_RESOLVED = "session.auto_mode_resolved"
     # Experimental: this event is part of an experimental API and may change or be removed.
+    SESSION_MANAGED_PLUGIN_PROGRESS = "session.managed_plugin_progress"
+    # Experimental: this event is part of an experimental API and may change or be removed.
     SESSION_MANAGED_SETTINGS_RESOLVED = "session.managed_settings_resolved"
     # Experimental: this event is part of an experimental API and may change or be removed.
     SESSION_MANAGED_SETTINGS_ENFORCED = "session.managed_settings_enforced"
@@ -1420,6 +1424,34 @@ def to_dict(self) -> dict:
         return result
 
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class ModelProviderRef:
+    "A neutral reference to the model provider that produced a model: an opaque id, a human-readable label, and the provider kind. Carried on each enumerated Model so consumers can group by provider without reaching into a provider-shaped internal type."
+    id: str
+    kind: ModelProviderKind
+    label: str
+
+    @staticmethod
+    def from_dict(obj: Any) -> "ModelProviderRef":
+        assert isinstance(obj, dict)
+        id = from_str(obj.get("id"))
+        kind = parse_enum(ModelProviderKind, obj.get("kind"))
+        label = from_str(obj.get("label"))
+        return ModelProviderRef(
+            id=id,
+            kind=kind,
+            label=label,
+        )
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["id"] = from_str(self.id)
+        result["kind"] = to_enum(ModelProviderKind, self.kind)
+        result["label"] = from_str(self.label)
+        return result
+
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class OmittedBinaryResult:
@@ -1756,6 +1788,165 @@ def to_dict(self) -> dict:
         return result
 
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class ProviderMonthlyUsage:
+    "An authoritative monthly usage reading for the observation's provider, account, and service."
+    scope: ProviderMonthlyUsageScope
+    state: ProviderMonthlyUsageState
+    unit: ProviderQuotaUnit
+    consumed_quantity: float | None = None
+    cycle_start: str | None = None
+    queried_at: str | None = None
+    reset_on: str | None = None
+
+    @staticmethod
+    def from_dict(obj: Any) -> "ProviderMonthlyUsage":
+        assert isinstance(obj, dict)
+        scope = parse_enum(ProviderMonthlyUsageScope, obj.get("scope"))
+        state = parse_enum(ProviderMonthlyUsageState, obj.get("state"))
+        unit = parse_enum(ProviderQuotaUnit, obj.get("unit"))
+        consumed_quantity = from_union([from_none, from_float], obj.get("consumedQuantity"))
+        cycle_start = from_union([from_none, from_str], obj.get("cycleStart"))
+        queried_at = from_union([from_none, from_str], obj.get("queriedAt"))
+        reset_on = from_union([from_none, from_str], obj.get("resetOn"))
+        return ProviderMonthlyUsage(
+            scope=scope,
+            state=state,
+            unit=unit,
+            consumed_quantity=consumed_quantity,
+            cycle_start=cycle_start,
+            queried_at=queried_at,
+            reset_on=reset_on,
+        )
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["scope"] = to_enum(ProviderMonthlyUsageScope, self.scope)
+        result["state"] = to_enum(ProviderMonthlyUsageState, self.state)
+        result["unit"] = to_enum(ProviderQuotaUnit, self.unit)
+        if self.consumed_quantity is not None:
+            result["consumedQuantity"] = from_union([from_none, to_float], self.consumed_quantity)
+        if self.cycle_start is not None:
+            result["cycleStart"] = from_union([from_none, from_str], self.cycle_start)
+        if self.queried_at is not None:
+            result["queriedAt"] = from_union([from_none, from_str], self.queried_at)
+        if self.reset_on is not None:
+            result["resetOn"] = from_union([from_none, from_str], self.reset_on)
+        return result
+
+
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class ProviderQuotaState:
+    "An account quota reading. Absence of a quantity is unknown, never zero."
+    access_state: ProviderQuotaAccessState
+    capacity_state: ProviderQuotaCapacityState
+    provider: ModelProviderRef
+    quota_id: str
+    unit: ProviderQuotaUnit
+    acquisition_error: str | None = None
+    acquisition_status: ProviderQuotaAcquisitionStatus | None = None
+    available_quantity: int | None = None
+    budget_metadata: ProviderQuotaBudgetMetadata | None = None
+    compatibility_key: str | None = None
+    entitled_quantity: int | None = None
+    has_quota: bool | None = None
+    http_status: int | None = None
+    monthly_usage: ProviderMonthlyUsage | None = None
+    observation_kind: ProviderQuotaObservationKind | None = None
+    observed_at: str | None = None
+    quantity_kind: ProviderQuotaQuantityKind | None = None
+    reason: str | None = None
+    service: str | None = None
+    source: str | None = None
+
+    @staticmethod
+    def from_dict(obj: Any) -> "ProviderQuotaState":
+        assert isinstance(obj, dict)
+        access_state = parse_enum(ProviderQuotaAccessState, obj.get("accessState"))
+        capacity_state = parse_enum(ProviderQuotaCapacityState, obj.get("capacityState"))
+        provider = ModelProviderRef.from_dict(obj.get("provider"))
+        quota_id = from_str(obj.get("quotaId"))
+        unit = parse_enum(ProviderQuotaUnit, obj.get("unit"))
+        acquisition_error = from_union([from_none, from_str], obj.get("acquisitionError"))
+        acquisition_status = from_union([from_none, lambda x: parse_enum(ProviderQuotaAcquisitionStatus, x)], obj.get("acquisitionStatus"))
+        available_quantity = from_union([from_none, from_int], obj.get("availableQuantity"))
+        budget_metadata = from_union([from_none, ProviderQuotaBudgetMetadata.from_dict], obj.get("budgetMetadata"))
+        compatibility_key = from_union([from_none, from_str], obj.get("compatibilityKey"))
+        entitled_quantity = from_union([from_none, from_int], obj.get("entitledQuantity"))
+        has_quota = from_union([from_none, from_bool], obj.get("hasQuota"))
+        http_status = from_union([from_none, from_int], obj.get("httpStatus"))
+        monthly_usage = from_union([from_none, ProviderMonthlyUsage.from_dict], obj.get("monthlyUsage"))
+        observation_kind = from_union([from_none, lambda x: parse_enum(ProviderQuotaObservationKind, x)], obj.get("observationKind"))
+        observed_at = from_union([from_none, from_str], obj.get("observedAt"))
+        quantity_kind = from_union([from_none, lambda x: parse_enum(ProviderQuotaQuantityKind, x)], obj.get("quantityKind"))
+        reason = from_union([from_none, from_str], obj.get("reason"))
+        service = from_union([from_none, from_str], obj.get("service"))
+        source = from_union([from_none, from_str], obj.get("source"))
+        return ProviderQuotaState(
+            access_state=access_state,
+            capacity_state=capacity_state,
+            provider=provider,
+            quota_id=quota_id,
+            unit=unit,
+            acquisition_error=acquisition_error,
+            acquisition_status=acquisition_status,
+            available_quantity=available_quantity,
+            budget_metadata=budget_metadata,
+            compatibility_key=compatibility_key,
+            entitled_quantity=entitled_quantity,
+            has_quota=has_quota,
+            http_status=http_status,
+            monthly_usage=monthly_usage,
+            observation_kind=observation_kind,
+            observed_at=observed_at,
+            quantity_kind=quantity_kind,
+            reason=reason,
+            service=service,
+            source=source,
+        )
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["accessState"] = to_enum(ProviderQuotaAccessState, self.access_state)
+        result["capacityState"] = to_enum(ProviderQuotaCapacityState, self.capacity_state)
+        result["provider"] = to_class(ModelProviderRef, self.provider)
+        result["quotaId"] = from_str(self.quota_id)
+        result["unit"] = to_enum(ProviderQuotaUnit, self.unit)
+        if self.acquisition_error is not None:
+            result["acquisitionError"] = from_union([from_none, from_str], self.acquisition_error)
+        if self.acquisition_status is not None:
+            result["acquisitionStatus"] = from_union([from_none, lambda x: to_enum(ProviderQuotaAcquisitionStatus, x)], self.acquisition_status)
+        if self.available_quantity is not None:
+            result["availableQuantity"] = from_union([from_none, to_int], self.available_quantity)
+        if self.budget_metadata is not None:
+            result["budgetMetadata"] = from_union([from_none, lambda x: to_class(ProviderQuotaBudgetMetadata, x)], self.budget_metadata)
+        if self.compatibility_key is not None:
+            result["compatibilityKey"] = from_union([from_none, from_str], self.compatibility_key)
+        if self.entitled_quantity is not None:
+            result["entitledQuantity"] = from_union([from_none, to_int], self.entitled_quantity)
+        if self.has_quota is not None:
+            result["hasQuota"] = from_union([from_none, from_bool], self.has_quota)
+        if self.http_status is not None:
+            result["httpStatus"] = from_union([from_none, to_int], self.http_status)
+        if self.monthly_usage is not None:
+            result["monthlyUsage"] = from_union([from_none, lambda x: to_class(ProviderMonthlyUsage, x)], self.monthly_usage)
+        if self.observation_kind is not None:
+            result["observationKind"] = from_union([from_none, lambda x: to_enum(ProviderQuotaObservationKind, x)], self.observation_kind)
+        if self.observed_at is not None:
+            result["observedAt"] = from_union([from_none, from_str], self.observed_at)
+        if self.quantity_kind is not None:
+            result["quantityKind"] = from_union([from_none, lambda x: to_enum(ProviderQuotaQuantityKind, x)], self.quantity_kind)
+        if self.reason is not None:
+            result["reason"] = from_union([from_none, from_str], self.reason)
+        if self.service is not None:
+            result["service"] = from_union([from_none, from_str], self.service)
+        if self.source is not None:
+            result["source"] = from_union([from_none, from_str], self.source)
+        return result
+
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class SessionAutoModeResolvedData:
@@ -2425,10 +2616,34 @@ def to_dict(self) -> dict:
         return result
 
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class SessionManagedPluginProgressData:
+    "Experimental transient presentation-neutral progress for organization-required plugin preparation. Clients should localize the phase copy and display plugin specs without translating them."
+    phase: ManagedPluginProgressPhase
+    plugin_specs: list[str]
+
+    @staticmethod
+    def from_dict(obj: Any) -> "SessionManagedPluginProgressData":
+        assert isinstance(obj, dict)
+        phase = parse_enum(ManagedPluginProgressPhase, obj.get("phase"))
+        plugin_specs = from_list(from_str, obj.get("pluginSpecs"))
+        return SessionManagedPluginProgressData(
+            phase=phase,
+            plugin_specs=plugin_specs,
+        )
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["phase"] = to_enum(ManagedPluginProgressPhase, self.phase)
+        result["pluginSpecs"] = from_list(from_str, self.plugin_specs)
+        return result
+
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class SessionManagedSettingsEnforcedData:
-    "Runtime enforcement of enterprise managed settings: fires when the session blocks or caps a runtime action because enterprise policy governs it, so SDK clients can explain *why* an action was governed. Unlike `session.managed_settings_resolved` (which reports *what* is managed), this reports a concrete governed action — e.g. a user or host tried to turn on a bypass-permissions escalation while policy disables it. Emitted live (not persisted to the session event log) on user/host-initiated attempts only, never for silent policy application. Marked experimental while the managed-settings surface stabilizes."
+    "Runtime enforcement of enterprise managed settings: fires when the session blocks or caps a runtime action because enterprise policy governs it, so SDK clients can explain *why* an action was governed. Unlike `session.managed_settings_resolved` (which reports *what* is managed), this reports a concrete governed action — e.g. a user or host tried to turn on bypass permissions or Assisted Permissions while the corresponding policy disables it. Emitted live (not persisted to the session event log) on user/host-initiated attempts only, never for silent policy application. Marked experimental while the managed-settings surface stabilizes."
     action: ManagedSettingsEnforcedAction
     fail_closed: bool
     message: str
@@ -2474,6 +2689,7 @@ class SessionManagedSettingsResolvedData:
     source: ManagedSettingsResolvedSource
     client_managed: bool | None = None
     permissions_allow_intersected: bool | None = None
+    permissions_context: ManagedPermissionsContext | None = None
     policy_helper_managed: bool | None = None
     sandbox_enabled_by_undetermined_policy: bool | None = None
     settings: Any = None
@@ -2489,6 +2705,7 @@ def from_dict(obj: Any) -> "SessionManagedSettingsResolvedData":
         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"))
+        permissions_context = from_union([from_none, ManagedPermissionsContext.from_dict], obj.get("permissionsContext"))
         policy_helper_managed = from_union([from_none, from_bool], obj.get("policyHelperManaged"))
         sandbox_enabled_by_undetermined_policy = from_union([from_none, from_bool], obj.get("sandboxEnabledByUndeterminedPolicy"))
         settings = obj.get("settings")
@@ -2501,6 +2718,7 @@ def from_dict(obj: Any) -> "SessionManagedSettingsResolvedData":
             source=source,
             client_managed=client_managed,
             permissions_allow_intersected=permissions_allow_intersected,
+            permissions_context=permissions_context,
             policy_helper_managed=policy_helper_managed,
             sandbox_enabled_by_undetermined_policy=sandbox_enabled_by_undetermined_policy,
             settings=settings,
@@ -2518,6 +2736,8 @@ def to_dict(self) -> dict:
             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.permissions_context is not None:
+            result["permissionsContext"] = from_union([from_none, lambda x: to_class(ManagedPermissionsContext, x)], self.permissions_context)
         if self.policy_helper_managed is not None:
             result["policyHelperManaged"] = from_union([from_none, from_bool], self.policy_helper_managed)
         if self.sandbox_enabled_by_undetermined_policy is not None:
@@ -2561,6 +2781,26 @@ def to_dict(self) -> dict:
         return result
 
 
+# Experimental: this type is part of an experimental API and may change or be removed.
+@dataclass
+class SessionQuotaObservationData:
+    "A provider-owned quota observation, distinct from per-call usage and charge accounting."
+    observation: ProviderQuotaState
+
+    @staticmethod
+    def from_dict(obj: Any) -> "SessionQuotaObservationData":
+        assert isinstance(obj, dict)
+        observation = ProviderQuotaState.from_dict(obj.get("observation"))
+        return SessionQuotaObservationData(
+            observation=observation,
+        )
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["observation"] = to_class(ProviderQuotaState, self.observation)
+        return result
+
+
 # Experimental: this type is part of an experimental API and may change or be removed.
 @dataclass
 class TaskBlocker:
@@ -2925,6 +3165,7 @@ class AssistantMessageData:
     # Deprecated: this field is deprecated.
     parent_tool_call_id: str | None = None
     phase: str | None = None
+    provider_id: str | None = None
     reasoning_blocks: AssistantMessageReasoningBlocks | None = None
     reasoning_opaque: str | None = None
     reasoning_text: str | None = None
@@ -2954,6 +3195,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"))
+        provider_id = from_union([from_none, from_str], obj.get("providerId"))
         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"))
@@ -2980,6 +3222,7 @@ def from_dict(obj: Any) -> "AssistantMessageData":
             output_tokens=output_tokens,
             parent_tool_call_id=parent_tool_call_id,
             phase=phase,
+            provider_id=provider_id,
             reasoning_blocks=reasoning_blocks,
             reasoning_opaque=reasoning_opaque,
             reasoning_text=reasoning_text,
@@ -3022,6 +3265,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.provider_id is not None:
+            result["providerId"] = from_union([from_none, from_str], self.provider_id)
         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:
@@ -3472,6 +3717,8 @@ class AssistantUsageData:
     "LLM API call usage metrics including tokens, costs, quotas, and billing information"
     model: str
     accepted_prediction_tokens: int | None = None
+    accounting: UsageAccountingIdentity | None = None
+    ai_credits_status: AiCreditsStatus | 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.
@@ -3502,6 +3749,7 @@ class AssistantUsageData:
     is_byok: bool | None = None
     max_output_tokens: int | None = None
     max_prompt_tokens: int | None = None
+    model_display_name: str | None = None
     model_provider: str | None = None
     # Internal: this field is an internal SDK API and is not part of the public surface.
     _num_tool_calls: int | None = None
@@ -3509,6 +3757,7 @@ class AssistantUsageData:
     output_ttft: timedelta | None = None
     # Deprecated: this field is deprecated.
     parent_tool_call_id: str | None = None
+    provider: ModelProviderRef | 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
@@ -3516,6 +3765,9 @@ class AssistantUsageData:
     reasoning_summary: ReasoningSummary | None = None
     reasoning_tokens: int | None = None
     rejected_prediction_tokens: int | None = None
+    request_body_bytes: int | None = None
+    request_body_encoding: ModelCallRequestBodyEncoding | None = None
+    request_body_wire_bytes: int | None = None
     rte: bool | None = None
     service_request_id: str | None = None
     # Internal: this field is an internal SDK API and is not part of the public surface.
@@ -3528,12 +3780,21 @@ class AssistantUsageData:
     # 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
+    websocket_fallback_after: timedelta | None = None
+    websocket_fallback_close_code: int | None = None
+    websocket_fallback_error_kind: ModelCallWebSocketFallbackErrorKind | None = None
+    websocket_fallback_reason: ModelCallWebSocketFallbackReason | None = None
+    websocket_fallback_reconnect_attempted: bool | None = None
+    websocket_fallback_started_this_call: bool | None = None
+    websocket_fallback_status_code: int | 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"))
+        accounting = from_union([from_none, UsageAccountingIdentity.from_dict], obj.get("accounting"))
+        ai_credits_status = from_union([from_none, lambda x: parse_enum(AiCreditsStatus, x)], obj.get("aiCreditsStatus"))
         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"))
@@ -3558,17 +3819,22 @@ def from_dict(obj: Any) -> "AssistantUsageData":
         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"))
+        model_display_name = from_union([from_none, from_str], obj.get("modelDisplayName"))
         model_provider = from_union([from_none, from_str], obj.get("modelProvider"))
         _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 = from_union([from_none, ModelProviderRef.from_dict], obj.get("provider"))
         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"))
+        request_body_bytes = from_union([from_none, from_int], obj.get("requestBodyBytes"))
+        request_body_encoding = from_union([from_none, lambda x: parse_enum(ModelCallRequestBodyEncoding, x)], obj.get("requestBodyEncoding"))
+        request_body_wire_bytes = from_union([from_none, from_int], obj.get("requestBodyWireBytes"))
         rte = from_union([from_none, from_bool], obj.get("rte"))
         service_request_id = from_union([from_none, from_str], obj.get("serviceRequestId"))
         _thinking_dropped_blocks = from_union([from_none, from_int], obj.get("thinkingDroppedBlocks"))
@@ -3577,9 +3843,18 @@ def from_dict(obj: Any) -> "AssistantUsageData":
         _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"))
+        websocket_fallback_after = from_union([from_none, from_timedelta], obj.get("websocketFallbackAfterMs"))
+        websocket_fallback_close_code = from_union([from_none, from_int], obj.get("websocketFallbackCloseCode"))
+        websocket_fallback_error_kind = from_union([from_none, lambda x: parse_enum(ModelCallWebSocketFallbackErrorKind, x)], obj.get("websocketFallbackErrorKind"))
+        websocket_fallback_reason = from_union([from_none, lambda x: parse_enum(ModelCallWebSocketFallbackReason, x)], obj.get("websocketFallbackReason"))
+        websocket_fallback_reconnect_attempted = from_union([from_none, from_bool], obj.get("websocketFallbackReconnectAttempted"))
+        websocket_fallback_started_this_call = from_union([from_none, from_bool], obj.get("websocketFallbackStartedThisCall"))
+        websocket_fallback_status_code = from_union([from_none, from_int], obj.get("websocketFallbackStatusCode"))
         return AssistantUsageData(
             model=model,
             accepted_prediction_tokens=accepted_prediction_tokens,
+            accounting=accounting,
+            ai_credits_status=ai_credits_status,
             api_call_id=api_call_id,
             api_endpoint=api_endpoint,
             _available_tool_count=_available_tool_count,
@@ -3604,17 +3879,22 @@ def from_dict(obj: Any) -> "AssistantUsageData":
             is_byok=is_byok,
             max_output_tokens=max_output_tokens,
             max_prompt_tokens=max_prompt_tokens,
+            model_display_name=model_display_name,
             model_provider=model_provider,
             _num_tool_calls=_num_tool_calls,
             output_tokens=output_tokens,
             output_ttft=output_ttft,
             parent_tool_call_id=parent_tool_call_id,
+            provider=provider,
             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,
+            request_body_bytes=request_body_bytes,
+            request_body_encoding=request_body_encoding,
+            request_body_wire_bytes=request_body_wire_bytes,
             rte=rte,
             service_request_id=service_request_id,
             _thinking_dropped_blocks=_thinking_dropped_blocks,
@@ -3623,6 +3903,13 @@ def from_dict(obj: Any) -> "AssistantUsageData":
             _tool_counts=_tool_counts,
             _tool_token_count=_tool_token_count,
             transport=transport,
+            websocket_fallback_after=websocket_fallback_after,
+            websocket_fallback_close_code=websocket_fallback_close_code,
+            websocket_fallback_error_kind=websocket_fallback_error_kind,
+            websocket_fallback_reason=websocket_fallback_reason,
+            websocket_fallback_reconnect_attempted=websocket_fallback_reconnect_attempted,
+            websocket_fallback_started_this_call=websocket_fallback_started_this_call,
+            websocket_fallback_status_code=websocket_fallback_status_code,
         )
 
     def to_dict(self) -> dict:
@@ -3630,6 +3917,10 @@ def to_dict(self) -> 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.accounting is not None:
+            result["accounting"] = from_union([from_none, lambda x: to_class(UsageAccountingIdentity, x)], self.accounting)
+        if self.ai_credits_status is not None:
+            result["aiCreditsStatus"] = from_union([from_none, lambda x: to_enum(AiCreditsStatus, x)], self.ai_credits_status)
         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:
@@ -3678,6 +3969,8 @@ def to_dict(self) -> dict:
             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.model_display_name is not None:
+            result["modelDisplayName"] = from_union([from_none, from_str], self.model_display_name)
         if self.model_provider is not None:
             result["modelProvider"] = from_union([from_none, from_str], self.model_provider)
         if self._num_tool_calls is not None:
@@ -3688,6 +3981,8 @@ def to_dict(self) -> dict:
             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 is not None:
+            result["provider"] = from_union([from_none, lambda x: to_class(ModelProviderRef, x)], self.provider)
         if self.provider_call_id is not None:
             result["providerCallId"] = from_union([from_none, from_str], self.provider_call_id)
         if self._quota_snapshots is not None:
@@ -3700,6 +3995,12 @@ def to_dict(self) -> dict:
             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.request_body_bytes is not None:
+            result["requestBodyBytes"] = from_union([from_none, to_int], self.request_body_bytes)
+        if self.request_body_encoding is not None:
+            result["requestBodyEncoding"] = from_union([from_none, lambda x: to_enum(ModelCallRequestBodyEncoding, x)], self.request_body_encoding)
+        if self.request_body_wire_bytes is not None:
+            result["requestBodyWireBytes"] = from_union([from_none, to_int], self.request_body_wire_bytes)
         if self.rte is not None:
             result["rte"] = from_union([from_none, from_bool], self.rte)
         if self.service_request_id is not None:
@@ -3716,6 +4017,20 @@ def to_dict(self) -> dict:
             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)
+        if self.websocket_fallback_after is not None:
+            result["websocketFallbackAfterMs"] = from_union([from_none, to_timedelta_int], self.websocket_fallback_after)
+        if self.websocket_fallback_close_code is not None:
+            result["websocketFallbackCloseCode"] = from_union([from_none, to_int], self.websocket_fallback_close_code)
+        if self.websocket_fallback_error_kind is not None:
+            result["websocketFallbackErrorKind"] = from_union([from_none, lambda x: to_enum(ModelCallWebSocketFallbackErrorKind, x)], self.websocket_fallback_error_kind)
+        if self.websocket_fallback_reason is not None:
+            result["websocketFallbackReason"] = from_union([from_none, lambda x: to_enum(ModelCallWebSocketFallbackReason, x)], self.websocket_fallback_reason)
+        if self.websocket_fallback_reconnect_attempted is not None:
+            result["websocketFallbackReconnectAttempted"] = from_union([from_none, from_bool], self.websocket_fallback_reconnect_attempted)
+        if self.websocket_fallback_started_this_call is not None:
+            result["websocketFallbackStartedThisCall"] = from_union([from_none, from_bool], self.websocket_fallback_started_this_call)
+        if self.websocket_fallback_status_code is not None:
+            result["websocketFallbackStatusCode"] = from_union([from_none, to_int], self.websocket_fallback_status_code)
         return result
 
 
@@ -4695,6 +5010,7 @@ def to_dict(self) -> dict:
 @dataclass
 class CompactionCompleteCompactionTokensUsed:
     "Token usage breakdown for the compaction LLM call (aligned with assistant.usage format)"
+    ai_credits_status: AiCreditsStatus | None = None
     cache_read_tokens: int | None = None
     cache_write_tokens: int | None = None
     # Internal: this field is an internal SDK API and is not part of the public surface.
@@ -4702,30 +5018,43 @@ class CompactionCompleteCompactionTokensUsed:
     duration: timedelta | None = None
     input_tokens: int | None = None
     model: str | None = None
+    model_display_name: str | None = None
     output_tokens: int | None = None
+    provider: ModelProviderRef | None = None
+    request_count: int | None = None
 
     @staticmethod
     def from_dict(obj: Any) -> "CompactionCompleteCompactionTokensUsed":
         assert isinstance(obj, dict)
+        ai_credits_status = from_union([from_none, lambda x: parse_enum(AiCreditsStatus, x)], obj.get("aiCreditsStatus"))
         cache_read_tokens = from_union([from_none, from_int], obj.get("cacheReadTokens"))
         cache_write_tokens = from_union([from_none, from_int], obj.get("cacheWriteTokens"))
         _copilot_usage = from_union([from_none, _CompactionCompleteCompactionTokensUsedCopilotUsage.from_dict], obj.get("copilotUsage"))
         duration = from_union([from_none, from_timedelta], obj.get("duration"))
         input_tokens = from_union([from_none, from_int], obj.get("inputTokens"))
         model = from_union([from_none, from_str], obj.get("model"))
+        model_display_name = from_union([from_none, from_str], obj.get("modelDisplayName"))
         output_tokens = from_union([from_none, from_int], obj.get("outputTokens"))
+        provider = from_union([from_none, ModelProviderRef.from_dict], obj.get("provider"))
+        request_count = from_union([from_none, from_int], obj.get("requestCount"))
         return CompactionCompleteCompactionTokensUsed(
+            ai_credits_status=ai_credits_status,
             cache_read_tokens=cache_read_tokens,
             cache_write_tokens=cache_write_tokens,
             _copilot_usage=_copilot_usage,
             duration=duration,
             input_tokens=input_tokens,
             model=model,
+            model_display_name=model_display_name,
             output_tokens=output_tokens,
+            provider=provider,
+            request_count=request_count,
         )
 
     def to_dict(self) -> dict:
         result: dict = {}
+        if self.ai_credits_status is not None:
+            result["aiCreditsStatus"] = from_union([from_none, lambda x: to_enum(AiCreditsStatus, x)], self.ai_credits_status)
         if self.cache_read_tokens is not None:
             result["cacheReadTokens"] = from_union([from_none, to_int], self.cache_read_tokens)
         if self.cache_write_tokens is not None:
@@ -4738,8 +5067,14 @@ def to_dict(self) -> dict:
             result["inputTokens"] = from_union([from_none, to_int], self.input_tokens)
         if self.model is not None:
             result["model"] = from_union([from_none, from_str], self.model)
+        if self.model_display_name is not None:
+            result["modelDisplayName"] = from_union([from_none, from_str], self.model_display_name)
         if self.output_tokens is not None:
             result["outputTokens"] = from_union([from_none, to_int], self.output_tokens)
+        if self.provider is not None:
+            result["provider"] = from_union([from_none, lambda x: to_class(ModelProviderRef, x)], self.provider)
+        if self.request_count is not None:
+            result["requestCount"] = from_union([from_none, to_int], self.request_count)
         return result
 
 
@@ -5648,6 +5983,30 @@ def to_dict(self) -> dict:
         return result
 
 
+@dataclass
+class ManagedPermissionsContext:
+    "Reusable managed permission evaluation context. Treat permissions as runtime-owned policy data and retain it verbatim; it includes source-aware composition metadata. This is a snapshot, not a capability or approval token; only use contexts obtained from trusted policy sources."
+    fail_closed: bool
+    permissions: Any = None
+
+    @staticmethod
+    def from_dict(obj: Any) -> "ManagedPermissionsContext":
+        assert isinstance(obj, dict)
+        fail_closed = from_bool(obj.get("failClosed"))
+        permissions = obj.get("permissions")
+        return ManagedPermissionsContext(
+            fail_closed=fail_closed,
+            permissions=permissions,
+        )
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["failClosed"] = from_bool(self.fail_closed)
+        if self.permissions is not None:
+            result["permissions"] = self.permissions
+        return result
+
+
 @dataclass
 class McpAppToolCallCompleteData:
     "MCP App view called a tool on a connected MCP server (SEP-1865)"
@@ -6150,11 +6509,22 @@ class ModelCallFailureData:
     # 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
+    request_body_bytes: int | None = None
+    request_body_encoding: ModelCallRequestBodyEncoding | None = None
+    request_body_wire_bytes: int | None = None
     request_fingerprint: ModelCallFailureRequestFingerprint | None = None
+    retry_attempt: int | None = None
     rte: bool | None = None
     service_request_id: str | None = None
     status_code: int | None = None
     transport: ModelCallFailureTransport | None = None
+    websocket_fallback_after: timedelta | None = None
+    websocket_fallback_close_code: int | None = None
+    websocket_fallback_error_kind: ModelCallWebSocketFallbackErrorKind | None = None
+    websocket_fallback_reason: ModelCallWebSocketFallbackReason | None = None
+    websocket_fallback_reconnect_attempted: bool | None = None
+    websocket_fallback_started_this_call: bool | None = None
+    websocket_fallback_status_code: int | None = None
 
     @staticmethod
     def from_dict(obj: Any) -> "ModelCallFailureData":
@@ -6182,11 +6552,22 @@ def from_dict(obj: Any) -> "ModelCallFailureData":
         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"))
+        request_body_bytes = from_union([from_none, from_int], obj.get("requestBodyBytes"))
+        request_body_encoding = from_union([from_none, lambda x: parse_enum(ModelCallRequestBodyEncoding, x)], obj.get("requestBodyEncoding"))
+        request_body_wire_bytes = from_union([from_none, from_int], obj.get("requestBodyWireBytes"))
         request_fingerprint = from_union([from_none, ModelCallFailureRequestFingerprint.from_dict], obj.get("requestFingerprint"))
+        retry_attempt = from_union([from_none, from_int], obj.get("retryAttempt"))
         rte = from_union([from_none, from_bool], obj.get("rte"))
         service_request_id = from_union([from_none, from_str], obj.get("serviceRequestId"))
         status_code = from_union([from_none, from_int], obj.get("statusCode"))
         transport = from_union([from_none, lambda x: parse_enum(ModelCallFailureTransport, x)], obj.get("transport"))
+        websocket_fallback_after = from_union([from_none, from_timedelta], obj.get("websocketFallbackAfterMs"))
+        websocket_fallback_close_code = from_union([from_none, from_int], obj.get("websocketFallbackCloseCode"))
+        websocket_fallback_error_kind = from_union([from_none, lambda x: parse_enum(ModelCallWebSocketFallbackErrorKind, x)], obj.get("websocketFallbackErrorKind"))
+        websocket_fallback_reason = from_union([from_none, lambda x: parse_enum(ModelCallWebSocketFallbackReason, x)], obj.get("websocketFallbackReason"))
+        websocket_fallback_reconnect_attempted = from_union([from_none, from_bool], obj.get("websocketFallbackReconnectAttempted"))
+        websocket_fallback_started_this_call = from_union([from_none, from_bool], obj.get("websocketFallbackStartedThisCall"))
+        websocket_fallback_status_code = from_union([from_none, from_int], obj.get("websocketFallbackStatusCode"))
         return ModelCallFailureData(
             source=source,
             api_call_id=api_call_id,
@@ -6211,11 +6592,22 @@ def from_dict(obj: Any) -> "ModelCallFailureData":
             provider_call_id=provider_call_id,
             _quota_snapshots=_quota_snapshots,
             reasoning_effort=reasoning_effort,
+            request_body_bytes=request_body_bytes,
+            request_body_encoding=request_body_encoding,
+            request_body_wire_bytes=request_body_wire_bytes,
             request_fingerprint=request_fingerprint,
+            retry_attempt=retry_attempt,
             rte=rte,
             service_request_id=service_request_id,
             status_code=status_code,
             transport=transport,
+            websocket_fallback_after=websocket_fallback_after,
+            websocket_fallback_close_code=websocket_fallback_close_code,
+            websocket_fallback_error_kind=websocket_fallback_error_kind,
+            websocket_fallback_reason=websocket_fallback_reason,
+            websocket_fallback_reconnect_attempted=websocket_fallback_reconnect_attempted,
+            websocket_fallback_started_this_call=websocket_fallback_started_this_call,
+            websocket_fallback_status_code=websocket_fallback_status_code,
         )
 
     def to_dict(self) -> dict:
@@ -6265,8 +6657,16 @@ 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.request_body_bytes is not None:
+            result["requestBodyBytes"] = from_union([from_none, to_int], self.request_body_bytes)
+        if self.request_body_encoding is not None:
+            result["requestBodyEncoding"] = from_union([from_none, lambda x: to_enum(ModelCallRequestBodyEncoding, x)], self.request_body_encoding)
+        if self.request_body_wire_bytes is not None:
+            result["requestBodyWireBytes"] = from_union([from_none, to_int], self.request_body_wire_bytes)
         if self.request_fingerprint is not None:
             result["requestFingerprint"] = from_union([from_none, lambda x: to_class(ModelCallFailureRequestFingerprint, x)], self.request_fingerprint)
+        if self.retry_attempt is not None:
+            result["retryAttempt"] = from_union([from_none, to_int], self.retry_attempt)
         if self.rte is not None:
             result["rte"] = from_union([from_none, from_bool], self.rte)
         if self.service_request_id is not None:
@@ -6275,6 +6675,20 @@ def to_dict(self) -> dict:
             result["statusCode"] = from_union([from_none, to_int], self.status_code)
         if self.transport is not None:
             result["transport"] = from_union([from_none, lambda x: to_enum(ModelCallFailureTransport, x)], self.transport)
+        if self.websocket_fallback_after is not None:
+            result["websocketFallbackAfterMs"] = from_union([from_none, to_timedelta_int], self.websocket_fallback_after)
+        if self.websocket_fallback_close_code is not None:
+            result["websocketFallbackCloseCode"] = from_union([from_none, to_int], self.websocket_fallback_close_code)
+        if self.websocket_fallback_error_kind is not None:
+            result["websocketFallbackErrorKind"] = from_union([from_none, lambda x: to_enum(ModelCallWebSocketFallbackErrorKind, x)], self.websocket_fallback_error_kind)
+        if self.websocket_fallback_reason is not None:
+            result["websocketFallbackReason"] = from_union([from_none, lambda x: to_enum(ModelCallWebSocketFallbackReason, x)], self.websocket_fallback_reason)
+        if self.websocket_fallback_reconnect_attempted is not None:
+            result["websocketFallbackReconnectAttempted"] = from_union([from_none, from_bool], self.websocket_fallback_reconnect_attempted)
+        if self.websocket_fallback_started_this_call is not None:
+            result["websocketFallbackStartedThisCall"] = from_union([from_none, from_bool], self.websocket_fallback_started_this_call)
+        if self.websocket_fallback_status_code is not None:
+            result["websocketFallbackStatusCode"] = from_union([from_none, to_int], self.websocket_fallback_status_code)
         return result
 
 
@@ -6287,7 +6701,10 @@ class ModelCallFailureRequestFingerprint:
     nameless_tool_call_count: int
     tool_call_count: int
     tool_result_message_count: int
+    encrypted_content_bytes: int | None = None
+    image_bytes: int | None = None
     last_message_role: str | None = None
+    reasoning_item_count: int | None = None
 
     @staticmethod
     def from_dict(obj: Any) -> "ModelCallFailureRequestFingerprint":
@@ -6298,7 +6715,10 @@ def from_dict(obj: Any) -> "ModelCallFailureRequestFingerprint":
         nameless_tool_call_count = from_int(obj.get("namelessToolCallCount"))
         tool_call_count = from_int(obj.get("toolCallCount"))
         tool_result_message_count = from_int(obj.get("toolResultMessageCount"))
+        encrypted_content_bytes = from_union([from_none, from_int], obj.get("encryptedContentBytes"))
+        image_bytes = from_union([from_none, from_int], obj.get("imageBytes"))
         last_message_role = from_union([from_none, from_str], obj.get("lastMessageRole"))
+        reasoning_item_count = from_union([from_none, from_int], obj.get("reasoningItemCount"))
         return ModelCallFailureRequestFingerprint(
             image_part_count=image_part_count,
             image_parts_missing_media_type=image_parts_missing_media_type,
@@ -6306,7 +6726,10 @@ def from_dict(obj: Any) -> "ModelCallFailureRequestFingerprint":
             nameless_tool_call_count=nameless_tool_call_count,
             tool_call_count=tool_call_count,
             tool_result_message_count=tool_result_message_count,
+            encrypted_content_bytes=encrypted_content_bytes,
+            image_bytes=image_bytes,
             last_message_role=last_message_role,
+            reasoning_item_count=reasoning_item_count,
         )
 
     def to_dict(self) -> dict:
@@ -6317,8 +6740,14 @@ def to_dict(self) -> dict:
         result["namelessToolCallCount"] = to_int(self.nameless_tool_call_count)
         result["toolCallCount"] = to_int(self.tool_call_count)
         result["toolResultMessageCount"] = to_int(self.tool_result_message_count)
+        if self.encrypted_content_bytes is not None:
+            result["encryptedContentBytes"] = from_union([from_none, to_int], self.encrypted_content_bytes)
+        if self.image_bytes is not None:
+            result["imageBytes"] = from_union([from_none, to_int], self.image_bytes)
         if self.last_message_role is not None:
             result["lastMessageRole"] = from_union([from_none, from_str], self.last_message_role)
+        if self.reasoning_item_count is not None:
+            result["reasoningItemCount"] = from_union([from_none, to_int], self.reasoning_item_count)
         return result
 
 
@@ -7390,6 +7819,7 @@ class PermissionPromptRequestWrite:
     kind: ClassVar[str] = "write"
     # Experimental: this field is part of an experimental API and may change or be removed.
     assisted_approval: PermissionAssistedApproval | None = None
+    file_edits: list[PermissionWriteFileEdit] | None = None
     managed_approval_required: bool | None = None
     new_file_contents: str | None = None
     # Experimental: this field is part of an experimental API and may change or be removed.
@@ -7404,6 +7834,7 @@ def from_dict(obj: Any) -> "PermissionPromptRequestWrite":
         file_name = from_str(obj.get("fileName"))
         intention = from_str(obj.get("intention"))
         assisted_approval = from_union([from_none, PermissionAssistedApproval.from_dict], obj.get("assistedApproval"))
+        file_edits = from_union([from_none, lambda x: from_list(PermissionWriteFileEdit.from_dict, x)], obj.get("fileEdits"))
         managed_approval_required = from_union([from_none, from_bool], obj.get("managedApprovalRequired"))
         new_file_contents = from_union([from_none, from_str], obj.get("newFileContents"))
         resolved_path = from_union([from_none, from_str], obj.get("resolvedPath"))
@@ -7414,6 +7845,7 @@ def from_dict(obj: Any) -> "PermissionPromptRequestWrite":
             file_name=file_name,
             intention=intention,
             assisted_approval=assisted_approval,
+            file_edits=file_edits,
             managed_approval_required=managed_approval_required,
             new_file_contents=new_file_contents,
             resolved_path=resolved_path,
@@ -7429,6 +7861,8 @@ def to_dict(self) -> dict:
         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.file_edits is not None:
+            result["fileEdits"] = from_union([from_none, lambda x: from_list(lambda x: to_class(PermissionWriteFileEdit, x), x)], self.file_edits)
         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:
@@ -7496,6 +7930,8 @@ class PermissionRecoveryData:
     on_blocked: PermissionRecoveryOnBlocked
     reason: PermissionRecoveryReason
     status: PermissionRecoveryStatus
+    owner_agent_id: str | None = None
+    owner_session_id: str | None = None
 
     @staticmethod
     def from_dict(obj: Any) -> "PermissionRecoveryData":
@@ -7506,6 +7942,8 @@ def from_dict(obj: Any) -> "PermissionRecoveryData":
         on_blocked = parse_enum(PermissionRecoveryOnBlocked, obj.get("onBlocked"))
         reason = parse_enum(PermissionRecoveryReason, obj.get("reason"))
         status = parse_enum(PermissionRecoveryStatus, obj.get("status"))
+        owner_agent_id = from_union([from_none, from_str], obj.get("ownerAgentId"))
+        owner_session_id = from_union([from_none, from_str], obj.get("ownerSessionId"))
         return PermissionRecoveryData(
             attempts=attempts,
             episode_id=episode_id,
@@ -7513,6 +7951,8 @@ def from_dict(obj: Any) -> "PermissionRecoveryData":
             on_blocked=on_blocked,
             reason=reason,
             status=status,
+            owner_agent_id=owner_agent_id,
+            owner_session_id=owner_session_id,
         )
 
     def to_dict(self) -> dict:
@@ -7523,6 +7963,10 @@ def to_dict(self) -> dict:
         result["onBlocked"] = to_enum(PermissionRecoveryOnBlocked, self.on_blocked)
         result["reason"] = to_enum(PermissionRecoveryReason, self.reason)
         result["status"] = to_enum(PermissionRecoveryStatus, self.status)
+        if self.owner_agent_id is not None:
+            result["ownerAgentId"] = from_union([from_none, from_str], self.owner_agent_id)
+        if self.owner_session_id is not None:
+            result["ownerSessionId"] = from_union([from_none, from_str], self.owner_session_id)
         return result
 
 
@@ -8213,6 +8657,7 @@ class PermissionRequestWrite:
     file_name: str
     intention: str
     kind: ClassVar[str] = "write"
+    file_edits: list[PermissionWriteFileEdit] | None = None
     managed_approval_required: bool | None = None
     new_file_contents: str | None = None
     request_sandbox_bypass: bool | None = None
@@ -8230,6 +8675,7 @@ def from_dict(obj: Any) -> "PermissionRequestWrite":
         diff = from_str(obj.get("diff"))
         file_name = from_str(obj.get("fileName"))
         intention = from_str(obj.get("intention"))
+        file_edits = from_union([from_none, lambda x: from_list(PermissionWriteFileEdit.from_dict, x)], obj.get("fileEdits"))
         managed_approval_required = from_union([from_none, from_bool], obj.get("managedApprovalRequired"))
         new_file_contents = from_union([from_none, from_str], obj.get("newFileContents"))
         request_sandbox_bypass = from_union([from_none, from_bool], obj.get("requestSandboxBypass"))
@@ -8242,6 +8688,7 @@ def from_dict(obj: Any) -> "PermissionRequestWrite":
             diff=diff,
             file_name=file_name,
             intention=intention,
+            file_edits=file_edits,
             managed_approval_required=managed_approval_required,
             new_file_contents=new_file_contents,
             request_sandbox_bypass=request_sandbox_bypass,
@@ -8258,6 +8705,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.file_edits is not None:
+            result["fileEdits"] = from_union([from_none, lambda x: from_list(lambda x: to_class(PermissionWriteFileEdit, x), x)], self.file_edits)
         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:
@@ -8281,6 +8730,8 @@ class PermissionRequestedData:
     permission_request: PermissionRequest
     request_id: str
     agent_mode: SessionMode | None = None
+    owner_agent_id: str | None = None
+    owner_session_id: str | None = None
     permission_mode: PermissionMode | None = None
     prompt_request: PermissionPromptRequest | None = None
     recovery_episode_id: str | None = None
@@ -8293,6 +8744,8 @@ def from_dict(obj: Any) -> "PermissionRequestedData":
         permission_request = _load_PermissionRequest(obj.get("permissionRequest"))
         request_id = from_str(obj.get("requestId"))
         agent_mode = from_union([from_none, lambda x: parse_enum(SessionMode, x)], obj.get("agentMode"))
+        owner_agent_id = from_union([from_none, from_str], obj.get("ownerAgentId"))
+        owner_session_id = from_union([from_none, from_str], obj.get("ownerSessionId"))
         permission_mode = from_union([from_none, lambda x: parse_enum(PermissionMode, x)], obj.get("permissionMode"))
         prompt_request = from_union([from_none, _load_PermissionPromptRequest], obj.get("promptRequest"))
         recovery_episode_id = from_union([from_none, from_str], obj.get("recoveryEpisodeId"))
@@ -8302,6 +8755,8 @@ def from_dict(obj: Any) -> "PermissionRequestedData":
             permission_request=permission_request,
             request_id=request_id,
             agent_mode=agent_mode,
+            owner_agent_id=owner_agent_id,
+            owner_session_id=owner_session_id,
             permission_mode=permission_mode,
             prompt_request=prompt_request,
             recovery_episode_id=recovery_episode_id,
@@ -8315,6 +8770,10 @@ def to_dict(self) -> dict:
         result["requestId"] = from_str(self.request_id)
         if self.agent_mode is not None:
             result["agentMode"] = from_union([from_none, lambda x: to_enum(SessionMode, x)], self.agent_mode)
+        if self.owner_agent_id is not None:
+            result["ownerAgentId"] = from_union([from_none, from_str], self.owner_agent_id)
+        if self.owner_session_id is not None:
+            result["ownerSessionId"] = from_union([from_none, from_str], self.owner_session_id)
         if self.permission_mode is not None:
             result["permissionMode"] = from_union([from_none, lambda x: to_enum(PermissionMode, x)], self.permission_mode)
         if self.prompt_request is not None:
@@ -8351,6 +8810,54 @@ def to_dict(self) -> dict:
         return result
 
 
+@dataclass
+class PermissionWriteFileContent:
+    "A named, complete UTF-8 text snapshot for a pending file operation."
+    content: str
+    path: str
+
+    @staticmethod
+    def from_dict(obj: Any) -> "PermissionWriteFileContent":
+        assert isinstance(obj, dict)
+        content = from_str(obj.get("content"))
+        path = from_str(obj.get("path"))
+        return PermissionWriteFileContent(
+            content=content,
+            path=path,
+        )
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["content"] = from_str(self.content)
+        result["path"] = from_str(self.path)
+        return result
+
+
+@dataclass
+class PermissionWriteFileEdit:
+    "Complete text snapshots for one proposed file change. At least one side is present. Different before and after paths describe a move."
+    after: PermissionWriteFileContent | None = None
+    before: PermissionWriteFileContent | None = None
+
+    @staticmethod
+    def from_dict(obj: Any) -> "PermissionWriteFileEdit":
+        assert isinstance(obj, dict)
+        after = from_union([from_none, PermissionWriteFileContent.from_dict], obj.get("after"))
+        before = from_union([from_none, PermissionWriteFileContent.from_dict], obj.get("before"))
+        return PermissionWriteFileEdit(
+            after=after,
+            before=before,
+        )
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        if self.after is not None:
+            result["after"] = from_union([from_none, lambda x: to_class(PermissionWriteFileContent, x)], self.after)
+        if self.before is not None:
+            result["before"] = from_union([from_none, lambda x: to_class(PermissionWriteFileContent, x)], self.before)
+        return result
+
+
 @dataclass
 class PersistedBinaryImage:
     "Binary result returned by a tool for the model"
@@ -8535,6 +9042,69 @@ def to_dict(self) -> dict:
         return result
 
 
+@dataclass
+class ProviderQuotaBudgetMetadata:
+    "Authoritative budget measurements and policy metadata, independent of provider."
+    consumed: float
+    entitlement: float
+    overage: float
+    overage_allowed_when_exhausted: bool
+    remaining_percentage: float
+    unlimited: bool
+    usage_allowed_when_exhausted: bool
+    overage_limit: float | None = None
+    reset_at_epoch_ms: float | None = None
+    reset_estimated: bool | None = None
+    token_based_billing: bool | None = None
+
+    @staticmethod
+    def from_dict(obj: Any) -> "ProviderQuotaBudgetMetadata":
+        assert isinstance(obj, dict)
+        consumed = from_float(obj.get("consumed"))
+        entitlement = from_float(obj.get("entitlement"))
+        overage = from_float(obj.get("overage"))
+        overage_allowed_when_exhausted = from_bool(obj.get("overageAllowedWhenExhausted"))
+        remaining_percentage = from_float(obj.get("remainingPercentage"))
+        unlimited = from_bool(obj.get("unlimited"))
+        usage_allowed_when_exhausted = from_bool(obj.get("usageAllowedWhenExhausted"))
+        overage_limit = from_union([from_none, from_float], obj.get("overageLimit"))
+        reset_at_epoch_ms = from_union([from_none, from_float], obj.get("resetAtEpochMs"))
+        reset_estimated = from_union([from_none, from_bool], obj.get("resetEstimated"))
+        token_based_billing = from_union([from_none, from_bool], obj.get("tokenBasedBilling"))
+        return ProviderQuotaBudgetMetadata(
+            consumed=consumed,
+            entitlement=entitlement,
+            overage=overage,
+            overage_allowed_when_exhausted=overage_allowed_when_exhausted,
+            remaining_percentage=remaining_percentage,
+            unlimited=unlimited,
+            usage_allowed_when_exhausted=usage_allowed_when_exhausted,
+            overage_limit=overage_limit,
+            reset_at_epoch_ms=reset_at_epoch_ms,
+            reset_estimated=reset_estimated,
+            token_based_billing=token_based_billing,
+        )
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["consumed"] = to_float(self.consumed)
+        result["entitlement"] = to_float(self.entitlement)
+        result["overage"] = to_float(self.overage)
+        result["overageAllowedWhenExhausted"] = from_bool(self.overage_allowed_when_exhausted)
+        result["remainingPercentage"] = to_float(self.remaining_percentage)
+        result["unlimited"] = from_bool(self.unlimited)
+        result["usageAllowedWhenExhausted"] = from_bool(self.usage_allowed_when_exhausted)
+        if self.overage_limit is not None:
+            result["overageLimit"] = from_union([from_none, to_float], self.overage_limit)
+        if self.reset_at_epoch_ms is not None:
+            result["resetAtEpochMs"] = from_union([from_none, to_float], self.reset_at_epoch_ms)
+        if self.reset_estimated is not None:
+            result["resetEstimated"] = from_union([from_none, from_bool], self.reset_estimated)
+        if self.token_based_billing is not None:
+            result["tokenBasedBilling"] = from_union([from_none, from_bool], self.token_based_billing)
+        return result
+
+
 @dataclass
 class ResponsesReasoning:
     "Original request-level and effective conversation reasoning effort for a provider history boundary; the historical type name is retained for compatibility"
@@ -9250,6 +9820,8 @@ class SessionErrorData:
     eligible_for_auto_switch: bool | None = None
     error_code: str | None = None
     provider_call_id: str | None = None
+    provider_error_param: str | None = None
+    provider_error_type: str | None = None
     remediation: RemediationAction | None = None
     service_request_id: str | None = None
     stack: str | None = None
@@ -9264,6 +9836,8 @@ def from_dict(obj: Any) -> "SessionErrorData":
         eligible_for_auto_switch = from_union([from_none, from_bool], obj.get("eligibleForAutoSwitch"))
         error_code = from_union([from_none, from_str], obj.get("errorCode"))
         provider_call_id = from_union([from_none, from_str], obj.get("providerCallId"))
+        provider_error_param = from_union([from_none, from_str], obj.get("providerErrorParam"))
+        provider_error_type = from_union([from_none, from_str], obj.get("providerErrorType"))
         remediation = from_union([from_none, lambda x: parse_enum(RemediationAction, x)], obj.get("remediation"))
         service_request_id = from_union([from_none, from_str], obj.get("serviceRequestId"))
         stack = from_union([from_none, from_str], obj.get("stack"))
@@ -9275,6 +9849,8 @@ def from_dict(obj: Any) -> "SessionErrorData":
             eligible_for_auto_switch=eligible_for_auto_switch,
             error_code=error_code,
             provider_call_id=provider_call_id,
+            provider_error_param=provider_error_param,
+            provider_error_type=provider_error_type,
             remediation=remediation,
             service_request_id=service_request_id,
             stack=stack,
@@ -9292,6 +9868,10 @@ def to_dict(self) -> dict:
             result["errorCode"] = from_union([from_none, from_str], self.error_code)
         if self.provider_call_id is not None:
             result["providerCallId"] = from_union([from_none, from_str], self.provider_call_id)
+        if self.provider_error_param is not None:
+            result["providerErrorParam"] = from_union([from_none, from_str], self.provider_error_param)
+        if self.provider_error_type is not None:
+            result["providerErrorType"] = from_union([from_none, from_str], self.provider_error_type)
         if self.remediation is not None:
             result["remediation"] = from_union([from_none, lambda x: to_enum(RemediationAction, x)], self.remediation)
         if self.service_request_id is not None:
@@ -9809,14 +10389,19 @@ class SessionModelChangeData:
     "Model change details including previous and new model identifiers"
     new_model: str
     auto_tier: AutoTier | None = None
+    auto_tier_managed: bool | None = None
     cause: str | None = None
     context_tier: ContextTier | None = None
+    context_tier_managed: bool | None = None
     previous_auto_tier: AutoTier | None = None
     previous_model: str | None = None
+    previous_provider_id: str | None = None
     previous_reasoning_effort: str | None = None
     previous_reasoning_summary: ReasoningSummary | None = None
     previous_verbosity: Verbosity | None = None
+    provider_id: str | None = None
     reasoning_effort: str | None = None
+    reasoning_effort_managed: bool | None = None
     reasoning_effort_model: str | None = None
     reasoning_summary: ReasoningSummary | None = None
     source: ModelChangeSource | None = None
@@ -9827,14 +10412,19 @@ def from_dict(obj: Any) -> "SessionModelChangeData":
         assert isinstance(obj, dict)
         new_model = from_str(obj.get("newModel"))
         auto_tier = from_union([from_none, lambda x: parse_enum(AutoTier, x)], obj.get("autoTier"))
+        auto_tier_managed = from_union([from_none, from_bool], obj.get("autoTierManaged"))
         cause = from_union([from_none, from_str], obj.get("cause"))
         context_tier = from_union([from_none, lambda x: parse_enum(ContextTier, x)], obj.get("contextTier"))
+        context_tier_managed = from_union([from_none, from_bool], obj.get("contextTierManaged"))
         previous_auto_tier = from_union([from_none, lambda x: parse_enum(AutoTier, x)], obj.get("previousAutoTier"))
         previous_model = from_union([from_none, from_str], obj.get("previousModel"))
+        previous_provider_id = from_union([from_none, from_str], obj.get("previousProviderId"))
         previous_reasoning_effort = from_union([from_none, from_str], obj.get("previousReasoningEffort"))
         previous_reasoning_summary = from_union([from_none, lambda x: parse_enum(ReasoningSummary, x)], obj.get("previousReasoningSummary"))
         previous_verbosity = from_union([from_none, lambda x: parse_enum(Verbosity, x)], obj.get("previousVerbosity"))
+        provider_id = from_union([from_none, from_str], obj.get("providerId"))
         reasoning_effort = from_union([from_none, from_str], obj.get("reasoningEffort"))
+        reasoning_effort_managed = from_union([from_none, from_bool], obj.get("reasoningEffortManaged"))
         reasoning_effort_model = from_union([from_none, from_str], obj.get("reasoningEffortModel"))
         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"))
@@ -9842,14 +10432,19 @@ def from_dict(obj: Any) -> "SessionModelChangeData":
         return SessionModelChangeData(
             new_model=new_model,
             auto_tier=auto_tier,
+            auto_tier_managed=auto_tier_managed,
             cause=cause,
             context_tier=context_tier,
+            context_tier_managed=context_tier_managed,
             previous_auto_tier=previous_auto_tier,
             previous_model=previous_model,
+            previous_provider_id=previous_provider_id,
             previous_reasoning_effort=previous_reasoning_effort,
             previous_reasoning_summary=previous_reasoning_summary,
             previous_verbosity=previous_verbosity,
+            provider_id=provider_id,
             reasoning_effort=reasoning_effort,
+            reasoning_effort_managed=reasoning_effort_managed,
             reasoning_effort_model=reasoning_effort_model,
             reasoning_summary=reasoning_summary,
             source=source,
@@ -9861,22 +10456,32 @@ def to_dict(self) -> dict:
         result["newModel"] = from_str(self.new_model)
         if self.auto_tier is not None:
             result["autoTier"] = from_union([from_none, lambda x: to_enum(AutoTier, x)], self.auto_tier)
+        if self.auto_tier_managed is not None:
+            result["autoTierManaged"] = from_union([from_none, from_bool], self.auto_tier_managed)
         if self.cause is not None:
             result["cause"] = from_union([from_none, from_str], self.cause)
         if self.context_tier is not None:
             result["contextTier"] = from_union([from_none, lambda x: to_enum(ContextTier, x)], self.context_tier)
+        if self.context_tier_managed is not None:
+            result["contextTierManaged"] = from_union([from_none, from_bool], self.context_tier_managed)
         if self.previous_auto_tier is not None:
             result["previousAutoTier"] = from_union([from_none, lambda x: to_enum(AutoTier, x)], self.previous_auto_tier)
         if self.previous_model is not None:
             result["previousModel"] = from_union([from_none, from_str], self.previous_model)
+        if self.previous_provider_id is not None:
+            result["previousProviderId"] = from_union([from_none, from_str], self.previous_provider_id)
         if self.previous_reasoning_effort is not None:
             result["previousReasoningEffort"] = from_union([from_none, from_str], self.previous_reasoning_effort)
         if self.previous_reasoning_summary is not None:
             result["previousReasoningSummary"] = from_union([from_none, lambda x: to_enum(ReasoningSummary, x)], self.previous_reasoning_summary)
         if self.previous_verbosity is not None:
             result["previousVerbosity"] = from_union([from_none, lambda x: to_enum(Verbosity, x)], self.previous_verbosity)
+        if self.provider_id is not None:
+            result["providerId"] = from_union([from_none, from_str], self.provider_id)
         if self.reasoning_effort is not None:
             result["reasoningEffort"] = from_union([from_none, from_str], self.reasoning_effort)
+        if self.reasoning_effort_managed is not None:
+            result["reasoningEffortManaged"] = from_union([from_none, from_bool], self.reasoning_effort_managed)
         if self.reasoning_effort_model is not None:
             result["reasoningEffortModel"] = from_union([from_none, from_str], self.reasoning_effort_model)
         if self.reasoning_summary is not None:
@@ -9920,6 +10525,8 @@ class SessionPermissionRecoveryData:
     on_blocked: PermissionRecoveryOnBlocked
     reason: PermissionRecoveryReason
     status: PermissionRecoveryStatus
+    owner_agent_id: str | None = None
+    owner_session_id: str | None = None
 
     @staticmethod
     def from_dict(obj: Any) -> "SessionPermissionRecoveryData":
@@ -9930,6 +10537,8 @@ def from_dict(obj: Any) -> "SessionPermissionRecoveryData":
         on_blocked = parse_enum(PermissionRecoveryOnBlocked, obj.get("onBlocked"))
         reason = parse_enum(PermissionRecoveryReason, obj.get("reason"))
         status = parse_enum(PermissionRecoveryStatus, obj.get("status"))
+        owner_agent_id = from_union([from_none, from_str], obj.get("ownerAgentId"))
+        owner_session_id = from_union([from_none, from_str], obj.get("ownerSessionId"))
         return SessionPermissionRecoveryData(
             attempts=attempts,
             episode_id=episode_id,
@@ -9937,6 +10546,8 @@ def from_dict(obj: Any) -> "SessionPermissionRecoveryData":
             on_blocked=on_blocked,
             reason=reason,
             status=status,
+            owner_agent_id=owner_agent_id,
+            owner_session_id=owner_session_id,
         )
 
     def to_dict(self) -> dict:
@@ -9947,6 +10558,10 @@ def to_dict(self) -> dict:
         result["onBlocked"] = to_enum(PermissionRecoveryOnBlocked, self.on_blocked)
         result["reason"] = to_enum(PermissionRecoveryReason, self.reason)
         result["status"] = to_enum(PermissionRecoveryStatus, self.status)
+        if self.owner_agent_id is not None:
+            result["ownerAgentId"] = from_union([from_none, from_str], self.owner_agent_id)
+        if self.owner_session_id is not None:
+            result["ownerSessionId"] = from_union([from_none, from_str], self.owner_session_id)
         return result
 
 
@@ -9995,11 +10610,15 @@ class SessionResumeData:
     resume_time: datetime
     already_in_use: bool | None = None
     auto_tier: AutoTier | None = None
+    auto_tier_managed: bool | None = None
     context: WorkingDirectoryContext | None = None
     context_tier: ContextTier | None = None
+    context_tier_managed: bool | None = None
     continue_pending_work: bool | None = None
     events_file_size_bytes: int | None = None
+    provider_id: str | None = None
     reasoning_effort: str | None = None
+    reasoning_effort_managed: bool | None = None
     reasoning_effort_model: str | None = None
     reasoning_summary: ReasoningSummary | None = None
     remote_steerable: bool | None = None
@@ -10015,11 +10634,15 @@ def from_dict(obj: Any) -> "SessionResumeData":
         resume_time = from_datetime(obj.get("resumeTime"))
         already_in_use = from_union([from_none, from_bool], obj.get("alreadyInUse"))
         auto_tier = from_union([from_none, lambda x: parse_enum(AutoTier, x)], obj.get("autoTier"))
+        auto_tier_managed = from_union([from_none, from_bool], obj.get("autoTierManaged"))
         context = from_union([from_none, WorkingDirectoryContext.from_dict], obj.get("context"))
         context_tier = from_union([from_none, lambda x: parse_enum(ContextTier, x)], obj.get("contextTier"))
+        context_tier_managed = from_union([from_none, from_bool], obj.get("contextTierManaged"))
         continue_pending_work = from_union([from_none, from_bool], obj.get("continuePendingWork"))
         events_file_size_bytes = from_union([from_none, from_int], obj.get("eventsFileSizeBytes"))
+        provider_id = from_union([from_none, from_str], obj.get("providerId"))
         reasoning_effort = from_union([from_none, from_str], obj.get("reasoningEffort"))
+        reasoning_effort_managed = from_union([from_none, from_bool], obj.get("reasoningEffortManaged"))
         reasoning_effort_model = from_union([from_none, from_str], obj.get("reasoningEffortModel"))
         reasoning_summary = from_union([from_none, lambda x: parse_enum(ReasoningSummary, x)], obj.get("reasoningSummary"))
         remote_steerable = from_union([from_none, from_bool], obj.get("remoteSteerable"))
@@ -10032,11 +10655,15 @@ def from_dict(obj: Any) -> "SessionResumeData":
             resume_time=resume_time,
             already_in_use=already_in_use,
             auto_tier=auto_tier,
+            auto_tier_managed=auto_tier_managed,
             context=context,
             context_tier=context_tier,
+            context_tier_managed=context_tier_managed,
             continue_pending_work=continue_pending_work,
             events_file_size_bytes=events_file_size_bytes,
+            provider_id=provider_id,
             reasoning_effort=reasoning_effort,
+            reasoning_effort_managed=reasoning_effort_managed,
             reasoning_effort_model=reasoning_effort_model,
             reasoning_summary=reasoning_summary,
             remote_steerable=remote_steerable,
@@ -10054,16 +10681,24 @@ def to_dict(self) -> dict:
             result["alreadyInUse"] = from_union([from_none, from_bool], self.already_in_use)
         if self.auto_tier is not None:
             result["autoTier"] = from_union([from_none, lambda x: to_enum(AutoTier, x)], self.auto_tier)
+        if self.auto_tier_managed is not None:
+            result["autoTierManaged"] = from_union([from_none, from_bool], self.auto_tier_managed)
         if self.context is not None:
             result["context"] = from_union([from_none, lambda x: to_class(WorkingDirectoryContext, x)], self.context)
         if self.context_tier is not None:
             result["contextTier"] = from_union([from_none, lambda x: to_enum(ContextTier, x)], self.context_tier)
+        if self.context_tier_managed is not None:
+            result["contextTierManaged"] = from_union([from_none, from_bool], self.context_tier_managed)
         if self.continue_pending_work is not None:
             result["continuePendingWork"] = from_union([from_none, from_bool], self.continue_pending_work)
         if self.events_file_size_bytes is not None:
             result["eventsFileSizeBytes"] = from_union([from_none, to_int], self.events_file_size_bytes)
+        if self.provider_id is not None:
+            result["providerId"] = from_union([from_none, from_str], self.provider_id)
         if self.reasoning_effort is not None:
             result["reasoningEffort"] = from_union([from_none, from_str], self.reasoning_effort)
+        if self.reasoning_effort_managed is not None:
+            result["reasoningEffortManaged"] = from_union([from_none, from_bool], self.reasoning_effort_managed)
         if self.reasoning_effort_model is not None:
             result["reasoningEffortModel"] = from_union([from_none, from_str], self.reasoning_effort_model)
         if self.reasoning_summary is not None:
@@ -10213,12 +10848,15 @@ class SessionShutdownData:
     session_start_time: int
     shutdown_type: ShutdownType
     total_api_duration: timedelta
+    # Internal: this field is an internal SDK API and is not part of the public surface.
+    _accounting_snapshot: UsageGetMetricsResult | None = None
     agent_metrics: dict[str, ShutdownAgentMetric] | None = None
     conversation_tokens: int | None = None
     current_model: str | None = None
     current_tokens: int | None = None
     error_reason: str | None = None
     events_file_size_bytes: int | None = None
+    provider_model_metrics: list[UsageMetricsProviderModelMetric] | None = None
     system_tokens: int | None = None
     token_details: dict[str, ShutdownTokenDetail] | None = None
     tool_definitions_tokens: int | None = None
@@ -10226,6 +10864,7 @@ class SessionShutdownData:
     total_nano_aiu: float | None = None
     # Internal: this field is an internal SDK API and is not part of the public surface.
     _total_premium_requests: float | None = None
+    usage_accounting_watermarks: dict[str, int] | None = None
 
     @staticmethod
     def from_dict(obj: Any) -> "SessionShutdownData":
@@ -10235,34 +10874,40 @@ 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"))
+        _accounting_snapshot = from_union([from_none, UsageGetMetricsResult.from_dict], obj.get("accountingSnapshot"))
         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"))
         error_reason = from_union([from_none, from_str], obj.get("errorReason"))
         events_file_size_bytes = from_union([from_none, from_int], obj.get("eventsFileSizeBytes"))
+        provider_model_metrics = from_union([from_none, lambda x: from_list(UsageMetricsProviderModelMetric.from_dict, x)], obj.get("providerModelMetrics"))
         system_tokens = from_union([from_none, from_int], obj.get("systemTokens"))
         token_details = from_union([from_none, lambda x: from_dict(ShutdownTokenDetail.from_dict, x)], obj.get("tokenDetails"))
         tool_definitions_tokens = from_union([from_none, from_int], obj.get("toolDefinitionsTokens"))
         total_nano_aiu = from_union([from_none, from_float], obj.get("totalNanoAiu"))
         _total_premium_requests = from_union([from_none, from_float], obj.get("totalPremiumRequests"))
+        usage_accounting_watermarks = from_union([from_none, lambda x: from_dict(from_int, x)], obj.get("usageAccountingWatermarks"))
         return SessionShutdownData(
             code_changes=code_changes,
             model_metrics=model_metrics,
             session_start_time=session_start_time,
             shutdown_type=shutdown_type,
             total_api_duration=total_api_duration,
+            _accounting_snapshot=_accounting_snapshot,
             agent_metrics=agent_metrics,
             conversation_tokens=conversation_tokens,
             current_model=current_model,
             current_tokens=current_tokens,
             error_reason=error_reason,
             events_file_size_bytes=events_file_size_bytes,
+            provider_model_metrics=provider_model_metrics,
             system_tokens=system_tokens,
             token_details=token_details,
             tool_definitions_tokens=tool_definitions_tokens,
             total_nano_aiu=total_nano_aiu,
             _total_premium_requests=_total_premium_requests,
+            usage_accounting_watermarks=usage_accounting_watermarks,
         )
 
     def to_dict(self) -> dict:
@@ -10272,6 +10917,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._accounting_snapshot is not None:
+            result["accountingSnapshot"] = from_union([from_none, lambda x: to_class(UsageGetMetricsResult, x)], self._accounting_snapshot)
         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:
@@ -10284,6 +10931,8 @@ def to_dict(self) -> dict:
             result["errorReason"] = from_union([from_none, from_str], self.error_reason)
         if self.events_file_size_bytes is not None:
             result["eventsFileSizeBytes"] = from_union([from_none, to_int], self.events_file_size_bytes)
+        if self.provider_model_metrics is not None:
+            result["providerModelMetrics"] = from_union([from_none, lambda x: from_list(lambda x: to_class(UsageMetricsProviderModelMetric, x), x)], self.provider_model_metrics)
         if self.system_tokens is not None:
             result["systemTokens"] = from_union([from_none, to_int], self.system_tokens)
         if self.token_details is not None:
@@ -10294,6 +10943,8 @@ def to_dict(self) -> dict:
             result["totalNanoAiu"] = from_union([from_none, to_float], self.total_nano_aiu)
         if self._total_premium_requests is not None:
             result["totalPremiumRequests"] = from_union([from_none, to_float], self._total_premium_requests)
+        if self.usage_accounting_watermarks is not None:
+            result["usageAccountingWatermarks"] = from_union([from_none, lambda x: from_dict(to_int, x)], self.usage_accounting_watermarks)
         return result
 
 
@@ -10354,11 +11005,15 @@ class SessionStartData:
     version: int
     already_in_use: bool | None = None
     auto_tier: AutoTier | None = None
+    auto_tier_managed: bool | None = None
     context: WorkingDirectoryContext | None = None
     context_tier: ContextTier | None = None
+    context_tier_managed: bool | None = None
     detached_from_spawning_parent_session_id: str | None = None
     github_mcp_tool_config: GitHubMcpToolConfig | None = None
+    provider_id: str | None = None
     reasoning_effort: str | None = None
+    reasoning_effort_managed: bool | None = None
     reasoning_effort_model: str | None = None
     reasoning_summary: ReasoningSummary | None = None
     remote_steerable: bool | None = None
@@ -10376,11 +11031,15 @@ def from_dict(obj: Any) -> "SessionStartData":
         version = from_int(obj.get("version"))
         already_in_use = from_union([from_none, from_bool], obj.get("alreadyInUse"))
         auto_tier = from_union([from_none, lambda x: parse_enum(AutoTier, x)], obj.get("autoTier"))
+        auto_tier_managed = from_union([from_none, from_bool], obj.get("autoTierManaged"))
         context = from_union([from_none, WorkingDirectoryContext.from_dict], obj.get("context"))
         context_tier = from_union([from_none, lambda x: parse_enum(ContextTier, x)], obj.get("contextTier"))
+        context_tier_managed = from_union([from_none, from_bool], obj.get("contextTierManaged"))
         detached_from_spawning_parent_session_id = from_union([from_none, from_str], obj.get("detachedFromSpawningParentSessionId"))
         github_mcp_tool_config = from_union([from_none, GitHubMcpToolConfig.from_dict], obj.get("githubMcpToolConfig"))
+        provider_id = from_union([from_none, from_str], obj.get("providerId"))
         reasoning_effort = from_union([from_none, from_str], obj.get("reasoningEffort"))
+        reasoning_effort_managed = from_union([from_none, from_bool], obj.get("reasoningEffortManaged"))
         reasoning_effort_model = from_union([from_none, from_str], obj.get("reasoningEffortModel"))
         reasoning_summary = from_union([from_none, lambda x: parse_enum(ReasoningSummary, x)], obj.get("reasoningSummary"))
         remote_steerable = from_union([from_none, from_bool], obj.get("remoteSteerable"))
@@ -10395,11 +11054,15 @@ def from_dict(obj: Any) -> "SessionStartData":
             version=version,
             already_in_use=already_in_use,
             auto_tier=auto_tier,
+            auto_tier_managed=auto_tier_managed,
             context=context,
             context_tier=context_tier,
+            context_tier_managed=context_tier_managed,
             detached_from_spawning_parent_session_id=detached_from_spawning_parent_session_id,
             github_mcp_tool_config=github_mcp_tool_config,
+            provider_id=provider_id,
             reasoning_effort=reasoning_effort,
+            reasoning_effort_managed=reasoning_effort_managed,
             reasoning_effort_model=reasoning_effort_model,
             reasoning_summary=reasoning_summary,
             remote_steerable=remote_steerable,
@@ -10419,16 +11082,24 @@ def to_dict(self) -> dict:
             result["alreadyInUse"] = from_union([from_none, from_bool], self.already_in_use)
         if self.auto_tier is not None:
             result["autoTier"] = from_union([from_none, lambda x: to_enum(AutoTier, x)], self.auto_tier)
+        if self.auto_tier_managed is not None:
+            result["autoTierManaged"] = from_union([from_none, from_bool], self.auto_tier_managed)
         if self.context is not None:
             result["context"] = from_union([from_none, lambda x: to_class(WorkingDirectoryContext, x)], self.context)
         if self.context_tier is not None:
             result["contextTier"] = from_union([from_none, lambda x: to_enum(ContextTier, x)], self.context_tier)
+        if self.context_tier_managed is not None:
+            result["contextTierManaged"] = from_union([from_none, from_bool], self.context_tier_managed)
         if self.detached_from_spawning_parent_session_id is not None:
             result["detachedFromSpawningParentSessionId"] = from_union([from_none, from_str], self.detached_from_spawning_parent_session_id)
         if self.github_mcp_tool_config is not None:
             result["githubMcpToolConfig"] = from_union([from_none, lambda x: to_class(GitHubMcpToolConfig, x)], self.github_mcp_tool_config)
+        if self.provider_id is not None:
+            result["providerId"] = from_union([from_none, from_str], self.provider_id)
         if self.reasoning_effort is not None:
             result["reasoningEffort"] = from_union([from_none, from_str], self.reasoning_effort)
+        if self.reasoning_effort_managed is not None:
+            result["reasoningEffortManaged"] = from_union([from_none, from_bool], self.reasoning_effort_managed)
         if self.reasoning_effort_model is not None:
             result["reasoningEffortModel"] = from_union([from_none, from_str], self.reasoning_effort_model)
         if self.reasoning_summary is not None:
@@ -10591,35 +11262,51 @@ class SessionUsageCheckpointData:
     "Durable session usage checkpoint for reconstructing aggregate accounting on resume"
     total_nano_aiu: float
     # Internal: this field is an internal SDK API and is not part of the public surface.
+    _accounting_snapshot: UsageGetMetricsResult | None = None
+    # 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
+    provider_model_metrics: list[UsageMetricsProviderModelMetric] | None = None
     # Internal: this field is an internal SDK API and is not part of the public surface.
     _total_premium_requests: float | None = None
+    usage_accounting_watermarks: dict[str, int] | None = None
 
     @staticmethod
     def from_dict(obj: Any) -> "SessionUsageCheckpointData":
         assert isinstance(obj, dict)
         total_nano_aiu = from_float(obj.get("totalNanoAiu"))
+        _accounting_snapshot = from_union([from_none, UsageGetMetricsResult.from_dict], obj.get("accountingSnapshot"))
         _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"))
+        provider_model_metrics = from_union([from_none, lambda x: from_list(UsageMetricsProviderModelMetric.from_dict, x)], obj.get("providerModelMetrics"))
         _total_premium_requests = from_union([from_none, from_float], obj.get("totalPremiumRequests"))
+        usage_accounting_watermarks = from_union([from_none, lambda x: from_dict(from_int, x)], obj.get("usageAccountingWatermarks"))
         return SessionUsageCheckpointData(
             total_nano_aiu=total_nano_aiu,
+            _accounting_snapshot=_accounting_snapshot,
             _model_cache_state=_model_cache_state,
             _prompt_cache_break_state=_prompt_cache_break_state,
+            provider_model_metrics=provider_model_metrics,
             _total_premium_requests=_total_premium_requests,
+            usage_accounting_watermarks=usage_accounting_watermarks,
         )
 
     def to_dict(self) -> dict:
         result: dict = {}
         result["totalNanoAiu"] = to_float(self.total_nano_aiu)
+        if self._accounting_snapshot is not None:
+            result["accountingSnapshot"] = from_union([from_none, lambda x: to_class(UsageGetMetricsResult, x)], self._accounting_snapshot)
         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.provider_model_metrics is not None:
+            result["providerModelMetrics"] = from_union([from_none, lambda x: from_list(lambda x: to_class(UsageMetricsProviderModelMetric, x), x)], self.provider_model_metrics)
         if self._total_premium_requests is not None:
             result["totalPremiumRequests"] = from_union([from_none, to_float], self._total_premium_requests)
+        if self.usage_accounting_watermarks is not None:
+            result["usageAccountingWatermarks"] = from_union([from_none, lambda x: from_dict(to_int, x)], self.usage_accounting_watermarks)
         return result
 
 
@@ -12959,6 +13646,33 @@ def to_dict(self) -> dict:
         return result
 
 
+@dataclass
+class UsageAccountingIdentity:
+    "Ordered accounting identity assigned under the source session's emission lock."
+    sequence: int
+    source_session_id: str
+    usage_id: str
+
+    @staticmethod
+    def from_dict(obj: Any) -> "UsageAccountingIdentity":
+        assert isinstance(obj, dict)
+        sequence = from_int(obj.get("sequence"))
+        source_session_id = from_str(obj.get("sourceSessionId"))
+        usage_id = from_str(obj.get("usageId"))
+        return UsageAccountingIdentity(
+            sequence=sequence,
+            source_session_id=source_session_id,
+            usage_id=usage_id,
+        )
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["sequence"] = to_int(self.sequence)
+        result["sourceSessionId"] = from_str(self.source_session_id)
+        result["usageId"] = from_str(self.usage_id)
+        return result
+
+
 @dataclass
 class _UsageCheckpointModelCacheState:
     "Internal prompt-cache expiration state for one model"
@@ -12987,6 +13701,323 @@ def to_dict(self) -> dict:
         return result
 
 
+@dataclass
+class UsageGetMetricsResult:
+    "Accumulated session usage metrics, including premium request cost, token counts, model breakdown, and code-change totals."
+    code_changes: UsageMetricsCodeChanges
+    last_call_input_tokens: int
+    last_call_output_tokens: int
+    model_metrics: dict[str, UsageMetricsModelMetric]
+    session_start_time: datetime
+    total_api_duration: timedelta
+    total_premium_request_cost: float
+    total_user_requests: int
+    agent_metrics: dict[str, UsageMetricsAgentMetric] | None = None
+    ai_credits_status: AiCreditsStatus | None = None
+    current_model: str | None = None
+    provider_model_metrics: list[UsageMetricsProviderModelMetric] | None = None
+    token_details: dict[str, UsageMetricsTokenDetail] | None = None
+    total_nano_aiu: float | None = None
+
+    @staticmethod
+    def from_dict(obj: Any) -> "UsageGetMetricsResult":
+        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 = from_timedelta(obj.get("totalApiDurationMs"))
+        total_premium_request_cost = from_float(obj.get("totalPremiumRequestCost"))
+        total_user_requests = from_int(obj.get("totalUserRequests"))
+        agent_metrics = from_union([from_none, lambda x: from_dict(UsageMetricsAgentMetric.from_dict, x)], obj.get("agentMetrics"))
+        ai_credits_status = from_union([from_none, lambda x: parse_enum(AiCreditsStatus, x)], obj.get("aiCreditsStatus"))
+        current_model = from_union([from_none, from_str], obj.get("currentModel"))
+        provider_model_metrics = from_union([from_none, lambda x: from_list(UsageMetricsProviderModelMetric.from_dict, x)], obj.get("providerModelMetrics"))
+        token_details = from_union([from_none, lambda x: from_dict(UsageMetricsTokenDetail.from_dict, x)], obj.get("tokenDetails"))
+        total_nano_aiu = from_union([from_none, from_float], obj.get("totalNanoAiu"))
+        return UsageGetMetricsResult(
+            code_changes=code_changes,
+            last_call_input_tokens=last_call_input_tokens,
+            last_call_output_tokens=last_call_output_tokens,
+            model_metrics=model_metrics,
+            session_start_time=session_start_time,
+            total_api_duration=total_api_duration,
+            total_premium_request_cost=total_premium_request_cost,
+            total_user_requests=total_user_requests,
+            agent_metrics=agent_metrics,
+            ai_credits_status=ai_credits_status,
+            current_model=current_model,
+            provider_model_metrics=provider_model_metrics,
+            token_details=token_details,
+            total_nano_aiu=total_nano_aiu,
+        )
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["codeChanges"] = to_class(UsageMetricsCodeChanges, self.code_changes)
+        result["lastCallInputTokens"] = to_int(self.last_call_input_tokens)
+        result["lastCallOutputTokens"] = to_int(self.last_call_output_tokens)
+        result["modelMetrics"] = from_dict(lambda x: to_class(UsageMetricsModelMetric, x), self.model_metrics)
+        result["sessionStartTime"] = to_datetime(self.session_start_time)
+        result["totalApiDurationMs"] = to_timedelta_int(self.total_api_duration)
+        result["totalPremiumRequestCost"] = to_float(self.total_premium_request_cost)
+        result["totalUserRequests"] = to_int(self.total_user_requests)
+        if self.agent_metrics is not None:
+            result["agentMetrics"] = from_union([from_none, lambda x: from_dict(lambda x: to_class(UsageMetricsAgentMetric, x), x)], self.agent_metrics)
+        if self.ai_credits_status is not None:
+            result["aiCreditsStatus"] = from_union([from_none, lambda x: to_enum(AiCreditsStatus, x)], self.ai_credits_status)
+        if self.current_model is not None:
+            result["currentModel"] = from_union([from_none, from_str], self.current_model)
+        if self.provider_model_metrics is not None:
+            result["providerModelMetrics"] = from_union([from_none, lambda x: from_list(lambda x: to_class(UsageMetricsProviderModelMetric, x), x)], self.provider_model_metrics)
+        if self.token_details is not None:
+            result["tokenDetails"] = from_union([from_none, lambda x: from_dict(lambda x: to_class(UsageMetricsTokenDetail, x), x)], self.token_details)
+        if self.total_nano_aiu is not None:
+            result["totalNanoAiu"] = from_union([from_none, to_float], self.total_nano_aiu)
+        return result
+
+
+@dataclass
+class UsageMetricsAgentMetric:
+    "Usage attributed to one agent instance, including its identity, API duration, AI units, and per-model breakdown."
+    model_metrics: dict[str, UsageMetricsModelMetric]
+    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) -> "UsageMetricsAgentMetric":
+        assert isinstance(obj, dict)
+        model_metrics = from_dict(UsageMetricsModelMetric.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 UsageMetricsAgentMetric(
+            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(UsageMetricsModelMetric, 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 UsageMetricsCodeChanges:
+    "Aggregated code change metrics"
+    files_modified: list[str]
+    files_modified_count: int
+    lines_added: int
+    lines_removed: int
+
+    @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,
+            files_modified_count=files_modified_count,
+            lines_added=lines_added,
+            lines_removed=lines_removed,
+        )
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["filesModified"] = from_list(from_str, self.files_modified)
+        result["filesModifiedCount"] = to_int(self.files_modified_count)
+        result["linesAdded"] = to_int(self.lines_added)
+        result["linesRemoved"] = to_int(self.lines_removed)
+        return result
+
+
+@dataclass
+class UsageMetricsModelMetric:
+    "Per-model usage metrics, including request counts/costs, token usage, nano-AI units, and per-token-type details."
+    requests: UsageMetricsModelMetricRequests
+    usage: UsageMetricsModelMetricUsage
+    ai_credits_status: AiCreditsStatus | None = None
+    cache_expires_at: datetime | None = None
+    token_details: dict[str, UsageMetricsModelMetricTokenDetail] | None = None
+    total_nano_aiu: float | None = None
+
+    @staticmethod
+    def from_dict(obj: Any) -> "UsageMetricsModelMetric":
+        assert isinstance(obj, dict)
+        requests = UsageMetricsModelMetricRequests.from_dict(obj.get("requests"))
+        usage = UsageMetricsModelMetricUsage.from_dict(obj.get("usage"))
+        ai_credits_status = from_union([from_none, lambda x: parse_enum(AiCreditsStatus, x)], obj.get("aiCreditsStatus"))
+        cache_expires_at = from_union([from_none, from_datetime], obj.get("cacheExpiresAt"))
+        token_details = from_union([from_none, lambda x: from_dict(UsageMetricsModelMetricTokenDetail.from_dict, x)], obj.get("tokenDetails"))
+        total_nano_aiu = from_union([from_none, from_float], obj.get("totalNanoAiu"))
+        return UsageMetricsModelMetric(
+            requests=requests,
+            usage=usage,
+            ai_credits_status=ai_credits_status,
+            cache_expires_at=cache_expires_at,
+            token_details=token_details,
+            total_nano_aiu=total_nano_aiu,
+        )
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["requests"] = to_class(UsageMetricsModelMetricRequests, self.requests)
+        result["usage"] = to_class(UsageMetricsModelMetricUsage, self.usage)
+        if self.ai_credits_status is not None:
+            result["aiCreditsStatus"] = from_union([from_none, lambda x: to_enum(AiCreditsStatus, x)], self.ai_credits_status)
+        if self.cache_expires_at is not None:
+            result["cacheExpiresAt"] = from_union([from_none, to_datetime], self.cache_expires_at)
+        if self.token_details is not None:
+            result["tokenDetails"] = from_union([from_none, lambda x: from_dict(lambda x: to_class(UsageMetricsModelMetricTokenDetail, x), x)], self.token_details)
+        if self.total_nano_aiu is not None:
+            result["totalNanoAiu"] = from_union([from_none, to_float], self.total_nano_aiu)
+        return result
+
+
+@dataclass
+class UsageMetricsModelMetricRequests:
+    "Request count and cost metrics for this model"
+    cost: float
+    count: int
+
+    @staticmethod
+    def from_dict(obj: Any) -> "UsageMetricsModelMetricRequests":
+        assert isinstance(obj, dict)
+        cost = from_float(obj.get("cost"))
+        count = from_int(obj.get("count"))
+        return UsageMetricsModelMetricRequests(
+            cost=cost,
+            count=count,
+        )
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["cost"] = to_float(self.cost)
+        result["count"] = to_int(self.count)
+        return result
+
+
+@dataclass
+class UsageMetricsModelMetricTokenDetail:
+    "Per-model token-detail entry containing the accumulated token count for one token type."
+    token_count: int
+
+    @staticmethod
+    def from_dict(obj: Any) -> "UsageMetricsModelMetricTokenDetail":
+        assert isinstance(obj, dict)
+        token_count = from_int(obj.get("tokenCount"))
+        return UsageMetricsModelMetricTokenDetail(
+            token_count=token_count,
+        )
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["tokenCount"] = to_int(self.token_count)
+        return result
+
+
+@dataclass
+class UsageMetricsModelMetricUsage:
+    "Token usage metrics for this model"
+    cache_read_tokens: int
+    cache_write_tokens: int
+    input_tokens: int
+    output_tokens: int
+    reasoning_tokens: int | None = None
+
+    @staticmethod
+    def from_dict(obj: Any) -> "UsageMetricsModelMetricUsage":
+        assert isinstance(obj, dict)
+        cache_read_tokens = from_int(obj.get("cacheReadTokens"))
+        cache_write_tokens = from_int(obj.get("cacheWriteTokens"))
+        input_tokens = from_int(obj.get("inputTokens"))
+        output_tokens = from_int(obj.get("outputTokens"))
+        reasoning_tokens = from_union([from_none, from_int], obj.get("reasoningTokens"))
+        return UsageMetricsModelMetricUsage(
+            cache_read_tokens=cache_read_tokens,
+            cache_write_tokens=cache_write_tokens,
+            input_tokens=input_tokens,
+            output_tokens=output_tokens,
+            reasoning_tokens=reasoning_tokens,
+        )
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["cacheReadTokens"] = to_int(self.cache_read_tokens)
+        result["cacheWriteTokens"] = to_int(self.cache_write_tokens)
+        result["inputTokens"] = to_int(self.input_tokens)
+        result["outputTokens"] = to_int(self.output_tokens)
+        if self.reasoning_tokens is not None:
+            result["reasoningTokens"] = from_union([from_none, to_int], self.reasoning_tokens)
+        return result
+
+
+@dataclass
+class UsageMetricsProviderModelMetric:
+    "Usage for one recorded provider and model, without merging identical model IDs across providers."
+    metrics: UsageMetricsModelMetric
+    model_id: str | None
+    provider: ModelProviderRef | None
+    model_display_name: str | None = None
+
+    @staticmethod
+    def from_dict(obj: Any) -> "UsageMetricsProviderModelMetric":
+        assert isinstance(obj, dict)
+        metrics = UsageMetricsModelMetric.from_dict(obj.get("metrics"))
+        model_id = from_union([from_none, from_str], obj.get("modelId"))
+        provider = from_union([from_none, ModelProviderRef.from_dict], obj.get("provider"))
+        model_display_name = from_union([from_none, from_str], obj.get("modelDisplayName"))
+        return UsageMetricsProviderModelMetric(
+            metrics=metrics,
+            model_id=model_id,
+            provider=provider,
+            model_display_name=model_display_name,
+        )
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["metrics"] = to_class(UsageMetricsModelMetric, self.metrics)
+        result["modelId"] = from_union([from_none, from_str], self.model_id)
+        result["provider"] = from_union([from_none, lambda x: to_class(ModelProviderRef, x)], self.provider)
+        if self.model_display_name is not None:
+            result["modelDisplayName"] = from_union([from_none, from_str], self.model_display_name)
+        return result
+
+
+@dataclass
+class UsageMetricsTokenDetail:
+    "Session-wide token-detail entry containing the accumulated token count for one token type."
+    token_count: int
+
+    @staticmethod
+    def from_dict(obj: Any) -> "UsageMetricsTokenDetail":
+        assert isinstance(obj, dict)
+        token_count = from_int(obj.get("tokenCount"))
+        return UsageMetricsTokenDetail(
+            token_count=token_count,
+        )
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["tokenCount"] = to_int(self.token_count)
+        return result
+
+
 @dataclass
 class UserInputCompletedData:
     "User input request completion with the user's response"
@@ -13732,6 +14763,28 @@ class FusionTurnKind(Enum):
     COMPACTION = "compaction"
 
 
+# Experimental: this enum is part of an experimental API and may change or be removed.
+class ManagedPluginProgressPhase(Enum):
+    "Current phase of organization-required plugin preparation."
+    # Managed settings are still resolving before plugin preparation can be planned.
+    INITIALIZING = "initializing"
+    # Required plugin content is being installed.
+    INSTALLING = "installing"
+    # Installed required plugin content is being updated.
+    UPDATING = "updating"
+    # Managed plugin preparation has completed.
+    COMPLETE = "complete"
+
+
+# Experimental: this enum is part of an experimental API and may change or be removed.
+class ModelProviderKind(Enum):
+    "The neutral kind of a model provider — the model analog of `AccountKind`. A model provider is the live, entitled source a model came from; central code never branches on this beyond a single dispatch."
+    # GitHub Copilot / CAPI models, spawned by a github-resolving account that holds a Copilot seat.
+    COPILOT = "copilot"
+    # Microsoft 365 Copilot (Loki) inference models, spawned by a resolvable Entra-derived Loki account.
+    LOKI = "loki"
+
+
 # Experimental: this enum is part of an experimental API and may change or be removed.
 class PermissionMessageAuthorizationPolarity(Enum):
     "Direction stored in a historical extractor claim. Current runtimes do not apply it."
@@ -13834,6 +14887,16 @@ class AgentModelPolicy(Enum):
     REQUIRED = "required"
 
 
+class AiCreditsStatus(Enum):
+    "Whether the accumulated numeric AI-credit subtotal covers the observed calls."
+    # Every observed call supplied an AI-credit amount, including an explicit zero.
+    COMPLETE = "complete"
+    # Some calls supplied amounts and some did not; the numeric value is only a reported subtotal.
+    PARTIAL = "partial"
+    # No AI-credit amount was reported for the observed calls. Numeric zero is not a zero-cost claim.
+    UNAVAILABLE = "unavailable"
+
+
 class AssistantMessageToolRequestCallerType(Enum):
     "Hosted program caller type"
     PROGRAM = "program"
@@ -13898,7 +14961,7 @@ class AutoModeSwitchResponse(Enum):
 
 
 class AutoTier(Enum):
-    "Routing preference used when the session model is `auto`. `fast` is an integrator-only latency preset and is not a first-party GitHub Copilot product preference."
+    "Extensible routing preference for the virtual `auto` model. New identifiers must be advertised and enabled by the provider. `fast` is an integrator-only latency preset."
     # Optimize for efficiency.
     EFFICIENCY = "efficiency"
     # Balance efficiency and intelligence.
@@ -13908,6 +14971,15 @@ class AutoTier(Enum):
     # Integrator-only preset that optimizes for latency.
     FAST = "fast"
 
+    @classmethod
+    def _missing_(cls, value: object):
+        if not isinstance(value, str):
+            return None
+        member = object.__new__(cls)
+        member._name_ = None
+        member._value_ = value
+        return cls._value2member_map_.setdefault(value, member)
+
 
 class AutoTierSwitchFailureReason(Enum):
     "Terminal reason an Auto preference activation failed."
@@ -14156,17 +15228,17 @@ class IndexedSearchState(Enum):
 
 class ManagedSettingsEnforcedAction(Enum):
     "The category of runtime action that enterprise managed settings governed (blocked or capped)"
-    # An attempt to turn on a bypass-permissions ("yolo") escalation was refused or capped because policy disables bypass-permissions mode.
+    # An attempt to enter a permission mode governed by managed policy was refused or capped. The `setting` and `escalation` fields identify whether this was bypass permissions or Assisted Permissions.
     BYPASS_PERMISSIONS_BLOCKED = "bypass_permissions_blocked"
 
 
 class ManagedSettingsEnforcedEscalation(Enum):
-    "For a `bypass_permissions_blocked` action, which permission-escalation primitive was refused"
+    "For a `bypass_permissions_blocked` action, which permission-mode or escalation primitive was refused"
     # Full allow-all permissions — automatically approving tools, paths, and URLs.
     ALLOW_ALL = "allow_all"
     # Automatic approval of all tool permission requests.
     APPROVE_ALL = "approve_all"
-    # Assisted mode — keeps normal prompt paths and adds an LLM recommendation, distinct from allow-all.
+    # Assisted Permissions — uses an LLM review to reduce prompts, distinct from allow-all and not a hard security boundary.
     ASSISTED_APPROVAL = "assisted_approval"
     # Unrestricted filesystem access outside the session's allowed directories.
     UNRESTRICTED_PATHS = "unrestricted_paths"
@@ -14235,7 +15307,7 @@ class McpOauthRequestReason(Enum):
 
 
 class McpServerSource(Enum):
-    "Configuration source: user, workspace, plugin, builtin, or managed"
+    "Configuration source: user, workspace, plugin, builtin, managed, or account"
     # Server configured in the user's global MCP configuration.
     USER = "user"
     # Server configured by the current workspace.
@@ -14246,6 +15318,8 @@ class McpServerSource(Enum):
     BUILTIN = "builtin"
     # Server supplied by a trusted host-managed catalog.
     MANAGED = "managed"
+    # Server contributed by a signed-in account; enablement and organization policy still apply.
+    ACCOUNT = "account"
 
 
 class McpServerStatus(Enum):
@@ -14260,7 +15334,7 @@ class McpServerStatus(Enum):
     PENDING = "pending"
     # The server is configured but disabled.
     DISABLED = "disabled"
-    # The server was intentionally stopped and can be restarted on demand when policy permits; a server quarantined by restrictive managed policy stays stopped and cannot be restarted until the policy allows it.
+    # The server is not running: it may not have started yet, may have been explicitly stopped, or may be quarantined by restrictive managed policy. It can be restarted on demand when policy permits.
     STOPPED = "stopped"
     # The server is not configured for this session.
     NOT_CONFIGURED = "not_configured"
@@ -14344,6 +15418,58 @@ class ModelCallFinishedOutcome(Enum):
     REJECTED = "rejected"
 
 
+class ModelCallRequestBodyEncoding(Enum):
+    "Content-Encoding applied to the request body sent on the wire"
+    # The request body was sent uncompressed (including every WebSocket request).
+    IDENTITY = "identity"
+    # The request body was sent gzip-compressed.
+    GZIP = "gzip"
+    # The request body was sent zstd-compressed.
+    ZSTD = "zstd"
+
+
+class ModelCallWebSocketFallbackErrorKind(Enum):
+    "Normalized cause of the WebSocket failure that triggered the HTTP fallback"
+    # DNS resolution of the WebSocket host failed.
+    DNS = "dns"
+    # The TLS handshake or a TLS record failed.
+    TLS = "tls"
+    # A WebSocket connect or read timed out.
+    TIMEOUT = "timeout"
+    # The peer refused the TCP connection.
+    CONNECTION_REFUSED = "connection_refused"
+    # The connection was reset, aborted, or ended mid-stream without a close.
+    CONNECTION_RESET = "connection_reset"
+    # The peer closed the WebSocket.
+    CLOSED_BY_PEER = "closed_by_peer"
+    # The runtime closed the WebSocket itself.
+    CLOSED_LOCALLY = "closed_locally"
+    # The socket was already closed before it was used.
+    NOT_CONNECTED = "not_connected"
+    # The upgrade or request was rejected with an HTTP status.
+    HTTP_STATUS = "http_status"
+    # A WebSocket protocol violation or an undecodable frame.
+    PROTOCOL = "protocol"
+    # The WebSocket request could not be built.
+    CONFIGURATION = "configuration"
+    # A failure that maps onto none of the other kinds.
+    OTHER = "other"
+
+
+class ModelCallWebSocketFallbackReason(Enum):
+    "Why a WebSocket-capable model call was carried by the HTTP fallback"
+    # The WebSocket connection could not be established.
+    CONNECT_FAILED = "connect_failed"
+    # No usable WebSocket connection was available for the request.
+    CONNECTION_UNAVAILABLE = "connection_unavailable"
+    # Sending the request over the WebSocket failed.
+    SEND_FAILED = "send_failed"
+    # The WebSocket returned a retryable API error.
+    API_ERROR = "api_error"
+    # The WebSocket transport failed before any output reached the consumer.
+    TRANSPORT_FAILED = "transport_failed"
+
+
 class ModelChangeSource(Enum):
     "Origin of an effective session model change."
     # The user selected a model directly with `/model <id>`.
@@ -14444,6 +15570,8 @@ class PermissionApprovalEvaluationReasonCode(Enum):
     ACTION_TOO_LONG = "action-too-long"
     # The script path was not authorized for inspection.
     PATH_NOT_AUTHORIZED = "path-not-authorized"
+    # A code source was excluded from review by content exclusion policy.
+    CONTENT_EXCLUDED = "content-excluded"
     # The script working directory was invalid.
     INVALID_WORKING_DIRECTORY = "invalid-working-directory"
     # The script snapshot could not be read.
@@ -14468,6 +15596,18 @@ class PermissionApprovalEvaluationReasonCode(Enum):
     UNREVIEWABLE_SCRIPT_INVOCATION = "unreviewable-script-invocation"
     # The script argument binding could not be reviewed.
     ARGUMENT_BINDING_UNREVIEWABLE = "argument-binding-unreviewable"
+    # The shell command could not be analyzed for execution evidence.
+    UNSUPPORTED_COMMAND_SHAPE = "unsupported-command-shape"
+    # The shell command used a code source that cannot be bound for review.
+    UNSUPPORTED_SOURCE = "unsupported-source"
+    # The shell command used a code source computed at run time.
+    DYNAMIC_SOURCE = "dynamic-source"
+    # The shell command referenced more code sources than can be reviewed.
+    TOO_MANY_SOURCES = "too-many-sources"
+    # A code-bearing executable could not be inspected.
+    EXECUTABLE_UNAVAILABLE = "executable-unavailable"
+    # A code-bearing executable exceeded the binding size limit.
+    EXECUTABLE_TOO_LARGE = "executable-too-large"
     # The script review metadata was malformed.
     MALFORMED_SCRIPT_ACTION_REVIEW = "malformed-script-action-review"
     # The script snapshot manifest was malformed.
@@ -14481,6 +15621,10 @@ class PermissionApprovalEvaluationReasonCode(Enum):
     # The request inherited an outcome from another decision.
     INHERITED = "inherited"
 
+    @classmethod
+    def _missing_(cls, value: object) -> "PermissionApprovalEvaluationReasonCode | None":
+        return cls.UNKNOWN if isinstance(value, str) else None
+
 
 class PermissionDecisionSource(Enum):
     "Controlled reason or actor responsible for a permission response."
@@ -14638,6 +15782,98 @@ class PlanChangedOperation(Enum):
     DELETE = "delete"
 
 
+class ProviderMonthlyUsageScope(Enum):
+    "Identity scope of a monthly usage reading."
+    # Consumption of the authenticated user within the parent observation's service and returned cycle.
+    USER = "user"
+    # The service did not establish a recognized usage scope.
+    UNKNOWN = "unknown"
+
+
+class ProviderMonthlyUsageState(Enum):
+    "Availability of a service's monthly consumption reading."
+    # The service reported a usable consumption reading, including an explicit zero.
+    AVAILABLE = "available"
+    # The service found no usage policy; no consumption amount is known.
+    NO_POLICY = "no_policy"
+    # The read failed or its data could not be used; consumption is unknown.
+    UNAVAILABLE = "unavailable"
+    # The service reported an unrecognized usage state.
+    UNKNOWN = "unknown"
+
+
+class ProviderQuotaAccessState(Enum):
+    "Access policy reported by the quota service."
+    # Access is allowed.
+    ALLOWED = "allowed"
+    # Access is denied.
+    DENIED = "denied"
+    # Quota is not required for this access.
+    NOT_REQUIRED = "not_required"
+    # The service did not supply a recognized access state.
+    UNKNOWN = "unknown"
+    # Client-only compatibility placeholder when acquisitionStatus is unavailable or failed; not an observed service verdict.
+    UNAVAILABLE = "unavailable"
+
+
+class ProviderQuotaAcquisitionStatus(Enum):
+    "Acquisition state, independent of the service's business access/capacity verdict."
+    # A service quota observation was received.
+    SUCCEEDED = "succeeded"
+    # No service snapshot is available for this caller or surface.
+    UNAVAILABLE = "unavailable"
+    # Acquisition failed; inspect httpStatus/acquisitionError without inferring a business verdict.
+    FAILED = "failed"
+
+
+class ProviderQuotaCapacityState(Enum):
+    "Capacity is independent of whether a numeric balance was supplied."
+    # Capacity is available.
+    AVAILABLE = "available"
+    # The service explicitly reports exhaustion.
+    EXHAUSTED = "exhausted"
+    # The reported entitlement is unlimited.
+    UNLIMITED = "unlimited"
+    # No billable quota is required.
+    NOT_REQUIRED = "not_required"
+    # The service reports that capacity is not applicable.
+    NOT_APPLICABLE = "not_applicable"
+    # No recognized capacity state was supplied.
+    UNKNOWN = "unknown"
+    # Client-only compatibility placeholder when acquisitionStatus is unavailable or failed; not an observed service verdict.
+    UNAVAILABLE = "unavailable"
+
+
+class ProviderQuotaObservationKind(Enum):
+    "Timing and purpose of a provider quota observation."
+    # An explicit account read; consumption may still be subject to service aggregation delay.
+    ACCOUNT_SNAPSHOT = "account_snapshot"
+    # A verdict attached before an inference response. May be cached; never a post-charge balance.
+    ADMISSION_STATE = "admission_state"
+
+
+class ProviderQuotaQuantityKind(Enum):
+    "Interpretation permitted for independently reported quantities."
+    # Quantities form an authoritative available-of-entitled budget suitable for percentage presentation.
+    AUTHORITATIVE_BUDGET = "authoritative_budget"
+    # Raw advisory quantities; do not infer permission, usage percentage, reset cadence, or post-charge balance.
+    ADVISORY_BALANCE = "advisory_balance"
+    # No quantity measurement, as with admission-only response headers.
+    NONE = "none"
+
+
+class ProviderQuotaUnit(Enum):
+    "Units explicitly reported by a quota provider."
+    # AI credits, not tokens or currency.
+    AI_CREDITS = "ai_credits"
+    # Requests charged against an entitlement.
+    REQUESTS = "requests"
+    # Model tokens.
+    TOKENS = "tokens"
+    # The observation does not establish a quantity unit.
+    UNKNOWN = "unknown"
+
+
 class ReasoningSummary(Enum):
     "Reasoning summary mode used for model calls, if applicable (e.g. \"none\", \"concise\", \"detailed\")"
     # Do not request reasoning summaries from the model.
@@ -14649,7 +15885,7 @@ class ReasoningSummary(Enum):
 
 
 class RecommendedAutoTier(Enum):
-    "Auto preferences that Copilot API can recommend."
+    "Enabled Auto preferences that Copilot API can recommend."
     # Optimize for efficiency.
     EFFICIENCY = "efficiency"
     # Balance efficiency and intelligence.
@@ -14657,6 +15893,15 @@ class RecommendedAutoTier(Enum):
     # Optimize for intelligence.
     INTELLIGENCE = "intelligence"
 
+    @classmethod
+    def _missing_(cls, value: object):
+        if not isinstance(value, str):
+            return None
+        member = object.__new__(cls)
+        member._name_ = None
+        member._value_ = value
+        return cls._value2member_map_.setdefault(value, member)
+
 
 class RemediationAction(Enum):
     "What the user must do to recover from a failure, named as an action rather than as one client's affordance. The runtime cannot know which affordance a client offers — a slash command, a settings pane, a link — so the accompanying message stays host-agnostic and each client renders its own copy from this value. Absent when the runtime knows of no action the user can take."
@@ -14670,6 +15915,8 @@ class RemediationAction(Enum):
     REVIEW_SANDBOX_POLICY = "review_sandbox_policy"
     # Permit outbound network access in the sandbox policy.
     ALLOW_SANDBOX_OUTBOUND = "allow_sandbox_outbound"
+    # Discard conversation history back through the blocked request before continuing.
+    REWIND_CONVERSATION = "rewind_conversation"
 
 
 class SandboxAttestation(Enum):
@@ -15124,7 +16371,7 @@ class WorkspaceFileChangedOperation(Enum):
     UPDATE = "update"
 
 
-SessionEventData = SessionStartData | SessionResumeData | SessionRemoteSteerableChangedData | SessionErrorData | SessionIdleData | SessionTitleChangedData | SessionScheduleCreatedData | SessionScheduleCancelledData | SessionScheduleRearmedData | SessionAutopilotObjectiveChangedData | SessionInfoData | SessionIndexedSearchData | SessionWarningData | SessionModelChangeData | SessionModelDeselectedData | SessionAutoTierRecommendationData | SessionAutoTierSwitchFailedData | SessionModeChangedData | SessionModeNoticeDeliveredData | SessionSessionLimitsChangedData | SessionPermissionsChangedData | SessionPlanChangedData | SessionTodosChangedData | SessionWorkspaceFileChangedData | SessionHandoffData | SessionTruncationData | SessionSnapshotRewindData | SessionShutdownData | SessionUsageCheckpointData | SessionContextChangedData | SessionUsageInfoData | SessionContextClearedData | SessionCompactionStartData | SessionCompactionCompleteData | SessionTaskCompleteData | SessionCompletionReceiptData | SessionFusionRouteStartedData | SessionFusionRouteFailedData | SessionFusionResolvedData | SessionFusionCompletedData | SessionPermissionRecoveryData | UserMessageData | PendingMessagesModifiedData | AssistantTurnStartData | AssistantTurnRetryData | AgentInterruptedData | AssistantIntentData | AssistantFusionPhaseStartedData | AssistantFusionPhaseActivityData | AssistantFusionPhaseCompletedData | AssistantFusionPhaseFailedData | AssistantServerToolProgressData | AssistantReasoningData | AssistantReasoningDeltaData | AssistantToolCallDeltaData | AssistantStreamingDeltaData | AssistantMessageData | AssistantMessageStartData | AssistantMessageDeltaData | AssistantTurnEndData | AssistantIdleData | AssistantUsageData | PromptCacheBreakData | ModelCallFailureData | ModelCallFinalResultData | ModelCallFinishedData | ModelCallStartData | AbortData | ToolUserRequestedData | ToolExecutionStartData | ToolExecutionPartialResultData | ToolShellOutputData | ToolExecutionProgressData | ToolExecutionCompleteData | ToolSearchActivatedData | SkillInvokedData | SkillInvokedRefData | SkillContextDeliveredData | SkillContextDeliveredRefData | SandboxDecisionData | SubagentStartedData | SubagentConfiguredData | SubagentCompletedData | SubagentFailedData | SubagentSelectedData | SubagentDeselectedData | HookStartData | HookEndData | HookProgressData | SessionBinaryAssetData | SystemMessageData | SystemNotificationData | PermissionRequestedData | PermissionCompletedData | PermissionCarriedForwardData | PermissionMessageAuthorizationData | PermissionMessageAuthorizationReadData | PermissionMessageAuthorizationDegradedData | PermissionAssentDetectedData | PermissionContextualAuthorizationData | 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 | HumanResponseRecordedData | SessionToolsUpdatedData | SessionBackgroundTasksChangedData | WorkflowRunUpdatedData | WorkflowRunStartedData | WorkflowRunSettledData | SessionSkillsLoadedData | SessionCustomAgentsUpdatedData | SessionMcpServersLoadedData | SessionMcpServerStatusChangedData | SessionMcpServerRemovedData | SessionMcpServerNeedsReconnectData | 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 | SessionIndexedSearchData | SessionWarningData | SessionModelChangeData | SessionModelDeselectedData | SessionAutoTierRecommendationData | SessionAutoTierSwitchFailedData | SessionModeChangedData | SessionModeNoticeDeliveredData | SessionSessionLimitsChangedData | SessionPermissionsChangedData | SessionPlanChangedData | SessionTodosChangedData | SessionWorkspaceFileChangedData | SessionHandoffData | SessionTruncationData | SessionSnapshotRewindData | SessionShutdownData | SessionUsageCheckpointData | SessionQuotaObservationData | SessionContextChangedData | SessionUsageInfoData | SessionContextClearedData | SessionCompactionStartData | SessionCompactionCompleteData | SessionTaskCompleteData | SessionCompletionReceiptData | SessionFusionRouteStartedData | SessionFusionRouteFailedData | SessionFusionResolvedData | SessionFusionCompletedData | SessionPermissionRecoveryData | UserMessageData | PendingMessagesModifiedData | AssistantTurnStartData | AssistantTurnRetryData | AgentInterruptedData | AssistantIntentData | AssistantFusionPhaseStartedData | AssistantFusionPhaseActivityData | AssistantFusionPhaseCompletedData | AssistantFusionPhaseFailedData | AssistantServerToolProgressData | AssistantReasoningData | AssistantReasoningDeltaData | AssistantToolCallDeltaData | AssistantStreamingDeltaData | AssistantMessageData | AssistantMessageStartData | AssistantMessageDeltaData | AssistantTurnEndData | AssistantIdleData | AssistantUsageData | PromptCacheBreakData | ModelCallFailureData | ModelCallFinalResultData | ModelCallFinishedData | ModelCallStartData | AbortData | ToolUserRequestedData | ToolExecutionStartData | ToolExecutionPartialResultData | ToolShellOutputData | ToolExecutionProgressData | ToolExecutionCompleteData | ToolSearchActivatedData | SkillInvokedData | SkillInvokedRefData | SkillContextDeliveredData | SkillContextDeliveredRefData | SandboxDecisionData | SubagentStartedData | SubagentConfiguredData | SubagentCompletedData | SubagentFailedData | SubagentSelectedData | SubagentDeselectedData | HookStartData | HookEndData | HookProgressData | SessionBinaryAssetData | SystemMessageData | SystemNotificationData | PermissionRequestedData | PermissionCompletedData | PermissionCarriedForwardData | PermissionMessageAuthorizationData | PermissionMessageAuthorizationReadData | PermissionMessageAuthorizationDegradedData | PermissionAssentDetectedData | PermissionContextualAuthorizationData | UserInputRequestedData | UserInputCompletedData | ElicitationRequestedData | ElicitationCompletedData | SamplingRequestedData | SamplingCompletedData | McpOauthRequiredData | McpOauthCompletedData | McpHeadersRefreshRequiredData | McpHeadersRefreshCompletedData | SessionCustomNotificationData | UiEphemeralQueryData | ExternalToolRequestedData | ExternalToolCompletedData | CommandQueuedData | CommandExecuteData | CommandCompletedData | AutoModeSwitchRequestedData | AutoModeSwitchCompletedData | SessionLimitsExhaustedRequestedData | SessionLimitsExhaustedCompletedData | SessionAutoModeResolvedData | SessionManagedPluginProgressData | SessionManagedSettingsResolvedData | SessionManagedSettingsEnforcedData | CommandsChangedData | CapabilitiesChangedData | ExitPlanModeRequestedData | ExitPlanModeCompletedData | HumanResponseRecordedData | SessionToolsUpdatedData | SessionBackgroundTasksChangedData | WorkflowRunUpdatedData | WorkflowRunStartedData | WorkflowRunSettledData | SessionSkillsLoadedData | SessionCustomAgentsUpdatedData | SessionMcpServersLoadedData | SessionMcpServerStatusChangedData | SessionMcpServerRemovedData | SessionMcpServerNeedsReconnectData | McpToolsListChangedData | McpResourcesListChangedData | McpPromptsListChangedData | SessionExtensionsLoadedData | SessionCanvasOpenedData | SessionCanvasRegistryChangedData | SessionCanvasClosedData | SessionCanvasUnavailableData | SessionCanvasRecordedData | SessionCanvasRemovedData | SessionExtensionsAttachmentsPushedData | McpAppToolCallCompleteData | RawSessionEventData | Data
 
 
 @dataclass
@@ -15179,6 +16426,7 @@ def from_dict(obj: Any) -> "SessionEvent":
             case SessionEventType.SESSION_SNAPSHOT_REWIND: data = SessionSnapshotRewindData.from_dict(data_obj)
             case SessionEventType.SESSION_SHUTDOWN: data = SessionShutdownData.from_dict(data_obj)
             case SessionEventType.SESSION_USAGE_CHECKPOINT: data = SessionUsageCheckpointData.from_dict(data_obj)
+            case SessionEventType.SESSION_QUOTA_OBSERVATION: data = SessionQuotaObservationData.from_dict(data_obj)
             case SessionEventType.SESSION_CONTEXT_CHANGED: data = SessionContextChangedData.from_dict(data_obj)
             case SessionEventType.SESSION_USAGE_INFO: data = SessionUsageInfoData.from_dict(data_obj)
             case SessionEventType.SESSION_CONTEXT_CLEARED: data = SessionContextClearedData.from_dict(data_obj)
@@ -15272,6 +16520,7 @@ def from_dict(obj: Any) -> "SessionEvent":
             case SessionEventType.SESSION_LIMITS_EXHAUSTED_REQUESTED: data = SessionLimitsExhaustedRequestedData.from_dict(data_obj)
             case SessionEventType.SESSION_LIMITS_EXHAUSTED_COMPLETED: data = SessionLimitsExhaustedCompletedData.from_dict(data_obj)
             case SessionEventType.SESSION_AUTO_MODE_RESOLVED: data = SessionAutoModeResolvedData.from_dict(data_obj)
+            case SessionEventType.SESSION_MANAGED_PLUGIN_PROGRESS: data = SessionManagedPluginProgressData.from_dict(data_obj)
             case SessionEventType.SESSION_MANAGED_SETTINGS_RESOLVED: data = SessionManagedSettingsResolvedData.from_dict(data_obj)
             case SessionEventType.SESSION_MANAGED_SETTINGS_ENFORCED: data = SessionManagedSettingsEnforcedData.from_dict(data_obj)
             case SessionEventType.COMMANDS_CHANGED: data = CommandsChangedData.from_dict(data_obj)
@@ -15342,6 +16591,7 @@ def session_event_to_dict(x: SessionEvent) -> Any:
     "AgentInterruptedCancelPhase",
     "AgentInterruptedData",
     "AgentModelPolicy",
+    "AiCreditsStatus",
     "AssistantFusionPhaseActivityData",
     "AssistantFusionPhaseCompletedData",
     "AssistantFusionPhaseFailedData",
@@ -15481,6 +16731,8 @@ def session_event_to_dict(x: SessionEvent) -> Any:
     "IndexedSearchIncrementalPhase",
     "IndexedSearchOutcome",
     "IndexedSearchState",
+    "ManagedPermissionsContext",
+    "ManagedPluginProgressPhase",
     "ManagedSettingsEnforcedAction",
     "ManagedSettingsEnforcedEscalation",
     "ManagedSettingsResolvedSource",
@@ -15517,9 +16769,14 @@ def session_event_to_dict(x: SessionEvent) -> Any:
     "ModelCallFinalResultData",
     "ModelCallFinishedData",
     "ModelCallFinishedOutcome",
+    "ModelCallRequestBodyEncoding",
     "ModelCallStartData",
+    "ModelCallWebSocketFallbackErrorKind",
+    "ModelCallWebSocketFallbackReason",
     "ModelChangeSource",
     "ModelDeselectedReason",
+    "ModelProviderKind",
+    "ModelProviderRef",
     "OmittedBinaryOmittedReason",
     "OmittedBinaryResult",
     "OmittedBinaryType",
@@ -15597,11 +16854,24 @@ def session_event_to_dict(x: SessionEvent) -> Any:
     "PermissionRule",
     "PermissionSandboxPathGrant",
     "PermissionSandboxPathGrantAccess",
+    "PermissionWriteFileContent",
+    "PermissionWriteFileEdit",
     "PersistedBinaryImage",
     "PersistedBinaryImageType",
     "PersistedBinaryResult",
     "PlanChangedOperation",
     "PromptCacheBreakData",
+    "ProviderMonthlyUsage",
+    "ProviderMonthlyUsageScope",
+    "ProviderMonthlyUsageState",
+    "ProviderQuotaAccessState",
+    "ProviderQuotaAcquisitionStatus",
+    "ProviderQuotaBudgetMetadata",
+    "ProviderQuotaCapacityState",
+    "ProviderQuotaObservationKind",
+    "ProviderQuotaQuantityKind",
+    "ProviderQuotaState",
+    "ProviderQuotaUnit",
     "RawSessionEventData",
     "ReasoningSummary",
     "RecommendedAutoTier",
@@ -15665,6 +16935,7 @@ def session_event_to_dict(x: SessionEvent) -> Any:
     "SessionLimitsExhaustedRequestedData",
     "SessionLimitsExhaustedResponse",
     "SessionLimitsExhaustedResponseAction",
+    "SessionManagedPluginProgressData",
     "SessionManagedSettingsEnforcedData",
     "SessionManagedSettingsResolvedData",
     "SessionMcpServerNeedsReconnectData",
@@ -15679,6 +16950,7 @@ def session_event_to_dict(x: SessionEvent) -> Any:
     "SessionPermissionRecoveryData",
     "SessionPermissionsChangedData",
     "SessionPlanChangedData",
+    "SessionQuotaObservationData",
     "SessionRemoteSteerableChangedData",
     "SessionResumeData",
     "SessionScheduleCancelledData",
@@ -15786,6 +17058,16 @@ def session_event_to_dict(x: SessionEvent) -> Any:
     "ToolUserRequestedData",
     "UIEphemeralQueryPhase",
     "UiEphemeralQueryData",
+    "UsageAccountingIdentity",
+    "UsageGetMetricsResult",
+    "UsageMetricsAgentMetric",
+    "UsageMetricsCodeChanges",
+    "UsageMetricsModelMetric",
+    "UsageMetricsModelMetricRequests",
+    "UsageMetricsModelMetricTokenDetail",
+    "UsageMetricsModelMetricUsage",
+    "UsageMetricsProviderModelMetric",
+    "UsageMetricsTokenDetail",
     "UserInputCompletedData",
     "UserInputRequestedData",
     "UserMessageAgentMode",
diff --git a/python/copilot/host.py b/python/copilot/host.py
index 1a64122c02..c0273d7bc9 100644
--- a/python/copilot/host.py
+++ b/python/copilot/host.py
@@ -18,6 +18,7 @@
 from .generated.rpc import (
     HostExitedNotification,
     HostGitHubEnvironmentOptions,
+    HostListSessionsResult,
     HostLocalServerOptions,
     HostPublishSessionResult,
     HostStartResult,
@@ -76,12 +77,17 @@ async def dispose(self) -> None:
         await self._rpc.request("host.dispose", {"hostId": self.host_id})
 
     async def publish_session(self, session_id: str) -> HostPublishSessionResult:
-        """Publish a resident session attached to the owning client."""
+        """Publish an attached session into the durable compute-scoped catalog."""
         result = await self._rpc.request(
             "host.publishSession", {"hostId": self.host_id, "sessionId": session_id}
         )
         return HostPublishSessionResult.from_dict(result)
 
+    async def list_sessions(self) -> HostListSessionsResult:
+        """List all live and dormant catalog sessions advertised by this host."""
+        result = await self._rpc.request("host.listSessions", {"hostId": self.host_id})
+        return HostListSessionsResult.from_dict(result)
+
     async def __aenter__(self) -> AhpHost:
         return self
 
@@ -98,6 +104,9 @@ class AhpHostOptions:
     Factories must return the exact requested session from the owning client.
     Release callbacks receive that same object once per handoff, including late
     results. The SDK never disconnects or destroys it on the application's behalf.
+    ``compute_id`` selects a durable catalog across transports; omitted local-only
+    identities are persisted by the runtime. It must agree with the GitHub
+    environment's compute identity when both are supplied.
     """
 
     local_server: HostLocalServerOptions | None = None
@@ -106,6 +115,7 @@ class AhpHostOptions:
     resume_session: Callable[[AhpSessionResumeRequest], Awaitable[CopilotSession]] | None = None
     on_session_released: Callable[[CopilotSession], Awaitable[None] | None] | None = None
     on_exit: Callable[[AhpHostExit], Awaitable[None] | None] | None = None
+    compute_id: str | None = None
 
 
 @dataclass
@@ -211,6 +221,7 @@ async def start(self, rpc: JsonRpcClient, options: AhpHostOptions) -> AhpHost:
         self._hosts[host_id] = options
         params = {
             "hostId": host_id,
+            "computeId": options.compute_id,
             "localServer": (
                 options.local_server.to_dict() if options.local_server is not None else None
             ),
diff --git a/python/copilot/session.py b/python/copilot/session.py
index 91174ce370..572f5e187a 100644
--- a/python/copilot/session.py
+++ b/python/copilot/session.py
@@ -21,7 +21,18 @@
 from datetime import UTC, datetime
 from enum import Enum
 from types import TracebackType
-from typing import TYPE_CHECKING, Any, Literal, NotRequired, Required, TypedDict, TypeVar, cast
+from typing import (
+    TYPE_CHECKING,
+    Any,
+    Literal,
+    NotRequired,
+    Protocol,
+    Required,
+    TypedDict,
+    TypeVar,
+    cast,
+    runtime_checkable,
+)
 
 from pydantic import BaseModel
 
@@ -58,6 +69,7 @@
     ProviderTokenAcquireResult,
     SessionLogLevel,
     SessionRpc,
+    SkillProviderDescriptor,
     ToolsSetRequest,
     UIElicitationRequest,
     UIElicitationResponse,
@@ -66,6 +78,8 @@
     UIElicitationSchemaProperty,
     UIElicitationSchemaPropertyType,
     UIHandlePendingElicitationRequest,
+    _SkillProviderListResult,
+    _SkillProviderReadResult,
 )
 from .generated.rpc import (
     CanvasHandler as RpcCanvasHandler,
@@ -187,7 +201,7 @@ def _capabilities_to_dict(caps: ModelCapabilitiesOverride) -> dict:
 ReasoningEffort = Literal["low", "medium", "high", "xhigh", "max"]
 ReasoningSummary = Literal["none", "concise", "detailed"]
 ContextTier = Literal["default", "long_context"]
-AutoTier = Literal["efficiency", "balance", "intelligence", "fast"]
+AutoTier = str
 SessionFsConventions = Literal["posix", "windows"]
 
 
@@ -1359,6 +1373,7 @@ class GitHubMcpToolConfig(TypedDict, total=False):
 class CustomAgentConfig(TypedDict, total=False):
     """Configuration for a custom agent."""
 
+    hooks: NotRequired[dict[str, list[dict[str, Any]]]]
     name: str  # Unique name of the custom agent
     display_name: NotRequired[str]  # Display name for UI purposes
     description: NotRequired[str]  # Description of what the agent does
@@ -1434,6 +1449,20 @@ class LargeToolOutputConfig(TypedDict, total=False):
     output_directory: str
 
 
+class ImageGenerationConfig(TypedDict, total=False):
+    """**Experimental.** Opt in to an authorized Copilot image model.
+
+    This API may change or be removed in a future release.
+
+    Omission disables on create/cold resume and preserves resident state on
+    resume. Not persisted: re-supply after runtime restart. Policy, permissions,
+    offline mode, and tool filters still apply. BYOK is not supported.
+    """
+
+    enabled: bool
+    """True opts in; False disables image generation."""
+
+
 class ToolSearchConfig(TypedDict, total=False):
     """
     Override for the runtime's built-in tool-search behavior.
@@ -1507,6 +1536,34 @@ class ProviderTokenArgs(TypedDict):
 BearerTokenProvider = Callable[[ProviderTokenArgs], str | Awaitable[str]]
 
 
+@runtime_checkable
+class SkillProvider(Protocol):
+    """**Experimental.** Provides session-scoped skills from SDK-owned storage.
+
+    Providers are ephemeral and must be supplied again when resuming a session.
+    The runtime may call providers concurrently, so implementations must be
+    concurrency-safe. Synchronous providers run on the event loop like other
+    Python SDK callbacks; keep them fast or make them async. When the runtime
+    cancels a call, for example after its 30-second limit or when the session
+    disconnects, an async provider's task is cancelled with
+    :class:`asyncio.CancelledError`.
+    """
+
+    def list_skills(
+        self,
+    ) -> list[SkillProviderDescriptor] | None | Awaitable[list[SkillProviderDescriptor] | None]:
+        """Return skill catalog descriptors, or ``None`` for an empty catalog."""
+        ...
+
+    def read_skill(self, name: str) -> str | None | Awaitable[str | None]:
+        """Return SKILL.md markdown for ``name``, or ``None`` when not found."""
+        ...
+
+
+def _skill_provider_failure_error(method_name: Literal["listSkills", "readSkill"]) -> JsonRpcError:
+    return JsonRpcError(-32603, f"Skill provider {method_name} failed")
+
+
 ProviderConfigModelProvider = Literal[
     "openai",
     "anthropic",
@@ -1792,6 +1849,8 @@ def __init__(
         self._transform_callbacks_lock = threading.Lock()
         self._command_handlers: dict[str, CommandHandler] = {}
         self._command_handlers_lock = threading.Lock()
+        self._skill_provider: SkillProvider | None = None
+        self._skill_provider_lock = threading.Lock()
         self._bearer_token_providers: dict[str, BearerTokenProvider] = {}
         self._bearer_token_providers_lock = threading.Lock()
         self._elicitation_handler: ElicitationHandler | None = None
@@ -1804,6 +1863,7 @@ def __init__(
         self._open_canvases_lock = threading.Lock()
         self._rpc: SessionRpc | None = None
         self._destroyed = False
+        self._response_waits: set[Callable[[], None]] = set()
         self._structured_waits: set[asyncio.Future[SessionEvent]] = set()
         self._disconnect_lock = asyncio.Lock()
         self._on_disconnect = on_disconnect
@@ -1827,9 +1887,44 @@ def _cancel_pending_external_tools(self) -> None:
                 task.cancel()
 
     def _mark_disconnected(self) -> None:
-        self._destroyed = True
+        with self._event_handlers_lock:
+            if self._destroyed:
+                return
+            self._destroyed = True
+            self._event_handlers.clear()
+        for fail in tuple(self._response_waits):
+            fail()
+        self._response_waits.clear()
         self._fail_structured_waits()
         self._cancel_pending_external_tools()
+        with self._tool_handlers_lock:
+            self._tool_handlers.clear()
+        self._clear_skill_provider()
+        with self._permission_handler_lock:
+            self._permission_handler = None
+        with self._mcp_auth_handler_lock:
+            self._mcp_auth_handler = None
+        with self._user_input_handler_lock:
+            self._user_input_handler = None
+        with self._exit_plan_mode_handler_lock:
+            self._exit_plan_mode_handler = None
+        with self._auto_mode_switch_handler_lock:
+            self._auto_mode_switch_handler = None
+        with self._hooks_lock:
+            self._hooks = None
+        with self._transform_callbacks_lock:
+            self._transform_callbacks = None
+        with self._command_handlers_lock:
+            self._command_handlers.clear()
+        with self._bearer_token_providers_lock:
+            self._bearer_token_providers.clear()
+        with self._elicitation_handler_lock:
+            self._elicitation_handler = None
+        with self._canvas_handler_lock:
+            self._canvas_handler = None
+        with self._open_canvases_lock:
+            self._open_canvases.clear()
+        self._client_session_apis = ClientSessionApiHandlers()
         self._run_disconnect_callback()
 
     def _fail_structured_waits(self) -> None:
@@ -1990,7 +2085,9 @@ async def set_tools(self, tools: list[Tool]) -> None:
         session are applied in order. Cancelling the call while an earlier
         replacement is still in flight sends nothing. Once the request is sent,
         cancelling only stops the wait: an accepted replacement still installs
-        its handlers.
+        its handlers while the session remains connected. Disconnecting the
+        session rejects queued replacements and prevents late acknowledgements
+        from reinstalling handlers.
 
         The agent sees the new tools from its next model request, which can fall
         within a turn in progress. A model request already in flight was made
@@ -1999,6 +2096,8 @@ async def set_tools(self, tools: list[Tool]) -> None:
         turn is aborted. If a running turn might still call a tool you remove,
         replace tools while the session is idle.
         """
+        if self._destroyed:
+            raise RuntimeError("Session is disconnected")
         definitions = _tools_to_wire_definitions(tools)
         handlers = _tool_handlers_for(tools)
         # Cancelling while an earlier call holds the lock sends nothing. Once
@@ -2015,8 +2114,12 @@ async def _replace_tools(
         handlers: dict[str, ToolHandler],
     ) -> None:
         try:
+            if self._destroyed:
+                raise RuntimeError("Session is disconnected")
             await self.rpc.tools.set(ToolsSetRequest(tools=definitions))
             with self._tool_handlers_lock:
+                if self._destroyed:
+                    raise RuntimeError("Session is disconnected")
                 self._tool_handlers = handlers
         finally:
             self._set_tools_lock.release()
@@ -2130,7 +2233,14 @@ def handler(event: SessionEventTypeAlias) -> None:
                     error_event = Exception(f"Session error: {data.message or str(data)}")
                     idle_event.set()
 
+        def fail_disconnected() -> None:
+            nonlocal error_event
+            if not idle_event.is_set():
+                error_event = RuntimeError("Session closed before response completed")
+                idle_event.set()
+
         unsubscribe = self.on(handler)
+        self._response_waits.add(fail_disconnected)
         try:
             await self.send(
                 prompt,
@@ -2174,6 +2284,7 @@ def handler(event: SessionEventTypeAlias) -> None:
             raise TimeoutError(f"Timeout after {timeout}s waiting for session.idle")
         finally:
             unsubscribe()
+            self._response_waits.discard(fail_disconnected)
 
     async def send_and_wait_typed(
         self,
@@ -2322,6 +2433,8 @@ def on(self, handler: Callable[[SessionEvent], None]) -> Callable[[], None]:
             >>> unsubscribe()
         """
         with self._event_handlers_lock:
+            if self._destroyed:
+                raise RuntimeError("Session is disconnected")
             self._event_handlers.add(handler)
 
         def unsubscribe():
@@ -2343,6 +2456,9 @@ def _dispatch_event(self, event: SessionEvent) -> None:
         Args:
             event: The session event to dispatch to all handlers.
         """
+        with self._event_handlers_lock:
+            if self._destroyed:
+                return
         dispatch_start = time.perf_counter()
         # Handle broadcast request events (protocol v3) before dispatching to user handlers.
         # Fire-and-forget: the response is sent asynchronously via RPC.
@@ -2352,6 +2468,9 @@ def _dispatch_event(self, event: SessionEvent) -> None:
             handlers = list(self._event_handlers)
 
         for handler in handlers:
+            with self._event_handlers_lock:
+                if self._destroyed:
+                    break
             try:
                 handler(event)
             except Exception:
@@ -2388,7 +2507,14 @@ def _handle_broadcast_event(self, event: SessionEvent) -> None:
                 ts = getattr(data, "tracestate", None)
                 task = asyncio.create_task(
                     self._execute_tool_and_respond(
-                        request_id, tool_name, tool_call_id, arguments, handler, tp, ts
+                        request_id,
+                        tool_name,
+                        tool_call_id,
+                        arguments,
+                        handler,
+                        tp,
+                        ts,
+                        event.agent_id or None,
                     )
                 )
                 if request_id in self._pending_external_tools:
@@ -2559,6 +2685,7 @@ async def _execute_tool_and_respond(
         handler: ToolHandler,
         traceparent: str | None = None,
         tracestate: str | None = None,
+        agent_id: str | None = None,
     ) -> None:
         """Execute a tool handler and send the result back via HandlePendingToolCall RPC."""
         try:
@@ -2581,6 +2708,8 @@ async def _execute_tool_and_respond(
                 tool_name=tool_name,
                 arguments=arguments,
                 available_tools=available_tools,
+                agent_id=agent_id,
+                request_id=request_id,
             )
 
             with trace_context(traceparent, tracestate):
@@ -3081,6 +3210,77 @@ def _get_tool_handler(self, name: str) -> ToolHandler | None:
         with self._tool_handlers_lock:
             return self._tool_handlers.get(name)
 
+    def _register_skill_provider(self, provider: SkillProvider | None) -> None:
+        """Register or clear the session-scoped skill provider."""
+        with self._skill_provider_lock:
+            self._skill_provider = provider
+
+    def _clear_skill_provider(self) -> None:
+        self._register_skill_provider(None)
+
+    async def _handle_skill_provider_list(self) -> dict:
+        provider = self._require_skill_provider()
+        skills = await self._call_skill_provider("listSkills", provider.list_skills)
+        resolved_skills = cast(list[SkillProviderDescriptor] | None, skills)
+        try:
+            return _SkillProviderListResult(
+                skills=[] if resolved_skills is None else list(resolved_skills)
+            ).to_dict()
+        except Exception:
+            self._log_skill_provider_failure("listSkills")
+            raise _skill_provider_failure_error("listSkills") from None
+
+    async def _handle_skill_provider_read(self, name: str) -> dict:
+        provider = self._require_skill_provider()
+        markdown = await self._call_skill_provider(
+            "readSkill", functools.partial(provider.read_skill, name)
+        )
+        return _SkillProviderReadResult(markdown=cast(str | None, markdown)).to_dict()
+
+    def _require_skill_provider(self) -> SkillProvider:
+        with self._skill_provider_lock:
+            provider = self._skill_provider
+        if provider is None:
+            raise JsonRpcError(-32603, f"No skill provider for session: {self.session_id}")
+        return provider
+
+    async def _call_skill_provider(
+        self, operation: Literal["listSkills", "readSkill"], call: Callable[[], Any]
+    ) -> Any:
+        """Run a provider callback, reporting any failure to the runtime generically."""
+        provider_start = time.perf_counter()
+        try:
+            result = call()
+            if inspect.isawaitable(result):
+                result = await result
+        except asyncio.CancelledError:
+            # Only a cancellation of this dispatch task propagates; one raised by
+            # the provider itself is an ordinary provider failure.
+            task = asyncio.current_task()
+            if task is not None and task.cancelling():
+                raise
+            self._log_skill_provider_failure(operation)
+            raise _skill_provider_failure_error(operation) from None
+        except Exception:
+            self._log_skill_provider_failure(operation)
+            raise _skill_provider_failure_error(operation) from None
+        log_timing(
+            logger,
+            logging.DEBUG,
+            f"CopilotSession skill provider {operation} dispatch",
+            provider_start,
+            session_id=self.session_id,
+        )
+        return result
+
+    def _log_skill_provider_failure(self, operation: Literal["listSkills", "readSkill"]) -> None:
+        logger.warning(
+            "Skill provider %s failed",
+            operation,
+            extra={"session_id": self.session_id},
+            exc_info=True,
+        )
+
     def _register_permission_handler(self, handler: _PermissionHandlerFn | None) -> None:
         """
         Register a handler for permission requests.
@@ -3459,24 +3659,7 @@ async def disconnect(self) -> None:
                 detail = response.get("error") or "unknown error"
                 raise RuntimeError(f"Failed to detach session {self.session_id}: {detail}")
 
-            self._cancel_pending_external_tools()
-            self._run_disconnect_callback()
-            with self._event_handlers_lock:
-                self._destroyed = True
-                self._fail_structured_waits()
-                self._event_handlers.clear()
-            with self._tool_handlers_lock:
-                self._tool_handlers.clear()
-            with self._permission_handler_lock:
-                self._permission_handler = None
-            with self._command_handlers_lock:
-                self._command_handlers.clear()
-            with self._elicitation_handler_lock:
-                self._elicitation_handler = None
-            with self._exit_plan_mode_handler_lock:
-                self._exit_plan_mode_handler = None
-            with self._auto_mode_switch_handler_lock:
-                self._auto_mode_switch_handler = None
+            self._mark_disconnected()
 
     async def __aenter__(self) -> CopilotSession:
         """Enable use as an async context manager."""
diff --git a/python/copilot/tools.py b/python/copilot/tools.py
index efe76a47c3..9dbafe1677 100644
--- a/python/copilot/tools.py
+++ b/python/copilot/tools.py
@@ -73,6 +73,18 @@ class ToolInvocation:
     rank/filter the live catalog -- including MCP tools configured in settings --
     without issuing its own RPC. ``None`` for every other tool invocation.
     """
+    agent_id: str | None = None
+    """**Experimental.** Sub-agent instance that issued this call (the ``agent_id``
+    of its session events). ``None`` for a root-agent call, and for every call
+    when the runtime does not attribute sub-agent tool calls.
+    """
+    request_id: str | None = None
+    """**Experimental.** Runtime request id of this call: the key
+    ``session.tools.handlePendingToolCall`` and ``session.tools.listPendingRequests``
+    use. A root-agent call stays answerable after the session is resumed with
+    pending work continued; a sub-agent's call can be answered only while that
+    sub-agent is still running.
+    """
 
 
 ToolHandler = Callable[[ToolInvocation], ToolResult | Awaitable[ToolResult]]
diff --git a/python/e2e/test_client_e2e.py b/python/e2e/test_client_e2e.py
index bc7da64485..efd18dcf56 100644
--- a/python/e2e/test_client_e2e.py
+++ b/python/e2e/test_client_e2e.py
@@ -214,10 +214,12 @@ async def test_should_report_error_with_stderr_when_cli_fails_to_start(self):
                     on_permission_request=PermissionHandler.approve_all
                 )
                 await session.send("test")
-            # A completed process preserves stderr even if its exit code was not yet
-            # available on the first failure; a broken transport can report EINVAL/EPIPE.
+            # Retirement rejects new session admission; before it wins, process exit
+            # preserves stderr or the broken transport reports EINVAL/EPIPE.
             error_msg = str(exc_info2.value).lower()
-            if "cli process exited with code" in error_msg:
+            if error_msg == "client not connected":
+                assert isinstance(exc_info2.value, RuntimeError)
+            elif "cli process exited with code" in error_msg:
                 assert (
                     error_msg.partition("stderr:")[2]
                     == error_message.lower().partition("stderr:")[2]
diff --git a/python/e2e/test_client_options_e2e.py b/python/e2e/test_client_options_e2e.py
index 1267bf6d57..701ddddd42 100644
--- a/python/e2e/test_client_options_e2e.py
+++ b/python/e2e/test_client_options_e2e.py
@@ -499,6 +499,7 @@ async def test_should_forward_advanced_session_options_in_create_wire_request(
         try:
             await client.start()
             session = await client.create_session(
+                name="python named at create",
                 client_name="advanced-create-client",
                 model="claude-sonnet-5",
                 reasoning_effort="medium",
@@ -585,6 +586,7 @@ async def test_should_forward_advanced_session_options_in_create_wire_request(
             )
             try:
                 params = _get_captured_request(capture_path, "session.create")
+                assert params["name"] == "python named at create"
                 assert params["clientName"] == "advanced-create-client"
                 assert params["model"] == "claude-sonnet-5"
                 assert params["reasoningEffort"] == "medium"
diff --git a/python/e2e/test_pending_work_resume_e2e.py b/python/e2e/test_pending_work_resume_e2e.py
index eac29508b2..60305e6f82 100644
--- a/python/e2e/test_pending_work_resume_e2e.py
+++ b/python/e2e/test_pending_work_resume_e2e.py
@@ -21,7 +21,11 @@
     SessionsCheckInUseRequest,
 )
 from copilot.session import CopilotSession, PermissionHandler, PermissionNoResult
-from copilot.session_events import ExternalToolRequestedData, PermissionRequestedData
+from copilot.session_events import (
+    ExternalToolRequestedData,
+    PermissionRequestedData,
+    SessionResumeData,
+)
 from copilot.tools import Tool, ToolInvocation, ToolResult
 
 from .testharness import (
@@ -86,6 +90,47 @@ async def _safe_force_stop(client: CopilotClient) -> None:
         await client.force_stop()
 
 
+async def _force_stop_for_cold_resume(
+    ctx: E2ETestContext, client: CopilotClient, session_id: str
+) -> None:
+    # TCP close is local; an independent runtime observes the server's lock release.
+    observer = _make_subprocess_client(ctx)
+    try:
+        await observer.start()
+
+        async def lock_is_held() -> bool:
+            result = await observer.rpc.sessions.check_in_use(
+                SessionsCheckInUseRequest(session_ids=[session_id])
+            )
+            return session_id in result.in_use
+
+        await wait_for_condition(
+            lock_is_held,
+            timeout=PENDING_WORK_TIMEOUT,
+            timeout_message=f"Session '{session_id}' never acquired its lock before suspension.",
+        )
+        await client.force_stop()
+
+        async def lock_is_released() -> bool:
+            return not await lock_is_held()
+
+        await wait_for_condition(
+            lock_is_released,
+            timeout=PENDING_WORK_TIMEOUT,
+            timeout_message=f"Session '{session_id}' never released its lock after TCP close.",
+        )
+    finally:
+        await _safe_force_stop(observer)
+
+
+async def _assert_cold_pending_resume(session: CopilotSession) -> None:
+    events = await session.get_events()
+    resumes = [event.data for event in events if isinstance(event.data, SessionResumeData)]
+    assert len(resumes) == 1, "Expected exactly one session.resume event"
+    assert resumes[0].session_was_active is False, resumes[0]
+    assert resumes[0].continue_pending_work is True, resumes[0]
+
+
 async def _pending_tool_diagnostics(session: CopilotSession, request_id: str) -> str:
     try:
         events = await asyncio.wait_for(session.get_events(), PENDING_WORK_TIMEOUT)
@@ -151,7 +196,7 @@ def original_tool_handler(args):
 
                 # Force-stop the suspended client without releasing the in-flight
                 # permission so the request remains pending in the runtime.
-                await suspended_client.force_stop()
+                await _force_stop_for_cold_resume(ctx, suspended_client, session_id)
 
                 def resumed_tool_handler(args):
                     return f"PERMISSION_RESUMED_{args['value'].upper()}"
@@ -169,6 +214,7 @@ def resumed_tool_handler(args):
                         continue_pending_work=True,
                         tools=[_make_pending_tool("resume_permission_tool", resumed_tool_handler)],
                     )
+                    await _assert_cold_pending_resume(session2)
 
                     permission_result = (
                         await session2.rpc.permissions.handle_pending_permission_request(
@@ -238,7 +284,7 @@ async def blocking_external_tool(args):
                 assert isinstance(tool_event.data, ExternalToolRequestedData)
                 assert (await asyncio.wait_for(tool_started, PENDING_WORK_TIMEOUT)) == "beta"
 
-                await suspended_client.force_stop()
+                await _force_stop_for_cold_resume(ctx, suspended_client, session_id)
 
                 resumed_client = CopilotClient(
                     connection=RuntimeConnection.for_uri(
@@ -251,6 +297,7 @@ async def blocking_external_tool(args):
                         on_permission_request=PermissionHandler.approve_all,
                         continue_pending_work=True,
                     )
+                    await _assert_cold_pending_resume(session2)
 
                     tool_result = await session2.rpc.tools.handle_pending_tool_call(
                         HandlePendingToolCallRequest(
@@ -340,7 +387,7 @@ async def tool_b(args):
                 assert tool_a_started.result() == "alpha"
                 assert tool_b_started.result() == "beta"
 
-                await suspended_client.force_stop()
+                await _force_stop_for_cold_resume(ctx, suspended_client, session_id)
 
                 resumed_client = CopilotClient(
                     connection=RuntimeConnection.for_uri(
@@ -353,6 +400,7 @@ async def tool_b(args):
                         on_permission_request=PermissionHandler.approve_all,
                         continue_pending_work=True,
                     )
+                    await _assert_cold_pending_resume(session2)
 
                     result_b = await session2.rpc.tools.handle_pending_tool_call(
                         HandlePendingToolCallRequest(
diff --git a/python/e2e/test_runtime_host_e2e.py b/python/e2e/test_runtime_host_e2e.py
index 5300f8aacb..67999be4eb 100644
--- a/python/e2e/test_runtime_host_e2e.py
+++ b/python/e2e/test_runtime_host_e2e.py
@@ -62,6 +62,8 @@ def __init__(self, client: CopilotClient, work_dir: str):
         self.hook_calls: list[str] = []
         self.create_calls = 0
         self.resume_calls = 0
+        self.create_ids: list[str] = []
+        self.resume_ids: list[str] = []
 
         @define_tool("magic_number", description="Returns a magic number")
         def magic_number(params: Seed, invocation: ToolInvocation) -> str:
@@ -88,7 +90,11 @@ async def create(self, request: AhpSessionCreateRequest) -> CopilotSession:
         self.create_calls += 1
         assert not request.cancellation_event.is_set()
         assert request.config["working_directory"] == self.work_dir
+        requested_id = request.config["session_id"]
+        assert requested_id
+        self.create_ids.append(requested_id)
         session = await self.client.create_session(**self.config(request.config))
+        assert session.session_id == requested_id
         self.sessions.append(session)
         return session
 
@@ -97,9 +103,11 @@ async def resume(self, request: AhpSessionResumeRequest) -> CopilotSession:
         assert not request.cancellation_event.is_set()
         assert request.config["continue_pending_work"] is False
         assert request.config["working_directory"] == self.work_dir
+        self.resume_ids.append(request.session_id)
         session = await self.client.resume_session(
             request.session_id, **self.config(request.config)
         )
+        assert session.session_id == request.session_id
         self.sessions.append(session)
         return session
 
@@ -171,7 +179,9 @@ async def test_creates_application_session_and_preserves_callbacks(
                     )
                     session_id = created["sessionId"]
                     assert app.create_calls == 1
-                    assert app.sessions[0].session_id == session_id
+                    runtime_id = app.sessions[0].session_id
+                    assert app.create_ids == [runtime_id]
+                    assert runtime_id != session_id
                     response = await ahp.request(
                         {
                             "op": "turn",
@@ -181,7 +191,7 @@ async def test_creates_application_session_and_preserves_callbacks(
                         }
                     )
                     assert "MAGIC_hello_42" in response["text"]
-                    await assert_tools(ctx, app, session_id)
+                    await assert_tools(ctx, app, runtime_id)
                     await asyncio.gather(host.dispose(), host.dispose())
                     await ahp.request({"op": "stopped", "clientId": client_id, "url": host.url})
                     await asyncio.wait_for(app.release_event.wait(), 10)
@@ -251,6 +261,10 @@ async def test_resumes_after_runtime_restart_and_composes_tools(
                         }
                     )
                     session_id = created["sessionId"]
+                    runtime_id = app.sessions[0].session_id
+                    assert app.create_calls == 1
+                    assert app.create_ids == [runtime_id]
+                    assert runtime_id != session_id
                     first = await ahp.request(
                         {
                             "op": "turn",
@@ -283,7 +297,8 @@ async def test_resumes_after_runtime_restart_and_composes_tools(
                     ]
                     assert resumed.create_calls == 0
                     assert resumed.resume_calls == 1
-                    assert resumed.sessions[0].session_id == session_id
+                    assert resumed.resume_ids == [runtime_id]
+                    assert resumed.sessions[0].session_id == runtime_id
                     assert resumed.sessions[0] is not app.sessions[0]
                     response = await ahp.request(
                         {
@@ -297,7 +312,7 @@ async def test_resumes_after_runtime_restart_and_composes_tools(
                     assert "MAGIC_hello_42" in response["text"]
                     assert "CLIENT_ECHO_ping" in response["text"]
                     assert response["clientToolCalls"] == 1
-                    await assert_tools(ctx, resumed, session_id)
+                    await assert_tools(ctx, resumed, runtime_id)
                     await replacement.dispose()
                     await ahp.request(
                         {"op": "stopped", "clientId": resumed_client_id, "url": replacement.url}
diff --git a/python/e2e/test_skill_provider_e2e.py b/python/e2e/test_skill_provider_e2e.py
new file mode 100644
index 0000000000..d91f858a85
--- /dev/null
+++ b/python/e2e/test_skill_provider_e2e.py
@@ -0,0 +1,399 @@
+"""
+E2E tests for SDK skill providers.
+"""
+
+import asyncio
+import json
+import os
+from collections.abc import Callable
+from dataclasses import dataclass
+
+import pytest
+
+from copilot import CloudSessionOptions, PermissionHandler, SkillProvider, SkillProviderDescriptor
+from copilot.session_events import (
+    SessionEvent,
+    SessionEventType,
+    SkillSource,
+    ToolExecutionCompleteData,
+    session_event_to_dict,
+)
+
+from .testharness import E2ETestContext
+
+pytestmark = pytest.mark.asyncio(loop_scope="module")
+
+
+@dataclass(frozen=True)
+class ProvidedSkill:
+    descriptor: SkillProviderDescriptor
+    read: Callable[[], str | None]
+
+
+class InMemorySkillProvider(SkillProvider):
+    """An in-memory provider that records every callback the runtime makes."""
+
+    def __init__(self, skills: list[ProvidedSkill]):
+        self.calls: list[str] = []
+        self._skills = skills
+
+    @property
+    def reads(self) -> list[str]:
+        return [call.removeprefix("read:") for call in self.calls if call.startswith("read:")]
+
+    def list_skills(self) -> list[SkillProviderDescriptor]:
+        self.calls.append("list")
+        return [skill.descriptor for skill in self._skills]
+
+    def read_skill(self, name: str) -> str | None:
+        self.calls.append(f"read:{name}")
+        for skill in self._skills:
+            if skill.descriptor.name == name:
+                return skill.read()
+        return None
+
+
+def skill(name: str, description: str, markdown: str) -> ProvidedSkill:
+    return ProvidedSkill(
+        descriptor=SkillProviderDescriptor(description=description, name=name),
+        read=lambda: markdown,
+    )
+
+
+def failed_tool_executions(events: list[SessionEvent]) -> list[SessionEvent]:
+    return [
+        event
+        for event in events
+        if event.type == SessionEventType.TOOL_EXECUTION_COMPLETE
+        and isinstance(event.data, ToolExecutionCompleteData)
+        and not event.data.success
+    ]
+
+
+class TestSkillProviders:
+    async def test_should_load_provider_skill_lazily_through_skill_tool(self, ctx: E2ETestContext):
+        # Body-only content: the catalog descriptor supplies all of the metadata.
+        provider = InMemorySkillProvider(
+            [
+                skill(
+                    "provider-lookup",
+                    "Reports the provider lookup verification word.",
+                    "# Provider lookup\n\n"
+                    "The verification word is TANGERINE_QUARTZ_19. Reply with it.\n",
+                )
+            ]
+        )
+        session = await ctx.client.create_session(
+            on_permission_request=PermissionHandler.approve_all,
+            skill_provider=provider,
+        )
+
+        try:
+            skills = await session.rpc.skills.list()
+            listed = next((s for s in skills.skills if s.name == "provider-lookup"), None)
+            assert listed is not None
+            assert listed.source == SkillSource.SDK
+            assert listed.enabled is True
+            assert (listed.path or "") == ""
+            assert provider.reads == []
+
+            message = await session.send_and_wait(
+                "Use the skill tool to load the provider-lookup skill, "
+                "then reply with its verification word."
+            )
+
+            assert provider.reads == ["provider-lookup"]
+            assert message is not None
+            # Validate the final assistant response arrived (guards against truncated captures)
+            assert "TANGERINE_QUARTZ_19" in message.data.content
+        finally:
+            await session.disconnect()
+
+    async def test_should_load_provider_and_file_based_skills_together(self, ctx: E2ETestContext):
+        skills_dir = os.path.join(ctx.work_dir, "file-skills")
+        file_skill_dir = os.path.join(skills_dir, "file-notes")
+        os.makedirs(file_skill_dir, exist_ok=True)
+        with open(os.path.join(file_skill_dir, "SKILL.md"), "w", newline="\n") as f:
+            f.write(
+                "---\n"
+                "name: file-notes\n"
+                "description: Reports the file notes verification word.\n"
+                "---\n"
+                "\n"
+                "The file notes verification word is MAPLE_FALCON_27.\n"
+            )
+
+        # Frontmatter may restate catalog metadata and is the only source of allowed-tools.
+        provider = InMemorySkillProvider(
+            [
+                skill(
+                    "provider-audit",
+                    "Reports the provider audit verification word.",
+                    "---\n"
+                    "name: provider-audit\n"
+                    "allowed-tools: view\n"
+                    "---\n"
+                    "\n"
+                    "The provider audit verification word is COBALT_HERON_58.\n",
+                )
+            ]
+        )
+        session = await ctx.client.create_session(
+            on_permission_request=PermissionHandler.approve_all,
+            skill_directories=[skills_dir],
+            skill_provider=provider,
+        )
+
+        try:
+            skills = await session.rpc.skills.list()
+            file_skill = next((s for s in skills.skills if s.name == "file-notes"), None)
+            provider_skill = next((s for s in skills.skills if s.name == "provider-audit"), None)
+            assert file_skill is not None
+            assert file_skill.source != SkillSource.SDK
+            assert file_skill.path
+            assert provider_skill is not None
+            assert provider_skill.source == SkillSource.SDK
+
+            message = await session.send_and_wait(
+                "Use the skill tool to load the file-notes skill and the "
+                "provider-audit skill, then reply with both verification words."
+            )
+
+            assert provider.reads == ["provider-audit"]
+            assert message is not None
+            assert "MAPLE_FALCON_27" in message.data.content
+            # Validate the final assistant response arrived (guards against truncated captures)
+            assert "COBALT_HERON_58" in message.data.content
+        finally:
+            await session.disconnect()
+
+    async def test_should_rebind_skill_provider_on_resume(self, ctx: E2ETestContext):
+        original = InMemorySkillProvider(
+            [
+                skill(
+                    "rebind-check",
+                    "Reports the rebind verification word.",
+                    "The rebind verification word is AMBER_ALPHA_11.\n",
+                )
+            ]
+        )
+        replacement = InMemorySkillProvider(
+            [
+                skill(
+                    "rebind-check",
+                    "Reports the rebind verification word.",
+                    "The rebind verification word is BRONZE_BETA_22.\n",
+                )
+            ]
+        )
+        first = await ctx.client.create_session(
+            on_permission_request=PermissionHandler.approve_all,
+            skill_provider=original,
+        )
+        session_id = first.session_id
+        try:
+            # A completed turn persists the session so that it can be resumed after disconnecting.
+            await first.send_and_wait(
+                "Without using any tools or skills, reply with exactly REBIND_READY."
+            )
+        finally:
+            await first.disconnect()
+        assert original.reads == []
+        original_calls_before_resume = len(original.calls)
+
+        session = await ctx.client.resume_session(
+            session_id,
+            on_permission_request=PermissionHandler.approve_all,
+            skill_provider=replacement,
+        )
+
+        try:
+            message = await session.send_and_wait(
+                "Use the skill tool to load the rebind-check skill, "
+                "then reply with its verification word."
+            )
+
+            assert replacement.reads == ["rebind-check"]
+            assert len(original.calls) == original_calls_before_resume
+            assert message is not None
+            # Validate the final assistant response arrived (guards against truncated captures)
+            assert "BRONZE_BETA_22" in message.data.content
+            assert "AMBER_ALPHA_11" not in message.data.content
+        finally:
+            await session.disconnect()
+
+    async def test_should_report_provider_read_failure_without_leaking_details(
+        self, ctx: E2ETestContext
+    ):
+        secret = "PROVIDER_SECRET_7F3A9C"
+
+        def fail_with_secret() -> str | None:
+            raise RuntimeError(f"database unavailable: {secret}")
+
+        provider = InMemorySkillProvider(
+            [
+                ProvidedSkill(
+                    descriptor=SkillProviderDescriptor(
+                        description="Reports the broken lookup verification word.",
+                        name="broken-lookup",
+                    ),
+                    read=fail_with_secret,
+                )
+            ]
+        )
+        events: list[SessionEvent] = []
+        session = await ctx.client.create_session(
+            on_permission_request=PermissionHandler.approve_all,
+            skill_provider=provider,
+            on_event=events.append,
+        )
+
+        try:
+            message = await session.send_and_wait(
+                "Use the skill tool to load the broken-lookup skill. "
+                "If loading fails, reply with exactly LOAD_FAILED."
+            )
+
+            assert "broken-lookup" in provider.reads
+            failures = failed_tool_executions(events)
+            assert len(failures) == 1
+            serialized_events = json.dumps([session_event_to_dict(event) for event in events])
+            assert secret not in serialized_events
+            assert message is not None
+            # Validate the final assistant response arrived (guards against truncated captures)
+            assert "LOAD_FAILED" in message.data.content
+        finally:
+            await session.disconnect()
+
+    async def test_should_report_missing_provider_skill_as_not_found(self, ctx: E2ETestContext):
+        provider = InMemorySkillProvider(
+            [
+                ProvidedSkill(
+                    descriptor=SkillProviderDescriptor(
+                        description="Reports the vanished lookup verification word.",
+                        name="vanished-lookup",
+                    ),
+                    read=lambda: None,
+                )
+            ]
+        )
+        events: list[SessionEvent] = []
+        session = await ctx.client.create_session(
+            on_permission_request=PermissionHandler.approve_all,
+            skill_provider=provider,
+            on_event=events.append,
+        )
+
+        try:
+            message = await session.send_and_wait(
+                "Use the skill tool to load the vanished-lookup skill. "
+                "If loading fails, reply with exactly LOAD_FAILED."
+            )
+
+            assert "vanished-lookup" in provider.reads
+            failures = failed_tool_executions(events)
+            assert len(failures) == 1
+            data = failures[0].data
+            assert isinstance(data, ToolExecutionCompleteData)
+            assert data.error is not None
+            assert "not found" in data.error.message.lower()
+            assert message is not None
+            # Validate the final assistant response arrived (guards against truncated captures)
+            assert "LOAD_FAILED" in message.data.content
+        finally:
+            await session.disconnect()
+
+    async def test_should_keep_provider_dormant_when_skills_disabled(self, ctx: E2ETestContext):
+        provider = InMemorySkillProvider(
+            [skill("dormant-lookup", "Never listed.", "Never read.\n")]
+        )
+        session = await ctx.client.create_session(
+            on_permission_request=PermissionHandler.approve_all,
+            enable_skills=False,
+            skill_provider=provider,
+        )
+
+        try:
+            await session.rpc.skills.ensure_loaded()
+            skills = await session.rpc.skills.list()
+
+            assert [s for s in skills.skills if s.source == SkillSource.SDK] == []
+            assert provider.calls == []
+        finally:
+            await session.disconnect()
+
+    async def test_should_unbind_provider_when_resumed_without_one(self, ctx: E2ETestContext):
+        provider = InMemorySkillProvider(
+            [skill("unbound-lookup", "Reports the unbound lookup word.", "Unbound.\n")]
+        )
+        first = await ctx.client.create_session(
+            on_permission_request=PermissionHandler.approve_all,
+            skill_provider=provider,
+        )
+        before = await first.rpc.skills.list()
+        assert any(s.name == "unbound-lookup" for s in before.skills)
+        calls_before_resume = len(provider.calls)
+
+        # Resume while the provider is still bound so the unbind is observable.
+        session = await ctx.client.resume_session(
+            first.session_id,
+            on_permission_request=PermissionHandler.approve_all,
+        )
+
+        try:
+            await session.rpc.skills.reload()
+            skills = await session.rpc.skills.list()
+
+            assert [s for s in skills.skills if s.source == SkillSource.SDK] == []
+            assert len(provider.calls) == calls_before_resume
+        finally:
+            await session.disconnect()
+
+    async def test_should_cancel_a_blocked_provider_call_when_the_session_disconnects(
+        self, ctx: E2ETestContext
+    ):
+        entered = asyncio.Event()
+        cancelled = asyncio.Event()
+
+        class BlockingSkillProvider:
+            async def list_skills(self) -> list[SkillProviderDescriptor]:
+                entered.set()
+                try:
+                    await asyncio.Event().wait()
+                except asyncio.CancelledError:
+                    cancelled.set()
+                    raise
+                return []
+
+            def read_skill(self, name: str) -> str | None:
+                return None
+
+        session = await ctx.client.create_session(
+            on_permission_request=PermissionHandler.approve_all,
+            skill_provider=BlockingSkillProvider(),
+        )
+
+        # The list RPC fails once the binding is removed; only the provider's
+        # cancellation matters here.
+        listing = asyncio.create_task(session.rpc.skills.list())
+        try:
+            await asyncio.wait_for(entered.wait(), timeout=30)
+            await session.disconnect()
+            await asyncio.wait_for(cancelled.wait(), timeout=10)
+        finally:
+            listing.cancel()
+            await asyncio.gather(listing, return_exceptions=True)
+
+    async def test_should_reject_skill_provider_for_cloud_sessions(self, ctx: E2ETestContext):
+        provider = InMemorySkillProvider([skill("cloud-lookup", "Never listed.", "Never read.\n")])
+
+        with pytest.raises(
+            ValueError, match="Skill providers are not supported for cloud sessions."
+        ):
+            await ctx.client.create_session(
+                on_permission_request=PermissionHandler.approve_all,
+                cloud=CloudSessionOptions(),
+                skill_provider=provider,
+            )
+
+        assert provider.calls == []
diff --git a/python/test_client.py b/python/test_client.py
index 57d284dd45..95e80c1b0e 100644
--- a/python/test_client.py
+++ b/python/test_client.py
@@ -16,6 +16,7 @@
 
 import pytest
 
+import copilot.client as client_module
 from copilot import (
     CanvasProviderIdentity,
     CapiSessionOptions,
@@ -29,6 +30,7 @@
     StdioRuntimeConnection,
     define_tool,
 )
+from copilot._jsonrpc import JsonRpcClient
 from copilot.client import (
     CloudSessionOptions,
     CloudSessionRepository,
@@ -86,6 +88,29 @@ def test_inprocess_connection_has_no_child_process_options():
     assert not hasattr(connection, "args")
 
 
+@pytest.mark.asyncio
+async def test_inprocess_forwards_integration_id_to_native_host(
+    monkeypatch: pytest.MonkeyPatch, tmp_path
+):
+    monkeypatch.setenv("GITHUB_COPILOT_INTEGRATION_ID", "  microsoft/vscode  ")
+    monkeypatch.setattr(
+        "copilot._cli_download.ensure_runtime_wrapper",
+        lambda: str(tmp_path / "copilot-runtime"),
+    )
+    host = Mock()
+    host.process = Mock()
+    host.start_blocking = Mock()
+    create_host = Mock(return_value=host)
+    monkeypatch.setattr(client_module.FfiRuntimeHost, "create", create_host)
+    client = CopilotClient(connection=RuntimeConnection.for_inprocess())
+
+    await client._start_inprocess_ffi()
+
+    assert (
+        "--cli-login-sync-integration-id=microsoft/vscode" in create_host.call_args.kwargs["args"]
+    )
+
+
 def test_explicit_child_process_path_does_not_require_runtime_bundle(tmp_path):
     explicit = tmp_path / "copilot"
     connection = RuntimeConnection.for_stdio(path=str(explicit))
@@ -152,6 +177,109 @@ def test_relative_path_is_rejected(self):
 
 
 class TestClientShutdown:
+    @pytest.mark.asyncio
+    @pytest.mark.parametrize("shutdown", ["stop", "force_stop"])
+    @pytest.mark.parametrize("restart", [False, True])
+    async def test_shutdown_rejects_cloud_publication_after_session_snapshot(
+        self, shutdown, restart
+    ):
+        client = CopilotClient(
+            connection=RuntimeConnection.for_uri("localhost:1234"),
+            session_fs={
+                "initial_working_directory": "/",
+                "session_state_path": "/session-state",
+                "conventions": "posix",
+            },
+        )
+        loop = asyncio.get_running_loop()
+        rpc = JsonRpcClient(Mock())
+        rpc._loop = loop
+        request_sent = asyncio.Event()
+        provider_started = asyncio.Event()
+        transport_stop_started = asyncio.Event()
+        release_provider = threading.Event()
+        release_transport_stop = asyncio.Event()
+        retained_sessions = []
+        messages = []
+
+        async def send_message(message):
+            messages.append(message)
+            request_sent.set()
+
+        async def stop_transport():
+            transport_stop_started.set()
+            await release_transport_stop.wait()
+
+        def create_provider(session):
+            retained_sessions.append(session)
+            loop.call_soon_threadsafe(provider_started.set)
+            release_provider.wait()
+            return Mock(spec=SessionFsProvider)
+
+        rpc._send_message = AsyncMock(side_effect=send_message)
+        rpc.stop = stop_transport
+        client._client = rpc
+        client._state = "connected"
+        creation = asyncio.create_task(
+            client.create_session(
+                cloud=CloudSessionOptions(
+                    repository=CloudSessionRepository(
+                        owner="github", name="copilot-sdk", branch="main"
+                    )
+                ),
+                create_session_fs_handler=create_provider,
+            )
+        )
+        response = None
+        stopping = None
+        try:
+            await asyncio.wait_for(request_sent.wait(), timeout=5)
+            response = asyncio.create_task(
+                asyncio.to_thread(
+                    rpc._handle_message,
+                    {
+                        "id": messages[0]["id"],
+                        "result": {"sessionId": "server-assigned-session"},
+                    },
+                )
+            )
+            await asyncio.wait_for(provider_started.wait(), timeout=5)
+            stopping = asyncio.create_task(getattr(client, shutdown)())
+            await asyncio.wait_for(transport_stop_started.wait(), timeout=5)
+            if restart:
+                release_transport_stop.set()
+                await asyncio.wait_for(stopping, timeout=5)
+                next_rpc = Mock(request=AsyncMock())
+
+                async def connect():
+                    client._client = next_rpc
+
+                client._connect_to_server = AsyncMock(side_effect=connect)
+                client._verify_protocol_version = AsyncMock()
+                client._set_session_fs_provider = AsyncMock()
+                await client.start()
+                assert client._state == "connected"
+            release_provider.set()
+            await asyncio.wait_for(response, timeout=5)
+            with pytest.raises(RuntimeError, match="not connected"):
+                await asyncio.wait_for(creation, timeout=5)
+            assert client._sessions == {}
+            with pytest.raises(RuntimeError, match="disconnected"):
+                retained_sessions[0].on(lambda _: None)
+            assert retained_sessions[0]._client_session_apis.session_fs is None
+            assert [message["method"] for message in messages] == ["session.create"]
+            assert rpc.pending_requests == {}
+        finally:
+            release_provider.set()
+            release_transport_stop.set()
+            if response is not None:
+                await asyncio.wait_for(response, timeout=5)
+            if stopping is not None:
+                await asyncio.wait_for(stopping, timeout=5)
+            if not creation.done():
+                creation.cancel()
+                await asyncio.gather(creation, return_exceptions=True)
+
     @pytest.mark.asyncio
     async def test_stop_requests_runtime_shutdown_for_owned_process(self):
         calls: list[str] = []
@@ -847,8 +975,12 @@ async def mock_request(method, params, **kwargs):
             assert "Failed to delete cloud session" in caplog.text
 
     @pytest.mark.asyncio
-    @pytest.mark.parametrize("valid_provider", [False, True])
-    async def test_cloud_create_cancellation_waits_for_provider_validation(self, valid_provider):
+    @pytest.mark.parametrize(
+        "valid_provider,replace_session", [(False, False), (True, False), (True, True)]
+    )
+    async def test_cloud_create_cancellation_waits_for_provider_validation(
+        self, valid_provider, replace_session
+    ):
         client = CopilotClient(
             connection=RuntimeConnection.for_uri("localhost:1234"),
             session_fs={
@@ -864,6 +996,7 @@ async def test_cloud_create_cancellation_waits_for_provider_validation(self, val
         delete_called = asyncio.Event()
         release_provider = threading.Event()
         requests = []
+        retained_sessions = []
 
         async def mock_request(method, params, **kwargs):
             requests.append((method, params))
@@ -883,7 +1016,8 @@ def invoke_callback():
                 return {"success": True}
             return {}
 
-        def create_provider(_):
+        def create_provider(session):
+            retained_sessions.append(session)
             loop.call_soon_threadsafe(provider_started.set)
             release_provider.wait()
             provider = Mock(spec=SessionFsProvider)
@@ -910,6 +1044,15 @@ def create_provider(_):
                 await asyncio.wait_for(creation, timeout=5)
             assert not delete_called.is_set()
 
+            successor = None
+            if replace_session:
+                provider = Mock(spec=SessionFsProvider)
+                provider.read_file_bytes = AsyncMock(return_value=b"image")
+                provider.write_file_bytes = AsyncMock()
+                successor = await client.resume_session(
+                    "server-assigned-session", create_session_fs_handler=lambda _: provider
+                )
+
             release_provider.set()
             await asyncio.wait_for(callback_finished.wait(), timeout=5)
             if valid_provider:
@@ -920,13 +1063,121 @@ def create_provider(_):
                     "session.delete",
                     {"sessionId": "server-assigned-session"},
                 )
-            assert "server-assigned-session" not in client._sessions
+            assert client._sessions == (
+                {"server-assigned-session": successor} if successor is not None else {}
+            )
+            if successor is not None:
+                successor.on(lambda _: None)()
+            with pytest.raises(RuntimeError, match="disconnected"):
+                retained_sessions[0].on(lambda _: None)
+            assert retained_sessions[0]._client_session_apis.session_fs is None
         finally:
             release_provider.set()
             if not creation.done():
                 creation.cancel()
                 await asyncio.gather(creation, return_exceptions=True)
 
+    @pytest.mark.asyncio
+    @pytest.mark.parametrize("operation", ["create", "resume"])
+    async def test_failed_provider_setup_retires_retained_factory_session(self, operation):
+        client = CopilotClient(
+            connection=RuntimeConnection.for_uri("localhost:1234"),
+            session_fs={
+                "initial_working_directory": "/",
+                "session_state_path": "/session-state",
+                "conventions": "posix",
+                "capabilities": {"binary": True},
+            },
+        )
+        client._client = Mock(request=AsyncMock())
+        original = CopilotSession("session-1", client._client)
+        retained_sessions = []
+
+        def create_provider(session):
+            retained_sessions.append(session)
+            return Mock(spec=SessionFsProvider)
+
+        if operation == "resume":
+            client._sessions["session-1"] = original
+        with pytest.raises(ValueError, match="does not implement SessionFsBinaryProvider"):
+            if operation == "resume":
+                await client.resume_session("session-1", create_session_fs_handler=create_provider)
+            else:
+                await client.create_session(
+                    session_id="session-1", create_session_fs_handler=create_provider
+                )
+
+        client._client.request.assert_not_awaited()
+        assert client._sessions == ({"session-1": original} if operation == "resume" else {})
+        original.on(lambda _: None)()
+        with pytest.raises(RuntimeError, match="disconnected"):
+            retained_sessions[0].on(lambda _: None)
+
+    @pytest.mark.asyncio
+    @pytest.mark.parametrize("operation", ["create", "resume"])
+    @pytest.mark.parametrize("cancelled", [False, True])
+    async def test_failed_session_admission_retires_retained_factory_session(
+        self, operation, cancelled
+    ):
+        client = CopilotClient(
+            connection=RuntimeConnection.for_uri("localhost:1234"),
+            session_fs={
+                "initial_working_directory": "/",
+                "session_state_path": "/session-state",
+                "conventions": "posix",
+            },
+        )
+        request_started = asyncio.Event()
+        release_request = asyncio.Event()
+        retained_sessions = []
+        requests = []
+
+        async def mock_request(method, params, **kwargs):
+            requests.append((method, params))
+            request_started.set()
+            await release_request.wait()
+            raise RuntimeError("admission rejected")
+
+        def create_provider(session):
+            retained_sessions.append(session)
+            return Mock(spec=SessionFsProvider)
+
+        client._client = Mock(request=mock_request)
+        original = CopilotSession("session-1", client._client)
+        if operation == "resume":
+            client._sessions["session-1"] = original
+            admission = asyncio.create_task(
+                client.resume_session("session-1", create_session_fs_handler=create_provider)
+            )
+        else:
+            admission = asyncio.create_task(
+                client.create_session(
+                    session_id="session-1", create_session_fs_handler=create_provider
+                )
+            )
+        try:
+            await asyncio.wait_for(request_started.wait(), timeout=5)
+            if cancelled:
+                admission.cancel()
+                with pytest.raises(asyncio.CancelledError):
+                    await asyncio.wait_for(admission, timeout=5)
+            else:
+                release_request.set()
+                with pytest.raises(RuntimeError, match="admission rejected"):
+                    await asyncio.wait_for(admission, timeout=5)
+
+            assert [method for method, _ in requests] == [f"session.{operation}"]
+            assert client._sessions == ({"session-1": original} if operation == "resume" else {})
+            original.on(lambda _: None)()
+            with pytest.raises(RuntimeError, match="disconnected"):
+                retained_sessions[0].on(lambda _: None)
+            assert retained_sessions[0]._client_session_apis.session_fs is None
+        finally:
+            release_request.set()
+            if not admission.done():
+                admission.cancel()
+                await asyncio.gather(admission, return_exceptions=True)
+
     @pytest.mark.asyncio
     async def test_cloud_create_preserves_session_when_interest_registration_fails(self):
         client = CopilotClient(connection=RuntimeConnection.for_uri("localhost:1234"))
@@ -1091,18 +1342,22 @@ async def mock_request(method, params, **kwargs):
             session = await client.create_session(
                 on_permission_request=PermissionHandler.approve_all,
                 enable_managed_settings=True,
+                enforce_managed_model_defaults=True,
                 managed_settings=ManagedSettings(
                     permissions=ManagedSettingsPermissions(
                         disable_bypass_permissions_mode=DisableBypassPermissionsModes.ALLOW_AUTO_ONLY,
+                        disable_assisted_permissions_mode=True,
                         deny=["Shell(git push)"],
                         ask=["Domain(publish.example)"],
                         allow=["Read(**)"],
+                        limit_to=["Domain(github.com)"],
                     )
                 ),
             )
             resumed_session = await client.resume_session(
                 session.session_id,
                 on_permission_request=PermissionHandler.approve_all,
+                enforce_managed_model_defaults=True,
                 managed_settings=ManagedSettings(
                     permissions=ManagedSettingsPermissions(
                         disable_bypass_permissions_mode="future-fail-closed-mode",
@@ -1114,12 +1369,16 @@ async def mock_request(method, params, **kwargs):
             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"]["enforceManagedModelDefaults"] is True
+            assert captured["session.resume"]["enforceManagedModelDefaults"] is True
             assert captured["session.create"]["managedSettings"] == {
                 "permissions": {
                     "disableBypassPermissionsMode": "allow-auto-only",
+                    "disableAssistedPermissionsMode": True,
                     "deny": ["Shell(git push)"],
                     "ask": ["Domain(publish.example)"],
                     "allow": ["Read(**)"],
+                    "limitTo": ["Domain(github.com)"],
                 }
             }
             assert captured["session.resume"]["managedSettings"] == {
@@ -1231,12 +1490,12 @@ async def mock_request(method, params, **kwargs):
             await client.create_session(
                 on_permission_request=PermissionHandler.approve_all,
                 managed_settings=ManagedSettings(
-                    permissions=ManagedSettingsPermissions(deny=[], ask=[], allow=[])
+                    permissions=ManagedSettingsPermissions(deny=[], ask=[], allow=[], limit_to=[])
                 ),
             )
 
             assert captured["session.create"]["managedSettings"] == {
-                "permissions": {"deny": [], "ask": [], "allow": []}
+                "permissions": {"deny": [], "ask": [], "allow": [], "limitTo": []}
             }
         finally:
             await client.force_stop()
diff --git a/python/test_connectors.py b/python/test_connectors.py
index eb73ac597f..ac3938df5d 100644
--- a/python/test_connectors.py
+++ b/python/test_connectors.py
@@ -11,11 +11,69 @@
     ConnectorConnectRequest,
     ConnectorConnectResultKind,
     ConnectorContinueRequest,
+    ConnectorDiscoveryAccount,
+    ConnectorDiscoveryAccountList,
+    ConnectorDiscoveryAvailability,
+    ConnectorDiscoveryCapabilities,
     ConnectorReconcileRequest,
+    ServerRpc,
 )
 from copilot.session import CopilotSession
 
 
+@pytest.mark.parametrize("availability", ["disabled", "enabled", "unavailable"])
+@pytest.mark.parametrize(
+    ("result_type", "payload"),
+    [
+        (ConnectorDiscoveryAccountList, {"availability": "enabled", "accounts": []}),
+        (
+            ConnectorDiscoveryCapabilities,
+            {
+                "apiVersion": 1,
+                "availability": "enabled",
+                "conditionalCache": True,
+                "opaqueAccountSelection": True,
+            },
+        ),
+    ],
+)
+def test_discovery_availability_is_distinct_from_session_availability(
+    result_type, payload, availability
+):
+    assert ConnectorDiscoveryAvailability is not ConnectorAvailability
+    payload = {**payload, "availability": availability}
+    result = result_type.from_dict(payload)
+    assert result.availability is ConnectorDiscoveryAvailability(availability)
+    assert result.to_dict() == payload
+
+
+@pytest.mark.asyncio
+async def test_client_connector_accounts_are_typed():
+    transport = Mock()
+    transport.request = AsyncMock(
+        return_value={
+            "availability": "enabled",
+            "accounts": [
+                {
+                    "accountId": "account-1",
+                    "authInfo": {
+                        "type": "user",
+                        "host": "https://github.com",
+                        "login": "octocat",
+                    },
+                }
+            ],
+        }
+    )
+
+    result = await ServerRpc(transport).connectors.get_accounts()
+
+    assert len(result.accounts) == 1
+    assert isinstance(result.accounts[0], ConnectorDiscoveryAccount)
+    assert result.accounts[0].account_id == "account-1"
+    assert result.accounts[0].auth_info.login == "octocat"
+
+
 @pytest.mark.asyncio
 async def test_session_connectors_exposes_host_lifecycle_api():
     transport = Mock()
diff --git a/python/test_customization_directories.py b/python/test_customization_directories.py
new file mode 100644
index 0000000000..254025a34f
--- /dev/null
+++ b/python/test_customization_directories.py
@@ -0,0 +1,71 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+
+from unittest.mock import AsyncMock
+
+import pytest
+
+from copilot import CopilotClient, RuntimeConnection
+from copilot._jsonrpc import JsonRpcClient
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize("roots", [None, [], ["relative-root", "other-root"]])
+async def test_customization_roots_preserved_on_create_and_resume(monkeypatch, roots):
+    client = CopilotClient(connection=RuntimeConnection.for_uri("localhost:1234"))
+    rpc = AsyncMock(spec=JsonRpcClient)
+    requests = {}
+
+    async def request(method, params, **kwargs):
+        requests[method] = params
+        if method in ("session.create", "session.resume"):
+            response = {"sessionId": params["sessionId"]}
+            if callback := kwargs.get("on_response_inline"):
+                callback(response)
+            return response
+        return {}
+
+    rpc.request.side_effect = request
+    monkeypatch.setattr(client, "_client", rpc)
+    skills = None if roots is None else [f"{root}-skills" for root in roots]
+    agents = None if roots is None else [f"{root}-agents" for root in roots]
+    instructions = None if roots is None else [f"{root}-instructions" for root in roots]
+    hooks = None if roots is None else [f"{root}-hooks" for root in roots]
+    try:
+        session = await client.create_session(
+            working_directory="request-cwd",
+            enable_config_discovery=False,
+            enable_file_hooks=False,
+            skill_directories=skills,
+            agent_directories=agents,
+            instruction_directories=instructions,
+            hook_directories=hooks,
+        )
+        await client.resume_session(
+            session.session_id,
+            working_directory="resume-cwd",
+            enable_config_discovery=False,
+            enable_file_hooks=False,
+            skill_directories=skills,
+            agent_directories=agents,
+            instruction_directories=instructions,
+            hook_directories=hooks,
+        )
+        for method in ("session.create", "session.resume"):
+            payload = requests[method]
+            for key, expected in (
+                ("skillDirectories", skills),
+                ("agentDirectories", agents),
+                ("instructionDirectories", instructions),
+                ("hookDirectories", hooks),
+            ):
+                if expected is None:
+                    assert key not in payload
+                else:
+                    assert payload[key] == expected
+            assert payload["enableConfigDiscovery"] is False
+            assert payload["enableFileHooks"] is False
+            assert "additionalDirectories" not in payload
+            assert "customAgents" not in payload
+            assert "hooks" not in payload
+    finally:
+        await client.force_stop()
diff --git a/python/test_event_forward_compatibility.py b/python/test_event_forward_compatibility.py
index 401eec6359..0d814ffaec 100644
--- a/python/test_event_forward_compatibility.py
+++ b/python/test_event_forward_compatibility.py
@@ -21,7 +21,9 @@
     ElicitationRequestedMode,
     ElicitationRequestedSchema,
     ManagedSettingsResolvedSource,
+    PermissionApprovalEvaluationReasonCode,
     PermissionPromptRequestMemory,
+    PermissionRequestedData,
     PermissionRequestMemory,
     PermissionRequestMemoryAction,
     SessionAutoTierSwitchFailedData,
@@ -64,6 +66,67 @@ def test_future_file_edit_kind_preserves_tool_completion(self):
         assert event.data.file_edits[0] == other.data.file_edits[0]
         assert len({event.data.file_edits[0].kind, other.data.file_edits[0].kind}) == 1
 
+    @staticmethod
+    def _permission_requested_with_reason(reason_code):
+        return {
+            "id": "11111111-1111-1111-1111-111111111111",
+            "timestamp": "2026-09-18T22:00:00+00:00",
+            "parentId": None,
+            "type": "permission.requested",
+            "data": {
+                "requestId": "request-1",
+                "permissionRequest": {
+                    "kind": "memory",
+                    "fact": "fact",
+                    "assistedApproval": {
+                        "recommendation": "requireApproval",
+                        "evaluation": {
+                            "reasonCode": reason_code,
+                            "judgeStatus": "not_called",
+                            "evaluationStage": "pre_judge",
+                            "judgeAttempted": False,
+                        },
+                    },
+                },
+            },
+        }
+
+    @pytest.mark.parametrize("reason", list(PermissionApprovalEvaluationReasonCode))
+    def test_permission_event_decodes_every_published_reason_code(self, reason):
+        wire = self._permission_requested_with_reason(reason.value)
+
+        event = session_event_from_dict(wire)
+        assert isinstance(event.data, PermissionRequestedData)
+        evaluation = event.data.permission_request.assisted_approval.evaluation
+        assert evaluation.reason_code is reason
+        assert session_event_to_dict(event) == wire
+
+    def test_shell_evidence_reason_codes_are_published(self):
+        assert {
+            "content-excluded",
+            "unsupported-command-shape",
+            "unsupported-source",
+            "dynamic-source",
+            "too-many-sources",
+            "executable-unavailable",
+            "executable-too-large",
+        } <= {reason.value for reason in PermissionApprovalEvaluationReasonCode}
+
+    def test_future_reason_code_decodes_as_unknown(self):
+        event = session_event_from_dict(
+            self._permission_requested_with_reason("future-runtime-reason")
+        )
+
+        assert isinstance(event.data, PermissionRequestedData)
+        evaluation = event.data.permission_request.assisted_approval.evaluation
+        assert evaluation.reason_code is PermissionApprovalEvaluationReasonCode.UNKNOWN
+        assert evaluation.judge_status.value == "not_called"
+        assert evaluation.evaluation_stage.value == "pre_judge"
+
+    def test_non_string_reason_code_still_raises(self):
+        with pytest.raises(ValueError):
+            PermissionApprovalEvaluationReasonCode(7)
+
     @pytest.mark.parametrize(
         ("event_type", "data"), [("session.idle", {}), ("user.message", {"content": "hello"})]
     )
@@ -198,7 +261,9 @@ def test_union_event_preserves_complete_envelope(self, event_type, kind, fields)
         assert session_event_to_dict(event) == wire
 
     @pytest.mark.parametrize("event_type", ["session.start", "session.resume"])
-    @pytest.mark.parametrize("tier", ["efficiency", "balance", "intelligence", "fast", None])
+    @pytest.mark.parametrize(
+        "tier", ["efficiency", "balance", "intelligence", "fast", "premium-v2", None]
+    )
     def test_auto_tier_lifecycle_events_round_trip(self, event_type, tier):
         timestamp = "2026-08-28T00:00:00Z"
         data = (
diff --git a/python/test_force_stop.py b/python/test_force_stop.py
new file mode 100644
index 0000000000..74d399295e
--- /dev/null
+++ b/python/test_force_stop.py
@@ -0,0 +1,171 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+
+"""Public TCP-backed tests for SDK-local force-stop retirement."""
+
+import asyncio
+import gc
+import json
+import weakref
+from collections.abc import AsyncIterator
+from datetime import UTC, datetime
+
+import pytest
+
+from copilot import CopilotClient, RuntimeConnection
+from copilot._sdk_protocol_version import SDK_PROTOCOL_VERSION
+from copilot.session import PermissionHandler
+
+
+class Peer:
+    def __init__(self):
+        self.requests: list[str] = []
+        self.sends_received = asyncio.Event()
+        self.expected_sends = 1
+        self.send_count = 0
+        self.failures: list[Exception] = []
+        self.writers: list[asyncio.StreamWriter] = []
+        self.tasks: list[asyncio.Task] = []
+
+    async def serve(self, reader: asyncio.StreamReader, writer: asyncio.StreamWriter) -> None:
+        self.writers.append(writer)
+        try:
+            while True:
+                try:
+                    header = await reader.readuntil(b"\r\n\r\n")
+                except asyncio.IncompleteReadError as error:
+                    if error.partial:
+                        raise
+                    return
+                lengths = [
+                    int(line.split(b":", 1)[1])
+                    for line in header.split(b"\r\n")
+                    if line.lower().startswith(b"content-length:")
+                ]
+                assert len(lengths) == 1
+                assert 0 < lengths[0] <= 128 * 1024
+                request = json.loads(await reader.readexactly(lengths[0]))
+                method = request["method"]
+                self.requests.append(method)
+                if method == "connect":
+                    result = {
+                        "ok": True,
+                        "protocolVersion": SDK_PROTOCOL_VERSION,
+                        "version": "force-stop-test",
+                    }
+                elif method == "ping":
+                    result = {
+                        "message": "pong",
+                        "timestamp": datetime.now(UTC).isoformat(),
+                        "protocolVersion": SDK_PROTOCOL_VERSION,
+                    }
+                elif method == "session.create":
+                    result = {"sessionId": request["params"]["sessionId"]}
+                elif method == "session.send":
+                    self.send_count += 1
+                    result = {"messageId": f"message-{self.send_count}"}
+                elif method == "session.detach":
+                    result = {"success": True}
+                else:
+                    raise AssertionError(f"Unexpected RPC: {method}")
+                body = json.dumps(
+                    {"jsonrpc": "2.0", "id": request["id"], "result": result}
+                ).encode()
+                writer.write(f"Content-Length: {len(body)}\r\n\r\n".encode() + body)
+                await writer.drain()
+                if self.send_count == self.expected_sends:
+                    self.sends_received.set()
+        except Exception as error:
+            self.failures.append(error)
+        finally:
+            writer.close()
+            await writer.wait_closed()
+
+
+@pytest.fixture
+async def connected_peer() -> AsyncIterator[tuple[CopilotClient, Peer]]:
+    peer = Peer()
+
+    def accepted(reader: asyncio.StreamReader, writer: asyncio.StreamWriter) -> None:
+        peer.tasks.append(asyncio.create_task(peer.serve(reader, writer)))
+
+    server = await asyncio.start_server(accepted, "127.0.0.1", 0)
+    client = CopilotClient(
+        connection=RuntimeConnection.for_uri(f"127.0.0.1:{server.sockets[0].getsockname()[1]}"),
+    )
+    try:
+        await client.start()
+        yield client, peer
+    finally:
+        try:
+            await client.force_stop()
+        finally:
+            server.close()
+            await server.wait_closed()
+            for writer in peer.writers:
+                writer.close()
+            if peer.tasks:
+                await asyncio.gather(*peer.tasks)
+            assert peer.failures == []
+
+
+@pytest.mark.parametrize("count", [1, 2])
+async def test_force_stop_rejects_acknowledged_plain_waits(connected_peer, count):
+    client, peer = connected_peer
+    peer.expected_sends = count
+    session = await client.create_session(
+        session_id="retirement-session", on_permission_request=PermissionHandler.approve_all
+    )
+    waits = [
+        asyncio.create_task(session.send_and_wait("hold the response", timeout=1))
+        for _ in range(count)
+    ]
+    try:
+        await asyncio.wait_for(peer.sends_received.wait(), 5)
+        # The later reply is a barrier for all preceding send acknowledgments.
+        await client.ping()
+        await client.force_stop()
+
+        for wait in waits:
+            with pytest.raises(RuntimeError, match="Session closed before response completed"):
+                await wait
+        await session.disconnect()
+        assert "session.detach" not in peer.requests
+    finally:
+        for wait in waits:
+            wait.cancel()
+        await asyncio.gather(*waits, return_exceptions=True)
+
+
+class Capture:
+    def __call__(self, *_args, **_kwargs):
+        return None
+
+
+async def captured_session(client: CopilotClient, kind: str):
+    capture = Capture()
+    reference = weakref.ref(capture)
+    options = {"on_permission_request": PermissionHandler.approve_all}
+    if kind == "permission":
+        options["on_permission_request"] = capture
+    elif kind == "user_input":
+        options["on_user_input_request"] = capture
+    elif kind == "hook":
+        options["hooks"] = {"on_session_end": capture}
+    session = await client.create_session(session_id="captured-session", **options)
+    if kind == "event":
+        session.on(capture)
+    return session, reference
+
+
+@pytest.mark.parametrize("kind", ["event", "permission", "user_input", "hook"])
+async def test_force_stop_releases_retained_session_callbacks(connected_peer, kind):
+    client, _peer = connected_peer
+    session, reference = await captured_session(client, kind)
+    assert reference() is not None
+
+    await client.force_stop()
+    gc.collect()
+
+    assert reference() is None
+    with pytest.raises(RuntimeError, match="Session is disconnected"):
+        session.on(Capture())
diff --git a/python/test_github_token_provider.py b/python/test_github_token_provider.py
index f31da92ba4..6da93a6633 100644
--- a/python/test_github_token_provider.py
+++ b/python/test_github_token_provider.py
@@ -41,7 +41,7 @@ async def request(self, method: str, params: dict[str, Any], **kwargs: Any) -> d
     async def stop(self) -> None:
         pass
 
-    def set_request_handler(self, method: str, handler: Any) -> None:
+    def set_request_handler(self, method: str, handler: Any, **_options: Any) -> None:
         self.request_handlers[method] = handler
 
     def set_raw_request_handler(self, method: str, handler: Any) -> None:
diff --git a/python/test_host.py b/python/test_host.py
index 546d797ccb..e2dcf3831e 100644
--- a/python/test_host.py
+++ b/python/test_host.py
@@ -22,6 +22,8 @@ async def request(method, params, **_):
                 "sessionId": params["sessionId"],
                 "sessionUri": f"copilot:/{params['sessionId']}",
             }
+        if method == "host.listSessions":
+            return {"sessions": []}
         if method in ("session.create", "session.resume"):
             return {"sessionId": params["sessionId"]}
         return {}
@@ -72,6 +74,7 @@ async def start(method, params):
     rpc.request.side_effect = start
     host = await client.start_ahp_host(
         AhpHostOptions(
+            compute_id="stable-installation-id",
             github_environment=HostGitHubEnvironmentOptions(
                 name="Application", compute_id="stable-installation-id"
             ),
@@ -80,6 +83,7 @@ async def start(method, params):
     )
     assert rpc.request.call_args.args[1] == {
         "hostId": host.host_id,
+        "computeId": "stable-installation-id",
         "githubEnvironment": {"name": "Application", "computeId": "stable-installation-id"},
         **({"localServer": {}} if local else {}),
     }
@@ -89,6 +93,19 @@ async def start(method, params):
     assert host.pid is None
 
 
+@pytest.mark.parametrize("compute_id", [None, "", "stable-local-compute"])
+async def test_local_compute_identity_is_forwarded_without_sdk_defaults(compute_id):
+    client, rpc = client_fixture()
+    host = await client.start_ahp_host(
+        AhpHostOptions(local_server=HostLocalServerOptions(), compute_id=compute_id)
+    )
+    assert rpc.request.call_args.args[1] == {
+        "hostId": host.host_id,
+        "localServer": {},
+        **({"computeId": compute_id} if compute_id is not None else {}),
+    }
+
+
 async def test_handle_uses_original_transport_and_forwards_every_disposal():
     client, rpc = client_fixture()
     exited = Mock()
@@ -108,6 +125,12 @@ async def test_handle_uses_original_transport_and_forwards_every_disposal():
     client._client = replacement
     published = await host.publish_session("resident")
     assert published.session_id == "resident"
+    sessions = await host.list_sessions()
+    assert sessions.sessions == []
+    assert rpc.request.call_args_list[-1].args[:2] == (
+        "host.listSessions",
+        {"hostId": host.host_id},
+    )
     assert await asyncio.gather(host.dispose(), host.dispose()) == [None, None]
     assert await host.dispose() is None
     assert sum(call.args[0] == "host.dispose" for call in rpc.request.call_args_list) == 3
diff --git a/python/test_image_generation.py b/python/test_image_generation.py
new file mode 100644
index 0000000000..7323d869da
--- /dev/null
+++ b/python/test_image_generation.py
@@ -0,0 +1,47 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+
+"""Image generation request serialization without starting a runtime."""
+
+import json
+from unittest.mock import AsyncMock, Mock
+
+import pytest
+
+from copilot import CopilotClient, ImageGenerationConfig, PermissionHandler, RuntimeConnection
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize("option", [None, {}, {"enabled": True}, {"enabled": False}])
+async def test_image_generation_create_and_resume_wire(option: ImageGenerationConfig | None):
+    client = CopilotClient(connection=RuntimeConnection.for_stdio(path="unused-cli"))
+    client._state = "connected"
+    transport = Mock()
+    captured = {}
+
+    async def request(method, params, **kwargs):
+        captured[method] = json.loads(json.dumps(params))
+        response = {"sessionId": params["sessionId"]}
+        if callback := kwargs.get("on_response_inline"):
+            callback(response)
+        return response
+
+    transport.request = AsyncMock(side_effect=request)
+    transport.stop = AsyncMock()
+    client._client = transport
+    try:
+        session = await client.create_session(
+            on_permission_request=PermissionHandler.approve_all,
+            image_generation=option,
+        )
+        await client.resume_session(
+            session.session_id,
+            on_permission_request=PermissionHandler.approve_all,
+            image_generation=option,
+        )
+        for method in ("session.create", "session.resume"):
+            if option is None:
+                assert "imageGeneration" not in captured[method], captured[method]
+            else:
+                assert captured[method]["imageGeneration"] == option
+    finally:
+        await client.force_stop()
diff --git a/python/test_legacy_parameters.py b/python/test_legacy_parameters.py
index 5eced46e82..29989ef2c2 100644
--- a/python/test_legacy_parameters.py
+++ b/python/test_legacy_parameters.py
@@ -1,4 +1,6 @@
-"""Existing callers keep their construction style when a request gains fields."""
+# Copyright (c) Microsoft Corporation. All rights reserved.
+
+"""Existing callers keep their construction style when an RPC record gains fields."""
 
 import dataclasses
 
@@ -93,3 +95,41 @@ def test_listed_server_owned_marker_round_trips_by_keyword():
     assert server.owned.installation_id == "installation"
     assert rpc.MCPServer.from_dict(server.to_dict()) == server
     assert server.to_dict()["owned"] == {"installationId": "installation"}
+
+
+def test_workspace_diff_positional_arguments_keep_their_meaning():
+    change = rpc.WorkspaceDiffFileChange(
+        rpc.WorkspaceDiffFileChangeType.MODIFIED, "patch", "app.txt", True, "old.txt"
+    )
+
+    assert (change.is_truncated, change.old_path, change.contents, _positional(type(change))) == (
+        True,
+        "old.txt",
+        None,
+        ["change_type", "diff", "path", "is_truncated", "old_path"],
+    )
+    assert "contents" not in change.to_dict()
+
+
+def test_workspace_diff_contents_round_trip_by_keyword():
+    contents = rpc.WorkspaceDiffContents(before="port=3000\n", after="port=4000\n")
+    change = rpc.WorkspaceDiffFileChange(
+        rpc.WorkspaceDiffFileChangeType.MODIFIED,
+        "patch",
+        "app.txt",
+        False,
+        None,
+        contents=contents,
+    )
+    encoded = change.to_dict()
+
+    assert (encoded, rpc.WorkspaceDiffFileChange.from_dict(encoded)) == (
+        {
+            "changeType": "modified",
+            "diff": "patch",
+            "path": "app.txt",
+            "isTruncated": False,
+            "contents": {"before": "port=3000\n", "after": "port=4000\n"},
+        },
+        change,
+    )
diff --git a/python/test_rpc_generated.py b/python/test_rpc_generated.py
index df5dc87232..15f8ab8ae6 100644
--- a/python/test_rpc_generated.py
+++ b/python/test_rpc_generated.py
@@ -2,6 +2,7 @@
 
 import inspect
 import json
+from datetime import timedelta
 from unittest.mock import AsyncMock, Mock
 
 import pytest
@@ -12,9 +13,11 @@
     CustomizationReloadOutcome,
     CustomizationReloadStatus,
     CustomizationReloadSubsystem,
+    UsageGetMetricsResult,
     register_client_global_api_handlers,
 )
 from copilot.rpc import (
+    AuthReadValue,
     BuiltinToolInputSchemaType,
     CommandsApi,
     CommandsInvokeRequest,
@@ -25,18 +28,79 @@
     MCPServerConfigHTTP,
     QueuedCommandHandled,
     QueuedCommandNotHandled,
+    QuotaWarningProjection,
     RemoteControlStatusOff,
     RemoteControlStatusResult,
     RemoteSessionMetadataValue,
     SandboxConfig,
     ServerRpc,
     SessionList,
+    SessionModelList,
+    SessionRpc,
     SlashCommandTextResult,
     TaskAgentInfo,
     UIElicitationSchemaType,
 )
 
 
+async def test_session_usage_get_metrics_deserializes_shared_event_type():
+    payload = {
+        "codeChanges": {
+            "filesModified": ["example.py"],
+            "filesModifiedCount": 1,
+            "linesAdded": 4,
+            "linesRemoved": 2,
+        },
+        "lastCallInputTokens": 12,
+        "lastCallOutputTokens": 7,
+        "modelMetrics": {},
+        "sessionStartTime": "2026-10-07T00:00:00Z",
+        "totalApiDurationMs": 125,
+        "totalPremiumRequestCost": 1.5,
+        "totalUserRequests": 2,
+        "aiCreditsStatus": "partial",
+    }
+    client = Mock(request=AsyncMock(return_value=payload))
+
+    result = await SessionRpc(client, "usage-session").usage.get_metrics(timeout=2.5)
+
+    assert isinstance(result, UsageGetMetricsResult)
+    assert result.code_changes.lines_added == 4
+    assert result.last_call_input_tokens == 12
+    assert result.total_user_requests == 2
+    assert result.session_start_time.isoformat() == "2026-10-07T00:00:00+00:00"
+    assert result.total_api_duration == timedelta(milliseconds=125)
+    assert result.ai_credits_status.value == "partial"
+    client.request.assert_awaited_once_with(
+        "session.usage.getMetrics", {"sessionId": "usage-session"}, timeout=2.5
+    )
+
+
+async def test_quota_warnings_deserialize_records_and_empty_lists():
+    payload = [
+        {
+            "warningType": "quota",
+            "message": "Usage is almost exhausted",
+            "url": "https://example.test",
+        },
+        {"warningType": "limit", "message": "A limit was reached"},
+    ]
+    client = Mock(request=AsyncMock(side_effect=[payload, []]))
+    api = SessionRpc(client, "quota-session").quota
+
+    warnings = await api.take_warnings()
+
+    assert all(isinstance(warning, QuotaWarningProjection) for warning in warnings)
+    assert [warning.warning_type for warning in warnings] == ["quota", "limit"]
+    assert warnings[0].message == payload[0]["message"]
+    assert warnings[0].url == payload[0]["url"]
+    assert warnings[1].url is None
+    assert [warning.to_dict() for warning in warnings] == payload
+    assert await api.take_warnings() == []
+    assert client.request.await_count == 2
+    client.request.assert_awaited_with("session.quota.takeWarnings", {"sessionId": "quota-session"})
+
+
 def test_customization_reload_outcome_preserves_future_enum_values():
     payload = {"status": "newStatus", "subsystem": "newSubsystem", "detail": "new component"}
     outcome = CustomizationReloadOutcome.from_dict(payload)
@@ -110,6 +174,77 @@ def test_mcp_oauth_scopes_preserve_existing_positional_parameters():
     assert config.oidc is True
 
 
+def test_auth_read_value_preserves_existing_positional_parameters():
+    assert list(inspect.signature(AuthReadValue).parameters) == [
+        "kind",
+        "account",
+        "status",
+        "errors",
+        "auth_info",
+    ]
+    payload = {
+        "kind": "activeAccount",
+        "authInfo": {"type": "user", "host": "https://github.com", "login": "octocat"},
+    }
+    result = AuthReadValue.from_dict(payload)
+    assert result.auth_info.login == "octocat"
+    assert result.status is None
+    assert result.errors is None
+    assert result.to_dict() == payload
+
+
+def test_model_list_preserves_existing_positional_parameters():
+    models = [{"id": "fixture-model"}]
+    prices = []
+    providers = []
+    quotas = {"premium": {"remaining": 42}}
+
+    result = SessionModelList(models, prices, providers, quotas)
+
+    assert result.list is models
+    assert result.auto is None
+    assert result.model_price_categories is prices
+    assert result.providers is providers
+    assert result.quota_snapshots is quotas
+    assert result.to_dict() == {
+        "list": models,
+        "modelPriceCategories": prices,
+        "providers": providers,
+        "quotaSnapshots": quotas,
+    }
+
+
+def test_model_list_round_trips_metadata_without_remapping_existing_fields():
+    payload = {
+        "list": [{"id": "fixture-model"}],
+        "modelPriceCategories": [],
+        "providers": [],
+        "quotaSnapshots": {"premium": {"remaining": 42}},
+        "auto": {
+            "defaultTier": "premium-v2",
+            "tiers": [
+                {
+                    "id": "premium-v2",
+                    "displayName": "Premium",
+                    "description": "Provider tier",
+                    "type": "auto",
+                    "status": {"enabled": True},
+                }
+            ],
+        },
+    }
+
+    result = SessionModelList.from_dict(payload)
+
+    assert result.auto is not None
+    assert result.auto.default_tier == "premium-v2"
+    assert result.auto.tiers[0].id == "premium-v2"
+    assert result.model_price_categories == []
+    assert result.providers == []
+    assert result.quota_snapshots == payload["quotaSnapshots"]
+    assert result.to_dict() == payload
+
+
 @pytest.mark.asyncio
 async def test_commands_invoke_deserializes_slash_command_result():
     client = AsyncMock()
diff --git a/python/test_session.py b/python/test_session.py
index b2a25f53dd..0b507db1b7 100644
--- a/python/test_session.py
+++ b/python/test_session.py
@@ -620,6 +620,109 @@ async def new_handler(_invocation):
         await asyncio.gather(replace, return_exceptions=True)
 
 
+@pytest.mark.asyncio
+async def test_set_tools_rejects_a_disconnected_session_without_sending():
+    client = Mock()
+    client.request = AsyncMock(return_value={})
+    session = CopilotSession("session-1", client)
+    session._mark_disconnected()
+
+    async def handler(_invocation):
+        return ToolResult(text_result_for_llm="new result")
+
+    with pytest.raises(RuntimeError, match="Session is disconnected"):
+        await session.set_tools([Tool("new_tool", "New", handler)])
+
+    client.request.assert_not_awaited()
+    assert session._tool_handlers == {}
+    assert not session._set_tools_lock.locked()
+
+
+@pytest.mark.asyncio
+async def test_set_tools_rejects_an_acknowledgement_after_disconnection():
+    rpc_started = asyncio.Event()
+    release_rpc = asyncio.Event()
+    client = Mock()
+
+    async def request(method, params):
+        assert method == "session.tools.set"
+        rpc_started.set()
+        await release_rpc.wait()
+        return {}
+
+    client.request = AsyncMock(side_effect=request)
+    session = CopilotSession("session-1", client)
+
+    async def handler(_invocation):
+        return ToolResult(text_result_for_llm="new result")
+
+    replacement = asyncio.create_task(session.set_tools([Tool("new_tool", "New", handler)]))
+    try:
+        await asyncio.wait_for(rpc_started.wait(), timeout=1)
+        session._mark_disconnected()
+        assert session._tool_handlers == {}
+        release_rpc.set()
+
+        with pytest.raises(RuntimeError, match="Session is disconnected"):
+            await asyncio.wait_for(replacement, timeout=1)
+
+        assert client.request.await_count == 1
+        assert session._tool_handlers == {}
+        assert not session._set_tools_lock.locked()
+    finally:
+        release_rpc.set()
+        replacement.cancel()
+        await asyncio.gather(replacement, return_exceptions=True)
+
+
+@pytest.mark.asyncio
+async def test_set_tools_rejects_a_queued_replacement_after_disconnection():
+    rpc_started = asyncio.Event()
+    release_rpc = asyncio.Event()
+    queued_started = asyncio.Event()
+    client = Mock()
+
+    async def request(method, params):
+        assert method == "session.tools.set"
+        rpc_started.set()
+        await release_rpc.wait()
+        return {}
+
+    client.request = AsyncMock(side_effect=request)
+    session = CopilotSession("session-1", client)
+
+    async def handler(_invocation):
+        return ToolResult(text_result_for_llm="new result")
+
+    async def replace_queued():
+        queued_started.set()
+        await session.set_tools([Tool("queued_tool", "Queued", handler)])
+
+    first = asyncio.create_task(session.set_tools([Tool("first_tool", "First", handler)]))
+    queued = None
+    try:
+        await asyncio.wait_for(rpc_started.wait(), timeout=1)
+        queued = asyncio.create_task(replace_queued())
+        await asyncio.wait_for(queued_started.wait(), timeout=1)
+        session._mark_disconnected()
+        release_rpc.set()
+        results = await asyncio.wait_for(
+            asyncio.gather(first, queued, return_exceptions=True), timeout=1
+        )
+
+        assert all(isinstance(result, RuntimeError) for result in results)
+        assert [str(result) for result in results] == ["Session is disconnected"] * 2
+        assert client.request.await_count == 1
+        assert session._tool_handlers == {}
+        assert not session._set_tools_lock.locked()
+    finally:
+        release_rpc.set()
+        pending = [first, queued] if queued is not None else [first]
+        for task in pending:
+            task.cancel()
+        await asyncio.gather(*pending, return_exceptions=True)
+
+
 @pytest.mark.asyncio
 async def test_set_tools_rejection_leaves_handlers_unchanged():
     client = Mock()
@@ -841,6 +944,52 @@ async def blocked_tool(_invocation):
     client.request.assert_not_awaited()
 
 
+@pytest.mark.asyncio
+async def test_tool_invocation_names_the_sub_agent_and_request_behind_the_call():
+    client = Mock()
+    client.request = AsyncMock()
+    session = CopilotSession("session-1", client)
+    invocations = []
+
+    def calc(invocation):
+        invocations.append(invocation)
+        return ToolResult(text_result_for_llm="ok")
+
+    session._register_tools([Tool("calc", "Calculates", calc)])
+    session._dispatch_event(
+        SessionEvent(
+            data=ExternalToolRequestedData(
+                request_id="req-sub-agent",
+                session_id="session-1",
+                tool_call_id="tc-sub-agent",
+                tool_name="calc",
+                arguments={},
+            ),
+            id=uuid4(),
+            timestamp=datetime.now(UTC),
+            type=SessionEventType.EXTERNAL_TOOL_REQUESTED,
+            agent_id="task-agent-1",
+        )
+    )
+    session._dispatch_event(_external_tool_request("calc", "req-root"))
+    blank_agent_request = _external_tool_request("calc", "req-blank-agent")
+    blank_agent_request.agent_id = ""
+    session._dispatch_event(blank_agent_request)
+    await _wait_for_tool_result(client, "req-sub-agent")
+    await _wait_for_tool_result(client, "req-root")
+    await _wait_for_tool_result(client, "req-blank-agent")
+
+    identities = sorted(
+        (invocation.tool_call_id, invocation.agent_id, invocation.request_id)
+        for invocation in invocations
+    )
+    assert identities == [
+        ("req-blank-agent-tool-call", None, "req-blank-agent"),
+        ("req-root-tool-call", None, "req-root"),
+        ("tc-sub-agent", "task-agent-1", "req-sub-agent"),
+    ]
+
+
 @pytest.mark.asyncio
 async def test_disconnect_from_tool_task_does_not_cancel_detach_request():
     client = Mock()
diff --git a/python/test_skill_provider.py b/python/test_skill_provider.py
new file mode 100644
index 0000000000..8d7208b5eb
--- /dev/null
+++ b/python/test_skill_provider.py
@@ -0,0 +1,673 @@
+"""Skill provider unit tests."""
+
+import asyncio
+import io
+import json
+from collections.abc import Awaitable, Callable
+from typing import Any
+from unittest.mock import AsyncMock, Mock
+
+import pytest
+
+from copilot import (
+    CloudSessionOptions,
+    CopilotClient,
+    RuntimeConnection,
+    SkillProvider,
+    SkillProviderDescriptor,
+)
+from copilot._jsonrpc import JsonRpcClient, JsonRpcError
+from copilot.session import CopilotSession
+
+
+class _SyncSkillProvider:
+    def __init__(
+        self,
+        *,
+        skills: list[SkillProviderDescriptor] | None = None,
+        markdown: dict[str, str | None] | None = None,
+    ) -> None:
+        self.skills = skills
+        self.markdown = markdown or {}
+        self.list_calls = 0
+        self.read_calls: list[str] = []
+
+    def list_skills(self) -> list[SkillProviderDescriptor] | None:
+        self.list_calls += 1
+        return self.skills
+
+    def read_skill(self, name: str) -> str | None:
+        self.read_calls.append(name)
+        return self.markdown.get(name)
+
+
+class _AsyncSkillProvider:
+    def __init__(
+        self,
+        *,
+        skills: list[SkillProviderDescriptor] | None = None,
+        markdown: dict[str, str | None] | None = None,
+    ) -> None:
+        self._sync = _SyncSkillProvider(skills=skills, markdown=markdown)
+
+    @property
+    def list_calls(self) -> int:
+        return self._sync.list_calls
+
+    @property
+    def read_calls(self) -> list[str]:
+        return self._sync.read_calls
+
+    async def list_skills(self) -> list[SkillProviderDescriptor] | None:
+        await asyncio.sleep(0)
+        return self._sync.list_skills()
+
+    async def read_skill(self, name: str) -> str | None:
+        await asyncio.sleep(0)
+        return self._sync.read_skill(name)
+
+
+class _FailingSkillProvider:
+    def list_skills(self) -> list[SkillProviderDescriptor]:
+        raise RuntimeError("secret-list-token")
+
+    def read_skill(self, name: str) -> str:
+        raise RuntimeError("secret-read-token")
+
+
+class _WriteOnlyProcess:
+    def __init__(self) -> None:
+        self.stdin = io.BytesIO()
+        self.stdout = io.BytesIO()
+        self.stderr = None
+
+    def poll(self) -> None:
+        return None
+
+
+def _descriptor(name: str, description: str = "Test skill") -> SkillProviderDescriptor:
+    return SkillProviderDescriptor(name=name, description=description)
+
+
+def _decode_jsonrpc_output(process: _WriteOnlyProcess) -> dict[str, Any]:
+    _header, payload = process.stdin.getvalue().split(b"\r\n\r\n", 1)
+    return json.loads(payload)
+
+
+async def _assert_no_provider_error(session: CopilotSession, provider: _SyncSkillProvider) -> None:
+    list_calls = provider.list_calls
+    read_calls = list(provider.read_calls)
+    with pytest.raises(JsonRpcError) as exc_info:
+        await session._handle_skill_provider_list()
+    assert exc_info.value.code == -32603
+    assert exc_info.value.message == f"No skill provider for session: {session.session_id}"
+    assert exc_info.value.data is None
+    assert provider.list_calls == list_calls
+    assert provider.read_calls == read_calls
+
+
+def _install_fake_client(
+    client: CopilotClient,
+    handler: Callable[[str, dict, dict[str, Any]], Awaitable[dict[str, Any]]],
+) -> None:
+    async def request(method: str, params: dict, **kwargs: Any) -> dict[str, Any]:
+        return await handler(method, params, kwargs)
+
+    client._client = Mock()
+    client._client.request = request
+
+
+async def _default_request(method: str, params: dict, kwargs: dict[str, Any]) -> dict[str, Any]:
+    if method == "session.create":
+        result = {"sessionId": params.get("sessionId") or "created-session", "workspacePath": None}
+        callback = kwargs.get("on_response_inline")
+        if callback is not None:
+            callback(result)
+        return result
+    if method == "session.resume":
+        return {"sessionId": params["sessionId"], "workspacePath": None}
+    if method == "session.options.update":
+        return {"success": True}
+    return {}
+
+
+def test_skill_provider_is_runtime_checkable_and_exported() -> None:
+    assert isinstance(_SyncSkillProvider(), SkillProvider)
+    assert SkillProviderDescriptor(name="demo", description="Demo").to_dict() == {
+        "description": "Demo",
+        "name": "demo",
+    }
+
+
+@pytest.mark.asyncio
+async def test_create_and_resume_send_skill_provider_flag_only_when_configured() -> None:
+    client = CopilotClient(connection=RuntimeConnection.for_uri("localhost:1234"))
+    captured: list[tuple[str, dict]] = []
+
+    async def request(method: str, params: dict, kwargs: dict[str, Any]) -> dict[str, Any]:
+        captured.append((method, dict(params)))
+        return await _default_request(method, params, kwargs)
+
+    _install_fake_client(client, request)
+    provider = _SyncSkillProvider(skills=[_descriptor("provided")])
+
+    await client.create_session(session_id="create-with-provider", skill_provider=provider)
+    await client.resume_session("resume-with-provider", skill_provider=provider)
+    await client.create_session(session_id="create-without-provider")
+    await client.resume_session("resume-without-provider")
+
+    payloads = {(method, params["sessionId"]): params for method, params in captured}
+    assert payloads[("session.create", "create-with-provider")]["hasSkillProvider"] is True
+    assert payloads[("session.resume", "resume-with-provider")]["hasSkillProvider"] is True
+    assert "hasSkillProvider" not in payloads[("session.create", "create-without-provider")]
+    assert "hasSkillProvider" not in payloads[("session.resume", "resume-without-provider")]
+
+
+@pytest.mark.asyncio
+async def test_empty_mode_keeps_skill_provider_dormant_by_default() -> None:
+    client = CopilotClient(connection=RuntimeConnection.for_uri("localhost:1234"), mode="empty")
+    captured: list[tuple[str, dict]] = []
+
+    async def request(method: str, params: dict, kwargs: dict[str, Any]) -> dict[str, Any]:
+        captured.append((method, dict(params)))
+        return await _default_request(method, params, kwargs)
+
+    _install_fake_client(client, request)
+    provider = _SyncSkillProvider(skills=[_descriptor("provided")])
+
+    await client.create_session(
+        session_id="empty-create",
+        available_tools=[],
+        skill_provider=provider,
+    )
+    await client.resume_session(
+        "empty-resume",
+        available_tools=[],
+        skill_provider=provider,
+    )
+
+    payloads = {(method, params["sessionId"]): params for method, params in captured}
+    assert payloads[("session.create", "empty-create")]["enableSkills"] is False
+    assert payloads[("session.resume", "empty-resume")]["enableSkills"] is False
+    assert payloads[("session.create", "empty-create")]["hasSkillProvider"] is True
+    assert payloads[("session.resume", "empty-resume")]["hasSkillProvider"] is True
+
+
+@pytest.mark.asyncio
+async def test_cloud_create_rejects_skill_provider_before_connecting() -> None:
+    client = CopilotClient(connection=RuntimeConnection.for_uri("localhost:1234"))
+    start_mock = AsyncMock()
+    setattr(client, "start", start_mock)
+    provider = _SyncSkillProvider(skills=[_descriptor("cloud")])
+
+    with pytest.raises(ValueError, match="Skill providers are not supported for cloud sessions\\."):
+        await client.create_session(
+            cloud=CloudSessionOptions(),
+            skill_provider=provider,
+        )
+
+    start_mock.assert_not_awaited()
+    assert provider.list_calls == 0
+    assert provider.read_calls == []
+
+
+@pytest.mark.asyncio
+async def test_early_skill_provider_callbacks_are_served_during_create_and_resume() -> None:
+    client = CopilotClient(connection=RuntimeConnection.for_uri("localhost:1234"))
+    observed: list[dict] = []
+    provider = _SyncSkillProvider(
+        skills=[_descriptor("early")],
+        markdown={"early": "early skill body"},
+    )
+
+    async def request(method: str, params: dict, kwargs: dict[str, Any]) -> dict[str, Any]:
+        if method in ("session.create", "session.resume"):
+            observed.append(
+                await client._handle_skill_provider_list({"sessionId": params["sessionId"]})
+            )
+            observed.append(
+                await client._handle_skill_provider_read(
+                    {"sessionId": params["sessionId"], "name": "early"}
+                )
+            )
+        return await _default_request(method, params, kwargs)
+
+    _install_fake_client(client, request)
+
+    await client.create_session(session_id="early-create", skill_provider=provider)
+    await client.resume_session("early-resume", skill_provider=provider)
+
+    assert observed == [
+        {"skills": [{"description": "Test skill", "name": "early"}]},
+        {"markdown": "early skill body"},
+        {"skills": [{"description": "Test skill", "name": "early"}]},
+        {"markdown": "early skill body"},
+    ]
+
+
+@pytest.mark.parametrize("provider_cls", [_SyncSkillProvider, _AsyncSkillProvider])
+@pytest.mark.asyncio
+async def test_skill_provider_dispatch_serializes_descriptors_and_reads_markdown(
+    provider_cls: type[_SyncSkillProvider] | type[_AsyncSkillProvider],
+) -> None:
+    client = CopilotClient(connection=RuntimeConnection.for_uri("localhost:1234"))
+    provider = provider_cls(
+        skills=[
+            _descriptor("alpha", "Alpha skill"),
+            SkillProviderDescriptor(
+                name="beta",
+                description="Beta skill",
+                argument_hint="ARG",
+                disable_model_invocation=True,
+                user_invocable=False,
+            ),
+        ],
+        markdown={"alpha": "# Alpha"},
+    )
+    session = CopilotSession("session-1", Mock())
+    session._register_skill_provider(provider)
+    client._sessions["session-1"] = session
+
+    listed = await client._handle_skill_provider_list({"sessionId": "session-1"})
+    read = await client._handle_skill_provider_read({"sessionId": "session-1", "name": "alpha"})
+
+    assert listed == {
+        "skills": [
+            {"description": "Alpha skill", "name": "alpha"},
+            {
+                "argumentHint": "ARG",
+                "description": "Beta skill",
+                "disableModelInvocation": True,
+                "name": "beta",
+                "userInvocable": False,
+            },
+        ]
+    }
+    assert read == {"markdown": "# Alpha"}
+
+
+@pytest.mark.asyncio
+async def test_skill_provider_null_list_becomes_empty_catalog() -> None:
+    session = CopilotSession("session-1", Mock())
+    session._register_skill_provider(_SyncSkillProvider(skills=None))
+
+    assert await session._handle_skill_provider_list() == {"skills": []}
+
+
+@pytest.mark.asyncio
+async def test_skill_provider_read_none_returns_null_markdown() -> None:
+    session = CopilotSession("session-1", Mock())
+    session._register_skill_provider(_SyncSkillProvider(markdown={"missing": None}))
+
+    assert await session._handle_skill_provider_read("missing") == {"markdown": None}
+
+
+@pytest.mark.asyncio
+async def test_skill_provider_failures_are_generic_and_do_not_leak_provider_errors() -> None:
+    session = CopilotSession("session-1", Mock())
+    session._register_skill_provider(_FailingSkillProvider())
+
+    with pytest.raises(JsonRpcError) as list_error:
+        await session._handle_skill_provider_list()
+    with pytest.raises(JsonRpcError) as read_error:
+        await session._handle_skill_provider_read("secret")
+
+    assert list_error.value.code == -32603
+    assert list_error.value.message == "Skill provider listSkills failed"
+    assert list_error.value.data is None
+    assert "secret-list-token" not in str(list_error.value)
+    assert read_error.value.code == -32603
+    assert read_error.value.message == "Skill provider readSkill failed"
+    assert read_error.value.data is None
+    assert "secret-read-token" not in str(read_error.value)
+
+
+@pytest.mark.asyncio
+async def test_skill_provider_failures_are_logged_with_session_id(
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    session = CopilotSession("session-1", Mock())
+    session._register_skill_provider(_FailingSkillProvider())
+
+    with caplog.at_level("WARNING", logger="copilot.session"):
+        with pytest.raises(JsonRpcError):
+            await session._handle_skill_provider_list()
+        with pytest.raises(JsonRpcError):
+            await session._handle_skill_provider_read("secret")
+
+    records = [r for r in caplog.records if r.getMessage().startswith("Skill provider")]
+    assert [r.getMessage() for r in records] == [
+        "Skill provider listSkills failed",
+        "Skill provider readSkill failed",
+    ]
+    assert all(getattr(r, "session_id", None) == "session-1" for r in records)
+    assert [str(r.exc_info[1]) for r in records if r.exc_info] == [
+        "secret-list-token",
+        "secret-read-token",
+    ]
+
+
+class _SelfCancellingSkillProvider:
+    async def list_skills(self) -> list[SkillProviderDescriptor]:
+        raise asyncio.CancelledError
+
+    async def read_skill(self, name: str) -> str:
+        raise asyncio.CancelledError
+
+
+@pytest.mark.asyncio
+async def test_skill_provider_cancelled_error_raised_by_provider_is_a_failure() -> None:
+    session = CopilotSession("session-1", Mock())
+    session._register_skill_provider(_SelfCancellingSkillProvider())
+
+    with pytest.raises(JsonRpcError) as list_error:
+        await session._handle_skill_provider_list()
+    with pytest.raises(JsonRpcError) as read_error:
+        await session._handle_skill_provider_read("cancelled")
+
+    assert list_error.value.message == "Skill provider listSkills failed"
+    assert read_error.value.message == "Skill provider readSkill failed"
+
+
+class _BlockingSkillProvider:
+    def __init__(self) -> None:
+        self.entered = asyncio.Event()
+
+    async def list_skills(self) -> list[SkillProviderDescriptor]:
+        self.entered.set()
+        await asyncio.Event().wait()
+        return []
+
+    async def read_skill(self, name: str) -> str:
+        return ""
+
+
+@pytest.mark.asyncio
+async def test_skill_provider_dispatch_cancellation_propagates() -> None:
+    session = CopilotSession("session-1", Mock())
+    provider = _BlockingSkillProvider()
+    session._register_skill_provider(provider)
+
+    task = asyncio.create_task(session._handle_skill_provider_list())
+    await provider.entered.wait()
+    task.cancel()
+
+    with pytest.raises(asyncio.CancelledError):
+        await task
+
+
+class _JsonRpcErrorSkillProvider:
+    def list_skills(self) -> list[SkillProviderDescriptor]:
+        raise JsonRpcError(-32000, "secret-list-token", data={"code": "provider_secret"})
+
+    def read_skill(self, name: str) -> str:
+        raise JsonRpcError(-32000, "secret-read-token", data={"code": "provider_secret"})
+
+
+@pytest.mark.asyncio
+async def test_skill_provider_json_rpc_errors_from_provider_are_not_forwarded() -> None:
+    session = CopilotSession("session-1", Mock())
+    session._register_skill_provider(_JsonRpcErrorSkillProvider())
+
+    with pytest.raises(JsonRpcError) as list_error:
+        await session._handle_skill_provider_list()
+    with pytest.raises(JsonRpcError) as read_error:
+        await session._handle_skill_provider_read("secret")
+
+    assert (list_error.value.code, list_error.value.message, list_error.value.data) == (
+        -32603,
+        "Skill provider listSkills failed",
+        None,
+    )
+    assert (read_error.value.code, read_error.value.message, read_error.value.data) == (
+        -32603,
+        "Skill provider readSkill failed",
+        None,
+    )
+
+
+@pytest.mark.asyncio
+async def test_skill_provider_unknown_session_and_no_provider_return_generic_errors() -> None:
+    client = CopilotClient(connection=RuntimeConnection.for_uri("localhost:1234"))
+
+    with pytest.raises(JsonRpcError) as unknown_error:
+        await client._handle_skill_provider_list({"sessionId": "missing-session"})
+    assert (unknown_error.value.code, unknown_error.value.message, unknown_error.value.data) == (
+        -32603,
+        "Session not found: missing-session",
+        None,
+    )
+
+    client._sessions["session-1"] = CopilotSession("session-1", Mock())
+    with pytest.raises(JsonRpcError) as no_provider_error:
+        await client._handle_skill_provider_read({"sessionId": "session-1", "name": "demo"})
+    assert (
+        no_provider_error.value.code,
+        no_provider_error.value.message,
+        no_provider_error.value.data,
+    ) == (
+        -32603,
+        "No skill provider for session: session-1",
+        None,
+    )
+
+
+@pytest.mark.parametrize("method", ["list", "read"])
+@pytest.mark.asyncio
+async def test_skill_provider_invalid_params_are_json_rpc_invalid_params(method: str) -> None:
+    client = CopilotClient(connection=RuntimeConnection.for_uri("localhost:1234"))
+    params = {"sessionId": "session-1"} if method == "read" else {}
+    handler = (
+        client._handle_skill_provider_read
+        if method == "read"
+        else client._handle_skill_provider_list
+    )
+
+    with pytest.raises(JsonRpcError) as exc_info:
+        await handler(params)
+
+    assert exc_info.value.code == -32602
+    assert exc_info.value.message == "Invalid params"
+    assert exc_info.value.data is None
+
+
+@pytest.mark.asyncio
+async def test_skill_provider_read_none_is_written_to_json_rpc_result() -> None:
+    sdk_client = CopilotClient(connection=RuntimeConnection.for_uri("localhost:1234"))
+    process = _WriteOnlyProcess()
+    rpc_client = JsonRpcClient(process)
+    sdk_client._client = rpc_client
+    sdk_client._register_session_scoped_request_handlers()
+    session = CopilotSession("session-1", rpc_client)
+    session._register_skill_provider(_SyncSkillProvider(markdown={"missing": None}))
+    sdk_client._sessions["session-1"] = session
+
+    await rpc_client._dispatch_request(
+        {
+            "jsonrpc": "2.0",
+            "id": 1,
+            "method": "skillProvider.read",
+            "params": {"sessionId": "session-1", "name": "missing"},
+        },
+        rpc_client.request_handlers["skillProvider.read"],
+        None,
+    )
+
+    response = _decode_jsonrpc_output(process)
+    assert response == {
+        "jsonrpc": "2.0",
+        "id": 1,
+        "result": {"markdown": None},
+    }
+
+
+@pytest.mark.parametrize("method", ["list", "read"])
+@pytest.mark.asyncio
+async def test_skill_provider_task_is_cancelled_by_runtime_cancel_request(
+    method: str, caplog: pytest.LogCaptureFixture
+) -> None:
+    entered = asyncio.Event()
+    cancelled = asyncio.Event()
+
+    class BlockingProvider:
+        async def _block(self) -> Any:
+            entered.set()
+            try:
+                await asyncio.Event().wait()
+            except asyncio.CancelledError:
+                cancelled.set()
+                raise
+
+        async def list_skills(self) -> list[SkillProviderDescriptor]:
+            return await self._block()
+
+        async def read_skill(self, name: str) -> str | None:
+            return await self._block()
+
+    sdk_client = CopilotClient(connection=RuntimeConnection.for_uri("localhost:1234"))
+    process = _WriteOnlyProcess()
+    rpc_client = JsonRpcClient(process)
+    rpc_client._loop = asyncio.get_running_loop()
+    sdk_client._client = rpc_client
+    sdk_client._register_session_scoped_request_handlers()
+    session = CopilotSession("session-1", rpc_client)
+    session._register_skill_provider(BlockingProvider())
+    sdk_client._sessions["session-1"] = session
+    params = {"sessionId": "session-1", "name": "demo"}
+
+    with caplog.at_level("WARNING", logger="copilot.session"):
+        rpc_client._handle_request(
+            {"jsonrpc": "2.0", "id": 7, "method": f"skillProvider.{method}", "params": params}
+        )
+        await asyncio.wait_for(entered.wait(), timeout=5)
+        rpc_client._handle_cancel_request({"id": 7})
+        await asyncio.wait_for(cancelled.wait(), timeout=5)
+        # The response is written before dispatch cleanup retires the cancellation entry.
+        async with asyncio.timeout(5):
+            while not process.stdin.getvalue() or 7 in rpc_client._incoming_request_cancellations:
+                await asyncio.sleep(0.01)
+
+    assert _decode_jsonrpc_output(process) == {
+        "jsonrpc": "2.0",
+        "id": 7,
+        "error": {"code": -32800, "message": "Request cancelled", "data": None},
+    }
+    assert not [r for r in caplog.records if r.getMessage().startswith("Skill provider")]
+    assert rpc_client._incoming_request_cancellations == {}
+
+
+@pytest.mark.parametrize("teardown", ["disconnect", "mark", "force_stop", "delete", "close"])
+@pytest.mark.asyncio
+async def test_skill_provider_is_cleared_on_teardown_paths(teardown: str) -> None:
+    provider = _SyncSkillProvider(skills=[_descriptor("demo")])
+    client = CopilotClient(connection=RuntimeConnection.for_uri("localhost:1234"))
+    session = CopilotSession("session-1", Mock())
+    session._register_skill_provider(provider)
+
+    if teardown == "disconnect":
+        session._client.request = AsyncMock(return_value={"success": True})
+        await session.disconnect()
+    elif teardown == "mark":
+        session._mark_disconnected()
+    elif teardown == "force_stop":
+        client._sessions["session-1"] = session
+        client._client = Mock()
+        client._client.stop = AsyncMock()
+        await client.force_stop()
+    elif teardown == "delete":
+        client._sessions["session-1"] = session
+        client._client = Mock()
+        client._client.request = AsyncMock(return_value={"success": True})
+        await client.delete_session("session-1")
+    else:
+        client._sessions["session-1"] = session
+        client._client = Mock(_loop=asyncio.get_running_loop())
+        client._handle_connection_close()
+        await asyncio.sleep(0)
+
+    await _assert_no_provider_error(session, provider)
+
+
+@pytest.mark.parametrize("operation", ["create", "resume"])
+@pytest.mark.asyncio
+async def test_skill_provider_is_cleared_after_failed_create_or_resume(operation: str) -> None:
+    client = CopilotClient(connection=RuntimeConnection.for_uri("localhost:1234"))
+    provider = _SyncSkillProvider(skills=[_descriptor("demo")])
+    captured_session: CopilotSession | None = None
+
+    async def request(method: str, params: dict, _kwargs: dict[str, Any]) -> dict[str, Any]:
+        nonlocal captured_session
+        if method == f"session.{operation}":
+            captured_session = client._sessions[params["sessionId"]]
+            raise RuntimeError("admission failed")
+        return {}
+
+    _install_fake_client(client, request)
+
+    with pytest.raises(RuntimeError, match="admission failed"):
+        if operation == "create":
+            await client.create_session(session_id="failed-session", skill_provider=provider)
+        else:
+            await client.resume_session("failed-session", skill_provider=provider)
+
+    assert "failed-session" not in client._sessions
+    assert captured_session is not None
+    await _assert_no_provider_error(captured_session, provider)
+
+
+@pytest.mark.asyncio
+async def test_failed_resume_restores_the_resident_skill_provider() -> None:
+    client = CopilotClient(connection=RuntimeConnection.for_uri("localhost:1234"))
+    resident = _SyncSkillProvider(skills=[_descriptor("demo")])
+    replacement = _SyncSkillProvider(skills=[_descriptor("demo")])
+
+    async def request(method: str, params: dict, kwargs: dict[str, Any]) -> dict[str, Any]:
+        if method == "session.resume":
+            raise RuntimeError("resume failed")
+        return await _default_request(method, params, kwargs)
+
+    _install_fake_client(client, request)
+    session = await client.create_session(session_id="session-1", skill_provider=resident)
+
+    with pytest.raises(RuntimeError, match="resume failed"):
+        await client.resume_session("session-1", skill_provider=replacement)
+
+    assert client._sessions["session-1"] is session
+    assert await client._handle_skill_provider_list({"sessionId": "session-1"}) == {
+        "skills": [{"name": "demo", "description": "Test skill"}]
+    }
+    assert (resident.list_calls, replacement.list_calls) == (1, 0)
+
+
+@pytest.mark.asyncio
+async def test_resume_rebinds_or_unbinds_skill_provider() -> None:
+    client = CopilotClient(connection=RuntimeConnection.for_uri("localhost:1234"))
+    provider_a = _SyncSkillProvider(
+        skills=[_descriptor("demo")],
+        markdown={"demo": "from A"},
+    )
+    provider_b = _SyncSkillProvider(
+        skills=[_descriptor("demo")],
+        markdown={"demo": "from B"},
+    )
+    _install_fake_client(client, _default_request)
+
+    session = CopilotSession("session-1", Mock())
+    session._register_skill_provider(provider_a)
+    client._sessions["session-1"] = session
+
+    await client.resume_session("session-1", skill_provider=provider_b)
+    assert await client._handle_skill_provider_read({"sessionId": "session-1", "name": "demo"}) == {
+        "markdown": "from B"
+    }
+    assert provider_a.read_calls == []
+
+    await client.resume_session("session-1")
+    with pytest.raises(JsonRpcError) as exc_info:
+        await client._handle_skill_provider_list({"sessionId": "session-1"})
+    assert (exc_info.value.code, exc_info.value.message, exc_info.value.data) == (
+        -32603,
+        "No skill provider for session: session-1",
+        None,
+    )
+    assert provider_b.list_calls == 0
diff --git a/rust/Cargo.lock b/rust/Cargo.lock
index 42b0f93e2c..74d6d98972 100644
--- a/rust/Cargo.lock
+++ b/rust/Cargo.lock
@@ -8,6 +8,41 @@ version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
 
+[[package]]
+name = "aead"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0"
+dependencies = [
+ "crypto-common",
+ "generic-array",
+]
+
+[[package]]
+name = "aes"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
+dependencies = [
+ "cfg-if",
+ "cipher",
+ "cpufeatures",
+]
+
+[[package]]
+name = "aes-gcm"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1"
+dependencies = [
+ "aead",
+ "aes",
+ "cipher",
+ "ctr",
+ "ghash",
+ "subtle",
+]
+
 [[package]]
 name = "aho-corasick"
 version = "1.1.5"
@@ -139,6 +174,41 @@ version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4e7648175b45a9a48536d676f68d918270699102aa8dab5496df06904c914600"
 
+[[package]]
+name = "chacha20"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818"
+dependencies = [
+ "cfg-if",
+ "cipher",
+ "cpufeatures",
+]
+
+[[package]]
+name = "chacha20poly1305"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35"
+dependencies = [
+ "aead",
+ "chacha20",
+ "cipher",
+ "poly1305",
+ "zeroize",
+]
+
+[[package]]
+name = "cipher"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
+dependencies = [
+ "crypto-common",
+ "inout",
+ "zeroize",
+]
+
 [[package]]
 name = "core-foundation"
 version = "0.10.1"
@@ -180,9 +250,44 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a"
 dependencies = [
  "generic-array",
+ "rand_core 0.6.4",
  "typenum",
 ]
 
+[[package]]
+name = "ctr"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835"
+dependencies = [
+ "cipher",
+]
+
+[[package]]
+name = "curve25519-dalek"
+version = "4.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "curve25519-dalek-derive",
+ "fiat-crypto",
+ "rustc_version",
+ "subtle",
+]
+
+[[package]]
+name = "curve25519-dalek-derive"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
 [[package]]
 name = "data-encoding"
 version = "2.11.1"
@@ -238,6 +343,7 @@ checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
  "block-buffer",
  "crypto-common",
+ "subtle",
 ]
 
 [[package]]
@@ -312,6 +418,12 @@ version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da7c62ceae207dd37ea5b845da6a0696c799f85e97da1ab5b7910be3c1c80223"
 
+[[package]]
+name = "fiat-crypto"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d"
+
 [[package]]
 name = "filetime"
 version = "0.2.29"
@@ -490,6 +602,16 @@ dependencies = [
  "r-efi 6.0.0",
 ]
 
+[[package]]
+name = "ghash"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1"
+dependencies = [
+ "opaque-debug",
+ "polyval",
+]
+
 [[package]]
 name = "github-copilot-sdk"
 version = "0.0.0-dev"
@@ -504,11 +626,13 @@ dependencies = [
  "flate2",
  "futures-util",
  "getrandom 0.4.3",
+ "hpke",
  "http",
  "indexmap",
  "libloading",
  "native-tls",
  "parking_lot",
+ "rand_core 0.6.4",
  "regex",
  "reqwest",
  "rusqlite",
@@ -576,6 +700,44 @@ dependencies = [
  "hashbrown 0.17.1",
 ]
 
+[[package]]
+name = "hkdf"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7"
+dependencies = [
+ "hmac",
+]
+
+[[package]]
+name = "hmac"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
+dependencies = [
+ "digest",
+]
+
+[[package]]
+name = "hpke"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4917627a14198c3603282c5158b815ad5534795451d3c074b53cf3cee0960b11"
+dependencies = [
+ "aead",
+ "aes-gcm",
+ "chacha20poly1305",
+ "digest",
+ "generic-array",
+ "hkdf",
+ "hmac",
+ "rand_core 0.6.4",
+ "sha2",
+ "subtle",
+ "x25519-dalek",
+ "zeroize",
+]
+
 [[package]]
 name = "http"
 version = "1.5.0"
@@ -806,6 +968,15 @@ dependencies = [
  "serde_core",
 ]
 
+[[package]]
+name = "inout"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01"
+dependencies = [
+ "generic-array",
+]
+
 [[package]]
 name = "ipnet"
 version = "2.12.2"
@@ -979,6 +1150,12 @@ version = "1.21.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
 
+[[package]]
+name = "opaque-debug"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
+
 [[package]]
 name = "openssl"
 version = "0.10.81"
@@ -1078,6 +1255,29 @@ version = "0.3.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f6b464fbc74e149a392436b17d523f769e057cb6877f6a5c4618bc6f11800548"
 
+[[package]]
+name = "poly1305"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf"
+dependencies = [
+ "cpufeatures",
+ "opaque-debug",
+ "universal-hash",
+]
+
+[[package]]
+name = "polyval"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "opaque-debug",
+ "universal-hash",
+]
+
 [[package]]
 name = "portable-atomic"
 version = "1.15.0"
@@ -1148,7 +1348,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b9ef1d0d795eb7d84685bca4f72f3649f064e6641543d3a8c415898726a57b41"
 dependencies = [
  "rand_chacha",
- "rand_core",
+ "rand_core 0.9.5",
 ]
 
 [[package]]
@@ -1158,7 +1358,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
 dependencies = [
  "ppv-lite86",
- "rand_core",
+ "rand_core 0.9.5",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom 0.2.17",
 ]
 
 [[package]]
@@ -1316,6 +1525,15 @@ dependencies = [
  "sqlite-wasm-rs",
 ]
 
+[[package]]
+name = "rustc_version"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
+dependencies = [
+ "semver",
+]
+
 [[package]]
 name = "rustix"
 version = "1.1.5"
@@ -1431,6 +1649,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "semver"
+version = "1.0.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd"
+
 [[package]]
 name = "serde"
 version = "1.0.229"
@@ -1960,6 +2184,16 @@ version = "1.0.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d245f478577f809a851594d02313b640fb437e0bb33866753cff937863096954"
 
+[[package]]
+name = "universal-hash"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea"
+dependencies = [
+ "crypto-common",
+ "subtle",
+]
+
 [[package]]
 name = "untrusted"
 version = "0.9.0"
@@ -2323,6 +2557,16 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3ad82d2a33cdc9674dc7465672f271e096168fcdbe0f799d9e6db8c5892679dc"
 
+[[package]]
+name = "x25519-dalek"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277"
+dependencies = [
+ "curve25519-dalek",
+ "rand_core 0.6.4",
+]
+
 [[package]]
 name = "xattr"
 version = "1.6.1"
@@ -2402,6 +2646,20 @@ name = "zeroize"
 version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e13c156562582aa81c60cb29407084cdb54c4164760106ab78e6c5b0858cf64e"
+dependencies = [
+ "zeroize_derive",
+]
+
+[[package]]
+name = "zeroize_derive"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c50655cbb0fe3fc43170059e702f1ce5e19b84cec58dc87b037a09935c2f328"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
 
 [[package]]
 name = "zerotrie"
diff --git a/rust/Cargo.toml b/rust/Cargo.toml
index f8d88de1c1..46b818bb61 100644
--- a/rust/Cargo.toml
+++ b/rust/Cargo.toml
@@ -81,14 +81,18 @@ tokio-tungstenite = { version = "0.28.0", default-features = false, features = [
 zip = { version = "7.2.0", default-features = false, features = ["deflate"], optional = true }
 windows-sys = { version = "0.61", default-features = false, features = [
     "Win32_Foundation",
-    "Win32_System_Diagnostics_ToolHelp",
+    "Win32_System_Diagnostics_Debug",
+    "Win32_System_Diagnostics_ProcessSnapshotting",
     "Win32_System_JobObjects",
+    "Win32_System_Kernel",
     "Win32_System_Threading",
 ] }
 
 [dev-dependencies]
 flate2 = "1"
+hpke = { version = "0.12", default-features = false, features = ["alloc", "x25519"] }
 native-tls = "0.2"
+rand_core = { version = "0.6", features = ["getrandom"] }
 ahp = { git = "https://github.com/microsoft/agent-host-protocol", tag = "rust/v0.9.0" }
 ahp-types = { git = "https://github.com/microsoft/agent-host-protocol", tag = "rust/v0.9.0" }
 ahp-ws = { git = "https://github.com/microsoft/agent-host-protocol", tag = "rust/v0.9.0", default-features = false }
@@ -154,6 +158,10 @@ bench = false
 [[test]]
 name = "prepared_session_test"
 required-features = ["test-support"]
+
+[[test]]
+name = "skill_provider_test"
+required-features = ["test-support"]
 [build-dependencies]
 dirs = "5"
 flate2 = "1"
diff --git a/rust/README.md b/rust/README.md
index 7b3d28cde6..f233c8b14e 100644
--- a/rust/README.md
+++ b/rust/README.md
@@ -124,6 +124,12 @@ Transport-specific phases are optional. For example, `port_wait_ms` is present
 only for TCP and `process_spawn_ms` is absent for external and in-process
 transports.
 
+On Windows, SDK-spawned CLI processes start suspended and are assigned to a
+private kill-on-close Job Object before their initial thread resumes. Thread
+lookup captures only that child's process snapshot, rather than enumerating
+machine-wide threads. The Job owns the CLI and its descendants until client
+shutdown or final-client drop, including abrupt termination of the SDK host.
+
 **`ClientOptions`:**
 
 | Field               | Type                        | Description                                                       |
@@ -177,7 +183,14 @@ The `on_exit` callback remains local-only. All hosting APIs are experimental.
 The returned `AhpHost` exposes `host_id` and optional `url`, `pid`, `token`, and
 `environment_id`. Mission Control-only hosting has no local URL; `environment_id`
 identifies its registration. Environment list/get/delete operations are available
-only through the generated `client.rpc().environments()` namespace.
+only through the generated `client.rpc().environments()` namespace. Call
+`host.list_sessions().await` to read the complete advertised catalog of live and
+dormant sessions.
+Use `AhpHostOptions::with_compute_id(...)` to reuse the durable catalog across
+local and Mission Control hosting; it must agree with the GitHub environment's
+`compute_id` when both are supplied. The runtime persists an omitted local-only
+identity. Publication survives host shutdown; dormant application sessions
+require your resume callback.
 `pid` is `None` for in-process listeners; `Some(pid)` preserves a separate host
 process ID returned by a legacy runtime, never the runtime PID. Stop the
 in-process listener with `dispose()`. There is no
@@ -264,8 +277,9 @@ owning client, subject to the same session identity and workspace checks.
 
 Only durable catalog entries marked as application-owned use this resume
 factory. Restoration fails if the callback is missing; it does not fall back
-to host-owned creation. Published resident sessions attach directly without invoking it or
-reconfiguring their current registrations. The SDK retains the exact returned
+to host-owned creation. Currently resident published sessions attach directly without invoking it or
+reconfiguring their current registrations. Dormant published application sessions
+require this callback to restore their tools and handlers. The SDK retains the exact returned
 `Arc` and applies the same cancellation, late completion, and release rules as
 fresh handoffs; it never automatically disconnects or destroys the result.
 
@@ -434,6 +448,59 @@ session
 session.disconnect().await?;
 ```
 
+#### Skill providers (experimental)
+
+Hosts can supply a session-scoped skill catalog and lazy markdown reader with
+`SkillProvider`. The provider is runtime-only: the SDK sends only
+`hasSkillProvider: true` on `session.create` / `session.resume`, and routes
+`skillProvider.list` and `skillProvider.read` callbacks back to the trait.
+
+```rust,no_run
+use std::sync::Arc;
+use async_trait::async_trait;
+use github_copilot_sdk::skill_provider::{SkillProvider, SkillProviderDescriptor};
+use github_copilot_sdk::{Client, ClientOptions, Error, SessionConfig};
+
+struct AppSkills;
+
+#[async_trait]
+impl SkillProvider for AppSkills {
+    async fn list_skills(
+        &self,
+    ) -> Result<Vec<SkillProviderDescriptor>, Error> {
+        Ok(vec![SkillProviderDescriptor {
+            name: "review".to_string(),
+            description: "Review the current change".to_string(),
+            ..Default::default()
+        }])
+    }
+
+    async fn read_skill(&self, name: &str) -> Result<Option<String>, Error> {
+        Ok((name == "review").then(|| "# Review\nInspect the diff carefully.".to_string()))
+    }
+}
+
+# async fn example() -> Result<(), Error> {
+let client = Client::start(ClientOptions::default()).await?;
+let session = client
+    .create_session(SessionConfig::default().with_skill_provider(Arc::new(AppSkills)))
+    .await?;
+# session.disconnect().await?;
+# client.stop().await.ok();
+# Ok(())
+# }
+```
+
+In `ClientMode::Empty`, built-in skill loading defaults to disabled; set
+`enable_skills` to `Some(true)` when the session should use provider-backed
+skills in that mode. Providers are not persisted, so re-supply one with
+`ResumeSessionConfig::with_skill_provider` on every resume. Cloud sessions do
+not support skill providers. Each callback is dispatched on its own spawned
+task, so provider implementations must be safe for concurrent calls. When the
+runtime cancels a call, for example after its 30-second limit or when the
+session disconnects, the SDK drops the provider future; await cancel-safe work
+so that dropping it stops the lookup.
+
 #### Typed RPC namespace
 
 High-level helpers are convenience wrappers over a fully-typed
@@ -1087,13 +1154,17 @@ while let Ok(event) = events.recv().await {
 
 When streaming is off (the default), only the final `assistant.message` and `assistant.reasoning` events fire. Delta events arrive in order; concatenating their `delta` text payloads reproduces the final message.
 
+After session shutdown or owner connection loss, `session.subscribe()` returns an immediately closed subscription: `recv()` reports `RecvErrorKind::Closed`, and stream iteration ends. Ordinary shutdown lets existing subscriptions drain already-published events. `Client::force_stop()` instead closes live and prepared subscriptions immediately and discards unread live and resume-bootstrap events, without waiting for producer shutdown. Retaining the `Session` does not retain the event producer or prevent its event loop from terminating.
+
+When the event loop retires, it also releases registered tool-handler captures, even if the application retains the `Session`. Tool replacements reject local admission and late acknowledgments after retirement. An already-admitted tool call retains its selected handler for its existing completion or cancellation path.
+
 #### Subscribing before the session starts
 
 `session.subscribe()` can only be called once the session exists. On create, events dispatched before a subscriber is installed are not delivered. Ephemeral events such as `session.idle` are not written to the session log either, so `get_messages` can't recover them afterwards.
 
 On resume with no active prepared subscriber, the SDK instead retains all routed startup events, durable and ephemeral, in an ordered bootstrap queue. The first `session.subscribe()` call claims that queue synchronously, even before the subscription is polled. It receives the complete prefix and any events dispatched while catching up, then atomically switches to bounded live delivery. Later subscribers receive newly dispatched live events immediately, even while the owner is draining.
 
-**The resume bootstrap is unbounded until its owner catches up.** Subscribe and drain promptly: a caller that never subscribes or cannot catch up can retain arbitrarily many events. Dropping the owner discards its unread backlog without transferring it to another subscriber. Stopping the session event loop releases an unclaimed backlog; a claimed backlog can still drain after shutdown without keeping the sender alive. This guarantee covers events routed to the session, not overflow in the bounded client-global notification router.
+**The resume bootstrap is unbounded until its owner catches up.** Subscribe and drain promptly: a caller that never subscribes or cannot catch up can retain arbitrarily many events. Dropping the owner discards its unread backlog without transferring it to another subscriber. Stopping the session event loop releases an unclaimed backlog; a claimed backlog can still drain after ordinary shutdown without keeping the sender alive. Client force-stop discards the backlog even after it has been claimed. This guarantee covers events routed to the session, not overflow in the bounded client-global notification router.
 
 For create and resume calls with a client-known session ID, the SDK starts its event loop before sending the RPC so it can answer session-scoped requests issued during startup. Cloud creates with a server-assigned ID register the loop after the response identifies the session.
 
diff --git a/rust/bazel/crates/BUILD.windows-sys-0.61.2.bazel b/rust/bazel/crates/BUILD.windows-sys-0.61.2.bazel
index f964882760..87b0fb6806 100644
--- a/rust/bazel/crates/BUILD.windows-sys-0.61.2.bazel
+++ b/rust/bazel/crates/BUILD.windows-sys-0.61.2.bazel
@@ -54,9 +54,11 @@ rust_library(
         "Win32_Storage_FileSystem",
         "Win32_System",
         "Win32_System_Diagnostics",
-        "Win32_System_Diagnostics_ToolHelp",
+        "Win32_System_Diagnostics_Debug",
+        "Win32_System_Diagnostics_ProcessSnapshotting",
         "Win32_System_IO",
         "Win32_System_JobObjects",
+        "Win32_System_Kernel",
         "Win32_System_LibraryLoader",
         "Win32_System_Memory",
         "Win32_System_Pipes",
diff --git a/rust/src/ahp_host.rs b/rust/src/ahp_host.rs
index 2b42b86ff0..5c906f605c 100644
--- a/rust/src/ahp_host.rs
+++ b/rust/src/ahp_host.rs
@@ -18,8 +18,9 @@ pub use crate::generated::api_types::HostExitReason as AhpHostExitReason;
 /// `Exited` means hosting-task failure, not runtime process death; `exit_code` is `None`.
 pub use crate::generated::api_types::HostExitedNotification as AhpHostExit;
 use crate::generated::api_types::{
-    HostDisposeRequest, HostPublishSessionRequest, HostPublishSessionResult,
-    HostSessionCreateCallback, HostSessionReleasedNotification, HostStartRequest, HostStartResult,
+    HostDisposeRequest, HostListSessionsRequest, HostListSessionsResult, HostPublishSessionRequest,
+    HostPublishSessionResult, HostSessionCreateCallback, HostSessionReleasedNotification,
+    HostStartOptions, HostStartResult,
 };
 use crate::session::Session;
 use crate::{
@@ -146,6 +147,9 @@ pub type AhpSessionReleasedCallback = Arc<dyn Fn(Arc<Session>) + Send + Sync>;
 #[derive(Clone, Default)]
 #[non_exhaustive]
 pub struct AhpHostOptions {
+    /// Stable durable catalog identity; defaults are runtime-owned.
+    /// Must agree with `github_environment.compute_id` when both are supplied.
+    pub compute_id: Option<String>,
     /// Experimental local WebSocket listener configuration.
     pub local_server: Option<crate::rpc::HostLocalServerOptions>,
     /// Experimental Mission Control registration; name and compute ID are required.
@@ -171,6 +175,7 @@ pub struct AhpHostOptions {
 impl std::fmt::Debug for AhpHostOptions {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         f.debug_struct("AhpHostOptions")
+            .field("compute_id", &self.compute_id)
             .field(
                 "local_server",
                 &self.local_server.as_ref().map(|_| "[configured]"),
@@ -190,6 +195,12 @@ impl AhpHostOptions {
         Self::default()
     }
 
+    /// Select the same durable catalog for local and Mission Control hosting.
+    pub fn with_compute_id(mut self, compute_id: impl Into<String>) -> Self {
+        self.compute_id = Some(compute_id.into());
+        self
+    }
+
     /// Enable the local WebSocket listener. Experimental; may change or be removed.
     pub fn with_local_server(mut self, options: crate::rpc::HostLocalServerOptions) -> Self {
         self.local_server = Some(options);
@@ -300,7 +311,7 @@ impl std::fmt::Debug for AhpHost {
 }
 
 impl AhpHost {
-    /// Publish a resident session already attached to this client until this listener stops.
+    /// Durably advertise an attached application session in the compute-scoped catalog.
     pub async fn publish_session(
         &self,
         session_id: impl Into<crate::SessionId>,
@@ -318,6 +329,20 @@ impl AhpHost {
             .await
     }
 
+    /// List all live and dormant catalog sessions advertised by this host.
+    pub async fn list_sessions(&self) -> Result<HostListSessionsResult, Error> {
+        let client = Client::from_inner(self.client.upgrade().ok_or_else(|| {
+            Error::from(ErrorKind::Protocol(ProtocolErrorKind::RequestCancelled))
+        })?);
+        client
+            .rpc()
+            .host()
+            .list_sessions(HostListSessionsRequest {
+                host_id: Some(self.host_id.clone()),
+            })
+            .await
+    }
+
     /// Forward `host.dispose` to the runtime.
     ///
     /// Every call makes its own RPC, including repeated and concurrent calls.
@@ -434,15 +459,25 @@ impl Client {
                 },
             );
         }
+        let mut start_options = HostStartOptions::new(host_id);
+        if let Some(compute_id) = options.compute_id {
+            start_options = start_options.compute_id(compute_id);
+        }
+        if let Some(local_server) = options.local_server {
+            start_options = start_options.local_server(local_server);
+        }
+        if let Some(github_environment) = options.github_environment {
+            start_options = start_options.github_environment(github_environment);
+        }
+        if let Some(session_factory) = session_factory {
+            start_options = start_options.session_factory(session_factory);
+        }
+        if let Some(resume_factory) = resume_factory {
+            start_options = start_options.resume_factory(resume_factory);
+        }
         let request = self.inner.rpc.send_request_with_inline_callback(
             "host.start",
-            Some(serde_json::to_value(HostStartRequest {
-                host_id,
-                local_server: options.local_server,
-                github_environment: options.github_environment,
-                session_factory,
-                resume_factory,
-            })?),
+            Some(serde_json::to_value(start_options)?),
             None,
         );
         pending.start = Some(tokio::spawn(async move {
@@ -901,6 +936,8 @@ macro_rules! host_settings {
             "memory" => memory,
             "pluginDirectories" => plugin_directories,
             "skillDirectories" => skill_directories,
+            "agentDirectories" => agent_directories,
+            "hookDirectories" => hook_directories,
             "instructionDirectories" => instruction_directories,
             "enableMcpApps" => enable_mcp_apps,
             "model" => model,
@@ -917,6 +954,7 @@ fn config_from_host(settings: &HashMap<String, Value>) -> Result<SessionConfig,
                         for (key, value) in settings {
                             match key.as_str() {
                                 "sessionId" => config.session_id = serde_json::from_value(value.clone())?,
+                                "refreshCustomInstructions" => config.refresh_custom_instructions = serde_json::from_value(value.clone())?,
                                 $($name => config.$field = serde_json::from_value(value.clone())?,)*
                                 _ => return Err(handoff_error("Unsupported AHP session configuration setting")),
                             }
@@ -932,6 +970,9 @@ pub(crate) fn config_for_host(config: &SessionConfig) -> Result<Value, Error> {
     if let Some(id) = &config.session_id {
         settings.insert("sessionId".into(), serde_json::to_value(id)?);
     }
+    if let Some(refresh) = config.refresh_custom_instructions {
+        settings.insert("refreshCustomInstructions".into(), Value::Bool(refresh));
+    }
     macro_rules! encode {
                     ($($name:literal => $field:ident,)*) => {
                         $(if let Some(value) = &config.$field {
diff --git a/rust/src/ahp_host/factory_tests.rs b/rust/src/ahp_host/factory_tests.rs
index c5140f72f5..a4b9cf3751 100644
--- a/rust/src/ahp_host/factory_tests.rs
+++ b/rust/src/ahp_host/factory_tests.rs
@@ -186,7 +186,10 @@ async fn resume_rejects_superseded_retained_original() {
     assert_eq!(reload["method"], "session.skills.reload");
     peer.respond(&reload, json!({})).await;
     let current = timeout(TIMEOUT, resuming).await.unwrap().unwrap().unwrap();
-    assert!(!original.cancellation_token().is_cancelled());
+    let original_retired = original.cancellation_token();
+    timeout(TIMEOUT, original_retired.cancelled())
+        .await
+        .unwrap();
     let retained = original.clone();
     let (released_tx, mut resumed_released) = mpsc::unbounded_channel();
     let pending = start(
@@ -212,6 +215,13 @@ async fn resume_rejects_superseded_retained_original() {
     let response = peer.request().await;
     assert_eq!(response["id"], 901);
     assert!(response.get("error").is_some());
+    assert!(
+        response["error"]["message"]
+            .as_str()
+            .unwrap()
+            .contains("AHP callback must return the requested session from this client"),
+        "{response}"
+    );
     assert!(Arc::ptr_eq(
         &original,
         &receive(&mut resumed_released).await
@@ -576,6 +586,35 @@ async fn failed_and_cancelled_start_remove_factory() {
     }
 }
 
+#[test]
+fn host_create_refresh_custom_instructions_round_trips_without_widening_resume() {
+    for refresh in [None, Some(false), Some(true)] {
+        let mut value = json!({"sessionId": "refresh-instructions"});
+        if let Some(refresh) = refresh {
+            value["refreshCustomInstructions"] = json!(refresh);
+        }
+        let settings = serde_json::from_value(value.clone()).unwrap();
+        let config = config_from_host(&settings).unwrap();
+        assert_eq!(config.refresh_custom_instructions, refresh);
+        assert_eq!(config_for_host(&config).unwrap(), value);
+        if refresh.is_some() {
+            assert!(resume_config_from_host(&settings).is_err());
+        } else {
+            assert!(resume_config_from_host(&settings).is_ok());
+        }
+    }
+}
+
+#[test]
+fn host_create_refresh_custom_instructions_rejects_invalid_and_unknown_settings() {
+    for value in [
+        json!({"sessionId": "id", "refreshCustomInstructions": "true"}),
+        json!({"sessionId": "id", "refreshCustomInstructions": true, "unknown": true}),
+    ] {
+        assert!(config_from_host(&serde_json::from_value(value).unwrap()).is_err());
+    }
+}
+
 #[test]
 fn host_settings_round_trip_without_callbacks_or_losing_constraints() {
     let value = json!({
@@ -590,6 +629,7 @@ fn host_settings_round_trip_without_callbacks_or_losing_constraints() {
         "customAgentsLocalOnly": true, "coauthorEnabled": false, "manageScheduleEnabled": false,
         "memory": {"enabled":false}, "pluginDirectories": ["/plugins"],
         "skillDirectories": ["/skills"], "instructionDirectories": ["/instructions"],
+        "agentDirectories": ["relative-agents"], "hookDirectories": [],
         "enableMcpApps": true, "model":"model", "reasoningEffort":"high", "contextTier":"long_context"
     });
     let config = config_from_host(&serde_json::from_value(value.clone()).unwrap()).unwrap();
diff --git a/rust/src/ahp_host/tests.rs b/rust/src/ahp_host/tests.rs
index 90f7ed55df..90d5444fdd 100644
--- a/rust/src/ahp_host/tests.rs
+++ b/rust/src/ahp_host/tests.rs
@@ -127,10 +127,12 @@ async fn requires_an_explicit_transport() {
 async fn github_and_combined_transports_preserve_optional_results() {
     for local in [false, true] {
         let (client, mut peer) = fixture();
-        let mut options =
-            AhpHostOptions::new().with_github_environment(HostGitHubEnvironmentOptions {
+        let mut options = AhpHostOptions::new()
+            .with_compute_id("compute")
+            .with_github_environment(HostGitHubEnvironmentOptions {
                 name: "SDK host".into(),
                 compute_id: "compute".into(),
+                require_connection_binding: Some(local),
             });
         if local {
             options = options.with_local_server(Default::default());
@@ -139,7 +141,8 @@ async fn github_and_combined_transports_preserve_optional_results() {
         let request = peer.request().await;
         let mut expected = json!({
             "hostId": request["params"]["hostId"],
-            "githubEnvironment": {"name": "SDK host", "computeId": "compute"}
+            "computeId": "compute",
+            "githubEnvironment": {"name": "SDK host", "computeId": "compute", "requireConnectionBinding": local}
         });
         let mut result = json!({
             "hostId": request["params"]["hostId"],
@@ -159,6 +162,16 @@ async fn github_and_combined_transports_preserve_optional_results() {
     }
 }
 
+#[tokio::test]
+async fn explicit_local_compute_identity_is_forwarded() {
+    let (client, mut peer) = fixture();
+    let pending = start(&client, local_options().with_compute_id("local-compute"));
+    let request = peer.request().await;
+    assert_eq!(request["params"]["computeId"], "local-compute");
+    peer.started(&request, None).await;
+    assert!(pending.await.unwrap().is_ok());
+}
+
 #[tokio::test]
 async fn forwards_only_generated_options_and_returns_runtime_fields() {
     let (client, mut peer) = fixture();
@@ -266,6 +279,23 @@ async fn publication_forwards_existing_identity_to_the_owning_listener() {
     assert_eq!(result.session_uri, "copilot:/resident");
 }
 
+#[tokio::test]
+async fn list_sessions_forwards_the_owning_host_and_returns_the_catalog() {
+    let (client, mut peer) = fixture();
+    let pending = start(&client, local_options());
+    let request = peer.request().await;
+    peer.started(&request, None).await;
+    let host = pending.await.unwrap().unwrap();
+    let host_id = host.host_id.clone();
+    let listing = tokio::spawn(async move { host.list_sessions().await });
+    let request = peer.request().await;
+    assert_eq!(request["method"], "host.listSessions");
+    assert_eq!(request["params"], json!({"hostId": host_id}));
+    peer.respond(&request, json!({"sessions": []})).await;
+    let result = listing.await.unwrap().unwrap();
+    assert!(result.sessions.is_empty());
+}
+
 #[tokio::test]
 async fn listener_validation_is_left_to_the_runtime() {
     let (client, mut peer) = fixture();
diff --git a/rust/src/copilot_request_handler.rs b/rust/src/copilot_request_handler.rs
index 381acac0d2..c0dec20a97 100644
--- a/rust/src/copilot_request_handler.rs
+++ b/rust/src/copilot_request_handler.rs
@@ -718,7 +718,13 @@ impl CopilotRequestExchange {
         let mut buf = Vec::new();
         let mut rx = self.body_rx.lock().await;
         while let Some(frame) = rx.recv().await {
-            buf.extend_from_slice(&frame);
+            // The first frame becomes the buffer, so a body sent as one chunk (the runtime sends
+            // every HTTP request body so) reaches the handler without a copy.
+            if buf.is_empty() {
+                buf = frame;
+            } else {
+                buf.extend_from_slice(&frame);
+            }
         }
         buf
     }
@@ -1114,7 +1120,8 @@ impl CopilotRequestDispatcher {
 
     async fn handle_start(self: &Arc<Self>, request: JsonRpcRequest) {
         let id = request.id;
-        let Some(params) = parse_params::<LlmInferenceHttpRequestStartRequest>(&request) else {
+        let Some(params) = parse_params::<LlmInferenceHttpRequestStartRequest>(request.params)
+        else {
             self.send_error(id, "invalid llmInference.httpRequestStart params")
                 .await;
             return;
@@ -1140,7 +1147,8 @@ impl CopilotRequestDispatcher {
 
     async fn handle_chunk(&self, request: JsonRpcRequest) {
         let id = request.id;
-        let Some(params) = parse_params::<LlmInferenceHttpRequestChunkRequest>(&request) else {
+        let Some(params) = parse_params::<LlmInferenceHttpRequestChunkRequest>(request.params)
+        else {
             self.send_error(id, "invalid llmInference.httpRequestChunk params")
                 .await;
             return;
@@ -1149,7 +1157,7 @@ impl CopilotRequestDispatcher {
         // May arrive before the matching start frame; get-or-create so the body
         // is buffered, never lost.
         let exchange = self.get_or_create_exchange(params.request_id.to_string());
-        apply_chunk(&exchange, &params);
+        apply_chunk(&exchange, params);
 
         self.ack(id).await;
     }
@@ -1193,7 +1201,7 @@ impl CopilotRequestDispatcher {
 
 /// Apply one body chunk to a pending request: route data into the body stream,
 /// or terminate it on `end` / `cancel`.
-fn apply_chunk(exchange: &CopilotRequestExchange, params: &LlmInferenceHttpRequestChunkRequest) {
+fn apply_chunk(exchange: &CopilotRequestExchange, params: LlmInferenceHttpRequestChunkRequest) {
     if params.cancel == Some(true) {
         exchange.push_cancel();
         return;
@@ -1209,7 +1217,7 @@ fn apply_chunk(exchange: &CopilotRequestExchange, params: &LlmInferenceHttpReque
                 }
             }
         } else {
-            params.data.clone().into_bytes()
+            params.data.into_bytes()
         };
         exchange.push_chunk(decoded);
     }
@@ -1219,11 +1227,10 @@ fn apply_chunk(exchange: &CopilotRequestExchange, params: &LlmInferenceHttpReque
     }
 }
 
-fn parse_params<T: serde::de::DeserializeOwned>(request: &JsonRpcRequest) -> Option<T> {
-    request
-        .params
-        .as_ref()
-        .and_then(|p| serde_json::from_value(p.clone()).ok())
+/// Deserialize a request's params by value, so their strings (the request body among them) move
+/// into `T`: deserializing from a borrow deep-clones the whole `Value` first.
+fn parse_params<T: serde::de::DeserializeOwned>(params: Option<serde_json::Value>) -> Option<T> {
+    params.and_then(|p| serde_json::from_value(p).ok())
 }
 
 /// Convert a wire header map into an [`http::HeaderMap`], skipping any entry the
diff --git a/rust/src/ffi.rs b/rust/src/ffi.rs
index df0269b0b8..3d7bbf4401 100644
--- a/rust/src/ffi.rs
+++ b/rust/src/ffi.rs
@@ -245,6 +245,7 @@ impl AsyncWrite for FfiWriter {
 pub(crate) struct FfiHost {
     library_path: PathBuf,
     cli_entrypoint: Option<PathBuf>,
+    integration_id: Option<String>,
     environment: Vec<(String, String)>,
     args: Vec<String>,
     host_start: HostStartFn,
@@ -263,6 +264,7 @@ impl FfiHost {
     pub(crate) fn create(
         runtime_entrypoint: &Path,
         cli_entrypoint: Option<&Path>,
+        integration_id: Option<&str>,
         environment: Vec<(String, String)>,
         args: Vec<String>,
     ) -> Result<Self, Error> {
@@ -307,6 +309,7 @@ impl FfiHost {
         Ok(Self {
             library_path,
             cli_entrypoint,
+            integration_id: integration_id.map(str::to_owned),
             environment,
             args,
             host_start,
@@ -330,7 +333,11 @@ impl FfiHost {
     }
 
     fn start_blocking(self) -> Result<(FfiReader, FfiWriter, Arc<FfiShared>), Error> {
-        let argv = build_argv_json(self.cli_entrypoint.as_deref(), &self.args);
+        let argv = build_argv_json(
+            self.cli_entrypoint.as_deref(),
+            self.integration_id.as_deref(),
+            &self.args,
+        );
         let env = build_env_json(&self.environment);
 
         let (env_ptr, env_len) = match &env {
@@ -561,7 +568,11 @@ fn path_for_child_process(path: PathBuf) -> PathBuf {
     path
 }
 
-fn build_argv_json(entrypoint: Option<&Path>, extra_args: &[String]) -> Vec<u8> {
+fn build_argv_json(
+    entrypoint: Option<&Path>,
+    integration_id: Option<&str>,
+    extra_args: &[String],
+) -> Vec<u8> {
     let mut argv = Vec::new();
     if let Some(entrypoint) = entrypoint {
         let entrypoint_str = entrypoint.to_string_lossy().into_owned();
@@ -578,6 +589,9 @@ fn build_argv_json(entrypoint: Option<&Path>, extra_args: &[String]) -> Vec<u8>
             "--no-auto-update".to_string(),
         ]);
     }
+    if let Some(integration_id) = integration_id {
+        argv.push(format!("--cli-login-sync-integration-id={integration_id}"));
+    }
     argv.extend_from_slice(extra_args);
     serde_json::to_vec(&argv).expect("argv serializes")
 }
diff --git a/rust/src/ffi/tests.rs b/rust/src/ffi/tests.rs
index 5662dc4e5b..5fbd0929fc 100644
--- a/rust/src/ffi/tests.rs
+++ b/rust/src/ffi/tests.rs
@@ -36,6 +36,7 @@ unsafe extern "C" fn test_connection_close(_connection_id: u32) -> bool {
 #[test]
 fn argv_without_entrypoint_contains_only_client_options() {
     let argv: Vec<String> = serde_json::from_slice(&build_argv_json(
+        None,
         None,
         &["--log-level".into(), "debug".into()],
     ))
@@ -46,12 +47,22 @@ fn argv_without_entrypoint_contains_only_client_options() {
 
 #[test]
 fn explicit_javascript_entrypoint_uses_node() {
-    let argv: Vec<String> =
-        serde_json::from_slice(&build_argv_json(Some(Path::new("index.js")), &[])).unwrap();
+    let argv: Vec<String> = serde_json::from_slice(&build_argv_json(
+        Some(Path::new("index.js")),
+        Some("microsoft/vscode"),
+        &[],
+    ))
+    .unwrap();
 
     assert_eq!(
         argv,
-        ["node", "index.js", "--embedded-host", "--no-auto-update"]
+        [
+            "node",
+            "index.js",
+            "--embedded-host",
+            "--no-auto-update",
+            "--cli-login-sync-integration-id=microsoft/vscode",
+        ]
     );
 }
 
diff --git a/rust/src/generated/api_types.rs b/rust/src/generated/api_types.rs
index 3532793c48..823e5055a0 100644
--- a/rust/src/generated/api_types.rs
+++ b/rust/src/generated/api_types.rs
@@ -11,17 +11,182 @@ use serde::{Deserialize, Serialize};
 
 pub use super::session_events::{
     AbortReason, AgentModelPolicy, AutoTier, ContextTier, IndexedSearchState,
-    ManagedSettingsResolvedSource, McpOauthHttpResponse, McpOauthWWWAuthenticateParams,
-    McpServerMetadata, McpServerSource, McpServerStatus, ModelChangeSource,
-    OmittedBinaryOmittedReason, PermissionDecisionSource, PermissionMode, PermissionPromptRequest,
-    PermissionRule, ReasoningSummary, RemediationAction, SessionLimitsConfig, SessionMode,
-    ShutdownType, SkillSource, TaskBlocker, TaskCompletionOutcome, UserToolSessionApproval,
-    Verbosity,
+    ManagedPermissionsContext, ManagedSettingsResolvedSource, McpOauthHttpResponse,
+    McpOauthWWWAuthenticateParams, McpServerMetadata, McpServerSource, McpServerStatus,
+    ModelChangeSource, ModelProviderKind, ModelProviderRef, OmittedBinaryOmittedReason,
+    PermissionDecisionSource, PermissionMode, PermissionPromptRequest, PermissionRule,
+    ProviderQuotaState, ReasoningSummary, RemediationAction, SessionLimitsConfig, SessionMode,
+    ShutdownType, SkillSource, TaskBlocker, TaskCompletionOutcome, UsageGetMetricsResult,
+    UserToolSessionApproval, Verbosity,
 };
 use crate::types::{RequestId, SessionEvent, SessionId};
 
 /// JSON-RPC method name constants.
 pub mod rpc_methods {
+    /// `sandbox.proxyCa.checkInstallationSupport`
+    pub const SANDBOX_PROXYCA_CHECKINSTALLATIONSUPPORT: &str =
+        "sandbox.proxyCa.checkInstallationSupport";
+    /// `sandbox.proxyCa.checkRelevance`
+    pub const SANDBOX_PROXYCA_CHECKRELEVANCE: &str = "sandbox.proxyCa.checkRelevance";
+    /// `sandbox.proxyCa.getStatus`
+    pub const SANDBOX_PROXYCA_GETSTATUS: &str = "sandbox.proxyCa.getStatus";
+    /// `sandbox.proxyCa.create`
+    pub const SANDBOX_PROXYCA_CREATE: &str = "sandbox.proxyCa.create";
+    /// `sandbox.proxyCa.rotate`
+    pub const SANDBOX_PROXYCA_ROTATE: &str = "sandbox.proxyCa.rotate";
+    /// `sandbox.proxyCa.trust`
+    pub const SANDBOX_PROXYCA_TRUST: &str = "sandbox.proxyCa.trust";
+    /// `sandbox.proxyCa.remove`
+    pub const SANDBOX_PROXYCA_REMOVE: &str = "sandbox.proxyCa.remove";
+    /// `sandbox.proxySecret.getLocation`
+    pub const SANDBOX_PROXYSECRET_GETLOCATION: &str = "sandbox.proxySecret.getLocation";
+    /// `sandbox.proxySecret.get`
+    pub const SANDBOX_PROXYSECRET_GET: &str = "sandbox.proxySecret.get";
+    /// `sandbox.proxySecret.save`
+    pub const SANDBOX_PROXYSECRET_SAVE: &str = "sandbox.proxySecret.save";
+    /// `sandbox.proxySecret.delete`
+    pub const SANDBOX_PROXYSECRET_DELETE: &str = "sandbox.proxySecret.delete";
+    /// `sandbox.settings.applyDefaults`
+    pub const SANDBOX_SETTINGS_APPLYDEFAULTS: &str = "sandbox.settings.applyDefaults";
+    /// `sandbox.resolveFlooredConfig`
+    pub const SANDBOX_RESOLVEFLOOREDCONFIG: &str = "sandbox.resolveFlooredConfig";
+    /// `sandbox.preparePickerPolicy`
+    pub const SANDBOX_PREPAREPICKERPOLICY: &str = "sandbox.preparePickerPolicy";
+    /// `sandbox.filterPickerCandidates`
+    pub const SANDBOX_FILTERPICKERCANDIDATES: &str = "sandbox.filterPickerCandidates";
+    /// `sandbox.resolveForOptional`
+    pub const SANDBOX_RESOLVEFOROPTIONAL: &str = "sandbox.resolveForOptional";
+    /// `sandbox.checkPlatformSupport`
+    pub const SANDBOX_CHECKPLATFORMSUPPORT: &str = "sandbox.checkPlatformSupport";
+    /// `sandbox.checkWindowsHostLoopbackSupport`
+    pub const SANDBOX_CHECKWINDOWSHOSTLOOPBACKSUPPORT: &str =
+        "sandbox.checkWindowsHostLoopbackSupport";
+    /// `sandbox.getUnsupportedMessage`
+    pub const SANDBOX_GETUNSUPPORTEDMESSAGE: &str = "sandbox.getUnsupportedMessage";
+    /// `sandbox.getUnsupportedSettingDisabledNotice`
+    pub const SANDBOX_GETUNSUPPORTEDSETTINGDISABLEDNOTICE: &str =
+        "sandbox.getUnsupportedSettingDisabledNotice";
+    /// `sandbox.getUnsupportedStartupNotice`
+    pub const SANDBOX_GETUNSUPPORTEDSTARTUPNOTICE: &str = "sandbox.getUnsupportedStartupNotice";
+    /// `sandbox.checkEnforcementCommand`
+    pub const SANDBOX_CHECKENFORCEMENTCOMMAND: &str = "sandbox.checkEnforcementCommand";
+    /// `sandbox.getDocsUrl`
+    pub const SANDBOX_GETDOCSURL: &str = "sandbox.getDocsUrl";
+    /// `sandbox.getHostSupport`
+    pub const SANDBOX_GETHOSTSUPPORT: &str = "sandbox.getHostSupport";
+    /// `persistence.writeRawJsonLocked`
+    pub const PERSISTENCE_WRITERAWJSONLOCKED: &str = "persistence.writeRawJsonLocked";
+    /// `user.settings.setHookDisabled`
+    pub const USER_SETTINGS_SETHOOKDISABLED: &str = "user.settings.setHookDisabled";
+    /// `user.settings.loadForConfigDir`
+    pub const USER_SETTINGS_LOADFORCONFIGDIR: &str = "user.settings.loadForConfigDir";
+    /// `user.settings.loadRepo`
+    pub const USER_SETTINGS_LOADREPO: &str = "user.settings.loadRepo";
+    /// `user.settings.loadAndMergeRepo`
+    pub const USER_SETTINGS_LOADANDMERGEREPO: &str = "user.settings.loadAndMergeRepo";
+    /// `user.settings.getPath`
+    pub const USER_SETTINGS_GETPATH: &str = "user.settings.getPath";
+    /// `user.settings.loadWithWarning`
+    pub const USER_SETTINGS_LOADWITHWARNING: &str = "user.settings.loadWithWarning";
+    /// `user.settings.mergeManagedAndUser`
+    pub const USER_SETTINGS_MERGEMANAGEDANDUSER: &str = "user.settings.mergeManagedAndUser";
+    /// `user.settings.mergeRepoValue`
+    pub const USER_SETTINGS_MERGEREPOVALUE: &str = "user.settings.mergeRepoValue";
+    /// `user.settings.migrateStaffUpdateChannelOnce`
+    pub const USER_SETTINGS_MIGRATESTAFFUPDATECHANNELONCE: &str =
+        "user.settings.migrateStaffUpdateChannelOnce";
+    /// `user.settings.resetStaffModelSelectionOnce`
+    pub const USER_SETTINGS_RESETSTAFFMODELSELECTIONONCE: &str =
+        "user.settings.resetStaffModelSelectionOnce";
+    /// `user.settings.getUnknownKeysWarning`
+    pub const USER_SETTINGS_GETUNKNOWNKEYSWARNING: &str = "user.settings.getUnknownKeysWarning";
+    /// `user.settings.buildRuntime`
+    pub const USER_SETTINGS_BUILDRUNTIME: &str = "user.settings.buildRuntime";
+    /// `user.settings.migrateStaffLogLevelOnce`
+    pub const USER_SETTINGS_MIGRATESTAFFLOGLEVELONCE: &str =
+        "user.settings.migrateStaffLogLevelOnce";
+    /// `user.settings.migrateObsoleteOnDisk`
+    pub const USER_SETTINGS_MIGRATEOBSOLETEONDISK: &str = "user.settings.migrateObsoleteOnDisk";
+    /// `user.settings.get`
+    pub const USER_SETTINGS_GET: &str = "user.settings.get";
+    /// `user.settings.getPaths`
+    pub const USER_SETTINGS_GETPATHS: &str = "user.settings.getPaths";
+    /// `user.settings.set`
+    pub const USER_SETTINGS_SET: &str = "user.settings.set";
+    /// `user.settings.listGovernanceKeys`
+    pub const USER_SETTINGS_LISTGOVERNANCEKEYS: &str = "user.settings.listGovernanceKeys";
+    /// `user.settings.edit`
+    pub const USER_SETTINGS_EDIT: &str = "user.settings.edit";
+    /// `user.settings.normalize`
+    pub const USER_SETTINGS_NORMALIZE: &str = "user.settings.normalize";
+    /// `user.settings.diagnoseProblems`
+    pub const USER_SETTINGS_DIAGNOSEPROBLEMS: &str = "user.settings.diagnoseProblems";
+    /// `user.settings.applyTopKey`
+    pub const USER_SETTINGS_APPLYTOPKEY: &str = "user.settings.applyTopKey";
+    /// `user.settings.writeAll`
+    pub const USER_SETTINGS_WRITEALL: &str = "user.settings.writeAll";
+    /// `user.settings.update`
+    pub const USER_SETTINGS_UPDATE: &str = "user.settings.update";
+    /// `user.settings.loadForEdit`
+    pub const USER_SETTINGS_LOADFOREDIT: &str = "user.settings.loadForEdit";
+    /// `user.settings.validate`
+    pub const USER_SETTINGS_VALIDATE: &str = "user.settings.validate";
+    /// `repo.settings.edit`
+    pub const REPO_SETTINGS_EDIT: &str = "repo.settings.edit";
+    /// `repo.settings.readRaw`
+    pub const REPO_SETTINGS_READRAW: &str = "repo.settings.readRaw";
+    /// `repo.settings.writeKey`
+    pub const REPO_SETTINGS_WRITEKEY: &str = "repo.settings.writeKey";
+    /// `repo.settings.writeAll`
+    pub const REPO_SETTINGS_WRITEALL: &str = "repo.settings.writeAll";
+    /// `featureFlags.resolveStartupGates`
+    pub const FEATUREFLAGS_RESOLVESTARTUPGATES: &str = "featureFlags.resolveStartupGates";
+    /// `featureFlags.listMetadata`
+    pub const FEATUREFLAGS_LISTMETADATA: &str = "featureFlags.listMetadata";
+    /// `featureFlags.resolve`
+    pub const FEATUREFLAGS_RESOLVE: &str = "featureFlags.resolve";
+    /// `permissions.locations.cleanupOrphaned`
+    pub const PERMISSIONS_LOCATIONS_CLEANUPORPHANED: &str = "permissions.locations.cleanupOrphaned";
+    /// `permissions.folderTrust.checkTrust`
+    pub const PERMISSIONS_FOLDERTRUST_CHECKTRUST: &str = "permissions.folderTrust.checkTrust";
+    /// `permissions.evaluateManagedPolicy`
+    pub const PERMISSIONS_EVALUATEMANAGEDPOLICY: &str = "permissions.evaluateManagedPolicy";
+    /// `managedSettings.readDevice`
+    pub const MANAGEDSETTINGS_READDEVICE: &str = "managedSettings.readDevice";
+    /// `managedSettings.retainPolicy`
+    pub const MANAGEDSETTINGS_RETAINPOLICY: &str = "managedSettings.retainPolicy";
+    /// `managedSettings.applyControls`
+    pub const MANAGEDSETTINGS_APPLYCONTROLS: &str = "managedSettings.applyControls";
+    /// `managedSettings.parseClientValue`
+    pub const MANAGEDSETTINGS_PARSECLIENTVALUE: &str = "managedSettings.parseClientValue";
+    /// `managedSettings.resolveEffectiveValue`
+    pub const MANAGEDSETTINGS_RESOLVEEFFECTIVEVALUE: &str = "managedSettings.resolveEffectiveValue";
+    /// `managedSettings.resolveBypassDisableTransition`
+    pub const MANAGEDSETTINGS_RESOLVEBYPASSDISABLETRANSITION: &str =
+        "managedSettings.resolveBypassDisableTransition";
+    /// `managedSettings.ingest`
+    pub const MANAGEDSETTINGS_INGEST: &str = "managedSettings.ingest";
+    /// `managedSettings.resolveStartupPolicy`
+    pub const MANAGEDSETTINGS_RESOLVESTARTUPPOLICY: &str = "managedSettings.resolveStartupPolicy";
+    /// `managedSettings.loadRemoteControl`
+    pub const MANAGEDSETTINGS_LOADREMOTECONTROL: &str = "managedSettings.loadRemoteControl";
+    /// `managedSettings.resolveDeviceForceLoginOrgsGate`
+    pub const MANAGEDSETTINGS_RESOLVEDEVICEFORCELOGINORGSGATE: &str =
+        "managedSettings.resolveDeviceForceLoginOrgsGate";
+    /// `managedSettings.read`
+    pub const MANAGEDSETTINGS_READ: &str = "managedSettings.read";
+    /// `managedSettings.clearCache`
+    pub const MANAGEDSETTINGS_CLEARCACHE: &str = "managedSettings.clearCache";
+    /// `managedSettings.resolve`
+    pub const MANAGEDSETTINGS_RESOLVE: &str = "managedSettings.resolve";
+    /// `managedSettings.permissions.evaluate`
+    pub const MANAGEDSETTINGS_PERMISSIONS_EVALUATE: &str = "managedSettings.permissions.evaluate";
+    /// `managedSettings.schema`
+    pub const MANAGEDSETTINGS_SCHEMA: &str = "managedSettings.schema";
+    /// `managedSettings.validate`
+    pub const MANAGEDSETTINGS_VALIDATE: &str = "managedSettings.validate";
+    /// `managedSettings.compose`
+    pub const MANAGEDSETTINGS_COMPOSE: &str = "managedSettings.compose";
     /// `environments.list`
     pub const ENVIRONMENTS_LIST: &str = "environments.list";
     /// `environments.get`
@@ -30,6 +195,8 @@ pub mod rpc_methods {
     pub const ENVIRONMENTS_DELETE: &str = "environments.delete";
     /// `host.publishSession`
     pub const HOST_PUBLISHSESSION: &str = "host.publishSession";
+    /// `host.listSessions`
+    pub const HOST_LISTSESSIONS: &str = "host.listSessions";
     /// `host.createSession`
     pub const HOST_CREATESESSION: &str = "host.createSession";
     /// `host.releaseSession`
@@ -54,18 +221,6 @@ pub mod rpc_methods {
     pub const MODELS_LIST: &str = "models.list";
     /// `models.getBuiltInCatalog`
     pub const MODELS_GETBUILTINCATALOG: &str = "models.getBuiltInCatalog";
-    /// `sandbox.getHostSupport`
-    pub const SANDBOX_GETHOSTSUPPORT: &str = "sandbox.getHostSupport";
-    /// `sandbox.proxyCa.getStatus`
-    pub const SANDBOX_PROXYCA_GETSTATUS: &str = "sandbox.proxyCa.getStatus";
-    /// `sandbox.proxyCa.create`
-    pub const SANDBOX_PROXYCA_CREATE: &str = "sandbox.proxyCa.create";
-    /// `sandbox.proxyCa.rotate`
-    pub const SANDBOX_PROXYCA_ROTATE: &str = "sandbox.proxyCa.rotate";
-    /// `sandbox.proxyCa.trust`
-    pub const SANDBOX_PROXYCA_TRUST: &str = "sandbox.proxyCa.trust";
-    /// `sandbox.proxyCa.remove`
-    pub const SANDBOX_PROXYCA_REMOVE: &str = "sandbox.proxyCa.remove";
     /// `tools.list`
     pub const TOOLS_LIST: &str = "tools.list";
     /// `account.getQuota`
@@ -78,6 +233,14 @@ pub mod rpc_methods {
     pub const ACCOUNT_LOGIN: &str = "account.login";
     /// `account.logout`
     pub const ACCOUNT_LOGOUT: &str = "account.logout";
+    /// `account.describeAuthInfo`
+    pub const ACCOUNT_DESCRIBEAUTHINFO: &str = "account.describeAuthInfo";
+    /// `account.getGistSupport`
+    pub const ACCOUNT_GETGISTSUPPORT: &str = "account.getGistSupport";
+    /// `account.getWebUrl`
+    pub const ACCOUNT_GETWEBURL: &str = "account.getWebUrl";
+    /// `account.getTokenEnvVar`
+    pub const ACCOUNT_GETTOKENENVVAR: &str = "account.getTokenEnvVar";
     /// `secrets.addFilterValues`
     pub const SECRETS_ADDFILTERVALUES: &str = "secrets.addFilterValues";
     /// `mcp.config.list`
@@ -94,8 +257,18 @@ pub mod rpc_methods {
     pub const MCP_CONFIG_DISABLE: &str = "mcp.config.disable";
     /// `mcp.config.reload`
     pub const MCP_CONFIG_RELOAD: &str = "mcp.config.reload";
+    /// `mcp.registry.allocateRequestId`
+    pub const MCP_REGISTRY_ALLOCATEREQUESTID: &str = "mcp.registry.allocateRequestId";
+    /// `mcp.registry.search`
+    pub const MCP_REGISTRY_SEARCH: &str = "mcp.registry.search";
+    /// `mcp.registry.cancel`
+    pub const MCP_REGISTRY_CANCEL: &str = "mcp.registry.cancel";
     /// `mcp.discover`
     pub const MCP_DISCOVER: &str = "mcp.discover";
+    /// `mcp.listBuiltinServerNames`
+    pub const MCP_LISTBUILTINSERVERNAMES: &str = "mcp.listBuiltinServerNames";
+    /// `mcp.shouldExcludeGitHubTools`
+    pub const MCP_SHOULDEXCLUDEGITHUBTOOLS: &str = "mcp.shouldExcludeGitHubTools";
     /// `mcp.planInstall`
     pub const MCP_PLANINSTALL: &str = "mcp.planInstall";
     /// `mcp.prepareInstall`
@@ -120,6 +293,16 @@ pub mod rpc_methods {
     pub const EXTENSIONS_ENABLE: &str = "extensions.enable";
     /// `extensions.disable`
     pub const EXTENSIONS_DISABLE: &str = "extensions.disable";
+    /// `instructions.getInitPrompt`
+    pub const INSTRUCTIONS_GETINITPROMPT: &str = "instructions.getInitPrompt";
+    /// `instructions.discover`
+    pub const INSTRUCTIONS_DISCOVER: &str = "instructions.discover";
+    /// `instructions.discoverRepoSources`
+    pub const INSTRUCTIONS_DISCOVERREPOSOURCES: &str = "instructions.discoverRepoSources";
+    /// `instructions.getDiscoveryPaths`
+    pub const INSTRUCTIONS_GETDISCOVERYPATHS: &str = "instructions.getDiscoveryPaths";
+    /// `instructions.clearCache`
+    pub const INSTRUCTIONS_CLEARCACHE: &str = "instructions.clearCache";
     /// `skills.planInstall`
     pub const SKILLS_PLANINSTALL: &str = "skills.planInstall";
     /// `skills.applyInstall`
@@ -182,30 +365,39 @@ pub mod rpc_methods {
     pub const AGENTS_DISCOVER: &str = "agents.discover";
     /// `agents.getDiscoveryPaths`
     pub const AGENTS_GETDISCOVERYPATHS: &str = "agents.getDiscoveryPaths";
-    /// `instructions.discover`
-    pub const INSTRUCTIONS_DISCOVER: &str = "instructions.discover";
-    /// `instructions.getDiscoveryPaths`
-    pub const INSTRUCTIONS_GETDISCOVERYPATHS: &str = "instructions.getDiscoveryPaths";
+    /// `agents.getBuiltins`
+    pub const AGENTS_GETBUILTINS: &str = "agents.getBuiltins";
+    /// `agents.getAvailableBuiltins`
+    pub const AGENTS_GETAVAILABLEBUILTINS: &str = "agents.getAvailableBuiltins";
+    /// `agents.getBuiltinDefinition`
+    pub const AGENTS_GETBUILTINDEFINITION: &str = "agents.getBuiltinDefinition";
+    /// `agents.getBuiltinListingDefinition`
+    pub const AGENTS_GETBUILTINLISTINGDEFINITION: &str = "agents.getBuiltinListingDefinition";
+    /// `agents.customAgentInitialModelDecision`
+    pub const AGENTS_CUSTOMAGENTINITIALMODELDECISION: &str =
+        "agents.customAgentInitialModelDecision";
+    /// `globalState.load`
+    pub const GLOBALSTATE_LOAD: &str = "globalState.load";
+    /// `globalState.loadForConfigDir`
+    pub const GLOBALSTATE_LOADFORCONFIGDIR: &str = "globalState.loadForConfigDir";
+    /// `globalState.writeKey`
+    pub const GLOBALSTATE_WRITEKEY: &str = "globalState.writeKey";
     /// `commands.list`
     pub const COMMANDS_LIST: &str = "commands.list";
-    /// `user.settings.reload`
-    pub const USER_SETTINGS_RELOAD: &str = "user.settings.reload";
-    /// `user.settings.get`
-    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";
-    /// `managedSettings.clearCache`
-    pub const MANAGEDSETTINGS_CLEARCACHE: &str = "managedSettings.clearCache";
-    /// `managedSettings.resolve`
-    pub const MANAGEDSETTINGS_RESOLVE: &str = "managedSettings.resolve";
-    /// `managedSettings.schema`
-    pub const MANAGEDSETTINGS_SCHEMA: &str = "managedSettings.schema";
-    /// `managedSettings.validate`
-    pub const MANAGEDSETTINGS_VALIDATE: &str = "managedSettings.validate";
-    /// `managedSettings.compose`
-    pub const MANAGEDSETTINGS_COMPOSE: &str = "managedSettings.compose";
+    /// `gitHubRepository.atPath`
+    pub const GITHUBREPOSITORY_ATPATH: &str = "gitHubRepository.atPath";
+    /// `gitHubOwners.nextRequestId`
+    pub const GITHUBOWNERS_NEXTREQUESTID: &str = "gitHubOwners.nextRequestId";
+    /// `gitHubOwners.list`
+    pub const GITHUBOWNERS_LIST: &str = "gitHubOwners.list";
+    /// `gitHubOwners.cancel`
+    pub const GITHUBOWNERS_CANCEL: &str = "gitHubOwners.cancel";
+    /// `git.currentBranchRemote`
+    pub const GIT_CURRENTBRANCHREMOTE: &str = "git.currentBranchRemote";
+    /// `git.workingDirectoryContext`
+    pub const GIT_WORKINGDIRECTORYCONTEXT: &str = "git.workingDirectoryContext";
+    /// `git.reposFromRemotes`
+    pub const GIT_REPOSFROMREMOTES: &str = "git.reposFromRemotes";
     /// `runtime.shutdown`
     pub const RUNTIME_SHUTDOWN: &str = "runtime.shutdown";
     /// `sessionFs.setProvider`
@@ -260,6 +452,12 @@ pub mod rpc_methods {
     pub const SESSIONS_RELEASELOCK: &str = "sessions.releaseLock";
     /// `sessions.enrichMetadata`
     pub const SESSIONS_ENRICHMETADATA: &str = "sessions.enrichMetadata";
+    /// `sessions.createWorkspace`
+    pub const SESSIONS_CREATEWORKSPACE: &str = "sessions.createWorkspace";
+    /// `sessions.loadWorkspace`
+    pub const SESSIONS_LOADWORKSPACE: &str = "sessions.loadWorkspace";
+    /// `sessions.updateWorkspaceFields`
+    pub const SESSIONS_UPDATEWORKSPACEFIELDS: &str = "sessions.updateWorkspaceFields";
     /// `sessions.reloadPluginHooks`
     pub const SESSIONS_RELOADPLUGINHOOKS: &str = "sessions.reloadPluginHooks";
     /// `sessions.loadDeferredRepoHooks`
@@ -282,6 +480,14 @@ pub mod rpc_methods {
     pub const SESSIONS_CONFIGURESESSIONEXTENSIONS: &str = "sessions.configureSessionExtensions";
     /// `agentRegistry.spawn`
     pub const AGENTREGISTRY_SPAWN: &str = "agentRegistry.spawn";
+    /// `connectors.getCapabilities`
+    pub const CONNECTORS_GETCAPABILITIES: &str = "connectors.getCapabilities";
+    /// `connectors.getAccounts`
+    pub const CONNECTORS_GETACCOUNTS: &str = "connectors.getAccounts";
+    /// `connectors.list`
+    pub const CONNECTORS_LIST: &str = "connectors.list";
+    /// `connectors.refresh`
+    pub const CONNECTORS_REFRESH: &str = "connectors.refresh";
     /// `session.providers.getCatalog`
     pub const SESSION_PROVIDERS_GETCATALOG: &str = "session.providers.getCatalog";
     /// `session.providers.discover`
@@ -301,6 +507,9 @@ pub mod rpc_methods {
     pub const SESSION_SENDMESSAGES: &str = "session.sendMessages";
     /// `session.sandbox.getEnforcementStatus`
     pub const SESSION_SANDBOX_GETENFORCEMENTSTATUS: &str = "session.sandbox.getEnforcementStatus";
+    /// `session.sandbox.getCredentialSuggestions`
+    pub const SESSION_SANDBOX_GETCREDENTIALSUGGESTIONS: &str =
+        "session.sandbox.getCredentialSuggestions";
     /// `session.sandbox.disableForSession`
     pub const SESSION_SANDBOX_DISABLEFORSESSION: &str = "session.sandbox.disableForSession";
     /// `session.sandbox.grantPathForRequest`
@@ -402,10 +611,14 @@ pub mod rpc_methods {
     pub const SESSION_MODEL_SWITCHAUTOTIER: &str = "session.model.switchAutoTier";
     /// `session.model.applyStartupOverlay`
     pub const SESSION_MODEL_APPLYSTARTUPOVERLAY: &str = "session.model.applyStartupOverlay";
+    /// `session.model.clearStartupSeed`
+    pub const SESSION_MODEL_CLEARSTARTUPSEED: &str = "session.model.clearStartupSeed";
     /// `session.model.setAllowedModels`
     pub const SESSION_MODEL_SETALLOWEDMODELS: &str = "session.model.setAllowedModels";
     /// `session.model.setReasoningEffort`
     pub const SESSION_MODEL_SETREASONINGEFFORT: &str = "session.model.setReasoningEffort";
+    /// `session.model.getReasoningSummaries`
+    pub const SESSION_MODEL_GETREASONINGSUMMARIES: &str = "session.model.getReasoningSummaries";
     /// `session.model.list`
     pub const SESSION_MODEL_LIST: &str = "session.model.list";
     /// `session.mode.get`
@@ -539,8 +752,12 @@ pub mod rpc_methods {
     pub const SESSION_SKILLS_RELOAD: &str = "session.skills.reload";
     /// `session.skills.ensureLoaded`
     pub const SESSION_SKILLS_ENSURELOADED: &str = "session.skills.ensureLoaded";
+    /// `session.mcp.setConnectedIdeInfo`
+    pub const SESSION_MCP_SETCONNECTEDIDEINFO: &str = "session.mcp.setConnectedIdeInfo";
     /// `session.mcp.list`
     pub const SESSION_MCP_LIST: &str = "session.mcp.list";
+    /// `session.mcp.listConfigured`
+    pub const SESSION_MCP_LISTCONFIGURED: &str = "session.mcp.listConfigured";
     /// `session.mcp.listTools`
     pub const SESSION_MCP_LISTTOOLS: &str = "session.mcp.listTools";
     /// `session.mcp.enable`
@@ -673,6 +890,8 @@ pub mod rpc_methods {
     pub const SESSION_PLUGINS_MARKETPLACES_REFRESH: &str = "session.plugins.marketplaces.refresh";
     /// `session.plugins.reload`
     pub const SESSION_PLUGINS_RELOAD: &str = "session.plugins.reload";
+    /// `session.plugins.retryManaged`
+    pub const SESSION_PLUGINS_RETRYMANAGED: &str = "session.plugins.retryManaged";
     /// `session.provider.getEndpoint`
     pub const SESSION_PROVIDER_GETENDPOINT: &str = "session.provider.getEndpoint";
     /// `session.provider.add`
@@ -693,6 +912,8 @@ pub mod rpc_methods {
     pub const SESSION_EXTENSIONS_DISABLE: &str = "session.extensions.disable";
     /// `session.extensions.reload`
     pub const SESSION_EXTENSIONS_RELOAD: &str = "session.extensions.reload";
+    /// `session.extensions.reconcile`
+    pub const SESSION_EXTENSIONS_RECONCILE: &str = "session.extensions.reconcile";
     /// `session.extensions.sendAttachmentsToMessage`
     pub const SESSION_EXTENSIONS_SENDATTACHMENTSTOMESSAGE: &str =
         "session.extensions.sendAttachmentsToMessage";
@@ -704,6 +925,8 @@ pub mod rpc_methods {
     pub const SESSION_TOOLS_TASKCOMPLETEEVENTDATA: &str = "session.tools.taskCompleteEventData";
     /// `session.tools.handlePendingToolCall`
     pub const SESSION_TOOLS_HANDLEPENDINGTOOLCALL: &str = "session.tools.handlePendingToolCall";
+    /// `session.tools.listPendingRequests`
+    pub const SESSION_TOOLS_LISTPENDINGREQUESTS: &str = "session.tools.listPendingRequests";
     /// `session.tools.initializeAndValidate`
     pub const SESSION_TOOLS_INITIALIZEANDVALIDATE: &str = "session.tools.initializeAndValidate";
     /// `session.tools.getCurrentMetadata`
@@ -924,6 +1147,14 @@ pub mod rpc_methods {
     pub const SESSION_EVENTLOG_RELEASEINTEREST: &str = "session.eventLog.releaseInterest";
     /// `session.usage.getMetrics`
     pub const SESSION_USAGE_GETMETRICS: &str = "session.usage.getMetrics";
+    /// `session.usage.setCodeChanges`
+    pub const SESSION_USAGE_SETCODECHANGES: &str = "session.usage.setCodeChanges";
+    /// `session.quota.get`
+    pub const SESSION_QUOTA_GET: &str = "session.quota.get";
+    /// `session.quota.refresh`
+    pub const SESSION_QUOTA_REFRESH: &str = "session.quota.refresh";
+    /// `session.quota.takeWarnings`
+    pub const SESSION_QUOTA_TAKEWARNINGS: &str = "session.quota.takeWarnings";
     /// `session.limitPrediction.predict`
     pub const SESSION_LIMITPREDICTION_PREDICT: &str = "session.limitPrediction.predict";
     /// `session.remote.enable`
@@ -1610,6 +1841,25 @@ pub struct UserAuthInfo {
     pub r#type: UserAuthInfoType,
 }
 
+/// An interactive account whose model provider owns its credentials. It carries no GitHub credential.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 AccountAuthInfo {
+    /// Host coordinate owned by the account's model provider.
+    pub host: String,
+    /// Login identifying the provider-owned account.
+    pub login: String,
+    /// Provider-owned account authentication.
+    pub r#type: AccountAuthInfoType,
+}
+
 /// Authentication-info input variant for GitHub CLI credentials, carrying host, login, and the `gh auth token` value.
 ///
 /// <div class="warning">
@@ -1677,6 +1927,67 @@ pub struct AccountAllUsers {
     pub token: Option<String>,
 }
 
+/// Credential-free authentication identity safe to expose to hosts and user interfaces.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 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 authentication identity whose shared wording should be rendered.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct AccountDescribeAuthInfoRequest {
+    /// Identity to describe.
+    pub identity: AuthIdentity,
+}
+
+/// The wording the runtime uses for an authentication identity.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct AccountDescribeAuthInfoResult {
+    /// One-line description of the identity, suitable after a verb such as "Switched to".
+    pub description: String,
+    /// Sign-in banner announcing the authenticated user.
+    pub message: String,
+}
+
 /// Current authentication state
 ///
 /// <div class="warning">
@@ -1696,6 +2007,42 @@ pub struct AccountGetCurrentAuthResult {
     pub auth_info: Option<AuthInfo>,
 }
 
+/// The authentication identity whose gist support should be reported.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct AccountGetGistSupportRequest {
+    /// Identity to evaluate.
+    pub identity: AuthIdentity,
+}
+
+/// Whether the identity can create gists, and why not when it cannot.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct AccountGetGistSupportResult {
+    /// Machine-readable reason category when unsupported.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub kind: Option<String>,
+    /// Human-readable explanation to show where the gist action would have been.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub reason: Option<String>,
+    /// True when the identity can create gists.
+    pub supported: bool,
+}
+
 /// Optional opaque account selection or compatibility GitHub token used to look up quota.
 ///
 /// <div class="warning">
@@ -1760,6 +2107,55 @@ pub struct AccountGetQuotaResult {
     pub quota_snapshots: HashMap<String, AccountQuotaSnapshot>,
 }
 
+/// The environment variable supplying a classic personal access token, when one is 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(crate) struct AccountGetTokenEnvVarResult {
+    /// Variable name, for example `GH_TOKEN`. Absent when no classic token is present in the environment.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub name: Option<String>,
+}
+
+/// A path to resolve against the GitHub host an identity is signed in to.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct AccountGetWebUrlRequest {
+    /// Identity whose host the path resolves against. Omit to resolve against the public github.com host.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub identity: Option<AuthIdentity>,
+    /// Host-relative path, without a leading slash, for example `settings/copilot/features`.
+    pub path: String,
+}
+
+/// An absolute URL on the identity's GitHub host.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct AccountGetWebUrlResult {
+    /// Absolute URL for the requested path.
+    pub url: String,
+}
+
 /// Credentials to validate and store. Omit login to resolve the authenticated user from the token.
 ///
 /// <div class="warning">
@@ -1957,6 +2353,9 @@ pub struct AccountsSetRequest {
 pub struct AccountStatus {
     /// Whether this is the active account.
     pub active: bool,
+    /// Human-readable credential source used to authenticate this account, such as `gh` or `GITHUB_TOKEN`.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub auth_source: Option<String>,
     /// Opaque id of the account this one was derived from (e.g. an EMU account's base Entra identity); absent for a root account. Matches the base identity account's selectionId, forming the derivation edge.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub derived_from: Option<String>,
@@ -2025,6 +2424,9 @@ pub struct AgentInfo {
     pub disable_model_invocation: Option<bool>,
     /// Human-readable display name
     pub display_name: String,
+    /// Declarative hook actions keyed by event name, executed only while this agent is active.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub hooks: Option<HashMap<String, Vec<serde_json::Value>>>,
     /// 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.
@@ -2337,6 +2739,45 @@ pub struct AgentReloadResult {
     pub agents: Vec<AgentInfo>,
 }
 
+/// The models a custom agent asks for, and the models actually 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(crate) struct AgentsCustomAgentInitialModelDecisionParams {
+    /// The agent's declared `model:` entry, serialized. A single name or an ordered list of acceptable names.
+    pub agent_models_json: String,
+    /// The models available to this session, serialized in the shape the model list carries.
+    pub available_models_json: String,
+}
+
+/// The model to switch to, and the warning to show when the agent's preference could not be met.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct AgentsCustomAgentInitialModelDecisionResult {
+    /// The reasoning effort attached to the selected model preference. Absent when that preference does not specify an effort.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub reasoning_effort: Option<String>,
+    /// The first available model that matches the agent's preferences. Absent when none of the requested models is available.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub target_model: Option<String>,
+    /// What to tell the user about an unmet preference. Absent when the preference was met. A warning with no `targetModel` means the agent's models are all unavailable.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub warning: Option<String>,
+}
+
 /// Optional project paths to include in agent discovery.
 ///
 /// <div class="warning">
@@ -2356,6 +2797,63 @@ pub struct AgentsDiscoverRequest {
     pub project_paths: Option<Vec<String>>,
 }
 
+/// Extensible [`AgentsDiscoverRequest`], including inputs added after it was published.
+///
+/// Required inputs are [`AgentsDiscoverOptions::new`] arguments; optional inputs have fluent setters.
+/// Input-only: it serialises to the flat wire request and is not deserialisable.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type 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)]
+#[serde(rename_all = "camelCase")]
+pub struct AgentsDiscoverOptions {
+    #[serde(flatten)]
+    legacy: AgentsDiscoverRequest,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    agent_directories: Option<Vec<String>>,
+}
+
+impl AgentsDiscoverOptions {
+    /// Creates options with the required inputs.
+    pub fn new() -> Self {
+        Self {
+            legacy: AgentsDiscoverRequest {
+                project_paths: None,
+                exclude_host_agents: None,
+            },
+            agent_directories: None,
+        }
+    }
+
+    /// 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 fn project_paths(mut self, value: Vec<String>) -> Self {
+        self.legacy.project_paths = Some(value);
+        self
+    }
+
+    /// 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.
+    pub fn exclude_host_agents(mut self, value: bool) -> Self {
+        self.legacy.exclude_host_agents = Some(value);
+        self
+    }
+
+    /// Explicit discovery-only agent roots, separate from customAgents and filesystem grants. Available without ambient discovery, subject to managed/source disables. Relative paths resolve against the request's effective working directory when supplied. Null and omission are equivalent; an empty array contributes no explicit roots.
+    pub fn agent_directories(mut self, value: Vec<String>) -> Self {
+        self.agent_directories = Some(value);
+        self
+    }
+}
+
+impl Default for AgentsDiscoverOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 /// Name of the custom agent to select for subsequent turns.
 ///
 /// <div class="warning">
@@ -2403,6 +2901,140 @@ pub struct AgentSetPromptRequest {
     pub prompt: String,
 }
 
+/// The feature flags to evaluate shipped agents against.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct AgentsGetAvailableBuiltinsRequest {
+    /// The surface asking, which gates agents that only apply to one client. Omit or pass null to apply no client filter.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub context: Option<String>,
+    /// Feature flag values keyed by name, evaluated with the runtime's truthiness rules. Omit or pass null for no flags.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub feature_flags: Option<HashMap<String, serde_json::Value>>,
+    /// Flag overrides keyed by name. A null entry uses the corresponding base flag; false explicitly disables it. Omit or pass null for no overrides.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub overrides: Option<HashMap<String, serde_json::Value>>,
+}
+
+/// A shipped agent, named and described.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct BuiltinAgentSummary {
+    /// One-line description of what the agent does.
+    pub description: String,
+    /// The agent name, as it appears in `getBuiltins`.
+    pub name: String,
+}
+
+/// The shipped agents available under the requested flags.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct AgentsGetAvailableBuiltinsResult {
+    /// Available shipped agents, in the runtime's own order.
+    #[doc(hidden)]
+    pub(crate) agents: Vec<BuiltinAgentSummary>,
+}
+
+/// The shipped agent whose definition to load.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct AgentsGetBuiltinDefinitionRequest {
+    /// The agent name, which must be one of `getBuiltins`'s `yamlBasedNames`. A name outside that list is special-cased in code and has no definition, and is reported as an error rather than as an empty definition.
+    pub name: String,
+}
+
+/// One shipped agent's definition.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct AgentsGetBuiltinDefinitionResult {
+    /// The agent's definition, serialized as JSON. It carries the authored keys plus the runtime's projected `__nativeCustomAgent` view of the same agent. It is a string rather than an object because the runtime parses it with the agent schema's tolerant shape, which accepts keys this contract does not name.
+    pub definition_json: String,
+}
+
+/// The shipped agent whose listing entry to load.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct AgentsGetBuiltinListingDefinitionRequest {
+    /// The agent name, taken from `getAvailableBuiltins`. Unlike `getBuiltinDefinition`, the agent that `getBuiltins` reports as special-cased rather than YAML-based is answered here too, from its in-code definition.
+    pub name: String,
+}
+
+/// One shipped agent, projected for a listing.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct AgentsGetBuiltinListingDefinitionResult {
+    /// The agent projected as a custom agent, serialized as JSON. It is a string rather than an object for the same reason as `getBuiltinDefinition`: the runtime parses the underlying definition with the agent schema's tolerant shape, which accepts keys this contract does not name.
+    pub definition_json: String,
+}
+
+/// The agents this runtime ships, named so a consumer can tell them apart from authored ones.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct AgentsGetBuiltinsResult {
+    /// The subset of `names` a user is allowed to turn off. A shipped agent outside this list is always active and a client should not offer a toggle for it.
+    pub disableable_names: Vec<String>,
+    /// Every agent name this runtime ships.
+    pub names: Vec<String>,
+    /// The subset of `names` defined by a shipped YAML definition. The remainder are special-cased in code and have no definition to load.
+    pub yaml_based_names: Vec<String>,
+}
+
 /// Optional project paths to include when enumerating agent discovery directories.
 ///
 /// <div class="warning">
@@ -2422,6 +3054,63 @@ pub struct AgentsGetDiscoveryPathsRequest {
     pub project_paths: Option<Vec<String>>,
 }
 
+/// Extensible [`AgentsGetDiscoveryPathsRequest`], including inputs added after it was published.
+///
+/// Required inputs are [`AgentsGetDiscoveryPathsOptions::new`] arguments; optional inputs have fluent setters.
+/// Input-only: it serialises to the flat wire request and is not deserialisable.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type 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)]
+#[serde(rename_all = "camelCase")]
+pub struct AgentsGetDiscoveryPathsOptions {
+    #[serde(flatten)]
+    legacy: AgentsGetDiscoveryPathsRequest,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    agent_directories: Option<Vec<String>>,
+}
+
+impl AgentsGetDiscoveryPathsOptions {
+    /// Creates options with the required inputs.
+    pub fn new() -> Self {
+        Self {
+            legacy: AgentsGetDiscoveryPathsRequest {
+                project_paths: None,
+                exclude_host_agents: None,
+            },
+            agent_directories: None,
+        }
+    }
+
+    /// Optional list of project directory paths. When omitted or empty, only the user-level directory is returned.
+    pub fn project_paths(mut self, value: Vec<String>) -> Self {
+        self.legacy.project_paths = Some(value);
+        self
+    }
+
+    /// When true, omit the host's user-level agent directory, leaving only project directories. For multitenant deployments (mirrors `discover`'s `excludeHostAgents`).
+    pub fn exclude_host_agents(mut self, value: bool) -> Self {
+        self.legacy.exclude_host_agents = Some(value);
+        self
+    }
+
+    /// Explicit discovery-only agent roots to enumerate, including configured missing directories. Relative paths resolve against the request's effective working directory when supplied. These are not filesystem grants or preferred creation targets. Null and omission are equivalent.
+    pub fn agent_directories(mut self, value: Vec<String>) -> Self {
+        self.agent_directories = Some(value);
+        self
+    }
+}
+
+impl Default for AgentsGetDiscoveryPathsOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 /// Blob attachment with inline base64-encoded data
 ///
 /// <div class="warning">
@@ -2960,7 +3649,7 @@ pub struct AuthEnumerateValueProviders {
     pub kind: AuthEnumerateValueProvidersKind,
 }
 
-/// Credential-free authentication identity safe to expose to hosts and user interfaces.
+/// Credential-free identity metadata.
 ///
 /// <div class="warning">
 ///
@@ -2970,26 +3659,16 @@ pub struct AuthEnumerateValueProviders {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-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 struct AuthIdentityMetadata {
+    /// Identity 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
+    /// User login.
+    pub login: String,
+    /// Authentication type.
     pub r#type: AuthInfoType,
 }
 
-/// Credential-free identity metadata.
+/// A credential-free account choice after sign-in.
 ///
 /// <div class="warning">
 ///
@@ -2999,13 +3678,15 @@ pub struct AuthIdentity {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct AuthIdentityMetadata {
-    /// Identity host.
+pub struct AuthLoginAccount {
+    /// Host coordinate owned by the selected account's provider.
     pub host: String,
-    /// User login.
+    /// Provider kind that owns this account choice.
+    pub kind: AccountKind,
+    /// Human-readable login for the account choice.
     pub login: String,
-    /// Authentication type.
-    pub r#type: AuthInfoType,
+    /// Opaque identifier supplied to the next login step to select this account.
+    pub selection_id: String,
 }
 
 /// Advance an in-flight login flow, optionally fulfilling an input-required step.
@@ -3101,7 +3782,7 @@ pub struct AuthLoginStepNeedsInteraction {
     pub kind: AuthLoginStepNeedsInteractionKind,
 }
 
-/// Terminal result of an interactive login flow.
+/// Result of an interactive login flow. Pending consent or account selection is not terminal.
 ///
 /// <div class="warning">
 ///
@@ -3112,13 +3793,16 @@ pub struct AuthLoginStepNeedsInteraction {
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct AuthLoginResultDto {
+    /// Available accounts when sign-in is awaiting account selection, ordered with Microsoft 365 first.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub accounts: Option<Vec<AuthLoginAccount>>,
     /// Host that was signed in, when completed.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub host: Option<String>,
     /// Login that was signed in, when completed.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub login: Option<String>,
-    /// Terminal disposition of the login.
+    /// Current disposition of the login, including pending user decisions.
     pub status: AuthLoginResultStatus,
 }
 
@@ -3134,7 +3818,7 @@ pub struct AuthLoginResultDto {
 pub struct AuthLoginStepCompleted {
     /// Login flow step variant discriminator.
     pub kind: AuthLoginStepCompletedKind,
-    /// The terminal login result.
+    /// Login result. When status is needs-plaintext-consent or needs-account-selection, advance with the user's decision to continue.
     pub result: AuthLoginResultDto,
 }
 
@@ -3199,6 +3883,9 @@ pub struct AuthReadValueActiveAccount {
     /// The active account, or absent when not logged in.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub account: Option<AccountStatus>,
+    /// Credential-free identity metadata for the active account, including resolved Copilot user information when available.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub auth_info: Option<AuthIdentity>,
     /// Account read-datum variant discriminator.
     pub kind: AuthReadValueActiveAccountKind,
 }
@@ -3364,6 +4051,70 @@ pub struct AutopilotObjectiveGetStateResult {
     pub state: Option<AutopilotObjectiveState>,
 }
 
+/// Availability of a server-advertised routing preference.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 AutoTierStatus {
+    /// Whether the provider permits selecting this preference.
+    pub enabled: bool,
+    /// Human-readable explanation of availability.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub message: Option<String>,
+    /// Extensible machine-readable unavailability reason.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub reason: Option<String>,
+}
+
+/// A server-advertised routing preference. Identifiers and execution types are extensible.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 AutoTierDescriptor {
+    /// Description displayed beside the preference.
+    pub description: String,
+    /// Human-readable label, not a routing identifier.
+    pub display_name: String,
+    /// Opaque routing identifier transmitted unchanged to the provider.
+    pub id: String,
+    /// Current account-specific availability.
+    pub status: AutoTierStatus,
+    /// Execution kind; this client supports `auto` preferences on the Auto model.
+    pub r#type: String,
+}
+
+/// Account-bound discovery metadata for the virtual `auto` 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 AutoTierMetadata {
+    /// Provider-default preference, used only when no explicit preference exists.
+    pub default_tier: String,
+    /// Provider that supplied this metadata, when the catalog is provider-attributed.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub provider_id: Option<String>,
+    /// Routing preferences in the server's presentation order.
+    pub tiers: Vec<AutoTierDescriptor>,
+}
+
 /// A well-known model in the runtime's built-in catalog.
 ///
 /// <div class="warning">
@@ -5899,6 +6650,147 @@ pub struct ConnectorDisconnectResult {
     pub status: ConnectorStatus,
 }
 
+/// Account 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 ConnectorDiscoveryAuthInfo {
+    /// Host.
+    pub host: String,
+    /// Login.
+    pub login: String,
+    /// Authentication type.
+    pub r#type: AuthInfoType,
+}
+
+/// Eligible account.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 ConnectorDiscoveryAccount {
+    /// Opaque account ID.
+    pub account_id: String,
+    /// Account metadata.
+    pub auth_info: ConnectorDiscoveryAuthInfo,
+}
+
+/// Eligible accounts.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 ConnectorDiscoveryAccountList {
+    /// Eligible accounts.
+    pub accounts: Vec<ConnectorDiscoveryAccount>,
+    /// Availability.
+    pub availability: ConnectorDiscoveryAvailability,
+}
+
+/// Selected account.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 ConnectorDiscoveryAccountRequest {
+    /// Opaque account ID.
+    pub account_id: String,
+}
+
+/// Feature availability.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 ConnectorDiscoveryCapabilities {
+    /// API version.
+    pub api_version: i64,
+    /// Availability.
+    pub availability: ConnectorDiscoveryAvailability,
+    /// Whether results are cached.
+    pub conditional_cache: bool,
+    /// Whether accounts are selected by opaque ID.
+    pub opaque_account_selection: bool,
+}
+
+/// 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>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ConnectorDiscoveryCatalogEntry {
+    /// Description.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub description: Option<String>,
+    /// Display name.
+    pub display_name: String,
+    /// Logo.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub logo: Option<String>,
+    /// Name.
+    pub name: String,
+    /// Release tag.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub release_tag: Option<String>,
+    /// Status.
+    pub status: ConnectorCatalogStatus,
+    /// Tier.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub tier: Option<String>,
+}
+
+/// Entries for the selected account.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 ConnectorDiscoveryCatalogResult {
+    /// Opaque account ID.
+    pub account_id: String,
+    /// Entries.
+    pub connectors: Vec<ConnectorDiscoveryCatalogEntry>,
+    /// Refresh time in Unix epoch milliseconds.
+    pub refreshed_at_ms: i64,
+    /// Revision.
+    pub revision: i64,
+}
+
 /// Requests authoritative Connector-to-MCP reconciliation for the pinned account.
 ///
 /// <div class="warning">
@@ -6141,6 +7033,12 @@ pub struct CurrentModel {
     /// Captured base model to restore when leaving plan mode. Omitted outside plan mode or when no plan override has captured a base model. Persistent agent model requirements apply to this model rather than the temporary plan model.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub plan_base_model_id: Option<String>,
+    /// Provider of planBaseModelId, when that saved selection is provider-qualified.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub plan_base_provider_id: Option<String>,
+    /// Provider selected for this model. Together with modelId, identifies a catalog entry even when providers serve the same model. Omitted for unattributed legacy selections.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub provider_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>,
@@ -7707,6 +8605,128 @@ pub struct ExternalToolTextResultForLlmContentText {
     pub r#type: ExternalToolTextResultForLlmContentTextType,
 }
 
+/// The declared shape of one feature flag, independent of any caller population.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct FeatureFlagMetadata {
+    /// The population the flag is declared for before any environment or user-settings override is applied.
+    #[doc(hidden)]
+    pub(crate) availability: FeatureFlagAvailability,
+    /// Whether the flag participates in the CAPI sanity suite.
+    pub capi_sanity: bool,
+    /// Text shown to a user choosing whether to turn the flag on in experimental mode. Absent when the flag is not user-facing.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub experimental_description: Option<String>,
+    /// The online-experiment (ExP) flag this maps to, when the flag is assigned by an experiment rather than declared statically.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub exp_flag: Option<String>,
+    /// Environment variable that overrides this flag's experiment assignment locally in the experiment service, not in `featureFlags.resolve`. Present exactly when `expFlag` is, and derived from it, so a caller reads a local override without reproducing the naming rule.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub exp_flag_env_var: Option<String>,
+    /// The flag's name, matching the key it is listed under.
+    pub name: String,
+}
+
+/// Every feature flag this runtime declares, with the shape each one was declared with.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct FeatureFlagsMetadataResult {
+    /// Declared feature flags keyed by flag name.
+    #[doc(hidden)]
+    pub(crate) flags: HashMap<String, FeatureFlagMetadata>,
+}
+
+/// Caller population and overrides for static feature-flag resolution, independent of experiment assignments and active runtime 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(crate) struct FeatureFlagsResolveRequest {
+    /// Resolve against this already-computed flag set rather than each flag's declared availability. Keyed by flag name.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub base_flags: Option<HashMap<String, bool>>,
+    /// User settings to apply, including `enabledFeatureFlags`, legacy `feature_flags.enabled`, and supported convenience settings.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub config: Option<serde_json::Value>,
+    /// Environment for direct feature-flag overrides and `COPILOT_CLI_ENABLED_FEATURE_FLAGS`. Does not apply `COPILOT_EXP_*` experiment assignments. Defaults to this runtime process's own environment.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub environment: Option<HashMap<String, String>>,
+    /// Flags forced to a value after every other layer, keyed by flag name.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub flag_overrides: Option<HashMap<String, bool>>,
+    /// Whether the caller is in an experimental population.
+    pub is_experimental: bool,
+    /// Whether the caller is GitHub or Microsoft staff.
+    pub is_staff: bool,
+    /// GitHub-staff membership. Omit when it was never recorded: a legacy staff account then counts as both staff populations and keeps every staff feature.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub is_staff_github: Option<bool>,
+    /// Microsoft-staff membership. Omitted the same way as `isStaffGitHub`.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub is_staff_microsoft: Option<bool>,
+    /// Whether the caller belongs to the team population used by feature availability.
+    pub is_team: bool,
+}
+
+/// Caller population and startup inputs to resolve named online-experiment gates for. Carries no account: the runtime resolves the assignment for the authentication it already holds.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct FeatureFlagsResolveStartupGatesRequest {
+    /// User settings document whose `featureFlags` block is layered on top of the resolved set.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub config: Option<serde_json::Value>,
+    /// Environment to read flag overrides from. Defaults to this runtime process's own environment.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub environment: Option<HashMap<String, String>>,
+    /// When this installation first launched, in milliseconds since the Unix epoch. Experiments that segment on installation age read it. Omit when the first launch was never recorded.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub first_launch_at_millis: Option<f64>,
+    /// The feature flags to resolve. A name this runtime does not declare is reported as an error rather than as a disabled flag.
+    pub flags: Vec<String>,
+    /// Whether the caller is in an experimental population.
+    pub is_experimental: bool,
+    /// Whether the caller is GitHub or Microsoft staff.
+    pub is_staff: bool,
+    /// GitHub-staff membership. Omit when it was never recorded: a legacy staff account then counts as both staff populations and keeps every staff feature.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub is_staff_github: Option<bool>,
+    /// Microsoft-staff membership. Omitted the same way as `isStaffGitHub`.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub is_staff_microsoft: Option<bool>,
+    /// Whether the caller belongs to a team plan.
+    pub is_team: bool,
+    /// Whether the runtime may refresh the cached assignment over the network without an active session. The refresh never blocks this call: the answer comes from the cache either way, so a refresh only affects a later launch.
+    pub refresh_without_session: bool,
+    /// Whether streamer mode is on, which withholds the populations an experiment would otherwise segment on.
+    pub streamer_mode: bool,
+}
+
 /// Parameters for starting fleet orchestration: an optional user prompt combined with the fleet instructions, plus the send options forwarded to the resulting turn.
 ///
 /// <div class="warning">
@@ -7793,6 +8813,239 @@ pub struct FolderTrustCheckResult {
     pub trusted: bool,
 }
 
+/// A folder to check against a persisted trusted-folders list, and the configuration directory holding that 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(crate) struct FolderTrustIsTrustedParams {
+    /// Configuration directory to read the trusted-folders list from. Omit it to read the default location; supply it when the host has redirected its configuration, or the check answers from a list the host is not using.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub config_dir: Option<String>,
+    /// Folder to check. A folder counts as trusted when it is itself listed, when an ancestor is listed, or when its git root is listed.
+    pub path: String,
+}
+
+/// The verdict of the `forceLoginOrgs` enterprise sign-in pin for one credential. A managed device may pin Copilot to an approved set of GitHub organizations so a developer cannot sign in with a personal — or another enterprise's — account and escape every control that keys off the signed-in identity. A host must refuse to proceed when `allowed` is false; the remaining fields explain the refusal rather than qualifying 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(crate) struct ForceLoginOrgsDecision {
+    /// Whether the client may proceed. True whenever no pin is in force, so an unmanaged host is never blocked.
+    pub allowed: bool,
+    /// A stable kebab-case reason code when refused: `org-not-approved`, `unverifiable-credential`, `policy-undetermined`, `policy-invalid`, `not-signed-in`, or `membership-unknown`. Omitted when allowed. Treat an unrecognized code as a refusal rather than mapping it to an allow: a code this host has not been taught about still denied the credential.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub denial: Option<String>,
+    /// Whether a pin applies at all. Distinguishes "allowed because unmanaged" from "allowed because the account is approved", which a diagnostics surface needs and which also decides whether a bring-your-own-key provider may serve inference.
+    pub enforced: bool,
+    /// The approved organization the account matched, when allowed under a pin.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub matched_org: Option<String>,
+    /// A developer-facing explanation of the refusal. Omitted when allowed.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub message: Option<String>,
+    /// Error-level detail from managed-policy discovery — which file failed to load, which field failed validation. Carried on the decision rather than left to the log because a refusal can exit the process before a log sink exists, which would discard the only actionable diagnostic a misconfigured managed device produces.
+    pub policy_diagnostics: Vec<String>,
+    /// The approved organization logins, as configured. Enterprise configuration rather than user data, so it is safe to name in a message or a log line.
+    pub required_orgs: Vec<String>,
+}
+
+/// The remote the checked-out branch tracks.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct GitCurrentBranchRemoteResult {
+    /// Name of the tracked remote. Reports `origin` whenever the working tree has no tracking configuration to read, including on a detached HEAD, so this is never null and never empty.
+    pub remote: String,
+}
+
+/// Working-tree path a git query applies to.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct GitCwdRequest {
+    /// Absolute path to a directory inside the git working tree to query.
+    pub cwd: String,
+}
+
+/// A GitHub login the authenticated user may act as: their own account, or an organization they belong to.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct GitHubOwnerOption {
+    /// The owner's GitHub login.
+    pub login: String,
+    /// Which kind of owner this is. The authenticated user's own account is always reported as `user`.
+    pub r#type: String,
+}
+
+/// The owner listing to abandon.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct GitHubOwnersCancelRequest {
+    /// Request id the listing was started with.
+    pub request_id: i64,
+}
+
+/// Whether the id named a running owner listing.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct GitHubOwnersCancelResult {
+    /// True when a listing with the id was running and the cancel stopped it. False when the id was never registered, was registered but unused, was released after being abandoned, or its listing had ended. An unused id is released and cannot start a later listing.
+    pub canceled: bool,
+}
+
+/// Credential to list owners under, and the request id that makes the listing cancellable.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct GitHubOwnersListRequest {
+    /// The credential the listing runs under, carried opaquely because its shape is the host's own and the runtime only resolves a token and a GitHub host from it. No credential travels: this selects one the runtime already holds.
+    pub auth_info: serde_json::Value,
+    /// Request id from `gitHubOwners.nextRequestId`. An id that was never registered, canceled before use, released after being abandoned, or already used is refused rather than silently running uncancellable.
+    pub request_id: i64,
+}
+
+/// Outcome of an owner listing. Exactly one of `owners` and `message` is present, except that `throwError` reports a failure the caller is expected to raise rather than render.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct GitHubOwnersListResult {
+    /// Why no owners could be listed, phrased for a user. Present when the listing failed in a way the caller should render rather than raise.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub message: Option<String>,
+    /// The owners, on success: the authenticated user first, then the organizations they belong to.
+    #[doc(hidden)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub(crate) owners: Option<Vec<GitHubOwnerOption>>,
+    /// A malformed request or an unreadable credential, which the caller raises instead of rendering. Kept a field rather than a dispatch error so it stays distinct from `message`, which the caller renders.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub throw_error: Option<String>,
+    /// A line the caller should log. Present only alongside `message`, and only for failures worth recording.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub warning: Option<String>,
+}
+
+/// A freshly registered request id. Registering it before the listing starts is what lets a cancel that races the request still find the owner listing slot. The id serves one listing only. Long-abandoned unused ids can be released by later allocations.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct GitHubOwnersRequestIdResult {
+    /// Request id to pass to `gitHubOwners.list` and, to abandon it, `gitHubOwners.cancel`.
+    pub request_id: i64,
+}
+
+/// Working-tree path whose owning GitHub repository should be resolved.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct GitHubRepositoryAtPathRequest {
+    /// Absolute path to a directory inside the git working tree to resolve.
+    pub path: String,
+}
+
+/// Owner, name, and host of a GitHub repository, as resolved from a git remote URL.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 GitHubRepositoryIdentity {
+    /// Host the remote points at, for example `github.com` or a GitHub Enterprise hostname.
+    pub host: String,
+    /// Repository name, without the owner prefix or the `.git` suffix.
+    pub name: String,
+    /// Repository owner login (user or organization).
+    pub owner: String,
+}
+
+/// The GitHub repository that owns the requested path, when the selected remote (`origin`, else the first) is on a GitHub host.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct GitHubRepositoryAtPathResult {
+    /// Resolved repository identity, or null when the selected remote resolves to no GitHub host.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub repository: Option<GitHubRepositoryIdentity>,
+}
+
 /// Client environment metadata describing the process that produced a telemetry event.
 ///
 /// <div class="warning">
@@ -7951,6 +9204,227 @@ pub struct GitHubTokenAcquireResultCancelled {
     pub kind: GitHubTokenAcquireResultCancelledKind,
 }
 
+/// A GitHub repository one of a working tree's remotes points at.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct GitRemoteRepository {
+    /// GitHub host serving the repository, which is not `github.com` for a GitHub Enterprise remote.
+    pub host: String,
+    /// Repository name, without the owner.
+    pub name: String,
+    /// Account or organization owning the repository.
+    pub owner: String,
+    /// Name of the first remote that produced this distinct repository entry, such as `origin` or `upstream`.
+    pub remote_name: String,
+}
+
+/// Git working tree whose GitHub remotes should be listed.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct GitReposFromRemotesRequest {
+    /// Absolute path to the root of the git working tree.
+    pub git_root: String,
+}
+
+/// The GitHub repositories a working tree's remotes point at.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct GitReposFromRemotesResult {
+    /// One entry per distinct GitHub repository, in the order git reports the first remote for each repository. Empty when no remote points at a GitHub host, which a caller should read as `not connected to GitHub`. Failing to read the remotes is an error, not an empty list.
+    #[doc(hidden)]
+    pub(crate) repositories: Vec<GitRemoteRepository>,
+}
+
+/// Selects the configuration directory whose machine-wide state to 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(crate) struct GlobalStateLoadForConfigDirRequest {
+    /// Copilot configuration directory to read the state document from, taking precedence over the server's own `COPILOT_HOME` and default home. Omit it, or pass an empty string, to read the directory the server resolved for itself.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub config_dir: Option<String>,
+}
+
+/// Installed plugin record from global state, 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 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,
+    /// 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>,
+}
+
+/// An account the host has signed in to, identified by the server it lives on and the login it uses there. The same person can appear more than once when they use both github.com and an Enterprise 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(crate) struct LoggedInUser {
+    /// Source account this account was derived from, when one was recorded.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub derived_from: Option<String>,
+    /// Host the account belongs to, such as `github.com` or an Enterprise server.
+    pub host: String,
+    /// Account kind, when the host recorded one. Consumers must tolerate new strings.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub kind: Option<String>,
+    /// Account login on that host.
+    pub login: String,
+}
+
+/// The host's machine-wide state. Every field is optional because a fresh install has recorded nothing yet, so a reader must treat an absent field as `not yet`, never as a negative answer. Stored credentials are deliberately absent from this shape.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct GlobalStateLoadResult {
+    /// Whether the app tip has been shown.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub app_tip_shown: Option<bool>,
+    /// Terminals the user has already been asked to set up, so the host does not ask twice.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub asked_setup_terminals: Option<Vec<String>>,
+    /// When the Auto-feedback hint was last shown, as an ISO 8601 timestamp. It enforces the once-per-day cap for non-staff users across restarts.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub auto_feedback_last_prompted_at: Option<String>,
+    /// When the host first ran on this machine.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub first_launch_at: Option<String>,
+    /// Plugins installed on this machine.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub installed_plugins: Option<Vec<InstalledPlugin>>,
+    /// Account used for the most recent sign-in.
+    #[doc(hidden)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub(crate) last_logged_in_user: Option<LoggedInUser>,
+    /// Every account the host has signed in to on this machine.
+    #[doc(hidden)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub(crate) logged_in_users: Option<Vec<LoggedInUser>>,
+    /// Whether the one-off cleanup of stored reasoning summaries has run.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub reasoning_summaries_cleanup_done: Option<bool>,
+    /// Models the user selected recently, most recent first.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub recent_model_ids: Option<Vec<String>>,
+    /// Whether the user declined to trust the sandbox credential proxy CA.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub sandbox_credential_proxy_ca_declined: Option<bool>,
+    /// Whether the sandbox onboarding has been shown.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub sandbox_onboarding_shown: Option<bool>,
+    /// Whether the user is a GitHub or Microsoft staff member, which unlocks internal-only behavior.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub staff: Option<bool>,
+    /// Whether the user was recognized as GitHub staff.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub staff_github: Option<bool>,
+    /// When the staff-only log level migration last ran.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub staff_log_level_migration_at: Option<String>,
+    /// Whether the user was recognized as Microsoft staff.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub staff_microsoft: Option<bool>,
+    /// When the staff-only model reset last ran.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub staff_model_reset_at: Option<String>,
+    /// When the staff-only update channel migration last ran.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub staff_update_channel_migration_at: Option<String>,
+    /// Folders where the user declined the init prompt, so it stays hidden there.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub suppress_init_folders: Option<Vec<String>>,
+    /// Folders the user has marked as trusted.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub trusted_folders: Option<Vec<String>>,
+}
+
+/// A single top-level key to record in the host's machine-wide state. The write replaces only that key and leaves the rest of the document untouched, so two writers recording different one-off flags do not overwrite each other. The stored credential keys cannot be written 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, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub(crate) struct GlobalStateWriteKeyRequest {
+    /// Copilot configuration directory to write the state document in, taking precedence over the server's own `COPILOT_HOME` and default home. Omit it, or pass an empty string, to write the directory the server resolved for itself. Mirrors `globalState.loadForConfigDir`, so a caller can read and write the same directory.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub config_dir: Option<String>,
+    /// Top-level key to write, named as it appears in the result of `globalState.load`. It must be one of the writable keys that `globalState.writeKey` lists.
+    pub key: String,
+    /// Value to store for the key. Omit it, or pass null, to remove the key instead.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub value: Option<serde_json::Value>,
+}
+
 /// Pending external tool call request ID, with the tool result or an error describing why it failed.
 ///
 /// <div class="warning">
@@ -8377,6 +9851,63 @@ pub struct HooksDiscoverRequest {
     pub project_paths: Option<Vec<String>>,
 }
 
+/// Extensible [`HooksDiscoverRequest`], including inputs added after it was published.
+///
+/// Required inputs are [`HooksDiscoverOptions::new`] arguments; optional inputs have fluent setters.
+/// Input-only: it serialises to the flat wire request and is not deserialisable.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type 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)]
+#[serde(rename_all = "camelCase")]
+pub struct HooksDiscoverOptions {
+    #[serde(flatten)]
+    legacy: HooksDiscoverRequest,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    hook_directories: Option<Vec<String>>,
+}
+
+impl HooksDiscoverOptions {
+    /// Creates options with the required inputs.
+    pub fn new() -> Self {
+        Self {
+            legacy: HooksDiscoverRequest {
+                project_paths: None,
+                exclude_host_hooks: None,
+            },
+            hook_directories: None,
+        }
+    }
+
+    /// Optional project directory paths whose trusted repository and project-expanded plugin hooks should be discovered. When omitted or empty, user, managed-policy, and globally enabled installed or explicit plugin hooks are returned without project expansion.
+    pub fn project_paths(mut self, value: Vec<String>) -> Self {
+        self.legacy.project_paths = Some(value);
+        self
+    }
+
+    /// When true, omit host-owned user and plugin hook rows and their diagnostics. Managed-policy hooks and trusted repository hooks remain visible, and host disabledHooks still contribute to each remaining row's effective enabled state. This filters sources rather than simulating a host with no settings.
+    pub fn exclude_host_hooks(mut self, value: bool) -> Self {
+        self.legacy.exclude_host_hooks = Some(value);
+        self
+    }
+
+    /// Explicit discovery-only file-hook roots, separate from callback hooks and filesystem grants. Available without ambient discovery or repository file-hook enablement, subject to managed/hook disables. Relative paths resolve against the request's effective working directory when supplied. Null and omission are equivalent; an empty array contributes no explicit roots.
+    pub fn hook_directories(mut self, value: Vec<String>) -> Self {
+        self.hook_directories = Some(value);
+        self
+    }
+}
+
+impl Default for HooksDiscoverOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 /// Server-discovered hook actions and partial-load diagnostics from user, repository, plugin, and managed-policy sources. Concrete sessions may include additional session-specific hook sources.
 ///
 /// <div class="warning">
@@ -8411,6 +9942,9 @@ pub struct HostGitHubEnvironmentOptions {
     pub compute_id: String,
     /// Human-readable environment display name.
     pub name: String,
+    /// Require sealed, connection-bound authentication (default true), independent of listener address. False permits unsealed direct credentials and unbound sealed relay credentials; use only when the caller fully controls and trusts the direct transport. Relay token encryption remains mandatory.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub require_connection_binding: Option<bool>,
 }
 
 /// Normalized local WebSocket listener settings.
@@ -8507,6 +10041,13 @@ pub struct HostEnvironmentCredentials {
 }
 
 /// Reports a supervised listener's hosting-task termination and cleanup outcome.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 HostExitedNotification {
@@ -8522,6 +10063,64 @@ pub struct HostExitedNotification {
     pub reason: HostExitReason,
 }
 
+/// Reads a running host's catalog or the runtime's saved default catalog.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 HostListSessionsRequest {
+    /// Listener UUID returned by host.start; the caller must own it. Omit to read
+    /// the saved default compute-identity catalog without starting a listener.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub host_id: Option<String>,
+}
+
+/// Metadata advertised by the AHP host, not a guarantee that history can be resumed.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 HostSessionSummary {
+    /// Optional activity description advertised by the host.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub activity: Option<String>,
+    /// Session creation time as an ISO 8601 timestamp.
+    pub created_at: String,
+    /// Last modification time as an ISO 8601 timestamp.
+    pub modified_at: String,
+    /// Stable AHP resource URI identifying the session on this host.
+    pub resource: String,
+    /// Unsigned 32-bit AHP session status bitset (0..=4294967295); unknown bits must be preserved.
+    pub status: i64,
+    /// Authoritative title advertised by the host.
+    pub title: String,
+}
+
+/// The complete live and dormant advertised catalog, without subscribing to 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 HostListSessionsResult {
+    /// Complete advertised session summaries, in the host's catalog order.
+    pub sessions: Vec<HostSessionSummary>,
+}
+
 /// Local WebSocket transport options.
 ///
 /// <div class="warning">
@@ -8604,6 +10203,13 @@ pub struct HostReadyRequest {
 }
 
 /// Listener-scoped registration, not a copy or durable adoption of 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 HostRegisterSessionRequest {
@@ -8626,6 +10232,13 @@ pub struct HostRegisterSessionRequest {
 }
 
 /// Application callback routed over its existing SDK connection.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 HostSessionCreateCallback {
@@ -8655,6 +10268,10 @@ pub struct HostSessionCreateRequest {
     pub config: HashMap<String, serde_json::Value>,
     /// Unique identity for this participation, independent of the session lifetime.
     pub handoff_id: String,
+    /// For an explicit publication, borrow an existing owning-connection resident
+    /// instead of invoking the resume factory. Cold sessions still use the factory.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub prefer_resident: Option<bool>,
     /// Resume an app-owned durable session instead of creating a new session.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub resume: Option<bool>,
@@ -8676,6 +10293,13 @@ pub struct HostSessionCreateResult {
 }
 
 /// Releases the original application session object retained for one handoff.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 HostSessionReleasedNotification {
@@ -8727,6 +10351,72 @@ pub struct HostStartRequest {
     pub session_factory: Option<bool>,
 }
 
+/// Extensible [`HostStartRequest`], including inputs added after it was published.
+///
+/// Required inputs are [`HostStartOptions::new`] arguments; optional inputs have fluent setters.
+/// Input-only: it serialises to the flat wire request and is not deserialisable.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type 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)]
+#[serde(rename_all = "camelCase")]
+pub struct HostStartOptions {
+    #[serde(flatten)]
+    legacy: HostStartRequest,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    compute_id: Option<String>,
+}
+
+impl HostStartOptions {
+    /// Creates options with the required inputs.
+    pub fn new(host_id: impl Into<String>) -> Self {
+        Self {
+            legacy: HostStartRequest {
+                host_id: host_id.into(),
+                local_server: None,
+                github_environment: None,
+                session_factory: None,
+                resume_factory: None,
+            },
+            compute_id: None,
+        }
+    }
+
+    /// Enables a local WebSocket listener.
+    pub fn local_server(mut self, value: HostLocalServerOptions) -> Self {
+        self.legacy.local_server = Some(value);
+        self
+    }
+
+    /// Registers a GitHub Mission Control environment and enables its relay transport.
+    pub fn github_environment(mut self, value: HostGitHubEnvironmentOptions) -> Self {
+        self.legacy.github_environment = Some(value);
+        self
+    }
+
+    /// Ask the owning SDK application to materialize AHP sessions.
+    pub fn session_factory(mut self, value: bool) -> Self {
+        self.legacy.session_factory = Some(value);
+        self
+    }
+
+    /// Ask the owning application to resume its durable AHP sessions.
+    pub fn resume_factory(mut self, value: bool) -> Self {
+        self.legacy.resume_factory = Some(value);
+        self
+    }
+
+    /// Stable application identity selecting its durable host catalog. Defaults to the persisted runtime compute GUID; must agree with githubEnvironment.computeId when both are supplied.
+    pub fn compute_id(mut self, value: impl Into<String>) -> Self {
+        self.compute_id = Some(value.into());
+        self
+    }
+}
+
 /// Listener readiness, returned only after binding and the supervised participant's SDK handshake.
 ///
 /// <div class="warning">
@@ -9418,43 +11108,6 @@ pub struct InstallationConfirmationResponse {
     pub review_fingerprint: String,
 }
 
-/// Installed plugin record from global state, 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 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,
-    /// 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>,
-}
-
 /// Information about an installed plugin tracked in global state.
 ///
 /// <div class="warning">
@@ -9603,6 +11256,36 @@ pub struct InstructionDiscoveryPathList {
     pub paths: Vec<InstructionDiscoveryPath>,
 }
 
+/// Explicit discovery arguments for one location, supplied by the caller rather than derived from 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(crate) struct InstructionsDiscoverRepoSourcesRequest {
+    /// Extra directories to scan alongside instruction directories configured in the runtime environment.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub additional_dirs: Option<Vec<String>>,
+    /// Copilot configuration directory for user-level sources. An omitted or empty value uses the server's configuration home.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub config_dir: Option<String>,
+    /// Working directory whose instruction sources should also be included. Omission adds no separate working-directory scope.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub cwd_path: Option<String>,
+    /// When true, also discover instruction files nested below the location.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub enable_child_instructions: Option<bool>,
+    /// When true, include the sources a command-line host reads. Hosts that are not the CLI omit it.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub is_cli: Option<bool>,
+    /// Repository location to discover. An empty string selects no repository scope; cwdPath can still supply working-directory sources.
+    pub location: String,
+}
+
 /// Optional project paths to include in instruction discovery.
 ///
 /// <div class="warning">
@@ -9622,6 +11305,63 @@ pub struct InstructionsDiscoverRequest {
     pub project_paths: Option<Vec<String>>,
 }
 
+/// Extensible [`InstructionsDiscoverRequest`], including inputs added after it was published.
+///
+/// Required inputs are [`InstructionsDiscoverOptions::new`] arguments; optional inputs have fluent setters.
+/// Input-only: it serialises to the flat wire request and is not deserialisable.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type 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)]
+#[serde(rename_all = "camelCase")]
+pub struct InstructionsDiscoverOptions {
+    #[serde(flatten)]
+    legacy: InstructionsDiscoverRequest,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    instruction_directories: Option<Vec<String>>,
+}
+
+impl InstructionsDiscoverOptions {
+    /// Creates options with the required inputs.
+    pub fn new() -> Self {
+        Self {
+            legacy: InstructionsDiscoverRequest {
+                project_paths: None,
+                exclude_host_instructions: None,
+            },
+            instruction_directories: None,
+        }
+    }
+
+    /// 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).
+    pub fn project_paths(mut self, value: Vec<String>) -> Self {
+        self.legacy.project_paths = Some(value);
+        self
+    }
+
+    /// 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.
+    pub fn exclude_host_instructions(mut self, value: bool) -> Self {
+        self.legacy.exclude_host_instructions = Some(value);
+        self
+    }
+
+    /// Explicit discovery-only instruction roots using existing SDK instruction formats, not filesystem grants. Available without ambient discovery, subject to instruction/managed disables. Relative paths resolve against the request's effective working directory when supplied. Null and omission are equivalent; an empty array contributes no explicit roots.
+    pub fn instruction_directories(mut self, value: Vec<String>) -> Self {
+        self.instruction_directories = Some(value);
+        self
+    }
+}
+
+impl Default for InstructionsDiscoverOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 /// Optional project paths to include when enumerating instruction discovery targets.
 ///
 /// <div class="warning">
@@ -9641,6 +11381,63 @@ pub struct InstructionsGetDiscoveryPathsRequest {
     pub project_paths: Option<Vec<String>>,
 }
 
+/// Extensible [`InstructionsGetDiscoveryPathsRequest`], including inputs added after it was published.
+///
+/// Required inputs are [`InstructionsGetDiscoveryPathsOptions::new`] arguments; optional inputs have fluent setters.
+/// Input-only: it serialises to the flat wire request and is not deserialisable.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type 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)]
+#[serde(rename_all = "camelCase")]
+pub struct InstructionsGetDiscoveryPathsOptions {
+    #[serde(flatten)]
+    legacy: InstructionsGetDiscoveryPathsRequest,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    instruction_directories: Option<Vec<String>>,
+}
+
+impl InstructionsGetDiscoveryPathsOptions {
+    /// Creates options with the required inputs.
+    pub fn new() -> Self {
+        Self {
+            legacy: InstructionsGetDiscoveryPathsRequest {
+                project_paths: None,
+                exclude_host_instructions: None,
+            },
+            instruction_directories: None,
+        }
+    }
+
+    /// Optional list of project directory paths. When omitted or empty, only the user-level targets are returned.
+    pub fn project_paths(mut self, value: Vec<String>) -> Self {
+        self.legacy.project_paths = Some(value);
+        self
+    }
+
+    /// When true, omit the host's user-level instruction targets, leaving only repository targets. For multitenant deployments (mirrors `discover`'s `excludeHostInstructions`).
+    pub fn exclude_host_instructions(mut self, value: bool) -> Self {
+        self.legacy.exclude_host_instructions = Some(value);
+        self
+    }
+
+    /// Explicit discovery-only instruction roots to enumerate, including configured missing directories. Relative paths resolve against the request's effective working directory when supplied. These are not filesystem grants or preferred creation targets. Null and omission are equivalent.
+    pub fn instruction_directories(mut self, value: Vec<String>) -> Self {
+        self.instruction_directories = Some(value);
+        self
+    }
+}
+
+impl Default for InstructionsGetDiscoveryPathsOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 /// Loaded instruction source for a session, including path, content, category, location, applicability, and optional description.
 ///
 /// <div class="warning">
@@ -9693,6 +11490,21 @@ pub struct InstructionsGetSourcesResult {
     pub sources: Vec<InstructionSource>,
 }
 
+/// The prompt the init command runs.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct InstructionsInitPromptResult {
+    /// Prompt text authoring repository instructions.
+    pub prompt: String,
+}
+
 /// Parameters for interrupting the main agent turn.
 ///
 /// <div class="warning">
@@ -9991,6 +11803,21 @@ pub struct LocalSessionMetadataValue {
     pub summary: Option<String>,
 }
 
+/// Which stored location permissions were dropped because their directory is gone.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct LocationPermissionsCleanupResult {
+    /// Location keys whose grants were removed. Empty when every stored location still exists.
+    pub removed_location_keys: Vec<String>,
+}
+
 /// Message text, optional severity level, persistence flag, optional follow-up URL, and optional tip.
 ///
 /// <div class="warning">
@@ -10084,6 +11911,92 @@ pub struct ManagedMcpServerConfig {
     pub url: 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 ManagedPermissionOperation {
+    /// Operation to evaluate. Currently only url is supported.
+    pub kind: ManagedPermissionOperationKind,
+    /// Absolute HTTP(S) URL with a host. Invalid URLs reject the entire evaluation batch.
+    pub url: 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 ManagedPermissionEvaluation {
+    /// Original input operation associated with this verdict.
+    pub operation: ManagedPermissionOperation,
+    /// Managed-policy decision only; never bypasses user permissions or other security controls.
+    pub verdict: ManagedPermissionVerdict,
+}
+
+/// Managed policy context and ordered operations for pure, sessionless evaluation.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 ManagedPermissionsEvaluateRequest {
+    /// Trusted, reusable managed permission policy snapshot; no policy is discovered during evaluation.
+    pub context: ManagedPermissionsContext,
+    /// Operations to evaluate, preserving input order and duplicates. An empty batch is valid.
+    pub operations: Vec<ManagedPermissionOperation>,
+}
+
+/// Ordered managed permission verdicts and the supplied policy's fail-closed posture.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 ManagedPermissionsEvaluateResult {
+    /// Managed permission policy could not be determined; every operation is denied.
+    pub fail_closed: bool,
+    /// One verdict per input operation, in the same order, including duplicates.
+    pub results: Vec<ManagedPermissionEvaluation>,
+}
+
+/// Retry outcome for one plugin required by managed 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 ManagedPluginRetryEntry {
+    /// Why the plugin was not prepared. Present when `status` is `failed` or `deferred`.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub error: Option<String>,
+    /// Plugin spec in "plugin@marketplace" form.
+    pub spec: String,
+    /// What the retry did for this plugin.
+    pub status: ManagedPluginRetryStatus,
+}
+
 /// Lock state and provenance of one managed setting.
 ///
 /// <div class="warning">
@@ -10097,10 +12010,46 @@ pub struct ManagedMcpServerConfig {
 pub struct ManagedSettingMeta {
     /// Whether users and repositories may choose a different value. `false` means policy locks the value.
     pub overridable: bool,
+    /// Original managed value when the runtime adjusted it to a supported effective value. Omitted when no adjustment was needed.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub requested: Option<String>,
     /// Channel that supplied this scalar value, matching a `layers[].source`: `device`, `server`, or `policyHelper`. These scalar defaults select one winning channel, not a mixed source. Treat unknown values as additional channels; more may be added.
     pub source: String,
 }
 
+/// A user settings document and the effective managed policy whose controlled entries should be stamped onto 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(crate) struct ManagedSettingsApplyControlsParams {
+    /// The effective managed policy, as composed by `managedSettings.resolveEffectiveValue`. Omit it on an unmanaged host: the settings then come back unchanged.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub managed: Option<serde_json::Value>,
+    /// The user settings document to stamp. Entries the managed layer does not name are returned exactly as supplied.
+    pub settings: serde_json::Value,
+}
+
+/// The user settings with the managed layer's controlled entries stamped on.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct ManagedSettingsApplyControlsResult {
+    /// The resulting settings document.
+    pub settings_json: serde_json::Value,
+}
+
 /// One candidate channel; absent settings represents a channel that delivered no document.
 ///
 /// <div class="warning">
@@ -10185,6 +12134,12 @@ pub struct ManagedSettingsMeta {
     /// Lock state and provenance of `values.autoTier`.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub auto_tier: Option<ManagedSettingMeta>,
+    /// Lock state and provenance of `values.contextTier`.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub context_tier: Option<ManagedSettingMeta>,
+    /// Lock state and provenance of `values.effortLevel`.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub effort_level: Option<ManagedSettingMeta>,
     /// Lock state and provenance of `values.model`.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub model: Option<ManagedSettingMeta>,
@@ -10201,20 +12156,23 @@ pub struct ManagedSettingsMeta {
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct ManagedSettingsResolvedData {
-    /// Whether enterprise policy disables bypass-permissions ("yolo") mode for this session. Deny-wins across layers, and forced on when `failClosed` is true.
+    /// Whether an explicit enterprise policy restriction disables bypass-permissions ("yolo") mode for this session. Deny-wins across layers; an unresolved policy does not force this on by itself.
     pub bypass_permissions_disabled: bool,
     /// 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.
+    /// Whether managed policy could not be determined (e.g. a failed server fetch) and unresolved-policy safeguards remain active. This does not by itself disable bypass-permissions; `bypassPermissionsDisabled` reports only an explicit policy restriction.
     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 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>,
+    /// Reusable retained managed permission policy for managedSettings.permissions.evaluate, including source composition and session-local injection. Provided by live session snapshots; absent in older events. Refresh the context when managed policy changes.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub permissions_context: Option<ManagedPermissionsContext>,
     /// Whether the policy-helper managed-settings layer was present. The policy helper is the weakest channel: it fills keys no enterprise source set and can never replace one.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub policy_helper_managed: Option<bool>,
@@ -10244,7 +12202,13 @@ pub struct ManagedSettingsValues {
     /// Managed Auto routing preference, used when the selected model is `auto`.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub auto_tier: Option<AutoTier>,
-    /// Managed default model identifier, as configured. New sessions start with it; it can name a model the account cannot use, so hosts match it against the listed models.
+    /// Managed context-tier default for the managed concrete model.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub context_tier: Option<ContextTier>,
+    /// Managed reasoning-effort default for the managed concrete model. The runtime clamps it to an entitled effort when model availability is known.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub effort_level: Option<String>,
+    /// Managed default model identifier. When model availability was resolved, aliases and family names are projected to a concrete available model ID; otherwise the configured value is returned.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub model: Option<String>,
 }
@@ -10274,6 +12238,272 @@ pub struct ManagedSettingsComposeResult {
     pub values: Option<ManagedSettingsValues>,
 }
 
+/// Inputs describing the host and account an ingestion should resolve managed policy 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(crate) struct ManagedSettingsIngestParams {
+    /// The authenticated identity to resolve policy for. Omitted before sign-in, in which case no server layer is fetched.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub auth_info: Option<serde_json::Value>,
+    /// Whether to ignore a cached server policy when reading, forcing the resolution to come from a live fetch.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub bypass_cache_read: Option<bool>,
+    /// Name of the embedding client, reported to the managed-settings service as `client_id` so it can refuse to deliver a policy this client is too old to enforce. Omit it and the runtime reports a generic identity; the runtime version sent alongside is the gate that actually matters.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub client_name: Option<String>,
+    /// A device layer supplied by the host instead of discovered from the machine. Pair it with `hasDeviceResponse` so an explicit absence is distinguishable from an omitted override.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub device_response: Option<serde_json::Value>,
+    /// The host's environment variables, read for cache location and policy overrides. Supplied by the host rather than read from the runtime process so a command that selected its own configuration home is honored.
+    pub environment: serde_json::Value,
+    /// Whether `deviceResponse` is an override at all. True with a null `deviceResponse` asserts the device layer is empty; false discovers it from the machine.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub has_device_response: Option<bool>,
+    /// The host's home directory, used to resolve cache and managed-file locations.
+    pub home_directory: String,
+    /// The host's platform, in Node's `process.platform` spelling, used to locate platform-specific cache and policy paths.
+    pub platform: String,
+    /// Whether a configured platform policy helper may be run to produce an enforced helper layer.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub policy_helper_enabled: Option<bool>,
+    /// The policy-helper invocation reason. Defaults to sessionStart.
+    #[doc(hidden)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub(crate) policy_helper_reason: Option<ManagedSettingsPolicyHelperReason>,
+    /// Directory the policy helper runs in when this ingestion is not owned by a registered session. A host resolving policy before its session exists must pass this, or a directory-sensitive helper judges the wrong repository.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub policy_helper_working_directory: Option<String>,
+    /// Whether to run ingestion. Omit or set false to return an empty result without discovering or fetching policy.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub self_fetch: Option<bool>,
+    /// How this ingestion may use the on-disk server-policy cache. Defaults to the runtime's own policy when omitted.
+    #[doc(hidden)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub(crate) server_policy_cache_mode: Option<ManagedSettingsServerPolicyCacheMode>,
+    /// The session whose credential store and working directory the policy helper should use. Omit it when no session exists yet and the process-wide store applies.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub session_id: Option<SessionId>,
+    /// User agent to send with the policy fetch.
+    pub user_agent: String,
+}
+
+/// One diagnostic emitted while ingesting managed settings. Returned rather than logged by the runtime so the host decides where ingestion diagnostics go, which matters because an ingestion runs before a session exists to carry a log sink.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct ManagedSettingsLogMessage {
+    /// Severity of this diagnostic.
+    #[doc(hidden)]
+    pub(crate) level: ManagedSettingsLogLevel,
+    /// Human-readable diagnostic text.
+    pub message: String,
+}
+
+/// The managed policy layers an ingestion resolved, together with the per-layer outcome flags a host needs to decide how much to trust the result. The flags are reported rather than folded into the settings because a host must be able to distinguish an unmanaged device from a managed device whose policy could not be confirmed, and apply its fail-closed gates in the second 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, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub(crate) struct ManagedSettingsIngestResult {
+    /// The device layer could not be read, so it is unconfirmed rather than known-absent.
+    pub device_load_failed: bool,
+    /// The device layer discovered from the machine, when one exists.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub device_response: Option<serde_json::Value>,
+    /// The sandbox floor contributed by the device layer.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub device_sandbox_floor: Option<serde_json::Value>,
+    /// Whether the device layer's sandbox intent could not be determined, so a consumer must not read its absence as permission to run unsandboxed.
+    pub device_sandbox_undetermined: bool,
+    /// A device-managed policy is known to exist.
+    pub device_source_found: bool,
+    /// Diagnostics emitted while resolving the layers, in the order they occurred.
+    #[doc(hidden)]
+    pub(crate) log_messages: Vec<ManagedSettingsLogMessage>,
+    /// The effective managed permissions layer, when the resolved policy carries one.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub permissions: Option<serde_json::Value>,
+    /// Which channel registered the policy helper that produced the helper layer.
+    #[doc(hidden)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub(crate) policy_helper_authority: Option<ManagedSettingsPolicyHelperAuthority>,
+    /// A policy helper is configured for this host.
+    pub policy_helper_configured: bool,
+    /// The policy helper's failure must be treated as fail-closed rather than ignored.
+    pub policy_helper_fail_closed: bool,
+    /// The policy helper was configured but could not be run or its output could not be read.
+    pub policy_helper_load_failed: bool,
+    /// The layer produced by the platform policy helper, when one ran.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub policy_helper_response: Option<serde_json::Value>,
+    /// A live fetch failed but a recent cached entry was served in its place, so `serverFetchFailed` stays false. Lets a consumer distinguish a clean fetch from a cache-backed fallback.
+    pub server_cache_fallback: bool,
+    /// Minimum client version requested by a successful response. Advisory only; the delivered policy remains active.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub server_client_update_requested: Option<String>,
+    /// The server refused to deliver a policy because this client is too old to enforce it, carrying the user-facing sentence describing the refusal. No retry will help; the remedy is a client update. Gates that exist only because of managed policy should deny on this rather than falling back to their unmanaged default.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub server_client_update_required: Option<String>,
+    /// The error that made the server fetch fail, when one did.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub server_fetch_error: Option<String>,
+    /// The server fetch failed and no cached entry stood in for it, so the server layer is unconfirmed and fail-closed gates apply.
+    pub server_fetch_failed: bool,
+    /// The server fetch failed while a policy demanded a fresh confirmation, which is the strict posture an enterprise opted into rather than an ordinary transient failure.
+    pub server_forced_refresh_failure: bool,
+    /// The synthesized fail-closed permissions layer applied in place of a policy a refused client may not enforce.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub server_permissions_floor: Option<serde_json::Value>,
+    /// How the server layer was resolved.
+    #[doc(hidden)]
+    pub(crate) server_resolution: ManagedSettingsServerPolicyResolution,
+    /// The account's server-delivered policy, when one was resolved.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub server_response: Option<serde_json::Value>,
+    /// The server fetch failed in a way a later retry could succeed at, as opposed to a refusal that no retry will change.
+    pub server_retryable_failure: bool,
+    /// The sandbox object from a cached server policy that a forced refresh declined to serve in full. Folded back into the effective sandbox layer so an outage during a forced refresh still synthesizes the fail-closed sandbox floor from the administrator's known intent.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub server_sandbox_floor: Option<serde_json::Value>,
+    /// A server-managed policy is known to exist even though `serverResponse` is intentionally unset. Consumers should OR this with the presence of `serverResponse` when deciding whether the device is managed, so a fresh start during an outage still applies the fail-closed gates instead of treating the device as unmanaged.
+    pub server_source_found: bool,
+    /// No usable token was available, so no server fetch was attempted.
+    pub server_token_unavailable: bool,
+    /// The effective managed settings composed from every resolved layer. Omitted when no layer set anything, so an unmanaged host locks nothing.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub settings: Option<serde_json::Value>,
+}
+
+/// Inputs describing the host and account whose managed remote-control policy should be resolved. Mirrors `managedSettings.ingest`, and deliberately carries no retention decision: reading this gate never becomes this runtime process's startup 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(crate) struct ManagedSettingsLoadRemoteControlParams {
+    /// The authenticated identity to resolve policy for. Omitted before sign-in, in which case no server layer is fetched.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub auth_info: Option<serde_json::Value>,
+    /// Name of the embedding client, reported to the managed-settings service as `client_id` so it can refuse to deliver a policy this client is too old to enforce. That refusal is exactly what turns into an explicit `disabled` below, so a host that omits this field forfeits the protection.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub client_name: Option<String>,
+    /// A device layer supplied by the host instead of discovered from the machine. Pair it with `hasDeviceResponse` so an explicit absence is distinguishable from an omitted override.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub device_response: Option<serde_json::Value>,
+    /// The host's environment variables, read for cache location and policy overrides.
+    pub environment: serde_json::Value,
+    /// Whether `deviceResponse` is an override at all. True with a null `deviceResponse` asserts the device layer is empty; false discovers it from the machine.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub has_device_response: Option<bool>,
+    /// The host's home directory, used to resolve cache and managed-file locations.
+    pub home_directory: String,
+    /// The host's platform, in Node's `process.platform` spelling, used to locate platform-specific cache and policy paths.
+    pub platform: String,
+    /// Whether a configured platform policy helper may be run to produce an enforced helper layer.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub policy_helper_enabled: Option<bool>,
+    /// The policy-helper invocation reason. Defaults to sessionStart.
+    #[doc(hidden)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub(crate) policy_helper_reason: Option<ManagedSettingsPolicyHelperReason>,
+    /// Whether to run ingestion. Omit or set false to return an empty result without discovering or fetching policy.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub self_fetch: Option<bool>,
+    /// User agent to send with the policy fetch.
+    pub user_agent: String,
+}
+
+/// The managed remote-control policy in force for an account, if any. An absent policy means the account is unmanaged for this capability, which a host reads as allowed — so absence here is a positive statement that no policy applies, never a stand-in for a resolution that failed. A resolution that cannot be completed is rejected instead.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct ManagedSettingsLoadRemoteControlResult {
+    /// The account's `remoteControl` policy document. Absent when no managed policy governs remote control for this account. Reported as an explicit disabled policy, rather than as absence, when the service refused to deliver a policy this client is too old to enforce.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub remote_control: Option<serde_json::Value>,
+}
+
+/// The client-supplied managed settings to validate and normalize. Omitting them is valid and yields no 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(crate) struct ManagedSettingsParseClientValueParams {
+    /// The managed settings a client is supplying for a session it is about to open. Omit them when the client is imposing no policy of its own.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub settings: Option<serde_json::Value>,
+}
+
+/// The accepted managed settings, reduced to the keys a client is allowed to 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(crate) struct ManagedSettingsParseClientValueResult {
+    /// The normalized settings. Omitted when the client supplied none. An accepted document that sets nothing comes back as an empty object, which is distinct from omission.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub settings_json: Option<serde_json::Value>,
+}
+
+/// The device-managed settings layer, with the sandbox floor and the load outcome a host needs to compose it into an effective 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(crate) struct ManagedSettingsReadDeviceResult {
+    /// Whether discovery or validation failed. A host must treat this as "policy unknown" rather than "no policy": absent settings with this set false mean the device genuinely has none.
+    pub load_failed: bool,
+    /// Sandbox floor read from the discovered document before validation, so a document that is otherwise rejected can still raise the floor it declared.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub sandbox_floor: Option<serde_json::Value>,
+    /// Validated, canonical device-managed settings. Omitted when no device policy was discovered, when the discovered document failed validation, or when it validated to an empty object — an empty document carries no policy, and reporting it as present would outrank layers that do.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub settings: Option<serde_json::Value>,
+}
+
 /// Validated device-managed settings discovered before a session exists.
 ///
 /// <div class="warning">
@@ -10293,6 +12523,115 @@ pub struct ManagedSettingsReadResult {
     pub settings_json: Option<serde_json::Value>,
 }
 
+/// The bypass-permissions state a host holds today, the account now signed in, and what the managed-policy resolution said.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct ManagedSettingsResolveBypassDisableTransitionParams {
+    /// The account signed in now. A `managed` disable pinned to a different account is lifted.
+    pub active_identity: String,
+    /// The account a `managed` disable is pinned to. Omit it when the current source is not `managed`; it is ignored for the other sources.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub current_managed_identity: Option<String>,
+    /// Which layer currently disables bypass mode. Omit it when nothing does.
+    #[doc(hidden)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub(crate) current_source: Option<ManagedSettingsBypassDisableSource>,
+    /// What the resolution said about bypass mode. Send `unknown` rather than omitting the field when there is no verdict.
+    #[doc(hidden)]
+    pub(crate) policy: ManagedSettingsBypassPolicyResolution,
+}
+
+/// The bypass-permissions state a host should hold after the resolution, and what it must do to get there.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct ManagedSettingsResolveBypassDisableTransitionResult {
+    /// The account the returned `managed` source is pinned to. Store it alongside `source`; the next call needs it to decide whether an account switch lifts the disable.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub managed_identity: Option<String>,
+    /// The value to store in the host's own bypass-disabled flag. Omitted means leave it exactly as it is, which is not the same as being told to store `false`.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub set_disabled_state: Option<bool>,
+    /// Which layer disables bypass mode after this resolution. Omitted when none does, which is what a lifted disable looks like.
+    #[doc(hidden)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub(crate) source: Option<ManagedSettingsBypassDisableSource>,
+    /// Whether a bypass-permissions session already running must be turned off. True only when this resolution newly disables bypass mode, so a host that is already compliant is not interrupted.
+    pub suppress_runtime_allow_all: bool,
+}
+
+/// The credential and environment to evaluate the device-channel sign-in pin against.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct ManagedSettingsResolveDeviceForceLoginOrgsGateParams {
+    /// The authenticated identity to judge. Omitted when signed out, which is the case the device channel exists to serve: it can refuse a first sign-in before any credential exists.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub auth_info: Option<serde_json::Value>,
+    /// The host's environment variables. Read for the variables that would make an identity's membership snapshot forgeable, so a credential whose provenance cannot be trusted is refused rather than accepted.
+    pub environment: serde_json::Value,
+}
+
+/// The managed-settings layers to compose into an effective policy. Every layer is optional; omitting all of them yields no effective 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(crate) struct ManagedSettingsResolveEffectiveValueParams {
+    /// The device sandbox floor, folded into the device layer under `sandbox` before composition.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub device_sandbox_floor: Option<serde_json::Value>,
+    /// The device layer: native MDM and managed-file settings describing the machine rather than the account.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub mdm: Option<serde_json::Value>,
+    /// The policy-helper layer, an enforced channel sourced from a platform policy helper process.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub policy_helper: Option<serde_json::Value>,
+    /// The account's server-delivered org policy, as returned by a managed-settings fetch. Omitted before sign-in or when the fetch has not landed.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub server: Option<serde_json::Value>,
+}
+
+/// The effective managed policy composed from the supplied layers.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct ManagedSettingsResolveEffectiveValueResult {
+    /// The composed effective managed settings. Omitted when no layer sets anything, so an unmanaged host locks nothing. Carries `sandboxAdvisoryFloorDeclined: true` when an advisory server force-on was dropped because this host cannot run the sandbox.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub settings_json: Option<serde_json::Value>,
+}
+
 /// Optional opaque account selection or GitHub token whose managed settings are resolved.
 ///
 /// <div class="warning">
@@ -10313,6 +12652,9 @@ pub struct ManagedSettingsResolveRequest {
     /// Opaque account identifier returned by `account.getAllUsers`. When omitted, the current account is used, or device policy only when no account is signed in.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub selection_id: Option<String>,
+    /// Working directory used to run an organization policy helper. When omitted, sessionless resolution does not run the helper.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub working_directory: Option<String>,
 }
 
 /// Effective enterprise managed settings for an account, resolved without a session.
@@ -10336,6 +12678,9 @@ pub struct ManagedSettingsResolveResult {
     /// Per-key lock state and provenance for the entries in `values`, using the same key names.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub meta: Option<ManagedSettingsMeta>,
+    /// Reusable source-composed permission policy for managedSettings.permissions.evaluate. Unlike resolved.settings.permissions, this retains every source's allowlist and default-prompt semantics. Refresh through resolve when account/device policy changes. Absent on runtimes that do not support permission evaluation.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub permissions_context: Option<ManagedPermissionsContext>,
     /// Effective managed settings from the device and account (server) channels, in the same shape as `session.managedSettings.get`, excluding session-local injection.
     pub resolved: ManagedSettingsResolvedData,
     /// Typed effective values of managed settings, keyed like the managed-settings schema and already resolved across channels, with the `{ "overridable": ... }` wrapper removed. Present when policy sets at least one typed key. Keys not typed here are available in `resolved.settings`.
@@ -10343,6 +12688,172 @@ pub struct ManagedSettingsResolveResult {
     pub values: Option<ManagedSettingsValues>,
 }
 
+/// Inputs describing the host and account a startup policy resolution should run for. Mirrors `managedSettings.ingest`, and adds the decision of whether the resolved policy is retained for this runtime 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(crate) struct ManagedSettingsResolveStartupPolicyParams {
+    /// The authenticated identity to resolve policy for. Omitted before sign-in, in which case no server layer is fetched and the sign-in pin is evaluated against no credential.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub auth_info: Option<serde_json::Value>,
+    /// Whether to ignore a cached server policy when reading, forcing the resolution to come from a live fetch.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub bypass_cache_read: Option<bool>,
+    /// Name of the embedding client, reported to the managed-settings service as `client_id` so it can refuse to deliver a policy this client is too old to enforce.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub client_name: Option<String>,
+    /// A device layer supplied by the host instead of discovered from the machine. Pair it with `hasDeviceResponse` so an explicit absence is distinguishable from an omitted override.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub device_response: Option<serde_json::Value>,
+    /// The host's environment variables, read for cache location, policy overrides, and the variables that would make a membership snapshot forgeable.
+    pub environment: serde_json::Value,
+    /// Whether `deviceResponse` is an override at all. True with a null `deviceResponse` asserts the device layer is empty; false discovers it from the machine.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub has_device_response: Option<bool>,
+    /// The host's home directory, used to resolve cache and managed-file locations.
+    pub home_directory: String,
+    /// The host's platform, in Node's `process.platform` spelling, used to locate platform-specific cache and policy paths.
+    pub platform: String,
+    /// Whether a configured platform policy helper may be run to produce an enforced helper layer.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub policy_helper_enabled: Option<bool>,
+    /// The policy-helper invocation reason. Defaults to sessionStart.
+    #[doc(hidden)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub(crate) policy_helper_reason: Option<ManagedSettingsPolicyHelperReason>,
+    /// Directory the policy helper runs in when this resolution is not owned by a registered session. A host resolving policy before its session exists must pass this, or a directory-sensitive helper judges the wrong repository.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub policy_helper_working_directory: Option<String>,
+    /// Whether to retain the resolved policy as this runtime process's startup policy, so later work in the process enforces it. Set false to resolve without side effects, which is what a protocol host wants before session creation: its sessions apply the complete policy through the normal lifecycle, and retaining here would let a readiness credential affect unrelated sessions. The returned verdict is identical either way — this decides only whether the process keeps it.
+    pub retain_and_apply: bool,
+    /// Whether to run ingestion. Omit or set false to return an empty result without discovering or fetching policy.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub self_fetch: Option<bool>,
+    /// How this resolution may use the on-disk server-policy cache. Defaults to the runtime's own policy when omitted. Rejected when combined with `bypassCacheRead`, because the two express the same decision and accepting both would leave the caller unsure which one the runtime honored.
+    #[doc(hidden)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub(crate) server_policy_cache_mode: Option<ManagedSettingsServerPolicyCacheMode>,
+    /// The session whose credential store, working directory and client kind the resolution should use. Omit it when no session exists yet and the process-wide store applies. A resolution whose session names a credential other than `authInfo` is returned but not retained, so a stale sign-in cannot apply policy for an account that has already been switched away from.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub session_id: Option<SessionId>,
+    /// User agent to send with the policy fetch.
+    pub user_agent: String,
+}
+
+/// The startup policy a resolution composed, the per-layer outcome flags a host needs to decide how much to trust it, and the enterprise sign-in verdict for the credential it ran against. The flags are reported rather than folded into the settings because a host must distinguish an unmanaged device from a managed device whose policy could not be confirmed, and apply its fail-closed gates in the second 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, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub(crate) struct ManagedSettingsResolveStartupPolicyResult {
+    /// Advisory minimum client version from a successful server response.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub client_update_requested: Option<String>,
+    /// The server refused to deliver a policy because this client is too old to enforce it, carrying the user-facing sentence describing the refusal. No retry will help; the remedy is a client update.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub client_update_required: Option<String>,
+    /// The device layer could not be read, so it is unconfirmed rather than known-absent.
+    pub device_load_failed: bool,
+    /// The device layer discovered from the machine, when one exists.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub device_response: Option<serde_json::Value>,
+    /// The sandbox floor contributed by the device layer.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub device_sandbox_floor: Option<serde_json::Value>,
+    /// The enterprise sign-in verdict for the credential this resolution ran against, evaluated over the effective policy so a server-delivered pin is honored alongside a device one. Computed on every resolution, including one that was not retained, so a host that declines to apply policy still cannot proceed past a pin.
+    #[doc(hidden)]
+    pub(crate) force_login_orgs: ForceLoginOrgsDecision,
+    /// A managed policy is known to apply to this host, from a discovered source or a resolved document.
+    pub managed_policy_present: bool,
+    /// The permissions layer specifically could not be confirmed, so permission gates apply their fail-closed posture.
+    pub permission_policy_undetermined: bool,
+    /// The policy helper was configured but could not be run, or its output could not be read.
+    pub policy_helper_load_failed: bool,
+    /// The layer produced by the platform policy helper, when one ran.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub policy_helper_response: Option<serde_json::Value>,
+    /// Some layer of the policy could not be confirmed, so its absence must not be read as permission. Folds in a failed server fetch as well as an unreadable device layer.
+    pub policy_undetermined: bool,
+    /// The sandbox was enabled because policy could not be confirmed rather than because an administrator asked for it. Lets a host explain a sandbox the user did not configure.
+    pub sandbox_enabled_by_undetermined_policy: bool,
+    /// The effective sandbox floor composed across every layer, which a host must apply rather than its own default.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub sandbox_floor: Option<serde_json::Value>,
+    /// The server fetch failed and no cached entry stood in for it, so the server layer is unconfirmed and fail-closed gates apply.
+    pub server_fetch_failed: bool,
+    /// How the current runtime resolved the server layer.
+    #[doc(hidden)]
+    pub(crate) server_resolution: ManagedSettingsServerPolicyResolution,
+    /// The account's server-delivered policy, when one was resolved.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub server_response: Option<serde_json::Value>,
+    /// Telemetry describing which layers answered and how, for the host to report alongside its own startup events.
+    pub telemetry: serde_json::Value,
+    /// Warnings raised while resolving, in the order they occurred.
+    pub warnings: Vec<String>,
+}
+
+/// The managed layers to retain as this process's startup policy, with the outcome of fetching each 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(crate) struct ManagedSettingsRetainPolicyParams {
+    /// Whether the device load failed. Report it honestly, for the same reason as `serverFetchFailed`.
+    pub device_load_failed: bool,
+    /// The device/MDM policy layer.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub device_response: Option<serde_json::Value>,
+    /// Sandbox floor declared by the device layer, carried separately so a document that failed validation can still raise the floor.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub device_sandbox_floor: Option<serde_json::Value>,
+    /// Whether the device sandbox intent is unreadable independently of its other settings.
+    pub device_sandbox_undetermined: bool,
+    /// Whether a device policy source demonstrably exists. This, not a read error, is the evidence a device is managed, so a fail-closed policy gates on it.
+    pub device_source_found: bool,
+    /// Whether any managed policy source exists, independently of fetch failures.
+    pub managed_policy_present: bool,
+    /// Whether permission policy is undetermined. Sandbox-only uncertainty does not imply this flag.
+    pub permission_policy_undetermined: bool,
+    /// The policy helper's response: the third managed layer that a process owning its startup policy resolves. It is retained with the other two so that every ambient read in this process, including the mutation guards and the governed marketplace allowlist that the `plugins.*` handlers derive, sees the whole policy the process fetched. A session-owning process omits it, because it resolves a helper per session against that session's working directory.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub policy_helper_response: Option<serde_json::Value>,
+    /// Preserve the retained server layer during a device-only resolution.
+    pub preserve_server_state: bool,
+    /// Whether uncertainty alone enabled the shared sandbox floor.
+    pub sandbox_enabled_by_undetermined_policy: bool,
+    /// Whether the shared sandbox policy is undetermined. Diagnostic errors alone do not imply this flag.
+    pub sandbox_floor_undetermined: bool,
+    /// Whether the server fetch failed. Report it honestly: true keeps the already-retained server layer rather than replacing it with an absent one.
+    pub server_fetch_failed: bool,
+    /// Whether a required fresh server-policy confirmation failed.
+    pub server_forced_refresh_failure: bool,
+    /// The resolved server policy. A known source can lack a response after a forced-refresh failure.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub server_response: Option<serde_json::Value>,
+    /// Whether the server policy source exists, even when its response is unavailable.
+    pub server_source_found: bool,
+    /// Shared server/device sandbox floor, excluding session-local helper policy.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub shared_sandbox_floor: Option<serde_json::Value>,
+}
+
 /// The authoring JSON schema for managed settings recognized by this runtime.
 ///
 /// <div class="warning">
@@ -11006,6 +13517,70 @@ pub struct McpConfigUpdateRequest {
     pub name: String,
 }
 
+/// Observational state for a matching already materialized 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, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct McpConfiguredServerState {
+    /// Observed connection error, when the materialized server failed.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub error: Option<String>,
+    /// Observed connection status. This is not a configuration or readiness guarantee.
+    pub status: McpServerStatus,
+}
+
+/// Effective MCP configuration entry. Configuration enablement is distinct from the optional live observation.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 McpConfiguredServer {
+    /// Human-readable display name supplied by configuration.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub display_name: Option<String>,
+    /// Whether this configured server is enabled after session configuration and policy filtering.
+    pub enabled: bool,
+    /// Observed state from an already materialized matching server. Omitted when no live graph has this configured server; it never determines configuration enablement.
+    pub live: McpConfiguredServerState,
+    /// Server name (config key)
+    pub name: String,
+    /// Configuration provenance: user, workspace, plugin, builtin, or managed.
+    #[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>,
+}
+
+/// Effective MCP configuration with optional live observations from matching already materialized 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, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct McpConfiguredServerList {
+    /// Effective configured MCP servers.
+    pub servers: Vec<McpConfiguredServer>,
+}
+
 /// Credential-free authentication identity used to configure GitHub MCP.
 ///
 /// <div class="warning">
@@ -11796,6 +14371,21 @@ pub struct McpIsServerRunningResult {
     pub running: bool,
 }
 
+/// Names of the MCP servers the runtime supplies itself.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct McpListBuiltinServerNamesResult {
+    /// Every built-in server name. A host disabling the built-ins wholesale suppresses exactly this set.
+    pub names: Vec<String>,
+}
+
 /// Server name whose tool list should be returned.
 ///
 /// <div class="warning">
@@ -12820,6 +15410,91 @@ pub(crate) struct McpRegisterExternalClientRequest {
     pub(crate) transport: serde_json::Value,
 }
 
+/// Registry search to abandon.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct McpRegistryCancelRequest {
+    /// Request ID from `mcp.registry.allocateRequestId` that the search uses.
+    pub request_id: i64,
+}
+
+/// Whether the cancel reached a live search.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct McpRegistryCancelResult {
+    /// True when the cancel stopped a running search. False for unknown or reclaimed IDs, completed or canceled searches, and unused reservations. The cancel releases an unused reservation.
+    pub canceled: bool,
+}
+
+/// Request id naming a cancellable registry search.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct McpRegistryRequestIdResult {
+    /// Request ID for `mcp.registry.search` and `mcp.registry.cancel`. It serves one search. Allocation can reclaim unused IDs at the 1,024-ID reservation limit.
+    pub request_id: i64,
+}
+
+/// Registry search terms, the credential to search under, and the request id that makes the search cancellable.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct McpRegistrySearchRequest {
+    /// The credential the search runs under, carried opaquely. Hosts usually send credential-free `AuthIdentity`; a `token` identity can be resolved only when it embeds a token, while `env` and `gh-cli` identities can use a token embedded in the request first.
+    pub auth_info: serde_json::Value,
+    /// Maximum number of servers to return.
+    pub limit: i64,
+    /// Free-text query. Omitted or empty asks the registry for its top servers rather than searching. A value that is not a string is refused.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub query: Option<String>,
+    /// Repository used for the policy lookup, as `owner/name`. The policy selects the registry URL and whether the user token goes to the registry. The registry receives this repository only when the policy entry lists it as required context. A value that is not a string is refused.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub repository: Option<String>,
+    /// Request ID from `mcp.registry.allocateRequestId`. The search refuses unknown, reclaimed, or canceled IDs and IDs that another search or request already uses.
+    pub request_id: i64,
+}
+
+/// Servers selected from the registry 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, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub(crate) struct McpRegistrySearchResult {
+    /// The server objects, carried opaquely. The runtime follows pages, keeps the newest entry per server name, cuts the list to `limit`, and sorts an empty-query result by GitHub stars. Each server object remains unchanged because the registry owns that shape.
+    pub servers: serde_json::Value,
+}
+
 /// In-process MCP reload configuration.
 ///
 /// <div class="warning">
@@ -13304,6 +15979,9 @@ pub struct McpServer {
     pub source_plugin_version: Option<String>,
     /// Connection status: connected, failed, needs-auth, pending, disabled, stopped, or not_configured
     pub status: McpServerStatus,
+    /// Configured URL for an HTTP/SSE server, regardless of configuration source. Omitted for local and in-memory servers.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub url: Option<String>,
 }
 
 /// Authentication settings with optional redirect port configuration.
@@ -13637,6 +16315,43 @@ pub struct McpSetEnvValueModeResult {
     pub mode: McpSetEnvValueModeDetails,
 }
 
+/// The session tool filters that decide whether the session still has a shell to run `gh` with.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct McpShouldExcludeGitHubToolsRequest {
+    /// The session's tool allowlist, when it set one. Omitted means the session constrains nothing this way.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub available_tools: Option<Vec<String>>,
+    /// The session's tool denylist, when it set one. Omitted means the session constrains nothing this way.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub excluded_tools: Option<Vec<String>>,
+    /// How the allowlist and denylist combine when both are set. Omitted means the default every session gets, so a caller that never chose a precedence is answered as its sessions behave.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub tool_filter_precedence: Option<OptionsUpdateToolFilterPrecedence>,
+}
+
+/// Whether the gh-replaceable GitHub MCP tools may be clipped for the session described by 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, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub(crate) struct McpShouldExcludeGitHubToolsResult {
+    /// True only when both halves hold: the session's filters still reach the platform shell tool, and the host actually has the `gh` those tools would be replaced by. Feed it straight back as the `excludeGhReplaceableTools` build option.
+    pub exclude_gh_replaceable_tools: bool,
+}
+
 /// 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">
@@ -13824,7 +16539,7 @@ pub struct MemoryConfiguration {
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct MetadataContextAttributionResultContextAttributionCategories {
-    /// Output reserve plus post-blocking-threshold buffer.
+    /// Overlapping output reservation plus post-blocking-threshold buffer.
     pub buffer: i64,
     /// Custom-instructions tokens (0 when none are configured).
     pub custom_instructions: i64,
@@ -13871,7 +16586,7 @@ pub struct MetadataContextAttributionResultContextAttributionEntriesItem {
 #[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`.
+    /// Output reservation overlapping the displayed prompt allowance plus the tokens past the effective input budget's 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,
@@ -13881,13 +16596,13 @@ pub struct MetadataContextAttributionResultContextAttribution {
     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`.
+    /// Advertised prompt allowance for the selected context tier: the denominator for context-usage displays and capacity for `categories.freeSpace` and `categories.buffer`. 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`.
+    /// Effective input budget after reserving requested output against the combined context ceiling. 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,
@@ -13952,10 +16667,13 @@ pub struct MetadataContextHeaviestMessagesResult {
 #[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.
+    /// Requested output allowance to reserve against the combined context ceiling. Pass 0 to resolve the session's request cap, falling back to the model's advertised output limit.
     pub output_token_limit: i64,
-    /// Maximum prompt tokens allowed by the target model. Pass 0 to use the runtime default.
+    /// Advertised prompt allowance. Pass 0 to resolve the selected model and context tier from the session.
     pub prompt_token_limit: i64,
+    /// Provider owning selectedModel. Omit to use the current provider for the current model, or deterministic legacy lookup for a different model.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub provider_id: Option<String>,
     /// 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>,
@@ -13965,20 +16683,26 @@ pub struct MetadataContextInfoRequest {
 #[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%)
+    /// Output reservation overlapping the displayed prompt allowance plus tokens after the effective input budget's 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.
+    /// Provider-owned model display label, or the Auto routing label. Presentation only; modelName remains the tokenization identity.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub display_model_name: Option<String>,
+    /// Advertised prompt allowance for the selected context tier, without adding output tokens. The denominator for context-usage displays.
     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)
+    /// Effective input budget: the selected tier's prompt allowance bounded by the combined context ceiling minus the requested output allowance. Uses DEFAULT_TOKEN_LIMIT when limits are unspecified.
     pub prompt_token_limit: i64,
+    /// Provider whose catalog supplies this context window. Omitted when provider identity is unavailable.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub provider: Option<ModelProviderRef>,
     /// Tokens consumed by the system prompt
     pub system_tokens: i64,
     /// Tokens consumed by tool definitions sent to the model (excludes deferred tools)
@@ -14385,25 +17109,6 @@ pub struct ModelPolicy {
     pub terms: Option<String>,
 }
 
-/// A neutral reference to the model provider that produced a model: an opaque id, a human-readable label, and the provider kind. Carried on each enumerated Model so consumers can group by provider without reaching into a provider-shaped internal 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 ModelProviderRef {
-    /// Opaque, stable id of the provider that produced this model. Matches the enumerated `ModelProviderDescriptor.id`.
-    pub id: String,
-    /// The provider kind.
-    pub kind: ModelProviderKind,
-    /// Human-readable provider label, owned by the runtime so every consumer renders identical text.
-    pub label: String,
-}
-
 /// Service-published warning text that hosts should display when presenting a model.
 ///
 /// <div class="warning">
@@ -14467,6 +17172,9 @@ pub struct Model {
     /// 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>>,
+    /// Model vendor as the Copilot API reports it, for example "Anthropic" or "Azure OpenAI". Open vocabulary, passed through unchanged. It can name the vendor that serves the model instead of the one that built it, or a label that is not a vendor, such as "Experimental". Absent when the Copilot API reports no vendor.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub vendor: Option<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>>,
@@ -14516,6 +17224,9 @@ pub struct ModelApplyStartupOverlayRequest {
     /// Model selected by repository settings, when configured.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub repo_model: Option<String>,
+    /// Provider owning the repository-selected model. Omitted repository provider identity retains legacy bare-model behavior.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub repo_model_provider_id: Option<String>,
     /// Reasoning effort selected by repository settings, when configured.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub repo_reasoning_effort: Option<String>,
@@ -14624,6 +17335,84 @@ pub struct ModelCapabilitiesOverride {
     pub supports: Option<ModelCapabilitiesOverrideSupports>,
 }
 
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct ModelClearStartupSeedRequest {
+    pub expected_model: String,
+    /// Provider captured with the startup seed; omission matches only an unqualified seed.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub expected_provider_id: 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(crate) struct ModelClearStartupSeedResult {
+    pub cleared: bool,
+}
+
+/// Host presentation state the reasoning-summaries policy depends on.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 ModelGetReasoningSummariesRequest {
+    /// The host's persisted `showReasoning` user setting, omitted when unset.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub persisted_show_reasoning: Option<bool>,
+    /// Whether the host is currently showing reasoning summaries. Defaults to false.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub summaries_visible: Option<bool>,
+}
+
+/// Reasoning-summaries presentation policy for the session's current 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 ModelGetReasoningSummariesResult {
+    /// Whether the supplied `persistedShowReasoning` setting only restates the model default. This reports a redundancy, not a standing instruction to delete the setting: it stays true for as long as the setting and the model default agree, including for a user who later chose that value deliberately. It exists for a one-time migration of a legacy setting written before the model default made it redundant, so a host that acts on it owns the cleanup and must gate it behind its own persisted `done` marker, delete only a setting whose value still matches the one it read, and never repeat the deletion on a later launch. Under an off-by-default reasoning-summaries experiment an explicit `showReasoning: true` opt-in also reads as redundant on a summary-producing model, so an ungated host would keep deleting that opt-in and hide summaries again on every launch.
+    pub clear_redundant_setting: bool,
+    /// Whether the session's reasoning-summaries experiment assignment has settled. False means this read does not wait for a pending assignment and reports the experiment-derived fields conservatively: `showHiddenHint` is false and `visibility` falls back to `persistedShowReasoning`, or is omitted when none was supplied. A host that wants the assigned answer re-reads until this is true.
+    pub experiment_settled: bool,
+    /// Whether the selected model shows reasoning summaries by default.
+    pub model_default_shows_summaries: bool,
+    /// False until the session has a model catalog and a selected model. This read never resolves the catalog itself, and the runtime emits no readiness notification, so repeating this call alone leaves `ready` false indefinitely on a session that has neither listed models nor run a turn. `session.model.list` is the prerequisite and the signal: it resolves and caches the catalog for the session, so a successful return means the next read is ready. The exception is a session that resolves models without a Copilot catalog, that is a BYOK registry or an alternate provider: `session.model.list` returns an empty list without caching a catalog, so `ready` stays false and this policy is unavailable there. While false, every model-policy field is false and `visibility` is omitted; `experimentSettled` is independent of readiness and still reports the assignment state.
+    pub ready: bool,
+    /// Whether turns on this session produce reasoning summaries, honouring an explicit session reasoning-summary override.
+    pub session_shows_summaries: bool,
+    /// Whether to show the hint that reasoning summaries are hidden. Always false while `experimentSettled` is false.
+    pub show_hidden_hint: bool,
+    /// Whether the selected model emits reasoning headers.
+    pub show_reasoning_headers: bool,
+    /// Default reasoning visibility, and only meaningful once `ready` is true: false when the session produces no summaries, else the persisted setting, else the experiment's default. While `ready` is true it is omitted only when all three are unavailable, that is when the session produces summaries, no `persistedShowReasoning` was supplied, and `experimentSettled` is false. While `ready` is false there is no model policy to report and this field is always omitted, so an absent value alone does not imply a pending experiment.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub visibility: Option<bool>,
+}
+
 /// List of Copilot models available to the resolved user, including capabilities and billing metadata.
 ///
 /// <div class="warning">
@@ -15283,7 +18072,7 @@ pub struct ModelSwitchToRequest {
     /// 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.
+    /// Model id to switch to, as returned by `list`. Include providerId to select an exact catalog entry when providers share the id. Without providerId, a bare id retains incumbent selection behavior; a registry-qualified id (`provider/id`, e.g. `acme/claude-sonnet`) targets a 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")]
@@ -15311,6 +18100,142 @@ pub struct ModelSwitchToRequest {
     pub verbosity: Option<Verbosity>,
 }
 
+/// Extensible [`ModelSwitchToRequest`], including inputs added after it was published.
+///
+/// Required inputs are [`ModelSwitchToOptions::new`] arguments; optional inputs have fluent setters.
+/// Input-only: it serialises to the flat wire request and is not deserialisable.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type 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)]
+#[serde(rename_all = "camelCase")]
+pub struct ModelSwitchToOptions {
+    #[serde(flatten)]
+    legacy: ModelSwitchToRequest,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    provider_id: Option<String>,
+}
+
+impl ModelSwitchToOptions {
+    /// Creates options with the required inputs.
+    pub fn new(model_id: impl Into<String>) -> Self {
+        Self {
+            legacy: ModelSwitchToRequest {
+                model_id: model_id.into(),
+                auto_tier: None,
+                reasoning_effort: None,
+                reasoning_summary: None,
+                verbosity: None,
+                model_capabilities: None,
+                context_tier: None,
+                source: None,
+                defer_if_model_change_queued: None,
+                compaction_decision: None,
+                run_compaction_preflight: None,
+                repo_scope: None,
+                model_change_scope: None,
+                require_available: None,
+                picker_persistence: None,
+            },
+            provider_id: None,
+        }
+    }
+
+    /// Optional Auto routing preference to stage atomically with selecting `auto`. Pass null to return to provider-default Auto routing. This field is rejected when `modelId` is not `auto`.
+    pub fn auto_tier(mut self, value: AutoTier) -> Self {
+        self.legacy.auto_tier = Some(value);
+        self
+    }
+
+    /// 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. Pass null to clear any session effort override and fall back to the model's default. When omitted, the session's current effort is kept.
+    pub fn reasoning_effort(mut self, value: impl Into<String>) -> Self {
+        self.legacy.reasoning_effort = Some(value.into());
+        self
+    }
+
+    /// Reasoning summary mode to request for supported model clients
+    pub fn reasoning_summary(mut self, value: ReasoningSummary) -> Self {
+        self.legacy.reasoning_summary = Some(value);
+        self
+    }
+
+    /// Output verbosity level to request for supported models
+    pub fn verbosity(mut self, value: Verbosity) -> Self {
+        self.legacy.verbosity = Some(value);
+        self
+    }
+
+    /// Override individual model capabilities resolved by the runtime
+    pub fn model_capabilities(mut self, value: ModelCapabilitiesOverride) -> Self {
+        self.legacy.model_capabilities = Some(value);
+        self
+    }
+
+    /// 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 fn context_tier(mut self, value: ContextTier) -> Self {
+        self.legacy.context_tier = Some(value);
+        self
+    }
+
+    /// Origin to record on the effective `session.model_change` event for trusted in-process calls. Transport SDK calls are always recorded as `sdk`, regardless of this value.
+    pub fn source(mut self, value: ModelChangeSource) -> Self {
+        self.legacy.source = Some(value);
+        self
+    }
+
+    /// 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 fn defer_if_model_change_queued(mut self, value: bool) -> Self {
+        self.legacy.defer_if_model_change_queued = Some(value);
+        self
+    }
+
+    /// Explicit response to a model-switch compaction preflight. Omit to request a confirmation projection when compaction is necessary.
+    pub fn compaction_decision(mut self, value: impl Into<String>) -> Self {
+        self.legacy.compaction_decision = Some(value.into());
+        self
+    }
+
+    /// When true, evaluate context-window compaction policy before applying the switch.
+    pub fn run_compaction_preflight(mut self, value: bool) -> Self {
+        self.legacy.run_compaction_preflight = Some(value);
+        self
+    }
+
+    /// Optional repository settings scope to persist after the switch commits.
+    pub fn repo_scope(mut self, value: impl Into<String>) -> Self {
+        self.legacy.repo_scope = Some(value.into());
+        self
+    }
+
+    /// Settings scope used when persisting the selected model.
+    pub fn model_change_scope(mut self, value: impl Into<String>) -> Self {
+        self.legacy.model_change_scope = Some(value.into());
+        self
+    }
+
+    /// Require the target to be currently available and enabled before applying the switch.
+    pub fn require_available(mut self, value: bool) -> Self {
+        self.legacy.require_available = Some(value);
+        self
+    }
+
+    /// Optional settings context and explicit-override flags used to persist a picker selection.
+    pub fn picker_persistence(mut self, value: ModelPickerPersistenceRequest) -> Self {
+        self.legacy.picker_persistence = Some(value);
+        self
+    }
+
+    /// Provider id from the selected list entry's provider reference. Selects this exact provider/model pair; an unavailable pair fails rather than using another provider. Omit for deterministic legacy bare-model selection.
+    pub fn provider_id(mut self, value: impl Into<String>) -> Self {
+        self.provider_id = Some(value.into());
+        self
+    }
+}
+
 /// The model identifier active on the session after the switch.
 ///
 /// <div class="warning">
@@ -15394,6 +18319,9 @@ pub struct ModeSetRequest {
     /// Whether a dedicated plan model is configured.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub plan_model_configured: Option<bool>,
+    /// Provider owning planModel. Omit for legacy bare-model selection.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub plan_model_provider_id: Option<String>,
     /// Reasoning effort to use with the dedicated plan model.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub plan_reasoning_effort: Option<String>,
@@ -15575,6 +18503,49 @@ pub struct OptionsUpdateAdditionalContentExclusionPolicy {
     pub scope: OptionsUpdateAdditionalContentExclusionPolicyScope,
 }
 
+/// External tool call of the session or one of its sub-agents that is still waiting for session.tools.handlePendingToolCall.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 PendingExternalToolRequest {
+    /// Sub-agent instance identifier (the envelope agentId of its events) of the agent that issued the call; absent for calls issued by the root agent
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub agent_id: Option<String>,
+    /// Arguments to pass to the external tool
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub arguments: Option<serde_json::Value>,
+    /// Stable identity of the provider that offered the tool, for hosts that route extension-owned tools by provider
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub provider_id: Option<String>,
+    /// Request ID to pass to session.tools.handlePendingToolCall
+    pub request_id: RequestId,
+    /// Tool call ID assigned to this external tool invocation
+    pub tool_call_id: String,
+    /// Name of the external tool to invoke
+    pub tool_name: String,
+}
+
+/// External tool calls still waiting for a result.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 PendingExternalToolRequestList {
+    /// External tool calls of the session and its sub-agents that session.tools.handlePendingToolCall would still accept, in the order they were requested. Includes calls that were pending when the session was last suspended and resumed with pending work continued, so a host that did not observe the original external_tool.requested event can answer them.
+    pub items: Vec<PendingExternalToolRequest>,
+}
+
 /// Pending permission prompt reconstructed from event history, with request ID and user-facing prompt details.
 ///
 /// <div class="warning">
@@ -16897,6 +19868,41 @@ pub struct PermissionsConfigureResult {
     pub success: bool,
 }
 
+/// The verbatim managed `permissions` slice to interpret.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct PermissionsEvaluateManagedPolicyParams {
+    /// The `permissions` object from a managed settings layer, for example `{"disableBypassPermissionsMode":"disable"}`. Omitted or null means no managed policy applies.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub permissions: Option<serde_json::Value>,
+}
+
+/// The policy questions a host asks before granting elevated permissions.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 PermissionsEvaluateManagedPolicyResult {
+    /// True when managed policy forbids bypass-permissions mode, so allow-all style flags must not take effect.
+    pub bypass_permissions_disabled: bool,
+    /// True when the managed layer supplies permission rules that the session must enforce.
+    pub permission_rules_active: bool,
+    /// True when a managed policy exists but this build could not determine its meaning. Hosts fail closed on it rather than assuming permission was granted.
+    pub policy_undetermined: bool,
+}
+
 /// Indicates whether the operation succeeded.
 ///
 /// <div class="warning">
@@ -17224,6 +20230,44 @@ pub struct PermissionUrlsSetUnrestrictedModeParams {
     pub enabled: bool,
 }
 
+/// A complete JSON snapshot to write under the runtime's per-path file lock.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 PersistenceWriteRawJsonLockedRequest {
+    /// The serialized JSON document to write. It replaces the file's contents entirely; nothing is merged.
+    pub data_json: String,
+    /// Comment lines to emit above the document, for a format that tolerates them. Omit for strict JSON.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub file_header: Option<String>,
+    /// Absolute path of the file to replace. Parent directories are created when missing.
+    pub path: String,
+}
+
+/// The outcome of a locked snapshot write.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 PersistenceWriteRawJsonLockedResult {
+    /// Why the write failed. Absent when `success` is true. A lock the runtime could not acquire in time reports here rather than raising.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub error: Option<String>,
+    /// Whether the file now holds the requested contents.
+    pub success: bool,
+}
+
 /// Optional message to echo back to the caller.
 ///
 /// <div class="warning">
@@ -19137,6 +22181,26 @@ pub struct QueueWithdrawMessageResult {
     pub removed: bool,
 }
 
+/// A pending session quota warning, consumed once by takeWarnings.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 QuotaWarningProjection {
+    /// User-facing warning text.
+    pub message: String,
+    /// Related account or upgrade link.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub url: Option<String>,
+    /// Existing warning category.
+    pub warning_type: String,
+}
+
 /// Event type to register consumer interest for, used by runtime gating logic.
 ///
 /// <div class="warning">
@@ -19529,6 +22593,110 @@ pub struct RemoteSessionRepository {
     pub owner: String,
 }
 
+/// One atomic edit of an allowed top-level repository setting.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct RepoSettingsEditRequest {
+    /// One canonical top-level repository setting that the allowlist permits.
+    pub key: String,
+    /// Set a scalar, add or remove a string list item, or remove the setting. The handler rejects a missing or incompatible value.
+    #[doc(hidden)]
+    pub(crate) operation: SettingsEditOperation,
+    /// Absolute path of the repository root.
+    pub repo_root: String,
+    /// Shared or local repository settings file.
+    #[doc(hidden)]
+    pub(crate) scope: RepoSettingsEditScope,
+    /// Required boolean, string or number for set, required string for add-item and remove-item, and forbidden for remove. The runtime rejects all other JSON values.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub value: Option<serde_json::Value>,
+}
+
+/// Which repository settings file to 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(crate) struct RepoSettingsReadRawRequest {
+    /// Absolute path of the repository root.
+    pub repo_root: String,
+    /// Use repo for shared settings or local for settings.local.json. Other scopes are rejected.
+    pub scope: String,
+}
+
+/// Parsed repository settings without normalization or layering.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct RepoSettingsReadRawResult {
+    /// Stored JSON values after the existing JSONC parser and prototype-safety checks. Empty when the file is missing, blank, or invalid.
+    pub config: serde_json::Value,
+    /// True when the file exists but did not parse, so `config` is empty for that reason rather than because nothing is set.
+    pub invalid: bool,
+}
+
+/// The complete set of repository-overridable settings to store.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct RepoSettingsWriteAllRequest {
+    /// Absolute path of the repository root.
+    pub repo_root: String,
+    /// Use repo for shared settings or local for settings.local.json. Other scopes are rejected.
+    pub scope: String,
+    /// Object of allowed settings to store. Missing allowlisted keys are removed. Other input keys are ignored, while unknown stored keys are preserved.
+    pub settings: serde_json::Value,
+}
+
+/// One key to write or remove in a repository settings 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(crate) struct RepoSettingsWriteKeyRequest {
+    /// True to remove the key instead of writing it.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub delete: Option<bool>,
+    /// Canonical top-level key permitted by the repository settings allowlist.
+    pub key: String,
+    /// Absolute path of the repository root.
+    pub repo_root: String,
+    /// Use repo for shared settings or local for settings.local.json. Other scopes are rejected.
+    pub scope: String,
+    /// Value to validate and write. Required unless delete is true; a null value is validated, not treated as deletion.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub value: Option<serde_json::Value>,
+}
+
 /// Provider-native structured output format. JSON Schema is forwarded without rewriting or validating the schema or the generated output.
 ///
 /// <div class="warning">
@@ -19546,6 +22714,21 @@ pub struct ResponseFormat {
     pub r#type: ResponseFormatType,
 }
 
+/// The stored sandbox settings to resolve against the 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>
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SandboxApplyDefaultsRequest {
+    /// The sandbox settings as stored in the settings file. An empty object resolves to the defaults alone.
+    pub stored: serde_json::Value,
+}
+
 /// 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">
@@ -19789,6 +22972,38 @@ pub struct SandboxConfig {
     pub user_policy: Option<SandboxConfigUserPolicy>,
 }
 
+/// A possible secret-bearing environment variable and optional locally suggested HTTPS injection hosts. This is a draft for user review, not an active grant.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 SandboxCredentialSuggestion {
+    /// Environment variable name. The secret value is never returned.
+    pub name: String,
+    /// HTTPS hostnames suggested by a local known-provider mapping. An empty list requires the user to supply injection hosts before adding a masking entry. These suggestions do not allow network access.
+    pub suggested_inject_hosts: Vec<String>,
+}
+
+/// Possible unconfigured secrets in the sandbox shell environment, sorted by variable name, with no secret values.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 SandboxCredentialSuggestionsResult {
+    /// Candidates for user review. Empty when sandboxing is disabled or no unconfigured candidates are present.
+    pub suggestions: Vec<SandboxCredentialSuggestion>,
+}
+
 /// Request to disable sandboxing for the current session while resolving an active sandbox-bypass permission prompt.
 ///
 /// <div class="warning">
@@ -19824,6 +23039,71 @@ pub struct SandboxDisableForSessionResult {
     pub success: bool,
 }
 
+/// The documentation URL a host cites when it declines or downgrades a sandbox setting.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 SandboxDocsUrlResult {
+    /// Documentation URL describing the sandbox and the settings that control it.
+    pub url: String,
+}
+
+/// A sandbox config and the per-feature routing flag to resolve it 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(crate) struct SandboxEffectiveForOptionalParams {
+    /// The routing flag naming the feature being launched, such as `sandboxMcpServers` or `sandboxLspServers`.
+    pub routing_flag: String,
+    /// The session's resolved `sandbox` slice. Omitted when the host has none, which yields a disabled sandbox rather than an error.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub sandbox: Option<serde_json::Value>,
+}
+
+/// The sandbox a named feature actually launches under.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct SandboxEffectiveForOptionalResult {
+    /// The effective sandbox config for the requested feature, or a disabled sandbox when the feature is routed out of it.
+    pub sandbox_json: serde_json::Value,
+}
+
+/// One slash command, as typed, to test against the enforcement-block allowlist.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct SandboxEnforcementCommandAllowedParams {
+    /// The command's arguments, in order. Pass an empty array for a bare command: several entries in the allowlist admit the bare form and refuse every argument.
+    pub args: Vec<String>,
+    /// The command name as the user typed it, with or without its leading slash.
+    pub command_name: String,
+}
+
 /// Managed sandbox enforcement state for a session.
 ///
 /// <div class="warning">
@@ -19844,6 +23124,59 @@ pub struct SandboxEnforcementStatus {
     pub required: bool,
 }
 
+/// One file-picker suggestion offered up for the sandbox filesystem check.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct SandboxPickerCandidate {
+    /// Whether the suggestion is a directory. A directory the policy does not itself allow may still be needed as a waypoint to an allowed subtree.
+    pub is_directory: bool,
+    /// Absolute path the suggestion would attach.
+    pub path: String,
+}
+
+/// A batch of file-picker candidates to check against a prepared 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(crate) struct SandboxFilterPickerCandidatesParams {
+    /// The candidates to check, in the order the answers are returned.
+    #[doc(hidden)]
+    pub(crate) candidates: Vec<SandboxPickerCandidate>,
+    /// The session's working directory, matching the one the policy was prepared from.
+    pub cwd: String,
+    /// The policy returned by `sandbox.preparePickerPolicy`. Omitted keeps every candidate.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub sandbox: Option<serde_json::Value>,
+}
+
+/// Per-candidate allow decisions, positionally aligned with 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, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub(crate) struct SandboxFilterPickerCandidatesResult {
+    /// One decision per candidate, in the same order. Always the same length as the request's `candidates`.
+    pub allowed: Vec<bool>,
+}
+
 /// Request to accept the sandbox path grant offered on an active sandbox escalation permission prompt.
 ///
 /// <div class="warning">
@@ -19888,7 +23221,7 @@ pub struct SandboxGrantPathForRequestResult {
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct SandboxHostCapability {
-    /// The policy feature, as an extensible string: ignore names you do not recognize. Known values: `network` (sandboxed commands can reach the network; on Linux this needs the tooling for Bubblewrap's private network namespace, such as slirp4netns), `network_filtering` (host rules and the sandbox proxy; on Linux this needs the same tooling as `network`; on Windows it needs Process Security Environment 1.1 host-loopback support, and a policy that uses it must also set `network.allowLocalNetwork`), `denied_paths` (native enforcement of `filesystem.deniedPaths`), `shell` (shell commands inside the sandbox), and `filesystem_enumeration` (enumerate-only filesystem grants; on Windows this needs Process Security Environment 1.1 filesystem enumeration support, and without it sandboxed PowerShell still runs but cannot resolve its current location; other platforms always report it).
+    /// The policy feature, as an extensible string: ignore names you do not recognize. Known values: `network` (sandboxed commands can reach the network; on Linux this needs the tooling for Bubblewrap's private network namespace, such as slirp4netns), `network_filtering` (host rules and the sandbox proxy; on Linux this needs the same tooling as `network`; on Windows it needs Process Security Environment 1.1 host-loopback support or MXC's PSEC 1.0-only proxy-loopback compatibility capability, and a policy that uses it must also set `network.allowLocalNetwork`; compatibility applies only to an explicit identity-less runtime proxy, not general host-loopback access, and other policy restrictions still apply), `denied_paths` (native enforcement of `filesystem.deniedPaths`), `shell` (shell commands inside the sandbox), and `filesystem_enumeration` (enumerate-only filesystem grants; on Windows this needs Process Security Environment 1.1 filesystem enumeration support, and without it sandboxed PowerShell still runs but cannot resolve its current location; other platforms always report it).
     pub name: String,
     /// Human-readable reason and remedy when the feature is unsupported, such as a package to install or an OS update. Present only when `supported` is false.
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -19917,6 +23250,40 @@ pub struct SandboxHostSupport {
     pub supported: bool,
 }
 
+/// The working directory and sandbox settings to build a file-picker policy from.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct SandboxPreparePickerPolicyParams {
+    /// The session's working directory. Git discovery and grant canonicalization are resolved against it.
+    pub cwd: String,
+    /// The session's resolved `sandbox` slice. Omitted, or disabled, yields no policy and every candidate is kept.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub sandbox: Option<serde_json::Value>,
+}
+
+/// The prepared file-picker policy, or none when the sandbox is disabled.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct SandboxPreparePickerPolicyResult {
+    /// The prepared policy to pass back to `sandbox.filterPickerCandidates`. Absent when the sandbox is disabled or absent, in which case filtering keeps every candidate.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub sandbox_json: Option<serde_json::Value>,
+}
+
 /// Result of creating the persistent certificate authority of the sandbox credential proxy.
 ///
 /// <div class="warning">
@@ -19968,6 +23335,138 @@ pub struct SandboxProxyCaStatus {
     pub state: SandboxProxyCaState,
 }
 
+/// The stored sandbox proxy password, if one is present.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 SandboxProxySecretGetResult {
+    /// The stored password. Absent when no entry exists in either the keychain or the on-disk fallback store.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub value: Option<String>,
+}
+
+/// Where this runtime keeps the sandbox proxy password.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 SandboxProxySecretLocation {
+    /// Absolute path of the credential store holding the sandbox proxy password. The proxy password belongs to no MCP server, so it is kept in its own directory rather than in the MCP secret store.
+    pub config_dir: String,
+    /// Identifier of the proxy password entry within that store. Derived from the configuration directory, so two Copilot homes on one machine never share an entry. Use it to recognize a `${secret:…}` reference in stored settings as this runtime's own proxy password.
+    pub secret_id: String,
+}
+
+/// The sandbox proxy password to store.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 SandboxProxySecretSaveRequest {
+    /// The password to store for the sandbox proxy.
+    pub value: String,
+}
+
+/// Where the sandbox proxy password was stored.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 SandboxProxySecretSaveResult {
+    /// Whether the OS keychain accepted the value. False means it was written to the on-disk fallback store instead, which is still readable by `sandbox.proxySecret.get`.
+    pub stored_in_keychain: bool,
+}
+
+/// The user's sandbox settings and the managed sandbox floor to raise them to.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct SandboxResolveFlooredConfigParams {
+    /// The effective managed `sandbox` slice acting as a floor. Omitted when no administrator policy applies, in which case the user's own settings stand unchanged.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub managed_sandbox: Option<serde_json::Value>,
+    /// The user's own `sandbox` settings slice. Omitted when the user has configured none, which still yields the managed floor rather than a disabled sandbox.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub user_sandbox: Option<serde_json::Value>,
+}
+
+/// The user's sandbox settings raised to the managed floor.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 SandboxResolveFlooredConfigResult {
+    /// The floored sandbox config, normalized through the declared sandbox shape so only declared fields in a fixed order are present.
+    pub sandbox_json: serde_json::Value,
+}
+
+/// The managed sandbox policy in force, which selects which remedy the notice offers.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct SandboxUnsupportedStartupNoticeParams {
+    /// True when the sandbox stayed on only because the managed policy could not be determined. Distinguishes a policy that positively enforces the sandbox from one that merely failed to resolve, which is the difference between telling the user to contact an administrator and telling them to wait. Defaults to false.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub enabled_by_undetermined_policy: Option<bool>,
+    /// The managed `sandbox` slice, when a policy supplies one. The notice treats the sandbox as enforced only when this both enables it and sets `failIfUnavailable`, because a managed sandbox that tolerates being unavailable still leaves the user able to turn it off.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub managed_sandbox: Option<serde_json::Value>,
+}
+
+/// The startup warning, absent when the machine can run a sandbox.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct SandboxUnsupportedStartupNoticeResult {
+    /// The user-facing warning, carrying the platform remedy and the recovery the policy in force actually allows. Absent when this machine supports a sandbox, so a host can call unconditionally and print only what it gets.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub notice: Option<String>,
+}
+
 /// Register an absolute-time scheduled prompt.
 ///
 /// <div class="warning">
@@ -20637,11 +24136,28 @@ pub struct SessionBulkDeleteResult {
     pub freed_bytes: HashMap<String, i64>,
 }
 
+/// The IDE a host is connected to, as reported 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 SessionConnectedIdeInfo {
+    /// Display name of the connected IDE, for example `VS Code`.
+    pub ide_name: String,
+    /// Absolute path of the workspace folder the IDE has open.
+    pub workspace_folder: String,
+}
+
 /// 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.
+    /// Overlapping output reservation plus post-blocking-threshold buffer.
     pub buffer: i64,
     /// Custom-instructions tokens (0 when none are configured).
     pub custom_instructions: i64,
@@ -20695,7 +24211,7 @@ pub struct SessionContextAttributionEntriesItem {
 #[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`.
+    /// Output reservation overlapping the displayed prompt allowance plus the tokens past the effective input budget's 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,
@@ -20705,13 +24221,13 @@ pub struct SessionContextAttribution {
     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`.
+    /// Advertised prompt allowance for the selected context tier: the denominator for context-usage displays and capacity for `categories.freeSpace` and `categories.buffer`. 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`.
+    /// Effective input budget after reserving requested output against the combined context ceiling. 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,
@@ -20728,20 +24244,26 @@ pub struct SessionContextAttribution {
 #[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%)
+    /// Output reservation overlapping the displayed prompt allowance plus tokens after the effective input budget's 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.
+    /// Provider-owned model display label, or the Auto routing label. Presentation only; modelName remains the tokenization identity.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub display_model_name: Option<String>,
+    /// Advertised prompt allowance for the selected context tier, without adding output tokens. The denominator for context-usage displays.
     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)
+    /// Effective input budget: the selected tier's prompt allowance bounded by the combined context ceiling minus the requested output allowance. Uses DEFAULT_TOKEN_LIMIT when limits are unspecified.
     pub prompt_token_limit: i64,
+    /// Provider whose catalog supplies this context window. Omitted when provider identity is unavailable.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub provider: Option<ModelProviderRef>,
     /// Tokens consumed by the system prompt
     pub system_tokens: i64,
     /// Tokens consumed by tool definitions sent to the model (excludes deferred tools)
@@ -21625,9 +25147,15 @@ pub struct SessionManagedPermissions {
     /// Permission rules that block matching operations. Deny has highest precedence.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub deny: Option<Vec<String>>,
+    /// When true, prevents Assisted Permissions from being activated. An actively Assisted session falls back to Manual Approval while the policy is in force. Omit the key or set it to false to impose no restriction.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub disable_assisted_permissions_mode: Option<bool>,
     /// When set to `disable`, prevents bypass/allow-all permission modes. Advisory auto-approval remains available because normal prompt paths stay active. 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>,
+    /// Closed-world host boundary expressed as `Domain(hostname)`, `Domain(IP)`, or `Domain(*.example.com)` rules. Schemes, ports, paths, queries, and fragments are rejected because every network request must be enforceable at host-level egress. Multiple managed sources intersect their lists; an empty list denies all hosts.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub limit_to: Option<Vec<String>>,
 }
 
 /// Managed settings an SDK host may inject at session startup. Only permissions are accepted in this initial contract.
@@ -21646,6 +25174,22 @@ pub struct SessionManagedSettings {
     pub permissions: Option<SessionManagedPermissions>,
 }
 
+/// Records which IDE the host is connected to, or clears 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 SessionMcpSetConnectedIdeInfoParams {
+    /// The connected IDE. Null or omitted clears the recorded IDE, which is how a host reports that it is disconnected.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub ide: Option<SessionConnectedIdeInfo>,
+}
+
 /// Public-facing projection of workspace metadata for SDK / TUI consumers
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
@@ -21760,6 +25304,9 @@ pub struct SessionModelPriceCategory {
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct SessionModelList {
+    /// Ordered Auto routing preferences discovered for this session's account.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub auto: Option<AutoTierMetadata>,
     /// 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.
@@ -21960,6 +25507,9 @@ pub struct SessionOpenOptions {
     /// Runtime context discriminator for agent filtering.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub agent_context: Option<String>,
+    /// Explicit discovery-only agent roots, separate from customAgents and filesystem grants. Available without enableConfigDiscovery, subject to managed/source disables. Relative SDK paths resolve once when supplied against the request's effective workingDirectory; retained roots do not move on cwd changes. Null and omission are equivalent; [] clears only the explicit SDK contribution.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub agent_directories: Option<Vec<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>,
@@ -21972,6 +25522,10 @@ pub struct SessionOpenOptions {
     /// Initial authentication info for the session.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub auth_info: Option<AuthInfo>,
+    /// Whether a CLI host explicitly requested the initial Auto preference. False preserves a settings-derived preference without validating availability during creation; execution still validates it. Defaults to true and is ignored for non-CLI callers.
+    #[doc(hidden)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub(crate) auto_tier_is_explicit: Option<bool>,
     /// Allowlist of available tool names.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub available_tools: Option<Vec<String>>,
@@ -22036,12 +25590,15 @@ pub struct SessionOpenOptions {
     /// Whether shell-script safety heuristics are enabled.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub enable_script_safety: Option<bool>,
-    /// Whether skill loading is enabled. When omitted, an SDK skill provider enables skills by default.
+    /// Whether skill loading is enabled. When omitted, explicit SDK skill roots or an SDK skill provider enable skills independently of enableConfigDiscovery.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub enable_skills: Option<bool>,
     /// Whether model responses stream as delta events.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub enable_streaming: Option<bool>,
+    /// Opt in to enforcing non-overridable managed model controls on session model, Auto-tier, reasoning-effort, and context-tier changes. Managed defaults still apply when omitted; this option only turns conflicting changes into errors.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub enforce_managed_model_defaults: Option<bool>,
     /// How MCP server environment values are interpreted.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub env_value_mode: Option<SessionOpenOptionsEnvValueMode>,
@@ -22075,6 +25632,9 @@ pub struct SessionOpenOptions {
     #[doc(hidden)]
     #[serde(skip_serializing_if = "Option::is_none")]
     pub(crate) has_skill_provider: Option<bool>,
+    /// Explicit discovery-only file-hook roots, separate from callback hooks and filesystem grants. Available without enableConfigDiscovery or enableFileHooks, which controls repository-origin hooks only; hook/managed disables still apply. Relative SDK paths resolve once when supplied against the request's effective workingDirectory; retained roots do not move on cwd changes. Null and omission are equivalent; [] clears only the explicit SDK contribution.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub hook_directories: Option<Vec<String>>,
     /// Skill scan directories and descendants excluded from discovery. Supports `~`-relative paths.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub ignored_skills_locations: Option<Vec<String>>,
@@ -22087,6 +25647,9 @@ pub struct SessionOpenOptions {
     /// Installed plugins visible to the session.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub installed_plugins: Option<Vec<InstalledPlugin>>,
+    /// Explicit discovery-only instruction roots using existing SDK instruction formats, not filesystem grants. Available without enableConfigDiscovery, subject to instruction/managed disables. Relative SDK paths resolve once when supplied against the request's effective workingDirectory; retained roots do not move on cwd changes. Null and omission are equivalent; [] clears only the explicit SDK contribution.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub instruction_directories: Option<Vec<String>>,
     /// Stable integration identifier for analytics.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub integration_id: Option<String>,
@@ -22204,7 +25767,7 @@ pub struct SessionOpenOptions {
     /// 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.
+    /// Explicit discovery-only skill roots, not filesystem grants. Available without enableConfigDiscovery, subject to skill/managed disables. Relative SDK paths resolve once when supplied against the request's effective workingDirectory; retained roots do not move on cwd changes. Null and omission are equivalent; [] clears only the explicit SDK contribution.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub skill_directories: Option<Vec<String>>,
     /// Whether to skip custom instruction sources.
@@ -22493,6 +26056,37 @@ pub struct SessionPluginsInstallRequest {
     pub source: String,
 }
 
+/// Plugins required by the session's managed settings to install or update again.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 SessionPluginsRetryManagedRequest {
+    /// "plugin@marketplace" specs to retry. Omit to retry every plugin the session's managed settings require.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub plugins: Option<Vec<String>>,
+}
+
+/// Per-plugin outcomes of retrying the plugins required by the session's managed 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 SessionPluginsRetryManagedResult {
+    /// One entry per requested plugin, in request order. When no plugins were requested, one entry per plugin the managed settings require.
+    pub plugins: Vec<ManagedPluginRetryEntry>,
+}
+
 /// Outcome of the prune operation: deleted IDs, dry-run candidates, skipped IDs, total bytes freed, and the dry-run flag.
 ///
 /// <div class="warning">
@@ -22516,6 +26110,107 @@ pub struct SessionPruneResult {
     pub skipped: Vec<String>,
 }
 
+/// Existing delegation guidance for an account without delegation access.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 SessionQuotaDelegateWarning {
+    /// User-facing guidance.
+    pub text: String,
+    /// Link to upgrade the account.
+    pub url: String,
+}
+
+/// Session quota snapshot, preserving the incumbent numeric units and reset 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 SessionQuotaSnapshot {
+    /// Entitled quantity in this quota's units.
+    pub entitlement_requests: f64,
+    /// Whether the provider reports available quota.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub has_quota: Option<bool>,
+    /// Whether the entitlement is unlimited.
+    pub is_unlimited_entitlement: bool,
+    /// Additional usage in this quota's units.
+    pub overage: f64,
+    /// Whether additional usage is allowed after quota exhaustion.
+    pub overage_allowed_with_exhausted_quota: bool,
+    /// Additional-usage budget cap, when provided.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub overage_entitlement: Option<f64>,
+    /// Percentage of the entitlement remaining.
+    pub remaining_percentage: f64,
+    /// Quota reset time in milliseconds since the Unix epoch, when known.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub reset_date_epoch_ms: Option<f64>,
+    /// Whether the reset time is estimated.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub reset_date_estimated: Option<bool>,
+    /// Whether this quota uses token-based billing.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub token_based_billing: Option<bool>,
+    /// Whether usage is allowed after quota exhaustion.
+    pub usage_allowed_with_exhausted_quota: bool,
+    /// Consumed quantity in this quota's units.
+    pub used_requests: f64,
+}
+
+/// The incumbent session-owned quota and account projection.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 SessionQuotaProjection {
+    /// Whether the account can sign up for Copilot Free.
+    pub can_signup_for_copilot_free: bool,
+    /// Whether the account can delegate tasks to GitHub.
+    pub delegate_available: bool,
+    /// Existing delegation warning for a free account.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub delegate_warning: Option<SessionQuotaDelegateWarning>,
+    /// Whether dynamic workflows are enabled for the active account.
+    pub dynamic_workflows_enabled: bool,
+    /// Whether dynamic workflows are visible under the session's feature flags.
+    pub dynamic_workflows_ui_visible: bool,
+    /// Whether the account uses the free limited Copilot plan.
+    pub is_free_user: bool,
+    /// Whether the account uses token-based billing.
+    pub is_tbb_user: bool,
+    /// Whether model cost columns should be shown.
+    pub model_cost_column_visible: bool,
+    /// Resolved Copilot plan tier.
+    pub plan_tier: SessionQuotaPlanTier,
+    /// Whether premium-request costs are billable.
+    pub premium_requests_billable: bool,
+    /// Provider-owned account quota state, including snapshots without numeric balances.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub provider_quotas: Option<Vec<ProviderQuotaState>>,
+    /// Known quota snapshots, keyed by the provider's quota type.
+    pub snapshots: HashMap<String, SessionQuotaSnapshot>,
+    /// Upgrade link for a free account.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub upgrade_url: Option<String>,
+}
+
 /// Session IDs to close, deactivate, and delete from disk.
 ///
 /// <div class="warning">
@@ -22588,6 +26283,85 @@ pub struct SessionsCloseRequest {
 #[serde(rename_all = "camelCase")]
 pub struct SessionsCloseResult {}
 
+/// A working-directory context together with the client that produced 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 SessionWorkingDirectoryContextWithClient {
+    /// Merge-base commit SHA
+    #[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>,
+    /// Name of the client that created the session
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub client_name: Option<String>,
+    /// Current working directory path
+    pub cwd: String,
+    /// Root directory of the git repository
+    #[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<String>,
+    /// Repository identifier derived from the git remote URL
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub repository: Option<String>,
+    /// Raw host string from the git remote URL
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub repository_host: Option<String>,
+}
+
+/// Identity, state location and starting context for a workspace record.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 SessionsCreateWorkspaceRequest {
+    /// Starting working-directory context. The record keeps `cwd`, `gitRoot`, `repository`, `hostType`, `branch`, and `clientName`. Other fields, including `repositoryHost`, `headCommit`, and `baseCommit`, are ignored. `hostType` must be `github` or `ado`.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub context: Option<SessionWorkingDirectoryContextWithClient>,
+    /// `windows` (any letter case) selects Windows path rules. Any other value selects POSIX path rules.
+    pub convention: String,
+    /// User-supplied display name for the workspace
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub name: Option<String>,
+    /// Session ID the workspace record belongs to
+    pub session_id: SessionId,
+    /// Directory the session's state is written under when no session filesystem provider is configured. Ignored when a provider is configured; the provider's session state path is used instead.
+    pub session_state_path: String,
+}
+
+/// The workspace record that was written.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 SessionsCreateWorkspaceResult {
+    /// The created workspace record, as JSON
+    pub workspace_json: String,
+}
+
 /// Session ID to delete from disk.
 ///
 /// <div class="warning">
@@ -23282,6 +27056,39 @@ pub struct SessionsLoadDeferredRepoHooksRequest {
     pub session_id: SessionId,
 }
 
+/// Where the session's state lives, as a root directory and the session ID under 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 SessionsLoadWorkspaceRequest {
+    /// Session ID naming the state directory under the sessions home. Rejected when it is absolute or contains a parent component, so it cannot escape the sessions home.
+    pub session_id: SessionId,
+    /// Root directory every session's state directory sits under
+    pub sessions_home: String,
+}
+
+/// The workspace record on disk, omitted when the session has 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 SessionsLoadWorkspaceResult {
+    /// The workspace record, as JSON. Omitted when the record does not exist.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub workspace_json: Option<String>,
+}
+
 /// Age threshold and optional flags controlling which old sessions are pruned (or simulated when dryRun is true).
 ///
 /// <div class="warning">
@@ -23510,6 +27317,37 @@ pub struct SessionsTransferRemoteControlRequest {
     pub to_session_id: String,
 }
 
+/// Where the session's state lives, plus workspace-schema fields to merge into its workspace record. Stored keys outside the schema are not preserved, and a stored `fork_count` is never replaced.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 SessionsUpdateWorkspaceFieldsRequest {
+    /// Workspace-schema fields to merge into the record, as a JSON object. Fields the object omits keep their stored values, except stored keys outside the schema are not preserved and a stored `fork_count` is never replaced.
+    pub fields_json: String,
+    /// Session ID naming the state directory under the sessions home. Rejected when it is absolute or contains a parent component, so it cannot escape the sessions home.
+    pub session_id: SessionId,
+    /// Root directory every session's state directory sits under
+    pub sessions_home: String,
+}
+
+/// The merge completed. The record carries the supplied workspace-schema fields, but a stored `fork_count` stays.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 SessionsUpdateWorkspaceFieldsResult {}
+
 /// Telemetry engagement ID for the session, when available.
 ///
 /// <div class="warning">
@@ -23551,6 +27389,9 @@ pub struct SessionUpdateOptionsParams {
     /// Runtime context discriminator (e.g., `cli`, `actions`).
     #[serde(skip_serializing_if = "Option::is_none")]
     pub agent_context: Option<String>,
+    /// Explicit discovery-only agent roots, separate from customAgents and filesystem grants. Available without enableConfigDiscovery, subject to managed/source disables. Relative SDK paths resolve once when supplied against the request's effective workingDirectory; retained roots do not move on cwd changes. Null and omission are equivalent; [] clears only the explicit SDK contribution.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub agent_directories: Option<Vec<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>,
@@ -23587,7 +27428,7 @@ pub struct SessionUpdateOptionsParams {
     /// 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.
+    /// Whether to enable repository-origin file hooks from `.github/hooks/` and trusted repository-configured roots. Does not control explicit hookDirectories or SDK callback hooks.
     #[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).
@@ -23605,7 +27446,7 @@ pub struct SessionUpdateOptionsParams {
     /// Whether to enable cross-session store writes and reads.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub enable_session_store: Option<bool>,
-    /// Whether skill loading is enabled. Explicit false disables every source, including a bound SDK provider; changing the value invalidates the loaded skill snapshot. When omitted, creation falls back to enableConfigDiscovery unless an SDK skill provider is registered.
+    /// Whether skill loading is enabled. Explicit false disables every source, including explicit SDK roots and a bound SDK provider; changing the value invalidates the loaded skill snapshot. When omitted, creation falls back to enableConfigDiscovery unless explicit SDK skill roots or an SDK skill provider are supplied.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub enable_skills: Option<bool>,
     /// Whether to stream model responses.
@@ -23629,6 +27470,9 @@ pub struct SessionUpdateOptionsParams {
     /// Map of feature-flag IDs to their boolean enabled state.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub feature_flags: Option<HashMap<String, bool>>,
+    /// Explicit discovery-only file-hook roots, separate from callback hooks and filesystem grants. Available without enableConfigDiscovery or enableFileHooks, which controls repository-origin hooks only; hook/managed disables still apply. Relative SDK paths resolve once when supplied against the request's effective workingDirectory; retained roots do not move on cwd changes. Null and omission are equivalent; [] clears only the explicit SDK contribution.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub hook_directories: Option<Vec<String>>,
     /// Skill scan directories and descendants excluded from discovery. Supports `~`-relative paths.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub ignored_skills_locations: Option<Vec<String>>,
@@ -23641,6 +27485,9 @@ pub struct SessionUpdateOptionsParams {
     /// 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>>,
+    /// Explicit discovery-only instruction roots using existing SDK instruction formats, not filesystem grants. Available without enableConfigDiscovery, subject to instruction/managed disables. Relative SDK paths resolve once when supplied against the request's effective workingDirectory; retained roots do not move on cwd changes. Null and omission are equivalent; [] clears only the explicit SDK contribution.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub instruction_directories: Option<Vec<String>>,
     /// Stable integration identifier used for analytics and rate-limit attribution.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub integration_id: Option<String>,
@@ -23710,7 +27557,7 @@ pub struct SessionUpdateOptionsParams {
     /// 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.
+    /// Explicit discovery-only skill roots, not filesystem grants. Available without enableConfigDiscovery, subject to skill/managed disables. Relative SDK paths resolve once when supplied against the request's effective workingDirectory; retained roots do not move on cwd changes. Null and omission are equivalent; [] clears only the explicit SDK contribution.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub skill_directories: Option<Vec<String>>,
     /// Whether to skip loading custom instruction sources.
@@ -23754,6 +27601,22 @@ pub struct SessionUpdateOptionsResult {
     pub success: bool,
 }
 
+/// Outcome of an atomic user or repository settings edit.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct SettingsEditResult {
+    /// Changed, unchanged or invalid existing file. Rejected input, validation failures and I/O errors remain RPC errors.
+    #[doc(hidden)]
+    pub(crate) status: SettingsEditStatus,
+}
+
 /// User-requested shell execution cancellation handle.
 ///
 /// <div class="warning">
@@ -24378,7 +28241,7 @@ pub struct SkillPlanUninstallRequest {
     pub policy_session_id: String,
 }
 
-/// Catalog-only metadata for one SDK-provided skill. The complete SKILL.md is fetched separately and lazily.
+/// Authoritative catalog metadata for one SDK-provided skill. The skill's SKILL.md text is fetched separately and lazily.
 ///
 /// <div class="warning">
 ///
@@ -24436,7 +28299,7 @@ pub(crate) struct SkillProviderReadRequest {
     pub name: String,
 }
 
-/// Complete text-only SKILL.md content returned by an SDK session's skill provider. Related files and assets are not supported.
+/// Text-only SKILL.md content returned by an SDK session's skill provider. YAML frontmatter is optional: fields it omits come from the catalog descriptor, fields it declares must match the descriptor, and `allowed-tools` is read only from frontmatter. Related files and assets are not supported.
 ///
 /// <div class="warning">
 ///
@@ -24447,8 +28310,8 @@ pub(crate) struct SkillProviderReadRequest {
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub(crate) struct SkillProviderReadResult {
-    /// Complete SKILL.md text. The runtime enforces a 1 MiB UTF-8 byte limit.
-    pub markdown: String,
+    /// SKILL.md text, with or without YAML frontmatter, or null when the provider has no skill with the requested name. The runtime enforces a 1 MiB UTF-8 byte limit.
+    pub markdown: Option<String>,
 }
 
 /// Skill names to mark as disabled in global configuration, replacing any previous list.
@@ -24518,7 +28381,7 @@ pub struct SkillsDiscoverRequest {
     /// 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
+    /// Explicit discovery-only skill roots, not filesystem grants. Available without ambient discovery, subject to skill/managed disables. Relative paths resolve against the request's effective working directory when supplied. Null and omission are equivalent; an empty array contributes no explicit roots.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub skill_directories: Option<Vec<String>>,
 }
@@ -24581,6 +28444,70 @@ pub struct SkillsGetDiscoveryPathsRequest {
     pub project_paths: Option<Vec<String>>,
 }
 
+/// Extensible [`SkillsGetDiscoveryPathsRequest`], including inputs added after it was published.
+///
+/// Required inputs are [`SkillsGetDiscoveryPathsOptions::new`] arguments; optional inputs have fluent setters.
+/// Input-only: it serialises to the flat wire request and is not deserialisable.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type 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)]
+#[serde(rename_all = "camelCase")]
+pub struct SkillsGetDiscoveryPathsOptions {
+    #[serde(flatten)]
+    legacy: SkillsGetDiscoveryPathsRequest,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    skill_directories: Option<Vec<String>>,
+}
+
+impl SkillsGetDiscoveryPathsOptions {
+    /// Creates options with the required inputs.
+    pub fn new() -> Self {
+        Self {
+            legacy: SkillsGetDiscoveryPathsRequest {
+                project_paths: None,
+                ignored_skills_locations: None,
+                exclude_host_skills: None,
+            },
+            skill_directories: None,
+        }
+    }
+
+    /// Optional list of project directory paths. When omitted or empty, only personal and custom directories are returned.
+    pub fn project_paths(mut self, value: Vec<String>) -> Self {
+        self.legacy.project_paths = Some(value);
+        self
+    }
+
+    /// Optional skill scan paths to exclude from discovery.
+    pub fn ignored_skills_locations(mut self, value: Vec<String>) -> Self {
+        self.legacy.ignored_skills_locations = Some(value);
+        self
+    }
+
+    /// When true, omit the host's personal and custom skill directories, leaving only project directories. For multitenant deployments.
+    pub fn exclude_host_skills(mut self, value: bool) -> Self {
+        self.legacy.exclude_host_skills = Some(value);
+        self
+    }
+
+    /// Explicit discovery-only skill roots to enumerate, including configured missing directories. Relative paths resolve against the request's effective working directory when supplied. These are not filesystem grants or preferred creation targets. Null and omission are equivalent.
+    pub fn skill_directories(mut self, value: Vec<String>) -> Self {
+        self.skill_directories = Some(value);
+        self
+    }
+}
+
+impl Default for SkillsGetDiscoveryPathsOptions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 /// Skill invocation record with name, path, content, allowed tools, and turn number.
 ///
 /// <div class="warning">
@@ -26046,6 +29973,18 @@ pub struct ToolsGetCurrentMetadataResult {
 #[serde(rename_all = "camelCase")]
 pub struct ToolsInitializeAndValidateResult {}
 
+/// No parameters; returns the external tool calls of the session and its sub-agents that are still waiting for a result.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 ToolsListPendingRequestsRequest {}
+
 /// Optional model identifier whose tool overrides should be applied to the listing.
 ///
 /// <div class="warning">
@@ -26783,7 +30722,7 @@ pub struct UpdateSubagentSettingsRequest {
     pub subagents: Option<UpdateSubagentSettingsRequestSubagents>,
 }
 
-/// Request count and cost metrics for this model
+/// Internal absolute code-change totals reported by the owning host.
 ///
 /// <div class="warning">
 ///
@@ -26793,14 +30732,17 @@ pub struct UpdateSubagentSettingsRequest {
 /// </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(crate) struct UsageSetCodeChangesRequest {
+    /// Absolute changed-file count; omission preserves the previous count.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub files_count: Option<f64>,
+    /// Absolute added-line total, replacing the previous reading.
+    pub lines_added: f64,
+    /// Absolute removed-line total, replacing the previous reading.
+    pub lines_removed: f64,
 }
 
-/// Per-model token-detail entry containing the accumulated token count for one token type.
+/// Result of a user-requested shell command.
 ///
 /// <div class="warning">
 ///
@@ -26810,12 +30752,22 @@ 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 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,
 }
 
-/// Token usage metrics for this model
+/// A single user setting's effective value alongside its default, so consumers can render settings left at their default.
 ///
 /// <div class="warning">
 ///
@@ -26825,21 +30777,42 @@ 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
+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,
+}
+
+/// A single top-level setting subtree to validate and write.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 UserSettingsApplyTopKeyRequest {
+    /// Canonical path of the setting the caller is editing. Currently informational only.
+    pub canonical_path: Vec<String>,
+    /// Records that the user chose an update channel explicitly, so the one-time staff channel migration stops reapplying. Honored only for the `autoUpdatesChannel` key.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub complete_staff_update_channel_migration: Option<bool>,
+    /// True to remove the top-level key instead of writing it.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub delete: Option<bool>,
+    /// Top-level setting name to write.
+    pub top_key: String,
+    /// Value to write for the whole top-level key. Omitted when `delete` is true. Explicit null is preserved and validated as null.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub reasoning_tokens: Option<i64>,
+    pub value: Option<serde_json::Value>,
 }
 
-/// Per-model usage metrics, including request counts/costs, token usage, nano-AI units, and per-token-type details.
+/// One problem found while validating a setting value.
 ///
 /// <div class="warning">
 ///
@@ -26849,23 +30822,57 @@ 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.
+pub struct UserSettingsValidationIssue {
+    /// Human-readable description of the problem.
+    pub message: String,
+    /// Where in the settings tree the problem sits, as object keys and array indices. The first element is the top-level key; a whole-value problem is reported as that single key.
+    pub path: Vec<serde_json::Value>,
+}
+
+/// Outcome of validating and writing one top-level setting subtree.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 UserSettingsApplyTopKeyResult {
+    /// Why the write failed, present only when `status` is `write-error`.
     #[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
+    pub error: Option<String>,
+    /// Problems found, present only when `status` is `validation-error`.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub token_details: Option<HashMap<String, UsageMetricsModelMetricTokenDetail>>,
-    /// Accumulated nano-AI units cost for this model
+    pub issues: Option<Vec<UserSettingsValidationIssue>>,
+    /// `ok` when the value was written, `validation-error` when it was rejected before any write, `write-error` when validation passed but the write failed.
+    pub status: String,
+}
+
+/// The overrides and host context to resolve effective runtime settings from.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct UserSettingsBuildRuntimeRequest {
+    /// The environment to read settings-bearing variables from. Passed explicitly rather than read from the server process so a host can resolve settings for an environment it is about to create rather than the one it runs in.
+    pub environment: HashMap<String, String>,
+    /// Settings that take precedence over every document and environment layer, such as the values a host derived from its own command line. Keyed by setting name, with each value carried verbatim, so a host may pass keys this runtime does not recognize. Absent when the host contributes no overrides of its own.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub total_nano_aiu: Option<f64>,
-    /// Token usage metrics for this model
-    pub usage: UsageMetricsModelMetricUsage,
+    pub overrides: Option<HashMap<String, serde_json::Value>>,
+    /// The platform to apply platform-specific defaults for, in the same spelling the host's own runtime reports.
+    pub platform: String,
+    /// The directory the settings are being resolved for. This selects the repository-scoped document, so a host resolving settings for a directory other than its own process working directory must pass that directory here.
+    pub working_directory: String,
 }
 
-/// Usage attributed to one agent instance, including its identity, API duration, AI units, and per-model breakdown.
+/// One atomic edit of a canonical setting in settings.json.
 ///
 /// <div class="warning">
 ///
@@ -26875,22 +30882,21 @@ pub struct UsageMetricsModelMetric {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-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.
+pub(crate) struct UserSettingsEditRequest {
+    /// Nonempty canonical path segments of the setting to edit, starting with its top-level key.
+    pub canonical_path: Vec<String>,
+    /// Configuration directory to edit. Omitted or empty resolves the server's own home, as in `user.settings.loadForConfigDir`.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub agent_display_name: Option<String>,
-    /// Configured agent name, when this is a subagent
+    pub config_dir: Option<String>,
+    /// Set a scalar, add or remove a string list item, or remove the setting. The handler rejects a missing or incompatible value.
+    #[doc(hidden)]
+    pub(crate) operation: SettingsEditOperation,
+    /// Required boolean, string or number for set, required string for add-item and remove-item, and forbidden for remove. The runtime rejects all other JSON values.
     #[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,
+    pub value: Option<serde_json::Value>,
 }
 
-/// Aggregated code change metrics
+/// Selects which settings file paths to resolve.
 ///
 /// <div class="warning">
 ///
@@ -26900,18 +30906,13 @@ pub struct UsageMetricsAgentMetric {
 /// </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 UserSettingsGetPathsRequest {
+    /// Absolute path of a repository root. Supply it to also resolve that repository's two settings file paths; omit it to resolve only the user path.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub repo_root: Option<String>,
 }
 
-/// Session-wide token-detail entry containing the accumulated token count for one token type.
+/// On-disk locations of the settings files this runtime reads. A path is reported whether or not the file exists.
 ///
 /// <div class="warning">
 ///
@@ -26921,12 +30922,18 @@ pub struct UsageMetricsCodeChanges {
 /// </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 UserSettingsGetPathsResult {
+    /// The repository's local, untracked settings file, or null when no repository root was supplied.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub repo_local_settings: Option<String>,
+    /// The repository's checked-in settings file, or null when no repository root was supplied.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub repo_settings: Option<String>,
+    /// The user settings file: `settings.json` under the resolved Copilot home. This is the file `user.settings.get`, `user.settings.load`, and `user.settings.set` read and write.
+    pub user_settings: String,
 }
 
-/// Accumulated session usage metrics, including premium request cost, token counts, model breakdown, and code-change totals.
+/// Per-key metadata for every known user setting in settings.json, including settings left at their default. Excludes repository- and enterprise-managed overrides.
 ///
 /// <div class="warning">
 ///
@@ -26936,38 +30943,86 @@ pub struct UsageMetricsTokenDetail {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct UsageGetMetricsResult {
-    /// Per-agent usage metrics, keyed by agent instance identifier. The main conversation uses the stable key `main`.
+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>,
+}
+
+/// Top-level user-setting keys grouped by who may govern 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 UserSettingsGovernanceKeysResult {
+    /// Top-level keys a repository may override through a Claude-compatible repository config.
+    pub claude_repo: Vec<String>,
+    /// Top-level keys an enterprise policy may fix through managed settings.
+    pub managed: Vec<String>,
+    /// Top-level keys a repository may override through `.github/copilot/settings.json` or `.github/copilot/settings.local.json`.
+    pub repo: Vec<String>,
+}
+
+/// The filesystem and environment facts a user-settings file is resolved from. Passed explicitly rather than read from the runtime's own process, so a host whose configuration directory differs from its process environment resolves the file it means.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 UserSettingsHostContext {
+    /// The Copilot configuration directory, when the host set one. Takes precedence over `COPILOT_HOME` and the home directory.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub agent_metrics: Option<HashMap<String, UsageMetricsAgentMetric>>,
-    /// Aggregated code change metrics
-    pub code_changes: UsageMetricsCodeChanges,
-    /// Currently active model identifier
+    pub config_dir: Option<String>,
+    /// The host's environment variables. `COPILOT_HOME` is read from here, as are the variables a settings hook may expand.
+    pub environment: serde_json::Value,
+    /// The user's home directory, used when neither a configuration directory nor `COPILOT_HOME` is set.
+    pub home_directory: String,
+}
+
+/// A repository to read settings from, and the user layer they are merged over.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct UserSettingsLoadAndMergeRepoRequest {
+    /// Absolute path of the repository root whose settings to read. When this is the user's home directory, the Claude-compatible configuration is skipped, so a home-directory session does not inherit a personal config as if it were repository policy.
+    pub repo_root: String,
+    /// The user's own settings, keyed by setting name. The repository layer is merged over this; a repository may only add to the collection settings it is allowed to influence, so a user setting it does not name survives unchanged.
+    pub user_settings: HashMap<String, serde_json::Value>,
+}
+
+/// The settings a consumer should act on inside a repository, together with any diagnostic raised while reading the repository layer.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct UserSettingsLoadAndMergeRepoResult {
+    /// The merged settings document, keyed by setting name. Equals the supplied user layer when the repository declares no settings.
+    pub settings: HashMap<String, serde_json::Value>,
+    /// Why part of the repository document was ignored, as a single human-readable string joining every diagnostic with `; `. Null when it loaded cleanly. The settings that did load are still merged, so a consumer should surface this and continue rather than treat it as a failure.
     #[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,
+    pub warning: Option<String>,
 }
 
-/// Result of a user-requested shell command.
+/// Selects the configuration directory whose user settings to read.
 ///
 /// <div class="warning">
 ///
@@ -26977,22 +31032,31 @@ pub struct UsageGetMetricsResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct UserRequestedShellCommandResult {
-    /// Error output when the execution failed
+pub(crate) struct UserSettingsLoadForConfigDirRequest {
+    /// Copilot configuration directory to read the settings document from, taking precedence over the server's own `COPILOT_HOME` and default home. Omit it, or pass an empty string, to read the directory the server resolved for itself.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub error: Option<String>,
-    /// Process exit code, when available
+    pub config_dir: Option<String>,
+}
+
+/// Contents of settings.json as stored, for a caller about to rewrite 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 UserSettingsLoadForEditResult {
+    /// Parsed contents, present only when `status` is `ok`.
     #[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 settings: Option<serde_json::Value>,
+    /// `ok` when the file parsed, `missing` when there is no file yet, `invalid` when the file exists but will not parse.
+    pub status: String,
 }
 
-/// A single user setting's effective value alongside its default, so consumers can render settings left at their default.
+/// Selects the repository whose checked-in settings to read.
 ///
 /// <div class="warning">
 ///
@@ -27002,16 +31066,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 UserSettingsLoadRepoRequest {
+    /// Absolute path of the repository root whose settings to read. When this is the user's home directory, the Claude-compatible configuration is skipped, so a home-directory session does not inherit a personal config as if it were repository policy.
+    pub repo_root: String,
 }
 
-/// 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.
+/// A repository's settings as stored, together with any diagnostic raised while reading them.
 ///
 /// <div class="warning">
 ///
@@ -27021,9 +31081,414 @@ 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 UserSettingsLoadRepoResult {
+    /// The repository's settings document, keyed by setting name, with each value carried verbatim. Null when the repository declares no settings.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub settings: Option<HashMap<String, serde_json::Value>>,
+    /// Why part of the document was ignored, as a single human-readable string joining every diagnostic with `; `. Null when the document loaded cleanly. The settings that did load are still reported, so a consumer should surface this and continue rather than treat it as a failure.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub warning: Option<String>,
+}
+
+/// The user's stored settings, together with any diagnostic raised while reading 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 UserSettingsLoadWithWarningResult {
+    /// The stored user settings document, keyed by setting name, with each value carried verbatim. Empty when the file could not be read at all.
+    pub settings: HashMap<String, serde_json::Value>,
+    /// Why part of the document was ignored, phrased for display to the user. Null when the document loaded cleanly. The settings that did load are still reported, so a consumer may surface this and continue rather than treat it as a failure.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub warning: Option<String>,
+}
+
+/// The managed (enterprise policy) layer and the user layer to fold together. The field names carry the layer identity: nothing about a settings object identifies which layer produced it, so a generic base/override pair would let a caller transpose them and silently resolve the governance keys in the user's favour.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct UserSettingsMergeManagedAndUserParams {
+    /// The managed layer. Its governance keys win, and the per-entry `enabledPlugins` and `extraKnownMarketplaces` control maps are stamped back from it after the union. Omitted when the host is unmanaged.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub managed: Option<serde_json::Value>,
+    /// The user's own settings layer. Wins on every key the managed layer does not govern. Omitted when the user has no settings yet.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub user: Option<serde_json::Value>,
+}
+
+/// The user layer folded over the managed layer.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 UserSettingsMergeManagedAndUserResult {
+    /// The merged settings. An empty object when neither layer was supplied, so an unmanaged host with no user settings governs nothing.
+    pub settings_json: serde_json::Value,
+}
+
+/// The user layer and the repository layer to fold together.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct UserSettingsMergeRepoValueParams {
+    /// The repository's checked-in settings layer.
+    pub repo_settings: serde_json::Value,
+    /// The user's settings, already resolved against any managed layer.
+    pub user_settings: serde_json::Value,
+}
+
+/// The repository layer folded into the user layer.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 UserSettingsMergeRepoValueResult {
+    /// The merged settings, with the per-entry managed control maps re-stamped from the runtime's ambient managed policy.
+    pub settings_json: serde_json::Value,
+}
+
+/// Selects the configuration directory whose settings document to clean.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct UserSettingsMigrateObsoleteOnDiskRequest {
+    /// The configuration directory holding the settings document to clean. A host that scopes a session to its own Copilot home passes that directory here; omit it to clean the document under the home the server resolved for itself. The home directory and environment are deliberately not caller-supplied: they decide only the settings path root and the two hook-parsing flags, and those describe the process doing the reading rather than the caller.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub config_dir: Option<String>,
+}
+
+/// The outcome of the one-time obsolete-settings cleanup.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct UserSettingsMigrateObsoleteOnDiskResult {
+    /// What the cleanup did. Only `changed` rewrote the document. The cleaned settings are not returned here: the document is written before this replies, so `user.settings.load` reads it authoritatively.
+    #[doc(hidden)]
+    pub(crate) status: UserSettingsMigrateObsoleteOnDiskStatus,
+}
+
+/// Selects the configuration directory to run the one-time staff log-level migration against, and supplies the caller's record of whether it has already 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(crate) struct UserSettingsMigrateStaffLogLevelOnceRequest {
+    /// When the caller last recorded this migration, as an ISO-8601 timestamp. Supplying it lets the runtime answer `current` without re-running the evaluation.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub cached_completed_at: Option<String>,
+    /// The configuration directory, home directory and environment to resolve the settings and global-state documents from. A host that scopes a session to its own Copilot home must pass that directory here, or the migration is evaluated against the server's own home instead.
+    pub context: UserSettingsHostContext,
+}
+
+/// The outcome of the one-time staff log-level migration.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct UserSettingsMigrateStaffLogLevelOnceResult {
+    /// When the migration was recorded as done, as an ISO-8601 timestamp. Absent only for `ineligible`, which records nothing.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub completed_at: Option<String>,
+    /// The settings document as it stands after the migration, keyed by setting name. Present only for `refreshed`, and only when the document could be re-read cleanly.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub settings: Option<serde_json::Value>,
+    /// What the migration did. Only `refreshed` can have changed the persisted settings.
+    pub status: StaffLogLevelMigrationStatus,
+}
+
+/// The outcome of the one-time staff update-channel migration.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct UserSettingsMigrateStaffUpdateChannelOnceResult {
+    /// When the migration was recorded as done, as an ISO-8601 timestamp. Absent only for `ineligible`, which records nothing.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub completed_at: Option<String>,
+    /// What the migration did. Only `migrated` means the persisted settings changed.
+    pub status: StaffUpdateChannelMigrationStatus,
+}
+
+/// Settings object whose key names should be canonicalized.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 UserSettingsNormalizeRequest {
+    /// Free-form settings object, possibly using legacy or snake_case key names.
+    pub settings: serde_json::Value,
+}
+
+/// Settings object with canonical key names.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 UserSettingsNormalizeResult {
+    /// The same settings with every legacy or snake_case key renamed to its canonical spelling.
+    pub settings: serde_json::Value,
+}
+
+/// The on-disk location of the user's settings document.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 UserSettingsPathResult {
+    /// Absolute path to the settings file this runtime reads and writes. Normally `settings.json` under the Copilot configuration directory; an extensionless legacy `settings` file is reported instead when it exists and `settings.json` does not.
+    pub path: String,
+}
+
+/// The settings layer a problem was found in.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 UserSettingsProblemLocation {
+    /// Absolute path of the file backing this layer.
+    pub file_path: String,
+    /// Which layer this is: `user`, `repo`, or `local`.
+    pub kind: String,
+    /// The caller-supplied display label for the layer.
+    pub label: String,
+}
+
+/// One setting that will not take effect, and why.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 UserSettingsProblem {
+    /// Coarse grouping for the problem, for a caller that presents problems in sections.
+    pub category: String,
+    /// Why the setting will not take effect. Never contains the setting's value, which may be a token or another secret.
+    pub explanation: String,
+    /// Stable identifier for this problem within the reported set, so a caller can track a selection across refreshes.
+    pub id: String,
+    /// What is wrong in machine-readable form, for a caller that wants to branch rather than display.
+    pub kind: String,
+    /// The offending key as written in the file, when the problem is attributable to a single key. Absent when the whole file is at fault.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub raw_key: Option<String>,
+    /// The settings layer the problem was found in.
+    pub source: UserSettingsProblemLocation,
+}
+
+/// One already-loaded settings layer to diagnose.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 UserSettingsProblemSource {
+    /// The layer's settings exactly as loaded, unnormalized. Empty when the file is missing or failed to parse.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub config: Option<HashMap<String, serde_json::Value>>,
+    /// Absolute path of the file backing this layer.
+    pub file_path: String,
+    /// True when the file itself failed to parse, so its keys could not be read at all.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub invalid: Option<bool>,
+    /// Which layer this is: `user`, `repo`, or `local`.
+    pub kind: String,
+    /// Caller-chosen display label for the layer, echoed back on each problem so a caller can group by layer without re-deriving its own naming.
+    pub label: String,
+}
+
+/// The settings layers to diagnose.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 UserSettingsProblemsRequest {
+    /// Layers to diagnose, in the precedence order the caller applies them.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub sources: Option<Vec<UserSettingsProblemSource>>,
+}
+
+/// The settings that will not take effect across the given layers.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 UserSettingsProblemsResult {
+    /// Each setting that will not take effect, and why. Empty when every layer is healthy.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub problems: Option<Vec<UserSettingsProblem>>,
+}
+
+/// Selects the configuration directory to run the one-time staff model-selection reset against, and supplies the caller's record of whether it has already 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(crate) struct UserSettingsResetStaffModelSelectionOnceRequest {
+    /// The configuration directory, home directory and environment to resolve the settings and global-state documents from. A host that scopes a session to its own Copilot home must pass that directory here, or the reset is evaluated against the server's own home instead.
+    pub context: UserSettingsHostContext,
+    /// Whether the signed-in account is a staff account. The reset applies only to staff, so anything other than `true` returns `didReset: false` without touching the settings document.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub staff: Option<bool>,
+    /// When the caller last recorded this reset, as an ISO-8601 timestamp. A timestamp at or after the cutoff means the reset already ran and is returned unchanged.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub staff_model_reset_at: Option<String>,
+}
+
+/// The outcome of the one-time staff model-selection reset.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct UserSettingsResetStaffModelSelectionOnceResult {
+    /// The cutoff this reset is gated on, as an ISO-8601 timestamp. A recorded timestamp at or after it means the reset is already done.
+    pub cutoff: String,
+    /// Whether the persisted model selection was cleared. Only `true` means the settings document changed and the host should adopt the returned settings.
+    pub did_reset: bool,
+    /// The timestamp the host should now record, as an ISO-8601 timestamp. Carries the caller's own value back unchanged when nothing was reset.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub reset_at: Option<String>,
+    /// The settings document as it stands after the reset, keyed by setting name. Present only when `didReset` is true.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub settings: Option<serde_json::Value>,
+}
+
+/// One hook to disable or re-enable.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct UserSettingsSetHookDisabledRequest {
+    /// True adds the key to `disabledHooks`, false removes it.
+    pub disabled: bool,
+    /// Durable content-hash key of the hook, as `hooks.loadResources` reports it.
+    pub disable_key: String,
+    /// Path of the settings.json to rewrite.
+    pub settings_path: String,
+}
+
+/// Outcome of rewriting the `disabledHooks` setting.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct UserSettingsSetHookDisabledResult {
+    /// Why the write failed. Absent when the status is `ok`.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub error_message: Option<String>,
+    /// `ok` when the setting was written, `invalid` when settings.json could not be parsed and was left alone, `error` when the write itself failed.
+    pub status: 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.
@@ -27041,7 +31506,38 @@ pub struct UserSettingsSetRequest {
     pub settings: serde_json::Value,
 }
 
-/// Outcome of writing user settings.
+/// Selects the configuration directory whose user settings document should be inspected for unrecognized top-level keys.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct UserSettingsUnknownKeysWarningRequest {
+    /// The configuration directory, home directory and environment to resolve the settings document from. A host that scopes a session to its own Copilot home must pass that directory here, or the server's own home is inspected instead.
+    pub context: UserSettingsHostContext,
+}
+
+/// The unrecognized top-level keys found in the user settings document, already phrased for display.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct UserSettingsUnknownKeysWarningResult {
+    /// The warning to show the user, naming the unrecognized keys and the file they were found in. Absent when every top-level key is recognized, and also when the document is missing or could not be read, because an unknown-key list taken from a document the runtime could not load would name keys that may not be there.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub warning: Option<String>,
+}
+
+/// Names the user setting to merge into, and the partial object to merge.
 ///
 /// <div class="warning">
 ///
@@ -27051,9 +31547,86 @@ 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(crate) struct UserSettingsUpdateRequest {
+    /// Copilot configuration directory to write the settings document in, taking precedence over the server's own `COPILOT_HOME` and default home. Omit it, or pass an empty string, to use the directory the server resolved for itself.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub config_dir: Option<String>,
+    /// Top-level user-setting key to merge into, such as `extensions`.
+    pub key: String,
+    /// Single-component name for the settings document at `<configDir>/settings/<subDir>.json`; path separators, `.` and `..` are rejected. Omit it, or pass an empty string, to use the main settings document.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub sub_dir: Option<String>,
+    /// Value to store for `key`. When both the stored value and this value are objects, their fields are shallow-merged and fields this object does not name are preserved. Otherwise this value replaces the stored value.
+    pub value: serde_json::Value,
+}
+
+/// The stored value of the user setting after the merge.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct UserSettingsUpdateResult {
+    /// The key's stored value after the write: the merged object when both the stored value and the supplied value are objects, otherwise the supplied value.
+    pub value: serde_json::Value,
+}
+
+/// A single top-level setting subtree to validate.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 UserSettingsValidateRequest {
+    /// True to validate a removal of this key. The current settings file is not read.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub delete: Option<bool>,
+    /// Top-level setting name to validate.
+    pub top_key: String,
+    /// Value to validate. Omitted when `delete` is true.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub value: Option<serde_json::Value>,
+}
+
+/// Outcome of validating one top-level setting subtree.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 UserSettingsValidateResult {
+    /// Problems found, empty when `ok` is true.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub issues: Option<Vec<UserSettingsValidationIssue>>,
+    /// True when the subtree is valid.
+    pub ok: bool,
+}
+
+/// The whole content to store in the user settings 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 UserSettingsWriteAllRequest {
+    /// The settings object to store. It replaces the file's entire content, so a key absent here is removed.
+    pub settings: serde_json::Value,
 }
 
 /// Current sharing status and shareable GitHub URL for a session.
@@ -28053,6 +32626,25 @@ pub(crate) struct WorkflowToolRunRequest {
     pub tool_call_id: Option<String>,
 }
 
+/// Complete text used to generate one session diff. These are display contents, with the same text decoding as the patch, not a file-restore 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 WorkspaceDiffContents {
+    /// Complete current text read when computing the diff. Omitted for a deleted file; an empty string represents an existing empty file.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub after: Option<String>,
+    /// Complete text before the session first changed the file. Omitted when the file did not exist; an empty string represents an existing empty file.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub before: Option<String>,
+}
+
 /// A single changed file and its unified diff.
 ///
 /// <div class="warning">
@@ -28066,6 +32658,9 @@ pub(crate) struct WorkflowToolRunRequest {
 pub struct WorkspaceDiffFileChange {
     /// Type of change represented by this file diff.
     pub change_type: WorkspaceDiffFileChangeType,
+    /// Full text used for this patch, only when includeContents was requested for session mode. Omitted for binary, oversized or unavailable contents, and for fallback results. Read isFallback and isTruncated before treating an absent value as a missing file.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub contents: Option<WorkspaceDiffContents>,
     /// 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.
@@ -28243,6 +32838,51 @@ pub struct WorkspacesDiffRequest {
     pub mode: WorkspaceDiffMode,
 }
 
+/// Extensible [`WorkspacesDiffRequest`], including inputs added after it was published.
+///
+/// Required inputs are [`WorkspacesDiffOptions::new`] arguments; optional inputs have fluent setters.
+/// Input-only: it serialises to the flat wire request and is not deserialisable.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type 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)]
+#[serde(rename_all = "camelCase")]
+pub struct WorkspacesDiffOptions {
+    #[serde(flatten)]
+    legacy: WorkspacesDiffRequest,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    include_contents: Option<bool>,
+}
+
+impl WorkspacesDiffOptions {
+    /// Creates options with the required inputs.
+    pub fn new(mode: WorkspaceDiffMode) -> Self {
+        Self {
+            legacy: WorkspacesDiffRequest {
+                mode,
+                ignore_whitespace: None,
+            },
+            include_contents: None,
+        }
+    }
+
+    /// When true, ignore whitespace-only changes (git `--ignore-all-space`). Defaults to false.
+    pub fn ignore_whitespace(mut self, value: bool) -> Self {
+        self.legacy.ignore_whitespace = Some(value);
+        self
+    }
+
+    /// Include the full before/after text used to compute each session diff. Defaults to false; true is accepted only for session mode. Existing capture/read limits still apply, and binary or unavailable contents are not returned. This can substantially increase response size.
+    pub fn include_contents(mut self, value: bool) -> Self {
+        self.include_contents = Some(value);
+        self
+    }
+}
+
 /// Optional session context used when creating a local workspace.
 ///
 /// <div class="warning">
@@ -28663,6 +33303,360 @@ pub struct WorkspacesWriteAutopilotObjectiveResult {
     pub operation: String,
 }
 
+/// Status of the persistent certificate authority of the sandbox credential proxy.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 SandboxProxyCaGetStatusResult {
+    /// Whether this process can add the certificate authority to OS trust without credentials from a different user. False where OS trust is unsupported, and on Windows when the process cannot elevate itself to write the machine trust store. When false, do not offer to set up the certificate authority.
+    pub can_install: bool,
+    /// Human-readable reason for the state. On `installed` or `notInstalled`, present only when the certificate authority must be rotated, and then says why.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub detail: Option<String>,
+    /// The state of the certificate authority.
+    pub state: SandboxProxyCaState,
+}
+
+/// Status of the persistent certificate authority of the sandbox credential proxy.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 SandboxProxyCaRotateResult {
+    /// Whether this process can add the certificate authority to OS trust without credentials from a different user. False where OS trust is unsupported, and on Windows when the process cannot elevate itself to write the machine trust store. When false, do not offer to set up the certificate authority.
+    pub can_install: bool,
+    /// Human-readable reason for the state. On `installed` or `notInstalled`, present only when the certificate authority must be rotated, and then says why.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub detail: Option<String>,
+    /// The state of the certificate authority.
+    pub state: SandboxProxyCaState,
+}
+
+/// Status of the persistent certificate authority of the sandbox credential proxy.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 SandboxProxyCaTrustResult {
+    /// Whether this process can add the certificate authority to OS trust without credentials from a different user. False where OS trust is unsupported, and on Windows when the process cannot elevate itself to write the machine trust store. When false, do not offer to set up the certificate authority.
+    pub can_install: bool,
+    /// Human-readable reason for the state. On `installed` or `notInstalled`, present only when the certificate authority must be rotated, and then says why.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub detail: Option<String>,
+    /// The state of the certificate authority.
+    pub state: SandboxProxyCaState,
+}
+
+/// Status of the persistent certificate authority of the sandbox credential proxy.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 SandboxProxyCaRemoveResult {
+    /// Whether this process can add the certificate authority to OS trust without credentials from a different user. False where OS trust is unsupported, and on Windows when the process cannot elevate itself to write the machine trust store. When false, do not offer to set up the certificate authority.
+    pub can_install: bool,
+    /// Human-readable reason for the state. On `installed` or `notInstalled`, present only when the certificate authority must be rotated, and then says why.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub detail: Option<String>,
+    /// The state of the certificate authority.
+    pub state: SandboxProxyCaState,
+}
+
+/// Where this runtime keeps the sandbox proxy password.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 SandboxProxySecretGetLocationResult {
+    /// Absolute path of the credential store holding the sandbox proxy password. The proxy password belongs to no MCP server, so it is kept in its own directory rather than in the MCP secret store.
+    pub config_dir: String,
+    /// Identifier of the proxy password entry within that store. Derived from the configuration directory, so two Copilot homes on one machine never share an entry. Use it to recognize a `${secret:…}` reference in stored settings as this runtime's own proxy password.
+    pub secret_id: String,
+}
+
+/// The sandbox a named feature actually launches under.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct SandboxResolveForOptionalResult {
+    /// The effective sandbox config for the requested feature, or a disabled sandbox when the feature is routed out of it.
+    pub sandbox_json: serde_json::Value,
+}
+
+/// The startup warning, absent when the machine can run a sandbox.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct SandboxGetUnsupportedStartupNoticeResult {
+    /// The user-facing warning, carrying the platform remedy and the recovery the policy in force actually allows. Absent when this machine supports a sandbox, so a host can call unconditionally and print only what it gets.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub notice: Option<String>,
+}
+
+/// The documentation URL a host cites when it declines or downgrades a sandbox setting.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 SandboxGetDocsUrlResult {
+    /// Documentation URL describing the sandbox and the settings that control it.
+    pub url: String,
+}
+
+/// Whether the host running this runtime can run the command sandbox. The runtime checks `supported` once per process. A capability answer can change while the process runs, for example after the user installs a missing package.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 SandboxGetHostSupportResult {
+    /// Sandbox policy features whose availability varies between hosts that can run the backend. Empty when `supported` is false, because no feature can run without a backend. Later runtimes can add entries; ignore an entry whose `name` you do not recognize.
+    pub capabilities: Vec<SandboxHostCapability>,
+    /// Human-readable reason the sandbox cannot run on this host. Present only when `supported` is false.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub reason: Option<String>,
+    /// Whether a process-containment backend is usable on this host: Seatbelt on macOS, Bubblewrap on Linux, or ProcessContainer on Windows.
+    pub supported: bool,
+}
+
+/// The on-disk location of the user's settings document.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 UserSettingsGetPathResult {
+    /// Absolute path to the settings file this runtime reads and writes. Normally `settings.json` under the Copilot configuration directory; an extensionless legacy `settings` file is reported instead when it exists and `settings.json` does not.
+    pub path: String,
+}
+
+/// The unrecognized top-level keys found in the user settings document, already phrased for display.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct UserSettingsGetUnknownKeysWarningResult {
+    /// The warning to show the user, naming the unrecognized keys and the file they were found in. Absent when every top-level key is recognized, and also when the document is missing or could not be read, because an unknown-key list taken from a document the runtime could not load would name keys that may not be there.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub warning: Option<String>,
+}
+
+/// Top-level user-setting keys grouped by who may govern 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 UserSettingsListGovernanceKeysResult {
+    /// Top-level keys a repository may override through a Claude-compatible repository config.
+    pub claude_repo: Vec<String>,
+    /// Top-level keys an enterprise policy may fix through managed settings.
+    pub managed: Vec<String>,
+    /// Top-level keys a repository may override through `.github/copilot/settings.json` or `.github/copilot/settings.local.json`.
+    pub repo: Vec<String>,
+}
+
+/// Outcome of an atomic user or repository settings edit.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct UserSettingsEditResult {
+    /// Changed, unchanged or invalid existing file. Rejected input, validation failures and I/O errors remain RPC errors.
+    #[doc(hidden)]
+    pub(crate) status: SettingsEditStatus,
+}
+
+/// The settings that will not take effect across the given layers.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 UserSettingsDiagnoseProblemsResult {
+    /// Each setting that will not take effect, and why. Empty when every layer is healthy.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub problems: Option<Vec<UserSettingsProblem>>,
+}
+
+/// Outcome of an atomic user or repository settings edit.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct RepoSettingsEditResult {
+    /// Changed, unchanged or invalid existing file. Rejected input, validation failures and I/O errors remain RPC errors.
+    #[doc(hidden)]
+    pub(crate) status: SettingsEditStatus,
+}
+
+/// Every feature flag this runtime declares, with the shape each one was declared with.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct FeatureFlagsListMetadataResult {
+    /// Declared feature flags keyed by flag name.
+    #[doc(hidden)]
+    pub(crate) flags: HashMap<String, FeatureFlagMetadata>,
+}
+
+/// Which stored location permissions were dropped because their directory is gone.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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(crate) struct PermissionsLocationsCleanupOrphanedResult {
+    /// Location keys whose grants were removed. Empty when every stored location still exists.
+    pub removed_location_keys: Vec<String>,
+}
+
+/// Folder trust check result.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 PermissionsFolderTrustCheckTrustResult {
+    /// Whether the folder is trusted
+    pub trusted: bool,
+}
+
+/// The verdict of the `forceLoginOrgs` enterprise sign-in pin for one credential. A managed device may pin Copilot to an approved set of GitHub organizations so a developer cannot sign in with a personal — or another enterprise's — account and escape every control that keys off the signed-in identity. A host must refuse to proceed when `allowed` is false; the remaining fields explain the refusal rather than qualifying 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(crate) struct ManagedSettingsResolveDeviceForceLoginOrgsGateResult {
+    /// Whether the client may proceed. True whenever no pin is in force, so an unmanaged host is never blocked.
+    pub allowed: bool,
+    /// A stable kebab-case reason code when refused: `org-not-approved`, `unverifiable-credential`, `policy-undetermined`, `policy-invalid`, `not-signed-in`, or `membership-unknown`. Omitted when allowed. Treat an unrecognized code as a refusal rather than mapping it to an allow: a code this host has not been taught about still denied the credential.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub denial: Option<String>,
+    /// Whether a pin applies at all. Distinguishes "allowed because unmanaged" from "allowed because the account is approved", which a diagnostics surface needs and which also decides whether a bring-your-own-key provider may serve inference.
+    pub enforced: bool,
+    /// The approved organization the account matched, when allowed under a pin.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub matched_org: Option<String>,
+    /// A developer-facing explanation of the refusal. Omitted when allowed.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub message: Option<String>,
+    /// Error-level detail from managed-policy discovery — which file failed to load, which field failed validation. Carried on the decision rather than left to the log because a refusal can exit the process before a log sink exists, which would discard the only actionable diagnostic a misconfigured managed device produces.
+    pub policy_diagnostics: Vec<String>,
+    /// The approved organization logins, as configured. Enterprise configuration rather than user data, so it is safe to name in a message or a log line.
+    pub required_orgs: Vec<String>,
+}
+
+/// Ordered managed permission verdicts and the supplied policy's fail-closed posture.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 ManagedSettingsPermissionsEvaluateResult {
+    /// Managed permission policy could not be determined; every operation is denied.
+    pub fail_closed: bool,
+    /// One verdict per input operation, in the same order, including duplicates.
+    pub results: Vec<ManagedPermissionEvaluation>,
+}
+
 /// The resident session the application has materialized on its own connection.
 ///
 /// <div class="warning">
@@ -28788,7 +33782,7 @@ pub struct ModelsGetBuiltInCatalogResult {
     pub models: Vec<BuiltInModelCatalogEntry>,
 }
 
-/// Whether the host running this runtime can run the command sandbox. The runtime checks `supported` once per process. A capability answer can change while the process runs, for example after the user installs a missing package.
+/// Built-in tools available for the requested model, with their parameters and instructions.
 ///
 /// <div class="warning">
 ///
@@ -28798,17 +33792,12 @@ pub struct ModelsGetBuiltInCatalogResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SandboxGetHostSupportResult {
-    /// Sandbox policy features whose availability varies between hosts that can run the backend. Empty when `supported` is false, because no feature can run without a backend. Later runtimes can add entries; ignore an entry whose `name` you do not recognize.
-    pub capabilities: Vec<SandboxHostCapability>,
-    /// Human-readable reason the sandbox cannot run on this host. Present only when `supported` is false.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub reason: Option<String>,
-    /// Whether a process-containment backend is usable on this host: Seatbelt on macOS, Bubblewrap on Linux, or ProcessContainer on Windows.
-    pub supported: bool,
+pub struct ToolsListResult {
+    /// List of available built-in tools with metadata
+    pub tools: Vec<Tool>,
 }
 
-/// Status of the persistent certificate authority of the sandbox credential proxy.
+/// User-configured MCP servers, keyed by server name.
 ///
 /// <div class="warning">
 ///
@@ -28818,17 +33807,12 @@ pub struct SandboxGetHostSupportResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SandboxProxyCaGetStatusResult {
-    /// Whether this process can add the certificate authority to OS trust without credentials from a different user. False where OS trust is unsupported, and on Windows when the process cannot elevate itself to write the machine trust store. When false, do not offer to set up the certificate authority.
-    pub can_install: bool,
-    /// Human-readable reason for the state. On `installed` or `notInstalled`, present only when the certificate authority must be rotated, and then says why.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub detail: Option<String>,
-    /// The state of the certificate authority.
-    pub state: SandboxProxyCaState,
+pub struct McpConfigListResult {
+    /// All MCP servers from user config, keyed by name
+    pub servers: HashMap<String, serde_json::Value>,
 }
 
-/// Status of the persistent certificate authority of the sandbox credential proxy.
+/// Request id naming a cancellable registry search.
 ///
 /// <div class="warning">
 ///
@@ -28838,17 +33822,12 @@ pub struct SandboxProxyCaGetStatusResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SandboxProxyCaRotateResult {
-    /// Whether this process can add the certificate authority to OS trust without credentials from a different user. False where OS trust is unsupported, and on Windows when the process cannot elevate itself to write the machine trust store. When false, do not offer to set up the certificate authority.
-    pub can_install: bool,
-    /// Human-readable reason for the state. On `installed` or `notInstalled`, present only when the certificate authority must be rotated, and then says why.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub detail: Option<String>,
-    /// The state of the certificate authority.
-    pub state: SandboxProxyCaState,
+pub(crate) struct McpRegistryAllocateRequestIdResult {
+    /// Request ID for `mcp.registry.search` and `mcp.registry.cancel`. It serves one search. Allocation can reclaim unused IDs at the 1,024-ID reservation limit.
+    pub request_id: i64,
 }
 
-/// Status of the persistent certificate authority of the sandbox credential proxy.
+/// Extensions discovered from persisted Copilot home state and their effective loading mode. Launch-scoped additional plugins are not included.
 ///
 /// <div class="warning">
 ///
@@ -28858,17 +33837,14 @@ pub struct SandboxProxyCaRotateResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SandboxProxyCaTrustResult {
-    /// Whether this process can add the certificate authority to OS trust without credentials from a different user. False where OS trust is unsupported, and on Windows when the process cannot elevate itself to write the machine trust store. When false, do not offer to set up the certificate authority.
-    pub can_install: bool,
-    /// Human-readable reason for the state. On `installed` or `notInstalled`, present only when the certificate authority must be rotated, and then says why.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub detail: Option<String>,
-    /// The state of the certificate authority.
-    pub state: SandboxProxyCaState,
+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,
 }
 
-/// Status of the persistent certificate authority of the sandbox credential proxy.
+/// The prompt the init command runs.
 ///
 /// <div class="warning">
 ///
@@ -28878,17 +33854,12 @@ pub struct SandboxProxyCaTrustResult {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SandboxProxyCaRemoveResult {
-    /// Whether this process can add the certificate authority to OS trust without credentials from a different user. False where OS trust is unsupported, and on Windows when the process cannot elevate itself to write the machine trust store. When false, do not offer to set up the certificate authority.
-    pub can_install: bool,
-    /// Human-readable reason for the state. On `installed` or `notInstalled`, present only when the certificate authority must be rotated, and then says why.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub detail: Option<String>,
-    /// The state of the certificate authority.
-    pub state: SandboxProxyCaState,
+pub(crate) struct InstructionsGetInitPromptResult {
+    /// Prompt text authoring repository instructions.
+    pub prompt: String,
 }
 
-/// Built-in tools available for the requested model, with their parameters and instructions.
+/// Instruction sources discovered across user, repository, and plugin sources.
 ///
 /// <div class="warning">
 ///
@@ -28898,12 +33869,12 @@ pub struct SandboxProxyCaRemoveResult {
 /// </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 InstructionsDiscoverResult {
+    /// All discovered instruction sources
+    pub sources: Vec<InstructionSource>,
 }
 
-/// User-configured MCP servers, keyed by server name.
+/// Instruction sources discovered across user, repository, and plugin sources.
 ///
 /// <div class="warning">
 ///
@@ -28913,12 +33884,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 InstructionsDiscoverRepoSourcesResult {
+    /// All discovered instruction sources
+    pub sources: Vec<InstructionSource>,
 }
 
-/// Extensions discovered from persisted Copilot home state and their effective loading mode. Launch-scoped additional plugins are not included.
+/// Canonical files and directories where custom instructions can be created so the runtime will recognize them.
 ///
 /// <div class="warning">
 ///
@@ -28928,11 +33899,9 @@ 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 InstructionsGetDiscoveryPathsResult {
+    /// Canonical instruction create/discovery files and directories, in priority order
+    pub paths: Vec<InstructionDiscoveryPath>,
 }
 
 /// Skills discovered across global and project sources.
@@ -29153,7 +34122,7 @@ pub struct AgentsGetDiscoveryPathsResult {
     pub paths: Vec<AgentDiscoveryPath>,
 }
 
-/// Instruction sources discovered across user, repository, and plugin sources.
+/// The host's machine-wide state. Every field is optional because a fresh install has recorded nothing yet, so a reader must treat an absent field as `not yet`, never as a negative answer. Stored credentials are deliberately absent from this shape.
 ///
 /// <div class="warning">
 ///
@@ -29163,12 +34132,69 @@ 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(crate) struct GlobalStateLoadForConfigDirResult {
+    /// Whether the app tip has been shown.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub app_tip_shown: Option<bool>,
+    /// Terminals the user has already been asked to set up, so the host does not ask twice.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub asked_setup_terminals: Option<Vec<String>>,
+    /// When the Auto-feedback hint was last shown, as an ISO 8601 timestamp. It enforces the once-per-day cap for non-staff users across restarts.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub auto_feedback_last_prompted_at: Option<String>,
+    /// When the host first ran on this machine.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub first_launch_at: Option<String>,
+    /// Plugins installed on this machine.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub installed_plugins: Option<Vec<InstalledPlugin>>,
+    /// Account used for the most recent sign-in.
+    #[doc(hidden)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub(crate) last_logged_in_user: Option<LoggedInUser>,
+    /// Every account the host has signed in to on this machine.
+    #[doc(hidden)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub(crate) logged_in_users: Option<Vec<LoggedInUser>>,
+    /// Whether the one-off cleanup of stored reasoning summaries has run.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub reasoning_summaries_cleanup_done: Option<bool>,
+    /// Models the user selected recently, most recent first.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub recent_model_ids: Option<Vec<String>>,
+    /// Whether the user declined to trust the sandbox credential proxy CA.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub sandbox_credential_proxy_ca_declined: Option<bool>,
+    /// Whether the sandbox onboarding has been shown.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub sandbox_onboarding_shown: Option<bool>,
+    /// Whether the user is a GitHub or Microsoft staff member, which unlocks internal-only behavior.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub staff: Option<bool>,
+    /// Whether the user was recognized as GitHub staff.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub staff_github: Option<bool>,
+    /// When the staff-only log level migration last ran.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub staff_log_level_migration_at: Option<String>,
+    /// Whether the user was recognized as Microsoft staff.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub staff_microsoft: Option<bool>,
+    /// When the staff-only model reset last ran.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub staff_model_reset_at: Option<String>,
+    /// When the staff-only update channel migration last ran.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub staff_update_channel_migration_at: Option<String>,
+    /// Folders where the user declined the init prompt, so it stays hidden there.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub suppress_init_folders: Option<Vec<String>>,
+    /// Folders the user has marked as trusted.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub trusted_folders: Option<Vec<String>>,
 }
 
-/// Canonical files and directories where custom instructions can be created so the runtime will recognize them.
+/// Slash commands available in the session, after applying any include/exclude filters.
 ///
 /// <div class="warning">
 ///
@@ -29178,12 +34204,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 CommandsListResult {
+    /// Commands available in this session
+    pub commands: Vec<SlashCommandInfo>,
 }
 
-/// Slash commands available in the session, after applying any include/exclude filters.
+/// A freshly registered request id. Registering it before the listing starts is what lets a cancel that races the request still find the owner listing slot. The id serves one listing only. Long-abandoned unused ids can be released by later allocations.
 ///
 /// <div class="warning">
 ///
@@ -29193,9 +34219,45 @@ 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(crate) struct GitHubOwnersNextRequestIdResult {
+    /// Request id to pass to `gitHubOwners.list` and, to abandon it, `gitHubOwners.cancel`.
+    pub request_id: i64,
+}
+
+/// Updated working directory and git context. Emitted as the new payload of `session.context_changed`.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 GitWorkingDirectoryContextResult {
+    /// 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>,
 }
 
 /// Result of opening a session.
@@ -29465,6 +34527,86 @@ pub struct SessionsGetRemoteControlStatusResult {
     pub status: serde_json::Value,
 }
 
+/// Feature availability.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 ConnectorsGetCapabilitiesResult {
+    /// API version.
+    pub api_version: i64,
+    /// Availability.
+    pub availability: ConnectorDiscoveryAvailability,
+    /// Whether results are cached.
+    pub conditional_cache: bool,
+    /// Whether accounts are selected by opaque ID.
+    pub opaque_account_selection: bool,
+}
+
+/// Eligible accounts.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 ConnectorsGetAccountsResult {
+    /// Eligible accounts.
+    pub accounts: Vec<ConnectorDiscoveryAccount>,
+    /// Availability.
+    pub availability: ConnectorDiscoveryAvailability,
+}
+
+/// Entries for the selected account.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 ConnectorsListResult {
+    /// Opaque account ID.
+    pub account_id: String,
+    /// Entries.
+    pub connectors: Vec<ConnectorDiscoveryCatalogEntry>,
+    /// Refresh time in Unix epoch milliseconds.
+    pub refreshed_at_ms: i64,
+    /// Revision.
+    pub revision: i64,
+}
+
+/// Entries for the selected account.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 ConnectorsRefreshResult {
+    /// Opaque account ID.
+    pub account_id: String,
+    /// Entries.
+    pub connectors: Vec<ConnectorDiscoveryCatalogEntry>,
+    /// Refresh time in Unix epoch milliseconds.
+    pub refreshed_at_ms: i64,
+    /// Revision.
+    pub revision: i64,
+}
+
 /// Identifies the target session.
 ///
 /// <div class="warning">
@@ -29656,6 +34798,36 @@ pub struct SessionSandboxGetEnforcementStatusResult {
     pub required: bool,
 }
 
+/// 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 SessionSandboxGetCredentialSuggestionsParams {
+    /// Target session identifier
+    pub session_id: SessionId,
+}
+
+/// Possible unconfigured secrets in the sandbox shell environment, sorted by variable name, with no secret values.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 SessionSandboxGetCredentialSuggestionsResult {
+    /// Candidates for user review. Empty when sandboxing is disabled or no unconfigured candidates are present.
+    pub suggestions: Vec<SandboxCredentialSuggestion>,
+}
+
 /// Result of attempting to disable sandboxing for the current session.
 ///
 /// <div class="warning">
@@ -30495,6 +35667,12 @@ pub struct SessionModelGetCurrentResult {
     /// Captured base model to restore when leaving plan mode. Omitted outside plan mode or when no plan override has captured a base model. Persistent agent model requirements apply to this model rather than the temporary plan model.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub plan_base_model_id: Option<String>,
+    /// Provider of planBaseModelId, when that saved selection is provider-qualified.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub plan_base_provider_id: Option<String>,
+    /// Provider selected for this model. Together with modelId, identifies a catalog entry even when providers serve the same model. Omitted for unattributed legacy selections.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub provider_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>,
@@ -30613,6 +35791,35 @@ pub struct SessionModelApplyStartupOverlayResult {
     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(crate) struct SessionModelClearStartupSeedParams {
+    pub expected_model: String,
+    /// Provider captured with the startup seed; omission matches only an unqualified seed.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub expected_provider_id: 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(crate) struct SessionModelClearStartupSeedResult {
+    pub cleared: bool,
+}
+
 /// The applied host allowlist and effective session model policy after intersection.
 ///
 /// <div class="warning">
@@ -30653,6 +35860,36 @@ pub struct SessionModelSetReasoningEffortResult {
     pub reasoning_effort: String,
 }
 
+/// Reasoning-summaries presentation policy for the session's current 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 SessionModelGetReasoningSummariesResult {
+    /// Whether the supplied `persistedShowReasoning` setting only restates the model default. This reports a redundancy, not a standing instruction to delete the setting: it stays true for as long as the setting and the model default agree, including for a user who later chose that value deliberately. It exists for a one-time migration of a legacy setting written before the model default made it redundant, so a host that acts on it owns the cleanup and must gate it behind its own persisted `done` marker, delete only a setting whose value still matches the one it read, and never repeat the deletion on a later launch. Under an off-by-default reasoning-summaries experiment an explicit `showReasoning: true` opt-in also reads as redundant on a summary-producing model, so an ungated host would keep deleting that opt-in and hide summaries again on every launch.
+    pub clear_redundant_setting: bool,
+    /// Whether the session's reasoning-summaries experiment assignment has settled. False means this read does not wait for a pending assignment and reports the experiment-derived fields conservatively: `showHiddenHint` is false and `visibility` falls back to `persistedShowReasoning`, or is omitted when none was supplied. A host that wants the assigned answer re-reads until this is true.
+    pub experiment_settled: bool,
+    /// Whether the selected model shows reasoning summaries by default.
+    pub model_default_shows_summaries: bool,
+    /// False until the session has a model catalog and a selected model. This read never resolves the catalog itself, and the runtime emits no readiness notification, so repeating this call alone leaves `ready` false indefinitely on a session that has neither listed models nor run a turn. `session.model.list` is the prerequisite and the signal: it resolves and caches the catalog for the session, so a successful return means the next read is ready. The exception is a session that resolves models without a Copilot catalog, that is a BYOK registry or an alternate provider: `session.model.list` returns an empty list without caching a catalog, so `ready` stays false and this policy is unavailable there. While false, every model-policy field is false and `visibility` is omitted; `experimentSettled` is independent of readiness and still reports the assignment state.
+    pub ready: bool,
+    /// Whether turns on this session produce reasoning summaries, honouring an explicit session reasoning-summary override.
+    pub session_shows_summaries: bool,
+    /// Whether to show the hint that reasoning summaries are hidden. Always false while `experimentSettled` is false.
+    pub show_hidden_hint: bool,
+    /// Whether the selected model emits reasoning headers.
+    pub show_reasoning_headers: bool,
+    /// Default reasoning visibility, and only meaningful once `ready` is true: false when the session produces no summaries, else the persisted setting, else the experiment's default. While `ready` is true it is omitted only when all three are unavailable, that is when the session produces summaries, no `persistedShowReasoning` was supplied, and `experimentSettled` is false. While `ready` is false there is no model policy to report and this field is always omitted, so an absent value alone does not imply a pending experiment.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub visibility: Option<bool>,
+}
+
 /// The list of models available to this session.
 ///
 /// <div class="warning">
@@ -30664,6 +35901,9 @@ pub struct SessionModelSetReasoningEffortResult {
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct SessionModelListResult {
+    /// Ordered Auto routing preferences discovered for this session's account.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub auto: Option<AutoTierMetadata>,
     /// 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.
@@ -32167,6 +37407,36 @@ pub struct SessionMcpListResult {
     pub servers: Vec<McpServer>,
 }
 
+/// 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 SessionMcpListConfiguredParams {
+    /// Target session identifier
+    pub session_id: SessionId,
+}
+
+/// Effective MCP configuration with optional live observations from matching already materialized 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, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SessionMcpListConfiguredResult {
+    /// Effective configured MCP servers.
+    pub servers: Vec<McpConfiguredServer>,
+}
+
 /// Tools exposed by the connected MCP server. Throws when the server is not connected.
 ///
 /// <div class="warning">
@@ -33037,20 +38307,23 @@ pub struct SessionManagedSettingsGetParams {
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct SessionManagedSettingsGetResult {
-    /// Whether enterprise policy disables bypass-permissions ("yolo") mode for this session. Deny-wins across layers, and forced on when `failClosed` is true.
+    /// Whether an explicit enterprise policy restriction disables bypass-permissions ("yolo") mode for this session. Deny-wins across layers; an unresolved policy does not force this on by itself.
     pub bypass_permissions_disabled: bool,
     /// 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.
+    /// Whether managed policy could not be determined (e.g. a failed server fetch) and unresolved-policy safeguards remain active. This does not by itself disable bypass-permissions; `bypassPermissionsDisabled` reports only an explicit policy restriction.
     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 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>,
+    /// Reusable retained managed permission policy for managedSettings.permissions.evaluate, including source composition and session-local injection. Provided by live session snapshots; absent in older events. Refresh the context when managed policy changes.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub permissions_context: Option<ManagedPermissionsContext>,
     /// Whether the policy-helper managed-settings layer was present. The policy helper is the weakest channel: it fills keys no enterprise source set and can never replace one.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub policy_helper_managed: Option<bool>,
@@ -33385,6 +38658,36 @@ pub struct SessionExtensionsReloadParams {
     pub session_id: SessionId,
 }
 
+/// 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 SessionExtensionsReconcileParams {
+    /// Target session identifier
+    pub session_id: SessionId,
+}
+
+/// Extensions discovered for the session, with their 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 SessionExtensionsReconcileResult {
+    /// Discovered extensions and their current status
+    pub extensions: Vec<Extension>,
+}
+
 /// Rust-owned built-in tool descriptors for the session.
 ///
 /// <div class="warning">
@@ -33446,6 +38749,21 @@ pub struct SessionToolsHandlePendingToolCallResult {
     pub success: bool,
 }
 
+/// External tool calls still waiting for a result.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 SessionToolsListPendingRequestsResult {
+    /// External tool calls of the session and its sub-agents that session.tools.handlePendingToolCall would still accept, in the order they were requested. Includes calls that were pending when the session was last suspended and resumed with pending work continued, so a host that did not observe the original external_tool.requested event can answer them.
+    pub items: Vec<PendingExternalToolRequest>,
+}
+
 /// Identifies the target session.
 ///
 /// <div class="warning">
@@ -34384,20 +39702,26 @@ pub struct SessionMetadataActivityResult {
 #[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%)
+    /// Output reservation overlapping the displayed prompt allowance plus tokens after the effective input budget's 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.
+    /// Provider-owned model display label, or the Auto routing label. Presentation only; modelName remains the tokenization identity.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub display_model_name: Option<String>,
+    /// Advertised prompt allowance for the selected context tier, without adding output tokens. The denominator for context-usage displays.
     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)
+    /// Effective input budget: the selected tier's prompt allowance bounded by the combined context ceiling minus the requested output allowance. Uses DEFAULT_TOKEN_LIMIT when limits are unspecified.
     pub prompt_token_limit: i64,
+    /// Provider whose catalog supplies this context window. Omitted when provider identity is unavailable.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub provider: Option<ModelProviderRef>,
     /// Tokens consumed by the system prompt
     pub system_tokens: i64,
     /// Tokens consumed by tool definitions sent to the model (excludes deferred tools)
@@ -34440,7 +39764,7 @@ pub struct SessionMetadataGetContextAttributionParams {
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct SessionMetadataGetContextAttributionResultContextAttributionCategories {
-    /// Output reserve plus post-blocking-threshold buffer.
+    /// Overlapping output reservation plus post-blocking-threshold buffer.
     pub buffer: i64,
     /// Custom-instructions tokens (0 when none are configured).
     pub custom_instructions: i64,
@@ -34487,7 +39811,7 @@ pub struct SessionMetadataGetContextAttributionResultContextAttributionEntriesIt
 #[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`.
+    /// Output reservation overlapping the displayed prompt allowance plus the tokens past the effective input budget's 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,
@@ -34497,13 +39821,13 @@ pub struct SessionMetadataGetContextAttributionResultContextAttribution {
     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`.
+    /// Advertised prompt allowance for the selected context tier: the denominator for context-usage displays and capacity for `categories.freeSpace` and `categories.buffer`. 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`.
+    /// Effective input budget after reserving requested output against the combined context ceiling. 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,
@@ -35421,7 +40745,7 @@ pub struct SessionUsageGetMetricsParams {
     pub session_id: SessionId,
 }
 
-/// Accumulated session usage metrics, including premium request cost, token counts, model breakdown, and code-change totals.
+/// Internal absolute code-change totals reported by the owning host.
 ///
 /// <div class="warning">
 ///
@@ -35431,35 +40755,143 @@ pub struct SessionUsageGetMetricsParams {
 /// </div>
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SessionUsageGetMetricsResult {
-    /// Per-agent usage metrics, keyed by agent instance identifier. The main conversation uses the stable key `main`.
+pub(crate) struct SessionUsageSetCodeChangesParams {
+    /// Absolute added-line total, replacing the previous reading.
+    pub lines_added: f64,
+    /// Absolute removed-line total, replacing the previous reading.
+    pub lines_removed: f64,
+    /// Absolute changed-file count; omission preserves the previous count.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub agent_metrics: Option<HashMap<String, UsageMetricsAgentMetric>>,
-    /// Aggregated code change metrics
-    pub code_changes: UsageMetricsCodeChanges,
-    /// Currently active model identifier
+    pub files_count: Option<f64>,
+}
+
+/// 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 SessionQuotaGetParams {
+    /// Target session identifier
+    pub session_id: SessionId,
+}
+
+/// The incumbent session-owned quota and account projection.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 SessionQuotaGetResult {
+    /// Whether the account can sign up for Copilot Free.
+    pub can_signup_for_copilot_free: bool,
+    /// Whether the account can delegate tasks to GitHub.
+    pub delegate_available: bool,
+    /// Existing delegation warning for a free account.
     #[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,
+    pub delegate_warning: Option<SessionQuotaDelegateWarning>,
+    /// Whether dynamic workflows are enabled for the active account.
+    pub dynamic_workflows_enabled: bool,
+    /// Whether dynamic workflows are visible under the session's feature flags.
+    pub dynamic_workflows_ui_visible: bool,
+    /// Whether the account uses the free limited Copilot plan.
+    pub is_free_user: bool,
+    /// Whether the account uses token-based billing.
+    pub is_tbb_user: bool,
+    /// Whether model cost columns should be shown.
+    pub model_cost_column_visible: bool,
+    /// Resolved Copilot plan tier.
+    pub plan_tier: SessionQuotaPlanTier,
+    /// Whether premium-request costs are billable.
+    pub premium_requests_billable: bool,
+    /// Provider-owned account quota state, including snapshots without numeric balances.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub provider_quotas: Option<Vec<ProviderQuotaState>>,
+    /// Known quota snapshots, keyed by the provider's quota type.
+    pub snapshots: HashMap<String, SessionQuotaSnapshot>,
+    /// Upgrade link for a free account.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub upgrade_url: Option<String>,
+}
+
+/// 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 SessionQuotaRefreshParams {
+    /// Target session identifier
+    pub session_id: SessionId,
+}
+
+/// The incumbent session-owned quota and account projection.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 SessionQuotaRefreshResult {
+    /// Whether the account can sign up for Copilot Free.
+    pub can_signup_for_copilot_free: bool,
+    /// Whether the account can delegate tasks to GitHub.
+    pub delegate_available: bool,
+    /// Existing delegation warning for a free account.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub delegate_warning: Option<SessionQuotaDelegateWarning>,
+    /// Whether dynamic workflows are enabled for the active account.
+    pub dynamic_workflows_enabled: bool,
+    /// Whether dynamic workflows are visible under the session's feature flags.
+    pub dynamic_workflows_ui_visible: bool,
+    /// Whether the account uses the free limited Copilot plan.
+    pub is_free_user: bool,
+    /// Whether the account uses token-based billing.
+    pub is_tbb_user: bool,
+    /// Whether model cost columns should be shown.
+    pub model_cost_column_visible: bool,
+    /// Resolved Copilot plan tier.
+    pub plan_tier: SessionQuotaPlanTier,
+    /// Whether premium-request costs are billable.
+    pub premium_requests_billable: bool,
+    /// Provider-owned account quota state, including snapshots without numeric balances.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub provider_quotas: Option<Vec<ProviderQuotaState>>,
+    /// Known quota snapshots, keyed by the provider's quota type.
+    pub snapshots: HashMap<String, SessionQuotaSnapshot>,
+    /// Upgrade link for a free account.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub upgrade_url: Option<String>,
+}
+
+/// 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 SessionQuotaTakeWarningsParams {
+    /// Target session identifier
+    pub session_id: SessionId,
 }
 
 /// GitHub URL for the session and a flag indicating whether remote steering is enabled.
@@ -35929,7 +41361,17 @@ pub type McpExecuteSamplingResult = HashMap<String, serde_json::Value>;
 /// </div>
 pub type McpPlanSecretReference = String;
 
-/// Extensible identifier of a sandbox policy feature whose availability varies between hosts. A plain string, so an older client decodes a name added by a newer runtime; ignore names you do not recognize. Known values: `network` — sandboxed commands can reach the network (`network.allowOutbound`, on by default); on Linux this needs the tooling for Bubblewrap's private network namespace, such as slirp4netns. `network_filtering` — host rules and the sandbox proxy (`network.allowedHosts`, `network.blockedHosts`, `network.proxy`); on Linux this needs the same tooling as `network`; on Windows it needs a version with Process Security Environment 1.1 host-loopback support, and a policy that uses it must also set `network.allowLocalNetwork`, because Windows reaches the local proxy only together with private-network access. `denied_paths` — native enforcement of `filesystem.deniedPaths`; on Windows this needs a version whose sandbox contract reports denied-path support. `shell` — shell commands inside the sandbox: bash on macOS and Linux, PowerShell on Windows. `filesystem_enumeration` — enumerate-only filesystem grants, which PowerShell's drive roots use on Windows; this needs a version with Process Security Environment 1.1 filesystem enumeration support. Without it, sandboxed PowerShell still runs, but `Get-Location` may report the drive root, `Set-Location` may fail, and relative paths may resolve against the drive root; the session also receives a `session.warning` with `warningType` `sandbox`. Other platforms always report it.
+/// Pending warnings returned and cleared by session.quota.takeWarnings.
+///
+/// <div class="warning">
+///
+/// **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 type QuotaTakeWarningsResult = Vec<QuotaWarningProjection>;
+
+/// Extensible identifier of a sandbox policy feature whose availability varies between hosts. A plain string, so an older client decodes a name added by a newer runtime; ignore names you do not recognize. Known values: `network` — sandboxed commands can reach the network (`network.allowOutbound`, on by default); on Linux this needs the tooling for Bubblewrap's private network namespace, such as slirp4netns. `network_filtering` — host rules and the sandbox proxy (`network.allowedHosts`, `network.blockedHosts`, `network.proxy`); on Linux this needs the same tooling as `network`; on Windows it needs Process Security Environment 1.1 host-loopback support or MXC's PSEC 1.0-only proxy-loopback compatibility capability, and a policy that uses it must also set `network.allowLocalNetwork`, because Windows reaches the local proxy only together with private-network access. Compatibility applies only to an explicit identity-less runtime proxy, not general host-loopback access, and other policy restrictions still apply. `denied_paths` — native enforcement of `filesystem.deniedPaths`; on Windows this needs a version whose sandbox contract reports denied-path support. `shell` — shell commands inside the sandbox: bash on macOS and Linux, PowerShell on Windows. `filesystem_enumeration` — enumerate-only filesystem grants, which PowerShell's drive roots use on Windows; this needs a version with Process Security Environment 1.1 filesystem enumeration support. Without it, sandboxed PowerShell still runs, but `Get-Location` may report the drive root, `Set-Location` may fail, and relative paths may resolve against the drive root; the session also receives a `session.warning` with `warningType` `sandbox`. Other platforms always report it.
 ///
 /// <div class="warning">
 ///
@@ -35969,6 +41411,126 @@ pub type SessionsGetClientMetadataResult = Vec<serde_json::Value>;
 /// </div>
 pub type UIElicitationResponseContent = HashMap<String, serde_json::Value>;
 
+/// True when this process can offer installing the sandbox credential-proxy certificate authority into OS 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>
+pub type SandboxProxyCaCheckInstallationSupportResult = bool;
+
+/// True when the sandbox configuration uses the credential proxy and can need certificate-authority setup.
+///
+/// <div class="warning">
+///
+/// **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 type SandboxProxyCaCheckRelevanceResult = bool;
+
+/// The effective sandbox settings, with every unset value resolved to its default.
+///
+/// <div class="warning">
+///
+/// **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 type SandboxSettingsApplyDefaultsResult = HashMap<String, serde_json::Value>;
+
+/// True when an OS-level sandbox can run on this host.
+///
+/// <div class="warning">
+///
+/// **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 type SandboxCheckPlatformSupportResult = bool;
+
+/// True when the sandbox on this host can reach host loopback directly.
+///
+/// <div class="warning">
+///
+/// **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 type SandboxCheckWindowsHostLoopbackSupportResult = bool;
+
+/// The user-facing refusal, including the platform remedy and the documentation link.
+///
+/// <div class="warning">
+///
+/// **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 type SandboxGetUnsupportedMessageResult = String;
+
+/// The user-facing notice that a saved sandbox setting is inert 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>
+pub type SandboxGetUnsupportedSettingDisabledNoticeResult = String;
+
+/// True when the command stays available while enforcement is blocked.
+///
+/// <div class="warning">
+///
+/// **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 type SandboxCheckEnforcementCommandResult = bool;
+
+/// The stored user settings document, keyed by setting 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 type UserSettingsLoadForConfigDirResult = HashMap<String, serde_json::Value>;
+
+/// The effective runtime settings, keyed by setting name. Keys this runtime does not recognize are preserved rather than dropped, so a caller reading a document written by a newer runtime keeps every 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>
+pub type UserSettingsBuildRuntimeResult = HashMap<String, serde_json::Value>;
+
+/// The resolved gates, keyed by flag 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 type FeatureFlagsResolveStartupGatesResult = HashMap<String, bool>;
+
+/// The resolved feature flags, keyed by flag 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 type FeatureFlagsResolveResult = HashMap<String, bool>;
+
 /// List of all authenticated users
 ///
 /// <div class="warning">
@@ -36059,6 +41621,16 @@ pub type SessionMetadataGetClientMetadataResult = HashMap<String, String>;
 /// </div>
 pub type SessionMetadataUpdateClientMetadataResult = HashMap<String, String>;
 
+/// Pending warnings returned and cleared by session.quota.takeWarnings.
+///
+/// <div class="warning">
+///
+/// **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 type SessionQuotaTakeWarningsResult = Vec<QuotaWarningProjection>;
+
 /// Indicates whether the command was accepted into the local execution queue.
 ///
 /// <div class="warning">
@@ -36138,6 +41710,14 @@ pub enum UserAuthInfoType {
     User,
 }
 
+/// Provider-owned account authentication.
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum AccountAuthInfoType {
+    #[serde(rename = "account")]
+    #[default]
+    Account,
+}
+
 /// Authentication via the `gh` CLI's saved credentials.
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
 pub enum GhCliAuthInfoType {
@@ -36171,10 +41751,54 @@ pub enum AuthInfo {
     TokenProvider(TokenProviderAuthInfo),
     CopilotApiToken(CopilotApiTokenAuthInfo),
     User(UserAuthInfo),
+    Account(AccountAuthInfo),
     GhCli(GhCliAuthInfo),
     ApiKey(ApiKeyAuthInfo),
 }
 
+/// Authentication 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, 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 from a selected provider-owned account, without a GitHub credential.
+    #[serde(rename = "account")]
+    Account,
+    /// 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,
+}
+
 /// The provider kind stamped on a signed-in account.
 ///
 /// <div class="warning">
@@ -36858,46 +42482,6 @@ pub enum AuthEnumerateValue {
     Providers(AuthEnumerateValueProviders),
 }
 
-/// Authentication 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, 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,
-}
-
 /// Login flow step variant discriminator.
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
 pub enum AuthLoginStepOpenUrlKind {
@@ -36938,7 +42522,7 @@ pub enum AuthLoginStepCompletedKind {
     Completed,
 }
 
-/// Terminal disposition of a login persistence attempt.
+/// Disposition of a login attempt, including pending user decisions.
 ///
 /// <div class="warning">
 ///
@@ -36948,12 +42532,15 @@ pub enum AuthLoginStepCompletedKind {
 /// </div>
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
 pub enum AuthLoginResultStatus {
-    /// The credential was persisted and the account is signed in.
+    /// The credential was persisted and the selected account is signed in.
     #[serde(rename = "completed")]
     Completed,
     /// Persistence needs explicit consent to store the token in plaintext.
     #[serde(rename = "needs-plaintext-consent")]
     NeedsPlaintextConsent,
+    /// Credentials are saved; select an account using a returned selectionId as advance input to complete sign-in.
+    #[serde(rename = "needs-account-selection")]
+    NeedsAccountSelection,
     /// The user declined plaintext persistence.
     #[serde(rename = "declined")]
     Declined,
@@ -38652,6 +44239,31 @@ pub enum ConnectorConnectResult {
     Pending(ConnectorConnectResultPending),
 }
 
+/// Availability.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 ConnectorDiscoveryAvailability {
+    /// Enabled.
+    #[serde(rename = "enabled")]
+    Enabled,
+    /// Disabled.
+    #[serde(rename = "disabled")]
+    Disabled,
+    /// Unavailable.
+    #[serde(rename = "unavailable")]
+    Unavailable,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
+
 /// Closed set of public task kinds a connection can negotiate.
 ///
 /// <div class="warning">
@@ -39606,6 +45218,49 @@ pub enum ExternalToolTextResultForLlmContentTextType {
     Text,
 }
 
+/// The population a feature flag is declared for, before overrides.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 FeatureFlagAvailability {
+    /// Enabled for everyone, before any override.
+    #[serde(rename = "on")]
+    On,
+    /// Enabled only for accounts on the owning team.
+    #[serde(rename = "team")]
+    Team,
+    /// Enabled only for staff accounts that have also opted into experimental features.
+    #[serde(rename = "staff-and-experimental")]
+    StaffAndExperimental,
+    /// Enabled for staff accounts and for accounts that opted into experimental features.
+    #[serde(rename = "staff-or-experimental")]
+    StaffOrExperimental,
+    /// Enabled for any staff account, GitHub or Microsoft.
+    #[serde(rename = "staff")]
+    Staff,
+    /// Enabled for GitHub staff accounts only.
+    #[serde(rename = "staff-github")]
+    StaffGitHub,
+    /// Enabled for Microsoft staff accounts only.
+    #[serde(rename = "staff-microsoft")]
+    StaffMicrosoft,
+    /// Enabled only for accounts that opted into experimental features.
+    #[serde(rename = "experimental")]
+    Experimental,
+    /// Disabled for everyone, before any override.
+    #[serde(rename = "off")]
+    Off,
+    /// 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 GitHubTokenAcquireReason {
@@ -39804,6 +45459,13 @@ pub enum HistoryRewindOutcome {
     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, PartialEq, Eq, Serialize, Deserialize)]
 pub enum HostExitReason {
     /// The owner requested disposal.
@@ -40509,6 +46171,126 @@ pub enum SessionLogLevel {
     Unknown,
 }
 
+/// Operation to evaluate. Currently only url is supported.
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum ManagedPermissionOperationKind {
+    #[serde(rename = "url")]
+    #[default]
+    Url,
+}
+
+/// Managed-policy verdict only: deny blocks the URL, ask requires approval, allow approves under managed policy, and unmanaged leaves the normal consumer permission flow in effect. No verdict bypasses other security controls.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 ManagedPermissionVerdict {
+    /// Managed policy prohibits the operation; do not offer approval.
+    #[serde(rename = "deny")]
+    Deny,
+    /// Managed policy requires the consumer to obtain approval.
+    #[serde(rename = "ask")]
+    Ask,
+    /// Managed policy allows the operation, subject to other security controls.
+    #[serde(rename = "allow")]
+    Allow,
+    /// Managed policy does not decide the operation; use the consumer's normal permission flow.
+    #[serde(rename = "unmanaged")]
+    Unmanaged,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
+
+/// What retrying did for one plugin required by managed 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, PartialEq, Eq, Serialize, Deserialize)]
+pub enum ManagedPluginRetryStatus {
+    /// The plugin was missing and is now installed.
+    #[serde(rename = "installed")]
+    Installed,
+    /// An update was available and is now installed.
+    #[serde(rename = "updated")]
+    Updated,
+    /// The plugin was already installed and current, so nothing was done.
+    #[serde(rename = "already_present")]
+    AlreadyPresent,
+    /// Checking, installing, or updating the plugin failed. See `error`.
+    #[serde(rename = "failed")]
+    Failed,
+    /// The plugin was not prepared because another session was changing plugins or the managed settings changed during the retry. It is prepared again before a later message.
+    #[serde(rename = "deferred")]
+    Deferred,
+    /// The session's managed settings do not require this plugin, so nothing was done.
+    #[serde(rename = "not_required")]
+    NotRequired,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
+
+/// Which layer disabled bypass-permissions mode. The layer matters because only a server-delivered disable is pinned to an account and can later be lifted by signing in elsewhere.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 ManagedSettingsBypassDisableSource {
+    /// The user turned bypass mode off themselves.
+    #[serde(rename = "user")]
+    User,
+    /// The account's server-delivered org policy disabled it. Pinned to the account named by `currentManagedIdentity`.
+    #[serde(rename = "managed")]
+    Managed,
+    /// The device/MDM layer disabled it. Outranks the account, so no server answer lifts it.
+    #[serde(rename = "mdm")]
+    Mdm,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
+
+/// What the managed-policy resolution said about bypass-permissions mode. `unknown` is a third answer rather than a missing one, and the caller must send it explicitly when it has no verdict.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 ManagedSettingsBypassPolicyResolution {
+    /// The policy resolved and does not disable bypass mode.
+    #[serde(rename = "allowed")]
+    Allowed,
+    /// The policy resolved and disables bypass mode.
+    #[serde(rename = "disabled")]
+    Disabled,
+    /// No verdict: the fetch failed, or the service declared a policy this build may not enforce. Whatever is in force is preserved, because reverting to permissive on an unreadable policy would widen access.
+    #[serde(rename = "unknown")]
+    UnknownValue,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
+
 /// A channel accepted by managedSettings.compose.
 ///
 /// <div class="warning">
@@ -40556,6 +46338,143 @@ pub enum ManagedSettingsDiagnosticSeverity {
     Unknown,
 }
 
+/// The operation that requires a policy-helper 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 ManagedSettingsPolicyHelperReason {
+    /// Resolve policy for session startup.
+    #[serde(rename = "sessionStart")]
+    SessionStart,
+    /// Resolve policy before plugin activation.
+    #[serde(rename = "pluginActivation")]
+    PluginActivation,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
+
+/// How an ingestion may use the on-disk server-policy cache.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 ManagedSettingsServerPolicyCacheMode {
+    /// Serve a recent cache entry before a live fetch.
+    #[serde(rename = "preferFresh")]
+    PreferFresh,
+    /// Read cached policy without a network request.
+    #[serde(rename = "cacheOnly")]
+    CacheOnly,
+    /// Serve a cached entry only as a fallback after a failed live fetch.
+    #[serde(rename = "fallbackOnly")]
+    FallbackOnly,
+    /// Ignore the cache entirely and rely on the live fetch alone.
+    #[serde(rename = "disabled")]
+    Disabled,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
+
+/// Severity of a diagnostic emitted while ingesting managed 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, PartialEq, Eq, Serialize, Deserialize)]
+pub enum ManagedSettingsLogLevel {
+    /// Detail useful only when diagnosing an ingestion.
+    #[serde(rename = "debug")]
+    Debug,
+    /// Ordinary progress worth surfacing under a verbose flag.
+    #[serde(rename = "info")]
+    Info,
+    /// A condition the operator should see but which did not stop the ingestion.
+    #[serde(rename = "warning")]
+    Warning,
+    /// A failure that changed the outcome of the ingestion.
+    #[serde(rename = "error")]
+    Error,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
+
+/// Which channel registered the policy helper that produced a helper layer.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 ManagedSettingsPolicyHelperAuthority {
+    /// The helper was registered by the device (MDM or managed file) layer.
+    #[serde(rename = "device")]
+    Device,
+    /// The helper was registered by the account's server-delivered policy.
+    #[serde(rename = "server")]
+    Server,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
+
+/// How the server layer of an ingestion was resolved.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 ManagedSettingsServerPolicyResolution {
+    /// A live fetch succeeded.
+    #[serde(rename = "live")]
+    Live,
+    /// A recent cached entry was served without a live fetch.
+    #[serde(rename = "freshCache")]
+    FreshCache,
+    /// No cached policy or confirmed no-policy result exists.
+    #[serde(rename = "cacheMiss")]
+    CacheMiss,
+    /// A live fetch failed and a cached entry was served in its place.
+    #[serde(rename = "fallbackCache")]
+    FallbackCache,
+    /// No policy could be resolved and the host proceeds unmanaged.
+    #[serde(rename = "failOpen")]
+    FailOpen,
+    /// No policy could be resolved and the host applies the fail-closed gates.
+    #[serde(rename = "failClosed")]
+    FailClosed,
+    /// No fetch was attempted because no usable token was available.
+    #[serde(rename = "skippedNoToken")]
+    SkippedNoToken,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
+
 /// Allowed values for the `McpAppsHostContextDetailsAvailableDisplayMode` enumeration.
 ///
 /// <div class="warning">
@@ -41680,6 +47599,28 @@ pub enum McpSetEnvValueModeDetails {
     Unknown,
 }
 
+/// Controls how availableTools (allowlist) and excludedTools (denylist) combine when both are 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, PartialEq, Eq, Serialize, Deserialize)]
+pub enum OptionsUpdateToolFilterPrecedence {
+    /// If availableTools is set, it is the only constraint that applies (excludedTools is ignored). Preserves CLI / pre-existing client behavior. Default.
+    #[serde(rename = "available")]
+    Available,
+    /// 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.
+    #[serde(rename = "excluded")]
+    Excluded,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
+
 /// Hosting platform type of the repository
 ///
 /// <div class="warning">
@@ -41827,28 +47768,6 @@ pub enum ModelPolicyState {
     Unknown,
 }
 
-/// The neutral kind of a model provider — the model analog of `AccountKind`. A model provider is the live, entitled source a model came from; central code never branches on this beyond a single dispatch.
-///
-/// <div class="warning">
-///
-/// **Experimental.** This type is 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 ModelProviderKind {
-    /// GitHub Copilot / CAPI models, spawned by a github-resolving account that holds a Copilot seat.
-    #[serde(rename = "copilot")]
-    Copilot,
-    /// Microsoft 365 Copilot (Loki) inference models, spawned by a resolvable Entra-derived Loki account.
-    #[serde(rename = "loki")]
-    Loki,
-    /// Unknown variant for forward compatibility.
-    #[default]
-    #[serde(other)]
-    Unknown,
-}
-
 /// When the runtime may run an adapter without an explicit user action.
 ///
 /// <div class="warning">
@@ -42215,28 +48134,6 @@ pub enum OptionsUpdateReasoningSummary {
     Unknown,
 }
 
-/// Controls how availableTools (allowlist) and excludedTools (denylist) combine when both are 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, PartialEq, Eq, Serialize, Deserialize)]
-pub enum OptionsUpdateToolFilterPrecedence {
-    /// If availableTools is set, it is the only constraint that applies (excludedTools is ignored). Preserves CLI / pre-existing client behavior. Default.
-    #[serde(rename = "available")]
-    Available,
-    /// 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.
-    #[serde(rename = "excluded")]
-    Excluded,
-    /// Unknown variant for forward compatibility.
-    #[default]
-    #[serde(other)]
-    Unknown,
-}
-
 /// Approve this single request only
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
 pub enum PermissionDecisionApproveOnceKind {
@@ -43376,6 +49273,56 @@ pub enum RemoteSessionMetadataTaskType {
     Unknown,
 }
 
+/// One atomic settings mutation.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 SettingsEditOperation {
+    /// Set one scalar value.
+    #[serde(rename = "set")]
+    Set,
+    /// Add one string to a list, unless present.
+    #[serde(rename = "add-item")]
+    AddItem,
+    /// Remove one string from a list, unless absent.
+    #[serde(rename = "remove-item")]
+    RemoveItem,
+    /// Remove the setting without supplying a value.
+    #[serde(rename = "remove")]
+    Remove,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
+
+/// Which repository settings file to edit.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 RepoSettingsEditScope {
+    /// The shared repository settings file.
+    #[serde(rename = "repo")]
+    Repo,
+    /// The local repository settings file.
+    #[serde(rename = "local")]
+    Local,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
+
 /// Output format discriminator. Currently only json_schema is supported.
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
 pub enum ResponseFormatType {
@@ -44122,6 +50069,46 @@ pub enum SessionsOpenStatus {
     Unknown,
 }
 
+/// Copilot plan tier used by the session quota projection.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 SessionQuotaPlanTier {
+    /// Copilot Free.
+    #[serde(rename = "free")]
+    Free,
+    /// Copilot education entitlement.
+    #[serde(rename = "edu")]
+    Edu,
+    /// Copilot Pro.
+    #[serde(rename = "pro")]
+    Pro,
+    /// Copilot Pro+.
+    #[serde(rename = "pro_plus")]
+    ProPlus,
+    /// Copilot Business.
+    #[serde(rename = "business")]
+    Business,
+    /// Copilot Enterprise.
+    #[serde(rename = "enterprise")]
+    Enterprise,
+    /// Copilot Max.
+    #[serde(rename = "max")]
+    Max,
+    /// The account's plan tier is not known.
+    #[serde(rename = "unknown")]
+    UnknownValue,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    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 {
@@ -44146,6 +50133,7 @@ pub enum SettableAuthInfo {
     Token(SettableTokenAuthInfo),
     CopilotApiToken(CopilotApiTokenAuthInfo),
     User(UserAuthInfo),
+    Account(AccountAuthInfo),
     GhCli(GhCliAuthInfo),
     ApiKey(ApiKeyAuthInfo),
 }
@@ -44270,6 +50258,31 @@ pub enum SessionVisibilityStatus {
     Unknown,
 }
 
+/// Whether one atomic settings edit changed a 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, PartialEq, Eq, Serialize, Deserialize)]
+pub enum SettingsEditStatus {
+    /// The edit changed the setting and was stored.
+    #[serde(rename = "changed")]
+    Changed,
+    /// The setting already had the requested state.
+    #[serde(rename = "unchanged")]
+    Unchanged,
+    /// The existing settings file could not be edited safely; nothing was written.
+    #[serde(rename = "invalid")]
+    Invalid,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
+
 /// Signal to send (default: SIGTERM)
 ///
 /// <div class="warning">
@@ -44798,6 +50811,62 @@ pub enum SlashCommandInvocationResult {
     SetPlanModel(SlashCommandSetPlanModelResult),
 }
 
+/// What the one-time staff log-level migration did.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 StaffLogLevelMigrationStatus {
+    /// The account is not a staff account, so the migration does not apply and nothing was recorded.
+    #[serde(rename = "ineligible")]
+    Ineligible,
+    /// The migration already ran; the stored completion timestamp is returned unchanged.
+    #[serde(rename = "current")]
+    Current,
+    /// The migration ran now. The persisted settings may have changed, so the host should adopt the returned settings when they are present.
+    #[serde(rename = "refreshed")]
+    Refreshed,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
+
+/// What the one-time staff update-channel migration did.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 StaffUpdateChannelMigrationStatus {
+    /// The account is not a staff account, so the migration does not apply and nothing was recorded.
+    #[serde(rename = "ineligible")]
+    Ineligible,
+    /// The migration already ran within the cutoff window; the stored completion timestamp is returned unchanged.
+    #[serde(rename = "current")]
+    Current,
+    /// The persisted update channel was changed to stable. Only this outcome requires the host to reload its configuration.
+    #[serde(rename = "migrated")]
+    Migrated,
+    /// The persisted channel was already stable, so nothing changed, but the migration is now recorded as done.
+    #[serde(rename = "completed")]
+    Completed,
+    /// The account is on the experimental channel, which the migration deliberately leaves alone, and the migration is recorded as done.
+    #[serde(rename = "excluded-experimental")]
+    ExcludedExperimental,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
+
 /// Context tier override for matching subagents
 ///
 /// <div class="warning">
@@ -45381,6 +51450,34 @@ pub enum UISessionLimitsExhaustedResponseAction {
     Unknown,
 }
 
+/// What the one-time obsolete-settings cleanup did to the document.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 UserSettingsMigrateObsoleteOnDiskStatus {
+    /// No settings document exists, so there was nothing to clean.
+    #[serde(rename = "missing")]
+    Missing,
+    /// The document could not be parsed, so it was left untouched rather than rewritten from a partial read.
+    #[serde(rename = "invalid")]
+    Invalid,
+    /// The document parsed and held nothing obsolete, so nothing was written.
+    #[serde(rename = "unchanged")]
+    Unchanged,
+    /// Obsolete keys were removed and the document was rewritten.
+    #[serde(rename = "changed")]
+    Changed,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
+
 /// Execution-critical workflow storage operation.
 ///
 /// <div class="warning">
diff --git a/rust/src/generated/rpc.rs b/rust/src/generated/rpc.rs
index cf5da5b4a5..e085bf03ae 100644
--- a/rust/src/generated/rpc.rs
+++ b/rust/src/generated/rpc.rs
@@ -11,7 +11,7 @@
 #![allow(dead_code)]
 
 use super::api_types::{rpc_methods, *};
-use super::session_events::SessionMode;
+use super::session_events::{SessionMode, UsageGetMetricsResult};
 use crate::session::Session;
 use crate::{Client, Error};
 
@@ -57,6 +57,13 @@ impl<'a> ClientRpc<'a> {
         }
     }
 
+    /// `connectors.*` sub-namespace.
+    pub fn connectors(&self) -> ClientRpcConnectors<'a> {
+        ClientRpcConnectors {
+            client: self.client,
+        }
+    }
+
     /// `environments.*` sub-namespace.
     pub fn environments(&self) -> ClientRpcEnvironments<'a> {
         ClientRpcEnvironments {
@@ -71,6 +78,41 @@ impl<'a> ClientRpc<'a> {
         }
     }
 
+    /// `featureFlags.*` sub-namespace.
+    pub fn feature_flags(&self) -> ClientRpcFeatureFlags<'a> {
+        ClientRpcFeatureFlags {
+            client: self.client,
+        }
+    }
+
+    /// `git.*` sub-namespace.
+    pub fn git(&self) -> ClientRpcGit<'a> {
+        ClientRpcGit {
+            client: self.client,
+        }
+    }
+
+    /// `gitHubOwners.*` sub-namespace.
+    pub fn git_hub_owners(&self) -> ClientRpcGitHubOwners<'a> {
+        ClientRpcGitHubOwners {
+            client: self.client,
+        }
+    }
+
+    /// `gitHubRepository.*` sub-namespace.
+    pub fn git_hub_repository(&self) -> ClientRpcGitHubRepository<'a> {
+        ClientRpcGitHubRepository {
+            client: self.client,
+        }
+    }
+
+    /// `globalState.*` sub-namespace.
+    pub fn global_state(&self) -> ClientRpcGlobalState<'a> {
+        ClientRpcGlobalState {
+            client: self.client,
+        }
+    }
+
     /// `hooks.*` sub-namespace.
     pub fn hooks(&self) -> ClientRpcHooks<'a> {
         ClientRpcHooks {
@@ -120,6 +162,20 @@ impl<'a> ClientRpc<'a> {
         }
     }
 
+    /// `permissions.*` sub-namespace.
+    pub fn permissions(&self) -> ClientRpcPermissions<'a> {
+        ClientRpcPermissions {
+            client: self.client,
+        }
+    }
+
+    /// `persistence.*` sub-namespace.
+    pub fn persistence(&self) -> ClientRpcPersistence<'a> {
+        ClientRpcPersistence {
+            client: self.client,
+        }
+    }
+
     /// `plugins.*` sub-namespace.
     pub fn plugins(&self) -> ClientRpcPlugins<'a> {
         ClientRpcPlugins {
@@ -127,6 +183,13 @@ impl<'a> ClientRpc<'a> {
         }
     }
 
+    /// `repo.*` sub-namespace.
+    pub fn repo(&self) -> ClientRpcRepo<'a> {
+        ClientRpcRepo {
+            client: self.client,
+        }
+    }
+
     /// `runtime.*` sub-namespace.
     pub fn runtime(&self) -> ClientRpcRuntime<'a> {
         ClientRpcRuntime {
@@ -428,26 +491,18 @@ impl<'a> ClientRpcAccount<'a> {
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
-}
-
-/// `agentRegistry.*` RPCs.
-#[derive(Clone, Copy)]
-pub struct ClientRpcAgentRegistry<'a> {
-    pub(crate) client: &'a Client,
-}
 
-impl<'a> ClientRpcAgentRegistry<'a> {
-    /// Spawns a managed-server child with the supplied configuration and returns a discriminated-union result. The caller (typically the CLI controller) is responsible for attaching to the spawned child and sending any follow-up prompt. When the controller-local spawn gate is closed the server returns JSON-RPC MethodNotFound.
+    /// Renders the sign-in banner and the one-line account description the runtime uses for an authentication identity. The runtime words these in several places for its own callers, so a host that announces a sign-in or an account switch should render them from here rather than composing its own, which would let the two spellings drift apart.
     ///
-    /// Wire method: `agentRegistry.spawn`.
+    /// Wire method: `account.describeAuthInfo`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Inputs to spawn a managed-server child via the controller's spawn delegate.
+    /// * `params` - The authentication identity whose shared wording should be rendered.
     ///
     /// # Returns
     ///
-    /// Outcome of an agentRegistry.spawn call.
+    /// The wording the runtime uses for an authentication identity.
     ///
     /// <div class="warning">
     ///
@@ -456,37 +511,29 @@ impl<'a> ClientRpcAgentRegistry<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn spawn(
+    pub(crate) async fn describe_auth_info(
         &self,
-        params: AgentRegistrySpawnRequest,
-    ) -> Result<AgentRegistrySpawnResult, Error> {
+        params: AccountDescribeAuthInfoRequest,
+    ) -> Result<AccountDescribeAuthInfoResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::AGENTREGISTRY_SPAWN, Some(wire_params))
+            .call(rpc_methods::ACCOUNT_DESCRIBEAUTHINFO, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
-}
-
-/// `agents.*` RPCs.
-#[derive(Clone, Copy)]
-pub struct ClientRpcAgents<'a> {
-    pub(crate) client: &'a Client,
-}
 
-impl<'a> ClientRpcAgents<'a> {
-    /// Discovers custom agents across user, project, plugin, and remote sources.
+    /// Reports whether the supplied identity can create gists. Gists are unavailable on GitHub Enterprise Cloud with data residency, and to Enterprise Managed Users on github.com, so a host that offers gist actions should hide or disable them when this reports no support.
     ///
-    /// Wire method: `agents.discover`.
+    /// Wire method: `account.getGistSupport`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Optional project paths to include in agent discovery.
+    /// * `params` - The authentication identity whose gist support should be reported.
     ///
     /// # Returns
     ///
-    /// Agents discovered across user, project, plugin, and remote sources.
+    /// Whether the identity can create gists, and why not when it cannot.
     ///
     /// <div class="warning">
     ///
@@ -495,26 +542,29 @@ impl<'a> ClientRpcAgents<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn discover(&self, params: AgentsDiscoverRequest) -> Result<ServerAgentList, Error> {
+    pub(crate) async fn get_gist_support(
+        &self,
+        params: AccountGetGistSupportRequest,
+    ) -> Result<AccountGetGistSupportResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::AGENTS_DISCOVER, Some(wire_params))
+            .call(rpc_methods::ACCOUNT_GETGISTSUPPORT, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Returns the canonical directories where a client may create custom agents that the runtime will recognize, including ones that do not exist yet. Project directories become active once created.
+    /// Resolves a path on the identity's GitHub host into an absolute URL, so a host can link to settings or documentation on the enterprise instance the user is signed in to rather than to github.com. Falls back to the public host when no identity is supplied.
     ///
-    /// Wire method: `agents.getDiscoveryPaths`.
+    /// Wire method: `account.getWebUrl`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Optional project paths to include when enumerating agent discovery directories.
+    /// * `params` - A path to resolve against the GitHub host an identity is signed in to.
     ///
     /// # Returns
     ///
-    /// Canonical locations where custom agents can be created so the runtime will recognize them.
+    /// An absolute URL on the identity's GitHub host.
     ///
     /// <div class="warning">
     ///
@@ -523,37 +573,25 @@ impl<'a> ClientRpcAgents<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn get_discovery_paths(
+    pub(crate) async fn get_web_url(
         &self,
-        params: AgentsGetDiscoveryPathsRequest,
-    ) -> Result<AgentDiscoveryPathList, Error> {
+        params: AccountGetWebUrlRequest,
+    ) -> Result<AccountGetWebUrlResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::AGENTS_GETDISCOVERYPATHS, Some(wire_params))
+            .call(rpc_methods::ACCOUNT_GETWEBURL, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
-}
-
-/// `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
+    /// Names the environment variable supplying a classic personal access token, if one is set. A classic token cannot be upgraded in place, so a host that finds one should tell the user which variable to unset rather than starting an interactive sign-in that the variable would override.
     ///
-    /// * `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.
+    /// Wire method: `account.getTokenEnvVar`.
     ///
     /// # Returns
     ///
-    /// Outcome of a catalog.search call: either bounded inert candidates, or one typed refusal. Never a partial success.
+    /// The environment variable supplying a classic personal access token, when one is set.
     ///
     /// <div class="warning">
     ///
@@ -562,26 +600,34 @@ impl<'a> ClientRpcCatalog<'a> {
     /// 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)?;
+    pub(crate) async fn get_token_env_var(&self) -> Result<AccountGetTokenEnvVarResult, Error> {
+        let wire_params = serde_json::json!({});
         let _value = self
             .client
-            .call(rpc_methods::CATALOG_SEARCH, Some(wire_params))
+            .call(rpc_methods::ACCOUNT_GETTOKENENVVAR, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
+}
 
-    /// 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.
+/// `agentRegistry.*` RPCs.
+#[derive(Clone, Copy)]
+pub struct ClientRpcAgentRegistry<'a> {
+    pub(crate) client: &'a Client,
+}
+
+impl<'a> ClientRpcAgentRegistry<'a> {
+    /// Spawns a managed-server child with the supplied configuration and returns a discriminated-union result. The caller (typically the CLI controller) is responsible for attaching to the spawned child and sending any follow-up prompt. When the controller-local spawn gate is closed the server returns JSON-RPC MethodNotFound.
     ///
-    /// Wire method: `catalog.search`.
+    /// Wire method: `agentRegistry.spawn`.
     ///
     /// # 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.
+    /// * `params` - Inputs to spawn a managed-server child via the controller's spawn delegate.
     ///
     /// # Returns
     ///
-    /// Outcome of a catalog.search call: either bounded inert candidates, or one typed refusal. Never a partial success.
+    /// Outcome of an agentRegistry.spawn call.
     ///
     /// <div class="warning">
     ///
@@ -590,31 +636,37 @@ impl<'a> ClientRpcCatalog<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    ///
-    /// Accepts [`CatalogSearchOptions`], including inputs added after [`CatalogSearchRequest`].
-    pub async fn search_with_options(
+    pub async fn spawn(
         &self,
-        params: CatalogSearchOptions,
-    ) -> Result<CatalogSearchResult, Error> {
+        params: AgentRegistrySpawnRequest,
+    ) -> Result<AgentRegistrySpawnResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::CATALOG_SEARCH, Some(wire_params))
+            .call(rpc_methods::AGENTREGISTRY_SPAWN, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
+}
 
-    /// Terminates one retained catalog selection group. A selected outcome returns the native host a fresh single-use candidate handle plus the original searchId for a later explicit mcp.planInstall call; non-selected outcomes release the group without producing a planning input. Candidate state, cards, URLs, credentials and private identifiers remain inside the runtime. The model-facing catalog_select tool projects the result separately and never exposes the candidate handle or searchId.
+/// `agents.*` RPCs.
+#[derive(Clone, Copy)]
+pub struct ClientRpcAgents<'a> {
+    pub(crate) client: &'a Client,
+}
+
+impl<'a> ClientRpcAgents<'a> {
+    /// Discovers custom agents across user, project, plugin, and remote sources.
     ///
-    /// Wire method: `catalog.select`.
+    /// Wire method: `agents.discover`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Terminates one retained catalog selection group through an opaque reference previously returned by the model-safe search projection.
+    /// * `params` - Optional project paths to include in agent discovery.
     ///
     /// # Returns
     ///
-    /// Typed outcome of catalog.select. Only the selected host result carries a fresh candidate handle; the model-facing projection removes both that handle and searchId.
+    /// Agents discovered across user, project, plugin, and remote sources.
     ///
     /// <div class="warning">
     ///
@@ -623,33 +675,26 @@ impl<'a> ClientRpcCatalog<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn select(
-        &self,
-        params: CatalogSelectionRequest,
-    ) -> Result<CatalogSelectionResult, Error> {
+    pub async fn discover(&self, params: AgentsDiscoverRequest) -> Result<ServerAgentList, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::CATALOG_SELECT, Some(wire_params))
+            .call(rpc_methods::AGENTS_DISCOVER, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
-}
 
-/// `commands.*` RPCs.
-#[derive(Clone, Copy)]
-pub struct ClientRpcCommands<'a> {
-    pub(crate) client: &'a Client,
-}
-
-impl<'a> ClientRpcCommands<'a> {
-    /// Lists the well-known built-in slash commands that work as the first message in a new session (e.g. /plan, /env), without requiring an active session. Commands that depend on session state, authentication, or a synced session are omitted.
+    /// Discovers custom agents across user, project, plugin, and remote sources.
     ///
-    /// Wire method: `commands.list`.
+    /// Wire method: `agents.discover`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Optional project paths to include in agent discovery.
     ///
     /// # Returns
     ///
-    /// Slash commands available in the session, after applying any include/exclude filters.
+    /// Agents discovered across user, project, plugin, and remote sources.
     ///
     /// <div class="warning">
     ///
@@ -658,34 +703,31 @@ impl<'a> ClientRpcCommands<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn list(&self) -> Result<CommandList, Error> {
-        let wire_params = serde_json::json!({});
+    ///
+    /// Accepts [`AgentsDiscoverOptions`], including inputs added after [`AgentsDiscoverRequest`].
+    pub async fn discover_with_options(
+        &self,
+        params: AgentsDiscoverOptions,
+    ) -> Result<ServerAgentList, Error> {
+        let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::COMMANDS_LIST, Some(wire_params))
+            .call(rpc_methods::AGENTS_DISCOVER, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
-}
-
-/// `environments.*` RPCs.
-#[derive(Clone, Copy)]
-pub struct ClientRpcEnvironments<'a> {
-    pub(crate) client: &'a Client,
-}
 
-impl<'a> ClientRpcEnvironments<'a> {
-    /// Lists GitHub Mission Control environments visible to the authenticated identity. Does not require a running host and excludes host relay credentials.
+    /// Returns the canonical directories where a client may create custom agents that the runtime will recognize, including ones that do not exist yet. Project directories become active once created.
     ///
-    /// Wire method: `environments.list`.
+    /// Wire method: `agents.getDiscoveryPaths`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Optional discovery filters supported by GitHub Mission Control.
+    /// * `params` - Optional project paths to include when enumerating agent discovery directories.
     ///
     /// # Returns
     ///
-    /// Environments visible to the authenticated caller and matching the supplied filters.
+    /// Canonical locations where custom agents can be created so the runtime will recognize them.
     ///
     /// <div class="warning">
     ///
@@ -694,29 +736,29 @@ impl<'a> ClientRpcEnvironments<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn list(
+    pub async fn get_discovery_paths(
         &self,
-        params: EnvironmentsListRequest,
-    ) -> Result<EnvironmentsListResult, Error> {
+        params: AgentsGetDiscoveryPathsRequest,
+    ) -> Result<AgentDiscoveryPathList, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::ENVIRONMENTS_LIST, Some(wire_params))
+            .call(rpc_methods::AGENTS_GETDISCOVERYPATHS, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Gets safe discovery information for a GitHub Mission Control environment without requiring a running host.
+    /// Returns the canonical directories where a client may create custom agents that the runtime will recognize, including ones that do not exist yet. Project directories become active once created.
     ///
-    /// Wire method: `environments.get`.
+    /// Wire method: `agents.getDiscoveryPaths`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Identify a Mission Control environment to retrieve.
+    /// * `params` - Optional project paths to include when enumerating agent discovery directories.
     ///
     /// # Returns
     ///
-    /// Safe discovery information for the requested environment.
+    /// Canonical locations where custom agents can be created so the runtime will recognize them.
     ///
     /// <div class="warning">
     ///
@@ -725,29 +767,27 @@ impl<'a> ClientRpcEnvironments<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn get(
+    ///
+    /// Accepts [`AgentsGetDiscoveryPathsOptions`], including inputs added after [`AgentsGetDiscoveryPathsRequest`].
+    pub async fn get_discovery_paths_with_options(
         &self,
-        params: EnvironmentsGetRequest,
-    ) -> Result<EnvironmentsGetResult, Error> {
+        params: AgentsGetDiscoveryPathsOptions,
+    ) -> Result<AgentDiscoveryPathList, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::ENVIRONMENTS_GET, Some(wire_params))
+            .call(rpc_methods::AGENTS_GETDISCOVERYPATHS, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Deletes a user-managed GitHub Mission Control environment. GitHub-managed environments cannot be deleted. Does not stop a running host, which may register again.
+    /// Lists the agents this runtime ships, by name. A consumer separating shipped agents from ones the user or a plugin authored should compare against these names rather than against `AgentInfo.source`: an authored agent may carry the `builtin` source while not being one of these, and the runtime treats the two as separate questions. `disableableNames` is the subset a user may turn off, which a client needs to decide whether to offer a toggle. `yamlBasedNames` is the subset backed by a shipped YAML definition, which a client needs before asking the runtime to load one.
     ///
-    /// Wire method: `environments.delete`.
-    ///
-    /// # Parameters
-    ///
-    /// * `params` - Identify a user-managed Mission Control environment to delete.
+    /// Wire method: `agents.getBuiltins`.
     ///
     /// # Returns
     ///
-    /// Acknowledgement that the requested environment was deleted.
+    /// The agents this runtime ships, named so a consumer can tell them apart from authored ones.
     ///
     /// <div class="warning">
     ///
@@ -756,33 +796,26 @@ impl<'a> ClientRpcEnvironments<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn delete(
-        &self,
-        params: EnvironmentsDeleteRequest,
-    ) -> Result<EnvironmentsDeleteResult, Error> {
-        let wire_params = serde_json::to_value(params)?;
+    pub(crate) async fn get_builtins(&self) -> Result<AgentsGetBuiltinsResult, Error> {
+        let wire_params = serde_json::json!({});
         let _value = self
             .client
-            .call(rpc_methods::ENVIRONMENTS_DELETE, Some(wire_params))
+            .call(rpc_methods::AGENTS_GETBUILTINS, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
-}
-
-/// `extensions.*` RPCs.
-#[derive(Clone, Copy)]
-pub struct ClientRpcExtensions<'a> {
-    pub(crate) client: &'a Client,
-}
 
-impl<'a> ClientRpcExtensions<'a> {
-    /// Discovers user and enabled installed-plugin extensions from persisted Copilot home state, including enablement preferences. Launch-scoped additional plugins are not included.
+    /// Lists the shipped agents a client should offer right now, filtered by the feature flags it passes. `getBuiltins` names every agent the runtime knows about; some of those are gated, so a client rendering a picker wants this narrower list together with the description to show beside each name.
     ///
-    /// Wire method: `extensions.discover`.
+    /// Wire method: `agents.getAvailableBuiltins`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - The feature flags to evaluate shipped agents against.
     ///
     /// # Returns
     ///
-    /// Extensions discovered from persisted Copilot home state and their effective loading mode. Launch-scoped additional plugins are not included.
+    /// The shipped agents available under the requested flags.
     ///
     /// <div class="warning">
     ///
@@ -791,22 +824,29 @@ impl<'a> ClientRpcExtensions<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn discover(&self) -> Result<DiscoveredExtensions, Error> {
-        let wire_params = serde_json::json!({});
+    pub(crate) async fn get_available_builtins(
+        &self,
+        params: AgentsGetAvailableBuiltinsRequest,
+    ) -> Result<AgentsGetAvailableBuiltinsResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::EXTENSIONS_DISCOVER, Some(wire_params))
+            .call(rpc_methods::AGENTS_GETAVAILABLEBUILTINS, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Persistently enables extension IDs for future sessions. Active sessions are unchanged; use session.extensions.enable to update them.
+    /// Loads one shipped agent's YAML definition, for a client that needs what the agent declares rather than only its name. `getBuiltins` reports which names have a definition to load: a name outside its `yamlBasedNames` is special-cased in code and has none. The definition crosses as its own JSON rather than as contract-typed fields, because the runtime parses it with the agent schema's tolerant shape and re-typing it here would drop the keys that shape accepts and this one does not. The projected `__nativeCustomAgent` view the runtime derives is included, so a caller reading the declared model and a caller rendering the agent see the same definition.
     ///
-    /// Wire method: `extensions.enable`.
+    /// Wire method: `agents.getBuiltinDefinition`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Source-qualified extension identifiers to persistently enable for future sessions.
+    /// * `params` - The shipped agent whose definition to load.
+    ///
+    /// # Returns
+    ///
+    /// One shipped agent's definition.
     ///
     /// <div class="warning">
     ///
@@ -815,58 +855,63 @@ impl<'a> ClientRpcExtensions<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn enable(&self, params: DiscoveredExtensionsEnableRequest) -> Result<(), Error> {
+    pub(crate) async fn get_builtin_definition(
+        &self,
+        params: AgentsGetBuiltinDefinitionRequest,
+    ) -> Result<AgentsGetBuiltinDefinitionResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::EXTENSIONS_ENABLE, Some(wire_params))
+            .call(rpc_methods::AGENTS_GETBUILTINDEFINITION, Some(wire_params))
             .await?;
-        Ok(())
+        Ok(serde_json::from_value(_value)?)
     }
 
-    /// Persistently disables extension IDs for future sessions. Active sessions are unchanged; use session.extensions.disable to update them.
+    /// Projects one shipped agent the way a picker lists it, reading only the metadata at the head of the definition file and stopping before the prompt body. `getBuiltinDefinition` answers the whole definition instead, so a client listing every shipped agent should prefer this one: the cost of a listing grows with the number of agents, and the prompt body is the part a listing never shows. The two also differ in shape. This returns the projected custom agent on its own, whereas `getBuiltinDefinition` returns the authored definition with that projection nested under `__nativeCustomAgent`.
     ///
-    /// Wire method: `extensions.disable`.
+    /// Wire method: `agents.getBuiltinListingDefinition`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Source-qualified extension identifiers to persistently disable for future sessions.
+    /// * `params` - The shipped agent whose listing entry to load.
     ///
-    /// <div class="warning">
+    /// # Returns
+    ///
+    /// One shipped agent, projected for a listing.
+    ///
+    /// <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 disable(&self, params: DiscoveredExtensionsDisableRequest) -> Result<(), Error> {
+    pub(crate) async fn get_builtin_listing_definition(
+        &self,
+        params: AgentsGetBuiltinListingDefinitionRequest,
+    ) -> Result<AgentsGetBuiltinListingDefinitionResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::EXTENSIONS_DISABLE, Some(wire_params))
+            .call(
+                rpc_methods::AGENTS_GETBUILTINLISTINGDEFINITION,
+                Some(wire_params),
+            )
             .await?;
-        Ok(())
+        Ok(serde_json::from_value(_value)?)
     }
-}
-
-/// `hooks.*` RPCs.
-#[derive(Clone, Copy)]
-pub struct ClientRpcHooks<'a> {
-    pub(crate) client: &'a Client,
-}
 
-impl<'a> ClientRpcHooks<'a> {
-    /// Discovers hook actions enabled under server-side discovery settings from user, repository, plugin, and managed-policy sources.
+    /// Resolves the model a custom agent asks for against the models actually available, and answers both the model to switch to and the warning a user should see when the agent's preference cannot be met. A custom agent may name several acceptable models in preference order, so the decision is a match rather than a lookup, and an agent whose preference is unavailable is a normal outcome that produces a warning rather than an error. A host must call this rather than pick the first available name itself, because the preference order and the wording of the warning are what keep one installation's agent selection the same as another's.
     ///
-    /// Wire method: `hooks.discover`.
+    /// Wire method: `agents.customAgentInitialModelDecision`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Optional project paths and host-exclusion behavior for server-scoped hook discovery.
+    /// * `params` - The models a custom agent asks for, and the models actually available.
     ///
     /// # Returns
     ///
-    /// Server-discovered hook actions and partial-load diagnostics from user, repository, plugin, and managed-policy sources. Concrete sessions may include additional session-specific hook sources.
+    /// The model to switch to, and the warning to show when the agent's preference could not be met.
     ///
     /// <div class="warning">
     ///
@@ -875,37 +920,40 @@ impl<'a> ClientRpcHooks<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn discover(
+    pub(crate) async fn custom_agent_initial_model_decision(
         &self,
-        params: HooksDiscoverRequest,
-    ) -> Result<HooksDiscoverResult, Error> {
+        params: AgentsCustomAgentInitialModelDecisionParams,
+    ) -> Result<AgentsCustomAgentInitialModelDecisionResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::HOOKS_DISCOVER, Some(wire_params))
+            .call(
+                rpc_methods::AGENTS_CUSTOMAGENTINITIALMODELDECISION,
+                Some(wire_params),
+            )
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 }
 
-/// `host.*` RPCs.
+/// `catalog.*` RPCs.
 #[derive(Clone, Copy)]
-pub struct ClientRpcHost<'a> {
+pub struct ClientRpcCatalog<'a> {
     pub(crate) client: &'a Client,
 }
 
-impl<'a> ClientRpcHost<'a> {
-    /// Publishes an attached resident session for this listener's lifetime without copying it.
+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: `host.publishSession`.
+    /// Wire method: `catalog.search`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Publishes a resident session attached to the listener's owning connection.
+    /// * `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
     ///
-    /// The existing runtime identity and its resource on the listener.
+    /// Outcome of a catalog.search call: either bounded inert candidates, or one typed refusal. Never a partial success.
     ///
     /// <div class="warning">
     ///
@@ -914,29 +962,26 @@ impl<'a> ClientRpcHost<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn publish_session(
-        &self,
-        params: HostPublishSessionRequest,
-    ) -> Result<HostPublishSessionResult, Error> {
+    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::HOST_PUBLISHSESSION, Some(wire_params))
+            .call(rpc_methods::CATALOG_SEARCH, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Requests app-owned materialization over the owning SDK participant.
+    /// 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: `host.createSession`.
+    /// Wire method: `catalog.search`.
     ///
     /// # Parameters
     ///
-    /// * `params` - One application-owned session handoff, requested by the supervised hosting participant.
+    /// * `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
     ///
-    /// The resident session the application has materialized on its own connection.
+    /// Outcome of a catalog.search call: either bounded inert candidates, or one typed refusal. Never a partial success.
     ///
     /// <div class="warning">
     ///
@@ -945,29 +990,31 @@ impl<'a> ClientRpcHost<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub(crate) async fn create_session(
+    ///
+    /// Accepts [`CatalogSearchOptions`], including inputs added after [`CatalogSearchRequest`].
+    pub async fn search_with_options(
         &self,
-        params: HostSessionCreateRequest,
-    ) -> Result<HostSessionCreateResult, Error> {
+        params: CatalogSearchOptions,
+    ) -> Result<CatalogSearchResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::HOST_CREATESESSION, Some(wire_params))
+            .call(rpc_methods::CATALOG_SEARCH, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Releases app ownership retention after AHP detaches.
+    /// Terminates one retained catalog selection group. A selected outcome returns the native host a fresh single-use candidate handle plus the original searchId for a later explicit mcp.planInstall call; non-selected outcomes release the group without producing a planning input. Candidate state, cards, URLs, credentials and private identifiers remain inside the runtime. The model-facing catalog_select tool projects the result separately and never exposes the candidate handle or searchId.
     ///
-    /// Wire method: `host.releaseSession`.
+    /// Wire method: `catalog.select`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Ends one participation, not the application's session lifetime.
+    /// * `params` - Terminates one retained catalog selection group through an opaque reference previously returned by the model-safe search projection.
     ///
     /// # Returns
     ///
-    /// Empty acknowledgement for a completed host lifecycle operation.
+    /// Typed outcome of catalog.select. Only the selected host result carries a fresh candidate handle; the model-facing projection removes both that handle and searchId.
     ///
     /// <div class="warning">
     ///
@@ -976,29 +1023,33 @@ impl<'a> ClientRpcHost<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub(crate) async fn release_session(
+    pub async fn select(
         &self,
-        params: HostSessionReleaseRequest,
-    ) -> Result<HostEmptyResult, Error> {
+        params: CatalogSelectionRequest,
+    ) -> Result<CatalogSelectionResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::HOST_RELEASESESSION, Some(wire_params))
+            .call(rpc_methods::CATALOG_SELECT, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
+}
 
-    /// Starts a connection-owned AHP host with explicit localServer and/or githubEnvironment transports as a supervised SDK participant.
-    ///
-    /// Wire method: `host.start`.
-    ///
-    /// # Parameters
+/// `commands.*` RPCs.
+#[derive(Clone, Copy)]
+pub struct ClientRpcCommands<'a> {
+    pub(crate) client: &'a Client,
+}
+
+impl<'a> ClientRpcCommands<'a> {
+    /// Lists the well-known built-in slash commands that work as the first message in a new session (e.g. /plan, /env), without requiring an active session. Commands that depend on session state, authentication, or a synced session are omitted.
     ///
-    /// * `params` - Starts a supervised AHP host with at least one explicitly selected transport.
+    /// Wire method: `commands.list`.
     ///
     /// # Returns
     ///
-    /// Listener readiness, returned only after binding and the supervised participant's SDK handshake.
+    /// Slash commands available in the session, after applying any include/exclude filters.
     ///
     /// <div class="warning">
     ///
@@ -1007,26 +1058,30 @@ impl<'a> ClientRpcHost<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn start(&self, params: HostStartRequest) -> Result<HostStartResult, Error> {
-        let wire_params = serde_json::to_value(params)?;
+    pub async fn list(&self) -> Result<CommandList, Error> {
+        let wire_params = serde_json::json!({});
         let _value = self
             .client
-            .call(rpc_methods::HOST_START, Some(wire_params))
+            .call(rpc_methods::COMMANDS_LIST, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
+}
 
-    /// Stops a listener owned by this SDK connection and joins its cleanup without deleting sessions.
-    ///
-    /// Wire method: `host.dispose`.
-    ///
-    /// # Parameters
+/// `connectors.*` RPCs.
+#[derive(Clone, Copy)]
+pub struct ClientRpcConnectors<'a> {
+    pub(crate) client: &'a Client,
+}
+
+impl<'a> ClientRpcConnectors<'a> {
+    /// Returns feature availability.
     ///
-    /// * `params` - Stops a connection-owned listener and joins its teardown.
+    /// Wire method: `connectors.getCapabilities`.
     ///
     /// # Returns
     ///
-    /// Empty acknowledgement for a completed host lifecycle operation.
+    /// Feature availability.
     ///
     /// <div class="warning">
     ///
@@ -1035,22 +1090,22 @@ impl<'a> ClientRpcHost<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn dispose(&self, params: HostDisposeRequest) -> Result<HostEmptyResult, Error> {
-        let wire_params = serde_json::to_value(params)?;
+    pub async fn get_capabilities(&self) -> Result<ConnectorDiscoveryCapabilities, Error> {
+        let wire_params = serde_json::json!({});
         let _value = self
             .client
-            .call(rpc_methods::HOST_DISPOSE, Some(wire_params))
+            .call(rpc_methods::CONNECTORS_GETCAPABILITIES, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Resolves current authenticated credentials and remote-control policy only for the runtime-owned Mission Control hosting participant.
+    /// Returns eligible accounts.
     ///
-    /// Wire method: `host.getEnvironmentCredentials`.
+    /// Wire method: `connectors.getAccounts`.
     ///
     /// # Returns
     ///
-    /// Private credentials delivered only to a runtime-owned Mission Control hosting participant.
+    /// Eligible accounts.
     ///
     /// <div class="warning">
     ///
@@ -1059,27 +1114,26 @@ impl<'a> ClientRpcHost<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub(crate) async fn get_environment_credentials(
-        &self,
-    ) -> Result<HostEnvironmentCredentials, Error> {
+    pub async fn get_accounts(&self) -> Result<ConnectorDiscoveryAccountList, Error> {
         let wire_params = serde_json::json!({});
         let _value = self
             .client
-            .call(
-                rpc_methods::HOST_GETENVIRONMENTCREDENTIALS,
-                Some(wire_params),
-            )
+            .call(rpc_methods::CONNECTORS_GETACCOUNTS, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Returns listener settings only to the supervised hosting participant over its SDK connection.
+    /// Lists entries for the selected account.
     ///
-    /// Wire method: `host.getConfiguration`.
+    /// Wire method: `connectors.list`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Selected account.
     ///
     /// # Returns
     ///
-    /// Normalized listener settings delivered only to the supervised hosting participant.
+    /// Entries for the selected account.
     ///
     /// <div class="warning">
     ///
@@ -1088,26 +1142,29 @@ impl<'a> ClientRpcHost<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub(crate) async fn get_configuration(&self) -> Result<HostConfiguration, Error> {
-        let wire_params = serde_json::json!({});
+    pub async fn list(
+        &self,
+        params: ConnectorDiscoveryAccountRequest,
+    ) -> Result<ConnectorDiscoveryCatalogResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::HOST_GETCONFIGURATION, Some(wire_params))
+            .call(rpc_methods::CONNECTORS_LIST, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Reports a supervised hosting participant's bound AHP endpoint after its SDK handshake.
+    /// Refreshes entries for the selected account.
     ///
-    /// Wire method: `host.ready`.
+    /// Wire method: `connectors.refresh`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Readiness reported by the supervised hosting participant on its own SDK connection.
+    /// * `params` - Selected account.
     ///
     /// # Returns
     ///
-    /// Empty acknowledgement for a completed host lifecycle operation.
+    /// Entries for the selected account.
     ///
     /// <div class="warning">
     ///
@@ -1116,34 +1173,37 @@ impl<'a> ClientRpcHost<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub(crate) async fn ready(&self, params: HostReadyRequest) -> Result<HostEmptyResult, Error> {
+    pub async fn refresh(
+        &self,
+        params: ConnectorDiscoveryAccountRequest,
+    ) -> Result<ConnectorDiscoveryCatalogResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::HOST_READY, Some(wire_params))
+            .call(rpc_methods::CONNECTORS_REFRESH, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 }
 
-/// `instructions.*` RPCs.
+/// `environments.*` RPCs.
 #[derive(Clone, Copy)]
-pub struct ClientRpcInstructions<'a> {
+pub struct ClientRpcEnvironments<'a> {
     pub(crate) client: &'a Client,
 }
 
-impl<'a> ClientRpcInstructions<'a> {
-    /// Discovers instruction sources across user, repository, and plugin sources.
+impl<'a> ClientRpcEnvironments<'a> {
+    /// Lists GitHub Mission Control environments visible to the authenticated identity. Does not require a running host and excludes host relay credentials.
     ///
-    /// Wire method: `instructions.discover`.
+    /// Wire method: `environments.list`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Optional project paths to include in instruction discovery.
+    /// * `params` - Optional discovery filters supported by GitHub Mission Control.
     ///
     /// # Returns
     ///
-    /// Instruction sources discovered across user, repository, and plugin sources.
+    /// Environments visible to the authenticated caller and matching the supplied filters.
     ///
     /// <div class="warning">
     ///
@@ -1152,29 +1212,29 @@ impl<'a> ClientRpcInstructions<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn discover(
+    pub async fn list(
         &self,
-        params: InstructionsDiscoverRequest,
-    ) -> Result<ServerInstructionSourceList, Error> {
+        params: EnvironmentsListRequest,
+    ) -> Result<EnvironmentsListResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::INSTRUCTIONS_DISCOVER, Some(wire_params))
+            .call(rpc_methods::ENVIRONMENTS_LIST, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Returns the canonical files and directories where a client may create custom instructions that the runtime will recognize, including ones that do not exist yet. Repository targets become active once created.
+    /// Gets safe discovery information for a GitHub Mission Control environment without requiring a running host.
     ///
-    /// Wire method: `instructions.getDiscoveryPaths`.
+    /// Wire method: `environments.get`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Optional project paths to include when enumerating instruction discovery targets.
+    /// * `params` - Identify a Mission Control environment to retrieve.
     ///
     /// # Returns
     ///
-    /// Canonical files and directories where custom instructions can be created so the runtime will recognize them.
+    /// Safe discovery information for the requested environment.
     ///
     /// <div class="warning">
     ///
@@ -1183,36 +1243,29 @@ impl<'a> ClientRpcInstructions<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn get_discovery_paths(
+    pub async fn get(
         &self,
-        params: InstructionsGetDiscoveryPathsRequest,
-    ) -> Result<InstructionDiscoveryPathList, Error> {
+        params: EnvironmentsGetRequest,
+    ) -> Result<EnvironmentsGetResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(
-                rpc_methods::INSTRUCTIONS_GETDISCOVERYPATHS,
-                Some(wire_params),
-            )
+            .call(rpc_methods::ENVIRONMENTS_GET, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
-}
-
-/// `llmInference.*` RPCs.
-#[derive(Clone, Copy)]
-pub struct ClientRpcLlmInference<'a> {
-    pub(crate) client: &'a Client,
-}
 
-impl<'a> ClientRpcLlmInference<'a> {
-    /// Registers an SDK client as the LLM inference callback provider.
+    /// Deletes a user-managed GitHub Mission Control environment. GitHub-managed environments cannot be deleted. Does not stop a running host, which may register again.
     ///
-    /// Wire method: `llmInference.setProvider`.
+    /// Wire method: `environments.delete`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Identify a user-managed Mission Control environment to delete.
     ///
     /// # Returns
     ///
-    /// Indicates whether the calling client was registered as the LLM inference provider.
+    /// Acknowledgement that the requested environment was deleted.
     ///
     /// <div class="warning">
     ///
@@ -1221,26 +1274,33 @@ impl<'a> ClientRpcLlmInference<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn set_provider(&self) -> Result<LlmInferenceSetProviderResult, Error> {
-        let wire_params = serde_json::json!({});
+    pub async fn delete(
+        &self,
+        params: EnvironmentsDeleteRequest,
+    ) -> Result<EnvironmentsDeleteResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::LLMINFERENCE_SETPROVIDER, Some(wire_params))
+            .call(rpc_methods::ENVIRONMENTS_DELETE, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
+}
 
-    /// 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.
-    ///
-    /// Wire method: `llmInference.httpResponseStart`.
-    ///
-    /// # Parameters
+/// `extensions.*` RPCs.
+#[derive(Clone, Copy)]
+pub struct ClientRpcExtensions<'a> {
+    pub(crate) client: &'a Client,
+}
+
+impl<'a> ClientRpcExtensions<'a> {
+    /// Discovers user and enabled installed-plugin extensions from persisted Copilot home state, including enablement preferences. Launch-scoped additional plugins are not included.
     ///
-    /// * `params` - Response head.
+    /// Wire method: `extensions.discover`.
     ///
     /// # Returns
     ///
-    /// Whether the start frame was accepted.
+    /// Extensions discovered from persisted Copilot home state and their effective loading mode. Launch-scoped additional plugins are not included.
     ///
     /// <div class="warning">
     ///
@@ -1249,32 +1309,22 @@ impl<'a> ClientRpcLlmInference<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn http_response_start(
-        &self,
-        params: LlmInferenceHttpResponseStartRequest,
-    ) -> Result<LlmInferenceHttpResponseStartResult, Error> {
-        let wire_params = serde_json::to_value(params)?;
+    pub async fn discover(&self) -> Result<DiscoveredExtensions, Error> {
+        let wire_params = serde_json::json!({});
         let _value = self
             .client
-            .call(
-                rpc_methods::LLMINFERENCE_HTTPRESPONSESTART,
-                Some(wire_params),
-            )
+            .call(rpc_methods::EXTENSIONS_DISCOVER, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Delivers a body byte range (or a terminal transport error) for an in-flight response, correlated by requestId. Set `end` true on the last chunk. When `error` is set the response terminates with a transport-level failure and the runtime raises an APIConnectionError.
+    /// Persistently enables extension IDs for future sessions. Active sessions are unchanged; use session.extensions.enable to update them.
     ///
-    /// Wire method: `llmInference.httpResponseChunk`.
+    /// Wire method: `extensions.enable`.
     ///
     /// # Parameters
     ///
-    /// * `params` - A response body chunk or terminal error.
-    ///
-    /// # Returns
-    ///
-    /// Whether the chunk was accepted.
+    /// * `params` - Source-qualified extension identifiers to persistently enable for future sessions.
     ///
     /// <div class="warning">
     ///
@@ -1283,36 +1333,22 @@ impl<'a> ClientRpcLlmInference<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn http_response_chunk(
-        &self,
-        params: LlmInferenceHttpResponseChunkRequest,
-    ) -> Result<LlmInferenceHttpResponseChunkResult, Error> {
+    pub async fn enable(&self, params: DiscoveredExtensionsEnableRequest) -> Result<(), Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(
-                rpc_methods::LLMINFERENCE_HTTPRESPONSECHUNK,
-                Some(wire_params),
-            )
+            .call(rpc_methods::EXTENSIONS_ENABLE, Some(wire_params))
             .await?;
-        Ok(serde_json::from_value(_value)?)
+        Ok(())
     }
-}
-
-/// `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. `managedSettings.resolve` returns the same device settings together with the account's server policy.
+    /// Persistently disables extension IDs for future sessions. Active sessions are unchanged; use session.extensions.disable to update them.
     ///
-    /// Wire method: `managedSettings.read`.
+    /// Wire method: `extensions.disable`.
     ///
-    /// # Returns
+    /// # Parameters
     ///
-    /// Validated device-managed settings discovered before a session exists.
+    /// * `params` - Source-qualified extension identifiers to persistently disable for future sessions.
     ///
     /// <div class="warning">
     ///
@@ -1321,18 +1357,34 @@ impl<'a> ClientRpcManagedSettings<'a> {
     /// 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!({});
+    pub async fn disable(&self, params: DiscoveredExtensionsDisableRequest) -> Result<(), Error> {
+        let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::MANAGEDSETTINGS_READ, Some(wire_params))
+            .call(rpc_methods::EXTENSIONS_DISABLE, Some(wire_params))
             .await?;
-        Ok(serde_json::from_value(_value)?)
+        Ok(())
     }
+}
 
-    /// Force-refreshes enterprise managed settings for every account: wipes the persistent server-policy cache (the whole `<cacheHome>/managed-settings` directory) and drops this runtime process's in-memory retained server policy. It does not itself fetch policy — the effect is that the next time a session resolves managed settings for an account, that resolution re-fetches the account's org policy from the network instead of serving a cached response. Note that `managedSettings.read` returns only device/MDM settings and never triggers the account server-policy fetch, so a host implementing "sync account policy" should call `managedSettings.resolve` or start a fresh session resolution rather than treat a subsequent `managedSettings.read` as the refreshed org policy. Mirrors the invalidation a sign-out performs, broadened from the one signing-out account to all of them; device/MDM layers describe the machine, not the account, and are left untouched. Rejects if the on-disk cache cannot be removed.
+/// `featureFlags.*` RPCs.
+#[derive(Clone, Copy)]
+pub struct ClientRpcFeatureFlags<'a> {
+    pub(crate) client: &'a Client,
+}
+
+impl<'a> ClientRpcFeatureFlags<'a> {
+    /// Resolves named gates against this installation's cached online-experiment assignment, for the account the runtime is already authenticated as. Unlike `featureFlags.resolve`, which layers static availability with the populations supplied, this reads the experiment assignment the runtime cached for its own current authentication, so a launch can honor a rollout before any session exists. The account is never taken from the request: naming one would read another account's cached assignments. The cached assignment answers immediately and any network refresh happens behind it, so this call does not wait on the network. Not available to an extension, which cannot carry the user's consent to read their assignment.
     ///
-    /// Wire method: `managedSettings.clearCache`.
+    /// Wire method: `featureFlags.resolveStartupGates`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Caller population and startup inputs to resolve named online-experiment gates for. Carries no account: the runtime resolves the assignment for the authentication it already holds.
+    ///
+    /// # Returns
+    ///
+    /// The resolved gates, keyed by flag name.
     ///
     /// <div class="warning">
     ///
@@ -1341,22 +1393,28 @@ impl<'a> ClientRpcManagedSettings<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn clear_cache(&self) -> Result<(), Error> {
-        let wire_params = serde_json::json!({});
+    pub(crate) async fn resolve_startup_gates(
+        &self,
+        params: FeatureFlagsResolveStartupGatesRequest,
+    ) -> Result<FeatureFlagsResolveStartupGatesResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::MANAGEDSETTINGS_CLEARCACHE, Some(wire_params))
+            .call(
+                rpc_methods::FEATUREFLAGS_RESOLVESTARTUPGATES,
+                Some(wire_params),
+            )
             .await?;
-        Ok(())
+        Ok(serde_json::from_value(_value)?)
     }
 
-    /// Resolves the effective enterprise managed settings without a session, from the device channel and, when an account is available, the account's server policy through the same per-account cache sessions use. A cached server policy less than an hour old is used without a fetch; otherwise the policy is fetched, and when the fetch fails a cached policy up to 24 hours old is used instead, unless `forceRemoteSettingsRefresh` requires a live fetch. With no account requested or signed in, it reports device policy only; signing out removes the account's cached policy. It can fetch server policy over the network when the cache is stale, so call it off latency-critical paths such as startup rather than before listing models. The policy helper is not run. `layers` lists each channel's document before merging, and `values` and `meta` carry typed effective values and their lock state for the keys typed so far.
+    /// Lists every feature flag this runtime declares, with the population each one is declared for, its experimental description, and the online-experiment flag it maps to. This is the static catalog: it describes how each flag is defined, not whether it is on for anyone. Use `featureFlags.resolve` for static values with caller overrides, not active runtime values or experiment assignments.
     ///
-    /// Wire method: `managedSettings.resolve`.
+    /// Wire method: `featureFlags.listMetadata`.
     ///
     /// # Returns
     ///
-    /// Effective enterprise managed settings for an account, resolved without a session.
+    /// Every feature flag this runtime declares, with the shape each one was declared with.
     ///
     /// <div class="warning">
     ///
@@ -1365,26 +1423,26 @@ impl<'a> ClientRpcManagedSettings<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn resolve(&self) -> Result<ManagedSettingsResolveResult, Error> {
+    pub(crate) async fn list_metadata(&self) -> Result<FeatureFlagsMetadataResult, Error> {
         let wire_params = serde_json::json!({});
         let _value = self
             .client
-            .call(rpc_methods::MANAGEDSETTINGS_RESOLVE, Some(wire_params))
+            .call(rpc_methods::FEATUREFLAGS_LISTMETADATA, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Resolves the effective enterprise managed settings without a session, from the device channel and, when an account is available, the account's server policy through the same per-account cache sessions use. A cached server policy less than an hour old is used without a fetch; otherwise the policy is fetched, and when the fetch fails a cached policy up to 24 hours old is used instead, unless `forceRemoteSettingsRefresh` requires a live fetch. With no account requested or signed in, it reports device policy only; signing out removes the account's cached policy. It can fetch server policy over the network when the cache is stale, so call it off latency-critical paths such as startup rather than before listing models. The policy helper is not run. `layers` lists each channel's document before merging, and `values` and `meta` carry typed effective values and their lock state for the keys typed so far.
+    /// Computes static feature flags from the supplied population and overrides without changing runtime state or verifying audience membership. Starts from declared availability, then applies direct feature-flag environment values, user settings, and explicit `flagOverrides`. It does not apply `COPILOT_EXP_*` experiment assignments, authenticated startup gates, or active runtime state. Settings include `enabledFeatureFlags`, the legacy `feature_flags.enabled` list, and supported convenience settings. Supply `baseFlags` to use an existing flag set instead of declared availability. Omit `isStaffGitHub` or `isStaffMicrosoft` when membership was never recorded: a legacy staff account then counts as both populations.
     ///
-    /// Wire method: `managedSettings.resolve`.
+    /// Wire method: `featureFlags.resolve`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Optional opaque account selection or GitHub token whose managed settings are resolved.
+    /// * `params` - Caller population and overrides for static feature-flag resolution, independent of experiment assignments and active runtime state.
     ///
     /// # Returns
     ///
-    /// Effective enterprise managed settings for an account, resolved without a session.
+    /// The resolved feature flags, keyed by flag name.
     ///
     /// <div class="warning">
     ///
@@ -1393,25 +1451,37 @@ impl<'a> ClientRpcManagedSettings<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn resolve_with_params(
+    pub(crate) async fn resolve(
         &self,
-        params: ManagedSettingsResolveRequest,
-    ) -> Result<ManagedSettingsResolveResult, Error> {
+        params: FeatureFlagsResolveRequest,
+    ) -> Result<FeatureFlagsResolveResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::MANAGEDSETTINGS_RESOLVE, Some(wire_params))
+            .call(rpc_methods::FEATUREFLAGS_RESOLVE, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
+}
 
-    /// Returns the managed-settings authoring JSON schema with descriptive `x-composition` annotations aligned with the shared settings-engine vocabulary. These annotations are not a complete runtime composition contract: model, effortLevel, and contextTier remain coupled. Use `managedSettings.compose` for the runtime's effective result. Performs no I/O.
+/// `git.*` RPCs.
+#[derive(Clone, Copy)]
+pub struct ClientRpcGit<'a> {
+    pub(crate) client: &'a Client,
+}
+
+impl<'a> ClientRpcGit<'a> {
+    /// Reads the remote that the branch checked out in a working tree tracks, as `branch.<name>.remote` configures it. Reports `origin` rather than failing whenever there is no tracking configuration to read — on a detached HEAD, on a branch with no upstream, or when git itself fails — because a caller asking which remote to talk to needs an answer it can act on, not an error. Marked internal because it exists to carry a CLI call site off the napi boundary onto the SDK contract; it is migration plumbing, not a surface consumers are meant to depend on.
     ///
-    /// Wire method: `managedSettings.schema`.
+    /// Wire method: `git.currentBranchRemote`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Working-tree path a git query applies to.
     ///
     /// # Returns
     ///
-    /// The authoring JSON schema for managed settings recognized by this runtime.
+    /// The remote the checked-out branch tracks.
     ///
     /// <div class="warning">
     ///
@@ -1420,26 +1490,29 @@ impl<'a> ClientRpcManagedSettings<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn schema(&self) -> Result<ManagedSettingsSchemaResult, Error> {
-        let wire_params = serde_json::json!({});
+    pub(crate) async fn current_branch_remote(
+        &self,
+        params: GitCwdRequest,
+    ) -> Result<GitCurrentBranchRemoteResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::MANAGEDSETTINGS_SCHEMA, Some(wire_params))
+            .call(rpc_methods::GIT_CURRENTBRANCHREMOTE, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Validates a candidate managed-settings document the way the runtime validates delivered policy, without applying it. Reports errors that would reject the document, warnings for content the runtime ignores, and the canonical document it would apply. Document text nested more than 64 levels deep is rejected. Performs no I/O.
+    /// Collects the repository context of a working directory in one call: working tree root, repository identifier and host, current branch, and the HEAD and base commits. Every repository field is omitted when the path is not inside a git working tree, and the requested path is echoed back as `cwd`. The answer is the same `SessionWorkingDirectoryContext` that `session.metadata.recordContextChange` accepts, so a caller polling for a context change can forward the result unchanged. Marked internal because it exists to carry a CLI call site off the napi boundary onto the SDK contract; it is migration plumbing, not a surface consumers are meant to depend on. It can become public once an SDK consumer needs to derive session context from a directory itself.
     ///
-    /// Wire method: `managedSettings.validate`.
+    /// Wire method: `git.workingDirectoryContext`.
     ///
     /// # Parameters
     ///
-    /// * `params` - A candidate managed-settings document to validate without applying it.
+    /// * `params` - Working-tree path a git query applies to.
     ///
     /// # Returns
     ///
-    /// Result of validating a managed-settings document.
+    /// Updated working directory and git context. Emitted as the new payload of `session.context_changed`.
     ///
     /// <div class="warning">
     ///
@@ -1448,29 +1521,29 @@ impl<'a> ClientRpcManagedSettings<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn validate(
+    pub(crate) async fn working_directory_context(
         &self,
-        params: ManagedSettingsValidateRequest,
-    ) -> Result<ManagedSettingsValidateResult, Error> {
+        params: GitCwdRequest,
+    ) -> Result<SessionWorkingDirectoryContext, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::MANAGEDSETTINGS_VALIDATE, Some(wire_params))
+            .call(rpc_methods::GIT_WORKINGDIRECTORYCONTEXT, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Merges candidate managed-settings documents for the device, server, and policy-helper channels into the effective settings the runtime would enforce on this host, using the same precedence and composition rules as live resolution, without applying them. Like live resolution, a server's advisory sandbox force-enable is declined on a host that cannot run the sandbox. Does not fetch policy or read policy files, but may perform blocking OS or subprocess probes for sandbox support. Preview documents are limited to 1 MiB and 64 levels of nesting.
+    /// Lists the GitHub repositories a working tree's remotes point at, one entry per distinct repository, so a caller can resolve a base and head repository without parsing remote URLs itself. When several remotes name the same repository, only the first is listed, and the entry keeps that remote name. Remotes pointing at no GitHub host are left out, so an empty list means the tree reaches GitHub through no remote. Failing to read the remotes is reported as an error rather than as an empty list, because the two mean different things to a caller. Marked internal because it exists to carry a CLI call site off the napi boundary onto the SDK contract; it is migration plumbing, not a surface consumers are meant to depend on.
     ///
-    /// Wire method: `managedSettings.compose`.
+    /// Wire method: `git.reposFromRemotes`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Candidate managed-settings documents to merge without applying them.
+    /// * `params` - Git working tree whose GitHub remotes should be listed.
     ///
     /// # Returns
     ///
-    /// The effective managed settings the runtime would enforce for the given documents, in the same shape `managedSettings.resolve` returns.
+    /// The GitHub repositories a working tree's remotes point at.
     ///
     /// <div class="warning">
     ///
@@ -1479,51 +1552,33 @@ impl<'a> ClientRpcManagedSettings<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn compose(
+    pub(crate) async fn repos_from_remotes(
         &self,
-        params: ManagedSettingsComposeRequest,
-    ) -> Result<ManagedSettingsComposeResult, Error> {
+        params: GitReposFromRemotesRequest,
+    ) -> Result<GitReposFromRemotesResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::MANAGEDSETTINGS_COMPOSE, Some(wire_params))
+            .call(rpc_methods::GIT_REPOSFROMREMOTES, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 }
 
-/// `mcp.*` RPCs.
+/// `gitHubOwners.*` RPCs.
 #[derive(Clone, Copy)]
-pub struct ClientRpcMcp<'a> {
+pub struct ClientRpcGitHubOwners<'a> {
     pub(crate) client: &'a Client,
 }
 
-impl<'a> ClientRpcMcp<'a> {
-    /// `mcp.config.*` sub-namespace.
-    pub fn config(&self) -> ClientRpcMcpConfig<'a> {
-        ClientRpcMcpConfig {
-            client: self.client,
-        }
-    }
-
-    /// `mcp.installations.*` sub-namespace.
-    pub fn installations(&self) -> ClientRpcMcpInstallations<'a> {
-        ClientRpcMcpInstallations {
-            client: self.client,
-        }
-    }
-
-    /// Discovers MCP servers from user, workspace, plugin, and builtin sources.
-    ///
-    /// Wire method: `mcp.discover`.
-    ///
-    /// # Parameters
+impl<'a> ClientRpcGitHubOwners<'a> {
+    /// Registers a cancellable owner listing and returns its request id. Separate from `gitHubOwners.list` so the id exists before the listing starts: a caller that abandons the listing the moment it begins would otherwise have nothing to name in `gitHubOwners.cancel`. The id serves one listing only. Long-abandoned unused ids can be released by later allocations.
     ///
-    /// * `params` - Optional working directory used as context for MCP server discovery.
+    /// Wire method: `gitHubOwners.nextRequestId`.
     ///
     /// # Returns
     ///
-    /// MCP servers discovered from user, workspace, plugin, and built-in sources.
+    /// A freshly registered request id. Registering it before the listing starts is what lets a cancel that races the request still find the owner listing slot. The id serves one listing only. Long-abandoned unused ids can be released by later allocations.
     ///
     /// <div class="warning">
     ///
@@ -1532,26 +1587,26 @@ impl<'a> ClientRpcMcp<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn discover(&self, params: McpDiscoverRequest) -> Result<McpDiscoverResult, Error> {
-        let wire_params = serde_json::to_value(params)?;
+    pub(crate) async fn next_request_id(&self) -> Result<GitHubOwnersRequestIdResult, Error> {
+        let wire_params = serde_json::json!({});
         let _value = self
             .client
-            .call(rpc_methods::MCP_DISCOVER, Some(wire_params))
+            .call(rpc_methods::GITHUBOWNERS_NEXTREQUESTID, Some(wire_params))
             .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.
+    /// Lists the logins the authenticated user may act as — their own account first, then the organizations they belong to — by asking the GitHub API under the supplied credential. No credential travels in the request: `authInfo` selects one the runtime already holds, and the runtime resolves the token and the GitHub host from it. A failure the caller should render arrives as `message`; one it should raise arrives as `throwError`.
     ///
-    /// Wire method: `mcp.planInstall`.
+    /// Wire method: `gitHubOwners.list`.
     ///
     /// # 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.
+    /// * `params` - Credential to list owners under, and the request id that makes the listing cancellable.
     ///
     /// # Returns
     ///
-    /// Outcome of an mcp.planInstall call: either a normalised plan, or one typed refusal. Nothing is written in either case.
+    /// Outcome of an owner listing. Exactly one of `owners` and `message` is present, except that `throwError` reports a failure the caller is expected to raise rather than render.
     ///
     /// <div class="warning">
     ///
@@ -1560,29 +1615,29 @@ impl<'a> ClientRpcMcp<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn plan_install(
+    pub(crate) async fn list(
         &self,
-        params: McpPlanInstallRequest,
-    ) -> Result<McpPlanInstallResult, Error> {
+        params: GitHubOwnersListRequest,
+    ) -> Result<GitHubOwnersListResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::MCP_PLANINSTALL, Some(wire_params))
+            .call(rpc_methods::GITHUBOWNERS_LIST, Some(wire_params))
             .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.
+    /// Abandons an owner listing started with the given request id. Answers `canceled: true` while a listing with that id is running. Answers `canceled: false` when the id was never registered, was registered but not used, was released after being abandoned, or its listing has ended. Canceling an unused id releases it, and a later `list` with that id is refused. The cancel acts only on owner listings and never reaches another request of the host.
     ///
-    /// Wire method: `mcp.planInstall`.
+    /// Wire method: `gitHubOwners.cancel`.
     ///
     /// # 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.
+    /// * `params` - The owner listing to abandon.
     ///
     /// # Returns
     ///
-    /// Outcome of an mcp.planInstall call: either a normalised plan, or one typed refusal. Nothing is written in either case.
+    /// Whether the id named a running owner listing.
     ///
     /// <div class="warning">
     ///
@@ -1591,31 +1646,37 @@ impl<'a> ClientRpcMcp<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    ///
-    /// Accepts [`McpPlanInstallOptions`], including inputs added after [`McpPlanInstallRequest`].
-    pub async fn plan_install_with_options(
+    pub(crate) async fn cancel(
         &self,
-        params: McpPlanInstallOptions,
-    ) -> Result<McpPlanInstallResult, Error> {
+        params: GitHubOwnersCancelRequest,
+    ) -> Result<GitHubOwnersCancelResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::MCP_PLANINSTALL, Some(wire_params))
+            .call(rpc_methods::GITHUBOWNERS_CANCEL, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
+}
 
-    /// Consumes a bound catalogue plan and retains one exact fully resolved personal remote MCP operation requiring no supplied values or configured secrets. Returns its runtime operation ID and original expiry before any confirmation, activation, writer initialisation or installation effect. Register the original connection, operation and selected-session binding before calling applyInstall. Missing lower owned admission is unavailable, never a raw-config fallback.
+/// `gitHubRepository.*` RPCs.
+#[derive(Clone, Copy)]
+pub struct ClientRpcGitHubRepository<'a> {
+    pub(crate) client: &'a Client,
+}
+
+impl<'a> ClientRpcGitHubRepository<'a> {
+    /// Resolves the GitHub repository that owns a working-tree path by reading the selected git remote configured for it, preferring `origin`. Returns a null `repository` when the path is inside a git working tree but that selected remote does not resolve to a GitHub host. Fails when the path is not inside a git working tree at all, so a caller can tell 'not a repository' apart from 'a repository with no GitHub remote'.
     ///
-    /// Wire method: `mcp.prepareInstall`.
+    /// Wire method: `gitHubRepository.atPath`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Side-effect-free preparation of one original bound remote MCP choice.
+    /// * `params` - Working-tree path whose owning GitHub repository should be resolved.
     ///
     /// # Returns
     ///
-    /// Management result with contract receipt, or a typed request/negotiation refusal.
+    /// The GitHub repository that owns the requested path, when the selected remote (`origin`, else the first) is on a GitHub host.
     ///
     /// <div class="warning">
     ///
@@ -1624,29 +1685,33 @@ impl<'a> ClientRpcMcp<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn prepare_install(
+    pub(crate) async fn at_path(
         &self,
-        params: McpPrepareInstallRequest,
-    ) -> Result<McpInstallationManagementResult, Error> {
+        params: GitHubRepositoryAtPathRequest,
+    ) -> Result<GitHubRepositoryAtPathResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::MCP_PREPAREINSTALL, Some(wire_params))
+            .call(rpc_methods::GITHUBREPOSITORY_ATPATH, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
+}
 
-    /// Consumes a retained prepared MCP operation once, revalidates its original authority, requests explicit human consent through installations.confirm on the original connection, then revalidates source and applies the sealed transaction. An uncertain result requires original-operation inspection or recovery, never replay.
-    ///
-    /// Wire method: `mcp.applyInstall`.
-    ///
-    /// # Parameters
+/// `globalState.*` RPCs.
+#[derive(Clone, Copy)]
+pub struct ClientRpcGlobalState<'a> {
+    pub(crate) client: &'a Client,
+}
+
+impl<'a> ClientRpcGlobalState<'a> {
+    /// Reads the host's machine-wide state: which plugins are installed and the one-off flags and timestamps that record what the user has already been shown or migrated. This is the state that outlives a single session and a single workspace, so a host reads it to decide whether to run a first-launch step, offer an onboarding prompt, or skip one it has already completed. The stored credentials are deliberately not part of this result; a caller that needs an authenticated identity asks the account methods for it instead. Reading is non-destructive and every field is optional, because a fresh install has recorded nothing yet.
     ///
-    /// * `params` - Applies exactly one previously prepared operation on its original connection.
+    /// Wire method: `globalState.load`.
     ///
     /// # Returns
     ///
-    /// An installation result together with the exact honoured contract, or a negotiation refusal.
+    /// The host's machine-wide state. Every field is optional because a fresh install has recorded nothing yet, so a reader must treat an absent field as `not yet`, never as a negative answer. Stored credentials are deliberately absent from this shape.
     ///
     /// <div class="warning">
     ///
@@ -1655,29 +1720,26 @@ impl<'a> ClientRpcMcp<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn apply_install(
-        &self,
-        params: McpApplyInstallRequest,
-    ) -> Result<McpInstallationResult, Error> {
-        let wire_params = serde_json::to_value(params)?;
+    pub(crate) async fn load(&self) -> Result<GlobalStateLoadResult, Error> {
+        let wire_params = serde_json::json!({});
         let _value = self
             .client
-            .call(rpc_methods::MCP_APPLYINSTALL, Some(wire_params))
+            .call(rpc_methods::GLOBALSTATE_LOAD, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Prepares a read-only removal plan for an exact owned receipt under the selected existing session. Returns the original operation ID before confirmation; neither planning nor abandonment changes configuration or shared OAuth credentials.
+    /// Reads the host's machine-wide state exactly as `globalState.load` does, but from a caller-supplied configuration directory instead of the one the server resolved for itself. Use this when a consumer scopes a session to its own Copilot home — the SDK's per-session `configDir` override — so the state read matches the directory that session actually uses. An absent or empty `configDir` resolves the server's own home, making this identical to `globalState.load`. The stored credentials are omitted here for the same reason they are omitted from `globalState.load`: a caller that needs an authenticated identity asks the account methods instead, so pointing this at another directory cannot be used to read the credentials kept in it.
     ///
-    /// Wire method: `mcp.planUninstall`.
+    /// Wire method: `globalState.loadForConfigDir`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Read-only preparation of one owned removal under fresh selected-session authority.
+    /// * `params` - Selects the configuration directory whose machine-wide state to read.
     ///
     /// # Returns
     ///
-    /// Management result with contract receipt, or a typed request/negotiation refusal.
+    /// The host's machine-wide state. Every field is optional because a fresh install has recorded nothing yet, so a reader must treat an absent field as `not yet`, never as a negative answer. Stored credentials are deliberately absent from this shape.
     ///
     /// <div class="warning">
     ///
@@ -1686,29 +1748,25 @@ impl<'a> ClientRpcMcp<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn plan_uninstall(
+    pub(crate) async fn load_for_config_dir(
         &self,
-        params: McpPlanUninstallRequest,
-    ) -> Result<McpInstallationManagementResult, Error> {
+        params: GlobalStateLoadForConfigDirRequest,
+    ) -> Result<GlobalStateLoadResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::MCP_PLANUNINSTALL, Some(wire_params))
+            .call(rpc_methods::GLOBALSTATE_LOADFORCONFIGDIR, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Consumes the original owned-removal plan once and requests fresh exact human confirmation on its original connection. Drift is refused; unrelated manual configuration and shared OAuth credentials are preserved.
+    /// Records one top-level key in the host's machine-wide state, the counterpart to `globalState.load`. A host calls this to remember that it has shown an onboarding step, asked a one-off question, or completed a migration, so the next run can skip it. Only the named key is replaced and the rest of the document is preserved, which lets two writers record different flags without overwriting each other; passing no value removes the key instead. Only the keys a host records itself are writable: `appTipShown`, `askedSetupTerminals`, `autoFeedbackLastPromptedAt`, `firstLaunchAt`, `recentModelIds`, `sandboxCredentialProxyCaDeclined` and `sandboxOnboardingShown`. Every other key is refused, including `installedPlugins`, the stored credentials, `trustedFolders`, the staff flags and the signed-in accounts. Plugin enablement must use the plugin APIs, which apply repository and managed-policy checks.
     ///
-    /// Wire method: `mcp.applyUninstall`.
+    /// Wire method: `globalState.writeKey`.
     ///
     /// # Parameters
     ///
-    /// * `params` - One-use application of the exact retained removal plan.
-    ///
-    /// # Returns
-    ///
-    /// An installation result together with the exact honoured contract, or a negotiation refusal.
+    /// * `params` - A single top-level key to record in the host's machine-wide state. The write replaces only that key and leaves the rest of the document untouched, so two writers recording different one-off flags do not overwrite each other. The stored credential keys cannot be written through this method.
     ///
     /// <div class="warning">
     ///
@@ -1717,33 +1775,34 @@ impl<'a> ClientRpcMcp<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn apply_uninstall(
-        &self,
-        params: McpApplyUninstallRequest,
-    ) -> Result<McpInstallationResult, Error> {
+    pub(crate) async fn write_key(&self, params: GlobalStateWriteKeyRequest) -> Result<(), Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::MCP_APPLYUNINSTALL, Some(wire_params))
+            .call(rpc_methods::GLOBALSTATE_WRITEKEY, Some(wire_params))
             .await?;
-        Ok(serde_json::from_value(_value)?)
+        Ok(())
     }
 }
 
-/// `mcp.config.*` RPCs.
+/// `hooks.*` RPCs.
 #[derive(Clone, Copy)]
-pub struct ClientRpcMcpConfig<'a> {
+pub struct ClientRpcHooks<'a> {
     pub(crate) client: &'a Client,
 }
 
-impl<'a> ClientRpcMcpConfig<'a> {
-    /// Lists MCP servers from user configuration.
+impl<'a> ClientRpcHooks<'a> {
+    /// Discovers hook actions enabled under server-side discovery settings from user, repository, plugin, and managed-policy sources.
     ///
-    /// Wire method: `mcp.config.list`.
+    /// Wire method: `hooks.discover`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Optional project paths and host-exclusion behavior for server-scoped hook discovery.
     ///
     /// # Returns
     ///
-    /// User-configured MCP servers, keyed by server name.
+    /// Server-discovered hook actions and partial-load diagnostics from user, repository, plugin, and managed-policy sources. Concrete sessions may include additional session-specific hook sources.
     ///
     /// <div class="warning">
     ///
@@ -1752,22 +1811,29 @@ impl<'a> ClientRpcMcpConfig<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn list(&self) -> Result<McpConfigList, Error> {
-        let wire_params = serde_json::json!({});
+    pub async fn discover(
+        &self,
+        params: HooksDiscoverRequest,
+    ) -> Result<HooksDiscoverResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::MCP_CONFIG_LIST, Some(wire_params))
+            .call(rpc_methods::HOOKS_DISCOVER, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Adds an MCP server to user configuration.
+    /// Discovers hook actions enabled under server-side discovery settings from user, repository, plugin, and managed-policy sources.
     ///
-    /// Wire method: `mcp.config.add`.
+    /// Wire method: `hooks.discover`.
     ///
     /// # Parameters
     ///
-    /// * `params` - MCP server name and configuration to add to user configuration.
+    /// * `params` - Optional project paths and host-exclusion behavior for server-scoped hook discovery.
+    ///
+    /// # Returns
+    ///
+    /// Server-discovered hook actions and partial-load diagnostics from user, repository, plugin, and managed-policy sources. Concrete sessions may include additional session-specific hook sources.
     ///
     /// <div class="warning">
     ///
@@ -1776,46 +1842,39 @@ impl<'a> ClientRpcMcpConfig<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn add(&self, params: McpConfigAddRequest) -> Result<(), Error> {
+    ///
+    /// Accepts [`HooksDiscoverOptions`], including inputs added after [`HooksDiscoverRequest`].
+    pub async fn discover_with_options(
+        &self,
+        params: HooksDiscoverOptions,
+    ) -> Result<HooksDiscoverResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::MCP_CONFIG_ADD, Some(wire_params))
+            .call(rpc_methods::HOOKS_DISCOVER, Some(wire_params))
             .await?;
-        Ok(())
+        Ok(serde_json::from_value(_value)?)
     }
+}
 
-    /// Updates an MCP server in user configuration.
+/// `host.*` RPCs.
+#[derive(Clone, Copy)]
+pub struct ClientRpcHost<'a> {
+    pub(crate) client: &'a Client,
+}
+
+impl<'a> ClientRpcHost<'a> {
+    /// Publishes an attached resident session for this listener's lifetime without copying it.
     ///
-    /// Wire method: `mcp.config.update`.
+    /// Wire method: `host.publishSession`.
     ///
     /// # Parameters
     ///
-    /// * `params` - MCP server name and replacement configuration to write to user configuration.
-    ///
-    /// <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 update(&self, params: McpConfigUpdateRequest) -> Result<(), Error> {
-        let wire_params = serde_json::to_value(params)?;
-        let _value = self
-            .client
-            .call(rpc_methods::MCP_CONFIG_UPDATE, Some(wire_params))
-            .await?;
-        Ok(())
-    }
-
-    /// Removes an MCP server from user configuration.
-    ///
-    /// Wire method: `mcp.config.remove`.
+    /// * `params` - Publishes a resident session attached to the listener's owning connection.
     ///
-    /// # Parameters
+    /// # Returns
     ///
-    /// * `params` - MCP server name to remove from user configuration.
+    /// The existing runtime identity and its resource on the listener.
     ///
     /// <div class="warning">
     ///
@@ -1824,22 +1883,29 @@ impl<'a> ClientRpcMcpConfig<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn remove(&self, params: McpConfigRemoveRequest) -> Result<(), Error> {
+    pub async fn publish_session(
+        &self,
+        params: HostPublishSessionRequest,
+    ) -> Result<HostPublishSessionResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::MCP_CONFIG_REMOVE, Some(wire_params))
+            .call(rpc_methods::HOST_PUBLISHSESSION, Some(wire_params))
             .await?;
-        Ok(())
+        Ok(serde_json::from_value(_value)?)
     }
 
-    /// Enables MCP servers in user configuration for new sessions.
+    /// Reads the complete advertised live and dormant session catalog of an existing host owned by this connection. Does not start hosting, subscribe to sessions, or guarantee resumability.
     ///
-    /// Wire method: `mcp.config.enable`.
+    /// Wire method: `host.listSessions`.
     ///
     /// # Parameters
     ///
-    /// * `params` - MCP server names to enable for new sessions.
+    /// * `params` - Reads a running host's catalog or the runtime's saved default catalog.
+    ///
+    /// # Returns
+    ///
+    /// The complete live and dormant advertised catalog, without subscribing to sessions.
     ///
     /// <div class="warning">
     ///
@@ -1848,42 +1914,29 @@ impl<'a> ClientRpcMcpConfig<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn enable(&self, params: McpConfigEnableRequest) -> Result<(), Error> {
+    pub async fn list_sessions(
+        &self,
+        params: HostListSessionsRequest,
+    ) -> Result<HostListSessionsResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::MCP_CONFIG_ENABLE, Some(wire_params))
+            .call(rpc_methods::HOST_LISTSESSIONS, Some(wire_params))
             .await?;
-        Ok(())
+        Ok(serde_json::from_value(_value)?)
     }
 
-    /// Disables MCP servers in user configuration for new sessions.
+    /// Requests app-owned materialization over the owning SDK participant.
     ///
-    /// Wire method: `mcp.config.disable`.
+    /// Wire method: `host.createSession`.
     ///
     /// # Parameters
     ///
-    /// * `params` - MCP server names to disable for new sessions.
-    ///
-    /// <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.
+    /// * `params` - One application-owned session handoff, requested by the supervised hosting participant.
     ///
-    /// </div>
-    pub async fn disable(&self, params: McpConfigDisableRequest) -> Result<(), Error> {
-        let wire_params = serde_json::to_value(params)?;
-        let _value = self
-            .client
-            .call(rpc_methods::MCP_CONFIG_DISABLE, Some(wire_params))
-            .await?;
-        Ok(())
-    }
-
-    /// Drops this runtime process's in-memory MCP server-definition cache so the next MCP config read observes disk.
+    /// # Returns
     ///
-    /// Wire method: `mcp.config.reload`.
+    /// The resident session the application has materialized on its own connection.
     ///
     /// <div class="warning">
     ///
@@ -1892,34 +1945,29 @@ impl<'a> ClientRpcMcpConfig<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn reload(&self) -> Result<(), Error> {
-        let wire_params = serde_json::json!({});
+    pub(crate) async fn create_session(
+        &self,
+        params: HostSessionCreateRequest,
+    ) -> Result<HostSessionCreateResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::MCP_CONFIG_RELOAD, Some(wire_params))
+            .call(rpc_methods::HOST_CREATESESSION, Some(wire_params))
             .await?;
-        Ok(())
+        Ok(serde_json::from_value(_value)?)
     }
-}
-
-/// `mcp.installations.*` RPCs.
-#[derive(Clone, Copy)]
-pub struct ClientRpcMcpInstallations<'a> {
-    pub(crate) client: &'a Client,
-}
 
-impl<'a> ClientRpcMcpInstallations<'a> {
-    /// Reads receipt-owned MCP inventory for the selected account and host without activating servers or reconstructing missing ownership. Configuration ownership does not prove session-specific usability.
+    /// Releases app ownership retention after AHP detaches.
     ///
-    /// Wire method: `mcp.installations.list`.
+    /// Wire method: `host.releaseSession`.
     ///
     /// # Parameters
     ///
-    /// * `params` - New-work inventory or recovery request under an explicitly selected existing session.
+    /// * `params` - Ends one participation, not the application's session lifetime.
     ///
     /// # Returns
     ///
-    /// Management result with contract receipt, or a typed request/negotiation refusal.
+    /// Empty acknowledgement for a completed host lifecycle operation.
     ///
     /// <div class="warning">
     ///
@@ -1928,29 +1976,29 @@ impl<'a> ClientRpcMcpInstallations<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn list(
+    pub(crate) async fn release_session(
         &self,
-        params: McpInstallationsRequest,
-    ) -> Result<McpInstallationManagementResult, Error> {
+        params: HostSessionReleaseRequest,
+    ) -> Result<HostEmptyResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::MCP_INSTALLATIONS_LIST, Some(wire_params))
+            .call(rpc_methods::HOST_RELEASESESSION, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Reconciles already-confirmed durable MCP transactions, then inspects owned inventory. Does not replay apply or reconstruct deleted ownership metadata; unresolved or unsafe evidence remains an explicit refusal.
+    /// Starts a connection-owned AHP host with explicit localServer and/or githubEnvironment transports as a supervised SDK participant.
     ///
-    /// Wire method: `mcp.installations.recover`.
+    /// Wire method: `host.start`.
     ///
     /// # Parameters
     ///
-    /// * `params` - New-work inventory or recovery request under an explicitly selected existing session.
+    /// * `params` - Starts a supervised AHP host with at least one explicitly selected transport.
     ///
     /// # Returns
     ///
-    /// Management result with contract receipt, or a typed request/negotiation refusal.
+    /// Listener readiness, returned only after binding and the supervised participant's SDK handshake.
     ///
     /// <div class="warning">
     ///
@@ -1959,29 +2007,26 @@ impl<'a> ClientRpcMcpInstallations<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn recover(
-        &self,
-        params: McpInstallationsRequest,
-    ) -> Result<McpInstallationManagementResult, Error> {
+    pub async fn start(&self, params: HostStartRequest) -> Result<HostStartResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::MCP_INSTALLATIONS_RECOVER, Some(wire_params))
+            .call(rpc_methods::HOST_START, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Inspects a known operation only on its original connection. Remains available after account or selected-session loss; does not acquire new authority or rebind an operation.
+    /// Starts a connection-owned AHP host with explicit localServer and/or githubEnvironment transports as a supervised SDK participant.
     ///
-    /// Wire method: `mcp.installations.status`.
+    /// Wire method: `host.start`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Existing-operation control. A new session selector is deliberately not accepted.
+    /// * `params` - Starts a supervised AHP host with at least one explicitly selected transport.
     ///
     /// # Returns
     ///
-    /// Management result with contract receipt, or a typed request/negotiation refusal.
+    /// Listener readiness, returned only after binding and the supervised participant's SDK handshake.
     ///
     /// <div class="warning">
     ///
@@ -1990,29 +2035,31 @@ impl<'a> ClientRpcMcpInstallations<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn status(
+    ///
+    /// Accepts [`HostStartOptions`], including inputs added after [`HostStartRequest`].
+    pub async fn start_with_options(
         &self,
-        params: McpInstallationOperationRequest,
-    ) -> Result<McpInstallationManagementResult, Error> {
+        params: HostStartOptions,
+    ) -> Result<HostStartResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::MCP_INSTALLATIONS_STATUS, Some(wire_params))
+            .call(rpc_methods::HOST_START, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Requests cancellation of a known operation on its original connection, including before apply or confirmation. Already-started effects retain their transaction lease and report an honest terminal or recovery outcome.
+    /// Stops a listener owned by this SDK connection and joins its cleanup without deleting sessions.
     ///
-    /// Wire method: `mcp.installations.cancel`.
+    /// Wire method: `host.dispose`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Existing-operation control. A new session selector is deliberately not accepted.
+    /// * `params` - Stops a connection-owned listener and joins its teardown.
     ///
     /// # Returns
     ///
-    /// Management result with contract receipt, or a typed request/negotiation refusal.
+    /// Empty acknowledgement for a completed host lifecycle operation.
     ///
     /// <div class="warning">
     ///
@@ -2021,33 +2068,22 @@ impl<'a> ClientRpcMcpInstallations<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn cancel(
-        &self,
-        params: McpInstallationOperationRequest,
-    ) -> Result<McpInstallationManagementResult, Error> {
+    pub async fn dispose(&self, params: HostDisposeRequest) -> Result<HostEmptyResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::MCP_INSTALLATIONS_CANCEL, Some(wire_params))
+            .call(rpc_methods::HOST_DISPOSE, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
-}
-
-/// `models.*` RPCs.
-#[derive(Clone, Copy)]
-pub struct ClientRpcModels<'a> {
-    pub(crate) client: &'a Client,
-}
 
-impl<'a> ClientRpcModels<'a> {
-    /// Lists Copilot models available to the authenticated user.
+    /// Resolves current authenticated credentials and remote-control policy only for the runtime-owned Mission Control hosting participant.
     ///
-    /// Wire method: `models.list`.
+    /// Wire method: `host.getEnvironmentCredentials`.
     ///
     /// # Returns
     ///
-    /// List of Copilot models available to the resolved user, including capabilities and billing metadata.
+    /// Private credentials delivered only to a runtime-owned Mission Control hosting participant.
     ///
     /// <div class="warning">
     ///
@@ -2056,26 +2092,27 @@ impl<'a> ClientRpcModels<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn list(&self) -> Result<ModelList, Error> {
+    pub(crate) async fn get_environment_credentials(
+        &self,
+    ) -> Result<HostEnvironmentCredentials, Error> {
         let wire_params = serde_json::json!({});
         let _value = self
             .client
-            .call(rpc_methods::MODELS_LIST, Some(wire_params))
+            .call(
+                rpc_methods::HOST_GETENVIRONMENTCREDENTIALS,
+                Some(wire_params),
+            )
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Lists Copilot models available to the authenticated user.
-    ///
-    /// Wire method: `models.list`.
-    ///
-    /// # Parameters
+    /// Returns listener settings only to the supervised hosting participant over its SDK connection.
     ///
-    /// * `params` - Optional opaque account selection or compatibility GitHub token used to list models.
+    /// Wire method: `host.getConfiguration`.
     ///
     /// # Returns
     ///
-    /// List of Copilot models available to the resolved user, including capabilities and billing metadata.
+    /// Normalized listener settings delivered only to the supervised hosting participant.
     ///
     /// <div class="warning">
     ///
@@ -2084,22 +2121,26 @@ impl<'a> ClientRpcModels<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn list_with_params(&self, params: ModelsListRequest) -> Result<ModelList, Error> {
-        let wire_params = serde_json::to_value(params)?;
+    pub(crate) async fn get_configuration(&self) -> Result<HostConfiguration, Error> {
+        let wire_params = serde_json::json!({});
         let _value = self
             .client
-            .call(rpc_methods::MODELS_LIST, Some(wire_params))
+            .call(rpc_methods::HOST_GETCONFIGURATION, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Returns the running runtime's complete catalog of well-known built-in model IDs without authentication or network access.
+    /// Reports a supervised hosting participant's bound AHP endpoint after its SDK handshake.
     ///
-    /// Wire method: `models.getBuiltInCatalog`.
+    /// Wire method: `host.ready`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Readiness reported by the supervised hosting participant on its own SDK connection.
     ///
     /// # Returns
     ///
-    /// The running runtime's complete catalog of well-known built-in model IDs, including supported models and additional IDs with built-in metadata.
+    /// Empty acknowledgement for a completed host lifecycle operation.
     ///
     /// <div class="warning">
     ///
@@ -2108,44 +2149,30 @@ impl<'a> ClientRpcModels<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn get_built_in_catalog(&self) -> Result<BuiltInModelCatalog, Error> {
-        let wire_params = serde_json::json!({});
+    pub(crate) async fn ready(&self, params: HostReadyRequest) -> Result<HostEmptyResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::MODELS_GETBUILTINCATALOG, Some(wire_params))
+            .call(rpc_methods::HOST_READY, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 }
 
-/// `plugins.*` RPCs.
+/// `instructions.*` RPCs.
 #[derive(Clone, Copy)]
-pub struct ClientRpcPlugins<'a> {
+pub struct ClientRpcInstructions<'a> {
     pub(crate) client: &'a Client,
 }
 
-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 {
-            client: self.client,
-        }
-    }
-
-    /// Lists plugins installed in user/global state.
+impl<'a> ClientRpcInstructions<'a> {
+    /// Returns the prompt the `init` command runs to author repository instructions. A host offering its own initialize action sends this text so the instructions it produces match the ones the CLI produces. The text is fixed for a build and depends on no configuration, session or repository.
     ///
-    /// Wire method: `plugins.list`.
+    /// Wire method: `instructions.getInitPrompt`.
     ///
     /// # Returns
     ///
-    /// Plugins installed in user/global state.
+    /// The prompt the init command runs.
     ///
     /// <div class="warning">
     ///
@@ -2154,26 +2181,26 @@ impl<'a> ClientRpcPlugins<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn list(&self) -> Result<PluginListResult, Error> {
+    pub(crate) async fn get_init_prompt(&self) -> Result<InstructionsInitPromptResult, Error> {
         let wire_params = serde_json::json!({});
         let _value = self
             .client
-            .call(rpc_methods::PLUGINS_LIST, Some(wire_params))
+            .call(rpc_methods::INSTRUCTIONS_GETINITPROMPT, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Installs a plugin from a marketplace, GitHub repo, URL, or local path.
+    /// Discovers instruction sources across user, repository, and plugin sources.
     ///
-    /// Wire method: `plugins.install`.
+    /// Wire method: `instructions.discover`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Plugin source and optional working directory for relative-path resolution.
+    /// * `params` - Optional project paths to include in instruction discovery.
     ///
     /// # Returns
     ///
-    /// Result of installing a plugin.
+    /// Instruction sources discovered across user, repository, and plugin sources.
     ///
     /// <div class="warning">
     ///
@@ -2182,25 +2209,29 @@ impl<'a> ClientRpcPlugins<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn install(
+    pub async fn discover(
         &self,
-        params: PluginsInstallRequest,
-    ) -> Result<PluginInstallResult, Error> {
+        params: InstructionsDiscoverRequest,
+    ) -> Result<ServerInstructionSourceList, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::PLUGINS_INSTALL, Some(wire_params))
+            .call(rpc_methods::INSTRUCTIONS_DISCOVER, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Uninstalls an installed plugin.
+    /// Discovers instruction sources across user, repository, and plugin sources.
     ///
-    /// Wire method: `plugins.uninstall`.
+    /// Wire method: `instructions.discover`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Name (or spec) of the plugin to uninstall.
+    /// * `params` - Optional project paths to include in instruction discovery.
+    ///
+    /// # Returns
+    ///
+    /// Instruction sources discovered across user, repository, and plugin sources.
     ///
     /// <div class="warning">
     ///
@@ -2209,26 +2240,31 @@ impl<'a> ClientRpcPlugins<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn uninstall(&self, params: PluginsUninstallRequest) -> Result<(), Error> {
+    ///
+    /// Accepts [`InstructionsDiscoverOptions`], including inputs added after [`InstructionsDiscoverRequest`].
+    pub async fn discover_with_options(
+        &self,
+        params: InstructionsDiscoverOptions,
+    ) -> Result<ServerInstructionSourceList, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::PLUGINS_UNINSTALL, Some(wire_params))
+            .call(rpc_methods::INSTRUCTIONS_DISCOVER, Some(wire_params))
             .await?;
-        Ok(())
+        Ok(serde_json::from_value(_value)?)
     }
 
-    /// Updates an installed plugin to its latest published version.
+    /// Discovers the instruction sources for one caller-named location and returns them in the order the runtime applies them. `discover` answers for a set of project paths and derives the rest of its scope itself; this one instead takes every argument from the caller — the extra directories to scan and whether to descend into nested instruction files — and honors them as given. It also includes instruction directories from trusted repository settings, matching native repository discovery. Use it when the caller knows its own scope and no session exists to derive that scope from, such as a host reporting how many instruction files a directory contributes before any session starts. Marked internal because it exists to carry a CLI call site off the napi boundary onto the SDK contract; it is migration plumbing, not a surface consumers are meant to depend on.
     ///
-    /// Wire method: `plugins.update`.
+    /// Wire method: `instructions.discoverRepoSources`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Name (or spec) of the plugin to update.
+    /// * `params` - Explicit discovery arguments for one location, supplied by the caller rather than derived from a session.
     ///
     /// # Returns
     ///
-    /// Result of updating a single plugin.
+    /// Instruction sources discovered across user, repository, and plugin sources.
     ///
     /// <div class="warning">
     ///
@@ -2237,22 +2273,32 @@ impl<'a> ClientRpcPlugins<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn update(&self, params: PluginsUpdateRequest) -> Result<PluginUpdateResult, Error> {
+    pub(crate) async fn discover_repo_sources(
+        &self,
+        params: InstructionsDiscoverRepoSourcesRequest,
+    ) -> Result<ServerInstructionSourceList, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::PLUGINS_UPDATE, Some(wire_params))
+            .call(
+                rpc_methods::INSTRUCTIONS_DISCOVERREPOSOURCES,
+                Some(wire_params),
+            )
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Updates every installed plugin to its latest published version.
+    /// Returns the canonical files and directories where a client may create custom instructions that the runtime will recognize, including ones that do not exist yet. Repository targets become active once created.
     ///
-    /// Wire method: `plugins.updateAll`.
+    /// Wire method: `instructions.getDiscoveryPaths`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Optional project paths to include when enumerating instruction discovery targets.
     ///
     /// # Returns
     ///
-    /// Result of updating all installed plugins.
+    /// Canonical files and directories where custom instructions can be created so the runtime will recognize them.
     ///
     /// <div class="warning">
     ///
@@ -2261,22 +2307,32 @@ impl<'a> ClientRpcPlugins<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn update_all(&self) -> Result<PluginUpdateAllResult, Error> {
-        let wire_params = serde_json::json!({});
+    pub async fn get_discovery_paths(
+        &self,
+        params: InstructionsGetDiscoveryPathsRequest,
+    ) -> Result<InstructionDiscoveryPathList, Error> {
+        let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::PLUGINS_UPDATEALL, Some(wire_params))
+            .call(
+                rpc_methods::INSTRUCTIONS_GETDISCOVERYPATHS,
+                Some(wire_params),
+            )
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Enables installed plugins for new sessions.
+    /// Returns the canonical files and directories where a client may create custom instructions that the runtime will recognize, including ones that do not exist yet. Repository targets become active once created.
     ///
-    /// Wire method: `plugins.enable`.
+    /// Wire method: `instructions.getDiscoveryPaths`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Plugin names (or specs) to enable, plus the optional working directory the repository-controlled guard is evaluated against.
+    /// * `params` - Optional project paths to include when enumerating instruction discovery targets.
+    ///
+    /// # Returns
+    ///
+    /// Canonical files and directories where custom instructions can be created so the runtime will recognize them.
     ///
     /// <div class="warning">
     ///
@@ -2285,22 +2341,26 @@ impl<'a> ClientRpcPlugins<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn enable(&self, params: PluginsEnableRequest) -> Result<(), Error> {
+    ///
+    /// Accepts [`InstructionsGetDiscoveryPathsOptions`], including inputs added after [`InstructionsGetDiscoveryPathsRequest`].
+    pub async fn get_discovery_paths_with_options(
+        &self,
+        params: InstructionsGetDiscoveryPathsOptions,
+    ) -> Result<InstructionDiscoveryPathList, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::PLUGINS_ENABLE, Some(wire_params))
+            .call(
+                rpc_methods::INSTRUCTIONS_GETDISCOVERYPATHS,
+                Some(wire_params),
+            )
             .await?;
-        Ok(())
+        Ok(serde_json::from_value(_value)?)
     }
 
-    /// Disables installed plugins for new sessions.
-    ///
-    /// Wire method: `plugins.disable`.
-    ///
-    /// # Parameters
+    /// Drops the runtime's in-memory cache of discovered custom instructions so the next discovery reads them from disk again. A host calls this after it changes instruction files, or after it trusts a folder whose instructions an earlier discovery skipped, so that a session started afterwards sees the current files instead of a cached earlier answer. The call performs no I/O of its own and removes nothing from disk; it only invalidates, so the cost lands on the next discovery.         Returns once the cache is clear, which is what lets a caller order a session start after it. Marked internal because it exists to carry a CLI call site off the napi boundary onto the SDK contract; it is migration plumbing, not a surface consumers are meant to depend on.
     ///
-    /// * `params` - Plugin names (or specs) to disable, plus the optional working directory the repository-controlled guard is evaluated against.
+    /// Wire method: `instructions.clearCache`.
     ///
     /// <div class="warning">
     ///
@@ -2309,30 +2369,58 @@ impl<'a> ClientRpcPlugins<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn disable(&self, params: PluginsDisableRequest) -> Result<(), Error> {
-        let wire_params = serde_json::to_value(params)?;
+    pub(crate) async fn clear_cache(&self) -> Result<(), Error> {
+        let wire_params = serde_json::json!({});
         let _value = self
             .client
-            .call(rpc_methods::PLUGINS_DISABLE, Some(wire_params))
+            .call(rpc_methods::INSTRUCTIONS_CLEARCACHE, Some(wire_params))
             .await?;
         Ok(())
     }
 }
 
-/// `plugins.builtin.*` RPCs.
+/// `llmInference.*` RPCs.
 #[derive(Clone, Copy)]
-pub struct ClientRpcPluginsBuiltin<'a> {
+pub struct ClientRpcLlmInference<'a> {
     pub(crate) client: &'a Client,
 }
 
-impl<'a> ClientRpcPluginsBuiltin<'a> {
-    /// Replaces this server's trusted built-in plugin directories while no sessions are active.
+impl<'a> ClientRpcLlmInference<'a> {
+    /// Registers an SDK client as the LLM inference callback provider.
     ///
-    /// Wire method: `plugins.builtin.set`.
+    /// Wire method: `llmInference.setProvider`.
+    ///
+    /// # Returns
+    ///
+    /// Indicates whether the calling client was registered as the LLM inference provider.
+    ///
+    /// <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_provider(&self) -> Result<LlmInferenceSetProviderResult, Error> {
+        let wire_params = serde_json::json!({});
+        let _value = self
+            .client
+            .call(rpc_methods::LLMINFERENCE_SETPROVIDER, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// 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.
+    ///
+    /// Wire method: `llmInference.httpResponseStart`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Trusted built-in plugin directories to use for this runtime process.
+    /// * `params` - Response head.
+    ///
+    /// # Returns
+    ///
+    /// Whether the start frame was accepted.
     ///
     /// <div class="warning">
     ///
@@ -2341,30 +2429,77 @@ impl<'a> ClientRpcPluginsBuiltin<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn set(&self, params: PluginsBuiltinSetRequest) -> Result<(), Error> {
+    pub async fn http_response_start(
+        &self,
+        params: LlmInferenceHttpResponseStartRequest,
+    ) -> Result<LlmInferenceHttpResponseStartResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::PLUGINS_BUILTIN_SET, Some(wire_params))
+            .call(
+                rpc_methods::LLMINFERENCE_HTTPRESPONSESTART,
+                Some(wire_params),
+            )
             .await?;
-        Ok(())
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Delivers a body byte range (or a terminal transport error) for an in-flight response, correlated by requestId. Set `end` true on the last chunk. When `error` is set the response terminates with a transport-level failure and the runtime raises an APIConnectionError.
+    ///
+    /// Wire method: `llmInference.httpResponseChunk`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - A response body chunk or terminal error.
+    ///
+    /// # Returns
+    ///
+    /// Whether the chunk was accepted.
+    ///
+    /// <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 http_response_chunk(
+        &self,
+        params: LlmInferenceHttpResponseChunkRequest,
+    ) -> Result<LlmInferenceHttpResponseChunkResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(
+                rpc_methods::LLMINFERENCE_HTTPRESPONSECHUNK,
+                Some(wire_params),
+            )
+            .await?;
+        Ok(serde_json::from_value(_value)?)
     }
 }
 
-/// `plugins.marketplaces.*` RPCs.
+/// `managedSettings.*` RPCs.
 #[derive(Clone, Copy)]
-pub struct ClientRpcPluginsMarketplaces<'a> {
+pub struct ClientRpcManagedSettings<'a> {
     pub(crate) client: &'a Client,
 }
 
-impl<'a> ClientRpcPluginsMarketplaces<'a> {
-    /// Lists all registered marketplaces (defaults + user-added).
+impl<'a> ClientRpcManagedSettings<'a> {
+    /// `managedSettings.permissions.*` sub-namespace.
+    pub fn permissions(&self) -> ClientRpcManagedSettingsPermissions<'a> {
+        ClientRpcManagedSettingsPermissions {
+            client: self.client,
+        }
+    }
+
+    /// Discovers device-managed settings the way the runtime's own device layer does, and reports the sandbox floor and the load outcome alongside the validated document. This differs from `managedSettings.read` in three ways a policy-enforcing host depends on: a document that validates to an empty object is reported as absent rather than as an empty policy, a discovery error does not suppress a document that still validates, and a failure is reported as a flag rather than only as error text. Hosts that compose the device layer into an effective policy use this, because `managedSettings.read` cannot distinguish "no device policy" from "device policy could not be read" and would silently hand the user's own layer the win.
     ///
-    /// Wire method: `plugins.marketplaces.list`.
+    /// Wire method: `managedSettings.readDevice`.
     ///
     /// # Returns
     ///
-    /// All registered marketplaces, including built-in defaults.
+    /// The device-managed settings layer, with the sandbox floor and the load outcome a host needs to compose it into an effective policy.
     ///
     /// <div class="warning">
     ///
@@ -2373,26 +2508,3312 @@ impl<'a> ClientRpcPluginsMarketplaces<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn list(&self) -> Result<MarketplaceListResult, Error> {
+    pub(crate) async fn read_device(&self) -> Result<ManagedSettingsReadDeviceResult, Error> {
         let wire_params = serde_json::json!({});
         let _value = self
             .client
-            .call(rpc_methods::PLUGINS_MARKETPLACES_LIST, Some(wire_params))
+            .call(rpc_methods::MANAGEDSETTINGS_READDEVICE, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Registers a new marketplace from a source (owner/repo, URL, or local path).
+    /// Retains the supplied managed layers as this runtime process's startup policy and re-applies the result to every live session. Hosts that own their own short-lived process policy use this, so a guarded mutation is checked against the policy the host actually fetched. Retaining is a whole-process replacement rather than a merge, so a host that already resolved a good policy must not retain a partial one over it. The failure flags are honest inputs rather than assumptions: reporting a fetch or load that failed keeps the layers already retained, and the interim fail-closed state, instead of clearing them.
     ///
-    /// Wire method: `plugins.marketplaces.add`.
+    /// Wire method: `managedSettings.retainPolicy`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - The managed layers to retain as this process's startup policy, with the outcome of fetching each one.
+    ///
+    /// <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 retain_policy(
+        &self,
+        params: ManagedSettingsRetainPolicyParams,
+    ) -> Result<(), Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::MANAGEDSETTINGS_RETAINPOLICY, Some(wire_params))
+            .await?;
+        Ok(())
+    }
+
+    /// Stamps an effective managed policy's individually-controlled entries onto a user settings document, returning the settings a host should actually act on. The managed layer wins on every plugin spec and marketplace name it names, and leaves everything it does not name as the user wrote it. Hosts use this rather than merging the two documents themselves, because the merge is per entry rather than per document and a whole-document overlay would either discard the user's unmanaged entries or let a user entry outrank a managed one. Omitting the managed layer returns the settings unchanged, which is what an unmanaged host wants. Rejects when either document is present but is not a JSON object rather than treating it as absent, since silently dropping a malformed policy hands the user's layer the win on exactly the entries the policy exists to control.
+    ///
+    /// Wire method: `managedSettings.applyControls`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - A user settings document and the effective managed policy whose controlled entries should be stamped onto it.
+    ///
+    /// # Returns
+    ///
+    /// The user settings with the managed layer's controlled entries stamped on.
+    ///
+    /// <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_controls(
+        &self,
+        params: ManagedSettingsApplyControlsParams,
+    ) -> Result<ManagedSettingsApplyControlsResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(
+                rpc_methods::MANAGEDSETTINGS_APPLYCONTROLS,
+                Some(wire_params),
+            )
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Validates the managed settings a client is supplying for a session it is about to open, and returns them reduced to the keys a client is allowed to set. A client-supplied policy is not the same thing as an administrator's: it may only narrow permissions, so this accepts `permissions` and rejects every other key outright rather than ignoring it. Rejecting is the point — a host that silently dropped an unsupported key would report a policy as applied while running without it. Hosts call this before opening the session rather than letting the open fail, so a malformed policy is reported against the request that carried it. The runtime applies the same rule again when the session starts, so this cannot be used to smuggle a wider document past it. An accepted document that sets nothing comes back as an empty object, which is distinct from supplying nothing at all.
+    ///
+    /// Wire method: `managedSettings.parseClientValue`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Marketplace source and optional working directory for relative-path resolution.
+    /// * `params` - The client-supplied managed settings to validate and normalize. Omitting them is valid and yields no policy.
+    ///
+    /// # Returns
+    ///
+    /// The accepted managed settings, reduced to the keys a client is allowed to set.
+    ///
+    /// <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 parse_client_value(
+        &self,
+        params: ManagedSettingsParseClientValueParams,
+    ) -> Result<ManagedSettingsParseClientValueResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(
+                rpc_methods::MANAGEDSETTINGS_PARSECLIENTVALUE,
+                Some(wire_params),
+            )
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Composes the supplied server, device/MDM, device sandbox floor and policy-helper layers into the single effective managed policy a host should enforce, resolving each key across the layers by the runtime's own precedence rules. Hosts that assemble managed layers themselves use this so their precedence matches the runtime's exactly instead of reimplementing it. The composition is not a pure function of its inputs: an advisory sandbox force-on that arrived over the server channel is declined when this host cannot run a sandbox, so the result reflects the runtime host's capabilities, and the returned settings carry `sandboxAdvisoryFloorDeclined: true` when that happened. Enforced channels (device/MDM and policy helper) are never declined, and a server force-on carrying `failIfUnavailable` is preserved so the session fails loudly instead of quietly running unsandboxed. Rejects when a supplied layer is present but is not a JSON object, rather than treating it as unmanaged, because silently dropping a malformed policy would hand the user's own layer the win on exactly the keys the policy exists to control.
+    ///
+    /// Wire method: `managedSettings.resolveEffectiveValue`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - The managed-settings layers to compose into an effective policy. Every layer is optional; omitting all of them yields no effective policy.
+    ///
+    /// # Returns
+    ///
+    /// The effective managed policy composed from the supplied layers.
+    ///
+    /// <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 resolve_effective_value(
+        &self,
+        params: ManagedSettingsResolveEffectiveValueParams,
+    ) -> Result<ManagedSettingsResolveEffectiveValueResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(
+                rpc_methods::MANAGEDSETTINGS_RESOLVEEFFECTIVEVALUE,
+                Some(wire_params),
+            )
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Decides what a host must do to its bypass-permissions state after a managed-policy resolution lands, given the state already in force and the account now signed in. A host holds two pieces of state — which layer disabled bypass mode, and for a server-delivered disable, the account it was pinned to — and cannot decide the next step from the new policy alone. Three rules make that so, and each one is a control rather than a preference. A device/MDM disable outranks the account, so a later server answer never lifts it. An unknown policy, which is what a failed fetch or a refusal this build cannot enforce yields, preserves whatever is in force instead of reverting to permissive. And a server disable is lifted only when the account it was pinned to is no longer the signed-in one, which is what makes signing in to an unrestricted account recover without a restart while a reconnect on the same restricted account does not. Hosts call this rather than reimplementing it because getting the pinning backwards either strands a disable on an account that never carried one or drops one that still applies. `setDisabledState` is omitted when the host must leave its stored flag untouched, which is distinct from being told to set it to false.
+    ///
+    /// Wire method: `managedSettings.resolveBypassDisableTransition`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - The bypass-permissions state a host holds today, the account now signed in, and what the managed-policy resolution said.
+    ///
+    /// # Returns
+    ///
+    /// The bypass-permissions state a host should hold after the resolution, and what it must do to get there.
+    ///
+    /// <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 resolve_bypass_disable_transition(
+        &self,
+        params: ManagedSettingsResolveBypassDisableTransitionParams,
+    ) -> Result<ManagedSettingsResolveBypassDisableTransitionResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(
+                rpc_methods::MANAGEDSETTINGS_RESOLVEBYPASSDISABLETRANSITION,
+                Some(wire_params),
+            )
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Resolves managed (enterprise policy) settings for a host from every layer at once: the account's server-delivered policy, the device/MDM layer, and a platform policy helper. Hosts use this instead of fetching and composing the layers themselves, because the per-layer precedence and the fail-closed rules that apply when a layer cannot be confirmed are the runtime's own and must match the policy a session will later enforce. It does not retain or apply anything to process-global policy state, so a host may call it before any session exists — which is the point, since plugin activation and one-shot commands resolve policy before a session is available to carry it. The returned per-layer outcome flags are load-bearing rather than diagnostic: a host must distinguish an unmanaged device from a managed device whose policy could not be confirmed, and apply its fail-closed gates in the second case. Reports its diagnostics in `logMessages` rather than logging them, so a host that runs before a log sink exists still sees them.
+    ///
+    /// Wire method: `managedSettings.ingest`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Inputs describing the host and account an ingestion should resolve managed policy for.
+    ///
+    /// # Returns
+    ///
+    /// The managed policy layers an ingestion resolved, together with the per-layer outcome flags a host needs to decide how much to trust the result. The flags are reported rather than folded into the settings because a host must be able to distinguish an unmanaged device from a managed device whose policy could not be confirmed, and apply its fail-closed gates in the second 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(crate) async fn ingest(
+        &self,
+        params: ManagedSettingsIngestParams,
+    ) -> Result<ManagedSettingsIngestResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::MANAGEDSETTINGS_INGEST, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Resolves the managed (enterprise policy) settings a host must enforce from startup, and judges the account against the enterprise sign-in pin in the same pass. This composes the layers the way `managedSettings.ingest` does and then answers the two questions a host cannot answer for itself: which fail-closed floors apply when a layer could not be confirmed, and whether this credential is allowed to sign in at all. The sign-in verdict is the reason a host must not assemble this itself from `managedSettings.ingest` — a pinned organization is an access control, and a host that composed the layers but skipped the pin would let a developer sign in with a personal or another enterprise's account and escape every control that keys off the signed-in identity. The verdict is computed on every resolution, including one that is not retained, so declining to apply policy never widens access. Set `retainAndApply` to keep the resolved policy as this runtime process's startup policy; leave it false to resolve without side effects.
+    ///
+    /// Wire method: `managedSettings.resolveStartupPolicy`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Inputs describing the host and account a startup policy resolution should run for. Mirrors `managedSettings.ingest`, and adds the decision of whether the resolved policy is retained for this runtime process.
+    ///
+    /// # Returns
+    ///
+    /// The startup policy a resolution composed, the per-layer outcome flags a host needs to decide how much to trust it, and the enterprise sign-in verdict for the credential it ran against. The flags are reported rather than folded into the settings because a host must distinguish an unmanaged device from a managed device whose policy could not be confirmed, and apply its fail-closed gates in the second 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(crate) async fn resolve_startup_policy(
+        &self,
+        params: ManagedSettingsResolveStartupPolicyParams,
+    ) -> Result<ManagedSettingsResolveStartupPolicyResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(
+                rpc_methods::MANAGEDSETTINGS_RESOLVESTARTUPPOLICY,
+                Some(wire_params),
+            )
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Resolves the managed `remoteControl` policy for an account on its own, for a host deciding whether a remote-control session may start. Composes the same layers as `managedSettings.ingest` and returns only that one key, so a host does not have to know which layer won. An absent policy means the account is unmanaged for this capability and the host may proceed; that default is safe only while absence really does mean "no policy", so a service refusal that says an account policy exists which this client is too old to enforce resolves to an explicit disabled policy instead of to absence. A resolution that cannot be completed is rejected rather than answered as absence, for the same reason.
+    ///
+    /// Wire method: `managedSettings.loadRemoteControl`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Inputs describing the host and account whose managed remote-control policy should be resolved. Mirrors `managedSettings.ingest`, and deliberately carries no retention decision: reading this gate never becomes this runtime process's startup policy.
+    ///
+    /// # Returns
+    ///
+    /// The managed remote-control policy in force for an account, if any. An absent policy means the account is unmanaged for this capability, which a host reads as allowed — so absence here is a positive statement that no policy applies, never a stand-in for a resolution that failed. A resolution that cannot be completed is rejected instead.
+    ///
+    /// <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 load_remote_control(
+        &self,
+        params: ManagedSettingsLoadRemoteControlParams,
+    ) -> Result<ManagedSettingsLoadRemoteControlResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(
+                rpc_methods::MANAGEDSETTINGS_LOADREMOTECONTROL,
+                Some(wire_params),
+            )
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Evaluates the device-channel enterprise sign-in pin (MDM plist, registry, or managed-settings file) against a credential, without resolving any server-delivered policy. This is the gate an entry point runs before it branches, and the only one that can refuse a developer's first sign-in: it is local, needs no credential, and a server-delivered pin only ever reaches accounts already inside the organization. It fails closed by construction — a discovery that cannot determine whether a pin exists refuses rather than allows, because a control that fails open under a triggerable condition is not a control. Hosts that also want the server channel should call `managedSettings.resolveStartupPolicy`, which folds both channels into one verdict.
+    ///
+    /// Wire method: `managedSettings.resolveDeviceForceLoginOrgsGate`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - The credential and environment to evaluate the device-channel sign-in pin against.
+    ///
+    /// # Returns
+    ///
+    /// The verdict of the `forceLoginOrgs` enterprise sign-in pin for one credential. A managed device may pin Copilot to an approved set of GitHub organizations so a developer cannot sign in with a personal — or another enterprise's — account and escape every control that keys off the signed-in identity. A host must refuse to proceed when `allowed` is false; the remaining fields explain the refusal rather than qualifying it.
+    ///
+    /// <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 resolve_device_force_login_orgs_gate(
+        &self,
+        params: ManagedSettingsResolveDeviceForceLoginOrgsGateParams,
+    ) -> Result<ForceLoginOrgsDecision, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(
+                rpc_methods::MANAGEDSETTINGS_RESOLVEDEVICEFORCELOGINORGSGATE,
+                Some(wire_params),
+            )
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// 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. `managedSettings.resolve` returns the same device settings together with the account's server policy.
+    ///
+    /// 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)?)
+    }
+
+    /// Force-refreshes enterprise managed settings for every account: wipes the persistent server-policy cache (the whole `<cacheHome>/managed-settings` directory) and drops this runtime process's in-memory retained server policy. It does not itself fetch policy — the effect is that the next time a session resolves managed settings for an account, that resolution re-fetches the account's org policy from the network instead of serving a cached response. Note that `managedSettings.read` returns only device/MDM settings and never triggers the account server-policy fetch, so a host implementing "sync account policy" should call `managedSettings.resolve` or start a fresh session resolution rather than treat a subsequent `managedSettings.read` as the refreshed org policy. Mirrors the invalidation a sign-out performs, broadened from the one signing-out account to all of them; device/MDM layers describe the machine, not the account, and are left untouched. Rejects if the on-disk cache cannot be removed.
+    ///
+    /// Wire method: `managedSettings.clearCache`.
+    ///
+    /// <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 clear_cache(&self) -> Result<(), Error> {
+        let wire_params = serde_json::json!({});
+        let _value = self
+            .client
+            .call(rpc_methods::MANAGEDSETTINGS_CLEARCACHE, Some(wire_params))
+            .await?;
+        Ok(())
+    }
+
+    /// Resolves the effective enterprise managed settings without a session, from the device channel and, when an account is available, the account's server policy through the same per-account cache sessions use. A cached server policy less than an hour old is used without a fetch; otherwise the policy is fetched, and when the fetch fails a cached policy up to 24 hours old is used instead, unless `forceRemoteSettingsRefresh` requires a live fetch. With no account requested or signed in, it reports device policy only; signing out removes the account's cached policy. It can fetch server policy over the network when the cache is stale, so call it off latency-critical paths such as startup rather than before listing models. The policy helper is not run. `layers` lists each channel's document before merging, and `values` and `meta` carry typed effective values and their lock state for the keys typed so far.
+    ///
+    /// Wire method: `managedSettings.resolve`.
+    ///
+    /// # Returns
+    ///
+    /// Effective enterprise managed settings for an account, resolved without a 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 resolve(&self) -> Result<ManagedSettingsResolveResult, Error> {
+        let wire_params = serde_json::json!({});
+        let _value = self
+            .client
+            .call(rpc_methods::MANAGEDSETTINGS_RESOLVE, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Resolves the effective enterprise managed settings without a session, from the device channel and, when an account is available, the account's server policy through the same per-account cache sessions use. A cached server policy less than an hour old is used without a fetch; otherwise the policy is fetched, and when the fetch fails a cached policy up to 24 hours old is used instead, unless `forceRemoteSettingsRefresh` requires a live fetch. With no account requested or signed in, it reports device policy only; signing out removes the account's cached policy. It can fetch server policy over the network when the cache is stale, so call it off latency-critical paths such as startup rather than before listing models. The policy helper is not run. `layers` lists each channel's document before merging, and `values` and `meta` carry typed effective values and their lock state for the keys typed so far.
+    ///
+    /// Wire method: `managedSettings.resolve`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Optional opaque account selection or GitHub token whose managed settings are resolved.
+    ///
+    /// # Returns
+    ///
+    /// Effective enterprise managed settings for an account, resolved without a 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 resolve_with_params(
+        &self,
+        params: ManagedSettingsResolveRequest,
+    ) -> Result<ManagedSettingsResolveResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::MANAGEDSETTINGS_RESOLVE, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Returns the managed-settings authoring JSON schema with descriptive `x-composition` annotations aligned with the shared settings-engine vocabulary. These annotations are not a complete runtime composition contract: model, effortLevel, and contextTier remain coupled. Use `managedSettings.compose` for the runtime's effective result. Performs no I/O.
+    ///
+    /// Wire method: `managedSettings.schema`.
+    ///
+    /// # Returns
+    ///
+    /// The authoring JSON schema for managed settings recognized by this runtime.
+    ///
+    /// <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 schema(&self) -> Result<ManagedSettingsSchemaResult, Error> {
+        let wire_params = serde_json::json!({});
+        let _value = self
+            .client
+            .call(rpc_methods::MANAGEDSETTINGS_SCHEMA, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Validates a candidate managed-settings document the way the runtime validates delivered policy, without applying it. Reports errors that would reject the document, warnings for content the runtime ignores, and the canonical document it would apply. Document text nested more than 64 levels deep is rejected. Performs no I/O.
+    ///
+    /// Wire method: `managedSettings.validate`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - A candidate managed-settings document to validate without applying it.
+    ///
+    /// # Returns
+    ///
+    /// Result of validating a managed-settings document.
+    ///
+    /// <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 validate(
+        &self,
+        params: ManagedSettingsValidateRequest,
+    ) -> Result<ManagedSettingsValidateResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::MANAGEDSETTINGS_VALIDATE, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Merges candidate managed-settings documents for the device, server, and policy-helper channels into the effective settings the runtime would enforce on this host, using the same precedence and composition rules as live resolution, without applying them. Like live resolution, a server's advisory sandbox force-enable is declined on a host that cannot run the sandbox. Does not fetch policy or read policy files, but may perform blocking OS or subprocess probes for sandbox support. Preview documents are limited to 1 MiB and 64 levels of nesting.
+    ///
+    /// Wire method: `managedSettings.compose`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Candidate managed-settings documents to merge without applying them.
+    ///
+    /// # Returns
+    ///
+    /// The effective managed settings the runtime would enforce for the given documents, in the same shape `managedSettings.resolve` returns.
+    ///
+    /// <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 compose(
+        &self,
+        params: ManagedSettingsComposeRequest,
+    ) -> Result<ManagedSettingsComposeResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::MANAGEDSETTINGS_COMPOSE, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+}
+
+/// `managedSettings.permissions.*` RPCs.
+#[derive(Clone, Copy)]
+pub struct ClientRpcManagedSettingsPermissions<'a> {
+    pub(crate) client: &'a Client,
+}
+
+impl<'a> ClientRpcManagedSettingsPermissions<'a> {
+    /// Pure, sessionless evaluation of operations against a supplied permissionsContext. Performs no policy discovery, I/O, prompting, navigation, permission grants, or sandbox changes. Obtain the context from managedSettings.resolve or session.managedSettings.get, or reuse an in-memory context. Results preserve input order and duplicates. Consumers must block deny, obtain approval for ask, and use their normal permission flow for unmanaged. Unknown policy returns failClosed with every operation denied. This is not a substitute for user permissions or other security controls.
+    ///
+    /// Wire method: `managedSettings.permissions.evaluate`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Managed policy context and ordered operations for pure, sessionless evaluation.
+    ///
+    /// # Returns
+    ///
+    /// Ordered managed permission verdicts and the supplied policy's fail-closed posture.
+    ///
+    /// <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 evaluate(
+        &self,
+        params: ManagedPermissionsEvaluateRequest,
+    ) -> Result<ManagedPermissionsEvaluateResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(
+                rpc_methods::MANAGEDSETTINGS_PERMISSIONS_EVALUATE,
+                Some(wire_params),
+            )
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+}
+
+/// `mcp.*` RPCs.
+#[derive(Clone, Copy)]
+pub struct ClientRpcMcp<'a> {
+    pub(crate) client: &'a Client,
+}
+
+impl<'a> ClientRpcMcp<'a> {
+    /// `mcp.config.*` sub-namespace.
+    pub fn config(&self) -> ClientRpcMcpConfig<'a> {
+        ClientRpcMcpConfig {
+            client: self.client,
+        }
+    }
+
+    /// `mcp.installations.*` sub-namespace.
+    pub fn installations(&self) -> ClientRpcMcpInstallations<'a> {
+        ClientRpcMcpInstallations {
+            client: self.client,
+        }
+    }
+
+    /// `mcp.registry.*` sub-namespace.
+    pub fn registry(&self) -> ClientRpcMcpRegistry<'a> {
+        ClientRpcMcpRegistry {
+            client: self.client,
+        }
+    }
+
+    /// Discovers MCP servers from user, workspace, plugin, and builtin sources.
+    ///
+    /// Wire method: `mcp.discover`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Optional working directory used as context for MCP server discovery.
+    ///
+    /// # Returns
+    ///
+    /// MCP servers discovered from user, workspace, plugin, and built-in sources.
+    ///
+    /// <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 discover(&self, params: McpDiscoverRequest) -> Result<McpDiscoverResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::MCP_DISCOVER, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Lists the MCP servers the runtime supplies itself, so a host that disables the built-ins wholesale suppresses exactly the set the runtime would otherwise add. The names are fixed for a build and depend on no configuration, session or account.
+    ///
+    /// Wire method: `mcp.listBuiltinServerNames`.
+    ///
+    /// # Returns
+    ///
+    /// Names of the MCP servers the runtime supplies itself.
+    ///
+    /// <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 list_builtin_server_names(
+        &self,
+    ) -> Result<McpListBuiltinServerNamesResult, Error> {
+        let wire_params = serde_json::json!({});
+        let _value = self
+            .client
+            .call(rpc_methods::MCP_LISTBUILTINSERVERNAMES, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Reports whether the gh-replaceable GitHub MCP tools may be clipped for a session, which a host feeds back as the `excludeGhReplaceableTools` build option. The tools are redundant only when the session can reach a shell *and* the host has the `gh` that would replace them, so both halves are decided here. The shell half runs the platform shell tool through the runtime's own tool-filter matcher, so entry forms like `builtin:bash` and `builtin:*` behave exactly as they do when a session builds its tool catalog. The host half probes for `gh`, and is skipped entirely when the filters already rule the shell out. Host presence alone is not enough: a session restricted to, say, `view` would otherwise lose the built-in issue-read fallback while having no shell to replace it with. The answer describes the host the runtime runs on, so it is never forwarded to a remote engine.
+    ///
+    /// Wire method: `mcp.shouldExcludeGitHubTools`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - The session tool filters that decide whether the session still has a shell to run `gh` with.
+    ///
+    /// # Returns
+    ///
+    /// Whether the gh-replaceable GitHub MCP tools may be clipped for the session described by the request.
+    ///
+    /// <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 should_exclude_git_hub_tools(
+        &self,
+        params: McpShouldExcludeGitHubToolsRequest,
+    ) -> Result<McpShouldExcludeGitHubToolsResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::MCP_SHOULDEXCLUDEGITHUBTOOLS, Some(wire_params))
+            .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)?)
+    }
+
+    /// 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>
+    ///
+    /// Accepts [`McpPlanInstallOptions`], including inputs added after [`McpPlanInstallRequest`].
+    pub async fn plan_install_with_options(
+        &self,
+        params: McpPlanInstallOptions,
+    ) -> 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)?)
+    }
+
+    /// Consumes a bound catalogue plan and retains one exact fully resolved personal remote MCP operation requiring no supplied values or configured secrets. Returns its runtime operation ID and original expiry before any confirmation, activation, writer initialisation or installation effect. Register the original connection, operation and selected-session binding before calling applyInstall. Missing lower owned admission is unavailable, never a raw-config fallback.
+    ///
+    /// Wire method: `mcp.prepareInstall`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Side-effect-free preparation of one original bound remote MCP choice.
+    ///
+    /// # Returns
+    ///
+    /// Management result with contract receipt, or a typed request/negotiation refusal.
+    ///
+    /// <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 prepare_install(
+        &self,
+        params: McpPrepareInstallRequest,
+    ) -> Result<McpInstallationManagementResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::MCP_PREPAREINSTALL, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Consumes a retained prepared MCP operation once, revalidates its original authority, requests explicit human consent through installations.confirm on the original connection, then revalidates source and applies the sealed transaction. An uncertain result requires original-operation inspection or recovery, never replay.
+    ///
+    /// Wire method: `mcp.applyInstall`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Applies exactly one previously prepared operation on its original connection.
+    ///
+    /// # Returns
+    ///
+    /// An installation result together with the exact honoured contract, or a negotiation refusal.
+    ///
+    /// <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 apply_install(
+        &self,
+        params: McpApplyInstallRequest,
+    ) -> Result<McpInstallationResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::MCP_APPLYINSTALL, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Prepares a read-only removal plan for an exact owned receipt under the selected existing session. Returns the original operation ID before confirmation; neither planning nor abandonment changes configuration or shared OAuth credentials.
+    ///
+    /// Wire method: `mcp.planUninstall`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Read-only preparation of one owned removal under fresh selected-session authority.
+    ///
+    /// # Returns
+    ///
+    /// Management result with contract receipt, or a typed request/negotiation refusal.
+    ///
+    /// <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_uninstall(
+        &self,
+        params: McpPlanUninstallRequest,
+    ) -> Result<McpInstallationManagementResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::MCP_PLANUNINSTALL, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Consumes the original owned-removal plan once and requests fresh exact human confirmation on its original connection. Drift is refused; unrelated manual configuration and shared OAuth credentials are preserved.
+    ///
+    /// Wire method: `mcp.applyUninstall`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - One-use application of the exact retained removal plan.
+    ///
+    /// # Returns
+    ///
+    /// An installation result together with the exact honoured contract, or a negotiation refusal.
+    ///
+    /// <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 apply_uninstall(
+        &self,
+        params: McpApplyUninstallRequest,
+    ) -> Result<McpInstallationResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::MCP_APPLYUNINSTALL, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+}
+
+/// `mcp.config.*` RPCs.
+#[derive(Clone, Copy)]
+pub struct ClientRpcMcpConfig<'a> {
+    pub(crate) client: &'a Client,
+}
+
+impl<'a> ClientRpcMcpConfig<'a> {
+    /// Lists MCP servers from user configuration.
+    ///
+    /// Wire method: `mcp.config.list`.
+    ///
+    /// # Returns
+    ///
+    /// User-configured MCP servers, keyed by server name.
+    ///
+    /// <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 list(&self) -> Result<McpConfigList, Error> {
+        let wire_params = serde_json::json!({});
+        let _value = self
+            .client
+            .call(rpc_methods::MCP_CONFIG_LIST, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Adds an MCP server to user configuration.
+    ///
+    /// Wire method: `mcp.config.add`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - MCP server name and configuration to add to user configuration.
+    ///
+    /// <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 add(&self, params: McpConfigAddRequest) -> Result<(), Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::MCP_CONFIG_ADD, Some(wire_params))
+            .await?;
+        Ok(())
+    }
+
+    /// Updates an MCP server in user configuration.
+    ///
+    /// Wire method: `mcp.config.update`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - MCP server name and replacement configuration to write to user configuration.
+    ///
+    /// <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 update(&self, params: McpConfigUpdateRequest) -> Result<(), Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::MCP_CONFIG_UPDATE, Some(wire_params))
+            .await?;
+        Ok(())
+    }
+
+    /// Removes an MCP server from user configuration.
+    ///
+    /// Wire method: `mcp.config.remove`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - MCP server name to remove from user configuration.
+    ///
+    /// <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 remove(&self, params: McpConfigRemoveRequest) -> Result<(), Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::MCP_CONFIG_REMOVE, Some(wire_params))
+            .await?;
+        Ok(())
+    }
+
+    /// Enables MCP servers in user configuration for new sessions.
+    ///
+    /// Wire method: `mcp.config.enable`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - MCP server names to enable for new sessions.
+    ///
+    /// <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 enable(&self, params: McpConfigEnableRequest) -> Result<(), Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::MCP_CONFIG_ENABLE, Some(wire_params))
+            .await?;
+        Ok(())
+    }
+
+    /// Disables MCP servers in user configuration for new sessions.
+    ///
+    /// Wire method: `mcp.config.disable`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - MCP server names to disable for new sessions.
+    ///
+    /// <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 disable(&self, params: McpConfigDisableRequest) -> Result<(), Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::MCP_CONFIG_DISABLE, Some(wire_params))
+            .await?;
+        Ok(())
+    }
+
+    /// Drops this runtime process's in-memory MCP server-definition cache so the next MCP config read observes disk.
+    ///
+    /// Wire method: `mcp.config.reload`.
+    ///
+    /// <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 reload(&self) -> Result<(), Error> {
+        let wire_params = serde_json::json!({});
+        let _value = self
+            .client
+            .call(rpc_methods::MCP_CONFIG_RELOAD, Some(wire_params))
+            .await?;
+        Ok(())
+    }
+}
+
+/// `mcp.installations.*` RPCs.
+#[derive(Clone, Copy)]
+pub struct ClientRpcMcpInstallations<'a> {
+    pub(crate) client: &'a Client,
+}
+
+impl<'a> ClientRpcMcpInstallations<'a> {
+    /// Reads receipt-owned MCP inventory for the selected account and host without activating servers or reconstructing missing ownership. Configuration ownership does not prove session-specific usability.
+    ///
+    /// Wire method: `mcp.installations.list`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - New-work inventory or recovery request under an explicitly selected existing session.
+    ///
+    /// # Returns
+    ///
+    /// Management result with contract receipt, or a typed request/negotiation refusal.
+    ///
+    /// <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 list(
+        &self,
+        params: McpInstallationsRequest,
+    ) -> Result<McpInstallationManagementResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::MCP_INSTALLATIONS_LIST, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Reconciles already-confirmed durable MCP transactions, then inspects owned inventory. Does not replay apply or reconstruct deleted ownership metadata; unresolved or unsafe evidence remains an explicit refusal.
+    ///
+    /// Wire method: `mcp.installations.recover`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - New-work inventory or recovery request under an explicitly selected existing session.
+    ///
+    /// # Returns
+    ///
+    /// Management result with contract receipt, or a typed request/negotiation refusal.
+    ///
+    /// <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 recover(
+        &self,
+        params: McpInstallationsRequest,
+    ) -> Result<McpInstallationManagementResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::MCP_INSTALLATIONS_RECOVER, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Inspects a known operation only on its original connection. Remains available after account or selected-session loss; does not acquire new authority or rebind an operation.
+    ///
+    /// Wire method: `mcp.installations.status`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Existing-operation control. A new session selector is deliberately not accepted.
+    ///
+    /// # Returns
+    ///
+    /// Management result with contract receipt, or a typed request/negotiation refusal.
+    ///
+    /// <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 status(
+        &self,
+        params: McpInstallationOperationRequest,
+    ) -> Result<McpInstallationManagementResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::MCP_INSTALLATIONS_STATUS, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Requests cancellation of a known operation on its original connection, including before apply or confirmation. Already-started effects retain their transaction lease and report an honest terminal or recovery outcome.
+    ///
+    /// Wire method: `mcp.installations.cancel`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Existing-operation control. A new session selector is deliberately not accepted.
+    ///
+    /// # Returns
+    ///
+    /// Management result with contract receipt, or a typed request/negotiation refusal.
+    ///
+    /// <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 cancel(
+        &self,
+        params: McpInstallationOperationRequest,
+    ) -> Result<McpInstallationManagementResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::MCP_INSTALLATIONS_CANCEL, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+}
+
+/// `mcp.registry.*` RPCs.
+#[derive(Clone, Copy)]
+pub struct ClientRpcMcpRegistry<'a> {
+    pub(crate) client: &'a Client,
+}
+
+impl<'a> ClientRpcMcpRegistry<'a> {
+    /// Allocates an ID for one cancellable MCP registry search. The ID exists before the search starts, so callers can cancel before it starts. The networking stack supplies the cancellation namespace. The runtime retains at most 1,024 unused IDs. At capacity, another allocation can reclaim an unused ID. Active searches retain their IDs until they finish.
+    ///
+    /// Wire method: `mcp.registry.allocateRequestId`.
+    ///
+    /// # Returns
+    ///
+    /// Request id naming a cancellable registry search.
+    ///
+    /// <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 allocate_request_id(&self) -> Result<McpRegistryRequestIdResult, Error> {
+        let wire_params = serde_json::json!({});
+        let _value = self
+            .client
+            .call(
+                rpc_methods::MCP_REGISTRY_ALLOCATEREQUESTID,
+                Some(wire_params),
+            )
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Searches the MCP registry the supplied credential may read, resolving the registry endpoint from policy first. Hosts usually send credential-free `AuthIdentity`; a `token` identity can be resolved only when it embeds a token, while `env` and `gh-cli` identities can use a token embedded in the request first. The runtime follows registry pages, keeps the newest entry per server name, cuts the list to `limit`, and sorts an empty-query result by GitHub stars. Each server object is carried opaquely.
+    ///
+    /// Wire method: `mcp.registry.search`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Registry search terms, the credential to search under, and the request id that makes the search cancellable.
+    ///
+    /// # Returns
+    ///
+    /// Servers selected from the registry response.
+    ///
+    /// <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 search(
+        &self,
+        params: McpRegistrySearchRequest,
+    ) -> Result<McpRegistrySearchResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::MCP_REGISTRY_SEARCH, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Abandons the registry search that uses the given request ID. It acts only on IDs from `mcp.registry.allocateRequestId`, so it never cancels another component's request. Answers `canceled: true` when it stops a running search. Answers `canceled: false` for unknown or reclaimed IDs, completed or canceled searches, and unused reservations. It releases an unused reservation, so a later search with that ID is refused.
+    ///
+    /// Wire method: `mcp.registry.cancel`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Registry search to abandon.
+    ///
+    /// # Returns
+    ///
+    /// Whether the cancel reached a live search.
+    ///
+    /// <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 cancel(
+        &self,
+        params: McpRegistryCancelRequest,
+    ) -> Result<McpRegistryCancelResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::MCP_REGISTRY_CANCEL, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+}
+
+/// `models.*` RPCs.
+#[derive(Clone, Copy)]
+pub struct ClientRpcModels<'a> {
+    pub(crate) client: &'a Client,
+}
+
+impl<'a> ClientRpcModels<'a> {
+    /// Lists Copilot models available to the authenticated user.
+    ///
+    /// Wire method: `models.list`.
+    ///
+    /// # Returns
+    ///
+    /// List of Copilot models available to the resolved user, including capabilities and billing 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 async fn list(&self) -> Result<ModelList, Error> {
+        let wire_params = serde_json::json!({});
+        let _value = self
+            .client
+            .call(rpc_methods::MODELS_LIST, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Lists Copilot models available to the authenticated user.
+    ///
+    /// Wire method: `models.list`.
+    ///
+    /// # Parameters
+    ///
+    /// * `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.
+    ///
+    /// <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 list_with_params(&self, params: ModelsListRequest) -> Result<ModelList, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::MODELS_LIST, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Returns the running runtime's complete catalog of well-known built-in model IDs without authentication or network access.
+    ///
+    /// Wire method: `models.getBuiltInCatalog`.
+    ///
+    /// # Returns
+    ///
+    /// 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">
+    ///
+    /// **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_built_in_catalog(&self) -> Result<BuiltInModelCatalog, Error> {
+        let wire_params = serde_json::json!({});
+        let _value = self
+            .client
+            .call(rpc_methods::MODELS_GETBUILTINCATALOG, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+}
+
+/// `permissions.*` RPCs.
+#[derive(Clone, Copy)]
+pub struct ClientRpcPermissions<'a> {
+    pub(crate) client: &'a Client,
+}
+
+impl<'a> ClientRpcPermissions<'a> {
+    /// `permissions.folderTrust.*` sub-namespace.
+    pub fn folder_trust(&self) -> ClientRpcPermissionsFolderTrust<'a> {
+        ClientRpcPermissionsFolderTrust {
+            client: self.client,
+        }
+    }
+
+    /// `permissions.locations.*` sub-namespace.
+    pub fn locations(&self) -> ClientRpcPermissionsLocations<'a> {
+        ClientRpcPermissionsLocations {
+            client: self.client,
+        }
+    }
+
+    /// Interprets a verbatim managed `permissions` slice into the three policy questions a host asks before granting elevated permissions: whether bypass-permissions mode is forbidden, whether a policy exists that this build could not determine, and whether the layer supplies permission rules the session must enforce. An absent or empty slice means no managed policy applies. The runtime and its permission service share one policy type, so a new managed permission setting is interpreted in exactly one place; a host that reimplements the reading would silently diverge the first time that set grows. Hosts must fail closed on an undetermined policy rather than treating it as permission granted.
+    ///
+    /// Wire method: `permissions.evaluateManagedPolicy`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - The verbatim managed `permissions` slice to interpret.
+    ///
+    /// # Returns
+    ///
+    /// The policy questions a host asks before granting elevated permissions.
+    ///
+    /// <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 evaluate_managed_policy(
+        &self,
+        params: PermissionsEvaluateManagedPolicyParams,
+    ) -> Result<PermissionsEvaluateManagedPolicyResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(
+                rpc_methods::PERMISSIONS_EVALUATEMANAGEDPOLICY,
+                Some(wire_params),
+            )
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+}
+
+/// `permissions.folderTrust.*` RPCs.
+#[derive(Clone, Copy)]
+pub struct ClientRpcPermissionsFolderTrust<'a> {
+    pub(crate) client: &'a Client,
+}
+
+impl<'a> ClientRpcPermissionsFolderTrust<'a> {
+    /// Reports whether a folder is trusted, reading the persisted trusted-folders list directly rather than through a session. Use this from a host that has no session yet, such as a one-shot command deciding whether to honor a checkout's own settings. It differs from the session-scoped check in two ways that matter: it takes the configuration directory to read the list from, instead of inheriting the session's, and it answers only from the persisted list, so trust a user granted for the lifetime of one session is not visible here. A host that has a session should prefer the session-scoped check, which also covers session-only trust.
+    ///
+    /// Wire method: `permissions.folderTrust.checkTrust`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - A folder to check against a persisted trusted-folders list, and the configuration directory holding that list.
+    ///
+    /// # Returns
+    ///
+    /// Folder trust check result.
+    ///
+    /// <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 check_trust(
+        &self,
+        params: FolderTrustIsTrustedParams,
+    ) -> Result<FolderTrustCheckResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(
+                rpc_methods::PERMISSIONS_FOLDERTRUST_CHECKTRUST,
+                Some(wire_params),
+            )
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+}
+
+/// `permissions.locations.*` RPCs.
+#[derive(Clone, Copy)]
+pub struct ClientRpcPermissionsLocations<'a> {
+    pub(crate) client: &'a Client,
+}
+
+impl<'a> ClientRpcPermissionsLocations<'a> {
+    /// Drops stored per-location permission grants whose directory no longer exists, and reports which location keys were removed. Runs against the permission store under the runtime's own Copilot home, the same store `session.permissions.locations.resolve` reads. Marked internal because it exists to carry a CLI call site off the napi boundary onto the SDK contract; it is migration plumbing, not a surface consumers are meant to depend on. It can become public once an SDK consumer needs to prune its own permission store.
+    ///
+    /// Wire method: `permissions.locations.cleanupOrphaned`.
+    ///
+    /// # Returns
+    ///
+    /// Which stored location permissions were dropped because their directory is gone.
+    ///
+    /// <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 cleanup_orphaned(&self) -> Result<LocationPermissionsCleanupResult, Error> {
+        let wire_params = serde_json::json!({});
+        let _value = self
+            .client
+            .call(
+                rpc_methods::PERMISSIONS_LOCATIONS_CLEANUPORPHANED,
+                Some(wire_params),
+            )
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+}
+
+/// `persistence.*` RPCs.
+#[derive(Clone, Copy)]
+pub struct ClientRpcPersistence<'a> {
+    pub(crate) client: &'a Client,
+}
+
+impl<'a> ClientRpcPersistence<'a> {
+    /// Atomically replaces a JSON file's entire contents while holding the runtime's per-path lock. The lock lives in the runtime process, so a host that writes these files itself takes no part in it and can tear a concurrent runtime write; route the write here instead. Unlike a merging write this never reads or parses the existing file, so a previously corrupted snapshot is replaced wholesale rather than failing every later write. Use it only for callers that always persist a complete snapshot.
+    ///
+    /// Wire method: `persistence.writeRawJsonLocked`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - A complete JSON snapshot to write under the runtime's per-path file lock.
+    ///
+    /// # Returns
+    ///
+    /// The outcome of a locked snapshot write.
+    ///
+    /// <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 write_raw_json_locked(
+        &self,
+        params: PersistenceWriteRawJsonLockedRequest,
+    ) -> Result<PersistenceWriteRawJsonLockedResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(
+                rpc_methods::PERSISTENCE_WRITERAWJSONLOCKED,
+                Some(wire_params),
+            )
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+}
+
+/// `plugins.*` RPCs.
+#[derive(Clone, Copy)]
+pub struct ClientRpcPlugins<'a> {
+    pub(crate) client: &'a Client,
+}
+
+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 {
+            client: self.client,
+        }
+    }
+
+    /// Lists plugins installed in user/global state.
+    ///
+    /// Wire method: `plugins.list`.
+    ///
+    /// # Returns
+    ///
+    /// Plugins installed in user/global state.
+    ///
+    /// <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 list(&self) -> Result<PluginListResult, Error> {
+        let wire_params = serde_json::json!({});
+        let _value = self
+            .client
+            .call(rpc_methods::PLUGINS_LIST, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Installs a plugin from a marketplace, GitHub repo, URL, or local path.
+    ///
+    /// Wire method: `plugins.install`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Plugin source and optional working directory for relative-path resolution.
+    ///
+    /// # Returns
+    ///
+    /// Result of installing a plugin.
+    ///
+    /// <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 install(
+        &self,
+        params: PluginsInstallRequest,
+    ) -> Result<PluginInstallResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::PLUGINS_INSTALL, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Uninstalls an installed plugin.
+    ///
+    /// Wire method: `plugins.uninstall`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Name (or spec) of the plugin to uninstall.
+    ///
+    /// <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 uninstall(&self, params: PluginsUninstallRequest) -> Result<(), Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::PLUGINS_UNINSTALL, Some(wire_params))
+            .await?;
+        Ok(())
+    }
+
+    /// Updates an installed plugin to its latest published version.
+    ///
+    /// Wire method: `plugins.update`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Name (or spec) of the plugin to update.
+    ///
+    /// # Returns
+    ///
+    /// Result of updating a single plugin.
+    ///
+    /// <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 update(&self, params: PluginsUpdateRequest) -> Result<PluginUpdateResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::PLUGINS_UPDATE, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Updates every installed plugin to its latest published version.
+    ///
+    /// Wire method: `plugins.updateAll`.
+    ///
+    /// # Returns
+    ///
+    /// Result of updating all installed plugins.
+    ///
+    /// <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 update_all(&self) -> Result<PluginUpdateAllResult, Error> {
+        let wire_params = serde_json::json!({});
+        let _value = self
+            .client
+            .call(rpc_methods::PLUGINS_UPDATEALL, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Enables installed plugins for new sessions.
+    ///
+    /// Wire method: `plugins.enable`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Plugin names (or specs) to enable, plus the optional working directory the repository-controlled guard is evaluated against.
+    ///
+    /// <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 enable(&self, params: PluginsEnableRequest) -> Result<(), Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::PLUGINS_ENABLE, Some(wire_params))
+            .await?;
+        Ok(())
+    }
+
+    /// Disables installed plugins for new sessions.
+    ///
+    /// Wire method: `plugins.disable`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Plugin names (or specs) to disable, plus the optional working directory the repository-controlled guard is evaluated against.
+    ///
+    /// <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 disable(&self, params: PluginsDisableRequest) -> Result<(), Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::PLUGINS_DISABLE, Some(wire_params))
+            .await?;
+        Ok(())
+    }
+}
+
+/// `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> {
+    pub(crate) client: &'a Client,
+}
+
+impl<'a> ClientRpcPluginsMarketplaces<'a> {
+    /// Lists all registered marketplaces (defaults + user-added).
+    ///
+    /// Wire method: `plugins.marketplaces.list`.
+    ///
+    /// # Returns
+    ///
+    /// All registered marketplaces, including built-in defaults.
+    ///
+    /// <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 list(&self) -> Result<MarketplaceListResult, Error> {
+        let wire_params = serde_json::json!({});
+        let _value = self
+            .client
+            .call(rpc_methods::PLUGINS_MARKETPLACES_LIST, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Registers a new marketplace from a source (owner/repo, URL, or local path).
+    ///
+    /// Wire method: `plugins.marketplaces.add`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Marketplace source and optional working directory for relative-path resolution.
+    ///
+    /// # Returns
+    ///
+    /// Result of registering a new marketplace.
+    ///
+    /// <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 add(
+        &self,
+        params: PluginsMarketplacesAddRequest,
+    ) -> Result<MarketplaceAddResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::PLUGINS_MARKETPLACES_ADD, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Removes a previously-registered marketplace. When the marketplace has dependent plugins and `force` is not set, the marketplace is left intact and the result lists the dependents so the caller can decide whether to retry with `force=true`.
+    ///
+    /// Wire method: `plugins.marketplaces.remove`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Name of the marketplace to remove and an optional force flag.
+    ///
+    /// # Returns
+    ///
+    /// Outcome of the remove attempt, including dependent-plugin info when applicable.
+    ///
+    /// <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 remove(
+        &self,
+        params: PluginsMarketplacesRemoveRequest,
+    ) -> Result<MarketplaceRemoveResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::PLUGINS_MARKETPLACES_REMOVE, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Lists plugins advertised by a registered marketplace.
+    ///
+    /// Wire method: `plugins.marketplaces.browse`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Name of the marketplace whose plugin catalog to fetch.
+    ///
+    /// # Returns
+    ///
+    /// Plugins advertised by the marketplace.
+    ///
+    /// <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 browse(
+        &self,
+        params: PluginsMarketplacesBrowseRequest,
+    ) -> Result<MarketplaceBrowseResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::PLUGINS_MARKETPLACES_BROWSE, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Re-fetches one or all registered marketplace catalogs.
+    ///
+    /// Wire method: `plugins.marketplaces.refresh`.
+    ///
+    /// # Returns
+    ///
+    /// Result of refreshing one or more marketplace catalogs.
+    ///
+    /// <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 refresh(&self) -> Result<MarketplaceRefreshResult, Error> {
+        let wire_params = serde_json::json!({});
+        let _value = self
+            .client
+            .call(rpc_methods::PLUGINS_MARKETPLACES_REFRESH, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Re-fetches one or all registered marketplace catalogs.
+    ///
+    /// Wire method: `plugins.marketplaces.refresh`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Optional marketplace name; omit to refresh all.
+    ///
+    /// # Returns
+    ///
+    /// Result of refreshing one or more marketplace catalogs.
+    ///
+    /// <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 refresh_with_params(
+        &self,
+        params: PluginsMarketplacesRefreshRequest,
+    ) -> Result<MarketplaceRefreshResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::PLUGINS_MARKETPLACES_REFRESH, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+}
+
+/// `repo.*` RPCs.
+#[derive(Clone, Copy)]
+pub struct ClientRpcRepo<'a> {
+    pub(crate) client: &'a Client,
+}
+
+impl<'a> ClientRpcRepo<'a> {
+    /// `repo.settings.*` sub-namespace.
+    pub fn settings(&self) -> ClientRpcRepoSettings<'a> {
+        ClientRpcRepoSettings {
+            client: self.client,
+        }
+    }
+}
+
+/// `repo.settings.*` RPCs.
+#[derive(Clone, Copy)]
+pub struct ClientRpcRepoSettings<'a> {
+    pub(crate) client: &'a Client,
+}
+
+impl<'a> ClientRpcRepoSettings<'a> {
+    /// Atomically edits one allowed top-level repository setting. Reads the raw file, preserves unrelated keys, applies one scalar or list edit, validates the result and writes under one file lock, so concurrent sibling or list edits are not lost. A malformed or unsafe existing file returns `invalid` without a write; rejected keys, invalid values and I/O errors reject the call.
+    ///
+    /// Wire method: `repo.settings.edit`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - One atomic edit of an allowed top-level repository setting.
+    ///
+    /// # Returns
+    ///
+    /// Outcome of an atomic user or repository settings edit.
+    ///
+    /// <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 edit(
+        &self,
+        params: RepoSettingsEditRequest,
+    ) -> Result<SettingsEditResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::REPO_SETTINGS_EDIT, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Reads one repository settings file without settings normalization or layering. The existing JSONC parser accepts comments and trailing commas and applies its prototype-safety rules. Missing or blank files return an empty valid config. Invalid files return an empty config with invalid=true; other read failures reject.
+    ///
+    /// Wire method: `repo.settings.readRaw`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Which repository settings file to read.
+    ///
+    /// # Returns
+    ///
+    /// Parsed repository settings without normalization or layering.
+    ///
+    /// <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 read_raw(
+        &self,
+        params: RepoSettingsReadRawRequest,
+    ) -> Result<RepoSettingsReadRawResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::REPO_SETTINGS_READRAW, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Writes or removes one allowed top-level repository setting through the existing validator and file lock. Preserves unrelated stored keys. Invalid keys, values, existing documents, and I/O errors reject without replacing the file. Deletion requires delete=true; otherwise value must be present.
+    ///
+    /// Wire method: `repo.settings.writeKey`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - One key to write or remove in a repository settings file.
+    ///
+    /// <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 write_key(&self, params: RepoSettingsWriteKeyRequest) -> Result<(), Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::REPO_SETTINGS_WRITEKEY, Some(wire_params))
+            .await?;
+        Ok(())
+    }
+
+    /// Replaces the repository-overridable settings in one locked write. Allowed keys present in settings are validated and written; allowed keys absent from settings are removed. Other input keys are ignored, and unknown keys already stored in the file remain unchanged. Invalid values or an invalid existing file reject without a partial write.
+    ///
+    /// Wire method: `repo.settings.writeAll`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - The complete set of repository-overridable settings to store.
+    ///
+    /// <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 write_all(&self, params: RepoSettingsWriteAllRequest) -> Result<(), Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::REPO_SETTINGS_WRITEALL, Some(wire_params))
+            .await?;
+        Ok(())
+    }
+}
+
+/// `runtime.*` RPCs.
+#[derive(Clone, Copy)]
+pub struct ClientRpcRuntime<'a> {
+    pub(crate) client: &'a Client,
+}
+
+impl<'a> ClientRpcRuntime<'a> {
+    /// Gracefully shuts down an SDK-owned runtime. The response is sent only after cleanup completes; callers may then terminate the owned runtime process.
+    ///
+    /// Wire method: `runtime.shutdown`.
+    ///
+    /// <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 shutdown(&self) -> Result<(), Error> {
+        let wire_params = serde_json::json!({});
+        let _value = self
+            .client
+            .call(rpc_methods::RUNTIME_SHUTDOWN, Some(wire_params))
+            .await?;
+        Ok(())
+    }
+}
+
+/// `sandbox.*` RPCs.
+#[derive(Clone, Copy)]
+pub struct ClientRpcSandbox<'a> {
+    pub(crate) client: &'a Client,
+}
+
+impl<'a> ClientRpcSandbox<'a> {
+    /// `sandbox.proxyCa.*` sub-namespace.
+    pub fn proxy_ca(&self) -> ClientRpcSandboxProxyCa<'a> {
+        ClientRpcSandboxProxyCa {
+            client: self.client,
+        }
+    }
+
+    /// `sandbox.proxySecret.*` sub-namespace.
+    pub fn proxy_secret(&self) -> ClientRpcSandboxProxySecret<'a> {
+        ClientRpcSandboxProxySecret {
+            client: self.client,
+        }
+    }
+
+    /// `sandbox.settings.*` sub-namespace.
+    pub fn settings(&self) -> ClientRpcSandboxSettings<'a> {
+        ClientRpcSandboxSettings {
+            client: self.client,
+        }
+    }
+
+    /// Raises a user's sandbox settings to an administrator's managed sandbox floor and returns the result a session should actually run under. The floor can only tighten: an enterprise force-on is reflected even when the user's own `enabled` is false, and a user cannot lower a setting the floor raised. The result is normalized through the declared sandbox shape, so a key reorder or an undeclared passthrough key is not mistaken for a policy change by callers that diff two results. A host must call this rather than merge the two layers itself, because reimplementing the direction of the fold is what turns an administrator's floor into a suggestion.
+    ///
+    /// Wire method: `sandbox.resolveFlooredConfig`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - The user's sandbox settings and the managed sandbox floor to raise them to.
+    ///
+    /// # Returns
+    ///
+    /// The user's sandbox settings raised to the managed floor.
+    ///
+    /// <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 resolve_floored_config(
+        &self,
+        params: SandboxResolveFlooredConfigParams,
+    ) -> Result<SandboxResolveFlooredConfigResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::SANDBOX_RESOLVEFLOOREDCONFIG, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Builds the effective filesystem policy one `@`-file picker checks its suggestions against, so Git discovery and grant canonicalization run once for the picker's lifetime instead of on every debounced keystroke. Returns no policy when the sandbox is absent or disabled, which the paired filter reads as "keep every candidate". A host must pair this with `sandbox.filterPickerCandidates` rather than resolve a grant list itself, because the picker's grants are narrower than a file tool's — the same path a built-in tool may read can be one the picker must not offer.
+    ///
+    /// Wire method: `sandbox.preparePickerPolicy`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - The working directory and sandbox settings to build a file-picker policy from.
+    ///
+    /// # Returns
+    ///
+    /// The prepared file-picker policy, or none when the sandbox is disabled.
+    ///
+    /// <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 prepare_picker_policy(
+        &self,
+        params: SandboxPreparePickerPolicyParams,
+    ) -> Result<SandboxPreparePickerPolicyResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::SANDBOX_PREPAREPICKERPOLICY, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Checks a batch of `@`-file picker suggestions against a policy prepared by `sandbox.preparePickerPolicy` and returns one allow decision per candidate, positionally aligned with the request. Batched deliberately: each check canonicalizes a path component-by-component through the real filesystem, so one call amortizes that over a single hop rather than dozens while the user types. A directory the policy does not itself allow can still be kept as a waypoint to an allowed subtree. An absent policy keeps every candidate.
+    ///
+    /// Wire method: `sandbox.filterPickerCandidates`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - A batch of file-picker candidates to check against a prepared policy.
+    ///
+    /// # Returns
+    ///
+    /// Per-candidate allow decisions, positionally aligned with the request.
+    ///
+    /// <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 filter_picker_candidates(
+        &self,
+        params: SandboxFilterPickerCandidatesParams,
+    ) -> Result<SandboxFilterPickerCandidatesResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(
+                rpc_methods::SANDBOX_FILTERPICKERCANDIDATES,
+                Some(wire_params),
+            )
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// The sandbox a single named feature actually launches under, which is not the same as the session's sandbox. A feature is routed out of the sandbox by its own flag — `sandboxMcpServers`, `sandboxLspServers` — so an enabled session can still start one server confined and another free. Returns a disabled sandbox rather than an error when the host has no sandbox slice at all, so an absent config and an opted-out feature read alike at the launch site. A host must ask per feature rather than reuse the session config, because reading only `enabled` confines a server the user opted out of, or reports as sandboxed one that is not.
+    ///
+    /// Wire method: `sandbox.resolveForOptional`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - A sandbox config and the per-feature routing flag to resolve it for.
+    ///
+    /// # Returns
+    ///
+    /// The sandbox a named feature actually launches under.
+    ///
+    /// <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 resolve_for_optional(
+        &self,
+        params: SandboxEffectiveForOptionalParams,
+    ) -> Result<SandboxEffectiveForOptionalResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::SANDBOX_RESOLVEFOROPTIONAL, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Reports whether this machine can run an OS-level command sandbox at all. A host must ask before it offers sandboxing, because the answer is a property of the machine rather than of any setting: on Linux it depends on bubblewrap being installed, and on Windows on the OS build supporting BaseContainer. Probing it requires spawning a process the first time, so the answer is cached for the life of the runtime. A host that assumes support and enables the sandbox anyway produces a session in which every shell command fails.
+    ///
+    /// Wire method: `sandbox.checkPlatformSupport`.
+    ///
+    /// # Returns
+    ///
+    /// True when an OS-level sandbox can run on this 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 check_platform_support(
+        &self,
+    ) -> Result<SandboxCheckPlatformSupportResult, Error> {
+        let wire_params = serde_json::json!({});
+        let _value = self
+            .client
+            .call(rpc_methods::SANDBOX_CHECKPLATFORMSUPPORT, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Reports whether this Windows host's BaseContainer implementation can reach the host's loopback interface directly, which is what a local-network policy needs to avoid routing through the egress proxy. Like `sandbox.checkPlatformSupport`, the answer is a property of the machine's OS build rather than of any setting, and resolving it the first time spawns a platform probe. A host that offers the direct local-network option on a machine that lacks the capability produces a session whose sandboxed commands cannot reach local services. Always false off Windows.
+    ///
+    /// Wire method: `sandbox.checkWindowsHostLoopbackSupport`.
+    ///
+    /// # Returns
+    ///
+    /// True when the sandbox on this host can reach host loopback directly.
+    ///
+    /// <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 check_windows_host_loopback_support(
+        &self,
+    ) -> Result<SandboxCheckWindowsHostLoopbackSupportResult, Error> {
+        let wire_params = serde_json::json!({});
+        let _value = self
+            .client
+            .call(
+                rpc_methods::SANDBOX_CHECKWINDOWSHOSTLOOPBACKSUPPORT,
+                Some(wire_params),
+            )
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// The explanation a host shows when it refuses an explicit request to turn the sandbox on for a machine that cannot run one. Carries the platform-specific remedy — install bubblewrap, update Windows — and the documentation link, so a host that got `false` from `sandbox.checkPlatformSupport` does not have to compose its own reason and cannot describe the same machine differently from the runtime's own spawn path.
+    ///
+    /// Wire method: `sandbox.getUnsupportedMessage`.
+    ///
+    /// # Returns
+    ///
+    /// The user-facing refusal, including the platform remedy and the documentation link.
+    ///
+    /// <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_unsupported_message(
+        &self,
+    ) -> Result<SandboxGetUnsupportedMessageResult, Error> {
+        let wire_params = serde_json::json!({});
+        let _value = self
+            .client
+            .call(
+                rpc_methods::SANDBOX_GETUNSUPPORTEDMESSAGE,
+                Some(wire_params),
+            )
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// The notice a host shows when a stored `sandbox` setting is being ignored for this session because the machine cannot enforce it. Distinct from `sandbox.getUnsupportedMessage`, which refuses an explicit request: this one reports that a setting the user already saved is inert, states that commands will run unsandboxed, and confirms the stored setting itself is left alone. A host that stays silent here leaves the user believing a sandbox is active.
+    ///
+    /// Wire method: `sandbox.getUnsupportedSettingDisabledNotice`.
+    ///
+    /// # Returns
+    ///
+    /// The user-facing notice that a saved sandbox setting is inert for this 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(crate) async fn get_unsupported_setting_disabled_notice(
+        &self,
+    ) -> Result<SandboxGetUnsupportedSettingDisabledNoticeResult, Error> {
+        let wire_params = serde_json::json!({});
+        let _value = self
+            .client
+            .call(
+                rpc_methods::SANDBOX_GETUNSUPPORTEDSETTINGDISABLEDNOTICE,
+                Some(wire_params),
+            )
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// The warning a host prints at startup when a session asked for a sandbox on a machine that cannot run one. The third of the unsupported notices, and the only one that depends on the policy in force: it names the remedy the reader can actually act on, which is the stored setting for an unmanaged host, an administrator for a managed one, and waiting for the policy to resolve when the sandbox stayed on only because the policy could not be determined. Returns no notice when the machine does support a sandbox, so a host can call it unconditionally on the startup path. A host that composes its own warning tells a managed user to change a setting their policy will overwrite.
+    ///
+    /// Wire method: `sandbox.getUnsupportedStartupNotice`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - The managed sandbox policy in force, which selects which remedy the notice offers.
+    ///
+    /// # Returns
+    ///
+    /// The startup warning, absent when the machine can run a sandbox.
+    ///
+    /// <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_unsupported_startup_notice(
+        &self,
+        params: SandboxUnsupportedStartupNoticeParams,
+    ) -> Result<SandboxUnsupportedStartupNoticeResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(
+                rpc_methods::SANDBOX_GETUNSUPPORTEDSTARTUPNOTICE,
+                Some(wire_params),
+            )
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Whether one slash command stays reachable while sandbox enforcement is unavailable and the session is otherwise blocked. The permitted set is deliberately narrow — commands that only report state, and the few that let the user repair or leave the situation — and it is keyed on the arguments as well as the name, so `/sandbox status` is admitted where `/sandbox enable` is not. A host must ask rather than keep its own list: a command this returns false for is one the runtime would refuse anyway, and a divergent list either strands the user with no way out or admits a command that acts on an unenforced session.
+    ///
+    /// Wire method: `sandbox.checkEnforcementCommand`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - One slash command, as typed, to test against the enforcement-block allowlist.
+    ///
+    /// # Returns
+    ///
+    /// True when the command stays available while enforcement is blocked.
+    ///
+    /// <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 check_enforcement_command(
+        &self,
+        params: SandboxEnforcementCommandAllowedParams,
+    ) -> Result<SandboxCheckEnforcementCommandResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(
+                rpc_methods::SANDBOX_CHECKENFORCEMENTCOMMAND,
+                Some(wire_params),
+            )
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Returns the documentation URL a host should point a user at when it declines or downgrades a sandbox setting. The runtime owns the address so every surface cites the same page and a host does not hard-code a link that later moves.
+    ///
+    /// Wire method: `sandbox.getDocsUrl`.
+    ///
+    /// # Returns
+    ///
+    /// The documentation URL a host cites when it declines or downgrades a sandbox setting.
+    ///
+    /// <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_docs_url(&self) -> Result<SandboxDocsUrlResult, Error> {
+        let wire_params = serde_json::json!({});
+        let _value = self
+            .client
+            .call(rpc_methods::SANDBOX_GETDOCSURL, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Reports whether the host running this runtime can run the command sandbox, without starting a session or spawning a sandboxed command.
+    ///
+    /// Wire method: `sandbox.getHostSupport`.
+    ///
+    /// # Returns
+    ///
+    /// Whether the host running this runtime can run the command sandbox. The runtime checks `supported` once per process. A capability answer can change while the process runs, for example after the user installs a missing package.
+    ///
+    /// <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_host_support(&self) -> Result<SandboxHostSupport, Error> {
+        let wire_params = serde_json::json!({});
+        let _value = self
+            .client
+            .call(rpc_methods::SANDBOX_GETHOSTSUPPORT, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+}
+
+/// `sandbox.proxyCa.*` RPCs.
+#[derive(Clone, Copy)]
+pub struct ClientRpcSandboxProxyCa<'a> {
+    pub(crate) client: &'a Client,
+}
+
+impl<'a> ClientRpcSandboxProxyCa<'a> {
+    /// Reports whether this runtime process can offer installing the sandbox credential-proxy certificate authority into OS trust.
+    ///
+    /// Wire method: `sandbox.proxyCa.checkInstallationSupport`.
+    ///
+    /// # Returns
+    ///
+    /// True when this process can offer installing the sandbox credential-proxy certificate authority into OS trust.
+    ///
+    /// <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 check_installation_support(
+        &self,
+    ) -> Result<SandboxProxyCaCheckInstallationSupportResult, Error> {
+        let wire_params = serde_json::json!({});
+        let _value = self
+            .client
+            .call(
+                rpc_methods::SANDBOX_PROXYCA_CHECKINSTALLATIONSUPPORT,
+                Some(wire_params),
+            )
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Reports whether this sandbox configuration uses the credential proxy and can need certificate-authority setup.
+    ///
+    /// Wire method: `sandbox.proxyCa.checkRelevance`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Identifies the credential hosts that the persistent certificate authority of the sandbox credential proxy must cover. The runtime always adds the hosts from the saved user settings.
+    ///
+    /// # Returns
+    ///
+    /// True when the sandbox configuration uses the credential proxy and can need certificate-authority setup.
+    ///
+    /// <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 check_relevance(
+        &self,
+        params: SandboxProxyCaRequest,
+    ) -> Result<SandboxProxyCaCheckRelevanceResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(
+                rpc_methods::SANDBOX_PROXYCA_CHECKRELEVANCE,
+                Some(wire_params),
+            )
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Reports whether the persistent certificate authority of the sandbox credential proxy exists, whether OS trust includes it, and whether it must be rotated. Changes nothing.
+    ///
+    /// Wire method: `sandbox.proxyCa.getStatus`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Identifies the credential hosts that the persistent certificate authority of the sandbox credential proxy must cover. The runtime always adds the hosts from the saved user settings.
+    ///
+    /// # Returns
+    ///
+    /// Status of the persistent certificate authority of the sandbox credential proxy.
+    ///
+    /// <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,
+        params: SandboxProxyCaRequest,
+    ) -> Result<SandboxProxyCaStatus, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::SANDBOX_PROXYCA_GETSTATUS, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Creates the persistent certificate authority of the sandbox credential proxy if none is stored, without changing OS trust, and returns the path of its public certificate. Keeps an existing certificate authority, even one that must be rotated. Fails where OS trust is unsupported. Trust it with sandbox.proxyCa.trust: the CLI trusts only the hosts in the saved user settings, so it refuses a certificate authority that also covers hosts from sandboxConfig.
+    ///
+    /// Wire method: `sandbox.proxyCa.create`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Identifies the credential hosts that the persistent certificate authority of the sandbox credential proxy must cover. The runtime always adds the hosts from the saved user settings.
+    ///
+    /// # Returns
+    ///
+    /// Result of creating the persistent certificate authority of the sandbox credential proxy.
+    ///
+    /// <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 create(
+        &self,
+        params: SandboxProxyCaRequest,
+    ) -> Result<SandboxProxyCaCreateResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::SANDBOX_PROXYCA_CREATE, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Replaces the persistent certificate authority of the sandbox credential proxy with a new one for the current credential hosts. If OS trust included the old one, removes it and trusts the new one, which can show an OS authentication prompt. Running sandboxed tools keep the old certificate authority until they restart.
+    ///
+    /// Wire method: `sandbox.proxyCa.rotate`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Identifies the credential hosts that the persistent certificate authority of the sandbox credential proxy must cover. The runtime always adds the hosts from the saved user settings.
+    ///
+    /// # Returns
+    ///
+    /// Status of the persistent certificate authority of the sandbox credential proxy.
+    ///
+    /// <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 rotate(
+        &self,
+        params: SandboxProxyCaRequest,
+    ) -> Result<SandboxProxyCaStatus, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::SANDBOX_PROXYCA_ROTATE, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Adds the persistent certificate authority of the sandbox credential proxy to OS trust, so sandboxed clients that read only OS trust accept the proxy. Call create first. Refuses a certificate authority that is not constrained to the current credential hosts. Can show an OS authentication prompt.
+    ///
+    /// Wire method: `sandbox.proxyCa.trust`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Identifies the credential hosts that the persistent certificate authority of the sandbox credential proxy must cover. The runtime always adds the hosts from the saved user settings.
+    ///
+    /// # Returns
+    ///
+    /// Status of the persistent certificate authority of the sandbox credential proxy.
+    ///
+    /// <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 trust(
+        &self,
+        params: SandboxProxyCaRequest,
+    ) -> Result<SandboxProxyCaStatus, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::SANDBOX_PROXYCA_TRUST, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Removes the persistent certificate authority of the sandbox credential proxy from OS trust. Keeps the stored certificate authority. Can show an OS authentication prompt. Sandboxed clients that read only OS trust then reject the proxy; clients that read the per-process certificate bundle continue to work.
+    ///
+    /// Wire method: `sandbox.proxyCa.remove`.
+    ///
+    /// # Returns
+    ///
+    /// Status of the persistent certificate authority of the sandbox credential proxy.
+    ///
+    /// <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 remove(&self) -> Result<SandboxProxyCaStatus, Error> {
+        let wire_params = serde_json::json!({});
+        let _value = self
+            .client
+            .call(rpc_methods::SANDBOX_PROXYCA_REMOVE, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+}
+
+/// `sandbox.proxySecret.*` RPCs.
+#[derive(Clone, Copy)]
+pub struct ClientRpcSandboxProxySecret<'a> {
+    pub(crate) client: &'a Client,
+}
+
+impl<'a> ClientRpcSandboxProxySecret<'a> {
+    /// Reports where this runtime keeps the sandbox proxy password: the credential store directory and the entry identifier within it. Both are derived from the configuration directory this runtime was started with, so a host does not resolve them itself. Read this to recognize a `${secret:…}` value in stored sandbox settings as this runtime's own proxy password rather than a reference the user wrote by hand. Marked internal because it exists to carry a CLI call site off the napi boundary onto the SDK contract.
+    ///
+    /// Wire method: `sandbox.proxySecret.getLocation`.
+    ///
+    /// # Returns
+    ///
+    /// Where this runtime keeps the sandbox proxy password.
+    ///
+    /// <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_location(&self) -> Result<SandboxProxySecretLocation, Error> {
+        let wire_params = serde_json::json!({});
+        let _value = self
+            .client
+            .call(
+                rpc_methods::SANDBOX_PROXYSECRET_GETLOCATION,
+                Some(wire_params),
+            )
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Reads the stored sandbox proxy password from the credential store `sandbox.proxySecret.getLocation` names, preferring the OS keychain and falling back to the on-disk store. Reports an absent value rather than failing when no entry exists. Marked internal because it exists to carry a CLI call site off the napi boundary onto the SDK contract.
+    ///
+    /// Wire method: `sandbox.proxySecret.get`.
+    ///
+    /// # Returns
+    ///
+    /// The stored sandbox proxy password, if one is present.
+    ///
+    /// <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(&self) -> Result<SandboxProxySecretGetResult, Error> {
+        let wire_params = serde_json::json!({});
+        let _value = self
+            .client
+            .call(rpc_methods::SANDBOX_PROXYSECRET_GET, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Stores the sandbox proxy password in the credential store `sandbox.proxySecret.getLocation` names, replacing any existing entry. Reports whether the OS keychain accepted it or it fell back to the on-disk store. Marked internal because it exists to carry a CLI call site off the napi boundary onto the SDK contract.
+    ///
+    /// Wire method: `sandbox.proxySecret.save`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - The sandbox proxy password to store.
+    ///
+    /// # Returns
+    ///
+    /// Where the sandbox proxy password was stored.
+    ///
+    /// <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 save(
+        &self,
+        params: SandboxProxySecretSaveRequest,
+    ) -> Result<SandboxProxySecretSaveResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::SANDBOX_PROXYSECRET_SAVE, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Removes the stored sandbox proxy password from the credential store `sandbox.proxySecret.getLocation` names. Succeeds when no entry exists, so it is safe to call while clearing a proxy password whose origin is unknown. Marked internal because it exists to carry a CLI call site off the napi boundary onto the SDK contract.
+    ///
+    /// Wire method: `sandbox.proxySecret.delete`.
+    ///
+    /// <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 delete(&self) -> Result<(), Error> {
+        let wire_params = serde_json::json!({});
+        let _value = self
+            .client
+            .call(rpc_methods::SANDBOX_PROXYSECRET_DELETE, Some(wire_params))
+            .await?;
+        Ok(())
+    }
+}
+
+/// `sandbox.settings.*` RPCs.
+#[derive(Clone, Copy)]
+pub struct ClientRpcSandboxSettings<'a> {
+    pub(crate) client: &'a Client,
+}
+
+impl<'a> ClientRpcSandboxSettings<'a> {
+    /// Resolves a stored sandbox settings object into the effective one, filling every value the user left unset with its default. Read this to render or reason about the sandbox configuration a session would actually run under, rather than the sparse document the user wrote.
+    ///
+    /// Wire method: `sandbox.settings.applyDefaults`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - The stored sandbox settings to resolve against the defaults.
+    ///
+    /// # Returns
+    ///
+    /// The effective sandbox settings, with every unset value resolved to its default.
+    ///
+    /// <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_defaults(
+        &self,
+        params: SandboxApplyDefaultsRequest,
+    ) -> Result<SandboxSettingsApplyDefaultsResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(
+                rpc_methods::SANDBOX_SETTINGS_APPLYDEFAULTS,
+                Some(wire_params),
+            )
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+}
+
+/// `secrets.*` RPCs.
+#[derive(Clone, Copy)]
+pub struct ClientRpcSecrets<'a> {
+    pub(crate) client: &'a Client,
+}
+
+impl<'a> ClientRpcSecrets<'a> {
+    /// Registers secret values for redaction in session logs and exports. The SDK calls this to inject dynamically generated secret values (e.g., OIDC tokens).
+    ///
+    /// Wire method: `secrets.addFilterValues`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Secret values to add to the redaction filter.
+    ///
+    /// # Returns
+    ///
+    /// Confirmation that the secret values were registered.
+    ///
+    /// <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 add_filter_values(
+        &self,
+        params: SecretsAddFilterValuesRequest,
+    ) -> Result<SecretsAddFilterValuesResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::SECRETS_ADDFILTERVALUES, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+}
+
+/// `sessionFs.*` RPCs.
+#[derive(Clone, Copy)]
+pub struct ClientRpcSessionFs<'a> {
+    pub(crate) client: &'a Client,
+}
+
+impl<'a> ClientRpcSessionFs<'a> {
+    /// Registers an SDK client as the session filesystem provider.
+    ///
+    /// Wire method: `sessionFs.setProvider`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Initial working directory, session-state path layout, and path conventions used to register the calling SDK client as the session filesystem provider. A registered provider is authoritative for path interpretation and filesystem facts used by workspace permission validation. Paths are interpreted lexically; home-relative paths (`~` and `~/...`) and Windows drive-relative paths such as `C:foo` are unsupported. Until provider-side canonicalization is supported, providers must not expose symlinks inside allowed roots that escape those roots.
+    ///
+    /// # Returns
+    ///
+    /// Indicates whether the calling client was registered as the session filesystem provider.
+    ///
+    /// <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_provider(
+        &self,
+        params: SessionFsSetProviderRequest,
+    ) -> Result<SessionFsSetProviderResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::SESSIONFS_SETPROVIDER, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+}
+
+/// `sessions.*` RPCs.
+#[derive(Clone, Copy)]
+pub struct ClientRpcSessions<'a> {
+    pub(crate) client: &'a Client,
+}
+
+impl<'a> ClientRpcSessions<'a> {
+    /// Creates or resumes a local session and returns the opened session ID.
+    ///
+    /// Wire method: `sessions.open`.
+    ///
+    /// # Returns
+    ///
+    /// Result of opening a 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 open(&self) -> Result<SessionOpenResult, Error> {
+        let wire_params = serde_json::json!({});
+        let _value = self
+            .client
+            .call(rpc_methods::SESSIONS_OPEN, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Creates a new session by forking persisted history from an existing session.
+    ///
+    /// Wire method: `sessions.fork`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Source session identifier to fork from, optional event-ID boundary, and optional friendly name for the new session.
+    ///
+    /// # Returns
+    ///
+    /// Identifier and optional friendly name assigned to the newly forked 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 fork(&self, params: SessionsForkRequest) -> Result<SessionsForkResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::SESSIONS_FORK, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Connects to an existing remote session and exposes it as an SDK session.
+    ///
+    /// Wire method: `sessions.connect`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Remote session connection parameters.
+    ///
+    /// # Returns
+    ///
+    /// Remote session connection result.
+    ///
+    /// <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 connect(
+        &self,
+        params: ConnectRemoteSessionParams,
+    ) -> Result<RemoteSessionConnectionResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::SESSIONS_CONNECT, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Lists sessions, optionally filtered by source and working-directory context. Returned entries are discriminated by `isRemote`: local entries carry only the lightweight `LocalSessionMetadataValue` shape; remote entries carry the full `RemoteSessionMetadataValue` shape (repository, PR number, taskType, etc.).
+    ///
+    /// Wire method: `sessions.list`.
+    ///
+    /// # Returns
+    ///
+    /// Sessions matching the filter, ordered most-recently-modified first.
+    ///
+    /// <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 list(&self) -> Result<SessionList, Error> {
+        let wire_params = serde_json::json!({});
+        let _value = self
+            .client
+            .call(rpc_methods::SESSIONS_LIST, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Lists sessions, optionally filtered by source and working-directory context. Returned entries are discriminated by `isRemote`: local entries carry only the lightweight `LocalSessionMetadataValue` shape; remote entries carry the full `RemoteSessionMetadataValue` shape (repository, PR number, taskType, etc.).
+    ///
+    /// Wire method: `sessions.list`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Optional source filter, metadata-load limit, and context filter applied to the returned sessions.
+    ///
+    /// # Returns
+    ///
+    /// Sessions matching the filter, ordered most-recently-modified first.
+    ///
+    /// <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 list_with_params(
+        &self,
+        params: SessionsListRequest,
+    ) -> Result<SessionList, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::SESSIONS_LIST, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Reads lightweight persisted metadata for one local session without opening it.
+    ///
+    /// Wire method: `sessions.getMetadata`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Session ID whose persisted metadata should be read.
+    ///
+    /// # Returns
+    ///
+    /// Persisted local session metadata when the 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(crate) async fn get_metadata(
+        &self,
+        params: SessionsGetMetadataRequest,
+    ) -> Result<SessionsGetMetadataResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::SESSIONS_GETMETADATA, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Reads client-owned metadata for multiple persisted local sessions without opening them. Results preserve request order and report missing, corrupt, unsupported, or temporarily unavailable sessions independently.
+    ///
+    /// Wire method: `sessions.getClientMetadata`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Bounded batch request for client-owned metadata from persisted local sessions.
+    ///
+    /// # Returns
+    ///
+    /// Ordered client metadata outcomes for the requested local sessions.
+    ///
+    /// <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_client_metadata(
+        &self,
+        params: SessionsGetClientMetadataRequest,
+    ) -> Result<SessionsGetClientMetadataResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::SESSIONS_GETCLIENTMETADATA, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Reads a page of durable events directly from a local session's persisted journal without creating, resuming, or activating the session. The first read pins the currently opened journal generation and its byte-length boundary; opaque cursor continuations remain on that generation across runtime-owned compaction, truncation, and rewrite operations, which replace the live path atomically, and events appended after the boundary are excluded. For cold hydration, await the first successful page before activation and establish lossless live-event buffering before resume; merge subsequent live events by ID, preserving persisted order and letting live payloads win. Continuations are process-local, single-use capabilities bound to the originating session and storage context and must be paged sequentially; concurrent or repeated use of the same cursor expires that duplicate read rather than reading the generation twice. A complete snapshot has cursorStatus 'ok' and hasMore false. Snapshots expire after five idle minutes, with at most eight retained per process and idle-only eviction under pressure; completion and cancelled-worker exit release their handles. No transcript copy is created, but retained handles may keep replaced files' disk blocks alive until release. Pages have a soft 1 MiB serialized event-array budget including resolved binary assets; one oversized event is returned alone to guarantee progress. Working memory also includes a record/lookahead and asset resolution; resolving the first binary reference may scan the full pinned generation to build a bounded offset index. If the snapshot expires, is evicted, is cancelled before a continuation is established, or becomes unreadable after an observable unsupported in-place shortening, the continuation returns cursorStatus 'expired' with an empty terminal page and never falls back to a different generation. A missing or initially unreadable journal is an RPC error. Persisted history excludes ephemeral events and may omit payloads that are reconstructed only for an active session; use the active session event stream for post-resume live events.
+    ///
+    /// Wire method: `sessions.readPersistedEvents`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Pagination options for reading an inactive or active local session's persisted event journal.
+    ///
+    /// # Returns
+    ///
+    /// Batch of session events returned by a read, with cursor and continuation 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 async fn read_persisted_events(
+        &self,
+        params: SessionsReadPersistedEventsRequest,
+    ) -> Result<EventsReadResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::SESSIONS_READPERSISTEDEVENTS, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Lists recent local session IDs that contain user-visible history, omitting housekeeping-only sessions.
+    ///
+    /// Wire method: `sessions.listNonEmptySessionIds`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Limit for non-empty local session IDs.
+    ///
+    /// # Returns
+    ///
+    /// Recent local session IDs that contain user-visible history.
+    ///
+    /// <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 list_non_empty_session_ids(
+        &self,
+        params: SessionsListNonEmptySessionIdsRequest,
+    ) -> Result<SessionsListNonEmptySessionIdsResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(
+                rpc_methods::SESSIONS_LISTNONEMPTYSESSIONIDS,
+                Some(wire_params),
+            )
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Finds the local session bound to a GitHub task ID, if any.
+    ///
+    /// Wire method: `sessions.findByTaskId`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - GitHub task ID to look up.
+    ///
+    /// # Returns
+    ///
+    /// ID of the local session bound to the given GitHub task, or omitted when none.
+    ///
+    /// <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 find_by_task_id(
+        &self,
+        params: SessionsFindByTaskIDRequest,
+    ) -> Result<SessionsFindByTaskIDResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::SESSIONS_FINDBYTASKID, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Resolves a UUID prefix to a unique session ID, if exactly one session matches.
+    ///
+    /// Wire method: `sessions.findByPrefix`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - UUID prefix to resolve to a unique session ID.
+    ///
+    /// # Returns
+    ///
+    /// Session ID matching the prefix, omitted when no unique match 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 find_by_prefix(
+        &self,
+        params: SessionsFindByPrefixRequest,
+    ) -> Result<SessionsFindByPrefixResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::SESSIONS_FINDBYPREFIX, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Returns the most-relevant prior session for a given working-directory context.
+    ///
+    /// Wire method: `sessions.getLastForContext`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Optional working-directory context used to score session relevance.
+    ///
+    /// # Returns
+    ///
+    /// Most-relevant session ID for the supplied context, or omitted when no sessions exist.
+    ///
+    /// <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_last_for_context(
+        &self,
+        params: SessionsGetLastForContextRequest,
+    ) -> Result<SessionsGetLastForContextResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::SESSIONS_GETLASTFORCONTEXT, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Computes the absolute path to a session's persisted events.jsonl file. Internal: filesystem paths are only meaningful in-process (CLI and runtime share a filesystem). Currently used by the CLI's contribution-graph feature to read historical events directly. Remote SDK consumers must not depend on this; a proper event-query API would replace it if the contribution graph ever needed to work over the wire.
+    ///
+    /// Wire method: `sessions.getEventFilePath`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Session ID whose event-log file path to compute.
+    ///
+    /// # Returns
+    ///
+    /// Absolute path to the session's events.jsonl file on disk.
+    ///
+    /// <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_event_file_path(
+        &self,
+        params: SessionsGetEventFilePathRequest,
+    ) -> Result<SessionsGetEventFilePathResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::SESSIONS_GETEVENTFILEPATH, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Returns the on-disk byte size of each session's workspace directory.
+    ///
+    /// Wire method: `sessions.getSizes`.
     ///
     /// # Returns
     ///
-    /// Result of registering a new marketplace.
+    /// Map of sessionId -> on-disk size in bytes for each session's workspace directory.
     ///
     /// <div class="warning">
     ///
@@ -2401,29 +5822,26 @@ impl<'a> ClientRpcPluginsMarketplaces<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn add(
-        &self,
-        params: PluginsMarketplacesAddRequest,
-    ) -> Result<MarketplaceAddResult, Error> {
-        let wire_params = serde_json::to_value(params)?;
+    pub async fn get_sizes(&self) -> Result<SessionSizes, Error> {
+        let wire_params = serde_json::json!({});
         let _value = self
             .client
-            .call(rpc_methods::PLUGINS_MARKETPLACES_ADD, Some(wire_params))
+            .call(rpc_methods::SESSIONS_GETSIZES, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Removes a previously-registered marketplace. When the marketplace has dependent plugins and `force` is not set, the marketplace is left intact and the result lists the dependents so the caller can decide whether to retry with `force=true`.
+    /// Returns the subset of the supplied session IDs that are currently held by another running process.
     ///
-    /// Wire method: `plugins.marketplaces.remove`.
+    /// Wire method: `sessions.checkInUse`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Name of the marketplace to remove and an optional force flag.
+    /// * `params` - Session IDs to test for live in-use locks.
     ///
     /// # Returns
     ///
-    /// Outcome of the remove attempt, including dependent-plugin info when applicable.
+    /// Session IDs from the input set that are currently in use by another process.
     ///
     /// <div class="warning">
     ///
@@ -2432,29 +5850,29 @@ impl<'a> ClientRpcPluginsMarketplaces<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn remove(
+    pub async fn check_in_use(
         &self,
-        params: PluginsMarketplacesRemoveRequest,
-    ) -> Result<MarketplaceRemoveResult, Error> {
+        params: SessionsCheckInUseRequest,
+    ) -> Result<SessionsCheckInUseResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::PLUGINS_MARKETPLACES_REMOVE, Some(wire_params))
+            .call(rpc_methods::SESSIONS_CHECKINUSE, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Lists plugins advertised by a registered marketplace.
+    /// Returns a session's persisted remote-steerable flag, if any has been recorded. Internal: this is CLI-specific book-keeping used by `--continue` / `--resume` to inherit the prior session's remote-steerable preference. SDK consumers that want similar behavior should manage their own persistence around start/stop calls rather than relying on this runtime-side flag.
     ///
-    /// Wire method: `plugins.marketplaces.browse`.
+    /// Wire method: `sessions.getPersistedRemoteSteerable`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Name of the marketplace whose plugin catalog to fetch.
+    /// * `params` - Session ID to look up the persisted remote-steerable flag for.
     ///
     /// # Returns
     ///
-    /// Plugins advertised by the marketplace.
+    /// The session's persisted remote-steerable flag, or omitted when no value has been persisted.
     ///
     /// <div class="warning">
     ///
@@ -2463,25 +5881,32 @@ impl<'a> ClientRpcPluginsMarketplaces<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn browse(
+    pub(crate) async fn get_persisted_remote_steerable(
         &self,
-        params: PluginsMarketplacesBrowseRequest,
-    ) -> Result<MarketplaceBrowseResult, Error> {
+        params: SessionsGetPersistedRemoteSteerableRequest,
+    ) -> Result<SessionsGetPersistedRemoteSteerableResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::PLUGINS_MARKETPLACES_BROWSE, Some(wire_params))
+            .call(
+                rpc_methods::SESSIONS_GETPERSISTEDREMOTESTEERABLE,
+                Some(wire_params),
+            )
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Re-fetches one or all registered marketplace catalogs.
+    /// Closes a session: emits shutdown, flushes pending events, releases the in-use lock, and disposes the active session.
     ///
-    /// Wire method: `plugins.marketplaces.refresh`.
+    /// Wire method: `sessions.close`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Session ID to close.
     ///
     /// # Returns
     ///
-    /// Result of refreshing one or more marketplace catalogs.
+    /// 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">
     ///
@@ -2490,26 +5915,26 @@ impl<'a> ClientRpcPluginsMarketplaces<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn refresh(&self) -> Result<MarketplaceRefreshResult, Error> {
-        let wire_params = serde_json::json!({});
+    pub async fn close(&self, params: SessionsCloseRequest) -> Result<SessionsCloseResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::PLUGINS_MARKETPLACES_REFRESH, Some(wire_params))
+            .call(rpc_methods::SESSIONS_CLOSE, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Re-fetches one or all registered marketplace catalogs.
+    /// Closes, deactivates, and deletes a set of sessions, returning the bytes freed per session.
     ///
-    /// Wire method: `plugins.marketplaces.refresh`.
+    /// Wire method: `sessions.bulkDelete`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Optional marketplace name; omit to refresh all.
+    /// * `params` - Session IDs to close, deactivate, and delete from disk.
     ///
     /// # Returns
     ///
-    /// Result of refreshing one or more marketplace catalogs.
+    /// Map of sessionId -> bytes freed by removing the session's workspace directory.
     ///
     /// <div class="warning">
     ///
@@ -2518,29 +5943,25 @@ impl<'a> ClientRpcPluginsMarketplaces<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn refresh_with_params(
+    pub async fn bulk_delete(
         &self,
-        params: PluginsMarketplacesRefreshRequest,
-    ) -> Result<MarketplaceRefreshResult, Error> {
+        params: SessionsBulkDeleteRequest,
+    ) -> Result<SessionBulkDeleteResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::PLUGINS_MARKETPLACES_REFRESH, Some(wire_params))
+            .call(rpc_methods::SESSIONS_BULKDELETE, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
-}
-
-/// `runtime.*` RPCs.
-#[derive(Clone, Copy)]
-pub struct ClientRpcRuntime<'a> {
-    pub(crate) client: &'a Client,
-}
 
-impl<'a> ClientRpcRuntime<'a> {
-    /// Gracefully shuts down an SDK-owned runtime. The response is sent only after cleanup completes; callers may then terminate the owned runtime process.
+    /// Deletes one local session from disk after running the same lifecycle hooks as the session manager.
     ///
-    /// Wire method: `runtime.shutdown`.
+    /// Wire method: `sessions.delete`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Session ID to delete from disk.
     ///
     /// <div class="warning">
     ///
@@ -2549,37 +5970,26 @@ impl<'a> ClientRpcRuntime<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn shutdown(&self) -> Result<(), Error> {
-        let wire_params = serde_json::json!({});
+    pub(crate) async fn delete(&self, params: SessionsDeleteRequest) -> Result<(), Error> {
+        let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::RUNTIME_SHUTDOWN, Some(wire_params))
+            .call(rpc_methods::SESSIONS_DELETE, Some(wire_params))
             .await?;
         Ok(())
     }
-}
-
-/// `sandbox.*` RPCs.
-#[derive(Clone, Copy)]
-pub struct ClientRpcSandbox<'a> {
-    pub(crate) client: &'a Client,
-}
-
-impl<'a> ClientRpcSandbox<'a> {
-    /// `sandbox.proxyCa.*` sub-namespace.
-    pub fn proxy_ca(&self) -> ClientRpcSandboxProxyCa<'a> {
-        ClientRpcSandboxProxyCa {
-            client: self.client,
-        }
-    }
 
-    /// Reports whether the host running this runtime can run the command sandbox, without starting a session or spawning a sandboxed command.
+    /// Deletes sessions older than the given threshold, with optional dry-run and exclusion list.
     ///
-    /// Wire method: `sandbox.getHostSupport`.
+    /// Wire method: `sessions.pruneOld`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Age threshold and optional flags controlling which old sessions are pruned (or simulated when dryRun is true).
     ///
     /// # Returns
     ///
-    /// Whether the host running this runtime can run the command sandbox. The runtime checks `supported` once per process. A capability answer can change while the process runs, for example after the user installs a missing package.
+    /// Outcome of the prune operation: deleted IDs, dry-run candidates, skipped IDs, total bytes freed, and the dry-run flag.
     ///
     /// <div class="warning">
     ///
@@ -2588,34 +5998,29 @@ impl<'a> ClientRpcSandbox<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn get_host_support(&self) -> Result<SandboxHostSupport, Error> {
-        let wire_params = serde_json::json!({});
+    pub async fn prune_old(
+        &self,
+        params: SessionsPruneOldRequest,
+    ) -> Result<SessionPruneResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::SANDBOX_GETHOSTSUPPORT, Some(wire_params))
+            .call(rpc_methods::SESSIONS_PRUNEOLD, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
-}
-
-/// `sandbox.proxyCa.*` RPCs.
-#[derive(Clone, Copy)]
-pub struct ClientRpcSandboxProxyCa<'a> {
-    pub(crate) client: &'a Client,
-}
 
-impl<'a> ClientRpcSandboxProxyCa<'a> {
-    /// Reports whether the persistent certificate authority of the sandbox credential proxy exists, whether OS trust includes it, and whether it must be rotated. Changes nothing.
+    /// Flushes a session's pending events to disk.
     ///
-    /// Wire method: `sandbox.proxyCa.getStatus`.
+    /// Wire method: `sessions.save`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Identifies the credential hosts that the persistent certificate authority of the sandbox credential proxy must cover. The runtime always adds the hosts from the saved user settings.
+    /// * `params` - Session ID whose pending events should be flushed to disk.
     ///
     /// # Returns
     ///
-    /// Status of the persistent certificate authority of the sandbox credential proxy.
+    /// Flush a session's pending events to disk. No-op when no writer exists for the session (e.g., already closed).
     ///
     /// <div class="warning">
     ///
@@ -2624,29 +6029,26 @@ impl<'a> ClientRpcSandboxProxyCa<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn get_status(
-        &self,
-        params: SandboxProxyCaRequest,
-    ) -> Result<SandboxProxyCaStatus, Error> {
+    pub async fn save(&self, params: SessionsSaveRequest) -> Result<SessionsSaveResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::SANDBOX_PROXYCA_GETSTATUS, Some(wire_params))
+            .call(rpc_methods::SESSIONS_SAVE, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Creates the persistent certificate authority of the sandbox credential proxy if none is stored, without changing OS trust, and returns the path of its public certificate. Keeps an existing certificate authority, even one that must be rotated. Fails where OS trust is unsupported. Trust it with sandbox.proxyCa.trust: the CLI trusts only the hosts in the saved user settings, so it refuses a certificate authority that also covers hosts from sandboxConfig.
+    /// Releases the in-use lock held by this process for a session.
     ///
-    /// Wire method: `sandbox.proxyCa.create`.
+    /// Wire method: `sessions.releaseLock`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Identifies the credential hosts that the persistent certificate authority of the sandbox credential proxy must cover. The runtime always adds the hosts from the saved user settings.
+    /// * `params` - Session ID whose in-use lock should be released.
     ///
     /// # Returns
     ///
-    /// Result of creating the persistent certificate authority of the sandbox credential proxy.
+    /// 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">
     ///
@@ -2655,29 +6057,29 @@ impl<'a> ClientRpcSandboxProxyCa<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn create(
+    pub async fn release_lock(
         &self,
-        params: SandboxProxyCaRequest,
-    ) -> Result<SandboxProxyCaCreateResult, Error> {
+        params: SessionsReleaseLockRequest,
+    ) -> Result<SessionsReleaseLockResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::SANDBOX_PROXYCA_CREATE, Some(wire_params))
+            .call(rpc_methods::SESSIONS_RELEASELOCK, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Replaces the persistent certificate authority of the sandbox credential proxy with a new one for the current credential hosts. If OS trust included the old one, removes it and trusts the new one, which can show an OS authentication prompt. Running sandboxed tools keep the old certificate authority until they restart.
+    /// Backfills missing summary and context fields on the supplied session metadata records.
     ///
-    /// Wire method: `sandbox.proxyCa.rotate`.
+    /// Wire method: `sessions.enrichMetadata`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Identifies the credential hosts that the persistent certificate authority of the sandbox credential proxy must cover. The runtime always adds the hosts from the saved user settings.
+    /// * `params` - Session metadata records to enrich with summary and context information.
     ///
     /// # Returns
     ///
-    /// Status of the persistent certificate authority of the sandbox credential proxy.
+    /// The enriched metadata records, with summary and context fields backfilled where available. Sessions confirmed empty and unnamed are omitted.
     ///
     /// <div class="warning">
     ///
@@ -2686,29 +6088,29 @@ impl<'a> ClientRpcSandboxProxyCa<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn rotate(
+    pub async fn enrich_metadata(
         &self,
-        params: SandboxProxyCaRequest,
-    ) -> Result<SandboxProxyCaStatus, Error> {
+        params: SessionsEnrichMetadataRequest,
+    ) -> Result<SessionEnrichMetadataResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::SANDBOX_PROXYCA_ROTATE, Some(wire_params))
+            .call(rpc_methods::SESSIONS_ENRICHMETADATA, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Adds the persistent certificate authority of the sandbox credential proxy to OS trust, so sandboxed clients that read only OS trust accept the proxy. Call create first. Refuses a certificate authority that is not constrained to the current credential hosts. Can show an OS authentication prompt.
+    /// Creates the workspace record for a session that has not been opened yet. A host that hands a session off to another application — writing the record and then launching that application against the session ID — needs the record on disk before any session exists to carry it, which the session-scoped workspace methods cannot do. Replaces any existing record and resets the checkpoint index. When writing to the local filesystem, a stored `fork_count` survives on disk. Returns the record it built, so a surviving stored `fork_count` can differ from the answer.
     ///
-    /// Wire method: `sandbox.proxyCa.trust`.
+    /// Wire method: `sessions.createWorkspace`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Identifies the credential hosts that the persistent certificate authority of the sandbox credential proxy must cover. The runtime always adds the hosts from the saved user settings.
+    /// * `params` - Identity, state location and starting context for a workspace record.
     ///
     /// # Returns
     ///
-    /// Status of the persistent certificate authority of the sandbox credential proxy.
+    /// The workspace record that was written.
     ///
     /// <div class="warning">
     ///
@@ -2717,25 +6119,29 @@ impl<'a> ClientRpcSandboxProxyCa<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn trust(
+    pub(crate) async fn create_workspace(
         &self,
-        params: SandboxProxyCaRequest,
-    ) -> Result<SandboxProxyCaStatus, Error> {
+        params: SessionsCreateWorkspaceRequest,
+    ) -> Result<SessionsCreateWorkspaceResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::SANDBOX_PROXYCA_TRUST, Some(wire_params))
+            .call(rpc_methods::SESSIONS_CREATEWORKSPACE, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Removes the persistent certificate authority of the sandbox credential proxy from OS trust. Keeps the stored certificate authority. Can show an OS authentication prompt. Sandboxed clients that read only OS trust then reject the proxy; clients that read the per-process certificate bundle continue to work.
+    /// Reads a session's workspace record straight from disk, without opening the session. Resuming by session ID has to know where the session lives before it can connect, so the lookup cannot come from the session-scoped workspace methods, which resolve their location from a live session's context. Returns no record when the file is absent.
     ///
-    /// Wire method: `sandbox.proxyCa.remove`.
+    /// Wire method: `sessions.loadWorkspace`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Where the session's state lives, as a root directory and the session ID under it.
     ///
     /// # Returns
     ///
-    /// Status of the persistent certificate authority of the sandbox credential proxy.
+    /// The workspace record on disk, omitted when the session has none.
     ///
     /// <div class="warning">
     ///
@@ -2744,34 +6150,29 @@ impl<'a> ClientRpcSandboxProxyCa<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn remove(&self) -> Result<SandboxProxyCaStatus, Error> {
-        let wire_params = serde_json::json!({});
+    pub(crate) async fn load_workspace(
+        &self,
+        params: SessionsLoadWorkspaceRequest,
+    ) -> Result<SessionsLoadWorkspaceResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::SANDBOX_PROXYCA_REMOVE, Some(wire_params))
+            .call(rpc_methods::SESSIONS_LOADWORKSPACE, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
-}
 
-/// `secrets.*` RPCs.
-#[derive(Clone, Copy)]
-pub struct ClientRpcSecrets<'a> {
-    pub(crate) client: &'a Client,
-}
-
-impl<'a> ClientRpcSecrets<'a> {
-    /// Registers secret values for redaction in session logs and exports. The SDK calls this to inject dynamically generated secret values (e.g., OIDC tokens).
+    /// Merges fields into a session's workspace record on disk, creating the record when it is absent. The counterpart to `sessions.loadWorkspace`, for the same before-the-session-exists case. It preserves stored workspace-schema fields the request does not supply, does not preserve stored keys outside the workspace schema, and never replaces a stored `fork_count`.
     ///
-    /// Wire method: `secrets.addFilterValues`.
+    /// Wire method: `sessions.updateWorkspaceFields`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Secret values to add to the redaction filter.
+    /// * `params` - Where the session's state lives, plus workspace-schema fields to merge into its workspace record. Stored keys outside the schema are not preserved, and a stored `fork_count` is never replaced.
     ///
     /// # Returns
     ///
-    /// Confirmation that the secret values were registered.
+    /// The merge completed. The record carries the supplied workspace-schema fields, but a stored `fork_count` stays.
     ///
     /// <div class="warning">
     ///
@@ -2780,37 +6181,32 @@ impl<'a> ClientRpcSecrets<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn add_filter_values(
+    pub(crate) async fn update_workspace_fields(
         &self,
-        params: SecretsAddFilterValuesRequest,
-    ) -> Result<SecretsAddFilterValuesResult, Error> {
+        params: SessionsUpdateWorkspaceFieldsRequest,
+    ) -> Result<SessionsUpdateWorkspaceFieldsResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::SECRETS_ADDFILTERVALUES, Some(wire_params))
+            .call(
+                rpc_methods::SESSIONS_UPDATEWORKSPACEFIELDS,
+                Some(wire_params),
+            )
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
-}
-
-/// `sessionFs.*` RPCs.
-#[derive(Clone, Copy)]
-pub struct ClientRpcSessionFs<'a> {
-    pub(crate) client: &'a Client,
-}
 
-impl<'a> ClientRpcSessionFs<'a> {
-    /// Registers an SDK client as the session filesystem provider.
+    /// Reloads user, plugin, and (optionally) repo hooks on the active session.
     ///
-    /// Wire method: `sessionFs.setProvider`.
+    /// Wire method: `sessions.reloadPluginHooks`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Initial working directory, session-state path layout, and path conventions used to register the calling SDK client as the session filesystem provider. A registered provider is authoritative for path interpretation and filesystem facts used by workspace permission validation. Paths are interpreted lexically; home-relative paths (`~` and `~/...`) and Windows drive-relative paths such as `C:foo` are unsupported. Until provider-side canonicalization is supported, providers must not expose symlinks inside allowed roots that escape those roots.
+    /// * `params` - Active session ID and an optional flag for deferring repo-level hooks until folder trust.
     ///
     /// # Returns
     ///
-    /// Indicates whether the calling client was registered as the session filesystem provider.
+    /// 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">
     ///
@@ -2819,33 +6215,29 @@ impl<'a> ClientRpcSessionFs<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn set_provider(
+    pub async fn reload_plugin_hooks(
         &self,
-        params: SessionFsSetProviderRequest,
-    ) -> Result<SessionFsSetProviderResult, Error> {
+        params: SessionsReloadPluginHooksRequest,
+    ) -> Result<SessionsReloadPluginHooksResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::SESSIONFS_SETPROVIDER, Some(wire_params))
+            .call(rpc_methods::SESSIONS_RELOADPLUGINHOOKS, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
-}
-
-/// `sessions.*` RPCs.
-#[derive(Clone, Copy)]
-pub struct ClientRpcSessions<'a> {
-    pub(crate) client: &'a Client,
-}
 
-impl<'a> ClientRpcSessions<'a> {
-    /// Creates or resumes a local session and returns the opened session ID.
+    /// Loads previously-deferred repo-level hooks on the active session, returning queued startup prompts.
     ///
-    /// Wire method: `sessions.open`.
+    /// Wire method: `sessions.loadDeferredRepoHooks`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Active session ID whose deferred repo-level hooks should be loaded.
     ///
     /// # Returns
     ///
-    /// Result of opening a session.
+    /// Queued repo-level startup prompts and the total hook command count after loading.
     ///
     /// <div class="warning">
     ///
@@ -2854,26 +6246,32 @@ impl<'a> ClientRpcSessions<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn open(&self) -> Result<SessionOpenResult, Error> {
-        let wire_params = serde_json::json!({});
+    pub async fn load_deferred_repo_hooks(
+        &self,
+        params: SessionsLoadDeferredRepoHooksRequest,
+    ) -> Result<SessionLoadDeferredRepoHooksResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::SESSIONS_OPEN, Some(wire_params))
+            .call(
+                rpc_methods::SESSIONS_LOADDEFERREDREPOHOOKS,
+                Some(wire_params),
+            )
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Creates a new session by forking persisted history from an existing session.
+    /// Replaces the manager-wide additional plugins registered with the session manager.
     ///
-    /// Wire method: `sessions.fork`.
+    /// Wire method: `sessions.setAdditionalPlugins`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Source session identifier to fork from, optional event-ID boundary, and optional friendly name for the new session.
+    /// * `params` - Manager-wide additional plugins to register; replaces any previously-configured set.
     ///
     /// # Returns
     ///
-    /// Identifier and optional friendly name assigned to the newly forked session.
+    /// 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">
     ///
@@ -2882,26 +6280,32 @@ impl<'a> ClientRpcSessions<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn fork(&self, params: SessionsForkRequest) -> Result<SessionsForkResult, Error> {
+    pub async fn set_additional_plugins(
+        &self,
+        params: SessionsSetAdditionalPluginsRequest,
+    ) -> Result<SessionsSetAdditionalPluginsResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::SESSIONS_FORK, Some(wire_params))
+            .call(
+                rpc_methods::SESSIONS_SETADDITIONALPLUGINS,
+                Some(wire_params),
+            )
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Connects to an existing remote session and exposes it as an SDK session.
+    /// Gets the dynamic-context board entry count associated with a session, when available. Internal: this exists solely so CLI telemetry events (`rem_spawn_gate`, `rem_consolidation_complete`) can pair START / END board counts around the detached rem-agent spawn. "Dynamic context board" is a runtime-internal concept that is not part of the public SDK contract; the long-term plan is to relocate the telemetry emission into the runtime so this method can be deleted entirely.
     ///
-    /// Wire method: `sessions.connect`.
+    /// Wire method: `sessions.getBoardEntryCount`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Remote session connection parameters.
+    /// * `params` - Session ID whose board entry count should be returned.
     ///
     /// # Returns
     ///
-    /// Remote session connection result.
+    /// Dynamic-context board entry count, when available.
     ///
     /// <div class="warning">
     ///
@@ -2910,25 +6314,29 @@ impl<'a> ClientRpcSessions<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn connect(
+    pub(crate) async fn get_board_entry_count(
         &self,
-        params: ConnectRemoteSessionParams,
-    ) -> Result<RemoteSessionConnectionResult, Error> {
+        params: SessionsGetBoardEntryCountRequest,
+    ) -> Result<SessionsGetBoardEntryCountResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::SESSIONS_CONNECT, Some(wire_params))
+            .call(rpc_methods::SESSIONS_GETBOARDENTRYCOUNT, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Lists sessions, optionally filtered by source and working-directory context. Returned entries are discriminated by `isRemote`: local entries carry only the lightweight `LocalSessionMetadataValue` shape; remote entries carry the full `RemoteSessionMetadataValue` shape (repository, PR number, taskType, etc.).
+    /// Attaches the runtime-managed remote-control singleton to a session, awaiting initial setup. If remote control is already attached to a different session, the singleton is transferred (preserving the underlying Mission Control connection). Returns the final status.
     ///
-    /// Wire method: `sessions.list`.
+    /// Wire method: `sessions.startRemoteControl`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Parameters for attaching the remote-control singleton to a session.
     ///
     /// # Returns
     ///
-    /// Sessions matching the filter, ordered most-recently-modified first.
+    /// Wrapper for the singleton's current status.
     ///
     /// <div class="warning">
     ///
@@ -2937,26 +6345,29 @@ impl<'a> ClientRpcSessions<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn list(&self) -> Result<SessionList, Error> {
-        let wire_params = serde_json::json!({});
+    pub async fn start_remote_control(
+        &self,
+        params: SessionsStartRemoteControlRequest,
+    ) -> Result<RemoteControlStatusResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::SESSIONS_LIST, Some(wire_params))
+            .call(rpc_methods::SESSIONS_STARTREMOTECONTROL, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Lists sessions, optionally filtered by source and working-directory context. Returned entries are discriminated by `isRemote`: local entries carry only the lightweight `LocalSessionMetadataValue` shape; remote entries carry the full `RemoteSessionMetadataValue` shape (repository, PR number, taskType, etc.).
+    /// Atomically rebinds the remote-control singleton to a different session, preserving the underlying Mission Control connection. When `expectedFromSessionId` is provided and does not match the singleton's current `attachedSessionId`, the transfer is rejected with `transferred: false` and the current status is returned unchanged.
     ///
-    /// Wire method: `sessions.list`.
+    /// Wire method: `sessions.transferRemoteControl`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Optional source filter, metadata-load limit, and context filter applied to the returned sessions.
+    /// * `params` - Parameters for atomically rebinding the remote-control singleton.
     ///
     /// # Returns
     ///
-    /// Sessions matching the filter, ordered most-recently-modified first.
+    /// Outcome of a transferRemoteControl call.
     ///
     /// <div class="warning">
     ///
@@ -2965,29 +6376,32 @@ impl<'a> ClientRpcSessions<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn list_with_params(
+    pub async fn transfer_remote_control(
         &self,
-        params: SessionsListRequest,
-    ) -> Result<SessionList, Error> {
+        params: SessionsTransferRemoteControlRequest,
+    ) -> Result<RemoteControlTransferResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::SESSIONS_LIST, Some(wire_params))
+            .call(
+                rpc_methods::SESSIONS_TRANSFERREMOTECONTROL,
+                Some(wire_params),
+            )
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Reads lightweight persisted metadata for one local session without opening it.
+    /// Patches the steering state of the active remote-control singleton. When remote control is off, this is a no-op and the off status is returned. Today only `enabled: true` is actionable on the underlying exporter; passing `false` is reserved for future use.
     ///
-    /// Wire method: `sessions.getMetadata`.
+    /// Wire method: `sessions.setRemoteControlSteering`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Session ID whose persisted metadata should be read.
+    /// * `params` - Patch for the singleton's steering state.
     ///
     /// # Returns
     ///
-    /// Persisted local session metadata when the session exists.
+    /// Wrapper for the singleton's current status.
     ///
     /// <div class="warning">
     ///
@@ -2996,29 +6410,28 @@ impl<'a> ClientRpcSessions<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub(crate) async fn get_metadata(
+    pub async fn set_remote_control_steering(
         &self,
-        params: SessionsGetMetadataRequest,
-    ) -> Result<SessionsGetMetadataResult, Error> {
+        params: SessionsSetRemoteControlSteeringRequest,
+    ) -> Result<RemoteControlStatusResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::SESSIONS_GETMETADATA, Some(wire_params))
+            .call(
+                rpc_methods::SESSIONS_SETREMOTECONTROLSTEERING,
+                Some(wire_params),
+            )
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Reads client-owned metadata for multiple persisted local sessions without opening them. Results preserve request order and report missing, corrupt, unsupported, or temporarily unavailable sessions independently.
-    ///
-    /// Wire method: `sessions.getClientMetadata`.
-    ///
-    /// # Parameters
+    /// Stops the remote-control singleton. When `expectedSessionId` is provided and does not match the singleton's current `attachedSessionId`, the stop is rejected with `stopped: false` and the current status is returned unchanged (unless `force` is set, in which case the singleton is unconditionally torn down).
     ///
-    /// * `params` - Bounded batch request for client-owned metadata from persisted local sessions.
+    /// Wire method: `sessions.stopRemoteControl`.
     ///
     /// # Returns
     ///
-    /// Ordered client metadata outcomes for the requested local sessions.
+    /// Outcome of a stopRemoteControl call.
     ///
     /// <div class="warning">
     ///
@@ -3027,29 +6440,26 @@ impl<'a> ClientRpcSessions<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn get_client_metadata(
-        &self,
-        params: SessionsGetClientMetadataRequest,
-    ) -> Result<SessionsGetClientMetadataResult, Error> {
-        let wire_params = serde_json::to_value(params)?;
+    pub async fn stop_remote_control(&self) -> Result<RemoteControlStopResult, Error> {
+        let wire_params = serde_json::json!({});
         let _value = self
             .client
-            .call(rpc_methods::SESSIONS_GETCLIENTMETADATA, Some(wire_params))
+            .call(rpc_methods::SESSIONS_STOPREMOTECONTROL, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Reads a page of durable events directly from a local session's persisted journal without creating, resuming, or activating the session. The first read pins the currently opened journal generation and its byte-length boundary; opaque cursor continuations remain on that generation across runtime-owned compaction, truncation, and rewrite operations, which replace the live path atomically, and events appended after the boundary are excluded. For cold hydration, await the first successful page before activation and establish lossless live-event buffering before resume; merge subsequent live events by ID, preserving persisted order and letting live payloads win. Continuations are process-local, single-use capabilities bound to the originating session and storage context and must be paged sequentially; concurrent or repeated use of the same cursor expires that duplicate read rather than reading the generation twice. A complete snapshot has cursorStatus 'ok' and hasMore false. Snapshots expire after five idle minutes, with at most eight retained per process and idle-only eviction under pressure; completion and cancelled-worker exit release their handles. No transcript copy is created, but retained handles may keep replaced files' disk blocks alive until release. Pages have a soft 1 MiB serialized event-array budget including resolved binary assets; one oversized event is returned alone to guarantee progress. Working memory also includes a record/lookahead and asset resolution; resolving the first binary reference may scan the full pinned generation to build a bounded offset index. If the snapshot expires, is evicted, is cancelled before a continuation is established, or becomes unreadable after an observable unsupported in-place shortening, the continuation returns cursorStatus 'expired' with an empty terminal page and never falls back to a different generation. A missing or initially unreadable journal is an RPC error. Persisted history excludes ephemeral events and may omit payloads that are reconstructed only for an active session; use the active session event stream for post-resume live events.
+    /// Stops the remote-control singleton. When `expectedSessionId` is provided and does not match the singleton's current `attachedSessionId`, the stop is rejected with `stopped: false` and the current status is returned unchanged (unless `force` is set, in which case the singleton is unconditionally torn down).
     ///
-    /// Wire method: `sessions.readPersistedEvents`.
+    /// Wire method: `sessions.stopRemoteControl`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Pagination options for reading an inactive or active local session's persisted event journal.
+    /// * `params` - Parameters for stopping the remote-control singleton.
     ///
     /// # Returns
     ///
-    /// Batch of session events returned by a read, with cursor and continuation metadata.
+    /// Outcome of a stopRemoteControl call.
     ///
     /// <div class="warning">
     ///
@@ -3058,29 +6468,25 @@ impl<'a> ClientRpcSessions<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn read_persisted_events(
+    pub async fn stop_remote_control_with_params(
         &self,
-        params: SessionsReadPersistedEventsRequest,
-    ) -> Result<EventsReadResult, Error> {
+        params: SessionsStopRemoteControlRequest,
+    ) -> Result<RemoteControlStopResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::SESSIONS_READPERSISTEDEVENTS, Some(wire_params))
+            .call(rpc_methods::SESSIONS_STOPREMOTECONTROL, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Lists recent local session IDs that contain user-visible history, omitting housekeeping-only sessions.
-    ///
-    /// Wire method: `sessions.listNonEmptySessionIds`.
-    ///
-    /// # Parameters
+    /// Returns the current state of the remote-control singleton, including the attached session id and frontend URL when active.
     ///
-    /// * `params` - Limit for non-empty local session IDs.
+    /// Wire method: `sessions.getRemoteControlStatus`.
     ///
     /// # Returns
     ///
-    /// Recent local session IDs that contain user-visible history.
+    /// Wrapper for the singleton's current status.
     ///
     /// <div class="warning">
     ///
@@ -3089,32 +6495,25 @@ impl<'a> ClientRpcSessions<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub(crate) async fn list_non_empty_session_ids(
-        &self,
-        params: SessionsListNonEmptySessionIdsRequest,
-    ) -> Result<SessionsListNonEmptySessionIdsResult, Error> {
-        let wire_params = serde_json::to_value(params)?;
+    pub async fn get_remote_control_status(&self) -> Result<RemoteControlStatusResult, Error> {
+        let wire_params = serde_json::json!({});
         let _value = self
             .client
             .call(
-                rpc_methods::SESSIONS_LISTNONEMPTYSESSIONIDS,
+                rpc_methods::SESSIONS_GETREMOTECONTROLSTATUS,
                 Some(wire_params),
             )
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Finds the local session bound to a GitHub task ID, if any.
+    /// Attaches (or detaches) an in-process ExtensionController delegate for the given session in a local host adapter. Pass `controller: undefined` to detach. Internal because the controller cannot cross the JSON-RPC boundary; the runtime manages its own session extension service.
     ///
-    /// Wire method: `sessions.findByTaskId`.
+    /// Wire method: `sessions.configureSessionExtensions`.
     ///
     /// # Parameters
     ///
-    /// * `params` - GitHub task ID to look up.
-    ///
-    /// # Returns
-    ///
-    /// ID of the local session bound to the given GitHub task, or omitted when none.
+    /// * `params` - Params to attach or detach an in-process ExtensionController delegate.
     ///
     /// <div class="warning">
     ///
@@ -3123,29 +6522,54 @@ impl<'a> ClientRpcSessions<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn find_by_task_id(
+    pub(crate) async fn configure_session_extensions(
         &self,
-        params: SessionsFindByTaskIDRequest,
-    ) -> Result<SessionsFindByTaskIDResult, Error> {
+        params: ConfigureSessionExtensionsParams,
+    ) -> Result<(), Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::SESSIONS_FINDBYTASKID, Some(wire_params))
+            .call(
+                rpc_methods::SESSIONS_CONFIGURESESSIONEXTENSIONS,
+                Some(wire_params),
+            )
             .await?;
-        Ok(serde_json::from_value(_value)?)
+        Ok(())
     }
+}
 
-    /// Resolves a UUID prefix to a unique session ID, if exactly one session matches.
+/// `skills.*` RPCs.
+#[derive(Clone, Copy)]
+pub struct ClientRpcSkills<'a> {
+    pub(crate) client: &'a Client,
+}
+
+impl<'a> ClientRpcSkills<'a> {
+    /// `skills.config.*` sub-namespace.
+    pub fn config(&self) -> ClientRpcSkillsConfig<'a> {
+        ClientRpcSkillsConfig {
+            client: self.client,
+        }
+    }
+
+    /// `skills.installations.*` sub-namespace.
+    pub fn installations(&self) -> ClientRpcSkillsInstallations<'a> {
+        ClientRpcSkillsInstallations {
+            client: self.client,
+        }
+    }
+
+    /// Plans installation of a verified Agent Finder Skill candidate without writing files. The returned review is safe to present to a user and installing always leaves the Skill disabled until separately enabled.
     ///
-    /// Wire method: `sessions.findByPrefix`.
+    /// Wire method: `skills.planInstall`.
     ///
     /// # Parameters
     ///
-    /// * `params` - UUID prefix to resolve to a unique session ID.
+    /// * `params` - Side-effect-free planning of one verified Agent Finder Skill candidate.
     ///
     /// # Returns
     ///
-    /// Session ID matching the prefix, omitted when no unique match exists.
+    /// Skill installation management result with the honoured contract, or a typed refusal.
     ///
     /// <div class="warning">
     ///
@@ -3154,29 +6578,29 @@ impl<'a> ClientRpcSessions<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn find_by_prefix(
+    pub async fn plan_install(
         &self,
-        params: SessionsFindByPrefixRequest,
-    ) -> Result<SessionsFindByPrefixResult, Error> {
+        params: SkillPlanInstallRequest,
+    ) -> Result<SkillInstallationManagementResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::SESSIONS_FINDBYPREFIX, Some(wire_params))
+            .call(rpc_methods::SKILLS_PLANINSTALL, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Returns the most-relevant prior session for a given working-directory context.
+    /// Consumes one verified Skill installation plan, requests explicit human consent through installations.confirm on the original connection, then revalidates and installs the Skill disabled.
     ///
-    /// Wire method: `sessions.getLastForContext`.
+    /// Wire method: `skills.applyInstall`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Optional working-directory context used to score session relevance.
+    /// * `params` - Applies exactly one retained verified Skill installation plan.
     ///
     /// # Returns
     ///
-    /// Most-relevant session ID for the supplied context, or omitted when no sessions exist.
+    /// Skill installation result with the honoured contract, or a typed request/negotiation refusal.
     ///
     /// <div class="warning">
     ///
@@ -3185,29 +6609,29 @@ impl<'a> ClientRpcSessions<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn get_last_for_context(
+    pub async fn apply_install(
         &self,
-        params: SessionsGetLastForContextRequest,
-    ) -> Result<SessionsGetLastForContextResult, Error> {
+        params: SkillApplyInstallRequest,
+    ) -> Result<SkillInstallationResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::SESSIONS_GETLASTFORCONTEXT, Some(wire_params))
+            .call(rpc_methods::SKILLS_APPLYINSTALL, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Computes the absolute path to a session's persisted events.jsonl file. Internal: filesystem paths are only meaningful in-process (CLI and runtime share a filesystem). Currently used by the CLI's contribution-graph feature to read historical events directly. Remote SDK consumers must not depend on this; a proper event-query API would replace it if the contribution graph ever needed to work over the wire.
+    /// Prepares a read-only removal plan for an owned verified Agent Finder Skill installation. Uninstall planning is never gated by the Skill-install feature flag.
     ///
-    /// Wire method: `sessions.getEventFilePath`.
+    /// Wire method: `skills.planUninstall`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Session ID whose event-log file path to compute.
+    /// * `params` - Read-only preparation of one owned Skill removal under fresh selected-session authority.
     ///
     /// # Returns
     ///
-    /// Absolute path to the session's events.jsonl file on disk.
+    /// Skill installation management result with the honoured contract, or a typed refusal.
     ///
     /// <div class="warning">
     ///
@@ -3216,25 +6640,29 @@ impl<'a> ClientRpcSessions<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub(crate) async fn get_event_file_path(
+    pub async fn plan_uninstall(
         &self,
-        params: SessionsGetEventFilePathRequest,
-    ) -> Result<SessionsGetEventFilePathResult, Error> {
+        params: SkillPlanUninstallRequest,
+    ) -> Result<SkillInstallationManagementResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::SESSIONS_GETEVENTFILEPATH, Some(wire_params))
+            .call(rpc_methods::SKILLS_PLANUNINSTALL, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Returns the on-disk byte size of each session's workspace directory.
+    /// Consumes an owned Skill removal plan, requests explicit human consent through installations.confirm, refuses drift, and removes the exact owned files through quarantine.
     ///
-    /// Wire method: `sessions.getSizes`.
+    /// Wire method: `skills.applyUninstall`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - One-use application of the exact retained Skill removal plan.
     ///
     /// # Returns
     ///
-    /// Map of sessionId -> on-disk size in bytes for each session's workspace directory.
+    /// Skill installation result with the honoured contract, or a typed request/negotiation refusal.
     ///
     /// <div class="warning">
     ///
@@ -3243,26 +6671,29 @@ impl<'a> ClientRpcSessions<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn get_sizes(&self) -> Result<SessionSizes, Error> {
-        let wire_params = serde_json::json!({});
+    pub async fn apply_uninstall(
+        &self,
+        params: SkillApplyUninstallRequest,
+    ) -> Result<SkillInstallationResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::SESSIONS_GETSIZES, Some(wire_params))
+            .call(rpc_methods::SKILLS_APPLYUNINSTALL, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Returns the subset of the supplied session IDs that are currently held by another running process.
+    /// Discovers skills across global and project sources.
     ///
-    /// Wire method: `sessions.checkInUse`.
+    /// Wire method: `skills.discover`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Session IDs to test for live in-use locks.
+    /// * `params` - Optional project paths and additional skill directories to include in discovery.
     ///
     /// # Returns
     ///
-    /// Session IDs from the input set that are currently in use by another process.
+    /// Skills discovered across global and project sources.
     ///
     /// <div class="warning">
     ///
@@ -3271,29 +6702,26 @@ impl<'a> ClientRpcSessions<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn check_in_use(
-        &self,
-        params: SessionsCheckInUseRequest,
-    ) -> Result<SessionsCheckInUseResult, Error> {
+    pub async fn discover(&self, params: SkillsDiscoverRequest) -> Result<ServerSkillList, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::SESSIONS_CHECKINUSE, Some(wire_params))
+            .call(rpc_methods::SKILLS_DISCOVER, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Returns a session's persisted remote-steerable flag, if any has been recorded. Internal: this is CLI-specific book-keeping used by `--continue` / `--resume` to inherit the prior session's remote-steerable preference. SDK consumers that want similar behavior should manage their own persistence around start/stop calls rather than relying on this runtime-side flag.
+    /// Returns the canonical directories where a client may create skills that the runtime will recognize, including ones that do not exist yet. Project directories become active once created.
     ///
-    /// Wire method: `sessions.getPersistedRemoteSteerable`.
+    /// Wire method: `skills.getDiscoveryPaths`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Session ID to look up the persisted remote-steerable flag for.
+    /// * `params` - Optional project paths to enumerate.
     ///
     /// # Returns
     ///
-    /// The session's persisted remote-steerable flag, or omitted when no value has been persisted.
+    /// Canonical locations where skills can be created so the runtime will recognize them.
     ///
     /// <div class="warning">
     ///
@@ -3302,32 +6730,29 @@ impl<'a> ClientRpcSessions<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub(crate) async fn get_persisted_remote_steerable(
+    pub async fn get_discovery_paths(
         &self,
-        params: SessionsGetPersistedRemoteSteerableRequest,
-    ) -> Result<SessionsGetPersistedRemoteSteerableResult, Error> {
+        params: SkillsGetDiscoveryPathsRequest,
+    ) -> Result<SkillDiscoveryPathList, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(
-                rpc_methods::SESSIONS_GETPERSISTEDREMOTESTEERABLE,
-                Some(wire_params),
-            )
+            .call(rpc_methods::SKILLS_GETDISCOVERYPATHS, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Closes a session: emits shutdown, flushes pending events, releases the in-use lock, and disposes the active session.
+    /// Returns the canonical directories where a client may create skills that the runtime will recognize, including ones that do not exist yet. Project directories become active once created.
     ///
-    /// Wire method: `sessions.close`.
+    /// Wire method: `skills.getDiscoveryPaths`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Session ID to close.
+    /// * `params` - Optional project paths to enumerate.
     ///
     /// # Returns
     ///
-    /// 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.
+    /// Canonical locations where skills can be created so the runtime will recognize them.
     ///
     /// <div class="warning">
     ///
@@ -3336,26 +6761,35 @@ impl<'a> ClientRpcSessions<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn close(&self, params: SessionsCloseRequest) -> Result<SessionsCloseResult, Error> {
+    ///
+    /// Accepts [`SkillsGetDiscoveryPathsOptions`], including inputs added after [`SkillsGetDiscoveryPathsRequest`].
+    pub async fn get_discovery_paths_with_options(
+        &self,
+        params: SkillsGetDiscoveryPathsOptions,
+    ) -> Result<SkillDiscoveryPathList, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::SESSIONS_CLOSE, Some(wire_params))
+            .call(rpc_methods::SKILLS_GETDISCOVERYPATHS, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
+}
 
-    /// Closes, deactivates, and deletes a set of sessions, returning the bytes freed per session.
+/// `skills.config.*` RPCs.
+#[derive(Clone, Copy)]
+pub struct ClientRpcSkillsConfig<'a> {
+    pub(crate) client: &'a Client,
+}
+
+impl<'a> ClientRpcSkillsConfig<'a> {
+    /// Replaces the global list of disabled skills.
     ///
-    /// Wire method: `sessions.bulkDelete`.
+    /// Wire method: `skills.config.setDisabledSkills`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Session IDs to close, deactivate, and delete from disk.
-    ///
-    /// # Returns
-    ///
-    /// Map of sessionId -> bytes freed by removing the session's workspace directory.
+    /// * `params` - Skill names to mark as disabled in global configuration, replacing any previous list.
     ///
     /// <div class="warning">
     ///
@@ -3364,25 +6798,28 @@ impl<'a> ClientRpcSessions<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn bulk_delete(
+    pub async fn set_disabled_skills(
         &self,
-        params: SessionsBulkDeleteRequest,
-    ) -> Result<SessionBulkDeleteResult, Error> {
+        params: SkillsConfigSetDisabledSkillsRequest,
+    ) -> Result<(), Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::SESSIONS_BULKDELETE, Some(wire_params))
+            .call(
+                rpc_methods::SKILLS_CONFIG_SETDISABLEDSKILLS,
+                Some(wire_params),
+            )
             .await?;
-        Ok(serde_json::from_value(_value)?)
+        Ok(())
     }
 
-    /// Deletes one local session from disk after running the same lifecycle hooks as the session manager.
+    /// Atomically adds or removes one skill from the disabled list.
     ///
-    /// Wire method: `sessions.delete`.
+    /// Wire method: `skills.config.setSkillDisabled`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Session ID to delete from disk.
+    /// * `params` - Adds or removes a single skill from the global disabled list, leaving every other entry untouched.
     ///
     /// <div class="warning">
     ///
@@ -3391,26 +6828,40 @@ impl<'a> ClientRpcSessions<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub(crate) async fn delete(&self, params: SessionsDeleteRequest) -> Result<(), Error> {
+    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::SESSIONS_DELETE, Some(wire_params))
+            .call(
+                rpc_methods::SKILLS_CONFIG_SETSKILLDISABLED,
+                Some(wire_params),
+            )
             .await?;
         Ok(())
     }
+}
 
-    /// Deletes sessions older than the given threshold, with optional dry-run and exclusion list.
+/// `skills.installations.*` RPCs.
+#[derive(Clone, Copy)]
+pub struct ClientRpcSkillsInstallations<'a> {
+    pub(crate) client: &'a Client,
+}
+
+impl<'a> ClientRpcSkillsInstallations<'a> {
+    /// Lists owned verified Agent Finder Skill installations for the selected existing session. Listing is never gated by the Skill-install feature flag.
     ///
-    /// Wire method: `sessions.pruneOld`.
+    /// Wire method: `skills.installations.list`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Age threshold and optional flags controlling which old sessions are pruned (or simulated when dryRun is true).
+    /// * `params` - Inventory request under an explicitly selected existing session.
     ///
     /// # Returns
     ///
-    /// Outcome of the prune operation: deleted IDs, dry-run candidates, skipped IDs, total bytes freed, and the dry-run flag.
+    /// Skill installation management result with the honoured contract, or a typed refusal.
     ///
     /// <div class="warning">
     ///
@@ -3419,29 +6870,29 @@ impl<'a> ClientRpcSessions<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn prune_old(
+    pub async fn list(
         &self,
-        params: SessionsPruneOldRequest,
-    ) -> Result<SessionPruneResult, Error> {
+        params: SkillInstallationsRequest,
+    ) -> Result<SkillInstallationManagementResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::SESSIONS_PRUNEOLD, Some(wire_params))
+            .call(rpc_methods::SKILLS_INSTALLATIONS_LIST, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Flushes a session's pending events to disk.
+    /// Reconciles interrupted owned Skill installation work for the selected existing session, then inspects owned inventory. Recovery is never gated by the Skill-install feature flag.
     ///
-    /// Wire method: `sessions.save`.
+    /// Wire method: `skills.installations.recover`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Session ID whose pending events should be flushed to disk.
+    /// * `params` - Inventory request under an explicitly selected existing session.
     ///
     /// # Returns
     ///
-    /// Flush a session's pending events to disk. No-op when no writer exists for the session (e.g., already closed).
+    /// Skill installation management result with the honoured contract, or a typed refusal.
     ///
     /// <div class="warning">
     ///
@@ -3450,26 +6901,29 @@ impl<'a> ClientRpcSessions<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn save(&self, params: SessionsSaveRequest) -> Result<SessionsSaveResult, Error> {
+    pub async fn recover(
+        &self,
+        params: SkillInstallationsRequest,
+    ) -> Result<SkillInstallationManagementResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::SESSIONS_SAVE, Some(wire_params))
+            .call(rpc_methods::SKILLS_INSTALLATIONS_RECOVER, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Releases the in-use lock held by this process for a session.
+    /// Inspects a known Skill installation operation on its original runtime connection. Status is never gated by the Skill-install feature flag.
     ///
-    /// Wire method: `sessions.releaseLock`.
+    /// Wire method: `skills.installations.status`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Session ID whose in-use lock should be released.
+    /// * `params` - Existing-operation control. A new session selector is deliberately not accepted.
     ///
     /// # Returns
     ///
-    /// 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.
+    /// Skill installation management result with the honoured contract, or a typed refusal.
     ///
     /// <div class="warning">
     ///
@@ -3478,29 +6932,29 @@ impl<'a> ClientRpcSessions<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn release_lock(
+    pub async fn status(
         &self,
-        params: SessionsReleaseLockRequest,
-    ) -> Result<SessionsReleaseLockResult, Error> {
+        params: SkillInstallationOperationRequest,
+    ) -> Result<SkillInstallationManagementResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::SESSIONS_RELEASELOCK, Some(wire_params))
+            .call(rpc_methods::SKILLS_INSTALLATIONS_STATUS, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Backfills missing summary and context fields on the supplied session metadata records.
+    /// Requests cancellation of a known Skill installation operation before commit. Already-started durable work requires recovery instead of silent replay.
     ///
-    /// Wire method: `sessions.enrichMetadata`.
+    /// Wire method: `skills.installations.cancel`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Session metadata records to enrich with summary and context information.
+    /// * `params` - Existing-operation control. A new session selector is deliberately not accepted.
     ///
     /// # Returns
     ///
-    /// The enriched metadata records, with summary and context fields backfilled where available. Sessions confirmed empty and unnamed are omitted.
+    /// Skill installation management result with the honoured contract, or a typed refusal.
     ///
     /// <div class="warning">
     ///
@@ -3509,29 +6963,29 @@ impl<'a> ClientRpcSessions<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn enrich_metadata(
+    pub async fn cancel(
         &self,
-        params: SessionsEnrichMetadataRequest,
-    ) -> Result<SessionEnrichMetadataResult, Error> {
+        params: SkillInstallationOperationRequest,
+    ) -> Result<SkillInstallationManagementResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::SESSIONS_ENRICHMETADATA, Some(wire_params))
+            .call(rpc_methods::SKILLS_INSTALLATIONS_CANCEL, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Reloads user, plugin, and (optionally) repo hooks on the active session.
+    /// Atomically persists enablement for one owned Agent Finder Skill and reconciles the selected bound session. Enablement is installation-scoped by receipt identity and is never gated by the Skill-install feature flag.
     ///
-    /// Wire method: `sessions.reloadPluginHooks`.
+    /// Wire method: `skills.installations.setEnabled`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Active session ID and an optional flag for deferring repo-level hooks until folder trust.
+    /// * `params` - Persisted enablement update for one owned Skill installation.
     ///
     /// # Returns
     ///
-    /// 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.
+    /// Skill installation management result with the honoured contract, or a typed refusal.
     ///
     /// <div class="warning">
     ///
@@ -3540,29 +6994,40 @@ impl<'a> ClientRpcSessions<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn reload_plugin_hooks(
+    pub async fn set_enabled(
         &self,
-        params: SessionsReloadPluginHooksRequest,
-    ) -> Result<SessionsReloadPluginHooksResult, Error> {
+        params: SkillSetEnabledRequest,
+    ) -> Result<SkillInstallationManagementResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::SESSIONS_RELOADPLUGINHOOKS, Some(wire_params))
+            .call(
+                rpc_methods::SKILLS_INSTALLATIONS_SETENABLED,
+                Some(wire_params),
+            )
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
+}
 
-    /// Loads previously-deferred repo-level hooks on the active session, returning queued startup prompts.
+/// `tools.*` RPCs.
+#[derive(Clone, Copy)]
+pub struct ClientRpcTools<'a> {
+    pub(crate) client: &'a Client,
+}
+
+impl<'a> ClientRpcTools<'a> {
+    /// Lists built-in tools available for a model.
     ///
-    /// Wire method: `sessions.loadDeferredRepoHooks`.
+    /// Wire method: `tools.list`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Active session ID whose deferred repo-level hooks should be loaded.
+    /// * `params` - Optional model identifier whose tool overrides should be applied to the listing.
     ///
     /// # Returns
     ///
-    /// Queued repo-level startup prompts and the total hook command count after loading.
+    /// Built-in tools available for the requested model, with their parameters and instructions.
     ///
     /// <div class="warning">
     ///
@@ -3571,32 +7036,49 @@ impl<'a> ClientRpcSessions<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn load_deferred_repo_hooks(
-        &self,
-        params: SessionsLoadDeferredRepoHooksRequest,
-    ) -> Result<SessionLoadDeferredRepoHooksResult, Error> {
+    pub async fn list(&self, params: ToolsListRequest) -> Result<ToolList, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(
-                rpc_methods::SESSIONS_LOADDEFERREDREPOHOOKS,
-                Some(wire_params),
-            )
+            .call(rpc_methods::TOOLS_LIST, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
+}
+
+/// `user.*` RPCs.
+#[derive(Clone, Copy)]
+pub struct ClientRpcUser<'a> {
+    pub(crate) client: &'a Client,
+}
+
+impl<'a> ClientRpcUser<'a> {
+    /// `user.settings.*` sub-namespace.
+    pub fn settings(&self) -> ClientRpcUserSettings<'a> {
+        ClientRpcUserSettings {
+            client: self.client,
+        }
+    }
+}
 
-    /// Replaces the manager-wide additional plugins registered with the session manager.
+/// `user.settings.*` RPCs.
+#[derive(Clone, Copy)]
+pub struct ClientRpcUserSettings<'a> {
+    pub(crate) client: &'a Client,
+}
+
+impl<'a> ClientRpcUserSettings<'a> {
+    /// Adds or removes one hook key in the user `disabledHooks` setting, rewriting settings.json in place and leaving every other setting untouched. Reports a typed outcome rather than failing the call, so a host can tell an unparseable settings file apart from a write that could not complete.
     ///
-    /// Wire method: `sessions.setAdditionalPlugins`.
+    /// Wire method: `user.settings.setHookDisabled`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Manager-wide additional plugins to register; replaces any previously-configured set.
+    /// * `params` - One hook to disable or re-enable.
     ///
     /// # Returns
     ///
-    /// 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.
+    /// Outcome of rewriting the `disabledHooks` setting.
     ///
     /// <div class="warning">
     ///
@@ -3605,32 +7087,32 @@ impl<'a> ClientRpcSessions<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn set_additional_plugins(
+    pub(crate) async fn set_hook_disabled(
         &self,
-        params: SessionsSetAdditionalPluginsRequest,
-    ) -> Result<SessionsSetAdditionalPluginsResult, Error> {
+        params: UserSettingsSetHookDisabledRequest,
+    ) -> Result<UserSettingsSetHookDisabledResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
             .call(
-                rpc_methods::SESSIONS_SETADDITIONALPLUGINS,
+                rpc_methods::USER_SETTINGS_SETHOOKDISABLED,
                 Some(wire_params),
             )
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Gets the dynamic-context board entry count associated with a session, when available. Internal: this exists solely so CLI telemetry events (`rem_spawn_gate`, `rem_consolidation_complete`) can pair START / END board counts around the detached rem-agent spawn. "Dynamic context board" is a runtime-internal concept that is not part of the public SDK contract; the long-term plan is to relocate the telemetry emission into the runtime so this method can be deleted entirely.
+    /// Reads the user's settings document exactly as `user.settings.load` does, but from a caller-supplied configuration directory instead of the one the server resolved for itself. Use this when a consumer scopes a session to its own Copilot home — the SDK's per-session `configDir` override — so the settings read match the directory that session actually uses. An absent or empty `configDir` resolves the server's own home, making this identical to `user.settings.load`. Hook-validation relaxations are deliberately not caller-supplied: they continue to come from the server's environment, so a consumer cannot widen the host's hook policy through this method.
     ///
-    /// Wire method: `sessions.getBoardEntryCount`.
+    /// Wire method: `user.settings.loadForConfigDir`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Session ID whose board entry count should be returned.
+    /// * `params` - Selects the configuration directory whose user settings to read.
     ///
     /// # Returns
     ///
-    /// Dynamic-context board entry count, when available.
+    /// The stored user settings document, keyed by setting name.
     ///
     /// <div class="warning">
     ///
@@ -3639,29 +7121,32 @@ impl<'a> ClientRpcSessions<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub(crate) async fn get_board_entry_count(
+    pub(crate) async fn load_for_config_dir(
         &self,
-        params: SessionsGetBoardEntryCountRequest,
-    ) -> Result<SessionsGetBoardEntryCountResult, Error> {
+        params: UserSettingsLoadForConfigDirRequest,
+    ) -> Result<UserSettingsLoadForConfigDirResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::SESSIONS_GETBOARDENTRYCOUNT, Some(wire_params))
+            .call(
+                rpc_methods::USER_SETTINGS_LOADFORCONFIGDIR,
+                Some(wire_params),
+            )
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Attaches the runtime-managed remote-control singleton to a session, awaiting initial setup. If remote control is already attached to a different session, the singleton is transferred (preserving the underlying Mission Control connection). Returns the final status.
+    /// Reads a repository's checked-in settings document as stored, normalized, together with any diagnostic raised while reading it. This is the repository half of the layering `user.settings.get` reports: `user.settings.load` reads the user's own document, and this reads the one a repository checks in to govern the keys `user.settings.governanceKeys` lists as repo-governable. A document that fails to parse, or that sets a key a repository may not govern, is reported through `warning` while the settings that did load are still returned, so a consumer surfaces the diagnostic and continues rather than failing the session. When `repoRoot` is the user's home directory the Claude-compatible configuration is skipped, so a home-directory session does not inherit a personal config as repository policy.
     ///
-    /// Wire method: `sessions.startRemoteControl`.
+    /// Wire method: `user.settings.loadRepo`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Parameters for attaching the remote-control singleton to a session.
+    /// * `params` - Selects the repository whose checked-in settings to read.
     ///
     /// # Returns
     ///
-    /// Wrapper for the singleton's current status.
+    /// A repository's settings as stored, together with any diagnostic raised while reading them.
     ///
     /// <div class="warning">
     ///
@@ -3670,29 +7155,29 @@ impl<'a> ClientRpcSessions<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn start_remote_control(
+    pub(crate) async fn load_repo(
         &self,
-        params: SessionsStartRemoteControlRequest,
-    ) -> Result<RemoteControlStatusResult, Error> {
+        params: UserSettingsLoadRepoRequest,
+    ) -> Result<UserSettingsLoadRepoResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::SESSIONS_STARTREMOTECONTROL, Some(wire_params))
+            .call(rpc_methods::USER_SETTINGS_LOADREPO, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Atomically rebinds the remote-control singleton to a different session, preserving the underlying Mission Control connection. When `expectedFromSessionId` is provided and does not match the singleton's current `attachedSessionId`, the transfer is rejected with `transferred: false` and the current status is returned unchanged.
+    /// Reads a repository's settings and merges them over a supplied user layer in one step, returning the settings a consumer should act on inside that repository. Use this rather than reading the two layers separately: the merge is per setting and collection-aware, so a repository adds to the collections it is allowed to influence without replacing the user's own entries, and a whole-document overlay would get that wrong. Any diagnostic raised while reading the repository layer is returned rather than printed, so the consumer decides how to surface it; the settings that did load are merged regardless.
     ///
-    /// Wire method: `sessions.transferRemoteControl`.
+    /// Wire method: `user.settings.loadAndMergeRepo`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Parameters for atomically rebinding the remote-control singleton.
+    /// * `params` - A repository to read settings from, and the user layer they are merged over.
     ///
     /// # Returns
     ///
-    /// Outcome of a transferRemoteControl call.
+    /// The settings a consumer should act on inside a repository, together with any diagnostic raised while reading the repository layer.
     ///
     /// <div class="warning">
     ///
@@ -3701,32 +7186,28 @@ impl<'a> ClientRpcSessions<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn transfer_remote_control(
+    pub(crate) async fn load_and_merge_repo(
         &self,
-        params: SessionsTransferRemoteControlRequest,
-    ) -> Result<RemoteControlTransferResult, Error> {
+        params: UserSettingsLoadAndMergeRepoRequest,
+    ) -> Result<UserSettingsLoadAndMergeRepoResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
             .call(
-                rpc_methods::SESSIONS_TRANSFERREMOTECONTROL,
+                rpc_methods::USER_SETTINGS_LOADANDMERGEREPO,
                 Some(wire_params),
             )
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Patches the steering state of the active remote-control singleton. When remote control is off, this is a no-op and the off status is returned. Today only `enabled: true` is actionable on the underlying exporter; passing `false` is reserved for future use.
-    ///
-    /// Wire method: `sessions.setRemoteControlSteering`.
-    ///
-    /// # Parameters
+    /// Reports the on-disk path of the settings document `user.settings.load` and `user.settings.set` read and write. Resolved the same way those methods resolve it, so a host that shows or opens the settings file names the file the runtime actually uses, including the extensionless legacy `settings` file when that is what is present.
     ///
-    /// * `params` - Patch for the singleton's steering state.
+    /// Wire method: `user.settings.getPath`.
     ///
     /// # Returns
     ///
-    /// Wrapper for the singleton's current status.
+    /// The on-disk location of the user's settings document.
     ///
     /// <div class="warning">
     ///
@@ -3735,28 +7216,22 @@ impl<'a> ClientRpcSessions<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn set_remote_control_steering(
-        &self,
-        params: SessionsSetRemoteControlSteeringRequest,
-    ) -> Result<RemoteControlStatusResult, Error> {
-        let wire_params = serde_json::to_value(params)?;
+    pub(crate) async fn get_path(&self) -> Result<UserSettingsPathResult, Error> {
+        let wire_params = serde_json::json!({});
         let _value = self
             .client
-            .call(
-                rpc_methods::SESSIONS_SETREMOTECONTROLSTEERING,
-                Some(wire_params),
-            )
+            .call(rpc_methods::USER_SETTINGS_GETPATH, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Stops the remote-control singleton. When `expectedSessionId` is provided and does not match the singleton's current `attachedSessionId`, the stop is rejected with `stopped: false` and the current status is returned unchanged (unless `force` is set, in which case the singleton is unconditionally torn down).
+    /// Reads the user's stored settings together with the diagnostic raised while reading them. This is `user.settings.load` plus the reason part of the document was ignored: that one answers the document alone, so a caller cannot tell a clean read from a salvaged one. Read this when the caller is about to write the file back, where accepting a partial parse would discard every value the loader could not read. The settings that did load are still reported alongside the warning, so a consumer may surface it and continue instead of failing.
     ///
-    /// Wire method: `sessions.stopRemoteControl`.
+    /// Wire method: `user.settings.loadWithWarning`.
     ///
     /// # Returns
     ///
-    /// Outcome of a stopRemoteControl call.
+    /// The user's stored settings, together with any diagnostic raised while reading them.
     ///
     /// <div class="warning">
     ///
@@ -3765,26 +7240,31 @@ impl<'a> ClientRpcSessions<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn stop_remote_control(&self) -> Result<RemoteControlStopResult, Error> {
+    pub(crate) async fn load_with_warning(
+        &self,
+    ) -> Result<UserSettingsLoadWithWarningResult, Error> {
         let wire_params = serde_json::json!({});
         let _value = self
             .client
-            .call(rpc_methods::SESSIONS_STOPREMOTECONTROL, Some(wire_params))
+            .call(
+                rpc_methods::USER_SETTINGS_LOADWITHWARNING,
+                Some(wire_params),
+            )
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Stops the remote-control singleton. When `expectedSessionId` is provided and does not match the singleton's current `attachedSessionId`, the stop is rejected with `stopped: false` and the current status is returned unchanged (unless `force` is set, in which case the singleton is unconditionally torn down).
+    /// Folds a user settings layer over a managed (enterprise policy) layer and returns the merged settings. The managed layer's governance keys win, `autoTier` resolves through its overridable form, and the two per-entry control maps (`enabledPlugins`, `extraKnownMarketplaces`) union across the layers and are then stamped back from the managed layer, so each entry an administrator declares wins while the user keeps control of the rest. The parameters are named for their layers rather than being a generic base/override pair: nothing about a settings object identifies which layer produced it, so the runtime cannot detect a transposed call, and transposing one resolves the governance keys in the user's favour instead of the administrator's. Supplying only one layer returns it unchanged, and supplying neither returns an empty object. Rejects a managed `autoTier` that is neither a user-configurable tier nor a single-key overridable form, rather than silently dropping it.
     ///
-    /// Wire method: `sessions.stopRemoteControl`.
+    /// Wire method: `user.settings.mergeManagedAndUser`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Parameters for stopping the remote-control singleton.
+    /// * `params` - The managed (enterprise policy) layer and the user layer to fold together. The field names carry the layer identity: nothing about a settings object identifies which layer produced it, so a generic base/override pair would let a caller transpose them and silently resolve the governance keys in the user's favour.
     ///
     /// # Returns
     ///
-    /// Outcome of a stopRemoteControl call.
+    /// The user layer folded over the managed layer.
     ///
     /// <div class="warning">
     ///
@@ -3793,25 +7273,32 @@ impl<'a> ClientRpcSessions<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn stop_remote_control_with_params(
+    pub(crate) async fn merge_managed_and_user(
         &self,
-        params: SessionsStopRemoteControlRequest,
-    ) -> Result<RemoteControlStopResult, Error> {
+        params: UserSettingsMergeManagedAndUserParams,
+    ) -> Result<UserSettingsMergeManagedAndUserResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::SESSIONS_STOPREMOTECONTROL, Some(wire_params))
+            .call(
+                rpc_methods::USER_SETTINGS_MERGEMANAGEDANDUSER,
+                Some(wire_params),
+            )
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Returns the current state of the remote-control singleton, including the attached session id and frontend URL when active.
+    /// Folds a repository's settings layer into the user layer. Each repo-overridable key carries a directional policy chosen so a repository can only add restrictions and never relax the user's own. The two per-entry managed control maps are the exception those directional rules cannot express — a repository may legitimately enable plugins and declare marketplaces — so they are re-stamped afterwards from the runtime's ambient managed policy. That makes the result depend on the runtime process's managed state and not on the arguments alone: a host must call this rather than reimplement the fold, or a repository could relax a restriction the administrator imposed. Rejects when either layer is not a JSON object.
     ///
-    /// Wire method: `sessions.getRemoteControlStatus`.
+    /// Wire method: `user.settings.mergeRepoValue`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - The user layer and the repository layer to fold together.
     ///
     /// # Returns
     ///
-    /// Wrapper for the singleton's current status.
+    /// The repository layer folded into the user layer.
     ///
     /// <div class="warning">
     ///
@@ -3820,25 +7307,29 @@ impl<'a> ClientRpcSessions<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn get_remote_control_status(&self) -> Result<RemoteControlStatusResult, Error> {
-        let wire_params = serde_json::json!({});
+    pub(crate) async fn merge_repo_value(
+        &self,
+        params: UserSettingsMergeRepoValueParams,
+    ) -> Result<UserSettingsMergeRepoValueResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(
-                rpc_methods::SESSIONS_GETREMOTECONTROLSTATUS,
-                Some(wire_params),
-            )
+            .call(rpc_methods::USER_SETTINGS_MERGEREPOVALUE, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Attaches (or detaches) an in-process ExtensionController delegate for the given session in a local host adapter. Pass `controller: undefined` to detach. Internal because the controller cannot cross the JSON-RPC boundary; the runtime manages its own session extension service.
+    /// Runs the one-time migration that moves a staff account's update channel to stable, and records that it ran. Idempotent and self-gating: it takes a lock over the global-state file, re-reads the completion stamp inside it, and returns `current` rather than migrating twice, so two hosts racing at startup cannot both migrate. Only a `migrated` status means the persisted settings changed and the caller should reload them. An account on the experimental channel is deliberately left alone and reported as `excluded-experimental`.
     ///
-    /// Wire method: `sessions.configureSessionExtensions`.
+    /// Wire method: `user.settings.migrateStaffUpdateChannelOnce`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Params to attach or detach an in-process ExtensionController delegate.
+    /// * `params` - The filesystem and environment facts a user-settings file is resolved from. Passed explicitly rather than read from the runtime's own process, so a host whose configuration directory differs from its process environment resolves the file it means.
+    ///
+    /// # Returns
+    ///
+    /// The outcome of the one-time staff update-channel migration.
     ///
     /// <div class="warning">
     ///
@@ -3847,54 +7338,32 @@ impl<'a> ClientRpcSessions<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub(crate) async fn configure_session_extensions(
+    pub(crate) async fn migrate_staff_update_channel_once(
         &self,
-        params: ConfigureSessionExtensionsParams,
-    ) -> Result<(), Error> {
+        params: UserSettingsHostContext,
+    ) -> Result<UserSettingsMigrateStaffUpdateChannelOnceResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
             .call(
-                rpc_methods::SESSIONS_CONFIGURESESSIONEXTENSIONS,
+                rpc_methods::USER_SETTINGS_MIGRATESTAFFUPDATECHANNELONCE,
                 Some(wire_params),
             )
             .await?;
-        Ok(())
-    }
-}
-
-/// `skills.*` RPCs.
-#[derive(Clone, Copy)]
-pub struct ClientRpcSkills<'a> {
-    pub(crate) client: &'a Client,
-}
-
-impl<'a> ClientRpcSkills<'a> {
-    /// `skills.config.*` sub-namespace.
-    pub fn config(&self) -> ClientRpcSkillsConfig<'a> {
-        ClientRpcSkillsConfig {
-            client: self.client,
-        }
-    }
-
-    /// `skills.installations.*` sub-namespace.
-    pub fn installations(&self) -> ClientRpcSkillsInstallations<'a> {
-        ClientRpcSkillsInstallations {
-            client: self.client,
-        }
+        Ok(serde_json::from_value(_value)?)
     }
 
-    /// Plans installation of a verified Agent Finder Skill candidate without writing files. The returned review is safe to present to a user and installing always leaves the Skill disabled until separately enabled.
+    /// Runs the one-time reset that clears a staff account's pinned model selection, and reports the timestamp the host should record. Idempotent and self-gating: the reset is gated on a fixed cutoff, so a caller that passes back the timestamp it recorded gets `didReset: false` rather than a second reset. It applies to staff accounts only; any other account is reported as not reset without the settings document being opened. Only `didReset: true` means the persisted settings changed, and only then are the updated settings returned for the host to adopt.
     ///
-    /// Wire method: `skills.planInstall`.
+    /// Wire method: `user.settings.resetStaffModelSelectionOnce`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Side-effect-free planning of one verified Agent Finder Skill candidate.
+    /// * `params` - Selects the configuration directory to run the one-time staff model-selection reset against, and supplies the caller's record of whether it has already run.
     ///
     /// # Returns
     ///
-    /// Skill installation management result with the honoured contract, or a typed refusal.
+    /// The outcome of the one-time staff model-selection reset.
     ///
     /// <div class="warning">
     ///
@@ -3903,29 +7372,32 @@ impl<'a> ClientRpcSkills<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn plan_install(
+    pub(crate) async fn reset_staff_model_selection_once(
         &self,
-        params: SkillPlanInstallRequest,
-    ) -> Result<SkillInstallationManagementResult, Error> {
+        params: UserSettingsResetStaffModelSelectionOnceRequest,
+    ) -> Result<UserSettingsResetStaffModelSelectionOnceResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::SKILLS_PLANINSTALL, Some(wire_params))
+            .call(
+                rpc_methods::USER_SETTINGS_RESETSTAFFMODELSELECTIONONCE,
+                Some(wire_params),
+            )
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Consumes one verified Skill installation plan, requests explicit human consent through installations.confirm on the original connection, then revalidates and installs the Skill disabled.
+    /// Reports the top-level keys in the user settings document that the runtime does not recognize, phrased for display to the user. This is a separate question from the warning `user.settings.loadWithWarning` returns: that one describes parts of the document the loader had to ignore to load the rest, whereas an unknown key parses cleanly and is simply not a setting, so a host that surfaces only the load warning silently accepts a misspelled key that will never take effect. Nothing is reported when the document is absent, unreadable, or failed to load, because an unknown-key list derived from a document the runtime could not read would be misleading rather than helpful. Inspection never modifies the document.
     ///
-    /// Wire method: `skills.applyInstall`.
+    /// Wire method: `user.settings.getUnknownKeysWarning`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Applies exactly one retained verified Skill installation plan.
+    /// * `params` - Selects the configuration directory whose user settings document should be inspected for unrecognized top-level keys.
     ///
     /// # Returns
     ///
-    /// Skill installation result with the honoured contract, or a typed request/negotiation refusal.
+    /// The unrecognized top-level keys found in the user settings document, already phrased for display.
     ///
     /// <div class="warning">
     ///
@@ -3934,29 +7406,32 @@ impl<'a> ClientRpcSkills<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn apply_install(
+    pub(crate) async fn get_unknown_keys_warning(
         &self,
-        params: SkillApplyInstallRequest,
-    ) -> Result<SkillInstallationResult, Error> {
+        params: UserSettingsUnknownKeysWarningRequest,
+    ) -> Result<UserSettingsUnknownKeysWarningResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::SKILLS_APPLYINSTALL, Some(wire_params))
+            .call(
+                rpc_methods::USER_SETTINGS_GETUNKNOWNKEYSWARNING,
+                Some(wire_params),
+            )
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Prepares a read-only removal plan for an owned verified Agent Finder Skill installation. Uninstall planning is never gated by the Skill-install feature flag.
+    /// Resolves the effective runtime settings for a host that is about to start a session, layering the given overrides over the settings documents, the environment and the platform defaults. A host cannot assemble this itself: the precedence between a user document, a repository document, the managed layers and the environment is the runtime's own rule, and a host that re-implements it drifts from the server it is configuring. The working directory, environment and platform are taken as arguments rather than read from the server process, so a host resolving settings for a directory other than its own gets that directory's answer. Nothing is written; this only computes.
     ///
-    /// Wire method: `skills.planUninstall`.
+    /// Wire method: `user.settings.buildRuntime`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Read-only preparation of one owned Skill removal under fresh selected-session authority.
+    /// * `params` - The overrides and host context to resolve effective runtime settings from.
     ///
     /// # Returns
     ///
-    /// Skill installation management result with the honoured contract, or a typed refusal.
+    /// The effective runtime settings, keyed by setting name. Keys this runtime does not recognize are preserved rather than dropped, so a caller reading a document written by a newer runtime keeps every value.
     ///
     /// <div class="warning">
     ///
@@ -3965,29 +7440,29 @@ impl<'a> ClientRpcSkills<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn plan_uninstall(
+    pub(crate) async fn build_runtime(
         &self,
-        params: SkillPlanUninstallRequest,
-    ) -> Result<SkillInstallationManagementResult, Error> {
+        params: UserSettingsBuildRuntimeRequest,
+    ) -> Result<UserSettingsBuildRuntimeResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::SKILLS_PLANUNINSTALL, Some(wire_params))
+            .call(rpc_methods::USER_SETTINGS_BUILDRUNTIME, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Consumes an owned Skill removal plan, requests explicit human consent through installations.confirm, refuses drift, and removes the exact owned files through quarantine.
+    /// Runs the one-time migration that moves a staff account's log level to the current default, and records that it ran. Idempotent and self-gating: it takes a lock over the global-state file and re-reads the completion stamp inside it, so two hosts racing at startup cannot both migrate. Only `refreshed` can have changed the persisted settings, and the settings it returns are the document re-read after the write, so a host should adopt them rather than reloading separately and racing the next writer.
     ///
-    /// Wire method: `skills.applyUninstall`.
+    /// Wire method: `user.settings.migrateStaffLogLevelOnce`.
     ///
     /// # Parameters
     ///
-    /// * `params` - One-use application of the exact retained Skill removal plan.
+    /// * `params` - Selects the configuration directory to run the one-time staff log-level migration against, and supplies the caller's record of whether it has already run.
     ///
     /// # Returns
     ///
-    /// Skill installation result with the honoured contract, or a typed request/negotiation refusal.
+    /// The outcome of the one-time staff log-level migration.
     ///
     /// <div class="warning">
     ///
@@ -3996,29 +7471,32 @@ impl<'a> ClientRpcSkills<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn apply_uninstall(
+    pub(crate) async fn migrate_staff_log_level_once(
         &self,
-        params: SkillApplyUninstallRequest,
-    ) -> Result<SkillInstallationResult, Error> {
+        params: UserSettingsMigrateStaffLogLevelOnceRequest,
+    ) -> Result<UserSettingsMigrateStaffLogLevelOnceResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::SKILLS_APPLYUNINSTALL, Some(wire_params))
+            .call(
+                rpc_methods::USER_SETTINGS_MIGRATESTAFFLOGLEVELONCE,
+                Some(wire_params),
+            )
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Discovers skills across global and project sources.
+    /// Runs the one-time cleanup that removes obsolete CLI-owned settings and legacy rubber-duck keys from the user's settings document, and reports what it did. Idempotent and safe to call on every startup: with nothing obsolete left it reports `unchanged` and writes nothing. The cleanup preserves every key it does not recognize, so a setting written by a newer host is never dropped by an older one, and a document that fails to parse is reported `invalid` and left untouched rather than rewritten from a partial read. The cleaned document is not returned: it is written before this replies, so `user.settings.load` reads it authoritatively. A host that surfaces unrecognized keys through `user.settings.unknownKeys` wants this first, because the keys this retires would otherwise be shown to the user as if they were misspelled settings.
     ///
-    /// Wire method: `skills.discover`.
+    /// Wire method: `user.settings.migrateObsoleteOnDisk`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Optional project paths and additional skill directories to include in discovery.
+    /// * `params` - Selects the configuration directory whose settings document to clean.
     ///
     /// # Returns
     ///
-    /// Skills discovered across global and project sources.
+    /// The outcome of the one-time obsolete-settings cleanup.
     ///
     /// <div class="warning">
     ///
@@ -4027,26 +7505,28 @@ impl<'a> ClientRpcSkills<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn discover(&self, params: SkillsDiscoverRequest) -> Result<ServerSkillList, Error> {
+    pub(crate) async fn migrate_obsolete_on_disk(
+        &self,
+        params: UserSettingsMigrateObsoleteOnDiskRequest,
+    ) -> Result<UserSettingsMigrateObsoleteOnDiskResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::SKILLS_DISCOVER, Some(wire_params))
+            .call(
+                rpc_methods::USER_SETTINGS_MIGRATEOBSOLETEONDISK,
+                Some(wire_params),
+            )
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Returns the canonical directories where a client may create skills that the runtime will recognize, including ones that do not exist yet. Project directories become active once created.
-    ///
-    /// Wire method: `skills.getDiscoveryPaths`.
-    ///
-    /// # Parameters
+    /// Lists every known user setting from settings.json, each with its effective value, its default, and whether it is at the default — so settings the user has never set still appear with their default value. Does not include repository- or enterprise-managed overrides that the runtime layers on top at session time.
     ///
-    /// * `params` - Optional project paths to enumerate.
+    /// Wire method: `user.settings.get`.
     ///
     /// # Returns
     ///
-    /// Canonical locations where skills can be created so the runtime will recognize them.
+    /// Per-key metadata for every known user setting in settings.json, including settings left at their default. Excludes repository- and enterprise-managed overrides.
     ///
     /// <div class="warning">
     ///
@@ -4055,33 +7535,26 @@ impl<'a> ClientRpcSkills<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn get_discovery_paths(
-        &self,
-        params: SkillsGetDiscoveryPathsRequest,
-    ) -> Result<SkillDiscoveryPathList, Error> {
-        let wire_params = serde_json::to_value(params)?;
+    pub async fn get(&self) -> Result<UserSettingsGetResult, Error> {
+        let wire_params = serde_json::json!({});
         let _value = self
             .client
-            .call(rpc_methods::SKILLS_GETDISCOVERYPATHS, Some(wire_params))
+            .call(rpc_methods::USER_SETTINGS_GET, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
-}
 
-/// `skills.config.*` RPCs.
-#[derive(Clone, Copy)]
-pub struct ClientRpcSkillsConfig<'a> {
-    pub(crate) client: &'a Client,
-}
-
-impl<'a> ClientRpcSkillsConfig<'a> {
-    /// Replaces the global list of disabled skills.
+    /// Resolves the on-disk locations of the settings files this runtime reads, so a consumer can show or open them. The user path is the same file `user.settings.get`, `user.settings.load`, and `user.settings.set` operate on. Supply `repoRoot` to also resolve that repository's checked-in and local settings paths. A path is reported whether or not the file exists.
     ///
-    /// Wire method: `skills.config.setDisabledSkills`.
+    /// Wire method: `user.settings.getPaths`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Skill names to mark as disabled in global configuration, replacing any previous list.
+    /// * `params` - Selects which settings file paths to resolve.
+    ///
+    /// # Returns
+    ///
+    /// On-disk locations of the settings files this runtime reads. A path is reported whether or not the file exists.
     ///
     /// <div class="warning">
     ///
@@ -4090,70 +7563,49 @@ impl<'a> ClientRpcSkillsConfig<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn set_disabled_skills(
+    pub(crate) async fn get_paths(
         &self,
-        params: SkillsConfigSetDisabledSkillsRequest,
-    ) -> Result<(), Error> {
+        params: UserSettingsGetPathsRequest,
+    ) -> Result<UserSettingsGetPathsResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(
-                rpc_methods::SKILLS_CONFIG_SETDISABLEDSKILLS,
-                Some(wire_params),
-            )
+            .call(rpc_methods::USER_SETTINGS_GETPATHS, Some(wire_params))
             .await?;
-        Ok(())
+        Ok(serde_json::from_value(_value)?)
     }
 
-    /// Atomically adds or removes one skill from the disabled list.
+    /// Writes one or more user settings to settings.json, replacing each provided top-level key. A key whose value is null is removed.
     ///
-    /// Wire method: `skills.config.setSkillDisabled`.
+    /// Wire method: `user.settings.set`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Adds or removes a single skill from the global disabled list, leaving every other entry untouched.
+    /// * `params` - 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">
     ///
     /// **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(())
-    }
-}
-
-/// `skills.installations.*` RPCs.
-#[derive(Clone, Copy)]
-pub struct ClientRpcSkillsInstallations<'a> {
-    pub(crate) client: &'a Client,
-}
-
-impl<'a> ClientRpcSkillsInstallations<'a> {
-    /// Lists owned verified Agent Finder Skill installations for the selected existing session. Listing is never gated by the Skill-install feature flag.
-    ///
-    /// Wire method: `skills.installations.list`.
+    /// SDK and CLI versions if your code depends on it.
     ///
-    /// # Parameters
+    /// </div>
+    pub async fn set(&self, params: UserSettingsSetRequest) -> Result<(), Error> {
+        let wire_params = serde_json::to_value(params)?;
+        let _value = self
+            .client
+            .call(rpc_methods::USER_SETTINGS_SET, Some(wire_params))
+            .await?;
+        Ok(())
+    }
+
+    /// Lists the top-level user-setting keys by who is allowed to govern them: `repo` keys a repository may override through `.github/copilot/settings.json`, `claudeRepo` keys a repository may override through a Claude-compatible config, and `managed` keys an enterprise policy may fix. The lists are static for a given runtime build and fail closed: a key absent from a list cannot be governed that way.
     ///
-    /// * `params` - Inventory request under an explicitly selected existing session.
+    /// Wire method: `user.settings.listGovernanceKeys`.
     ///
     /// # Returns
     ///
-    /// Skill installation management result with the honoured contract, or a typed refusal.
+    /// Top-level user-setting keys grouped by who may govern them.
     ///
     /// <div class="warning">
     ///
@@ -4162,29 +7614,31 @@ impl<'a> ClientRpcSkillsInstallations<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn list(
+    pub(crate) async fn list_governance_keys(
         &self,
-        params: SkillInstallationsRequest,
-    ) -> Result<SkillInstallationManagementResult, Error> {
-        let wire_params = serde_json::to_value(params)?;
+    ) -> Result<UserSettingsGovernanceKeysResult, Error> {
+        let wire_params = serde_json::json!({});
         let _value = self
             .client
-            .call(rpc_methods::SKILLS_INSTALLATIONS_LIST, Some(wire_params))
+            .call(
+                rpc_methods::USER_SETTINGS_LISTGOVERNANCEKEYS,
+                Some(wire_params),
+            )
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Reconciles interrupted owned Skill installation work for the selected existing session, then inspects owned inventory. Recovery is never gated by the Skill-install feature flag.
+    /// Atomically edits one canonical user setting inside its settings-file lock. Reads, canonicalizes touched aliases, applies the edit, validates the resulting top-level setting and writes before releasing the lock. An explicit autoUpdatesChannel set completes the staff migration in the same transaction. Only a malformed existing file returns `invalid`; refused keys, invalid values and I/O errors reject the call.
     ///
-    /// Wire method: `skills.installations.recover`.
+    /// Wire method: `user.settings.edit`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Inventory request under an explicitly selected existing session.
+    /// * `params` - One atomic edit of a canonical setting in settings.json.
     ///
     /// # Returns
     ///
-    /// Skill installation management result with the honoured contract, or a typed refusal.
+    /// Outcome of an atomic user or repository settings edit.
     ///
     /// <div class="warning">
     ///
@@ -4193,29 +7647,29 @@ impl<'a> ClientRpcSkillsInstallations<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn recover(
+    pub(crate) async fn edit(
         &self,
-        params: SkillInstallationsRequest,
-    ) -> Result<SkillInstallationManagementResult, Error> {
+        params: UserSettingsEditRequest,
+    ) -> Result<SettingsEditResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::SKILLS_INSTALLATIONS_RECOVER, Some(wire_params))
+            .call(rpc_methods::USER_SETTINGS_EDIT, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Inspects a known Skill installation operation on its original runtime connection. Status is never gated by the Skill-install feature flag.
+    /// Rewrites legacy and snake_case setting names in a settings object to their canonical spelling. A caller editing settings.json must normalize before writing: a legacy key left in place survives the write, is re-normalized on the next load, and silently shadows the canonical value the write just stored.
     ///
-    /// Wire method: `skills.installations.status`.
+    /// Wire method: `user.settings.normalize`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Existing-operation control. A new session selector is deliberately not accepted.
+    /// * `params` - Settings object whose key names should be canonicalized.
     ///
     /// # Returns
     ///
-    /// Skill installation management result with the honoured contract, or a typed refusal.
+    /// Settings object with canonical key names.
     ///
     /// <div class="warning">
     ///
@@ -4224,29 +7678,29 @@ impl<'a> ClientRpcSkillsInstallations<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn status(
+    pub(crate) async fn normalize(
         &self,
-        params: SkillInstallationOperationRequest,
-    ) -> Result<SkillInstallationManagementResult, Error> {
+        params: UserSettingsNormalizeRequest,
+    ) -> Result<UserSettingsNormalizeResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::SKILLS_INSTALLATIONS_STATUS, Some(wire_params))
+            .call(rpc_methods::USER_SETTINGS_NORMALIZE, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Requests cancellation of a known Skill installation operation before commit. Already-started durable work requires recovery instead of silent replay.
+    /// Diagnoses a set of already-loaded settings layers, reporting each key that will not take effect and why. Settings load tolerantly so that one bad key does not stop a session from starting; this method surfaces what was dropped so a caller can report it instead of silently ignoring the user's intent. Takes the layers as given rather than reading them, so a caller can diagnose exactly the content it is showing, including unsaved edits. Never echoes a setting's value, because a value may be a token or another secret. Marked internal because it exists to carry a CLI call site off the native addon, not to serve a consumer-facing need; it becomes public once an SDK consumer needs to inspect settings health itself.
     ///
-    /// Wire method: `skills.installations.cancel`.
+    /// Wire method: `user.settings.diagnoseProblems`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Existing-operation control. A new session selector is deliberately not accepted.
+    /// * `params` - The settings layers to diagnose.
     ///
     /// # Returns
     ///
-    /// Skill installation management result with the honoured contract, or a typed refusal.
+    /// The settings that will not take effect across the given layers.
     ///
     /// <div class="warning">
     ///
@@ -4255,29 +7709,32 @@ impl<'a> ClientRpcSkillsInstallations<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn cancel(
+    pub(crate) async fn diagnose_problems(
         &self,
-        params: SkillInstallationOperationRequest,
-    ) -> Result<SkillInstallationManagementResult, Error> {
+        params: UserSettingsProblemsRequest,
+    ) -> Result<UserSettingsProblemsResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::SKILLS_INSTALLATIONS_CANCEL, Some(wire_params))
+            .call(
+                rpc_methods::USER_SETTINGS_DIAGNOSEPROBLEMS,
+                Some(wire_params),
+            )
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Atomically persists enablement for one owned Agent Finder Skill and reconciles the selected bound session. Enablement is installation-scoped by receipt identity and is never gated by the Skill-install feature flag.
+    /// Validates one top-level setting subtree and writes just that key to settings.json as a single step. Doing both here closes the race a caller cannot close itself: between a separate preflight read and the write, the file may change. Rewriting only the touched key keeps legacy siblings out of settings.json. Answers a status rather than failing, so a validation problem and a write problem stay distinguishable.
     ///
-    /// Wire method: `skills.installations.setEnabled`.
+    /// Wire method: `user.settings.applyTopKey`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Persisted enablement update for one owned Skill installation.
+    /// * `params` - A single top-level setting subtree to validate and write.
     ///
     /// # Returns
     ///
-    /// Skill installation management result with the honoured contract, or a typed refusal.
+    /// Outcome of validating and writing one top-level setting subtree.
     ///
     /// <div class="warning">
     ///
@@ -4286,40 +7743,25 @@ impl<'a> ClientRpcSkillsInstallations<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn set_enabled(
+    pub(crate) async fn apply_top_key(
         &self,
-        params: SkillSetEnabledRequest,
-    ) -> Result<SkillInstallationManagementResult, Error> {
+        params: UserSettingsApplyTopKeyRequest,
+    ) -> Result<UserSettingsApplyTopKeyResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(
-                rpc_methods::SKILLS_INSTALLATIONS_SETENABLED,
-                Some(wire_params),
-            )
+            .call(rpc_methods::USER_SETTINGS_APPLYTOPKEY, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
-}
-
-/// `tools.*` RPCs.
-#[derive(Clone, Copy)]
-pub struct ClientRpcTools<'a> {
-    pub(crate) client: &'a Client,
-}
 
-impl<'a> ClientRpcTools<'a> {
-    /// Lists built-in tools available for a model.
+    /// Replaces the user settings file's entire content in one write. A key absent from `settings` is removed, which is what distinguishes this from `user.settings.set`: that one merges, so it can never clear a key the caller has dropped. For a caller saving the result of a raw edit, a merge would silently resurrect every key the user deleted. Records the same one-time mutation marks a per-key write records, so a setting the user has now chosen explicitly stops being migrated for them.
     ///
-    /// Wire method: `tools.list`.
+    /// Wire method: `user.settings.writeAll`.
     ///
     /// # Parameters
     ///
-    /// * `params` - Optional model identifier whose tool overrides should be applied to the listing.
-    ///
-    /// # Returns
-    ///
-    /// Built-in tools available for the requested model, with their parameters and instructions.
+    /// * `params` - The whole content to store in the user settings file.
     ///
     /// <div class="warning">
     ///
@@ -4328,41 +7770,26 @@ impl<'a> ClientRpcTools<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn list(&self, params: ToolsListRequest) -> Result<ToolList, Error> {
+    pub(crate) async fn write_all(&self, params: UserSettingsWriteAllRequest) -> Result<(), Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::TOOLS_LIST, Some(wire_params))
+            .call(rpc_methods::USER_SETTINGS_WRITEALL, Some(wire_params))
             .await?;
-        Ok(serde_json::from_value(_value)?)
-    }
-}
-
-/// `user.*` RPCs.
-#[derive(Clone, Copy)]
-pub struct ClientRpcUser<'a> {
-    pub(crate) client: &'a Client,
-}
-
-impl<'a> ClientRpcUser<'a> {
-    /// `user.settings.*` sub-namespace.
-    pub fn settings(&self) -> ClientRpcUserSettings<'a> {
-        ClientRpcUserSettings {
-            client: self.client,
-        }
+        Ok(())
     }
-}
-
-/// `user.settings.*` RPCs.
-#[derive(Clone, Copy)]
-pub struct ClientRpcUserSettings<'a> {
-    pub(crate) client: &'a Client,
-}
 
-impl<'a> ClientRpcUserSettings<'a> {
-    /// Drops this runtime process's in-memory user settings cache so the next settings read observes disk.
+    /// Merges a partial object into one top-level user setting, re-reading the stored value inside this runtime process's settings.json write lock so that concurrent writers in this process to different sub-fields of the same key do not clobber each other. Unlike `user.settings.set`, which replaces a key's whole value with what the caller last read, this keeps sub-fields the caller did not name when both the stored value and supplied value are objects; otherwise the supplied value replaces the stored value. Use it whenever two independent surfaces own different sub-fields of one setting. Returns the key's stored value after the write, in `value`.
+    ///
+    /// Wire method: `user.settings.update`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Names the user setting to merge into, and the partial object to merge.
+    ///
+    /// # Returns
     ///
-    /// Wire method: `user.settings.reload`.
+    /// The stored value of the user setting after the merge.
     ///
     /// <div class="warning">
     ///
@@ -4371,22 +7798,25 @@ impl<'a> ClientRpcUserSettings<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn reload(&self) -> Result<(), Error> {
-        let wire_params = serde_json::json!({});
+    pub(crate) async fn update(
+        &self,
+        params: UserSettingsUpdateRequest,
+    ) -> Result<UserSettingsUpdateResult, Error> {
+        let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::USER_SETTINGS_RELOAD, Some(wire_params))
+            .call(rpc_methods::USER_SETTINGS_UPDATE, Some(wire_params))
             .await?;
-        Ok(())
+        Ok(serde_json::from_value(_value)?)
     }
 
-    /// Lists every known user setting (settings.json overlaid with the legacy config.json, config.json wins), each with its effective value, its default, and whether it is at the default — so settings the user has never set still appear with their default value. Does not include repository- or enterprise-managed overrides that the runtime layers on top at session time.
+    /// Reads settings.json as stored for a caller that is about to edit it. Unlike `user.settings.get`, this returns file values rather than per-key metadata and defaults. Reports `missing` for an absent file and `invalid` when the existing file will not parse. Retired config.json and extensionless files are not read.
     ///
-    /// Wire method: `user.settings.get`.
+    /// Wire method: `user.settings.loadForEdit`.
     ///
     /// # Returns
     ///
-    /// 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.
+    /// Contents of settings.json as stored, for a caller about to rewrite it.
     ///
     /// <div class="warning">
     ///
@@ -4395,26 +7825,26 @@ impl<'a> ClientRpcUserSettings<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn get(&self) -> Result<UserSettingsGetResult, Error> {
+    pub(crate) async fn load_for_edit(&self) -> Result<UserSettingsLoadForEditResult, Error> {
         let wire_params = serde_json::json!({});
         let _value = self
             .client
-            .call(rpc_methods::USER_SETTINGS_GET, Some(wire_params))
+            .call(rpc_methods::USER_SETTINGS_LOADFOREDIT, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Writes one or more user settings to settings.json, replacing each provided top-level key. A key whose value is null is removed. Returns the keys whose new value is shadowed by a legacy config.json entry (config.json wins on read), which the runtime leaves in place — such writes do not take effect until the legacy value is removed.
+    /// Validates one top-level setting subtree without writing it, reporting each problem with the path it applies to. Scoped to a single top-level key on purpose: validating the whole file would reject an edit whenever an unrelated pre-existing field is malformed, locking the user out of the very tool that could fix it.
     ///
-    /// Wire method: `user.settings.set`.
+    /// Wire method: `user.settings.validate`.
     ///
     /// # Parameters
     ///
-    /// * `params` - 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.
+    /// * `params` - A single top-level setting subtree to validate.
     ///
     /// # Returns
     ///
-    /// Outcome of writing user settings.
+    /// Outcome of validating one top-level setting subtree.
     ///
     /// <div class="warning">
     ///
@@ -4423,14 +7853,14 @@ impl<'a> ClientRpcUserSettings<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub async fn set(
+    pub(crate) async fn validate(
         &self,
-        params: UserSettingsSetRequest,
-    ) -> Result<UserSettingsSetResult, Error> {
+        params: UserSettingsValidateRequest,
+    ) -> Result<UserSettingsValidateResult, Error> {
         let wire_params = serde_json::to_value(params)?;
         let _value = self
             .client
-            .call(rpc_methods::USER_SETTINGS_SET, Some(wire_params))
+            .call(rpc_methods::USER_SETTINGS_VALIDATE, Some(wire_params))
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
@@ -4667,6 +8097,13 @@ impl<'a> SessionRpc<'a> {
         }
     }
 
+    /// `session.quota.*` sub-namespace.
+    pub fn quota(&self) -> SessionRpcQuota<'a> {
+        SessionRpcQuota {
+            session: self.session,
+        }
+    }
+
     /// `session.remote.*` sub-namespace.
     pub fn remote(&self) -> SessionRpcRemote<'a> {
         SessionRpcRemote {
@@ -6840,7 +10277,7 @@ impl<'a> SessionRpcExtensions<'a> {
         Ok(serde_json::from_value(_value)?)
     }
 
-    /// Enables an extension for the session.
+    /// Enables an extension for the session and persists the preference when the session has a settings store. Hosts synchronizing effective membership should use extensions.reconcile instead.
     ///
     /// Wire method: `session.extensions.enable`.
     ///
@@ -6866,7 +10303,7 @@ impl<'a> SessionRpcExtensions<'a> {
         Ok(())
     }
 
-    /// Disables an extension for the session.
+    /// Disables an extension for the session and persists the preference when the session has a settings store. Hosts synchronizing effective membership should use extensions.reconcile instead.
     ///
     /// Wire method: `session.extensions.disable`.
     ///
@@ -6913,6 +10350,31 @@ impl<'a> SessionRpcExtensions<'a> {
         Ok(())
     }
 
+    /// Host-only reconciliation of authoritative session-effective extension membership and enablement. Refreshes runtime-owned discovery and preferences without persisting settings, installing plugins, or restarting unchanged activations. Returns ExtensionList only after required starts and process/contribution cleanup settle. Takes no caller inventory or overrides. Missing controllers, unready/incomplete discovery, unavailable workspaces, superseded inputs, and lifecycle failures are errors, not empty membership. Independently proven revocations may be applied before an error; retry converges without restarting healthy activations. Error data contains lifecycleChangesApplied and code: extension_reconciliation_host_required, extension_reconciliation_unavailable, extension_reconciliation_not_ready, extension_reconciliation_discovery_failed, extension_reconciliation_workspace_unavailable, extension_reconciliation_superseded, or extension_reconciliation_lifecycle_failed. Mark host reconciliation state applied only on success. On older runtimes, method-not-found must not fall back to global discovery and persistent extension disables.
+    ///
+    /// Wire method: `session.extensions.reconcile`.
+    ///
+    /// # Returns
+    ///
+    /// Extensions discovered for the session, with their current status.
+    ///
+    /// <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 reconcile(&self) -> Result<ExtensionList, Error> {
+        let wire_params = serde_json::json!({ "sessionId": self.session.id() });
+        let _value = self
+            .session
+            .client()
+            .call(rpc_methods::SESSION_EXTENSIONS_RECONCILE, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
     /// Push attachments into the next user-message turn from an extension. The host should surface them as composer pills and forward them via the next session.send call. Callable only by extension-owned connections.
     ///
     /// Wire method: `session.extensions.sendAttachmentsToMessage`.
@@ -7846,7 +11308,39 @@ impl<'a> SessionRpcMcp<'a> {
         }
     }
 
-    /// Lists MCP servers configured for the session, their connection status, and host-level state. The host-level state (disabled/filtered servers, failed/needs-auth/pending connections, mcp3p policy, full config) is empty/zero when no MCP host has been initialized for the session.
+    /// Records the IDE the host is connected to, so the agent's system prompt can name it and its workspace folder. Null or an omitted `ide` clears the recorded value, which is how a host reports that it is disconnected; there is no separate clear method. Both `ideName` and `workspaceFolder` are required together, because half a state cannot be attributed to a project.
+    ///
+    /// Wire method: `session.mcp.setConnectedIdeInfo`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Records which IDE the host is connected to, or clears it.
+    ///
+    /// <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 set_connected_ide_info(
+        &self,
+        params: SessionMcpSetConnectedIdeInfoParams,
+    ) -> 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_MCP_SETCONNECTEDIDEINFO,
+                Some(wire_params),
+            )
+            .await?;
+        Ok(())
+    }
+
+    /// Lists materialized MCP servers and their connection status. Cache misses may start and wait for MCP servers.
     ///
     /// Wire method: `session.mcp.list`.
     ///
@@ -7871,6 +11365,31 @@ impl<'a> SessionRpcMcp<'a> {
         Ok(serde_json::from_value(_value)?)
     }
 
+    /// Lists effective MCP configuration without starting, restarting, authenticating, or waiting for servers. An optional live observation is from an already materialized matching server; this is not a readiness guarantee.
+    ///
+    /// Wire method: `session.mcp.listConfigured`.
+    ///
+    /// # Returns
+    ///
+    /// Effective MCP configuration with optional live observations from matching already materialized servers.
+    ///
+    /// <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 list_configured(&self) -> Result<McpConfiguredServerList, Error> {
+        let wire_params = serde_json::json!({ "sessionId": self.session.id() });
+        let _value = self
+            .session
+            .client()
+            .call(rpc_methods::SESSION_MCP_LISTCONFIGURED, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
     /// Lists the tools exposed by a connected MCP server on this session's host. This performs a live `tools/list` request. Tool UI metadata is returned independently of whether MCP Apps rendering is enabled for the session.
     ///
     /// Wire method: `session.mcp.listTools`.
@@ -9770,6 +13289,41 @@ impl<'a> SessionRpcModel<'a> {
         Ok(serde_json::from_value(_value)?)
     }
 
+    /// Switches the session to a model and optional reasoning configuration.
+    ///
+    /// Wire method: `session.model.switchTo`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Target model identifier and optional reasoning effort, summary, capability overrides, and context tier.
+    ///
+    /// # 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>
+    ///
+    /// Accepts [`ModelSwitchToOptions`], including inputs added after [`ModelSwitchToRequest`].
+    pub async fn switch_to_with_options(
+        &self,
+        params: ModelSwitchToOptions,
+    ) -> 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_SWITCHTO, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
     /// Requests an Auto preference change without changing the session's selected model. The latest unclaimed request wins; the runtime commits it only after a later prompt using the `auto` model mints a usable model and token pair. A `pending` response confirms that the request was accepted, not that it committed. Observe eventual success through `session.model_change`, failure through the ephemeral `session.auto_tier_switch_failed` event, or current unclaimed state through `session.model.getCurrent`.
     ///
     /// Wire method: `session.model.switchAutoTier`.
@@ -9803,17 +13357,45 @@ 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
+    /// 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)?)
+    }
+
+    /// Clears an unchanged startup model/provider seed before default-model resolution. Never clears a resumed or user-selected model.
     ///
-    /// * `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.
+    /// Wire method: `session.model.clearStartupSeed`.
     ///
     /// <div class="warning">
     ///
@@ -9822,17 +13404,17 @@ impl<'a> SessionRpcModel<'a> {
     /// SDK and CLI versions if your code depends on it.
     ///
     /// </div>
-    pub(crate) async fn apply_startup_overlay(
+    pub(crate) async fn clear_startup_seed(
         &self,
-        params: ModelApplyStartupOverlayRequest,
-    ) -> Result<ModelSwitchToResult, Error> {
+        params: SessionModelClearStartupSeedParams,
+    ) -> Result<ModelClearStartupSeedResult, 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,
+                rpc_methods::SESSION_MODEL_CLEARSTARTUPSEED,
                 Some(wire_params),
             )
             .await?;
@@ -9911,6 +13493,42 @@ impl<'a> SessionRpcModel<'a> {
         Ok(serde_json::from_value(_value)?)
     }
 
+    /// Computes whether the session's current model shows reasoning summaries and how a host should present them: the default Ctrl+T visibility, reasoning headers, the hidden-summaries hint, and whether a persisted `showReasoning` setting is redundant. The runtime folds in the session's model catalog, selection and reasoning-summaries experiment assignment; the host supplies only its own persisted setting and current visibility. This method reads the session's resolved model catalog rather than resolving it, so call `session.model.list` first on a session that has not listed models or run a turn; until then the result is `ready: false`. A session that resolves models without a Copilot catalog, that is a BYOK registry or an alternate provider, never caches one and stays `ready: false`.
+    ///
+    /// Wire method: `session.model.getReasoningSummaries`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Host presentation state the reasoning-summaries policy depends on.
+    ///
+    /// # Returns
+    ///
+    /// Reasoning-summaries presentation policy for the session's current model.
+    ///
+    /// <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_reasoning_summaries(
+        &self,
+        params: ModelGetReasoningSummariesRequest,
+    ) -> Result<ModelGetReasoningSummariesResult, 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_GETREASONINGSUMMARIES,
+                Some(wire_params),
+            )
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
     /// Lists models available to this session using its own auth and integration context. Connected hosts (CLI TUI, GitHub App) should call this through the session client so remote sessions return the remote CLI's available models rather than the caller's.
     ///
     /// Wire method: `session.model.list`.
@@ -11255,6 +14873,64 @@ impl<'a> SessionRpcPlugins<'a> {
             .await?;
         Ok(())
     }
+
+    /// Installs or updates the plugins the session's managed settings require now, without waiting for the next automatic attempt after a failure, then reloads plugins. Reports progress and failures with the same `session.info` and `session.warning` events as automatic preparation. Fails when the runtime does not prepare managed plugins for the session.
+    ///
+    /// Wire method: `session.plugins.retryManaged`.
+    ///
+    /// # Returns
+    ///
+    /// Per-plugin outcomes of retrying the plugins required by the session's managed settings.
+    ///
+    /// <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 retry_managed(&self) -> Result<SessionPluginsRetryManagedResult, Error> {
+        let wire_params = serde_json::json!({ "sessionId": self.session.id() });
+        let _value = self
+            .session
+            .client()
+            .call(rpc_methods::SESSION_PLUGINS_RETRYMANAGED, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Installs or updates the plugins the session's managed settings require now, without waiting for the next automatic attempt after a failure, then reloads plugins. Reports progress and failures with the same `session.info` and `session.warning` events as automatic preparation. Fails when the runtime does not prepare managed plugins for the session.
+    ///
+    /// Wire method: `session.plugins.retryManaged`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Plugins required by the session's managed settings to install or update again.
+    ///
+    /// # Returns
+    ///
+    /// Per-plugin outcomes of retrying the plugins required by the session's managed settings.
+    ///
+    /// <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 retry_managed_with_params(
+        &self,
+        params: SessionPluginsRetryManagedRequest,
+    ) -> Result<SessionPluginsRetryManagedResult, 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_PLUGINS_RETRYMANAGED, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
 }
 
 /// `session.plugins.marketplaces.*` RPCs.
@@ -12423,6 +16099,89 @@ impl<'a> SessionRpcQueue<'a> {
     }
 }
 
+/// `session.quota.*` RPCs.
+#[derive(Clone, Copy)]
+pub struct SessionRpcQuota<'a> {
+    pub(crate) session: &'a Session,
+}
+
+impl<'a> SessionRpcQuota<'a> {
+    /// Gets the session's current quota and account projection without making a network request.
+    ///
+    /// Wire method: `session.quota.get`.
+    ///
+    /// # Returns
+    ///
+    /// The incumbent session-owned quota and account projection.
+    ///
+    /// <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(&self) -> Result<SessionQuotaProjection, Error> {
+        let wire_params = serde_json::json!({ "sessionId": self.session.id() });
+        let _value = self
+            .session
+            .client()
+            .call(rpc_methods::SESSION_QUOTA_GET, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Refreshes the session's provider model catalog bypassing its cache, folds quota snapshots into session state, and returns the updated projection. Failures leave the last known quota intact.
+    ///
+    /// Wire method: `session.quota.refresh`.
+    ///
+    /// # Returns
+    ///
+    /// The incumbent session-owned quota and account projection.
+    ///
+    /// <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 refresh(&self) -> Result<SessionQuotaProjection, Error> {
+        let wire_params = serde_json::json!({ "sessionId": self.session.id() });
+        let _value = self
+            .session
+            .client()
+            .call(rpc_methods::SESSION_QUOTA_REFRESH, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
+    /// Returns and clears the session's pending quota warnings. Reading or refreshing quota does not drain warnings.
+    ///
+    /// Wire method: `session.quota.takeWarnings`.
+    ///
+    /// # Returns
+    ///
+    /// Pending warnings returned and cleared by session.quota.takeWarnings.
+    ///
+    /// <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 take_warnings(&self) -> Result<QuotaTakeWarningsResult, Error> {
+        let wire_params = serde_json::json!({ "sessionId": self.session.id() });
+        let _value = self
+            .session
+            .client()
+            .call(rpc_methods::SESSION_QUOTA_TAKEWARNINGS, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+}
+
 /// `session.remote.*` RPCs.
 #[derive(Clone, Copy)]
 pub struct SessionRpcRemote<'a> {
@@ -12553,6 +16312,36 @@ impl<'a> SessionRpcSandbox<'a> {
         Ok(serde_json::from_value(_value)?)
     }
 
+    /// Lists possible secret-bearing environment variables available to new sandboxed shells that are not already covered by credential masking. Uses local name rules and known-provider host suggestions, never returns secret values, and changes no settings or network permissions. Returns no suggestions while the session is not sandboxed.
+    ///
+    /// Wire method: `session.sandbox.getCredentialSuggestions`.
+    ///
+    /// # Returns
+    ///
+    /// Possible unconfigured secrets in the sandbox shell environment, sorted by variable name, with no secret values.
+    ///
+    /// <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_credential_suggestions(
+        &self,
+    ) -> Result<SandboxCredentialSuggestionsResult, Error> {
+        let wire_params = serde_json::json!({ "sessionId": self.session.id() });
+        let _value = self
+            .session
+            .client()
+            .call(
+                rpc_methods::SESSION_SANDBOX_GETCREDENTIALSUGGESTIONS,
+                Some(wire_params),
+            )
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
     /// Disables sandboxing for the remainder of the current session and approves the referenced pending sandbox-bypass permission request. The request is rejected unless the exact request is still pending and the effective sandbox policy permits bypass.
     ///
     /// Wire method: `session.sandbox.disableForSession`.
@@ -13883,6 +17672,34 @@ impl<'a> SessionRpcTools<'a> {
         Ok(serde_json::from_value(_value)?)
     }
 
+    /// Lists the external tool calls of the session and its sub-agents that are still waiting for session.tools.handlePendingToolCall.
+    ///
+    /// Wire method: `session.tools.listPendingRequests`.
+    ///
+    /// # Returns
+    ///
+    /// External tool calls still waiting for a result.
+    ///
+    /// <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 list_pending_requests(&self) -> Result<PendingExternalToolRequestList, Error> {
+        let wire_params = serde_json::json!({ "sessionId": self.session.id() });
+        let _value = self
+            .session
+            .client()
+            .call(
+                rpc_methods::SESSION_TOOLS_LISTPENDINGREQUESTS,
+                Some(wire_params),
+            )
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
+
     /// Resolves, builds, and validates the runtime tool list for the session.
     ///
     /// Wire method: `session.tools.initializeAndValidate`.
@@ -14501,6 +18318,35 @@ impl<'a> SessionRpcUsage<'a> {
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
+
+    /// Internal host-only replacement of absolute code-change totals reported by a relay host.
+    ///
+    /// Wire method: `session.usage.setCodeChanges`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Internal absolute code-change totals reported by the owning 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 set_code_changes(
+        &self,
+        params: SessionUsageSetCodeChangesParams,
+    ) -> 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_USAGE_SETCODECHANGES, Some(wire_params))
+            .await?;
+        Ok(())
+    }
 }
 
 /// `session.visibility.*` RPCs.
@@ -15712,4 +19558,39 @@ impl<'a> SessionRpcWorkspaces<'a> {
             .await?;
         Ok(serde_json::from_value(_value)?)
     }
+
+    /// Computes a diff for the session workspace. Never rejects for a busy session: a `session`-mode diff that cannot read the session's file-change captures falls back to an unstaged git diff with `isFallback: true` and reports why in `unavailableReason`.
+    ///
+    /// Wire method: `session.workspaces.diff`.
+    ///
+    /// # Parameters
+    ///
+    /// * `params` - Parameters for computing a workspace diff.
+    ///
+    /// # Returns
+    ///
+    /// Workspace diff result for the requested mode.
+    ///
+    /// <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>
+    ///
+    /// Accepts [`WorkspacesDiffOptions`], including inputs added after [`WorkspacesDiffRequest`].
+    pub async fn diff_with_options(
+        &self,
+        params: WorkspacesDiffOptions,
+    ) -> Result<WorkspaceDiffResult, 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_WORKSPACES_DIFF, Some(wire_params))
+            .await?;
+        Ok(serde_json::from_value(_value)?)
+    }
 }
diff --git a/rust/src/generated/session_events.rs b/rust/src/generated/session_events.rs
index 569a16a92c..13b80797dd 100644
--- a/rust/src/generated/session_events.rs
+++ b/rust/src/generated/session_events.rs
@@ -83,6 +83,15 @@ pub enum SessionEventType {
     SessionShutdown,
     #[serde(rename = "session.usage_checkpoint")]
     SessionUsageCheckpoint,
+    ///
+    /// <div class="warning">
+    ///
+    /// **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.quota_observation")]
+    SessionQuotaObservation,
     #[serde(rename = "session.context_changed")]
     SessionContextChanged,
     #[serde(rename = "session.usage_info")]
@@ -425,6 +434,15 @@ pub enum SessionEventType {
     /// and may change or be removed in future SDK or CLI releases.
     ///
     /// </div>
+    #[serde(rename = "session.managed_plugin_progress")]
+    SessionManagedPluginProgress,
+    ///
+    /// <div class="warning">
+    ///
+    /// **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.managed_settings_resolved")]
     SessionManagedSettingsResolved,
     ///
@@ -639,6 +657,15 @@ pub enum SessionEventData {
     SessionShutdown(SessionShutdownData),
     #[serde(rename = "session.usage_checkpoint")]
     SessionUsageCheckpoint(SessionUsageCheckpointData),
+    ///
+    /// <div class="warning">
+    ///
+    /// **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.quota_observation")]
+    SessionQuotaObservation(SessionQuotaObservationData),
     #[serde(rename = "session.context_changed")]
     SessionContextChanged(SessionContextChangedData),
     #[serde(rename = "session.usage_info")]
@@ -953,6 +980,15 @@ pub enum SessionEventData {
     /// and may change or be removed in future SDK or CLI releases.
     ///
     /// </div>
+    #[serde(rename = "session.managed_plugin_progress")]
+    SessionManagedPluginProgress(SessionManagedPluginProgressData),
+    ///
+    /// <div class="warning">
+    ///
+    /// **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.managed_settings_resolved")]
     SessionManagedSettingsResolved(SessionManagedSettingsResolvedData),
     ///
@@ -1181,12 +1217,18 @@ pub struct SessionStartData {
     /// Auto routing preference selected at session creation time
     #[serde(skip_serializing_if = "Option::is_none")]
     pub auto_tier: Option<AutoTier>,
+    /// True when autoTier is a managed-policy default. Omitted for user-authored and legacy values.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub auto_tier_managed: Option<bool>,
     /// Working directory and git context at session start
     #[serde(skip_serializing_if = "Option::is_none")]
     pub context: Option<WorkingDirectoryContext>,
     /// Context tier selected at session creation time for models with tiered context pricing; null when no tier is selected (e.g., non-tiered model)
     #[serde(skip_serializing_if = "Option::is_none")]
     pub context_tier: Option<ContextTier>,
+    /// True when contextTier is a managed-policy default. Omitted for user-authored and legacy values.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub context_tier_managed: Option<bool>,
     /// Version string of the Copilot application
     pub copilot_version: String,
     /// When set, identifies a parent session whose context this session continues — e.g., a detached headless rem-agent run launched on the parent's interactive shutdown. Telemetry from this session is reported under the parent's session_id.
@@ -1197,9 +1239,15 @@ pub struct SessionStartData {
     pub github_mcp_tool_config: Option<GitHubMcpToolConfig>,
     /// Identifier of the software producing the events (e.g., "copilot-agent")
     pub producer: String,
+    /// Provider of selectedModel at creation time, when explicitly selected.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub provider_id: Option<String>,
     /// 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>,
+    /// True when the reasoning effort is a managed-policy default bound to reasoningEffortModel. Omitted for agent-authored, user-authored, independent, and legacy effort.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub reasoning_effort_managed: Option<bool>,
     /// Model that owns effort embedded in an authored model selection. Omitted for independent reasoning-effort overrides and legacy events.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub reasoning_effort_model: Option<String>,
@@ -1236,12 +1284,18 @@ pub struct SessionResumeData {
     /// Auto routing preference active at resume time
     #[serde(skip_serializing_if = "Option::is_none")]
     pub auto_tier: Option<AutoTier>,
+    /// True when autoTier is a managed-policy default. Omitted for user-authored and legacy values.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub auto_tier_managed: Option<bool>,
     /// Updated working directory and git context at resume time
     #[serde(skip_serializing_if = "Option::is_none")]
     pub context: Option<WorkingDirectoryContext>,
     /// Context tier currently selected at resume time; null when no tier is active
     #[serde(skip_serializing_if = "Option::is_none")]
     pub context_tier: Option<ContextTier>,
+    /// True when contextTier is a managed-policy default. Omitted for user-authored and legacy values.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub context_tier_managed: Option<bool>,
     /// When true, tool calls and permission requests left in flight by the previous session lifetime remain pending after resume and the agentic loop awaits their results. User sends are queued behind the pending work until all such requests reach a terminal state. When false or omitted, pending work is normally marked as interrupted unless the resume passively joined live work owned by another client; sessionWasActive distinguishes that case.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub continue_pending_work: Option<bool>,
@@ -1250,9 +1304,15 @@ pub struct SessionResumeData {
     /// On-disk byte size of the session's persisted events.jsonl file at resume time; omitted when the file does not exist or cannot be stat'd
     #[serde(skip_serializing_if = "Option::is_none")]
     pub events_file_size_bytes: Option<i64>,
+    /// Provider of selectedModel at resume time, when explicitly selected.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub provider_id: Option<String>,
     /// 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>,
+    /// True when the reasoning effort is a managed-policy default bound to reasoningEffortModel. Omitted for agent-authored, user-authored, independent, and legacy effort.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub reasoning_effort_managed: Option<bool>,
     /// Model that owns effort embedded in an authored model selection. Omitted for independent reasoning-effort overrides and legacy events.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub reasoning_effort_model: Option<String>,
@@ -1296,13 +1356,19 @@ pub struct SessionErrorData {
     /// Fine-grained error code from the upstream provider, when available. For `errorType: "rate_limit"`, this is one of the `RateLimitErrorCode` values (e.g., `"user_weekly_rate_limited"`, `"user_global_rate_limited"`, `"rate_limited"`, `"user_model_rate_limited"`, `"integration_rate_limited"`). For `errorType: "quota"`, this is the CAPI quota error code (e.g., `"quota_exceeded"`, `"session_quota_exceeded"`, `"billing_not_configured"`).
     #[serde(skip_serializing_if = "Option::is_none")]
     pub error_code: Option<String>,
-    /// Category of error (e.g., "authentication", "authorization", "quota", "rate_limit", "context_limit", "query")
+    /// Category of error (e.g., "authentication", "authorization", "policy", "quota", "rate_limit", "context_limit", "query")
     pub error_type: String,
     /// Human-readable error message
     pub message: String,
     /// GitHub request tracing ID (x-github-request-id header) for correlating with server-side logs
     #[serde(skip_serializing_if = "Option::is_none")]
     pub provider_call_id: Option<String>,
+    /// Sanitized provider-defined error parameter preserved from a structured upstream error envelope, when available.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub provider_error_param: Option<String>,
+    /// Provider-defined error type preserved from a structured upstream error envelope, when available (for example, `invalid_request_error`).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub provider_error_type: Option<String>,
     /// What the user must do to recover, when the runtime knows of an action. The `message` never names a client affordance, so a client that offers one — a slash command, a settings pane, a link — renders it from this value.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub remediation: Option<RemediationAction>,
@@ -1526,12 +1592,18 @@ pub struct SessionModelChangeData {
     /// Committed Auto preference after the model configuration change, when applicable.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub auto_tier: Option<AutoTier>,
+    /// True when autoTier is a managed-policy default. Omitted for user-authored and legacy values.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub auto_tier_managed: Option<bool>,
     /// 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.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub cause: Option<String>,
     /// Context tier after the model change; null explicitly clears a previously selected tier
     #[serde(skip_serializing_if = "Option::is_none")]
     pub context_tier: Option<ContextTier>,
+    /// True when contextTier is a managed-policy default. Omitted for user-authored and legacy values.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub context_tier_managed: Option<bool>,
     /// Newly selected model identifier
     pub new_model: String,
     /// Previously committed Auto preference, when one was explicitly selected.
@@ -1540,6 +1612,9 @@ pub struct SessionModelChangeData {
     /// Model that was previously selected, if any
     #[serde(skip_serializing_if = "Option::is_none")]
     pub previous_model: Option<String>,
+    /// Provider of previousModel, when known. A provider-only change is a model selection change even when the model identifiers are equal.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub previous_provider_id: Option<String>,
     /// Reasoning effort level before the model change, if applicable
     #[serde(skip_serializing_if = "Option::is_none")]
     pub previous_reasoning_effort: Option<String>,
@@ -1549,9 +1624,15 @@ pub struct SessionModelChangeData {
     /// Output verbosity level before the model change, if applicable
     #[serde(skip_serializing_if = "Option::is_none")]
     pub previous_verbosity: Option<Verbosity>,
+    /// Provider selected for newModel. Omitted for legacy or unattributed selections; never inferred from a later selection.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub provider_id: Option<String>,
     /// Reasoning effort level after the model change, if applicable
     #[serde(skip_serializing_if = "Option::is_none")]
     pub reasoning_effort: Option<String>,
+    /// True when the reasoning effort is a managed-policy default bound to reasoningEffortModel. Omitted for agent-authored, user-authored, independent, and legacy effort.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub reasoning_effort_managed: Option<bool>,
     /// Model that owns effort embedded in an authored model selection. Omitted for independent reasoning-effort overrides and legacy events.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub reasoning_effort_model: Option<String>,
@@ -1772,6 +1853,178 @@ pub struct SessionSnapshotRewindData {
     pub up_to_event_id: String,
 }
 
+/// Request count and cost metrics for this model
+#[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,
+}
+
+/// Per-model token-detail entry containing the accumulated token count for one token type.
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct UsageMetricsModelMetricTokenDetail {
+    /// Accumulated token count for this token type
+    pub token_count: i64,
+}
+
+/// Token usage metrics for this model
+#[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>,
+}
+
+/// Per-model usage metrics, including request counts/costs, token usage, nano-AI units, and per-token-type details.
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct UsageMetricsModelMetric {
+    /// Completeness of this model's reported AI-credit subtotal. Explicitly reported zero is complete, not unavailable.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub ai_credits_status: Option<AiCreditsStatus>,
+    /// 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,
+}
+
+/// Usage attributed to one agent instance, including its identity, API duration, AI units, and per-model breakdown.
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+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 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,
+}
+
+/// Aggregated code change metrics
+#[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,
+}
+
+/// A neutral reference to the model provider that produced a model: an opaque id, a human-readable label, and the provider kind. Carried on each enumerated Model so consumers can group by provider without reaching into a provider-shaped internal 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 ModelProviderRef {
+    /// Opaque, stable id of the provider that produced this model. Matches the enumerated `ModelProviderDescriptor.id`.
+    pub id: String,
+    /// The provider kind.
+    pub kind: ModelProviderKind,
+    /// Human-readable provider label, owned by the runtime so every consumer renders identical text.
+    pub label: String,
+}
+
+/// Usage for one recorded provider and model, without merging identical model IDs across providers.
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct UsageMetricsProviderModelMetric {
+    /// Request, token, and cost totals for this provider/model.
+    pub metrics: UsageMetricsModelMetric,
+    /// Model display name captured at call time, when known.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub model_display_name: Option<String>,
+    /// Model identity, or null for legacy aggregate-only usage.
+    pub model_id: Option<String>,
+    /// Provider identity and product label captured when the call was dispatched; null when unknown.
+    pub provider: Option<ModelProviderRef>,
+}
+
+/// Session-wide token-detail entry containing the accumulated token count for one token type.
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct UsageMetricsTokenDetail {
+    /// Accumulated token count for this token type
+    pub token_count: i64,
+}
+
+/// Accumulated session usage metrics, including premium request cost, token counts, model breakdown, and code-change totals.
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+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 agent_metrics: Option<HashMap<String, UsageMetricsAgentMetric>>,
+    /// Completeness of totalNanoAiu. Numeric totals remain the reported subtotal; zero is not a claim of free usage when unavailable.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub ai_credits_status: Option<AiCreditsStatus>,
+    /// 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>,
+    /// Provider-attributed model metrics, ordered by first observed provider and model.
+    /// Null attribution preserves historical usage whose provider or model was not recorded.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub provider_model_metrics: Option<Vec<UsageMetricsProviderModelMetric>>,
+    /// 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,
+}
+
 /// Request count and cost metrics
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
@@ -1888,6 +2141,10 @@ pub struct ShutdownTokenDetail {
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct SessionShutdownData {
+    /// Complete accounting state captured atomically with receipt watermarks.
+    #[doc(hidden)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub(crate) accounting_snapshot: Option<UsageGetMetricsResult>,
     /// 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>>,
@@ -1910,6 +2167,9 @@ pub struct SessionShutdownData {
     pub events_file_size_bytes: Option<i64>,
     /// Per-model usage breakdown, keyed by model identifier
     pub model_metrics: HashMap<String, ShutdownModelMetric>,
+    /// Provider/model accounting preserved for replay without consulting current provider selection.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub provider_model_metrics: Option<Vec<UsageMetricsProviderModelMetric>>,
     /// Unix timestamp (milliseconds) when the session started
     pub session_start_time: i64,
     /// Whether the session ended normally ("routine") or due to a crash/fatal error ("error")
@@ -1939,6 +2199,9 @@ pub struct SessionShutdownData {
     #[doc(hidden)]
     #[serde(skip_serializing_if = "Option::is_none")]
     pub(crate) total_premium_requests: Option<f64>,
+    /// Per-source accounting sequence watermarks subsuming preceding usage receipts.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub usage_accounting_watermarks: Option<HashMap<String, i64>>,
 }
 
 /// Internal prompt-cache expiration state for one model
@@ -1958,6 +2221,10 @@ pub(crate) struct UsageCheckpointModelCacheState {
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct SessionUsageCheckpointData {
+    /// Complete accounting state captured atomically with the receipt watermarks.
+    #[doc(hidden)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub(crate) accounting_snapshot: Option<UsageGetMetricsResult>,
     /// Internal per-model prompt-cache state used to restore expiration tracking on resume
     #[doc(hidden)]
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -1966,12 +2233,164 @@ pub struct SessionUsageCheckpointData {
     #[doc(hidden)]
     #[serde(skip_serializing_if = "Option::is_none")]
     pub(crate) prompt_cache_break_state: Option<Vec<serde_json::Value>>,
+    /// Provider/model accounting snapshot that subsumes preceding usage receipts.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub provider_model_metrics: Option<Vec<UsageMetricsProviderModelMetric>>,
     /// 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
     #[doc(hidden)]
     #[serde(skip_serializing_if = "Option::is_none")]
     pub(crate) total_premium_requests: Option<f64>,
+    /// Highest accounted sequence per source session; no per-call deduplication history is retained.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub usage_accounting_watermarks: Option<HashMap<String, i64>>,
+}
+
+/// Authoritative budget measurements and policy metadata, independent of provider.
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ProviderQuotaBudgetMetadata {
+    /// Exact measured consumption in the budget's unit.
+    pub consumed: f64,
+    /// Exact budget entitlement, retaining incumbent fractional-unit compatibility.
+    pub entitlement: f64,
+    /// Usage beyond entitlement, in the budget's unit.
+    pub overage: f64,
+    /// Whether additional usage is allowed when the budget is exhausted.
+    pub overage_allowed_when_exhausted: bool,
+    /// Optional additional-usage budget cap.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub overage_limit: Option<f64>,
+    /// Service-reported remaining percentage for authoritative budget presentation.
+    pub remaining_percentage: f64,
+    /// Reset instant in epoch milliseconds when this budget actually defines a window.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub reset_at_epoch_ms: Option<f64>,
+    /// Whether the reset instant is an estimate.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub reset_estimated: Option<bool>,
+    /// Whether this budget uses token-based billing.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub token_based_billing: Option<bool>,
+    /// Whether the budget has unlimited entitlement.
+    pub unlimited: bool,
+    /// Whether service policy allows continued usage after exhaustion.
+    pub usage_allowed_when_exhausted: bool,
+}
+
+/// An authoritative monthly usage reading for the observation's provider, account, and service.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 ProviderMonthlyUsage {
+    /// Nonnegative finite consumption reported by the service, preserving zero and fractions. Present only when state is available; never computed from tokens or balance differences.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub consumed_quantity: Option<f64>,
+    /// Start of the service-reported monthly billing cycle, in UTC RFC 3339.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub cycle_start: Option<String>,
+    /// Service read time in UTC RFC 3339, not a ledger reconciliation watermark or confirmation of the latest inference charge.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub queried_at: Option<String>,
+    /// End of the service-reported monthly billing cycle, in UTC RFC 3339.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub reset_on: Option<String>,
+    /// Identity scope of the reading within its provider and service.
+    pub scope: ProviderMonthlyUsageScope,
+    /// Availability of monthly consumption. Missing or unavailable usage must never be interpreted as zero.
+    pub state: ProviderMonthlyUsageState,
+    /// Unit of consumedQuantity; independent of the parent observation's balance unit.
+    pub unit: ProviderQuotaUnit,
+}
+
+/// An account quota reading. Absence of a quantity is unknown, never zero.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 ProviderQuotaState {
+    /// Whether the service permits access, independently of balance.
+    pub access_state: ProviderQuotaAccessState,
+    /// Service error code or client acquisition category, separate from the business-state reason.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub acquisition_error: Option<String>,
+    /// Acquisition outcome. Unavailable/failed readings have no service verdict; access/capacity unavailable are compatibility placeholders only.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub acquisition_status: Option<ProviderQuotaAcquisitionStatus>,
+    /// Independently reported signed 64-bit available quantity. Zero does not override the service access/capacity verdict; omission and null are preserved.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub available_quantity: Option<i64>,
+    /// Optional metadata for an authoritative budget. Advisory balances and admission-only observations do not populate this.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub budget_metadata: Option<ProviderQuotaBudgetMetadata>,
+    /// Service capacity state; missing quantities do not imply exhaustion.
+    pub capacity_state: ProviderQuotaCapacityState,
+    /// Key for the backwards-compatible snapshots projection, when the authoritative budget supports that contract.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub compatibility_key: Option<String>,
+    /// Independently reported signed 64-bit entitlement. -1 is an unlimited sentinel, not a capacity-state rewrite; omission and null are preserved.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub entitled_quantity: Option<i64>,
+    /// Explicit service admission flag, when reported.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub has_quota: Option<bool>,
+    /// HTTP status from acquisition, when available.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub http_status: Option<i64>,
+    /// Service-reported monthly consumption, independent of quota balances and per-call or session cost. Omitted when the service does not report monthly usage.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub monthly_usage: Option<ProviderMonthlyUsage>,
+    /// Whether this is a GET account reading or a pre-response admission observation. Observations are never merged across kinds.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub observation_kind: Option<ProviderQuotaObservationKind>,
+    /// When the runtime observed this reading, not a charge timestamp or guarantee that consumption has settled.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub observed_at: Option<String>,
+    /// Provider/account whose service reported this state.
+    pub provider: ModelProviderRef,
+    /// Whether quantities are authoritative budget measurements, advisory balances, or absent. Only authoritative budgets support percentage presentation.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub quantity_kind: Option<ProviderQuotaQuantityKind>,
+    /// Service-owned quota identifier within this provider.
+    pub quota_id: String,
+    /// Service-reported explanation for the state.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub reason: Option<String>,
+    /// Service name owning this reading.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub service: Option<String>,
+    /// Service-reported quota source.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub source: Option<String>,
+    /// Unit of entitledQuantity and availableQuantity.
+    pub unit: ProviderQuotaUnit,
+}
+
+/// Session event "session.quota_observation". A provider-owned quota observation, distinct from per-call usage and charge accounting.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 SessionQuotaObservationData {
+    /// The admitted provider's state observation. Admission balances and percentages remain absent; separate monthly usage may report its own amount and cycle.
+    pub observation: ProviderQuotaState,
 }
 
 /// Session event "session.context_changed". Updated working directory and git context after the change
@@ -2106,6 +2525,9 @@ pub(crate) struct CompactionCompleteCompactionTokensUsedCopilotUsage {
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct CompactionCompleteCompactionTokensUsed {
+    /// Whether the compaction's credit amount was reported for all, some, or none of its calls.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub ai_credits_status: Option<AiCreditsStatus>,
     /// Cached input tokens reused in the compaction LLM call
     #[serde(skip_serializing_if = "Option::is_none")]
     pub cache_read_tokens: Option<i64>,
@@ -2125,9 +2547,18 @@ pub struct CompactionCompleteCompactionTokensUsed {
     /// Model identifier used for the compaction LLM call
     #[serde(skip_serializing_if = "Option::is_none")]
     pub model: Option<String>,
+    /// Model display name captured for the compaction call.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub model_display_name: Option<String>,
     /// Output tokens produced by the compaction LLM call
     #[serde(skip_serializing_if = "Option::is_none")]
     pub output_tokens: Option<i64>,
+    /// Provider captured for the compaction call; absent when attribution is unknown.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub provider: Option<ModelProviderRef>,
+    /// Number of model requests represented by this aggregated compaction usage
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub request_count: Option<i64>,
 }
 
 /// Original request-level and effective conversation reasoning effort for a provider history boundary; the historical type name is retained for compatibility
@@ -2255,6 +2686,12 @@ pub struct PermissionRecoveryData {
     pub max_attempts: i64,
     /// Policy selected from the current client's response capability; mode or client changes may update it during recovery
     pub on_blocked: PermissionRecoveryOnBlocked,
+    /// Subagent identifier that owns this recovery episode when the request was delegated through a parent permission service
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub owner_agent_id: Option<String>,
+    /// Root or child execution-session identifier that owns this recovery episode; omitted for legacy snapshots
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub owner_session_id: Option<String>,
     /// Controlled reason for the latest episode transition
     pub reason: PermissionRecoveryReason,
     /// Current lifecycle state of the recovery episode
@@ -2688,6 +3125,12 @@ pub struct SessionPermissionRecoveryData {
     pub max_attempts: i64,
     /// Policy selected from the current client's response capability; mode or client changes may update it during recovery
     pub on_blocked: PermissionRecoveryOnBlocked,
+    /// Subagent identifier that owns this recovery episode when the request was delegated through a parent permission service
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub owner_agent_id: Option<String>,
+    /// Root or child execution-session identifier that owns this recovery episode; omitted for legacy snapshots
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub owner_session_id: Option<String>,
     /// Controlled reason for the latest episode transition
     pub reason: PermissionRecoveryReason,
     /// Current lifecycle state of the recovery episode
@@ -3389,6 +3832,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>,
+    /// Opaque origin provider identity captured at dispatch. Only an exact match with the target provider permits replay of reasoningOpaque, encryptedContent, reasoningBlocks, serverTools, and provider response/item identifiers. Matching model ids or wire protocols is insufficient. Omitted for legacy or unattributed messages; the runtime excludes unproven opaque state when projecting to a known provider. Text content and client tool requests/results remain portable semantic history.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub provider_id: 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>,
@@ -3470,6 +3916,18 @@ pub struct AssistantIdleData {
     pub aborted: Option<bool>,
 }
 
+/// Ordered accounting identity assigned under the source session's emission lock.
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct UsageAccountingIdentity {
+    /// Monotonically increasing sequence within the source session.
+    pub sequence: i64,
+    /// Session that assigned this accounting sequence.
+    pub source_session_id: String,
+    /// Existing API call identifier, or a runtime-generated identity when none was supplied.
+    pub usage_id: String,
+}
+
 /// Token usage detail for a single billing category
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
@@ -3552,6 +4010,12 @@ pub struct AssistantUsageData {
     /// Number of accepted speculative prediction tokens
     #[serde(skip_serializing_if = "Option::is_none")]
     pub accepted_prediction_tokens: Option<i64>,
+    /// Runtime-owned identity shared with the durable accounting receipt.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub accounting: Option<UsageAccountingIdentity>,
+    /// Availability of this call's reported AI-credit amount. Missing billing is unavailable, not a zero charge.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub ai_credits_status: Option<AiCreditsStatus>,
     /// Completion ID from the model provider (e.g., chatcmpl-abc123)
     #[serde(skip_serializing_if = "Option::is_none")]
     pub api_call_id: Option<String>,
@@ -3644,6 +4108,9 @@ pub struct AssistantUsageData {
     pub max_prompt_tokens: Option<i64>,
     /// Model identifier used for this API call
     pub model: String,
+    /// Model display name captured for this call, not derived from the current selection.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub model_display_name: Option<String>,
     /// Fixed-set provider family serving the bring-your-own-key model (for example "openai", "anthropic", "azure_openai", "ollama", "llama_cpp", or "other"). Never the caller-supplied provider name. Absent for Copilot-served models.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub model_provider: Option<String>,
@@ -3662,6 +4129,9 @@ pub struct AssistantUsageData {
     #[deprecated]
     #[serde(skip_serializing_if = "Option::is_none")]
     pub parent_tool_call_id: Option<String>,
+    /// Provider identity and product label captured by the actual call's dispatch path.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub provider: Option<ModelProviderRef>,
     /// GitHub request tracing ID (x-github-request-id header) for server-side log correlation
     #[serde(skip_serializing_if = "Option::is_none")]
     pub provider_call_id: Option<String>,
@@ -3681,6 +4151,15 @@ pub struct AssistantUsageData {
     /// Number of rejected speculative prediction tokens
     #[serde(skip_serializing_if = "Option::is_none")]
     pub rejected_prediction_tokens: Option<i64>,
+    /// Serialized (uncompressed) byte length of the request body, before any Content-Encoding. A content-free size signal.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub request_body_bytes: Option<i64>,
+    /// Content-Encoding applied to the request body of the attempt that produced this outcome; identity when uncompressed
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub request_body_encoding: Option<ModelCallRequestBodyEncoding>,
+    /// Byte length of the request body actually sent on the wire for the attempt that produced this outcome, after any Content-Encoding. Equals requestBodyBytes when the body was not compressed.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub request_body_wire_bytes: 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>,
@@ -3709,6 +4188,27 @@ pub struct AssistantUsageData {
     /// Transport used for this model call (http or websocket)
     #[serde(skip_serializing_if = "Option::is_none")]
     pub transport: Option<AssistantUsageTransport>,
+    /// Milliseconds spent on the WebSocket attempt before falling back to HTTP
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub websocket_fallback_after_ms: Option<i64>,
+    /// WebSocket close code received before the HTTP fallback
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub websocket_fallback_close_code: Option<i32>,
+    /// Normalized cause of the WebSocket failure that triggered the HTTP fallback; absent when no fallback occurred or the cause is unknown
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub websocket_fallback_error_kind: Option<ModelCallWebSocketFallbackErrorKind>,
+    /// Why the call was carried by the HTTP fallback of a WebSocket-capable dispatcher; absent when no fallback occurred
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub websocket_fallback_reason: Option<ModelCallWebSocketFallbackReason>,
+    /// Whether a WebSocket reconnect was attempted before falling back to HTTP
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub websocket_fallback_reconnect_attempted: Option<bool>,
+    /// Whether the HTTP fallback started during this model call, rather than being inherited from an earlier call
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub websocket_fallback_started_this_call: Option<bool>,
+    /// HTTP status of the WebSocket upgrade rejection or WebSocket API error that triggered the HTTP fallback
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub websocket_fallback_status_code: Option<i32>,
 }
 
 /// Session event "prompt_cache_break". A detected loss of a previously cached prompt prefix
@@ -3805,6 +4305,12 @@ pub struct PromptCacheBreakData {
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct ModelCallFailureRequestFingerprint {
+    /// Summed byte length of opaque or encrypted reasoning payloads
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub encrypted_content_bytes: Option<i64>,
+    /// Summed byte length of inline image payloads (data URLs and base64 sources)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub image_bytes: Option<i64>,
     /// Total number of image content parts
     pub image_part_count: i64,
     /// Image parts whose media type cannot be determined (rejected by strict providers)
@@ -3816,6 +4322,9 @@ pub struct ModelCallFailureRequestFingerprint {
     pub message_count: i64,
     /// Tool calls whose name is missing or empty (rejected by strict providers)
     pub nameless_tool_call_count: i64,
+    /// Number of messages carrying opaque or encrypted reasoning
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub reasoning_item_count: Option<i64>,
     /// Total number of tool calls across assistant messages
     pub tool_call_count: i64,
     /// Number of "tool" result messages in the request
@@ -3900,9 +4409,21 @@ pub struct ModelCallFailureData {
     /// Reasoning effort level used for the failed model call, if applicable
     #[serde(skip_serializing_if = "Option::is_none")]
     pub reasoning_effort: Option<String>,
+    /// Serialized (uncompressed) byte length of the failed request body, before any Content-Encoding. A content-free size signal.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub request_body_bytes: Option<i64>,
+    /// Content-Encoding applied to the failed request body; identity when uncompressed
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub request_body_encoding: Option<ModelCallRequestBodyEncoding>,
+    /// Byte length of the failed request body actually sent on the wire, after any Content-Encoding. Equals requestBodyBytes when the body was not compressed.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub request_body_wire_bytes: Option<i64>,
     /// 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>,
+    /// Zero-based orchestrator retry index of the failed attempt
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub retry_attempt: 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>,
@@ -3917,6 +4438,27 @@ pub struct ModelCallFailureData {
     /// Transport used for the failed model call (http or websocket)
     #[serde(skip_serializing_if = "Option::is_none")]
     pub transport: Option<ModelCallFailureTransport>,
+    /// Milliseconds spent on the WebSocket attempt before falling back to HTTP
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub websocket_fallback_after_ms: Option<i64>,
+    /// WebSocket close code received before the HTTP fallback
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub websocket_fallback_close_code: Option<i32>,
+    /// Normalized cause of the WebSocket failure that triggered the HTTP fallback; absent when no fallback occurred or the cause is unknown
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub websocket_fallback_error_kind: Option<ModelCallWebSocketFallbackErrorKind>,
+    /// Why the failed call was carried by the HTTP fallback of a WebSocket-capable dispatcher; absent when no fallback occurred
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub websocket_fallback_reason: Option<ModelCallWebSocketFallbackReason>,
+    /// Whether a WebSocket reconnect was attempted before falling back to HTTP
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub websocket_fallback_reconnect_attempted: Option<bool>,
+    /// Whether the HTTP fallback started during this model call, rather than being inherited from an earlier call
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub websocket_fallback_started_this_call: Option<bool>,
+    /// HTTP status of the WebSocket upgrade rejection or WebSocket API error that triggered the HTTP fallback
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub websocket_fallback_status_code: Option<i32>,
 }
 
 /// Session event "model.call_final_result". Internal telemetry result for one logical model operation after all orchestrator-owned retries settle
@@ -5582,6 +6124,28 @@ pub struct PermissionRequestShell {
     pub warning: Option<String>,
 }
 
+/// A named, complete UTF-8 text snapshot for a pending file operation.
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct PermissionWriteFileContent {
+    /// Complete file contents, including an empty string for an empty file.
+    pub content: String,
+    /// Absolute path in the session filesystem namespace.
+    pub path: String,
+}
+
+/// Complete text snapshots for one proposed file change. At least one side is present. Different before and after paths describe a move.
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct PermissionWriteFileEdit {
+    /// Complete file content the operation plans to write. Absent only when the file is being deleted.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub after: Option<PermissionWriteFileContent>,
+    /// File content read while planning the operation. Absent only when the file is being created.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub before: Option<PermissionWriteFileContent>,
+}
+
 /// File write permission request
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
@@ -5590,6 +6154,9 @@ pub struct PermissionRequestWrite {
     pub can_offer_session_approval: bool,
     /// Unified diff showing the proposed changes
     pub diff: String,
+    /// Complete before/after text previews captured while planning this request. Omitted when a complete preview is unavailable, including pre-read sandbox requests and non-UTF-8 files. Missing sides mean creation or deletion, not unavailable content.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub file_edits: Option<Vec<PermissionWriteFileEdit>>,
     /// Path of the file being written to
     pub file_name: String,
     /// Human-readable description of the intended file change
@@ -6062,6 +6629,9 @@ pub struct PermissionPromptRequestWrite {
     pub can_offer_session_approval: bool,
     /// Unified diff showing the proposed changes
     pub diff: String,
+    /// Complete before/after text previews captured while planning this request. Omitted when a complete preview is unavailable, including pre-read sandbox requests and non-UTF-8 files. Missing sides mean creation or deletion, not unavailable content.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub file_edits: Option<Vec<PermissionWriteFileEdit>>,
     /// Path of the file being written to
     pub file_name: String,
     /// Human-readable description of the intended file change
@@ -6480,6 +7050,12 @@ pub struct PermissionRequestedData {
     /// Agent mode captured from the owning turn when permission evaluation began.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub agent_mode: Option<SessionMode>,
+    /// Delegated agent that owns permission recovery when the owner session multiplexes remote agents. Absent otherwise.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub owner_agent_id: Option<String>,
+    /// Execution session that owns permission recovery for this request. Absent on historical events.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub owner_session_id: Option<String>,
     /// Permission mode captured when evaluation began. Absent on historical events.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub permission_mode: Option<PermissionMode>,
@@ -7512,6 +8088,34 @@ pub struct SessionAutoModeResolvedData {
     pub sticky_override: Option<bool>,
 }
 
+/// Session event "session.managed_plugin_progress". Experimental transient presentation-neutral progress for organization-required plugin preparation. Clients should localize the phase copy and display plugin specs without translating 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 SessionManagedPluginProgressData {
+    /// Current preparation phase.
+    pub phase: ManagedPluginProgressPhase,
+    /// Ordered plugin install specs affected by this phase. Empty while managed settings initialize and when preparation completes.
+    pub plugin_specs: Vec<String>,
+}
+
+/// Reusable managed permission evaluation context. Treat permissions as runtime-owned policy data and retain it verbatim; it includes source-aware composition metadata. This is a snapshot, not a capability or approval token; only use contexts obtained from trusted policy sources.
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ManagedPermissionsContext {
+    /// Policy could not be determined; evaluation must deny every operation.
+    pub fail_closed: bool,
+    /// Runtime-owned composed permissions object. Absent when no permission policy is configured.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub permissions: Option<serde_json::Value>,
+}
+
 /// Session event "session.managed_settings_resolved". Effective enterprise managed settings applied to the session and their contributing channels. Emitted whenever managed policy is applied or reapplied, including session start, resume, and account switch. This ephemeral live snapshot is delivered to subscribers but not persisted to the session event log; initial resolution occurs before session.start.
 ///
 /// <div class="warning">
@@ -7523,20 +8127,23 @@ pub struct SessionAutoModeResolvedData {
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 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.
+    /// Whether an explicit enterprise policy restriction disables bypass-permissions ("yolo") mode for this session. Deny-wins across layers; an unresolved policy does not force this on by itself.
     pub bypass_permissions_disabled: bool,
     /// 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.
+    /// Whether managed policy could not be determined (e.g. a failed server fetch) and unresolved-policy safeguards remain active. This does not by itself disable bypass-permissions; `bypassPermissionsDisabled` reports only an explicit policy restriction.
     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 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>,
+    /// Reusable retained managed permission policy for managedSettings.permissions.evaluate, including source composition and session-local injection. Provided by live session snapshots; absent in older events. Refresh the context when managed policy changes.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub permissions_context: Option<ManagedPermissionsContext>,
     /// Whether the policy-helper managed-settings layer was present. The policy helper is the weakest channel: it fills keys no enterprise source set and can never replace one.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub policy_helper_managed: Option<bool>,
@@ -7552,7 +8159,7 @@ pub struct SessionManagedSettingsResolvedData {
     pub source: ManagedSettingsResolvedSource,
 }
 
-/// Session event "session.managed_settings_enforced". Runtime enforcement of enterprise managed settings: fires when the session blocks or caps a runtime action because enterprise policy governs it, so SDK clients can explain *why* an action was governed. Unlike `session.managed_settings_resolved` (which reports *what* is managed), this reports a concrete governed action — e.g. a user or host tried to turn on a bypass-permissions escalation while policy disables it. Emitted live (not persisted to the session event log) on user/host-initiated attempts only, never for silent policy application. Marked experimental while the managed-settings surface stabilizes.
+/// Session event "session.managed_settings_enforced". Runtime enforcement of enterprise managed settings: fires when the session blocks or caps a runtime action because enterprise policy governs it, so SDK clients can explain *why* an action was governed. Unlike `session.managed_settings_resolved` (which reports *what* is managed), this reports a concrete governed action — e.g. a user or host tried to turn on bypass permissions or Assisted Permissions while the corresponding policy disables it. Emitted live (not persisted to the session event log) on user/host-initiated attempts only, never for silent policy application. Marked experimental while the managed-settings surface stabilizes.
 ///
 /// <div class="warning">
 ///
@@ -7565,14 +8172,14 @@ pub struct SessionManagedSettingsResolvedData {
 pub struct SessionManagedSettingsEnforcedData {
     /// The category of runtime action that managed policy governed.
     pub action: ManagedSettingsEnforcedAction,
-    /// For a `bypass_permissions_blocked` action, which permission-escalation primitive was refused. Absent for actions without a specific escalation primitive.
+    /// For a `bypass_permissions_blocked` action, which permission-mode or escalation primitive was refused. Absent for actions without a specific primitive.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub escalation: Option<ManagedSettingsEnforcedEscalation>,
     /// Whether the enforcement was forced by fail-closed handling (managed policy could not be determined) rather than an explicit managed setting. When true, `setting` still names the restriction that was applied.
     pub fail_closed: bool,
     /// A human-readable explanation of why the action was governed, suitable for surfacing to the user.
     pub message: String,
-    /// The managed setting key responsible for the enforcement (e.g. `permissions.disableBypassPermissionsMode`).
+    /// The managed setting key responsible for the enforcement (for example `permissions.disableBypassPermissionsMode` or `permissions.disableAssistedPermissionsMode`).
     pub setting: String,
 }
 
@@ -8265,25 +8872,52 @@ pub struct McpAppToolCallCompleteData {
 /// Session event "session.indexed_search". Transient indexed-search status and diagnostics from the live runtime service. Never persisted or used to infer activation from session history.
 pub type SessionIndexedSearchData = IndexedSearchData;
 
-/// Routing preference used when the session model is `auto`. `fast` is an integrator-only latency preset and is not a first-party GitHub Copilot product preference.
-#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+/// Extensible routing preference for the virtual `auto` model. New identifiers must be advertised and enabled by the provider. `fast` is an integrator-only latency preset.
+#[derive(Debug, Clone, Default, PartialEq, Eq)]
 pub enum AutoTier {
     /// Optimize for efficiency.
-    #[serde(rename = "efficiency")]
     Efficiency,
     /// Balance efficiency and intelligence.
-    #[serde(rename = "balance")]
     Balance,
     /// Optimize for intelligence.
-    #[serde(rename = "intelligence")]
     Intelligence,
     /// Integrator-only preset that optimizes for latency.
-    #[serde(rename = "fast")]
     Fast,
     /// Unknown variant for forward compatibility.
     #[default]
-    #[serde(other)]
     Unknown,
+    /// Provider-advertised identifier, retained verbatim.
+    Custom(String),
+}
+impl AutoTier {
+    /// Returns the routing identifier without losing unknown values.
+    pub fn as_str(&self) -> &str {
+        match self {
+            Self::Efficiency => "efficiency",
+            Self::Balance => "balance",
+            Self::Intelligence => "intelligence",
+            Self::Fast => "fast",
+            Self::Unknown => "Unknown",
+            Self::Custom(value) => value,
+        }
+    }
+}
+impl Serialize for AutoTier {
+    fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        serializer.serialize_str(self.as_str())
+    }
+}
+impl<'de> Deserialize<'de> for AutoTier {
+    fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
+        let value = String::deserialize(deserializer)?;
+        Ok(match value.as_str() {
+            "efficiency" => Self::Efficiency,
+            "balance" => Self::Balance,
+            "intelligence" => Self::Intelligence,
+            "fast" => Self::Fast,
+            _ => Self::Custom(value),
+        })
+    }
 }
 
 /// Hosting platform type of the repository (github or ado)
@@ -8370,6 +9004,9 @@ pub enum RemediationAction {
     /// Permit outbound network access in the sandbox policy.
     #[serde(rename = "allow_sandbox_outbound")]
     AllowSandboxOutbound,
+    /// Discard conversation history back through the blocked request before continuing.
+    #[serde(rename = "rewind_conversation")]
+    RewindConversation,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
@@ -8670,22 +9307,48 @@ pub enum ModelDeselectedReason {
     Unknown,
 }
 
-/// Auto preferences that Copilot API can recommend.
-#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+/// Enabled Auto preferences that Copilot API can recommend.
+#[derive(Debug, Clone, Default, PartialEq, Eq)]
 pub enum RecommendedAutoTier {
     /// Optimize for efficiency.
-    #[serde(rename = "efficiency")]
     Efficiency,
     /// Balance efficiency and intelligence.
-    #[serde(rename = "balance")]
     Balance,
     /// Optimize for intelligence.
-    #[serde(rename = "intelligence")]
     Intelligence,
     /// Unknown variant for forward compatibility.
     #[default]
-    #[serde(other)]
     Unknown,
+    /// Provider-advertised identifier, retained verbatim.
+    Custom(String),
+}
+impl RecommendedAutoTier {
+    /// Returns the routing identifier without losing unknown values.
+    pub fn as_str(&self) -> &str {
+        match self {
+            Self::Efficiency => "efficiency",
+            Self::Balance => "balance",
+            Self::Intelligence => "intelligence",
+            Self::Unknown => "Unknown",
+            Self::Custom(value) => value,
+        }
+    }
+}
+impl Serialize for RecommendedAutoTier {
+    fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        serializer.serialize_str(self.as_str())
+    }
+}
+impl<'de> Deserialize<'de> for RecommendedAutoTier {
+    fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
+        let value = String::deserialize(deserializer)?;
+        Ok(match value.as_str() {
+            "efficiency" => Self::Efficiency,
+            "balance" => Self::Balance,
+            "intelligence" => Self::Intelligence,
+            _ => Self::Custom(value),
+        })
+    }
 }
 
 /// Terminal reason an Auto preference activation failed.
@@ -8782,6 +9445,46 @@ pub enum HandoffSourceType {
     Unknown,
 }
 
+/// Whether the accumulated numeric AI-credit subtotal covers the observed calls.
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum AiCreditsStatus {
+    /// Every observed call supplied an AI-credit amount, including an explicit zero.
+    #[serde(rename = "complete")]
+    Complete,
+    /// Some calls supplied amounts and some did not; the numeric value is only a reported subtotal.
+    #[serde(rename = "partial")]
+    Partial,
+    /// No AI-credit amount was reported for the observed calls. Numeric zero is not a zero-cost claim.
+    #[serde(rename = "unavailable")]
+    Unavailable,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
+
+/// The neutral kind of a model provider — the model analog of `AccountKind`. A model provider is the live, entitled source a model came from; central code never branches on this beyond a single dispatch.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 ModelProviderKind {
+    /// GitHub Copilot / CAPI models, spawned by a github-resolving account that holds a Copilot seat.
+    #[serde(rename = "copilot")]
+    Copilot,
+    /// Microsoft 365 Copilot (Loki) inference models, spawned by a resolvable Entra-derived Loki account.
+    #[serde(rename = "loki")]
+    Loki,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
+
 /// Whether the session ended normally ("routine") or due to a crash/fatal error ("error")
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
 pub enum ShutdownType {
@@ -8797,6 +9500,168 @@ pub enum ShutdownType {
     Unknown,
 }
 
+/// Access policy reported by the quota service.
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum ProviderQuotaAccessState {
+    /// Access is allowed.
+    #[serde(rename = "allowed")]
+    Allowed,
+    /// Access is denied.
+    #[serde(rename = "denied")]
+    Denied,
+    /// Quota is not required for this access.
+    #[serde(rename = "not_required")]
+    NotRequired,
+    /// The service did not supply a recognized access state.
+    #[serde(rename = "unknown")]
+    UnknownValue,
+    /// Client-only compatibility placeholder when acquisitionStatus is unavailable or failed; not an observed service verdict.
+    #[serde(rename = "unavailable")]
+    Unavailable,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
+
+/// Acquisition state, independent of the service's business access/capacity verdict.
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum ProviderQuotaAcquisitionStatus {
+    /// A service quota observation was received.
+    #[serde(rename = "succeeded")]
+    Succeeded,
+    /// No service snapshot is available for this caller or surface.
+    #[serde(rename = "unavailable")]
+    Unavailable,
+    /// Acquisition failed; inspect httpStatus/acquisitionError without inferring a business verdict.
+    #[serde(rename = "failed")]
+    Failed,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
+
+/// Capacity is independent of whether a numeric balance was supplied.
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum ProviderQuotaCapacityState {
+    /// Capacity is available.
+    #[serde(rename = "available")]
+    Available,
+    /// The service explicitly reports exhaustion.
+    #[serde(rename = "exhausted")]
+    Exhausted,
+    /// The reported entitlement is unlimited.
+    #[serde(rename = "unlimited")]
+    Unlimited,
+    /// No billable quota is required.
+    #[serde(rename = "not_required")]
+    NotRequired,
+    /// The service reports that capacity is not applicable.
+    #[serde(rename = "not_applicable")]
+    NotApplicable,
+    /// No recognized capacity state was supplied.
+    #[serde(rename = "unknown")]
+    UnknownValue,
+    /// Client-only compatibility placeholder when acquisitionStatus is unavailable or failed; not an observed service verdict.
+    #[serde(rename = "unavailable")]
+    Unavailable,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
+
+/// Identity scope of a monthly usage reading.
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum ProviderMonthlyUsageScope {
+    /// Consumption of the authenticated user within the parent observation's service and returned cycle.
+    #[serde(rename = "user")]
+    User,
+    /// The service did not establish a recognized usage scope.
+    #[serde(rename = "unknown")]
+    UnknownValue,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
+
+/// Availability of a service's monthly consumption reading.
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum ProviderMonthlyUsageState {
+    /// The service reported a usable consumption reading, including an explicit zero.
+    #[serde(rename = "available")]
+    Available,
+    /// The service found no usage policy; no consumption amount is known.
+    #[serde(rename = "no_policy")]
+    NoPolicy,
+    /// The read failed or its data could not be used; consumption is unknown.
+    #[serde(rename = "unavailable")]
+    Unavailable,
+    /// The service reported an unrecognized usage state.
+    #[serde(rename = "unknown")]
+    UnknownValue,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
+
+/// Units explicitly reported by a quota provider.
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum ProviderQuotaUnit {
+    /// AI credits, not tokens or currency.
+    #[serde(rename = "ai_credits")]
+    AiCredits,
+    /// Requests charged against an entitlement.
+    #[serde(rename = "requests")]
+    Requests,
+    /// Model tokens.
+    #[serde(rename = "tokens")]
+    Tokens,
+    /// The observation does not establish a quantity unit.
+    #[serde(rename = "unknown")]
+    UnknownValue,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
+
+/// Timing and purpose of a provider quota observation.
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum ProviderQuotaObservationKind {
+    /// An explicit account read; consumption may still be subject to service aggregation delay.
+    #[serde(rename = "account_snapshot")]
+    AccountSnapshot,
+    /// A verdict attached before an inference response. May be cached; never a post-charge balance.
+    #[serde(rename = "admission_state")]
+    AdmissionState,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
+
+/// Interpretation permitted for independently reported quantities.
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum ProviderQuotaQuantityKind {
+    /// Quantities form an authoritative available-of-entitled budget suitable for percentage presentation.
+    #[serde(rename = "authoritative_budget")]
+    AuthoritativeBudget,
+    /// Raw advisory quantities; do not infer permission, usage percentage, reset cadence, or post-charge balance.
+    #[serde(rename = "advisory_balance")]
+    AdvisoryBalance,
+    /// No quantity measurement, as with admission-only response headers.
+    #[serde(rename = "none")]
+    None,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
+
 /// What initiated a conversation compaction
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
 pub enum CompactionTrigger {
@@ -9399,6 +10264,24 @@ pub enum AssistantUsageApiEndpoint {
     Unknown,
 }
 
+/// Content-Encoding applied to the request body sent on the wire
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum ModelCallRequestBodyEncoding {
+    /// The request body was sent uncompressed (including every WebSocket request).
+    #[serde(rename = "identity")]
+    Identity,
+    /// The request body was sent gzip-compressed.
+    #[serde(rename = "gzip")]
+    Gzip,
+    /// The request body was sent zstd-compressed.
+    #[serde(rename = "zstd")]
+    Zstd,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
+
 /// Transport used for a successful model call
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
 pub enum AssistantUsageTransport {
@@ -9414,6 +10297,75 @@ pub enum AssistantUsageTransport {
     Unknown,
 }
 
+/// Normalized cause of the WebSocket failure that triggered the HTTP fallback
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum ModelCallWebSocketFallbackErrorKind {
+    /// DNS resolution of the WebSocket host failed.
+    #[serde(rename = "dns")]
+    Dns,
+    /// The TLS handshake or a TLS record failed.
+    #[serde(rename = "tls")]
+    Tls,
+    /// A WebSocket connect or read timed out.
+    #[serde(rename = "timeout")]
+    Timeout,
+    /// The peer refused the TCP connection.
+    #[serde(rename = "connection_refused")]
+    ConnectionRefused,
+    /// The connection was reset, aborted, or ended mid-stream without a close.
+    #[serde(rename = "connection_reset")]
+    ConnectionReset,
+    /// The peer closed the WebSocket.
+    #[serde(rename = "closed_by_peer")]
+    ClosedByPeer,
+    /// The runtime closed the WebSocket itself.
+    #[serde(rename = "closed_locally")]
+    ClosedLocally,
+    /// The socket was already closed before it was used.
+    #[serde(rename = "not_connected")]
+    NotConnected,
+    /// The upgrade or request was rejected with an HTTP status.
+    #[serde(rename = "http_status")]
+    HttpStatus,
+    /// A WebSocket protocol violation or an undecodable frame.
+    #[serde(rename = "protocol")]
+    Protocol,
+    /// The WebSocket request could not be built.
+    #[serde(rename = "configuration")]
+    Configuration,
+    /// A failure that maps onto none of the other kinds.
+    #[serde(rename = "other")]
+    Other,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
+
+/// Why a WebSocket-capable model call was carried by the HTTP fallback
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum ModelCallWebSocketFallbackReason {
+    /// The WebSocket connection could not be established.
+    #[serde(rename = "connect_failed")]
+    ConnectFailed,
+    /// No usable WebSocket connection was available for the request.
+    #[serde(rename = "connection_unavailable")]
+    ConnectionUnavailable,
+    /// Sending the request over the WebSocket failed.
+    #[serde(rename = "send_failed")]
+    SendFailed,
+    /// The WebSocket returned a retryable API error.
+    #[serde(rename = "api_error")]
+    ApiError,
+    /// The WebSocket transport failed before any output reached the consumer.
+    #[serde(rename = "transport_failed")]
+    TransportFailed,
+    /// 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 {
@@ -9537,7 +10489,7 @@ pub enum AbortReason {
     Unknown,
 }
 
-/// Configuration source: user, workspace, plugin, builtin, or managed
+/// Configuration source: user, workspace, plugin, builtin, managed, or account
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
 pub enum McpServerSource {
     /// Server configured in the user's global MCP configuration.
@@ -9555,6 +10507,9 @@ pub enum McpServerSource {
     /// Server supplied by a trusted host-managed catalog.
     #[serde(rename = "managed")]
     Managed,
+    /// Server contributed by a signed-in account; enablement and organization policy still apply.
+    #[serde(rename = "account")]
+    Account,
     /// Unknown variant for forward compatibility.
     #[default]
     #[serde(other)]
@@ -10494,6 +11449,9 @@ pub enum PermissionApprovalEvaluationReasonCode {
     /// The script path was not authorized for inspection.
     #[serde(rename = "path-not-authorized")]
     PathNotAuthorized,
+    /// A code source was excluded from review by content exclusion policy.
+    #[serde(rename = "content-excluded")]
+    ContentExcluded,
     /// The script working directory was invalid.
     #[serde(rename = "invalid-working-directory")]
     InvalidWorkingDirectory,
@@ -10530,6 +11488,24 @@ pub enum PermissionApprovalEvaluationReasonCode {
     /// The script argument binding could not be reviewed.
     #[serde(rename = "argument-binding-unreviewable")]
     ArgumentBindingUnreviewable,
+    /// The shell command could not be analyzed for execution evidence.
+    #[serde(rename = "unsupported-command-shape")]
+    UnsupportedCommandShape,
+    /// The shell command used a code source that cannot be bound for review.
+    #[serde(rename = "unsupported-source")]
+    UnsupportedSource,
+    /// The shell command used a code source computed at run time.
+    #[serde(rename = "dynamic-source")]
+    DynamicSource,
+    /// The shell command referenced more code sources than can be reviewed.
+    #[serde(rename = "too-many-sources")]
+    TooManySources,
+    /// A code-bearing executable could not be inspected.
+    #[serde(rename = "executable-unavailable")]
+    ExecutableUnavailable,
+    /// A code-bearing executable exceeded the binding size limit.
+    #[serde(rename = "executable-too-large")]
+    ExecutableTooLarge,
     /// The script review metadata was malformed.
     #[serde(rename = "malformed-script-action-review")]
     MalformedScriptActionReview,
@@ -11325,6 +12301,34 @@ pub enum AutoModeResolvedReasoningBucket {
     Unknown,
 }
 
+/// Current phase of organization-required plugin preparation.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This type is 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 ManagedPluginProgressPhase {
+    /// Managed settings are still resolving before plugin preparation can be planned.
+    #[serde(rename = "initializing")]
+    Initializing,
+    /// Required plugin content is being installed.
+    #[serde(rename = "installing")]
+    Installing,
+    /// Installed required plugin content is being updated.
+    #[serde(rename = "updating")]
+    Updating,
+    /// Managed plugin preparation has completed.
+    #[serde(rename = "complete")]
+    Complete,
+    /// Unknown variant for forward compatibility.
+    #[default]
+    #[serde(other)]
+    Unknown,
+}
+
 /// 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 {
@@ -11355,7 +12359,7 @@ pub enum ManagedSettingsResolvedSource {
 /// The category of runtime action that enterprise managed settings governed (blocked or capped)
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
 pub enum ManagedSettingsEnforcedAction {
-    /// An attempt to turn on a bypass-permissions ("yolo") escalation was refused or capped because policy disables bypass-permissions mode.
+    /// An attempt to enter a permission mode governed by managed policy was refused or capped. The `setting` and `escalation` fields identify whether this was bypass permissions or Assisted Permissions.
     #[serde(rename = "bypass_permissions_blocked")]
     BypassPermissionsBlocked,
     /// Unknown variant for forward compatibility.
@@ -11364,7 +12368,7 @@ pub enum ManagedSettingsEnforcedAction {
     Unknown,
 }
 
-/// For a `bypass_permissions_blocked` action, which permission-escalation primitive was refused
+/// For a `bypass_permissions_blocked` action, which permission-mode or escalation primitive was refused
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
 pub enum ManagedSettingsEnforcedEscalation {
     /// Full allow-all permissions — automatically approving tools, paths, and URLs.
@@ -11373,7 +12377,7 @@ pub enum ManagedSettingsEnforcedEscalation {
     /// Automatic approval of all tool permission requests.
     #[serde(rename = "approve_all")]
     ApproveAll,
-    /// Assisted mode — keeps normal prompt paths and adds an LLM recommendation, distinct from allow-all.
+    /// Assisted Permissions — uses an LLM review to reduce prompts, distinct from allow-all and not a hard security boundary.
     #[serde(rename = "assisted_approval")]
     AssistedApproval,
     /// Unrestricted filesystem access outside the session's allowed directories.
@@ -11553,7 +12557,7 @@ pub enum McpServerStatus {
     /// The server is configured but disabled.
     #[serde(rename = "disabled")]
     Disabled,
-    /// The server was intentionally stopped and can be restarted on demand when policy permits; a server quarantined by restrictive managed policy stays stopped and cannot be restarted until the policy allows it.
+    /// The server is not running: it may not have started yet, may have been explicitly stopped, or may be quarantined by restrictive managed policy. It can be restarted on demand when policy permits.
     #[serde(rename = "stopped")]
     Stopped,
     /// The server is not configured for this session.
diff --git a/rust/src/installation_confirmation.rs b/rust/src/installation_confirmation.rs
index 42a52092ba..ccb9b46b01 100644
--- a/rust/src/installation_confirmation.rs
+++ b/rust/src/installation_confirmation.rs
@@ -2,14 +2,12 @@
 
 //! Connection-global human confirmation for experimental installation operations.
 
-use std::collections::HashMap;
-use std::collections::hash_map::Entry;
 use std::panic::AssertUnwindSafe;
 use std::sync::{Arc, OnceLock, Weak};
 
 use async_trait::async_trait;
 use futures_util::FutureExt;
-use parking_lot::{Mutex, RwLock};
+use parking_lot::RwLock;
 use tokio_util::sync::CancellationToken;
 use tracing::warn;
 
@@ -22,7 +20,6 @@ use crate::{
 };
 
 pub(crate) const CONFIRM_METHOD: &str = "installations.confirm";
-const REQUEST_CANCELLED: i32 = -32800;
 
 /// The cancellation lifetime of one confirmation.
 ///
@@ -66,63 +63,6 @@ pub trait InstallationConfirmationHandler: Send + Sync + 'static {
     ) -> Result<InstallationDecision>;
 }
 
-/// Registered synchronously by the transport before forwarding each confirmation.
-/// This preserves request/cancellation ordering across the router's separate queues.
-#[derive(Default)]
-pub(crate) struct ConfirmationRequests {
-    pending: Mutex<HashMap<u64, Arc<CancellationToken>>>,
-}
-
-impl ConfirmationRequests {
-    pub(crate) fn register(&self, id: u64) -> bool {
-        let mut pending = self.pending.lock();
-        match pending.entry(id) {
-            Entry::Vacant(entry) => {
-                entry.insert(Arc::new(CancellationToken::new()));
-                true
-            }
-            Entry::Occupied(_) => false,
-        }
-    }
-
-    pub(crate) fn cancel(&self, id: u64) {
-        if let Some(token) = self.pending.lock().get(&id) {
-            token.cancel();
-        }
-    }
-
-    pub(crate) fn clear(&self) {
-        self.pending.lock().clear();
-    }
-
-    fn claim(self: &Arc<Self>, id: u64) -> Option<PendingConfirmation> {
-        let cancellation = self.pending.lock().get(&id)?.clone();
-        Some(PendingConfirmation {
-            requests: self.clone(),
-            id,
-            cancellation,
-        })
-    }
-}
-
-struct PendingConfirmation {
-    requests: Arc<ConfirmationRequests>,
-    id: u64,
-    cancellation: Arc<CancellationToken>,
-}
-
-impl Drop for PendingConfirmation {
-    fn drop(&mut self) {
-        let mut pending = self.requests.pending.lock();
-        if pending
-            .get(&self.id)
-            .is_some_and(|token| Arc::ptr_eq(token, &self.cancellation))
-        {
-            pending.remove(&self.id);
-        }
-    }
-}
-
 pub(crate) struct InstallationConfirmationDispatcher {
     handler: RwLock<Option<Arc<dyn InstallationConfirmationHandler>>>,
     client: OnceLock<Weak<ClientInner>>,
@@ -153,11 +93,11 @@ impl InstallationConfirmationDispatcher {
         let Some(client) = self.client.get().and_then(Weak::upgrade) else {
             return;
         };
-        let Some(pending) = client.rpc.confirmation_requests.claim(request.id) else {
+        let Some(pending) = client.rpc.cancellable_requests.claim(request.id) else {
             warn!("confirmation request retired before dispatch");
             return;
         };
-        let request_cancelled = pending.cancellation.as_ref().clone();
+        let request_cancelled = pending.cancellation().clone();
         let connection_closed = client.rpc.connection_closed_token();
         let context = InstallationConfirmationContext {
             cancellation: connection_closed.child_token(),
@@ -170,7 +110,7 @@ impl InstallationConfirmationDispatcher {
                 _ = connection_closed.cancelled() => return,
                 _ = request_cancelled.cancelled() => {
                     context.cancellation.cancel();
-                    Err((REQUEST_CANCELLED, "Installation confirmation request cancelled"))
+                    Err((error_codes::REQUEST_CANCELLED, "Installation confirmation request cancelled"))
                 }
                 outcome = Self::handle(handler, request.params, context.clone()) => outcome,
             };
@@ -180,7 +120,7 @@ impl InstallationConfirmationDispatcher {
             let outcome = if request_cancelled.is_cancelled() {
                 context.cancellation.cancel();
                 Err((
-                    REQUEST_CANCELLED,
+                    error_codes::REQUEST_CANCELLED,
                     "Installation confirmation request cancelled",
                 ))
             } else {
diff --git a/rust/src/jsonrpc.rs b/rust/src/jsonrpc.rs
index 8da2c72fb5..c602ca9f4d 100644
--- a/rust/src/jsonrpc.rs
+++ b/rust/src/jsonrpc.rs
@@ -1,4 +1,5 @@
 use std::collections::HashMap;
+use std::collections::hash_map::Entry;
 use std::sync::Arc;
 use std::sync::atomic::{AtomicU64, Ordering};
 use std::time::Instant;
@@ -98,6 +99,8 @@ pub mod error_codes {
     /// Internal server error (-32603).
     #[allow(dead_code, reason = "standard JSON-RPC code, reserved for future use")]
     pub const INTERNAL_ERROR: i32 = -32603;
+    /// Request cancelled by the peer's `$/cancelRequest` (-32800).
+    pub const REQUEST_CANCELLED: i32 = -32800;
 }
 
 /// A JSON-RPC 2.0 notification (no `id`, no response expected).
@@ -267,13 +270,92 @@ fn repair_lone_surrogates(body: &[u8]) -> Option<Vec<u8>> {
 ///
 /// `frame` is the fully serialized bytes (header + body); the caller pays
 /// the serde cost synchronously before enqueueing so the actor never sees a
-/// `Result` from JSON encoding. `ack` resolves once the bytes have been
+/// `Result` from JSON encoding. When present, `ack` resolves once the bytes have been
 /// fully written and flushed (or the underlying I/O reports an error). If
 /// the caller drops the `oneshot::Receiver`, the actor still completes the
 /// frame — caller cancellation cannot desync the wire.
 struct WriteCommand {
     frame: Vec<u8>,
-    ack: oneshot::Sender<Result<(), std::io::Error>>,
+    ack: Option<oneshot::Sender<Result<(), std::io::Error>>>,
+}
+
+/// Inbound requests that honor `$/cancelRequest`.
+///
+/// The read loop registers each one synchronously before forwarding it. This
+/// preserves request/cancellation ordering across the router's separate queues.
+#[derive(Default)]
+pub(crate) struct CancellableRequests {
+    pending: Mutex<HashMap<u64, Arc<CancellationToken>>>,
+}
+
+impl CancellableRequests {
+    fn honors_cancellation(method: &str) -> bool {
+        use crate::generated::api_types::rpc_methods;
+
+        matches!(
+            method,
+            crate::installation_confirmation::CONFIRM_METHOD
+                | rpc_methods::SKILLPROVIDER_LIST
+                | rpc_methods::SKILLPROVIDER_READ
+        )
+    }
+
+    fn register(&self, id: u64) -> bool {
+        let mut pending = self.pending.lock();
+        match pending.entry(id) {
+            Entry::Vacant(entry) => {
+                entry.insert(Arc::new(CancellationToken::new()));
+                true
+            }
+            Entry::Occupied(_) => false,
+        }
+    }
+
+    fn cancel(&self, id: u64) {
+        if let Some(token) = self.pending.lock().get(&id) {
+            token.cancel();
+        }
+    }
+
+    fn clear(&self) {
+        self.pending.lock().clear();
+    }
+
+    /// Take ownership of a registered request's cancellation until the
+    /// returned guard drops, or `None` if the connection already retired it.
+    pub(crate) fn claim(self: &Arc<Self>, id: u64) -> Option<PendingCancellation> {
+        let cancellation = self.pending.lock().get(&id)?.clone();
+        Some(PendingCancellation {
+            requests: self.clone(),
+            id,
+            cancellation,
+        })
+    }
+}
+
+pub(crate) struct PendingCancellation {
+    requests: Arc<CancellableRequests>,
+    id: u64,
+    cancellation: Arc<CancellationToken>,
+}
+
+impl PendingCancellation {
+    /// Cancelled when the runtime sends `$/cancelRequest` for this request.
+    pub(crate) fn cancellation(&self) -> &CancellationToken {
+        &self.cancellation
+    }
+}
+
+impl Drop for PendingCancellation {
+    fn drop(&mut self) {
+        let mut pending = self.requests.pending.lock();
+        if pending
+            .get(&self.id)
+            .is_some_and(|token| Arc::ptr_eq(token, &self.cancellation))
+        {
+            pending.remove(&self.id);
+        }
+    }
 }
 
 /// Low-level JSON-RPC 2.0 client over Content-Length-framed streams.
@@ -300,7 +382,7 @@ pub struct JsonRpcClient {
     request_tx: mpsc::UnboundedSender<JsonRpcRequest>,
     request_handlers: RequestHandlers,
     connection_closed: CancellationToken,
-    pub(crate) confirmation_requests: Arc<crate::installation_confirmation::ConfirmationRequests>,
+    pub(crate) cancellable_requests: Arc<CancellableRequests>,
     read_task: Mutex<Option<JoinHandle<()>>>,
     write_task: Mutex<Option<JoinHandle<()>>>,
 }
@@ -330,9 +412,12 @@ impl JsonRpcClient {
         host_notifications: Option<mpsc::UnboundedSender<JsonRpcNotification>>,
     ) -> Self {
         let (write_tx, write_rx) = mpsc::unbounded_channel::<WriteCommand>();
+        let connection_closed = CancellationToken::new();
 
         let writer_span = tracing::error_span!("jsonrpc_write_loop");
-        let write_task = tokio::spawn(Self::write_loop(writer, write_rx).instrument(writer_span));
+        let write_task = tokio::spawn(
+            Self::write_loop(writer, write_rx, connection_closed.clone()).instrument(writer_span),
+        );
 
         let client = Self {
             request_id: AtomicU64::new(1),
@@ -341,10 +426,8 @@ impl JsonRpcClient {
             notification_tx,
             request_tx,
             request_handlers: Arc::new(RwLock::new(HashMap::new())),
-            connection_closed: CancellationToken::new(),
-            confirmation_requests: Arc::new(
-                crate::installation_confirmation::ConfirmationRequests::default(),
-            ),
+            connection_closed,
+            cancellable_requests: Arc::new(CancellableRequests::default()),
             read_task: Mutex::new(None),
             write_task: Mutex::new(Some(write_task)),
         };
@@ -353,7 +436,7 @@ impl JsonRpcClient {
         let notification_tx_clone = client.notification_tx.clone();
         let request_tx_clone = client.request_tx.clone();
         let connection_closed = client.connection_closed.clone();
-        let confirmation_requests = client.confirmation_requests.clone();
+        let cancellable_requests = client.cancellable_requests.clone();
         let request_handlers = client.request_handlers.clone();
         let write_tx = client.write_tx.clone();
         let reader_span = tracing::error_span!("jsonrpc_read_loop");
@@ -367,7 +450,7 @@ impl JsonRpcClient {
                     request_tx_clone,
                     request_handlers,
                     write_tx,
-                    (connection_closed, confirmation_requests),
+                    (connection_closed, cancellable_requests),
                 )
                 .await;
             }
@@ -380,7 +463,7 @@ impl JsonRpcClient {
 
     pub(crate) fn force_close(&self) {
         self.connection_closed.cancel();
-        self.confirmation_requests.clear();
+        self.cancellable_requests.clear();
         let handlers = std::mem::take(&mut *self.request_handlers.write());
         drop(handlers);
         if let Some(task) = self.read_task.lock().take() {
@@ -438,6 +521,7 @@ impl JsonRpcClient {
     async fn write_loop(
         mut writer: impl AsyncWrite + Unpin + Send + 'static,
         mut rx: mpsc::UnboundedReceiver<WriteCommand>,
+        connection_closed: CancellationToken,
     ) {
         while let Some(WriteCommand { frame, ack }) = rx.recv().await {
             let result = async {
@@ -446,11 +530,21 @@ impl JsonRpcClient {
                 Ok::<_, std::io::Error>(())
             }
             .await;
-
             // Caller may have dropped the ack receiver (e.g. their
             // `await` was cancelled); that's fine — we still completed
             // the write, which was the whole point.
-            let _ = ack.send(result);
+            match ack {
+                Some(ack) => {
+                    let _ = ack.send(result);
+                }
+                None => {
+                    if let Err(error) = result {
+                        error!(%error, "router rejection write failed; closing connection");
+                        connection_closed.cancel();
+                        break;
+                    }
+                }
+            }
         }
     }
 
@@ -464,16 +558,18 @@ impl JsonRpcClient {
         request_tx: mpsc::UnboundedSender<JsonRpcRequest>,
         request_handlers: RequestHandlers,
         write_tx: mpsc::UnboundedSender<WriteCommand>,
-        connection: (
-            CancellationToken,
-            Arc<crate::installation_confirmation::ConfirmationRequests>,
-        ),
+        connection: (CancellationToken, Arc<CancellableRequests>),
     ) {
         let mut reader = BufReader::new(reader);
-        let (connection_closed, confirmation_requests) = connection;
+        let (connection_closed, cancellable_requests) = connection;
 
         loop {
-            match Self::read_message(&mut reader).await {
+            let message = tokio::select! {
+                biased;
+                _ = connection_closed.cancelled() => break,
+                message = Self::read_message(&mut reader) => message,
+            };
+            match message {
                 Ok(Some(message)) => match message {
                     JsonRpcMessage::Response(mut response) => {
                         let id = response.id;
@@ -537,7 +633,7 @@ impl JsonRpcClient {
                                 .and_then(|params| params.get("id"))
                                 .and_then(Value::as_u64)
                             {
-                                confirmation_requests.cancel(id);
+                                cancellable_requests.cancel(id);
                             } else {
                                 warn!("invalid numeric request cancellation");
                             }
@@ -552,10 +648,10 @@ impl JsonRpcClient {
                         let _ = notifications.0.send(notification);
                     }
                     JsonRpcMessage::Request(request) => {
-                        if request.method == crate::installation_confirmation::CONFIRM_METHOD
-                            && !confirmation_requests.register(request.id)
+                        if CancellableRequests::honors_cancellation(&request.method)
+                            && !cancellable_requests.register(request.id)
                         {
-                            warn!("duplicate pending installation confirmation request ID");
+                            warn!(method = %request.method, "duplicate pending cancellable request ID");
                             break;
                         }
                         let handler = request_handlers.read().get(&request.method).cloned();
@@ -608,7 +704,7 @@ impl JsonRpcClient {
             }
         }
         connection_closed.cancel();
-        confirmation_requests.clear();
+        cancellable_requests.clear();
         // A handler may own the last Client clone, whose drop closes the RPC.
         // Release the registry lock before dropping those captured values.
         let handlers = std::mem::take(&mut *request_handlers.write());
@@ -827,27 +923,18 @@ impl JsonRpcClient {
         Self::write_message(&self.write_tx, message).await
     }
 
+    /// Commit a router rejection to the existing writer actor without retaining
+    /// a delivery waiter. The actor reports write failure and closes the connection.
+    pub(crate) fn enqueue_response(&self, response: &JsonRpcResponse) -> Result<(), Error> {
+        Self::enqueue_message(&self.write_tx, response, None)
+    }
+
     async fn write_message<T: serde::Serialize>(
         write_tx: &mpsc::UnboundedSender<WriteCommand>,
         message: &T,
     ) -> Result<(), Error> {
-        let body = serde_json::to_vec(message)?;
-        let mut frame = Vec::with_capacity(CONTENT_LENGTH_HEADER.len() + 16 + body.len() + 4);
-        frame.extend_from_slice(CONTENT_LENGTH_HEADER.as_bytes());
-        frame.extend_from_slice(body.len().to_string().as_bytes());
-        frame.extend_from_slice(b"\r\n\r\n");
-        frame.extend_from_slice(&body);
-
         let (ack_tx, ack_rx) = oneshot::channel();
-        write_tx
-            .send(WriteCommand { frame, ack: ack_tx })
-            .map_err(|_| {
-                Error::from(std::io::Error::new(
-                    std::io::ErrorKind::BrokenPipe,
-                    "writer actor has shut down",
-                ))
-            })?;
-
+        Self::enqueue_message(write_tx, message, Some(ack_tx))?;
         match ack_rx.await {
             Ok(Ok(())) => Ok(()),
             Ok(Err(e)) => Err(Error::from(e)),
@@ -857,6 +944,28 @@ impl JsonRpcClient {
             ))),
         }
     }
+
+    fn enqueue_message<T: serde::Serialize>(
+        write_tx: &mpsc::UnboundedSender<WriteCommand>,
+        message: &T,
+        ack: Option<oneshot::Sender<Result<(), std::io::Error>>>,
+    ) -> Result<(), Error> {
+        let body = serde_json::to_vec(message)?;
+        let mut frame = Vec::with_capacity(CONTENT_LENGTH_HEADER.len() + 16 + body.len() + 4);
+        frame.extend_from_slice(CONTENT_LENGTH_HEADER.as_bytes());
+        frame.extend_from_slice(body.len().to_string().as_bytes());
+        frame.extend_from_slice(b"\r\n\r\n");
+        frame.extend_from_slice(&body);
+
+        write_tx.send(WriteCommand { frame, ack }).map_err(|_| {
+            Error::from(std::io::Error::new(
+                std::io::ErrorKind::BrokenPipe,
+                "writer actor has shut down",
+            ))
+        })?;
+
+        Ok(())
+    }
 }
 
 impl Drop for JsonRpcClient {
diff --git a/rust/src/lib.rs b/rust/src/lib.rs
index 43040d0944..090bbaf85f 100644
--- a/rust/src/lib.rs
+++ b/rust/src/lib.rs
@@ -69,6 +69,8 @@ pub mod session;
 /// Custom session filesystem provider (virtualizable filesystem layer).
 pub mod session_fs;
 mod session_fs_dispatch;
+/// Session-scoped skill provider callbacks.
+pub mod skill_provider;
 /// Per-phase timing breakdown for [`Client::start`].
 pub mod startup_timings;
 /// Event subscription handles returned by `subscribe()` methods.
@@ -131,6 +133,7 @@ pub(crate) use jsonrpc::{
 };
 pub use mode::{BUILTIN_TOOLS_ISOLATED, ClientMode, ToolSet};
 pub use provider_token::{BearerTokenError, BearerTokenProvider, ProviderTokenArgs};
+pub use skill_provider::{SkillProvider, SkillProviderDescriptor};
 
 /// Re-exported JSON-RPC internals for integration tests (requires `test-support` feature).
 #[cfg(feature = "test-support")]
@@ -1631,12 +1634,17 @@ impl Client {
                     if !use_logged_in_user {
                         args.push("--no-auto-login".to_string());
                     }
+                    let integration_id = std::env::var("GITHUB_COPILOT_INTEGRATION_ID")
+                        .ok()
+                        .map(|value| value.trim().to_owned())
+                        .filter(|value| !value.is_empty());
                     let explicit_cli = std::env::var_os("COPILOT_CLI_PATH")
                         .map(PathBuf::from)
                         .filter(|path| path.is_file());
                     let host = crate::ffi::FfiHost::create(
                         &program,
                         explicit_cli.as_deref(),
+                        integration_id.as_deref(),
                         environment,
                         args,
                     )?;
@@ -2055,6 +2063,22 @@ impl Client {
         )
     }
 
+    /// Construct a client from raw streams with a preset mode, for integration
+    /// tests that need mode-specific session defaults without spawning a CLI.
+    #[doc(hidden)]
+    #[cfg(any(test, feature = "test-support"))]
+    pub fn from_streams_with_mode_for_test(
+        reader: impl AsyncRead + Unpin + Send + 'static,
+        writer: impl AsyncWrite + Unpin + Send + 'static,
+        cwd: PathBuf,
+        mode: ClientMode,
+    ) -> Result<Self> {
+        Self::from_transport(
+            reader, writer, None, None, cwd, None, None, false, false, false, None, None, None,
+            mode, None, false,
+        )
+    }
+
     #[allow(clippy::too_many_arguments)]
     fn from_transport(
         reader: impl AsyncRead + Unpin + Send + 'static,
@@ -2596,6 +2620,31 @@ impl Client {
         self.inner.router.register(session_id)
     }
 
+    /// Like [`register_session`](Self::register_session), but keeps the
+    /// registration it displaced so a failed resume can restore it with
+    /// [`restore_session_owned`](Self::restore_session_owned).
+    pub(crate) fn replace_session_registration(
+        &self,
+        session_id: &SessionId,
+    ) -> (
+        crate::router::SessionRegistration,
+        Option<crate::router::ReplacedRegistration>,
+    ) {
+        self.inner.router.ensure_started(&self.inner);
+        self.inner.router.replace(session_id)
+    }
+
+    /// Unregister the registration identified by `token`, handing the ID back
+    /// to `replaced` if that session is still running.
+    pub(crate) fn restore_session_owned(
+        &self,
+        session_id: &SessionId,
+        token: crate::router::RegistrationToken,
+        replaced: Option<crate::router::ReplacedRegistration>,
+    ) {
+        self.inner.router.restore_owned(session_id, token, replaced);
+    }
+
     /// Unregister a session only if `token` still identifies the live
     /// registration.
     ///
diff --git a/rust/src/process_tree.rs b/rust/src/process_tree.rs
index ef9d3fc62e..238854bcf9 100644
--- a/rust/src/process_tree.rs
+++ b/rust/src/process_tree.rs
@@ -56,9 +56,11 @@ mod platform {
     use std::{io, ptr};
 
     use tokio::process::{Child, Command};
-    use windows_sys::Win32::Foundation::{CloseHandle, HANDLE, INVALID_HANDLE_VALUE};
-    use windows_sys::Win32::System::Diagnostics::ToolHelp::{
-        CreateToolhelp32Snapshot, TH32CS_SNAPTHREAD, THREADENTRY32, Thread32First, Thread32Next,
+    use windows_sys::Win32::Foundation::{CloseHandle, ERROR_NO_MORE_ITEMS, HANDLE};
+    use windows_sys::Win32::System::Diagnostics::ProcessSnapshotting::{
+        HPSS, HPSSWALK, PSS_CAPTURE_THREADS, PSS_THREAD_ENTRY, PSS_WALK_THREADS,
+        PssCaptureSnapshot, PssFreeSnapshot, PssWalkMarkerCreate, PssWalkMarkerFree,
+        PssWalkSnapshot,
     };
     use windows_sys::Win32::System::JobObjects::{
         AssignProcessToJobObject, CreateJobObjectW, JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE,
@@ -66,9 +68,48 @@ mod platform {
         SetInformationJobObject, TerminateJobObject,
     };
     use windows_sys::Win32::System::Threading::{
-        CREATE_NO_WINDOW, CREATE_SUSPENDED, OpenThread, ResumeThread, THREAD_SUSPEND_RESUME,
+        CREATE_NO_WINDOW, CREATE_SUSPENDED, GetCurrentProcess, GetProcessIdOfThread, OpenThread,
+        ResumeThread, THREAD_QUERY_LIMITED_INFORMATION, THREAD_SUSPEND_RESUME,
     };
 
+    #[cfg(test)]
+    use super::tests::{
+        BEFORE_ASSIGNMENT, BEFORE_RESUME, FailurePoint, MARKERS, RESUME_ELAPSED, SNAPSHOTS,
+        THREADS_EXAMINED, fail_at,
+    };
+
+    struct ThreadSnapshot(HPSS);
+
+    impl Drop for ThreadSnapshot {
+        fn drop(&mut self) {
+            // SAFETY: this process uniquely owns the local snapshot descriptor.
+            let status = unsafe { PssFreeSnapshot(GetCurrentProcess(), self.0) };
+            if let Err(error) = check_status(status) {
+                tracing::warn!(%error, "failed to free CLI thread snapshot");
+            }
+            #[cfg(test)]
+            if status == 0 {
+                SNAPSHOTS.set((SNAPSHOTS.get().0, SNAPSHOTS.get().1 + 1));
+            }
+        }
+    }
+
+    struct WalkMarker(HPSSWALK);
+
+    impl Drop for WalkMarker {
+        fn drop(&mut self) {
+            // SAFETY: this value uniquely owns a valid walk marker.
+            let status = unsafe { PssWalkMarkerFree(self.0) };
+            if let Err(error) = check_status(status) {
+                tracing::warn!(%error, "failed to free CLI thread walk marker");
+            }
+            #[cfg(test)]
+            if status == 0 {
+                MARKERS.set((MARKERS.get().0, MARKERS.get().1 + 1));
+            }
+        }
+    }
+
     struct OwnedHandle(HANDLE);
 
     // SAFETY: Win32 handles may be used and closed from any thread.
@@ -97,13 +138,19 @@ mod platform {
         match attach_and_resume(&child) {
             Ok(tree) => Ok((child, tree)),
             Err(error) => {
-                let _ = child.start_kill();
+                if let Err(kill_error) = child.start_kill() {
+                    tracing::warn!(%kill_error, "failed to terminate suspended CLI child");
+                }
                 Err(error)
             }
         }
     }
 
     fn attach_and_resume(child: &Child) -> io::Result<Tree> {
+        #[cfg(test)]
+        if let Some(hook) = BEFORE_ASSIGNMENT.with_borrow_mut(Option::take) {
+            hook(child)?;
+        }
         // SAFETY: null security attributes and name create a private,
         // non-inheritable Job Object.
         let raw_job = unsafe { CreateJobObjectW(ptr::null(), ptr::null()) };
@@ -138,50 +185,122 @@ mod platform {
             return Err(io::Error::last_os_error());
         }
 
-        resume_initial_thread(child.id().ok_or_else(|| {
-            io::Error::new(io::ErrorKind::NotFound, "CLI exited before thread resume")
-        })?)?;
+        #[cfg(test)]
+        if let Some(hook) = BEFORE_RESUME.with_borrow_mut(Option::take) {
+            hook(child, job.0)?;
+        }
+        #[cfg(test)]
+        let resume_start = std::time::Instant::now();
+        let result = resume_initial_thread(
+            process.cast(),
+            child.id().ok_or_else(|| {
+                io::Error::new(io::ErrorKind::NotFound, "CLI exited before thread resume")
+            })?,
+        );
+        #[cfg(test)]
+        RESUME_ELAPSED.set(resume_start.elapsed());
+        result?;
         Ok(Tree { job })
     }
 
-    fn resume_initial_thread(pid: u32) -> io::Result<()> {
-        // SAFETY: the returned snapshot handle is owned and closed below.
-        let snapshot = unsafe { CreateToolhelp32Snapshot(TH32CS_SNAPTHREAD, 0) };
-        if snapshot == INVALID_HANDLE_VALUE {
-            return Err(io::Error::last_os_error());
+    pub(super) fn check_status(status: u32) -> io::Result<()> {
+        if status == 0 {
+            Ok(())
+        } else {
+            Err(io::Error::from_raw_os_error(status as i32))
         }
-        let snapshot = OwnedHandle(snapshot);
-        let mut entry = THREADENTRY32 {
-            dwSize: size_of::<THREADENTRY32>() as u32,
-            ..Default::default()
-        };
-
-        // SAFETY: `entry` has the documented size and remains live throughout
-        // enumeration.
-        let mut found = unsafe { Thread32First(snapshot.0, &mut entry) } != 0;
-        while found {
-            if entry.th32OwnerProcessID == pid {
-                // SAFETY: the thread id came from the live system snapshot.
-                let raw_thread =
-                    unsafe { OpenThread(THREAD_SUSPEND_RESUME, 0, entry.th32ThreadID) };
+    }
+
+    pub(super) fn resume_initial_thread(process: HANDLE, pid: u32) -> io::Result<()> {
+        #[cfg(test)]
+        THREADS_EXAMINED.set(0);
+        #[cfg(test)]
+        fail_at(FailurePoint::Capture)?;
+        let mut snapshot = ptr::null_mut();
+        // SAFETY: the suspended child owns the live process handle throughout
+        // capture and resume. Only its thread information is captured.
+        check_status(unsafe {
+            PssCaptureSnapshot(process, PSS_CAPTURE_THREADS, 0, &mut snapshot)
+        })?;
+        let snapshot = ThreadSnapshot(snapshot);
+        #[cfg(test)]
+        SNAPSHOTS.set((SNAPSHOTS.get().0 + 1, SNAPSHOTS.get().1));
+
+        #[cfg(test)]
+        fail_at(FailurePoint::Marker)?;
+        let mut marker = ptr::null_mut();
+        // SAFETY: Windows initializes the marker with its default allocator.
+        check_status(unsafe { PssWalkMarkerCreate(ptr::null(), &mut marker) })?;
+        let marker = WalkMarker(marker);
+        #[cfg(test)]
+        MARKERS.set((MARKERS.get().0 + 1, MARKERS.get().1));
+
+        loop {
+            #[cfg(test)]
+            fail_at(FailurePoint::Walk)?;
+            let mut entry = PSS_THREAD_ENTRY::default();
+            // SAFETY: the aligned entry has the layout and size required by
+            // PSS_WALK_THREADS; both snapshot and marker remain owned.
+            let status = unsafe {
+                PssWalkSnapshot(
+                    snapshot.0,
+                    PSS_WALK_THREADS,
+                    marker.0,
+                    ptr::from_mut(&mut entry).cast(),
+                    size_of::<PSS_THREAD_ENTRY>() as u32,
+                )
+            };
+            if status == ERROR_NO_MORE_ITEMS {
+                return Err(io::Error::new(
+                    io::ErrorKind::NotFound,
+                    "CLI initial thread was not found in its process snapshot",
+                ));
+            }
+            check_status(status)?;
+            #[cfg(test)]
+            THREADS_EXAMINED.set(THREADS_EXAMINED.get() + 1);
+            if entry.ProcessId == pid {
+                #[cfg(test)]
+                fail_at(FailurePoint::OpenThread)?;
+                // SAFETY: the thread id came from the child's process snapshot.
+                let raw_thread = unsafe {
+                    OpenThread(
+                        THREAD_SUSPEND_RESUME | THREAD_QUERY_LIMITED_INFORMATION,
+                        0,
+                        entry.ThreadId,
+                    )
+                };
                 if raw_thread.is_null() {
                     return Err(io::Error::last_os_error());
                 }
                 let thread = OwnedHandle(raw_thread);
-                // SAFETY: this is the root's suspended initial thread.
-                if unsafe { ResumeThread(thread.0) } == u32::MAX {
-                    return Err(io::Error::last_os_error());
-                }
-                return Ok(());
+                return resume_owned_thread(thread.0, pid);
             }
-            // SAFETY: same valid snapshot and initialized entry as above.
-            found = unsafe { Thread32Next(snapshot.0, &mut entry) } != 0;
         }
+    }
 
-        Err(io::Error::new(
-            io::ErrorKind::NotFound,
-            "CLI initial thread was not found",
-        ))
+    pub(super) fn resume_owned_thread(thread: HANDLE, pid: u32) -> io::Result<()> {
+        #[cfg(test)]
+        fail_at(FailurePoint::QueryThread)?;
+        // SAFETY: the caller owns this thread handle with limited-query rights.
+        let owner = unsafe { GetProcessIdOfThread(thread) };
+        if owner == 0 {
+            return Err(io::Error::last_os_error());
+        }
+        if owner != pid {
+            return Err(io::Error::new(
+                io::ErrorKind::PermissionDenied,
+                "CLI initial thread no longer belongs to the spawned process",
+            ));
+        }
+        #[cfg(test)]
+        fail_at(FailurePoint::Resume)?;
+        // SAFETY: the open handle's ownership was verified, and the root's
+        // initial thread remains suspended until Job assignment completes.
+        if unsafe { ResumeThread(thread) } == u32::MAX {
+            return Err(io::Error::last_os_error());
+        }
+        Ok(())
     }
 
     impl Tree {
@@ -195,3 +314,6 @@ mod platform {
         }
     }
 }
+
+#[cfg(all(test, windows, feature = "runtime"))]
+mod tests;
diff --git a/rust/src/process_tree/tests.rs b/rust/src/process_tree/tests.rs
new file mode 100644
index 0000000000..5106081dac
--- /dev/null
+++ b/rust/src/process_tree/tests.rs
@@ -0,0 +1,318 @@
+#![cfg(test)]
+
+use std::os::windows::io::{AsRawHandle, FromRawHandle, OwnedHandle};
+use std::os::windows::process::CommandExt;
+use std::path::{Path, PathBuf};
+use std::sync::Arc;
+use std::time::{Duration, Instant};
+use std::{io, ptr};
+
+use tokio::process::{Child, Command};
+use windows_sys::Win32::Foundation::{
+    DUPLICATE_SAME_ACCESS, DuplicateHandle, ERROR_ACCESS_DENIED, HANDLE,
+};
+use windows_sys::Win32::System::JobObjects::IsProcessInJob;
+use windows_sys::Win32::System::Threading::{
+    GetCurrentProcess, GetCurrentProcessId, GetCurrentThreadId, OpenThread,
+    THREAD_QUERY_LIMITED_INFORMATION, THREAD_SUSPEND_RESUME, WaitForSingleObject,
+};
+
+use super::platform::{check_status, resume_initial_thread, resume_owned_thread};
+
+#[derive(Clone, Copy, PartialEq)]
+pub(super) enum FailurePoint {
+    Capture,
+    Marker,
+    Walk,
+    OpenThread,
+    QueryThread,
+    Resume,
+}
+
+type BeforeAssignment = Box<dyn FnOnce(&Child) -> io::Result<()>>;
+type BeforeResume = Box<dyn FnOnce(&Child, HANDLE) -> io::Result<()>>;
+
+thread_local! {
+    pub(super) static THREADS_EXAMINED: std::cell::Cell<u32> = const { std::cell::Cell::new(0) };
+    pub(super) static RESUME_ELAPSED: std::cell::Cell<Duration> =
+        const { std::cell::Cell::new(Duration::ZERO) };
+    pub(super) static BEFORE_ASSIGNMENT: std::cell::RefCell<Option<BeforeAssignment>> =
+        const { std::cell::RefCell::new(None) };
+    pub(super) static BEFORE_RESUME: std::cell::RefCell<Option<BeforeResume>> =
+        const { std::cell::RefCell::new(None) };
+    static FAILURE: std::cell::Cell<Option<FailurePoint>> =
+        const { std::cell::Cell::new(None) };
+    pub(super) static SNAPSHOTS: std::cell::Cell<(u32, u32)> =
+        const { std::cell::Cell::new((0, 0)) };
+    pub(super) static MARKERS: std::cell::Cell<(u32, u32)> =
+        const { std::cell::Cell::new((0, 0)) };
+}
+
+pub(super) fn fail_at(point: FailurePoint) -> io::Result<()> {
+    if FAILURE.get() == Some(point) {
+        Err(io::Error::from_raw_os_error(ERROR_ACCESS_DENIED as i32))
+    } else {
+        Ok(())
+    }
+}
+
+struct ResetHooks;
+
+impl Drop for ResetHooks {
+    fn drop(&mut self) {
+        FAILURE.set(None);
+        BEFORE_ASSIGNMENT.with_borrow_mut(|hook| *hook = None);
+        BEFORE_RESUME.with_borrow_mut(|hook| *hook = None);
+    }
+}
+
+fn command() -> Command {
+    let mut command = Command::new(
+        PathBuf::from(std::env::var_os("SystemRoot").expect("SystemRoot"))
+            .join("System32")
+            .join("cmd.exe"),
+    );
+    command.args(["/d", "/c"]).kill_on_drop(true);
+    command
+}
+
+fn marker_command(marker: &Path) -> Command {
+    let mut command = command();
+    command
+        .as_std_mut()
+        .raw_arg(format!("echo ready>\"{}\"", marker.display()));
+    command
+}
+
+fn retain_process(child: &Child) -> OwnedHandle {
+    let mut handle = ptr::null_mut();
+    // SAFETY: the child owns its live process handle; the duplicate is independently owned.
+    let result = unsafe {
+        DuplicateHandle(
+            GetCurrentProcess(),
+            child.raw_handle().expect("live child").cast(),
+            GetCurrentProcess(),
+            &mut handle,
+            0,
+            0,
+            DUPLICATE_SAME_ACCESS,
+        )
+    };
+    assert_ne!(result, 0, "{}", io::Error::last_os_error());
+    // SAFETY: DuplicateHandle returned a new uniquely owned process handle.
+    unsafe { OwnedHandle::from_raw_handle(handle) }
+}
+
+fn assert_exited(handle: &OwnedHandle) {
+    // SAFETY: the independently owned process handle remains valid.
+    assert_eq!(
+        unsafe { WaitForSingleObject(handle.as_raw_handle().cast(), 5000) },
+        0,
+        "owned suspended root must terminate"
+    );
+}
+
+#[tokio::test]
+async fn initial_thread_lookup_is_process_scoped() {
+    let mut command = command();
+    command.args(["exit", "/b", "0"]);
+    let start = Instant::now();
+    let (mut child, tree) = super::spawn(&mut command).expect("spawn owned suspended child");
+    let spawn_elapsed = start.elapsed();
+    let status = tokio::time::timeout(Duration::from_secs(5), child.wait())
+        .await
+        .expect("initial thread must execute")
+        .expect("reap child");
+    drop(tree);
+    assert!(status.success());
+    eprintln!(
+        "owned lookup: spawn_ms={:.3} resume_ms={:.3} entries={}",
+        spawn_elapsed.as_secs_f64() * 1000.0,
+        RESUME_ELAPSED.get().as_secs_f64() * 1000.0,
+        THREADS_EXAMINED.get()
+    );
+    assert_eq!(
+        THREADS_EXAMINED.get(),
+        1,
+        "lookup must not walk unrelated machine-wide threads"
+    );
+}
+
+#[tokio::test]
+async fn initial_thread_executes_only_after_private_job_assignment() {
+    let _reset = ResetHooks;
+    let dir = tempfile::tempdir().expect("fixture directory");
+    let marker = dir.path().join("executed.txt");
+    BEFORE_ASSIGNMENT.with_borrow_mut(|hook| {
+        let marker = marker.clone();
+        *hook = Some(Box::new(move |_| {
+            assert!(
+                !marker.exists(),
+                "suspended root cannot execute before assignment"
+            );
+            Ok(())
+        }));
+    });
+    BEFORE_RESUME.with_borrow_mut(|hook| {
+        let marker = marker.clone();
+        *hook = Some(Box::new(move |child, job| {
+            assert!(
+                !marker.exists(),
+                "suspended initial thread must not have executed"
+            );
+            let mut assigned = 0;
+            // SAFETY: both handles remain owned throughout the hook.
+            assert_ne!(
+                unsafe {
+                    IsProcessInJob(
+                        child.raw_handle().expect("live child").cast(),
+                        job,
+                        &mut assigned,
+                    )
+                },
+                0,
+                "{}",
+                io::Error::last_os_error()
+            );
+            assert_ne!(
+                assigned, 0,
+                "root must belong to its private Job before resume"
+            );
+            Ok(())
+        }));
+    });
+    let (mut child, tree) = super::spawn(&mut marker_command(&marker)).expect("owned spawn");
+    let status = tokio::time::timeout(Duration::from_secs(5), child.wait())
+        .await
+        .expect("fixture must execute its initial thread")
+        .expect("reap fixture");
+    assert!(status.success());
+    assert_eq!(
+        std::fs::read_to_string(marker)
+            .expect("executed marker")
+            .trim(),
+        "ready"
+    );
+    drop(tree);
+}
+
+#[tokio::test]
+async fn lookup_failures_reap_suspended_root_and_release_pss_resources() {
+    let _reset = ResetHooks;
+    for point in [
+        FailurePoint::Capture,
+        FailurePoint::Marker,
+        FailurePoint::Walk,
+        FailurePoint::OpenThread,
+        FailurePoint::QueryThread,
+        FailurePoint::Resume,
+    ] {
+        let dir = tempfile::tempdir().expect("fixture directory");
+        let marker = dir.path().join("must-not-execute.txt");
+        let retained = Arc::new(parking_lot::Mutex::new(None));
+        BEFORE_ASSIGNMENT.with_borrow_mut(|hook| {
+            let retained = retained.clone();
+            *hook = Some(Box::new(move |child| {
+                *retained.lock() = Some(retain_process(child));
+                Ok(())
+            }));
+        });
+        SNAPSHOTS.set((0, 0));
+        MARKERS.set((0, 0));
+        FAILURE.set(Some(point));
+        let result = super::spawn(&mut marker_command(&marker));
+        let error = result.err().expect("injected launch failure");
+        assert_eq!(error.raw_os_error(), Some(ERROR_ACCESS_DENIED as i32));
+        assert_exited(retained.lock().as_ref().expect("retained suspended root"));
+        assert!(
+            !marker.exists(),
+            "failed lookup must never execute the root"
+        );
+        let snapshots = u32::from(point != FailurePoint::Capture);
+        let markers = u32::from(point != FailurePoint::Capture && point != FailurePoint::Marker);
+        assert_eq!(SNAPSHOTS.get(), (snapshots, snapshots));
+        assert_eq!(MARKERS.get(), (markers, markers));
+    }
+}
+
+#[tokio::test]
+async fn pre_assignment_failure_terminates_suspended_root() {
+    let _reset = ResetHooks;
+    let dir = tempfile::tempdir().expect("fixture directory");
+    let marker = dir.path().join("must-not-execute.txt");
+    let retained = Arc::new(parking_lot::Mutex::new(None));
+    BEFORE_ASSIGNMENT.with_borrow_mut(|hook| {
+        let retained = retained.clone();
+        *hook = Some(Box::new(move |child| {
+            *retained.lock() = Some(retain_process(child));
+            Err(io::Error::from_raw_os_error(ERROR_ACCESS_DENIED as i32))
+        }));
+    });
+    let error = super::spawn(&mut marker_command(&marker))
+        .err()
+        .expect("assignment failure");
+    assert_eq!(error.raw_os_error(), Some(ERROR_ACCESS_DENIED as i32));
+    assert_exited(retained.lock().as_ref().expect("retained root"));
+    assert!(!marker.exists());
+}
+
+#[test]
+fn pss_status_uses_returned_win32_error() {
+    assert!(check_status(0).is_ok());
+    assert_eq!(
+        check_status(ERROR_ACCESS_DENIED)
+            .expect_err("direct status error")
+            .raw_os_error(),
+        Some(ERROR_ACCESS_DENIED as i32)
+    );
+}
+
+#[test]
+fn invalid_process_capture_returns_error_without_resources() {
+    let _reset = ResetHooks;
+    SNAPSHOTS.set((0, 0));
+    MARKERS.set((0, 0));
+    assert!(resume_initial_thread(ptr::null_mut(), 1).is_err());
+    assert_eq!(SNAPSHOTS.get(), (0, 0));
+    assert_eq!(MARKERS.get(), (0, 0));
+}
+
+#[test]
+fn foreign_snapshot_entries_cannot_be_resumed() {
+    let _reset = ResetHooks;
+    SNAPSHOTS.set((0, 0));
+    MARKERS.set((0, 0));
+    // SAFETY: the pseudo handle references the current live process.
+    let error = resume_initial_thread(unsafe { GetCurrentProcess() }, u32::MAX)
+        .expect_err("no matching owned thread");
+    assert_eq!(error.kind(), io::ErrorKind::NotFound);
+    assert_eq!(SNAPSHOTS.get(), (1, 1));
+    assert_eq!(MARKERS.get(), (1, 1));
+}
+
+#[test]
+fn opened_foreign_thread_is_rejected_before_resume() {
+    let _reset = ResetHooks;
+    // SAFETY: the thread ID identifies this live test thread.
+    let handle = unsafe {
+        OpenThread(
+            THREAD_QUERY_LIMITED_INFORMATION | THREAD_SUSPEND_RESUME,
+            0,
+            GetCurrentThreadId(),
+        )
+    };
+    assert!(!handle.is_null(), "{}", io::Error::last_os_error());
+    // SAFETY: OpenThread returned a new uniquely owned handle.
+    let thread = unsafe { OwnedHandle::from_raw_handle(handle) };
+    let error = resume_owned_thread(thread.as_raw_handle().cast(), unsafe {
+        GetCurrentProcessId().wrapping_add(1)
+    })
+    .expect_err("opened handle belongs to a different process");
+    assert_eq!(error.kind(), io::ErrorKind::PermissionDenied);
+}
+
+#[test]
+fn invalid_thread_ownership_query_returns_error() {
+    let _reset = ResetHooks;
+    assert!(resume_owned_thread(ptr::null_mut(), 1).is_err());
+}
diff --git a/rust/src/router.rs b/rust/src/router.rs
index 02fd5cfde2..dff61da6b1 100644
--- a/rust/src/router.rs
+++ b/rust/src/router.rs
@@ -1,12 +1,12 @@
 use std::collections::HashMap;
-use std::sync::Arc;
 use std::sync::atomic::{AtomicU64, Ordering};
+use std::sync::{Arc, Weak};
 
 use parking_lot::Mutex;
 use tokio::sync::{broadcast, mpsc};
 use tracing::warn;
 
-use crate::jsonrpc::JsonRpcRequest;
+use crate::jsonrpc::{JsonRpcError, JsonRpcRequest, JsonRpcResponse, error_codes};
 use crate::types::{SessionEventNotification, SessionId};
 
 /// Identity of one specific registration of a session ID.
@@ -41,6 +41,13 @@ struct SessionSenders {
     token: RegistrationToken,
 }
 
+/// A registration displaced by [`SessionRouter::replace`].
+///
+/// Holding it keeps the displaced session's channels open, so a failed
+/// resume can hand routing back with [`SessionRouter::restore_owned`].
+/// Dropping it closes them, which ends that session's event loop.
+pub(crate) struct ReplacedRegistration(SessionSenders);
+
 /// Routes notifications and requests by sessionId to per-session channels.
 ///
 /// Internal to the SDK — consumers interact via `Client::register_session()`.
@@ -64,10 +71,20 @@ impl SessionRouter {
     /// Replaces any existing registration for the same ID and returns a
     /// fresh [`RegistrationToken`] identifying this registration.
     pub(crate) fn register(&self, session_id: &SessionId) -> SessionRegistration {
+        self.replace(session_id).0
+    }
+
+    /// Like [`register`](Self::register), but also returns the registration
+    /// it displaced so the caller can [`restore_owned`](Self::restore_owned)
+    /// it if the new one is abandoned.
+    pub(crate) fn replace(
+        &self,
+        session_id: &SessionId,
+    ) -> (SessionRegistration, Option<ReplacedRegistration>) {
         let (notif_tx, notif_rx) = mpsc::unbounded_channel();
         let (req_tx, req_rx) = mpsc::unbounded_channel();
         let token = RegistrationToken(self.next_token.fetch_add(1, Ordering::Relaxed));
-        self.sessions.lock().insert(
+        let replaced = self.sessions.lock().insert(
             session_id.clone(),
             SessionSenders {
                 notifications: notif_tx,
@@ -75,13 +92,14 @@ impl SessionRouter {
                 token,
             },
         );
-        SessionRegistration {
+        let registration = SessionRegistration {
             channels: SessionChannels {
                 notifications: notif_rx,
                 requests: req_rx,
             },
             token,
-        }
+        };
+        (registration, replaced.map(ReplacedRegistration))
     }
 
     /// Unregister a session, dropping its channels.
@@ -115,17 +133,37 @@ impl SessionRouter {
         &self,
         session_id: &SessionId,
         token: RegistrationToken,
+    ) -> bool {
+        self.restore_owned(session_id, token, None)
+    }
+
+    /// Unregister the registration identified by `token`, handing the ID
+    /// back to `replaced` when that session is still running.
+    ///
+    /// Returns `false`, leaving the router unchanged, when `token` no longer
+    /// identifies the live registration.
+    pub(crate) fn restore_owned(
+        &self,
+        session_id: &SessionId,
+        token: RegistrationToken,
+        replaced: Option<ReplacedRegistration>,
     ) -> bool {
         let mut sessions = self.sessions.lock();
-        if sessions
+        if !sessions
             .get(session_id.as_str())
             .is_some_and(|senders| senders.token == token)
         {
-            sessions.remove(session_id.as_str());
-            true
-        } else {
-            false
+            return false;
+        }
+        match replaced.filter(|replaced| !replaced.0.requests.is_closed()) {
+            Some(ReplacedRegistration(senders)) => {
+                sessions.insert(session_id.clone(), senders);
+            }
+            None => {
+                sessions.remove(session_id.as_str());
+            }
         }
+        true
     }
 
     /// Snapshot every currently-registered session ID.
@@ -156,12 +194,13 @@ impl SessionRouter {
     /// Takes the notification broadcast and request channel from the client.
     /// If its request receiver was already taken by `take_request_rx()`,
     /// only notification routing is available.
-    pub(crate) fn ensure_started(&self, client: &crate::ClientInner) {
+    pub(crate) fn ensure_started(&self, client: &Arc<crate::ClientInner>) {
         let mut started = self.started.lock();
         if *started {
             return;
         }
         *started = true;
+        let weak_client = Arc::downgrade(client);
         let extension_launch_provider = client.extension_launch_provider.clone();
         let llm_inference = client.llm_inference.get().cloned();
         let github_telemetry = client.on_github_telemetry.clone();
@@ -263,8 +302,17 @@ impl SessionRouter {
         // Request routing task (if request_rx is available)
         if let Some(mut rx) = client.request_rx.lock().take() {
             let sessions = self.sessions.clone();
+            let connection_closed = client.rpc.connection_closed_token();
             tokio::spawn(async move {
-                while let Some(request) = rx.recv().await {
+                loop {
+                    let request = tokio::select! {
+                        biased;
+                        _ = connection_closed.cancelled() => break,
+                        request = rx.recv() => {
+                            let Some(request) = request else { break };
+                            request
+                        }
+                    };
                     if request.method == crate::installation_confirmation::CONFIRM_METHOD {
                         installation_confirmation.dispatch(request);
                         continue;
@@ -298,33 +346,81 @@ impl SessionRouter {
                         .params
                         .as_ref()
                         .and_then(|p| p.get("sessionId"))
-                        .and_then(|v| v.as_str());
-
-                    if let Some(sid) = session_id {
-                        let sender = {
-                            let guard = sessions.lock();
-                            guard.get(sid).map(|s| s.requests.clone())
-                        };
-                        if let Some(sender) = sender {
-                            let _ = sender.send(request);
-                        } else {
-                            warn!(
-                                session_id = sid,
-                                method = %request.method,
-                                "request for unregistered session"
-                            );
+                        .and_then(|v| v.as_str())
+                        .map(str::to_owned);
+                    let Some(session_id) = session_id else {
+                        warn!(method = %request.method, "request missing sessionId");
+                        if !send_error(
+                            &weak_client,
+                            request.id,
+                            error_codes::INVALID_PARAMS,
+                            "missing required field: sessionId".to_string(),
+                        ) {
+                            break;
                         }
-                    } else {
+                        continue;
+                    };
+
+                    let sender = sessions
+                        .lock()
+                        .get(session_id.as_str())
+                        .map(|s| s.requests.clone());
+                    let unrouted = match sender {
+                        Some(sender) => sender.send(request).err().map(|error| error.0),
+                        None => Some(request),
+                    };
+                    // Every request owes the peer a response. Answer unroutable
+                    // ones (for example, after a `Session` was dropped without
+                    // detaching) so the runtime does not wait for its timeout.
+                    if let Some(request) = unrouted {
                         warn!(
+                            session_id = %session_id,
                             method = %request.method,
-                            "request missing sessionId"
+                            "request for unregistered session"
                         );
+                        if !send_error(
+                            &weak_client,
+                            request.id,
+                            error_codes::INTERNAL_ERROR,
+                            format!("Session not found: {session_id}"),
+                        ) {
+                            break;
+                        }
                     }
                 }
+                sessions.lock().clear();
             });
         }
     }
 }
 
+fn send_error(
+    client: &Weak<crate::ClientInner>,
+    request_id: u64,
+    code: i32,
+    message: String,
+) -> bool {
+    let Some(inner) = client.upgrade() else {
+        return false;
+    };
+    // Retire any cancellation registered for a request that never reaches a handler.
+    drop(inner.rpc.cancellable_requests.claim(request_id));
+    if let Err(error) = inner.rpc.enqueue_response(&JsonRpcResponse {
+        jsonrpc: "2.0".to_string(),
+        id: request_id,
+        result: None,
+        error: Some(JsonRpcError {
+            code,
+            message,
+            data: None,
+        }),
+    }) {
+        warn!(%error, "failed to enqueue router rejection; closing connection");
+        crate::Client::from_inner(inner).force_stop();
+        return false;
+    }
+    true
+}
+
 #[cfg(test)]
 mod tests;
diff --git a/rust/src/router/tests.rs b/rust/src/router/tests.rs
index 4d89fd937f..997829a50a 100644
--- a/rust/src/router/tests.rs
+++ b/rust/src/router/tests.rs
@@ -4,8 +4,501 @@
 
 #![cfg(test)]
 
+use std::pin::Pin;
+use std::sync::atomic::AtomicBool;
+use std::task::{Context, Poll};
+use std::time::Duration;
+
+use futures_util::task::AtomicWaker;
+use serde_json::json;
+use tokio::io::{
+    AsyncBufReadExt, AsyncReadExt, AsyncWrite, AsyncWriteExt, BufReader, DuplexStream,
+};
+use tokio::time::timeout;
+use tokio_util::sync::CancellationToken;
+
 use super::*;
 
+const DEADLINE: Duration = Duration::from_secs(5);
+
+#[derive(Clone, Copy, Debug)]
+enum BlockAt {
+    Write,
+    Flush,
+}
+
+#[derive(Default)]
+struct WriteGate {
+    released: AtomicBool,
+    waker: AtomicWaker,
+    entered: CancellationToken,
+    dropped: CancellationToken,
+}
+
+impl WriteGate {
+    fn poll(&self, cx: &mut Context<'_>) -> Poll<()> {
+        self.waker.register(cx.waker());
+        if self.released.load(Ordering::Acquire) {
+            Poll::Ready(())
+        } else {
+            self.entered.cancel();
+            Poll::Pending
+        }
+    }
+
+    fn release(&self) {
+        self.released.store(true, Ordering::Release);
+        self.waker.wake();
+    }
+}
+
+struct GatedWriter {
+    writer: DuplexStream,
+    gate: Arc<WriteGate>,
+    block_at: BlockAt,
+}
+
+impl AsyncWrite for GatedWriter {
+    fn poll_write(
+        mut self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+        bytes: &[u8],
+    ) -> Poll<std::io::Result<usize>> {
+        if matches!(self.block_at, BlockAt::Write) && self.gate.poll(cx).is_pending() {
+            return Poll::Pending;
+        }
+        Pin::new(&mut self.writer).poll_write(cx, bytes)
+    }
+
+    fn poll_flush(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<std::io::Result<()>> {
+        if matches!(self.block_at, BlockAt::Flush) && self.gate.poll(cx).is_pending() {
+            return Poll::Pending;
+        }
+        Pin::new(&mut self.writer).poll_flush(cx)
+    }
+
+    fn poll_shutdown(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<std::io::Result<()>> {
+        Pin::new(&mut self.writer).poll_shutdown(cx)
+    }
+}
+
+impl Drop for GatedWriter {
+    fn drop(&mut self) {
+        self.gate.dropped.cancel();
+    }
+}
+
+#[derive(Clone, Copy, Debug)]
+enum Unroutable {
+    MissingSessionId,
+    UnknownSession,
+    ClosedReceiver,
+}
+
+struct Peer {
+    client: crate::Client,
+    input: DuplexStream,
+    output: BufReader<DuplexStream>,
+    gate: Arc<WriteGate>,
+}
+
+impl Peer {
+    fn new(block_at: BlockAt) -> Self {
+        let (reader, input) = tokio::io::duplex(4096);
+        let (writer, output) = tokio::io::duplex(4096);
+        let gate = Arc::new(WriteGate::default());
+        let client = crate::Client::from_streams(
+            reader,
+            GatedWriter {
+                writer,
+                gate: gate.clone(),
+                block_at,
+            },
+            std::path::PathBuf::from("."),
+        )
+        .unwrap();
+        Self {
+            client,
+            input,
+            output: BufReader::new(output),
+            gate,
+        }
+    }
+
+    async fn send(&mut self, message: &impl serde::Serialize) {
+        let body = serde_json::to_vec(message).unwrap();
+        timeout(DEADLINE, async {
+            self.input
+                .write_all(format!("Content-Length: {}\r\n\r\n", body.len()).as_bytes())
+                .await
+                .unwrap();
+            self.input.write_all(&body).await.unwrap();
+        })
+        .await
+        .expect("peer could not inject a complete request");
+    }
+
+    async fn reject(&mut self, id: u64, kind: Unroutable) {
+        let params = match kind {
+            Unroutable::MissingSessionId => json!({}),
+            Unroutable::UnknownSession => json!({"sessionId": "gone"}),
+            Unroutable::ClosedReceiver => {
+                drop(self.client.register_session(&SessionId::new("closed")));
+                json!({"sessionId": "closed"})
+            }
+        };
+        self.send(&JsonRpcRequest::new(id, "skillProvider.list", Some(params)))
+            .await;
+    }
+
+    async fn read(&mut self) -> JsonRpcResponse {
+        timeout(DEADLINE, async {
+            let mut header = String::new();
+            self.output.read_line(&mut header).await.unwrap();
+            let length = header
+                .strip_prefix("Content-Length: ")
+                .expect("missing response header")
+                .trim()
+                .parse::<usize>()
+                .unwrap();
+            header.clear();
+            self.output.read_line(&mut header).await.unwrap();
+            assert_eq!(header, "\r\n");
+            let mut body = vec![0; length];
+            self.output.read_exact(&mut body).await.unwrap();
+            serde_json::from_slice(&body).unwrap()
+        })
+        .await
+        .expect("error frame was not delivered")
+    }
+
+    async fn stop(&self) {
+        self.client.force_stop();
+        timeout(DEADLINE, self.gate.dropped.cancelled())
+            .await
+            .expect("writer did not exit");
+    }
+}
+
+#[track_caller]
+fn assert_error(response: JsonRpcResponse, id: u64, kind: Unroutable) {
+    assert_eq!(response.id, id);
+    assert!(response.result.is_none());
+    let error = response.error.expect("unroutable request received success");
+    let (code, message) = match kind {
+        Unroutable::MissingSessionId => (
+            error_codes::INVALID_PARAMS,
+            "missing required field: sessionId",
+        ),
+        Unroutable::UnknownSession => (error_codes::INTERNAL_ERROR, "Session not found: gone"),
+        Unroutable::ClosedReceiver => (error_codes::INTERNAL_ERROR, "Session not found: closed"),
+    };
+    assert_eq!(error.code, code);
+    assert_eq!(error.message, message);
+}
+
+#[tokio::test]
+async fn stalled_rejection_preserves_live_routing_and_eventual_error_delivery() {
+    for block_at in [BlockAt::Write, BlockAt::Flush] {
+        for kind in [
+            Unroutable::MissingSessionId,
+            Unroutable::UnknownSession,
+            Unroutable::ClosedReceiver,
+        ] {
+            let mut peer = Peer::new(block_at);
+            let mut live = peer
+                .client
+                .register_session(&SessionId::new("live"))
+                .channels
+                .requests;
+            peer.reject(101, kind).await;
+            timeout(DEADLINE, peer.gate.entered.cancelled())
+                .await
+                .unwrap();
+            peer.send(&crate::JsonRpcNotification {
+                jsonrpc: "2.0".into(),
+                method: "$/cancelRequest".into(),
+                params: Some(json!({"id": 101})),
+            })
+            .await;
+            peer.send(&JsonRpcRequest::new(
+                102,
+                "skillProvider.list",
+                Some(json!({"sessionId": "live"})),
+            ))
+            .await;
+            let routed = timeout(DEADLINE, live.recv())
+                .await
+                .unwrap_or_else(|_| panic!("live callback stalled behind {kind:?} at {block_at:?}"))
+                .expect("live channel closed");
+            assert_eq!(routed.id, 102);
+            assert!(
+                peer.client
+                    .inner
+                    .rpc
+                    .cancellable_requests
+                    .claim(101)
+                    .is_none()
+            );
+            assert!(
+                !peer
+                    .client
+                    .inner
+                    .rpc
+                    .connection_closed_token()
+                    .is_cancelled()
+            );
+            peer.gate.release();
+            assert_error(peer.read().await, 101, kind);
+            peer.stop().await;
+        }
+    }
+}
+
+#[tokio::test]
+async fn delayed_writer_preserves_a_large_healthy_burst_without_disconnect() {
+    const BURST: u64 = 512;
+    for block_at in [BlockAt::Write, BlockAt::Flush] {
+        let mut peer = Peer::new(block_at);
+        let mut live = peer
+            .client
+            .register_session(&SessionId::new("live"))
+            .channels
+            .requests;
+        peer.reject(100, Unroutable::UnknownSession).await;
+        timeout(DEADLINE, peer.gate.entered.cancelled())
+            .await
+            .unwrap();
+        for id in 101..100 + BURST {
+            peer.reject(id, Unroutable::UnknownSession).await;
+        }
+        peer.send(&JsonRpcRequest::new(
+            100 + BURST,
+            "skillProvider.list",
+            Some(json!({"sessionId": "live"})),
+        ))
+        .await;
+        assert_eq!(
+            timeout(DEADLINE, live.recv()).await.unwrap().unwrap().id,
+            100 + BURST
+        );
+        assert!(
+            !peer
+                .client
+                .inner
+                .rpc
+                .connection_closed_token()
+                .is_cancelled()
+        );
+        for id in 100..100 + BURST {
+            assert!(
+                peer.client
+                    .inner
+                    .rpc
+                    .cancellable_requests
+                    .claim(id)
+                    .is_none()
+            );
+        }
+        peer.gate.release();
+        for id in 100..100 + BURST {
+            assert_error(peer.read().await, id, Unroutable::UnknownSession);
+        }
+        peer.stop().await;
+    }
+}
+
+#[tokio::test]
+async fn pending_rejection_does_not_retain_the_last_client() {
+    for block_at in [BlockAt::Write, BlockAt::Flush] {
+        let mut peer = Peer::new(block_at);
+        let mut live = peer
+            .client
+            .register_session(&SessionId::new("live"))
+            .channels
+            .requests;
+        peer.reject(101, Unroutable::UnknownSession).await;
+        timeout(DEADLINE, peer.gate.entered.cancelled())
+            .await
+            .unwrap();
+        let weak = Arc::downgrade(&peer.client.inner);
+        let gate = peer.gate.clone();
+        drop(peer);
+        assert!(
+            weak.upgrade().is_none(),
+            "error delivery retained the client"
+        );
+        timeout(DEADLINE, gate.dropped.cancelled()).await.unwrap();
+        assert!(timeout(DEADLINE, live.recv()).await.unwrap().is_none());
+    }
+}
+
+#[tokio::test]
+async fn force_stop_releases_pending_rejections() {
+    for kind in [
+        Unroutable::MissingSessionId,
+        Unroutable::UnknownSession,
+        Unroutable::ClosedReceiver,
+    ] {
+        let mut peer = Peer::new(BlockAt::Write);
+        let mut live = peer
+            .client
+            .register_session(&SessionId::new("live"))
+            .channels
+            .requests;
+        peer.reject(101, kind).await;
+        timeout(DEADLINE, peer.gate.entered.cancelled())
+            .await
+            .unwrap();
+        peer.stop().await;
+        assert!(timeout(DEADLINE, live.recv()).await.unwrap().is_none());
+        assert!(
+            peer.client
+                .inner
+                .rpc
+                .cancellable_requests
+                .claim(101)
+                .is_none()
+        );
+    }
+}
+
+#[tokio::test]
+async fn client_stop_does_not_await_router_rejection_delivery() {
+    for block_at in [BlockAt::Write, BlockAt::Flush] {
+        let mut peer = Peer::new(block_at);
+        peer.client.inner.router.ensure_started(&peer.client.inner);
+        peer.reject(101, Unroutable::UnknownSession).await;
+        timeout(DEADLINE, peer.gate.entered.cancelled())
+            .await
+            .unwrap();
+        timeout(DEADLINE, peer.client.stop())
+            .await
+            .expect("stop awaited rejection output")
+            .unwrap();
+        timeout(DEADLINE, peer.gate.dropped.cancelled())
+            .await
+            .unwrap();
+    }
+}
+
+#[tokio::test]
+async fn late_rejection_delivery_does_not_retire_a_reused_request_id() {
+    let mut peer = Peer::new(BlockAt::Write);
+    let mut live = peer
+        .client
+        .register_session(&SessionId::new("live"))
+        .channels
+        .requests;
+    peer.reject(101, Unroutable::UnknownSession).await;
+    timeout(DEADLINE, peer.gate.entered.cancelled())
+        .await
+        .unwrap();
+    peer.send(&JsonRpcRequest::new(
+        101,
+        "skillProvider.list",
+        Some(json!({"sessionId": "live"})),
+    ))
+    .await;
+    assert_eq!(
+        timeout(DEADLINE, live.recv()).await.unwrap().unwrap().id,
+        101
+    );
+    let pending = peer
+        .client
+        .inner
+        .rpc
+        .cancellable_requests
+        .claim(101)
+        .expect("new request lost cancellation");
+    peer.gate.release();
+    assert_error(peer.read().await, 101, Unroutable::UnknownSession);
+    peer.send(&crate::JsonRpcNotification {
+        jsonrpc: "2.0".into(),
+        method: "$/cancelRequest".into(),
+        params: Some(json!({"id": 101})),
+    })
+    .await;
+    timeout(DEADLINE, pending.cancellation().cancelled())
+        .await
+        .expect("old completion retired new cancellation");
+    peer.stop().await;
+}
+
+#[tokio::test]
+async fn failed_router_rejection_write_closes_connection_and_wakes_pending_work() {
+    let mut peer = Peer::new(BlockAt::Write);
+    let mut live = peer
+        .client
+        .register_session(&SessionId::new("live"))
+        .channels
+        .requests;
+    peer.reject(101, Unroutable::UnknownSession).await;
+    timeout(DEADLINE, peer.gate.entered.cancelled())
+        .await
+        .unwrap();
+    let pending = peer
+        .client
+        .inner
+        .rpc
+        .send_request_with_inline_callback("ping", None, None);
+    tokio::pin!(pending);
+    assert!(futures_util::poll!(&mut pending).is_pending());
+    let Peer {
+        client,
+        input: _input,
+        output,
+        gate,
+    } = peer;
+    drop(output);
+    gate.release();
+    timeout(
+        DEADLINE,
+        client.inner.rpc.connection_closed_token().cancelled(),
+    )
+    .await
+    .expect("write failure left connection open");
+    let error = timeout(DEADLINE, pending)
+        .await
+        .expect("pending request did not wake")
+        .expect_err("request succeeded on broken output");
+    assert_eq!(error.kind(), &crate::ErrorKind::Io);
+    assert!(timeout(DEADLINE, live.recv()).await.unwrap().is_none());
+    timeout(DEADLINE, gate.dropped.cancelled()).await.unwrap();
+    client.force_stop();
+}
+
+#[tokio::test]
+async fn peer_eof_retires_routing_with_a_committed_rejection_pending() {
+    let mut peer = Peer::new(BlockAt::Write);
+    let mut live = peer
+        .client
+        .register_session(&SessionId::new("live"))
+        .channels
+        .requests;
+    peer.reject(101, Unroutable::UnknownSession).await;
+    timeout(DEADLINE, peer.gate.entered.cancelled())
+        .await
+        .unwrap();
+    peer.input.shutdown().await.unwrap();
+    timeout(
+        DEADLINE,
+        peer.client.inner.rpc.connection_closed_token().cancelled(),
+    )
+    .await
+    .unwrap();
+    assert!(timeout(DEADLINE, live.recv()).await.unwrap().is_none());
+    assert!(
+        peer.client
+            .inner
+            .rpc
+            .cancellable_requests
+            .claim(101)
+            .is_none()
+    );
+    peer.stop().await;
+}
+
 fn session_id() -> SessionId {
     SessionId::new("router-ownership")
 }
@@ -34,3 +527,36 @@ fn unregister_owned_removes_only_the_matching_registration() {
     // Removing twice is a no-op rather than evicting a future tenant.
     assert!(!router.unregister_owned(&session_id(), live.token));
 }
+
+#[test]
+fn restore_owned_hands_the_id_back_to_a_running_replaced_registration() {
+    let router = SessionRouter::new();
+    let resident = router.register(&session_id());
+    let (attempt, replaced) = router.replace(&session_id());
+    assert!(replaced.is_some());
+
+    assert!(router.restore_owned(&session_id(), attempt.token, replaced));
+    assert!(router.is_registered_owner(&session_id(), resident.token));
+}
+
+#[test]
+fn restore_owned_unregisters_when_the_replaced_session_has_stopped() {
+    let router = SessionRouter::new();
+    let resident = router.register(&session_id());
+    let (attempt, replaced) = router.replace(&session_id());
+    drop(resident);
+
+    assert!(router.restore_owned(&session_id(), attempt.token, replaced));
+    assert!(router.session_ids().is_empty());
+}
+
+#[test]
+fn restore_owned_leaves_a_newer_registration_alone() {
+    let router = SessionRouter::new();
+    let _resident = router.register(&session_id());
+    let (attempt, replaced) = router.replace(&session_id());
+    let newer = router.register(&session_id());
+
+    assert!(!router.restore_owned(&session_id(), attempt.token, replaced));
+    assert!(router.is_registered_owner(&session_id(), newer.token));
+}
diff --git a/rust/src/session.rs b/rust/src/session.rs
index 14864a3137..1ba8325095 100644
--- a/rust/src/session.rs
+++ b/rust/src/session.rs
@@ -30,6 +30,7 @@ use crate::handler::{
 use crate::hooks::SessionHooks;
 use crate::provider_token::BearerTokenProvider;
 use crate::session_fs::SessionFsProvider;
+use crate::skill_provider::SkillProvider;
 use crate::trace_context::inject_trace_context;
 use crate::transforms::SystemMessageTransform;
 use crate::types::{
@@ -92,11 +93,26 @@ pub(crate) struct SessionHandlers {
     pub user_input: Option<Arc<dyn UserInputHandler>>,
     pub exit_plan_mode: Option<Arc<dyn ExitPlanModeHandler>>,
     pub auto_mode_switch: Option<Arc<dyn AutoModeSwitchHandler>>,
+    pub skill_provider: Option<Arc<dyn SkillProvider>>,
     /// Shared with the owning [`Session`], which replaces the map when the
     /// runtime accepts a [`Session::set_tools`] call.
     pub tools: Arc<parking_lot::RwLock<ToolHandlerMap>>,
 }
 
+struct ToolHandlerRetirement {
+    handlers: Arc<parking_lot::RwLock<ToolHandlerMap>>,
+    shutdown: CancellationToken,
+}
+
+impl Drop for ToolHandlerRetirement {
+    fn drop(&mut self) {
+        self.shutdown.cancel();
+        // Handler destructors may re-enter the SDK; release the map lock first.
+        let handlers = std::mem::take(&mut *self.handlers.write());
+        drop(handlers);
+    }
+}
+
 type PendingExternalTools = Arc<ParkingLotMutex<HashMap<RequestId, Arc<CancellationToken>>>>;
 
 struct PendingExternalToolGuard {
@@ -262,6 +278,10 @@ struct PendingSessionRegistration {
     shutdown: CancellationToken,
     external_tools_shutdown: CancellationToken,
     startup_tasks: Arc<StartupTasks>,
+    /// The resident session a resume displaced. The runtime keeps that
+    /// session's bindings when the resume fails, so cleanup routes its
+    /// callbacks back to it; success drops it.
+    replaced: Option<crate::router::ReplacedRegistration>,
     disarmed: bool,
 }
 
@@ -295,10 +315,19 @@ impl PendingSessionRegistration {
             shutdown,
             external_tools_shutdown,
             startup_tasks: Arc::new(StartupTasks::default()),
+            replaced: None,
             disarmed: false,
         }
     }
 
+    fn restoring_on_failure(
+        mut self,
+        replaced: Option<crate::router::ReplacedRegistration>,
+    ) -> Self {
+        self.replaced = replaced;
+        self
+    }
+
     /// Guard for a registration whose session ID is assigned by the server.
     fn deferred(
         client: Client,
@@ -312,6 +341,7 @@ impl PendingSessionRegistration {
             shutdown: shutdown.clone(),
             external_tools_shutdown,
             startup_tasks: Arc::new(StartupTasks::default()),
+            replaced: None,
             disarmed: false,
         };
         let callback: crate::jsonrpc::InlineResponseCallback = Box::new(move |response| {
@@ -358,7 +388,8 @@ impl PendingSessionRegistration {
         let _ = event_loop.await;
         if let Some(id) = self.registered_id() {
             if let PendingSessionId::Known(_, token) = self.session_id {
-                self.client.unregister_session_owned(&id, token);
+                self.client
+                    .restore_session_owned(&id, token, self.replaced.take());
             } else if let PendingSessionId::Deferred(stash) = &self.session_id
                 && let Some((id, registration)) = stash.lock().as_ref()
             {
@@ -370,6 +401,7 @@ impl PendingSessionRegistration {
 
     fn disarm(&mut self) {
         self.startup_tasks.disarm();
+        self.replaced = None;
         self.disarmed = true;
     }
 }
@@ -380,7 +412,8 @@ impl Drop for PendingSessionRegistration {
             self.cancel();
             if let Some(id) = self.registered_id() {
                 if let PendingSessionId::Known(_, token) = self.session_id {
-                    self.client.unregister_session_owned(&id, token);
+                    self.client
+                        .restore_session_owned(&id, token, self.replaced.take());
                 } else if let PendingSessionId::Deferred(stash) = &self.session_id
                     && let Some((id, registration)) = stash.lock().as_ref()
                 {
@@ -539,8 +572,9 @@ pub struct Session {
     capabilities: Arc<parking_lot::RwLock<SessionCapabilities>>,
     /// Canvas instances currently known to be open for this 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>,
+    /// Only the event loop owns the producer, so retaining a retired session
+    /// cannot keep its subscriptions open.
+    event_tx: tokio::sync::broadcast::WeakSender<SessionEvent>,
     /// Resume-only queue retained until the first post-resume subscriber
     /// catches up and switches to bounded live delivery.
     resume_bootstrap: Option<Arc<crate::subscription::ResumeBootstrap>>,
@@ -631,7 +665,7 @@ impl Session {
 
     /// Returns a [`CancellationToken`] that fires when this session shuts
     /// down (via [`Session::stop_event_loop`], [`Session::destroy`], or
-    /// [`Drop`]).
+    /// [`Drop`]), loses its router registration, or its owner connection closes.
     ///
     /// Use this to bind an external task's lifetime to the session — when
     /// the session shuts down, awaiting [`cancelled()`](CancellationToken::cancelled)
@@ -679,6 +713,13 @@ impl Session {
     /// loop or any combinator from `tokio_stream::StreamExt` /
     /// `futures::StreamExt`.
     ///
+    /// After session shutdown or owner connection loss (including
+    /// [`Client::force_stop`]), returns an immediately closed subscription:
+    /// `recv` reports [`RecvErrorKind::Closed`](crate::subscription::RecvErrorKind::Closed)
+    /// and stream iteration ends. Ordinary shutdown lets existing subscribers
+    /// drain published events. Client force-stop instead closes all subscriptions
+    /// immediately and discards unread live and resume-bootstrap events.
+    ///
     /// If resume started with no active [`PreparedSession`] subscriber, the
     /// first subscription receives all retained routed startup events, durable
     /// and ephemeral, in order before live delivery. Ownership is assigned
@@ -690,7 +731,8 @@ impl Session {
     /// that never subscribe or cannot catch up can retain arbitrarily many
     /// events, so subscribe and drain promptly. Dropping the owner discards
     /// its unread backlog; stopping the event loop releases an unclaimed
-    /// backlog. A claimed backlog can still be drained after shutdown.
+    /// backlog. A claimed backlog can still be drained after ordinary shutdown,
+    /// but client force-stop discards it.
     /// This guarantee covers events routed to this session, not events lost
     /// to overflow in the bounded client-global notification router.
     ///
@@ -714,10 +756,18 @@ impl Session {
     /// # }
     /// ```
     pub fn subscribe(&self) -> crate::subscription::EventSubscription {
+        let connection_closed = self.client.inner.rpc.connection_closed_token();
+        if self.shutdown.is_cancelled() || connection_closed.is_cancelled() {
+            return crate::subscription::EventSubscription::closed();
+        }
+        let Some(event_tx) = self.event_tx.upgrade() else {
+            return crate::subscription::EventSubscription::closed();
+        };
         match &self.resume_bootstrap {
-            Some(bootstrap) => bootstrap.subscribe(&self.event_tx),
-            None => crate::subscription::EventSubscription::new(self.event_tx.subscribe()),
+            Some(bootstrap) => bootstrap.subscribe(&event_tx),
+            None => crate::subscription::EventSubscription::new(event_tx.subscribe()),
         }
+        .with_force_stop(self.client.inner.force_stop_requested.clone())
     }
 
     /// The underlying Client (for advanced use cases).
@@ -976,7 +1026,16 @@ impl Session {
     async fn send_and_wait_structured(&self, opts: MessageOptions) -> Result<SessionEvent, Error> {
         let duration = opts.wait_timeout.unwrap_or(Duration::from_secs(60));
         // Internal request observers must not claim the caller's resume backlog.
-        let mut events = crate::subscription::EventSubscription::new(self.event_tx.subscribe());
+        let mut events = self
+            .event_tx
+            .upgrade()
+            .map(|sender| {
+                crate::subscription::EventSubscription::new(sender.subscribe())
+                    .with_force_stop(self.client.inner.force_stop_requested.clone())
+            })
+            .ok_or_else(|| {
+                structured_output_error("session closed before structured output completed")
+            })?;
         let wait = async {
             let mut admission = Box::pin(self.send(opts));
             let mut pending = Vec::new();
@@ -1207,18 +1266,34 @@ impl Session {
     pub async fn set_tools<I: IntoIterator<Item = Tool>>(&self, tools: I) -> Result<(), Error> {
         let mut tools: Vec<Tool> = tools.into_iter().collect();
         let handlers = take_tool_handlers(&mut tools)?;
+        if self.shutdown.is_cancelled() || self.external_tools_shutdown.is_cancelled() {
+            return Err(ErrorKind::Session(SessionErrorKind::EventLoopClosed).into());
+        }
         let mut params = serde_json::json!({ "sessionId": self.id });
         params["tools"] = serde_json::to_value(&tools)?;
 
         let set_tools_lock = self.set_tools_lock.clone().lock_owned().await;
+        if self.shutdown.is_cancelled() || self.external_tools_shutdown.is_cancelled() {
+            return Err(ErrorKind::Session(SessionErrorKind::EventLoopClosed).into());
+        }
         let installed = self.tool_handlers.clone();
+        let shutdown = self.shutdown.clone();
+        let connection_closed = self.external_tools_shutdown.clone();
         let replaced = Arc::new(ParkingLotMutex::new(None));
         // Swapping on the read task means no tool request read after the
         // runtime accepted is dispatched to the previous handlers.
         let accepted: crate::jsonrpc::InlineResponseCallback = Box::new({
             let replaced = replaced.clone();
             move |_| {
-                let previous = std::mem::replace(&mut *installed.write(), handlers);
+                let previous = {
+                    let mut installed = installed.write();
+                    if shutdown.is_cancelled() || connection_closed.is_cancelled() {
+                        // Retired replacements also drop captures on the replacement task.
+                        *replaced.lock() = Some(handlers);
+                        return Err(ErrorKind::Session(SessionErrorKind::EventLoopClosed).into());
+                    }
+                    std::mem::replace(&mut *installed, handlers)
+                };
                 *replaced.lock() = Some(previous);
                 Ok(())
             }
@@ -1658,6 +1733,12 @@ impl Client {
         shutdown: CancellationToken,
     ) -> Result<Session, Error> {
         let total_start = Instant::now();
+        if config.cloud.is_some() && config.skill_provider.is_some() {
+            return Err(Error::with_message(
+                ErrorKind::InvalidConfig,
+                "Skill providers are not supported for cloud sessions.",
+            ));
+        }
         let ahp_creation_config = if self
             .inner
             .ahp_host_sessions
@@ -1766,6 +1847,7 @@ impl Client {
             user_input: runtime.user_input_handler.take(),
             exit_plan_mode: runtime.exit_plan_mode_handler.take(),
             auto_mode_switch: runtime.auto_mode_switch_handler.take(),
+            skill_provider: runtime.skill_provider.take(),
             tools: tool_handlers.clone(),
         };
         let hooks = runtime.hooks_handler.take();
@@ -1984,7 +2066,7 @@ impl Client {
             idle_waiter,
             capabilities,
             open_canvases,
-            event_tx,
+            event_tx: event_tx.downgrade(),
             resume_bootstrap: None,
             github_token_registration: ParkingLotMutex::new(github_token_registration),
             registration_token,
@@ -2111,6 +2193,7 @@ impl Client {
             user_input: runtime.user_input_handler.take(),
             exit_plan_mode: runtime.exit_plan_mode_handler.take(),
             auto_mode_switch: runtime.auto_mode_switch_handler.take(),
+            skill_provider: runtime.skill_provider.take(),
             tools: tool_handlers.clone(),
         };
         let hooks = runtime.hooks_handler.take();
@@ -2162,7 +2245,7 @@ impl Client {
         // Active prepared subscribers retain their existing bounded delivery.
         let resume_bootstrap = (event_tx.receiver_count() == 0)
             .then(|| crate::subscription::ResumeBootstrap::new(&event_tx));
-        let registration = self.register_session(&session_id);
+        let (registration, replaced) = self.replace_session_registration(&session_id);
         let registration_token = registration.token;
         let channels = registration.channels;
         let idle_waiter = Arc::new(ParkingLotMutex::new(None));
@@ -2174,7 +2257,8 @@ impl Client {
             registration_token,
             shutdown.clone(),
             external_tools_shutdown.clone(),
-        );
+        )
+        .restoring_on_failure(replaced);
         let event_loop = spawn_event_loop(
             session_id.clone(),
             Client::from_inner(self.inner.clone()),
@@ -2299,7 +2383,7 @@ impl Client {
             idle_waiter,
             capabilities,
             open_canvases,
-            event_tx,
+            event_tx: event_tx.downgrade(),
             resume_bootstrap,
             github_token_registration: ParkingLotMutex::new(github_token_registration),
             registration_token,
@@ -2421,9 +2505,10 @@ impl PreparedSession {
     /// observes [`Lagged`](crate::subscription::Lagged) and skips the
     /// events it missed, rather than stalling the session's event loop.
     /// Subscriptions taken here close if the prepared session is dropped
-    /// without starting, or if startup fails.
+    /// without starting, if startup fails, or immediately on client force-stop.
     pub fn subscribe(&self) -> crate::subscription::EventSubscription {
         crate::subscription::EventSubscription::new(self.event_tx.subscribe())
+            .with_force_stop(self.client.inner.force_stop_requested.clone())
     }
 
     /// Create or resume the session on the CLI.
@@ -2606,12 +2691,26 @@ fn spawn_event_loop(
     let bootstrap_cleanup = resume_bootstrap
         .as_ref()
         .map(|bootstrap| bootstrap.cleanup_guard());
+    let tool_handler_retirement = ToolHandlerRetirement {
+        handlers: handlers.tools.clone(),
+        shutdown: shutdown.clone(),
+    };
+    let connection_closed = client.inner.rpc.connection_closed_token();
 
     let span = tracing::error_span!("session_event_loop", session_id = %session_id);
     tokio::spawn(
         async move {
             let _bootstrap_cleanup = bootstrap_cleanup;
+            let _tool_handler_retirement = tool_handler_retirement;
+            let mut notifications_open = true;
+            let mut requests_open = true;
             loop {
+                if shutdown.is_cancelled()
+                    || connection_closed.is_cancelled()
+                    || (!notifications_open && !requests_open)
+                {
+                    break;
+                }
                 // `mpsc::UnboundedReceiver::recv` and
                 // `CancellationToken::cancelled` are both cancel-safe per
                 // RFD 400.
@@ -2637,12 +2736,21 @@ fn spawn_event_loop(
                 // background tasks to perform cancel-unsafe operations" pattern.
                 tokio::select! {
                     _ = shutdown.cancelled() => break,
-                    Some(notification) = notifications.recv() => {
+                    _ = connection_closed.cancelled() => break,
+                    notification = notifications.recv(), if notifications_open => {
+                        let Some(notification) = notification else {
+                            notifications_open = false;
+                            continue;
+                        };
                         handle_notification(
                             &session_id, &client, &handlers, &command_handlers, notification, &idle_waiter, &capabilities, &open_canvases, &event_tx, resume_bootstrap.as_ref(), &shutdown, &external_tools_shutdown, &pending_external_tools, startup_tasks.as_ref(),
                         ).await;
                     }
-                    Some(request) = requests.recv() => {
+                    request = requests.recv(), if requests_open => {
+                        let Some(request) = request else {
+                            requests_open = false;
+                            continue;
+                        };
                         // Clone the Arc-backed dispatch context into the task so
                         // the spawned `handle_request` future is `'static`. All
                         // clones are cheap (Arc refcount bumps / small maps).
@@ -2686,7 +2794,6 @@ fn spawn_event_loop(
                             startup_tasks.as_ref(),
                         );
                     }
-                    else => break,
                 }
             }
             // Channels closed or shutdown signaled — fail any pending
@@ -3087,6 +3194,11 @@ async fn handle_notification(
             let Some(tool_handler) = tool_handler else {
                 return;
             };
+            let agent_id = notification
+                .event
+                .agent_id
+                .clone()
+                .filter(|agent_id| !agent_id.is_empty());
             let cancellation = Arc::new(external_tools_shutdown.child_token());
             {
                 let mut pending = pending_external_tools.lock();
@@ -3181,6 +3293,8 @@ async fn handle_notification(
                         available_tools,
                         traceparent: data.traceparent,
                         tracestate: data.tracestate,
+                        agent_id,
+                        request_id: Some(request_id.clone()),
                     };
                     let handler_start = Instant::now();
                     let tool_result = tokio::select! {
@@ -3531,6 +3645,110 @@ struct RequestDispatchContext<'a> {
     bearer_token_providers: &'a HashMap<String, Arc<dyn BearerTokenProvider>>,
 }
 
+/// Serve one `skillProvider.*` callback. Provider failures are reported
+/// generically so their details never reach the runtime or the model.
+///
+/// A `$/cancelRequest` for this request, or the connection closing, drops the
+/// provider future.
+async fn handle_skill_provider_request(
+    client: &Client,
+    session_id: &SessionId,
+    provider: Option<&Arc<dyn SkillProvider>>,
+    request: &crate::JsonRpcRequest,
+) {
+    let Some(pending) = client.inner.rpc.cancellable_requests.claim(request.id) else {
+        // The connection closed before dispatch, so nobody awaits a response.
+        return;
+    };
+    let Some(provider) = provider else {
+        let _ = send_error_response(
+            client,
+            request.id,
+            error_codes::INTERNAL_ERROR,
+            &format!("No skill provider for session: {session_id}"),
+        )
+        .await;
+        return;
+    };
+
+    let read_name = if request.method == rpc_methods::SKILLPROVIDER_READ {
+        let Some(name) = request
+            .params
+            .as_ref()
+            .and_then(|params| params.get("name"))
+            .and_then(Value::as_str)
+        else {
+            let _ = send_error_response(
+                client,
+                request.id,
+                error_codes::INVALID_PARAMS,
+                "missing required field: name",
+            )
+            .await;
+            return;
+        };
+        Some(name)
+    } else {
+        None
+    };
+    let operation = if read_name.is_some() {
+        "readSkill"
+    } else {
+        "listSkills"
+    };
+    let call = async {
+        match read_name {
+            Some(name) => provider
+                .read_skill(name)
+                .await
+                .map(|markdown| serde_json::json!({ "markdown": markdown })),
+            None => provider
+                .list_skills()
+                .await
+                .map(|skills| serde_json::json!({ "skills": skills })),
+        }
+    };
+
+    let connection_closed = client.inner.rpc.connection_closed_token();
+    let result = tokio::select! {
+        biased;
+        _ = connection_closed.cancelled() => return,
+        _ = pending.cancellation().cancelled() => {
+            let _ = send_error_response(
+                client,
+                request.id,
+                error_codes::REQUEST_CANCELLED,
+                &format!("Skill provider {operation} cancelled"),
+            )
+            .await;
+            return;
+        }
+        result = call => result,
+    };
+
+    match result {
+        Ok(result) => {
+            let response = JsonRpcResponse {
+                jsonrpc: "2.0".to_string(),
+                id: request.id,
+                result: Some(result),
+                error: None,
+            };
+            let _ = client.send_response(&response).await;
+        }
+        Err(error) => {
+            warn!(error = %error, operation, "skill provider callback failed");
+            let _ = send_error_response(
+                client,
+                request.id,
+                error_codes::INTERNAL_ERROR,
+                &format!("Skill provider {operation} failed"),
+            )
+            .await;
+        }
+    }
+}
+
 /// Process a JSON-RPC request from the CLI.
 async fn handle_request(
     session_id: &SessionId,
@@ -3561,6 +3779,14 @@ async fn handle_request(
         return;
     }
 
+    if request.method == rpc_methods::SKILLPROVIDER_LIST
+        || request.method == rpc_methods::SKILLPROVIDER_READ
+    {
+        handle_skill_provider_request(client, &sid, handlers.skill_provider.as_ref(), &request)
+            .await;
+        return;
+    }
+
     match request.method.as_str() {
         "hooks.invoke" => {
             let params = request.params.as_ref();
diff --git a/rust/src/session/startup_tasks_tests.rs b/rust/src/session/startup_tasks_tests.rs
index bdec2551ad..5bc14f3287 100644
--- a/rust/src/session/startup_tasks_tests.rs
+++ b/rust/src/session/startup_tasks_tests.rs
@@ -68,6 +68,7 @@ async fn check_aborted_nested_dispatches(nested_first: bool) {
         user_input: None,
         exit_plan_mode: None,
         auto_mode_switch: None,
+        skill_provider: None,
         tools: Arc::new(Default::default()),
     };
     let startup_tasks = Arc::new(StartupTasks::default());
diff --git a/rust/src/skill_provider.rs b/rust/src/skill_provider.rs
new file mode 100644
index 0000000000..28d4fc8911
--- /dev/null
+++ b/rust/src/skill_provider.rs
@@ -0,0 +1,40 @@
+//! Session-scoped skill provider callbacks.
+//!
+//! <div class="warning">
+//!
+//! **Experimental.** These types are part of an experimental wire-protocol
+//! surface and may change or be removed in future SDK or CLI releases.
+//!
+//! </div>
+
+use async_trait::async_trait;
+
+use crate::Error;
+pub use crate::rpc::SkillProviderDescriptor;
+
+/// Supplies session-scoped skills to the runtime.
+///
+/// <div class="warning">
+///
+/// **Experimental.** This trait is part of an experimental wire-protocol
+/// surface and may change or be removed in future SDK or CLI releases.
+///
+/// </div>
+///
+/// Each inbound `skillProvider.*` request is dispatched on its own spawned
+/// task, so implementations must be safe for concurrent calls. When the
+/// runtime cancels a call, for example after its time limit or when the
+/// session disconnects, the SDK drops the provider future and the runtime
+/// ignores any later result. Register a
+/// provider with [`SessionConfig::with_skill_provider`](crate::SessionConfig::with_skill_provider)
+/// or [`ResumeSessionConfig::with_skill_provider`](crate::ResumeSessionConfig::with_skill_provider).
+#[async_trait]
+pub trait SkillProvider: Send + Sync + 'static {
+    /// Return the catalog of skills this session exposes.
+    async fn list_skills(&self) -> std::result::Result<Vec<SkillProviderDescriptor>, Error>;
+
+    /// Return the markdown for one skill name.
+    ///
+    /// Return `Ok(None)` when the skill name is not found.
+    async fn read_skill(&self, name: &str) -> std::result::Result<Option<String>, Error>;
+}
diff --git a/rust/src/subscription.rs b/rust/src/subscription.rs
index d4f989c107..f85ad9a5fc 100644
--- a/rust/src/subscription.rs
+++ b/rust/src/subscription.rs
@@ -34,6 +34,7 @@
 
 use std::collections::VecDeque;
 use std::fmt;
+use std::future::Future;
 use std::pin::Pin;
 use std::sync::Arc;
 use std::task::{Context, Poll};
@@ -43,6 +44,7 @@ use tokio::sync::broadcast::{Receiver, Sender, WeakSender};
 use tokio_stream::wrappers::BroadcastStream;
 use tokio_stream::wrappers::errors::BroadcastStreamRecvError;
 use tokio_stream::{Stream, StreamExt as _};
+use tokio_util::sync::{CancellationToken, WaitForCancellationFutureOwned};
 
 use crate::types::{SessionEvent, SessionLifecycleEvent};
 use crate::{Custom, Repr};
@@ -202,6 +204,7 @@ impl ResumeBootstrap {
                 EventSubscription {
                     inner: None,
                     bootstrap: Some(self.clone()),
+                    force_stop: None,
                 }
             }
             ResumeBootstrapState::Claimed(_) | ResumeBootstrapState::Disabled => {
@@ -255,16 +258,31 @@ impl ResumeBootstrap {
 pub struct EventSubscription {
     inner: Option<BroadcastStream<SessionEvent>>,
     bootstrap: Option<Arc<ResumeBootstrap>>,
+    force_stop: Option<Pin<Box<WaitForCancellationFutureOwned>>>,
 }
 
 impl EventSubscription {
+    pub(crate) fn closed() -> Self {
+        Self {
+            inner: None,
+            bootstrap: None,
+            force_stop: None,
+        }
+    }
+
     pub(crate) fn new(rx: Receiver<SessionEvent>) -> Self {
         Self {
             inner: Some(BroadcastStream::new(rx)),
             bootstrap: None,
+            force_stop: None,
         }
     }
 
+    pub(crate) fn with_force_stop(mut self, force_stop: CancellationToken) -> Self {
+        self.force_stop = Some(Box::pin(force_stop.cancelled_owned()));
+        self
+    }
+
     fn next_bootstrap_event(&mut self) -> Option<SessionEvent> {
         let event = self
             .bootstrap
@@ -284,7 +302,8 @@ impl EventSubscription {
     /// - [`RecvErrorKind::Lagged`] if live delivery fell behind; call again
     ///   to continue from the next available live event.
     /// - [`RecvErrorKind::Closed`] once the producer is gone and any retained
-    ///   events have been drained.
+    ///   events have been drained, or immediately after client force-stop.
+    ///   Force-stop discards unread live and resume-bootstrap events.
     ///
     /// # Cancel safety
     ///
@@ -304,6 +323,18 @@ impl Stream for EventSubscription {
     type Item = Result<SessionEvent, Lagged>;
 
     fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
+        if self
+            .force_stop
+            .as_mut()
+            .is_some_and(|force_stop| force_stop.as_mut().poll(cx).is_ready())
+        {
+            self.force_stop = None;
+            self.inner = None;
+            if let Some(bootstrap) = self.bootstrap.take() {
+                bootstrap.abandon();
+            }
+            return Poll::Ready(None);
+        }
         if let Some(event) = self.next_bootstrap_event() {
             return Poll::Ready(Some(Ok(event)));
         }
diff --git a/rust/src/subscription/tests.rs b/rust/src/subscription/tests.rs
index be8a076f0b..adb4496352 100644
--- a/rust/src/subscription/tests.rs
+++ b/rust/src/subscription/tests.rs
@@ -41,6 +41,92 @@ fn make_event(id: &str) -> SessionEvent {
     }
 }
 
+#[tokio::test]
+async fn closed_subscription_ends_on_its_first_poll() {
+    let mut events = EventSubscription::closed();
+    assert!(next_ready(&mut events).is_none());
+    assert!(matches!(
+        recv_ready(&mut events).unwrap_err().kind(),
+        RecvErrorKind::Closed
+    ));
+    assert!(next_ready(&mut events).is_none());
+}
+
+#[tokio::test]
+async fn force_stop_discards_buffered_live_events_with_a_retained_producer() {
+    let (tx, rx) = broadcast::channel(8);
+    let force_stop = CancellationToken::new();
+    let mut events = EventSubscription::new(rx).with_force_stop(force_stop.clone());
+    tx.send(make_event("unread")).unwrap();
+    force_stop.cancel();
+
+    assert!(next_ready(&mut events).is_none());
+    assert!(matches!(
+        recv_ready(&mut events).unwrap_err().kind(),
+        RecvErrorKind::Closed
+    ));
+    assert_eq!(tx.receiver_count(), 0);
+}
+
+#[tokio::test]
+async fn force_stop_discards_owned_resume_bootstrap() {
+    let (tx, _) = broadcast::channel(8);
+    let bootstrap = ResumeBootstrap::new(&tx);
+    bootstrap.publish(&tx, make_event("unread"));
+    let force_stop = CancellationToken::new();
+    let mut events = bootstrap.subscribe(&tx).with_force_stop(force_stop.clone());
+    force_stop.cancel();
+
+    assert!(next_ready(&mut events).is_none());
+    assert!(matches!(
+        *bootstrap.state.lock(),
+        ResumeBootstrapState::Disabled
+    ));
+    assert!(matches!(
+        recv_ready(&mut events).unwrap_err().kind(),
+        RecvErrorKind::Closed
+    ));
+}
+
+#[tokio::test]
+async fn force_stop_wakes_a_pending_receive_without_producer_shutdown() {
+    use std::sync::atomic::{AtomicBool, Ordering};
+    use std::task::{Wake, Waker};
+
+    struct WakeFlag(AtomicBool);
+
+    impl Wake for WakeFlag {
+        fn wake(self: Arc<Self>) {
+            self.0.store(true, Ordering::SeqCst);
+        }
+    }
+
+    let (_tx, rx) = broadcast::channel(8);
+    let force_stop = CancellationToken::new();
+    let mut events = EventSubscription::new(rx).with_force_stop(force_stop.clone());
+    let mut receive = Box::pin(events.recv());
+    let woke = Arc::new(WakeFlag(AtomicBool::new(false)));
+    let waker = Waker::from(woke.clone());
+    assert!(
+        receive
+            .as_mut()
+            .poll(&mut Context::from_waker(&waker))
+            .is_pending()
+    );
+    woke.0.store(false, Ordering::SeqCst);
+    force_stop.cancel();
+
+    assert!(
+        woke.0.load(Ordering::SeqCst),
+        "force-stop must notify the pending receiver's registered waker"
+    );
+    let error = receive
+        .now_or_never()
+        .expect("the awakened receiver must close on its first poll")
+        .unwrap_err();
+    assert!(matches!(error.kind(), RecvErrorKind::Closed), "{error:?}");
+}
+
 #[tokio::test]
 async fn recv_yields_then_closes_on_drop_sender() {
     let (tx, rx) = broadcast::channel(8);
diff --git a/rust/src/tests.rs b/rust/src/tests.rs
index 8656d6f4d3..bd4d519b87 100644
--- a/rust/src/tests.rs
+++ b/rust/src/tests.rs
@@ -6,6 +6,61 @@
 
 use super::*;
 
+#[tokio::test]
+async fn settings_apply_top_key_preserves_value_presence_on_wire() {
+    use crate::generated::api_types::UserSettingsApplyTopKeyRequest;
+
+    for (name, value, delete) in [
+        ("omitted", None, Some(false)),
+        ("explicit null", Some(serde_json::Value::Null), None),
+        ("value", Some(serde_json::json!("chosen")), None),
+        ("delete", None, Some(true)),
+    ] {
+        let temp = tempfile::tempdir().unwrap();
+        let (client_stream, server_stream) = tokio::io::duplex(8192);
+        let (client_read, client_write) = tokio::io::split(client_stream);
+        let (server_read, server_write) = tokio::io::split(server_stream);
+        let client =
+            Client::from_streams(client_read, client_write, temp.path().to_owned()).unwrap();
+        let (notifications, _) = tokio::sync::broadcast::channel(1);
+        let (requests, _) = tokio::sync::mpsc::unbounded_channel();
+        let server =
+            jsonrpc::JsonRpcClient::new(server_write, server_read, notifications, requests);
+        let (captured, mut received) = tokio::sync::mpsc::unbounded_channel();
+        server
+            .register_request_handler(
+                "user.settings.applyTopKey",
+                Arc::new(move |params| {
+                    captured.send(params).unwrap();
+                    Box::pin(async { Ok(serde_json::json!({ "status": "ok" })) })
+                }),
+            )
+            .unwrap();
+
+        let result = tokio::time::timeout(
+            Duration::from_secs(5),
+            client
+                .rpc()
+                .user()
+                .settings()
+                .apply_top_key(UserSettingsApplyTopKeyRequest {
+                    canonical_path: vec!["model".to_owned()],
+                    top_key: "model".to_owned(),
+                    value: value.clone(),
+                    delete,
+                    complete_staff_update_channel_migration: None,
+                }),
+        )
+        .await;
+        client.force_stop();
+        server.force_close();
+
+        result.expect(name).expect(name);
+        let params = received.try_recv().expect(name);
+        assert_eq!(params.get("value"), value.as_ref(), "{name}: {params}");
+    }
+}
+
 #[test]
 fn is_transport_failure_matches_request_cancelled() {
     let err = Error::from(ErrorKind::Protocol(ProtocolErrorKind::RequestCancelled));
diff --git a/rust/src/tool/tests.rs b/rust/src/tool/tests.rs
index e9a0192964..d307202ce5 100644
--- a/rust/src/tool/tests.rs
+++ b/rust/src/tool/tests.rs
@@ -247,6 +247,8 @@ async fn tool_handler_call_returns_result() {
         available_tools: None,
         traceparent: None,
         tracestate: None,
+        agent_id: None,
+        request_id: None,
     };
 
     let result = tool.call(inv).await.unwrap();
@@ -286,6 +288,8 @@ async fn define_tool_builds_schema_and_dispatches() {
         available_tools: None,
         traceparent: None,
         tracestate: None,
+        agent_id: None,
+        request_id: None,
     };
     match handler.call(inv).await.unwrap() {
         ToolResult::Text(s) => assert_eq!(s, "sunny in Seattle"),
@@ -369,6 +373,8 @@ mod derive_tests {
             available_tools: None,
             traceparent: None,
             tracestate: None,
+            agent_id: None,
+            request_id: None,
         };
 
         let result = tool.call(inv).await.unwrap();
@@ -389,6 +395,8 @@ mod derive_tests {
             available_tools: None,
             traceparent: None,
             tracestate: None,
+            agent_id: None,
+            request_id: None,
         };
 
         let err = tool.call(inv).await.unwrap_err();
@@ -411,6 +419,8 @@ mod derive_tests {
                 available_tools: None,
                 traceparent: None,
                 tracestate: None,
+                agent_id: None,
+                request_id: None,
             })
             .await
             .expect("ToolHandler::call should succeed for matching args");
diff --git a/rust/src/types.rs b/rust/src/types.rs
index dbf40ce4f5..8f027e56dd 100644
--- a/rust/src/types.rs
+++ b/rust/src/types.rs
@@ -48,6 +48,7 @@ pub use crate::session_fs::{
     SessionFsSqliteQueryResult, SessionFsSqliteQueryType, SessionFsSqliteTransactionError,
     SessionFsSqliteTransactionErrorClass, SessionFsSqliteTransactionStatement,
 };
+use crate::skill_provider::SkillProvider;
 pub use crate::trace_context::{TraceContext, TraceContextProvider};
 use crate::transforms::SystemMessageTransform;
 
@@ -666,6 +667,9 @@ impl Serialize for CommandDefinition {
 #[serde(rename_all = "camelCase")]
 #[non_exhaustive]
 pub struct CustomAgentConfig {
+    /// Declarative hook action objects keyed by event name, active only for this agent.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub hooks: Option<IndexMap<String, Vec<IndexMap<String, Value>>>>,
     /// Unique name of the custom agent.
     pub name: String,
     /// Display name for UI purposes.
@@ -703,6 +707,12 @@ pub struct CustomAgentConfig {
 }
 
 impl CustomAgentConfig {
+    /// Set declarative hook action objects scoped to this agent.
+    pub fn with_hooks(mut self, hooks: IndexMap<String, Vec<IndexMap<String, Value>>>) -> Self {
+        self.hooks = Some(hooks);
+        self
+    }
+
     /// Construct a custom agent configuration with the required `name`
     /// and `prompt` fields populated.
     ///
@@ -837,6 +847,35 @@ impl LargeToolOutputConfig {
     }
 }
 
+/// Opt in to image generation through an authorized Copilot image model.
+///
+/// **Experimental.** This API may change or be removed in a future release.
+///
+/// Omission disables on create/cold resume and preserves resident resume state.
+/// Not persisted: re-supply after runtime restart. Policy, permissions, offline
+/// mode, and tool filters still apply. BYOK image generation is not supported.
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+#[non_exhaustive]
+pub struct ImageGenerationConfig {
+    /// True opts in; false disables image generation.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub enabled: Option<bool>,
+}
+
+impl ImageGenerationConfig {
+    /// Construct an unset image generation configuration.
+    pub fn new() -> Self {
+        Self::default()
+    }
+
+    /// Enable or disable image generation.
+    pub fn with_enabled(mut self, enabled: bool) -> Self {
+        self.enabled = Some(enabled);
+        self
+    }
+}
+
 /// Overrides the runtime's built-in tool-search behavior.
 ///
 /// Tool search defers tools to keep the model's active tool set small.
@@ -1871,6 +1910,9 @@ pub struct ManagedSettingsPermissions {
     /// are forwarded so newer runtime policies fail closed.
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub disable_bypass_permissions_mode: Option<String>,
+    /// When true, prevents Assisted Permissions from being activated.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub disable_assisted_permissions_mode: Option<bool>,
     /// Tool-permission patterns that are always denied.
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub deny: Option<Vec<String>>,
@@ -1880,6 +1922,12 @@ pub struct ManagedSettingsPermissions {
     /// Tool-permission patterns that are allowed without prompting.
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub allow: Option<Vec<String>>,
+    /// Closed-world host boundary expressed as `Domain(hostname)`,
+    /// `Domain(IP)`, or `Domain(*.example.com)` rules. Schemes, ports, paths,
+    /// queries, and fragments are rejected. Multiple managed layers intersect
+    /// their lists. A present empty list denies all hosts.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub limit_to: Option<Vec<String>>,
 }
 
 impl ManagedSettingsPermissions {
@@ -1889,6 +1937,12 @@ impl ManagedSettingsPermissions {
         self
     }
 
+    /// Sets whether this managed layer disables Assisted Permissions.
+    pub fn with_disable_assisted_permissions_mode(mut self, value: bool) -> Self {
+        self.disable_assisted_permissions_mode = Some(value);
+        self
+    }
+
     /// Sets the rules that are always denied.
     pub fn with_deny(mut self, rules: Vec<String>) -> Self {
         self.deny = Some(rules);
@@ -1906,6 +1960,12 @@ impl ManagedSettingsPermissions {
         self.allow = Some(rules);
         self
     }
+
+    /// Sets the closed-world domain boundary for this managed layer.
+    pub fn with_limit_to(mut self, rules: Vec<String>) -> Self {
+        self.limit_to = Some(rules);
+        self
+    }
 }
 
 /// Managed-settings layer injected at session startup. Currently carries only a
@@ -2002,6 +2062,13 @@ pub enum AskUserVariant {
 pub struct SessionConfig {
     /// Custom session ID. When unset, the CLI generates one.
     pub session_id: Option<SessionId>,
+    /// Name the session at creation, as `session.name.set` would, and validated
+    /// the same way: non-empty, no leading or trailing whitespace, at most 100
+    /// UTF-16 units, no control characters, and no double quotes. A name also
+    /// makes the session persist from the start, so it can be listed and resumed
+    /// even if it never runs a turn. Local sessions only: cloud creation rejects
+    /// it.
+    pub name: Option<String>,
     /// Model to use (e.g. `"gpt-4"`, `"claude-sonnet-4"`).
     pub model: Option<String>,
     /// Exact model IDs this session may use. When unset, the host imposes no
@@ -2107,7 +2174,8 @@ pub struct SessionConfig {
     pub refresh_custom_instructions: Option<bool>,
     /// When true, enables on-demand instruction discovery for this session.
     pub enable_on_demand_instruction_discovery: Option<bool>,
-    /// When true, enables file hooks for this session.
+    /// Enables repository-origin file hooks from `.github/hooks/` and trusted
+    /// repository-configured roots, not explicit `hook_directories` or callback hooks.
     pub enable_file_hooks: Option<bool>,
     /// When true, allows host Git operations for this session.
     pub enable_host_git_operations: Option<bool>,
@@ -2115,6 +2183,13 @@ pub struct SessionConfig {
     pub enable_session_store: Option<bool>,
     /// When true, enables skills for this session.
     pub enable_skills: Option<bool>,
+    /// **Experimental.** Supplies session-scoped skills from the SDK host.
+    ///
+    /// The provider is runtime-only and is not serialized. Set
+    /// [`enable_skills`](Self::enable_skills) to `Some(true)` when using this
+    /// in [`ClientMode::Empty`](crate::ClientMode::Empty), where built-in
+    /// skill loading is otherwise disabled by default.
+    pub skill_provider: Option<Arc<dyn SkillProvider>>,
     /// **Experimental.** This option is part of an experimental wire-protocol
     /// surface (SEP-1865) and may change or be removed in a future release.
     ///
@@ -2147,10 +2222,30 @@ pub struct SessionConfig {
     /// `disable_form_deferral` only applies to that server and only has an
     /// effect when MCP Apps and form-backed GitHub tools are enabled.
     pub github_mcp_tool_config: Option<GitHubMcpToolConfig>,
-    /// Skill directory paths passed through to the GitHub Copilot CLI.
+    /// Explicit discovery-only skill roots, not general filesystem grants.
+    /// Available without `enable_config_discovery`, subject to skill/managed disables.
+    /// Relative paths resolve once when supplied against the request's effective
+    /// `working_directory`; retained roots do not move on cwd changes.
+    /// `None` and omission are equivalent; an empty list clears only the explicit SDK contribution.
     pub skill_directories: Option<Vec<PathBuf>>,
-    /// Additional directories to search for custom instruction files.
-    /// Forwarded to the CLI; not the same as [`skill_directories`](Self::skill_directories).
+    /// Explicit discovery-only agent roots, separate from `custom_agents` objects.
+    /// No general filesystem grant. Available without `enable_config_discovery`,
+    /// subject to source/managed disables. Relative paths resolve once when supplied
+    /// against the request's effective `working_directory`; retained roots do not move.
+    /// `None` and omission are equivalent; an empty list clears only the explicit SDK contribution.
+    pub agent_directories: Option<Vec<PathBuf>>,
+    /// Explicit discovery-only file-hook roots, separate from callback `hooks`.
+    /// No general filesystem grant. Available without `enable_config_discovery` or
+    /// `enable_file_hooks` (repository-origin hooks only), subject to hook/managed disables.
+    /// Relative paths resolve once when supplied against the request's effective
+    /// `working_directory`; retained roots do not move on cwd changes.
+    /// `None` and omission are equivalent; an empty list clears only the explicit SDK contribution.
+    pub hook_directories: Option<Vec<PathBuf>>,
+    /// Explicit discovery-only instruction roots using existing SDK formats.
+    /// No general filesystem grant. Available without `enable_config_discovery`,
+    /// subject to instruction/managed disables. Relative paths resolve once when supplied
+    /// against the request's effective `working_directory`; retained roots do not move.
+    /// `None` and omission are equivalent; an empty list clears only the explicit SDK contribution.
     pub instruction_directories: Option<Vec<PathBuf>>,
     /// Open Plugin directory paths passed through to the CLI.
     pub plugin_directories: Option<Vec<PathBuf>>,
@@ -2160,6 +2255,8 @@ pub struct SessionConfig {
     /// rarely used tools behind a searchable index. When unset, the runtime
     /// default applies.
     pub tool_search: Option<ToolSearchConfig>,
+    /// **Experimental.** Non-persisted image generation opt-in. Re-supply after runtime restart.
+    pub image_generation: Option<ImageGenerationConfig>,
     /// Skill names to disable. Skills in this set will not be available
     /// even if found in skill directories.
     pub disabled_skills: Option<Vec<String>>,
@@ -2287,6 +2384,11 @@ pub struct SessionConfig {
     /// 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>,
+    /// When `Some(true)`, locked managed model controls are enforced for this
+    /// session. Conflicting model changes are rejected; overridable managed
+    /// defaults remain mutable. Set via
+    /// [`with_enforce_managed_model_defaults`](Self::with_enforce_managed_model_defaults).
+    pub enforce_managed_model_defaults: 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
@@ -2378,6 +2480,7 @@ impl std::fmt::Debug for SessionConfig {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         f.debug_struct("SessionConfig")
             .field("session_id", &self.session_id)
+            .field("name", &self.name)
             .field("model", &self.model)
             .field("allowed_models", &self.allowed_models)
             .field("client_name", &self.client_name)
@@ -2434,12 +2537,19 @@ impl std::fmt::Debug for SessionConfig {
             )
             .field("enable_session_store", &self.enable_session_store)
             .field("enable_skills", &self.enable_skills)
+            .field(
+                "skill_provider",
+                &self.skill_provider.as_ref().map(|_| "<set>"),
+            )
             .field("enable_mcp_apps", &self.enable_mcp_apps)
             .field("skill_directories", &self.skill_directories)
+            .field("agent_directories", &self.agent_directories)
+            .field("hook_directories", &self.hook_directories)
             .field("instruction_directories", &self.instruction_directories)
             .field("plugin_directories", &self.plugin_directories)
             .field("large_output", &self.large_output)
             .field("tool_search", &self.tool_search)
+            .field("image_generation", &self.image_generation)
             .field("disabled_skills", &self.disabled_skills)
             .field("disabled_mcp_servers", &self.disabled_mcp_servers)
             .field("hooks", &self.hooks)
@@ -2479,6 +2589,10 @@ impl std::fmt::Debug for SessionConfig {
             .field("feature_flags", &self.feature_flags)
             .field("exp_assignments", &self.exp_assignments)
             .field("enable_managed_settings", &self.enable_managed_settings)
+            .field(
+                "enforce_managed_model_defaults",
+                &self.enforce_managed_model_defaults,
+            )
             .field("enable_experimental_mode", &self.enable_experimental_mode)
             .field("managed_settings", &self.managed_settings)
             .field(
@@ -2531,6 +2645,7 @@ impl Default for SessionConfig {
     fn default() -> Self {
         Self {
             session_id: None,
+            name: None,
             model: None,
             allowed_models: None,
             client_name: None,
@@ -2565,14 +2680,18 @@ impl Default for SessionConfig {
             enable_host_git_operations: None,
             enable_session_store: None,
             enable_skills: None,
+            skill_provider: None,
             embedding_cache_storage: None,
             enable_mcp_apps: None,
             github_mcp_tool_config: None,
             skill_directories: None,
+            agent_directories: None,
+            hook_directories: None,
             instruction_directories: None,
             plugin_directories: None,
             large_output: None,
             tool_search: None,
+            image_generation: None,
             disabled_skills: None,
             disabled_mcp_servers: None,
             hooks: None,
@@ -2602,6 +2721,7 @@ impl Default for SessionConfig {
             feature_flags: None,
             exp_assignments: None,
             enable_managed_settings: None,
+            enforce_managed_model_defaults: None,
             managed_settings: None,
             session_fs_provider: None,
             permission_handler: None,
@@ -2641,6 +2761,7 @@ pub(crate) struct SessionConfigRuntime {
     pub tool_handlers: ToolHandlerMap,
     pub canvas_handler: Option<Arc<dyn CanvasHandler>>,
     pub session_fs_provider: Option<Arc<dyn SessionFsProvider>>,
+    pub skill_provider: Option<Arc<dyn SkillProvider>>,
     pub bearer_token_providers: HashMap<String, Arc<dyn BearerTokenProvider>>,
     pub github_token_provider: Option<Arc<dyn GitHubTokenProvider>>,
     pub commands: Option<Vec<CommandDefinition>>,
@@ -2675,6 +2796,7 @@ impl SessionConfig {
         let request_auto_mode_switch = self.auto_mode_switch_handler.is_some();
         let request_elicitation = self.elicitation_handler.is_some();
         let hooks_flag = self.hooks_handler.is_some();
+        let has_skill_provider = self.skill_provider.is_some();
 
         let tool_handlers = take_tool_handlers(self.tools.as_deref_mut().unwrap_or_default())?;
 
@@ -2693,6 +2815,7 @@ impl SessionConfig {
 
         let wire = crate::wire::SessionCreateWire {
             session_id,
+            name: self.name,
             model: self.model,
             allowed_models: self.allowed_models,
             client_name: self.client_name,
@@ -2728,6 +2851,7 @@ impl SessionConfig {
             enable_host_git_operations: self.enable_host_git_operations,
             enable_session_store: self.enable_session_store,
             enable_skills: self.enable_skills,
+            has_skill_provider: has_skill_provider.then_some(true),
             request_user_input,
             request_permission: permission_active,
             request_exit_plan_mode,
@@ -2737,10 +2861,13 @@ impl SessionConfig {
             github_mcp_tool_config: self.github_mcp_tool_config,
             hooks: hooks_flag,
             skill_directories: self.skill_directories,
+            agent_directories: self.agent_directories,
+            hook_directories: self.hook_directories,
             instruction_directories: self.instruction_directories,
             plugin_directories: self.plugin_directories,
             large_output: self.large_output,
             tool_search: self.tool_search,
+            image_generation: self.image_generation,
             disabled_skills: self.disabled_skills,
             disabled_mcp_servers: self.disabled_mcp_servers,
             custom_agents: self.custom_agents,
@@ -2771,6 +2898,7 @@ impl SessionConfig {
             feature_flags: self.feature_flags,
             exp_assignments: self.exp_assignments,
             enable_managed_settings: self.enable_managed_settings,
+            enforce_managed_model_defaults: self.enforce_managed_model_defaults,
             is_experimental_mode: self.enable_experimental_mode,
             managed_settings: self.managed_settings,
         };
@@ -2788,6 +2916,7 @@ impl SessionConfig {
             tool_handlers,
             canvas_handler,
             session_fs_provider: self.session_fs_provider,
+            skill_provider: self.skill_provider,
             bearer_token_providers,
             github_token_provider: self.github_token_provider,
             commands: self.commands,
@@ -2915,6 +3044,15 @@ impl SessionConfig {
         self
     }
 
+    /// Set [`Self::name`]. The runtime rejects a name that is empty, padded with
+    /// whitespace, longer than 100 UTF-16 units, or contains control characters
+    /// or double quotes, so `create_session` fails rather than creating an
+    /// unnamed or unrenameable session.
+    pub fn with_name(mut self, name: impl Into<String>) -> Self {
+        self.name = Some(name.into());
+        self
+    }
+
     /// Set the model identifier (e.g. `"claude-sonnet-4"`).
     pub fn with_model(mut self, model: impl Into<String>) -> Self {
         self.model = Some(model.into());
@@ -3151,6 +3289,14 @@ impl SessionConfig {
         self
     }
 
+    /// Install an experimental session-scoped [`SkillProvider`].
+    ///
+    /// The provider is not serialized and must be re-supplied on resume.
+    pub fn with_skill_provider(mut self, provider: Arc<dyn SkillProvider>) -> Self {
+        self.skill_provider = Some(provider);
+        self
+    }
+
     /// **Experimental.** This method is part of an experimental wire-protocol
     /// surface (SEP-1865) and may change or be removed in a future release.
     ///
@@ -3177,6 +3323,26 @@ impl SessionConfig {
         self
     }
 
+    /// Set explicit discovery-only agent roots. See [`Self::agent_directories`].
+    pub fn with_agent_directories<I, P>(mut self, paths: I) -> Self
+    where
+        I: IntoIterator<Item = P>,
+        P: Into<PathBuf>,
+    {
+        self.agent_directories = Some(paths.into_iter().map(Into::into).collect());
+        self
+    }
+
+    /// Set explicit discovery-only file-hook roots. See [`Self::hook_directories`].
+    pub fn with_hook_directories<I, P>(mut self, paths: I) -> Self
+    where
+        I: IntoIterator<Item = P>,
+        P: Into<PathBuf>,
+    {
+        self.hook_directories = Some(paths.into_iter().map(Into::into).collect());
+        self
+    }
+
     /// Set the runtime-bundled skill allowlist.
     pub fn with_included_builtin_skills<I, S>(mut self, names: I) -> Self
     where
@@ -3222,6 +3388,12 @@ impl SessionConfig {
         self
     }
 
+    /// **Experimental.** Set the non-persisted image generation opt-in on create.
+    pub fn with_image_generation(mut self, config: ImageGenerationConfig) -> Self {
+        self.image_generation = Some(config);
+        self
+    }
+
     /// Set the names of skills to disable (overrides skill discovery).
     pub fn with_disabled_skills<I, S>(mut self, names: I) -> Self
     where
@@ -3481,6 +3653,12 @@ impl SessionConfig {
         self
     }
 
+    /// Enforce locked managed model controls for this session.
+    pub fn with_enforce_managed_model_defaults(mut self, enforce: bool) -> Self {
+        self.enforce_managed_model_defaults = Some(enforce);
+        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
@@ -3591,7 +3769,8 @@ pub struct ResumeSessionConfig {
     pub organization_custom_instructions: Option<String>,
     /// When true, enables on-demand instruction discovery on resume.
     pub enable_on_demand_instruction_discovery: Option<bool>,
-    /// When true, enables file hooks on resume.
+    /// Enables repository-origin file hooks from `.github/hooks/` and trusted
+    /// repository-configured roots, not explicit `hook_directories` or callback hooks.
     pub enable_file_hooks: Option<bool>,
     /// When true, allows host Git operations on resume.
     pub enable_host_git_operations: Option<bool>,
@@ -3599,6 +3778,11 @@ pub struct ResumeSessionConfig {
     pub enable_session_store: Option<bool>,
     /// When true, enables skills on resume.
     pub enable_skills: Option<bool>,
+    /// **Experimental.** Supplies session-scoped skills from the SDK host.
+    ///
+    /// The provider is runtime-only and is not serialized. Re-supply it on
+    /// each resume because providers are not persisted by the runtime.
+    pub skill_provider: Option<Arc<dyn SkillProvider>>,
     /// **Experimental.** This option is part of an experimental wire-protocol
     /// surface (SEP-1865) and may change or be removed in a future release.
     ///
@@ -3610,10 +3794,30 @@ pub struct ResumeSessionConfig {
     /// `disable_form_deferral` only applies to that server and only has an
     /// effect when MCP Apps and form-backed GitHub tools are enabled.
     pub github_mcp_tool_config: Option<GitHubMcpToolConfig>,
-    /// Skill directory paths passed through to the GitHub Copilot CLI on resume.
+    /// Explicit discovery-only skill roots, not general filesystem grants.
+    /// Available without `enable_config_discovery`, subject to skill/managed disables.
+    /// Relative paths resolve once when supplied against the request's effective
+    /// `working_directory`; retained roots do not move on cwd changes.
+    /// `None` and omission are equivalent; an empty list clears only the explicit SDK contribution.
     pub skill_directories: Option<Vec<PathBuf>>,
-    /// Additional directories to search for custom instruction files on
-    /// resume. Forwarded to the CLI; not the same as [`skill_directories`](Self::skill_directories).
+    /// Explicit discovery-only agent roots, separate from `custom_agents` objects.
+    /// No general filesystem grant. Available without `enable_config_discovery`,
+    /// subject to source/managed disables. Relative paths resolve once when supplied
+    /// against the request's effective `working_directory`; retained roots do not move.
+    /// `None` and omission are equivalent; an empty list clears only the explicit SDK contribution.
+    pub agent_directories: Option<Vec<PathBuf>>,
+    /// Explicit discovery-only file-hook roots, separate from callback `hooks`.
+    /// No general filesystem grant. Available without `enable_config_discovery` or
+    /// `enable_file_hooks` (repository-origin hooks only), subject to hook/managed disables.
+    /// Relative paths resolve once when supplied against the request's effective
+    /// `working_directory`; retained roots do not move on cwd changes.
+    /// `None` and omission are equivalent; an empty list clears only the explicit SDK contribution.
+    pub hook_directories: Option<Vec<PathBuf>>,
+    /// Explicit discovery-only instruction roots using existing SDK formats.
+    /// No general filesystem grant. Available without `enable_config_discovery`,
+    /// subject to instruction/managed disables. Relative paths resolve once when supplied
+    /// against the request's effective `working_directory`; retained roots do not move.
+    /// `None` and omission are equivalent; an empty list clears only the explicit SDK contribution.
     pub instruction_directories: Option<Vec<PathBuf>>,
     /// Open Plugin directory paths passed through to the CLI on resume.
     pub plugin_directories: Option<Vec<PathBuf>>,
@@ -3622,6 +3826,8 @@ pub struct ResumeSessionConfig {
     /// Overrides the runtime's built-in tool-search behavior on resume. When
     /// unset, the runtime default applies.
     pub tool_search: Option<ToolSearchConfig>,
+    /// **Experimental.** Non-persisted image generation opt-in. Re-supply after runtime restart.
+    pub image_generation: Option<ImageGenerationConfig>,
     /// Skill names to disable on resume.
     pub disabled_skills: Option<Vec<String>>,
     /// Exact MCP server names to disable on resume. This prevents startup and
@@ -3715,6 +3921,9 @@ pub struct ResumeSessionConfig {
     /// process restart. Set via
     /// [`with_enable_managed_settings`](Self::with_enable_managed_settings).
     pub enable_managed_settings: Option<bool>,
+    /// Re-applies managed model lock enforcement on resume. See
+    /// [`SessionConfig::enforce_managed_model_defaults`].
+    pub enforce_managed_model_defaults: 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
@@ -3840,12 +4049,19 @@ impl std::fmt::Debug for ResumeSessionConfig {
             )
             .field("enable_session_store", &self.enable_session_store)
             .field("enable_skills", &self.enable_skills)
+            .field(
+                "skill_provider",
+                &self.skill_provider.as_ref().map(|_| "<set>"),
+            )
             .field("enable_mcp_apps", &self.enable_mcp_apps)
             .field("skill_directories", &self.skill_directories)
+            .field("agent_directories", &self.agent_directories)
+            .field("hook_directories", &self.hook_directories)
             .field("instruction_directories", &self.instruction_directories)
             .field("plugin_directories", &self.plugin_directories)
             .field("large_output", &self.large_output)
             .field("tool_search", &self.tool_search)
+            .field("image_generation", &self.image_generation)
             .field("disabled_skills", &self.disabled_skills)
             .field("disabled_mcp_servers", &self.disabled_mcp_servers)
             .field("hooks", &self.hooks)
@@ -3884,6 +4100,10 @@ impl std::fmt::Debug for ResumeSessionConfig {
             .field("feature_flags", &self.feature_flags)
             .field("exp_assignments", &self.exp_assignments)
             .field("enable_managed_settings", &self.enable_managed_settings)
+            .field(
+                "enforce_managed_model_defaults",
+                &self.enforce_managed_model_defaults,
+            )
             .field("enable_experimental_mode", &self.enable_experimental_mode)
             .field("managed_settings", &self.managed_settings)
             .field(
@@ -3949,6 +4169,7 @@ impl ResumeSessionConfig {
         let request_auto_mode_switch = self.auto_mode_switch_handler.is_some();
         let request_elicitation = self.elicitation_handler.is_some();
         let hooks_flag = self.hooks_handler.is_some();
+        let has_skill_provider = self.skill_provider.is_some();
 
         let tool_handlers = take_tool_handlers(self.tools.as_deref_mut().unwrap_or_default())?;
 
@@ -4002,6 +4223,7 @@ impl ResumeSessionConfig {
             enable_host_git_operations: self.enable_host_git_operations,
             enable_session_store: self.enable_session_store,
             enable_skills: self.enable_skills,
+            has_skill_provider: has_skill_provider.then_some(true),
             request_user_input,
             request_permission: permission_active,
             request_exit_plan_mode,
@@ -4011,10 +4233,13 @@ impl ResumeSessionConfig {
             github_mcp_tool_config: self.github_mcp_tool_config,
             hooks: hooks_flag,
             skill_directories: self.skill_directories,
+            agent_directories: self.agent_directories,
+            hook_directories: self.hook_directories,
             instruction_directories: self.instruction_directories,
             plugin_directories: self.plugin_directories,
             large_output: self.large_output,
             tool_search: self.tool_search,
+            image_generation: self.image_generation,
             disabled_skills: self.disabled_skills,
             disabled_mcp_servers: self.disabled_mcp_servers,
             custom_agents: self.custom_agents,
@@ -4044,6 +4269,7 @@ impl ResumeSessionConfig {
             feature_flags: self.feature_flags,
             exp_assignments: self.exp_assignments,
             enable_managed_settings: self.enable_managed_settings,
+            enforce_managed_model_defaults: self.enforce_managed_model_defaults,
             is_experimental_mode: self.enable_experimental_mode,
             managed_settings: self.managed_settings,
             suppress_resume_event: self.suppress_resume_event,
@@ -4064,6 +4290,7 @@ impl ResumeSessionConfig {
             tool_handlers,
             canvas_handler,
             session_fs_provider: self.session_fs_provider,
+            skill_provider: self.skill_provider,
             bearer_token_providers,
             github_token_provider: self.github_token_provider,
             commands: self.commands,
@@ -4113,14 +4340,18 @@ impl ResumeSessionConfig {
             enable_host_git_operations: None,
             enable_session_store: None,
             enable_skills: None,
+            skill_provider: None,
             embedding_cache_storage: None,
             enable_mcp_apps: None,
             github_mcp_tool_config: None,
             skill_directories: None,
+            agent_directories: None,
+            hook_directories: None,
             instruction_directories: None,
             plugin_directories: None,
             large_output: None,
             tool_search: None,
+            image_generation: None,
             disabled_skills: None,
             disabled_mcp_servers: None,
             hooks: None,
@@ -4149,6 +4380,7 @@ impl ResumeSessionConfig {
             feature_flags: None,
             exp_assignments: None,
             enable_managed_settings: None,
+            enforce_managed_model_defaults: None,
             managed_settings: None,
             session_fs_provider: None,
             suppress_resume_event: None,
@@ -4248,6 +4480,14 @@ impl ResumeSessionConfig {
         self
     }
 
+    /// Install an experimental session-scoped [`SkillProvider`].
+    ///
+    /// The provider is not persisted and must be re-supplied on each resume.
+    pub fn with_skill_provider(mut self, provider: Arc<dyn SkillProvider>) -> Self {
+        self.skill_provider = Some(provider);
+        self
+    }
+
     /// Auto-approve every permission request on the resumed session. See
     /// [`SessionConfig::approve_all_permissions`].
     pub fn approve_all_permissions(mut self) -> Self {
@@ -4531,6 +4771,26 @@ impl ResumeSessionConfig {
         self
     }
 
+    /// Set explicit discovery-only agent roots. See [`Self::agent_directories`].
+    pub fn with_agent_directories<I, P>(mut self, paths: I) -> Self
+    where
+        I: IntoIterator<Item = P>,
+        P: Into<PathBuf>,
+    {
+        self.agent_directories = Some(paths.into_iter().map(Into::into).collect());
+        self
+    }
+
+    /// Set explicit discovery-only file-hook roots. See [`Self::hook_directories`].
+    pub fn with_hook_directories<I, P>(mut self, paths: I) -> Self
+    where
+        I: IntoIterator<Item = P>,
+        P: Into<PathBuf>,
+    {
+        self.hook_directories = Some(paths.into_iter().map(Into::into).collect());
+        self
+    }
+
     /// Set the runtime-bundled skill allowlist on resume.
     pub fn with_included_builtin_skills<I, S>(mut self, names: I) -> Self
     where
@@ -4576,6 +4836,12 @@ impl ResumeSessionConfig {
         self
     }
 
+    /// **Experimental.** Set the image generation opt-in on resume, including after runtime restart.
+    pub fn with_image_generation(mut self, config: ImageGenerationConfig) -> Self {
+        self.image_generation = Some(config);
+        self
+    }
+
     /// Set the names of skills to disable on resume.
     pub fn with_disabled_skills<I, S>(mut self, names: I) -> Self
     where
@@ -4841,6 +5107,12 @@ impl ResumeSessionConfig {
         self
     }
 
+    /// Enforce locked managed model controls after resume.
+    pub fn with_enforce_managed_model_defaults(mut self, enforce: bool) -> Self {
+        self.enforce_managed_model_defaults = Some(enforce);
+        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.
@@ -5907,8 +6179,8 @@ impl SessionEvent {
 
 /// A request from the CLI to invoke a client-defined tool.
 ///
-/// Received as a JSON-RPC request on the `tool.call` method. The client
-/// must respond with a [`ToolResultResponse`].
+/// Built from an `external_tool.requested` session event. The SDK sends the
+/// handler's result back with `session.tools.handlePendingToolCall`.
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 #[non_exhaustive]
@@ -5940,6 +6212,18 @@ pub struct ToolInvocation {
     /// [`traceparent`](Self::traceparent).
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub tracestate: Option<String>,
+    /// **Experimental.** Sub-agent instance that issued this call (the
+    /// `agentId` of its session events). `None` for a root-agent call, and for
+    /// every call when the runtime does not attribute sub-agent tool calls.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub agent_id: Option<String>,
+    /// **Experimental.** Runtime request id of this call: the key
+    /// `session.tools.handlePendingToolCall` and `session.tools.listPendingRequests`
+    /// use. A root-agent call stays answerable after the session is resumed with
+    /// pending work continued; a sub-agent's call can be answered only while that
+    /// sub-agent is still running.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub request_id: Option<RequestId>,
 }
 
 impl ToolInvocation {
@@ -6413,6 +6697,9 @@ impl Default for ExitPlanModeData {
     }
 }
 
+#[cfg(test)]
+mod customization_directory_tests;
+
 #[cfg(test)]
 mod tests;
 
diff --git a/rust/src/types/customization_directory_tests.rs b/rust/src/types/customization_directory_tests.rs
new file mode 100644
index 0000000000..67a5dadf15
--- /dev/null
+++ b/rust/src/types/customization_directory_tests.rs
@@ -0,0 +1,88 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+
+#![cfg(test)]
+
+use std::path::PathBuf;
+
+use serde_json::{Value, json};
+
+use super::{ResumeSessionConfig, SessionConfig, SessionId};
+
+fn assert_roots(wire: &Value, roots: Option<&[PathBuf]>) {
+    for (key, kind) in [
+        ("skillDirectories", "skills"),
+        ("agentDirectories", "agents"),
+        ("instructionDirectories", "instructions"),
+        ("hookDirectories", "hooks"),
+    ] {
+        match roots {
+            Some(paths) => assert_eq!(
+                wire[key],
+                serde_json::to_value(paths.iter().map(|path| path.join(kind)).collect::<Vec<_>>())
+                    .unwrap()
+            ),
+            None => assert!(wire.get(key).is_none(), "unexpected {key}: {wire}"),
+        }
+    }
+    assert!(wire.get("additionalDirectories").is_none());
+    assert!(wire.get("customAgents").is_none());
+    assert_eq!(wire["hooks"], false);
+    assert_eq!(wire["enableFileHooks"], false);
+    assert_eq!(wire["enableConfigDiscovery"], false);
+}
+
+#[test]
+fn create_and_resume_preserve_discovery_roots_without_client_rebasing() {
+    for roots in [
+        None,
+        Some(Vec::new()),
+        Some(vec![
+            PathBuf::from("relative-root"),
+            PathBuf::from("other-root"),
+        ]),
+    ] {
+        let mut create = SessionConfig::default()
+            .with_working_directory("request-cwd")
+            .with_enable_config_discovery(false)
+            .with_enable_file_hooks(false);
+        let mut resume = ResumeSessionConfig::new(SessionId::from("resumed"))
+            .with_working_directory("resume-cwd")
+            .with_enable_config_discovery(false)
+            .with_enable_file_hooks(false);
+        if let Some(paths) = &roots {
+            create = create
+                .with_skill_directories(paths.iter().map(|path| path.join("skills")))
+                .with_agent_directories(paths.iter().map(|path| path.join("agents")))
+                .with_instruction_directories(paths.iter().map(|path| path.join("instructions")))
+                .with_hook_directories(paths.iter().map(|path| path.join("hooks")));
+            resume = resume
+                .with_skill_directories(paths.iter().map(|path| path.join("skills")))
+                .with_agent_directories(paths.iter().map(|path| path.join("agents")))
+                .with_instruction_directories(paths.iter().map(|path| path.join("instructions")))
+                .with_hook_directories(paths.iter().map(|path| path.join("hooks")));
+        }
+        let (wire, _) = create.into_wire(None).unwrap();
+        assert_roots(&serde_json::to_value(wire).unwrap(), roots.as_deref());
+        let (wire, _) = resume.into_wire().unwrap();
+        assert_roots(&serde_json::to_value(wire).unwrap(), roots.as_deref());
+    }
+}
+
+#[test]
+fn host_factory_forwards_agent_and_hook_roots() {
+    let create = SessionConfig::default()
+        .with_agent_directories(["relative-agents"])
+        .with_hook_directories(Vec::<PathBuf>::new());
+    let resume = ResumeSessionConfig::new(SessionId::from("resumed"))
+        .with_agent_directories(["relative-agents"])
+        .with_hook_directories(Vec::<PathBuf>::new());
+    for wire in [
+        crate::ahp_host::config_for_host(&create).unwrap(),
+        crate::ahp_host::resume_config_for_host(&resume).unwrap(),
+    ] {
+        assert_eq!(wire["agentDirectories"], json!(["relative-agents"]));
+        assert_eq!(wire["hookDirectories"], json!([]));
+        assert!(wire.get("customAgents").is_none());
+        assert!(wire.get("hooks").is_none());
+    }
+}
diff --git a/rust/src/types/tests.rs b/rust/src/types/tests.rs
index a61c083a4f..451fe35191 100644
--- a/rust/src/types/tests.rs
+++ b/rust/src/types/tests.rs
@@ -13,11 +13,11 @@ use super::{
     AgentMode, Attachment, AttachmentLineRange, AttachmentSelectionPosition,
     AttachmentSelectionRange, AutoTier, AzureProviderOptions, CapiSessionOptions, ConnectionState,
     CopilotExpAssignmentResponse, CustomAgentConfig, DeliveryMode, ExpConfigEntry, ExpFlagValue,
-    ExtensionInfo, GitHubMcpToolConfig, GitHubReferenceType, InfiniteSessionConfig,
-    LargeToolOutputConfig, McpServerConfig, McpStdioServerConfig, MemoryConfiguration,
-    NamedProviderConfig, PermissionResponseCapability, ProviderConfig, ProviderModelConfig,
-    ReasoningSummary, ResumeSessionConfig, SessionConfig, SessionEvent, SessionId,
-    SystemMessageConfig, Tool, ToolBinaryResult, ToolResult, ToolResultExpanded,
+    ExtensionInfo, GitHubMcpToolConfig, GitHubReferenceType, ImageGenerationConfig,
+    InfiniteSessionConfig, LargeToolOutputConfig, McpServerConfig, McpStdioServerConfig,
+    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;
@@ -135,6 +135,55 @@ fn custom_agent_config_omits_reasoning_effort_when_none() {
     assert!(wire.get("reasoningEffort").is_none());
 }
 
+#[test]
+fn custom_agent_config_hooks_round_trip() {
+    use indexmap::IndexMap;
+
+    let action: IndexMap<String, serde_json::Value> = IndexMap::from([
+        ("type".into(), json!("command")),
+        ("bash".into(), json!("echo scoped-hook")),
+        ("timeoutSec".into(), json!(10)),
+    ]);
+    let hooks = IndexMap::from([("preToolUse".into(), vec![action])]);
+    let agent = CustomAgentConfig::new("hook-agent", "prompt").with_hooks(hooks.clone());
+    assert_eq!(agent.hooks.as_ref(), Some(&hooks));
+
+    let wire = serde_json::to_value(&agent).unwrap();
+    assert_eq!(
+        wire["hooks"],
+        json!({"preToolUse": [{"type": "command", "bash": "echo scoped-hook", "timeoutSec": 10}]})
+    );
+    let restored: CustomAgentConfig = serde_json::from_value(wire).unwrap();
+    assert_eq!(restored.hooks, Some(hooks));
+}
+
+#[test]
+fn custom_agent_config_hooks_reject_non_object_actions() {
+    for action in [
+        json!(null),
+        json!(true),
+        json!(42),
+        json!("command"),
+        json!([]),
+    ] {
+        let result = serde_json::from_value::<CustomAgentConfig>(json!({
+            "name": "invalid-hook-agent",
+            "prompt": "prompt",
+            "hooks": {"preToolUse": [action]}
+        }));
+        assert!(
+            result.is_err(),
+            "expected non-object hook action {action} to fail, got {result:?}"
+        );
+    }
+}
+
+#[test]
+fn custom_agent_config_omits_hooks_when_unset() {
+    let wire = serde_json::to_value(CustomAgentConfig::new("plain-agent", "prompt")).unwrap();
+    assert!(wire.get("hooks").is_none());
+}
+
 #[test]
 #[should_panic(expected = "tool parameter schema must be a JSON object")]
 fn tool_with_parameters_panics_on_non_object_value() {
@@ -888,6 +937,23 @@ fn resume_session_config_into_wire_serializes_plugin_directories_and_large_outpu
     assert!(empty_json.get("largeOutput").is_none());
 }
 
+#[test]
+fn session_configs_serialize_managed_model_enforcement() {
+    let (create_wire, _) = SessionConfig::default()
+        .with_enforce_managed_model_defaults(true)
+        .into_wire(Some(SessionId::from("create")))
+        .expect("no duplicate handlers");
+    let create_json = serde_json::to_value(&create_wire).unwrap();
+    assert_eq!(create_json["enforceManagedModelDefaults"], true);
+
+    let (resume_wire, _) = ResumeSessionConfig::new(SessionId::from("resume"))
+        .with_enforce_managed_model_defaults(true)
+        .into_wire()
+        .expect("no duplicate handlers");
+    let resume_json = serde_json::to_value(&resume_wire).unwrap();
+    assert_eq!(resume_json["enforceManagedModelDefaults"], true);
+}
+
 #[test]
 fn auth_client_id_metadata_url_reaches_create_and_resume_wire_payloads() {
     let url = "https://example.com/oauth/client-metadata.json";
@@ -1446,7 +1512,12 @@ fn capi_auto_tier_accepts_unknown_values_for_forward_compatibility() {
     for value in ["balanced", "Balance", "unknown"] {
         assert_eq!(
             serde_json::from_value::<AutoTier>(json!(value)).unwrap(),
-            AutoTier::Unknown
+            AutoTier::Custom(value.to_owned())
+        );
+        assert_eq!(
+            serde_json::to_value(serde_json::from_value::<AutoTier>(json!(value)).unwrap())
+                .unwrap(),
+            json!(value)
         );
     }
     let capi: CapiSessionOptions = serde_json::from_value(json!({})).unwrap();
@@ -1925,3 +1996,40 @@ fn github_anchored_attachment_variants_round_trip() {
         );
     }
 }
+#[test]
+fn image_generation_create_and_resume_wire_options() {
+    for enabled in [true, false] {
+        let config = ImageGenerationConfig::new().with_enabled(enabled);
+        let (create, _) = SessionConfig::default()
+            .with_image_generation(config.clone())
+            .into_wire(Some(SessionId::from("image-test")))
+            .unwrap();
+        let (resume, _) = ResumeSessionConfig::new(SessionId::from("image-test"))
+            .with_image_generation(config)
+            .into_wire()
+            .unwrap();
+        for wire in [
+            serde_json::to_value(create).unwrap(),
+            serde_json::to_value(resume).unwrap(),
+        ] {
+            assert_eq!(
+                wire["imageGeneration"],
+                serde_json::json!({"enabled": enabled})
+            );
+        }
+    }
+    let (create, _) = SessionConfig::default().into_wire(None).unwrap();
+    let (resume, _) = ResumeSessionConfig::new(SessionId::from("image-test"))
+        .into_wire()
+        .unwrap();
+    for wire in [
+        serde_json::to_value(create).unwrap(),
+        serde_json::to_value(resume).unwrap(),
+    ] {
+        assert!(wire.get("imageGeneration").is_none(), "{wire}");
+    }
+    assert_eq!(
+        serde_json::to_value(ImageGenerationConfig::new()).unwrap(),
+        serde_json::json!({})
+    );
+}
diff --git a/rust/src/wire.rs b/rust/src/wire.rs
index 61e7d7c44f..7c5e2ccbd4 100644
--- a/rust/src/wire.rs
+++ b/rust/src/wire.rs
@@ -27,9 +27,9 @@ use crate::generated::session_events::ReasoningSummary;
 use crate::types::{
     AskUserVariant, CanvasProviderIdentity, CapiSessionOptions, CloudSessionOptions,
     CustomAgentConfig, DefaultAgentConfig, ExtensionInfo, GitHubMcpToolConfig,
-    InfiniteSessionConfig, LargeToolOutputConfig, McpServerConfig, MemoryConfiguration,
-    NamedProviderConfig, ProviderConfig, ProviderModelConfig, SessionId, SessionLimitsConfig,
-    SystemMessageConfig, Tool, ToolSearchConfig,
+    ImageGenerationConfig, InfiniteSessionConfig, LargeToolOutputConfig, McpServerConfig,
+    MemoryConfiguration, NamedProviderConfig, ProviderConfig, ProviderModelConfig, SessionId,
+    SessionLimitsConfig, SystemMessageConfig, Tool, ToolSearchConfig,
 };
 
 /// Wire representation of a slash command (name + description only). The
@@ -51,6 +51,8 @@ pub(crate) struct SessionCreateWire {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub session_id: Option<SessionId>,
     #[serde(skip_serializing_if = "Option::is_none")]
+    pub name: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub model: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub allowed_models: Option<Vec<String>>,
@@ -123,6 +125,8 @@ pub(crate) struct SessionCreateWire {
     pub enable_session_store: Option<bool>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub enable_skills: Option<bool>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub has_skill_provider: Option<bool>,
     pub request_user_input: bool,
     pub request_permission: bool,
     pub request_exit_plan_mode: bool,
@@ -135,6 +139,10 @@ pub(crate) struct SessionCreateWire {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub skill_directories: Option<Vec<PathBuf>>,
     #[serde(skip_serializing_if = "Option::is_none")]
+    pub agent_directories: Option<Vec<PathBuf>>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub hook_directories: Option<Vec<PathBuf>>,
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub instruction_directories: Option<Vec<PathBuf>>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub plugin_directories: Option<Vec<PathBuf>>,
@@ -143,6 +151,8 @@ pub(crate) struct SessionCreateWire {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub tool_search: Option<ToolSearchConfig>,
     #[serde(skip_serializing_if = "Option::is_none")]
+    pub image_generation: Option<ImageGenerationConfig>,
+    #[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>>,
@@ -209,6 +219,8 @@ pub(crate) struct SessionCreateWire {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub enable_managed_settings: Option<bool>,
     #[serde(skip_serializing_if = "Option::is_none")]
+    pub enforce_managed_model_defaults: 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>,
@@ -291,6 +303,8 @@ pub(crate) struct SessionResumeWire {
     pub enable_session_store: Option<bool>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub enable_skills: Option<bool>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub has_skill_provider: Option<bool>,
     pub request_user_input: bool,
     pub request_permission: bool,
     pub request_exit_plan_mode: bool,
@@ -303,6 +317,10 @@ pub(crate) struct SessionResumeWire {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub skill_directories: Option<Vec<PathBuf>>,
     #[serde(skip_serializing_if = "Option::is_none")]
+    pub agent_directories: Option<Vec<PathBuf>>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub hook_directories: Option<Vec<PathBuf>>,
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub instruction_directories: Option<Vec<PathBuf>>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub plugin_directories: Option<Vec<PathBuf>>,
@@ -311,6 +329,8 @@ pub(crate) struct SessionResumeWire {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub tool_search: Option<ToolSearchConfig>,
     #[serde(skip_serializing_if = "Option::is_none")]
+    pub image_generation: Option<ImageGenerationConfig>,
+    #[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>>,
@@ -382,6 +402,8 @@ pub(crate) struct SessionResumeWire {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub enable_managed_settings: Option<bool>,
     #[serde(skip_serializing_if = "Option::is_none")]
+    pub enforce_managed_model_defaults: 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/api_types_test.rs b/rust/tests/api_types_test.rs
index fa714a7789..d8b705f075 100644
--- a/rust/tests/api_types_test.rs
+++ b/rust/tests/api_types_test.rs
@@ -11,18 +11,126 @@ use github_copilot_sdk::rpc::{
     CustomizationReloadOutcome, CustomizationReloadStatus, CustomizationReloadSubsystem,
     EnqueueCommandResult, Extension, ExtensionList, ExtensionSource, ExtensionStatus,
     ExtensionsDisableRequest, ExtensionsEnableRequest, FleetStartRequest, FleetStartResult,
-    McpDisableRequest, McpEnableOptions, McpEnableRequest, McpInstallationOperationStatus,
-    McpOauthLoginOptions, McpOauthLoginRequest, McpServer, McpStopServerRequest,
-    ModelSetAllowedModelsRequest, ModelSetAllowedModelsResult, ModelSwitchAutoTierRequest,
-    ModelSwitchAutoTierResult, ModelSwitchAutoTierStatus, QueuePendingItems, QueuePendingItemsKind,
-    SandboxConfig, SendAgentMode, TasksStartAgentRequest, UnsupportedEnqueueCommandResult,
+    ManagedPermissionEvaluation, ManagedPermissionOperationKind, ManagedPermissionsEvaluateRequest,
+    McpConfiguredServer, McpConfiguredServerList, McpConfiguredServerState, McpDisableRequest,
+    McpEnableOptions, McpEnableRequest, McpInstallationOperationStatus, McpOauthLoginOptions,
+    McpOauthLoginRequest, McpServer, McpStopServerRequest, ModelSetAllowedModelsRequest,
+    ModelSetAllowedModelsResult, ModelSwitchAutoTierRequest, ModelSwitchAutoTierResult,
+    ModelSwitchAutoTierStatus, QueuePendingItems, QueuePendingItemsKind, SandboxConfig,
+    SendAgentMode, SessionMcpListConfiguredResult, TasksStartAgentRequest,
+    UnsupportedEnqueueCommandResult,
 };
 use github_copilot_sdk::session_events::{
-    McpServerStatus, PermissionRequest, PermissionRequestedData, SessionEventData,
-    TypedSessionEvent,
+    McpServerStatus, PermissionRequest, PermissionRequestedData, RecommendedAutoTier,
+    SessionEventData, TypedSessionEvent,
 };
 use github_copilot_sdk::{AutoTier, AutoTierPreference, SetModelOptions};
 
+#[test]
+fn managed_permission_results_reuse_operations_without_reconstruction() {
+    let evaluation: ManagedPermissionEvaluation = serde_json::from_value(serde_json::json!({
+        "operation": {"kind": "url", "url": "https://example.com/a"},
+        "verdict": "allow",
+    }))
+    .unwrap();
+    let request = ManagedPermissionsEvaluateRequest {
+        context: serde_json::from_value(serde_json::json!({"failClosed": false})).unwrap(),
+        operations: vec![evaluation.operation],
+    };
+    assert_eq!(
+        request.operations[0].kind,
+        ManagedPermissionOperationKind::Url
+    );
+    assert_eq!(
+        serde_json::to_value(request).unwrap(),
+        serde_json::json!({
+            "context": {"failClosed": false},
+            "operations": [{"kind": "url", "url": "https://example.com/a"}],
+        })
+    );
+}
+
+#[test]
+fn extensible_tier_unknown_literal_retains_its_provider_identity() {
+    let wire = serde_json::json!("Unknown");
+    let tier: AutoTier = serde_json::from_value(wire.clone()).unwrap();
+    assert_eq!(tier, AutoTier::Custom("Unknown".to_owned()));
+    assert_eq!(serde_json::to_value(tier).unwrap(), wire);
+    let recommendation: RecommendedAutoTier = serde_json::from_value(wire.clone()).unwrap();
+    assert_eq!(
+        recommendation,
+        RecommendedAutoTier::Custom("Unknown".to_owned())
+    );
+    assert_eq!(serde_json::to_value(recommendation).unwrap(), wire);
+}
+
+#[test]
+fn configured_mcp_servers_preserve_enablement_with_unmaterialized_state() {
+    for enabled in [false, true] {
+        let server = McpConfiguredServer {
+            name: "configured".to_string(),
+            enabled,
+            live: McpConfiguredServerState {
+                status: McpServerStatus::NotConfigured,
+                error: None,
+            },
+            ..Default::default()
+        };
+        let wire = serde_json::json!({
+            "servers": [{
+                "name": "configured",
+                "enabled": enabled,
+                "live": { "status": "not_configured" },
+            }],
+        });
+        assert_eq!(
+            serde_json::to_value(McpConfiguredServerList {
+                servers: vec![server],
+            })
+            .unwrap(),
+            wire
+        );
+        let result: SessionMcpListConfiguredResult = serde_json::from_value(wire.clone()).unwrap();
+        assert_eq!(
+            result.servers[0].live.status,
+            McpServerStatus::NotConfigured
+        );
+        assert_eq!(serde_json::to_value(result).unwrap(), wire);
+    }
+}
+
+#[test]
+fn configured_mcp_servers_preserve_live_observations_independently_of_enablement() {
+    for enabled in [false, true] {
+        let server = McpConfiguredServer {
+            name: "configured".to_string(),
+            enabled,
+            live: McpConfiguredServerState {
+                status: McpServerStatus::Stopped,
+                error: None,
+            },
+            ..Default::default()
+        };
+        assert_eq!(
+            serde_json::to_value(server).unwrap(),
+            serde_json::json!({
+                "name": "configured",
+                "enabled": enabled,
+                "live": { "status": "stopped" },
+            })
+        );
+    }
+    let wire = serde_json::json!({
+        "servers": [{
+            "name": "configured",
+            "enabled": true,
+            "live": { "status": "failed", "error": "connection failed" },
+        }],
+    });
+    let result: SessionMcpListConfiguredResult = serde_json::from_value(wire.clone()).unwrap();
+    assert_eq!(serde_json::to_value(result).unwrap(), wire);
+}
+
 #[test]
 fn customization_reload_outcome_preserves_future_wire_values() {
     let wire = serde_json::json!({
@@ -239,6 +347,10 @@ fn session_events_deserialize_auto_tier() {
             (Some(AutoTier::Balance), Some("balance")),
             (Some(AutoTier::Intelligence), Some("intelligence")),
             (Some(AutoTier::Fast), Some("fast")),
+            (
+                Some(AutoTier::Custom("premium-v2".to_owned())),
+                Some("premium-v2"),
+            ),
             (None, None),
         ] {
             let mut wire = serde_json::json!({
@@ -257,6 +369,12 @@ fn session_events_deserialize_auto_tier() {
                 wire["data"]["autoTier"] = serde_json::json!(wire_tier);
             }
             let event: TypedSessionEvent = serde_json::from_value(wire).unwrap();
+            if let Some(wire_tier) = wire_tier {
+                assert_eq!(
+                    serde_json::to_value(&event).unwrap()["data"]["autoTier"],
+                    serde_json::json!(wire_tier),
+                );
+            }
             let actual: Option<AutoTier> = match event.payload {
                 SessionEventData::SessionStart(data) if event_type == "session.start" => {
                     data.auto_tier
@@ -713,6 +831,7 @@ fn switch_auto_tier_request_serializes_each_tier() {
         (AutoTier::Balance, "balance"),
         (AutoTier::Intelligence, "intelligence"),
         (AutoTier::Fast, "fast"),
+        (AutoTier::Custom("premium-v2".to_owned()), "premium-v2"),
     ] {
         let request = ModelSwitchAutoTierRequest {
             auto_tier: Some(tier),
diff --git a/rust/tests/e2e.rs b/rust/tests/e2e.rs
index 7e24053d61..8c4e912bb5 100644
--- a/rust/tests/e2e.rs
+++ b/rust/tests/e2e.rs
@@ -80,6 +80,8 @@ mod session_lifecycle;
 mod session_todos_changed;
 #[path = "e2e/set_tools.rs"]
 mod set_tools;
+#[path = "e2e/skill_provider.rs"]
+mod skill_provider;
 #[path = "e2e/skills.rs"]
 mod skills;
 #[path = "e2e/streaming_fidelity.rs"]
diff --git a/rust/tests/e2e/client_options.rs b/rust/tests/e2e/client_options.rs
index c516f84be6..563ae1328b 100644
--- a/rust/tests/e2e/client_options.rs
+++ b/rust/tests/e2e/client_options.rs
@@ -18,6 +18,10 @@ use serde::Deserialize;
 use serde_json::{Value, json};
 use tempfile::TempDir;
 
+#[cfg(windows)]
+#[path = "client_options/windows_process_tree.rs"]
+mod windows_process_tree;
+
 #[tokio::test]
 async fn should_forward_advanced_session_creation_options_to_the_cli() {
     let fake = FakeCli::new();
@@ -32,6 +36,7 @@ async fn should_forward_advanced_session_creation_options_to_the_cli() {
         .create_session(
             SessionConfig::default()
                 .with_session_id("advanced-session-id")
+                .with_name("advanced session")
                 .with_client_name("rust-sdk-e2e-client")
                 .with_model("claude-sonnet-5")
                 .with_reasoning_effort("low")
@@ -95,6 +100,7 @@ async fn should_forward_advanced_session_creation_options_to_the_cli() {
         params,
         [
             ("sessionId", json!("advanced-session-id")),
+            ("name", json!("advanced session")),
             ("clientName", json!("rust-sdk-e2e-client")),
             ("model", json!("claude-sonnet-5")),
             ("reasoningEffort", json!("low")),
diff --git a/rust/tests/e2e/client_options/windows_process_tree.rs b/rust/tests/e2e/client_options/windows_process_tree.rs
new file mode 100644
index 0000000000..36035536ac
--- /dev/null
+++ b/rust/tests/e2e/client_options/windows_process_tree.rs
@@ -0,0 +1,252 @@
+#![cfg(windows)]
+
+use std::io;
+use std::os::windows::io::{AsRawHandle, FromRawHandle, OwnedHandle};
+use std::path::Path;
+use std::time::Duration;
+
+use github_copilot_sdk::{CliProgram, Client, ClientOptions, Transport};
+use windows_sys::Win32::System::Threading::{
+    OpenProcess, PROCESS_SYNCHRONIZE, PROCESS_TERMINATE, TerminateProcess, WaitForSingleObject,
+};
+
+use super::ShutdownCli;
+
+struct FixtureProcess(OwnedHandle);
+
+impl FixtureProcess {
+    fn open(pid: u32) -> Self {
+        // SAFETY: this PID was published by this test's owned fixture.
+        let handle = unsafe { OpenProcess(PROCESS_SYNCHRONIZE | PROCESS_TERMINATE, 0, pid) };
+        assert!(!handle.is_null(), "{}", io::Error::last_os_error());
+        // SAFETY: OpenProcess returned a new independently owned handle.
+        Self(unsafe { OwnedHandle::from_raw_handle(handle) })
+    }
+
+    fn alive(&self) -> bool {
+        // SAFETY: the retained process handle is valid even after the process exits.
+        match unsafe { WaitForSingleObject(self.0.as_raw_handle().cast(), 0) } {
+            0 => false,
+            258 => true,
+            result => panic!(
+                "process wait failed ({result}): {}",
+                io::Error::last_os_error()
+            ),
+        }
+    }
+
+    fn terminate(&self) {
+        // SAFETY: this handle uniquely identifies a fixture-owned process, not a reused PID.
+        assert_ne!(
+            unsafe { TerminateProcess(self.0.as_raw_handle().cast(), 1) },
+            0,
+            "{}",
+            io::Error::last_os_error()
+        );
+    }
+
+    async fn assert_exited(&self) {
+        tokio::time::timeout(Duration::from_secs(5), async {
+            while self.alive() {
+                tokio::time::sleep(Duration::from_millis(10)).await;
+            }
+        })
+        .await
+        .expect("owned root and descendant must terminate");
+    }
+}
+
+impl Drop for FixtureProcess {
+    fn drop(&mut self) {
+        // SAFETY: fallback cleanup targets only this fixture's retained process handle.
+        unsafe {
+            if WaitForSingleObject(self.0.as_raw_handle().cast(), 0) == 258 {
+                if TerminateProcess(self.0.as_raw_handle().cast(), 1) == 0 {
+                    eprintln!(
+                        "fixture fallback termination failed: {}",
+                        io::Error::last_os_error()
+                    );
+                }
+                if WaitForSingleObject(self.0.as_raw_handle().cast(), 5000) != 0 {
+                    eprintln!(
+                        "fixture fallback reap failed: {}",
+                        io::Error::last_os_error()
+                    );
+                }
+            }
+        }
+    }
+}
+
+fn options(fake: &ShutdownCli, tcp: bool) -> ClientOptions {
+    let mut options = fake.options();
+    options.prefix_args.push("--fixture-descendant".into());
+    if tcp {
+        options.prefix_args.push("--fixture-tcp".into());
+        options.transport = Transport::Tcp {
+            port: 0,
+            connection_token: None,
+        };
+    }
+    options
+}
+
+async fn published_pid(path: &Path) -> u32 {
+    tokio::time::timeout(Duration::from_secs(10), async {
+        loop {
+            match std::fs::read_to_string(path) {
+                Ok(value) => {
+                    if let Ok(pid) = value.trim().parse() {
+                        return pid;
+                    }
+                }
+                Err(error) if error.kind() == io::ErrorKind::NotFound => {}
+                Err(error) => panic!("read fixture PID: {error}"),
+            }
+            tokio::time::sleep(Duration::from_millis(10)).await;
+        }
+    })
+    .await
+    .expect("fixture must publish its PID")
+}
+
+async fn retain_tree(fake: &ShutdownCli) -> (FixtureProcess, FixtureProcess) {
+    let root = FixtureProcess::open(published_pid(&fake.pid_file).await);
+    let descendant_path = fake.pid_file.with_file_name("child.pid.descendant");
+    let descendant = FixtureProcess::open(published_pid(&descendant_path).await);
+    assert!(root.alive());
+    assert!(descendant.alive());
+    (root, descendant)
+}
+
+#[tokio::test]
+async fn stop_force_stop_and_drop_terminate_owned_descendants() {
+    for tcp in [false, true] {
+        for action in ["stop", "force_stop", "drop"] {
+            let fake = ShutdownCli::new("force");
+            let client = Client::start(options(&fake, tcp))
+                .await
+                .expect("start fixture CLI");
+            let (root, descendant) = retain_tree(&fake).await;
+            match action {
+                "stop" => client.stop().await.expect("stop fixture CLI"),
+                "force_stop" => client.force_stop(),
+                "drop" => {}
+                _ => unreachable!(),
+            }
+            drop(client);
+            root.assert_exited().await;
+            descendant.assert_exited().await;
+        }
+    }
+}
+
+#[tokio::test]
+async fn cancelled_startup_terminates_root_and_descendant() {
+    for (tcp, mode) in [
+        (false, "connect-stall"),
+        (true, "connect-stall"),
+        (true, "port-stall"),
+    ] {
+        let fake = ShutdownCli::new(mode);
+        let starting = tokio::spawn(Client::start(options(&fake, tcp)));
+        let (root, descendant) = retain_tree(&fake).await;
+        starting.abort();
+        assert!(starting.await.expect_err("cancel startup").is_cancelled());
+        root.assert_exited().await;
+        descendant.assert_exited().await;
+    }
+}
+
+#[tokio::test]
+async fn startup_process_exit_terminates_descendant() {
+    for tcp in [false, true] {
+        let fake = ShutdownCli::new("connect-stall");
+        let starting = tokio::spawn(Client::start(options(&fake, tcp)));
+        let (root, descendant) = retain_tree(&fake).await;
+        root.terminate();
+        let result = tokio::time::timeout(Duration::from_secs(5), starting)
+            .await
+            .expect("startup failure must be bounded")
+            .expect("join startup task");
+        assert!(result.is_err());
+        root.assert_exited().await;
+        descendant.assert_exited().await;
+    }
+}
+
+#[tokio::test]
+async fn last_clone_drop_is_private_to_its_client_job() {
+    for tcp in [false, true] {
+        let first = ShutdownCli::new("force");
+        let client = Client::start(options(&first, tcp))
+            .await
+            .expect("start first client");
+        let retained_client = client.clone();
+        let first_tree = retain_tree(&first).await;
+        let second = ShutdownCli::new("force");
+        let second_client = Client::start(options(&second, tcp))
+            .await
+            .expect("start second client");
+        let second_tree = retain_tree(&second).await;
+
+        drop(client);
+        assert!(first_tree.0.alive());
+        assert!(first_tree.1.alive());
+        drop(retained_client);
+        first_tree.0.assert_exited().await;
+        first_tree.1.assert_exited().await;
+        assert!(second_tree.0.alive());
+        assert!(second_tree.1.alive());
+        second_client
+            .ping(Some("private-job-isolation"))
+            .await
+            .expect("other client's Job must remain alive");
+        second_client.force_stop();
+        second_tree.0.assert_exited().await;
+        second_tree.1.assert_exited().await;
+    }
+}
+
+#[tokio::test]
+async fn abrupt_host_exit_terminates_root_and_descendant_without_rust_cleanup() {
+    for tcp in [false, true] {
+        let fake = ShutdownCli::new("force");
+        let options = options(&fake, tcp);
+        let CliProgram::Path(program) = options.program else {
+            panic!("fixture uses an explicit program");
+        };
+        let prefix: Vec<_> = options
+            .prefix_args
+            .iter()
+            .map(|arg| arg.to_str().expect("fixture argument is UTF-8"))
+            .collect();
+        let host_pid_file = fake.dir.path().join("host-cli.pid");
+        let mut host =
+            tokio::process::Command::new(env!("CARGO_BIN_EXE_copilot-host-crash-fixture"))
+                .env("HOST_CRASH_FIXTURE_PROGRAM", program)
+                .env(
+                    "HOST_CRASH_FIXTURE_PREFIX_ARGS_JSON",
+                    serde_json::to_string(&prefix).expect("fixture args"),
+                )
+                .env("HOST_CRASH_FIXTURE_CWD", fake.dir.path())
+                .env("HOST_CRASH_FIXTURE_ENV_JSON", "[]")
+                .env("HOST_CRASH_FIXTURE_PID_FILE", &host_pid_file)
+                .env(
+                    "HOST_CRASH_FIXTURE_TRANSPORT",
+                    if tcp { "tcp" } else { "stdio" },
+                )
+                .kill_on_drop(true)
+                .spawn()
+                .expect("spawn SDK host fixture");
+        let reported_root = published_pid(&host_pid_file).await;
+        assert_eq!(reported_root, published_pid(&fake.pid_file).await);
+        let (root, descendant) = retain_tree(&fake).await;
+        tokio::time::timeout(Duration::from_secs(5), host.kill())
+            .await
+            .expect("bound abrupt host termination")
+            .expect("kill and reap SDK host");
+        root.assert_exited().await;
+        descendant.assert_exited().await;
+    }
+}
diff --git a/rust/tests/e2e/runtime_host_callbacks.rs b/rust/tests/e2e/runtime_host_callbacks.rs
index 92e4ff26b2..873c6e009b 100644
--- a/rust/tests/e2e/runtime_host_callbacks.rs
+++ b/rust/tests/e2e/runtime_host_callbacks.rs
@@ -41,8 +41,8 @@ async fn callback_resume_composes_tools_after_application_session_runtime_restar
             let original = deadline(created.recv()).await.unwrap();
             assert!(created.try_recv().is_err());
             let session_id = original.id();
-            assert_eq!(session_id.as_str(), uri.strip_prefix("ahp-session:/").unwrap());
-            topology(&first, &first_owner, &home(ctx).join("ahp/sessions"));
+            assert_ne!(session_id.as_str(), uri.strip_prefix("ahp-session:/").unwrap());
+            topology(&first, &first_owner, &home(ctx));
             turn(&ahp, &chat, subscription).await;
             assert_eq!(first_callbacks.tools.load(Ordering::SeqCst), 0);
             first.dispose().await.unwrap();
@@ -103,7 +103,7 @@ async fn callback_resume_composes_tools_after_application_session_runtime_restar
                 .with_on_session_released(move |session| { released_tx.send(session).unwrap(); });
             let host = owner.start_ahp_host(options).await.unwrap();
             let ahp = connect_url_as(host.url.as_deref().expect("local listener URL"), host.token.as_deref(), client_id).await;
-            topology(&host, &owner, &home(ctx).join("ahp/sessions"));
+            topology(&host, &owner, &home(ctx));
             resume(&ahp, &uri, None).await;
             let restored = deadline(resumed.recv()).await.unwrap();
             assert_eq!(restored.id(), session_id);
@@ -324,6 +324,11 @@ fn options_with_app(
             let created_tx = created_tx.clone();
             async move {
                 assert!(!request.cancellation_token.is_cancelled());
+                let requested_id = request
+                    .config
+                    .session_id
+                    .clone()
+                    .expect("host-requested runtime ID");
                 let tool = Tool::new("magic_number")
                     .with_description("Returns a magic number")
                     .with_parameters(json!({
@@ -348,6 +353,7 @@ fn options_with_app(
                         )
                         .await?,
                 );
+                assert_eq!(original.id(), requested_id);
                 created_tx.send(original.clone()).unwrap();
                 Ok(original)
             }
@@ -358,6 +364,141 @@ fn options_with_app(
     (options, created, released)
 }
 
+#[tokio::test]
+#[ignore = "requires local runtime host artifacts"]
+#[serial_test::serial]
+async fn resident_publication_preserves_original_without_invoking_factories() {
+    use github_copilot_sdk::rpc::ModeSetRequest;
+    use github_copilot_sdk::session_events::SessionMode;
+
+    run_snapshot("multi_client", TOOL_SNAPSHOT, |ctx| {
+        Box::pin(async move {
+            let owner = start(ctx).await;
+            let callbacks = Arc::new(AppCallbacks::default());
+            let tool = Tool::new("magic_number")
+                .with_description("Returns a magic number")
+                .with_parameters(json!({
+                    "type": "object",
+                    "properties": {"seed": {"type": "string", "description": "A seed value"}},
+                    "required": ["seed"]
+                }))
+                .with_handler(callbacks.clone());
+            let original = owner
+                .create_session(
+                    ctx.approve_all_session_config()
+                        .with_model("claude-sonnet-5")
+                        .with_system_message(
+                            SystemMessageConfig::new()
+                                .with_mode("append")
+                                .with_content(MARKER),
+                        )
+                        .with_excluded_tools(["bash"])
+                        .with_tools(vec![tool])
+                        .with_hooks(callbacks.clone()),
+                )
+                .await
+                .unwrap();
+            original
+                .rpc()
+                .mode()
+                .set(ModeSetRequest {
+                    mode: SessionMode::Plan,
+                    ..Default::default()
+                })
+                .await
+                .unwrap();
+            let creates = Arc::new(AtomicUsize::new(0));
+            let resumes = Arc::new(AtomicUsize::new(0));
+            let releases = Arc::new(AtomicUsize::new(0));
+            let (created, resumed, released) = (creates.clone(), resumes.clone(), releases.clone());
+            let host = owner
+                .start_ahp_host(
+                    local_options()
+                        .with_create_session(move |_: AhpSessionRequest, _: Client| {
+                            created.fetch_add(1, Ordering::SeqCst);
+                            async {
+                                Err::<Arc<Session>, Error>(
+                                    std::io::Error::other("publication must not create").into(),
+                                )
+                            }
+                        })
+                        .with_resume_session(move |_: AhpSessionResumeRequest, _: Client| {
+                            resumed.fetch_add(1, Ordering::SeqCst);
+                            async {
+                                Err::<Arc<Session>, Error>(
+                                    std::io::Error::other("resident publication must not resume")
+                                        .into(),
+                                )
+                            }
+                        })
+                        .with_on_session_released(move |_| {
+                            released.fetch_add(1, Ordering::SeqCst);
+                        }),
+                )
+                .await
+                .unwrap();
+            let ahp = connect(&host).await;
+            let published = host.publish_session(original.id().as_str()).await.unwrap();
+            assert_eq!(published.session_id, original.id());
+            authenticate(&ahp).await;
+            let attachment = ahp.client.subscribe(published.session_uri).await;
+            assert_eq!(creates.load(Ordering::SeqCst), 0);
+            assert_eq!(
+                resumes.load(Ordering::SeqCst),
+                0,
+                "attaching an already-resident publication must not invoke its resume factory"
+            );
+            let (session, _) = attachment.expect("attach original resident session");
+            assert_eq!(
+                serde_json::to_value(session).unwrap()["snapshot"]["state"]["lifecycle"],
+                "ready"
+            );
+            assert_eq!(
+                original.rpc().mode().get().await.unwrap(),
+                SessionMode::Plan
+            );
+            original
+                .rpc()
+                .mode()
+                .set(ModeSetRequest {
+                    mode: SessionMode::Interactive,
+                    ..Default::default()
+                })
+                .await
+                .unwrap();
+            let response = original.send_and_wait(TOOL_PROMPT).await.unwrap().unwrap();
+            assert!(
+                response.data["content"]
+                    .as_str()
+                    .unwrap()
+                    .contains("MAGIC_hello_42")
+            );
+            assert_eq!(callbacks.tools.load(Ordering::SeqCst), 1);
+            assert!(callbacks.hooks.load(Ordering::SeqCst) > 0);
+            let exchanges = ctx.exchanges();
+            let request = &exchanges.last().expect("application inference")["request"];
+            assert!(request["messages"].to_string().contains(MARKER));
+            let tools = request["tools"].as_array().unwrap();
+            assert!(
+                tools
+                    .iter()
+                    .any(|tool| tool["function"]["name"] == "magic_number")
+            );
+            assert!(!tools.iter().any(|tool| tool["function"]["name"] == "bash"));
+            host.dispose().await.unwrap();
+            stopped(&host, &ahp, &owner).await;
+            assert_eq!(creates.load(Ordering::SeqCst), 0);
+            assert_eq!(resumes.load(Ordering::SeqCst), 0);
+            assert_eq!(releases.load(Ordering::SeqCst), 0);
+            assert!(!original.get_events().await.unwrap().is_empty());
+            ahp.client.shutdown().await;
+            original.disconnect().await.unwrap();
+            owner.stop().await.unwrap();
+        })
+    })
+    .await;
+}
+
 #[tokio::test]
 #[ignore = "requires local runtime host artifacts"]
 #[serial_test::serial]
@@ -371,11 +512,11 @@ async fn callback_handoff_preserves_tools_hooks_prompt_and_original_arc() {
             let ahp = connect(&host).await;
             let (uri, chat, subscription) = create(&ahp, ctx).await;
             let original = deadline(created.recv()).await.unwrap();
-            assert_eq!(
+            assert_ne!(
                 original.id().as_str(),
                 uri.strip_prefix("ahp-session:/").unwrap()
             );
-            topology(&host, &owner, &home(ctx).join("ahp/sessions"));
+            topology(&host, &owner, &home(ctx));
             turn_with_prompt(&ahp, &chat, subscription, TOOL_PROMPT, "MAGIC_hello_42").await;
             assert_eq!(callbacks.tools.load(Ordering::SeqCst), 1);
             assert!(callbacks.hooks.load(Ordering::SeqCst) > 0);
diff --git a/rust/tests/e2e/runtime_host_support.rs b/rust/tests/e2e/runtime_host_support.rs
index e38ed6ff70..a652e719c1 100644
--- a/rust/tests/e2e/runtime_host_support.rs
+++ b/rust/tests/e2e/runtime_host_support.rs
@@ -3,17 +3,22 @@ use std::future::Future;
 use std::path::{Path, PathBuf};
 use std::process::Command;
 use std::sync::{Arc, LazyLock, Mutex};
-use std::time::Duration;
+use std::time::{Duration, SystemTime, UNIX_EPOCH};
 
 use ahp::{Client as AhpClient, ClientConfig, SessionSubscription, SubscriptionEvent};
 use ahp_types::version::PROTOCOL_VERSION;
 use ahp_ws::WebSocketTransport;
+use base64::Engine as _;
+use base64::engine::general_purpose::{STANDARD, URL_SAFE_NO_PAD};
 use futures_util::FutureExt;
 use github_copilot_sdk::{
     AhpHost, AhpHostExit, AhpHostOptions, CliProgram, Client, ClientOptions, Transport,
 };
+use hpke::{Deserializable, Serializable};
+use rand_core::{OsRng, RngCore};
 use serde::Deserialize;
 use serde_json::{Value, json};
+use sha2::{Digest, Sha256};
 
 use super::support::{DEFAULT_TEST_TOKEN, E2eContext};
 
@@ -190,6 +195,7 @@ pub fn deadline<T>(future: impl Future<Output = T>) -> impl Future<Output = T> {
 pub struct Ahp {
     pub client: AhpClient,
     pub client_id: String,
+    initialize_meta: Value,
 }
 
 pub async fn connect(host: &AhpHost) -> Ahp {
@@ -226,7 +232,149 @@ pub async fn connect_url_as(url: &str, token: Option<&str>, client_id: String) -
         .await
         .unwrap();
     assert_eq!(initialized.protocol_version, "0.9.0");
-    Ahp { client, client_id }
+    let initialize_meta = serde_json::to_value(initialized).unwrap()["_meta"].clone();
+    Ahp {
+        client,
+        client_id,
+        initialize_meta,
+    }
+}
+
+// Matches protocol_base/ahp/sealing.rs: HPKE base mode, empty info/AAD,
+// enc || ciphertext, and the structured connection-bound auth-token plaintext.
+// The harness owns the direct endpoint; no remote advertisement is trusted.
+fn sealed_auth_token(initialize_meta: &Value, root_meta: &Value, resource: &str) -> String {
+    let required = initialize_meta["copilot.encryptionRequired"]
+        .as_array()
+        .unwrap();
+    assert!(required.iter().any(|purpose| purpose == "auth-token"));
+    let binding = &initialize_meta["copilot.authChallenge"];
+    assert_eq!(binding["required"], true);
+    assert!(binding["responseMaxAgeSeconds"].as_u64().unwrap() > 0);
+    let challenge = binding["challenge"].as_str().unwrap();
+    assert_eq!(challenge.len(), 32);
+    assert!(
+        challenge
+            .bytes()
+            .all(|byte| byte.is_ascii_digit() || (b'a'..=b'f').contains(&byte))
+    );
+    let key = root_meta["copilot.encryptionKeys"]
+        .as_array()
+        .unwrap()
+        .iter()
+        .find(|key| {
+            key["use"] == "auth-token" && key["algorithm"] == "hpke-x25519-hkdf-sha256-aes256gcm"
+        })
+        .expect("host advertises auth-token HPKE key");
+    let public_key = STANDARD.decode(key["publicKey"].as_str().unwrap()).unwrap();
+    assert_eq!(public_key.len(), 32);
+    let key_id = key["keyId"].as_str().unwrap();
+    assert_eq!(
+        key_id,
+        URL_SAFE_NO_PAD.encode(&Sha256::digest(&public_key)[..8])
+    );
+    let mut nonce = [0_u8; 16];
+    OsRng.fill_bytes(&mut nonce);
+    let nonce: String = nonce.iter().map(|byte| format!("{byte:02x}")).collect();
+    let plaintext = serde_json::to_vec(&json!({
+        "cty": "text",
+        "ctx": {
+            "purpose": "auth-token",
+            "resource": resource,
+            "connection": {
+                "challenge": challenge,
+                "nonce": nonce,
+                "issuedAt": SystemTime::now().duration_since(UNIX_EPOCH).unwrap().as_secs(),
+            },
+        },
+        "value": DEFAULT_TEST_TOKEN,
+    }))
+    .unwrap();
+    type Kem = hpke::kem::X25519HkdfSha256;
+    let recipient = <Kem as hpke::Kem>::PublicKey::from_bytes(&public_key).unwrap();
+    let (enc, mut sender) = hpke::setup_sender::<
+        hpke::aead::AesGcm256,
+        hpke::kdf::HkdfSha256,
+        Kem,
+        _,
+    >(&hpke::OpModeS::Base, &recipient, &[], &mut OsRng)
+    .unwrap();
+    let mut ciphertext = enc.to_bytes().to_vec();
+    ciphertext.extend(sender.seal(&plaintext, &[]).unwrap());
+    format!(
+        "copilot-sealed.v1.{key_id}.{}",
+        URL_SAFE_NO_PAD.encode(ciphertext)
+    )
+}
+
+#[test]
+fn fixture_authentication_is_sealed_and_bound_to_the_live_challenge() {
+    type Kem = hpke::kem::X25519HkdfSha256;
+    let (secret, public) = <Kem as hpke::Kem>::gen_keypair(&mut OsRng);
+    let key_id = URL_SAFE_NO_PAD.encode(&Sha256::digest(public.to_bytes())[..8]);
+    let challenge = "00112233445566778899aabbccddeeff";
+    let initialized = json!({
+        "copilot.encryptionRequired": ["auth-token", "mcp-auth-token"],
+        "copilot.authChallenge": {
+            "challenge": challenge, "responseMaxAgeSeconds": 300, "required": true,
+        },
+    });
+    let root = json!({
+        "copilot.encryptionKeys": [{
+            "keyId": key_id, "use": "auth-token",
+            "algorithm": "hpke-x25519-hkdf-sha256-aes256gcm",
+            "publicKey": STANDARD.encode(public.to_bytes()),
+        }],
+    });
+    let mut nonces = std::collections::HashSet::new();
+    for _ in 0..2 {
+        let before = SystemTime::now()
+            .duration_since(UNIX_EPOCH)
+            .unwrap()
+            .as_secs();
+        let sealed = sealed_auth_token(&initialized, &root, "https://api.github.com");
+        assert!(!sealed.contains(DEFAULT_TEST_TOKEN));
+        let prefix = format!("copilot-sealed.v1.{key_id}.");
+        let bytes = URL_SAFE_NO_PAD
+            .decode(sealed.strip_prefix(&prefix).unwrap())
+            .unwrap();
+        let enc = <Kem as hpke::Kem>::EncappedKey::from_bytes(&bytes[..32]).unwrap();
+        let mut recipient =
+            hpke::setup_receiver::<hpke::aead::AesGcm256, hpke::kdf::HkdfSha256, Kem>(
+                &hpke::OpModeR::Base,
+                &secret,
+                &enc,
+                &[],
+            )
+            .unwrap();
+        let plaintext: Value =
+            serde_json::from_slice(&recipient.open(&bytes[32..], &[]).unwrap()).unwrap();
+        assert_eq!(plaintext["cty"], "text");
+        assert_eq!(plaintext["value"], DEFAULT_TEST_TOKEN);
+        assert_eq!(plaintext["ctx"]["purpose"], "auth-token");
+        assert_eq!(plaintext["ctx"]["resource"], "https://api.github.com");
+        let connection = &plaintext["ctx"]["connection"];
+        assert_eq!(connection["challenge"], challenge);
+        assert!(connection["issuedAt"].as_u64().unwrap() >= before);
+        assert!(
+            connection["issuedAt"].as_u64().unwrap()
+                <= SystemTime::now()
+                    .duration_since(UNIX_EPOCH)
+                    .unwrap()
+                    .as_secs()
+        );
+        let nonce = connection["nonce"].as_str().unwrap();
+        assert_eq!(nonce.len(), 32);
+        assert!(
+            nonce
+                .bytes()
+                .all(|byte| byte.is_ascii_digit() || (b'a'..=b'f').contains(&byte))
+        );
+        assert!(
+            nonces.insert(nonce.to_owned()),
+            "each authentication has a fresh nonce"
+        );
+    }
 }
 
 pub async fn authenticate(ahp: &Ahp) {
@@ -244,12 +392,17 @@ pub async fn authenticate(ahp: &Ahp) {
         .find(|resource| resource["resource_name"] == "GitHub API")
         .unwrap()["resource"]
         .clone();
+    let token = sealed_auth_token(
+        &ahp.initialize_meta,
+        &root["snapshot"]["state"]["_meta"],
+        resource.as_str().unwrap(),
+    );
     let _: Value = ahp
         .client
         .request(
             "authenticate",
             json!({
-                "channel": ROOT, "resource": resource, "token": DEFAULT_TEST_TOKEN,
+                "channel": ROOT, "resource": resource, "token": token,
             }),
         )
         .await
@@ -453,9 +606,24 @@ pub async fn resume(ahp: &Ahp, uri: &str, excluded_sdk_id: Option<&str>) {
     );
 }
 
-pub fn topology(host: &AhpHost, owner: &Client, catalog: &Path) {
+pub fn topology(host: &AhpHost, owner: &Client, home: &Path) {
     let runtime = owner.pid().expect("owned out-of-process runtime");
+    let settings: Value =
+        serde_json::from_slice(&std::fs::read(home.join("settings.json")).unwrap()).unwrap();
+    let compute_id = settings["ahpEnvironment"]["computeId"]
+        .as_str()
+        .expect("host must save its default compute identity");
+    uuid::Uuid::parse_str(compute_id).expect("default compute identity must be a UUID");
+    let catalog = home.join("ahp").join(compute_id).join("sessions");
     assert!(catalog.is_dir(), "host must create the resolved catalog");
+    assert_eq!(
+        std::fs::read_to_string(catalog.join(".attached-host.owner"))
+            .expect("catalog ownership metadata")
+            .parse::<u32>()
+            .unwrap(),
+        runtime,
+        "the SDK runtime owns the compute-scoped catalog"
+    );
     let command = std::fs::read_to_string(format!("/proc/{runtime}/cmdline")).unwrap();
     let args: Vec<_> = command.split('\0').collect();
     assert!(!command.contains("copilotd"), "no companion host process");
diff --git a/rust/tests/e2e/session_lifecycle.rs b/rust/tests/e2e/session_lifecycle.rs
index 545bb49885..d406297e02 100644
--- a/rust/tests/e2e/session_lifecycle.rs
+++ b/rust/tests/e2e/session_lifecycle.rs
@@ -1,7 +1,12 @@
+use std::sync::Arc;
+
+use github_copilot_sdk::ResumeSessionConfig;
+use github_copilot_sdk::handler::ApproveAllHandler;
 use github_copilot_sdk::session_events::SessionEventType;
 
 use super::support::{
-    assistant_message_content, collect_until_idle, event_types, wait_for_condition,
+    DEFAULT_TEST_TOKEN, assistant_message_content, collect_until_idle, event_types,
+    wait_for_condition,
 };
 
 #[tokio::test]
@@ -57,6 +62,75 @@ async fn should_list_created_sessions_after_sending_a_message() {
     .await;
 }
 
+#[tokio::test]
+async fn should_persist_a_session_named_at_create_without_a_turn() {
+    // Dedicated context: the persisted name must survive a real CLI restart, and the
+    // shared group's client is never actually stopped.
+    super::support::with_dedicated_e2e_context(
+        "session_lifecycle",
+        "should_persist_a_session_named_at_create_without_a_turn",
+        |ctx| {
+            Box::pin(async move {
+                ctx.set_default_copilot_user();
+                let client = ctx.start_client().await;
+                let named = client
+                    .create_session(
+                        ctx.approve_all_session_config()
+                            .with_name("Named at create"),
+                    )
+                    .await
+                    .expect("create named session");
+                let named_id = named.id().clone();
+                let unnamed = client
+                    .create_session(ctx.approve_all_session_config())
+                    .await
+                    .expect("create unnamed session");
+                let unnamed_id = unnamed.id().clone();
+
+                let created_name = named.rpc().name().get().await.expect("get name").name;
+                assert_eq!(created_name.as_deref(), Some("Named at create"));
+
+                named.disconnect().await.expect("disconnect named session");
+                unnamed
+                    .disconnect()
+                    .await
+                    .expect("disconnect unnamed session");
+
+                // Neither session ran a turn: only the create-time name makes one persist.
+                let listed: std::collections::HashSet<_> = client
+                    .list_sessions(None)
+                    .await
+                    .expect("list sessions")
+                    .into_iter()
+                    .map(|session| session.session_id)
+                    .collect();
+                assert!(listed.contains(&named_id), "named session is listed");
+                assert!(!listed.contains(&unnamed_id), "unnamed session is not");
+
+                // Restart the CLI so the resume below reads the name back from disk.
+                client.stop().await.expect("stop client");
+                let cold_client = ctx.start_client().await;
+                let resumed = cold_client
+                    .resume_session(
+                        ResumeSessionConfig::new(named_id.clone())
+                            .with_permission_handler(Arc::new(ApproveAllHandler))
+                            .with_github_token(DEFAULT_TEST_TOKEN),
+                    )
+                    .await
+                    .expect("resume named session");
+                let read = resumed.rpc().name().get().await.expect("get resumed name");
+                assert_eq!(read.name.as_deref(), Some("Named at create"));
+                resumed
+                    .disconnect()
+                    .await
+                    .expect("disconnect resumed session");
+                cold_client.stop().await.expect("stop cold client");
+            })
+        },
+    )
+    .await;
+}
+
 #[tokio::test]
 async fn should_delete_session_permanently() {
     super::support::with_shared_e2e_context(
diff --git a/rust/tests/e2e/skill_provider.rs b/rust/tests/e2e/skill_provider.rs
new file mode 100644
index 0000000000..2bbbac7814
--- /dev/null
+++ b/rust/tests/e2e/skill_provider.rs
@@ -0,0 +1,641 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+
+use std::path::Path;
+use std::sync::{Arc, Mutex};
+use std::time::Duration;
+
+use async_trait::async_trait;
+use github_copilot_sdk::handler::ApproveAllHandler;
+use github_copilot_sdk::rpc::SkillSource;
+use github_copilot_sdk::session_events::{SessionEventType, ToolExecutionCompleteData};
+use github_copilot_sdk::{
+    CloudSessionOptions, Error, ErrorKind, ResumeSessionConfig, SessionConfig, SessionEvent,
+    SkillProvider, SkillProviderDescriptor,
+};
+use tokio::sync::Notify;
+
+use super::support::{assistant_message_content, collect_until_idle};
+
+static E2E: super::support::SharedE2eGroup =
+    super::support::SharedE2eGroup::standard("skill_provider", 5);
+
+#[tokio::test]
+async fn should_load_provider_skill_lazily_through_skill_tool() {
+    super::support::with_shared_e2e_context(
+        &E2E,
+        "skill_provider",
+        "should_load_provider_skill_lazily_through_skill_tool",
+        |ctx| {
+            Box::pin(async move {
+                let provider = Arc::new(TestSkillProvider::new(vec![skill(
+                    "provider-lookup",
+                    "Reports the provider lookup verification word.",
+                    "# Provider lookup\n\nThe verification word is TANGERINE_QUARTZ_19. Reply with it.\n",
+                )]));
+                let client = ctx.start_client().await;
+                let session = client
+                    .create_session(
+                        ctx.approve_all_session_config()
+                            .with_skill_provider(provider.clone()),
+                    )
+                    .await
+                    .expect("create session");
+
+                let skills = session.rpc().skills().list().await.expect("list skills");
+                let listed = skills
+                    .skills
+                    .iter()
+                    .find(|skill| skill.name == "provider-lookup")
+                    .expect("provider skill");
+                assert_eq!(listed.source, SkillSource::Sdk);
+                assert!(listed.enabled);
+                assert_eq!(listed.path.as_deref().unwrap_or_default(), "");
+                assert_eq!(provider.reads(), Vec::<String>::new());
+
+                let message = session
+                    .send_and_wait(
+                        "Use the skill tool to load the provider-lookup skill, then reply with its verification word.",
+                    )
+                    .await
+                    .expect("send")
+                    .expect("assistant message");
+
+                assert_eq!(provider.reads(), vec!["provider-lookup"]);
+                // Validate the final assistant response arrived (guards against truncated captures)
+                assert!(assistant_message_content(&message).contains("TANGERINE_QUARTZ_19"));
+
+                session.disconnect().await.expect("disconnect session");
+                client.stop().await.expect("stop client");
+            })
+        },
+    )
+    .await;
+}
+
+#[tokio::test]
+async fn should_load_provider_and_file_based_skills_together() {
+    super::support::with_shared_e2e_context(
+        &E2E,
+        "skill_provider",
+        "should_load_provider_and_file_based_skills_together",
+        |ctx| {
+            Box::pin(async move {
+                let skills_dir = write_file_notes_skill(ctx.work_dir());
+                let provider = Arc::new(TestSkillProvider::new(vec![skill(
+                    "provider-audit",
+                    "Reports the provider audit verification word.",
+                    "---\nname: provider-audit\nallowed-tools: view\n---\n\nThe provider audit verification word is COBALT_HERON_58.\n",
+                )]));
+                let client = ctx.start_client().await;
+                let session = client
+                    .create_session(
+                        ctx.approve_all_session_config()
+                            .with_skill_directories([skills_dir])
+                            .with_skill_provider(provider.clone()),
+                    )
+                    .await
+                    .expect("create session");
+
+                let skills = session.rpc().skills().list().await.expect("list skills");
+                let file_skill = skills
+                    .skills
+                    .iter()
+                    .find(|skill| skill.name == "file-notes")
+                    .expect("file skill");
+                let provider_skill = skills
+                    .skills
+                    .iter()
+                    .find(|skill| skill.name == "provider-audit")
+                    .expect("provider skill");
+                assert_ne!(file_skill.source, SkillSource::Sdk);
+                assert!(file_skill.path.as_deref().is_some_and(|path| !path.is_empty()));
+                assert_eq!(provider_skill.source, SkillSource::Sdk);
+
+                let message = session
+                    .send_and_wait(
+                        "Use the skill tool to load the file-notes skill and the provider-audit skill, then reply with both verification words.",
+                    )
+                    .await
+                    .expect("send")
+                    .expect("assistant message");
+
+                assert_eq!(provider.reads(), vec!["provider-audit"]);
+                // Validate the final assistant response arrived (guards against truncated captures)
+                let content = assistant_message_content(&message);
+                assert!(content.contains("MAPLE_FALCON_27"));
+                assert!(content.contains("COBALT_HERON_58"));
+
+                session.disconnect().await.expect("disconnect session");
+                client.stop().await.expect("stop client");
+            })
+        },
+    )
+    .await;
+}
+
+#[tokio::test]
+async fn should_rebind_skill_provider_on_resume() {
+    super::support::with_shared_e2e_context(
+        &E2E,
+        "skill_provider",
+        "should_rebind_skill_provider_on_resume",
+        |ctx| {
+            Box::pin(async move {
+                let original = Arc::new(TestSkillProvider::new(vec![skill(
+                    "rebind-check",
+                    "Reports the rebind verification word.",
+                    "The rebind verification word is AMBER_ALPHA_11.\n",
+                )]));
+                let replacement = Arc::new(TestSkillProvider::new(vec![skill(
+                    "rebind-check",
+                    "Reports the rebind verification word.",
+                    "The rebind verification word is BRONZE_BETA_22.\n",
+                )]));
+                let client = ctx.start_client().await;
+                let first = client
+                    .create_session(
+                        ctx.approve_all_session_config()
+                            .with_skill_provider(original.clone()),
+                    )
+                    .await
+                    .expect("create session");
+                let session_id = first.id().clone();
+                let ready = first
+                    .send_and_wait(
+                        "Without using any tools or skills, reply with exactly REBIND_READY.",
+                    )
+                    .await
+                    .expect("send readiness turn")
+                    .expect("assistant message");
+                assert!(assistant_message_content(&ready).contains("REBIND_READY"));
+                first.disconnect().await.expect("disconnect first session");
+                assert_eq!(original.reads(), Vec::<String>::new());
+                let original_calls_before_resume = original.calls().len();
+
+                let session = client
+                    .resume_session(
+                        ResumeSessionConfig::new(session_id)
+                            .with_permission_handler(Arc::new(ApproveAllHandler))
+                            .with_github_token(super::support::DEFAULT_TEST_TOKEN)
+                            .with_skill_provider(replacement.clone()),
+                    )
+                    .await
+                    .expect("resume session");
+
+                let message = session
+                    .send_and_wait(
+                        "Use the skill tool to load the rebind-check skill, then reply with its verification word.",
+                    )
+                    .await
+                    .expect("send")
+                    .expect("assistant message");
+
+                assert_eq!(replacement.reads(), vec!["rebind-check"]);
+                assert_eq!(original.calls().len(), original_calls_before_resume);
+                // Validate the final assistant response arrived (guards against truncated captures)
+                let content = assistant_message_content(&message);
+                assert!(content.contains("BRONZE_BETA_22"));
+                assert!(!content.contains("AMBER_ALPHA_11"));
+
+                session.disconnect().await.expect("disconnect session");
+                client.stop().await.expect("stop client");
+            })
+        },
+    )
+    .await;
+}
+
+#[tokio::test]
+async fn should_report_provider_read_failure_without_leaking_details() {
+    super::support::with_shared_e2e_context(
+        &E2E,
+        "skill_provider",
+        "should_report_provider_read_failure_without_leaking_details",
+        |ctx| {
+            Box::pin(async move {
+                let secret = "PROVIDER_SECRET_7F3A9C";
+                let provider = Arc::new(TestSkillProvider::new(vec![ProvidedSkill::new(
+                    "broken-lookup",
+                    "Reports the broken lookup verification word.",
+                    SkillRead::Error(format!("database unavailable: {secret}")),
+                )]));
+                let client = ctx.start_client().await;
+                let session = client
+                    .create_session(
+                        ctx.approve_all_session_config()
+                            .with_skill_provider(provider.clone()),
+                    )
+                    .await
+                    .expect("create session");
+                let events = session.subscribe();
+
+                let message = session
+                    .send_and_wait(
+                        "Use the skill tool to load the broken-lookup skill. If loading fails, reply with exactly LOAD_FAILED.",
+                    )
+                    .await
+                    .expect("send")
+                    .expect("assistant message");
+                let observed = collect_until_idle(events).await;
+
+                assert!(provider.reads().contains(&"broken-lookup".to_string()));
+                let failures = failed_tool_executions(&observed);
+                assert_eq!(failures.len(), 1, "expected one failed tool execution");
+                assert_no_secret(&observed, secret);
+                // Validate the final assistant response arrived (guards against truncated captures)
+                assert!(assistant_message_content(&message).contains("LOAD_FAILED"));
+
+                session.disconnect().await.expect("disconnect session");
+                client.stop().await.expect("stop client");
+            })
+        },
+    )
+    .await;
+}
+
+#[tokio::test]
+async fn should_report_missing_provider_skill_as_not_found() {
+    super::support::with_shared_e2e_context(
+        &E2E,
+        "skill_provider",
+        "should_report_missing_provider_skill_as_not_found",
+        |ctx| {
+            Box::pin(async move {
+                let provider = Arc::new(TestSkillProvider::new(vec![ProvidedSkill::new(
+                    "vanished-lookup",
+                    "Reports the vanished lookup verification word.",
+                    SkillRead::Missing,
+                )]));
+                let client = ctx.start_client().await;
+                let session = client
+                    .create_session(
+                        ctx.approve_all_session_config()
+                            .with_skill_provider(provider.clone()),
+                    )
+                    .await
+                    .expect("create session");
+                let events = session.subscribe();
+
+                let message = session
+                    .send_and_wait(
+                        "Use the skill tool to load the vanished-lookup skill. If loading fails, reply with exactly LOAD_FAILED.",
+                    )
+                    .await
+                    .expect("send")
+                    .expect("assistant message");
+                let observed = collect_until_idle(events).await;
+
+                assert!(provider.reads().contains(&"vanished-lookup".to_string()));
+                let failures = failed_tool_executions(&observed);
+                assert_eq!(failures.len(), 1, "expected one failed tool execution");
+                let failure = serde_json::to_string(&failures[0]).expect("serialize failure");
+                assert!(
+                    failure.to_ascii_lowercase().contains("not found"),
+                    "expected not found failure, got {failure}"
+                );
+                // Validate the final assistant response arrived (guards against truncated captures)
+                assert!(assistant_message_content(&message).contains("LOAD_FAILED"));
+
+                session.disconnect().await.expect("disconnect session");
+                client.stop().await.expect("stop client");
+            })
+        },
+    )
+    .await;
+}
+
+#[tokio::test]
+async fn should_keep_provider_dormant_when_skills_disabled() {
+    super::support::with_e2e_context_no_snapshot(|ctx| {
+        Box::pin(async move {
+            let provider = Arc::new(TestSkillProvider::new(vec![skill(
+                "dormant-lookup",
+                "Never listed.",
+                "Never read.\n",
+            )]));
+            let client = ctx.start_client().await;
+            let session = client
+                .create_session(
+                    ctx.approve_all_session_config()
+                        .with_enable_skills(false)
+                        .with_skill_provider(provider.clone()),
+                )
+                .await
+                .expect("create session");
+
+            session
+                .rpc()
+                .skills()
+                .ensure_loaded()
+                .await
+                .expect("ensure skills loaded");
+            let skills = session.rpc().skills().list().await.expect("list skills");
+
+            assert_no_sdk_skills(&skills.skills);
+            assert_eq!(provider.calls(), Vec::<String>::new());
+
+            session.disconnect().await.expect("disconnect session");
+            client.stop().await.expect("stop client");
+        })
+    })
+    .await;
+}
+
+#[tokio::test]
+async fn should_unbind_provider_when_resumed_without_one() {
+    super::support::with_e2e_context_no_snapshot(|ctx| {
+        Box::pin(async move {
+            let provider = Arc::new(TestSkillProvider::new(vec![skill(
+                "unbound-lookup",
+                "Reports the unbound lookup word.",
+                "Unbound.\n",
+            )]));
+            let client = ctx.start_client().await;
+            let first = client
+                .create_session(
+                    ctx.approve_all_session_config()
+                        .with_skill_provider(provider.clone()),
+                )
+                .await
+                .expect("create session");
+            let before = first.rpc().skills().list().await.expect("list skills");
+            assert!(
+                before
+                    .skills
+                    .iter()
+                    .any(|skill| skill.name == "unbound-lookup")
+            );
+            let calls_before_resume = provider.calls().len();
+
+            let session = client
+                .resume_session(
+                    ResumeSessionConfig::new(first.id().clone())
+                        .with_permission_handler(Arc::new(ApproveAllHandler))
+                        .with_github_token(super::support::DEFAULT_TEST_TOKEN),
+                )
+                .await
+                .expect("resume session");
+
+            session
+                .rpc()
+                .skills()
+                .reload()
+                .await
+                .expect("reload skills");
+            let skills = session.rpc().skills().list().await.expect("list skills");
+
+            assert_no_sdk_skills(&skills.skills);
+            assert_eq!(provider.calls().len(), calls_before_resume);
+
+            session.disconnect().await.expect("disconnect session");
+            client.stop().await.expect("stop client");
+            drop(first);
+        })
+    })
+    .await;
+}
+
+#[tokio::test]
+async fn should_cancel_a_blocked_provider_call_when_the_session_disconnects() {
+    super::support::with_e2e_context_no_snapshot(|ctx| {
+        Box::pin(async move {
+            let entered = Arc::new(Notify::new());
+            let dropped = Arc::new(Notify::new());
+            let client = ctx.start_client().await;
+            let session = client
+                .create_session(
+                    ctx.approve_all_session_config()
+                        .with_skill_provider(Arc::new(BlockingSkillProvider {
+                            entered: entered.clone(),
+                            dropped: dropped.clone(),
+                        })),
+                )
+                .await
+                .expect("create session");
+
+            // The list RPC fails once the binding is removed; only the provider's
+            // cancellation matters here.
+            let rpc = session.rpc();
+            let skills = rpc.skills();
+            let list = skills.list();
+            tokio::pin!(list);
+            tokio::select! {
+                _ = entered.notified() => {}
+                _ = &mut list => panic!("skills.list finished before the provider was called"),
+                _ = tokio::time::sleep(Duration::from_secs(30)) => {
+                    panic!("provider list_skills was not called");
+                }
+            }
+
+            session.disconnect().await.expect("disconnect session");
+            tokio::time::timeout(Duration::from_secs(10), dropped.notified())
+                .await
+                .expect("provider future was not dropped after disconnect");
+
+            client.stop().await.expect("stop client");
+        })
+    })
+    .await;
+}
+
+#[tokio::test]
+async fn should_reject_skill_provider_for_cloud_sessions() {
+    super::support::with_e2e_context_no_snapshot(|ctx| {
+        Box::pin(async move {
+            let provider = Arc::new(TestSkillProvider::new(vec![skill(
+                "cloud-lookup",
+                "Never listed.",
+                "Never read.\n",
+            )]));
+            let client = ctx.start_client().await;
+
+            let result = client
+                .create_session(
+                    SessionConfig::default()
+                        .with_permission_handler(Arc::new(ApproveAllHandler))
+                        .with_github_token(super::support::DEFAULT_TEST_TOKEN)
+                        .with_cloud(CloudSessionOptions::default())
+                        .with_skill_provider(provider.clone()),
+                )
+                .await;
+
+            match result {
+                Ok(session) => {
+                    let _ = session.disconnect().await;
+                    panic!("cloud session with skill provider unexpectedly succeeded");
+                }
+                Err(error) => {
+                    assert!(
+                        error
+                            .to_string()
+                            .contains("Skill providers are not supported for cloud sessions."),
+                        "unexpected error: {error}"
+                    );
+                }
+            }
+            assert_eq!(provider.calls(), Vec::<String>::new());
+
+            client.stop().await.expect("stop client");
+        })
+    })
+    .await;
+}
+
+struct ProvidedSkill {
+    descriptor: SkillProviderDescriptor,
+    read: SkillRead,
+}
+
+impl ProvidedSkill {
+    fn new(name: &str, description: &str, read: SkillRead) -> Self {
+        Self {
+            descriptor: descriptor(name, description),
+            read,
+        }
+    }
+}
+
+enum SkillRead {
+    Markdown(&'static str),
+    Missing,
+    Error(String),
+}
+
+struct TestSkillProvider {
+    skills: Vec<ProvidedSkill>,
+    calls: Mutex<Vec<String>>,
+}
+
+impl TestSkillProvider {
+    fn new(skills: Vec<ProvidedSkill>) -> Self {
+        Self {
+            skills,
+            calls: Mutex::new(Vec::new()),
+        }
+    }
+
+    fn calls(&self) -> Vec<String> {
+        self.calls.lock().expect("provider call log").clone()
+    }
+
+    fn reads(&self) -> Vec<String> {
+        self.calls()
+            .into_iter()
+            .filter_map(|call| call.strip_prefix("read:").map(str::to_string))
+            .collect()
+    }
+
+    fn push_call(&self, call: impl Into<String>) {
+        self.calls
+            .lock()
+            .expect("provider call log")
+            .push(call.into());
+    }
+}
+
+#[async_trait]
+impl SkillProvider for TestSkillProvider {
+    async fn list_skills(&self) -> std::result::Result<Vec<SkillProviderDescriptor>, Error> {
+        self.push_call("list");
+        Ok(self
+            .skills
+            .iter()
+            .map(|skill| skill.descriptor.clone())
+            .collect())
+    }
+
+    async fn read_skill(&self, name: &str) -> std::result::Result<Option<String>, Error> {
+        self.push_call(format!("read:{name}"));
+        let Some(skill) = self
+            .skills
+            .iter()
+            .find(|skill| skill.descriptor.name == name)
+        else {
+            return Ok(None);
+        };
+
+        match &skill.read {
+            SkillRead::Markdown(markdown) => Ok(Some((*markdown).to_string())),
+            SkillRead::Missing => Ok(None),
+            SkillRead::Error(message) => Err(Error::with_message(
+                ErrorKind::InvalidConfig,
+                message.clone(),
+            )),
+        }
+    }
+}
+
+fn skill(name: &str, description: &str, markdown: &'static str) -> ProvidedSkill {
+    ProvidedSkill::new(name, description, SkillRead::Markdown(markdown))
+}
+
+struct NotifyOnDrop(Arc<Notify>);
+
+impl Drop for NotifyOnDrop {
+    fn drop(&mut self) {
+        self.0.notify_one();
+    }
+}
+
+/// Blocks `list_skills` until the SDK drops its future.
+struct BlockingSkillProvider {
+    entered: Arc<Notify>,
+    dropped: Arc<Notify>,
+}
+
+#[async_trait]
+impl SkillProvider for BlockingSkillProvider {
+    async fn list_skills(&self) -> std::result::Result<Vec<SkillProviderDescriptor>, Error> {
+        let _dropped = NotifyOnDrop(self.dropped.clone());
+        self.entered.notify_one();
+        std::future::pending().await
+    }
+
+    async fn read_skill(&self, _name: &str) -> std::result::Result<Option<String>, Error> {
+        Ok(None)
+    }
+}
+
+fn descriptor(name: &str, description: &str) -> SkillProviderDescriptor {
+    SkillProviderDescriptor {
+        name: name.to_string(),
+        description: description.to_string(),
+        ..Default::default()
+    }
+}
+
+fn write_file_notes_skill(work_dir: &Path) -> std::path::PathBuf {
+    let skills_dir = work_dir.join("file-skills");
+    let skill_dir = skills_dir.join("file-notes");
+    std::fs::create_dir_all(&skill_dir).expect("create skill directory");
+    std::fs::write(
+        skill_dir.join("SKILL.md"),
+        "---\nname: file-notes\ndescription: Reports the file notes verification word.\n---\n\nThe file notes verification word is MAPLE_FALCON_27.\n",
+    )
+    .expect("write file skill");
+    skills_dir
+}
+
+fn failed_tool_executions(events: &[SessionEvent]) -> Vec<ToolExecutionCompleteData> {
+    events
+        .iter()
+        .filter(|event| event.parsed_type() == SessionEventType::ToolExecutionComplete)
+        .filter_map(|event| event.typed_data::<ToolExecutionCompleteData>())
+        .filter(|data| !data.success)
+        .collect()
+}
+
+fn assert_no_secret(events: &[SessionEvent], secret: &str) {
+    let events_json = serde_json::to_string(events).expect("serialize events");
+    assert!(
+        !events_json.contains(secret),
+        "provider secret leaked into events: {events_json}"
+    );
+}
+
+fn assert_no_sdk_skills(skills: &[github_copilot_sdk::rpc::Skill]) {
+    assert!(
+        skills.iter().all(|skill| skill.source != SkillSource::Sdk),
+        "expected no SDK skills, got {skills:?}"
+    );
+}
diff --git a/rust/tests/e2e/support.rs b/rust/tests/e2e/support.rs
index d352aa3131..718bd51361 100644
--- a/rust/tests/e2e/support.rs
+++ b/rust/tests/e2e/support.rs
@@ -219,6 +219,9 @@ pub async fn with_shared_e2e_context<F>(
                 "timed out after {SHARED_E2E_CLEANUP_TIMEOUT:?} preparing shared E2E test"
             ))),
         };
+        if !matches!(&result, Ok(Ok(Ok(())))) {
+            state.context.print_sdk_diagnostics();
+        }
         let cleanup_result = match tokio::time::timeout(
             SHARED_E2E_CLEANUP_TIMEOUT,
             state.cleanup_after_test(),
@@ -318,6 +321,9 @@ where
     let timed_out = tokio::time::timeout(default_test_timeout(), test(&mut ctx))
         .await
         .is_err();
+    if timed_out {
+        ctx.print_sdk_diagnostics();
+    }
     ctx.cleanup(timed_out)
         .await
         .unwrap_or_else(|err| panic!("clean up E2E context: {err}"));
@@ -399,6 +405,7 @@ pub struct E2eContext {
     home_dir: tempfile::TempDir,
     work_dir: tempfile::TempDir,
     proxy: Option<CapiProxy>,
+    diagnostics: bool,
 }
 
 impl E2eContext {
@@ -428,6 +435,7 @@ impl E2eContext {
             home_dir,
             work_dir,
             proxy: Some(proxy),
+            diagnostics: matches!(category, "pending_work_resume" | "telemetry"),
         };
         ctx.configure(category, snapshot_name)?;
         ctx.set_default_copilot_user();
@@ -449,6 +457,7 @@ impl E2eContext {
             home_dir,
             work_dir,
             proxy: Some(proxy),
+            diagnostics: false,
         };
         // Initialize proxy state without replaying any recorded exchanges: the
         // snapshot path intentionally does not exist, so `/copilot_internal/user`
@@ -490,7 +499,13 @@ impl E2eContext {
     }
 
     pub fn client_options(&self) -> ClientOptions {
-        client_options_for_cli(&self.cli_path, self.work_dir.path(), self.environment())
+        let options =
+            client_options_for_cli(&self.cli_path, self.work_dir.path(), self.environment());
+        if self.diagnostics {
+            options.with_log_level(github_copilot_sdk::LogLevel::Debug)
+        } else {
+            options
+        }
     }
 
     pub fn client_options_with_transport(&self, transport: Transport) -> ClientOptions {
@@ -650,6 +665,9 @@ impl E2eContext {
             ),
         ]);
         env.extend(isolated_cache_environment(self.home_dir.path()));
+        if self.diagnostics {
+            env.push(("RUST_LOG".into(), "error,sdk_diagnostics=debug".into()));
+        }
         env.extend([
             ("COPILOT_MCP_APPS".into(), "true".into()),
             ("MCP_APPS".into(), "true".into()),
@@ -666,6 +684,27 @@ impl E2eContext {
     fn proxy(&self) -> &CapiProxy {
         self.proxy.as_ref().expect("proxy already stopped")
     }
+
+    fn print_sdk_diagnostics(&self) {
+        if !self.diagnostics {
+            return;
+        }
+        let mut command = Command::new("node");
+        command
+            .arg(self.repo_root.join("test/harness/sdk-diagnostics.mjs"))
+            .arg(self.home_dir.path());
+        #[cfg(windows)]
+        {
+            const CREATE_NO_WINDOW: u32 = 0x0800_0000;
+            command.creation_flags(CREATE_NO_WINDOW);
+        }
+        match command.output() {
+            Ok(output) if output.status.success() => {
+                eprintln!("{}", String::from_utf8_lossy(&output.stdout));
+            }
+            _ => eprintln!("SDK diagnostics unavailable"),
+        }
+    }
 }
 
 impl SharedE2eState {
@@ -811,6 +850,9 @@ fn is_transient_windows_file_lock(error: &std::io::Error) -> bool {
 
 impl Drop for E2eContext {
     fn drop(&mut self) {
+        if std::thread::panicking() {
+            self.print_sdk_diagnostics();
+        }
         if let Some(mut proxy) = self.proxy.take() {
             let _ = proxy.stop(true);
         }
@@ -1227,8 +1269,7 @@ fn cli_path(repo_root: &Path) -> std::io::Result<PathBuf> {
         }
     }
 
-    let npm = if cfg!(windows) { "npm.cmd" } else { "npm" };
-    let output = std::process::Command::new(npm)
+    let output = std::process::Command::new(npm_program())
         .args(["run", "--silent", "prepare:runtime", "--", "--print-path"])
         .current_dir(repo_root.join("nodejs"))
         .output()?;
@@ -1571,6 +1612,28 @@ fn node_program() -> &'static str {
     if cfg!(windows) { "node.exe" } else { "node" }
 }
 
+fn npm_program() -> &'static str {
+    if cfg!(windows) {
+        windows_program(&["npm.cmd", "npm.exe", "npm"])
+    } else {
+        "npm"
+    }
+}
+
+fn windows_program(candidates: &[&'static str]) -> &'static str {
+    candidates
+        .iter()
+        .copied()
+        .find(|candidate| program_exists_on_path(candidate))
+        .unwrap_or(candidates[0])
+}
+
+fn program_exists_on_path(program: &str) -> bool {
+    std::env::var_os("PATH").is_some_and(|path| {
+        std::env::split_paths(&path).any(|directory| directory.join(program).is_file())
+    })
+}
+
 #[test]
 fn e2e_context_isolates_copilot_cache() {
     let home_dir = tempfile::tempdir().expect("create test home");
diff --git a/rust/tests/e2e/telemetry.rs b/rust/tests/e2e/telemetry.rs
index fe83a1e2ea..0d54f31868 100644
--- a/rust/tests/e2e/telemetry.rs
+++ b/rust/tests/e2e/telemetry.rs
@@ -1,3 +1,5 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+
 use std::sync::Arc;
 
 use async_trait::async_trait;
@@ -194,12 +196,19 @@ async fn should_export_per_request_subagent_chat_spans() {
                     .iter()
                     .filter(|entry| string_property(entry, "type") == Some("span"))
                     .collect();
-                assert!(spans.iter().all(|span| {
-                    span.get("instrumentationScope")
-                        .and_then(|scope| string_property(scope, "name"))
-                        == Some(source_name)
-                        && status_code(span) != Some(2)
-                }));
+                for span in &spans {
+                    assert_eq!(
+                        span.get("instrumentationScope")
+                            .and_then(|scope| string_property(scope, "name")),
+                        Some(source_name),
+                        "unexpected instrumentation scope: {span:#}"
+                    );
+                    assert_ne!(
+                        status_code(span),
+                        Some(2),
+                        "unexpected error span: {span:#}"
+                    );
+                }
                 let invocations: Vec<_> = spans
                     .iter()
                     .copied()
diff --git a/rust/tests/fixtures/host_crash_fixture.rs b/rust/tests/fixtures/host_crash_fixture.rs
index 8c48379001..204b5dbb67 100644
--- a/rust/tests/fixtures/host_crash_fixture.rs
+++ b/rust/tests/fixtures/host_crash_fixture.rs
@@ -13,6 +13,7 @@
 //!   on the spawned CLI's environment.
 //! - `HOST_CRASH_FIXTURE_PID_FILE`: path this process atomically publishes the
 //!   CLI child's OS process id to, once the client finishes starting.
+//! - `HOST_CRASH_FIXTURE_TRANSPORT`: optional `stdio` (default) or `tcp`.
 
 use std::io::Write;
 use std::path::PathBuf;
@@ -38,13 +39,21 @@ async fn main() {
         std::env::var("HOST_CRASH_FIXTURE_PID_FILE").expect("HOST_CRASH_FIXTURE_PID_FILE"),
     );
 
+    let transport = match std::env::var("HOST_CRASH_FIXTURE_TRANSPORT").as_deref() {
+        Ok("tcp") => Transport::Tcp {
+            port: 0,
+            connection_token: None,
+        },
+        Ok("stdio") | Err(std::env::VarError::NotPresent) => Transport::Stdio,
+        value => panic!("invalid HOST_CRASH_FIXTURE_TRANSPORT: {value:?}"),
+    };
     let options = ClientOptions::new()
         .with_program(CliProgram::Path(PathBuf::from(program)))
         .with_prefix_args(prefix_args)
         .with_cwd(PathBuf::from(cwd))
         .with_env(env_pairs)
         .with_use_logged_in_user(false)
-        .with_transport(Transport::Stdio);
+        .with_transport(transport);
 
     let client = Client::start(options).await.expect("start CLI client");
     let pid = client.pid().expect("client reports spawned CLI pid");
diff --git a/rust/tests/http_request_body_test.rs b/rust/tests/http_request_body_test.rs
new file mode 100644
index 0000000000..d200803d63
--- /dev/null
+++ b/rust/tests/http_request_body_test.rs
@@ -0,0 +1,614 @@
+//! The LLM-callback request body on its way through the dispatcher: the runtime sends an HTTP
+//! request body in `llmInference.httpRequestChunk` frames, and the dispatcher moves the body out
+//! of the parsed frame instead of copying it (a deep clone of the params `Value`, a clone of
+//! `data`, and a copy of the first frame into an empty buffer). The handler must see the
+//! runtime's bytes exactly: an escaped JSON body, an empty body, a body in several chunks, a
+//! base64 chunk, a chunk that races ahead of its start frame, and a cancel chunk after part of
+//! the body. The wire around the body is pinned too: every case asserts the exact ack of each
+//! request it sends and the response frames in order, and one more case the exact error reply
+//! to params that do not parse. And once the frame is parsed, a single-chunk body must not be
+//! copied again: a counting allocator counts the allocations of exactly the body's length
+//! between the chunk frame's write and the handler's entry.
+//!
+//! Each case drives the real dispatcher: `Client::start` over loopback TCP with a request
+//! handler, the test playing the CLI. The allocator is process-global and `cargo test` runs a
+//! binary's tests on parallel threads, so the counting case is `#[serial]` and every other case
+//! `#[parallel]`: nothing else runs while it counts.
+
+use std::alloc::{GlobalAlloc, Layout, System};
+use std::collections::HashMap;
+use std::sync::atomic::{AtomicUsize, Ordering};
+use std::time::Duration;
+
+use async_trait::async_trait;
+use bytes::Bytes;
+use futures_util::stream;
+use github_copilot_sdk::{
+    Client, ClientOptions, CopilotHttpRequest, CopilotHttpResponse, CopilotRequestContext,
+    CopilotRequestError, CopilotRequestHandler, SDK_PROTOCOL_VERSION, Transport,
+};
+use http::HeaderMap;
+use serde_json::{Value, json};
+use serial_test::{parallel, serial};
+use tokio::io::{AsyncBufReadExt, AsyncReadExt, AsyncWriteExt, BufReader};
+use tokio::net::TcpListener;
+use tokio::net::tcp::{OwnedReadHalf, OwnedWriteHalf};
+use tokio::sync::mpsc;
+use tokio::time::timeout;
+
+/// A backstop against a hang, never a measurement.
+const DEADLINE: Duration = Duration::from_secs(30);
+/// The single-chunk body the allocation count watches. Odd, so no buffer that grows by doubling
+/// (serde_json's unescape scratch) lands on it, and larger than every buffer between the socket
+/// and the dispatcher.
+const WATCHED_BODY_BYTES: usize = 2 * 1024 * 1024 + 1;
+
+/// The system allocator, counting the allocations (and reallocations) of exactly [`WATCHED`]
+/// bytes while it is non-zero.
+struct ExactSizeCounting;
+
+static WATCHED: AtomicUsize = AtomicUsize::new(0);
+static HITS: AtomicUsize = AtomicUsize::new(0);
+
+fn note(size: usize) {
+    let watched = WATCHED.load(Ordering::SeqCst);
+    if watched != 0 && size == watched {
+        HITS.fetch_add(1, Ordering::SeqCst);
+    }
+}
+
+// SAFETY: every method forwards to `System` with the caller's own arguments, so `System`'s
+// contract is the caller's; the counters are plain atomics and never touch the memory.
+unsafe impl GlobalAlloc for ExactSizeCounting {
+    unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
+        note(layout.size());
+        // SAFETY: forwarded unchanged (see the impl's SAFETY note).
+        unsafe { System.alloc(layout) }
+    }
+
+    unsafe fn alloc_zeroed(&self, layout: Layout) -> *mut u8 {
+        note(layout.size());
+        // SAFETY: forwarded unchanged (see the impl's SAFETY note).
+        unsafe { System.alloc_zeroed(layout) }
+    }
+
+    unsafe fn dealloc(&self, ptr: *mut u8, layout: Layout) {
+        // SAFETY: forwarded unchanged (see the impl's SAFETY note).
+        unsafe { System.dealloc(ptr, layout) }
+    }
+
+    unsafe fn realloc(&self, ptr: *mut u8, layout: Layout, new_size: usize) -> *mut u8 {
+        note(new_size);
+        // SAFETY: forwarded unchanged (see the impl's SAFETY note).
+        unsafe { System.realloc(ptr, layout, new_size) }
+    }
+}
+
+#[global_allocator]
+static ALLOCATOR: ExactSizeCounting = ExactSizeCounting;
+
+/// What the handler saw: the body, and the watched-size allocations counted when it was entered.
+struct Captured {
+    body: Vec<u8>,
+    hits_at_entry: usize,
+}
+
+/// What the SDK wrote while one exchange ran: its replies to the test's requests, by id, and the
+/// response requests it sent (method and params), in order.
+struct Wire {
+    replies: HashMap<u64, Value>,
+    response_frames: Vec<(String, Value)>,
+}
+
+/// The wire of a well-formed exchange: the empty-result ack of every request the test sent, and
+/// nothing else, then the response head (200, no headers) and its terminal empty chunk.
+fn assert_wire(wire: &Wire, request_id: &str, request_ids: &[u64]) {
+    for id in request_ids {
+        assert_eq!(
+            wire.replies[id],
+            json!({"jsonrpc": "2.0", "id": id, "result": {}}),
+            "the ack of request {id}"
+        );
+    }
+    assert_eq!(
+        wire.replies.len(),
+        request_ids.len(),
+        "replies: {:?}",
+        wire.replies
+    );
+    assert_eq!(
+        wire.response_frames,
+        vec![
+            (
+                "llmInference.httpResponseStart".to_owned(),
+                json!({"requestId": request_id, "status": 200, "headers": {}}),
+            ),
+            (
+                "llmInference.httpResponseChunk".to_owned(),
+                json!({"requestId": request_id, "data": "", "end": true}),
+            ),
+        ]
+    );
+}
+
+/// Hands every request's body to the test and answers an empty 200.
+struct CaptureHandler(mpsc::UnboundedSender<Captured>);
+
+#[async_trait]
+impl CopilotRequestHandler for CaptureHandler {
+    async fn send_request(
+        &self,
+        request: CopilotHttpRequest,
+        _ctx: &CopilotRequestContext,
+    ) -> Result<CopilotHttpResponse, CopilotRequestError> {
+        let hits_at_entry = HITS.load(Ordering::SeqCst);
+        let _ = self.0.send(Captured {
+            body: request.body,
+            hits_at_entry,
+        });
+        Ok(CopilotHttpResponse::new(
+            200,
+            None,
+            HeaderMap::new(),
+            Box::pin(stream::empty::<Result<Bytes, CopilotRequestError>>()),
+        ))
+    }
+}
+
+/// One frame in the SDK's JSON-RPC shape: a `Content-Length` header, a blank line, the body.
+fn frame_bytes(message: &Value) -> Vec<u8> {
+    let body = serde_json::to_vec(message).expect("a JSON-RPC message serialises");
+    let mut frame = format!("Content-Length: {}\r\n\r\n", body.len()).into_bytes();
+    frame.extend_from_slice(&body);
+    frame
+}
+
+/// The next frame the SDK wrote, decoded.
+async fn read_frame(read: &mut BufReader<OwnedReadHalf>) -> Value {
+    let mut length = None;
+    loop {
+        let mut line = String::new();
+        let read_bytes = read.read_line(&mut line).await.expect("a header line");
+        assert_ne!(read_bytes, 0, "the SDK closed the socket");
+        if line == "\r\n" {
+            break;
+        }
+        if let Some(value) = line.strip_prefix("Content-Length:") {
+            length = Some(value.trim().parse::<usize>().expect("a decimal length"));
+        }
+    }
+    let mut body = vec![0; length.expect("a Content-Length header")];
+    read.read_exact(&mut body).await.expect("the frame body");
+    serde_json::from_slice(&body).expect("a JSON frame body")
+}
+
+/// The CLI's side of one SDK client: the public `Client` over real loopback TCP, with the
+/// request handler registered through `llmInference.setProvider`.
+struct Peer {
+    client: Client,
+    read: BufReader<OwnedReadHalf>,
+    write: OwnedWriteHalf,
+    captured: mpsc::UnboundedReceiver<Captured>,
+    _work: tempfile::TempDir,
+}
+
+impl Peer {
+    async fn start() -> Self {
+        let listener = TcpListener::bind("127.0.0.1:0")
+            .await
+            .expect("a loopback listener");
+        let port = listener.local_addr().expect("a bound address").port();
+        let work = tempfile::tempdir().expect("a temp dir");
+        let (captured_tx, captured) = mpsc::unbounded_channel();
+        let options = ClientOptions::new()
+            .with_program(std::env::current_exe().expect("the test binary's path"))
+            .with_cwd(work.path())
+            .with_transport(Transport::External {
+                host: "127.0.0.1".into(),
+                port,
+                connection_token: None,
+            })
+            .with_request_handler(CaptureHandler(captured_tx));
+        let (client, (read, write)) = timeout(DEADLINE, async {
+            tokio::join!(Client::start(options), async {
+                let (socket, _) = listener.accept().await.expect("the SDK connects");
+                socket.set_nodelay(true).expect("TCP_NODELAY");
+                let (read, mut write) = socket.into_split();
+                let mut read = BufReader::new(read);
+                for method in ["connect", "llmInference.setProvider"] {
+                    let message = read_frame(&mut read).await;
+                    assert_eq!(message["method"], method);
+                    let result = if method == "connect" {
+                        json!({
+                            "ok": true,
+                            "version": "test",
+                            "protocolVersion": SDK_PROTOCOL_VERSION
+                        })
+                    } else {
+                        json!({"success": true})
+                    };
+                    let reply = json!({"jsonrpc": "2.0", "id": message["id"], "result": result});
+                    write
+                        .write_all(&frame_bytes(&reply))
+                        .await
+                        .expect("the handshake reply");
+                }
+                (read, write)
+            })
+        })
+        .await
+        .expect("the client handshake finishes");
+        Self {
+            client: client.expect("the client starts"),
+            read,
+            write,
+            captured,
+            _work: work,
+        }
+    }
+
+    /// Bounded: an SDK that stops reading with the socket open would otherwise park a large frame's
+    /// write on TCP backpressure, past every receive deadline.
+    async fn send(&mut self, message: &Value) {
+        timeout(DEADLINE, self.write.write_all(&frame_bytes(message)))
+            .await
+            .expect("the SDK takes the frame in time")
+            .expect("a frame to the SDK");
+    }
+
+    async fn start_request(&mut self, request_id: &str, id: u64) {
+        self.send(&json!({
+            "jsonrpc": "2.0",
+            "id": id,
+            "method": "llmInference.httpRequestStart",
+            "params": {
+                "requestId": request_id,
+                "method": "POST",
+                "url": "http://unused.test/chat",
+                "headers": {}
+            }
+        }))
+        .await;
+    }
+
+    async fn chunk(&mut self, id: u64, params: Value) {
+        self.send(&json!({
+            "jsonrpc": "2.0",
+            "id": id,
+            "method": "llmInference.httpRequestChunk",
+            "params": params
+        }))
+        .await;
+    }
+
+    /// What the handler received for the next request.
+    async fn captured(&mut self) -> Captured {
+        timeout(DEADLINE, self.captured.recv())
+            .await
+            .expect("the handler is entered")
+            .expect("the handler's channel is open")
+    }
+
+    /// Serves the CLI's side of the response (acking the SDK's head and body requests) until its
+    /// terminal body chunk has arrived and every one of `request_ids` has its reply, so the
+    /// exchange finishes before the client stops; returns everything the SDK wrote meanwhile.
+    async fn finish_response(&mut self, request_ids: &[u64]) -> Wire {
+        let mut wire = Wire {
+            replies: HashMap::new(),
+            response_frames: Vec::new(),
+        };
+        timeout(DEADLINE, async {
+            let mut terminal = false;
+            while !terminal || request_ids.iter().any(|id| !wire.replies.contains_key(id)) {
+                let message = read_frame(&mut self.read).await;
+                let Some(method) = message.get("method").and_then(Value::as_str) else {
+                    let id = message["id"]
+                        .as_u64()
+                        .expect("a reply carries its request's id");
+                    wire.replies.insert(id, message);
+                    continue;
+                };
+                terminal =
+                    method == "llmInference.httpResponseChunk" && message["params"]["end"] == true;
+                wire.response_frames
+                    .push((method.to_owned(), message["params"].clone()));
+                let ack = json!({
+                    "jsonrpc": "2.0",
+                    "id": message["id"],
+                    "result": {"accepted": true}
+                });
+                self.send(&ack).await;
+            }
+        })
+        .await
+        .expect("the response finishes and every request is answered");
+        wire
+    }
+
+    /// The SDK's replies to `request_ids`, for frames that start no exchange: any request from the
+    /// SDK meanwhile fails the test.
+    async fn replies(&mut self, request_ids: &[u64]) -> HashMap<u64, Value> {
+        let mut replies = HashMap::new();
+        timeout(DEADLINE, async {
+            while request_ids.iter().any(|id| !replies.contains_key(id)) {
+                let message = read_frame(&mut self.read).await;
+                assert!(
+                    message.get("method").is_none(),
+                    "an unexpected request: {message}"
+                );
+                let id = message["id"]
+                    .as_u64()
+                    .expect("a reply carries its request's id");
+                replies.insert(id, message);
+            }
+        })
+        .await
+        .expect("every request is answered");
+        replies
+    }
+
+    async fn stop(self) {
+        self.client.stop().await.expect("the client stops");
+    }
+}
+
+/// A chat-request-shaped JSON body of exactly `len` bytes, dense with quotes and backslashes so
+/// its frame carries it escaped, as the runtime's does.
+fn escaped_body(len: usize) -> String {
+    let unit = r#"{"role":"user","content":"a \"quoted\" path C:\\dir\\file, tab\there"},"#;
+    let mut out = String::with_capacity(len);
+    out.push_str(r#"{"messages":["#);
+    while out.len() + unit.len() <= len {
+        out.push_str(unit);
+    }
+    while out.len() < len {
+        out.push('x');
+    }
+    out
+}
+
+/// Every JSON escape class (quote, backslash, the short escapes, the other control bytes) and
+/// multi-byte UTF-8, after a body large enough to span many socket reads.
+fn every_escape_class_body() -> String {
+    let mut out = escaped_body(1024 * 1024);
+    out.push_str(
+        "controls: \u{0}\u{1}\u{8}\u{b}\u{c}\u{1f} cr\r lf\n unicode: \u{e9}\u{4e2d}\u{1f600}",
+    );
+    out
+}
+
+#[tokio::test(flavor = "multi_thread")]
+#[parallel]
+async fn an_escaped_json_body_reaches_the_handler_byte_for_byte() {
+    let mut peer = Peer::start().await;
+    let body = every_escape_class_body();
+
+    peer.start_request("escaped", 10).await;
+    peer.chunk(
+        11,
+        json!({"requestId": "escaped", "data": body, "end": true}),
+    )
+    .await;
+
+    let captured = peer.captured().await;
+    assert_eq!(captured.body, body.as_bytes());
+    let wire = peer.finish_response(&[10, 11]).await;
+    assert_wire(&wire, "escaped", &[10, 11]);
+    peer.stop().await;
+}
+
+#[tokio::test(flavor = "multi_thread")]
+#[parallel]
+async fn an_empty_body_reaches_the_handler_empty() {
+    let mut peer = Peer::start().await;
+
+    peer.start_request("empty", 20).await;
+    peer.chunk(21, json!({"requestId": "empty", "data": "", "end": true}))
+        .await;
+
+    let captured = peer.captured().await;
+    assert_eq!(captured.body, Vec::<u8>::new());
+    let wire = peer.finish_response(&[20, 21]).await;
+    assert_wire(&wire, "empty", &[20, 21]);
+    peer.stop().await;
+}
+
+#[tokio::test(flavor = "multi_thread")]
+#[parallel]
+async fn a_body_in_several_chunks_reaches_the_handler_in_order() {
+    let mut peer = Peer::start().await;
+    let parts = [
+        escaped_body(64 * 1024),
+        escaped_body(1000),
+        escaped_body(70_001),
+    ];
+
+    peer.start_request("several", 30).await;
+    peer.chunk(31, json!({"requestId": "several", "data": parts[0]}))
+        .await;
+    // An empty, non-terminal chunk carries no bytes and must not disturb the order.
+    peer.chunk(32, json!({"requestId": "several", "data": ""}))
+        .await;
+    peer.chunk(33, json!({"requestId": "several", "data": parts[1]}))
+        .await;
+    peer.chunk(
+        34,
+        json!({"requestId": "several", "data": parts[2], "end": true}),
+    )
+    .await;
+
+    let captured = peer.captured().await;
+    assert_eq!(captured.body, parts.concat().as_bytes());
+    let wire = peer.finish_response(&[30, 31, 32, 33, 34]).await;
+    assert_wire(&wire, "several", &[30, 31, 32, 33, 34]);
+    peer.stop().await;
+}
+
+#[tokio::test(flavor = "multi_thread")]
+#[parallel]
+async fn a_base64_chunk_reaches_the_handler_decoded_before_a_text_chunk() {
+    let mut peer = Peer::start().await;
+
+    peer.start_request("binary", 40).await;
+    // "AAEC/w==" is the standard base64 of the bytes 0x00 0x01 0x02 0xff.
+    peer.chunk(
+        41,
+        json!({"requestId": "binary", "data": "AAEC/w==", "binary": true}),
+    )
+    .await;
+    peer.chunk(
+        42,
+        json!({"requestId": "binary", "data": "tail", "end": true}),
+    )
+    .await;
+
+    let captured = peer.captured().await;
+    assert_eq!(captured.body, b"\x00\x01\x02\xfftail".to_vec());
+    let wire = peer.finish_response(&[40, 41, 42]).await;
+    assert_wire(&wire, "binary", &[40, 41, 42]);
+    peer.stop().await;
+}
+
+#[tokio::test(flavor = "multi_thread")]
+#[parallel]
+async fn a_chunk_ahead_of_its_start_frame_reaches_the_handler() {
+    let mut peer = Peer::start().await;
+    let body = escaped_body(300_001);
+
+    peer.chunk(51, json!({"requestId": "early", "data": body, "end": true}))
+        .await;
+    peer.start_request("early", 50).await;
+
+    let captured = peer.captured().await;
+    assert_eq!(captured.body, body.as_bytes());
+    let wire = peer.finish_response(&[50, 51]).await;
+    assert_wire(&wire, "early", &[50, 51]);
+    peer.stop().await;
+}
+
+/// A cancel chunk after part of the body, on the `apply_chunk` path that moves `data`: the handler
+/// sees the bytes that arrived before it, each request is acked, and the response is its head and
+/// then a terminal chunk carrying the cancellation.
+#[tokio::test(flavor = "multi_thread")]
+#[parallel]
+async fn a_cancel_chunk_ends_the_body_and_the_response_with_the_cancellation() {
+    let mut peer = Peer::start().await;
+    let part = escaped_body(10_001);
+
+    peer.start_request("cancelled", 80).await;
+    peer.chunk(81, json!({"requestId": "cancelled", "data": part}))
+        .await;
+    peer.chunk(
+        82,
+        json!({"requestId": "cancelled", "data": "", "cancel": true}),
+    )
+    .await;
+
+    let captured = peer.captured().await;
+    assert_eq!(captured.body, part.as_bytes());
+    let wire = peer.finish_response(&[80, 81, 82]).await;
+    for id in [80, 81, 82] {
+        assert_eq!(
+            wire.replies[&id],
+            json!({"jsonrpc": "2.0", "id": id, "result": {}}),
+            "the ack of request {id}"
+        );
+    }
+    assert_eq!(wire.replies.len(), 3, "replies: {:?}", wire.replies);
+    assert_eq!(
+        wire.response_frames,
+        vec![
+            (
+                "llmInference.httpResponseStart".to_owned(),
+                json!({"requestId": "cancelled", "status": 200, "headers": {}}),
+            ),
+            (
+                "llmInference.httpResponseChunk".to_owned(),
+                json!({
+                    "requestId": "cancelled",
+                    "data": "",
+                    "end": true,
+                    "error": {"code": "cancelled", "message": "Request cancelled by runtime"}
+                }),
+            ),
+        ]
+    );
+    peer.stop().await;
+}
+
+/// A start or chunk frame whose params do not parse gets the dispatcher's error reply: the params
+/// move into the parse instead of being cloned into it, and a failed parse still answers.
+#[tokio::test(flavor = "multi_thread")]
+#[parallel]
+async fn unparsable_start_and_chunk_params_get_the_error_reply() {
+    let mut peer = Peer::start().await;
+
+    // Neither frame names the requestId that both params types require.
+    peer.send(&json!({
+        "jsonrpc": "2.0",
+        "id": 70,
+        "method": "llmInference.httpRequestStart",
+        "params": {"method": "POST", "url": "http://unused.test/chat", "headers": {}}
+    }))
+    .await;
+    peer.chunk(71, json!({"data": "x", "end": true})).await;
+
+    let replies = peer.replies(&[70, 71]).await;
+    assert_eq!(
+        replies[&70],
+        json!({
+            "jsonrpc": "2.0",
+            "id": 70,
+            "error": {"code": -32603, "message": "invalid llmInference.httpRequestStart params"}
+        })
+    );
+    assert_eq!(
+        replies[&71],
+        json!({
+            "jsonrpc": "2.0",
+            "id": 71,
+            "error": {"code": -32603, "message": "invalid llmInference.httpRequestChunk params"}
+        })
+    );
+    peer.stop().await;
+}
+
+/// The mechanism: between the chunk frame's write and the handler's entry, the body is
+/// allocated at its exact length once, by the frame parse (`serde_json`'s `Value` string), and
+/// the dispatcher moves that buffer to the handler. Copying it instead allocated it three more
+/// times (the params `Value` clone, the `data` clone, the drain into an empty `Vec`); reverting
+/// any one of the three moves adds one.
+#[tokio::test(flavor = "multi_thread")]
+#[serial]
+async fn a_single_chunk_body_reaches_the_handler_without_a_copy() {
+    let mut peer = Peer::start().await;
+    let body = escaped_body(WATCHED_BODY_BYTES);
+    assert_eq!(body.len(), WATCHED_BODY_BYTES);
+    peer.start_request("single", 60).await;
+    // Encoded before the count starts: building the frame allocates the body's length too.
+    let chunk = frame_bytes(&json!({
+        "jsonrpc": "2.0",
+        "id": 61,
+        "method": "llmInference.httpRequestChunk",
+        "params": {"requestId": "single", "data": body, "end": true}
+    }));
+
+    HITS.store(0, Ordering::SeqCst);
+    WATCHED.store(WATCHED_BODY_BYTES, Ordering::SeqCst);
+    timeout(DEADLINE, peer.write.write_all(&chunk))
+        .await
+        .expect("the SDK takes the chunk frame in time")
+        .expect("the chunk frame to the SDK");
+    let captured = peer.captured().await;
+    WATCHED.store(0, Ordering::SeqCst);
+
+    assert_eq!(captured.body, body.as_bytes());
+    assert_eq!(
+        captured.hits_at_entry, 1,
+        "allocations of exactly the body's {WATCHED_BODY_BYTES} bytes between the frame's write \
+         and the handler's entry: the frame parse's one, and no relay copy"
+    );
+    let wire = peer.finish_response(&[60, 61]).await;
+    assert_wire(&wire, "single", &[60, 61]);
+    peer.stop().await;
+}
diff --git a/rust/tests/prepared_session_test.rs b/rust/tests/prepared_session_test.rs
index f3102d7f40..1ae60cbbe1 100644
--- a/rust/tests/prepared_session_test.rs
+++ b/rust/tests/prepared_session_test.rs
@@ -1425,9 +1425,13 @@ async fn check_stopping_resume_bootstrap(claim: bool) {
         expect_startup_burst(&mut events).await;
         expect_event_id(&mut events, "publication-fence").await;
     } else {
+        let result = events.recv().now_or_never();
         assert!(
-            events.recv().now_or_never().is_none(),
-            "unclaimed backlog was replayed"
+            matches!(
+                &result,
+                Some(Err(error)) if matches!(error.kind(), RecvErrorKind::Closed)
+            ),
+            "subscription created after stop must close without replaying backlog, got {result:?}"
         );
         drop(session);
     }
diff --git a/rust/tests/runtime_host_e2e.rs b/rust/tests/runtime_host_e2e.rs
index fab6e8724d..ce639d417d 100644
--- a/rust/tests/runtime_host_e2e.rs
+++ b/rust/tests/runtime_host_e2e.rs
@@ -34,10 +34,17 @@ async fn streams_real_ahp_turn_beside_sdk_session_on_same_runtime() {
                 )
                 .await
                 .unwrap();
+            let previous_ids: Vec<_> = owner
+                .list_sessions(None)
+                .await
+                .unwrap()
+                .into_iter()
+                .map(|session| session.session_id)
+                .collect();
             let host = owner.start_ahp_host(local_options()).await.unwrap();
             let ahp = connect(&host).await;
             let (uri, chat, subscription) = create(&ahp, ctx).await;
-            topology(&host, &owner, &home(ctx).join("ahp/sessions"));
+            topology(&host, &owner, &home(ctx));
             let (_, response) =
                 tokio::join!(turn(&ahp, &chat, subscription), sdk.send_and_wait(PROMPT));
             assert!(
@@ -46,18 +53,17 @@ async fn streams_real_ahp_turn_beside_sdk_session_on_same_runtime() {
                     .unwrap()
                     .contains('4')
             );
-            let id = uri.strip_prefix("ahp-session:/").unwrap();
             // Turn completion is not a persistence acknowledgement: event writes
             // are debounced, and list_sessions lists persisted sessions.
             let sessions = tokio::time::timeout(Duration::from_secs(10), async {
                 loop {
                     let sessions = owner.list_sessions(None).await.unwrap();
-                    if sessions
+                    if sessions.iter().any(|session| {
+                        session.session_id != sdk.id()
+                            && !previous_ids.contains(&session.session_id)
+                    }) && sessions
                         .iter()
-                        .any(|session| session.session_id.as_str() == id)
-                        && sessions
-                            .iter()
-                            .any(|session| session.session_id == sdk.id())
+                        .any(|session| session.session_id == sdk.id())
                     {
                         return sessions;
                     }
@@ -66,11 +72,19 @@ async fn streams_real_ahp_turn_beside_sdk_session_on_same_runtime() {
             })
             .await
             .expect("persisted session list must include both completed AHP and SDK sessions");
-            assert!(
-                sessions
-                    .iter()
-                    .any(|session| session.session_id.as_str() == id)
+            let ahp_sessions: Vec<_> = sessions
+                .iter()
+                .filter(|session| {
+                    session.session_id != sdk.id() && !previous_ids.contains(&session.session_id)
+                })
+                .collect();
+            assert_eq!(
+                ahp_sessions.len(),
+                1,
+                "exactly one new private AHP runtime session"
             );
+            let id = ahp_sessions[0].session_id.clone();
+            assert_ne!(id.as_str(), uri.strip_prefix("ahp-session:/").unwrap());
             assert!(
                 sessions
                     .iter()
@@ -78,12 +92,13 @@ async fn streams_real_ahp_turn_beside_sdk_session_on_same_runtime() {
             );
             let observer = owner
                 .resume_session(
-                    ResumeSessionConfig::new(SessionId::from(id)).with_permission_handler(
+                    ResumeSessionConfig::new(id.clone()).with_permission_handler(
                         std::sync::Arc::new(github_copilot_sdk::handler::ApproveAllHandler),
                     ),
                 )
                 .await
                 .unwrap();
+            assert_eq!(observer.id(), id);
             assert!(observer.get_events().await.unwrap().iter().any(|event| {
                 event.event_type == "assistant.message"
                     && event.data["content"]
@@ -155,7 +170,7 @@ async fn explicit_base_directory_survives_runtime_restart_and_excludes_other_wri
                 .unwrap();
             let host = first.start_ahp_host(local_options()).await.unwrap();
             let ahp = connect(&host).await;
-            topology(&host, &first, &base.join("ahp/sessions"));
+            topology(&host, &first, &base);
             let (uri, chat, subscription) = create(&ahp, ctx).await;
             turn(&ahp, &chat, subscription).await;
             let sdk = second
@@ -231,7 +246,7 @@ async fn same_catalog_and_other_owner_rejected_disconnect_cleans_up_without_stop
             let ahp = connect(&host).await;
             let (uri, chat, subscription) = create(&ahp, ctx).await;
             turn(&ahp, &chat, subscription).await;
-            topology(&host, &owner, &home(ctx).join("ahp/sessions"));
+            topology(&host, &owner, &home(ctx));
             let error = owner.start_ahp_host(local_options()).await.err().unwrap();
             assert!(
                 error.to_string().contains("catalog")
@@ -320,7 +335,7 @@ async fn listener_startup_failure_recovers_and_preserves_owner_session() {
                 .await
                 .unwrap();
             let ahp = connect(&host).await;
-            topology(&host, &owner, &home(ctx).join("ahp/sessions"));
+            topology(&host, &owner, &home(ctx));
             host.dispose().await.unwrap();
             let observed = exit(&exits).await;
             assert_eq!(observed.host_id, host.host_id);
@@ -445,7 +460,7 @@ async fn listener_defaults_explicit_ports_tokens_and_invalid_combinations() {
                 );
                 let ahp = connect_url(url.as_str(), host.token.as_deref()).await;
                 ahp.client.ping().await.unwrap();
-                topology(&host, &owner, &home(ctx).join("ahp/sessions"));
+                topology(&host, &owner, &home(ctx));
                 host.dispose().await.unwrap();
                 stopped(&host, &ahp, &owner).await;
                 ahp.client.shutdown().await;
@@ -549,7 +564,7 @@ async fn graceful_runtime_shutdown_closes_attached_ahp_session_and_reaps_runtime
             let ahp = connect(&host).await;
             create(&ahp, ctx).await;
             let runtime_pid = owner.pid().unwrap();
-            topology(&host, &owner, &home(ctx).join("ahp/sessions"));
+            topology(&host, &owner, &home(ctx));
             deadline(owner.rpc().runtime().shutdown()).await.unwrap();
             let observed = exit(&exits).await;
             assert_eq!(observed.reason, HostExitReason::RuntimeShutdown);
diff --git a/rust/tests/session_test.rs b/rust/tests/session_test.rs
index 23a254d9e9..40c455549c 100644
--- a/rust/tests/session_test.rs
+++ b/rust/tests/session_test.rs
@@ -215,6 +215,20 @@ impl Drop for NotifyOnDrop {
     }
 }
 
+struct CapturingTool {
+    _on_drop: NotifyOnDrop,
+}
+
+#[async_trait]
+impl tool::ToolHandler for CapturingTool {
+    async fn call(
+        &self,
+        _invocation: ToolInvocation,
+    ) -> Result<ToolResult, github_copilot_sdk::Error> {
+        Ok(ToolResult::Text("captured handler".to_string()))
+    }
+}
+
 #[async_trait]
 impl PermissionHandler for PendingPermissionHandler {
     async fn handle(
@@ -1784,6 +1798,13 @@ fn managed_bypass_permissions_modes_use_wire_values() {
         serde_json::to_value(future).unwrap()["disableBypassPermissionsMode"],
         "future-fail-closed-mode"
     );
+
+    let assisted_disabled =
+        ManagedSettingsPermissions::default().with_disable_assisted_permissions_mode(true);
+    assert_eq!(
+        serde_json::to_value(assisted_disabled).unwrap()["disableAssistedPermissionsMode"],
+        true
+    );
 }
 
 #[tokio::test]
@@ -1795,9 +1816,11 @@ async fn create_and_resume_send_managed_settings_permissions() {
     let managed = ManagedSettings::default().with_permissions(
         ManagedSettingsPermissions::default()
             .with_disable_bypass_permissions_mode(DisableBypassPermissionsModes::ALLOW_AUTO_ONLY)
+            .with_disable_assisted_permissions_mode(true)
             .with_deny(vec!["shell(rm*)".to_string()])
             .with_ask(vec!["write".to_string()])
-            .with_allow(vec![]),
+            .with_allow(vec![])
+            .with_limit_to(vec![]),
     );
 
     let create_handle = tokio::spawn({
@@ -1820,9 +1843,11 @@ async fn create_and_resume_send_managed_settings_permissions() {
     assert_eq!(request["params"]["enableManagedSettings"], true);
     let perms = &request["params"]["managedSettings"]["permissions"];
     assert_eq!(perms["disableBypassPermissionsMode"], "allow-auto-only");
+    assert_eq!(perms["disableAssistedPermissionsMode"], true);
     assert_eq!(perms["deny"][0], "shell(rm*)");
     assert_eq!(perms["ask"][0], "write");
     assert_eq!(perms["allow"], serde_json::json!([]));
+    assert_eq!(perms["limitTo"], serde_json::json!([]));
 
     let id = request["id"].as_u64().unwrap();
     let session_id = requested_session_id(&request).to_string();
@@ -3024,6 +3049,204 @@ fn permission_request_data_extracts_typed_kind() {
     assert_eq!(unknown.kind, Some(PermissionRequestKind::Unknown));
 }
 
+#[tokio::test]
+async fn session_retirement_releases_retained_tool_handler_captures() {
+    for action in ["force_stop", "stop_event_loop", "connection_loss"] {
+        let dropped = Arc::new(Notify::new());
+        let handler = Arc::new(CapturingTool {
+            _on_drop: NotifyOnDrop(dropped.clone()),
+        });
+        let retained = Arc::downgrade(&handler);
+        let (session, server) = create_session_pair_with_config(move |cfg| {
+            cfg.with_tools(vec![Tool::new("capture").with_handler(handler)])
+        })
+        .await;
+        assert!(
+            retained.upgrade().is_some(),
+            "{action}: handler not installed"
+        );
+
+        match action {
+            "force_stop" => session.client().force_stop(),
+            "stop_event_loop" => session.stop_event_loop().await,
+            "connection_loss" => drop(server),
+            _ => unreachable!(),
+        }
+        timeout(TIMEOUT, dropped.notified())
+            .await
+            .unwrap_or_else(|_| panic!("{action}: retained session kept tool captures alive"));
+        assert!(
+            retained.upgrade().is_none(),
+            "{action}: handler still retained"
+        );
+        assert!(session.cancellation_token().is_cancelled());
+    }
+}
+
+#[tokio::test]
+async fn force_stop_closes_retained_session_subscriptions() {
+    use futures_util::FutureExt as _;
+    use github_copilot_sdk::subscription::RecvErrorKind;
+    use tokio_stream::StreamExt as _;
+
+    let (session, mut server) = create_session_pair().await;
+    let mut existing = session.subscribe();
+    let mut buffered = session.subscribe();
+    server
+        .send_event("before-force-stop", serde_json::json!({}))
+        .await;
+    assert_eq!(
+        timeout(TIMEOUT, existing.recv())
+            .await
+            .unwrap()
+            .unwrap()
+            .event_type,
+        "before-force-stop"
+    );
+
+    session.client().force_stop();
+    let error = buffered
+        .recv()
+        .now_or_never()
+        .expect(
+            "force-stop must discard the already-published marker without awaiting the producer",
+        )
+        .unwrap_err();
+    assert!(matches!(error.kind(), RecvErrorKind::Closed), "{error:?}");
+    assert!(buffered.next().now_or_never().unwrap().is_none());
+    let mut late = session.subscribe();
+    let error = late
+        .recv()
+        .now_or_never()
+        .expect("late subscription must close without waiting for event-loop scheduling")
+        .unwrap_err();
+    assert!(matches!(error.kind(), RecvErrorKind::Closed), "{error:?}");
+    assert!(late.next().now_or_never().unwrap().is_none());
+
+    let lifetime = session.cancellation_token();
+    timeout(TIMEOUT, lifetime.cancelled())
+        .await
+        .expect("force-stop must terminate the retained session's event loop");
+    let error = timeout(TIMEOUT, existing.recv())
+        .await
+        .unwrap()
+        .unwrap_err();
+    assert!(matches!(error.kind(), RecvErrorKind::Closed), "{error:?}");
+    assert!(existing.next().now_or_never().unwrap().is_none());
+}
+
+#[tokio::test]
+async fn force_stop_closes_unstarted_prepared_subscriptions() {
+    use futures_util::FutureExt as _;
+    use github_copilot_sdk::subscription::RecvErrorKind;
+
+    let (client, _server_read, _server_write) = make_client();
+    let prepared = client.prepare_session(SessionConfig::default()).unwrap();
+    let mut existing = prepared.subscribe();
+    assert!(existing.recv().now_or_never().is_none());
+    client.force_stop();
+
+    for mut events in [prepared.subscribe(), existing] {
+        let error = events
+            .recv()
+            .now_or_never()
+            .expect("force-stop must close observers even before an event loop exists")
+            .unwrap_err();
+        assert!(matches!(error.kind(), RecvErrorKind::Closed), "{error:?}");
+    }
+}
+
+#[tokio::test]
+async fn stopped_event_loop_closes_subscriptions_without_dropping_session() {
+    use futures_util::FutureExt as _;
+    use github_copilot_sdk::subscription::RecvErrorKind;
+
+    let (session, _server) = create_session_pair().await;
+    let existing = session.subscribe();
+    session.stop_event_loop().await;
+
+    for mut events in [session.subscribe(), existing] {
+        let error = events
+            .recv()
+            .now_or_never()
+            .expect("a retained stopped session must not keep its producer alive")
+            .unwrap_err();
+        assert!(matches!(error.kind(), RecvErrorKind::Closed), "{error:?}");
+    }
+}
+
+#[tokio::test]
+async fn owner_connection_loss_retires_retained_session_subscriptions() {
+    use futures_util::FutureExt as _;
+    use github_copilot_sdk::subscription::RecvErrorKind;
+
+    let (session, server) = create_session_pair().await;
+    let existing = session.subscribe();
+    let lifetime = session.cancellation_token();
+    drop(server);
+    timeout(TIMEOUT, lifetime.cancelled())
+        .await
+        .expect("transport EOF must terminate the retained session's event loop");
+
+    for mut events in [session.subscribe(), existing] {
+        let error = timeout(TIMEOUT, events.recv()).await.unwrap().unwrap_err();
+        assert!(matches!(error.kind(), RecvErrorKind::Closed), "{error:?}");
+        assert!(events.recv().now_or_never().unwrap().is_err());
+    }
+}
+
+#[tokio::test]
+async fn replacing_router_registration_retires_only_previous_session() {
+    use futures_util::FutureExt as _;
+    use github_copilot_sdk::subscription::RecvErrorKind;
+
+    let (session, mut server) = create_session_pair().await;
+    let lifetime = session.cancellation_token();
+    let replacement = tokio::spawn({
+        let client = session.client().clone();
+        let session_id = session.id().clone();
+        async move {
+            client
+                .create_session(SessionConfig::default().with_session_id(session_id))
+                .await
+                .unwrap()
+        }
+    });
+    let request = server.read_request().await;
+    assert_eq!(request["method"], "session.create");
+    server
+        .respond(
+            &request,
+            serde_json::json!({ "sessionId": server.session_id }),
+        )
+        .await;
+    let replacement = timeout(TIMEOUT, replacement).await.unwrap().unwrap();
+    timeout(TIMEOUT, lifetime.cancelled())
+        .await
+        .expect("closed routing channels must retire the previous event loop");
+    let error = session
+        .subscribe()
+        .recv()
+        .now_or_never()
+        .unwrap()
+        .unwrap_err();
+    assert!(matches!(error.kind(), RecvErrorKind::Closed), "{error:?}");
+
+    let mut events = replacement.subscribe();
+    server
+        .send_event("replacement-live", serde_json::json!({}))
+        .await;
+    assert_eq!(
+        timeout(TIMEOUT, events.recv())
+            .await
+            .unwrap()
+            .unwrap()
+            .event_type,
+        "replacement-live"
+    );
+    assert!(!replacement.cancellation_token().is_cancelled());
+}
+
 #[tokio::test]
 async fn force_stop_is_idempotent_with_no_child() {
     // Stream-based clients have no child process. force_stop should be a
@@ -5809,6 +6032,93 @@ async fn assert_no_request(server: &mut FakeServer) {
     assert!(request.is_err(), "unexpected request: {:?}", request.ok());
 }
 
+#[tokio::test]
+async fn set_tools_rejects_acknowledgment_after_event_loop_retirement() {
+    let (session, mut server) = create_session_pair().await;
+    let session = Arc::new(session);
+    let dropped = Arc::new(Notify::new());
+    let handler = Arc::new(CapturingTool {
+        _on_drop: NotifyOnDrop(dropped.clone()),
+    });
+    let retained = Arc::downgrade(&handler);
+    let replace = tokio::spawn({
+        let session = session.clone();
+        async move {
+            session
+                .set_tools([Tool::new("capture").with_handler(handler)])
+                .await
+        }
+    });
+    let request = timeout(TIMEOUT, server.read_request()).await.unwrap();
+    assert_eq!(request["method"], "session.tools.set");
+
+    session.stop_event_loop().await;
+    server.respond(&request, serde_json::json!({})).await;
+    let error = timeout(TIMEOUT, replace)
+        .await
+        .unwrap()
+        .unwrap()
+        .unwrap_err();
+    assert_eq!(error.kind(), &ErrorKind::Rpc { code: -32603 });
+    assert_eq!(
+        error.to_string(),
+        format!(
+            "RPC error -32603: {}",
+            github_copilot_sdk::SessionErrorKind::EventLoopClosed
+        )
+    );
+    timeout(TIMEOUT, dropped.notified()).await.unwrap();
+    assert!(retained.upgrade().is_none());
+}
+
+#[tokio::test]
+async fn set_tools_rejects_queued_and_late_admission_after_retirement() {
+    let (session, mut server) = create_session_pair().await;
+    let session = Arc::new(session);
+    let first = tokio::spawn({
+        let session = session.clone();
+        async move {
+            session
+                .set_tools([label_tool("first", "first handler")])
+                .await
+        }
+    });
+    let request = timeout(TIMEOUT, server.read_request()).await.unwrap();
+    assert_eq!(request["method"], "session.tools.set");
+
+    let queued = session.set_tools([label_tool("queued", "queued handler")]);
+    tokio::pin!(queued);
+    assert!(futures_util::poll!(queued.as_mut()).is_pending());
+
+    session.stop_event_loop().await;
+    server.respond(&request, serde_json::json!({})).await;
+    let error = timeout(TIMEOUT, first).await.unwrap().unwrap().unwrap_err();
+    assert_eq!(error.kind(), &ErrorKind::Rpc { code: -32603 });
+    assert_eq!(
+        error.to_string(),
+        format!(
+            "RPC error -32603: {}",
+            github_copilot_sdk::SessionErrorKind::EventLoopClosed
+        )
+    );
+    for result in [
+        timeout(TIMEOUT, queued).await.unwrap(),
+        session
+            .set_tools([label_tool("late", "late handler")])
+            .await,
+    ] {
+        let error = result.unwrap_err();
+        assert!(
+            matches!(
+                error.kind(),
+                ErrorKind::Session(github_copilot_sdk::SessionErrorKind::EventLoopClosed)
+            ),
+            "{error}"
+        );
+    }
+    assert_no_request(&mut server).await;
+}
+
 #[tokio::test]
 async fn set_tools_replaces_the_definitions_and_handlers_together() {
     let (session, mut server) = create_session_pair_with_config(|cfg| {
@@ -9362,6 +9672,96 @@ async fn tool_invocation_carries_trace_context_from_event() {
     );
 }
 
+#[tokio::test]
+async fn tool_invocation_names_the_sub_agent_and_request_behind_the_call() {
+    struct CapturingTool {
+        captured: tokio::sync::mpsc::UnboundedSender<Value>,
+    }
+
+    #[async_trait]
+    impl tool::ToolHandler for CapturingTool {
+        async fn call(
+            &self,
+            invocation: ToolInvocation,
+        ) -> Result<ToolResult, github_copilot_sdk::Error> {
+            self.captured
+                .send(serde_json::to_value(&invocation).unwrap())
+                .unwrap();
+            Ok(ToolResult::Text("ok".into()))
+        }
+    }
+
+    let (captured, mut invocations) = tokio::sync::mpsc::unbounded_channel();
+    let handler = Arc::new(CapturingTool { captured });
+    let (_session, mut server) = create_session_pair_with_config(move |cfg| {
+        cfg.with_tools(vec![
+            Tool::new("calc")
+                .with_description("calc")
+                .with_parameters(serde_json::json!({"type":"object"}))
+                .with_handler(handler.clone()),
+        ])
+    })
+    .await;
+
+    server
+        .send_event_from_agent(
+            "external_tool.requested",
+            serde_json::json!({
+                "requestId": "req-sub-agent",
+                "sessionId": server.session_id,
+                "toolCallId": "tc-sub-agent",
+                "toolName": "calc",
+                "arguments": {},
+            }),
+            "task-agent-1",
+        )
+        .await;
+    let pending = timeout(TIMEOUT, server.read_request()).await.unwrap();
+    assert_eq!(pending["method"], "session.tools.handlePendingToolCall");
+    let sub_agent_call = timeout(TIMEOUT, invocations.recv()).await.unwrap().unwrap();
+
+    server
+        .send_event(
+            "external_tool.requested",
+            serde_json::json!({
+                "requestId": "req-root",
+                "sessionId": server.session_id,
+                "toolCallId": "tc-root",
+                "toolName": "calc",
+                "arguments": {},
+            }),
+        )
+        .await;
+    let pending = timeout(TIMEOUT, server.read_request()).await.unwrap();
+    assert_eq!(pending["method"], "session.tools.handlePendingToolCall");
+    let root_call = timeout(TIMEOUT, invocations.recv()).await.unwrap().unwrap();
+
+    server
+        .send_event_from_agent(
+            "external_tool.requested",
+            serde_json::json!({
+                "requestId": "req-blank-agent",
+                "sessionId": server.session_id,
+                "toolCallId": "tc-blank-agent",
+                "toolName": "calc",
+                "arguments": {},
+            }),
+            "",
+        )
+        .await;
+    let pending = timeout(TIMEOUT, server.read_request()).await.unwrap();
+    assert_eq!(pending["method"], "session.tools.handlePendingToolCall");
+    let blank_agent_call = timeout(TIMEOUT, invocations.recv()).await.unwrap().unwrap();
+
+    assert_eq!(sub_agent_call["agentId"], "task-agent-1");
+    assert_eq!(sub_agent_call["requestId"], "req-sub-agent");
+    assert_eq!(sub_agent_call["toolCallId"], "tc-sub-agent");
+    assert_eq!(root_call.get("agentId"), None);
+    assert_eq!(root_call["requestId"], "req-root");
+    assert_eq!(blank_agent_call.get("agentId"), None);
+    assert_eq!(blank_agent_call["requestId"], "req-blank-agent");
+}
+
 #[tokio::test]
 async fn wire_omits_trace_fields_when_unset() {
     let (session, mut server) = create_session_pair().await;
diff --git a/rust/tests/skill_provider_test.rs b/rust/tests/skill_provider_test.rs
new file mode 100644
index 0000000000..71494ee65c
--- /dev/null
+++ b/rust/tests/skill_provider_test.rs
@@ -0,0 +1,965 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+
+#![allow(clippy::unwrap_used)]
+
+use std::collections::HashMap;
+use std::sync::Arc;
+use std::time::Duration;
+
+use async_trait::async_trait;
+use github_copilot_sdk::skill_provider::{SkillProvider, SkillProviderDescriptor};
+use github_copilot_sdk::types::{CloudSessionOptions, SessionConfig, SessionId, Tool};
+use github_copilot_sdk::{Client, ClientMode, Error, ErrorKind, ResumeSessionConfig};
+use serde_json::{Value, json};
+use tokio::io::{AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt, DuplexStream, duplex};
+use tokio::sync::Notify;
+use tokio::time::timeout;
+
+const TIMEOUT: Duration = Duration::from_secs(2);
+
+async fn write_framed(writer: &mut (impl AsyncWrite + Unpin), value: &Value) {
+    let body = serde_json::to_vec(value).unwrap();
+    let header = format!("Content-Length: {}\r\n\r\n", body.len());
+    writer.write_all(header.as_bytes()).await.unwrap();
+    writer.write_all(&body).await.unwrap();
+    writer.flush().await.unwrap();
+}
+
+async fn read_framed(reader: &mut (impl AsyncRead + Unpin)) -> Value {
+    timeout(TIMEOUT, read_framed_untimed(reader)).await.unwrap()
+}
+
+async fn read_framed_untimed(reader: &mut (impl AsyncRead + Unpin)) -> 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: usize = 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()
+}
+
+fn make_client() -> (Client, FakeServer) {
+    make_client_with_mode(ClientMode::default())
+}
+
+fn make_client_with_mode(mode: ClientMode) -> (Client, FakeServer) {
+    let (client_write, server_read) = duplex(8192);
+    let (server_write, client_read) = duplex(8192);
+    let client = Client::from_streams_with_mode_for_test(
+        client_read,
+        client_write,
+        std::env::temp_dir(),
+        mode,
+    )
+    .unwrap();
+    (
+        client,
+        FakeServer {
+            read: server_read,
+            write: server_write,
+            session_id: String::new(),
+        },
+    )
+}
+
+struct FakeServer {
+    read: DuplexStream,
+    write: DuplexStream,
+    session_id: String,
+}
+
+impl FakeServer {
+    async fn read_request(&mut self) -> Value {
+        read_framed(&mut self.read).await
+    }
+
+    async fn respond(&mut self, request: &Value, result: Value) {
+        let response = json!({
+            "jsonrpc": "2.0",
+            "id": request["id"].as_u64().unwrap(),
+            "result": result,
+        });
+        write_framed(&mut self.write, &response).await;
+    }
+
+    async fn respond_error(&mut self, request: &Value, code: i64, message: &str) {
+        let response = json!({
+            "jsonrpc": "2.0",
+            "id": request["id"].as_u64().unwrap(),
+            "error": { "code": code, "message": message },
+        });
+        write_framed(&mut self.write, &response).await;
+    }
+
+    async fn send_request(&mut self, id: u64, method: &str, params: Value) {
+        let request = json!({
+            "jsonrpc": "2.0",
+            "id": id,
+            "method": method,
+            "params": params,
+        });
+        write_framed(&mut self.write, &request).await;
+    }
+
+    async fn send_notification(&mut self, method: &str, params: Value) {
+        let notification = json!({
+            "jsonrpc": "2.0",
+            "method": method,
+            "params": params,
+        });
+        write_framed(&mut self.write, &notification).await;
+    }
+
+    async fn read_response(&mut self) -> Value {
+        read_framed(&mut self.read).await
+    }
+}
+
+fn descriptor(name: &str, description: &str) -> SkillProviderDescriptor {
+    SkillProviderDescriptor {
+        name: name.to_string(),
+        description: description.to_string(),
+        ..Default::default()
+    }
+}
+
+#[derive(Clone, Default)]
+struct CallLog(Arc<std::sync::Mutex<Vec<String>>>);
+
+impl CallLog {
+    fn push(&self, call: impl Into<String>) {
+        self.0.lock().unwrap().push(call.into());
+    }
+
+    fn snapshot(&self) -> Vec<String> {
+        self.0.lock().unwrap().clone()
+    }
+}
+
+struct RecordingProvider {
+    skills: Vec<SkillProviderDescriptor>,
+    markdown: HashMap<String, String>,
+    calls: CallLog,
+}
+
+impl RecordingProvider {
+    fn new() -> Self {
+        Self {
+            skills: vec![descriptor("review", "Reviews code")],
+            markdown: HashMap::from([("review".to_string(), "Review carefully.".to_string())]),
+            calls: CallLog::default(),
+        }
+    }
+
+    fn empty() -> Self {
+        Self {
+            skills: Vec::new(),
+            markdown: HashMap::new(),
+            calls: CallLog::default(),
+        }
+    }
+}
+
+#[async_trait]
+impl SkillProvider for RecordingProvider {
+    async fn list_skills(&self) -> std::result::Result<Vec<SkillProviderDescriptor>, Error> {
+        self.calls.push("list");
+        Ok(self.skills.clone())
+    }
+
+    async fn read_skill(&self, name: &str) -> std::result::Result<Option<String>, Error> {
+        self.calls.push(format!("read:{name}"));
+        Ok(self.markdown.get(name).cloned())
+    }
+}
+
+struct FailingProvider {
+    fail_list: bool,
+    secret: &'static str,
+}
+
+#[async_trait]
+impl SkillProvider for FailingProvider {
+    async fn list_skills(&self) -> std::result::Result<Vec<SkillProviderDescriptor>, Error> {
+        if self.fail_list {
+            Err(Error::with_message(ErrorKind::InvalidConfig, self.secret))
+        } else {
+            Ok(vec![descriptor("review", "Reviews code")])
+        }
+    }
+
+    async fn read_skill(&self, _name: &str) -> std::result::Result<Option<String>, Error> {
+        Err(Error::with_message(ErrorKind::InvalidConfig, self.secret))
+    }
+}
+
+struct NotifyOnDrop(Arc<Notify>);
+
+impl Drop for NotifyOnDrop {
+    fn drop(&mut self) {
+        self.0.notify_one();
+    }
+}
+
+/// Blocks every call until the SDK drops its future.
+struct BlockingProvider {
+    entered: Arc<Notify>,
+    dropped: Arc<Notify>,
+}
+
+#[async_trait]
+impl SkillProvider for BlockingProvider {
+    async fn list_skills(&self) -> std::result::Result<Vec<SkillProviderDescriptor>, Error> {
+        let _dropped = NotifyOnDrop(self.dropped.clone());
+        self.entered.notify_one();
+        std::future::pending().await
+    }
+
+    async fn read_skill(&self, _name: &str) -> std::result::Result<Option<String>, Error> {
+        let _dropped = NotifyOnDrop(self.dropped.clone());
+        self.entered.notify_one();
+        std::future::pending().await
+    }
+}
+
+fn requested_session_id(request: &Value) -> &str {
+    request["params"]["sessionId"].as_str().unwrap()
+}
+
+async fn create_session(
+    client: &Client,
+    server: &mut FakeServer,
+    config: SessionConfig,
+) -> github_copilot_sdk::session::Session {
+    let handle = tokio::spawn({
+        let client = client.clone();
+        async move { client.create_session(config).await.unwrap() }
+    });
+    let request = server.read_request().await;
+    assert_eq!(request["method"], "session.create");
+    server.session_id = requested_session_id(&request).to_string();
+    server
+        .respond(
+            &request,
+            json!({
+                "sessionId": server.session_id,
+                "workspacePath": "/tmp/workspace",
+            }),
+        )
+        .await;
+    timeout(TIMEOUT, handle).await.unwrap().unwrap()
+}
+
+async fn respond_to_resume(server: &mut FakeServer) {
+    let request = server.read_request().await;
+    assert_eq!(request["method"], "session.resume");
+    server
+        .respond(
+            &request,
+            json!({
+                "sessionId": requested_session_id(&request),
+                "workspacePath": "/tmp/workspace",
+            }),
+        )
+        .await;
+
+    let reload = server.read_request().await;
+    assert_eq!(reload["method"], "session.skills.reload");
+    server.respond(&reload, json!({})).await;
+}
+
+async fn disconnect_session(
+    session: &github_copilot_sdk::session::Session,
+    server: &mut FakeServer,
+) {
+    let disconnect = session.disconnect();
+    tokio::pin!(disconnect);
+    let detach = tokio::select! {
+        request = server.read_request() => request,
+        result = &mut disconnect => panic!("disconnect finished before detach request: {result:?}"),
+    };
+    assert_eq!(detach["method"], "session.detach");
+    server
+        .respond(&detach, json!({ "success": true, "error": null }))
+        .await;
+    timeout(TIMEOUT, disconnect).await.unwrap().unwrap();
+}
+
+fn assert_no_provider(response: &Value, session_id: &str) {
+    assert_eq!(response["error"]["code"], -32603);
+    assert_eq!(
+        response["error"]["message"],
+        format!("No skill provider for session: {session_id}")
+    );
+    assert!(response["error"].get("data").is_none());
+}
+
+fn assert_session_not_found(response: &Value, session_id: &str) {
+    assert_eq!(response["error"]["code"], -32603);
+    assert_eq!(
+        response["error"]["message"],
+        format!("Session not found: {session_id}")
+    );
+}
+
+#[test]
+fn descriptor_omits_unset_optional_fields_and_config_debug_redacts_provider() {
+    let value = serde_json::to_value(descriptor("review", "Reviews code")).unwrap();
+    assert_eq!(
+        value,
+        json!({ "name": "review", "description": "Reviews code" })
+    );
+
+    let provider: Arc<dyn SkillProvider> = Arc::new(RecordingProvider::new());
+    let config = SessionConfig::default().with_skill_provider(provider.clone());
+    let cloned = config.clone();
+    assert!(Arc::ptr_eq(
+        config.skill_provider.as_ref().unwrap(),
+        cloned.skill_provider.as_ref().unwrap()
+    ));
+    let debug = format!("{config:?}");
+    assert!(debug.contains("skill_provider"));
+    assert!(debug.contains("<set>"));
+
+    let resume =
+        ResumeSessionConfig::new(SessionId::new("resume-id")).with_skill_provider(provider.clone());
+    let cloned_resume = resume.clone();
+    assert!(Arc::ptr_eq(
+        resume.skill_provider.as_ref().unwrap(),
+        cloned_resume.skill_provider.as_ref().unwrap()
+    ));
+    assert!(format!("{resume:?}").contains("skill_provider"));
+}
+
+#[tokio::test]
+async fn create_and_resume_payloads_flag_only_when_provider_is_supplied() {
+    let (client, mut server) = make_client();
+
+    let session = create_session(&client, &mut server, SessionConfig::default()).await;
+    let resume = tokio::spawn({
+        let client = client.clone();
+        let session_id = session.id().clone();
+        async move {
+            client
+                .resume_session(ResumeSessionConfig::new(session_id))
+                .await
+                .unwrap()
+        }
+    });
+    respond_to_resume(&mut server).await;
+    let _resumed = timeout(TIMEOUT, resume).await.unwrap().unwrap();
+
+    let provider: Arc<dyn SkillProvider> = Arc::new(RecordingProvider::new());
+    let create = tokio::spawn({
+        let client = client.clone();
+        let provider = provider.clone();
+        async move {
+            client
+                .create_session(SessionConfig::default().with_skill_provider(provider))
+                .await
+                .unwrap()
+        }
+    });
+    let create_request = server.read_request().await;
+    assert_eq!(create_request["params"]["hasSkillProvider"], true);
+    assert!(create_request["params"].get("skillProvider").is_none());
+    server.session_id = requested_session_id(&create_request).to_string();
+    server
+        .respond(
+            &create_request,
+            json!({ "sessionId": server.session_id, "workspacePath": "/tmp/workspace" }),
+        )
+        .await;
+    let session_with_provider = timeout(TIMEOUT, create).await.unwrap().unwrap();
+
+    let resume_with_provider = tokio::spawn({
+        let client = client.clone();
+        let provider = Arc::new(RecordingProvider::new());
+        let session_id = session_with_provider.id().clone();
+        async move {
+            client
+                .resume_session(ResumeSessionConfig::new(session_id).with_skill_provider(provider))
+                .await
+                .unwrap()
+        }
+    });
+    let resume_request = server.read_request().await;
+    assert_eq!(resume_request["method"], "session.resume");
+    assert_eq!(resume_request["params"]["hasSkillProvider"], true);
+    assert!(resume_request["params"].get("skillProvider").is_none());
+    server
+        .respond(
+            &resume_request,
+            json!({ "sessionId": requested_session_id(&resume_request), "workspacePath": "/tmp/workspace" }),
+        )
+        .await;
+    let reload = server.read_request().await;
+    server.respond(&reload, json!({})).await;
+    let _ = timeout(TIMEOUT, resume_with_provider)
+        .await
+        .unwrap()
+        .unwrap();
+}
+
+#[tokio::test]
+async fn empty_mode_keeps_enable_skills_default_with_provider() {
+    let (client, mut server) = make_client_with_mode(ClientMode::Empty);
+    let provider: Arc<dyn SkillProvider> = Arc::new(RecordingProvider::new());
+    let create = tokio::spawn({
+        let client = client.clone();
+        async move {
+            client
+                .create_session(
+                    SessionConfig::default()
+                        .with_available_tools(Vec::<String>::new())
+                        .with_tools(Vec::<Tool>::new())
+                        .with_skill_provider(provider),
+                )
+                .await
+                .unwrap()
+        }
+    });
+    let request = server.read_request().await;
+    assert_eq!(request["params"]["enableSkills"], false);
+    assert_eq!(request["params"]["hasSkillProvider"], true);
+    server.session_id = requested_session_id(&request).to_string();
+    server
+        .respond(
+            &request,
+            json!({ "sessionId": server.session_id, "workspacePath": "/tmp/workspace" }),
+        )
+        .await;
+    let update = server.read_request().await;
+    assert_eq!(update["method"], "session.options.update");
+    server.respond(&update, json!({ "success": true })).await;
+    let _ = timeout(TIMEOUT, create).await.unwrap().unwrap();
+}
+
+#[tokio::test]
+async fn serves_early_create_and_resume_callbacks() {
+    let (client, mut server) = make_client();
+    let provider: Arc<dyn SkillProvider> = Arc::new(RecordingProvider::new());
+    let create = tokio::spawn({
+        let client = client.clone();
+        let provider = provider.clone();
+        async move {
+            client
+                .create_session(
+                    SessionConfig::default()
+                        .with_session_id("early-create")
+                        .with_skill_provider(provider),
+                )
+                .await
+                .unwrap()
+        }
+    });
+    let create_request = server.read_request().await;
+    assert_eq!(create_request["method"], "session.create");
+    server
+        .send_request(
+            10,
+            "skillProvider.list",
+            json!({ "sessionId": "early-create" }),
+        )
+        .await;
+    let list_response = server.read_response().await;
+    assert_eq!(list_response["result"]["skills"][0]["name"], "review");
+    server
+        .respond(
+            &create_request,
+            json!({ "sessionId": "early-create", "workspacePath": "/tmp/workspace" }),
+        )
+        .await;
+    let _ = timeout(TIMEOUT, create).await.unwrap().unwrap();
+
+    let resume_provider: Arc<dyn SkillProvider> = Arc::new(RecordingProvider::new());
+    let resume = tokio::spawn({
+        let client = client.clone();
+        async move {
+            client
+                .resume_session(
+                    ResumeSessionConfig::new(SessionId::new("early-resume"))
+                        .with_skill_provider(resume_provider),
+                )
+                .await
+                .unwrap()
+        }
+    });
+    let resume_request = server.read_request().await;
+    assert_eq!(resume_request["method"], "session.resume");
+    server
+        .send_request(
+            11,
+            "skillProvider.list",
+            json!({ "sessionId": "early-resume" }),
+        )
+        .await;
+    let list_response = server.read_response().await;
+    assert_eq!(list_response["result"]["skills"][0]["name"], "review");
+    server
+        .respond(
+            &resume_request,
+            json!({ "sessionId": "early-resume", "workspacePath": "/tmp/workspace" }),
+        )
+        .await;
+    let reload = server.read_request().await;
+    server.respond(&reload, json!({})).await;
+    let _ = timeout(TIMEOUT, resume).await.unwrap().unwrap();
+}
+
+#[tokio::test]
+async fn cloud_sessions_reject_provider_before_rpc() {
+    let (client, mut server) = make_client();
+    let provider = Arc::new(RecordingProvider::new());
+    let calls = provider.calls.clone();
+    let error = match client
+        .create_session(
+            SessionConfig::default()
+                .with_skill_provider(provider)
+                .with_cloud(CloudSessionOptions::default()),
+        )
+        .await
+    {
+        Ok(_) => panic!("cloud session unexpectedly accepted a skill provider"),
+        Err(error) => error,
+    };
+
+    assert_eq!(
+        error.to_string(),
+        "Skill providers are not supported for cloud sessions."
+    );
+    assert_eq!(calls.snapshot(), Vec::<String>::new());
+    assert!(
+        timeout(Duration::from_millis(100), server.read_request())
+            .await
+            .is_err()
+    );
+}
+
+#[tokio::test]
+async fn dispatches_list_read_empty_and_not_found() {
+    let (client, mut server) = make_client();
+    let provider = Arc::new(RecordingProvider {
+        skills: vec![
+            descriptor("review", "Reviews code"),
+            SkillProviderDescriptor {
+                name: "deploy".to_string(),
+                description: "Deploys service".to_string(),
+                argument_hint: Some("[environment]".to_string()),
+                disable_model_invocation: Some(true),
+                user_invocable: Some(false),
+            },
+        ],
+        markdown: HashMap::from([("deploy".to_string(), "# deploy".to_string())]),
+        calls: CallLog::default(),
+    });
+    let session = create_session(
+        &client,
+        &mut server,
+        SessionConfig::default().with_skill_provider(provider),
+    )
+    .await;
+    let session_id = session.id().to_string();
+
+    server
+        .send_request(20, "skillProvider.list", json!({ "sessionId": session_id }))
+        .await;
+    let response = server.read_response().await;
+    assert_eq!(
+        response["result"]["skills"][0],
+        json!({
+            "name": "review",
+            "description": "Reviews code",
+        })
+    );
+    assert_eq!(
+        response["result"]["skills"][1]["argumentHint"],
+        "[environment]"
+    );
+    assert_eq!(
+        response["result"]["skills"][1]["disableModelInvocation"],
+        true
+    );
+    assert_eq!(response["result"]["skills"][1]["userInvocable"], false);
+
+    server
+        .send_request(
+            21,
+            "skillProvider.read",
+            json!({ "sessionId": session_id, "name": "deploy" }),
+        )
+        .await;
+    let response = server.read_response().await;
+    assert_eq!(response["result"], json!({ "markdown": "# deploy" }));
+
+    server
+        .send_request(
+            22,
+            "skillProvider.read",
+            json!({ "sessionId": session_id, "name": "missing" }),
+        )
+        .await;
+    let response = server.read_response().await;
+    assert_eq!(response["result"], json!({ "markdown": null }));
+
+    let empty = Arc::new(RecordingProvider::empty());
+    let empty_session = create_session(
+        &client,
+        &mut server,
+        SessionConfig::default()
+            .with_session_id("empty-catalog")
+            .with_skill_provider(empty),
+    )
+    .await;
+    server
+        .send_request(
+            23,
+            "skillProvider.list",
+            json!({ "sessionId": empty_session.id() }),
+        )
+        .await;
+    let response = server.read_response().await;
+    assert_eq!(response["result"], json!({ "skills": [] }));
+}
+
+#[tokio::test]
+async fn provider_errors_are_generic_and_invalid_params_are_rejected() {
+    let (client, mut server) = make_client();
+    let secret = "db-password-in-error";
+    let session = create_session(
+        &client,
+        &mut server,
+        SessionConfig::default().with_skill_provider(Arc::new(FailingProvider {
+            fail_list: true,
+            secret,
+        })),
+    )
+    .await;
+    let session_id = session.id().to_string();
+
+    server
+        .send_request(30, "skillProvider.list", json!({ "sessionId": session_id }))
+        .await;
+    let response = server.read_response().await;
+    assert_eq!(response["error"]["code"], -32603);
+    assert_eq!(
+        response["error"]["message"],
+        "Skill provider listSkills failed"
+    );
+    assert!(response["error"].get("data").is_none());
+    assert!(!response.to_string().contains(secret));
+
+    let read_session = create_session(
+        &client,
+        &mut server,
+        SessionConfig::default()
+            .with_session_id("failing-read")
+            .with_skill_provider(Arc::new(FailingProvider {
+                fail_list: false,
+                secret,
+            })),
+    )
+    .await;
+    server
+        .send_request(
+            31,
+            "skillProvider.read",
+            json!({ "sessionId": read_session.id(), "name": "review" }),
+        )
+        .await;
+    let response = server.read_response().await;
+    assert_eq!(response["error"]["code"], -32603);
+    assert_eq!(
+        response["error"]["message"],
+        "Skill provider readSkill failed"
+    );
+    assert!(response["error"].get("data").is_none());
+    assert!(!response.to_string().contains(secret));
+
+    server
+        .send_request(
+            32,
+            "skillProvider.read",
+            json!({ "sessionId": read_session.id() }),
+        )
+        .await;
+    let response = server.read_response().await;
+    assert_eq!(response["error"]["code"], -32602);
+}
+
+#[tokio::test]
+async fn cancel_request_drops_provider_future_and_reports_cancellation() {
+    let (client, mut server) = make_client();
+    let entered = Arc::new(Notify::new());
+    let dropped = Arc::new(Notify::new());
+    let session = create_session(
+        &client,
+        &mut server,
+        SessionConfig::default().with_skill_provider(Arc::new(BlockingProvider {
+            entered: entered.clone(),
+            dropped: dropped.clone(),
+        })),
+    )
+    .await;
+
+    for (id, method, params) in [
+        (
+            60,
+            "skillProvider.list",
+            json!({ "sessionId": session.id() }),
+        ),
+        (
+            61,
+            "skillProvider.read",
+            json!({ "sessionId": session.id(), "name": "review" }),
+        ),
+    ] {
+        server.send_request(id, method, params).await;
+        timeout(TIMEOUT, entered.notified()).await.unwrap();
+        server
+            .send_notification("$/cancelRequest", json!({ "id": id }))
+            .await;
+
+        let response = server.read_response().await;
+        assert_eq!(response["id"], id);
+        assert_eq!(response["error"]["code"], -32800);
+        timeout(TIMEOUT, dropped.notified()).await.unwrap();
+    }
+}
+
+#[tokio::test]
+async fn connection_close_drops_provider_future() {
+    let (client, mut server) = make_client();
+    let entered = Arc::new(Notify::new());
+    let dropped = Arc::new(Notify::new());
+    let session = create_session(
+        &client,
+        &mut server,
+        SessionConfig::default().with_skill_provider(Arc::new(BlockingProvider {
+            entered: entered.clone(),
+            dropped: dropped.clone(),
+        })),
+    )
+    .await;
+
+    server
+        .send_request(
+            62,
+            "skillProvider.list",
+            json!({ "sessionId": session.id() }),
+        )
+        .await;
+    timeout(TIMEOUT, entered.notified()).await.unwrap();
+    drop(server);
+
+    timeout(TIMEOUT, dropped.notified()).await.unwrap();
+}
+
+#[tokio::test]
+async fn missing_provider_reports_generic_error() {
+    let (client, mut server) = make_client();
+    let session = create_session(&client, &mut server, SessionConfig::default()).await;
+    let session_id = session.id().to_string();
+    server
+        .send_request(
+            41,
+            "skillProvider.read",
+            json!({ "sessionId": session_id, "name": "review" }),
+        )
+        .await;
+    let response = server.read_response().await;
+    assert_no_provider(&response, &session_id);
+}
+
+#[tokio::test]
+async fn teardown_and_failed_open_stop_serving_provider() {
+    let (client, mut server) = make_client();
+    let provider = Arc::new(RecordingProvider::new());
+    let calls = provider.calls.clone();
+    let session = create_session(
+        &client,
+        &mut server,
+        SessionConfig::default().with_skill_provider(provider),
+    )
+    .await;
+    let session_id = session.id().to_string();
+    disconnect_session(&session, &mut server).await;
+
+    let failed_provider = Arc::new(RecordingProvider::new());
+    let failed_calls = failed_provider.calls.clone();
+    let failed_create = tokio::spawn({
+        let client = client.clone();
+        async move {
+            client
+                .create_session(
+                    SessionConfig::default()
+                        .with_session_id("failed-open")
+                        .with_skill_provider(failed_provider),
+                )
+                .await
+        }
+    });
+    let request = server.read_request().await;
+    assert_eq!(request["method"], "session.create");
+    server
+        .respond_error(&request, -32603, "create failed")
+        .await;
+    let error = match timeout(TIMEOUT, failed_create).await.unwrap().unwrap() {
+        Ok(_) => panic!("failed-open session unexpectedly succeeded"),
+        Err(error) => error,
+    };
+    assert!(error.to_string().contains("create failed"));
+    server
+        .send_request(50, "skillProvider.list", json!({ "sessionId": session_id }))
+        .await;
+    let response = server.read_response().await;
+    assert_eq!(response["id"], 50);
+    assert_session_not_found(&response, &session_id);
+    server
+        .send_request(
+            51,
+            "skillProvider.list",
+            json!({ "sessionId": "failed-open" }),
+        )
+        .await;
+    let response = server.read_response().await;
+    assert_eq!(response["id"], 51);
+    assert_session_not_found(&response, "failed-open");
+    assert_eq!(calls.snapshot(), Vec::<String>::new());
+    assert_eq!(failed_calls.snapshot(), Vec::<String>::new());
+}
+
+#[tokio::test]
+async fn dropped_session_answers_provider_callbacks_with_an_error() {
+    let (client, mut server) = make_client();
+    let provider = Arc::new(RecordingProvider::new());
+    let calls = provider.calls.clone();
+    let session = create_session(
+        &client,
+        &mut server,
+        SessionConfig::default().with_skill_provider(provider),
+    )
+    .await;
+    let session_id = session.id().to_string();
+    drop(session);
+
+    server
+        .send_request(60, "skillProvider.list", json!({ "sessionId": session_id }))
+        .await;
+    let response = server.read_response().await;
+    assert_eq!(response["id"], 60);
+    assert_session_not_found(&response, &session_id);
+
+    server
+        .send_request(61, "skillProvider.read", json!({ "name": "review" }))
+        .await;
+    let response = server.read_response().await;
+    assert_eq!(response["id"], 61);
+    assert_eq!(response["error"]["code"], -32602);
+    assert_eq!(calls.snapshot(), Vec::<String>::new());
+}
+
+#[tokio::test]
+async fn resume_rebinds_provider() {
+    let (client, mut server) = make_client();
+    let original = Arc::new(RecordingProvider::new());
+    let original_calls = original.calls.clone();
+    let session = create_session(
+        &client,
+        &mut server,
+        SessionConfig::default().with_skill_provider(original),
+    )
+    .await;
+    let session_id = session.id().clone();
+    disconnect_session(&session, &mut server).await;
+
+    let replacement = Arc::new(RecordingProvider::new());
+    let replacement_calls = replacement.calls.clone();
+    let resume = tokio::spawn({
+        let client = client.clone();
+        let session_id = session_id.clone();
+        async move {
+            client
+                .resume_session(
+                    ResumeSessionConfig::new(session_id).with_skill_provider(replacement),
+                )
+                .await
+                .unwrap()
+        }
+    });
+    respond_to_resume(&mut server).await;
+    let resumed = timeout(TIMEOUT, resume).await.unwrap().unwrap();
+    server
+        .send_request(
+            70,
+            "skillProvider.list",
+            json!({ "sessionId": resumed.id() }),
+        )
+        .await;
+    let response = server.read_response().await;
+    assert_eq!(response["result"]["skills"][0]["name"], "review");
+    assert_eq!(original_calls.snapshot(), Vec::<String>::new());
+    assert_eq!(replacement_calls.snapshot(), vec!["list"]);
+}
+
+#[tokio::test]
+async fn failed_resume_restores_the_resident_provider() {
+    let (client, mut server) = make_client();
+    let resident = Arc::new(RecordingProvider::new());
+    let resident_calls = resident.calls.clone();
+    let session = create_session(
+        &client,
+        &mut server,
+        SessionConfig::default().with_skill_provider(resident),
+    )
+    .await;
+    let session_id = session.id().clone();
+
+    let replacement = Arc::new(RecordingProvider::new());
+    let replacement_calls = replacement.calls.clone();
+    let resume = tokio::spawn({
+        let client = client.clone();
+        let session_id = session_id.clone();
+        async move {
+            client
+                .resume_session(
+                    ResumeSessionConfig::new(session_id).with_skill_provider(replacement),
+                )
+                .await
+        }
+    });
+    let request = server.read_request().await;
+    assert_eq!(request["method"], "session.resume");
+    server
+        .respond_error(&request, -32603, "resume failed")
+        .await;
+    let error = match timeout(TIMEOUT, resume).await.unwrap().unwrap() {
+        Ok(_) => panic!("resume unexpectedly succeeded"),
+        Err(error) => error,
+    };
+    assert!(error.to_string().contains("resume failed"));
+
+    // The runtime keeps the resident binding when a resume fails.
+    server
+        .send_request(80, "skillProvider.list", json!({ "sessionId": session_id }))
+        .await;
+    let response = server.read_response().await;
+    assert_eq!(response["id"], 80);
+    assert_eq!(response["result"]["skills"][0]["name"], "review");
+    assert_eq!(resident_calls.snapshot(), vec!["list"]);
+    assert_eq!(replacement_calls.snapshot(), Vec::<String>::new());
+    drop(session);
+}
diff --git a/samples/startup-policy/README.md b/samples/startup-policy/README.md
new file mode 100644
index 0000000000..4e9f902da3
--- /dev/null
+++ b/samples/startup-policy/README.md
@@ -0,0 +1,28 @@
+# Startup policy example
+
+This source example uses an isolated configuration directory and a local runtime.
+It makes no model request and installs no certificate.
+It does not read or write your settings or keychain.
+
+Prepare the same-checkout runtime and generated Node.js client with the
+[SDK contributor guide](../../CONTRIBUTING.md#testing-an-unreleased-runtime-api).
+From the SDK directory, run:
+
+```sh
+npx --no-install tsx samples/startup-policy/read-settings.mts /absolute/path/to/runtime.node
+```
+
+The output shows `user-model`, then `repo-model`, and a `changed` repository edit.
+The obsolete value in `config.json` does not override `settings.json`.
+Managed plugin controls override the user value.
+The startup override disables native web search.
+The permission query reports the managed bypass restriction.
+The ingestion request disables policy discovery and network access.
+The managed sandbox floor stays enabled.
+`proxyCaRelevant` is `true`; installation support depends on the host platform.
+
+The example imports internal host helpers directly from the source checkout.
+Those helpers are not public SDK exports.
+Applications can use `client.rpc.sandbox.proxyCa.checkRelevance` and
+`client.rpc.sandbox.proxyCa.checkInstallationSupport` through the public client.
+Neither query installs a certificate or requests elevation.
diff --git a/samples/startup-policy/read-settings.mts b/samples/startup-policy/read-settings.mts
new file mode 100644
index 0000000000..f0a2c9a883
--- /dev/null
+++ b/samples/startup-policy/read-settings.mts
@@ -0,0 +1,141 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from "node:assert/strict";
+import { mkdtemp, mkdir, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join, resolve } from "node:path";
+import {
+    createMessageConnection,
+    StreamMessageReader,
+    StreamMessageWriter,
+} from "vscode-jsonrpc/node.js";
+import { FfiRuntimeHost } from "../../nodejs/src/ffiRuntimeHost.js";
+import { createInternalServerRpc, createServerRpc } from "../../nodejs/src/generated/rpc.js";
+
+const library = process.argv[2];
+assert(library, "Pass the same-checkout runtime.node path as the first argument");
+const home = await mkdtemp(join(tmpdir(), "copilot-startup-policy-"));
+let host: FfiRuntimeHost | undefined;
+let connection: ReturnType<typeof createMessageConnection> | undefined;
+const errors: unknown[] = [];
+try {
+    const configDir = join(home, ".copilot");
+    const repo = join(home, "project");
+    await mkdir(configDir);
+    await mkdir(join(repo, ".github", "copilot"), { recursive: true });
+    await writeFile(join(configDir, "settings.json"), JSON.stringify({ model: "user-model" }));
+    await writeFile(join(configDir, "config.json"), JSON.stringify({ model: "obsolete-model" }));
+    await writeFile(
+        join(repo, ".github", "copilot", "settings.json"),
+        JSON.stringify({ model: "repo-model" })
+    );
+    host = FfiRuntimeHost.create(
+        resolve(library),
+        undefined,
+        {
+            HOME: home,
+            USERPROFILE: home,
+            COPILOT_HOME: configDir,
+            COPILOT_CACHE_HOME: join(home, "cache"),
+            COPILOT_OFFLINE: "true",
+            COPILOT_USE_KEYCHAIN: "false",
+        },
+        ["--no-auto-login"]
+    );
+    await host.start();
+    connection = createMessageConnection(
+        new StreamMessageReader(host.receiveStream),
+        new StreamMessageWriter(host.sendStream)
+    );
+    connection.listen();
+    const internal = createInternalServerRpc(connection);
+    const rpc = createServerRpc(connection);
+    const startupGates = await internal.featureFlags.resolveStartupGates({
+        flags: ["NATIVE_WEB_SEARCH"],
+        isStaff: false,
+        isExperimental: false,
+        isTeam: false,
+        streamerMode: false,
+        refreshWithoutSession: false,
+        environment: {},
+        config: { featureFlags: { NATIVE_WEB_SEARCH: false } },
+    });
+    assert.equal(startupGates.NATIVE_WEB_SEARCH, false);
+    const loaded = await internal.user.settings.loadWithWarning();
+    assert.equal(loaded.settings.model, "user-model");
+    const merged = await internal.user.settings.loadAndMergeRepo({
+        repoRoot: repo,
+        userSettings: loaded.settings,
+    });
+    assert.equal(merged.settings.model, "repo-model");
+    const edit = await internal.repo.settings.edit({
+        repoRoot: repo,
+        scope: "local",
+        key: "deniedUrls",
+        operation: "add-item",
+        value: "https://example.com",
+    });
+    assert.equal(edit.status, "changed");
+    const controls = await internal.managedSettings.applyControls({
+        settings: { enabledPlugins: { required: false } },
+        managed: { enabledPlugins: { required: true } },
+    });
+    assert.deepEqual(controls.settingsJson, { enabledPlugins: { required: true } });
+    const permissions = await internal.permissions.evaluateManagedPolicy({
+        permissions: { disableBypassPermissionsMode: "disable" },
+    });
+    assert.equal(permissions.bypassPermissionsDisabled, true);
+    const ingestion = await internal.managedSettings.ingest({
+        selfFetch: false,
+        userAgent: "startup-policy-example",
+        environment: {},
+        platform: process.platform,
+        homeDirectory: home,
+    });
+    assert.equal(ingestion.serverFetchFailed, false);
+    const sandbox = await internal.sandbox.resolveFlooredConfig({
+        userSandbox: { enabled: false },
+        managedSandbox: { enabled: true, failIfUnavailable: true },
+    });
+    const relevant = await rpc.sandbox.proxyCa.checkRelevance({
+        sandboxConfig: { enabled: true, auth: { gh: true } },
+    });
+    assert.equal(relevant, true);
+    console.log(
+        JSON.stringify(
+            {
+                userModel: loaded.settings.model,
+                repoModel: merged.settings.model,
+                repoEdit: edit.status,
+                startupGates,
+                managedControls: controls.settingsJson,
+                permissions,
+                ingestion: ingestion.serverResolution,
+                sandbox: sandbox.sandboxJson,
+                proxyCaRelevant: relevant,
+                proxyCaInstallationSupported: await rpc.sandbox.proxyCa.checkInstallationSupport(),
+            },
+            null,
+            2
+        )
+    );
+} catch (error) {
+    errors.push(error);
+} finally {
+    connection?.dispose();
+    try {
+        await host?.dispose();
+    } catch (error) {
+        errors.push(error);
+    }
+    try {
+        await rm(home, { recursive: true, force: true });
+    } catch (error) {
+        errors.push(error);
+    }
+}
+if (errors.length > 0) {
+    throw new AggregateError(errors, "Startup policy example failed");
+}
diff --git a/scripts/ci/check-generated.test.mjs b/scripts/ci/check-generated.test.mjs
index 23c95ced04..6827464fdb 100644
--- a/scripts/ci/check-generated.test.mjs
+++ b/scripts/ci/check-generated.test.mjs
@@ -8,7 +8,7 @@ import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
 import test from "node:test";
-import { fileURLToPath } from "node:url";
+import { fileURLToPath, pathToFileURL } from "node:url";
 import { SCHEMA_FILES } from "../build-prerequisites.mjs";
 import {
     assertGeneratedClean,
@@ -64,6 +64,15 @@ function fixture(t) {
     return { root, git, write, commit, schemas, options };
 }
 
+function shallowClone(t, source, depth) {
+    const root = fs.mkdtempSync(path.join(os.tmpdir(), "sdk-freshness-shallow-"));
+    t.after(() => fs.rmSync(root, { recursive: true, force: true }));
+    execFileSync("git", ["clone", "--quiet", "--depth", String(depth), pathToFileURL(source).href, root]);
+    const git = (...args) => execFileSync("git", args, { cwd: root, encoding: "utf8" }).trim();
+    assert.equal(git("rev-parse", "--is-shallow-repository"), "true");
+    return { root, git };
+}
+
 for (const name of SCHEMA_FILES) {
     test(`rejects stale ${name} before SDK generation`, (t) => {
         const f = fixture(t);
@@ -207,10 +216,39 @@ test("uses the tested PR merge's actual base, not an earlier event base", (t) =>
     const actualBase = f.commit();
     f.git("merge", "--quiet", "--no-ff", "topic", "-m", "test merge");
     assert.equal(generationBaseline(f.root, "pull_request", { pull_request: { base: { sha: oldBase } } }), actualBase);
+    const clone = shallowClone(t, f.root, 2);
+    assert.equal(
+        generationBaseline(clone.root, "pull_request", { pull_request: { base: { sha: oldBase } } }),
+        actualBase,
+    );
     const paths = f.git("diff", "--name-only", actualBase, "HEAD").split("\n");
     assert.equal(requiresSdkGeneration(paths), false);
 });
 
+for (const eventName of ["merge_group", "push"]) {
+    test(`uses a separately fetched ${eventName} baseline beyond shallow history`, (t) => {
+        const f = fixture(t);
+        f.write("generated/api.schema.json", '{"earlierCommit":true}\n');
+        f.commit();
+        f.write("internal", "last commit");
+        f.commit();
+        const clone = shallowClone(t, f.root, 1);
+        const event =
+            eventName === "merge_group"
+                ? { merge_group: { base_sha: f.options.baseline } }
+                : { before: f.options.baseline };
+        assert.throws(() => generationBaseline(clone.root, eventName, event));
+        clone.git("fetch", "--quiet", "--no-tags", "--depth=1", "origin", f.options.baseline);
+        const baseline = generationBaseline(clone.root, eventName, event);
+        assert.equal(baseline, f.options.baseline);
+        assert.equal(
+            requiresSdkGeneration(clone.git("diff", "--name-only", baseline, "HEAD").split("\n")),
+            true,
+        );
+        assert.equal(clone.git("rev-parse", "--is-shallow-repository"), "true");
+    });
+}
+
 test("uses the whole merge-group/push range, not just the final commit", (t) => {
     const f = fixture(t);
     f.write("generated/api.schema.json", '{"earlierCommit":true}\n');
diff --git a/scripts/ci/run-dotnet-tests.sh b/scripts/ci/run-dotnet-tests.sh
index ea0312c4a6..b1840e323e 100755
--- a/scripts/ci/run-dotnet-tests.sh
+++ b/scripts/ci/run-dotnet-tests.sh
@@ -11,6 +11,7 @@ Usage: run-dotnet-tests.sh [--help]
 Runs the full .NET SDK test project. Environment variables:
   DOTNET_TEST_FILTER   Optional dotnet test filter (e.g. for a backend or transport).
   DOTNET_TEST_RUNTIME  Optional runtime identifier passed to dotnet test.
+  DOTNET_TEST_FRAMEWORK  Optional target framework (default: all project frameworks).
   DOTNET_TEST_RESULTS_DIRECTORY  Results directory (default: TestResults).
 EOF
 }
@@ -40,6 +41,7 @@ args=(
 )
 filter="${DOTNET_TEST_FILTER:-}"
 runtime="${DOTNET_TEST_RUNTIME:-}"
+framework="${DOTNET_TEST_FRAMEWORK:-}"
 
 if [[ -n "$filter" ]]; then
     args+=(--filter "$filter")
@@ -47,5 +49,8 @@ fi
 if [[ -n "$runtime" ]]; then
     args+=(--runtime "$runtime")
 fi
+if [[ -n "$framework" ]]; then
+    args+=(--framework "$framework")
+fi
 
 dotnet test "${args[@]}"
diff --git a/scripts/ci/run-dotnet-tests.test.mjs b/scripts/ci/run-dotnet-tests.test.mjs
index 582fcd6b2c..f979b8042c 100644
--- a/scripts/ci/run-dotnet-tests.test.mjs
+++ b/scripts/ci/run-dotnet-tests.test.mjs
@@ -19,7 +19,7 @@ function fromBashPath(value) {
     return value;
 }
 
-await test("runs all .NET tests with optional filter, runtime, and results directory", (t) => {
+await test("runs all .NET tests with optional filter, runtime, framework, and results directory", (t) => {
     const root = fs.mkdtempSync(path.join(os.tmpdir(), "sdk-dotnet-test-"));
     t.after(() => fs.rmSync(root, { recursive: true, force: true }));
     const argumentsPath = path.join(root, "arguments");
@@ -31,9 +31,12 @@ await test("runs all .NET tests with optional filter, runtime, and results direc
     );
     fs.chmodSync(fakeDotnet, 0o755);
 
-    for (const [filter, runtime, resultsDirectory] of [
-        ["", "", ""],
-        ["E2EBackend!=CapiOnly", "win-x64", "TestResults/inprocess"],
+    for (const [filter, runtime, framework, resultsDirectory] of [
+        ["", "", "", ""],
+        ["E2EBackend!=CapiOnly", "win-x64", "net8.0", "TestResults/inprocess"],
+        ["", "win-x64", "net472", "TestResults/subprocess"],
+        ["FullyQualifiedName~GitHub.Copilot.Test.E2E.S", "win-x64", "net8.0", "TestResults/subprocess"],
+        ["FullyQualifiedName!~GitHub.Copilot.Test.E2E.S", "win-x64", "net472", "TestResults/subprocess"],
     ]) {
         const result = spawnSync("bash", [script], {
             encoding: "utf8",
@@ -42,6 +45,7 @@ await test("runs all .NET tests with optional filter, runtime, and results direc
                 ARGUMENTS_PATH: argumentsPath,
                 DOTNET_TEST_FILTER: filter,
                 DOTNET_TEST_RUNTIME: runtime,
+                DOTNET_TEST_FRAMEWORK: framework,
                 DOTNET_TEST_RESULTS_DIRECTORY: resultsDirectory,
                 PATH: `${root}${path.delimiter}${process.env.PATH ?? ""}`,
                 WORKING_DIRECTORY_PATH: workingDirectoryPath,
@@ -67,6 +71,10 @@ await test("runs all .NET tests with optional filter, runtime, and results direc
         if (runtime) {
             assert.equal(arguments_[arguments_.indexOf("--runtime") + 1], runtime);
         }
+        assert.equal(arguments_.includes("--framework"), framework !== "");
+        if (framework) {
+            assert.equal(arguments_[arguments_.indexOf("--framework") + 1], framework);
+        }
     }
 });
 
@@ -75,6 +83,7 @@ await test("documents its environment and rejects positional arguments", () => {
     assert.equal(help.status, 0, help.stderr);
     assert.match(help.stdout, /DOTNET_TEST_FILTER/);
     assert.match(help.stdout, /DOTNET_TEST_RUNTIME/);
+    assert.match(help.stdout, /DOTNET_TEST_FRAMEWORK/);
     assert.match(help.stdout, /DOTNET_TEST_RESULTS_DIRECTORY/);
 
     const invalid = spawnSync("bash", [script, "unexpected"], { encoding: "utf8" });
diff --git a/scripts/ci/run-tasks.test.mjs b/scripts/ci/run-tasks.test.mjs
index 99c456e3c5..7c205a2255 100644
--- a/scripts/ci/run-tasks.test.mjs
+++ b/scripts/ci/run-tasks.test.mjs
@@ -95,6 +95,25 @@ for (const language of ["nodejs", "rust"]) {
     });
 }
 
+for (const checkout of [true, false]) {
+    test(`Java docs install once through the Maven wrapper before validation (${checkout ? "checkout" : "standalone"})`, async (t) => {
+        const { runTasks, preparations, calls, sdkRoot } = await taskFixture(t, checkout);
+
+        runTasks("docs", "java", { environment: {}, runtimeSource: checkout ? "checkout" : "published" });
+
+        assert.deepEqual(preparations, []);
+        assert.deepEqual(calls, [
+            { executable: "npm", args: ["run", "extract"], cwd: path.join(sdkRoot, "scripts/docs-validation") },
+            {
+                executable: process.platform === "win32" ? "mvnw.cmd" : "./mvnw",
+                args: ["install", "-Dmaven.test.skip=true", "-Dskip.test.harness=true", "-Dcopilot.native.skip.download=true"],
+                cwd: path.join(sdkRoot, "java"),
+            },
+            { executable: "npm", args: ["run", "validate:java"], cwd: path.join(sdkRoot, "scripts/docs-validation") },
+        ]);
+    });
+}
+
 async function taskFixture(t, checkout) {
     const root = fs.mkdtempSync(path.join(import.meta.dirname, ".run-tasks-"));
     t.after(() => fs.rmSync(root, { recursive: true, force: true }));
diff --git a/scripts/codegen/csharp-dictionary-roundtrip.test.ts b/scripts/codegen/csharp-dictionary-roundtrip.test.ts
new file mode 100644
index 0000000000..604ed86fc2
--- /dev/null
+++ b/scripts/codegen/csharp-dictionary-roundtrip.test.ts
@@ -0,0 +1,90 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from "node:assert/strict";
+import { spawnSync } from "node:child_process";
+import { mkdtemp, rm, writeFile } from "node:fs/promises";
+import { join } from "node:path";
+import { test } from "node:test";
+import { generateRpcCode } from "./csharp.ts";
+
+test("generated C# open dictionaries retain entries through System.Text.Json", async () => {
+    const directory = await mkdtemp(join(process.cwd(), ".csharp-dictionary-test-"));
+    let failure: unknown;
+    try {
+        const code = generateRpcCode({
+            server: {
+                sample: {
+                    read: {
+                        rpcMethod: "sample.read",
+                        params: null,
+                        result: {
+                            title: "SampleResult",
+                            type: "object",
+                            properties: {
+                                environment: { type: "object", properties: {} },
+                                settings: { type: "object", properties: {} },
+                            },
+                            required: ["environment"],
+                        },
+                    },
+                },
+            },
+        });
+        await writeFile(join(directory, "Rpc.cs"), code);
+        await writeFile(
+            join(directory, "Roundtrip.csproj"),
+            `<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net10.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+</Project>`
+        );
+        await writeFile(
+            join(directory, "Program.cs"),
+            `using System.Text.Json;
+using System.Text.Json.Nodes;
+using GitHub.Copilot.Rpc;
+
+const string json = """
+{"environment":{"COPILOT_HOME":"/isolated/config","EMPTY":""},"settings":{"model":"selected-model","enabled":false,"custom":{"nested":42}}}
+""";
+var value = JsonSerializer.Deserialize<SampleResult>(json)!;
+var actual = JsonSerializer.Serialize(value);
+if (!JsonNode.DeepEquals(JsonNode.Parse(json), JsonNode.Parse(actual)))
+    throw new Exception($"Dictionary entries lost: {actual}");
+Console.WriteLine("environment and settings dictionaries round-trip");
+
+namespace GitHub.Copilot.Rpc
+{
+    internal sealed class JsonRpc;
+    internal static class CopilotClient
+    {
+        internal static Task<T> InvokeRpcAsync<T>(JsonRpc rpc, string method, object[] args,
+            CancellationToken cancellationToken) => throw new NotSupportedException("No RPC is expected");
+    }
+}`
+        );
+        const result = spawnSync("dotnet", ["run", "--project", join(directory, "Roundtrip.csproj")], {
+            cwd: directory,
+            encoding: "utf8",
+        });
+        if (result.error) throw result.error;
+        assert.equal(result.status, 0, `${result.stdout}\n${result.stderr}`);
+        assert.match(result.stdout, /environment and settings dictionaries round-trip/);
+    } catch (error) {
+        failure = error;
+        throw error;
+    } finally {
+        try {
+            await rm(directory, { recursive: true, force: true });
+        } catch (cleanupError) {
+            if (failure) throw new AggregateError([failure, cleanupError], "Test and cleanup failed");
+            throw cleanupError;
+        }
+    }
+});
diff --git a/scripts/codegen/csharp.ts b/scripts/codegen/csharp.ts
index 1c59d64f18..fe7e8f185a 100644
--- a/scripts/codegen/csharp.ts
+++ b/scripts/codegen/csharp.ts
@@ -59,6 +59,7 @@ import {
     type SessionEventEnvelopeProperty,
 } from "./utils.js";
 import { isOmittableRequest, readLegacyParameters, validateLegacyDefinitions } from "./legacy-parameters.js";
+import { extensibleEnumValues, normalizeExtensibleEnums } from "./extensible-enums.js";
 
 const execFileAsync = promisify(execFile);
 
@@ -659,7 +660,8 @@ function getOrCreateEnum(
     enumValueDescriptions?: EnumValueDescriptions,
     explicitName?: string,
     deprecated?: boolean,
-    experimental?: boolean
+    experimental?: boolean,
+    caseSensitive = false
 ): string {
     const enumName = explicitName ?? `${parentClassName}${propName}`;
     const existing = generatedEnums.get(enumName);
@@ -698,9 +700,10 @@ function getOrCreateEnum(
     lines.push(`    /// <inheritdoc />`);
     lines.push(`    public override bool Equals(object? obj) => obj is ${enumName} other && Equals(other);`, "");
     lines.push(`    /// <inheritdoc />`);
-    lines.push(`    public bool Equals(${enumName} other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);`, "");
+    const comparison = caseSensitive ? "Ordinal" : "OrdinalIgnoreCase";
+    lines.push(`    public bool Equals(${enumName} other) => string.Equals(Value, other.Value, StringComparison.${comparison});`, "");
     lines.push(`    /// <inheritdoc />`);
-    lines.push(`    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);`, "");
+    lines.push(`    public override int GetHashCode() => StringComparer.${comparison}.GetHashCode(Value);`, "");
     lines.push(`    /// <inheritdoc />`);
     lines.push(`    public override string ToString() => Value;`, "");
     lines.push(`    /// <summary>Provides a <see cref="JsonConverter{${enumName}}"/> for serializing <see cref="${enumName}"/> instances.</summary>`);
@@ -1310,7 +1313,7 @@ function resolveSessionPropertyType(
         }
 
         if (refSchema.enum && Array.isArray(refSchema.enum)) {
-            const enumName = getOrCreateEnum(className, "", refSchema.enum as string[], enumOutput, refSchema.description, getEnumValueDescriptions(refSchema), undefined, isSchemaDeprecated(refSchema), isSchemaExperimental(refSchema));
+            const enumName = getOrCreateEnum(className, "", refSchema.enum as string[], enumOutput, refSchema.description, getEnumValueDescriptions(refSchema), undefined, isSchemaDeprecated(refSchema), isSchemaExperimental(refSchema), extensibleEnumValues(refSchema) !== undefined);
             return isRequired ? enumName : `${enumName}?`;
         }
 
@@ -1359,7 +1362,7 @@ function resolveSessionPropertyType(
         failUnmappable(`oneOf without discriminator (${parentClassName}.${propName})`, propSchema);
     }
     if (propSchema.enum && Array.isArray(propSchema.enum)) {
-        const enumName = getOrCreateEnum(parentClassName, propName, propSchema.enum as string[], enumOutput, propSchema.description, getEnumValueDescriptions(propSchema), propSchema.title as string | undefined, isSchemaDeprecated(propSchema), isSchemaExperimental(propSchema));
+        const enumName = getOrCreateEnum(parentClassName, propName, propSchema.enum as string[], enumOutput, propSchema.description, getEnumValueDescriptions(propSchema), propSchema.title as string | undefined, isSchemaDeprecated(propSchema), isSchemaExperimental(propSchema), extensibleEnumValues(propSchema) !== undefined);
         return isRequired ? enumName : `${enumName}?`;
     }
     if (propSchema.type === "object" && propSchema.properties) {
@@ -1692,6 +1695,10 @@ export async function generateSessionEvents(schemaPath?: string): Promise<void>
 // ══════════════════════════════════════════════════════════════════════════════
 
 let emittedRpcClassSchemas = new Map<string, string>();
+// Class names reachable from a public method's params or result. A type shared
+// with an internal method must stay public regardless of which method emits it
+// first; see the upgrade in `emitRpcClass`.
+const publicReachableRpcClasses = new Set<string>();
 const nonSessionRequestTypeNames = new Set<string>();
 let emittedRpcEnumResultTypes = new Set<string>();
 let experimentalRpcTypes = new Set<string>();
@@ -1887,9 +1894,12 @@ function resolveRpcType(schema: JSONSchema7, isRequired: boolean, parentClassNam
     if (isOpaqueJson(schema)) {
         return isRequired ? "JsonElement" : "JsonElement?";
     }
-    if (schema.type === "object" && schema.additionalProperties === true &&
+    if (schema.type === "object" && schema.additionalProperties !== false &&
         (!schema.properties || Object.keys(schema.properties).length === 0)) {
-        return isRequired ? "IDictionary<string, JsonElement>" : "IDictionary<string, JsonElement>?";
+        const valueType = typeof schema.additionalProperties === "object"
+            ? resolveRpcType(schema.additionalProperties, true, parentClassName, `${propName}Value`, classes)
+            : "JsonElement";
+        return isRequired ? `IDictionary<string, ${valueType}>` : `IDictionary<string, ${valueType}>?`;
     }
     // Handle $ref by resolving against schema definitions and generating the referenced class
     if (schema.$ref) {
@@ -1900,11 +1910,12 @@ function resolveRpcType(schema: JSONSchema7, isRequired: boolean, parentClassNam
         }
 
         if (refSchema.enum && Array.isArray(refSchema.enum)) {
-            const enumName = getOrCreateEnum(typeName, "", refSchema.enum as string[], rpcEnumOutput, refSchema.description, getEnumValueDescriptions(refSchema), undefined, isSchemaDeprecated(refSchema), isSchemaExperimental(refSchema) || experimentalRpcTypes.has(typeName));
+            const enumName = getOrCreateEnum(typeName, "", refSchema.enum as string[], rpcEnumOutput, refSchema.description, getEnumValueDescriptions(refSchema), undefined, isSchemaDeprecated(refSchema), isSchemaExperimental(refSchema) || experimentalRpcTypes.has(typeName), extensibleEnumValues(refSchema) !== undefined);
             return isRequired ? enumName : `${enumName}?`;
         }
 
-        if (refSchema.type === "object" && refSchema.properties) {
+        if (refSchema.type === "object" && refSchema.properties &&
+            (Object.keys(refSchema.properties).length > 0 || refSchema.additionalProperties === false)) {
             const cls = emitRpcClass(typeName, refSchema, "public", classes);
             if (cls) classes.push(cls);
             return isRequired ? typeName : `${typeName}?`;
@@ -1987,6 +1998,7 @@ function resolveRpcType(schema: JSONSchema7, isRequired: boolean, parentClassNam
             explicitName,
             isSchemaDeprecated(schema),
             isSchemaExperimental(schema) || experimentalRpcTypes.has(generatedEnumName),
+            extensibleEnumValues(schema) !== undefined,
         );
         return isRequired ? enumName : `${enumName}?`;
     }
@@ -1997,7 +2009,8 @@ function resolveRpcType(schema: JSONSchema7, isRequired: boolean, parentClassNam
     }
     if (schema.type === "array" && schema.items) {
         const items = schema.items as JSONSchema7;
-        if (items.type === "object" && items.properties) {
+        if (items.type === "object" && items.properties &&
+            (Object.keys(items.properties).length > 0 || items.additionalProperties === false)) {
             const itemClass = (items.title as string) ?? `${parentClassName}${singularPascal(propName)}`;
             classes.push(emitRpcClass(itemClass, items, "public", classes));
             return isRequired ? `IList<${itemClass}>` : `IList<${itemClass}>?`;
@@ -2005,11 +2018,6 @@ function resolveRpcType(schema: JSONSchema7, isRequired: boolean, parentClassNam
         const itemType = resolveRpcType(items, true, parentClassName, `${propName}Item`, classes);
         return isRequired ? `IList<${itemType}>` : `IList<${itemType}>?`;
     }
-    if (schema.type === "object" && schema.additionalProperties && typeof schema.additionalProperties === "object") {
-        const vs = schema.additionalProperties as JSONSchema7;
-        const valueType = resolveRpcType(vs, true, parentClassName, `${propName}Value`, classes);
-        return isRequired ? `IDictionary<string, ${valueType}>` : `IDictionary<string, ${valueType}>?`;
-    }
     return schemaTypeToCSharp(schema, isRequired, rpcKnownTypes, propName);
 }
 
@@ -2035,6 +2043,13 @@ function emitRpcClass(
         (effectiveSchema as Record<string, unknown>).visibility === "internal"
     ) {
         visibility = "internal";
+    } else if (publicReachableRpcClasses.has(className)) {
+        // The caller's default follows the *method* being emitted, and only the
+        // first emission of a class name wins. When an internal method shares a
+        // type with a public one and is emitted first, that would freeze the
+        // type as internal and leave the public method referencing it
+        // (CS0050/CS0051). Reachability from a public method decides instead.
+        visibility = "public";
     }
     const schemaKey = stableStringify(effectiveSchema);
     const existingSchema = emittedRpcClassSchemas.get(className);
@@ -2297,7 +2312,7 @@ function emitServerInstanceMethod(
         const opaqueListOptional = naturalType === "IList<JsonElement>?";
         const opaque = opaqueRequired || opaqueOptional || opaqueListRequired || opaqueListOptional;
         const csType = opaqueRequired
-            ? "object"
+            ? "object?"
             : opaqueOptional
                 ? "object?"
                 : opaqueListRequired
@@ -2307,7 +2322,7 @@ function emitServerInstanceMethod(
                         : naturalType;
         sigParams.push(`${csType} ${pName}${isReq ? "" : " = null"}`);
         const assignedValue = opaqueRequired
-            ? `CopilotClient.ToJsonElementForWire(${pName})!.Value`
+            ? `CopilotClient.ToJsonElementForWire(${pName}) ?? JsonElement.Parse("null")`
             : opaqueOptional
                 ? `CopilotClient.ToJsonElementForWire(${pName})`
                 : opaqueListRequired
@@ -2316,7 +2331,7 @@ function emitServerInstanceMethod(
                         ? `${pName}?.Select(static v => CopilotClient.ToJsonElementForWire(v)!.Value).ToList()`
                         : pName;
         bodyAssignments.push(`${csharpName} = ${assignedValue}`);
-        if (opaqueRequired || opaqueListRequired || (!opaque && requiresArgumentNullCheck(csType, isReq))) {
+        if (opaqueListRequired || (!opaque && requiresArgumentNullCheck(csType, isReq))) {
             argumentNullChecks.push(`${indent}    ArgumentNullException.ThrowIfNull(${pName});`);
         }
         if (opaqueListRequired || (!opaque && requiresArgumentNullCheck(csType, isReq))) {
@@ -2349,7 +2364,18 @@ function emitServerInstanceMethod(
     }
     if (requestClassName && bodyAssignments.length > 0) {
         lines.push(`${indent}    var ${localRequestName} = new ${requestClassName} { ${bodyAssignments.join(", ")} };`);
-        if (!isVoidSchema(resultSchema)) {
+        if (
+            method.rpcMethod === "user.settings.applyTopKey" ||
+            method.rpcMethod === "repo.settings.writeKey"
+        ) {
+            lines.push(`${indent}    var payload = JsonSerializer.SerializeToNode(${localRequestName}, RpcJsonContext.Default.${requestClassName})!.AsObject();`);
+            lines.push(`${indent}    if (${localRequestName}.Delete != true && ${localRequestName}.Value is null) payload["value"] = null;`);
+            if (!isVoidSchema(resultSchema)) {
+                lines.push(`${indent}    return await CopilotClient.InvokeRpcAsync<${resultClassName}>(_rpc, "${method.rpcMethod}", [payload], cancellationToken);`);
+            } else {
+                lines.push(`${indent}    await CopilotClient.InvokeRpcAsync(_rpc, "${method.rpcMethod}", [payload], cancellationToken);`);
+            }
+        } else if (!isVoidSchema(resultSchema)) {
             lines.push(`${indent}    return await CopilotClient.InvokeRpcAsync<${resultClassName}>(_rpc, "${method.rpcMethod}", [${localRequestName}], cancellationToken);`);
         } else {
             lines.push(`${indent}    await CopilotClient.InvokeRpcAsync(_rpc, "${method.rpcMethod}", [${localRequestName}], cancellationToken);`);
@@ -2362,6 +2388,24 @@ function emitServerInstanceMethod(
         }
     }
     lines.push(`${indent}}`);
+    if (
+        method.rpcMethod === "managedSettings.resolve" &&
+        paramEntries.some(([name]) => name === "workingDirectory")
+    ) {
+        lines.push("");
+        lines.push(
+            ...xmlDocComment(
+                "Compatibility overload preserving the positional CancellationToken parameter from before workingDirectory was added.",
+                indent
+            )
+        );
+        lines.push(
+            `${indent}${methodVisibility} ${taskType} ${methodName}Async(string? selectionId, string? gitHubToken, string? clientName, CancellationToken cancellationToken)`
+        );
+        lines.push(
+            `${indent}    => ${methodName}Async(selectionId, gitHubToken, clientName, workingDirectory: null, cancellationToken);`
+        );
+    }
     if (legacyEntries && requestClassName) {
         emitRequestObjectMethod(methodName, method, requestClassName, requestClassName, undefined, resultClassName, lines, indent, groupExperimental, groupDeprecated, requiredMemberNames);
     }
@@ -2515,7 +2559,7 @@ function emitSessionMethod(key: string, method: RpcMethod, lines: string[], clas
             const opaqueListOptional = naturalType === "IList<JsonElement>?";
             const opaque = opaqueRequired || opaqueOptional || opaqueListRequired || opaqueListOptional;
             const csType = opaqueRequired
-                ? "object"
+                ? "object?"
                 : opaqueOptional
                     ? "object?"
                     : opaqueListRequired
@@ -2525,7 +2569,7 @@ function emitSessionMethod(key: string, method: RpcMethod, lines: string[], clas
                             : naturalType;
             sigParams.push(`${csType} ${pName}${isReq ? "" : " = null"}`);
             const assignedValue = opaqueRequired
-                ? `CopilotClient.ToJsonElementForWire(${pName})!.Value`
+                ? `CopilotClient.ToJsonElementForWire(${pName}) ?? JsonElement.Parse("null")`
                 : opaqueOptional
                     ? `CopilotClient.ToJsonElementForWire(${pName})`
                     : opaqueListRequired
@@ -2534,7 +2578,7 @@ function emitSessionMethod(key: string, method: RpcMethod, lines: string[], clas
                             ? `${pName}?.Select(static v => CopilotClient.ToJsonElementForWire(v)!.Value).ToList()`
                             : pName;
             bodyAssignments.push(`${csharpName} = ${assignedValue}`);
-            if (opaqueRequired || opaqueListRequired || (!opaque && requiresArgumentNullCheck(csType, isReq))) {
+            if (opaqueListRequired || (!opaque && requiresArgumentNullCheck(csType, isReq))) {
                 argumentNullChecks.push(`${indent}    ArgumentNullException.ThrowIfNull(${pName});`);
             }
             if (opaqueListRequired || (!opaque && requiresArgumentNullCheck(csType, isReq))) {
@@ -2566,7 +2610,18 @@ function emitSessionMethod(key: string, method: RpcMethod, lines: string[], clas
     lines.push(`${indent}    _session.ThrowIfDisposed();`);
     lines.push("");
     lines.push(`${indent}    var ${localRequestName} = new ${wireRequestClassName} { ${bodyAssignments.join(", ")} };`);
-    if (!isVoidSchema(resultSchema)) {
+    if (
+        method.rpcMethod === "user.settings.applyTopKey" ||
+        method.rpcMethod === "repo.settings.writeKey"
+    ) {
+        lines.push(`${indent}    var payload = JsonSerializer.SerializeToNode(${localRequestName}, RpcJsonContext.Default.${wireRequestClassName})!.AsObject();`);
+        lines.push(`${indent}    if (${localRequestName}.Delete != true && ${localRequestName}.Value is null) payload["value"] = null;`);
+        if (!isVoidSchema(resultSchema)) {
+            lines.push(`${indent}    return await CopilotClient.InvokeRpcAsync<${resultClassName}>(_session.Rpc, "${method.rpcMethod}", [payload], cancellationToken);`, `${indent}}`);
+        } else {
+            lines.push(`${indent}    await CopilotClient.InvokeRpcAsync(_session.Rpc, "${method.rpcMethod}", [payload], cancellationToken);`, `${indent}}`);
+        }
+    } else if (!isVoidSchema(resultSchema)) {
         lines.push(`${indent}    return await CopilotClient.InvokeRpcAsync<${resultClassName}>(_session.Rpc, "${method.rpcMethod}", [${localRequestName}], cancellationToken);`, `${indent}}`);
     } else {
         lines.push(`${indent}    await CopilotClient.InvokeRpcAsync(_session.Rpc, "${method.rpcMethod}", [${localRequestName}], cancellationToken);`, `${indent}}`);
@@ -2903,9 +2958,10 @@ export function generateRpcCode(
     externalJsonSerializableRefs: Map<string, Set<string>> = new Map(),
     externalValueTypes: Set<string> = new Set()
 ): string {
-    schema = cloneSchemaForCodegen(schema);
+    schema = normalizeExtensibleEnums(cloneSchemaForCodegen(schema));
     omitUnrepresentableInternalProperties(schema);
     emittedRpcClassSchemas.clear();
+    publicReachableRpcClasses.clear();
     nonSessionRequestTypeNames.clear();
     emittedRpcEnumResultTypes.clear();
     experimentalRpcTypes.clear();
@@ -2947,6 +3003,18 @@ export function generateRpcCode(
             }
         }
     }
+    for (const name of collectRpcMethodReferencedDefinitionNames(
+        allMethods.filter((method) => method.visibility !== "internal"),
+        rpcDefinitions
+    )) {
+        publicReachableRpcClasses.add(typeToClassName(name));
+    }
+    // A method's own request wrapper is deliberately emitted `internal` at its
+    // call site; public methods take the individual parameters instead. Only
+    // types shared *inside* a signature need the upgrade, so drop the wrappers.
+    for (const method of allMethods) {
+        publicReachableRpcClasses.delete(paramsTypeName(method));
+    }
     const classes: string[] = [];
 
     let serverRpcParts: string[] = [];
diff --git a/scripts/codegen/extensible-enums.ts b/scripts/codegen/extensible-enums.ts
new file mode 100644
index 0000000000..8ab92cf774
--- /dev/null
+++ b/scripts/codegen/extensible-enums.ts
@@ -0,0 +1,26 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+/** Known values of an open string contract; this annotation does not constrain the wire schema. */
+export function extensibleEnumValues(schema: object): string[] | undefined {
+    const values = (schema as Record<string, unknown>)["x-extensible-enum"];
+    if (values === undefined) return undefined;
+    if ((schema as Record<string, unknown>).type !== "string" ||
+        !Array.isArray(values) || values.length === 0 || !values.every((value) => typeof value === "string")) {
+        throw new Error("x-extensible-enum requires a string schema with known string values");
+    }
+    return values;
+}
+
+/** Supply known enum values to generators without rewriting other schema constraints. */
+export function normalizeExtensibleEnums<T>(schema: T): T {
+    if (Array.isArray(schema)) {
+        for (const item of schema) normalizeExtensibleEnums(item);
+    } else if (schema !== null && typeof schema === "object") {
+        const knownValues = extensibleEnumValues(schema);
+        if (knownValues) (schema as Record<string, unknown>).enum = knownValues;
+        for (const value of Object.values(schema)) normalizeExtensibleEnums(value);
+    }
+    return schema;
+}
diff --git a/scripts/codegen/go.ts b/scripts/codegen/go.ts
index 5e01ee7bf2..b2a75aea37 100644
--- a/scripts/codegen/go.ts
+++ b/scripts/codegen/go.ts
@@ -60,6 +60,7 @@ import {
     type SessionEventEnvelopeProperty,
 } from "./utils.js";
 import { validateLegacyRequests, validateLegacyDefinitions } from "./legacy-parameters.js";
+import { normalizeExtensibleEnums } from "./extensible-enums.js";
 
 const execFileAsync = promisify(execFile);
 
@@ -3924,7 +3925,7 @@ async function generateRpc(schemaPath?: string): Promise<void> {
     console.log("Go: generating RPC types...");
 
     const resolvedPath = schemaPath ?? (await getApiSchemaPath());
-    const schema = propagateInternalVisibility(fixNullableRequiredRefsInApiSchema(cloneSchemaForCodegen((await loadSchemaJson(resolvedPath)) as ApiSchema)) as JSONSchema7) as unknown as ApiSchema;
+    const schema = propagateInternalVisibility(normalizeExtensibleEnums(fixNullableRequiredRefsInApiSchema(cloneSchemaForCodegen((await loadSchemaJson(resolvedPath)) as ApiSchema))) as JSONSchema7) as unknown as ApiSchema;
 
     const allMethods = [
         ...collectRpcMethods(schema.server || {}),
@@ -4089,9 +4090,10 @@ async function generateRpc(schemaPath?: string): Promise<void> {
         }
     }
     for (const typeName of internalTypeNames) {
+        const emittedTypeName = resolveType(typeName);
         generatedTypeCode = generatedTypeCode.replace(
-            new RegExp(`^(type ${typeName} struct)`, "m"),
-            `// Internal: ${typeName} is an internal SDK API and is not part of the public surface.\n$1`
+            new RegExp(`^(type ${escapeRegExp(emittedTypeName)} struct)`, "m"),
+            `// Internal: ${emittedTypeName} is an internal SDK API and is not part of the public surface.\n$1`
         );
     }
     // Remove trailing blank lines before appending.
@@ -4302,6 +4304,7 @@ function emitMethod(lines: string[], receiver: string, name: string, method: Rpc
     const paramsType = hasParams ? resolveType(goParamsTypeName(method)) : "";
     const hasRequiredNonSessionParams = nonSessionParams.some((name) => requiredParams.has(name));
     const paramsAreOptional = hasParams && !!method.params && !!getNullableInner(method.params) && !hasRequiredNonSessionParams;
+    const supportsExplicitNullValue = method.rpcMethod === "user.settings.edit";
 
     // For wrapper-level methods, access fields through a.common; for service type aliases, use a directly
     const clientRef = isWrapper ? "a.common.client" : "a.client";
@@ -4360,14 +4363,41 @@ function emitMethod(lines: string[], receiver: string, name: string, method: Rpc
         }
         lines.push(`\traw, err := ${clientRef}.Request(ctx, "${method.rpcMethod}", req)`);
     } else {
-        if (method.rpcMethod === "managedSettings.resolve") {
-            // A typed nil inside Request's any argument marshals as null, not omitted params.
-            lines.push(`\tif ${paramsRef} == nil {`);
-            lines.push(`\t\t${paramsRef} = &${paramsType}{}`);
+        if (hasParams && supportsExplicitNullValue) {
+            lines.push(`\treq := map[string]any{}`);
+            lines.push(`\tif ${paramsRef} != nil {`);
+            for (const pName of nonSessionParams) {
+                const field = fields.get(paramsType)?.get(pName);
+                const goField = field?.name ?? toGoFieldName(pName);
+                const goType = field?.type;
+                const isOptional = !requiredParams.has(pName);
+                if (isOptional) {
+                    lines.push(`\t\tif ${paramsRef}.${goField} != nil {`);
+                    const valueExpr = goOptionalFieldNeedsDereference(goType) ? `*${paramsRef}.${goField}` : `${paramsRef}.${goField}`;
+                    lines.push(`\t\t\treq["${pName}"] = ${valueExpr}`);
+                    lines.push(`\t\t}`);
+                } else {
+                    lines.push(`\t\treq["${pName}"] = ${paramsRef}.${goField}`);
+                }
+            }
+            const operationField = fields.get(paramsType)?.get("operation")?.name ?? toGoFieldName("operation");
+            lines.push(`\t\tif ${paramsRef}.${operationField} != SettingsEditOperationRemove {`);
+            lines.push(`\t\t\tif _, ok := req["value"]; !ok {`);
+            lines.push(`\t\t\t\treq["value"] = nil`);
+            lines.push(`\t\t\t}`);
+            lines.push(`\t\t}`);
             lines.push(`\t}`);
+            lines.push(`\traw, err := ${clientRef}.Request(ctx, "${method.rpcMethod}", req)`);
+        } else {
+            if (method.rpcMethod === "managedSettings.resolve") {
+                // A typed nil inside Request's any argument marshals as null, not omitted params.
+                lines.push(`\tif ${paramsRef} == nil {`);
+                lines.push(`\t\t${paramsRef} = &${paramsType}{}`);
+                lines.push(`\t}`);
+            }
+            const arg = hasParams ? paramsRef : "nil";
+            lines.push(`\traw, err := ${clientRef}.Request(ctx, "${method.rpcMethod}", ${arg})`);
         }
-        const arg = hasParams ? paramsRef : "nil";
-        lines.push(`\traw, err := ${clientRef}.Request(ctx, "${method.rpcMethod}", ${arg})`);
     }
 
     lines.push(`\tif err != nil {`);
diff --git a/scripts/codegen/python.ts b/scripts/codegen/python.ts
index 3ca936f461..ceb5598d80 100644
--- a/scripts/codegen/python.ts
+++ b/scripts/codegen/python.ts
@@ -9,6 +9,7 @@
 import fs from "fs/promises";
 import type { JSONSchema7, JSONSchema7Definition } from "json-schema";
 import { fileURLToPath } from "url";
+import { extensibleEnumValues } from "./extensible-enums.js";
 import {
     addManagedApprovalRequiredToPermissionRequests,
     cloneSchemaForCodegen,
@@ -114,16 +115,7 @@ function rewriteExternalRefsForPython(schema: JSONSchema7 & { definitions?: Reco
         if (!schema.definitions) schema.definitions = {};
         for (const placeholder of placeholderNames.keys()) {
             if (!schema.definitions[placeholder]) {
-                const markerProperty = `__externalRefMarker_${placeholder}`;
-                schema.definitions[placeholder] = {
-                    type: "object",
-                    additionalProperties: false,
-                    title: placeholder,
-                    properties: {
-                        [markerProperty]: { type: "string" },
-                    },
-                    required: [markerProperty],
-                };
+                schema.definitions[placeholder] = pythonReferencePlaceholder(placeholder);
             }
         }
     }
@@ -131,6 +123,17 @@ function rewriteExternalRefsForPython(schema: JSONSchema7 & { definitions?: Reco
     return { placeholderNames, imports };
 }
 
+function pythonReferencePlaceholder(placeholder: string): JSONSchema7 {
+    const markerProperty = `__externalRefMarker_${placeholder}`;
+    return {
+        type: "object",
+        additionalProperties: false,
+        title: placeholder,
+        properties: { [markerProperty]: { type: "string" } },
+        required: [markerProperty],
+    };
+}
+
 function placeholderToQuicktypeIdentifier(placeholder: string): string {
     return placeholder
         .replace(/^_+/, "")
@@ -297,6 +300,7 @@ function preservePythonSessionEventConstructorOrder(schema: JSONSchema7): void {
  */
 const PY_RPC_APPEND_LAST_FIELDS: ReadonlyArray<readonly [string, string]> = [
     ["ConnectorReconcileRequest", "forceConnectorName"],
+    ["SessionModelList", "auto"],
 ];
 
 /**
@@ -308,10 +312,32 @@ export function pythonAppendLastFieldsPresentIn(
     definitions: Record<string, JSONSchema7Definition>,
     fields: ReadonlyArray<readonly [string, string]> = PY_RPC_APPEND_LAST_FIELDS
 ): ReadonlyArray<readonly [string, string]> {
-    return fields.filter(([className, propertyName]) => {
+    const result = fields.filter(([className, propertyName]) => {
         const definition = definitions[className];
         return typeof definition === "object" && Object.hasOwn(definition.properties ?? {}, propertyName);
     });
+    const seen = new Set(result.map(([className, propertyName]) => `${className}.${propertyName}`));
+
+    for (const [className, definition] of Object.entries(definitions)) {
+        if (typeof definition !== "object") continue;
+        // Quicktype merges inline union variants into the definition's dataclass.
+        const shapes = [definition, ...(definition.anyOf ?? definition.oneOf ?? [])];
+        for (const [propertyName, property] of shapes.flatMap((shape) =>
+            typeof shape === "object" ? Object.entries(shape.properties ?? {}) : []
+        )) {
+            if (
+                typeof property !== "object" ||
+                property["x-copilot-sdk-append-last"] !== true ||
+                seen.has(`${className}.${propertyName}`)
+            ) {
+                continue;
+            }
+            result.push([className, propertyName]);
+            seen.add(`${className}.${propertyName}`);
+        }
+    }
+
+    return result;
 }
 
 function preservePythonRpcStringDateFields(definitions: Record<string, JSONSchema7>): void {
@@ -1828,6 +1854,58 @@ function pythonParamsTypeName(method: RpcMethod): string {
     return getRpcSchemaTypeName(schema, fallback);
 }
 
+function applyExplicitNullableFieldPresenceSentinel(
+    code: string,
+    resolveType: (name: string) => string
+): string {
+    const escapeRegex = (value: string): string => value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+    const explicitNullableFields: Array<{ className: string; jsonName: string; pyName: string }> = [
+        {
+            className: resolveType("UserSettingsApplyTopKeyRequest"),
+            jsonName: "value",
+            pyName: "value",
+        },
+        {
+            className: resolveType("RepoSettingsWriteKeyRequest"),
+            jsonName: "value",
+            pyName: "value",
+        },
+        {
+            className: resolveType("UserSettingsEditRequest"),
+            jsonName: "value",
+            pyName: "value",
+        },
+    ];
+
+    let result = code;
+    for (const { className, jsonName, pyName } of explicitNullableFields) {
+        const classPattern = new RegExp(
+            `(@dataclass\\r?\\nclass ${escapeRegex(className)}\\b[\\s\\S]*?\\r?\\n)(?=@dataclass\\r?\\nclass |class\\s+\\w+\\(Enum\\):|def\\s+\\w+\\(|$)`,
+            "g"
+        );
+        result = result.replace(classPattern, (classBlock) => {
+            let next = classBlock;
+            next = next.replace(
+                new RegExp(`^(\\s{4}${escapeRegex(pyName)}:\\s[^=\\r\\n]+\\=\\s*)None(\\r?\\n)`, "m"),
+                "$1UNSET_SENTINEL$2"
+            );
+            next = next.replace(
+                new RegExp(
+                    `^(\\s{8}${escapeRegex(pyName)}\\s*=\\s*)(.+?)obj\\.get\\("${escapeRegex(jsonName)}"\\)(.*)$`,
+                    "m"
+                ),
+                `$1$2obj["${jsonName}"]$3 if "${jsonName}" in obj else UNSET_SENTINEL`
+            );
+            next = next.replace(
+                new RegExp(`^(\\s{8}if\\s+self\\.${escapeRegex(pyName)}\\s+is\\s+not\\s+)None(\\s*:\\s*\\r?\\n)`, "m"),
+                "$1UNSET_SENTINEL$2"
+            );
+            return next;
+        });
+    }
+    return result;
+}
+
 // ── Session Events ──────────────────────────────────────────────────────────
 // ── Session Events (custom codegen — dedicated per-event payload types) ─────
 
@@ -2260,10 +2338,17 @@ function resolvePyNamedUnion(
     };
 }
 
+/**
+ * Enums whose contract defines `unknown` as "outside the supported vocabulary". The runtime
+ * contract decodes later values as `unknown` (`#[serde(other)]`); Python does the same instead
+ * of failing the whole event.
+ */
+const COLLAPSE_UNKNOWN_PYTHON_ENUMS = new Set(["PermissionApprovalEvaluationReasonCode"]);
+
 function getOrCreatePyEnum(
     enumName: string,
     values: string[],
-    ctx: PyCodegenCtx,
+    ctx: Pick<PyCodegenCtx, "enumsByName" | "enums" | "definitions">,
     description?: string,
     enumValueDescriptions?: EnumValueDescriptions,
     deprecated?: boolean,
@@ -2296,6 +2381,7 @@ function getOrCreatePyEnum(
         }
         lines.push(`    ${toEnumMemberName(value)} = ${JSON.stringify(value)}`);
     }
+    const open = extensibleEnumValues(resolveSchema({ $ref: `#/$defs/${enumName}` }, ctx.definitions) ?? {}) !== undefined;
     if (enumName === "ToolExecutionCompleteFileEditKind") {
         lines.push(``);
         lines.push(`    @classmethod`);
@@ -2306,6 +2392,22 @@ function getOrCreatePyEnum(
         lines.push(`        member._name_ = "UNKNOWN"`);
         lines.push(`        member._value_ = value`);
         lines.push(`        return cls._value2member_map_.setdefault(value, member)`);
+    } else if (COLLAPSE_UNKNOWN_PYTHON_ENUMS.has(enumName)) {
+        if (!values.includes("unknown")) throw new Error(`${enumName} has no "unknown" value to collapse into`);
+        lines.push(``);
+        lines.push(`    @classmethod`);
+        lines.push(`    def _missing_(cls, value: object) -> "${enumName} | None":`);
+        lines.push(`        return cls.UNKNOWN if isinstance(value, str) else None`);
+    } else if (open) {
+        lines.push("");
+        lines.push("    @classmethod");
+        lines.push("    def _missing_(cls, value: object):");
+        lines.push("        if not isinstance(value, str):");
+        lines.push("            return None");
+        lines.push("        member = object.__new__(cls)");
+        lines.push("        member._name_ = None");
+        lines.push("        member._value_ = value");
+        lines.push("        return cls._value2member_map_.setdefault(value, member)");
     }
     ctx.enumsByName.set(enumName, enumName);
     ctx.enums.push(lines.join("\n"));
@@ -3315,7 +3417,8 @@ async function generateRpc(schemaPath?: string, sessionEventsSchema?: JSONSchema
     const { FetchingJSONSchemaStore, InputData, JSONSchemaInput, quicktype } = await import("quicktype-core");
 
     const resolvedPath = schemaPath ?? (await getApiSchemaPath());
-    let schema = fixNullableRequiredRefsInApiSchema(cloneSchemaForCodegen((await loadSchemaJson(resolvedPath)) as ApiSchema));
+    const sourceSchema = fixNullableRequiredRefsInApiSchema(cloneSchemaForCodegen((await loadSchemaJson(resolvedPath)) as ApiSchema));
+    let schema = sourceSchema;
     if (sessionEventsSchema) {
         const sharedDefinitions = findSharedSchemaDefinitions(
             schema as unknown as Record<string, unknown>,
@@ -3385,6 +3488,25 @@ async function generateRpc(schemaPath?: string, sessionEventsSchema?: JSONSchema
 
     const allDefinitions = combinedSchema.definitions! as Record<string, JSONSchema7>;
     preservePythonRpcStringDateFields(allDefinitions);
+    const managedOperationProperties = resolveObjectSchema(
+        allDefinitions.ManagedPermissionOperation,
+        rpcDefinitions
+    )?.properties;
+    const managedOperationKind = managedOperationProperties?.kind;
+    if (managedOperationProperties && managedOperationKind && typeof managedOperationKind === "object") {
+        const values =
+            managedOperationKind.enum ??
+            (typeof managedOperationKind.const === "string" ? [managedOperationKind.const] : undefined);
+        if (!values?.every((value): value is string => typeof value === "string")) {
+            throw new Error("Expected a string discriminator for ManagedPermissionOperation.kind");
+        }
+        allDefinitions.ManagedPermissionOperationKind = {
+            type: "string",
+            enum: values,
+            description: managedOperationKind.description,
+        };
+        managedOperationProperties.kind = { $ref: "#/definitions/ManagedPermissionOperationKind" };
+    }
     const allDefinitionCollections: DefinitionCollections = {
         definitions: { ...(combinedSchema.$defs ?? {}), ...allDefinitions },
         $defs: { ...allDefinitions, ...(combinedSchema.$defs ?? {}) },
@@ -3404,6 +3526,30 @@ async function generateRpc(schemaPath?: string, sessionEventsSchema?: JSONSchema
     };
     const externalRefs = rewriteExternalRefsForPython(singleSchema as JSONSchema7 & { definitions?: Record<string, JSONSchema7> });
     const externalEnumNames = collectPythonExternalEnumNames(sessionEventsSchema, externalRefs.placeholderNames);
+    // Independently versioned enums must not be structurally merged by quicktype.
+    // Hide them from quicktype's enum merging, then restore them with our enum emitter.
+    const distinctEnums: Pick<PyCodegenCtx, "enumsByName" | "enums"> = {
+        enumsByName: new Map(),
+        enums: [],
+    };
+    for (const name of ["ConnectorDiscoveryAvailability", "ManagedPermissionOperationKind"]) {
+        const definition = allDefinitions[name];
+        if (!definition) continue;
+        if (!definition.enum?.every((value): value is string => typeof value === "string")) {
+            throw new Error(`Expected a string enum for ${name}`);
+        }
+        getOrCreatePyEnum(
+            name,
+            definition.enum,
+            distinctEnums,
+            definition.description,
+            getEnumValueDescriptions(definition)
+        );
+        const placeholder = `__ExternalRef_${name}`;
+        (singleSchema.definitions as Record<string, JSONSchema7>)[name] = pythonReferencePlaceholder(placeholder);
+        externalRefs.placeholderNames.set(placeholder, name);
+        externalEnumNames.add(name);
+    }
     const externalDiscriminatedUnionNames = collectPythonExternalDiscriminatedUnionNames(
         sessionEventsSchema,
         externalRefs.placeholderNames
@@ -3469,6 +3615,7 @@ async function generateRpc(schemaPath?: string, sessionEventsSchema?: JSONSchema
         externalEnumNames,
         externalDiscriminatedUnionNames
     );
+    typesCode += `\n\n${distinctEnums.enums.join("\n\n")}\n`;
     typesCode = removeShadowedSessionEventEnumsForPython(
         typesCode,
         externalRefs.imports.get(".session_events") ?? new Set<string>(),
@@ -3684,6 +3831,7 @@ import dateutil.parser
 
 T = TypeVar("T")
 EnumT = TypeVar("EnumT", bound=Enum)
+UNSET_SENTINEL = object()
 
 `);
     lines.push(typesCode);
@@ -3725,25 +3873,28 @@ def _patch_model_capabilities(data: dict) -> dict:
 
 `);
 
-    // Emit RPC wrapper classes
-    if (schema.server) {
-        const publicNode = filterNodeByVisibility(schema.server, "public");
+    // Imports change where types live, not how their wire values are decoded.
+    const projectionDefinitions = rpcDefinitions;
+    rpcDefinitions = collectDefinitionCollections(sourceSchema as Record<string, unknown>);
+    if (sourceSchema.server) {
+        const publicNode = filterNodeByVisibility(sourceSchema.server, "public");
         if (publicNode) emitRpcWrapper(lines, publicNode, false, resolveType, "");
-        const internalNode = filterNodeByVisibility(schema.server, "internal");
+        const internalNode = filterNodeByVisibility(sourceSchema.server, "internal");
         if (internalNode) emitRpcWrapper(lines, internalNode, false, resolveType, "_Internal");
     }
-    if (schema.session) {
-        const publicNode = filterNodeByVisibility(schema.session, "public");
+    if (sourceSchema.session) {
+        const publicNode = filterNodeByVisibility(sourceSchema.session, "public");
         if (publicNode) emitRpcWrapper(lines, publicNode, true, resolveType, "");
-        const internalNode = filterNodeByVisibility(schema.session, "internal");
+        const internalNode = filterNodeByVisibility(sourceSchema.session, "internal");
         if (internalNode) emitRpcWrapper(lines, internalNode, true, resolveType, "_Internal");
     }
-    if (schema.clientSession) {
-        emitClientSessionApiRegistration(lines, schema.clientSession, resolveType);
+    if (sourceSchema.clientSession) {
+        emitClientSessionApiRegistration(lines, sourceSchema.clientSession, resolveType);
     }
-    if (schema.clientGlobal) {
-        emitClientGlobalApiRegistration(lines, schema.clientGlobal, resolveType);
+    if (sourceSchema.clientGlobal) {
+        emitClientGlobalApiRegistration(lines, sourceSchema.clientGlobal, resolveType);
     }
+    rpcDefinitions = projectionDefinitions;
 
     // Patch models.list to normalize capabilities before deserialization
     let finalCode = lines.join("\n");
@@ -3775,6 +3926,7 @@ def _patch_model_capabilities(data: dict) -> dict:
         finalCode,
         new Set(Object.keys(allDefinitions).map((name) => name.toLowerCase()))
     );
+    finalCode = applyExplicitNullableFieldPresenceSentinel(finalCode, resolveType);
 
     // Apply `_`-prefix to type names of internal RPC types so the leading-underscore
     // Python convention signals "internal, no stability guarantees" to consumers.
@@ -3791,7 +3943,11 @@ def _patch_model_capabilities(data: dict) -> dict:
             }
         }
         if (internalDefs.size > 0) {
-            finalCode = renameInternalPythonSymbols(finalCode, internalDefs);
+            // Resolve class-name casing without following aliases to shared public types.
+            const internalSymbols = new Set(
+                [...internalDefs].flatMap((name) => [name, actualTypeNames.get(name.toLowerCase()) ?? name])
+            );
+            finalCode = renameInternalPythonSymbols(finalCode, internalSymbols);
         }
     }
 
@@ -4054,6 +4210,14 @@ function emitRpcWrapper(lines: string[], node: Record<string, unknown>, isSessio
     lines.push(``);
 }
 
+/** Preserve published dictionary-array results while typing new object-array APIs. */
+const PYTHON_LEGACY_RAW_ARRAY_RESULTS = new Set([
+    "account.getAllUsers",
+    "sessions.getClientMetadata",
+    "session.gitHubAuth.getAllAuthAvailable",
+    "session.gitHubAuth.lastAuthErrors",
+]);
+
 export function emitMethod(lines: string[], name: string, method: RpcMethod, isSession: boolean, resolveType: (name: string) => string, groupExperimental = false, groupDeprecated = false): void {
     const isInternal = method.visibility === "internal";
     const methodName = (isInternal ? "_" : "") + toSnakeCase(name);
@@ -4064,13 +4228,22 @@ export function emitMethod(lines: string[], name: string, method: RpcMethod, isS
     const hasNullableResult = !!nullableInner;
     const resultIsOpaque = isOpaqueJson(effectiveResultSchema);
     const resultIsObject = !resultIsOpaque && isPythonObjectResultSchema(effectiveResultSchema);
+    const resultItems = effectiveResultSchema?.type === "array" &&
+        typeof effectiveResultSchema.items === "object" && !Array.isArray(effectiveResultSchema.items)
+        ? effectiveResultSchema.items
+        : undefined;
+    const resultItemType = !PYTHON_LEGACY_RAW_ARRAY_RESULTS.has(method.rpcMethod) &&
+        resultItems?.$ref && isPythonObjectResultSchema(resultItems)
+        ? resolveType(toPascalCase(refTypeName(resultItems.$ref, rpcDefinitions)))
+        : undefined;
+    const arrayResultType = resultItemType ? `list[${resultItemType}]` : undefined;
 
     let resultType: string;
     if (hasNullableResult) {
-        const innerTypeName = resolveType(pythonResultTypeName(method, nullableInner));
+        const innerTypeName = arrayResultType ?? resolveType(pythonResultTypeName(method, nullableInner));
         resultType = `${innerTypeName} | None`;
     } else if (hasResult) {
-        resultType = resolveType(pythonResultTypeName(method));
+        resultType = arrayResultType ?? resolveType(pythonResultTypeName(method));
     } else {
         resultType = "None";
     }
@@ -4107,6 +4280,10 @@ export function emitMethod(lines: string[], name: string, method: RpcMethod, isS
         if (resultIsOpaque || isAnyType) {
             return expr;
         }
+        if (resultItemType) {
+            const arrayResult = `from_list(${resultItemType}.from_dict, ${expr})`;
+            return hasNullableResult ? `${arrayResult} if ${expr} is not None else None` : arrayResult;
+        }
         if (hasNullableResult) {
             return resultIsObject
                 ? `${innerTypeName}.from_dict(${expr}) if ${expr} is not None else None`
@@ -4132,10 +4309,16 @@ export function emitMethod(lines: string[], name: string, method: RpcMethod, isS
 
     if (isSession) {
         if (hasParams) {
+            const serializeParams =
+                method.rpcMethod === "user.settings.applyTopKey" ||
+                method.rpcMethod === "repo.settings.writeKey" ||
+                method.rpcMethod === "user.settings.edit"
+                    ? "params.to_dict()"
+                    : "{k: v for k, v in params.to_dict().items() if v is not None}";
             if (paramsOptional) {
-                lines.push(`        params_dict: dict[str, Any] = {k: v for k, v in params.to_dict().items() if v is not None} if params is not None else {}`);
+                lines.push(`        params_dict: dict[str, Any] = ${serializeParams} if params is not None else {}`);
             } else {
-                lines.push(`        params_dict: dict[str, Any] = {k: v for k, v in params.to_dict().items() if v is not None}`);
+                lines.push(`        params_dict: dict[str, Any] = ${serializeParams}`);
             }
             lines.push(`        params_dict["sessionId"] = self._session_id`);
             emitRequestCall("params_dict");
@@ -4144,10 +4327,16 @@ export function emitMethod(lines: string[], name: string, method: RpcMethod, isS
         }
     } else {
         if (hasParams) {
+            const serializeParams =
+                method.rpcMethod === "user.settings.applyTopKey" ||
+                method.rpcMethod === "repo.settings.writeKey" ||
+                method.rpcMethod === "user.settings.edit"
+                    ? "params.to_dict()"
+                    : "{k: v for k, v in params.to_dict().items() if v is not None}";
             if (paramsOptional) {
-                lines.push(`        params_dict = {k: v for k, v in params.to_dict().items() if v is not None} if params is not None else {}`);
+                lines.push(`        params_dict = ${serializeParams} if params is not None else {}`);
             } else {
-                lines.push(`        params_dict = {k: v for k, v in params.to_dict().items() if v is not None}`);
+                lines.push(`        params_dict = ${serializeParams}`);
             }
             emitRequestCall("params_dict");
         } else {
diff --git a/scripts/codegen/rust.ts b/scripts/codegen/rust.ts
index 0048ceb53a..20b6f100d7 100644
--- a/scripts/codegen/rust.ts
+++ b/scripts/codegen/rust.ts
@@ -16,6 +16,7 @@ import path from "path";
 import { fileURLToPath } from "url";
 import { promisify } from "util";
 import type { JSONSchema7, JSONSchema7Definition } from "json-schema";
+import { extensibleEnumValues } from "./extensible-enums.js";
 import {
 	isCodegenEntrypoint,
 	addManagedApprovalRequiredToPermissionRequests,
@@ -803,8 +804,11 @@ function resolveRustType(
 				);
 				return wrapOption(typeName, isRequired);
 			}
-			if (isObjectSchema(resolved)) {
-				emitRustStruct(typeName, resolved, ctx);
+			const namedObject = typeName === "ManagedPermissionOperation"
+				? resolveObjectSchema(resolved, ctx.definitions)
+				: resolved;
+			if (namedObject && isObjectSchema(namedObject)) {
+				emitRustStruct(typeName, { ...resolved, ...namedObject }, ctx);
 				return wrapOption(typeName, isRequired);
 			}
 			return resolveRustType(
@@ -1266,6 +1270,7 @@ function emitRustStringEnum(
 	if (!claimRustStringEnum(enumName, values, false, ctx)) return;
 
 	const preserveUnknownValue = enumName === "ToolExecutionCompleteFileEditKind";
+	const open = extensibleEnumValues(resolveRef(`#/$defs/${enumName}`, ctx.definitions) ?? {}) !== undefined;
 	const lines: string[] = [];
 	const preserveUnknown = preserveUnknownValue || preservesUnknownStringValue(enumName);
 	if (description) {
@@ -1277,6 +1282,8 @@ function emitRustStringEnum(
 	lines.push(
 		preserveUnknown
 			? "#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]"
+			: open
+			? "#[derive(Debug, Clone, Default, PartialEq, Eq)]"
 			: "#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]",
 	);
 	if (preserveUnknown) {
@@ -1285,8 +1292,8 @@ function emitRustStringEnum(
 	lines.push(`pub enum ${enumName} {`);
 
 	const usedVariantNames = new Set<string>();
-	const reservedVariantNames = new Set(["Unknown"]);
-	const variants: { value: string; name: string }[] = [];
+	const reservedVariantNames = new Set(["Unknown", ...(open ? ["Custom"] : [])]);
+	const variants: Array<{ name: string; value: string }> = [];
 	for (const value of values) {
 		// Keep the protocol's explicit "unknown" distinct from the serde fallback,
 		// including anonymous enums whose names depend on their containing type.
@@ -1299,7 +1306,7 @@ function emitRustStringEnum(
 		);
 		variants.push({ value, name: variantName });
 		pushRustDoc(lines, enumValueDescriptions?.[value], "    ");
-		if (!preserveUnknown && variantName !== value) {
+		if (!open && !preserveUnknown && variantName !== value) {
 			lines.push(`    #[serde(rename = "${value}")]`);
 		}
 		lines.push(`    ${variantName},`);
@@ -1315,9 +1322,13 @@ function emitRustStringEnum(
 	} else {
 		// For wire-protocol enums an unknown/sentinel value is the only safe default.
 		lines.push("    #[default]");
-		lines.push("    #[serde(other)]");
+		if (!open) lines.push("    #[serde(other)]");
 		lines.push("    Unknown,");
 	}
+	if (open) {
+		lines.push("    /// Provider-advertised identifier, retained verbatim.");
+		lines.push("    Custom(String),");
+	}
 
 	lines.push("}");
 	if (preserveUnknown) {
@@ -1347,6 +1358,31 @@ function emitRustStringEnum(
 		lines.push("        }");
 		lines.push("    }");
 		lines.push("}");
+	} else if (open) {
+		lines.push(`impl ${enumName} {`);
+		lines.push("    /// Returns the routing identifier without losing unknown values.");
+		lines.push("    pub fn as_str(&self) -> &str {");
+		lines.push("        match self {");
+		for (const variant of variants) lines.push(`            Self::${variant.name} => ${JSON.stringify(variant.value)},`);
+		lines.push('            Self::Unknown => "Unknown",');
+		lines.push("            Self::Custom(value) => value,");
+		lines.push("        }");
+		lines.push("    }");
+		lines.push("}");
+		lines.push(`impl Serialize for ${enumName} {`);
+		lines.push("    fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {");
+		lines.push("        serializer.serialize_str(self.as_str())");
+		lines.push("    }");
+		lines.push("}");
+		lines.push(`impl<'de> Deserialize<'de> for ${enumName} {`);
+		lines.push("    fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {");
+		lines.push("        let value = String::deserialize(deserializer)?;");
+		lines.push("        Ok(match value.as_str() {");
+		for (const variant of variants) lines.push(`            ${JSON.stringify(variant.value)} => Self::${variant.name},`);
+		lines.push("            _ => Self::Custom(value),");
+		lines.push("        })");
+		lines.push("    }");
+		lines.push("}");
 	}
 	ctx.enums.push(lines.join("\n"));
 }
@@ -2486,7 +2522,9 @@ function pushNamespaceMethodBody(
 	// Build the params Value sent over the wire.
 	if (isSession) {
 		if (hasParams) {
-			out.push(`        let mut wire_params = serde_json::to_value(params)?;`);
+			out.push(
+				`        let mut wire_params = serde_json::to_value(params)?;`,
+			);
 			out.push(
 				`        wire_params["sessionId"] = serde_json::Value::String(self.session.id().to_string());`,
 			);
@@ -2500,7 +2538,9 @@ function pushNamespaceMethodBody(
 		);
 	} else {
 		if (hasParams) {
-			out.push(`        let wire_params = serde_json::to_value(params)?;`);
+			out.push(
+				`        let wire_params = serde_json::to_value(params)?;`,
+			);
 		} else {
 			out.push(`        let wire_params = serde_json::json!({});`);
 		}
diff --git a/scripts/codegen/typescript.ts b/scripts/codegen/typescript.ts
index 9cce8743ee..51abbd460c 100644
--- a/scripts/codegen/typescript.ts
+++ b/scripts/codegen/typescript.ts
@@ -442,7 +442,8 @@ export function normalizeSchemaForTypeScript(
         }
 
         const enumValueDescriptions = getEnumValueDescriptions(rewritten as JSONSchema7);
-        if ((enumValueDescriptions || openReloadEnums.has(source)) && Array.isArray(rewritten.enum) && rewritten.enum.every((entry) => typeof entry === "string")) {
+        const openEnum = Array.isArray(rewritten["x-extensible-enum"]);
+        if ((enumValueDescriptions || openEnum || openReloadEnums.has(source)) && Array.isArray(rewritten.enum) && rewritten.enum.every((entry) => typeof entry === "string")) {
             const documentedValues = (rewritten.enum as string[])
                 .map((entry) => {
                     const comment = enumValueDescriptions?.[entry];
@@ -452,12 +453,13 @@ export function normalizeSchemaForTypeScript(
                 .join("\n");
             // Preserve future wire values without losing completion for the known edit kinds.
             rewritten.tsType =
-                rewritten.title === "ToolExecutionCompleteFileEditKind" || openReloadEnums.has(source)
+                openEnum || rewritten.title === "ToolExecutionCompleteFileEditKind" || openReloadEnums.has(source)
                     ? `${documentedValues}\n| (string & {})`
                     : documentedValues;
             delete rewritten.type;
             delete rewritten.enum;
             delete rewritten["x-enumDescriptions"];
+            delete rewritten["x-extensible-enum"];
         }
 
         if (typeof rewritten.$ref === "string") {
diff --git a/scripts/codegen/utils.ts b/scripts/codegen/utils.ts
index 5bb3c9f995..eca2a34182 100644
--- a/scripts/codegen/utils.ts
+++ b/scripts/codegen/utils.ts
@@ -16,6 +16,7 @@ import { promisify } from "util";
 import { COPILOT_CLI_VERSION } from "../../nodejs/src/cliVersion.js";
 import { ensureCopilotPackage } from "../../nodejs/scripts/releaseArtifacts.js";
 import { findRuntimeRoot } from "../runtime-layout.mjs";
+import { extensibleEnumValues } from "./extensible-enums.js";
 
 export const execFileAsync = promisify(execFile);
 
@@ -245,6 +246,11 @@ export function postProcessSchema(schema: JSONSchema7): JSONSchema7 {
     if (typeof schema !== "object" || schema === null) return schema;
 
     const processed = { ...schema } as JSONSchema7WithDefs;
+    const knownValues = extensibleEnumValues(processed);
+    if (knownValues) {
+        // Enum emitters retain the familiar constants; open-value emitters must also retain unknown strings.
+        processed.enum = knownValues;
+    }
 
     if (processed.title === "ProviderModelConfig" && processed.properties) {
         const tokenFields = new Set([
@@ -1718,8 +1724,13 @@ function normalizeDefinitionForComparison(definition: JSONSchema7Definition): un
     }
 
     const result: Record<string, unknown> = {};
+    const knownValues = extensibleEnumValues(definition);
     for (const [key, value] of Object.entries(definition as Record<string, unknown>)) {
-        if (key === "description" || key === "markdownDescription" || key === "x-enumDescriptions") {
+        if (key === "enum" && knownValues && Array.isArray(value) &&
+            value.length === knownValues.length && value.every((item) => knownValues.includes(item))) {
+            // The processed event schema adds known values for codegen, not a wire restriction.
+            continue;
+        } else if (key === "description" || key === "markdownDescription" || key === "x-enumDescriptions") {
             continue;
         } else if (key === "$ref" && typeof value === "string") {
             const localRef = parseLocalDefinitionRef(value);
diff --git a/scripts/corrections/package-lock.json b/scripts/corrections/package-lock.json
index a975812af3..faa7a956f7 100644
--- a/scripts/corrections/package-lock.json
+++ b/scripts/corrections/package-lock.json
@@ -10,7 +10,7 @@
         "@octokit/rest": "^22.0.1",
         "@types/node": "^22.0.0",
         "typescript": "^5.8.0",
-        "vitest": "^4.1.0"
+        "vitest": "^4.1.11"
       }
     },
     "node_modules/@actions/github": {
@@ -40,66 +40,13 @@
         "undici": "^6.23.0"
       }
     },
-    "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",
-      "optional": true,
-      "dependencies": {
-        "@emnapi/wasi-threads": "1.2.1",
-        "tslib": "^2.4.0"
-      }
-    },
-    "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",
-      "optional": true,
-      "dependencies": {
-        "tslib": "^2.4.0"
-      }
-    },
-    "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",
-      "optional": true,
-      "dependencies": {
-        "tslib": "^2.4.0"
-      }
-    },
     "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==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.6.0.tgz",
+      "integrity": "sha512-T7jf+5zgsZHwNJ4lvQ7/aezbyk0nNX+zJVWpmHA7VYsEx7a7qr5Rg5IbtJFqkgze5Y2sruq1RUY8Q837Od7iFw==",
       "dev": true,
       "license": "MIT"
     },
-    "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",
-      "optional": true,
-      "dependencies": {
-        "@tybys/wasm-util": "^0.10.1"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/Brooooooklyn"
-      },
-      "peerDependencies": {
-        "@emnapi/core": "^1.7.1",
-        "@emnapi/runtime": "^1.7.1"
-      }
-    },
     "node_modules/@octokit/auth-token": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-6.0.0.tgz",
@@ -268,19 +215,36 @@
       }
     },
     "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==",
+      "version": "0.153.0",
+      "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.153.0.tgz",
+      "integrity": "sha512-jSNrRIyvPVLL5E1z/tS5zLAprosGz/FuI1PWwEOz59j3E4TTTzSpqKb/RDGqJhhW0QHYISGXxq582wGx6T11Tw==",
       "dev": true,
       "license": "MIT",
       "funding": {
-        "url": "https://github.com/sponsors/Boshen"
+        "url": "https://github.com/sponsors/oxc-project"
+      }
+    },
+    "node_modules/@rolldown/binding-android-arm-eabi": {
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm-eabi/-/binding-android-arm-eabi-1.2.13.tgz",
+      "integrity": "sha512-Vu/NICrgdRvUOeaJZIyB2FP63s6fO/4ud5l8dXmxDx9yDyn+mN0y+gsvsVviSli+T361Aqo0h46EuMoobrwawA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
       }
     },
     "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==",
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.2.13.tgz",
+      "integrity": "sha512-6LEoIrGy5vvCd2boNnv2soPSUZj/PRvhp8R/t9KlX+mIZxThIE/ZqxrGXxmuNX0FuvQFvLdZr7S4HrYpYBVhEQ==",
       "cpu": [
         "arm64"
       ],
@@ -295,9 +259,9 @@
       }
     },
     "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==",
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.2.13.tgz",
+      "integrity": "sha512-CaJSRzlQ6Q+zkDMVA9OkVxBjVoPRCDEE3v0FSJ9kIQBgRjFApA3Si4ijhbNVUji7ZJt+PfO0e46qy4nPInHUPA==",
       "cpu": [
         "arm64"
       ],
@@ -312,9 +276,9 @@
       }
     },
     "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==",
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.2.13.tgz",
+      "integrity": "sha512-e4r340I5hxSzJkD3YJBxgzq/rJ3wwxwdLLb2FPt1Zpyem20nrQPT11DDEEkazwxaHumH8wpglsp/Ozgj/wT6mw==",
       "cpu": [
         "x64"
       ],
@@ -329,9 +293,9 @@
       }
     },
     "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==",
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.2.13.tgz",
+      "integrity": "sha512-hoBWDZ4/K/mJKVMbsgUd1jfpA2DiOrJ54mpegObU9TBHBBrtX4FLIXJJQRDPZ/2Dn91GvPob+Z2hwKJzf4E5SQ==",
       "cpu": [
         "x64"
       ],
@@ -346,9 +310,9 @@
       }
     },
     "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==",
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.2.13.tgz",
+      "integrity": "sha512-oF9fZu3vTWnTiVAkDFxU9PJLt1nh20K9RRpuHsR7ZnE2L7XookBbDBVLojCVSLGbvtSlxeUNnjAj6DbNsKyzbg==",
       "cpu": [
         "arm"
       ],
@@ -363,13 +327,16 @@
       }
     },
     "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==",
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.2.13.tgz",
+      "integrity": "sha512-DTpb/+jMiqWMPgphn4ksW1zW+XLJ6dJJ9FMvnIk9I291LhCctMPhMYJrP5t9p6C9qa3KXadDdUEZHBaPh3kNxQ==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -380,13 +347,16 @@
       }
     },
     "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==",
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.2.13.tgz",
+      "integrity": "sha512-xU+Kvv9N2A3SY35zFh1FWWNjxbadE/BKeqnkXe7vScU4GZsw757BlVmDLITZEq8DPpk6m7uoDYkK7P+x/uU5Ow==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "libc": [
+        "musl"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -397,13 +367,16 @@
       }
     },
     "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==",
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.2.13.tgz",
+      "integrity": "sha512-XMk/hnhh25oQ756Lclb1Q11h4ll0xC0Esa5w4Vzp+mAE2S3AGJgeM0SonrIgY8fHhjarb6hcoTuwoFG0VVP2ig==",
       "cpu": [
         "ppc64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -414,13 +387,16 @@
       }
     },
     "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==",
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.2.13.tgz",
+      "integrity": "sha512-U1BoTHYmlywE2n3HUWjzZ+8EQsKr+OwpxYuDWaubx42tUL8QSL7nOqRz/NVHanibbFP3M1Rxuprz/wNcbMKjqw==",
       "cpu": [
         "s390x"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -431,13 +407,16 @@
       }
     },
     "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==",
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.2.13.tgz",
+      "integrity": "sha512-J4cm80Pc6wEwV5AZ42o62sIQgDk+Y7R2s646jIwuvO+4V46QB58N4vVuMPWCBaNgursXLpmUWJV//WQAkPvHBQ==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -448,13 +427,16 @@
       }
     },
     "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==",
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.2.13.tgz",
+      "integrity": "sha512-W0euZS40U4V6JkmEnVCIX9mcsL6cbXQ4X8c2w+MMOIjFg68TXUW+u3RT+2e1t1pv9mg/EP3pDtK3POXdQ7Rxyw==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "libc": [
+        "musl"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -465,9 +447,9 @@
       }
     },
     "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==",
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.2.13.tgz",
+      "integrity": "sha512-do/AF/4n9MRshia3a5aXoy8xM2c6mgfT6D7H/dY6my5z+hfCIR4ab7mk4IRj++nsEQpKy39kd0DQnDq+r692tw==",
       "cpu": [
         "arm64"
       ],
@@ -481,29 +463,10 @@
         "node": "^20.19.0 || >=22.12.0"
       }
     },
-    "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"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "@emnapi/core": "1.10.0",
-        "@emnapi/runtime": "1.10.0",
-        "@napi-rs/wasm-runtime": "^1.1.4"
-      },
-      "engines": {
-        "node": "^20.19.0 || >=22.12.0"
-      }
-    },
     "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==",
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.2.13.tgz",
+      "integrity": "sha512-6FtUf2cJZobutJdxnGYX8z0vtbgqU0b2v8vfBhkXb9wp2MppMFtkunE+IaOntyi01rkIQoPW2GHABtfzsC0BRQ==",
       "cpu": [
         "arm64"
       ],
@@ -518,9 +481,9 @@
       }
     },
     "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==",
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.2.13.tgz",
+      "integrity": "sha512-UKhFaZTeTcbKrb3iU82m17jVcPEAoqDkCN5MBqgPyZSwp/cQmib21crTS0DdH7T1B7wZRWEI89YQAOJMet5yhg==",
       "cpu": [
         "x64"
       ],
@@ -548,17 +511,6 @@
       "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",
-      "optional": true,
-      "dependencies": {
-        "tslib": "^2.4.0"
-      }
-    },
     "node_modules/@types/chai": {
       "version": "5.2.3",
       "resolved": "https://registry.npmjs.org/@types/chai/-/chai-5.2.3.tgz",
@@ -595,31 +547,31 @@
       }
     },
     "node_modules/@vitest/expect": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-4.1.0.tgz",
-      "integrity": "sha512-EIxG7k4wlWweuCLG9Y5InKFwpMEOyrMb6ZJ1ihYu02LVj/bzUwn2VMU+13PinsjRW75XnITeFrQBMH5+dLvCDA==",
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-4.1.11.tgz",
+      "integrity": "sha512-VX2x5vNJXET47KAFzwERI+KRMtTTCSWTfSMKsW7JsUsXV4psq++e3DvZpuTDOpHcxytiDs6p2nhVb2tVDiiUYw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@standard-schema/spec": "^1.1.0",
         "@types/chai": "^5.2.2",
-        "@vitest/spy": "4.1.0",
-        "@vitest/utils": "4.1.0",
+        "@vitest/spy": "4.1.11",
+        "@vitest/utils": "4.1.11",
         "chai": "^6.2.2",
-        "tinyrainbow": "^3.0.3"
+        "tinyrainbow": "^3.1.0"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       }
     },
     "node_modules/@vitest/mocker": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-4.1.0.tgz",
-      "integrity": "sha512-evxREh+Hork43+Y4IOhTo+h5lGmVRyjqI739Rz4RlUPqwrkFFDF6EMvOOYjTx4E8Tl6gyCLRL8Mu7Ry12a13Tw==",
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-4.1.11.tgz",
+      "integrity": "sha512-2XJVD55d1o5AZous5CCGKS74g/riOj9odEt2bQpCVZeblHyHdnMeFl4jl0XjU21stf4mbjUkew2eXQZt65g5CQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/spy": "4.1.0",
+        "@vitest/spy": "4.1.11",
         "estree-walker": "^3.0.3",
         "magic-string": "^0.30.21"
       },
@@ -628,7 +580,7 @@
       },
       "peerDependencies": {
         "msw": "^2.4.9",
-        "vite": "^6.0.0 || ^7.0.0 || ^8.0.0-0"
+        "vite": "^6.0.0 || ^7.0.0 || ^8.0.0"
       },
       "peerDependenciesMeta": {
         "msw": {
@@ -640,26 +592,26 @@
       }
     },
     "node_modules/@vitest/pretty-format": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-4.1.0.tgz",
-      "integrity": "sha512-3RZLZlh88Ib0J7NQTRATfc/3ZPOnSUn2uDBUoGNn5T36+bALixmzphN26OUD3LRXWkJu4H0s5vvUeqBiw+kS0A==",
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-4.1.11.tgz",
+      "integrity": "sha512-yiZzPbGTS9Sr/JpFl8zHrcIkAofNbFV6k21vIgQN/cY/oxZeXhJv5sc/MBJ5jFKWmWs+oJHw0UXLZjmf931+Vw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "tinyrainbow": "^3.0.3"
+        "tinyrainbow": "^3.1.0"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       }
     },
     "node_modules/@vitest/runner": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-4.1.0.tgz",
-      "integrity": "sha512-Duvx2OzQ7d6OjchL+trw+aSrb9idh7pnNfxrklo14p3zmNL4qPCDeIJAK+eBKYjkIwG96Bc6vYuxhqDXQOWpoQ==",
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-4.1.11.tgz",
+      "integrity": "sha512-LztvUgdwMNJMIkj3hQnnxiC2Xy1zNxq928W/xhjCLaNCzqTZOudjwbQf6v9IntZGPw132i2Lq2rgTRZHD3JHNw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/utils": "4.1.0",
+        "@vitest/utils": "4.1.11",
         "pathe": "^2.0.3"
       },
       "funding": {
@@ -667,14 +619,14 @@
       }
     },
     "node_modules/@vitest/snapshot": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-4.1.0.tgz",
-      "integrity": "sha512-0Vy9euT1kgsnj1CHttwi9i9o+4rRLEaPRSOJ5gyv579GJkNpgJK+B4HSv/rAWixx2wdAFci1X4CEPjiu2bXIMg==",
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-4.1.11.tgz",
+      "integrity": "sha512-pN7ikn1ON7h8ee4gIAp4AzyK+zBtJPzVbqOgu5LCEh4VaJVbPQcgYQYJIMGQPXVeJJq1fnfazis7a5pFNPahog==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/pretty-format": "4.1.0",
-        "@vitest/utils": "4.1.0",
+        "@vitest/pretty-format": "4.1.11",
+        "@vitest/utils": "4.1.11",
         "magic-string": "^0.30.21",
         "pathe": "^2.0.3"
       },
@@ -683,9 +635,9 @@
       }
     },
     "node_modules/@vitest/spy": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-4.1.0.tgz",
-      "integrity": "sha512-pz77k+PgNpyMDv2FV6qmk5ZVau6c3R8HC8v342T2xlFxQKTrSeYw9waIJG8KgV9fFwAtTu4ceRzMivPTH6wSxw==",
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-4.1.11.tgz",
+      "integrity": "sha512-apNa/prQy2qCeywhnixOHPRCgGNhvg7T4Dapfl1GahLp/R+uhBm5cPyFoNVyqsNd2h1nJxL6BqqdIjiABL60YA==",
       "dev": true,
       "license": "MIT",
       "funding": {
@@ -693,15 +645,15 @@
       }
     },
     "node_modules/@vitest/utils": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-4.1.0.tgz",
-      "integrity": "sha512-XfPXT6a8TZY3dcGY8EdwsBulFCIw+BeeX0RZn2x/BtiY/75YGh8FeWGG8QISN/WhaqSrE2OrlDgtF8q5uhOTmw==",
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-4.1.11.tgz",
+      "integrity": "sha512-zTCVGpyFsGWBhllOyKlTw/vnr6D9qxsfSDyfbyZmTyjHw5N/VuvzHpHoQjm2ZJzn4RJgx5w4r7V0er69CmLgPQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/pretty-format": "4.1.0",
+        "@vitest/pretty-format": "4.1.11",
         "convert-source-map": "^2.0.0",
-        "tinyrainbow": "^3.0.3"
+        "tinyrainbow": "^3.1.0"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
@@ -725,9 +677,9 @@
       "license": "Apache-2.0"
     },
     "node_modules/chai": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/chai/-/chai-6.2.2.tgz",
-      "integrity": "sha512-NUPRluOfOiTKBKvWPtSD4PhFvWCqOi0BGStNWs57X9js7XGTprSmFoz5F0tWhR4WPjNeR9jXqdC7/UpSJTnlRg==",
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-6.3.0.tgz",
+      "integrity": "sha512-XWAtwJ6OHO+tj0EKCs0Y2UamnyOxseZWltU4x2U2wh8g4AigdjwvtUjvLP2tqkA/avxHEtzxNaqGq/YGNwckKg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -836,9 +788,9 @@
       "license": "MIT"
     },
     "node_modules/lightningcss": {
-      "version": "1.32.0",
-      "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.32.0.tgz",
-      "integrity": "sha512-NXYBzinNrblfraPGyrbPoD19C1h9lfI/1mzgWYvXUTe414Gz/X1FD2XBZSZM7rRTrMA8JL3OtAaGifrIKhQ5yQ==",
+      "version": "1.33.0",
+      "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.33.0.tgz",
+      "integrity": "sha512-WkUDrojuJs0xkgGf2udWxa3yGBRxPtxUkB79i6aCZLRgc7PM8fZe9TosfPDcvEpQZbuFASnHYmRLBLUbmLOIIA==",
       "dev": true,
       "license": "MPL-2.0",
       "dependencies": {
@@ -852,23 +804,23 @@
         "url": "https://opencollective.com/parcel"
       },
       "optionalDependencies": {
-        "lightningcss-android-arm64": "1.32.0",
-        "lightningcss-darwin-arm64": "1.32.0",
-        "lightningcss-darwin-x64": "1.32.0",
-        "lightningcss-freebsd-x64": "1.32.0",
-        "lightningcss-linux-arm-gnueabihf": "1.32.0",
-        "lightningcss-linux-arm64-gnu": "1.32.0",
-        "lightningcss-linux-arm64-musl": "1.32.0",
-        "lightningcss-linux-x64-gnu": "1.32.0",
-        "lightningcss-linux-x64-musl": "1.32.0",
-        "lightningcss-win32-arm64-msvc": "1.32.0",
-        "lightningcss-win32-x64-msvc": "1.32.0"
+        "lightningcss-android-arm64": "1.33.0",
+        "lightningcss-darwin-arm64": "1.33.0",
+        "lightningcss-darwin-x64": "1.33.0",
+        "lightningcss-freebsd-x64": "1.33.0",
+        "lightningcss-linux-arm-gnueabihf": "1.33.0",
+        "lightningcss-linux-arm64-gnu": "1.33.0",
+        "lightningcss-linux-arm64-musl": "1.33.0",
+        "lightningcss-linux-x64-gnu": "1.33.0",
+        "lightningcss-linux-x64-musl": "1.33.0",
+        "lightningcss-win32-arm64-msvc": "1.33.0",
+        "lightningcss-win32-x64-msvc": "1.33.0"
       }
     },
     "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==",
+      "version": "1.33.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-android-arm64/-/lightningcss-android-arm64-1.33.0.tgz",
+      "integrity": "sha512-gEpRTalKdosp4Bb8qWtc2iOgE5SeIHlpS1up9bFq2wAyYhl1UdTObYiHe98zEM9SQvSoqQZ1IQD0JNpg3Ml5pg==",
       "cpu": [
         "arm64"
       ],
@@ -887,9 +839,9 @@
       }
     },
     "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==",
+      "version": "1.33.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.33.0.tgz",
+      "integrity": "sha512-Sciaz8eenNTKn9b3t7+xr0ipTp9YxKQY4npwQ3mrRuL0BAVHBLyZxofhaKBAVtzmtRZ/zTyo0/to4B1uWG/Djg==",
       "cpu": [
         "arm64"
       ],
@@ -908,9 +860,9 @@
       }
     },
     "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==",
+      "version": "1.33.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.33.0.tgz",
+      "integrity": "sha512-Z5UPAxzrjlWNNyGy6i65cJzzvgJ5D3T6wMvs+gWpY9d7qRhANrxqAp6LhxIgZhWEw18RfJTGcRxjuLIBr+m8XQ==",
       "cpu": [
         "x64"
       ],
@@ -929,9 +881,9 @@
       }
     },
     "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==",
+      "version": "1.33.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.33.0.tgz",
+      "integrity": "sha512-QQM/Ti/hQajJwCY+RiWuCZ9sdtI/XQk7nDK5vC8kkdwixezOlDgvDx7+RT+QjK6FcFT4MpsuoBnHIo/O3StRRg==",
       "cpu": [
         "x64"
       ],
@@ -950,9 +902,9 @@
       }
     },
     "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==",
+      "version": "1.33.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.33.0.tgz",
+      "integrity": "sha512-N7FVBe6iS24MlM6R/4RBTxGhQheZGs7tiQ9U32UtF75NzP5Q7xWPRqLBCKxlRQRk3rY1jCIPLzx7WzOhuUIRLQ==",
       "cpu": [
         "arm"
       ],
@@ -971,13 +923,16 @@
       }
     },
     "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==",
+      "version": "1.33.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.33.0.tgz",
+      "integrity": "sha512-j2v/itmy4HlNxlc6voKXYgBqNi0Ng2LShg4z7GufpEgs05P+2suBVyi9I6YHq5uoVFx9ETin3eCEhLVyXGQnKg==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MPL-2.0",
       "optional": true,
       "os": [
@@ -992,13 +947,16 @@
       }
     },
     "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==",
+      "version": "1.33.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.33.0.tgz",
+      "integrity": "sha512-yiO5ROMuYQgXbC60yjZU5CYSFZGKXL0HFATXt9mHJn1+zW55oCtMI9NfcVhYLMFDL7gV7oBPon/EmMMGg2OvtQ==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "libc": [
+        "musl"
+      ],
       "license": "MPL-2.0",
       "optional": true,
       "os": [
@@ -1013,13 +971,16 @@
       }
     },
     "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==",
+      "version": "1.33.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.33.0.tgz",
+      "integrity": "sha512-ar+Ju7LmcN0Jo4FpL4hpFybwNG9/3A/Br5KW2n2jyODg3MEZXaDYADdemoNS+BDNfMgKvylJLj4S5tyRActuAg==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MPL-2.0",
       "optional": true,
       "os": [
@@ -1034,13 +995,16 @@
       }
     },
     "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==",
+      "version": "1.33.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.33.0.tgz",
+      "integrity": "sha512-RYiYbkokw0trfKqqzfF55lginwEPrD3OJDfTuJzFs1MK6iFnDenaz1fqLLtX4ITG3OktJQXOeTaw1awrBAlZPw==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "libc": [
+        "musl"
+      ],
       "license": "MPL-2.0",
       "optional": true,
       "os": [
@@ -1055,9 +1019,9 @@
       }
     },
     "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==",
+      "version": "1.33.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.33.0.tgz",
+      "integrity": "sha512-1K+MPfLSFVpphzpdbfkhlWk6wBrTObBzS2T6db10PNOZgR9GoVsAWzwNyuhUYYbTp23j+4RrncfujZ4uAzXvwA==",
       "cpu": [
         "arm64"
       ],
@@ -1076,9 +1040,9 @@
       }
     },
     "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==",
+      "version": "1.33.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.33.0.tgz",
+      "integrity": "sha512-OlEICDx/Xl0FqSp4bry8zFnCvGpig3Gl4gCquvYwHuqJKEC1+n9NgDniFvqHGmMv1ZkqDJrDqKKSykTDX+ehuA==",
       "cpu": [
         "x64"
       ],
@@ -1107,9 +1071,9 @@
       }
     },
     "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==",
+      "version": "3.3.20",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.20.tgz",
+      "integrity": "sha512-uKdg2G3GNCKQn9byYOpxbGqrT2fGO5KRt5J/8b3pok8rT6qxGWF6hxMyJiEYtAf+FVyYuD9hRaDqX5uPFYJ4ZQ==",
       "dev": true,
       "funding": [
         {
@@ -1151,9 +1115,9 @@
       "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==",
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.7.tgz",
+      "integrity": "sha512-qcJu88Q2IWqJsDD529JKMdwGm/dvInW4HvQnRwiH9JtihJvzGOscDtHE3x1pBKeUOTysQ8kVmLnJ2kJu7yhcGA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1164,9 +1128,9 @@
       }
     },
     "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==",
+      "version": "8.5.29",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.29.tgz",
+      "integrity": "sha512-49cGhUbXj8Qenv0iTMxA1cFBzxXoctpC9Ujd77t1WcbJIr6nF/eI7g/8MgxrYldFRuAXvja7xQRwavoW7kgrxQ==",
       "dev": true,
       "funding": [
         {
@@ -1184,22 +1148,22 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "nanoid": "^3.3.16",
+        "nanoid": "^3.3.19",
         "picocolors": "^1.1.1",
-        "source-map-js": "^1.2.1"
+        "source-map-js": "^1.2.2"
       },
       "engines": {
         "node": "^10 || ^12 || >=14"
       }
     },
     "node_modules/rolldown": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.0.3.tgz",
-      "integrity": "sha512-i00lAJ2ks1BYr7rjNjKC7BcqAS7nVfiT3QX1SI5aY+AFHblCmaUf9OE9dbdzDvW6dJxbi2ZCZiy9v3CcwOiX3g==",
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.2.13.tgz",
+      "integrity": "sha512-/5apOkwWxtACcQtZ5WlrAsKS4JwXVThQPJZ3RqIruRY9UG9M8e0VlXN068xum/JRKA4aIUoJ13ghe/kGCvidiQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@oxc-project/types": "=0.133.0",
+        "@oxc-project/types": "=0.153.0",
         "@rolldown/pluginutils": "^1.0.0"
       },
       "bin": {
@@ -1209,21 +1173,21 @@
         "node": "^20.19.0 || >=22.12.0"
       },
       "optionalDependencies": {
-        "@rolldown/binding-android-arm64": "1.0.3",
-        "@rolldown/binding-darwin-arm64": "1.0.3",
-        "@rolldown/binding-darwin-x64": "1.0.3",
-        "@rolldown/binding-freebsd-x64": "1.0.3",
-        "@rolldown/binding-linux-arm-gnueabihf": "1.0.3",
-        "@rolldown/binding-linux-arm64-gnu": "1.0.3",
-        "@rolldown/binding-linux-arm64-musl": "1.0.3",
-        "@rolldown/binding-linux-ppc64-gnu": "1.0.3",
-        "@rolldown/binding-linux-s390x-gnu": "1.0.3",
-        "@rolldown/binding-linux-x64-gnu": "1.0.3",
-        "@rolldown/binding-linux-x64-musl": "1.0.3",
-        "@rolldown/binding-openharmony-arm64": "1.0.3",
-        "@rolldown/binding-wasm32-wasi": "1.0.3",
-        "@rolldown/binding-win32-arm64-msvc": "1.0.3",
-        "@rolldown/binding-win32-x64-msvc": "1.0.3"
+        "@rolldown/binding-android-arm-eabi": "1.2.13",
+        "@rolldown/binding-android-arm64": "1.2.13",
+        "@rolldown/binding-darwin-arm64": "1.2.13",
+        "@rolldown/binding-darwin-x64": "1.2.13",
+        "@rolldown/binding-freebsd-x64": "1.2.13",
+        "@rolldown/binding-linux-arm-gnueabihf": "1.2.13",
+        "@rolldown/binding-linux-arm64-gnu": "1.2.13",
+        "@rolldown/binding-linux-arm64-musl": "1.2.13",
+        "@rolldown/binding-linux-ppc64-gnu": "1.2.13",
+        "@rolldown/binding-linux-s390x-gnu": "1.2.13",
+        "@rolldown/binding-linux-x64-gnu": "1.2.13",
+        "@rolldown/binding-linux-x64-musl": "1.2.13",
+        "@rolldown/binding-openharmony-arm64": "1.2.13",
+        "@rolldown/binding-win32-arm64-msvc": "1.2.13",
+        "@rolldown/binding-win32-x64-msvc": "1.2.13"
       }
     },
     "node_modules/siginfo": {
@@ -1234,9 +1198,9 @@
       "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==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.2.tgz",
+      "integrity": "sha512-KGj/8Y43x35aZVDtt+J4mK1hoLGHULMYfSkODJNQjNDC3oW1PqPoxMwo0pLUsWM/UEGzON/NxeHywEfNXNP3Vw==",
       "dev": true,
       "license": "BSD-3-Clause",
       "engines": {
@@ -1292,23 +1256,15 @@
       }
     },
     "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==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-3.2.0.tgz",
+      "integrity": "sha512-LgO3D9yZJjApUiuUfl9iFAwrtaX4+lok3wJIqttGoKCHlWUqHqbQpnxCf82L8FjgKsh4iGo78hqJwgL8F6To2A==",
       "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=14.0.0"
       }
     },
-    "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",
-      "optional": true
-    },
     "node_modules/tunnel": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
@@ -1358,16 +1314,16 @@
       "license": "ISC"
     },
     "node_modules/vite": {
-      "version": "8.0.16",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-8.0.16.tgz",
-      "integrity": "sha512-h9bXPmJichP5fLmVQo3PyaGSDE2n3aPuomeAlVRm0JLmt4rY6zmPKd59HYI4LNW8oTK7tlTsuC7l/m7awx9Jcw==",
+      "version": "8.3.4",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-8.3.4.tgz",
+      "integrity": "sha512-IftLE8phJhdNRIGNEV4JCCvfNScoZQVfcXaN8TQropWGJtOHcu+iAB9pHcuGvmEb/kddw0LBe/jS8ztdC6xdiQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "lightningcss": "^1.32.0",
-        "picomatch": "^4.0.4",
-        "postcss": "^8.5.15",
-        "rolldown": "1.0.3",
+        "lightningcss": "^1.33.0",
+        "picomatch": "^4.0.7",
+        "postcss": "^8.5.29",
+        "rolldown": "~1.2.12",
         "tinyglobby": "^0.2.17"
       },
       "bin": {
@@ -1384,7 +1340,7 @@
       },
       "peerDependencies": {
         "@types/node": "^20.19.0 || >=22.12.0",
-        "@vitejs/devtools": "^0.1.18",
+        "@vitejs/devtools": "^0.7.1",
         "esbuild": "^0.27.0 || ^0.28.0",
         "jiti": ">=1.21.0",
         "less": "^4.0.0",
@@ -1436,19 +1392,19 @@
       }
     },
     "node_modules/vitest": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/vitest/-/vitest-4.1.0.tgz",
-      "integrity": "sha512-YbDrMF9jM2Lqc++2530UourxZHmkKLxrs4+mYhEwqWS97WJ7wOYEkcr+QfRgJ3PW9wz3odRijLZjHEaRLTNbqw==",
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/vitest/-/vitest-4.1.11.tgz",
+      "integrity": "sha512-fhACrNXUidIbGSBr5FlbuBkO7VWC1ZyLl0DO4CU2DrQoAPxX84Ysxs+HeGQpii5lZWV1Q4gBZTTu49mF+A6Edw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/expect": "4.1.0",
-        "@vitest/mocker": "4.1.0",
-        "@vitest/pretty-format": "4.1.0",
-        "@vitest/runner": "4.1.0",
-        "@vitest/snapshot": "4.1.0",
-        "@vitest/spy": "4.1.0",
-        "@vitest/utils": "4.1.0",
+        "@vitest/expect": "4.1.11",
+        "@vitest/mocker": "4.1.11",
+        "@vitest/pretty-format": "4.1.11",
+        "@vitest/runner": "4.1.11",
+        "@vitest/snapshot": "4.1.11",
+        "@vitest/spy": "4.1.11",
+        "@vitest/utils": "4.1.11",
         "es-module-lexer": "^2.0.0",
         "expect-type": "^1.3.0",
         "magic-string": "^0.30.21",
@@ -1459,8 +1415,8 @@
         "tinybench": "^2.9.0",
         "tinyexec": "^1.0.2",
         "tinyglobby": "^0.2.15",
-        "tinyrainbow": "^3.0.3",
-        "vite": "^6.0.0 || ^7.0.0 || ^8.0.0-0",
+        "tinyrainbow": "^3.1.0",
+        "vite": "^6.0.0 || ^7.0.0 || ^8.0.0",
         "why-is-node-running": "^2.3.0"
       },
       "bin": {
@@ -1476,13 +1432,15 @@
         "@edge-runtime/vm": "*",
         "@opentelemetry/api": "^1.9.0",
         "@types/node": "^20.0.0 || ^22.0.0 || >=24.0.0",
-        "@vitest/browser-playwright": "4.1.0",
-        "@vitest/browser-preview": "4.1.0",
-        "@vitest/browser-webdriverio": "4.1.0",
-        "@vitest/ui": "4.1.0",
+        "@vitest/browser-playwright": "4.1.11",
+        "@vitest/browser-preview": "4.1.11",
+        "@vitest/browser-webdriverio": "4.1.11",
+        "@vitest/coverage-istanbul": "4.1.11",
+        "@vitest/coverage-v8": "4.1.11",
+        "@vitest/ui": "4.1.11",
         "happy-dom": "*",
         "jsdom": "*",
-        "vite": "^6.0.0 || ^7.0.0 || ^8.0.0-0"
+        "vite": "^6.0.0 || ^7.0.0 || ^8.0.0"
       },
       "peerDependenciesMeta": {
         "@edge-runtime/vm": {
@@ -1503,6 +1461,12 @@
         "@vitest/browser-webdriverio": {
           "optional": true
         },
+        "@vitest/coverage-istanbul": {
+          "optional": true
+        },
+        "@vitest/coverage-v8": {
+          "optional": true
+        },
         "@vitest/ui": {
           "optional": true
         },
diff --git a/scripts/corrections/package.json b/scripts/corrections/package.json
index 0afee52cc9..0dc9cfeb4b 100644
--- a/scripts/corrections/package.json
+++ b/scripts/corrections/package.json
@@ -10,6 +10,6 @@
     "@octokit/rest": "^22.0.1",
     "@types/node": "^22.0.0",
     "typescript": "^5.8.0",
-    "vitest": "^4.1.0"
+    "vitest": "^4.1.11"
   }
 }
diff --git a/scripts/docs-validation/extract.ts b/scripts/docs-validation/extract.ts
index 7ddd2c136c..d869196ba7 100644
--- a/scripts/docs-validation/extract.ts
+++ b/scripts/docs-validation/extract.ts
@@ -457,6 +457,7 @@ async function main() {
     cwd: DOCS_DIR,
     ignore: [".validation/**", "node_modules/**", "IMPROVEMENT_PLAN.md"],
   });
+  mdFiles.push("../java/README.md");
 
   console.log(`Found ${mdFiles.length} markdown files\n`);
 
@@ -472,7 +473,15 @@ async function main() {
 
   for (const mdFile of mdFiles) {
     const fullPath = path.join(DOCS_DIR, mdFile);
-    const content = fs.readFileSync(fullPath, "utf-8");
+    let content = fs.readFileSync(fullPath, "utf-8");
+    if (mdFile === "../java/README.md") {
+      // Replace the legacy README smoke with validation of its exact Quick Start.
+      const quickStart = /^## Quick Start\r?\n[\s\S]*?^```java\r?\n[\s\S]*?^```/m.exec(content);
+      if (!quickStart) {
+        throw new Error(`Could not find the Java Quick Start in ${mdFile}`);
+      }
+      content = "\n".repeat(content.slice(0, quickStart.index).split("\n").length - 1) + quickStart[0];
+    }
     const blocks = parseMarkdownCodeBlocks(content, mdFile);
 
     for (const block of blocks) {
diff --git a/scripts/docs-validation/package-lock.json b/scripts/docs-validation/package-lock.json
index 0c2751fa78..0f0c48a705 100644
--- a/scripts/docs-validation/package-lock.json
+++ b/scripts/docs-validation/package-lock.json
@@ -480,9 +480,9 @@
       }
     },
     "node_modules/brace-expansion": {
-      "version": "5.0.9",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.9.tgz",
-      "integrity": "sha512-ScQ4IuvIEF1TMlP7Zt+vjJ//9zlPb2SDcxWxM3bk8s6t6GGdJ7KO1dCcTidOPJKePW30LE/2cT7wCyPho9/Wxg==",
+      "version": "5.0.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.12.tgz",
+      "integrity": "sha512-YovQ3rzhaLMIrDjNDMkNS01tea93qhEhG5xy8f6+R0l+dw3Ki+5sCoIoI942iuLZTHWogWktgwVDhU09iNEimQ==",
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^4.0.2"
diff --git a/scripts/docs-validation/validate.ts b/scripts/docs-validation/validate.ts
index cb7b2ae2f6..cfa14b9251 100644
--- a/scripts/docs-validation/validate.ts
+++ b/scripts/docs-validation/validate.ts
@@ -385,12 +385,10 @@ async function validateJava(): Promise<ValidationResult[]> {
     fs.copyFileSync(path.join(javaDir, file), path.join(srcDir, file));
   }
 
-  // Read the inherited SDK version from java/sdk/pom.xml
-  const sdkPomPath = path.join(ROOT_DIR, "java", "sdk", "pom.xml");
+  // The required SDK install writes a flattened POM with ${revision} resolved.
+  const sdkPomPath = path.join(ROOT_DIR, "java", "sdk", ".flattened-pom.xml");
   const sdkPomContent = fs.readFileSync(sdkPomPath, "utf-8");
-  const versionMatch = sdkPomContent.match(
-    /<parent>[\s\S]*?<version>([^<]+)<\/version>[\s\S]*?<\/parent>/,
-  );
+  const versionMatch = sdkPomContent.match(/<version>([^<]+)<\/version>/);
   if (!versionMatch) {
     throw new Error(`Could not read the Java SDK version from ${sdkPomPath}`);
   }
@@ -421,37 +419,13 @@ async function validateJava(): Promise<ValidationResult[]> {
 
   fs.writeFileSync(path.join(javaDir, "pom.xml"), pomXml);
 
-  // First, install the local SDK into the local Maven repo
-  const pomPath = path.join(ROOT_DIR, "java", "pom.xml");
-  try {
-    execSync(`mvn install -f "${pomPath}" -Dmaven.test.skip=true -q`, {
-      encoding: "utf-8",
-      cwd: path.join(ROOT_DIR, "java"),
-    });
-  } catch (err: any) {
-    // If SDK install fails, all Java snippets fail
-    const errorMsg = `SDK install failed: ${(err.stderr || err.message || "").slice(0, 200)}`;
-    for (const file of files) {
-      const block = manifest.blocks.find(
-        (b) => b.outputFile === `java/${file}`,
-      );
-      results.push({
-        file: `java/${file}`,
-        sourceFile: block?.sourceFile || "unknown",
-        sourceLine: block?.sourceLine || 0,
-        success: false,
-        errors: [errorMsg],
-      });
-    }
-    return results;
-  }
-
-  // Compile the validation project
+  // The docs task or CI installs the SDK before validation.
   try {
     const validationPom = path.join(javaDir, "pom.xml");
-    execSync(`mvn compile -f "${validationPom}" -q`, {
+    const maven = process.platform === "win32" ? "mvnw.cmd" : "./mvnw";
+    execSync(`${maven} compile -f "${validationPom}" -q`, {
       encoding: "utf-8",
-      cwd: javaDir,
+      cwd: path.join(ROOT_DIR, "java"),
     });
 
     // All files passed
@@ -487,6 +461,10 @@ async function validateJava(): Promise<ValidationResult[]> {
       }
     }
 
+    if (fileErrors.size === 0) {
+      throw new Error(`Java documentation compilation failed:\n${output}`);
+    }
+
     for (const file of files) {
       const block = manifest.blocks.find(
         (b) => b.outputFile === `java/${file}`,
diff --git a/scripts/run-tasks.mjs b/scripts/run-tasks.mjs
index 63ca1b77e2..8b0e4592b7 100644
--- a/scripts/run-tasks.mjs
+++ b/scripts/run-tasks.mjs
@@ -143,7 +143,15 @@ const tasks = {
         python: [command("scripts/docs-validation", "npm", ["run", "validate:py"])],
         go: [command("scripts/docs-validation", "npm", ["run", "validate:go"])],
         dotnet: [command("scripts/docs-validation", "npm", ["run", "validate:cs"])],
-        java: [command("scripts/docs-validation", "npm", ["run", "validate:java"])],
+        java: [
+            command("java", maven, [
+                "install",
+                "-Dmaven.test.skip=true",
+                "-Dskip.test.harness=true",
+                "-Dcopilot.native.skip.download=true",
+            ]),
+            command("scripts/docs-validation", "npm", ["run", "validate:java"]),
+        ],
     },
 };
 
diff --git a/test/harness/legacyExitPlanNotice.ts b/test/harness/legacyExitPlanNotice.ts
new file mode 100644
index 0000000000..7622026f25
--- /dev/null
+++ b/test/harness/legacyExitPlanNotice.ts
@@ -0,0 +1,21 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+export function isLegacyExitPlanNotice(body: string): boolean {
+  const parts = body
+    .trim()
+    .split(/\r?\n\s*\r?\n/)
+    .map((part) => part.trim());
+  const delta =
+    /^(?:New tools available|Tools no longer available): exit_plan_mode$/;
+  return (
+    parts.some((part) => delta.test(part)) &&
+    parts.every(
+      (part) =>
+        delta.test(part) ||
+        part ===
+          "Important: Do not attempt to call tools that are no longer available unless you've been notified that they're available again.",
+    )
+  );
+}
diff --git a/test/harness/mockHandlers.ts b/test/harness/mockHandlers.ts
index 9f75d6819e..8c520a6ff2 100644
--- a/test/harness/mockHandlers.ts
+++ b/test/harness/mockHandlers.ts
@@ -19,6 +19,9 @@ export function createE2eRequestHandler(options: {
     }
 
     if (targetHost === "github.com") {
+      if (req.method === "POST" && req.url === "/login/oauth/access_token") {
+        return forwardToCapiProxy(req, res, options.capiProxyUrl);
+      }
       respondJson(res, 404, { message: "Not Found (e2e mock)" });
       return true;
     }
diff --git a/test/harness/package-lock.json b/test/harness/package-lock.json
index 0c31f6ea1d..8a72836f53 100644
--- a/test/harness/package-lock.json
+++ b/test/harness/package-lock.json
@@ -9,51 +9,20 @@
       "version": "1.0.0",
       "license": "ISC",
       "devDependencies": {
-        "@modelcontextprotocol/sdk": "^1.26.0",
+        "@modelcontextprotocol/sdk": "^1.31.0",
         "@types/node": "^25.3.3",
         "@types/node-forge": "^1.3.14",
         "node-forge": "^1.4.0",
         "openai": "^6.17.0",
         "tsx": "^4.21.0",
         "typescript": "^5.9.3",
-        "vitest": "^4.0.18",
+        "vitest": "^4.1.11",
         "yaml": "^2.8.2"
       },
       "engines": {
         "node": "^20.19.0 || >=22.12.0"
       }
     },
-    "node_modules/@emnapi/core": {
-      "version": "1.10.0",
-      "integrity": "sha1-OAzMjyQS6iLR2XLff47iOjucdGc=",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "@emnapi/wasi-threads": "1.2.1",
-        "tslib": "^2.4.0"
-      }
-    },
-    "node_modules/@emnapi/runtime": {
-      "version": "1.10.0",
-      "integrity": "sha1-SyYMDTU0IE6YxhELjbGph9JuyHw=",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "tslib": "^2.4.0"
-      }
-    },
-    "node_modules/@emnapi/wasi-threads": {
-      "version": "1.2.1",
-      "integrity": "sha1-KP7SGhuhznl8RKBwq8lNQvOuhUg=",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "tslib": "^2.4.0"
-      }
-    },
     "node_modules/@esbuild/aix-ppc64": {
       "version": "0.28.1",
       "integrity": "sha1-egGo0uwvuy2seK2tCbD6eB5Agr4=",
@@ -469,28 +438,19 @@
         "node": ">=18"
       }
     },
-    "node_modules/@hono/node-server": {
-      "version": "1.19.14",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=18.14.1"
-      },
-      "peerDependencies": {
-        "hono": "^4"
-      }
-    },
     "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.5.5",
+      "version": "1.6.0",
+      "integrity": "sha512-T7jf+5zgsZHwNJ4lvQ7/aezbyk0nNX+zJVWpmHA7VYsEx7a7qr5Rg5IbtJFqkgze5Y2sruq1RUY8Q837Od7iFw==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@modelcontextprotocol/sdk": {
-      "version": "1.26.0",
+      "version": "1.32.1",
+      "integrity": "sha512-2DdE+SJDtzLEEWzY1ZjY7Q+VcPhcV1KisD3zI4u0XZyktsjHum1mwbMI+JaulUBi2OZk+KJAi2uPXzxichPkdw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@hono/node-server": "^1.19.9",
+        "@hono/node-server": "^1.19.9 || ^2.0.5",
         "ajv": "^8.17.1",
         "ajv-formats": "^3.0.1",
         "content-type": "^1.0.5",
@@ -524,38 +484,46 @@
         }
       }
     },
-    "node_modules/@napi-rs/wasm-runtime": {
-      "version": "1.2.3",
-      "integrity": "sha1-l+PUXXQk3F2h1OMvO/OykvbBtEw=",
+    "node_modules/@modelcontextprotocol/sdk/node_modules/@hono/node-server": {
+      "version": "1.19.17",
+      "integrity": "sha512-dSneS5qhiauZWGDCeK4o695Xd9nUNjviSZCMQrj10eetr8Uln1ucn6bbphOM6UynAMMtNIzZNSpL9vnASJwrPQ==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "@tybys/wasm-util": "^0.10.3"
-      },
       "engines": {
-        "node": "^20.19.0 || ^22.13.0 || >=23.5.0"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/Brooooooklyn"
+        "node": ">=18.14.1"
       },
       "peerDependencies": {
-        "@emnapi/core": "^1.7.1 || ^2.0.0-alpha.4",
-        "@emnapi/runtime": "^1.7.1 || ^2.0.0-alpha.4"
+        "hono": "^4"
       }
     },
     "node_modules/@oxc-project/types": {
-      "version": "0.133.0",
+      "version": "0.153.0",
+      "integrity": "sha512-jSNrRIyvPVLL5E1z/tS5zLAprosGz/FuI1PWwEOz59j3E4TTTzSpqKb/RDGqJhhW0QHYISGXxq582wGx6T11Tw==",
       "dev": true,
       "license": "MIT",
       "funding": {
-        "url": "https://github.com/sponsors/Boshen"
+        "url": "https://github.com/sponsors/oxc-project"
+      }
+    },
+    "node_modules/@rolldown/binding-android-arm-eabi": {
+      "version": "1.2.13",
+      "integrity": "sha512-Vu/NICrgdRvUOeaJZIyB2FP63s6fO/4ud5l8dXmxDx9yDyn+mN0y+gsvsVviSli+T361Aqo0h46EuMoobrwawA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
       }
     },
     "node_modules/@rolldown/binding-android-arm64": {
-      "version": "1.0.3",
-      "integrity": "sha1-VM6Pg4IhP0oxSgwve6g/gf/q5ZI=",
+      "version": "1.2.13",
+      "integrity": "sha512-6LEoIrGy5vvCd2boNnv2soPSUZj/PRvhp8R/t9KlX+mIZxThIE/ZqxrGXxmuNX0FuvQFvLdZr7S4HrYpYBVhEQ==",
       "cpu": [
         "arm64"
       ],
@@ -570,7 +538,8 @@
       }
     },
     "node_modules/@rolldown/binding-darwin-arm64": {
-      "version": "1.0.3",
+      "version": "1.2.13",
+      "integrity": "sha512-CaJSRzlQ6Q+zkDMVA9OkVxBjVoPRCDEE3v0FSJ9kIQBgRjFApA3Si4ijhbNVUji7ZJt+PfO0e46qy4nPInHUPA==",
       "cpu": [
         "arm64"
       ],
@@ -585,8 +554,8 @@
       }
     },
     "node_modules/@rolldown/binding-darwin-x64": {
-      "version": "1.0.3",
-      "integrity": "sha1-U/V94fWZ7PHbE4I8/IjBj7gJVK0=",
+      "version": "1.2.13",
+      "integrity": "sha512-e4r340I5hxSzJkD3YJBxgzq/rJ3wwxwdLLb2FPt1Zpyem20nrQPT11DDEEkazwxaHumH8wpglsp/Ozgj/wT6mw==",
       "cpu": [
         "x64"
       ],
@@ -601,8 +570,8 @@
       }
     },
     "node_modules/@rolldown/binding-freebsd-x64": {
-      "version": "1.0.3",
-      "integrity": "sha1-bz/dobeuqsnSaKUmgEtPuW5ONfE=",
+      "version": "1.2.13",
+      "integrity": "sha512-hoBWDZ4/K/mJKVMbsgUd1jfpA2DiOrJ54mpegObU9TBHBBrtX4FLIXJJQRDPZ/2Dn91GvPob+Z2hwKJzf4E5SQ==",
       "cpu": [
         "x64"
       ],
@@ -617,8 +586,8 @@
       }
     },
     "node_modules/@rolldown/binding-linux-arm-gnueabihf": {
-      "version": "1.0.3",
-      "integrity": "sha1-2HpFS/WFzJZ2hJN36R1uN1KXMm8=",
+      "version": "1.2.13",
+      "integrity": "sha512-oF9fZu3vTWnTiVAkDFxU9PJLt1nh20K9RRpuHsR7ZnE2L7XookBbDBVLojCVSLGbvtSlxeUNnjAj6DbNsKyzbg==",
       "cpu": [
         "arm"
       ],
@@ -633,12 +602,15 @@
       }
     },
     "node_modules/@rolldown/binding-linux-arm64-gnu": {
-      "version": "1.0.3",
-      "integrity": "sha1-QZ/Wv2Es80jxBSjLzZTrq5YH2NE=",
+      "version": "1.2.13",
+      "integrity": "sha512-DTpb/+jMiqWMPgphn4ksW1zW+XLJ6dJJ9FMvnIk9I291LhCctMPhMYJrP5t9p6C9qa3KXadDdUEZHBaPh3kNxQ==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -649,12 +621,15 @@
       }
     },
     "node_modules/@rolldown/binding-linux-arm64-musl": {
-      "version": "1.0.3",
-      "integrity": "sha1-/MaRhpa7doRId+HkkwoY/Q03QGk=",
+      "version": "1.2.13",
+      "integrity": "sha512-xU+Kvv9N2A3SY35zFh1FWWNjxbadE/BKeqnkXe7vScU4GZsw757BlVmDLITZEq8DPpk6m7uoDYkK7P+x/uU5Ow==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "libc": [
+        "musl"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -665,12 +640,15 @@
       }
     },
     "node_modules/@rolldown/binding-linux-ppc64-gnu": {
-      "version": "1.0.3",
-      "integrity": "sha1-Mq7LfI2uXU8qjN5XoFjshpkVQvg=",
+      "version": "1.2.13",
+      "integrity": "sha512-XMk/hnhh25oQ756Lclb1Q11h4ll0xC0Esa5w4Vzp+mAE2S3AGJgeM0SonrIgY8fHhjarb6hcoTuwoFG0VVP2ig==",
       "cpu": [
         "ppc64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -681,12 +659,15 @@
       }
     },
     "node_modules/@rolldown/binding-linux-s390x-gnu": {
-      "version": "1.0.3",
-      "integrity": "sha1-vtk0bqgea7i5PPEfXYi3fbiQt2M=",
+      "version": "1.2.13",
+      "integrity": "sha512-U1BoTHYmlywE2n3HUWjzZ+8EQsKr+OwpxYuDWaubx42tUL8QSL7nOqRz/NVHanibbFP3M1Rxuprz/wNcbMKjqw==",
       "cpu": [
         "s390x"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -697,12 +678,15 @@
       }
     },
     "node_modules/@rolldown/binding-linux-x64-gnu": {
-      "version": "1.0.3",
-      "integrity": "sha1-ZMLSb3Xf/ZtaH5dVegCudyUMjLc=",
+      "version": "1.2.13",
+      "integrity": "sha512-J4cm80Pc6wEwV5AZ42o62sIQgDk+Y7R2s646jIwuvO+4V46QB58N4vVuMPWCBaNgursXLpmUWJV//WQAkPvHBQ==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -713,12 +697,15 @@
       }
     },
     "node_modules/@rolldown/binding-linux-x64-musl": {
-      "version": "1.0.3",
-      "integrity": "sha1-WkUTLopHZZ7qrztUDClUqXyGD/M=",
+      "version": "1.2.13",
+      "integrity": "sha512-W0euZS40U4V6JkmEnVCIX9mcsL6cbXQ4X8c2w+MMOIjFg68TXUW+u3RT+2e1t1pv9mg/EP3pDtK3POXdQ7Rxyw==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "libc": [
+        "musl"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -729,8 +716,8 @@
       }
     },
     "node_modules/@rolldown/binding-openharmony-arm64": {
-      "version": "1.0.3",
-      "integrity": "sha1-KQUTBoxV6EnchFejKv7h17Csswk=",
+      "version": "1.2.13",
+      "integrity": "sha512-do/AF/4n9MRshia3a5aXoy8xM2c6mgfT6D7H/dY6my5z+hfCIR4ab7mk4IRj++nsEQpKy39kd0DQnDq+r692tw==",
       "cpu": [
         "arm64"
       ],
@@ -744,27 +731,9 @@
         "node": "^20.19.0 || >=22.12.0"
       }
     },
-    "node_modules/@rolldown/binding-wasm32-wasi": {
-      "version": "1.0.3",
-      "integrity": "sha1-PZly2/GpU9PHr6pKDyDvKy458xs=",
-      "cpu": [
-        "wasm32"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "@emnapi/core": "1.10.0",
-        "@emnapi/runtime": "1.10.0",
-        "@napi-rs/wasm-runtime": "^1.1.4"
-      },
-      "engines": {
-        "node": "^20.19.0 || >=22.12.0"
-      }
-    },
     "node_modules/@rolldown/binding-win32-arm64-msvc": {
-      "version": "1.0.3",
-      "integrity": "sha1-oASrYHoW1vA7y1VXKP+IivdXc60=",
+      "version": "1.2.13",
+      "integrity": "sha512-6FtUf2cJZobutJdxnGYX8z0vtbgqU0b2v8vfBhkXb9wp2MppMFtkunE+IaOntyi01rkIQoPW2GHABtfzsC0BRQ==",
       "cpu": [
         "arm64"
       ],
@@ -779,8 +748,8 @@
       }
     },
     "node_modules/@rolldown/binding-win32-x64-msvc": {
-      "version": "1.0.3",
-      "integrity": "sha1-4qJbNGkaHMihIJ195wkGMCbdDNs=",
+      "version": "1.2.13",
+      "integrity": "sha512-UKhFaZTeTcbKrb3iU82m17jVcPEAoqDkCN5MBqgPyZSwp/cQmib21crTS0DdH7T1B7wZRWEI89YQAOJMet5yhg==",
       "cpu": [
         "x64"
       ],
@@ -796,26 +765,19 @@
     },
     "node_modules/@rolldown/pluginutils": {
       "version": "1.0.1",
+      "integrity": "sha512-2j9bGt5Jh8hj+vPtgzPtl72j0yRxHAyumoo6TNfAjsLB04UtpSvPbPcDcBMxz7n+9CYB0c1GxQFxYRg2jimqGw==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@standard-schema/spec": {
       "version": "1.1.0",
+      "integrity": "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@tybys/wasm-util": {
-      "version": "0.10.3",
-      "integrity": "sha1-AVy6np3UfOFNA9KoxdVHv7FpZl0=",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "tslib": "^2.4.0"
-      }
-    },
     "node_modules/@types/chai": {
       "version": "5.2.3",
+      "integrity": "sha512-Mw558oeA9fFbv65/y4mHtXDs9bPnFMZAL/jxdPFUpOHHIXX91mcgEHbS5Lahr+pwZFR8A7GQleRWeI6cGFC2UA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -825,11 +787,13 @@
     },
     "node_modules/@types/deep-eql": {
       "version": "4.0.2",
+      "integrity": "sha512-c9h9dVVMigMPc4bwTvC5dxqtqJZwQPePsWjPlpSOnojbor6pGqdk541lfA7AqFQr5pB1BRdq0juY9db81BwyFw==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/estree": {
       "version": "1.0.9",
+      "integrity": "sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==",
       "dev": true,
       "license": "MIT"
     },
@@ -850,14 +814,15 @@
       }
     },
     "node_modules/@vitest/expect": {
-      "version": "4.1.8",
+      "version": "4.1.11",
+      "integrity": "sha512-VX2x5vNJXET47KAFzwERI+KRMtTTCSWTfSMKsW7JsUsXV4psq++e3DvZpuTDOpHcxytiDs6p2nhVb2tVDiiUYw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@standard-schema/spec": "^1.1.0",
         "@types/chai": "^5.2.2",
-        "@vitest/spy": "4.1.8",
-        "@vitest/utils": "4.1.8",
+        "@vitest/spy": "4.1.11",
+        "@vitest/utils": "4.1.11",
         "chai": "^6.2.2",
         "tinyrainbow": "^3.1.0"
       },
@@ -866,11 +831,12 @@
       }
     },
     "node_modules/@vitest/mocker": {
-      "version": "4.1.8",
+      "version": "4.1.11",
+      "integrity": "sha512-2XJVD55d1o5AZous5CCGKS74g/riOj9odEt2bQpCVZeblHyHdnMeFl4jl0XjU21stf4mbjUkew2eXQZt65g5CQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/spy": "4.1.8",
+        "@vitest/spy": "4.1.11",
         "estree-walker": "^3.0.3",
         "magic-string": "^0.30.21"
       },
@@ -891,7 +857,8 @@
       }
     },
     "node_modules/@vitest/pretty-format": {
-      "version": "4.1.8",
+      "version": "4.1.11",
+      "integrity": "sha512-yiZzPbGTS9Sr/JpFl8zHrcIkAofNbFV6k21vIgQN/cY/oxZeXhJv5sc/MBJ5jFKWmWs+oJHw0UXLZjmf931+Vw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -902,11 +869,12 @@
       }
     },
     "node_modules/@vitest/runner": {
-      "version": "4.1.8",
+      "version": "4.1.11",
+      "integrity": "sha512-LztvUgdwMNJMIkj3hQnnxiC2Xy1zNxq928W/xhjCLaNCzqTZOudjwbQf6v9IntZGPw132i2Lq2rgTRZHD3JHNw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/utils": "4.1.8",
+        "@vitest/utils": "4.1.11",
         "pathe": "^2.0.3"
       },
       "funding": {
@@ -914,12 +882,13 @@
       }
     },
     "node_modules/@vitest/snapshot": {
-      "version": "4.1.8",
+      "version": "4.1.11",
+      "integrity": "sha512-pN7ikn1ON7h8ee4gIAp4AzyK+zBtJPzVbqOgu5LCEh4VaJVbPQcgYQYJIMGQPXVeJJq1fnfazis7a5pFNPahog==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/pretty-format": "4.1.8",
-        "@vitest/utils": "4.1.8",
+        "@vitest/pretty-format": "4.1.11",
+        "@vitest/utils": "4.1.11",
         "magic-string": "^0.30.21",
         "pathe": "^2.0.3"
       },
@@ -928,7 +897,8 @@
       }
     },
     "node_modules/@vitest/spy": {
-      "version": "4.1.8",
+      "version": "4.1.11",
+      "integrity": "sha512-apNa/prQy2qCeywhnixOHPRCgGNhvg7T4Dapfl1GahLp/R+uhBm5cPyFoNVyqsNd2h1nJxL6BqqdIjiABL60YA==",
       "dev": true,
       "license": "MIT",
       "funding": {
@@ -936,11 +906,12 @@
       }
     },
     "node_modules/@vitest/utils": {
-      "version": "4.1.8",
+      "version": "4.1.11",
+      "integrity": "sha512-zTCVGpyFsGWBhllOyKlTw/vnr6D9qxsfSDyfbyZmTyjHw5N/VuvzHpHoQjm2ZJzn4RJgx5w4r7V0er69CmLgPQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/pretty-format": "4.1.8",
+        "@vitest/pretty-format": "4.1.11",
         "convert-source-map": "^2.0.0",
         "tinyrainbow": "^3.1.0"
       },
@@ -993,6 +964,7 @@
     },
     "node_modules/assertion-error": {
       "version": "2.0.1",
+      "integrity": "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1000,19 +972,20 @@
       }
     },
     "node_modules/body-parser": {
-      "version": "2.2.2",
+      "version": "2.3.0",
+      "integrity": "sha512-2cGmJupaNgg+QUwVLAucDuWuoMZ6EX9iHDRswZ5lsNYEmwPaRknMPCLZz07yTzVq/83p4o/wzbDZbBrTvGGTIw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "bytes": "^3.1.2",
-        "content-type": "^1.0.5",
+        "content-type": "^2.0.0",
         "debug": "^4.4.3",
-        "http-errors": "^2.0.0",
-        "iconv-lite": "^0.7.0",
+        "http-errors": "^2.0.1",
+        "iconv-lite": "^0.7.2",
         "on-finished": "^2.4.1",
-        "qs": "^6.14.1",
-        "raw-body": "^3.0.1",
-        "type-is": "^2.0.1"
+        "qs": "^6.15.2",
+        "raw-body": "^3.0.2",
+        "type-is": "^2.1.0"
       },
       "engines": {
         "node": ">=18"
@@ -1022,6 +995,19 @@
         "url": "https://opencollective.com/express"
       }
     },
+    "node_modules/body-parser/node_modules/content-type": {
+      "version": "2.1.0",
+      "integrity": "sha512-mj7UPXE0jaqaOsukNZRUEfEi2AcL7C/vwmwcHV0O97eO1E1pxBZuyjlZrx5seTaNBg1U6+o35wpa35Qfcc+7ag==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
+      }
+    },
     "node_modules/bytes": {
       "version": "3.1.2",
       "dev": true,
@@ -1032,6 +1018,7 @@
     },
     "node_modules/call-bind-apply-helpers": {
       "version": "1.0.2",
+      "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1044,6 +1031,7 @@
     },
     "node_modules/call-bound": {
       "version": "1.0.4",
+      "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1058,7 +1046,8 @@
       }
     },
     "node_modules/chai": {
-      "version": "6.2.2",
+      "version": "6.3.0",
+      "integrity": "sha512-XWAtwJ6OHO+tj0EKCs0Y2UamnyOxseZWltU4x2U2wh8g4AigdjwvtUjvLP2tqkA/avxHEtzxNaqGq/YGNwckKg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1087,6 +1076,7 @@
     },
     "node_modules/convert-source-map": {
       "version": "2.0.0",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
       "dev": true,
       "license": "MIT"
     },
@@ -1161,6 +1151,7 @@
     },
     "node_modules/detect-libc": {
       "version": "2.1.2",
+      "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -1169,6 +1160,7 @@
     },
     "node_modules/dunder-proto": {
       "version": "1.0.1",
+      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1195,6 +1187,7 @@
     },
     "node_modules/es-define-property": {
       "version": "1.0.1",
+      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1203,6 +1196,7 @@
     },
     "node_modules/es-errors": {
       "version": "1.3.0",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1215,7 +1209,8 @@
       "license": "MIT"
     },
     "node_modules/es-object-atoms": {
-      "version": "1.1.1",
+      "version": "1.1.2",
+      "integrity": "sha512-HWcBoN6NileqtSydK2FqHbS/LoDd2pqrnQHLyJzBj4kOp/ky2MWMN694xOfkK8/SnUsW2DH7EfyVlydKCsm1Zw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1272,6 +1267,7 @@
     },
     "node_modules/estree-walker": {
       "version": "3.0.3",
+      "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1378,8 +1374,8 @@
       "license": "MIT"
     },
     "node_modules/fast-uri": {
-      "version": "3.1.7",
-      "integrity": "sha512-dOvZVzjdZdz7phd9v6jCbwxrBW3fK6n8Rc0CtdmM4bumzMnxywBYhuph6J819RRw/ku+rLbelwfMunktuzVVHg==",
+      "version": "3.1.8",
+      "integrity": "sha512-GZMtZUTNRpOVIECoXwLNZS5xUGE+mVNbTB8h/7Rwh2TFWcBQiPzTgyZi05BF9UMZKkLJv8XBRJTlU7zg8+ZfMg==",
       "dev": true,
       "funding": [
         {
@@ -1395,6 +1391,7 @@
     },
     "node_modules/fdir": {
       "version": "6.5.0",
+      "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1459,6 +1456,7 @@
     },
     "node_modules/function-bind": {
       "version": "1.1.2",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
       "dev": true,
       "license": "MIT",
       "funding": {
@@ -1467,6 +1465,7 @@
     },
     "node_modules/get-intrinsic": {
       "version": "1.3.0",
+      "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1490,6 +1489,7 @@
     },
     "node_modules/get-proto": {
       "version": "1.0.1",
+      "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1502,6 +1502,7 @@
     },
     "node_modules/gopd": {
       "version": "1.2.0",
+      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1513,6 +1514,7 @@
     },
     "node_modules/has-symbols": {
       "version": "1.1.0",
+      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1523,7 +1525,8 @@
       }
     },
     "node_modules/hasown": {
-      "version": "2.0.2",
+      "version": "2.0.4",
+      "integrity": "sha512-T2UbfbBEF32wiepXIsMlTW9+dDYC6wMh/t/vYA4tuOMKqWz/n3vr1NFSxQiyP+zk2mXsoMA/i/7qV6LKut1t1A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1582,7 +1585,8 @@
       "license": "ISC"
     },
     "node_modules/ip-address": {
-      "version": "10.4.0",
+      "version": "10.7.4",
+      "integrity": "sha512-DWBMKyeM25D70nrIiTkgQth59/G+naKOTep6huF9j+GmeK3DMD60Zvxg5d5qQnz+38AHgou6ean2LECX+lrKDg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1626,7 +1630,8 @@
       "license": "BSD-2-Clause"
     },
     "node_modules/lightningcss": {
-      "version": "1.32.0",
+      "version": "1.33.0",
+      "integrity": "sha512-WkUDrojuJs0xkgGf2udWxa3yGBRxPtxUkB79i6aCZLRgc7PM8fZe9TosfPDcvEpQZbuFASnHYmRLBLUbmLOIIA==",
       "dev": true,
       "license": "MPL-2.0",
       "dependencies": {
@@ -1640,22 +1645,22 @@
         "url": "https://opencollective.com/parcel"
       },
       "optionalDependencies": {
-        "lightningcss-android-arm64": "1.32.0",
-        "lightningcss-darwin-arm64": "1.32.0",
-        "lightningcss-darwin-x64": "1.32.0",
-        "lightningcss-freebsd-x64": "1.32.0",
-        "lightningcss-linux-arm-gnueabihf": "1.32.0",
-        "lightningcss-linux-arm64-gnu": "1.32.0",
-        "lightningcss-linux-arm64-musl": "1.32.0",
-        "lightningcss-linux-x64-gnu": "1.32.0",
-        "lightningcss-linux-x64-musl": "1.32.0",
-        "lightningcss-win32-arm64-msvc": "1.32.0",
-        "lightningcss-win32-x64-msvc": "1.32.0"
+        "lightningcss-android-arm64": "1.33.0",
+        "lightningcss-darwin-arm64": "1.33.0",
+        "lightningcss-darwin-x64": "1.33.0",
+        "lightningcss-freebsd-x64": "1.33.0",
+        "lightningcss-linux-arm-gnueabihf": "1.33.0",
+        "lightningcss-linux-arm64-gnu": "1.33.0",
+        "lightningcss-linux-arm64-musl": "1.33.0",
+        "lightningcss-linux-x64-gnu": "1.33.0",
+        "lightningcss-linux-x64-musl": "1.33.0",
+        "lightningcss-win32-arm64-msvc": "1.33.0",
+        "lightningcss-win32-x64-msvc": "1.33.0"
       }
     },
     "node_modules/lightningcss-android-arm64": {
-      "version": "1.32.0",
-      "integrity": "sha1-8DOIURbf79nG9UeHUj41FLYeGWg=",
+      "version": "1.33.0",
+      "integrity": "sha512-gEpRTalKdosp4Bb8qWtc2iOgE5SeIHlpS1up9bFq2wAyYhl1UdTObYiHe98zEM9SQvSoqQZ1IQD0JNpg3Ml5pg==",
       "cpu": [
         "arm64"
       ],
@@ -1674,7 +1679,8 @@
       }
     },
     "node_modules/lightningcss-darwin-arm64": {
-      "version": "1.32.0",
+      "version": "1.33.0",
+      "integrity": "sha512-Sciaz8eenNTKn9b3t7+xr0ipTp9YxKQY4npwQ3mrRuL0BAVHBLyZxofhaKBAVtzmtRZ/zTyo0/to4B1uWG/Djg==",
       "cpu": [
         "arm64"
       ],
@@ -1693,8 +1699,8 @@
       }
     },
     "node_modules/lightningcss-darwin-x64": {
-      "version": "1.32.0",
-      "integrity": "sha1-NfPpczLRMLnKGB4RtWje1q68bV4=",
+      "version": "1.33.0",
+      "integrity": "sha512-Z5UPAxzrjlWNNyGy6i65cJzzvgJ5D3T6wMvs+gWpY9d7qRhANrxqAp6LhxIgZhWEw18RfJTGcRxjuLIBr+m8XQ==",
       "cpu": [
         "x64"
       ],
@@ -1713,8 +1719,8 @@
       }
     },
     "node_modules/lightningcss-freebsd-x64": {
-      "version": "1.32.0",
-      "integrity": "sha1-l3enZHK2Ttb/lDQq1kx7r9eUpXU=",
+      "version": "1.33.0",
+      "integrity": "sha512-QQM/Ti/hQajJwCY+RiWuCZ9sdtI/XQk7nDK5vC8kkdwixezOlDgvDx7+RT+QjK6FcFT4MpsuoBnHIo/O3StRRg==",
       "cpu": [
         "x64"
       ],
@@ -1733,8 +1739,8 @@
       }
     },
     "node_modules/lightningcss-linux-arm-gnueabihf": {
-      "version": "1.32.0",
-      "integrity": "sha1-E65lLhq3O5E117faFy9mbEEK1T0=",
+      "version": "1.33.0",
+      "integrity": "sha512-N7FVBe6iS24MlM6R/4RBTxGhQheZGs7tiQ9U32UtF75NzP5Q7xWPRqLBCKxlRQRk3rY1jCIPLzx7WzOhuUIRLQ==",
       "cpu": [
         "arm"
       ],
@@ -1753,12 +1759,15 @@
       }
     },
     "node_modules/lightningcss-linux-arm64-gnu": {
-      "version": "1.32.0",
-      "integrity": "sha1-QXhYeVqUWS9oASOhsfnaig4e8zU=",
+      "version": "1.33.0",
+      "integrity": "sha512-j2v/itmy4HlNxlc6voKXYgBqNi0Ng2LShg4z7GufpEgs05P+2suBVyi9I6YHq5uoVFx9ETin3eCEhLVyXGQnKg==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MPL-2.0",
       "optional": true,
       "os": [
@@ -1773,12 +1782,15 @@
       }
     },
     "node_modules/lightningcss-linux-arm64-musl": {
-      "version": "1.32.0",
-      "integrity": "sha1-a+NmkugQtxgECAL9gJYjz/5zITM=",
+      "version": "1.33.0",
+      "integrity": "sha512-yiO5ROMuYQgXbC60yjZU5CYSFZGKXL0HFATXt9mHJn1+zW55oCtMI9NfcVhYLMFDL7gV7oBPon/EmMMGg2OvtQ==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "libc": [
+        "musl"
+      ],
       "license": "MPL-2.0",
       "optional": true,
       "os": [
@@ -1793,12 +1805,15 @@
       }
     },
     "node_modules/lightningcss-linux-x64-gnu": {
-      "version": "1.32.0",
-      "integrity": "sha1-C3gDr06yHP043Tn+Kru1PH3QkfY=",
+      "version": "1.33.0",
+      "integrity": "sha512-ar+Ju7LmcN0Jo4FpL4hpFybwNG9/3A/Br5KW2n2jyODg3MEZXaDYADdemoNS+BDNfMgKvylJLj4S5tyRActuAg==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MPL-2.0",
       "optional": true,
       "os": [
@@ -1813,12 +1828,15 @@
       }
     },
     "node_modules/lightningcss-linux-x64-musl": {
-      "version": "1.32.0",
-      "integrity": "sha1-iNyLqGXd3bGsXvBLDxYYBEGMFjs=",
+      "version": "1.33.0",
+      "integrity": "sha512-RYiYbkokw0trfKqqzfF55lginwEPrD3OJDfTuJzFs1MK6iFnDenaz1fqLLtX4ITG3OktJQXOeTaw1awrBAlZPw==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "libc": [
+        "musl"
+      ],
       "license": "MPL-2.0",
       "optional": true,
       "os": [
@@ -1833,8 +1851,8 @@
       }
     },
     "node_modules/lightningcss-win32-arm64-msvc": {
-      "version": "1.32.0",
-      "integrity": "sha1-TzC6P6XpJfW3n5RejMDRdsOxqzg=",
+      "version": "1.33.0",
+      "integrity": "sha512-1K+MPfLSFVpphzpdbfkhlWk6wBrTObBzS2T6db10PNOZgR9GoVsAWzwNyuhUYYbTp23j+4RrncfujZ4uAzXvwA==",
       "cpu": [
         "arm64"
       ],
@@ -1853,8 +1871,8 @@
       }
     },
     "node_modules/lightningcss-win32-x64-msvc": {
-      "version": "1.32.0",
-      "integrity": "sha1-FBqlYFZFBkkokCu0rwRfp9n0Igo=",
+      "version": "1.33.0",
+      "integrity": "sha512-OlEICDx/Xl0FqSp4bry8zFnCvGpig3Gl4gCquvYwHuqJKEC1+n9NgDniFvqHGmMv1ZkqDJrDqKKSykTDX+ehuA==",
       "cpu": [
         "x64"
       ],
@@ -1874,6 +1892,7 @@
     },
     "node_modules/magic-string": {
       "version": "0.30.21",
+      "integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1882,6 +1901,7 @@
     },
     "node_modules/math-intrinsics": {
       "version": "1.1.0",
+      "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1936,7 +1956,8 @@
       "license": "MIT"
     },
     "node_modules/nanoid": {
-      "version": "3.3.17",
+      "version": "3.3.20",
+      "integrity": "sha512-uKdg2G3GNCKQn9byYOpxbGqrT2fGO5KRt5J/8b3pok8rT6qxGWF6hxMyJiEYtAf+FVyYuD9hRaDqX5uPFYJ4ZQ==",
       "dev": true,
       "funding": [
         {
@@ -1978,6 +1999,7 @@
     },
     "node_modules/object-inspect": {
       "version": "1.13.4",
+      "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -2062,16 +2084,19 @@
     },
     "node_modules/pathe": {
       "version": "2.0.3",
+      "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/picocolors": {
       "version": "1.1.1",
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
       "dev": true,
       "license": "ISC"
     },
     "node_modules/picomatch": {
-      "version": "4.0.4",
+      "version": "4.0.7",
+      "integrity": "sha512-qcJu88Q2IWqJsDD529JKMdwGm/dvInW4HvQnRwiH9JtihJvzGOscDtHE3x1pBKeUOTysQ8kVmLnJ2kJu7yhcGA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -2090,7 +2115,8 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.5.25",
+      "version": "8.5.29",
+      "integrity": "sha512-49cGhUbXj8Qenv0iTMxA1cFBzxXoctpC9Ujd77t1WcbJIr6nF/eI7g/8MgxrYldFRuAXvja7xQRwavoW7kgrxQ==",
       "dev": true,
       "funding": [
         {
@@ -2108,16 +2134,17 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "nanoid": "^3.3.16",
+        "nanoid": "^3.3.19",
         "picocolors": "^1.1.1",
-        "source-map-js": "^1.2.1"
+        "source-map-js": "^1.2.2"
       },
       "engines": {
         "node": "^10 || ^12 || >=14"
       }
     },
     "node_modules/proxy-addr": {
-      "version": "2.0.7",
+      "version": "2.0.8",
+      "integrity": "sha512-5nnx0yGyVUcY6t9RnWcARWtwT9F1D8O9rt08htPvnd49W1IgZtmLkhu9WfMzQj1cFxjHIO6connUNVW5k7AVyQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2126,14 +2153,20 @@
       },
       "engines": {
         "node": ">= 0.10"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
       }
     },
     "node_modules/qs": {
-      "version": "6.15.2",
+      "version": "6.16.0",
+      "integrity": "sha512-h6fhOIaRrID2CbEY2fqs+7t+UXZo+MLAnU5gRIq85uFtdiUPCdsApMlHhXogKVM4HM2DVbIjGNTTYH2OcmP1vA==",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
-        "side-channel": "^1.1.0"
+        "es-define-property": "^1.0.1",
+        "side-channel": "^1.1.1"
       },
       "engines": {
         "node": ">=0.6"
@@ -2173,11 +2206,12 @@
       }
     },
     "node_modules/rolldown": {
-      "version": "1.0.3",
+      "version": "1.2.13",
+      "integrity": "sha512-/5apOkwWxtACcQtZ5WlrAsKS4JwXVThQPJZ3RqIruRY9UG9M8e0VlXN068xum/JRKA4aIUoJ13ghe/kGCvidiQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@oxc-project/types": "=0.133.0",
+        "@oxc-project/types": "=0.153.0",
         "@rolldown/pluginutils": "^1.0.0"
       },
       "bin": {
@@ -2187,21 +2221,21 @@
         "node": "^20.19.0 || >=22.12.0"
       },
       "optionalDependencies": {
-        "@rolldown/binding-android-arm64": "1.0.3",
-        "@rolldown/binding-darwin-arm64": "1.0.3",
-        "@rolldown/binding-darwin-x64": "1.0.3",
-        "@rolldown/binding-freebsd-x64": "1.0.3",
-        "@rolldown/binding-linux-arm-gnueabihf": "1.0.3",
-        "@rolldown/binding-linux-arm64-gnu": "1.0.3",
-        "@rolldown/binding-linux-arm64-musl": "1.0.3",
-        "@rolldown/binding-linux-ppc64-gnu": "1.0.3",
-        "@rolldown/binding-linux-s390x-gnu": "1.0.3",
-        "@rolldown/binding-linux-x64-gnu": "1.0.3",
-        "@rolldown/binding-linux-x64-musl": "1.0.3",
-        "@rolldown/binding-openharmony-arm64": "1.0.3",
-        "@rolldown/binding-wasm32-wasi": "1.0.3",
-        "@rolldown/binding-win32-arm64-msvc": "1.0.3",
-        "@rolldown/binding-win32-x64-msvc": "1.0.3"
+        "@rolldown/binding-android-arm-eabi": "1.2.13",
+        "@rolldown/binding-android-arm64": "1.2.13",
+        "@rolldown/binding-darwin-arm64": "1.2.13",
+        "@rolldown/binding-darwin-x64": "1.2.13",
+        "@rolldown/binding-freebsd-x64": "1.2.13",
+        "@rolldown/binding-linux-arm-gnueabihf": "1.2.13",
+        "@rolldown/binding-linux-arm64-gnu": "1.2.13",
+        "@rolldown/binding-linux-arm64-musl": "1.2.13",
+        "@rolldown/binding-linux-ppc64-gnu": "1.2.13",
+        "@rolldown/binding-linux-s390x-gnu": "1.2.13",
+        "@rolldown/binding-linux-x64-gnu": "1.2.13",
+        "@rolldown/binding-linux-x64-musl": "1.2.13",
+        "@rolldown/binding-openharmony-arm64": "1.2.13",
+        "@rolldown/binding-win32-arm64-msvc": "1.2.13",
+        "@rolldown/binding-win32-x64-msvc": "1.2.13"
       }
     },
     "node_modules/router": {
@@ -2292,13 +2326,14 @@
       }
     },
     "node_modules/side-channel": {
-      "version": "1.1.0",
+      "version": "1.1.1",
+      "integrity": "sha512-6x6dK6zJdpTzF4sQeNYxwtvBzf6Eg4GtlesS94HOvTudUeyK2WXAaIfmDgsyslYrRBeFIlsi54AYsFGUuhmvrQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "es-errors": "^1.3.0",
-        "object-inspect": "^1.13.3",
-        "side-channel-list": "^1.0.0",
+        "object-inspect": "^1.13.4",
+        "side-channel-list": "^1.0.1",
         "side-channel-map": "^1.0.1",
         "side-channel-weakmap": "^1.0.2"
       },
@@ -2310,12 +2345,13 @@
       }
     },
     "node_modules/side-channel-list": {
-      "version": "1.0.0",
+      "version": "1.0.1",
+      "integrity": "sha512-mjn/0bi/oUURjc5Xl7IaWi/OJJJumuoJFQJfDDyO46+hBWsfaVM65TBHq2eoZBhzl9EchxOijpkbRC8SVBQU0w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "es-errors": "^1.3.0",
-        "object-inspect": "^1.13.3"
+        "object-inspect": "^1.13.4"
       },
       "engines": {
         "node": ">= 0.4"
@@ -2326,6 +2362,7 @@
     },
     "node_modules/side-channel-map": {
       "version": "1.0.1",
+      "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2343,6 +2380,7 @@
     },
     "node_modules/side-channel-weakmap": {
       "version": "1.0.2",
+      "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2365,7 +2403,8 @@
       "license": "ISC"
     },
     "node_modules/source-map-js": {
-      "version": "1.2.1",
+      "version": "1.2.2",
+      "integrity": "sha512-KGj/8Y43x35aZVDtt+J4mK1hoLGHULMYfSkODJNQjNDC3oW1PqPoxMwo0pLUsWM/UEGzON/NxeHywEfNXNP3Vw==",
       "dev": true,
       "license": "BSD-3-Clause",
       "engines": {
@@ -2405,6 +2444,7 @@
     },
     "node_modules/tinyglobby": {
       "version": "0.2.17",
+      "integrity": "sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2419,7 +2459,8 @@
       }
     },
     "node_modules/tinyrainbow": {
-      "version": "3.1.0",
+      "version": "3.2.0",
+      "integrity": "sha512-LgO3D9yZJjApUiuUfl9iFAwrtaX4+lok3wJIqttGoKCHlWUqHqbQpnxCf82L8FjgKsh4iGo78hqJwgL8F6To2A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -2434,13 +2475,6 @@
         "node": ">=0.6"
       }
     },
-    "node_modules/tslib": {
-      "version": "2.8.1",
-      "integrity": "sha1-YS7+TtI11Wfoq6Xypfq3AoCt6D8=",
-      "dev": true,
-      "license": "0BSD",
-      "optional": true
-    },
     "node_modules/tsx": {
       "version": "4.22.4",
       "dev": true,
@@ -2459,16 +2493,34 @@
       }
     },
     "node_modules/type-is": {
-      "version": "2.0.1",
+      "version": "2.1.0",
+      "integrity": "sha512-faYHw0anBbc/kWF3zFTEnxSFOAGUX9GFbOBthvDdLsIlEoWOFOtS0zgCiQYwIskL9iGXZL3kAXD8OoZ4GmMATA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "content-type": "^1.0.5",
+        "content-type": "^2.0.0",
         "media-typer": "^1.1.0",
         "mime-types": "^3.0.0"
       },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">= 18"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
+      }
+    },
+    "node_modules/type-is/node_modules/content-type": {
+      "version": "2.1.0",
+      "integrity": "sha512-mj7UPXE0jaqaOsukNZRUEfEi2AcL7C/vwmwcHV0O97eO1E1pxBZuyjlZrx5seTaNBg1U6+o35wpa35Qfcc+7ag==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
       }
     },
     "node_modules/typescript": {
@@ -2505,14 +2557,15 @@
       }
     },
     "node_modules/vite": {
-      "version": "8.0.16",
+      "version": "8.3.4",
+      "integrity": "sha512-IftLE8phJhdNRIGNEV4JCCvfNScoZQVfcXaN8TQropWGJtOHcu+iAB9pHcuGvmEb/kddw0LBe/jS8ztdC6xdiQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "lightningcss": "^1.32.0",
-        "picomatch": "^4.0.4",
-        "postcss": "^8.5.15",
-        "rolldown": "1.0.3",
+        "lightningcss": "^1.33.0",
+        "picomatch": "^4.0.7",
+        "postcss": "^8.5.29",
+        "rolldown": "~1.2.12",
         "tinyglobby": "^0.2.17"
       },
       "bin": {
@@ -2529,7 +2582,7 @@
       },
       "peerDependencies": {
         "@types/node": "^20.19.0 || >=22.12.0",
-        "@vitejs/devtools": "^0.1.18",
+        "@vitejs/devtools": "^0.7.1",
         "esbuild": "^0.27.0 || ^0.28.0",
         "jiti": ">=1.21.0",
         "less": "^4.0.0",
@@ -2581,17 +2634,18 @@
       }
     },
     "node_modules/vitest": {
-      "version": "4.1.8",
+      "version": "4.1.11",
+      "integrity": "sha512-fhACrNXUidIbGSBr5FlbuBkO7VWC1ZyLl0DO4CU2DrQoAPxX84Ysxs+HeGQpii5lZWV1Q4gBZTTu49mF+A6Edw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/expect": "4.1.8",
-        "@vitest/mocker": "4.1.8",
-        "@vitest/pretty-format": "4.1.8",
-        "@vitest/runner": "4.1.8",
-        "@vitest/snapshot": "4.1.8",
-        "@vitest/spy": "4.1.8",
-        "@vitest/utils": "4.1.8",
+        "@vitest/expect": "4.1.11",
+        "@vitest/mocker": "4.1.11",
+        "@vitest/pretty-format": "4.1.11",
+        "@vitest/runner": "4.1.11",
+        "@vitest/snapshot": "4.1.11",
+        "@vitest/spy": "4.1.11",
+        "@vitest/utils": "4.1.11",
         "es-module-lexer": "^2.0.0",
         "expect-type": "^1.3.0",
         "magic-string": "^0.30.21",
@@ -2619,12 +2673,12 @@
         "@edge-runtime/vm": "*",
         "@opentelemetry/api": "^1.9.0",
         "@types/node": "^20.0.0 || ^22.0.0 || >=24.0.0",
-        "@vitest/browser-playwright": "4.1.8",
-        "@vitest/browser-preview": "4.1.8",
-        "@vitest/browser-webdriverio": "4.1.8",
-        "@vitest/coverage-istanbul": "4.1.8",
-        "@vitest/coverage-v8": "4.1.8",
-        "@vitest/ui": "4.1.8",
+        "@vitest/browser-playwright": "4.1.11",
+        "@vitest/browser-preview": "4.1.11",
+        "@vitest/browser-webdriverio": "4.1.11",
+        "@vitest/coverage-istanbul": "4.1.11",
+        "@vitest/coverage-v8": "4.1.11",
+        "@vitest/ui": "4.1.11",
         "happy-dom": "*",
         "jsdom": "*",
         "vite": "^6.0.0 || ^7.0.0 || ^8.0.0"
diff --git a/test/harness/package.json b/test/harness/package.json
index 9b37dfb9d0..055121c48e 100644
--- a/test/harness/package.json
+++ b/test/harness/package.json
@@ -14,14 +14,17 @@
     "node": "^20.19.0 || >=22.12.0"
   },
   "devDependencies": {
-    "@modelcontextprotocol/sdk": "^1.26.0",
+    "@modelcontextprotocol/sdk": "^1.31.0",
     "@types/node": "^25.3.3",
     "@types/node-forge": "^1.3.14",
     "node-forge": "^1.4.0",
     "openai": "^6.17.0",
     "tsx": "^4.21.0",
     "typescript": "^5.9.3",
-    "vitest": "^4.0.18",
+    "vitest": "^4.1.11",
     "yaml": "^2.8.2"
+  },
+  "overrides": {
+    "@hono/node-server": "^1.19.15"
   }
 }
diff --git a/test/harness/replayingCapiProxy.test.ts b/test/harness/replayingCapiProxy.test.ts
index 1092d19f10..347b2b9547 100644
--- a/test/harness/replayingCapiProxy.test.ts
+++ b/test/harness/replayingCapiProxy.test.ts
@@ -11,6 +11,7 @@ import type {
 } from "openai/resources/chat/completions";
 import os from "os";
 import path from "path";
+import { gzipSync } from "zlib";
 import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
 import yaml from "yaml";
 import {
@@ -148,6 +149,31 @@ describe("ReplayingCapiProxy", () => {
     }
   });
 
+  test("accepts telemetry locally before replay configuration", async () => {
+    const proxy = new ReplayingCapiProxy("http://localhost");
+    const address = await proxy.start();
+    try {
+      const response = await fetch(`${address}/telemetry`, {
+        method: "POST",
+        headers: {
+          "content-type": "application/x-json-stream",
+          "content-encoding": "gzip",
+        },
+        body: gzipSync('{"name":"fixture-event"}\n'),
+      });
+      expect(response.status).toBe(204);
+      expect(await response.text()).toBe("");
+      expect(proxy.exchanges).toMatchObject([
+        {
+          request: { url: "/telemetry", method: "POST" },
+          response: { statusCode: 204, body: "" },
+        },
+      ]);
+    } finally {
+      await proxy.stop();
+    }
+  });
+
   test("does not write file when no chat completion exchanges", async () => {
     const outputPath = path.join(tempDir, "output.yaml");
     const proxy = new ReplayingCapiProxy(
@@ -964,69 +990,118 @@ describe("ReplayingCapiProxy", () => {
     expect(result.conversations[0].messages[0].content).toBe("What is 2+2?");
   });
 
-  test("strips mode_changed_notice from user messages", async () => {
-    const requestBody = JSON.stringify({
-      messages: [
-        {
-          role: "user",
-          content:
-            "Context before.\n\n<mode_changed_notice>\n<plan_mode>Write a plan only.</plan_mode>\n</mode_changed_notice>\n\nCreate a brief implementation plan.",
-        },
-      ],
-    });
-    const responseBody = JSON.stringify({
-      choices: [{ message: { role: "assistant", content: "Plan ready" } }],
-    });
+  test.each([
+    ["mode_changed_notice", "<plan_mode>Write a plan only.</plan_mode>"],
+    ["tools_changed_notice", "Tools no longer available: exit_plan_mode"],
+  ])(
+    "strips %s from user messages without losing surrounding text",
+    async (tag, body) => {
+      const requestBody = JSON.stringify({
+        messages: [
+          {
+            role: "user",
+            content:
+              `Context before.\n\n<${tag}>\n${body}\n</${tag}>\n\nCreate a brief implementation plan.`,
+          },
+        ],
+      });
+      const responseBody = JSON.stringify({
+        choices: [{ message: { role: "assistant", content: "Plan ready" } }],
+      });
 
-    const outputPath = await createProxy([
-      { url: "/chat/completions", requestBody, responseBody },
-    ]);
+      const outputPath = await createProxy([
+        { url: "/chat/completions", requestBody, responseBody },
+      ]);
 
-    const result = await readYamlOutput(outputPath);
-    expect(result.conversations[0].messages[0].content).toBe(
-      "Context before.\n\nCreate a brief implementation plan.",
-    );
-  });
+      const result = await readYamlOutput(outputPath);
+      expect(result.conversations[0].messages[0].content).toBe(
+        "Context before.\n\nCreate a brief implementation plan.",
+      );
+    },
+  );
 
-  test("drops notice-only user turns while preserving genuinely empty input", async () => {
-    const responseBody = JSON.stringify({
-      choices: [{ message: { role: "assistant", content: "Ready" } }],
-    });
-    const noticeOutputPath = await createProxy([
-      {
-        url: "/chat/completions",
-        requestBody: JSON.stringify({
-          messages: [
-            {
-              role: "user",
-              content:
-                "<mode_changed_notice>\nPlan mode is no longer active.\n</mode_changed_notice>",
-            },
-          ],
-        }),
-        responseBody,
-      },
-    ]);
-    const noticeResult = await readYamlOutput(noticeOutputPath);
-    expect(noticeResult.conversations[0].messages).toEqual([
-      { role: "assistant", content: "Ready" },
-    ]);
+  test.each([1, 2])(
+    "strips %i adjacent mode notices without duplicating the retained model separator",
+    async (count) => {
+      const modelNotice =
+        "<tools_changed_notice>\nThe model has been switched from claude-sonnet-5 to claude-haiku-4.5.\n</tools_changed_notice>";
+      const modeNotice =
+        "<mode_changed_notice>\nPlan mode is no longer active.\n</mode_changed_notice>";
+      const instructions = "You are now in fleet mode. Implement the plan.";
+      const outputPath = await createProxy([
+        {
+          url: "/chat/completions",
+          requestBody: JSON.stringify({
+            messages: [
+              {
+                role: "user",
+                content: [
+                  modelNotice,
+                  ...Array.from({ length: count }, () => modeNotice),
+                  instructions,
+                ].join(count === 2 ? "\n\n\n\n" : "\n\n"),
+              },
+            ],
+          }),
+          responseBody: JSON.stringify({
+            choices: [{ message: { role: "assistant", content: "Done" } }],
+          }),
+        },
+      ]);
+      const result = await readYamlOutput(outputPath);
+      expect(result.conversations[0].messages[0].content).toBe(
+        `${modelNotice}\n\n${instructions}`,
+      );
+    },
+  );
 
-    const emptyOutputPath = await createProxy([
-      {
-        url: "/chat/completions",
-        requestBody: JSON.stringify({
-          messages: [{ role: "user", content: "" }],
-        }),
-        responseBody,
-      },
-    ]);
-    const emptyResult = await readYamlOutput(emptyOutputPath);
-    expect(emptyResult.conversations[0].messages).toEqual([
-      { role: "user" },
-      { role: "assistant", content: "Ready" },
-    ]);
-  });
+  test.each([
+    ["mode_changed_notice", "Plan mode is no longer active."],
+    [
+      "tools_changed_notice",
+      "Tools no longer available: exit_plan_mode\n\nImportant: Do not attempt to call tools that are no longer available unless you've been notified that they're available again.",
+    ],
+  ])(
+    "drops %s-only user turns while preserving genuinely empty input",
+    async (tag, body) => {
+      const responseBody = JSON.stringify({
+        choices: [{ message: { role: "assistant", content: "Ready" } }],
+      });
+      const noticeOutputPath = await createProxy([
+        {
+          url: "/chat/completions",
+          requestBody: JSON.stringify({
+            messages: [
+              {
+                role: "user",
+                content: `<${tag}>\n${body}\n</${tag}>`,
+              },
+            ],
+          }),
+          responseBody,
+        },
+      ]);
+      const noticeResult = await readYamlOutput(noticeOutputPath);
+      expect(noticeResult.conversations[0].messages).toEqual([
+        { role: "assistant", content: "Ready" },
+      ]);
+
+      const emptyOutputPath = await createProxy([
+        {
+          url: "/chat/completions",
+          requestBody: JSON.stringify({
+            messages: [{ role: "user", content: "" }],
+          }),
+          responseBody,
+        },
+      ]);
+      const emptyResult = await readYamlOutput(emptyOutputPath);
+      expect(emptyResult.conversations[0].messages).toEqual([
+        { role: "user" },
+        { role: "assistant", content: "Ready" },
+      ]);
+    },
+  );
 
   test("strips plan mode prefix from user messages", async () => {
     const requestBody = JSON.stringify({
@@ -1718,6 +1793,11 @@ Related files (use view tool to read):
                   content:
                     "<mode_changed_notice>\nPlan mode is no longer active.\n</mode_changed_notice>",
                 },
+                {
+                  role: "user",
+                  content:
+                    "<tools_changed_notice>\nTools no longer available: exit_plan_mode\n</tools_changed_notice>",
+                },
                 { role: "assistant", content: "Notice ready" },
               ],
             },
@@ -1776,15 +1856,18 @@ Related files (use view tool to read):
       };
 
       try {
-        const noticeRequest = request(
+        for (const notice of [
           "<mode_changed_notice>\nPlan mode is no longer active.\n</mode_changed_notice>",
-        );
-        const response = await makeRequest(proxyUrl, noticeRequest.endpoint, {
-          body: noticeRequest.body,
-        });
+          "<tools_changed_notice>\nNew tools available: exit_plan_mode\n</tools_changed_notice>",
+        ]) {
+          const noticeRequest = request(notice);
+          const response = await makeRequest(proxyUrl, noticeRequest.endpoint, {
+            body: noticeRequest.body,
+          });
 
-        expect(response.status).toBe(200);
-        expect(response.body).toContain("Notice ready");
+          expect(response.status).toBe(200);
+          expect(response.body).toContain("Notice ready");
+        }
 
         const emptyRequest = request("");
         const emptyResponse = await makeRequest(proxyUrl, emptyRequest.endpoint, {
@@ -1995,6 +2078,150 @@ Related files (use view tool to read):
       }
     });
 
+    test.each([
+      [1, 0],
+      [0, 1],
+      [2, 1],
+      [1, 2],
+      [0, 0],
+    ])(
+      "replays plan approval with %i stored and %i live catalog notices",
+      async (storedCount, liveCount) => {
+        const notice =
+          "<tools_changed_notice>\nTools no longer available: exit_plan_mode\n</tools_changed_notice>";
+        const notices = (count: number) =>
+          Array.from({ length: count }, () => ({
+            role: "user",
+            content: notice,
+          }));
+        const prefix = [
+          { role: "system", content: "${system}" },
+          { role: "user", content: "Create fleet-alpha.txt." },
+          {
+            role: "assistant",
+            tool_calls: [
+              {
+                id: "toolcall_0",
+                type: "function",
+                function: { name: "exit_plan_mode", arguments: "{}" },
+              },
+            ],
+          },
+          {
+            role: "tool",
+            tool_call_id: "toolcall_0",
+            content:
+              "Plan approved!\n<fleet_mode_instructions>Implement the plan.</fleet_mode_instructions>",
+          },
+        ];
+        const createMessage = {
+          role: "assistant",
+          tool_calls: [
+            {
+              id: "toolcall_1",
+              type: "function",
+              function: {
+                name: "create",
+                arguments: '{"file_text":"alpha","path":"fleet-alpha.txt"}',
+              },
+            },
+          ],
+        };
+        const created = [
+          createMessage,
+          {
+            role: "tool",
+            tool_call_id: "toolcall_1",
+            content: "Created fleet-alpha.txt.",
+          },
+        ];
+        const finished = { role: "assistant", content: "Created the file." };
+        const continuation = (count: number) => ({
+          role: "user",
+          content: `${count ? `${notice}\n\n` : ""}Finish the task.`,
+        });
+        const cachePath = path.join(tempDir, "plan-catalog-notices.yaml");
+        await writeFile(
+          cachePath,
+          yaml.stringify({
+            models: ["test-model"],
+            conversations: [
+              {
+                messages: [
+                  ...prefix,
+                  ...notices(storedCount),
+                  ...created,
+                  finished,
+                  continuation(storedCount),
+                  { role: "assistant", content: "Fleet complete." },
+                ],
+              },
+            ],
+          } satisfies NormalizedData),
+        );
+        const proxy = new ReplayingCapiProxy("http://localhost:9999");
+        await proxy.updateConfig({
+          filePath: cachePath,
+          workDir,
+          replayOnly: true,
+        });
+        const proxyUrl = await proxy.start();
+        try {
+          for (const [messages, expected] of [
+            [[...prefix, ...notices(liveCount)], createMessage],
+            [[...prefix, ...created], finished],
+            [
+              [...prefix, ...created, finished, continuation(liveCount)],
+              { role: "assistant", content: "Fleet complete." },
+            ],
+          ] as const) {
+            const response = await makeRequest(proxyUrl, "/chat/completions", {
+              body: { model: "test-model", messages },
+            });
+            expect(response.status).toBe(200);
+            expect(
+              (JSON.parse(response.body) as ChatCompletion).choices[0].message,
+            ).toMatchObject(expected);
+          }
+          for (const messages of [
+            [
+              ...prefix.slice(0, -1),
+              {
+                ...prefix.at(-1),
+                content: "Approval without fleet instructions.",
+              },
+            ],
+            [
+              ...prefix,
+              ...created,
+              finished,
+              { role: "user", content: "Do a different task." },
+            ],
+            ...[
+              "New tools available: read_file",
+              "Tools no longer available: bash",
+              "New tools available: exit_plan_mode, read_file",
+              "New tools available: read_file\n\nTools no longer available: exit_plan_mode",
+              "The model has been switched to another model.\n\nTools no longer available: exit_plan_mode",
+            ].map((body) => [
+              ...prefix,
+              {
+                role: "user",
+                content: `<tools_changed_notice>\n${body}\n</tools_changed_notice>`,
+              },
+            ]),
+          ]) {
+            const response = await makeRequest(proxyUrl, "/chat/completions", {
+              body: { model: "test-model", messages },
+            });
+            expect(response.status).toBe(500);
+          }
+        } finally {
+          await proxy.stop(true);
+        }
+      },
+    );
+
     test("replays a CAPI view-image capture for BYOK tool-result and image-turn continuations", async () => {
       const cachePath = path.join(tempDir, "view-image.yaml");
       await writeFile(
diff --git a/test/harness/replayingCapiProxy.ts b/test/harness/replayingCapiProxy.ts
index dd5627df3a..b4e0f455a5 100644
--- a/test/harness/replayingCapiProxy.ts
+++ b/test/harness/replayingCapiProxy.ts
@@ -27,6 +27,7 @@ import {
   chatCompletionResponseToAnthropicSseChunks,
 } from "./anthropicMessagesAdapter";
 import { canonicalUserMessageSeparator } from "./modelProtocolAdapterShared";
+import { isLegacyExitPlanNotice } from "./legacyExitPlanNotice";
 import {
   chatCompletionResponseToResponsesApiMessage,
   chatCompletionResponseToResponsesApiSseChunks,
@@ -124,7 +125,15 @@ const defaultModel = "claude-sonnet-5";
 export class ReplayingCapiProxy extends CapturingHttpProxy {
   private state: ReplayingCapiProxyState | null = null;
   private memoryApiStub: MemoryApiStub | undefined;
+  private entraLogin: { subjectToken: string; githubToken: string } | undefined;
   private startPromise: Promise<string> | null = null;
+  private metaResponse: { body: unknown; statusCode: number } | undefined;
+  private metaResponseGate:
+    | {
+        reached: PromiseWithResolvers<void>;
+        release: PromiseWithResolvers<void>;
+      }
+    | undefined;
   private defaultToolResultNormalizers: ToolResultNormalizer[] = [
     { toolName: "*", normalizer: normalizeLargeOutputFilepaths },
     { toolName: "*", normalizer: normalizeInterruptedToolResult },
@@ -184,6 +193,7 @@ export class ReplayingCapiProxy extends CapturingHttpProxy {
     if (!config.filePath || !config.workDir) {
       throw new Error("filePath and workDir must be provided in config");
     }
+    this.metaResponse = undefined;
 
     // Since we're about to switch to a new file, write out any captured exchanges
     // Note that the final call to stop() will also write out any remaining exchanges.
@@ -237,6 +247,8 @@ export class ReplayingCapiProxy extends CapturingHttpProxy {
   }
 
   async stop(skipWritingCache?: boolean): Promise<void> {
+    this.metaResponseGate?.release.resolve();
+    this.metaResponseGate = undefined;
     await super.stop();
 
     // CAPI is the authoritative capture path. BYOK modes only verify that the
@@ -279,6 +291,52 @@ export class ReplayingCapiProxy extends CapturingHttpProxy {
       };
 
       try {
+        if (options.requestOptions.path === "/meta-response-gate") {
+          if (options.requestOptions.method === "POST") {
+            const { hold } = JSON.parse(options.body!) as { hold: boolean };
+            this.metaResponseGate?.release.resolve();
+            this.metaResponseGate = hold
+              ? {
+                  reached: Promise.withResolvers<void>(),
+                  release: Promise.withResolvers<void>(),
+                }
+              : undefined;
+          } else if (this.metaResponseGate) {
+            await this.metaResponseGate.reached.promise;
+          } else {
+            throw new Error("No metadata response gate is installed");
+          }
+          options.onResponseStart(200, {});
+          options.onResponseEnd();
+          return;
+        }
+        if (
+          options.requestOptions.path === "/meta-response-config" &&
+          options.requestOptions.method === "POST"
+        ) {
+          this.metaResponse = JSON.parse(options.body!) as { body: unknown; statusCode: number };
+          options.onResponseStart(200, {});
+          options.onResponseEnd();
+          return;
+        }
+        if (options.requestOptions.path === "/meta") {
+          const gate = this.metaResponseGate;
+          if (gate) {
+            gate.reached.resolve();
+            await gate.release.promise;
+          }
+          const fixture = this.metaResponse ?? {
+            statusCode: 501,
+            body: { message: "No explicit /meta fixture configured" },
+          };
+          options.onResponseStart(fixture.statusCode, {
+            "content-type": "application/json",
+            ...commonResponseHeaders,
+          });
+          options.onData(Buffer.from(JSON.stringify(fixture.body)));
+          options.onResponseEnd();
+          return;
+        }
         // Handle /copilot-user-config endpoint for configuring per-token user responses
         if (
           options.requestOptions.path === "/copilot-user-config" &&
@@ -294,6 +352,15 @@ export class ReplayingCapiProxy extends CapturingHttpProxy {
           return;
         }
 
+        if (
+          options.requestOptions.path === "/telemetry" &&
+          options.requestOptions.method === "POST"
+        ) {
+          options.onResponseStart(204, {});
+          options.onResponseEnd();
+          return;
+        }
+
         if (
           options.requestOptions.path === "/memory-api-config" &&
           options.requestOptions.method === "POST"
@@ -304,6 +371,65 @@ export class ReplayingCapiProxy extends CapturingHttpProxy {
           return;
         }
 
+        if (
+          options.requestOptions.path === "/entra-login-config" &&
+          options.requestOptions.method === "POST"
+        ) {
+          this.entraLogin = JSON.parse(options.body!) as {
+            subjectToken: string;
+            githubToken: string;
+          };
+          options.onResponseStart(200, {});
+          options.onResponseEnd();
+          return;
+        }
+        if (
+          this.entraLogin &&
+          options.requestOptions.path === "/entra-broker"
+        ) {
+          options.onResponseStart(200, { "content-type": "application/json" });
+          options.onData(
+            Buffer.from(
+              JSON.stringify({
+                accessToken: this.entraLogin.subjectToken,
+                expiresOnTimestamp: Date.now() + 3600000,
+                username: "entra-sdk@example.test",
+                accountId: "entra-sdk-account",
+              }),
+            ),
+          );
+          options.onResponseEnd();
+          return;
+        }
+        if (
+          this.entraLogin &&
+          options.requestOptions.path === "/login/oauth/access_token"
+        ) {
+          const form = new URLSearchParams(options.body ?? "");
+          const valid =
+            form.get("grant_type") ===
+              "urn:ietf:params:oauth:grant-type:token-exchange" &&
+            form.get("subject_token") === this.entraLogin.subjectToken;
+          options.onResponseStart(valid ? 200 : 400, {
+            "content-type": "application/json",
+          });
+          options.onData(
+            Buffer.from(
+              JSON.stringify(
+                valid
+                  ? {
+                      access_token: this.entraLogin.githubToken,
+                      expires_in: 3600,
+                      token_type: "bearer",
+                    }
+                  : { error: "invalid_request" },
+              ),
+            ),
+          );
+          options.onResponseEnd();
+          return;
+        }
+
         // Handle /config endpoint for updating proxy configuration
         if (
           options.requestOptions.path === "/config" &&
@@ -1064,7 +1190,7 @@ function coalesceAdjacentUserMessages(requestBody: string): string {
     if (
       message.role === "user" &&
       typeof message.content === "string" &&
-      containsModeChangedNotice(message.content) &&
+      containsRuntimeNotice(message.content) &&
       normalizeUserMessage(message.content) === ""
     ) {
       continue;
@@ -1505,19 +1631,19 @@ function transformOpenAIRequestMessage(
   m: ChatCompletionMessageParam,
 ): NormalizedMessage | undefined {
   let content: string | undefined;
-  let strippedModeNoticeOnly = false;
+  let strippedRuntimeNoticeOnly = false;
   if (m.role === "system") {
     // System message changes too often to include in snapshots - just store placeholder
     content = "${system}";
   } else if (m.role === "user" && typeof m.content === "string") {
     content = normalizeUserMessage(m.content);
-    strippedModeNoticeOnly =
-      content === "" && containsModeChangedNotice(m.content);
+    strippedRuntimeNoticeOnly =
+      content === "" && containsRuntimeNotice(m.content);
   } else if (m.role === "user" && Array.isArray(m.content)) {
     // Multimodal user messages have array content with text and image_url parts.
     // Extract and normalize text parts; represent image_url parts as a stable marker.
     const parts: string[] = [];
-    let sawModeNotice = false;
+    let sawRuntimeNotice = false;
     let sawVisibleContent = false;
     for (const part of m.content) {
       if (
@@ -1525,7 +1651,7 @@ function transformOpenAIRequestMessage(
         part.type === "text" &&
         typeof part.text === "string"
       ) {
-        sawModeNotice ||= containsModeChangedNotice(part.text);
+        sawRuntimeNotice ||= containsRuntimeNotice(part.text);
         const normalized = normalizeUserMessage(part.text);
         if (normalized) {
           parts.push(normalized);
@@ -1537,7 +1663,7 @@ function transformOpenAIRequestMessage(
       }
     }
     content = parts.join("\n") || undefined;
-    strippedModeNoticeOnly = sawModeNotice && !sawVisibleContent;
+    strippedRuntimeNoticeOnly = sawRuntimeNotice && !sawVisibleContent;
   } else if (m.role === "tool" && typeof m.content === "string") {
     // If it's a JSON tool call result, normalize the whitespace and property ordering.
     // For successful tool results wrapped in {resultType, textResultForLlm}, unwrap to
@@ -1564,7 +1690,7 @@ function transformOpenAIRequestMessage(
     content = m.content;
   }
 
-  if (strippedModeNoticeOnly) {
+  if (strippedRuntimeNoticeOnly) {
     return undefined;
   }
   const msg: NormalizedMessage = { role: m.role };
@@ -1579,7 +1705,7 @@ function transformOpenAIRequestMessage(
 }
 
 function normalizeUserMessage(content: string): string {
-  return stripModeChangedNotice(normalizeSkillContext(content))
+  return stripRuntimeNotice(normalizeSkillContext(content))
     .replace(
       taskCompletionNotificationPattern,
       taskCompletionNotificationReplacement,
@@ -1601,41 +1727,44 @@ const taskCompletionNotificationPattern =
 const taskCompletionNotificationReplacement =
   'Agent "$1" ($2) has completed successfully. Use read_agent with agent_id "$1" to retrieve the full results.';
 
-const modeChangedNoticePattern =
-  /(\s*)<mode_changed_notice>[\s\S]*?<\/mode_changed_notice>(\s*)/g;
-
-function containsModeChangedNotice(content: string): boolean {
-  return /<mode_changed_notice>[\s\S]*?<\/mode_changed_notice>/.test(content);
-}
-
-function stripModeChangedNotice(content: string): string {
-  let removed = false;
-  const stripped = content.replace(
-    modeChangedNoticePattern,
-    (
-      match,
-      leading: string,
-      trailing: string,
-      offset: number,
-      source: string,
-    ) => {
-      removed = true;
-      const before = source.slice(0, offset);
-      const after = source.slice(offset + match.length);
-      if (!before.trim() || !after.trim()) {
-        return "";
-      }
-      return /[\r\n]/.test(leading + trailing) ? "\n\n" : " ";
-    },
+// Only the obsolete exit_plan_mode withdrawal is optional; other catalog deltas stay strict.
+const runtimeNoticePattern =
+  /<(mode_changed_notice|tools_changed_notice)>([\s\S]*?)<\/\1>/g;
+
+function containsRuntimeNotice(content: string): boolean {
+  return /<(mode_changed_notice|tools_changed_notice)>[\s\S]*?<\/\1>/.test(
+    content,
   );
-  return removed ? stripped.trim() : content;
+}
+
+function stripRuntimeNotice(content: string): string {
+  let stripped = content;
+  // Work backward to preserve offsets and include separators held by retained notices.
+  for (const match of [...content.matchAll(runtimeNoticePattern)].reverse()) {
+    const [, tag, body] = match;
+    if (tag === "tools_changed_notice" && !isLegacyExitPlanNotice(body)) {
+      continue;
+    }
+    const before = stripped.slice(0, match.index);
+    const after = stripped.slice(match.index + match[0].length);
+    const whitespace = [
+      before.match(/\s*$/)?.[0],
+      after.match(/^\s*/)?.[0],
+    ].join("");
+    let separator = "";
+    if (before.trim() && after.trim()) {
+      separator = /[\r\n]/.test(whitespace) ? "\n\n" : " ";
+    }
+    stripped = before.trimEnd() + separator + after.trimStart();
+  }
+  return stripped === content ? content : stripped.trim();
 }
 
 function normalizeStoredUserMessages(conversations: NormalizedConversation[]) {
   for (const conversation of conversations) {
     for (const message of conversation.messages) {
       if (message.role === "user" && typeof message.content === "string") {
-        message.content = stripModeChangedNotice(
+        message.content = stripRuntimeNotice(
           normalizeSkillContext(message.content).replace(
             taskCompletionNotificationPattern,
             taskCompletionNotificationReplacement,
@@ -2381,7 +2510,7 @@ function convertToStreamingResponseChunks(
   return chunks;
 }
 
-function createGetModelsResponse(
+export function createGetModelsResponse(
   modelIds: string[],
   modelNames?: Record<string, string>,
 ) {
diff --git a/test/harness/sdk-diagnostics.d.mts b/test/harness/sdk-diagnostics.d.mts
new file mode 100644
index 0000000000..b217a458c3
--- /dev/null
+++ b/test/harness/sdk-diagnostics.d.mts
@@ -0,0 +1,6 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+export function sanitizeDiagnosticLine(line: string): string | undefined;
+export function readDiagnosticTail(home: string): Promise<string[]>;
diff --git a/test/harness/sdk-diagnostics.mjs b/test/harness/sdk-diagnostics.mjs
new file mode 100644
index 0000000000..829c8ed27d
--- /dev/null
+++ b/test/harness/sdk-diagnostics.mjs
@@ -0,0 +1,465 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { createReadStream } from "node:fs";
+import { readdir } from "node:fs/promises";
+import { join, resolve } from "node:path";
+import { createInterface } from "node:readline";
+import { fileURLToPath } from "node:url";
+
+// This is a finite projection, not a redactor: target names alone are not a privacy boundary.
+const presence = {
+    generation: "number",
+    event_count: "number",
+    resolved_live: "boolean",
+    request_present: "boolean",
+    completion_present: "boolean",
+    tool_present: "boolean",
+    orphaned: "boolean",
+};
+const childParts = {
+    child_span_handle: "number",
+    chat_span_handle: "number",
+    part_count: "number",
+    text_count: "number",
+    reasoning_count: "number",
+    capture_responses: "boolean",
+};
+const childCloseReasons = ["subagent_completed", "subagent_failed", "agent_turn_close", "dispose"];
+const shell = {
+    generation: "number",
+    sandbox: "boolean",
+    pid: "number",
+};
+const shellState = {
+    ...shell,
+    current_generation: "number",
+    status: ["idle", "running", "completed", "failed"],
+    exit_code_present: "boolean",
+    exit_code: "number",
+    output_bytes: "number",
+    reader_backlog_count: "number",
+    pending_stdout_bytes: "number",
+    pending_stderr_bytes: "number",
+    publications_closed: "boolean",
+};
+const records = {
+    "workflow availability decision": { available: "boolean" },
+    "sdk transport teardown": {
+        connection: "count",
+        active_requests: "count",
+        driver_finished: "boolean",
+        phase: [
+            "shutdown_writer",
+            "launcher",
+            "launcher_complete",
+            "driver",
+            "driver_complete",
+            "driver_failed",
+            "driver_timeout",
+            "driver_abort_complete",
+            "writer_shutdown_complete",
+            "peer_eof",
+            "notification_worker",
+            "notification_worker_complete",
+            "notification_worker_failed",
+            "notification_worker_timed_out",
+            "active_request_grace",
+            "handle_close",
+            "handle_close_complete",
+            "active_requests",
+            "active_requests_complete",
+            "active_requests_timed_out",
+            "flush",
+            "flush_complete",
+            "flush_cancelled",
+            "flush_timed_out",
+            "flush_unavailable",
+            "writer_join",
+            "writer_join_complete",
+            "complete",
+        ],
+    },
+    "sdk pending permission response": {
+        ...presence,
+        prepared_replay: "boolean",
+        aborting: "boolean",
+        reason: [
+            "prepared_replay",
+            "completed_request",
+            "unknown_request",
+            "resolved_tool",
+            "accepted",
+        ],
+    },
+    "sdk pending tool response": {
+        ...presence,
+        reason: [
+            "completed_request",
+            "unknown_request",
+            "non_pending_request",
+            "completed_tool",
+            "accepted",
+        ],
+    },
+    "sdk pending permission delivery": {
+        generation: "number",
+        settled: "boolean",
+        invariant_failure: "boolean",
+    },
+    "sdk pending tool delivery": {
+        generation: "number",
+        origin: ["client_response"],
+        accepted: "boolean",
+        success: "boolean",
+        failed: "boolean",
+    },
+    "sdk pending permission drain planned": {
+        generation: "number",
+        requests: "number",
+        origin: ["suspend", "abort"],
+    },
+    "sdk pending permission drain completed": {
+        generation: "number",
+        generation_known: "boolean",
+        origin: ["client_response", "cancellation"],
+        settled: "boolean",
+        invariant_failure: "boolean",
+    },
+    "sdk pending stale drain": { generation: "number", expected_generation: "number" },
+    "sdk pending transition": {
+        generation: "number",
+        event_count: "number",
+        kind: ["permission", "external_tool"],
+        origin: [
+            "registered",
+            "client_response",
+            "delivery_failure",
+            "suspend",
+            "abort",
+            "timeout",
+            "terminal_response_rejected",
+            "prepared_conflict",
+            "invalid_response",
+            "already_claimed",
+        ],
+        terminal_cancelled: "boolean",
+    },
+    "sdk pending resume": {
+        connection: "number",
+        dispatch: "number",
+        warm: "boolean",
+        phase: ["begin", "accepted"],
+    },
+    "sdk pending reap": {
+        registration: "number",
+        phase: [
+            "begin",
+            "callbacks_drained",
+            "lifecycle_acquired",
+            "owner_present",
+            "generation_removed",
+            "complete",
+            "generation_changed",
+        ],
+    },
+    "sdk session shutdown": {
+        generation: "number",
+        phase: ["begin", "tasks_drained", "terminal_drain_begin", "terminal_drain_complete"],
+        failed: "boolean",
+        elapsed_ms: "number",
+    },
+    "sdk detach": {
+        connection: "number",
+        dispatch: "number",
+        elapsed_ms: "number",
+        failed: "boolean",
+        phase: [
+            "received",
+            "lifecycle_acquired",
+            "already_detached",
+            "close_already_started",
+            "shared_owner_begin",
+            "shared_owner_complete",
+            "host_destroy_begin",
+            "host_destroy_complete",
+            "finalized",
+            "dispatch_complete",
+        ],
+    },
+    "sdk detach state": {
+        connection: "number",
+        dispatch: "number",
+        generation: "number",
+        active: "boolean",
+        attached: "boolean",
+    },
+    "sdk otel dispatch": {
+        event_kind: [
+            "assistant_message",
+            "model_call_start",
+            "assistant_turn_end",
+            "subagent_completed",
+            "subagent_failed",
+        ],
+        event_sequence: "number",
+        scope: ["parent", "child"],
+        child_present: "boolean",
+        chat_present: "boolean",
+        child_span_handle: "number",
+        chat_span_handle: "number",
+    },
+    "sdk otel admission": {
+        phase: ["received", "no_tracker", "fenced", "pending", "submitted"],
+        event_sequence: "count",
+        policy_revision: "count",
+        authority_fenced: "boolean",
+        preparation_pending: "boolean",
+        policy_enabled: "boolean",
+        projected_event_count: "count",
+        submitted: "boolean",
+    },
+    "sdk otel policy state": {
+        origin: [
+            "host_prepare",
+            "host_commit",
+            "host_commit_initial",
+            "host_bind",
+            "host_rollback",
+            "explicit_fence",
+            "legacy_settled",
+            "native_pending",
+            "native_settled",
+            "native_apply",
+            "reserved_apply",
+            "direct_apply",
+        ],
+        kind: [
+            "transition",
+            "restore",
+            "fence",
+            "apply_stale_source",
+            "apply_retry",
+            "apply_superseded",
+            "apply_settled",
+        ],
+        expected_some: "boolean",
+        expected_incarnation: "count",
+        expected_revision: "count",
+        previous_incarnation: "count",
+        previous_revision: "count",
+        current_incarnation: "count",
+        current_revision: "count",
+        previous_authority_fenced: "boolean",
+        authority_fenced: "boolean",
+        previous_preparation_pending: "boolean",
+        preparation_pending: "boolean",
+        previous_native_owned: "boolean",
+        native_owned: "boolean",
+        policy_enabled: "boolean",
+        returned_some: "boolean",
+        applied: "boolean",
+        build_succeeded: "boolean",
+    },
+    "sdk otel core policy publication": {
+        origin: [
+            "clear_account_policy",
+            "retained_device_update",
+            "retained_server_update",
+            "retained_signed_out_update",
+            "registry_rotation",
+            "signed_out_policy_clear",
+            "refresh_start",
+            "ingest_settlement",
+            "standalone_provider_rebind",
+            "standalone_provider_restore",
+            "construction_options_auth",
+            "manager_auth_changed",
+            "resolved_session_auth",
+            "hydrated_session_auth",
+            "set_credentials",
+            "clear_credentials",
+            "other_auth_mutation",
+        ],
+        kind: ["pending_publish", "pending_publish_returned"],
+        registry_generation: "count",
+        previous_auth_generation: "count",
+        auth_generation: "count",
+        auth_generation_changed: "boolean",
+        previous_server_pending: "boolean",
+        server_pending: "boolean",
+        policy_identity_present: "boolean",
+        source_recovery: "boolean",
+        clear_retained: "boolean",
+        composition_succeeded: "boolean",
+        refresh_generation: "count",
+        has_resolved_managed_settings: "boolean",
+        has_eligible_current_otel_policy: "boolean",
+        expected_auth_generation: "count",
+    },
+    "sdk otel policy settlement": {
+        origin: ["standalone_commit"],
+        kind: ["reservation", "application"],
+        succeeded: "boolean",
+        reservation_some: "boolean",
+        committed_incarnation: "count",
+        committed_revision: "count",
+        expected_incarnation: "count",
+        expected_revision: "count",
+        applied: "boolean",
+    },
+    "sdk assistant message": {
+        ...childParts,
+        scope: ["parent", "child"],
+        child_present: "boolean",
+        chat_present: "boolean",
+        parent_chat_present: "boolean",
+    },
+    "sdk chat close": {
+        ...childParts,
+        scope: ["parent", "child"],
+        operation: ["chat"],
+        reason: [
+            ...childCloseReasons,
+            "model_call_start",
+            "assistant_turn_end",
+            "parent_turn_close",
+        ],
+        status: ["unset", "error"],
+    },
+    "sdk child completion": {
+        ...childParts,
+        phase: ["begin", "closed"],
+        operation: ["invoke_agent"],
+        reason: childCloseReasons,
+        status: ["unset", "error"],
+        child_present: "boolean",
+        chat_present: "boolean",
+    },
+    "sdk shell exit": {
+        ...shell,
+        phase: [
+            "scheduled",
+            "started",
+            "observed",
+            "observe_failed",
+            "finalize_started",
+            "finalized",
+            "finalize_failed",
+        ],
+        exit_code_present: "boolean",
+        exit_code: "number",
+        elapsed_ms: "elapsed",
+    },
+    "sdk shell reader": {
+        ...shell,
+        phase: ["eof", "error", "finished"],
+        stream: ["stdout", "stderr"],
+        elapsed_ms: "elapsed",
+    },
+    "sdk shell drain": {
+        ...shell,
+        phase: ["drained", "aborted"],
+        reader_count: "number",
+        reader_unjoined: "number",
+        elapsed_ms: "elapsed",
+        backpressured: "boolean",
+    },
+    "sdk shell completion": {
+        ...shellState,
+        phase: [
+            "finish_stale_generation",
+            "finish_not_running",
+            "finish_publications_closed",
+            "publishing",
+            "complete_stale_generation",
+            "complete_not_running",
+            "completed",
+        ],
+        lifecycle_error: "boolean",
+    },
+    "sdk shell wait": {
+        ...shellState,
+        phase: [
+            "interrupted",
+            "stale_generation",
+            "completion",
+            "cancelled",
+            "deadline",
+            "completion_after_deadline",
+        ],
+        wait_generation: "number",
+        current_wait_generation: "number",
+        elapsed_ms: "elapsed",
+        timeout_ms: "number",
+    },
+};
+
+export function sanitizeDiagnosticLine(line) {
+    if (line.length > 16384) return undefined;
+    const match = /^\S+ \[DEBUG\] \[rust:sdk_diagnostics\] ([a-z ]+) (\{.*\})$/.exec(line);
+    if (!match || !Object.hasOwn(records, match[1])) return undefined;
+    let input;
+    try {
+        input = JSON.parse(match[2]);
+    } catch {
+        return undefined;
+    }
+    if (!input || Array.isArray(input) || typeof input !== "object") return undefined;
+    const output = {};
+    for (const [key, rule] of Object.entries(records[match[1]])) {
+        if (!Object.hasOwn(input, key)) continue;
+        const value = input[key];
+        const valid = Array.isArray(rule)
+            ? rule.includes(value)
+            : rule === "number"
+              ? Number.isSafeInteger(value)
+              : rule === "count"
+                ? Number.isSafeInteger(value) && value >= 0
+                : rule === "elapsed"
+                  ? Number.isFinite(value) && value >= 0
+                  : typeof value === rule;
+        if (!valid) return undefined;
+        output[key] = value;
+    }
+    if (!Object.keys(output).length) return undefined;
+    return `${match[1]} ${JSON.stringify(output)}`;
+}
+
+export async function readDiagnosticTail(home) {
+    const tail = [];
+    const append = (line) => {
+        const safe = sanitizeDiagnosticLine(line);
+        if (safe !== undefined) {
+            tail.push(safe);
+            if (tail.length > 200) tail.shift();
+        }
+    };
+    let files;
+    try {
+        files = await readdir(join(home, "logs"));
+    } catch (error) {
+        if (error.code !== "ENOENT") throw error;
+        files = [];
+    }
+    for (const file of files.sort()) {
+        if (!file.endsWith(".log")) continue;
+        const lines = createInterface({
+            input: createReadStream(join(home, "logs", file)),
+            crlfDelay: Infinity,
+        });
+        for await (const line of lines) append(line);
+    }
+    return tail;
+}
+
+if (process.argv[1] && resolve(process.argv[1]) === fileURLToPath(import.meta.url)) {
+    try {
+        const tail = await readDiagnosticTail(process.argv[2]);
+        console.log(`[SDK diagnostics: last ${tail.length} audited records]\n${tail.join("\n")}`);
+    } catch {
+        console.error("SDK diagnostics unavailable");
+        process.exitCode = 1;
+    }
+}
diff --git a/test/harness/sdk-diagnostics.test.ts b/test/harness/sdk-diagnostics.test.ts
new file mode 100644
index 0000000000..9a57c8b8d9
--- /dev/null
+++ b/test/harness/sdk-diagnostics.test.ts
@@ -0,0 +1,507 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { mkdtemp, mkdir, writeFile, rm } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { describe, expect, it, onTestFinished } from "vitest";
+import { readDiagnosticTail, sanitizeDiagnosticLine } from "./sdk-diagnostics.mjs";
+
+const prefix = "2026-10-05T12:00:00Z [DEBUG] [rust:sdk_diagnostics] ";
+
+describe("SDK failure diagnostics", () => {
+    it("projects model admission phases, authoritative sequences and policy metadata without content", () => {
+        const cases = [
+            { phase: "received" },
+            { phase: "no_tracker" },
+            {
+                phase: "fenced",
+                event_sequence: 17,
+                policy_revision: 3,
+                authority_fenced: false,
+                preparation_pending: true,
+                policy_enabled: true,
+            },
+            { phase: "pending", event_sequence: 17 },
+            { phase: "submitted", event_sequence: 17, projected_event_count: 1, submitted: true },
+            { phase: "submitted", projected_event_count: 0, submitted: false },
+        ];
+        for (const fields of cases) {
+            const safe = sanitizeDiagnosticLine(
+                `${prefix}sdk otel admission ${JSON.stringify({
+                    ...fields,
+                    session_id: "PRIVATE_SESSION",
+                    event_id: "PRIVATE_EVENT",
+                    model: "PRIVATE_MODEL",
+                    payload: { content: "PRIVATE_PAYLOAD" },
+                    error: "PRIVATE_ERROR",
+                    path: "PRIVATE_PATH",
+                })}`
+            );
+            expect(safe).toBeDefined();
+            expect(JSON.parse(safe!.slice("sdk otel admission ".length))).toEqual(fields);
+            expect(safe).not.toContain("PRIVATE");
+        }
+        for (const fields of [
+            { phase: "PRIVATE_PHASE" },
+            { event_sequence: -1 },
+            { event_sequence: 0.5 },
+            { event_sequence: Number.MAX_SAFE_INTEGER + 1 },
+            { event_sequence: "PRIVATE_SEQUENCE" },
+            { event_sequence: null },
+            { policy_revision: -1 },
+            { policy_revision: 0.5 },
+            { projected_event_count: -1 },
+            { projected_event_count: 0.5 },
+            { authority_fenced: "PRIVATE_STATE" },
+            { preparation_pending: null },
+            { policy_enabled: "PRIVATE_STATE" },
+            { submitted: "PRIVATE_STATE" },
+            { session_id: "PRIVATE_SESSION" },
+        ]) {
+            expect(
+                sanitizeDiagnosticLine(`${prefix}sdk otel admission ${JSON.stringify(fields)}`)
+            ).toBeUndefined();
+        }
+    });
+
+    it.each([
+        {
+            label: "native authority fence",
+            record: "sdk otel policy state",
+            fields: {
+                origin: "native_pending",
+                kind: "fence",
+                expected_some: false,
+                previous_incarnation: 2,
+                previous_revision: 10,
+                current_incarnation: 2,
+                current_revision: 11,
+                previous_authority_fenced: false,
+                authority_fenced: true,
+                previous_preparation_pending: true,
+                preparation_pending: true,
+                previous_native_owned: true,
+                native_owned: true,
+                policy_enabled: true,
+                returned_some: true,
+            },
+        },
+        {
+            label: "resident credential publication",
+            record: "sdk otel core policy publication",
+            fields: {
+                origin: "standalone_provider_rebind",
+                kind: "pending_publish_returned",
+                registry_generation: 1,
+                previous_auth_generation: 2,
+                auth_generation: 3,
+                auth_generation_changed: true,
+                previous_server_pending: false,
+                server_pending: true,
+                policy_identity_present: true,
+                source_recovery: false,
+            },
+        },
+        {
+            label: "superseded host reservation",
+            record: "sdk otel policy settlement",
+            fields: {
+                origin: "standalone_commit",
+                kind: "reservation",
+                succeeded: true,
+                reservation_some: false,
+            },
+        },
+        {
+            label: "successfully disabled application",
+            record: "sdk otel policy settlement",
+            fields: {
+                origin: "standalone_commit",
+                kind: "application",
+                expected_incarnation: 2,
+                expected_revision: 3,
+                succeeded: true,
+                applied: false,
+            },
+        },
+    ])("projects $label without credential or policy content", ({ record, fields }) => {
+        const safe = sanitizeDiagnosticLine(
+            `${prefix}${record} ${JSON.stringify({
+                ...fields,
+                session_id: "PRIVATE_SESSION",
+                registration: "PRIVATE_REGISTRATION",
+                account: "PRIVATE_ACCOUNT",
+                policy: { endpoint: "PRIVATE_ENDPOINT", headers: { token: "PRIVATE_TOKEN" } },
+                error: "PRIVATE_ERROR",
+            })}`
+        );
+        expect(safe).toBeDefined();
+        expect(JSON.parse(safe!.slice(record.length + 1))).toEqual(fields);
+        expect(safe).not.toContain("PRIVATE");
+    });
+
+    it.each([
+        ["sdk otel policy state", "current_revision", "authority_fenced"],
+        ["sdk otel core policy publication", "auth_generation", "server_pending"],
+        ["sdk otel policy settlement", "committed_revision", "reservation_some"],
+    ])("rejects unaudited or invalid %s fields", (record, count, flag) => {
+        for (const fields of [
+            { origin: "PRIVATE_ORIGIN" },
+            { kind: "PRIVATE_KIND" },
+            ...[-1, 0.5, Number.MAX_SAFE_INTEGER + 1, "PRIVATE_COUNT", null].map((value) => ({
+                [count]: value,
+            })),
+            { [flag]: "PRIVATE_STATE" },
+            { [flag]: null },
+            { session_id: "PRIVATE_SESSION" },
+        ]) {
+            expect(
+                sanitizeDiagnosticLine(`${prefix}${record} ${JSON.stringify(fields)}`)
+            ).toBeUndefined();
+        }
+    });
+
+    it("preserves policy attribution through the audited file collector", async () => {
+        const home = await mkdtemp(join(tmpdir(), "sdk-policy-diagnostics-"));
+        onTestFinished(() => rm(home, { recursive: true, force: true }));
+        await mkdir(join(home, "logs"));
+        await writeFile(
+            join(home, "logs", "policy.log"),
+            [
+                `${prefix}sdk otel core policy publication {"origin":"standalone_provider_rebind","kind":"pending_publish_returned","auth_generation":3,"account":"PRIVATE"}`,
+                `${prefix}sdk otel policy state {"origin":"native_pending","kind":"fence","current_revision":11,"authority_fenced":true,"policy":"PRIVATE"}`,
+                `${prefix}sdk otel policy settlement {"origin":"standalone_commit","kind":"reservation","succeeded":true,"reservation_some":false,"session_id":"PRIVATE"}`,
+            ].join("\n")
+        );
+        expect(await readDiagnosticTail(home)).toEqual([
+            'sdk otel core policy publication {"origin":"standalone_provider_rebind","kind":"pending_publish_returned","auth_generation":3}',
+            'sdk otel policy state {"origin":"native_pending","kind":"fence","current_revision":11,"authority_fenced":true}',
+            'sdk otel policy settlement {"origin":"standalone_commit","kind":"reservation","succeeded":true,"reservation_some":false}',
+        ]);
+    });
+
+    it("projects fixed transport teardown phases and bounded counts without SDK content", () => {
+        for (const phase of [
+            "shutdown_writer",
+            "launcher",
+            "launcher_complete",
+            "driver",
+            "driver_complete",
+            "driver_failed",
+            "driver_timeout",
+            "driver_abort_complete",
+            "writer_shutdown_complete",
+            "peer_eof",
+            "notification_worker",
+            "notification_worker_complete",
+            "notification_worker_failed",
+            "notification_worker_timed_out",
+            "active_request_grace",
+            "handle_close",
+            "handle_close_complete",
+            "active_requests",
+            "active_requests_complete",
+            "active_requests_timed_out",
+            "flush",
+            "flush_complete",
+            "flush_cancelled",
+            "flush_timed_out",
+            "flush_unavailable",
+            "writer_join",
+            "writer_join_complete",
+            "complete",
+        ]) {
+            const safe = sanitizeDiagnosticLine(
+                `${prefix}sdk transport teardown ${JSON.stringify({
+                    connection: 4,
+                    active_requests: 2,
+                    driver_finished: false,
+                    phase,
+                    method: "PRIVATE_METHOD",
+                    request: { token: "PRIVATE_TOKEN" },
+                    sdkLog: "PRIVATE_LOG",
+                    error: "PRIVATE_ERROR",
+                })}`
+            );
+            expect(safe).toBeDefined();
+            expect(JSON.parse(safe!.slice("sdk transport teardown ".length))).toEqual({
+                connection: 4,
+                active_requests: 2,
+                driver_finished: false,
+                phase,
+            });
+            expect(safe).not.toContain("PRIVATE");
+        }
+        for (const fields of [
+            { phase: "PRIVATE_PHASE" },
+            { active_requests: -1 },
+            { active_requests: 0.5 },
+            { active_requests: Number.MAX_SAFE_INTEGER + 1 },
+            { active_requests: "PRIVATE_COUNT" },
+            { connection: -1 },
+            { connection: null },
+            { driver_finished: "PRIVATE_STATE" },
+            { method: "PRIVATE_METHOD" },
+        ]) {
+            expect(
+                sanitizeDiagnosticLine(`${prefix}sdk transport teardown ${JSON.stringify(fields)}`)
+            ).toBeUndefined();
+        }
+        expect(
+            sanitizeDiagnosticLine(
+                `${prefix}sdk transport teardown {"phase":"complete","active_requests":0}`
+            )
+        ).toBe('sdk transport teardown {"active_requests":0,"phase":"complete"}');
+    });
+
+    it("projects only audited fields and never falls back to raw data", () => {
+        expect(
+            sanitizeDiagnosticLine(
+                `${prefix}sdk pending tool response ${JSON.stringify({
+                    generation: 9,
+                    request_event: 3,
+                    reason: "completed_request",
+                    requestId: "PRIVATE_REQUEST",
+                    sessionId: "PRIVATE_SESSION",
+                    tool: "PRIVATE_TOOL",
+                    path: "/PRIVATE_PATH",
+                    error: "PRIVATE_ERROR",
+                    payload: "PRIVATE_PROMPT",
+                    credential: "PRIVATE_CREDENTIAL",
+                    endpoint: "PRIVATE_ENDPOINT",
+                })}`
+            )
+        ).toBe('sdk pending tool response {"generation":9,"reason":"completed_request"}');
+        expect(
+            sanitizeDiagnosticLine(
+                `${prefix}sdk pending transition ${JSON.stringify({
+                    generation: 9,
+                    request_event: 3,
+                    event_count: 4,
+                    completion_present: true,
+                    kind: "permission",
+                    origin: "client_response",
+                    terminal_cancelled: false,
+                    requestId: "PRIVATE_REQUEST",
+                })}`
+            )
+        ).toBe(
+            'sdk pending transition {"generation":9,"event_count":4,"kind":"permission","origin":"client_response","terminal_cancelled":false}'
+        );
+        expect(
+            sanitizeDiagnosticLine(
+                `${prefix}sdk pending tool delivery ${JSON.stringify({
+                    generation: 9,
+                    origin: "client_response",
+                    accepted: true,
+                    success: true,
+                    failed: false,
+                    requestId: "PRIVATE_REQUEST",
+                    result: "PRIVATE_RESULT",
+                    error: "PRIVATE_ERROR",
+                })}`
+            )
+        ).toBe(
+            'sdk pending tool delivery {"generation":9,"origin":"client_response","accepted":true,"success":true,"failed":false}'
+        );
+        for (const line of [
+            `${prefix}PRIVATE_MESSAGE {"generation":9}`,
+            `${prefix}sdk pending tool response {"reason":"PRIVATE_REASON"}`,
+            `${prefix}sdk pending tool response {"generation":"PRIVATE_ID"}`,
+            `${prefix}sdk pending tool response {"reason":"accepted"} PRIVATE_TRAILER`,
+            `${prefix}sdk pending tool response {PRIVATE_MALFORMED`,
+            `${prefix}sdk pending tool response {"PRIVATE_FIELD":"PRIVATE_VALUE"}`,
+            `${prefix}sdk pending tool response {"generation":null}`,
+            `${prefix}sdk pending tool response {"generation":{}}`,
+            `${prefix}sdk pending tool response {"generation":1e100}`,
+            `${prefix}sdk pending tool delivery {"origin":"PRIVATE_ORIGIN"}`,
+            `PRIVATE_PREFIX ${prefix}sdk pending tool response {"generation":9}`,
+        ]) {
+            expect(sanitizeDiagnosticLine(line)).toBeUndefined();
+        }
+    });
+
+    it("bounds the combined tail across files and preserves only audited native records", async () => {
+        const home = await mkdtemp(join(tmpdir(), "sdk-diagnostics-"));
+        onTestFinished(() => rm(home, { recursive: true, force: true }));
+        await mkdir(join(home, "logs"));
+        for (const file of ["first.log", "second.log"]) {
+            await writeFile(
+                join(home, "logs", file),
+                Array.from(
+                    { length: 150 },
+                    (_, generation) =>
+                        `${prefix}sdk pending stale drain ${JSON.stringify({ generation, expected_generation: 1, secret: "PRIVATE" })}`
+                ).join("\n")
+            );
+        }
+        await writeFile(
+            join(home, "logs", "third.log"),
+            [
+                `${prefix}sdk detach {"phase":"received","connection":2,"dispatch":1,"content":"PRIVATE"}`,
+                `${prefix}sdk detach {"phase":"dispatch_complete","connection":2,"dispatch":1,"failed":false,"elapsed_ms":4}`,
+                '[sdk_diagnostics] sdk detach {"phase":"received","content":"PRIVATE"}',
+            ].join("\n")
+        );
+        const tail = await readDiagnosticTail(home);
+        expect(tail).toHaveLength(200);
+        expect(tail[0]).toContain('"generation":102');
+        expect(tail.at(-2)).toBe('sdk detach {"connection":2,"dispatch":1,"phase":"received"}');
+        expect(tail.at(-1)).toBe(
+            'sdk detach {"connection":2,"dispatch":1,"elapsed_ms":4,"failed":false,"phase":"dispatch_complete"}'
+        );
+        expect(tail.join("\n")).not.toContain("PRIVATE");
+        expect(tail.join("\n")).not.toContain(home);
+    });
+
+    it("preserves telemetry correlation and fractional shell timings without content", () => {
+        const cases = [
+            [
+                "sdk otel dispatch",
+                {
+                    event_kind: "assistant_message",
+                    event_sequence: 8,
+                    scope: "child",
+                    child_present: true,
+                    chat_present: true,
+                    child_span_handle: 2,
+                    chat_span_handle: 3,
+                },
+            ],
+            [
+                "sdk assistant message",
+                {
+                    scope: "child",
+                    child_present: true,
+                    chat_present: true,
+                    parent_chat_present: true,
+                    child_span_handle: 2,
+                    chat_span_handle: 3,
+                    part_count: 2,
+                    text_count: 1,
+                    reasoning_count: 1,
+                    capture_responses: true,
+                },
+            ],
+            [
+                "sdk chat close",
+                {
+                    scope: "child",
+                    operation: "chat",
+                    reason: "subagent_completed",
+                    status: "unset",
+                    child_span_handle: 2,
+                    chat_span_handle: 3,
+                    part_count: 2,
+                    text_count: 1,
+                    reasoning_count: 1,
+                    capture_responses: true,
+                },
+            ],
+            [
+                "sdk child completion",
+                {
+                    phase: "closed",
+                    operation: "invoke_agent",
+                    reason: "subagent_completed",
+                    status: "unset",
+                    child_span_handle: 2,
+                },
+            ],
+            [
+                "sdk shell wait",
+                {
+                    generation: 2,
+                    current_generation: 2,
+                    wait_generation: 1,
+                    current_wait_generation: 1,
+                    sandbox: true,
+                    pid: 123,
+                    status: "running",
+                    exit_code_present: false,
+                    output_bytes: 7,
+                    reader_backlog_count: 2,
+                    pending_stdout_bytes: 4,
+                    pending_stderr_bytes: 3,
+                    publications_closed: false,
+                    phase: "deadline",
+                    elapsed_ms: 30000.125,
+                    timeout_ms: 30000,
+                },
+            ],
+            [
+                "sdk shell exit",
+                {
+                    generation: 2,
+                    sandbox: false,
+                    phase: "observed",
+                    exit_code_present: true,
+                    exit_code: -1,
+                    elapsed_ms: 0.125,
+                },
+            ],
+            [
+                "sdk shell reader",
+                {
+                    generation: 2,
+                    sandbox: false,
+                    phase: "finished",
+                    stream: "stderr",
+                    elapsed_ms: 0.25,
+                },
+            ],
+            [
+                "sdk shell drain",
+                {
+                    generation: 2,
+                    sandbox: false,
+                    phase: "aborted",
+                    reader_count: 2,
+                    reader_unjoined: 1,
+                    backpressured: true,
+                    elapsed_ms: 1500.125,
+                },
+            ],
+            [
+                "sdk shell completion",
+                {
+                    generation: 2,
+                    current_generation: 3,
+                    sandbox: false,
+                    status: "running",
+                    phase: "finish_stale_generation",
+                    lifecycle_error: false,
+                },
+            ],
+        ] as const;
+        for (const [message, fields] of cases) {
+            const safe = sanitizeDiagnosticLine(
+                `${prefix}${message} ${JSON.stringify({
+                    ...fields,
+                    command: "PRIVATE_COMMAND",
+                    output: "PRIVATE_OUTPUT",
+                    message: "PRIVATE_MESSAGE",
+                    span: { content: "PRIVATE_SPAN" },
+                    sessionId: "PRIVATE_SESSION",
+                    childId: "PRIVATE_CHILD",
+                })}`
+            );
+            expect(safe).toBeDefined();
+            expect(JSON.parse(safe!.slice(message.length + 1))).toEqual(fields);
+            expect(safe).not.toContain("PRIVATE");
+        }
+        for (const fields of [
+            { elapsed_ms: -1 },
+            { elapsed_ms: "PRIVATE_TIME" },
+            { elapsed_ms: null },
+            { phase: "PRIVATE_PHASE" },
+            { stream: "PRIVATE_STREAM" },
+        ]) {
+            expect(
+                sanitizeDiagnosticLine(`${prefix}sdk shell reader ${JSON.stringify(fields)}`)
+            ).toBeUndefined();
+        }
+    });
+});
diff --git a/test/harness/server.ts b/test/harness/server.ts
index 887a57178b..f190b2d2f5 100644
--- a/test/harness/server.ts
+++ b/test/harness/server.ts
@@ -6,11 +6,18 @@ import { ReplayingCapiProxy } from "./replayingCapiProxy";
 import { ConnectProxy } from "./connectProxy";
 import { createE2eRequestHandler } from "./mockHandlers";
 
+console.error(
+  `[SDK proxy startup] Server dependencies loaded at ${Math.round(performance.now())}ms`,
+);
+
 // Starts up an instance of the ReplayingCapiProxy server
 // The intention is for this to be usable in E2E tests across all languages
 
 const proxy = new ReplayingCapiProxy("https://api.githubcopilot.com");
 const proxyUrl = await proxy.start();
+console.error(
+  `[SDK proxy startup] Replay server listening at ${Math.round(performance.now())}ms`,
+);
 const blockedHosts: string[] = [];
 const unhandledRequests: string[] = [];
 
@@ -39,6 +46,9 @@ const connectProxy = new ConnectProxy(
   },
 );
 await connectProxy.start();
+console.error(
+  `[SDK proxy startup] CONNECT server listening at ${Math.round(performance.now())}ms`,
+);
 
 proxy.onStopRequested = async () => {
   if (blockedHosts.length || unhandledRequests.length) {
diff --git a/test/harness/sessionExpiryMcpServer.test.mjs b/test/harness/sessionExpiryMcpServer.test.mjs
new file mode 100644
index 0000000000..091b218072
--- /dev/null
+++ b/test/harness/sessionExpiryMcpServer.test.mjs
@@ -0,0 +1,191 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Agent, request } from "node:http";
+import { test } from "vitest";
+import { startSessionExpiryMcpServer } from "./test-mcp-session-expiry-server.mjs";
+
+test("legacy session expiry is independent of HTTP connection lifetime even for modern clients", async ({
+  expect,
+  onTestFinished,
+}) => {
+  const server = await startSessionExpiryMcpServer();
+  onTestFinished(() => server.close());
+  const agent = new Agent({ keepAlive: true });
+  onTestFinished(() => agent.destroy());
+  const probeSockets = new Set();
+
+  const initialize = () =>
+    fetch(`${server.url}/mcp`, {
+      method: "POST",
+      headers: { "content-type": "application/json" },
+      body: JSON.stringify({
+        jsonrpc: "2.0",
+        id: 1,
+        method: "initialize",
+        params: {
+          protocolVersion: "2026-07-28",
+          capabilities: {},
+          clientInfo: { name: "session-expiry-test", version: "1" },
+        },
+      }),
+    });
+  const initialized = await initialize();
+  expect(initialized.status).toBe(200);
+  expect(initialized.headers.get("connection")).toBe("close");
+  expect((await initialized.json()).result.protocolVersion).toBe("2025-03-26");
+  const sessionId = initialized.headers.get("mcp-session-id");
+  expect(sessionId).toBeTruthy();
+
+  const ping = async () => {
+    const response = await new Promise((resolve, reject) => {
+      const req = request(
+        `${server.url}/mcp`,
+        {
+          agent,
+          method: "POST",
+          headers: {
+            "content-type": "application/json",
+            "mcp-session-id": sessionId,
+          },
+        },
+        (res) => {
+          const socket = res.socket;
+          let body = "";
+          res.setEncoding("utf8");
+          res.on("data", (chunk) => (body += chunk));
+          res.on("error", reject);
+          res.on("end", () =>
+            resolve({ status: res.statusCode, headers: res.headers, socket, body })
+          );
+        }
+      );
+      req.on("error", reject);
+      req.end(JSON.stringify({ jsonrpc: "2.0", id: 2, method: "ping" }));
+    });
+    expect(response.headers.connection).toBe("close");
+    expect(probeSockets.has(response.socket)).toBe(false);
+    probeSockets.add(response.socket);
+    return { status: response.status, body: JSON.parse(response.body) };
+  };
+  const alive = await ping();
+  expect(alive.status).toBe(200);
+  expect(alive.body).toEqual({ jsonrpc: "2.0", id: 2, result: {} });
+
+  const expired = await fetch(`${server.url}/__expire`, { method: "POST" });
+  expect(expired.status).toBe(200);
+  expect(await expired.json()).toEqual({ expired: 1 });
+  for (let probe = 0; probe < 3; probe++) {
+    const afterExpiry = await ping();
+    expect(afterExpiry.status).toBe(404);
+    expect(afterExpiry.body).toEqual({ error: "session_expired" });
+  }
+  const observed = await fetch(`${server.url}/__stats`).then((response) => response.json());
+  expect(observed.pings).toBe(1);
+  expect(observed.expiredRequests).toBe(3);
+  expect(observed.expiredRequestLog).toEqual(
+    Array.from({ length: 3 }, () => ({ method: "POST", elapsedMs: expect.any(Number) })),
+  );
+  expect(observed.protocolVersions).toEqual(["2026-07-28"]);
+  expect(observed.recentRequests).toContainEqual(
+    expect.objectContaining({
+      httpMethod: "POST",
+      sessionAttached: true,
+      expiredSession: true,
+      status: 404,
+    }),
+  );
+  expect(JSON.stringify(observed)).not.toContain(sessionId);
+
+  const reinitialized = await initialize();
+  expect(reinitialized.status).toBe(200);
+  expect((await reinitialized.json()).result.protocolVersion).toBe("2025-03-26");
+  expect(reinitialized.headers.get("mcp-session-id")).not.toBe(sessionId);
+  expect(server.stats.initializations).toBe(2);
+});
+
+test("distinguishes answered expiry probes from unrelated traffic", async ({
+  expect,
+  onTestFinished,
+}) => {
+  const startingServer = startSessionExpiryMcpServer();
+  onTestFinished(async () => (await startingServer).close());
+  const server = await startingServer;
+
+  const initialized = await fetch(`${server.url}/mcp`, {
+    method: "POST",
+    headers: { "content-type": "application/json" },
+    body: JSON.stringify({ jsonrpc: "2.0", id: 1, method: "initialize" }),
+  });
+  const sessionId = initialized.headers.get("mcp-session-id");
+  expect(initialized.status).toBe(200);
+  expect(sessionId).toBeTruthy();
+  await initialized.json();
+
+  const request = (method) =>
+    fetch(`${server.url}/mcp`, {
+      method: "POST",
+      headers: { "content-type": "application/json", "mcp-session-id": sessionId },
+      body: JSON.stringify({ jsonrpc: "2.0", id: 2, method }),
+    });
+  const alive = await request("ping");
+  expect(alive.status).toBe(200);
+  expect(await alive.json()).toEqual({ jsonrpc: "2.0", id: 2, result: {} });
+  expect(server.stats.expiredSessionProbes).toBe(0);
+
+  const expired = await fetch(`${server.url}/__expire`, { method: "POST" });
+  expect(expired.status).toBe(200);
+  expect(await expired.json()).toEqual({ expired: 1 });
+  expect(server.stats.expiredSessionProbes).toBe(0);
+
+  const ordinary = await request("tools/list");
+  expect(ordinary.status).toBe(404);
+  expect(await ordinary.json()).toEqual({ error: "session_expired" });
+  expect(server.stats.expiredSessionProbes).toBe(0);
+
+  const probe = await request("ping");
+  expect(probe.status).toBe(404);
+  expect(await probe.json()).toEqual({ error: "session_expired" });
+  expect(server.stats.expiredSessionProbes).toBe(1);
+  const observed = await fetch(`${server.url}/__stats`);
+  expect(observed.status).toBe(200);
+  expect(await observed.json()).toMatchObject({ activeSessions: 0, expiredSessionProbes: 1 });
+});
+
+test("bounds session-expiry diagnostics without retaining request payloads", async ({ expect, onTestFinished }) => {
+  const startingServer = startSessionExpiryMcpServer();
+  onTestFinished(async () => (await startingServer).close());
+  const server = await startingServer;
+  for (let i = 0; i < 40; i++) {
+    const response = await fetch(`${server.url}/mcp`, {
+      method: "POST",
+      headers: { "content-type": "application/json" },
+      body: JSON.stringify({
+        jsonrpc: "2.0",
+        id: `private-request-${i}`,
+        method: "initialize",
+        params: {
+          protocolVersion: "2025-03-26",
+          clientInfo: { name: "private-client", version: "1" },
+        },
+      }),
+    });
+    expect(response.status).toBe(200);
+    await response.json();
+  }
+  const observed = await fetch(`${server.url}/__stats`).then((response) => response.json());
+  expect(observed.initializations).toBe(40);
+  expect(observed.recentRequests).toHaveLength(32);
+  for (const request of observed.recentRequests) {
+    expect(request).toEqual({
+      elapsedMs: expect.any(Number),
+      httpMethod: "POST",
+      sessionAttached: false,
+      expiredSession: false,
+      rpcMethods: ["initialize"],
+      status: 200,
+    });
+  }
+  expect(JSON.stringify(observed)).not.toContain("private-");
+});
diff --git a/test/harness/sessionExpiryServer.test.ts b/test/harness/sessionExpiryServer.test.ts
new file mode 100644
index 0000000000..5a97f3cdfa
--- /dev/null
+++ b/test/harness/sessionExpiryServer.test.ts
@@ -0,0 +1,63 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { onTestFinished, test } from "vitest";
+import { startSessionExpiryMcpServer } from "./test-mcp-session-expiry-server.mjs";
+
+test.for(["2025-03-26", "2026-07-28", "2099-01-01"])(
+  "negotiates a stateful session when the client proposes %s",
+  async (protocolVersion, { expect }) => {
+    const startingServer = startSessionExpiryMcpServer();
+    onTestFinished(async () => {
+      const [result] = await Promise.allSettled([startingServer]);
+      if (result.status === "fulfilled") {
+        await result.value.close();
+      }
+    });
+    const server = await startingServer;
+    const initialized = await fetch(`${server.url}/mcp`, {
+      method: "POST",
+      headers: { "content-type": "application/json" },
+      body: JSON.stringify({
+        jsonrpc: "2.0",
+        id: 1,
+        method: "initialize",
+        params: {
+          protocolVersion,
+          capabilities: {},
+          clientInfo: { name: "test", version: "1" },
+        },
+      }),
+    });
+    expect(initialized.status).toBe(200);
+    expect((await initialized.json()).result.protocolVersion).toBe("2025-03-26");
+    const sessionId = initialized.headers.get("mcp-session-id");
+    expect(sessionId).not.toBeNull();
+    if (sessionId === null) {
+      throw new Error("The stateful fixture did not issue an MCP session ID");
+    }
+
+    const ping = () =>
+      fetch(`${server.url}/mcp`, {
+        method: "POST",
+        headers: { "content-type": "application/json", "mcp-session-id": sessionId },
+        body: JSON.stringify({ jsonrpc: "2.0", id: 2, method: "ping" }),
+      });
+    const alive = await ping();
+    expect(alive.status).toBe(200);
+    expect(await alive.json()).toEqual({ jsonrpc: "2.0", id: 2, result: {} });
+
+    const expired = await fetch(`${server.url}/__expire`, { method: "POST" });
+    expect(expired.status).toBe(200);
+    expect(await expired.json()).toEqual({ expired: 1 });
+    const lost = await ping();
+    expect(lost.status).toBe(404);
+    expect(await lost.json()).toEqual({ error: "session_expired" });
+    const lostStream = await fetch(`${server.url}/mcp`, {
+      headers: { "mcp-session-id": sessionId },
+    });
+    expect(lostStream.status).toBe(404);
+    expect(await lostStream.json()).toEqual({ error: "session_expired" });
+  },
+);
diff --git a/test/harness/startup.mjs b/test/harness/startup.mjs
new file mode 100644
index 0000000000..38f2540b57
--- /dev/null
+++ b/test/harness/startup.mjs
@@ -0,0 +1,12 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+console.error(
+  `[SDK proxy startup] Node entered at ${Math.round(performance.now())}ms`,
+);
+await import("tsx");
+console.error(
+  `[SDK proxy startup] TypeScript loader ready at ${Math.round(performance.now())}ms`,
+);
+await import("./server.ts");
diff --git a/test/harness/startup.test.ts b/test/harness/startup.test.ts
new file mode 100644
index 0000000000..d3ada9ee3b
--- /dev/null
+++ b/test/harness/startup.test.ts
@@ -0,0 +1,73 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { execFile } from "node:child_process";
+import { mkdtemp, rm, writeFile } from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+import { fileURLToPath, pathToFileURL } from "node:url";
+import { promisify } from "node:util";
+import { test } from "vitest";
+
+const execute = promisify(execFile);
+const bootstrap = fileURLToPath(new URL("./startup.mjs", import.meta.url));
+
+test.for(["tsx", "./server.ts"])(
+  "records the last startup phase before import %s fails",
+  async (failedImport, { expect, onTestFinished, signal }) => {
+    const creatingDirectory = mkdtemp(
+      path.join(os.tmpdir(), "sdk-proxy-startup-"),
+    );
+    let executing: ReturnType<typeof execute> | undefined;
+    onTestFinished(async () => {
+      const [created] = await Promise.allSettled([creatingDirectory]);
+      try {
+        if (executing) await Promise.allSettled([executing]);
+      } finally {
+        if (created.status === "fulfilled") {
+          await rm(created.value, { recursive: true, force: true });
+        }
+      }
+    });
+    const directory = await creatingDirectory;
+    signal.throwIfAborted();
+    const loader = path.join(directory, "loader.mjs");
+    const registration = path.join(directory, "register.mjs");
+    await writeFile(
+      loader,
+      `export function resolve(specifier, context, nextResolve) {
+      if (specifier === ${JSON.stringify(failedImport)}) throw new Error("CONTROLLED_IMPORT_FAILURE");
+      if (specifier === "tsx") return { url: "data:text/javascript,export%20%7B%7D", shortCircuit: true };
+      return nextResolve(specifier, context);
+    }`,
+    );
+    await writeFile(
+      registration,
+      `import { register } from "node:module";
+     register(${JSON.stringify(pathToFileURL(loader).href)}, import.meta.url);`,
+    );
+
+    executing = execute(
+      process.execPath,
+      ["--import", pathToFileURL(registration).href, bootstrap],
+      {
+        signal,
+        env: { ...process.env, NODE_OPTIONS: "" },
+      },
+    );
+    await expect(executing).rejects.toMatchObject({
+      code: 1,
+      stdout: "",
+      stderr: expect.stringMatching(
+        /\[SDK proxy startup\] Node entered.*CONTROLLED_IMPORT_FAILURE/su,
+      ),
+    });
+    await expect(executing).rejects.toMatchObject({
+      stderr:
+        failedImport === "tsx"
+          ? expect.not.stringContaining("TypeScript loader ready")
+          : expect.stringContaining("TypeScript loader ready"),
+    });
+  },
+);
diff --git a/test/harness/stdio-shutdown-runtime.cjs b/test/harness/stdio-shutdown-runtime.cjs
index 99d1c8cec2..f3230a041d 100644
--- a/test/harness/stdio-shutdown-runtime.cjs
+++ b/test/harness/stdio-shutdown-runtime.cjs
@@ -4,20 +4,32 @@
 
 // Shared SDK shutdown fixture: node <script> <cleanup-marker> <mode> <pid-file>.
 const fs = require("node:fs");
-const { writeFile } = require("node:fs/promises");
+const { rename, writeFile } = require("node:fs/promises");
+const { dirname } = require("node:path");
 
 const [marker, mode, pidFile] = process.argv.slice(2);
-if (!marker || !pidFile || !["stop", "dispose", "force", "fallback", "start-failure"].includes(mode)) {
+const useTcp = process.argv.includes("--fixture-tcp");
+if (!marker || !pidFile || !["stop", "dispose", "force", "fallback", "start-failure", "shutdown-error", "connect-stall", "port-stall"].includes(mode)) {
     throw new Error("Expected cleanup marker, shutdown mode, and PID file arguments");
 }
 fs.writeFileSync(pidFile, String(process.pid));
-if (mode === "fallback" || mode === "start-failure") {
+if (mode === "fallback" || mode === "start-failure" || mode === "connect-stall" || mode === "port-stall") {
     setInterval(() => {}, 1000);
 }
+if (process.argv.includes("--fixture-descendant")) {
+    const child = require("node:child_process").spawn(
+        process.execPath,
+        ["-e", "setInterval(() => {}, 1000)"],
+        { stdio: "ignore" },
+    );
+    child.on("error", (error) => { throw error; });
+    fs.writeFileSync(`${pidFile}.descendant`, String(child.pid));
+    child.unref();
+}
 
 let buffered = Buffer.alloc(0);
 let shutdownRequested = false;
-process.stdin.on("data", (chunk) => {
+const handleData = (chunk, output) => {
     buffered = Buffer.concat([buffered, chunk]);
     while (true) {
         const headerEnd = buffered.indexOf("\r\n\r\n");
@@ -30,8 +42,10 @@ process.stdin.on("data", (chunk) => {
         buffered = buffered.subarray(headerEnd + 4 + length);
         if (message.id === undefined) continue;
         let result;
+        let error;
         switch (message.method) {
             case "connect":
+                if (mode === "connect-stall") continue;
                 result = {
                     ok: true,
                     protocolVersion: mode === "start-failure" ? -1 : 3,
@@ -39,21 +53,64 @@ process.stdin.on("data", (chunk) => {
                 };
                 break;
             case "ping":
-                result = { message: message.params?.message, timestamp: Date.now(), protocolVersion: 3 };
+                result = { message: message.params?.message, timestamp: new Date().toISOString(), protocolVersion: 3 };
                 break;
             case "runtime.shutdown":
                 shutdownRequested = true;
-                result = {};
+                if (mode === "shutdown-error") {
+                    error = { code: -32000, message: "Intentional shutdown failure" };
+                } else {
+                    result = {};
+                    if (useTcp) fs.writeFileSync(marker, '{"type":"span"}\n');
+                }
                 break;
             default:
                 throw new Error(`Unexpected method: ${message.method}`);
         }
-        const body = JSON.stringify({ jsonrpc: "2.0", id: message.id, result });
-        process.stdout.write(`Content-Length: ${Buffer.byteLength(body)}\r\n\r\n${body}`);
+        const body = JSON.stringify(
+            error ? { jsonrpc: "2.0", id: message.id, error } : { jsonrpc: "2.0", id: message.id, result },
+        );
+        output.write(`Content-Length: ${Buffer.byteLength(body)}\r\n\r\n${body}`);
     }
-});
+};
+if (useTcp) {
+    // Match the native TCP host: shutdown acknowledges but leaves its listener open.
+    const server = require("node:net").createServer((socket) => {
+        socket.on("data", (chunk) => handleData(chunk, socket));
+    });
+    server.listen(0, "127.0.0.1", () => {
+        if (mode !== "port-stall") console.log(`listening on port ${server.address().port}`);
+    });
+} else {
+    process.stdin.on("data", (chunk) => handleData(chunk, process.stdout));
+}
 process.stdin.on("end", async () => {
+    if (useTcp) return;
     if (!shutdownRequested) throw new Error("Missing runtime.shutdown");
+    if (mode === "shutdown-error") {
+        await new Promise((resolve, reject) => {
+            const release = `${marker}.release`;
+            const watcher = fs.watch(dirname(marker), () => {
+                if (fs.existsSync(release)) {
+                    watcher.close();
+                    resolve();
+                }
+            });
+            const fail = (error) => {
+                watcher.close();
+                reject(error);
+            };
+            watcher.on("error", fail);
+            writeFile(`${marker}.eof`, "").then(() => {
+                if (fs.existsSync(release)) {
+                    watcher.close();
+                    resolve();
+                }
+            }, fail);
+        });
+    }
     // Like the native wrapper, finalize host output only after transport EOF.
-    await writeFile(marker, '{"type":"span"}\n');
+    // Marker existence signals a completed write to tests that force-stop the child.
+    await writeFile(`${marker}.tmp`, '{"type":"span"}\n');
+    await rename(`${marker}.tmp`, marker);
 });
diff --git a/test/harness/test-mcp-computer-use-oauth-server.mjs b/test/harness/test-mcp-computer-use-oauth-server.mjs
new file mode 100644
index 0000000000..2b8dc3c82f
--- /dev/null
+++ b/test/harness/test-mcp-computer-use-oauth-server.mjs
@@ -0,0 +1,173 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import http from "node:http";
+
+export async function startComputerUseOAuthServer({
+    deferRegistration = false,
+    deferInitialChallenge = false,
+    deferAuthorizationMetadata = false,
+    preconfiguredClientId = "",
+} = {}) {
+    let clientId = preconfiguredClientId;
+    let releaseRegistration = () => {};
+    const registration = deferRegistration
+        ? new Promise((resolve) => {
+              releaseRegistration = resolve;
+          })
+        : Promise.resolve();
+    let releaseInitialChallenge = () => {};
+    const initialChallenge = deferInitialChallenge
+        ? new Promise((resolve) => {
+              releaseInitialChallenge = resolve;
+          })
+        : Promise.resolve();
+    let releaseAuthorizationMetadata = () => {};
+    const authorizationMetadata = deferAuthorizationMetadata
+        ? new Promise((resolve) => {
+              releaseAuthorizationMetadata = resolve;
+          })
+        : Promise.resolve();
+    const requests = [];
+    const token = "computer-use-isolation-token";
+    const server = http.createServer(async (request, response) => {
+        const url = new URL(request.url ?? "/", `http://${request.headers.host}`);
+        const chunks = [];
+        for await (const chunk of request) chunks.push(chunk);
+        const body = Buffer.concat(chunks).toString("utf8");
+        requests.push({
+            method: request.method,
+            path: url.pathname,
+            authorization: request.headers.authorization ?? null,
+            body,
+        });
+        const respond = (status, value, headers = {}) => {
+            response.writeHead(status, { "content-type": "application/json", ...headers });
+            response.end(JSON.stringify(value));
+        };
+        if (request.method === "GET" && url.pathname === "/.well-known/oauth-protected-resource") {
+            respond(200, {
+                resource: `${url.origin}/mcp`,
+                authorization_servers: [url.origin],
+                scopes_supported: ["mcp.read"],
+                bearer_methods_supported: ["header"],
+            });
+            return;
+        }
+        if (request.method === "GET" && url.pathname === "/.well-known/oauth-authorization-server") {
+            await authorizationMetadata;
+            respond(200, {
+                issuer: url.origin,
+                authorization_endpoint: `${url.origin}/authorize`,
+                token_endpoint: `${url.origin}/token`,
+                registration_endpoint: `${url.origin}/register`,
+                response_types_supported: ["code"],
+                grant_types_supported: ["authorization_code"],
+            });
+            return;
+        }
+        if (request.method === "POST" && url.pathname === "/register") {
+            await registration;
+            clientId = "registered-client";
+            respond(201, { client_id: clientId, client_id_issued_at: Math.floor(Date.now() / 1000) });
+            return;
+        }
+        if (request.method === "POST" && url.pathname === "/token") {
+            const form = new URLSearchParams(body);
+            if (!clientId || form.get("client_id") !== clientId) {
+                respond(400, { error: "invalid_client" });
+                return;
+            }
+            if (
+                form.get("grant_type") !== "authorization_code" ||
+                form.get("code") !== "accepted-code" ||
+                !form.get("code_verifier")
+            ) {
+                respond(400, { error: "invalid_grant" });
+                return;
+            }
+            respond(200, { access_token: token, token_type: "Bearer", expires_in: 3600 });
+            return;
+        }
+        if (url.pathname !== "/mcp") {
+            respond(404, { error: "not_found" });
+            return;
+        }
+        if (request.headers.authorization !== `Bearer ${token}`) {
+            await initialChallenge;
+            respond(
+                401,
+                { error: "unauthorized" },
+                {
+                    "www-authenticate": `Bearer resource_metadata="${url.origin}/.well-known/oauth-protected-resource", scope="mcp.read"`,
+                },
+            );
+            return;
+        }
+        if (request.method !== "POST") {
+            respond(405, { error: "method_not_allowed" });
+            return;
+        }
+        let message;
+        try {
+            message = JSON.parse(body);
+        } catch {
+            respond(400, { error: "invalid_json" });
+            return;
+        }
+        if (message.id === undefined) {
+            response.writeHead(202);
+            response.end();
+            return;
+        }
+        let result;
+        if (message.method === "initialize") {
+            result = {
+                protocolVersion: "2025-03-26",
+                capabilities: { tools: {} },
+                serverInfo: { name: "computer-use-oauth-isolation", version: "1.0.0" },
+            };
+        } else if (message.method === "tools/list") {
+            result = {
+                tools: [
+                    {
+                        name: "whoami",
+                        description: "Reports an authenticated connection",
+                        inputSchema: { type: "object", properties: {}, additionalProperties: false },
+                    },
+                ],
+            };
+        } else if (message.method === "ping") {
+            result = {};
+        } else {
+            respond(200, { jsonrpc: "2.0", id: message.id, error: { code: -32601, message: "Method not found" } });
+            return;
+        }
+        respond(200, { jsonrpc: "2.0", id: message.id, result }, { "mcp-session-id": "computer-use-oauth-isolation" });
+    });
+    await new Promise((resolve, reject) => {
+        server.once("error", reject);
+        server.listen(0, "127.0.0.1", () => {
+            server.off("error", reject);
+            resolve();
+        });
+    });
+    const address = server.address();
+    if (!address || typeof address === "string") throw new Error("Expected TCP server address");
+    return {
+        url: `http://127.0.0.1:${address.port}`,
+        requests,
+        releaseRegistration,
+        releaseInitialChallenge,
+        releaseAuthorizationMetadata,
+        close: () =>
+            new Promise((resolve, reject) => {
+                releaseRegistration();
+                releaseInitialChallenge();
+                releaseAuthorizationMetadata();
+                server.close((error) => (error ? reject(error) : resolve()));
+                server.closeAllConnections();
+            }),
+    };
+}
diff --git a/test/harness/test-mcp-oauth-server.mjs b/test/harness/test-mcp-oauth-server.mjs
index 5d82bb5c4a..d4fca5ccb5 100644
--- a/test/harness/test-mcp-oauth-server.mjs
+++ b/test/harness/test-mcp-oauth-server.mjs
@@ -135,16 +135,21 @@ export async function startOAuthMcpServer({
         body,
       });
       const form = new URLSearchParams(body);
+      // "accepted-code-reauth" mints a different accepted token so tests can rotate credentials.
+      const issuedToken = {
+        "accepted-code": tokens.initial,
+        "accepted-code-reauth": tokens.reauth,
+      }[form.get("code") ?? ""];
       if (
         form.get("grant_type") !== "authorization_code" ||
-        form.get("code") !== "accepted-code" ||
+        !issuedToken ||
         !form.get("code_verifier")
       ) {
         respondJson(res, 400, { error: "invalid_grant" });
         return;
       }
       respondJson(res, 200, {
-        access_token: expectedToken,
+        access_token: issuedToken,
         token_type: "Bearer",
         expires_in: 3600,
       });
diff --git a/test/harness/test-mcp-server.mjs b/test/harness/test-mcp-server.mjs
index 94fcd63888..a1c3609767 100644
--- a/test/harness/test-mcp-server.mjs
+++ b/test/harness/test-mcp-server.mjs
@@ -13,6 +13,8 @@
 
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
+import { existsSync } from "node:fs";
+import { setTimeout } from "node:timers/promises";
 import {
     GetPromptRequestSchema,
     ListPromptsRequestSchema,
@@ -30,6 +32,8 @@ function getArgument(name) {
 const startupMarkerPath = getArgument("--startup-marker");
 const diagnosticStderr = getArgument("--diagnostic-stderr");
 const serverName = getArgument("--server-name") ?? "env-echo";
+const toolName = getArgument("--tool-name") ?? "get_env";
+const toolDescriptionFile = getArgument("--tool-description-file");
 const server = new McpServer({ name: serverName, version: "1.0.0" });
 const fixtures = JSON.parse(await readFile(new URL("./mcp-prompt-fixtures.json", import.meta.url), "utf8"));
 // Fixtures contain SDK extension bags; MCP sends those entries as ordinary object fields.
@@ -94,8 +98,10 @@ server.server.setRequestHandler(GetPromptRequestSchema, async ({ params }) => {
 });
 
 server.tool(
-    "get_env",
-    "Returns the value of the specified environment variable.",
+    toolName,
+    toolDescriptionFile
+        ? await readFile(toolDescriptionFile, "utf8")
+        : "Returns the value of the specified environment variable.",
     { name: z.string().describe("Environment variable name") },
     async ({ name }) => ({
         content: [{ type: "text", text: process.env[name] ?? "" }],
@@ -106,6 +112,13 @@ const transport = new StdioServerTransport();
 if (startupMarkerPath) {
     await appendFile(startupMarkerPath, `${serverName}\n`);
 }
+const startupGate = getArgument("--startup-gate");
+while (startupGate && !existsSync(startupGate)) {
+    await setTimeout(20);
+}
+if (process.argv.includes("--fail-startup")) {
+    throw new Error("MCP startup failed as requested by the test");
+}
 if (diagnosticStderr) {
     console.error(diagnosticStderr);
 }
diff --git a/test/harness/test-mcp-session-expiry-server.mjs b/test/harness/test-mcp-session-expiry-server.mjs
index 98b49039e5..4751be0bfd 100644
--- a/test/harness/test-mcp-session-expiry-server.mjs
+++ b/test/harness/test-mcp-session-expiry-server.mjs
@@ -9,10 +9,15 @@
  *
  * The `/mcp` endpoint issues a real `mcp-session-id` per connection and serves
  * enough JSON-RPC MCP methods for the runtime to initialize, list tools and call
- * one tool. `POST /__expire` invalidates every active session so subsequent
- * requests (including the runtime's liveness `ping`) answer `404`, which is how a
+ * one tool. It negotiates its supported stateful protocol version rather than
+ * echoing a newer, stateless client proposal. `POST /__expire` invalidates every
+ * active session so subsequent requests (including the runtime's liveness
+ * `ping`) answer `404`, which is how a
  * server-side idle expiry is observed by a real Streamable HTTP client.
- * `GET /__stats` reports the counters tests assert on.
+ * `GET /__stats` reports the counters tests assert on, including answered
+ * expired-session probes so recovery assertions need not budget the idle delay.
+ * HTTP connections close after each response so socket idle retirement cannot
+ * interfere with the independently managed MCP session lifetime.
  */
 
 import http from "node:http";
@@ -21,21 +26,37 @@ import { randomUUID } from "node:crypto";
 import { fileURLToPath } from "node:url";
 
 const PROTOCOL_VERSION = "2025-03-26";
+const MAX_RECENT_REQUESTS = 32;
 
 export async function startSessionExpiryMcpServer({ host = "127.0.0.1", port = 0 } = {}) {
   const activeSessions = new Set();
   const expiredSessions = new Set();
-  const stats = { initializations: 0, toolsListRequests: 0, toolCalls: 0 };
+  let expiredAt = 0;
+  const stats = {
+    initializations: 0,
+    toolsListRequests: 0,
+    toolCalls: 0,
+    pings: 0,
+    expiredRequests: 0,
+    expiredRequestLog: [],
+    protocolVersions: [],
+    expiredSessionProbes: 0,
+  };
+  const recentRequests = [];
+  const startedAt = performance.now();
 
   const server = http.createServer(async (req, res) => {
+    // MCP session expiry is independent of TCP keep-alive expiry.
+    res.setHeader("connection", "close");
     const url = new URL(req.url ?? "/", `http://${req.headers.host ?? `${host}:${port}`}`);
 
     if (req.method === "GET" && url.pathname === "/__stats") {
-      respondJson(res, 200, { ...stats, activeSessions: activeSessions.size });
+      respondJson(res, 200, { ...stats, activeSessions: activeSessions.size, recentRequests });
       return;
     }
 
     if (req.method === "POST" && url.pathname === "/__expire") {
+      expiredAt = performance.now();
       for (const sessionId of activeSessions) {
         expiredSessions.add(sessionId);
       }
@@ -50,7 +71,39 @@ export async function startSessionExpiryMcpServer({ host = "127.0.0.1", port = 0
     }
 
     const sessionId = req.headers["mcp-session-id"];
-    if (typeof sessionId === "string" && expiredSessions.has(sessionId)) {
+    const expiredSession = typeof sessionId === "string" && expiredSessions.has(sessionId);
+    const observation = {
+      elapsedMs: Math.round(performance.now() - startedAt),
+      httpMethod: req.method,
+      sessionAttached: typeof sessionId === "string",
+      expiredSession,
+      rpcMethods: [],
+      status: null,
+    };
+    recentRequests.push(observation);
+    if (recentRequests.length > MAX_RECENT_REQUESTS) recentRequests.shift();
+    res.once("finish", () => {
+      observation.status = res.statusCode;
+    });
+    if (expiredSession) {
+      stats.expiredRequests++;
+      if (stats.expiredRequestLog.length < 8) {
+        stats.expiredRequestLog.push({
+          method: req.method ?? "UNKNOWN",
+          elapsedMs: Math.round(performance.now() - expiredAt),
+        });
+      }
+      let isProbe = false;
+      if (req.method === "POST") {
+        const body = parseJsonBody(await readBody(req));
+        if (body.ok) {
+          const messages = Array.isArray(body.value) ? body.value : [body.value];
+          isProbe = messages.some((message) => message?.method === "ping" && "id" in message);
+        }
+      }
+      if (isProbe) {
+        res.once("finish", () => stats.expiredSessionProbes++);
+      }
       respondJson(res, 404, { error: "session_expired" });
       return;
     }
@@ -67,6 +120,10 @@ export async function startSessionExpiryMcpServer({ host = "127.0.0.1", port = 0
     }
 
     const messages = Array.isArray(parsedBody.value) ? parsedBody.value : [parsedBody.value];
+    observation.rpcMethods = messages
+      .map((message) => message?.method)
+      .filter((method) => typeof method === "string")
+      .slice(0, 4);
     const isInitialize = messages.some((message) => message?.method === "initialize");
     let responseSessionId = typeof sessionId === "string" ? sessionId : undefined;
 
@@ -129,16 +186,19 @@ function handleJsonRpcMessage(message, stats) {
 
   switch (message.method) {
     case "initialize":
+      stats.protocolVersions.push(message.params?.protocolVersion ?? PROTOCOL_VERSION);
       return {
         jsonrpc: "2.0",
         id: message.id,
         result: {
-          protocolVersion: message.params?.protocolVersion ?? PROTOCOL_VERSION,
+          // Session expiry and ping belong to legacy MCP, not modern stateless MCP.
+          protocolVersion: PROTOCOL_VERSION,
           capabilities: { tools: {} },
           serverInfo: { name: "session-expiry-test-server", version: "1.0.0" },
         },
       };
     case "ping":
+      stats.pings++;
       return { jsonrpc: "2.0", id: message.id, result: {} };
     case "tools/list":
       stats.toolsListRequests++;
diff --git a/test/snapshots/mcp_instruction_recovery/should_preserve_workiq_instructions_through_an_equivalent_successor_without_withdrawing_peer_tools_mid_turn.yaml b/test/snapshots/mcp_instruction_recovery/should_preserve_workiq_instructions_through_an_equivalent_successor_without_withdrawing_peer_tools_mid_turn.yaml
new file mode 100644
index 0000000000..33db4e3314
--- /dev/null
+++ b/test/snapshots/mcp_instruction_recovery/should_preserve_workiq_instructions_through_an_equivalent_successor_without_withdrawing_peer_tools_mid_turn.yaml
@@ -0,0 +1,36 @@
+models:
+  - claude-sonnet-5
+conversations:
+  - messages:
+      - role: system
+        content: ${system}
+      - role: user
+        content: Call read_record on workiq. If it reports a changed tool catalog, retry it. then call read_record on healthy.
+          Do not use other tools or invent their outputs. Finish by reporting both record values and
+          CATALOG_RECOVERY_COMPLETE.
+      - role: assistant
+        tool_calls:
+          - id: toolcall_0
+            type: function
+            function:
+              name: workiq-read_record
+              arguments: "{}"
+      - role: tool
+        tool_call_id: toolcall_0
+        content: CATALOG_RECORD
+      - role: assistant
+        tool_calls:
+          - id: toolcall_1
+            type: function
+            function:
+              name: healthy-read_record
+              arguments: "{}"
+      - role: tool
+        tool_call_id: toolcall_1
+        content: PEER_RECORD
+      - role: assistant
+        content: |-
+          workiq record: CATALOG_RECORD
+          healthy record: PEER_RECORD
+
+          CATALOG_RECOVERY_COMPLETE
diff --git a/test/snapshots/mcp_instruction_recovery/should_recover__workiq__instructions_without_withdrawing_peer_tools_mid_turn.yaml b/test/snapshots/mcp_instruction_recovery/should_recover__workiq__instructions_without_withdrawing_peer_tools_mid_turn.yaml
index 33db4e3314..8d039da2b4 100644
--- a/test/snapshots/mcp_instruction_recovery/should_recover__workiq__instructions_without_withdrawing_peer_tools_mid_turn.yaml
+++ b/test/snapshots/mcp_instruction_recovery/should_recover__workiq__instructions_without_withdrawing_peer_tools_mid_turn.yaml
@@ -17,16 +17,55 @@ conversations:
               arguments: "{}"
       - role: tool
         tool_call_id: toolcall_0
-        content: CATALOG_RECORD
+        content: 'workiq-read_record has no native execution backend: it is not a built-in native tool, and the MCP invocation
+          failed (MCP tool catalog changed before tool "workiq-read_record" could be invoked).'
+      - role: assistant
+        content: Tool catalog changed — retrying workiq read_record as instructed.
       - role: assistant
         tool_calls:
           - id: toolcall_1
             type: function
             function:
-              name: healthy-read_record
+              name: workiq-read_record
+              arguments: "{}"
+  - messages:
+      - role: system
+        content: ${system}
+      - role: user
+        content: Call read_record on workiq. If it reports a changed tool catalog, retry it. then call read_record on healthy.
+          Do not use other tools or invent their outputs. Finish by reporting both record values and
+          CATALOG_RECOVERY_COMPLETE.
+      - role: assistant
+        tool_calls:
+          - id: toolcall_0
+            type: function
+            function:
+              name: workiq-read_record
+              arguments: "{}"
+      - role: tool
+        tool_call_id: toolcall_0
+        content: 'workiq-read_record has no native execution backend: it is not a built-in native tool, and the MCP invocation
+          failed (MCP tool catalog changed before tool "workiq-read_record" could be invoked).'
+      - role: assistant
+        content: Tool catalog changed — retrying workiq read_record as instructed.
+        tool_calls:
+          - id: toolcall_1
+            type: function
+            function:
+              name: workiq-read_record
               arguments: "{}"
       - role: tool
         tool_call_id: toolcall_1
+        content: CATALOG_RECORD
+      - role: assistant
+        tool_calls:
+          - id: toolcall_2
+            type: function
+            function:
+              name: healthy-read_record
+              arguments: "{}"
+      - role: tool
+        tool_call_id: toolcall_2
         content: PEER_RECORD
       - role: assistant
         content: |-
diff --git a/test/snapshots/mcp_instruction_recovery/should_refuse_an_unverified_late_successor_and_recover_without_withdrawing_peer_tools_mid_turn.yaml b/test/snapshots/mcp_instruction_recovery/should_refuse_an_unverified_late_successor_and_recover_without_withdrawing_peer_tools_mid_turn.yaml
new file mode 100644
index 0000000000..2a42d32e50
--- /dev/null
+++ b/test/snapshots/mcp_instruction_recovery/should_refuse_an_unverified_late_successor_and_recover_without_withdrawing_peer_tools_mid_turn.yaml
@@ -0,0 +1,75 @@
+models:
+  - claude-sonnet-5
+conversations:
+  - messages:
+      - role: system
+        content: ${system}
+      - role: user
+        content: Call read_record on workiq. If it reports a changed tool catalog, retry it. then call read_record on healthy.
+          Do not use other tools or invent their outputs. Finish by reporting both record values and
+          CATALOG_RECOVERY_COMPLETE.
+      - role: assistant
+        tool_calls:
+          - id: toolcall_0
+            type: function
+            function:
+              name: workiq-read_record
+              arguments: "{}"
+      - role: tool
+        tool_call_id: toolcall_0
+        content: 'workiq-read_record has no native execution backend: it is not a built-in native tool, and the MCP invocation
+          failed (MCP tool catalog changed before tool "workiq-read_record" could be invoked).'
+      - role: assistant
+        content: Catalog changed — retrying workiq-read_record as instructed.
+      - role: assistant
+        tool_calls:
+          - id: toolcall_1
+            type: function
+            function:
+              name: workiq-read_record
+              arguments: "{}"
+  - messages:
+      - role: system
+        content: ${system}
+      - role: user
+        content: Call read_record on workiq. If it reports a changed tool catalog, retry it. then call read_record on healthy.
+          Do not use other tools or invent their outputs. Finish by reporting both record values and
+          CATALOG_RECOVERY_COMPLETE.
+      - role: assistant
+        tool_calls:
+          - id: toolcall_0
+            type: function
+            function:
+              name: workiq-read_record
+              arguments: "{}"
+      - role: tool
+        tool_call_id: toolcall_0
+        content: 'workiq-read_record has no native execution backend: it is not a built-in native tool, and the MCP invocation
+          failed (MCP tool catalog changed before tool "workiq-read_record" could be invoked).'
+      - role: assistant
+        content: Catalog changed — retrying workiq-read_record as instructed.
+        tool_calls:
+          - id: toolcall_1
+            type: function
+            function:
+              name: workiq-read_record
+              arguments: "{}"
+      - role: tool
+        tool_call_id: toolcall_1
+        content: CATALOG_RECORD
+      - role: assistant
+        tool_calls:
+          - id: toolcall_2
+            type: function
+            function:
+              name: healthy-read_record
+              arguments: "{}"
+      - role: tool
+        tool_call_id: toolcall_2
+        content: PEER_RECORD
+      - role: assistant
+        content: |-
+          workiq record: CATALOG_RECORD
+          healthy record: PEER_RECORD
+
+          CATALOG_RECOVERY_COMPLETE
diff --git a/test/snapshots/permissions/should_handle_async_permission_handler_dotnet.yaml b/test/snapshots/permissions/should_handle_async_permission_handler_dotnet.yaml
new file mode 100644
index 0000000000..08ee2fa0f2
--- /dev/null
+++ b/test/snapshots/permissions/should_handle_async_permission_handler_dotnet.yaml
@@ -0,0 +1,20 @@
+models:
+  - claude-sonnet-5
+conversations:
+  - messages:
+      - role: system
+        content: ${system}
+      - role: user
+        content: Call async_permission_echo once and reply with only its returned text.
+      - role: assistant
+        tool_calls:
+          - id: toolcall_0
+            type: function
+            function:
+              name: async_permission_echo
+              arguments: "{}"
+      - role: tool
+        tool_call_id: toolcall_0
+        content: DOTNET_ASYNC_PERMISSION_RESULT
+      - role: assistant
+        content: DOTNET_ASYNC_PERMISSION_RESULT
diff --git a/test/snapshots/plan_fleet_approval/should_deliver_fleet_instructions_with_the_approved_plan_tool_result.yaml b/test/snapshots/plan_fleet_approval/should_deliver_fleet_instructions_with_the_approved_plan_tool_result.yaml
new file mode 100644
index 0000000000..25525331ae
--- /dev/null
+++ b/test/snapshots/plan_fleet_approval/should_deliver_fleet_instructions_with_the_approved_plan_tool_result.yaml
@@ -0,0 +1,127 @@
+models:
+  - claude-sonnet-5
+conversations:
+  - messages:
+      - role: system
+        content: ${system}
+      - role: user
+        content: "The plan is one step: create a file named fleet-alpha.txt in the current directory containing exactly the text
+          alpha. Do not write a plan file, create todos, or call any other tool first. Request approval right away with
+          exit_plan_mode, setting recommendedAction to autopilot_fleet."
+      - role: assistant
+        tool_calls:
+          - id: toolcall_0
+            type: function
+            function:
+              name: exit_plan_mode
+              arguments: '{"summary":"Create fleet-alpha.txt in current directory containing exactly the text
+                \"alpha\".","recommendedAction":"autopilot_fleet","showFleet":true}'
+      - role: tool
+        tool_call_id: toolcall_0
+        content: >-
+          Plan approved! Exited plan mode.
+
+
+          You are now in autopilot mode with fleet enabled. Proceed with implementing the plan in fleet mode by
+          following the fleet-mode instructions below.
+
+
+          <fleet_mode_instructions>
+
+          You are now in fleet mode. Dispatch sub-agents (via the task tool) in parallel to do the work.
+
+
+          **Getting Started**
+
+          1. Check for existing todos: `SELECT id, title, status FROM todos WHERE status != 'done'`
+
+          2. If todos exist, dispatch them in parallel (respecting dependencies)
+
+          3. If no todos exist, help decompose the work into todos first. Try to structure todos to minimize
+          dependencies and maximize parallel execution.
+
+
+          **Parallel Execution**
+
+          - Dispatch independent todos simultaneously
+
+          - Never dispatch just a single background subagent. Prefer one sync subagent, or better, prefer to efficiently
+          dispatch multiple background subagents in the same turn.
+
+          - Only serialize todos with true dependencies (check todo_deps)
+
+          - Query ready todos: `SELECT * FROM todos WHERE status = 'pending' AND id NOT IN (SELECT todo_id FROM
+          todo_deps td JOIN todos t ON td.depends_on = t.id WHERE t.status != 'done')`
+
+
+          **Sub-Agent Instructions**
+
+          When dispatching a sub-agent, include these instructions in your prompt:
+
+          1. Update the todo status when finished:
+             - Success: `UPDATE todos SET status = 'done' WHERE id = '<todo-id>'`
+             - Blocked: `UPDATE todos SET status = 'blocked' WHERE id = '<todo-id>'`
+          2. Always return a response summarizing:
+             - What was completed
+             - Whether the todo is fully done or needs more work
+             - Any blockers or questions that need resolution
+
+          **Coordination**
+
+          - After sub-agents return, check todo status in SQL (source of truth)
+
+          - If status is still 'in_progress', the sub-agent may have failed to update - investigate
+
+          - Use the sub-agent's response to understand context, but trust SQL for status
+
+
+          **After Sub-Agents Complete**
+
+          - Check the work done by sub-agents and validate the original request is fully satisfied
+
+          - Ensure the work done by sub-agents (both implementation and testing) is sensible, robust, and handles edge
+          cases, not just the happy path
+
+          - If the original request is not fully satisfied, decompose remaining work into new todos and dispatch more
+          sub-agents as needed
+
+
+          Now proceed with the user's request using fleet mode.
+
+          </fleet_mode_instructions>
+      - role: assistant
+        tool_calls:
+          - id: toolcall_1
+            type: function
+            function:
+              name: create
+              arguments: '{"path":"${workdir}/fleet-alpha.txt","file_text":"alpha"}'
+      - role: tool
+        tool_call_id: toolcall_1
+        content: Created file ${workdir}/fleet-alpha.txt with 5 characters
+      - role: assistant
+        content: Created `fleet-alpha.txt` with exact content "alpha" (5 characters, no extra whitespace).
+      - role: user
+        content: >-
+          You have not yet marked the task as complete using the task_complete tool. If you were planning, stop planning
+          and start implementing. You aren't done until you have fully completed the task.
+
+
+          IMPORTANT: Do NOT call task_complete if:
+
+          - You have open questions or ambiguities - make good decisions and keep working
+
+          - You encountered an error - try to resolve it or find an alternative approach
+
+          - There are remaining steps - complete them first
+
+
+          Keep working autonomously until the task is truly finished, then call task_complete.
+      - role: assistant
+        tool_calls:
+          - id: toolcall_2
+            type: function
+            function:
+              name: task_complete
+              arguments: '{"summary":"Created fleet-alpha.txt in the current directory with exact content \"alpha\" (verified 5
+                characters written)."}'
diff --git a/test/snapshots/plan_fleet_approval/should_run_one_hidden_fleet_turn_on_the_session_model_after_a_deferred_approval.yaml b/test/snapshots/plan_fleet_approval/should_run_one_hidden_fleet_turn_on_the_session_model_after_a_deferred_approval.yaml
new file mode 100644
index 0000000000..43ddf2ee22
--- /dev/null
+++ b/test/snapshots/plan_fleet_approval/should_run_one_hidden_fleet_turn_on_the_session_model_after_a_deferred_approval.yaml
@@ -0,0 +1,1009 @@
+models:
+  - claude-sonnet-5
+  - claude-haiku-4.5
+conversations:
+  - messages:
+      - role: system
+        content: ${system}
+      - role: user
+        content: "The plan is one step: create a file named fleet-beta.txt in the current directory containing exactly the text
+          beta. Do not write a plan file, create todos, or call any other tool first. Request approval right away with
+          exit_plan_mode, setting recommendedAction to autopilot_fleet."
+      - role: assistant
+        tool_calls:
+          - id: toolcall_0
+            type: function
+            function:
+              name: exit_plan_mode
+              arguments: '{"summary":"- Create `fleet-beta.txt` in the current directory with exact content
+                `beta`","recommendedAction":"autopilot_fleet","showFleet":true}'
+      - role: tool
+        tool_call_id: toolcall_0
+        content: >-
+          Plan approved! Exited plan mode.
+
+
+          You are now in autopilot mode with fleet enabled. Do not start implementing yet. End your turn now without
+          taking any further action — a follow-up message will arrive automatically to begin implementing the plan on
+          the session model.
+      - role: user
+        content: >-
+          <tools_changed_notice>
+
+          The model has been switched from claude-sonnet-5 to claude-haiku-4.5.
+
+          </tools_changed_notice>
+
+
+          You are now in fleet mode. Dispatch sub-agents (via the task tool) in parallel to do the work.
+
+
+          **Getting Started**
+
+          1. Check for existing todos: `SELECT id, title, status FROM todos WHERE status != 'done'`
+
+          2. If todos exist, dispatch them in parallel (respecting dependencies)
+
+          3. If no todos exist, help decompose the work into todos first. Try to structure todos to minimize
+          dependencies and maximize parallel execution.
+
+
+          **Parallel Execution**
+
+          - Dispatch independent todos simultaneously
+
+          - Never dispatch just a single background subagent. Prefer one sync subagent, or better, prefer to efficiently
+          dispatch multiple background subagents in the same turn.
+
+          - Only serialize todos with true dependencies (check todo_deps)
+
+          - Query ready todos: `SELECT * FROM todos WHERE status = 'pending' AND id NOT IN (SELECT todo_id FROM
+          todo_deps td JOIN todos t ON td.depends_on = t.id WHERE t.status != 'done')`
+
+
+          **Sub-Agent Instructions**
+
+          When dispatching a sub-agent, include these instructions in your prompt:
+
+          1. Update the todo status when finished:
+             - Success: `UPDATE todos SET status = 'done' WHERE id = '<todo-id>'`
+             - Blocked: `UPDATE todos SET status = 'blocked' WHERE id = '<todo-id>'`
+          2. Always return a response summarizing:
+             - What was completed
+             - Whether the todo is fully done or needs more work
+             - Any blockers or questions that need resolution
+
+          **Coordination**
+
+          - After sub-agents return, check todo status in SQL (source of truth)
+
+          - If status is still 'in_progress', the sub-agent may have failed to update - investigate
+
+          - Use the sub-agent's response to understand context, but trust SQL for status
+
+
+          **After Sub-Agents Complete**
+
+          - Check the work done by sub-agents and validate the original request is fully satisfied
+
+          - Ensure the work done by sub-agents (both implementation and testing) is sensible, robust, and handles edge
+          cases, not just the happy path
+
+          - If the original request is not fully satisfied, decompose remaining work into new todos and dispatch more
+          sub-agents as needed
+
+
+          Now proceed with the user's request using fleet mode.
+      - role: assistant
+        content: I'll start by checking for existing todos to understand what work needs to be done.
+      - role: assistant
+        tool_calls:
+          - id: toolcall_1
+            type: function
+            function:
+              name: sql
+              arguments: "{\"description\":\"Check for existing todos\",\"query\":\"SELECT id, title, status FROM todos WHERE status
+                != 'done'\"}"
+  - messages:
+      - role: system
+        content: ${system}
+      - role: user
+        content: "The plan is one step: create a file named fleet-beta.txt in the current directory containing exactly the text
+          beta. Do not write a plan file, create todos, or call any other tool first. Request approval right away with
+          exit_plan_mode, setting recommendedAction to autopilot_fleet."
+      - role: assistant
+        tool_calls:
+          - id: toolcall_0
+            type: function
+            function:
+              name: exit_plan_mode
+              arguments: '{"summary":"- Create `fleet-beta.txt` in the current directory with exact content
+                `beta`","recommendedAction":"autopilot_fleet","showFleet":true}'
+      - role: tool
+        tool_call_id: toolcall_0
+        content: >-
+          Plan approved! Exited plan mode.
+
+
+          You are now in autopilot mode with fleet enabled. Do not start implementing yet. End your turn now without
+          taking any further action — a follow-up message will arrive automatically to begin implementing the plan on
+          the session model.
+      - role: user
+        content: >-
+          <tools_changed_notice>
+
+          The model has been switched from claude-sonnet-5 to claude-haiku-4.5.
+
+          </tools_changed_notice>
+
+
+          You are now in fleet mode. Dispatch sub-agents (via the task tool) in parallel to do the work.
+
+
+          **Getting Started**
+
+          1. Check for existing todos: `SELECT id, title, status FROM todos WHERE status != 'done'`
+
+          2. If todos exist, dispatch them in parallel (respecting dependencies)
+
+          3. If no todos exist, help decompose the work into todos first. Try to structure todos to minimize
+          dependencies and maximize parallel execution.
+
+
+          **Parallel Execution**
+
+          - Dispatch independent todos simultaneously
+
+          - Never dispatch just a single background subagent. Prefer one sync subagent, or better, prefer to efficiently
+          dispatch multiple background subagents in the same turn.
+
+          - Only serialize todos with true dependencies (check todo_deps)
+
+          - Query ready todos: `SELECT * FROM todos WHERE status = 'pending' AND id NOT IN (SELECT todo_id FROM
+          todo_deps td JOIN todos t ON td.depends_on = t.id WHERE t.status != 'done')`
+
+
+          **Sub-Agent Instructions**
+
+          When dispatching a sub-agent, include these instructions in your prompt:
+
+          1. Update the todo status when finished:
+             - Success: `UPDATE todos SET status = 'done' WHERE id = '<todo-id>'`
+             - Blocked: `UPDATE todos SET status = 'blocked' WHERE id = '<todo-id>'`
+          2. Always return a response summarizing:
+             - What was completed
+             - Whether the todo is fully done or needs more work
+             - Any blockers or questions that need resolution
+
+          **Coordination**
+
+          - After sub-agents return, check todo status in SQL (source of truth)
+
+          - If status is still 'in_progress', the sub-agent may have failed to update - investigate
+
+          - Use the sub-agent's response to understand context, but trust SQL for status
+
+
+          **After Sub-Agents Complete**
+
+          - Check the work done by sub-agents and validate the original request is fully satisfied
+
+          - Ensure the work done by sub-agents (both implementation and testing) is sensible, robust, and handles edge
+          cases, not just the happy path
+
+          - If the original request is not fully satisfied, decompose remaining work into new todos and dispatch more
+          sub-agents as needed
+
+
+          Now proceed with the user's request using fleet mode.
+      - role: assistant
+        content: I'll start by checking for existing todos to understand what work needs to be done.
+        tool_calls:
+          - id: toolcall_1
+            type: function
+            function:
+              name: sql
+              arguments: "{\"description\":\"Check for existing todos\",\"query\":\"SELECT id, title, status FROM todos WHERE status
+                != 'done'\"}"
+      - role: tool
+        tool_call_id: toolcall_1
+        content: Query returned 0 rows.
+      - role: assistant
+        content: No existing todos. I'll create a todo for the single task and then dispatch it.
+      - role: assistant
+        tool_calls:
+          - id: toolcall_2
+            type: function
+            function:
+              name: sql
+              arguments: "{\"description\":\"Create todo for creating fleet-beta.txt\",\"query\":\"INSERT INTO todos (id, title,
+                description, status) VALUES ('create-fleet-beta-file', 'Creating fleet-beta.txt file', 'Create a file
+                named fleet-beta.txt in the current directory containing exactly the text: beta', 'pending')\"}"
+  - messages:
+      - role: system
+        content: ${system}
+      - role: user
+        content: "The plan is one step: create a file named fleet-beta.txt in the current directory containing exactly the text
+          beta. Do not write a plan file, create todos, or call any other tool first. Request approval right away with
+          exit_plan_mode, setting recommendedAction to autopilot_fleet."
+      - role: assistant
+        tool_calls:
+          - id: toolcall_0
+            type: function
+            function:
+              name: exit_plan_mode
+              arguments: '{"summary":"- Create `fleet-beta.txt` in the current directory with exact content
+                `beta`","recommendedAction":"autopilot_fleet","showFleet":true}'
+      - role: tool
+        tool_call_id: toolcall_0
+        content: >-
+          Plan approved! Exited plan mode.
+
+
+          You are now in autopilot mode with fleet enabled. Do not start implementing yet. End your turn now without
+          taking any further action — a follow-up message will arrive automatically to begin implementing the plan on
+          the session model.
+      - role: user
+        content: >-
+          <tools_changed_notice>
+
+          The model has been switched from claude-sonnet-5 to claude-haiku-4.5.
+
+          </tools_changed_notice>
+
+
+          You are now in fleet mode. Dispatch sub-agents (via the task tool) in parallel to do the work.
+
+
+          **Getting Started**
+
+          1. Check for existing todos: `SELECT id, title, status FROM todos WHERE status != 'done'`
+
+          2. If todos exist, dispatch them in parallel (respecting dependencies)
+
+          3. If no todos exist, help decompose the work into todos first. Try to structure todos to minimize
+          dependencies and maximize parallel execution.
+
+
+          **Parallel Execution**
+
+          - Dispatch independent todos simultaneously
+
+          - Never dispatch just a single background subagent. Prefer one sync subagent, or better, prefer to efficiently
+          dispatch multiple background subagents in the same turn.
+
+          - Only serialize todos with true dependencies (check todo_deps)
+
+          - Query ready todos: `SELECT * FROM todos WHERE status = 'pending' AND id NOT IN (SELECT todo_id FROM
+          todo_deps td JOIN todos t ON td.depends_on = t.id WHERE t.status != 'done')`
+
+
+          **Sub-Agent Instructions**
+
+          When dispatching a sub-agent, include these instructions in your prompt:
+
+          1. Update the todo status when finished:
+             - Success: `UPDATE todos SET status = 'done' WHERE id = '<todo-id>'`
+             - Blocked: `UPDATE todos SET status = 'blocked' WHERE id = '<todo-id>'`
+          2. Always return a response summarizing:
+             - What was completed
+             - Whether the todo is fully done or needs more work
+             - Any blockers or questions that need resolution
+
+          **Coordination**
+
+          - After sub-agents return, check todo status in SQL (source of truth)
+
+          - If status is still 'in_progress', the sub-agent may have failed to update - investigate
+
+          - Use the sub-agent's response to understand context, but trust SQL for status
+
+
+          **After Sub-Agents Complete**
+
+          - Check the work done by sub-agents and validate the original request is fully satisfied
+
+          - Ensure the work done by sub-agents (both implementation and testing) is sensible, robust, and handles edge
+          cases, not just the happy path
+
+          - If the original request is not fully satisfied, decompose remaining work into new todos and dispatch more
+          sub-agents as needed
+
+
+          Now proceed with the user's request using fleet mode.
+      - role: assistant
+        content: I'll start by checking for existing todos to understand what work needs to be done.
+        tool_calls:
+          - id: toolcall_1
+            type: function
+            function:
+              name: sql
+              arguments: "{\"description\":\"Check for existing todos\",\"query\":\"SELECT id, title, status FROM todos WHERE status
+                != 'done'\"}"
+      - role: tool
+        tool_call_id: toolcall_1
+        content: Query returned 0 rows.
+      - role: assistant
+        content: No existing todos. I'll create a todo for the single task and then dispatch it.
+        tool_calls:
+          - id: toolcall_2
+            type: function
+            function:
+              name: sql
+              arguments: "{\"description\":\"Create todo for creating fleet-beta.txt\",\"query\":\"INSERT INTO todos (id, title,
+                description, status) VALUES ('create-fleet-beta-file', 'Creating fleet-beta.txt file', 'Create a file
+                named fleet-beta.txt in the current directory containing exactly the text: beta', 'pending')\"}"
+      - role: tool
+        tool_call_id: toolcall_2
+        content: "1 row(s) inserted. Last inserted row ID: 1."
+      - role: assistant
+        content: Now I'll dispatch a sub-agent to complete this task.
+      - role: assistant
+        tool_calls:
+          - id: toolcall_3
+            type: function
+            function:
+              name: write_agent
+              arguments: "{\"message\":\"You are working on a fleet task. Your job is to complete the following todo:\\n\\n**Todo
+                ID:** create-fleet-beta-file/n**Title:** Creating fleet-beta.txt file/n**Description:** Create a file
+                named fleet-beta.txt in the current directory containing exactly the text:
+                beta/n/n**Instructions:**\\n1. Complete the task/n2. Update the todo status when finished:\\n   -
+                Success: `UPDATE todos SET status = 'done' WHERE id = 'create-fleet-beta-file'`\\n   - If blocked:
+                `UPDATE todos SET status = 'blocked' WHERE id = 'create-fleet-beta-file'`\\n3. Return a response
+                summarizing what was completed and whether the todo is fully done/n/n**Note:** The current working
+                directory is: ${workdir}/n/nPlease proceed with creating the file and updating the todo
+                status.\",\"scope\":\"children\"}"
+  - messages:
+      - role: system
+        content: ${system}
+      - role: user
+        content: "The plan is one step: create a file named fleet-beta.txt in the current directory containing exactly the text
+          beta. Do not write a plan file, create todos, or call any other tool first. Request approval right away with
+          exit_plan_mode, setting recommendedAction to autopilot_fleet."
+      - role: assistant
+        tool_calls:
+          - id: toolcall_0
+            type: function
+            function:
+              name: exit_plan_mode
+              arguments: '{"summary":"- Create `fleet-beta.txt` in the current directory with exact content
+                `beta`","recommendedAction":"autopilot_fleet","showFleet":true}'
+      - role: tool
+        tool_call_id: toolcall_0
+        content: >-
+          Plan approved! Exited plan mode.
+
+
+          You are now in autopilot mode with fleet enabled. Do not start implementing yet. End your turn now without
+          taking any further action — a follow-up message will arrive automatically to begin implementing the plan on
+          the session model.
+      - role: user
+        content: >-
+          <tools_changed_notice>
+
+          The model has been switched from claude-sonnet-5 to claude-haiku-4.5.
+
+          </tools_changed_notice>
+
+
+          You are now in fleet mode. Dispatch sub-agents (via the task tool) in parallel to do the work.
+
+
+          **Getting Started**
+
+          1. Check for existing todos: `SELECT id, title, status FROM todos WHERE status != 'done'`
+
+          2. If todos exist, dispatch them in parallel (respecting dependencies)
+
+          3. If no todos exist, help decompose the work into todos first. Try to structure todos to minimize
+          dependencies and maximize parallel execution.
+
+
+          **Parallel Execution**
+
+          - Dispatch independent todos simultaneously
+
+          - Never dispatch just a single background subagent. Prefer one sync subagent, or better, prefer to efficiently
+          dispatch multiple background subagents in the same turn.
+
+          - Only serialize todos with true dependencies (check todo_deps)
+
+          - Query ready todos: `SELECT * FROM todos WHERE status = 'pending' AND id NOT IN (SELECT todo_id FROM
+          todo_deps td JOIN todos t ON td.depends_on = t.id WHERE t.status != 'done')`
+
+
+          **Sub-Agent Instructions**
+
+          When dispatching a sub-agent, include these instructions in your prompt:
+
+          1. Update the todo status when finished:
+             - Success: `UPDATE todos SET status = 'done' WHERE id = '<todo-id>'`
+             - Blocked: `UPDATE todos SET status = 'blocked' WHERE id = '<todo-id>'`
+          2. Always return a response summarizing:
+             - What was completed
+             - Whether the todo is fully done or needs more work
+             - Any blockers or questions that need resolution
+
+          **Coordination**
+
+          - After sub-agents return, check todo status in SQL (source of truth)
+
+          - If status is still 'in_progress', the sub-agent may have failed to update - investigate
+
+          - Use the sub-agent's response to understand context, but trust SQL for status
+
+
+          **After Sub-Agents Complete**
+
+          - Check the work done by sub-agents and validate the original request is fully satisfied
+
+          - Ensure the work done by sub-agents (both implementation and testing) is sensible, robust, and handles edge
+          cases, not just the happy path
+
+          - If the original request is not fully satisfied, decompose remaining work into new todos and dispatch more
+          sub-agents as needed
+
+
+          Now proceed with the user's request using fleet mode.
+      - role: assistant
+        content: I'll start by checking for existing todos to understand what work needs to be done.
+        tool_calls:
+          - id: toolcall_1
+            type: function
+            function:
+              name: sql
+              arguments: "{\"description\":\"Check for existing todos\",\"query\":\"SELECT id, title, status FROM todos WHERE status
+                != 'done'\"}"
+      - role: tool
+        tool_call_id: toolcall_1
+        content: Query returned 0 rows.
+      - role: assistant
+        content: No existing todos. I'll create a todo for the single task and then dispatch it.
+        tool_calls:
+          - id: toolcall_2
+            type: function
+            function:
+              name: sql
+              arguments: "{\"description\":\"Create todo for creating fleet-beta.txt\",\"query\":\"INSERT INTO todos (id, title,
+                description, status) VALUES ('create-fleet-beta-file', 'Creating fleet-beta.txt file', 'Create a file
+                named fleet-beta.txt in the current directory containing exactly the text: beta', 'pending')\"}"
+      - role: tool
+        tool_call_id: toolcall_2
+        content: "1 row(s) inserted. Last inserted row ID: 1."
+      - role: assistant
+        content: Now I'll dispatch a sub-agent to complete this task.
+        tool_calls:
+          - id: toolcall_3
+            type: function
+            function:
+              name: write_agent
+              arguments: "{\"message\":\"You are working on a fleet task. Your job is to complete the following todo:\\n\\n**Todo
+                ID:** create-fleet-beta-file/n**Title:** Creating fleet-beta.txt file/n**Description:** Create a file
+                named fleet-beta.txt in the current directory containing exactly the text:
+                beta/n/n**Instructions:**\\n1. Complete the task/n2. Update the todo status when finished:\\n   -
+                Success: `UPDATE todos SET status = 'done' WHERE id = 'create-fleet-beta-file'`\\n   - If blocked:
+                `UPDATE todos SET status = 'blocked' WHERE id = 'create-fleet-beta-file'`\\n3. Return a response
+                summarizing what was completed and whether the todo is fully done/n/n**Note:** The current working
+                directory is: ${workdir}/n/nPlease proceed with creating the file and updating the todo
+                status.\",\"scope\":\"children\"}"
+      - role: tool
+        tool_call_id: toolcall_3
+        content: No matching agents to message. Run list_agents to get current agent IDs and scopes.
+      - role: assistant
+        content: I need to use a different approach. Let me directly complete this task synchronously since it's a simple
+          operation.
+      - role: assistant
+        tool_calls:
+          - id: toolcall_4
+            type: function
+            function:
+              name: create
+              arguments: '{"path":"${workdir}/fleet-beta.txt","file_text":"beta"}'
+  - messages:
+      - role: system
+        content: ${system}
+      - role: user
+        content: "The plan is one step: create a file named fleet-beta.txt in the current directory containing exactly the text
+          beta. Do not write a plan file, create todos, or call any other tool first. Request approval right away with
+          exit_plan_mode, setting recommendedAction to autopilot_fleet."
+      - role: assistant
+        tool_calls:
+          - id: toolcall_0
+            type: function
+            function:
+              name: exit_plan_mode
+              arguments: '{"summary":"- Create `fleet-beta.txt` in the current directory with exact content
+                `beta`","recommendedAction":"autopilot_fleet","showFleet":true}'
+      - role: tool
+        tool_call_id: toolcall_0
+        content: >-
+          Plan approved! Exited plan mode.
+
+
+          You are now in autopilot mode with fleet enabled. Do not start implementing yet. End your turn now without
+          taking any further action — a follow-up message will arrive automatically to begin implementing the plan on
+          the session model.
+      - role: user
+        content: >-
+          <tools_changed_notice>
+
+          The model has been switched from claude-sonnet-5 to claude-haiku-4.5.
+
+          </tools_changed_notice>
+
+
+          You are now in fleet mode. Dispatch sub-agents (via the task tool) in parallel to do the work.
+
+
+          **Getting Started**
+
+          1. Check for existing todos: `SELECT id, title, status FROM todos WHERE status != 'done'`
+
+          2. If todos exist, dispatch them in parallel (respecting dependencies)
+
+          3. If no todos exist, help decompose the work into todos first. Try to structure todos to minimize
+          dependencies and maximize parallel execution.
+
+
+          **Parallel Execution**
+
+          - Dispatch independent todos simultaneously
+
+          - Never dispatch just a single background subagent. Prefer one sync subagent, or better, prefer to efficiently
+          dispatch multiple background subagents in the same turn.
+
+          - Only serialize todos with true dependencies (check todo_deps)
+
+          - Query ready todos: `SELECT * FROM todos WHERE status = 'pending' AND id NOT IN (SELECT todo_id FROM
+          todo_deps td JOIN todos t ON td.depends_on = t.id WHERE t.status != 'done')`
+
+
+          **Sub-Agent Instructions**
+
+          When dispatching a sub-agent, include these instructions in your prompt:
+
+          1. Update the todo status when finished:
+             - Success: `UPDATE todos SET status = 'done' WHERE id = '<todo-id>'`
+             - Blocked: `UPDATE todos SET status = 'blocked' WHERE id = '<todo-id>'`
+          2. Always return a response summarizing:
+             - What was completed
+             - Whether the todo is fully done or needs more work
+             - Any blockers or questions that need resolution
+
+          **Coordination**
+
+          - After sub-agents return, check todo status in SQL (source of truth)
+
+          - If status is still 'in_progress', the sub-agent may have failed to update - investigate
+
+          - Use the sub-agent's response to understand context, but trust SQL for status
+
+
+          **After Sub-Agents Complete**
+
+          - Check the work done by sub-agents and validate the original request is fully satisfied
+
+          - Ensure the work done by sub-agents (both implementation and testing) is sensible, robust, and handles edge
+          cases, not just the happy path
+
+          - If the original request is not fully satisfied, decompose remaining work into new todos and dispatch more
+          sub-agents as needed
+
+
+          Now proceed with the user's request using fleet mode.
+      - role: assistant
+        content: I'll start by checking for existing todos to understand what work needs to be done.
+        tool_calls:
+          - id: toolcall_1
+            type: function
+            function:
+              name: sql
+              arguments: "{\"description\":\"Check for existing todos\",\"query\":\"SELECT id, title, status FROM todos WHERE status
+                != 'done'\"}"
+      - role: tool
+        tool_call_id: toolcall_1
+        content: Query returned 0 rows.
+      - role: assistant
+        content: No existing todos. I'll create a todo for the single task and then dispatch it.
+        tool_calls:
+          - id: toolcall_2
+            type: function
+            function:
+              name: sql
+              arguments: "{\"description\":\"Create todo for creating fleet-beta.txt\",\"query\":\"INSERT INTO todos (id, title,
+                description, status) VALUES ('create-fleet-beta-file', 'Creating fleet-beta.txt file', 'Create a file
+                named fleet-beta.txt in the current directory containing exactly the text: beta', 'pending')\"}"
+      - role: tool
+        tool_call_id: toolcall_2
+        content: "1 row(s) inserted. Last inserted row ID: 1."
+      - role: assistant
+        content: Now I'll dispatch a sub-agent to complete this task.
+        tool_calls:
+          - id: toolcall_3
+            type: function
+            function:
+              name: write_agent
+              arguments: "{\"message\":\"You are working on a fleet task. Your job is to complete the following todo:\\n\\n**Todo
+                ID:** create-fleet-beta-file/n**Title:** Creating fleet-beta.txt file/n**Description:** Create a file
+                named fleet-beta.txt in the current directory containing exactly the text:
+                beta/n/n**Instructions:**\\n1. Complete the task/n2. Update the todo status when finished:\\n   -
+                Success: `UPDATE todos SET status = 'done' WHERE id = 'create-fleet-beta-file'`\\n   - If blocked:
+                `UPDATE todos SET status = 'blocked' WHERE id = 'create-fleet-beta-file'`\\n3. Return a response
+                summarizing what was completed and whether the todo is fully done/n/n**Note:** The current working
+                directory is: ${workdir}/n/nPlease proceed with creating the file and updating the todo
+                status.\",\"scope\":\"children\"}"
+      - role: tool
+        tool_call_id: toolcall_3
+        content: No matching agents to message. Run list_agents to get current agent IDs and scopes.
+      - role: assistant
+        content: I need to use a different approach. Let me directly complete this task synchronously since it's a simple
+          operation.
+        tool_calls:
+          - id: toolcall_4
+            type: function
+            function:
+              name: create
+              arguments: '{"path":"${workdir}/fleet-beta.txt","file_text":"beta"}'
+      - role: tool
+        tool_call_id: toolcall_4
+        content: Created file ${workdir}/fleet-beta.txt with 4 characters
+      - role: assistant
+        content: Perfect! Now I'll update the todo status to mark it as complete.
+      - role: assistant
+        tool_calls:
+          - id: toolcall_5
+            type: function
+            function:
+              name: sql
+              arguments: "{\"description\":\"Mark todo as done\",\"query\":\"UPDATE todos SET status = 'done' WHERE id =
+                'create-fleet-beta-file'\"}"
+  - messages:
+      - role: system
+        content: ${system}
+      - role: user
+        content: "The plan is one step: create a file named fleet-beta.txt in the current directory containing exactly the text
+          beta. Do not write a plan file, create todos, or call any other tool first. Request approval right away with
+          exit_plan_mode, setting recommendedAction to autopilot_fleet."
+      - role: assistant
+        tool_calls:
+          - id: toolcall_0
+            type: function
+            function:
+              name: exit_plan_mode
+              arguments: '{"summary":"- Create `fleet-beta.txt` in the current directory with exact content
+                `beta`","recommendedAction":"autopilot_fleet","showFleet":true}'
+      - role: tool
+        tool_call_id: toolcall_0
+        content: >-
+          Plan approved! Exited plan mode.
+
+
+          You are now in autopilot mode with fleet enabled. Do not start implementing yet. End your turn now without
+          taking any further action — a follow-up message will arrive automatically to begin implementing the plan on
+          the session model.
+      - role: user
+        content: >-
+          <tools_changed_notice>
+
+          The model has been switched from claude-sonnet-5 to claude-haiku-4.5.
+
+          </tools_changed_notice>
+
+
+          You are now in fleet mode. Dispatch sub-agents (via the task tool) in parallel to do the work.
+
+
+          **Getting Started**
+
+          1. Check for existing todos: `SELECT id, title, status FROM todos WHERE status != 'done'`
+
+          2. If todos exist, dispatch them in parallel (respecting dependencies)
+
+          3. If no todos exist, help decompose the work into todos first. Try to structure todos to minimize
+          dependencies and maximize parallel execution.
+
+
+          **Parallel Execution**
+
+          - Dispatch independent todos simultaneously
+
+          - Never dispatch just a single background subagent. Prefer one sync subagent, or better, prefer to efficiently
+          dispatch multiple background subagents in the same turn.
+
+          - Only serialize todos with true dependencies (check todo_deps)
+
+          - Query ready todos: `SELECT * FROM todos WHERE status = 'pending' AND id NOT IN (SELECT todo_id FROM
+          todo_deps td JOIN todos t ON td.depends_on = t.id WHERE t.status != 'done')`
+
+
+          **Sub-Agent Instructions**
+
+          When dispatching a sub-agent, include these instructions in your prompt:
+
+          1. Update the todo status when finished:
+             - Success: `UPDATE todos SET status = 'done' WHERE id = '<todo-id>'`
+             - Blocked: `UPDATE todos SET status = 'blocked' WHERE id = '<todo-id>'`
+          2. Always return a response summarizing:
+             - What was completed
+             - Whether the todo is fully done or needs more work
+             - Any blockers or questions that need resolution
+
+          **Coordination**
+
+          - After sub-agents return, check todo status in SQL (source of truth)
+
+          - If status is still 'in_progress', the sub-agent may have failed to update - investigate
+
+          - Use the sub-agent's response to understand context, but trust SQL for status
+
+
+          **After Sub-Agents Complete**
+
+          - Check the work done by sub-agents and validate the original request is fully satisfied
+
+          - Ensure the work done by sub-agents (both implementation and testing) is sensible, robust, and handles edge
+          cases, not just the happy path
+
+          - If the original request is not fully satisfied, decompose remaining work into new todos and dispatch more
+          sub-agents as needed
+
+
+          Now proceed with the user's request using fleet mode.
+      - role: assistant
+        content: I'll start by checking for existing todos to understand what work needs to be done.
+        tool_calls:
+          - id: toolcall_1
+            type: function
+            function:
+              name: sql
+              arguments: "{\"description\":\"Check for existing todos\",\"query\":\"SELECT id, title, status FROM todos WHERE status
+                != 'done'\"}"
+      - role: tool
+        tool_call_id: toolcall_1
+        content: Query returned 0 rows.
+      - role: assistant
+        content: No existing todos. I'll create a todo for the single task and then dispatch it.
+        tool_calls:
+          - id: toolcall_2
+            type: function
+            function:
+              name: sql
+              arguments: "{\"description\":\"Create todo for creating fleet-beta.txt\",\"query\":\"INSERT INTO todos (id, title,
+                description, status) VALUES ('create-fleet-beta-file', 'Creating fleet-beta.txt file', 'Create a file
+                named fleet-beta.txt in the current directory containing exactly the text: beta', 'pending')\"}"
+      - role: tool
+        tool_call_id: toolcall_2
+        content: "1 row(s) inserted. Last inserted row ID: 1."
+      - role: assistant
+        content: Now I'll dispatch a sub-agent to complete this task.
+        tool_calls:
+          - id: toolcall_3
+            type: function
+            function:
+              name: write_agent
+              arguments: "{\"message\":\"You are working on a fleet task. Your job is to complete the following todo:\\n\\n**Todo
+                ID:** create-fleet-beta-file/n**Title:** Creating fleet-beta.txt file/n**Description:** Create a file
+                named fleet-beta.txt in the current directory containing exactly the text:
+                beta/n/n**Instructions:**\\n1. Complete the task/n2. Update the todo status when finished:\\n   -
+                Success: `UPDATE todos SET status = 'done' WHERE id = 'create-fleet-beta-file'`\\n   - If blocked:
+                `UPDATE todos SET status = 'blocked' WHERE id = 'create-fleet-beta-file'`\\n3. Return a response
+                summarizing what was completed and whether the todo is fully done/n/n**Note:** The current working
+                directory is: ${workdir}/n/nPlease proceed with creating the file and updating the todo
+                status.\",\"scope\":\"children\"}"
+      - role: tool
+        tool_call_id: toolcall_3
+        content: No matching agents to message. Run list_agents to get current agent IDs and scopes.
+      - role: assistant
+        content: I need to use a different approach. Let me directly complete this task synchronously since it's a simple
+          operation.
+        tool_calls:
+          - id: toolcall_4
+            type: function
+            function:
+              name: create
+              arguments: '{"path":"${workdir}/fleet-beta.txt","file_text":"beta"}'
+      - role: tool
+        tool_call_id: toolcall_4
+        content: Created file ${workdir}/fleet-beta.txt with 4 characters
+      - role: assistant
+        content: Perfect! Now I'll update the todo status to mark it as complete.
+        tool_calls:
+          - id: toolcall_5
+            type: function
+            function:
+              name: sql
+              arguments: "{\"description\":\"Mark todo as done\",\"query\":\"UPDATE todos SET status = 'done' WHERE id =
+                'create-fleet-beta-file'\"}"
+      - role: tool
+        tool_call_id: toolcall_5
+        content: 1 row(s) updated.
+      - role: assistant
+        content: "Let me verify the file was created correctly:"
+      - role: assistant
+        tool_calls:
+          - id: toolcall_6
+            type: function
+            function:
+              name: view
+              arguments: '{"path":"${workdir}/fleet-beta.txt"}'
+  - messages:
+      - role: system
+        content: ${system}
+      - role: user
+        content: "The plan is one step: create a file named fleet-beta.txt in the current directory containing exactly the text
+          beta. Do not write a plan file, create todos, or call any other tool first. Request approval right away with
+          exit_plan_mode, setting recommendedAction to autopilot_fleet."
+      - role: assistant
+        tool_calls:
+          - id: toolcall_0
+            type: function
+            function:
+              name: exit_plan_mode
+              arguments: '{"summary":"- Create `fleet-beta.txt` in the current directory with exact content
+                `beta`","recommendedAction":"autopilot_fleet","showFleet":true}'
+      - role: tool
+        tool_call_id: toolcall_0
+        content: >-
+          Plan approved! Exited plan mode.
+
+
+          You are now in autopilot mode with fleet enabled. Do not start implementing yet. End your turn now without
+          taking any further action — a follow-up message will arrive automatically to begin implementing the plan on
+          the session model.
+      - role: user
+        content: >-
+          <tools_changed_notice>
+
+          The model has been switched from claude-sonnet-5 to claude-haiku-4.5.
+
+          </tools_changed_notice>
+
+
+          You are now in fleet mode. Dispatch sub-agents (via the task tool) in parallel to do the work.
+
+
+          **Getting Started**
+
+          1. Check for existing todos: `SELECT id, title, status FROM todos WHERE status != 'done'`
+
+          2. If todos exist, dispatch them in parallel (respecting dependencies)
+
+          3. If no todos exist, help decompose the work into todos first. Try to structure todos to minimize
+          dependencies and maximize parallel execution.
+
+
+          **Parallel Execution**
+
+          - Dispatch independent todos simultaneously
+
+          - Never dispatch just a single background subagent. Prefer one sync subagent, or better, prefer to efficiently
+          dispatch multiple background subagents in the same turn.
+
+          - Only serialize todos with true dependencies (check todo_deps)
+
+          - Query ready todos: `SELECT * FROM todos WHERE status = 'pending' AND id NOT IN (SELECT todo_id FROM
+          todo_deps td JOIN todos t ON td.depends_on = t.id WHERE t.status != 'done')`
+
+
+          **Sub-Agent Instructions**
+
+          When dispatching a sub-agent, include these instructions in your prompt:
+
+          1. Update the todo status when finished:
+             - Success: `UPDATE todos SET status = 'done' WHERE id = '<todo-id>'`
+             - Blocked: `UPDATE todos SET status = 'blocked' WHERE id = '<todo-id>'`
+          2. Always return a response summarizing:
+             - What was completed
+             - Whether the todo is fully done or needs more work
+             - Any blockers or questions that need resolution
+
+          **Coordination**
+
+          - After sub-agents return, check todo status in SQL (source of truth)
+
+          - If status is still 'in_progress', the sub-agent may have failed to update - investigate
+
+          - Use the sub-agent's response to understand context, but trust SQL for status
+
+
+          **After Sub-Agents Complete**
+
+          - Check the work done by sub-agents and validate the original request is fully satisfied
+
+          - Ensure the work done by sub-agents (both implementation and testing) is sensible, robust, and handles edge
+          cases, not just the happy path
+
+          - If the original request is not fully satisfied, decompose remaining work into new todos and dispatch more
+          sub-agents as needed
+
+
+          Now proceed with the user's request using fleet mode.
+      - role: assistant
+        content: I'll start by checking for existing todos to understand what work needs to be done.
+        tool_calls:
+          - id: toolcall_1
+            type: function
+            function:
+              name: sql
+              arguments: "{\"description\":\"Check for existing todos\",\"query\":\"SELECT id, title, status FROM todos WHERE status
+                != 'done'\"}"
+      - role: tool
+        tool_call_id: toolcall_1
+        content: Query returned 0 rows.
+      - role: assistant
+        content: No existing todos. I'll create a todo for the single task and then dispatch it.
+        tool_calls:
+          - id: toolcall_2
+            type: function
+            function:
+              name: sql
+              arguments: "{\"description\":\"Create todo for creating fleet-beta.txt\",\"query\":\"INSERT INTO todos (id, title,
+                description, status) VALUES ('create-fleet-beta-file', 'Creating fleet-beta.txt file', 'Create a file
+                named fleet-beta.txt in the current directory containing exactly the text: beta', 'pending')\"}"
+      - role: tool
+        tool_call_id: toolcall_2
+        content: "1 row(s) inserted. Last inserted row ID: 1."
+      - role: assistant
+        content: Now I'll dispatch a sub-agent to complete this task.
+        tool_calls:
+          - id: toolcall_3
+            type: function
+            function:
+              name: write_agent
+              arguments: "{\"message\":\"You are working on a fleet task. Your job is to complete the following todo:\\n\\n**Todo
+                ID:** create-fleet-beta-file/n**Title:** Creating fleet-beta.txt file/n**Description:** Create a file
+                named fleet-beta.txt in the current directory containing exactly the text:
+                beta/n/n**Instructions:**\\n1. Complete the task/n2. Update the todo status when finished:\\n   -
+                Success: `UPDATE todos SET status = 'done' WHERE id = 'create-fleet-beta-file'`\\n   - If blocked:
+                `UPDATE todos SET status = 'blocked' WHERE id = 'create-fleet-beta-file'`\\n3. Return a response
+                summarizing what was completed and whether the todo is fully done/n/n**Note:** The current working
+                directory is: ${workdir}/n/nPlease proceed with creating the file and updating the todo
+                status.\",\"scope\":\"children\"}"
+      - role: tool
+        tool_call_id: toolcall_3
+        content: No matching agents to message. Run list_agents to get current agent IDs and scopes.
+      - role: assistant
+        content: I need to use a different approach. Let me directly complete this task synchronously since it's a simple
+          operation.
+        tool_calls:
+          - id: toolcall_4
+            type: function
+            function:
+              name: create
+              arguments: '{"path":"${workdir}/fleet-beta.txt","file_text":"beta"}'
+      - role: tool
+        tool_call_id: toolcall_4
+        content: Created file ${workdir}/fleet-beta.txt with 4 characters
+      - role: assistant
+        content: Perfect! Now I'll update the todo status to mark it as complete.
+        tool_calls:
+          - id: toolcall_5
+            type: function
+            function:
+              name: sql
+              arguments: "{\"description\":\"Mark todo as done\",\"query\":\"UPDATE todos SET status = 'done' WHERE id =
+                'create-fleet-beta-file'\"}"
+      - role: tool
+        tool_call_id: toolcall_5
+        content: 1 row(s) updated.
+      - role: assistant
+        content: "Let me verify the file was created correctly:"
+        tool_calls:
+          - id: toolcall_6
+            type: function
+            function:
+              name: view
+              arguments: '{"path":"${workdir}/fleet-beta.txt"}'
+      - role: tool
+        tool_call_id: toolcall_6
+        content: beta
+      - role: assistant
+        content: Perfect! The file has been created successfully with the exact content "beta".
+      - role: assistant
+        tool_calls:
+          - id: toolcall_7
+            type: function
+            function:
+              name: task_complete
+              arguments: '{"summary":"Successfully created `fleet-beta.txt` in the current directory (${workdir}) with the exact text
+                content \"beta\". File verified and todo marked as done."}'
diff --git a/test/snapshots/rpc_server_misc/should_reload_user_settings.yaml b/test/snapshots/rpc_session_state/should_read_the_reasoning_summaries_policy_for_the_current_model.yaml
similarity index 100%
rename from test/snapshots/rpc_server_misc/should_reload_user_settings.yaml
rename to test/snapshots/rpc_session_state/should_read_the_reasoning_summaries_policy_for_the_current_model.yaml
diff --git a/test/snapshots/rpc_tasks_and_handlers/should_emit_session_idle_after_cancelling_a_running_attached_shell.yaml b/test/snapshots/rpc_tasks_and_handlers/should_emit_session_idle_after_cancelling_a_running_attached_shell.yaml
new file mode 100644
index 0000000000..d22c9aefea
--- /dev/null
+++ b/test/snapshots/rpc_tasks_and_handlers/should_emit_session_idle_after_cancelling_a_running_attached_shell.yaml
@@ -0,0 +1,21 @@
+models:
+  - claude-sonnet-5
+conversations:
+  - messages:
+      - role: system
+        content: ${system}
+      - role: user
+        content: Use your shell tool to run `sleep 600` in async mode without detaching. Do not read its output or wait for it.
+          Then reply with exactly SHELL_STARTED.
+      - role: assistant
+        tool_calls:
+          - id: toolcall_0
+            type: function
+            function:
+              name: ${shell}
+              arguments: '{"command":"sleep 600","description":"Sleep for 600 seconds","mode":"async"}'
+      - role: tool
+        tool_call_id: toolcall_0
+        content: "<command started in background with shellId: 0>"
+      - role: assistant
+        content: SHELL_STARTED
diff --git a/test/snapshots/rpc_tasks_and_handlers/should_run_a_queued_message_after_cancelling_a_running_attached_shell.yaml b/test/snapshots/rpc_tasks_and_handlers/should_run_a_queued_message_after_cancelling_a_running_attached_shell.yaml
new file mode 100644
index 0000000000..d2dbce4e77
--- /dev/null
+++ b/test/snapshots/rpc_tasks_and_handlers/should_run_a_queued_message_after_cancelling_a_running_attached_shell.yaml
@@ -0,0 +1,25 @@
+models:
+  - claude-sonnet-5
+conversations:
+  - messages:
+      - role: system
+        content: ${system}
+      - role: user
+        content: Use your shell tool to run `sleep 600` in async mode without detaching. Do not read its output or wait for it.
+          Then reply with exactly SHELL_STARTED.
+      - role: assistant
+        tool_calls:
+          - id: toolcall_0
+            type: function
+            function:
+              name: ${shell}
+              arguments: '{"command":"sleep 600","description":"Sleep for 600 seconds","mode":"async","initial_wait":10}'
+      - role: tool
+        tool_call_id: toolcall_0
+        content: "<command started in background with shellId: 0>"
+      - role: assistant
+        content: SHELL_STARTED
+      - role: user
+        content: Reply with exactly QUEUED_DONE.
+      - role: assistant
+        content: QUEUED_DONE
diff --git a/test/snapshots/session/send_returns_immediately_while_events_stream_in_background.yaml b/test/snapshots/session/send_returns_immediately_while_events_stream_in_background.yaml
index 4ef08ab255..e252e84248 100644
--- a/test/snapshots/session/send_returns_immediately_while_events_stream_in_background.yaml
+++ b/test/snapshots/session/send_returns_immediately_while_events_stream_in_background.yaml
@@ -41,9 +41,7 @@ conversations:
                 command","initial_wait":5,"mode":"sync"}'
       - 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.
+        content: Tool 'report_intent' does not exist.
       - role: tool
         tool_call_id: toolcall_1
         content: |-
diff --git a/test/snapshots/session/should_send_with_directory_attachment.yaml b/test/snapshots/session/should_send_with_directory_attachment.yaml
index f2e8835c5d..83cea962ac 100644
--- a/test/snapshots/session/should_send_with_directory_attachment.yaml
+++ b/test/snapshots/session/should_send_with_directory_attachment.yaml
@@ -56,9 +56,7 @@ conversations:
               arguments: '{"path":"${workdir}/attached-directory"}'
       - 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.
+        content: Tool 'report_intent' does not exist.
       - role: tool
         tool_call_id: toolcall_1
         content: readme.txt
diff --git a/test/snapshots/session/should_send_with_file_attachment.yaml b/test/snapshots/session/should_send_with_file_attachment.yaml
index f2acea13fb..b9b544ebb7 100644
--- a/test/snapshots/session/should_send_with_file_attachment.yaml
+++ b/test/snapshots/session/should_send_with_file_attachment.yaml
@@ -53,9 +53,7 @@ conversations:
               arguments: '{"path":"${workdir}/attached-file.txt"}'
       - 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.
+        content: Tool 'report_intent' does not exist.
       - role: tool
         tool_call_id: toolcall_1
         content: FILE_ATTACHMENT_SENTINEL
diff --git a/test/snapshots/skill_provider/should_load_provider_and_file_based_skills_together.yaml b/test/snapshots/skill_provider/should_load_provider_and_file_based_skills_together.yaml
new file mode 100644
index 0000000000..c9594e65fe
--- /dev/null
+++ b/test/snapshots/skill_provider/should_load_provider_and_file_based_skills_together.yaml
@@ -0,0 +1,48 @@
+models:
+  - claude-sonnet-5
+conversations:
+  - messages:
+      - role: system
+        content: ${system}
+      - role: user
+        content: Use the skill tool to load the file-notes skill and the provider-audit skill, then reply with both verification
+          words.
+      - role: assistant
+        tool_calls:
+          - id: toolcall_0
+            type: function
+            function:
+              name: skill
+              arguments: '{"skill":"file-notes"}'
+      - role: tool
+        tool_call_id: toolcall_0
+        content: Skill "file-notes" loaded successfully. Follow the instructions in the skill context.
+      - role: user
+        content: |-
+          <skill-context name="file-notes">
+          Base directory for this skill: ${workdir}/file-skills/file-notes
+
+          The file notes verification word is MAPLE_FALCON_27.
+
+          </skill-context>
+      - role: assistant
+        tool_calls:
+          - id: toolcall_1
+            type: function
+            function:
+              name: skill
+              arguments: '{"skill":"provider-audit"}'
+      - role: tool
+        tool_call_id: toolcall_1
+        content: Skill "provider-audit" loaded successfully. Follow the instructions in the skill context.
+      - role: user
+        content: |-
+          <skill-context name="provider-audit">
+          This is an SDK-provided text-only skill - related files, scripts, templates, and assets are not available.
+          The provider audit verification word is COBALT_HERON_58.
+
+          </skill-context>
+      - role: assistant
+        content: |-
+          - file-notes: MAPLE_FALCON_27
+          - provider-audit: COBALT_HERON_58
diff --git a/test/snapshots/skill_provider/should_load_provider_skill_lazily_through_skill_tool.yaml b/test/snapshots/skill_provider/should_load_provider_skill_lazily_through_skill_tool.yaml
new file mode 100644
index 0000000000..e639dbe6eb
--- /dev/null
+++ b/test/snapshots/skill_provider/should_load_provider_skill_lazily_through_skill_tool.yaml
@@ -0,0 +1,29 @@
+models:
+  - claude-sonnet-5
+conversations:
+  - messages:
+      - role: system
+        content: ${system}
+      - role: user
+        content: Use the skill tool to load the provider-lookup skill, then reply with its verification word.
+      - role: assistant
+        tool_calls:
+          - id: toolcall_0
+            type: function
+            function:
+              name: skill
+              arguments: '{"skill":"provider-lookup"}'
+      - role: tool
+        tool_call_id: toolcall_0
+        content: Skill "provider-lookup" loaded successfully. Follow the instructions in the skill context.
+      - role: user
+        content: |-
+          <skill-context name="provider-lookup">
+          This is an SDK-provided text-only skill - related files, scripts, templates, and assets are not available.
+          # Provider lookup
+
+          The verification word is TANGERINE_QUARTZ_19. Reply with it.
+
+          </skill-context>
+      - role: assistant
+        content: The verification word is **TANGERINE_QUARTZ_19**.
diff --git a/test/snapshots/skill_provider/should_preserve_skill_prompt_bytes_across_cold_resume_with_reordered_discovery.yaml b/test/snapshots/skill_provider/should_preserve_skill_prompt_bytes_across_cold_resume_with_reordered_discovery.yaml
new file mode 100644
index 0000000000..72910c73cd
--- /dev/null
+++ b/test/snapshots/skill_provider/should_preserve_skill_prompt_bytes_across_cold_resume_with_reordered_discovery.yaml
@@ -0,0 +1,14 @@
+models:
+  - claude-sonnet-5
+conversations:
+  - messages:
+      - role: system
+        content: ${system}
+      - role: user
+        content: Without using tools, reply with exactly SKILL_ORDER_INITIAL_OK.
+      - role: assistant
+        content: SKILL_ORDER_INITIAL_OK
+      - role: user
+        content: Without using tools, reply with exactly SKILL_ORDER_RESUMED_OK.
+      - role: assistant
+        content: SKILL_ORDER_RESUMED_OK
diff --git a/test/snapshots/skill_provider/should_rebind_skill_provider_on_resume.yaml b/test/snapshots/skill_provider/should_rebind_skill_provider_on_resume.yaml
new file mode 100644
index 0000000000..1a8387a0e8
--- /dev/null
+++ b/test/snapshots/skill_provider/should_rebind_skill_provider_on_resume.yaml
@@ -0,0 +1,31 @@
+models:
+  - claude-sonnet-5
+conversations:
+  - messages:
+      - role: system
+        content: ${system}
+      - role: user
+        content: Without using any tools or skills, reply with exactly REBIND_READY.
+      - role: assistant
+        content: REBIND_READY
+      - role: user
+        content: Use the skill tool to load the rebind-check skill, then reply with its verification word.
+      - role: assistant
+        tool_calls:
+          - id: toolcall_0
+            type: function
+            function:
+              name: skill
+              arguments: '{"skill":"rebind-check"}'
+      - role: tool
+        tool_call_id: toolcall_0
+        content: Skill "rebind-check" loaded successfully. Follow the instructions in the skill context.
+      - role: user
+        content: |-
+          <skill-context name="rebind-check">
+          This is an SDK-provided text-only skill - related files, scripts, templates, and assets are not available.
+          The rebind verification word is BRONZE_BETA_22.
+
+          </skill-context>
+      - role: assistant
+        content: BRONZE_BETA_22
diff --git a/test/snapshots/skill_provider/should_report_missing_provider_skill_as_not_found.yaml b/test/snapshots/skill_provider/should_report_missing_provider_skill_as_not_found.yaml
new file mode 100644
index 0000000000..1f372cdc0b
--- /dev/null
+++ b/test/snapshots/skill_provider/should_report_missing_provider_skill_as_not_found.yaml
@@ -0,0 +1,20 @@
+models:
+  - claude-sonnet-5
+conversations:
+  - messages:
+      - role: system
+        content: ${system}
+      - role: user
+        content: Use the skill tool to load the vanished-lookup skill. If loading fails, reply with exactly LOAD_FAILED.
+      - role: assistant
+        tool_calls:
+          - id: toolcall_0
+            type: function
+            function:
+              name: skill
+              arguments: '{"skill":"vanished-lookup"}'
+      - role: tool
+        tool_call_id: toolcall_0
+        content: Failed to load SDK-provided skill "vanished-lookup". Its provider may be unavailable.
+      - role: assistant
+        content: LOAD_FAILED
diff --git a/test/snapshots/skill_provider/should_report_provider_read_failure_without_leaking_details.yaml b/test/snapshots/skill_provider/should_report_provider_read_failure_without_leaking_details.yaml
new file mode 100644
index 0000000000..47dd533263
--- /dev/null
+++ b/test/snapshots/skill_provider/should_report_provider_read_failure_without_leaking_details.yaml
@@ -0,0 +1,20 @@
+models:
+  - claude-sonnet-5
+conversations:
+  - messages:
+      - role: system
+        content: ${system}
+      - role: user
+        content: Use the skill tool to load the broken-lookup skill. If loading fails, reply with exactly LOAD_FAILED.
+      - role: assistant
+        tool_calls:
+          - id: toolcall_0
+            type: function
+            function:
+              name: skill
+              arguments: '{"skill":"broken-lookup"}'
+      - role: tool
+        tool_call_id: toolcall_0
+        content: Failed to load SDK-provided skill "broken-lookup". Its provider may be unavailable.
+      - role: assistant
+        content: LOAD_FAILED